From dd7c91f3d331f8dba347cefad5a66e33744d542d Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 21 Dec 2025 19:43:06 -0500 Subject: [PATCH 01/35] Miscellaneous data fixes (#2983) * Replace bss lbl_ with init$0000 * Rename l_HIOInit to hio_set The name is excluded from TP's weird maps, but hio_set is the name they used in TWW's maps. * Fix a couple more init$ names * Fix nbomb missing some bss * Fix camera localstatics having wrong name * Rename l_initHIO to hio_set * A couple manual fixes * Rename hioInit to hio_set * Couple more manual fixes * Fix d_a_npc_cd2 data and function order * More data fixes * Fix inconsistent hex vs decimal --- config/GZ2E01/rels/d_a_b_bh/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_bq/symbols.txt | 4 +- config/GZ2E01/rels/d_a_b_dr/symbols.txt | 4 +- config/GZ2E01/rels/d_a_b_dre/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_ds/symbols.txt | 4 +- config/GZ2E01/rels/d_a_b_gg/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_gnd/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_go/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_gos/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_mgn/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_ob/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_oh/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_tn/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_yo/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_yo_ice/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_zant/symbols.txt | 2 +- config/GZ2E01/rels/d_a_bd/symbols.txt | 2 +- config/GZ2E01/rels/d_a_bg_obj/symbols.txt | 2 +- config/GZ2E01/rels/d_a_crod/symbols.txt | 2 +- config/GZ2E01/rels/d_a_cstatue/symbols.txt | 1 + config/GZ2E01/rels/d_a_do/symbols.txt | 2 +- config/GZ2E01/rels/d_a_door_boss/symbols.txt | 2 +- .../GZ2E01/rels/d_a_door_bossL1/symbols.txt | 2 +- .../GZ2E01/rels/d_a_door_bossL5/symbols.txt | 2 +- .../GZ2E01/rels/d_a_door_dbdoor00/symbols.txt | 2 +- .../GZ2E01/rels/d_a_door_knob00/symbols.txt | 2 +- .../GZ2E01/rels/d_a_door_mbossL1/symbols.txt | 2 +- config/GZ2E01/rels/d_a_door_push/symbols.txt | 4 +- config/GZ2E01/rels/d_a_dshutter/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_ai/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_ba/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_bee/symbols.txt | 4 +- config/GZ2E01/rels/d_a_e_bg/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_bi/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_bs/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_bu/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_bug/symbols.txt | 8 +- config/GZ2E01/rels/d_a_e_cr/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_db/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_dd/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_df/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_dk/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_dn/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_fb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_fm/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_fs/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_fz/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_ga/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_ge/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_gi/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_gm/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_gob/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_gs/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_hb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_hm/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_hp/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_hz/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_is/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_kk/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_mk/symbols.txt | 4 +- config/GZ2E01/rels/d_a_e_mm/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_ms/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_nest/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_nz/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_oc/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_oct_bg/symbols.txt | 6 +- config/GZ2E01/rels/d_a_e_ot/symbols.txt | 6 +- config/GZ2E01/rels/d_a_e_ph/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_pm/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_po/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_pz/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_rb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_rd/symbols.txt | 6 +- config/GZ2E01/rels/d_a_e_rdb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_rdy/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_s1/symbols.txt | 4 +- config/GZ2E01/rels/d_a_e_sb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_sf/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_sg/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_sh/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_sm/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_st/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_sw/symbols.txt | 8 +- config/GZ2E01/rels/d_a_e_th/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_tk/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_tk2/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_tt/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_vt/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_wb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_ws/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_ww/symbols.txt | 4 +- config/GZ2E01/rels/d_a_e_yc/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_yd/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_yg/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_yh/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_ymb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_zm/symbols.txt | 2 +- config/GZ2E01/rels/d_a_econt/symbols.txt | 2 +- config/GZ2E01/rels/d_a_fr/symbols.txt | 2 +- config/GZ2E01/rels/d_a_kago/symbols.txt | 2 +- config/GZ2E01/rels/d_a_kytag03/symbols.txt | 2 +- config/GZ2E01/rels/d_a_mg_fish/symbols.txt | 3 +- config/GZ2E01/rels/d_a_mg_fshop/symbols.txt | 2 +- config/GZ2E01/rels/d_a_mg_rod/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_du/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_henna/symbols.txt | 14 +- .../GZ2E01/rels/d_a_npc_kasi_kyu/symbols.txt | 2 +- .../GZ2E01/rels/d_a_npc_kasi_mich/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_ks/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_sq/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_tk/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_tkj2/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_tr/symbols.txt | 2 +- .../rels/d_a_obj_amiShutter/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_ari/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_avalanche/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_balloon/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_barDesk/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_batta/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_bmWindow/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_bmshutter/symbols.txt | 4 +- config/GZ2E01/rels/d_a_obj_bsGate/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_carry/symbols.txt | 14 +- config/GZ2E01/rels/d_a_obj_cb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_cdoor/symbols.txt | 4 +- config/GZ2E01/rels/d_a_obj_chest/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_cho/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_cwall/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_dan/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_digsnow/symbols.txt | 2 +- .../rels/d_a_obj_dmelevator/symbols.txt | 6 +- config/GZ2E01/rels/d_a_obj_drop/symbols.txt | 4 +- config/GZ2E01/rels/d_a_obj_food/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_fw/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_geyser/symbols.txt | 4 +- config/GZ2E01/rels/d_a_obj_gm/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_goGate/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_gomikabe/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_gpTaru/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_heavySw/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_iceblock/symbols.txt | 4 +- config/GZ2E01/rels/d_a_obj_ito/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kabuto/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kag/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_kamakiri/symbols.txt | 2 +- .../rels/d_a_obj_katatsumuri/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kbox/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_key/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_keyhole/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kgate/symbols.txt | 4 +- config/GZ2E01/rels/d_a_obj_ki/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kiPot/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kita/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_kshutter/symbols.txt | 10 +- .../GZ2E01/rels/d_a_obj_kuwagata/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_lbox/symbols.txt | 2 +- .../rels/d_a_obj_lv4CandleDemoTag/symbols.txt | 2 +- .../rels/d_a_obj_lv4CandleTag/symbols.txt | 2 +- .../rels/d_a_obj_lv4EdShutter/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv4Gate/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv4PoGate/symbols.txt | 2 +- .../rels/d_a_obj_lv4RailWall/symbols.txt | 2 +- .../rels/d_a_obj_lv4SlideWall/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv4bridge/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv4floor/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv4sand/symbols.txt | 2 +- .../rels/d_a_obj_lv5FloorBoard/symbols.txt | 2 +- .../rels/d_a_obj_lv5IceWall/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv5SwIce/symbols.txt | 2 +- .../rels/d_a_obj_lv6ChangeGate/symbols.txt | 2 +- .../rels/d_a_obj_lv6FurikoTrap/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv6Lblock/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv6SwGate/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv6SzGate/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv6Tenbin/symbols.txt | 2 +- .../rels/d_a_obj_lv6TogeRoll/symbols.txt | 2 +- .../rels/d_a_obj_lv6TogeTrap/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv6bemos/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv6swturn/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv7BsGate/symbols.txt | 2 +- .../rels/d_a_obj_lv7PropellerY/symbols.txt | 2 +- .../rels/d_a_obj_lv8KekkaiTrap/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv8Lift/symbols.txt | 2 +- .../rels/d_a_obj_lv8OptiLift/symbols.txt | 2 +- .../rels/d_a_obj_lv8UdFloor/symbols.txt | 2 +- .../rels/d_a_obj_lv9SwShutter/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_magLift/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_msima/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_mvstair/symbols.txt | 4 +- config/GZ2E01/rels/d_a_obj_myogan/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_pillar/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_poCandle/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_poFire/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_poTbox/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_rfHole/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_rgate/symbols.txt | 4 +- .../rels/d_a_obj_rope_bridge/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_rotTrap/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_rw/symbols.txt | 2 +- .../rels/d_a_obj_sWallShutter/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_saidan/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_smallkey/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_stopper/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_stopper2/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_swBallA/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_swBallB/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_swBallC/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_swLight/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_swhang/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_sword/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_swpush/symbols.txt | 4 +- .../GZ2E01/rels/d_a_obj_swpush2/symbols.txt | 4 +- .../GZ2E01/rels/d_a_obj_swpush5/symbols.txt | 4 +- config/GZ2E01/rels/d_a_obj_syRock/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_taFence/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_takaraDai/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_toby/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_tombo/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_warp_kbrg/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_warp_obrg/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_waterGate/symbols.txt | 2 +- .../rels/d_a_obj_waterPillar/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_web0/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_web1/symbols.txt | 2 +- .../rels/d_a_obj_well_cover/symbols.txt | 2 +- .../GZ2E01/rels/d_a_scene_exit2/symbols.txt | 2 +- config/GZ2E01/rels/d_a_sq/symbols.txt | 2 +- config/GZ2E01/rels/d_a_swBall/symbols.txt | 2 +- config/GZ2E01/rels/d_a_swc00/symbols.txt | 2 +- .../GZ2E01/rels/d_a_tag_firewall/symbols.txt | 2 +- .../GZ2E01/rels/d_a_tag_lv2prchk/symbols.txt | 2 +- .../rels/d_a_tag_statue_evt/symbols.txt | 2 +- config/GZ2E01/rels/d_a_tbox/symbols.txt | 2 +- config/GZ2E01/rels/d_a_tbox2/symbols.txt | 4 +- config/GZ2E01/symbols.txt | 10 +- config/GZ2J01/rels/d_a_e_fb/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_fs/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_hm/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_hp/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_nz/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_po/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_pz/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_sh/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_yh/symbols.txt | 2 +- config/GZ2J01/rels/d_a_mg_rod/symbols.txt | 2 +- config/GZ2J01/rels/d_a_npc_henna/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_batta/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_gomikabe/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_kita/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_kuwagata/symbols.txt | 2 +- .../rels/d_a_obj_lv4CandleDemoTag/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_msima/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_toby/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_tombo/symbols.txt | 2 +- config/GZ2J01/symbols.txt | 2 +- config/GZ2P01/rels/d_a_bd/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_fb/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_fs/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_hm/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_hp/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_nz/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_po/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_sh/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_yh/symbols.txt | 2 +- config/GZ2P01/rels/d_a_mg_rod/symbols.txt | 2 +- config/GZ2P01/rels/d_a_npc_henna/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_batta/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_gm/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_gomikabe/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_kita/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_kuwagata/symbols.txt | 2 +- .../rels/d_a_obj_lv4CandleDemoTag/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_msima/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_toby/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_tombo/symbols.txt | 2 +- config/RZDE01_00/rels/d_a_e_yh/symbols.txt | 2 +- config/RZDE01_00/rels/d_a_fr/symbols.txt | 2 +- .../RZDE01_00/rels/d_a_obj_batta/symbols.txt | 2 +- .../rels/d_a_obj_gomikabe/symbols.txt | 2 +- .../RZDE01_00/rels/d_a_obj_ice_s/symbols.txt | 2 +- config/RZDE01_02/rels/d_a_e_yh/symbols.txt | 2 +- config/ShieldD/rels/d_a_b_mgnD/symbols.txt | 2 +- config/ShieldD/rels/d_a_bdD/symbols.txt | 2 +- config/ShieldD/rels/d_a_e_bgD/symbols.txt | 2 +- config/ShieldD/rels/d_a_e_fbD/symbols.txt | 2 +- config/ShieldD/rels/d_a_e_hpD/symbols.txt | 2 +- config/ShieldD/rels/d_a_e_shD/symbols.txt | 2 +- config/ShieldD/rels/d_a_frD/symbols.txt | 2 +- config/ShieldD/rels/d_a_kagoD/symbols.txt | 2 +- .../ShieldD/rels/d_a_obj_ice_sD/symbols.txt | 2 +- include/d/actor/d_a_npc_cd2.h | 151 ++- src/JSystem/JUtility/JUTException.cpp | 3 +- src/d/actor/d_a_b_bh.cpp | 8 +- src/d/actor/d_a_b_dr.cpp | 10 +- src/d/actor/d_a_b_ds.cpp | 8 +- src/d/actor/d_a_b_gg.cpp | 9 +- src/d/actor/d_a_b_gm.cpp | 8 +- src/d/actor/d_a_b_gnd.cpp | 8 +- src/d/actor/d_a_b_mgn.cpp | 8 +- src/d/actor/d_a_b_tn.cpp | 8 +- src/d/actor/d_a_b_yo.cpp | 8 +- src/d/actor/d_a_b_yo_ice.cpp | 8 +- src/d/actor/d_a_b_zant.cpp | 10 +- src/d/actor/d_a_b_zant_mobile.cpp | 8 +- src/d/actor/d_a_bd.cpp | 8 +- src/d/actor/d_a_cstatue.cpp | 14 +- src/d/actor/d_a_do.cpp | 8 +- src/d/actor/d_a_door_shutter.cpp | 271 +++-- src/d/actor/d_a_e_ai.cpp | 8 +- src/d/actor/d_a_e_ba.cpp | 8 +- src/d/actor/d_a_e_bee.cpp | 8 +- src/d/actor/d_a_e_bg.cpp | 8 +- src/d/actor/d_a_e_bi.cpp | 8 +- src/d/actor/d_a_e_bs.cpp | 8 +- src/d/actor/d_a_e_bu.cpp | 8 +- src/d/actor/d_a_e_bug.cpp | 8 +- src/d/actor/d_a_e_cr.cpp | 8 +- src/d/actor/d_a_e_db.cpp | 8 +- src/d/actor/d_a_e_dd.cpp | 8 +- src/d/actor/d_a_e_df.cpp | 8 +- src/d/actor/d_a_e_dn.cpp | 8 +- src/d/actor/d_a_e_dt.cpp | 8 +- src/d/actor/d_a_e_fb.cpp | 8 +- src/d/actor/d_a_e_fk.cpp | 8 +- src/d/actor/d_a_e_fm.cpp | 8 +- src/d/actor/d_a_e_fs.cpp | 8 +- src/d/actor/d_a_e_ga.cpp | 8 +- src/d/actor/d_a_e_ge.cpp | 8 +- src/d/actor/d_a_e_gi.cpp | 8 +- src/d/actor/d_a_e_gm.cpp | 10 +- src/d/actor/d_a_e_gob.cpp | 8 +- src/d/actor/d_a_e_gs.cpp | 8 +- src/d/actor/d_a_e_hb.cpp | 8 +- src/d/actor/d_a_e_hm.cpp | 8 +- src/d/actor/d_a_e_hp.cpp | 8 +- src/d/actor/d_a_e_hz.cpp | 8 +- src/d/actor/d_a_e_hzelda.cpp | 8 +- src/d/actor/d_a_e_is.cpp | 8 +- src/d/actor/d_a_e_kk.cpp | 8 +- src/d/actor/d_a_e_mb.cpp | 8 +- src/d/actor/d_a_e_mf.cpp | 8 +- src/d/actor/d_a_e_mk.cpp | 8 +- src/d/actor/d_a_e_mm.cpp | 8 +- src/d/actor/d_a_e_ms.cpp | 8 +- src/d/actor/d_a_e_nest.cpp | 8 +- src/d/actor/d_a_e_nz.cpp | 8 +- src/d/actor/d_a_e_ot.cpp | 8 +- src/d/actor/d_a_e_pm.cpp | 8 +- src/d/actor/d_a_e_po.cpp | 8 +- src/d/actor/d_a_e_pz.cpp | 10 +- src/d/actor/d_a_e_rb.cpp | 8 +- src/d/actor/d_a_e_rd.cpp | 8 +- src/d/actor/d_a_e_rdb.cpp | 8 +- src/d/actor/d_a_e_rdy.cpp | 8 +- src/d/actor/d_a_e_s1.cpp | 8 +- src/d/actor/d_a_e_sb.cpp | 8 +- src/d/actor/d_a_e_sf.cpp | 8 +- src/d/actor/d_a_e_sh.cpp | 8 +- src/d/actor/d_a_e_sm.cpp | 8 +- src/d/actor/d_a_e_st.cpp | 8 +- src/d/actor/d_a_e_sw.cpp | 8 +- src/d/actor/d_a_e_th.cpp | 8 +- src/d/actor/d_a_e_tk.cpp | 8 +- src/d/actor/d_a_e_tk2.cpp | 8 +- src/d/actor/d_a_e_tt.cpp | 8 +- src/d/actor/d_a_e_vt.cpp | 8 +- src/d/actor/d_a_e_wb.cpp | 17 +- src/d/actor/d_a_e_ws.cpp | 8 +- src/d/actor/d_a_e_ww.cpp | 8 +- src/d/actor/d_a_e_yc.cpp | 8 +- src/d/actor/d_a_e_yg.cpp | 8 +- src/d/actor/d_a_e_yh.cpp | 8 +- src/d/actor/d_a_e_ymb.cpp | 8 +- src/d/actor/d_a_e_zh.cpp | 8 +- src/d/actor/d_a_e_zm.cpp | 8 +- src/d/actor/d_a_fr.cpp | 8 +- src/d/actor/d_a_kago.cpp | 8 +- src/d/actor/d_a_mg_rod.cpp | 8 +- src/d/actor/d_a_nbomb.cpp | 3 + src/d/actor/d_a_npc_cd2.cpp | 979 +----------------- src/d/actor/d_a_npc_cd2_HIO.inc | 712 +++++++++++++ src/d/actor/d_a_npc_du.cpp | 8 +- src/d/actor/d_a_npc_henna.cpp | 8 +- src/d/actor/d_a_npc_ks.cpp | 8 +- src/d/actor/d_a_npc_ne.cpp | 8 +- src/d/actor/d_a_npc_sq.cpp | 8 +- src/d/actor/d_a_npc_tkj2.cpp | 8 +- src/d/actor/d_a_obj_ari.cpp | 8 +- src/d/actor/d_a_obj_balloon.cpp | 8 +- src/d/actor/d_a_obj_batta.cpp | 8 +- src/d/actor/d_a_obj_cho.cpp | 8 +- src/d/actor/d_a_obj_dan.cpp | 8 +- src/d/actor/d_a_obj_food.cpp | 8 +- src/d/actor/d_a_obj_fw.cpp | 8 +- src/d/actor/d_a_obj_gm.cpp | 8 +- src/d/actor/d_a_obj_gomikabe.cpp | 8 +- src/d/actor/d_a_obj_ice_s.cpp | 8 +- src/d/actor/d_a_obj_ito.cpp | 8 +- src/d/actor/d_a_obj_kabuto.cpp | 8 +- src/d/actor/d_a_obj_kag.cpp | 8 +- src/d/actor/d_a_obj_kamakiri.cpp | 8 +- src/d/actor/d_a_obj_kanban2.cpp | 10 +- src/d/actor/d_a_obj_katatsumuri.cpp | 8 +- src/d/actor/d_a_obj_kbox.cpp | 8 +- src/d/actor/d_a_obj_key.cpp | 8 +- src/d/actor/d_a_obj_keyhole.cpp | 8 +- src/d/actor/d_a_obj_ki.cpp | 8 +- src/d/actor/d_a_obj_kita.cpp | 8 +- src/d/actor/d_a_obj_kuwagata.cpp | 8 +- src/d/actor/d_a_obj_msima.cpp | 8 +- src/d/actor/d_a_obj_rw.cpp | 8 +- src/d/actor/d_a_obj_toby.cpp | 8 +- src/d/actor/d_a_obj_tombo.cpp | 8 +- src/d/actor/d_a_sq.cpp | 8 +- src/d/d_camera.cpp | 8 +- 419 files changed, 1789 insertions(+), 2004 deletions(-) create mode 100644 src/d/actor/d_a_npc_cd2_HIO.inc diff --git a/config/GZ2E01/rels/d_a_b_bh/symbols.txt b/config/GZ2E01/rels/d_a_b_bh/symbols.txt index fe1e9e4029..c22efde037 100644 --- a/config/GZ2E01/rels/d_a_b_bh/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_bh/symbols.txt @@ -128,7 +128,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_138_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3759 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte bh = .bss:0x0000006C; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_b_bq/symbols.txt b/config/GZ2E01/rels/d_a_b_bq/symbols.txt index c2b346786b..898084b407 100644 --- a/config/GZ2E01/rels/d_a_b_bq/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_bq/symbols.txt @@ -292,7 +292,7 @@ __vt__8cM3dGAab = .data:0x000004AC; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000004B8; // type:object size:0xC scope:global __vt__12daB_BQ_HIO_c = .data:0x000004C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_139_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_805BAD50 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3811 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte -lbl_139_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +data_805BAD70 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_b_dr/symbols.txt b/config/GZ2E01/rels/d_a_b_dr/symbols.txt index 128994900f..4807429dba 100644 --- a/config/GZ2E01/rels/d_a_b_dr/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_dr/symbols.txt @@ -279,10 +279,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_140_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3795 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x68 scope:global data:byte -lbl_140_bss_BC = .bss:0x000000BC; // type:object size:0x1 data:byte +data_805C7974 = .bss:0x000000BC; // type:object size:0x1 scope:local align:1 data:byte @6782 = .bss:0x000000C0; // type:object size:0xC scope:local @6785 = .bss:0x000000D0; // type:object size:0xC scope:local @6786 = .bss:0x000000DC; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_dre/symbols.txt b/config/GZ2E01/rels/d_a_b_dre/symbols.txt index ea01563666..dfdf3b33b9 100644 --- a/config/GZ2E01/rels/d_a_b_dre/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_dre/symbols.txt @@ -166,7 +166,7 @@ s_HeadPos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000060; // type:object size:0xC s_BodyPos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000078; // type:object size:0xC scope:global @3770 = .bss:0x00000084; // type:object size:0xC scope:local s_TalePos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000090; // type:object size:0xC scope:global -lbl_141_bss_9C = .bss:0x0000009C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000009C; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000A8; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_b_ds/symbols.txt b/config/GZ2E01/rels/d_a_b_ds/symbols.txt index 4a6207b043..0f3b4ad2e5 100644 --- a/config/GZ2E01/rels/d_a_b_ds/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_ds/symbols.txt @@ -522,13 +522,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_142_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3948 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x50 scope:global data:byte handL_ang = .bss:0x000000A4; // type:object size:0x2 scope:global handR_ang = .bss:0x000000A6; // type:object size:0x2 scope:global handX_ang = .bss:0x000000A8; // type:object size:0x2 scope:global -lbl_142_bss_AA = .bss:0x000000AA; // type:object size:0x1 data:byte +breathTimerBase = .bss:0x000000AA; // type:object size:0x1 scope:local align:1 data:byte @5249 = .bss:0x000000AC; // type:object size:0xC scope:local init$3146 = .bss:0x000000B8; // type:object size:0x1 scope:local data:byte @5252 = .bss:0x000000BC; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_gg/symbols.txt b/config/GZ2E01/rels/d_a_b_gg/symbols.txt index 99890333ea..ba3557c376 100644 --- a/config/GZ2E01/rels/d_a_b_gg/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_gg/symbols.txt @@ -306,7 +306,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_143_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3927 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte s_dis__22@unnamed@d_a_b_gg_cpp@ = .bss:0x00000070; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_b_gnd/symbols.txt b/config/GZ2E01/rels/d_a_b_gnd/symbols.txt index a90584bc21..2bb590d871 100644 --- a/config/GZ2E01/rels/d_a_b_gnd/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_gnd/symbols.txt @@ -362,7 +362,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_145_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3810 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte @4187 = .bss:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_go/symbols.txt b/config/GZ2E01/rels/d_a_b_go/symbols.txt index e83df13316..dfe1704b06 100644 --- a/config/GZ2E01/rels/d_a_b_go/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_go/symbols.txt @@ -56,6 +56,6 @@ __vt__8cM3dGAab = .data:0x00000068; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000074; // type:object size:0x24 scope:global __vt__12daB_GO_HIO_c = .data:0x00000098; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_146_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_b_gos/symbols.txt b/config/GZ2E01/rels/d_a_b_gos/symbols.txt index 9ee77a54dd..885d96fb44 100644 --- a/config/GZ2E01/rels/d_a_b_gos/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_gos/symbols.txt @@ -61,6 +61,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B0; // type:object size:0x24 scope:global __vt__13daB_GOS_HIO_c = .data:0x000001D4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global boss = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte -lbl_147_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x00000010; // type:object size:0xC scope:local l_HIO = .bss:0x0000001C; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_b_mgn/symbols.txt b/config/GZ2E01/rels/d_a_b_mgn/symbols.txt index af2b078fe4..8c3ec76c1f 100644 --- a/config/GZ2E01/rels/d_a_b_mgn/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_mgn/symbols.txt @@ -255,6 +255,6 @@ __vt__12J3DFrameCtrl = .data:0x00000380; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x0000038C; // type:object size:0xC scope:global __vt__13daB_MGN_HIO_c = .data:0x00000398; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_148_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3944 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_b_ob/symbols.txt b/config/GZ2E01/rels/d_a_b_ob/symbols.txt index 6bc1178c09..e24d0372d2 100644 --- a/config/GZ2E01/rels/d_a_b_ob/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_ob/symbols.txt @@ -342,7 +342,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_149_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +data_8061B4FD = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte moveSW = .bss:0x00000048; // type:object size:0x4 scope:global moveSW2 = .bss:0x0000004C; // type:object size:0x4 scope:global data:4byte @3767 = .bss:0x00000050; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_oh/symbols.txt b/config/GZ2E01/rels/d_a_b_oh/symbols.txt index fac7433e0a..daed63a928 100644 --- a/config/GZ2E01/rels/d_a_b_oh/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_oh/symbols.txt @@ -100,7 +100,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_150_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3645 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte boss = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_b_tn/symbols.txt b/config/GZ2E01/rels/d_a_b_tn/symbols.txt index e3f4cefbf1..c4bae1e7f5 100644 --- a/config/GZ2E01/rels/d_a_b_tn/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_tn/symbols.txt @@ -327,7 +327,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_152_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3936 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x30 scope:global data:byte @3949 = .bss:0x00000084; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_yo/symbols.txt b/config/GZ2E01/rels/d_a_b_yo/symbols.txt index e0ce68d174..532ee0f219 100644 --- a/config/GZ2E01/rels/d_a_b_yo/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_yo/symbols.txt @@ -280,7 +280,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_153_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3783 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x5C scope:global data:byte @3802 = .bss:0x000000B0; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_yo_ice/symbols.txt b/config/GZ2E01/rels/d_a_b_yo_ice/symbols.txt index 2ea2c85961..742844fe30 100644 --- a/config/GZ2E01/rels/d_a_b_yo_ice/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_yo_ice/symbols.txt @@ -130,6 +130,6 @@ __vt__8cM3dGCyl = .data:0x00000214; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000220; // type:object size:0xC scope:global __vt__13daB_YOI_HIO_c = .data:0x0000022C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_154_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3771 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_b_zant/symbols.txt b/config/GZ2E01/rels/d_a_b_zant/symbols.txt index ded68103f0..9c25cd6e55 100644 --- a/config/GZ2E01/rels/d_a_b_zant/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_zant/symbols.txt @@ -345,7 +345,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_155_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4164 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x44 scope:global data:byte @4182 = .bss:0x00000098; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_bd/symbols.txt b/config/GZ2E01/rels/d_a_bd/symbols.txt index 3aaec7bce5..5731497f87 100644 --- a/config/GZ2E01/rels/d_a_bd/symbols.txt +++ b/config/GZ2E01/rels/d_a_bd/symbols.txt @@ -131,7 +131,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3937 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3946 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_bg_obj/symbols.txt b/config/GZ2E01/rels/d_a_bg_obj/symbols.txt index d120d81ea3..53d7c32053 100644 --- a/config/GZ2E01/rels/d_a_bg_obj/symbols.txt +++ b/config/GZ2E01/rels/d_a_bg_obj/symbols.txt @@ -123,4 +123,4 @@ l_bmdName$3644 = .bss:0x00000000; // type:object size:0x10 scope:local l_btkName$3652 = .bss:0x00000010; // type:object size:0x10 scope:local l_brkName$3660 = .bss:0x00000020; // type:object size:0x10 scope:local l_dzbName$3668 = .bss:0x00000030; // type:object size:0x10 scope:local -lbl_4_bss_40 = .bss:0x00000040; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000040; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_crod/symbols.txt b/config/GZ2E01/rels/d_a_crod/symbols.txt index f4f6486578..c41167bdd7 100644 --- a/config/GZ2E01/rels/d_a_crod/symbols.txt +++ b/config/GZ2E01/rels/d_a_crod/symbols.txt @@ -44,4 +44,4 @@ __vt__10cCcD_GStts = .data:0x000000A8; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x000000B4; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000C0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000CC; // type:object size:0xC scope:global -lbl_47_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_cstatue/symbols.txt b/config/GZ2E01/rels/d_a_cstatue/symbols.txt index 227da38300..146823774d 100644 --- a/config/GZ2E01/rels/d_a_cstatue/symbols.txt +++ b/config/GZ2E01/rels/d_a_cstatue/symbols.txt @@ -165,6 +165,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @5356 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte effScale$5355 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_do/symbols.txt b/config/GZ2E01/rels/d_a_do/symbols.txt index 93efa62619..598470af7f 100644 --- a/config/GZ2E01/rels/d_a_do/symbols.txt +++ b/config/GZ2E01/rels/d_a_do/symbols.txt @@ -200,7 +200,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_165_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte target_info = .bss:0x00000074; // type:object size:0x14 scope:global diff --git a/config/GZ2E01/rels/d_a_door_boss/symbols.txt b/config/GZ2E01/rels/d_a_door_boss/symbols.txt index d5963ee2e2..4767613840 100644 --- a/config/GZ2E01/rels/d_a_door_boss/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_boss/symbols.txt @@ -74,4 +74,4 @@ g_profile_BOSS_DOOR = .data:0x00000124; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global -lbl_166_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_door_bossL1/symbols.txt b/config/GZ2E01/rels/d_a_door_bossL1/symbols.txt index 31521ba140..1bc1880ca9 100644 --- a/config/GZ2E01/rels/d_a_door_bossL1/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_bossL1/symbols.txt @@ -111,4 +111,4 @@ g_profile_L1BOSS_DOOR = .data:0x00000240; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000270; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000027C; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000002A0; // type:object size:0xC scope:global -lbl_64_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_door_bossL5/symbols.txt b/config/GZ2E01/rels/d_a_door_bossL5/symbols.txt index 1ad2e69276..47cd28ae83 100644 --- a/config/GZ2E01/rels/d_a_door_bossL5/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_bossL5/symbols.txt @@ -84,4 +84,4 @@ g_profile_L5BOSS_DOOR = .data:0x0000013C; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x0000016C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000178; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x0000019C; // type:object size:0xC scope:global -lbl_167_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_door_dbdoor00/symbols.txt b/config/GZ2E01/rels/d_a_door_dbdoor00/symbols.txt index cc42dafd1d..012a27ccbc 100644 --- a/config/GZ2E01/rels/d_a_door_dbdoor00/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_dbdoor00/symbols.txt @@ -67,4 +67,4 @@ l_action$4091 = .data:0x000000B4; // type:object size:0x48 scope:local l_daDbdoor00_Method = .data:0x000000FC; // type:object size:0x20 scope:global g_profile_DBDOOR = .data:0x0000011C; // type:object size:0x30 scope:global l_bmdName$3699 = .bss:0x00000000; // type:object size:0x20 scope:local -lbl_6_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_door_knob00/symbols.txt b/config/GZ2E01/rels/d_a_door_knob00/symbols.txt index 9c5e8037a0..8e6a14b2dd 100644 --- a/config/GZ2E01/rels/d_a_door_knob00/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_knob00/symbols.txt @@ -96,4 +96,4 @@ l_daKnob20_Method = .data:0x000001C4; // type:object size:0x20 scope:global g_profile_KNOB20 = .data:0x000001E4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000214; // type:object size:0xC scope:global l_bmdName$3809 = .bss:0x00000000; // type:object size:0x20 scope:local -lbl_7_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_door_mbossL1/symbols.txt b/config/GZ2E01/rels/d_a_door_mbossL1/symbols.txt index 9d379b47a1..54c9a0bed8 100644 --- a/config/GZ2E01/rels/d_a_door_mbossL1/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_mbossL1/symbols.txt @@ -168,4 +168,4 @@ __vt__14dBgS_ObjGndChk = .data:0x00000358; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000388; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000394; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000003B8; // type:object size:0xC scope:global -lbl_168_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_door_push/symbols.txt b/config/GZ2E01/rels/d_a_door_push/symbols.txt index 24dec9a08b..affd271169 100644 --- a/config/GZ2E01/rels/d_a_door_push/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_push/symbols.txt @@ -65,5 +65,5 @@ action_table$3910 = .data:0x0000009C; // type:object size:0xC scope:local daDoorPush_METHODS = .data:0x000000A8; // type:object size:0x20 scope:global g_profile_PushDoor = .data:0x000000C8; // type:object size:0x30 scope:global __vt__12daDoorPush_c = .data:0x000000F8; // type:object size:0x28 scope:global -lbl_169_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_169_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_dshutter/symbols.txt b/config/GZ2E01/rels/d_a_dshutter/symbols.txt index 449ab0158c..fae8ea8767 100644 --- a/config/GZ2E01/rels/d_a_dshutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_dshutter/symbols.txt @@ -100,4 +100,4 @@ sInstance__32JASGlobalInstance<11Z2FxLineMgr> = .bss:0x000000F4; // type:object sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .bss:0x000000F8; // type:object size:0x4 scope:global sInstance__32JASGlobalInstance<11Z2SpeechMgr> = .bss:0x000000FC; // type:object size:0x4 scope:global sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .bss:0x00000100; // type:object size:0x4 scope:global -lbl_10_bss_104 = .bss:0x00000104; // type:object size:0x1 data:byte +init$localstatic4$create__7daDsh_cFv = .bss:0x00000104; // type:object size:0x1 scope:weak align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_e_ai/symbols.txt b/config/GZ2E01/rels/d_a_e_ai/symbols.txt index 5e622a2aea..bbb0483d7c 100644 --- a/config/GZ2E01/rels/d_a_e_ai/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ai/symbols.txt @@ -113,6 +113,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000114; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000138; // type:object size:0xC scope:global __vt__12daE_AI_HIO_c = .data:0x00000144; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_170_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_ba/symbols.txt b/config/GZ2E01/rels/d_a_e_ba/symbols.txt index 72e70594e0..1640972ff5 100644 --- a/config/GZ2E01/rels/d_a_e_ba/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ba/symbols.txt @@ -114,7 +114,7 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12daE_BA_HIO_c = .data:0x00000184; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_172_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3963 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte check_index$4162 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_e_bee/symbols.txt b/config/GZ2E01/rels/d_a_e_bee/symbols.txt index 8d9f657de5..6c2bf35204 100644 --- a/config/GZ2E01/rels/d_a_e_bee/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bee/symbols.txt @@ -106,10 +106,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_173_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3765 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte -lbl_173_bss_64 = .bss:0x00000064; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte @4455 = .bss:0x00000068; // type:object size:0xC scope:local init$2267 = .bss:0x00000074; // type:object size:0x1 scope:local align:1 non$4454 = .bss:0x00000078; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_bg/symbols.txt b/config/GZ2E01/rels/d_a_e_bg/symbols.txt index 4a630a49c4..beed6f3d59 100644 --- a/config/GZ2E01/rels/d_a_e_bg/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bg/symbols.txt @@ -105,6 +105,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global __vt__12daE_BG_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_initHIO = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_bi/symbols.txt b/config/GZ2E01/rels/d_a_e_bi/symbols.txt index b1be8ebe25..94901e64f2 100644 --- a/config/GZ2E01/rels/d_a_e_bi/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bi/symbols.txt @@ -140,7 +140,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_175_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte @4522 = .bss:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_bs/symbols.txt b/config/GZ2E01/rels/d_a_e_bs/symbols.txt index 4de1a478c4..2e290ad3a0 100644 --- a/config/GZ2E01/rels/d_a_e_bs/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bs/symbols.txt @@ -116,6 +116,6 @@ __vt__8cM3dGAab = .data:0x00000184; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000190; // type:object size:0x24 scope:global __vt__12daE_BS_HIO_c = .data:0x000001B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_177_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_bu/symbols.txt b/config/GZ2E01/rels/d_a_e_bu/symbols.txt index f4be5872c0..c5b4183809 100644 --- a/config/GZ2E01/rels/d_a_e_bu/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bu/symbols.txt @@ -115,7 +115,7 @@ __vt__8cM3dGAab = .data:0x00000194; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001A0; // type:object size:0x24 scope:global __vt__12daE_BU_HIO_c = .data:0x000001C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_178_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte check_index$4007 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_e_bug/symbols.txt b/config/GZ2E01/rels/d_a_e_bug/symbols.txt index fb1cfb392a..92424d7f92 100644 --- a/config/GZ2E01/rels/d_a_e_bug/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bug/symbols.txt @@ -113,15 +113,15 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_179_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3824 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte -lbl_179_bss_64 = .bss:0x00000064; // type:object size:0x1 data:byte -lbl_179_bss_65 = .bss:0x00000065; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000065; // type:object size:0x1 scope:local align:1 data:byte @3831 = .bss:0x00000068; // type:object size:0xC scope:local at_pos = .bss:0x00000074; // type:object size:0xC scope:global align:4 data:float at_size = .bss:0x00000080; // type:object size:0x4 scope:global -lbl_179_bss_84 = .bss:0x00000084; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000088; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000008C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000090; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_cr/symbols.txt b/config/GZ2E01/rels/d_a_e_cr/symbols.txt index 630070796a..5cb834e7ab 100644 --- a/config/GZ2E01/rels/d_a_e_cr/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_cr/symbols.txt @@ -86,6 +86,6 @@ __vt__8cM3dGAab = .data:0x000000F8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000104; // type:object size:0x24 scope:global __vt__12daE_CR_HIO_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_180_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_db/symbols.txt b/config/GZ2E01/rels/d_a_e_db/symbols.txt index 9d54352ab7..b7557c0bc2 100644 --- a/config/GZ2E01/rels/d_a_e_db/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_db/symbols.txt @@ -164,6 +164,6 @@ __vt__8cM3dGAab = .data:0x000002F0; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:global __vt__12daE_DB_HIO_c = .data:0x00000310; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_182_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_dd/symbols.txt b/config/GZ2E01/rels/d_a_e_dd/symbols.txt index 4ba002e6a1..2c29dc26d1 100644 --- a/config/GZ2E01/rels/d_a_e_dd/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_dd/symbols.txt @@ -134,7 +134,7 @@ __vt__12dBgS_ObjAcch = .data:0x000001B0; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001D4; // type:object size:0xC scope:global __vt__12daE_DD_HIO_c = .data:0x000001E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_184_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x28 scope:global data:byte check_index$4196 = .bss:0x00000040; // type:object size:0xFF scope:local diff --git a/config/GZ2E01/rels/d_a_e_df/symbols.txt b/config/GZ2E01/rels/d_a_e_df/symbols.txt index ad261ba6d1..9dcde89c43 100644 --- a/config/GZ2E01/rels/d_a_e_df/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_df/symbols.txt @@ -97,6 +97,6 @@ __vt__8cM3dGCyl = .data:0x000000A0; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000AC; // type:object size:0xC scope:global __vt__12daE_DF_HIO_c = .data:0x000000B8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_185_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3932 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_dk/symbols.txt b/config/GZ2E01/rels/d_a_e_dk/symbols.txt index add4157182..3552e2161b 100644 --- a/config/GZ2E01/rels/d_a_e_dk/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_dk/symbols.txt @@ -123,6 +123,6 @@ __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001A0; // type:object size:0xC scope:global __vt__12daE_DK_HIO_c = .data:0x000001AC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_186_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3759 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_dn/symbols.txt b/config/GZ2E01/rels/d_a_e_dn/symbols.txt index 4d7df8c258..644a4de6cd 100644 --- a/config/GZ2E01/rels/d_a_e_dn/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_dn/symbols.txt @@ -219,7 +219,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_initHIO = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte target_info = .bss:0x0000007C; // type:object size:0x28 scope:global diff --git a/config/GZ2E01/rels/d_a_e_fb/symbols.txt b/config/GZ2E01/rels/d_a_e_fb/symbols.txt index b74d562148..6ae5f04ebc 100644 --- a/config/GZ2E01/rels/d_a_e_fb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fb/symbols.txt @@ -114,7 +114,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000078; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_fm/symbols.txt b/config/GZ2E01/rels/d_a_e_fm/symbols.txt index c30352b53d..e5876d4d68 100644 --- a/config/GZ2E01/rels/d_a_e_fm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fm/symbols.txt @@ -303,7 +303,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_66_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3772 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xB0 scope:local data:byte @3819 = .bss:0x00000104; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_fs/symbols.txt b/config/GZ2E01/rels/d_a_e_fs/symbols.txt index 9c90c29d5c..80f5183849 100644 --- a/config/GZ2E01/rels/d_a_e_fs/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fs/symbols.txt @@ -129,7 +129,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local s_AtCount__22@unnamed@d_a_e_fs_cpp@ = .bss:0x00000046; // type:object size:0x2 scope:global data:2byte -hioInit = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 data:byte @3933 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x1C scope:global data:byte @4275 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_fz/symbols.txt b/config/GZ2E01/rels/d_a_e_fz/symbols.txt index e0e33dc271..4baaff79ea 100644 --- a/config/GZ2E01/rels/d_a_e_fz/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fz/symbols.txt @@ -111,6 +111,6 @@ __vt__8cM3dGAab = .data:0x0000015C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000168; // type:object size:0x24 scope:global __vt__12daE_FZ_HIO_c = .data:0x0000018C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_191_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3819 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x38 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_ga/symbols.txt b/config/GZ2E01/rels/d_a_e_ga/symbols.txt index c0e1315d30..64c39bb1ca 100644 --- a/config/GZ2E01/rels/d_a_e_ga/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ga/symbols.txt @@ -41,6 +41,6 @@ l_daE_Ga_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_E_GA = .data:0x00000020; // type:object size:0x30 scope:global __vt__12daE_Ga_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_67_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_ge/symbols.txt b/config/GZ2E01/rels/d_a_e_ge/symbols.txt index 65bd483773..44659e7211 100644 --- a/config/GZ2E01/rels/d_a_e_ge/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ge/symbols.txt @@ -153,7 +153,7 @@ __vt__8cM3dGAab = .data:0x000001FC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000208; // type:object size:0x24 scope:global __vt__12daE_GE_HIO_c = .data:0x0000022C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_193_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3920 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x34 scope:global data:byte target_count = .bss:0x0000004C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_gi/symbols.txt b/config/GZ2E01/rels/d_a_e_gi/symbols.txt index 774c5fb68f..387991fb14 100644 --- a/config/GZ2E01/rels/d_a_e_gi/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_gi/symbols.txt @@ -142,7 +142,7 @@ __vt__8cM3dGSph = .data:0x00000160; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000016C; // type:object size:0x24 scope:global __vt__12daE_GI_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_194_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3923 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte m_cry_gi = .bss:0x00000044; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_gm/symbols.txt b/config/GZ2E01/rels/d_a_e_gm/symbols.txt index e70551c81e..c60ff60423 100644 --- a/config/GZ2E01/rels/d_a_e_gm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_gm/symbols.txt @@ -217,7 +217,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_initHIO = .bss:0x00000045; // type:object size:0x1 scope:local +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local @4050 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte @4061 = .bss:0x0000007C; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_gob/symbols.txt b/config/GZ2E01/rels/d_a_e_gob/symbols.txt index 951027439b..18bade7ae4 100644 --- a/config/GZ2E01/rels/d_a_e_gob/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_gob/symbols.txt @@ -207,7 +207,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_196_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3758 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte ms = .bss:0x00000074; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_gs/symbols.txt b/config/GZ2E01/rels/d_a_e_gs/symbols.txt index f373b81623..4bce071f0c 100644 --- a/config/GZ2E01/rels/d_a_e_gs/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_gs/symbols.txt @@ -38,6 +38,6 @@ l_daE_GS_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_E_GS = .data:0x00000020; // type:object size:0x30 scope:global __vt__12daE_GS_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_197_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_hb/symbols.txt b/config/GZ2E01/rels/d_a_e_hb/symbols.txt index 083adb751c..e15f981354 100644 --- a/config/GZ2E01/rels/d_a_e_hb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hb/symbols.txt @@ -145,6 +145,6 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000001FC; // type:object size:0x14 scope:global __vt__12daE_HB_HIO_c = .data:0x00000210; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_68_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_hm/symbols.txt b/config/GZ2E01/rels/d_a_e_hm/symbols.txt index 3a977acca7..ab9bc3414e 100644 --- a/config/GZ2E01/rels/d_a_e_hm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hm/symbols.txt @@ -181,7 +181,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3807 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_e_hp/symbols.txt b/config/GZ2E01/rels/d_a_e_hp/symbols.txt index dd58f774a9..d4918268e6 100644 --- a/config/GZ2E01/rels/d_a_e_hp/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hp/symbols.txt @@ -122,6 +122,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global __vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3921 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_hz/symbols.txt b/config/GZ2E01/rels/d_a_e_hz/symbols.txt index 48f154fc04..61b863e987 100644 --- a/config/GZ2E01/rels/d_a_e_hz/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hz/symbols.txt @@ -170,7 +170,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_201_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3982 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global data:byte m_near_bomb = .bss:0x00000090; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_is/symbols.txt b/config/GZ2E01/rels/d_a_e_is/symbols.txt index d69937c264..de0695fffa 100644 --- a/config/GZ2E01/rels/d_a_e_is/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_is/symbols.txt @@ -101,6 +101,6 @@ __vt__8cM3dGAab = .data:0x00000170; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12daE_IS_HIO_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_203_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_kk/symbols.txt b/config/GZ2E01/rels/d_a_e_kk/symbols.txt index fa400e288e..56245a3771 100644 --- a/config/GZ2E01/rels/d_a_e_kk/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_kk/symbols.txt @@ -127,6 +127,6 @@ __vt__8cM3dGAab = .data:0x00000174; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000180; // type:object size:0x24 scope:global __vt__12daE_KK_HIO_c = .data:0x000001A4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_205_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3808 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_mk/symbols.txt b/config/GZ2E01/rels/d_a_e_mk/symbols.txt index a5765970d9..4e43672c35 100644 --- a/config/GZ2E01/rels/d_a_e_mk/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_mk/symbols.txt @@ -258,12 +258,12 @@ demo_jump_pos_3 = .bss:0x00000084; // type:object size:0xC scope:global @3769 = .bss:0x00000090; // type:object size:0xC scope:local STAGE_CENTER_POS = .bss:0x0000009C; // type:object size:0xC scope:global align:4 data:float STAGE_ANGLE_Y = .bss:0x000000A8; // type:object size:0x2 scope:global data:2byte -lbl_210_bss_AA = .bss:0x000000AA; // type:object size:0x1 data:byte +init$0000 = .bss:0x000000AA; // type:object size:0x1 scope:local align:1 data:byte @3772 = .bss:0x000000AC; // type:object size:0xC scope:local l_HIO = .bss:0x000000B8; // type:object size:0x24 scope:global data:byte target_info = .bss:0x000000DC; // type:object size:0x50 scope:global data:4byte target_info_count = .bss:0x0000012C; // type:object size:0x4 scope:global data:4byte -lbl_210_bss_130 = .bss:0x00000130; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000130; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000134; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000138; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000013C; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_mm/symbols.txt b/config/GZ2E01/rels/d_a_e_mm/symbols.txt index c3d5233c6e..27ebf1265a 100644 --- a/config/GZ2E01/rels/d_a_e_mm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_mm/symbols.txt @@ -100,6 +100,6 @@ __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12daE_MM_HIO_c = .data:0x000001A8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_212_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x34 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_ms/symbols.txt b/config/GZ2E01/rels/d_a_e_ms/symbols.txt index c5c5116b88..0416a451d6 100644 --- a/config/GZ2E01/rels/d_a_e_ms/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ms/symbols.txt @@ -142,7 +142,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_214_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3816 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte target_info = .bss:0x00000070; // type:object size:0x50 scope:global diff --git a/config/GZ2E01/rels/d_a_e_nest/symbols.txt b/config/GZ2E01/rels/d_a_e_nest/symbols.txt index e974e7b788..fff71ebdf3 100644 --- a/config/GZ2E01/rels/d_a_e_nest/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_nest/symbols.txt @@ -118,6 +118,6 @@ __vt__8cM3dGAab = .data:0x00000110; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000011C; // type:object size:0x24 scope:global __vt__14daE_Nest_HIO_c = .data:0x00000140; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_69_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3994 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_nz/symbols.txt b/config/GZ2E01/rels/d_a_e_nz/symbols.txt index 59e3bf5bee..6c50f55d1d 100644 --- a/config/GZ2E01/rels/d_a_e_nz/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_nz/symbols.txt @@ -116,7 +116,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_215_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte lbl_215_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte diff --git a/config/GZ2E01/rels/d_a_e_oc/symbols.txt b/config/GZ2E01/rels/d_a_e_oc/symbols.txt index 3802a573c1..8af22da6c9 100644 --- a/config/GZ2E01/rels/d_a_e_oc/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_oc/symbols.txt @@ -236,7 +236,7 @@ m_battle_oc__6E_OC_n = .bss:0x00000048; // type:object size:0x4 scope:global m_damage_oc__6E_OC_n = .bss:0x0000004C; // type:object size:0x4 scope:global m_death_oc__6E_OC_n = .bss:0x00000050; // type:object size:0x4 scope:global m_talk_oc__6E_OC_n = .bss:0x00000054; // type:object size:0x4 scope:global -lbl_216_bss_58 = .bss:0x00000058; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000058; // type:object size:0x1 scope:local align:1 data:byte @3927 = .bss:0x0000005C; // type:object size:0xC scope:local l_HIO = .bss:0x00000068; // type:object size:0x28 scope:global align:4 data:float @6203 = .bss:0x00000090; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_oct_bg/symbols.txt b/config/GZ2E01/rels/d_a_e_oct_bg/symbols.txt index a9517f74ab..009177bc9c 100644 --- a/config/GZ2E01/rels/d_a_e_oct_bg/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_oct_bg/symbols.txt @@ -165,11 +165,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_217_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte -lbl_217_bss_79 = .bss:0x00000079; // type:object size:0x1 data:byte -lbl_217_bss_7A = .bss:0x0000007A; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000079; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x0000007A; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_ot/symbols.txt b/config/GZ2E01/rels/d_a_e_ot/symbols.txt index f8dedb46b3..a8b7e3c902 100644 --- a/config/GZ2E01/rels/d_a_e_ot/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ot/symbols.txt @@ -138,11 +138,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_218_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3926 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte -lbl_218_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte -lbl_218_bss_75 = .bss:0x00000075; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000074; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000075; // type:object size:0x1 scope:local align:1 data:byte @4086 = .bss:0x00000078; // type:object size:0xC scope:local sc$4085 = .bss:0x00000088; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000094; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_ph/symbols.txt b/config/GZ2E01/rels/d_a_e_ph/symbols.txt index 8a06998f23..b76eb82272 100644 --- a/config/GZ2E01/rels/d_a_e_ph/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ph/symbols.txt @@ -120,6 +120,6 @@ __vt__8cM3dGAab = .data:0x0000005C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000068; // type:object size:0x24 scope:global __vt__12daE_PH_HIO_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_219_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3762 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_pm/symbols.txt b/config/GZ2E01/rels/d_a_e_pm/symbols.txt index b5be478507..8e32b5fd71 100644 --- a/config/GZ2E01/rels/d_a_e_pm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_pm/symbols.txt @@ -246,7 +246,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_220_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3928 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4C scope:global data:byte s_dis__22@unnamed@d_a_e_pm_cpp@ = .bss:0x000000A0; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_e_po/symbols.txt b/config/GZ2E01/rels/d_a_e_po/symbols.txt index b57e7b837e..868aa46850 100644 --- a/config/GZ2E01/rels/d_a_e_po/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_po/symbols.txt @@ -363,7 +363,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3933 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global align:4 data:float mRollCount = .bss:0x00000090; // type:object size:0x2 scope:global diff --git a/config/GZ2E01/rels/d_a_e_pz/symbols.txt b/config/GZ2E01/rels/d_a_e_pz/symbols.txt index 348fb4755a..b82313eecb 100644 --- a/config/GZ2E01/rels/d_a_e_pz/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_pz/symbols.txt @@ -268,7 +268,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_initHIO = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3922 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global align:4 data:float lbl_222_bss_70 = .bss:0x00000070; // type:object size:0x1 data:byte diff --git a/config/GZ2E01/rels/d_a_e_rb/symbols.txt b/config/GZ2E01/rels/d_a_e_rb/symbols.txt index 809da468ef..6336b03581 100644 --- a/config/GZ2E01/rels/d_a_e_rb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rb/symbols.txt @@ -107,7 +107,7 @@ __vt__8cM3dGPla = .data:0x00000154; // type:object size:0xC scope:global __vt__14dBgS_ObjGndChk = .data:0x00000160; // type:object size:0x30 scope:global __vt__12daE_RB_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_223_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte child = .bss:0x00000028; // type:object size:0x28 scope:global diff --git a/config/GZ2E01/rels/d_a_e_rd/symbols.txt b/config/GZ2E01/rels/d_a_e_rd/symbols.txt index 32e71e0f29..cae9547108 100644 --- a/config/GZ2E01/rels/d_a_e_rd/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rd/symbols.txt @@ -438,11 +438,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local boss = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -lbl_70_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @4224 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x50 scope:global data:byte S_find = .bss:0x000000AC; // type:object size:0x2 scope:global data:2byte -lbl_70_bss_AE = .bss:0x000000AE; // type:object size:0x1 data:byte +data_80519338 = .bss:0x000000AE; // type:object size:0x1 scope:local align:1 data:byte @4242 = .bss:0x000000B0; // type:object size:0xC scope:local S_find_pos = .bss:0x000000BC; // type:object size:0xC scope:global align:4 data:float data_80519200 = .bss:0x000000C8; // type:object size:0x1 data:byte @@ -452,7 +452,7 @@ target_info_count = .bss:0x000000F4; // type:object size:0x4 scope:global data:4 data_80519230 = .bss:0x000000F8; // type:object size:0x1 scope:local data:byte check_index$5284 = .bss:0x000000FC; // type:object size:0xFF scope:local rd_count = .bss:0x000001FC; // type:object size:0x4 scope:global data:4byte -lbl_70_bss_200 = .bss:0x00000200; // type:object size:0x1 data:byte +lbl_70_bss_AE = .bss:0x00000200; // type:object size:0x1 scope:local align:1 data:byte c_start = .bss:0x00000204; // type:object size:0x4 scope:global @11269 = .bss:0x00000208; // type:object size:0xC scope:local init$8899 = .bss:0x00000214; // type:object size:0x1 scope:local diff --git a/config/GZ2E01/rels/d_a_e_rdb/symbols.txt b/config/GZ2E01/rels/d_a_e_rdb/symbols.txt index 99ad39c268..0ef48322af 100644 --- a/config/GZ2E01/rels/d_a_e_rdb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rdb/symbols.txt @@ -243,7 +243,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_224_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4023 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @5932 = .bss:0x00000060; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_rdy/symbols.txt b/config/GZ2E01/rels/d_a_e_rdy/symbols.txt index 6e27fb4609..611015941e 100644 --- a/config/GZ2E01/rels/d_a_e_rdy/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rdy/symbols.txt @@ -318,7 +318,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local boss = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -lbl_225_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @4034 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x50 scope:global data:byte S_find = .bss:0x000000AC; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2E01/rels/d_a_e_s1/symbols.txt b/config/GZ2E01/rels/d_a_e_s1/symbols.txt index a7740798ab..decbf834d9 100644 --- a/config/GZ2E01/rels/d_a_e_s1/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_s1/symbols.txt @@ -212,8 +212,8 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_226_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte -lbl_226_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x2C scope:global data:byte check_index$4023 = .bss:0x00000080; // type:object size:0xFF scope:local diff --git a/config/GZ2E01/rels/d_a_e_sb/symbols.txt b/config/GZ2E01/rels/d_a_e_sb/symbols.txt index 94ea694cdb..dd060af475 100644 --- a/config/GZ2E01/rels/d_a_e_sb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sb/symbols.txt @@ -136,7 +136,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3653 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x40 scope:local data:byte s_Bomb__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000094; // type:object size:0x4 scope:local data:4byte diff --git a/config/GZ2E01/rels/d_a_e_sf/symbols.txt b/config/GZ2E01/rels/d_a_e_sf/symbols.txt index 0618f0bb0d..9120708750 100644 --- a/config/GZ2E01/rels/d_a_e_sf/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sf/symbols.txt @@ -171,7 +171,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_initHIO = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3924 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte target_info = .bss:0x0000007C; // type:object size:0x28 scope:global diff --git a/config/GZ2E01/rels/d_a_e_sg/symbols.txt b/config/GZ2E01/rels/d_a_e_sg/symbols.txt index 5a848f01cf..f5ce865d87 100644 --- a/config/GZ2E01/rels/d_a_e_sg/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sg/symbols.txt @@ -127,7 +127,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_229_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3762 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte stick_pt = .bss:0x0000006C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_sh/symbols.txt b/config/GZ2E01/rels/d_a_e_sh/symbols.txt index 55d03fff5b..0fd6daf0fb 100644 --- a/config/GZ2E01/rels/d_a_e_sh/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sh/symbols.txt @@ -144,6 +144,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_sm/symbols.txt b/config/GZ2E01/rels/d_a_e_sm/symbols.txt index 20b8781062..cb9445af26 100644 --- a/config/GZ2E01/rels/d_a_e_sm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sm/symbols.txt @@ -206,7 +206,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_231_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3936 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:global data:byte s_Dis__22@unnamed@d_a_e_sm_cpp@ = .bss:0x00000068; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_e_st/symbols.txt b/config/GZ2E01/rels/d_a_e_st/symbols.txt index 47268b0223..2a7922e962 100644 --- a/config/GZ2E01/rels/d_a_e_st/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_st/symbols.txt @@ -235,7 +235,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local small = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -l_initHIO = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 data:byte @3919 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x24 scope:global data:byte @6303 = .bss:0x00000080; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_sw/symbols.txt b/config/GZ2E01/rels/d_a_e_sw/symbols.txt index 160dab8e8a..0d1b97909a 100644 --- a/config/GZ2E01/rels/d_a_e_sw/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sw/symbols.txt @@ -233,10 +233,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local target_info__22@unnamed@d_a_e_sw_cpp@ = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte target_dist__22@unnamed@d_a_e_sw_cpp@ = .bss:0x0000004C; // type:object size:0x4 scope:global align:4 data:float -lbl_235_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte -lbl_235_bss_51 = .bss:0x00000051; // type:object size:0x1 data:byte -lbl_235_bss_52 = .bss:0x00000052; // type:object size:0x1 data:byte -lbl_235_bss_53 = .bss:0x00000053; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000051; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000052; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000053; // type:object size:0x1 scope:local align:1 data:byte @3925 = .bss:0x00000054; // type:object size:0xC scope:local l_HIO = .bss:0x00000060; // type:object size:0x24 scope:global align:4 data:float sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_th/symbols.txt b/config/GZ2E01/rels/d_a_e_th/symbols.txt index 639cd081c0..c54eaa912d 100644 --- a/config/GZ2E01/rels/d_a_e_th/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_th/symbols.txt @@ -177,6 +177,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000001D4; // type:object size:0x14 scope:gl __vt__12dBgS_ObjAcch = .data:0x000001E8; // type:object size:0x24 scope:global __vt__12daE_TH_HIO_c = .data:0x0000020C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_236_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3922 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_tk/symbols.txt b/config/GZ2E01/rels/d_a_e_tk/symbols.txt index 81e295557a..269234ce6c 100644 --- a/config/GZ2E01/rels/d_a_e_tk/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_tk/symbols.txt @@ -78,6 +78,6 @@ __vt__8cM3dGAab = .data:0x000000FC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000108; // type:object size:0x24 scope:global __vt__12daE_TK_HIO_c = .data:0x0000012C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_238_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_tk2/symbols.txt b/config/GZ2E01/rels/d_a_e_tk2/symbols.txt index f26389f8b1..6d79ece770 100644 --- a/config/GZ2E01/rels/d_a_e_tk2/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_tk2/symbols.txt @@ -71,6 +71,6 @@ __vt__8cM3dGAab = .data:0x000000D0; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000DC; // type:object size:0x24 scope:global __vt__13daE_TK2_HIO_c = .data:0x00000100; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_239_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_tt/symbols.txt b/config/GZ2E01/rels/d_a_e_tt/symbols.txt index 493a709191..8dfffeea7b 100644 --- a/config/GZ2E01/rels/d_a_e_tt/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_tt/symbols.txt @@ -162,7 +162,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_241_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3924 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte m_attack_tt = .bss:0x0000006C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_vt/symbols.txt b/config/GZ2E01/rels/d_a_e_vt/symbols.txt index be6f76686c..b743286d69 100644 --- a/config/GZ2E01/rels/d_a_e_vt/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_vt/symbols.txt @@ -306,7 +306,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_242_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3923 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x40 scope:global data:byte @5409 = .bss:0x00000094; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_wb/symbols.txt b/config/GZ2E01/rels/d_a_e_wb/symbols.txt index 8c9c8c94fa..0a2fa43ab7 100644 --- a/config/GZ2E01/rels/d_a_e_wb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_wb/symbols.txt @@ -542,7 +542,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa lbl_244_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte lbl_244_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte lbl_244_bss_47 = .bss:0x00000047; // type:object size:0x1 data:byte -l_HIOInit = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 data:byte @4435 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x5C scope:global data:byte @4746 = .bss:0x000000B4; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_ws/symbols.txt b/config/GZ2E01/rels/d_a_e_ws/symbols.txt index 07ff0e9fd5..2646d45ed2 100644 --- a/config/GZ2E01/rels/d_a_e_ws/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ws/symbols.txt @@ -131,6 +131,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000184; // type:object size:0xC scope:global __vt__12daE_WS_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_245_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3818 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x28 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_ww/symbols.txt b/config/GZ2E01/rels/d_a_e_ww/symbols.txt index 477017fbc8..dcbed608d1 100644 --- a/config/GZ2E01/rels/d_a_e_ww/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ww/symbols.txt @@ -191,10 +191,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_246_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3921 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte -lbl_246_bss_7C = .bss:0x0000007C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte @4585 = .bss:0x00000080; // type:object size:0xC scope:local @4586 = .bss:0x0000008C; // type:object size:0xC scope:local @4587 = .bss:0x00000098; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_yc/symbols.txt b/config/GZ2E01/rels/d_a_e_yc/symbols.txt index a13545877b..85e66be261 100644 --- a/config/GZ2E01/rels/d_a_e_yc/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yc/symbols.txt @@ -100,6 +100,6 @@ __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12daE_YC_HIO_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global S_area_dis = .bss:0x00000008; // type:object size:0x4 scope:global align:4 data:float -lbl_247_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte @3710 = .bss:0x00000010; // type:object size:0xC scope:local l_HIO = .bss:0x0000001C; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_yd/symbols.txt b/config/GZ2E01/rels/d_a_e_yd/symbols.txt index 2bdf52c219..263caefc96 100644 --- a/config/GZ2E01/rels/d_a_e_yd/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yd/symbols.txt @@ -149,6 +149,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000001FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000210; // type:object size:0xC scope:global __vt__12daE_YD_HIO_c = .data:0x0000021C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_248_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_yg/symbols.txt b/config/GZ2E01/rels/d_a_e_yg/symbols.txt index 87f0bd2fb2..573ee44528 100644 --- a/config/GZ2E01/rels/d_a_e_yg/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yg/symbols.txt @@ -165,7 +165,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_initHIO = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3817 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte @3917 = .bss:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_yh/symbols.txt b/config/GZ2E01/rels/d_a_e_yh/symbols.txt index 32982191ca..d2316c664e 100644 --- a/config/GZ2E01/rels/d_a_e_yh/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yh/symbols.txt @@ -167,6 +167,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global __vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_ymb/symbols.txt b/config/GZ2E01/rels/d_a_e_ymb/symbols.txt index 6c9c87d969..ddf36384b6 100644 --- a/config/GZ2E01/rels/d_a_e_ymb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ymb/symbols.txt @@ -288,7 +288,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_255_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3786 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3797 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_zm/symbols.txt b/config/GZ2E01/rels/d_a_e_zm/symbols.txt index fd0b419f7e..d1f84ec0e8 100644 --- a/config/GZ2E01/rels/d_a_e_zm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_zm/symbols.txt @@ -114,6 +114,6 @@ __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12daE_ZM_HIO_c = .data:0x000001A8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_258_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_econt/symbols.txt b/config/GZ2E01/rels/d_a_econt/symbols.txt index 8ecf694dad..da4095ce69 100644 --- a/config/GZ2E01/rels/d_a_econt/symbols.txt +++ b/config/GZ2E01/rels/d_a_econt/symbols.txt @@ -17,4 +17,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3873 = .rodata:0x0000000C; // type:object size:0x4 scope:local l_daEcont_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_ECONT = .data:0x00000020; // type:object size:0x30 scope:global -lbl_71_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_fr/symbols.txt b/config/GZ2E01/rels/d_a_fr/symbols.txt index 0ef3af06f5..001e901d7e 100644 --- a/config/GZ2E01/rels/d_a_fr/symbols.txt +++ b/config/GZ2E01/rels/d_a_fr/symbols.txt @@ -91,6 +91,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000134; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000158; // type:object size:0xC scope:global __vt__10daFr_HIO_c = .data:0x00000164; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_initHIO = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_kago/symbols.txt b/config/GZ2E01/rels/d_a_kago/symbols.txt index 1d6519d20d..97454c22bf 100644 --- a/config/GZ2E01/rels/d_a_kago/symbols.txt +++ b/config/GZ2E01/rels/d_a_kago/symbols.txt @@ -246,6 +246,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001D8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001FC; // type:object size:0xC scope:global __vt__12daKago_HIO_c = .data:0x00000208; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3924 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x5C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_kytag03/symbols.txt b/config/GZ2E01/rels/d_a_kytag03/symbols.txt index 9d5a0f354c..ebdf5d367c 100644 --- a/config/GZ2E01/rels/d_a_kytag03/symbols.txt +++ b/config/GZ2E01/rels/d_a_kytag03/symbols.txt @@ -60,4 +60,4 @@ l_daKytag03_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_KYTAG03 = .data:0x00000020; // type:object size:0x30 scope:global __vt__8cM3dGLin = .data:0x00000050; // type:object size:0xC scope:global S_ang_y_work$4270 = .bss:0x00000000; // type:object size:0x2 scope:local -lbl_268_bss_2 = .bss:0x00000002; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000002; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_mg_fish/symbols.txt b/config/GZ2E01/rels/d_a_mg_fish/symbols.txt index c562813a39..497e465a62 100644 --- a/config/GZ2E01/rels/d_a_mg_fish/symbols.txt +++ b/config/GZ2E01/rels/d_a_mg_fish/symbols.txt @@ -304,7 +304,8 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1007 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_78_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte +lit_1008 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +lit_1007 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3674 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte s_fish_ct = .bss:0x00000070; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_mg_fshop/symbols.txt b/config/GZ2E01/rels/d_a_mg_fshop/symbols.txt index 4367f16c97..221dabcba8 100644 --- a/config/GZ2E01/rels/d_a_mg_fshop/symbols.txt +++ b/config/GZ2E01/rels/d_a_mg_fshop/symbols.txt @@ -226,7 +226,7 @@ ArcIX_A_crcurve_a_model = .bss:0x00000100; // type:object size:0x40 scope:global ArcIX_A_crcurve_b_model = .bss:0x00000140; // type:object size:0x10 scope:global ArcIX_A_crsaka_model = .bss:0x00000150; // type:object size:0x20 scope:global old_stick_x$4410 = .bss:0x00000170; // type:object size:0x4 scope:local align:4 data:float -lbl_278_bss_174 = .bss:0x00000174; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000174; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000178; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000017C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000180; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_mg_rod/symbols.txt b/config/GZ2E01/rels/d_a_mg_rod/symbols.txt index 98c7715408..c2ade85265 100644 --- a/config/GZ2E01/rels/d_a_mg_rod/symbols.txt +++ b/config/GZ2E01/rels/d_a_mg_rod/symbols.txt @@ -363,7 +363,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local henna = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte data_804BBBD4 = .bss:0x0000004C; // type:object size:0x1 data:byte -l_HIOInit = .bss:0x0000004D; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004D; // type:object size:0x1 data:byte @4280 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x28 scope:global data:byte @4921 = .bss:0x00000084; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_npc_du/symbols.txt b/config/GZ2E01/rels/d_a_npc_du/symbols.txt index fc428c5a35..4a1a3d66ea 100644 --- a/config/GZ2E01/rels/d_a_npc_du/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_du/symbols.txt @@ -78,6 +78,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000B8; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000000DC; // type:object size:0xC scope:global __vt__14daNpc_Du_HIO_c = .data:0x000000E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_301_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_npc_henna/symbols.txt b/config/GZ2E01/rels/d_a_npc_henna/symbols.txt index 9b102c559c..ba8b7a3937 100644 --- a/config/GZ2E01/rels/d_a_npc_henna/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_henna/symbols.txt @@ -304,12 +304,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3900 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte -lbl_82_bss_90 = .bss:0x00000090; // type:object size:0x1 data:byte -lbl_82_bss_91 = .bss:0x00000091; // type:object size:0x1 data:byte +lbl_82_bss_90 = .bss:0x00000090; // type:object size:0x1 scope:local align:1 data:byte +lbl_82_bss_91 = .bss:0x00000091; // type:object size:0x1 scope:local align:1 @5112 = .bss:0x00000094; // type:object size:0xC scope:local @5113 = .bss:0x000000A0; // type:object size:0xC scope:local @5114 = .bss:0x000000AC; // type:object size:0xC scope:local @@ -332,12 +332,12 @@ lbl_82_bss_91 = .bss:0x00000091; // type:object size:0x1 data:byte @5131 = .bss:0x00000178; // type:object size:0xC scope:local zoom_check_pos = .bss:0x00000184; // type:object size:0xF0 scope:global koro2_reset = .bss:0x00000274; // type:object size:0x4 scope:global -@5134 = .bss:0x00000278; // type:object size:0x4 scope:local +unk_bss_5134$3105 = .bss:0x00000278; // type:object size:0x1 scope:local old_stick_x$5644 = .bss:0x0000027C; // type:object size:0x4 scope:local -@5136 = .bss:0x00000280; // type:object size:0x4 scope:local +unk_bss_5136$3107 = .bss:0x00000280; // type:object size:0x1 scope:local old_stick_sx$5647 = .bss:0x00000284; // type:object size:0x4 scope:local -lbl_82_bss_288 = .bss:0x00000288; // type:object size:0x1 scope:local -lbl_82_bss_289 = .bss:0x00000289; // type:object size:0x1 data:byte +unk_bss_5138$3109 = .bss:0x00000288; // type:object size:0x1 scope:local +lbl_82_bss_289 = .bss:0x00000289; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000028C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000290; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000294; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_kasi_kyu/symbols.txt b/config/GZ2E01/rels/d_a_npc_kasi_kyu/symbols.txt index 44bc9867d1..96c6bf0246 100644 --- a/config/GZ2E01/rels/d_a_npc_kasi_kyu/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_kasi_kyu/symbols.txt @@ -234,7 +234,7 @@ l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte mTargetTag__14daNpcKasiKyu_c = .bss:0x00000058; // type:object size:0x4 scope:global data:4byte mTargetTagDist__14daNpcKasiKyu_c = .bss:0x0000005C; // type:object size:0x4 scope:global mWolfAngle__14daNpcKasiKyu_c = .bss:0x00000060; // type:object size:0x2 scope:global data:2byte -lbl_324_bss_62 = .bss:0x00000062; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000062; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000006C; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_kasi_mich/symbols.txt b/config/GZ2E01/rels/d_a_npc_kasi_mich/symbols.txt index cff2c60630..f88b449d53 100644 --- a/config/GZ2E01/rels/d_a_npc_kasi_mich/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_kasi_mich/symbols.txt @@ -232,7 +232,7 @@ l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte mTargetTag__15daNpcKasiMich_c = .bss:0x00000058; // type:object size:0x4 scope:global data:4byte mTargetTagDist__15daNpcKasiMich_c = .bss:0x0000005C; // type:object size:0x4 scope:global mWolfAngle__15daNpcKasiMich_c = .bss:0x00000060; // type:object size:0x2 scope:global data:2byte -lbl_325_bss_62 = .bss:0x00000062; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000062; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000006C; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_ks/symbols.txt b/config/GZ2E01/rels/d_a_npc_ks/symbols.txt index 2d3703eaca..d4fded6381 100644 --- a/config/GZ2E01/rels/d_a_npc_ks/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_ks/symbols.txt @@ -522,7 +522,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa obj_pos = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float leader = .bss:0x00000060; // type:object size:0x4 scope:global data:4byte call_pt = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte -l_HIOInit = .bss:0x00000068; // type:object size:0x1 data:byte +hio_set = .bss:0x00000068; // type:object size:0x1 data:byte @4025 = .bss:0x0000006C; // type:object size:0xC scope:local l_HIO = .bss:0x00000078; // type:object size:0x38 scope:global data:byte target_info = .bss:0x000000B0; // type:object size:0x28 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_sq/symbols.txt b/config/GZ2E01/rels/d_a_npc_sq/symbols.txt index 57e6ba0cf5..79147cea87 100644 --- a/config/GZ2E01/rels/d_a_npc_sq/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_sq/symbols.txt @@ -72,6 +72,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000D0; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000000F4; // type:object size:0xC scope:global __vt__14daNpc_Sq_HIO_c = .data:0x00000100; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_367_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_npc_tk/symbols.txt b/config/GZ2E01/rels/d_a_npc_tk/symbols.txt index 0acce3f714..c154b22a84 100644 --- a/config/GZ2E01/rels/d_a_npc_tk/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_tk/symbols.txt @@ -226,7 +226,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local m_near_angle = .bss:0x00000046; // type:object size:0x2 scope:global m_near_actor = .bss:0x00000048; // type:object size:0x4 scope:global -lbl_370_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @3994 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x40 scope:global data:byte @5011 = .bss:0x0000009C; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_npc_tkj2/symbols.txt b/config/GZ2E01/rels/d_a_npc_tkj2/symbols.txt index 91e862d1ad..7b52fac1e6 100644 --- a/config/GZ2E01/rels/d_a_npc_tkj2/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_tkj2/symbols.txt @@ -105,6 +105,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000F4; // type:object size:0x30 scope:global __vt__8cM3dGPla = .data:0x00000124; // type:object size:0xC scope:global __vt__16daNpc_Tkj2_HIO_c = .data:0x00000130; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_372_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_npc_tr/symbols.txt b/config/GZ2E01/rels/d_a_npc_tr/symbols.txt index 483c52bcba..e10a860fed 100644 --- a/config/GZ2E01/rels/d_a_npc_tr/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_tr/symbols.txt @@ -52,6 +52,6 @@ l_daNPC_TR_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_NPC_TR = .data:0x00000020; // type:object size:0x30 scope:global __vt__14daNPC_TR_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_375_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_amiShutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_amiShutter/symbols.txt index b69c98a830..89047d3bfb 100644 --- a/config/GZ2E01/rels/d_a_obj_amiShutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_amiShutter/symbols.txt @@ -77,4 +77,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000016C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3649 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global align:4 data:float -lbl_397_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_ari/symbols.txt b/config/GZ2E01/rels/d_a_obj_ari/symbols.txt index 3cbe730333..7c9c6041c6 100644 --- a/config/GZ2E01/rels/d_a_obj_ari/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ari/symbols.txt @@ -98,6 +98,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_AriHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_398_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3771 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_avalanche/symbols.txt b/config/GZ2E01/rels/d_a_obj_avalanche/symbols.txt index a2db73112d..7784d9cbb0 100644 --- a/config/GZ2E01/rels/d_a_obj_avalanche/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_avalanche/symbols.txt @@ -55,4 +55,4 @@ daObjAvalanche_METHODS = .data:0x000000AC; // type:object size:0x20 scope:global g_profile_Obj_Avalanche = .data:0x000000CC; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000FC; // type:object size:0xC scope:global __vt__16daObjAvalanche_c = .data:0x00000108; // type:object size:0x28 scope:global -lbl_400_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_balloon/symbols.txt b/config/GZ2E01/rels/d_a_obj_balloon/symbols.txt index 8873ce7ad6..14fa45f7fb 100644 --- a/config/GZ2E01/rels/d_a_obj_balloon/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_balloon/symbols.txt @@ -92,7 +92,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa m_combo_count__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x00000048; // type:object size:0x4 scope:global m_combo_next_score__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x0000004C; // type:object size:0x4 scope:global m_balloon_score__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x00000050; // type:object size:0x4 scope:global data:4byte -lbl_401_bss_54 = .bss:0x00000054; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3651 = .bss:0x00000058; // type:object size:0xC scope:local l_HIO = .bss:0x00000064; // type:object size:0x20 scope:global data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_barDesk/symbols.txt b/config/GZ2E01/rels/d_a_obj_barDesk/symbols.txt index 4dacf3f13c..37580febc9 100644 --- a/config/GZ2E01/rels/d_a_obj_barDesk/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_barDesk/symbols.txt @@ -58,4 +58,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000148; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:byte -lbl_402_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_batta/symbols.txt b/config/GZ2E01/rels/d_a_obj_batta/symbols.txt index 3ebe277f25..e550aefccb 100644 --- a/config/GZ2E01/rels/d_a_obj_batta/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_batta/symbols.txt @@ -130,6 +130,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_bmWindow/symbols.txt b/config/GZ2E01/rels/d_a_obj_bmWindow/symbols.txt index babcf5d3d7..60849e2f03 100644 --- a/config/GZ2E01/rels/d_a_obj_bmWindow/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bmWindow/symbols.txt @@ -83,4 +83,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000016C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x3C scope:global data:byte -lbl_410_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_bmshutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_bmshutter/symbols.txt index 3d0551e015..b3a1635f59 100644 --- a/config/GZ2E01/rels/d_a_obj_bmshutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bmshutter/symbols.txt @@ -58,5 +58,5 @@ l_func$3894 = .data:0x000000A8; // type:object size:0x24 scope:local l_daObjBmSh_Method = .data:0x000000CC; // type:object size:0x20 scope:global g_profile_Obj_BoomShutter = .data:0x000000EC; // type:object size:0x30 scope:global __vt__11daObjBmSh_c = .data:0x0000011C; // type:object size:0x28 scope:global -lbl_411_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_411_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_bsGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_bsGate/symbols.txt index 318b0e3a13..7a5451f026 100644 --- a/config/GZ2E01/rels/d_a_obj_bsGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bsGate/symbols.txt @@ -54,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_415_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_carry/symbols.txt b/config/GZ2E01/rels/d_a_obj_carry/symbols.txt index 3827a99a2d..59b63fb4c9 100644 --- a/config/GZ2E01/rels/d_a_obj_carry/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_carry/symbols.txt @@ -391,10 +391,10 @@ __vt__8cM3dGAab = .data:0x00000B4C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000B58; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000B7C; // type:object size:0xC scope:global l_sw_id = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_18_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte -lbl_18_bss_5 = .bss:0x00000005; // type:object size:0x1 data:byte -lbl_18_bss_6 = .bss:0x00000006; // type:object size:0x1 data:byte -lbl_18_bss_7 = .bss:0x00000007; // type:object size:0x1 data:byte -lbl_18_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte -lbl_18_bss_9 = .bss:0x00000009; // type:object size:0x1 data:byte -lbl_18_bss_A = .bss:0x0000000A; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000005; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000006; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000007; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000009; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x0000000A; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_cb/symbols.txt b/config/GZ2E01/rels/d_a_obj_cb/symbols.txt index 47e595e280..0fa8a0f378 100644 --- a/config/GZ2E01/rels/d_a_obj_cb/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_cb/symbols.txt @@ -53,6 +53,6 @@ __vt__8cM3dGAab = .data:0x0000005C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000068; // type:object size:0x24 scope:global __vt__14daObj_Cb_HIO_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_418_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_cdoor/symbols.txt b/config/GZ2E01/rels/d_a_obj_cdoor/symbols.txt index 21b98f8432..d9ddea02f2 100644 --- a/config/GZ2E01/rels/d_a_obj_cdoor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_cdoor/symbols.txt @@ -56,5 +56,5 @@ l_daObjCdoor_Method = .data:0x000000D8; // type:object size:0x20 scope:global g_profile_Obj_Cdoor = .data:0x000000F8; // type:object size:0x30 scope:global __vt__12daObjCdoor_c = .data:0x00000128; // type:object size:0x2C scope:global __vt__12J3DFrameCtrl = .data:0x00000154; // type:object size:0xC scope:global -lbl_420_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_420_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_chest/symbols.txt b/config/GZ2E01/rels/d_a_obj_chest/symbols.txt index 85e51c7fa1..b457b70b62 100644 --- a/config/GZ2E01/rels/d_a_obj_chest/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_chest/symbols.txt @@ -75,4 +75,4 @@ __vt__8cM3dGAab = .data:0x000000E0; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__12daObjChest_c = .data:0x0000011C; // type:object size:0x28 scope:global -lbl_422_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_cho/symbols.txt b/config/GZ2E01/rels/d_a_obj_cho/symbols.txt index 2390e68b5e..358f24b81d 100644 --- a/config/GZ2E01/rels/d_a_obj_cho/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_cho/symbols.txt @@ -96,6 +96,6 @@ __vt__10daObjCHO_c = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_ChoHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_423_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_cwall/symbols.txt b/config/GZ2E01/rels/d_a_obj_cwall/symbols.txt index ec6033321b..df0b6979e8 100644 --- a/config/GZ2E01/rels/d_a_obj_cwall/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_cwall/symbols.txt @@ -141,7 +141,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_chainOffset = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3760 = .bss:0x00000060; // type:object size:0xC scope:local l_smokeSetOffset = .bss:0x0000006C; // type:object size:0xC scope:global -lbl_433_bss_78 = .bss:0x00000078; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000078; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_dan/symbols.txt b/config/GZ2E01/rels/d_a_obj_dan/symbols.txt index cc85422ce2..cda5b9f43b 100644 --- a/config/GZ2E01/rels/d_a_obj_dan/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_dan/symbols.txt @@ -86,6 +86,6 @@ __vt__10daObjDAN_c = .data:0x000000BC; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000C8; // type:object size:0xC scope:global __vt__14daObj_DanHIO_c = .data:0x000000D4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_435_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_digsnow/symbols.txt b/config/GZ2E01/rels/d_a_obj_digsnow/symbols.txt index 5fcbcc860f..0abdbc9a84 100644 --- a/config/GZ2E01/rels/d_a_obj_digsnow/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_digsnow/symbols.txt @@ -60,4 +60,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__14dBgS_ObjGndChk = .data:0x0000011C; // type:object size:0x30 scope:global __vt__14daObjDigSnow_c = .data:0x0000014C; // type:object size:0x28 scope:global -lbl_437_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_dmelevator/symbols.txt b/config/GZ2E01/rels/d_a_obj_dmelevator/symbols.txt index d382de76fb..19af75ed29 100644 --- a/config/GZ2E01/rels/d_a_obj_dmelevator/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_dmelevator/symbols.txt @@ -131,9 +131,9 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3658 = .bss:0x00000064; // type:object size:0xC scope:local @3659 = .bss:0x00000070; // type:object size:0xC scope:local l_push_check_pos$3653 = .bss:0x0000007C; // type:object size:0x30 scope:local -lbl_438_bss_AC = .bss:0x000000AC; // type:object size:0x1 data:byte -lbl_438_bss_AD = .bss:0x000000AD; // type:object size:0x1 data:byte -lbl_438_bss_AE = .bss:0x000000AE; // type:object size:0x1 data:byte +init$0000 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x000000AE; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_drop/symbols.txt b/config/GZ2E01/rels/d_a_obj_drop/symbols.txt index 4eb6ef94c2..6d34713eb1 100644 --- a/config/GZ2E01/rels/d_a_obj_drop/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_drop/symbols.txt @@ -102,5 +102,5 @@ __vt__10dCcD_GStts = .data:0x00000190; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001B4; // type:object size:0x24 scope:global -lbl_439_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_439_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_food/symbols.txt b/config/GZ2E01/rels/d_a_obj_food/symbols.txt index 6b3171c27f..8cc295a232 100644 --- a/config/GZ2E01/rels/d_a_obj_food/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_food/symbols.txt @@ -70,6 +70,6 @@ __vt__8cM3dGAab = .data:0x000000E4; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F0; // type:object size:0x24 scope:global __vt__16daObj_Food_HIO_c = .data:0x00000114; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_452_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3642 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_fw/symbols.txt b/config/GZ2E01/rels/d_a_obj_fw/symbols.txt index 9f88b36990..5c6998a4d3 100644 --- a/config/GZ2E01/rels/d_a_obj_fw/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_fw/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Fw_Method = .data:0x00000010; // type:object size:0x20 scope:global g_profile_OBJ_FW = .data:0x00000030; // type:object size:0x30 scope:global __vt__14daObj_Fw_HIO_c = .data:0x00000060; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_453_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3642 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_geyser/symbols.txt b/config/GZ2E01/rels/d_a_obj_geyser/symbols.txt index a0675bc936..aa99a123e1 100644 --- a/config/GZ2E01/rels/d_a_obj_geyser/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_geyser/symbols.txt @@ -94,5 +94,5 @@ __vt__10dCcD_GStts = .data:0x0000018C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000198; // type:object size:0xC scope:global __vt__8cM3dGLin = .data:0x000001A4; // type:object size:0xC scope:global __vt__13daObjGeyser_c = .data:0x000001B0; // type:object size:0x28 scope:global -lbl_458_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_458_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_gm/symbols.txt b/config/GZ2E01/rels/d_a_obj_gm/symbols.txt index 78dba7f87b..2608c59e73 100644 --- a/config/GZ2E01/rels/d_a_obj_gm/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gm/symbols.txt @@ -89,6 +89,6 @@ __vt__8cM3dGAab = .data:0x0000018C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000198; // type:object size:0x24 scope:global __vt__14daObj_Gm_HIO_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_initHIO = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3661 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_goGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_goGate/symbols.txt index b57fca8560..6ff435f84c 100644 --- a/config/GZ2E01/rels/d_a_obj_goGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_goGate/symbols.txt @@ -54,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:byte -lbl_461_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt index c63329fe7a..99f0c23f4d 100644 --- a/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3761 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_gpTaru/symbols.txt b/config/GZ2E01/rels/d_a_obj_gpTaru/symbols.txt index 82be36fcbe..436b0400af 100644 --- a/config/GZ2E01/rels/d_a_obj_gpTaru/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gpTaru/symbols.txt @@ -135,4 +135,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000238; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x3C scope:global align:4 data:float -lbl_96_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_heavySw/symbols.txt b/config/GZ2E01/rels/d_a_obj_heavySw/symbols.txt index 8d01a3e314..334059a3b4 100644 --- a/config/GZ2E01/rels/d_a_obj_heavySw/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_heavySw/symbols.txt @@ -77,4 +77,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000014C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3641 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x38 scope:global data:byte -lbl_476_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt b/config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt index 7b5e12bf42..419425f3e1 100644 --- a/config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt @@ -106,7 +106,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3730 = .bss:0x00000238; // type:object size:0xC scope:local @3731 = .bss:0x00000244; // type:object size:0xC scope:local l_rot_data$3686 = .bss:0x00000250; // type:object size:0x102 scope:local -lbl_477_bss_352 = .bss:0x00000352; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000352; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000354; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000358; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000035C; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt index cfb339d7b3..23c57b9e6f 100644 --- a/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt @@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3639 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_iceblock/symbols.txt b/config/GZ2E01/rels/d_a_obj_iceblock/symbols.txt index decd35adef..4bdd2a3dd1 100644 --- a/config/GZ2E01/rels/d_a_obj_iceblock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_iceblock/symbols.txt @@ -110,5 +110,5 @@ __vt__8cM3dGAab = .data:0x00000164; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000170; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000194; // type:object size:0xC scope:global __vt__13daObjIceBlk_c = .data:0x000001A0; // type:object size:0x28 scope:global -lbl_481_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_481_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_ito/symbols.txt b/config/GZ2E01/rels/d_a_obj_ito/symbols.txt index 0e78432374..7c0a0e3415 100644 --- a/config/GZ2E01/rels/d_a_obj_ito/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ito/symbols.txt @@ -80,6 +80,6 @@ __vt__8cM3dGSph = .data:0x000000B8; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000000C4; // type:object size:0x14 scope:global __vt__15daObj_Ito_HIO_c = .data:0x000000D8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_19_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3765 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kabuto/symbols.txt b/config/GZ2E01/rels/d_a_obj_kabuto/symbols.txt index f6e756713c..b8e837cd04 100644 --- a/config/GZ2E01/rels/d_a_obj_kabuto/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kabuto/symbols.txt @@ -101,6 +101,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KabHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_488_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kag/symbols.txt b/config/GZ2E01/rels/d_a_obj_kag/symbols.txt index 83bbf1e5a9..7970aa57b2 100644 --- a/config/GZ2E01/rels/d_a_obj_kag/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kag/symbols.txt @@ -128,6 +128,6 @@ __vt__8cM3dGPla = .data:0x00000194; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001A0; // type:object size:0xC scope:global __vt__14daObj_KagHIO_c = .data:0x000001AC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_489_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_kamakiri/symbols.txt b/config/GZ2E01/rels/d_a_obj_kamakiri/symbols.txt index 6e060164da..abc7ce9de9 100644 --- a/config/GZ2E01/rels/d_a_obj_kamakiri/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kamakiri/symbols.txt @@ -98,6 +98,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KamHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_493_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_katatsumuri/symbols.txt b/config/GZ2E01/rels/d_a_obj_katatsumuri/symbols.txt index f609dc9b92..23642053b4 100644 --- a/config/GZ2E01/rels/d_a_obj_katatsumuri/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_katatsumuri/symbols.txt @@ -94,6 +94,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KatHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_495_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_kbox/symbols.txt b/config/GZ2E01/rels/d_a_obj_kbox/symbols.txt index 20e516dad6..d47ce36508 100644 --- a/config/GZ2E01/rels/d_a_obj_kbox/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kbox/symbols.txt @@ -105,7 +105,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_497_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @3976 = .bss:0x00000060; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_key/symbols.txt b/config/GZ2E01/rels/d_a_obj_key/symbols.txt index 30995d3d75..c56aef8e4e 100644 --- a/config/GZ2E01/rels/d_a_obj_key/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_key/symbols.txt @@ -74,7 +74,7 @@ __vt__8cM3dGAab = .data:0x00000060; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000006C; // type:object size:0x24 scope:global __vt__15daObj_Key_HIO_c = .data:0x00000090; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_498_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3773 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte target_info_count = .bss:0x00000028; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2E01/rels/d_a_obj_keyhole/symbols.txt b/config/GZ2E01/rels/d_a_obj_keyhole/symbols.txt index 99253b2767..6eb9ea689f 100644 --- a/config/GZ2E01/rels/d_a_obj_keyhole/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_keyhole/symbols.txt @@ -121,7 +121,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_499_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3650 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @3934 = .bss:0x00000060; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_kgate/symbols.txt b/config/GZ2E01/rels/d_a_obj_kgate/symbols.txt index b33c8cff72..61c0f81181 100644 --- a/config/GZ2E01/rels/d_a_obj_kgate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kgate/symbols.txt @@ -115,5 +115,5 @@ __vt__10dCcD_GStts = .data:0x00000134; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000140; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x0000014C; // type:object size:0xC scope:global __vt__12daObjKGate_c = .data:0x00000158; // type:object size:0x28 scope:global -lbl_100_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_100_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_ki/symbols.txt b/config/GZ2E01/rels/d_a_obj_ki/symbols.txt index 513c684e92..9a2754b5af 100644 --- a/config/GZ2E01/rels/d_a_obj_ki/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ki/symbols.txt @@ -47,6 +47,6 @@ l_daObj_Ki_Method = .data:0x00000010; // type:object size:0x20 scope:global g_profile_OBJ_KI = .data:0x00000030; // type:object size:0x30 scope:global __vt__14daObj_Ki_HIO_c = .data:0x00000060; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_500_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kiPot/symbols.txt b/config/GZ2E01/rels/d_a_obj_kiPot/symbols.txt index f235e2034b..824294511c 100644 --- a/config/GZ2E01/rels/d_a_obj_kiPot/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kiPot/symbols.txt @@ -38,4 +38,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3620 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:local -lbl_501_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kita/symbols.txt b/config/GZ2E01/rels/d_a_obj_kita/symbols.txt index b71b6895a0..bac9b5db57 100644 --- a/config/GZ2E01/rels/d_a_obj_kita/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kita/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global __vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kshutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_kshutter/symbols.txt index 40fce6a5cd..f1c7eb96eb 100644 --- a/config/GZ2E01/rels/d_a_obj_kshutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kshutter/symbols.txt @@ -102,8 +102,8 @@ daObjKshtr_METHODS = .data:0x00000200; // type:object size:0x20 scope:global g_profile_Obj_Kshutter = .data:0x00000220; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000250; // type:object size:0xC scope:global __vt__12daObjKshtr_c = .data:0x0000025C; // type:object size:0x28 scope:global -lbl_506_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_506_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte -lbl_506_bss_2 = .bss:0x00000002; // type:object size:0x1 data:byte -lbl_506_bss_3 = .bss:0x00000003; // type:object size:0x1 data:byte -lbl_506_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000002; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000003; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt b/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt index 0d42e11443..6b58a43d16 100644 --- a/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt @@ -99,6 +99,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KuwHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_lbox/symbols.txt b/config/GZ2E01/rels/d_a_obj_lbox/symbols.txt index 9184ad9efe..f6f81222cf 100644 --- a/config/GZ2E01/rels/d_a_obj_lbox/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lbox/symbols.txt @@ -47,6 +47,6 @@ __vt__8cM3dGAab = .data:0x0000009C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000A8; // type:object size:0x24 scope:global __vt__16daObj_Lbox_HIO_c = .data:0x000000CC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_513_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt index a253b2a87a..d35995e8c0 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt @@ -54,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3632 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte -l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000001C; // type:object size:0x1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4CandleTag/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4CandleTag/symbols.txt index 0b2874ec52..6d3d54516a 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4CandleTag/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4CandleTag/symbols.txt @@ -56,4 +56,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3624 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:byte -lbl_524_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4EdShutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4EdShutter/symbols.txt index b36034ee85..af557bc7c0 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4EdShutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4EdShutter/symbols.txt @@ -65,4 +65,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000013C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3628 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_525_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4Gate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4Gate/symbols.txt index 82a00cd74f..2e951f990a 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4Gate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4Gate/symbols.txt @@ -53,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:byte -lbl_526_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4PoGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4PoGate/symbols.txt index 26d6a2ece6..4abc55c44d 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4PoGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4PoGate/symbols.txt @@ -72,4 +72,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000014C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3623 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x28 scope:global data:byte -lbl_528_bss_3C = .bss:0x0000003C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000003C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4RailWall/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4RailWall/symbols.txt index 142e38b29a..e07252aed7 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4RailWall/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4RailWall/symbols.txt @@ -72,4 +72,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__17dEvLib_callback_c = .data:0x0000011C; // type:object size:0x18 scope:global __vt__14daObjLv4Wall_c = .data:0x00000134; // type:object size:0x48 scope:global -lbl_529_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_lv4SlideWall/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4SlideWall/symbols.txt index 2fa3bb5e46..6e6c69830f 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4SlideWall/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4SlideWall/symbols.txt @@ -53,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_530_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4bridge/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4bridge/symbols.txt index a58922b160..b1f2847f63 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4bridge/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4bridge/symbols.txt @@ -53,4 +53,4 @@ daObjLv4Brg_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global g_profile_Obj_Lv4Bridge = .data:0x0000008C; // type:object size:0x30 scope:global __vt__17dEvLib_callback_c = .data:0x000000BC; // type:object size:0x18 scope:global __vt__13daObjLv4Brg_c = .data:0x000000D4; // type:object size:0x48 scope:global -lbl_531_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_lv4floor/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4floor/symbols.txt index 309cd4aa8a..2d9d9abaaf 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4floor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4floor/symbols.txt @@ -39,4 +39,4 @@ l_func$3677 = .data:0x00000048; // type:object size:0x24 scope:local daObjLv4Floor_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global g_profile_Obj_Lv4Floor = .data:0x0000008C; // type:object size:0x30 scope:global __vt__15daObjLv4Floor_c = .data:0x000000BC; // type:object size:0x28 scope:global -lbl_534_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_lv4sand/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4sand/symbols.txt index be6b662edd..7ee6d149ae 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4sand/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4sand/symbols.txt @@ -54,4 +54,4 @@ g_profile_Obj_Lv4Sand = .data:0x0000008C; // type:object size:0x30 scope:global __vt__17dEvLib_callback_c = .data:0x000000BC; // type:object size:0x18 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObjLv4Sand_c = .data:0x000000E0; // type:object size:0x48 scope:global -lbl_538_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/symbols.txt index 2a9b06e0c7..2eac480fb6 100644 --- a/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/symbols.txt @@ -59,4 +59,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000154; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_539_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv5IceWall/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv5IceWall/symbols.txt index 2258586051..807ec02ae0 100644 --- a/config/GZ2E01/rels/d_a_obj_lv5IceWall/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv5IceWall/symbols.txt @@ -73,4 +73,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000154; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_540_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv5SwIce/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv5SwIce/symbols.txt index 36bfec72c4..c44ff405e5 100644 --- a/config/GZ2E01/rels/d_a_obj_lv5SwIce/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv5SwIce/symbols.txt @@ -62,4 +62,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000154; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:byte -lbl_541_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/symbols.txt index 1a75d75a9c..c2d0a46f7b 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/symbols.txt @@ -82,4 +82,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3631 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_544_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6FurikoTrap/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6FurikoTrap/symbols.txt index 130de8a12b..92ce683dd0 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6FurikoTrap/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6FurikoTrap/symbols.txt @@ -58,4 +58,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000010C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_545_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6Lblock/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6Lblock/symbols.txt index 13e08cf71e..02c819dfdd 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6Lblock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6Lblock/symbols.txt @@ -54,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000F4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_546_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6SwGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6SwGate/symbols.txt index 1be7906f07..4f493cb9d1 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6SwGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6SwGate/symbols.txt @@ -77,4 +77,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000019C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3625 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global align:4 data:float -lbl_547_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6SzGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6SzGate/symbols.txt index 9cae0e5a10..1071142231 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6SzGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6SzGate/symbols.txt @@ -67,4 +67,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000158; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global align:4 data:float -lbl_548_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6Tenbin/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6Tenbin/symbols.txt index f7cb5cb832..e371647a92 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6Tenbin/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6Tenbin/symbols.txt @@ -58,4 +58,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3662 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x44 scope:global align:4 data:float -lbl_549_bss_58 = .bss:0x00000058; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000058; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/symbols.txt index 887fb2fa8f..72e2e5d3ba 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/symbols.txt @@ -98,4 +98,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000238; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:local align:4 data:float -lbl_550_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/symbols.txt index a98b49b5c0..526b759908 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/symbols.txt @@ -129,4 +129,4 @@ __vt__14mDoHIO_entry_c = .data:0x000002CC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3625 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x28 scope:global align:4 data:float -lbl_551_bss_3C = .bss:0x0000003C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000003C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6bemos/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6bemos/symbols.txt index 68f8af69b8..324bc4689e 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6bemos/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6bemos/symbols.txt @@ -71,4 +71,4 @@ __vt__8cM3dGAab = .data:0x00000174; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x00000180; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x0000018C; // type:object size:0xC scope:global __vt__11daObjL6Bm_c = .data:0x00000198; // type:object size:0x28 scope:global -lbl_552_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_lv6swturn/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6swturn/symbols.txt index c45a71239a..b3944c664e 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6swturn/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6swturn/symbols.txt @@ -41,4 +41,4 @@ l_func$3776 = .data:0x0000003C; // type:object size:0x18 scope:local daObjLv6SwTurn_METHODS = .data:0x00000054; // type:object size:0x20 scope:global g_profile_Obj_Lv6SwTurn = .data:0x00000074; // type:object size:0x30 scope:global __vt__16daObjLv6SwTurn_c = .data:0x000000A4; // type:object size:0x28 scope:global -lbl_556_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_lv7BsGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv7BsGate/symbols.txt index b4fa29d021..be6833bfe0 100644 --- a/config/GZ2E01/rels/d_a_obj_lv7BsGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv7BsGate/symbols.txt @@ -57,4 +57,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000104; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3622 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_557_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv7PropellerY/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv7PropellerY/symbols.txt index 8181b81eca..c7fcc45cb4 100644 --- a/config/GZ2E01/rels/d_a_obj_lv7PropellerY/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv7PropellerY/symbols.txt @@ -65,4 +65,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000134; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3644 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:global align:4 data:float -lbl_558_bss_34 = .bss:0x00000034; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt index bf006adea5..a24277ea4d 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt @@ -53,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000F8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x1C scope:global align:4 data:float -lbl_560_bss_30 = .bss:0x00000030; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000030; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv8Lift/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv8Lift/symbols.txt index c4fd6cd778..5952d161a2 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8Lift/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8Lift/symbols.txt @@ -95,4 +95,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001D0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_561_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv8OptiLift/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv8OptiLift/symbols.txt index d4760e09fb..facf538f92 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8OptiLift/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8OptiLift/symbols.txt @@ -86,4 +86,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000188; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3655 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_562_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv8UdFloor/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv8UdFloor/symbols.txt index cf884edf5a..a477be3cdb 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8UdFloor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8UdFloor/symbols.txt @@ -65,4 +65,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000124; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3622 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global data:byte -lbl_563_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv9SwShutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv9SwShutter/symbols.txt index 6c49e396ad..6b2fc0490b 100644 --- a/config/GZ2E01/rels/d_a_obj_lv9SwShutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv9SwShutter/symbols.txt @@ -54,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global align:4 data:float -lbl_564_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_magLift/symbols.txt b/config/GZ2E01/rels/d_a_obj_magLift/symbols.txt index cacfc1e7d8..b9e1627575 100644 --- a/config/GZ2E01/rels/d_a_obj_magLift/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_magLift/symbols.txt @@ -67,4 +67,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000158; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:local -lbl_565_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_msima/symbols.txt b/config/GZ2E01/rels/d_a_obj_msima/symbols.txt index d949123189..38370071a8 100644 --- a/config/GZ2E01/rels/d_a_obj_msima/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_msima/symbols.txt @@ -88,7 +88,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3858 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte @3958 = .bss:0x00000068; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_mvstair/symbols.txt b/config/GZ2E01/rels/d_a_obj_mvstair/symbols.txt index befb027cc1..e10f6e58a7 100644 --- a/config/GZ2E01/rels/d_a_obj_mvstair/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_mvstair/symbols.txt @@ -78,5 +78,5 @@ daObjStair_METHODS = .data:0x000000E8; // type:object size:0x20 scope:global g_profile_Obj_MvStair = .data:0x00000108; // type:object size:0x30 scope:global __vt__18dPa_levelEcallBack = .data:0x00000138; // type:object size:0x24 scope:global __vt__12daObjStair_c = .data:0x0000015C; // type:object size:0x28 scope:global -lbl_578_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_578_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_myogan/symbols.txt b/config/GZ2E01/rels/d_a_obj_myogan/symbols.txt index 1057d7e7e5..443e77d0be 100644 --- a/config/GZ2E01/rels/d_a_obj_myogan/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_myogan/symbols.txt @@ -29,6 +29,6 @@ g_profile_OBJ_MYOGAN = .data:0x00000020; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000050; // type:object size:0xC scope:global __vt__18daObj_Myogan_HIO_c = .data:0x0000005C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_579_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_pillar/symbols.txt b/config/GZ2E01/rels/d_a_obj_pillar/symbols.txt index 0219fe712b..d1086c010e 100644 --- a/config/GZ2E01/rels/d_a_obj_pillar/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_pillar/symbols.txt @@ -84,4 +84,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000124; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3657 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x28 scope:local align:4 data:float -lbl_593_bss_3C = .bss:0x0000003C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000003C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_poCandle/symbols.txt b/config/GZ2E01/rels/d_a_obj_poCandle/symbols.txt index 498ee3f5c1..fb218223e2 100644 --- a/config/GZ2E01/rels/d_a_obj_poCandle/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_poCandle/symbols.txt @@ -71,4 +71,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000013C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3629 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global align:4 data:float -lbl_595_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_poFire/symbols.txt b/config/GZ2E01/rels/d_a_obj_poFire/symbols.txt index 14d1dd17f5..0b75ee8de5 100644 --- a/config/GZ2E01/rels/d_a_obj_poFire/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_poFire/symbols.txt @@ -98,4 +98,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3656 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x34 scope:global data:byte -lbl_596_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_poTbox/symbols.txt b/config/GZ2E01/rels/d_a_obj_poTbox/symbols.txt index 80f90af9c9..eb6e8888f1 100644 --- a/config/GZ2E01/rels/d_a_obj_poTbox/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_poTbox/symbols.txt @@ -56,4 +56,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3622 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global -lbl_597_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_rfHole/symbols.txt b/config/GZ2E01/rels/d_a_obj_rfHole/symbols.txt index 0be600cf7e..05689f8049 100644 --- a/config/GZ2E01/rels/d_a_obj_rfHole/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rfHole/symbols.txt @@ -60,4 +60,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000104; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global align:4 data:float -lbl_601_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_rgate/symbols.txt b/config/GZ2E01/rels/d_a_obj_rgate/symbols.txt index 03a1bdc73f..1ab375754e 100644 --- a/config/GZ2E01/rels/d_a_obj_rgate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rgate/symbols.txt @@ -97,5 +97,5 @@ __vt__8cM3dGAab = .data:0x000000E4; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x000000F0; // type:object size:0xC scope:global __vt__12daObjRgate_c = .data:0x000000FC; // type:object size:0x28 scope:global l_evName$4049 = .bss:0x00000000; // type:object size:0x4 scope:local -lbl_602_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte -lbl_602_bss_5 = .bss:0x00000005; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000005; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_rope_bridge/symbols.txt b/config/GZ2E01/rels/d_a_obj_rope_bridge/symbols.txt index b81353e080..04d88e4f0e 100644 --- a/config/GZ2E01/rels/d_a_obj_rope_bridge/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rope_bridge/symbols.txt @@ -98,4 +98,4 @@ __vt__8cM3dGSph = .data:0x00000240; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x0000024C; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x00000258; // type:object size:0x14 scope:global __vt__14daObjRBridge_c = .data:0x0000026C; // type:object size:0x28 scope:global -lbl_110_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_rotTrap/symbols.txt b/config/GZ2E01/rels/d_a_obj_rotTrap/symbols.txt index 185ad00bad..19f842b5db 100644 --- a/config/GZ2E01/rels/d_a_obj_rotTrap/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rotTrap/symbols.txt @@ -68,4 +68,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000240; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_606_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_rw/symbols.txt b/config/GZ2E01/rels/d_a_obj_rw/symbols.txt index 6f81469e6c..8b1229d7c2 100644 --- a/config/GZ2E01/rels/d_a_obj_rw/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rw/symbols.txt @@ -60,6 +60,6 @@ __vt__8cM3dGAab = .data:0x00000100; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x0000010C; // type:object size:0xC scope:global __vt__14daOBJ_RW_HIO_c = .data:0x00000118; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_609_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_sWallShutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_sWallShutter/symbols.txt index 58b14daf99..e051b1b9a3 100644 --- a/config/GZ2E01/rels/d_a_obj_sWallShutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_sWallShutter/symbols.txt @@ -63,4 +63,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000010C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3624 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x2C scope:global data:byte -lbl_111_bss_40 = .bss:0x00000040; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000040; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_saidan/symbols.txt b/config/GZ2E01/rels/d_a_obj_saidan/symbols.txt index 55e46d29e7..727a8cfe60 100644 --- a/config/GZ2E01/rels/d_a_obj_saidan/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_saidan/symbols.txt @@ -52,4 +52,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global align:4 data:float -lbl_610_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_smallkey/symbols.txt b/config/GZ2E01/rels/d_a_obj_smallkey/symbols.txt index 6768516357..60aa409d3b 100644 --- a/config/GZ2E01/rels/d_a_obj_smallkey/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_smallkey/symbols.txt @@ -102,4 +102,4 @@ __vt__8cM3dGAab = .data:0x00000184; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000190; // type:object size:0x24 scope:global __vt__7daKey_c = .data:0x000001B4; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001F8; // type:object size:0xC scope:global -lbl_621_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_stopper/symbols.txt b/config/GZ2E01/rels/d_a_obj_stopper/symbols.txt index 3adfe0ff21..733ca766ee 100644 --- a/config/GZ2E01/rels/d_a_obj_stopper/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_stopper/symbols.txt @@ -113,7 +113,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3627 = .bss:0x00000048; // type:object size:0xC scope:local l_offset$3626 = .bss:0x00000058; // type:object size:0xC scope:local -lbl_634_bss_64 = .bss:0x00000064; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000068; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000006C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000070; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_stopper2/symbols.txt b/config/GZ2E01/rels/d_a_obj_stopper2/symbols.txt index 2525750729..bc78527162 100644 --- a/config/GZ2E01/rels/d_a_obj_stopper2/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_stopper2/symbols.txt @@ -51,4 +51,4 @@ l_func$3768 = .data:0x00000068; // type:object size:0x30 scope:local action_table$3859 = .data:0x00000098; // type:object size:0xC scope:local l_daObjStopper2_Method = .data:0x000000A4; // type:object size:0x20 scope:global g_profile_Obj_Stopper2 = .data:0x000000C4; // type:object size:0x30 scope:global -lbl_635_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_swBallA/symbols.txt b/config/GZ2E01/rels/d_a_obj_swBallA/symbols.txt index 00fc9b8482..2f88812263 100644 --- a/config/GZ2E01/rels/d_a_obj_swBallA/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swBallA/symbols.txt @@ -55,4 +55,4 @@ __vt__17dEvLib_callback_c = .data:0x000000C8; // type:object size:0x18 scope:glo __vt__12J3DFrameCtrl = .data:0x000000E0; // type:object size:0xC scope:global l_target_info = .bss:0x00000000; // type:object size:0x20 scope:global l_target_info_count = .bss:0x00000020; // type:object size:0x4 scope:global data:4byte -lbl_638_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_swBallB/symbols.txt b/config/GZ2E01/rels/d_a_obj_swBallB/symbols.txt index 477b74c3ac..8c721372f6 100644 --- a/config/GZ2E01/rels/d_a_obj_swBallB/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swBallB/symbols.txt @@ -57,4 +57,4 @@ __vt__17dEvLib_callback_c = .data:0x000000C8; // type:object size:0x18 scope:glo __vt__12J3DFrameCtrl = .data:0x000000E0; // type:object size:0xC scope:global l_target_info = .bss:0x00000000; // type:object size:0x8 scope:global l_target_info_count = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte -lbl_639_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_swBallC/symbols.txt b/config/GZ2E01/rels/d_a_obj_swBallC/symbols.txt index d8371526d1..f961a68e9c 100644 --- a/config/GZ2E01/rels/d_a_obj_swBallC/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swBallC/symbols.txt @@ -64,4 +64,4 @@ action_table$3966 = .data:0x0000008C; // type:object size:0x34 scope:local l_daObjSwBallC_Method = .data:0x00000128; // type:object size:0x20 scope:global g_profile_Obj_SwBallC = .data:0x00000148; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000178; // type:object size:0xC scope:global -lbl_640_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_swLight/symbols.txt b/config/GZ2E01/rels/d_a_obj_swLight/symbols.txt index 93be2d29e9..95d3fe3ec5 100644 --- a/config/GZ2E01/rels/d_a_obj_swLight/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swLight/symbols.txt @@ -77,4 +77,4 @@ __vt__8cM3dGSph = .data:0x00000154; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000160; // type:object size:0xC scope:global __vt__17dEvLib_callback_c = .data:0x0000016C; // type:object size:0x18 scope:global __vt__14daObjSwLight_c = .data:0x00000184; // type:object size:0x44 scope:global -lbl_641_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_swhang/symbols.txt b/config/GZ2E01/rels/d_a_obj_swhang/symbols.txt index 6a43bea4ad..8059a56259 100644 --- a/config/GZ2E01/rels/d_a_obj_swhang/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swhang/symbols.txt @@ -78,4 +78,4 @@ __vt__8cM3dGSph = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__17dEvLib_callback_c = .data:0x000001B4; // type:object size:0x18 scope:global __vt__13daObjSwHang_c = .data:0x000001CC; // type:object size:0x48 scope:global -lbl_643_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_sword/symbols.txt b/config/GZ2E01/rels/d_a_obj_sword/symbols.txt index ef6ba64e9e..b40ad5b297 100644 --- a/config/GZ2E01/rels/d_a_obj_sword/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_sword/symbols.txt @@ -45,4 +45,4 @@ __vt__12daObjSword_c = .data:0x000000F4; // type:object size:0x44 scope:global __vt__8cM3dGCyl = .data:0x00000138; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000150; // type:object size:0x24 scope:global -lbl_644_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_swpush/symbols.txt b/config/GZ2E01/rels/d_a_obj_swpush/symbols.txt index f5bfdb8d91..adec071440 100644 --- a/config/GZ2E01/rels/d_a_obj_swpush/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swpush/symbols.txt @@ -118,8 +118,8 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3919 = .bss:0x00000064; // type:object size:0xC scope:local @3920 = .bss:0x00000070; // type:object size:0xC scope:local no_push_vec$3914 = .bss:0x0000007C; // type:object size:0x30 scope:local -lbl_21_bss_AC = .bss:0x000000AC; // type:object size:0x1 data:byte -lbl_21_bss_AD = .bss:0x000000AD; // type:object size:0x1 data:byte +init$0000 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_swpush2/symbols.txt b/config/GZ2E01/rels/d_a_obj_swpush2/symbols.txt index 2b85106a59..aa0953599d 100644 --- a/config/GZ2E01/rels/d_a_obj_swpush2/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swpush2/symbols.txt @@ -87,5 +87,5 @@ mode_proc$4343 = .data:0x000000C8; // type:object size:0x30 scope:local Mthd_Table__Q212daObjSwpush229@unnamed@d_a_obj_swpush2_cpp@ = .data:0x000000F8; // type:object size:0x20 scope:global g_profile_Obj_Swpush2 = .data:0x00000118; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000148; // type:object size:0xC scope:global -lbl_645_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_645_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_swpush5/symbols.txt b/config/GZ2E01/rels/d_a_obj_swpush5/symbols.txt index 0a080c2d50..9f8473382a 100644 --- a/config/GZ2E01/rels/d_a_obj_swpush5/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swpush5/symbols.txt @@ -98,8 +98,8 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3658 = .bss:0x00000064; // type:object size:0xC scope:local @3659 = .bss:0x00000070; // type:object size:0xC scope:local l_push_check_pos$3653 = .bss:0x0000007C; // type:object size:0x30 scope:local -lbl_115_bss_AC = .bss:0x000000AC; // type:object size:0x1 data:byte -lbl_115_bss_AD = .bss:0x000000AD; // type:object size:0x1 data:byte +init$0000 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_syRock/symbols.txt b/config/GZ2E01/rels/d_a_obj_syRock/symbols.txt index 7c286a49b7..e594d06dcb 100644 --- a/config/GZ2E01/rels/d_a_obj_syRock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_syRock/symbols.txt @@ -109,4 +109,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000210; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3656 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x34 scope:global data:byte -lbl_648_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_taFence/symbols.txt b/config/GZ2E01/rels/d_a_obj_taFence/symbols.txt index 1c26916551..b68863616a 100644 --- a/config/GZ2E01/rels/d_a_obj_taFence/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_taFence/symbols.txt @@ -82,4 +82,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000178; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x74 scope:global data:byte -lbl_650_bss_88 = .bss:0x00000088; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000088; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_takaraDai/symbols.txt b/config/GZ2E01/rels/d_a_obj_takaraDai/symbols.txt index 2a6f816fe3..14a79d3164 100644 --- a/config/GZ2E01/rels/d_a_obj_takaraDai/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_takaraDai/symbols.txt @@ -54,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000009C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x3C scope:global align:4 data:float -lbl_652_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_toby/symbols.txt b/config/GZ2E01/rels/d_a_obj_toby/symbols.txt index 144a68b6e3..8a40ef99ad 100644 --- a/config/GZ2E01/rels/d_a_obj_toby/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_toby/symbols.txt @@ -98,7 +98,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3801 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt b/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt index 0447e763cc..f90429ab44 100644 --- a/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_warp_kbrg/symbols.txt b/config/GZ2E01/rels/d_a_obj_warp_kbrg/symbols.txt index 8edad3b1ea..e1904d4f9d 100644 --- a/config/GZ2E01/rels/d_a_obj_warp_kbrg/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_warp_kbrg/symbols.txt @@ -105,4 +105,4 @@ daObjWarpKBrg_METHODS = .data:0x00000194; // type:object size:0x20 scope:global g_profile_Obj_KakarikoBrg = .data:0x000001B4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000001E4; // type:object size:0xC scope:global __vt__15daObjWarpKBrg_c = .data:0x000001F0; // type:object size:0x28 scope:global -lbl_677_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_warp_obrg/symbols.txt b/config/GZ2E01/rels/d_a_obj_warp_obrg/symbols.txt index a6fa0ad422..c13a57bd7d 100644 --- a/config/GZ2E01/rels/d_a_obj_warp_obrg/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_warp_obrg/symbols.txt @@ -79,4 +79,4 @@ daObjWarpOBrg_METHODS = .data:0x000000EC; // type:object size:0x20 scope:global g_profile_Obj_OrdinBrg = .data:0x0000010C; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x0000013C; // type:object size:0xC scope:global __vt__15daObjWarpOBrg_c = .data:0x00000148; // type:object size:0x28 scope:global -lbl_678_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_obj_waterGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_waterGate/symbols.txt index 05a4b27959..0f22c9598c 100644 --- a/config/GZ2E01/rels/d_a_obj_waterGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_waterGate/symbols.txt @@ -55,4 +55,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000104; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global align:4 data:float -lbl_679_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_waterPillar/symbols.txt b/config/GZ2E01/rels/d_a_obj_waterPillar/symbols.txt index d688f8f420..fa5a5f02a7 100644 --- a/config/GZ2E01/rels/d_a_obj_waterPillar/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_waterPillar/symbols.txt @@ -129,4 +129,4 @@ __vt__14mDoHIO_entry_c = .data:0x000002D0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3635 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x58 scope:global align:4 data:float -lbl_680_bss_6C = .bss:0x0000006C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_web0/symbols.txt b/config/GZ2E01/rels/d_a_obj_web0/symbols.txt index f004aa2850..6b37e0c92d 100644 --- a/config/GZ2E01/rels/d_a_obj_web0/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_web0/symbols.txt @@ -41,6 +41,6 @@ __vt__8cM3dGAab = .data:0x0000009C; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A8; // type:object size:0xC scope:global __vt__16daObj_Web0_HIO_c = .data:0x000000B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_684_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_web1/symbols.txt b/config/GZ2E01/rels/d_a_obj_web1/symbols.txt index a218599b44..cde5972d11 100644 --- a/config/GZ2E01/rels/d_a_obj_web1/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_web1/symbols.txt @@ -51,6 +51,6 @@ __vt__8cM3dGAab = .data:0x000000A0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000AC; // type:object size:0xC scope:global __vt__16daObj_Web1_HIO_c = .data:0x000000B8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_685_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_well_cover/symbols.txt b/config/GZ2E01/rels/d_a_obj_well_cover/symbols.txt index a73a34024f..41fb200107 100644 --- a/config/GZ2E01/rels/d_a_obj_well_cover/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_well_cover/symbols.txt @@ -41,4 +41,4 @@ l_func$3730 = .data:0x0000003C; // type:object size:0x18 scope:local l_daObjWCover_Method = .data:0x00000054; // type:object size:0x20 scope:global g_profile_Obj_WellCover = .data:0x00000074; // type:object size:0x30 scope:global __vt__13daObjWCover_c = .data:0x000000A4; // type:object size:0x28 scope:global -lbl_686_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_scene_exit2/symbols.txt b/config/GZ2E01/rels/d_a_scene_exit2/symbols.txt index 2db11e5b18..1ad1eac76a 100644 --- a/config/GZ2E01/rels/d_a_scene_exit2/symbols.txt +++ b/config/GZ2E01/rels/d_a_scene_exit2/symbols.txt @@ -43,4 +43,4 @@ l_func$3698 = .data:0x00000058; // type:object size:0x30 scope:local action_table$3745 = .data:0x00000088; // type:object size:0xC scope:local l_daScExit_Method = .data:0x00000094; // type:object size:0x20 scope:global g_profile_SCENE_EXIT2 = .data:0x000000B4; // type:object size:0x30 scope:global -lbl_117_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_sq/symbols.txt b/config/GZ2E01/rels/d_a_sq/symbols.txt index 8f6b26420b..a77a9fd5d4 100644 --- a/config/GZ2E01/rels/d_a_sq/symbols.txt +++ b/config/GZ2E01/rels/d_a_sq/symbols.txt @@ -78,6 +78,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000104; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000128; // type:object size:0xC scope:global __vt__10daSq_HIO_c = .data:0x00000134; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_119_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x30 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_swBall/symbols.txt b/config/GZ2E01/rels/d_a_swBall/symbols.txt index ca8a19bae1..428926fec5 100644 --- a/config/GZ2E01/rels/d_a_swBall/symbols.txt +++ b/config/GZ2E01/rels/d_a_swBall/symbols.txt @@ -35,4 +35,4 @@ l_daSwBall_Method = .data:0x00000050; // type:object size:0x20 scope:global g_profile_SwBall = .data:0x00000070; // type:object size:0x30 scope:global l_target_info = .bss:0x00000000; // type:object size:0x20 scope:global l_target_info_count = .bss:0x00000020; // type:object size:0x4 scope:global data:4byte -lbl_707_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_swc00/symbols.txt b/config/GZ2E01/rels/d_a_swc00/symbols.txt index ededd82493..545f2ea6e3 100644 --- a/config/GZ2E01/rels/d_a_swc00/symbols.txt +++ b/config/GZ2E01/rels/d_a_swc00/symbols.txt @@ -35,4 +35,4 @@ l_func$3819 = .data:0x00000090; // type:object size:0x30 scope:local @3996 = .data:0x000000C0; // type:object size:0x40 scope:local l_daSwc00_Method = .data:0x00000100; // type:object size:0x20 scope:global g_profile_SWC00 = .data:0x00000120; // type:object size:0x30 scope:global -lbl_120_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_tag_firewall/symbols.txt b/config/GZ2E01/rels/d_a_tag_firewall/symbols.txt index eb287a2173..60644395e6 100644 --- a/config/GZ2E01/rels/d_a_tag_firewall/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_firewall/symbols.txt @@ -34,4 +34,4 @@ g_profile_Tag_FWall = .data:0x00000068; // type:object size:0x30 scope:global __vt__8cM3dGAab = .data:0x00000098; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x000000A4; // type:object size:0xC scope:global fire_leader = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_720_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_tag_lv2prchk/symbols.txt b/config/GZ2E01/rels/d_a_tag_lv2prchk/symbols.txt index 6f8a5ae3d0..39ac12522f 100644 --- a/config/GZ2E01/rels/d_a_tag_lv2prchk/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_lv2prchk/symbols.txt @@ -25,4 +25,4 @@ lbl_128_data_10 = .data:0x00000010; // type:object size:0x10 l_func$3666 = .data:0x00000038; // type:object size:0x18 scope:local l_daTagLv2PrChk_Method = .data:0x00000050; // type:object size:0x20 scope:global g_profile_Tag_Lv2PrChk = .data:0x00000070; // type:object size:0x30 scope:global -lbl_128_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_tag_statue_evt/symbols.txt b/config/GZ2E01/rels/d_a_tag_statue_evt/symbols.txt index 848dd413a3..07074cf75b 100644 --- a/config/GZ2E01/rels/d_a_tag_statue_evt/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_statue_evt/symbols.txt @@ -63,4 +63,4 @@ l_statue_ang$3944 = .data:0x00000128; // type:object size:0xC scope:local l_daTagStatue_Method = .data:0x00000134; // type:object size:0x20 scope:global g_profile_Tag_Statue = .data:0x00000154; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global -lbl_133_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 diff --git a/config/GZ2E01/rels/d_a_tbox/symbols.txt b/config/GZ2E01/rels/d_a_tbox/symbols.txt index 2d6241f68d..cbedcda2bf 100644 --- a/config/GZ2E01/rels/d_a_tbox/symbols.txt +++ b/config/GZ2E01/rels/d_a_tbox/symbols.txt @@ -212,7 +212,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_light_offset = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3824 = .bss:0x00000060; // type:object size:0xC scope:local l_HIO = .bss:0x0000006C; // type:object size:0x34 scope:global -lbl_41_bss_A0 = .bss:0x000000A0; // type:object size:0x1 data:byte +init$0000 = .bss:0x000000A0; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A4; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A8; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000AC; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_tbox2/symbols.txt b/config/GZ2E01/rels/d_a_tbox2/symbols.txt index ba4d318b90..4642a379df 100644 --- a/config/GZ2E01/rels/d_a_tbox2/symbols.txt +++ b/config/GZ2E01/rels/d_a_tbox2/symbols.txt @@ -81,5 +81,5 @@ __vt__8cM3dGAab = .data:0x000001B0; // type:object size:0xC scope:global __vt__12daTboxBase_c = .data:0x000001BC; // type:object size:0x2C scope:global __vt__12J3DFrameCtrl = .data:0x000001E8; // type:object size:0xC scope:global __vt__9daTbox2_c = .data:0x000001F4; // type:object size:0x2C scope:global -lbl_42_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_42_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/symbols.txt b/config/GZ2E01/symbols.txt index 0c99a9f4c4..223a9443a2 100644 --- a/config/GZ2E01/symbols.txt +++ b/config/GZ2E01/symbols.txt @@ -21386,7 +21386,7 @@ chk_type_num__12dAttention_c = .sdata:0x8045066C; // type:object size:0x4 scope: attn_opt_hold = .sdata:0x80450670; // type:object size:0x1 scope:local align:1 data:byte ang_table$4418 = .sdata:0x80450674; // type:object size:0x6 scope:local align:4 data_80450680 = .sdata:0x80450680; // type:object size:0x1 scope:global align:4 data:byte -data_80450688 = .sdata:0x80450688; // type:object size:0x1 scope:global align:4 data:byte +l_captureAlpha = .sdata:0x80450688; // type:object size:0x1 scope:global align:4 data:byte l_autoUpHeight = .sdata:0x80450690; // type:object size:0x4 scope:global align:4 data:float l_autoDownHeight = .sdata:0x80450694; // type:object size:0x4 scope:global align:4 data:float l_ladderAnmBaseTransY = .sdata:0x80450698; // type:object size:0x4 scope:global align:4 data:float @@ -21896,9 +21896,9 @@ mTypeGroupData__7dTres_c = .sbss:0x80450F98; // type:object size:0x4 scope:globa mNum__7dTres_c = .sbss:0x80450F9C; // type:object size:0x2 scope:global align:2 data:2byte m_myObj__10dMdl_mng_c = .sbss:0x80450FA0; // type:object size:0x4 scope:global align:4 data:4byte m_obj__12dEyeHL_mng_c = .sbss:0x80450FA8; // type:object size:0x4 scope:global align:4 data:4byte -struct_80450FB0 = .sbss:0x80450FB0; // type:object size:0x1 scope:global align:8 data:byte -lbl_80450FB1 = .sbss:0x80450FB1; // type:object size:0x1 data:byte -lbl_80450FB2 = .sbss:0x80450FB2; // type:object size:0x1 data:byte +l_dvdError$1875 = .sbss:0x80450FB0; // type:object size:0x1 data:byte +l_texCopied$1898 = .sbss:0x80450FB1; // type:object size:0x1 data:byte +init$1899 = .sbss:0x80450FB2; // type:object size:0x1 data:byte init$11203 = .sbss:0x80450FB8; // type:object size:0x1 scope:global align:1 data:byte init$11207 = .sbss:0x80450FB9; // type:object size:0x1 scope:global align:1 data:byte init$11211 = .sbss:0x80450FBA; // type:object size:0x1 scope:global align:1 data:byte @@ -21972,7 +21972,7 @@ virtual_stage$3999 = .sbss:0x804510A4; // type:object size:0x8 scope:local align MyClass__12dMenu_Fmap_c = .sbss:0x804510AC; // type:object size:0x4 scope:global align:4 data:4byte g_menuHIO = .sbss:0x804510B0; // type:object size:0x8 scope:global align:4 tex_name$5188 = .sbss:0x804510B8; // type:object size:0x4 scope:local align:4 data:4byte -initTexName$2118 = .sbss:0x804510BC; // type:object size:0x1 scope:local align:1 data:byte +init$2118 = .sbss:0x804510BC; // type:object size:0x1 scope:local align:1 data:byte mMoji$3770 = .sbss:0x804510C0; // type:object size:0x3 scope:local align:4 data:byte s_groupID = .sbss:0x804510C8; // type:object size:0x2 scope:global align:2 data:2byte g_msg_unit = .sbss:0x804510D0; // type:object size:0x4 scope:global align:4 diff --git a/config/GZ2J01/rels/d_a_e_fb/symbols.txt b/config/GZ2J01/rels/d_a_e_fb/symbols.txt index e715ea9ef6..b13581c498 100644 --- a/config/GZ2J01/rels/d_a_e_fb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_fb/symbols.txt @@ -114,7 +114,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000078; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_e_fs/symbols.txt b/config/GZ2J01/rels/d_a_e_fs/symbols.txt index c47f0979a6..62c2e3ce3e 100644 --- a/config/GZ2J01/rels/d_a_e_fs/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_fs/symbols.txt @@ -128,7 +128,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local s_AtCount__22@unnamed@d_a_e_fs_cpp@ = .bss:0x00000046; // type:object size:0x2 scope:global data:2byte -hioInit = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 data:byte @3933 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x1C scope:global data:byte @4275 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_hm/symbols.txt b/config/GZ2J01/rels/d_a_e_hm/symbols.txt index a6f6360f00..fe75134251 100644 --- a/config/GZ2J01/rels/d_a_e_hm/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_hm/symbols.txt @@ -180,7 +180,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3807 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_e_hp/symbols.txt b/config/GZ2J01/rels/d_a_e_hp/symbols.txt index 2259904b4f..c6012fdf7d 100644 --- a/config/GZ2J01/rels/d_a_e_hp/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_hp/symbols.txt @@ -121,6 +121,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global __vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3921 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_nz/symbols.txt b/config/GZ2J01/rels/d_a_e_nz/symbols.txt index ced74ba0af..077d1abc5a 100644 --- a/config/GZ2J01/rels/d_a_e_nz/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_nz/symbols.txt @@ -115,7 +115,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_215_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte lbl_215_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte diff --git a/config/GZ2J01/rels/d_a_e_po/symbols.txt b/config/GZ2J01/rels/d_a_e_po/symbols.txt index 55e31bd0e1..a515c05f4d 100644 --- a/config/GZ2J01/rels/d_a_e_po/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_po/symbols.txt @@ -362,7 +362,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3933 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global align:4 data:float mRollCount = .bss:0x00000090; // type:object size:0x2 scope:global diff --git a/config/GZ2J01/rels/d_a_e_pz/symbols.txt b/config/GZ2J01/rels/d_a_e_pz/symbols.txt index 9e574db5c5..a488d9dfb3 100644 --- a/config/GZ2J01/rels/d_a_e_pz/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_pz/symbols.txt @@ -267,7 +267,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_initHIO = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3922 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global align:4 data:float lbl_222_bss_70 = .bss:0x00000070; // type:object size:0x1 data:byte diff --git a/config/GZ2J01/rels/d_a_e_sh/symbols.txt b/config/GZ2J01/rels/d_a_e_sh/symbols.txt index 3c574d67a6..d0fbea44b7 100644 --- a/config/GZ2J01/rels/d_a_e_sh/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_sh/symbols.txt @@ -143,6 +143,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_yh/symbols.txt b/config/GZ2J01/rels/d_a_e_yh/symbols.txt index 04a49a35fd..b5a33970db 100644 --- a/config/GZ2J01/rels/d_a_e_yh/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_yh/symbols.txt @@ -166,6 +166,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global __vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_mg_rod/symbols.txt b/config/GZ2J01/rels/d_a_mg_rod/symbols.txt index 98c7715408..c2ade85265 100644 --- a/config/GZ2J01/rels/d_a_mg_rod/symbols.txt +++ b/config/GZ2J01/rels/d_a_mg_rod/symbols.txt @@ -363,7 +363,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local henna = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte data_804BBBD4 = .bss:0x0000004C; // type:object size:0x1 data:byte -l_HIOInit = .bss:0x0000004D; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004D; // type:object size:0x1 data:byte @4280 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x28 scope:global data:byte @4921 = .bss:0x00000084; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_npc_henna/symbols.txt b/config/GZ2J01/rels/d_a_npc_henna/symbols.txt index ee1055849f..247cd65789 100644 --- a/config/GZ2J01/rels/d_a_npc_henna/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_henna/symbols.txt @@ -303,7 +303,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3900 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_obj_batta/symbols.txt b/config/GZ2J01/rels/d_a_obj_batta/symbols.txt index 78b1c7e393..a3acf1ce9a 100644 --- a/config/GZ2J01/rels/d_a_obj_batta/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_batta/symbols.txt @@ -129,6 +129,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt index 81e36fcb56..c20eccffca 100644 --- a/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3761 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt index cfb339d7b3..23c57b9e6f 100644 --- a/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt @@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3639 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_kita/symbols.txt b/config/GZ2J01/rels/d_a_obj_kita/symbols.txt index b71b6895a0..bac9b5db57 100644 --- a/config/GZ2J01/rels/d_a_obj_kita/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kita/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global __vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt b/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt index 0d42e11443..6b58a43d16 100644 --- a/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt @@ -99,6 +99,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KuwHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt index 1df1fe2b88..85a76a8196 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt @@ -53,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3632 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte -l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000001C; // type:object size:0x1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_msima/symbols.txt b/config/GZ2J01/rels/d_a_obj_msima/symbols.txt index d949123189..38370071a8 100644 --- a/config/GZ2J01/rels/d_a_obj_msima/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_msima/symbols.txt @@ -88,7 +88,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3858 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte @3958 = .bss:0x00000068; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_toby/symbols.txt b/config/GZ2J01/rels/d_a_obj_toby/symbols.txt index b59a2ac86a..b0a0be5011 100644 --- a/config/GZ2J01/rels/d_a_obj_toby/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_toby/symbols.txt @@ -98,7 +98,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3801 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt b/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt index 0447e763cc..f90429ab44 100644 --- a/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float diff --git a/config/GZ2J01/symbols.txt b/config/GZ2J01/symbols.txt index 993e64984d..5de8e756b2 100644 --- a/config/GZ2J01/symbols.txt +++ b/config/GZ2J01/symbols.txt @@ -21988,7 +21988,7 @@ virtual_stage$3999 = .sbss:0x8044B1E4; // type:object size:0x8 scope:local align MyClass__12dMenu_Fmap_c = .sbss:0x8044B1EC; // type:object size:0x4 scope:global align:4 data:4byte g_menuHIO = .sbss:0x8044B1F0; // type:object size:0x8 scope:global align:4 tex_name$5204 = .sbss:0x8044B1F8; // type:object size:0x4 scope:local align:4 data:4byte -initTexName$2118 = .sbss:0x8044B1FC; // type:object size:0x1 scope:local align:1 data:byte +init$2118 = .sbss:0x8044B1FC; // type:object size:0x1 scope:local align:1 data:byte mMoji$3770 = .sbss:0x8044B200; // type:object size:0x3 scope:local align:4 data:byte s_groupID = .sbss:0x8044B208; // type:object size:0x2 scope:global align:4 data:2byte g_msg_unit = .sbss:0x8044B210; // type:object size:0x4 scope:global align:4 diff --git a/config/GZ2P01/rels/d_a_bd/symbols.txt b/config/GZ2P01/rels/d_a_bd/symbols.txt index 3aaec7bce5..5731497f87 100644 --- a/config/GZ2P01/rels/d_a_bd/symbols.txt +++ b/config/GZ2P01/rels/d_a_bd/symbols.txt @@ -131,7 +131,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3937 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3946 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_fb/symbols.txt b/config/GZ2P01/rels/d_a_e_fb/symbols.txt index 176e6ce64d..bc2bab1a2a 100644 --- a/config/GZ2P01/rels/d_a_e_fb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_fb/symbols.txt @@ -114,7 +114,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000078; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_e_fs/symbols.txt b/config/GZ2P01/rels/d_a_e_fs/symbols.txt index c47f0979a6..62c2e3ce3e 100644 --- a/config/GZ2P01/rels/d_a_e_fs/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_fs/symbols.txt @@ -128,7 +128,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local s_AtCount__22@unnamed@d_a_e_fs_cpp@ = .bss:0x00000046; // type:object size:0x2 scope:global data:2byte -hioInit = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 data:byte @3933 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x1C scope:global data:byte @4275 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_hm/symbols.txt b/config/GZ2P01/rels/d_a_e_hm/symbols.txt index a6f6360f00..fe75134251 100644 --- a/config/GZ2P01/rels/d_a_e_hm/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_hm/symbols.txt @@ -180,7 +180,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3807 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_e_hp/symbols.txt b/config/GZ2P01/rels/d_a_e_hp/symbols.txt index 2259904b4f..c6012fdf7d 100644 --- a/config/GZ2P01/rels/d_a_e_hp/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_hp/symbols.txt @@ -121,6 +121,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global __vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3921 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_nz/symbols.txt b/config/GZ2P01/rels/d_a_e_nz/symbols.txt index ced74ba0af..077d1abc5a 100644 --- a/config/GZ2P01/rels/d_a_e_nz/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_nz/symbols.txt @@ -115,7 +115,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_215_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte lbl_215_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte diff --git a/config/GZ2P01/rels/d_a_e_po/symbols.txt b/config/GZ2P01/rels/d_a_e_po/symbols.txt index 55e31bd0e1..a515c05f4d 100644 --- a/config/GZ2P01/rels/d_a_e_po/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_po/symbols.txt @@ -362,7 +362,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3933 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global align:4 data:float mRollCount = .bss:0x00000090; // type:object size:0x2 scope:global diff --git a/config/GZ2P01/rels/d_a_e_sh/symbols.txt b/config/GZ2P01/rels/d_a_e_sh/symbols.txt index 3c574d67a6..d0fbea44b7 100644 --- a/config/GZ2P01/rels/d_a_e_sh/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_sh/symbols.txt @@ -143,6 +143,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_yh/symbols.txt b/config/GZ2P01/rels/d_a_e_yh/symbols.txt index 04a49a35fd..b5a33970db 100644 --- a/config/GZ2P01/rels/d_a_e_yh/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_yh/symbols.txt @@ -166,6 +166,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global __vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_mg_rod/symbols.txt b/config/GZ2P01/rels/d_a_mg_rod/symbols.txt index 6918801b44..2ce0f10234 100644 --- a/config/GZ2P01/rels/d_a_mg_rod/symbols.txt +++ b/config/GZ2P01/rels/d_a_mg_rod/symbols.txt @@ -363,7 +363,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local henna = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte data_804BBBD4 = .bss:0x0000004C; // type:object size:0x1 data:byte -l_HIOInit = .bss:0x0000004D; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004D; // type:object size:0x1 data:byte @4280 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x28 scope:global data:byte @4921 = .bss:0x00000084; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_npc_henna/symbols.txt b/config/GZ2P01/rels/d_a_npc_henna/symbols.txt index ee1055849f..247cd65789 100644 --- a/config/GZ2P01/rels/d_a_npc_henna/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_henna/symbols.txt @@ -303,7 +303,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 data:byte @3900 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_obj_batta/symbols.txt b/config/GZ2P01/rels/d_a_obj_batta/symbols.txt index 78b1c7e393..a3acf1ce9a 100644 --- a/config/GZ2P01/rels/d_a_obj_batta/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_batta/symbols.txt @@ -129,6 +129,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_gm/symbols.txt b/config/GZ2P01/rels/d_a_obj_gm/symbols.txt index bc0d7473a9..29da718574 100644 --- a/config/GZ2P01/rels/d_a_obj_gm/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_gm/symbols.txt @@ -88,6 +88,6 @@ __vt__8cM3dGAab = .data:0x0000018C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000198; // type:object size:0x24 scope:global __vt__14daObj_Gm_HIO_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_initHIO = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3661 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt index c63329fe7a..99f0c23f4d 100644 --- a/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3761 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt index cfb339d7b3..23c57b9e6f 100644 --- a/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt @@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @3639 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_kita/symbols.txt b/config/GZ2P01/rels/d_a_obj_kita/symbols.txt index b71b6895a0..bac9b5db57 100644 --- a/config/GZ2P01/rels/d_a_obj_kita/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kita/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global __vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt b/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt index 0d42e11443..6b58a43d16 100644 --- a/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt @@ -99,6 +99,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KuwHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt index 1df1fe2b88..85a76a8196 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt @@ -53,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3632 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte -l_HIOInit = .bss:0x0000001C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000001C; // type:object size:0x1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_msima/symbols.txt b/config/GZ2P01/rels/d_a_obj_msima/symbols.txt index 944f6e08b3..aea56fe4d5 100644 --- a/config/GZ2P01/rels/d_a_obj_msima/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_msima/symbols.txt @@ -88,7 +88,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3858 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte @3958 = .bss:0x00000068; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_toby/symbols.txt b/config/GZ2P01/rels/d_a_obj_toby/symbols.txt index 9583ab8c84..369ed50225 100644 --- a/config/GZ2P01/rels/d_a_obj_toby/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_toby/symbols.txt @@ -98,7 +98,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -l_HIOInit = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3801 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt b/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt index 0447e763cc..f90429ab44 100644 --- a/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float diff --git a/config/RZDE01_00/rels/d_a_e_yh/symbols.txt b/config/RZDE01_00/rels/d_a_e_yh/symbols.txt index 6ae565d092..1a06ebd73a 100644 --- a/config/RZDE01_00/rels/d_a_e_yh/symbols.txt +++ b/config/RZDE01_00/rels/d_a_e_yh/symbols.txt @@ -148,6 +148,6 @@ lbl_251_data_3FC = .data:0x000003FC; // type:object size:0x1C @95827 = .data:0x00000418; // type:object size:0xC scope:local lbl_251_data_424 = .data:0x00000424; // type:object size:0xCC __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @94134 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/RZDE01_00/rels/d_a_fr/symbols.txt b/config/RZDE01_00/rels/d_a_fr/symbols.txt index bc632771ee..02f37c8d35 100644 --- a/config/RZDE01_00/rels/d_a_fr/symbols.txt +++ b/config/RZDE01_00/rels/d_a_fr/symbols.txt @@ -67,6 +67,6 @@ lbl_73_data_134 = .data:0x00000134; // type:object size:0xB data:string @92624 = .data:0x00000140; // type:object size:0xC scope:local __RTTI__10daFr_HIO_c = .data:0x0000014C; // type:object size:0x8 scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_initHIO = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @92050 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/RZDE01_00/rels/d_a_obj_batta/symbols.txt b/config/RZDE01_00/rels/d_a_obj_batta/symbols.txt index 359b1b2018..04f5fbb7fc 100644 --- a/config/RZDE01_00/rels/d_a_obj_batta/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_batta/symbols.txt @@ -133,6 +133,6 @@ lbl_403_data_424 = .data:0x00000424; // type:object size:0x4 data:string lbl_403_data_428 = .data:0x00000428; // type:object size:0x4 data:string lbl_403_data_42C = .data:0x0000042C; // type:object size:0x4 data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @93433 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt b/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt index dc57641ca4..f0d0e59cc3 100644 --- a/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_gomikabe/symbols.txt @@ -79,6 +79,6 @@ lbl_462_data_E8 = .data:0x000000E8; // type:object size:0xF data:string lbl_462_data_F7 = .data:0x000000F7; // type:object size:0x15 data:string lbl_462_data_10C = .data:0x0000010C; // type:object size:0xF data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @93404 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt b/config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt index bdf287b0e8..a522f8d2db 100644 --- a/config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt +++ b/config/RZDE01_00/rels/d_a_obj_ice_s/symbols.txt @@ -69,6 +69,6 @@ __RTTI__12daObjIce_s_c = .data:0x000000DC; // type:object size:0x8 scope:global lbl_480_data_E4 = .data:0x000000E4; // type:object size:0xA data:string lbl_480_data_EE = .data:0x000000EE; // type:object size:0xA data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 data:byte @91760 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/RZDE01_02/rels/d_a_e_yh/symbols.txt b/config/RZDE01_02/rels/d_a_e_yh/symbols.txt index e75164b41d..accd1e14ce 100644 --- a/config/RZDE01_02/rels/d_a_e_yh/symbols.txt +++ b/config/RZDE01_02/rels/d_a_e_yh/symbols.txt @@ -151,6 +151,6 @@ lbl_251_data_3FC = .data:0x000003FC; // type:object size:0x1C @95827 = .data:0x00000418; // type:object size:0xC scope:local align:4 lbl_251_data_424 = .data:0x00000424; // type:object size:0xCC __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global align:4 -l_HIOInit = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @94134 = .bss:0x0000000C; // type:object size:0xC scope:local align:4 l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global align:4 data:byte diff --git a/config/ShieldD/rels/d_a_b_mgnD/symbols.txt b/config/ShieldD/rels/d_a_b_mgnD/symbols.txt index 7e6108ced9..21d253a806 100644 --- a/config/ShieldD/rels/d_a_b_mgnD/symbols.txt +++ b/config/ShieldD/rels/d_a_b_mgnD/symbols.txt @@ -295,5 +295,5 @@ lbl_139_data_440 = .data:0x00000440; // type:object size:0x24 @123083 = .data:0x0000066C; // type:object size:0x11 scope:local data:string @123084 = .data:0x00000694; // type:object size:0xD scope:local data:string lbl_139_data_6A1 = .data:0x000006A1; // type:object size:0x93 -l_initHIO = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte diff --git a/config/ShieldD/rels/d_a_bdD/symbols.txt b/config/ShieldD/rels/d_a_bdD/symbols.txt index 964778448b..c0a76ede04 100644 --- a/config/ShieldD/rels/d_a_bdD/symbols.txt +++ b/config/ShieldD/rels/d_a_bdD/symbols.txt @@ -147,7 +147,7 @@ lbl_58_data_4B0 = .data:0x000004B0; // type:object size:0x24 @122173 = .data:0x00000698; // type:object size:0xC scope:local @122174 = .data:0x000006BC; // type:object size:0x11 scope:local data:string @122175 = .data:0x000006E4; // type:object size:0xD scope:local data:string -l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000008; // type:object size:0x20 scope:global data:byte land_sp_pos = .bss:0x00000028; // type:object size:0x30 scope:global rope_pt = .bss:0x00000058; // type:object size:0x4 scope:global data:4byte diff --git a/config/ShieldD/rels/d_a_e_bgD/symbols.txt b/config/ShieldD/rels/d_a_e_bgD/symbols.txt index 05549aca71..9be5600189 100644 --- a/config/ShieldD/rels/d_a_e_bgD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_bgD/symbols.txt @@ -142,5 +142,5 @@ lbl_165_data_298 = .data:0x00000298; // type:object size:0x24 @119823 = .data:0x000004A4; // type:object size:0x11 scope:local data:string @119824 = .data:0x000004CC; // type:object size:0xD scope:local data:string lbl_165_data_4D9 = .data:0x000004D9; // type:object size:0x93 -l_initHIO = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte diff --git a/config/ShieldD/rels/d_a_e_fbD/symbols.txt b/config/ShieldD/rels/d_a_e_fbD/symbols.txt index 7564bedf29..64f5efc8aa 100644 --- a/config/ShieldD/rels/d_a_e_fbD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_fbD/symbols.txt @@ -143,7 +143,7 @@ lbl_179_data_320 = .data:0x00000320; // type:object size:0x24 @118010 = .data:0x0000052C; // type:object size:0x11 scope:local data:string @118011 = .data:0x00000554; // type:object size:0xD scope:local data:string lbl_179_data_561 = .data:0x00000561; // type:object size:0x93 -l_HIOInit = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 scope:local data:byte l_HIO = .bss:0x00000004; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000028; // type:object size:0x4 scope:global data:4byte lbl_179_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte diff --git a/config/ShieldD/rels/d_a_e_hpD/symbols.txt b/config/ShieldD/rels/d_a_e_hpD/symbols.txt index 25a3aaaed0..8a8f39a6db 100644 --- a/config/ShieldD/rels/d_a_e_hpD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_hpD/symbols.txt @@ -162,5 +162,5 @@ lbl_191_data_310 = .data:0x00000310; // type:object size:0x24 @120215 = .data:0x00000538; // type:object size:0xC scope:local @120216 = .data:0x0000055C; // type:object size:0x11 scope:local data:string lbl_191_data_56D = .data:0x0000056D; // type:object size:0x8F -l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000004; // type:object size:0x14 scope:global data:byte diff --git a/config/ShieldD/rels/d_a_e_shD/symbols.txt b/config/ShieldD/rels/d_a_e_shD/symbols.txt index c69911dc43..c65c7b006b 100644 --- a/config/ShieldD/rels/d_a_e_shD/symbols.txt +++ b/config/ShieldD/rels/d_a_e_shD/symbols.txt @@ -173,5 +173,5 @@ lbl_221_data_340 = .data:0x00000340; // type:object size:0x24 @120143 = .data:0x00000528; // type:object size:0xC scope:local @120144 = .data:0x0000054C; // type:object size:0x11 scope:local data:string lbl_221_data_55D = .data:0x0000055D; // type:object size:0x8F -l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000004; // type:object size:0x2C scope:global data:byte diff --git a/config/ShieldD/rels/d_a_frD/symbols.txt b/config/ShieldD/rels/d_a_frD/symbols.txt index 1fbc1d1ea6..355033e5ec 100644 --- a/config/ShieldD/rels/d_a_frD/symbols.txt +++ b/config/ShieldD/rels/d_a_frD/symbols.txt @@ -125,5 +125,5 @@ lbl_70_data_2F8 = .data:0x000002F8; // type:object size:0x24 @117848 = .data:0x000004E0; // type:object size:0xC scope:local @117849 = .data:0x00000504; // type:object size:0x11 scope:local data:string @117850 = .data:0x0000052C; // type:object size:0xD scope:local data:string -l_initHIO = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000004; // type:object size:0x2C scope:global data:byte diff --git a/config/ShieldD/rels/d_a_kagoD/symbols.txt b/config/ShieldD/rels/d_a_kagoD/symbols.txt index 5ca8576a45..e13fe98947 100644 --- a/config/ShieldD/rels/d_a_kagoD/symbols.txt +++ b/config/ShieldD/rels/d_a_kagoD/symbols.txt @@ -313,5 +313,5 @@ lbl_256_data_530 = .data:0x00000530; // type:object size:0x24 @125862 = .data:0x00000738; // type:object size:0xC scope:local @125863 = .data:0x0000075C; // type:object size:0x11 scope:local data:string lbl_256_data_76D = .data:0x0000076D; // type:object size:0xB7 -l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000004; // type:object size:0x5C scope:global data:byte diff --git a/config/ShieldD/rels/d_a_obj_ice_sD/symbols.txt b/config/ShieldD/rels/d_a_obj_ice_sD/symbols.txt index 6579a71a39..b787c74786 100644 --- a/config/ShieldD/rels/d_a_obj_ice_sD/symbols.txt +++ b/config/ShieldD/rels/d_a_obj_ice_sD/symbols.txt @@ -94,5 +94,5 @@ __RTTI__12daObjIce_s_c = .data:0x00000160; // type:object size:0x8 scope:global @STRING@CreateHeap__12daObjIce_s_cFv@0 = .data:0x0000028C; // type:object size:0x12 scope:local data:string @STRING@CreateHeap__12daObjIce_s_cFv = .data:0x000002A0; // type:object size:0xA scope:local data:string lbl_468_data_2AA = .data:0x000002AA; // type:object size:0x72 -l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte +hio_set = .bss:0x00000000; // type:object size:0x1 data:byte l_HIO = .bss:0x00000008; // type:object size:0x10 scope:global data:byte diff --git a/include/d/actor/d_a_npc_cd2.h b/include/d/actor/d_a_npc_cd2.h index 90df576f0a..b306e36daa 100644 --- a/include/d/actor/d_a_npc_cd2.h +++ b/include/d/actor/d_a_npc_cd2.h @@ -20,43 +20,53 @@ enum AnmNum { CD2_ANM_14 = 14, }; +// Fake name +struct daNpcCd2_HIO_Jnt_UnkStruct_s { + /* 0x00 */ f32 field_0x00[3]; + /* 0x0C */ s16 field_0x0C[3]; +}; // Size: 0x14 + struct daNpcCd2_HIO_Jnt_c : public JORReflexible { virtual ~daNpcCd2_HIO_Jnt_c() {} daNpcCd2_HIO_Jnt_c() {} void genMessage(JORMContext*); - /* 0x04 */ f32 field_0x04[3]; - /* 0x10 */ s16 field_0x10[3]; + /* 0x04 */ daNpcCd2_HIO_Jnt_UnkStruct_s field_0x04; }; +// Fake name +struct daNpcCd2_HIO_Child_UnkStruct_s { + /* 0x00 */ s16 mMaxLmtX_BACKBONE; + /* 0x02 */ s16 mMaxLmtY_BACKBONE; + /* 0x04 */ s16 mMinLmtX_BACKBONE; + /* 0x06 */ s16 mMinLmtY_BACKBONE; + /* 0x08 */ s16 mMaxLmtX_NECK; + /* 0x0A */ s16 mMaxLmtY_NECK; + /* 0x0C */ s16 mMinLmtX_NECK; + /* 0x0E */ s16 mMinLmtY_NECK; + /* 0x10 */ s16 mMaxLmtX_HEAD; + /* 0x12 */ s16 mMaxLmtY_HEAD; + /* 0x14 */ s16 mMinLmtX_HEAD; + /* 0x16 */ s16 mMinLmtY_HEAD; + /* 0x18 */ f32 mScale; + /* 0x1C */ s16 mAttn; + /* 0x20 */ f32 mAnmPlaySpeed; + /* 0x24 */ f32 mWalkAnmPlaySpeed; + /* 0x28 */ f32 mMaxSpeed; + /* 0x2C */ f32 mWalkMaxSpeed; + /* 0x30 */ f32 mCylH; + /* 0x34 */ f32 mCylR; + /* 0x38 */ f32 mChkWallH; + /* 0x3C */ f32 mChkWallR; +}; // Size: 0x40 + struct daNpcCd2_HIO_MChild_c { virtual ~daNpcCd2_HIO_MChild_c() {} daNpcCd2_HIO_MChild_c() {} /* 0x004 */ daNpcCd2_HIO_Jnt_c field_0x004[19]; - /* 0x1CE */ s16 mMaxLmtX_BACKBONE; - /* 0x1CA */ s16 mMaxLmtY_BACKBONE; - /* 0x1CC */ s16 mMinLmtX_BACKBONE; - /* 0x1CE */ s16 mMinLmtY_BACKBONE; - /* 0x1D0 */ s16 mMaxLmtX_NECK; - /* 0x1D2 */ s16 mMaxLmtY_NECK; - /* 0x1D4 */ s16 mMinLmtX_NECK; - /* 0x1D6 */ s16 mMinLmtY_NECK; - /* 0x1D0 */ s16 mMaxLmtX_HEAD; - /* 0x1D2 */ s16 mMaxLmtY_HEAD; - /* 0x1D4 */ s16 mMinLmtX_HEAD; - /* 0x1D6 */ s16 mMinLmtY_HEAD; - /* 0x1E0 */ f32 mScale; - /* 0x1E4 */ s16 mAttn; - /* 0x1E8 */ f32 mAnmPlaySpeed; - /* 0x1EC */ f32 mWalkAnmPlaySpeed; - /* 0x1F0 */ f32 mMaxSpeed; - /* 0x1F4 */ f32 mWalkMaxSpeed; - /* 0x1F8 */ f32 mCylH; - /* 0x1FC */ f32 mCylR; - /* 0x200 */ f32 mChkWallH; - /* 0x204 */ f32 mChkWallR; + /* 0x1D0 */ daNpcCd2_HIO_Child_UnkStruct_s field_0x1D0; }; struct daNpcCd2_HIO_WChild_c { @@ -64,28 +74,7 @@ struct daNpcCd2_HIO_WChild_c { daNpcCd2_HIO_WChild_c() {} /* 0x004 */ daNpcCd2_HIO_Jnt_c field_0x004[21]; - /* 0x1FE */ s16 mMaxLmtX_BACKBONE; - /* 0x1FA */ s16 mMaxLmtY_BACKBONE; - /* 0x1FC */ s16 mMinLmtX_BACKBONE; - /* 0x1FE */ s16 mMinLmtY_BACKBONE; - /* 0x200 */ s16 mMaxLmtX_NECK; - /* 0x202 */ s16 mMaxLmtY_NECK; - /* 0x204 */ s16 mMinLmtX_NECK; - /* 0x206 */ s16 mMinLmtY_NECK; - /* 0x200 */ s16 mMaxLmtX_HEAD; - /* 0x202 */ s16 mMaxLmtY_HEAD; - /* 0x204 */ s16 mMinLmtX_HEAD; - /* 0x206 */ s16 mMinLmtY_HEAD; - /* 0x218 */ f32 mScale; - /* 0x21C */ s16 mAttn; - /* 0x220 */ f32 mAnmPlaySpeed; - /* 0x224 */ f32 mWalkAnmPlaySpeed; - /* 0x228 */ f32 mMaxSpeed; - /* 0x22C */ f32 mWalkMaxSpeed; - /* 0x230 */ f32 mCylH; - /* 0x234 */ f32 mCylR; - /* 0x238 */ f32 mChkWallH; - /* 0x23C */ f32 mChkWallR; + /* 0x1FC */ daNpcCd2_HIO_Child_UnkStruct_s field_0x1FC; }; struct daNpcCd2_HIO_c : public fOpAcm_HIO_entry_c { @@ -103,120 +92,120 @@ extern daNpcCd2_HIO_c l_Cd2_HIO; inline s16 Cd2_HIO_atnOfs(int param_1) { s16 rv; if (param_1 < 16) { - rv = l_Cd2_HIO.field_0x0004[param_1].mAttn; + rv = l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mAttn; } else { - rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].mAttn; + rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mAttn; } return rv; } inline f32 Cd2_HIO_objScale(int param_1) { - return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mScale : l_Cd2_HIO.field_0x20c4[param_1 - 16].mScale); + return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mScale : l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mScale); } inline f32 Cd2_HIO_walkMaxSpeed(int param_1) { - return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mWalkMaxSpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].mWalkMaxSpeed); + return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mWalkMaxSpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mWalkMaxSpeed); } inline f32 Cd2_HIO_walkAnmPlaySpeed(int param_1) { - return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mWalkAnmPlaySpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].mWalkAnmPlaySpeed); + return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mWalkAnmPlaySpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mWalkAnmPlaySpeed); } inline f32 Cd2_HIO_maxSpeed(int param_1) { - return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mMaxSpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].mMaxSpeed); + return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMaxSpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMaxSpeed); } inline f32 Cd2_HIO_anmPlaySpeed(int param_1) { - return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mAnmPlaySpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].mAnmPlaySpeed); + return (f32)(param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mAnmPlaySpeed : l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mAnmPlaySpeed); } inline f32 Cd2_HIO_chkWallH(int param_1) { - return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mChkWallH : l_Cd2_HIO.field_0x20c4[param_1 - 16].mChkWallH; + return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mChkWallH : l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mChkWallH; } inline f32 Cd2_HIO_chkWallR(int param_1) { - return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mChkWallR : l_Cd2_HIO.field_0x20c4[param_1 - 16].mChkWallR; + return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mChkWallR : l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mChkWallR; } inline f32 Cd2_HIO_cylR(int param_1) { - return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mCylR : l_Cd2_HIO.field_0x20c4[param_1 - 16].mCylR; + return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mCylR : l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mCylR; } inline f32 Cd2_HIO_cylH(int param_1) { - return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].mCylH : l_Cd2_HIO.field_0x20c4[param_1 - 16].mCylH; + return param_1 < 16 ? l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mCylH : l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mCylH; } inline s16 Cd2_HIO_maxLmtX_BACKBONE(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMaxLmtX_BACKBONE : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMaxLmtX_BACKBONE); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMaxLmtX_BACKBONE : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMaxLmtX_BACKBONE); } inline s16 Cd2_HIO_maxLmtY_BACKBONE(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMaxLmtY_BACKBONE : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMaxLmtY_BACKBONE); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMaxLmtY_BACKBONE : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMaxLmtY_BACKBONE); } inline s16 Cd2_HIO_maxLmtX_NECK(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMaxLmtX_NECK : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMaxLmtX_NECK); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMaxLmtX_NECK : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMaxLmtX_NECK); } inline s16 Cd2_HIO_maxLmtY_NECK(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMaxLmtY_NECK : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMaxLmtY_NECK); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMaxLmtY_NECK : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMaxLmtY_NECK); } inline s16 Cd2_HIO_maxLmtX_HEAD(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMaxLmtX_HEAD : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMaxLmtX_HEAD); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMaxLmtX_HEAD : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMaxLmtX_HEAD); } inline s16 Cd2_HIO_maxLmtY_HEAD(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMaxLmtY_HEAD : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMaxLmtY_HEAD); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMaxLmtY_HEAD : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMaxLmtY_HEAD); } inline s16 Cd2_HIO_minLmtX_BACKBONE(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMinLmtX_BACKBONE : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMinLmtX_BACKBONE); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMinLmtX_BACKBONE : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMinLmtX_BACKBONE); } inline s16 Cd2_HIO_minLmtY_BACKBONE(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMinLmtY_BACKBONE : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMinLmtY_BACKBONE); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMinLmtY_BACKBONE : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMinLmtY_BACKBONE); } inline s16 Cd2_HIO_minLmtX_NECK(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMinLmtX_NECK : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMinLmtX_NECK); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMinLmtX_NECK : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMinLmtX_NECK); } inline s16 Cd2_HIO_minLmtY_NECK(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMinLmtY_NECK : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMinLmtY_NECK); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMinLmtY_NECK : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMinLmtY_NECK); } inline s16 Cd2_HIO_minLmtX_HEAD(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMinLmtX_HEAD : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMinLmtX_HEAD); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMinLmtX_HEAD : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMinLmtX_HEAD); } inline s16 Cd2_HIO_minLmtY_HEAD(int param_1) { return (s16)(param_1 < 16 ? - l_Cd2_HIO.field_0x0004[param_1].mMinLmtY_HEAD : - l_Cd2_HIO.field_0x20c4[param_1 - 16].mMinLmtY_HEAD); + l_Cd2_HIO.field_0x0004[param_1].field_0x1D0.mMinLmtY_HEAD : + l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x1FC.mMinLmtY_HEAD); } class PathTrace_c { diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index 855e46cf70..876804d584 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -154,8 +154,6 @@ void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3, JSUList JUTException::sMapFileList(false); -static OSContext context; - void JUTException::panic_f_va(char const* file, int line, char const* format, va_list args) { char buffer[256]; vsnprintf(buffer, sizeof(buffer) - 1, format, args); @@ -164,6 +162,7 @@ void JUTException::panic_f_va(char const* file, int line, char const* format, va } OSContext* current_context = OSGetCurrentContext(); + static OSContext context; memcpy(&context, current_context, sizeof(OSContext)); sErrorManager->mStackPointer = (uintptr_t)OSGetStackPointer(); diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index bc67ac8799..e4531267cd 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -95,7 +95,7 @@ static int daB_BH_Draw(b_bh_class* i_this) { } /* 805B33ED 0003+00 data_805B33ED None */ -static u8 l_initHIO; +static u8 hio_set; static daB_BH_HIO_c l_HIO; @@ -1414,7 +1414,7 @@ static int daB_BH_Delete(b_bh_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "B_BH"); if (i_this->mInitHIO) { - l_initHIO = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.no); } @@ -1489,9 +1489,9 @@ static int daB_BH_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////B_BH SET 2 !!\n"); - if (!l_initHIO) { + if (!hio_set) { a_this->mInitHIO = TRUE; - l_initHIO = TRUE; + hio_set = TRUE; l_HIO.no = mDoHIO_CREATE_CHILD("ボスババ触手", &l_HIO); } diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index 0a46a17e15..b651124000 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -281,8 +281,8 @@ daB_DR_HIO_c::daB_DR_HIO_c() { breath_feint2_OFF = true; } -/* 805C78FD 0003+00 l_initHIO None */ -static u8 l_initHIO; +/* 805C78FD 0003+00 hio_set None */ +static u8 hio_set; static daB_DR_HIO_c l_HIO; @@ -3962,7 +3962,7 @@ int daB_DR_c::_delete() { } if (mInitHIO) { - l_initHIO = 0; + hio_set = 0; } if (heap != NULL) { @@ -4137,8 +4137,8 @@ int daB_DR_c::create() { health = 24; field_0x560 = 24; - if (!l_initHIO) { - l_initHIO = true; + if (!hio_set) { + hio_set = true; mInitHIO = true; l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("翼竜", &l_HIO); } diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 9312f5ad89..c559e6d25f 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -199,7 +199,7 @@ daB_DS_HIO_c::daB_DS_HIO_c() { mP2HealthDebugOn = false; } -static bool hioInit; +static bool hio_set; static daB_DS_HIO_c l_HIO; @@ -5261,7 +5261,7 @@ int daB_DS_c::_delete() { } if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { @@ -5507,8 +5507,8 @@ cPhs__Step daB_DS_c::create() { field_0x560 = health = l_HIO.mP2Health; - if (!hioInit) { - hioInit = 1; + if (!hio_set) { + hio_set = 1; mHIOInit = true; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index d75a2f8cf2..d8699bcd21 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -269,8 +269,7 @@ void daB_GG_c::initCc() { } } -/* 805ED6FD 0003+00 l_HIOInit None */ -static u8 l_HIOInit; +static u8 hio_set; static daB_GG_HIO_c l_HIO; @@ -4194,7 +4193,7 @@ int daB_GG_c::Delete() { dComIfG_resDelete(&mPhase, "B_gg"); if (mHIOInit) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -4288,8 +4287,8 @@ int daB_GG_c::Create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = TRUE; + if (!hio_set) { + hio_set = TRUE; mHIOInit = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("ガーゴイル", &l_HIO); } diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index c7b21c7e9e..78b33acb7c 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -164,7 +164,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { return 1; } -static u8 l_initHIO; +static u8 hio_set; static daB_GM_HIO_c l_HIO; @@ -1999,7 +1999,7 @@ static int daB_GM_Delete(b_gm_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "B_gm"); if (i_this->mInitHIO) { - l_initHIO = false; + hio_set = false; } if (a_this->heap != NULL) { @@ -2088,9 +2088,9 @@ static int daB_GM_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////B_GM SET 2 !!\n"); - if (!l_initHIO) { + if (!hio_set) { a_this->mInitHIO = true; - l_initHIO = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 0ada4dd212..838ef2cbd0 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -193,7 +193,7 @@ enum daB_GND_ACTION { ACTION_END = 22, }; -static u8 l_initHIO; +static u8 hio_set; daB_GND_HIO_c::daB_GND_HIO_c() { no = -1; @@ -4572,7 +4572,7 @@ static int daB_GND_Delete(b_gnd_class* i_this) { dComIfG_resDelete(&i_this->mHorsePhaseReq, "B_hg"); if (i_this->mInitHIO) { - l_initHIO = false; + hio_set = false; } if (a_this->heap != NULL) { @@ -4783,9 +4783,9 @@ static int daB_GND_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (!l_initHIO) { + if (!hio_set) { i_this->mInitHIO = true; - l_initHIO = true; + hio_set = true; l_HIO.no = mDoHIO_CREATE_CHILD("ガノンドロフ", &l_HIO); } diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index 78122845a6..1c83092489 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -279,7 +279,7 @@ int daB_MGN_c::JointCallBack(J3DJoint* i_joint, int param_1) { return 1; } -static u8 l_initHIO; +static u8 hio_set; static daB_MGN_HIO_c l_HIO; @@ -3367,7 +3367,7 @@ int daB_MGN_c::_delete() { dComIfG_resDelete(&mMgnePhase, "B_mgne"); if (mInitHIO) { - l_initHIO = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.no); } @@ -3511,8 +3511,8 @@ int daB_MGN_c::create() { return cPhs_ERROR_e; } - if (!l_initHIO) { - l_initHIO = TRUE; + if (!hio_set) { + hio_set = TRUE; mInitHIO = TRUE; l_HIO.no = mDoHIO_CREATE_CHILD("豚ガノン", &l_HIO); } diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index ffdc8f3538..b3e1e19328 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -343,7 +343,7 @@ void daB_TN_c::calcWaistAngle() { } /* 8062F01D 0003+00 data_8062F01D None */ -static u8 s_hioinit; +static u8 hio_set; static daB_TN_HIO_c l_HIO; @@ -4913,7 +4913,7 @@ int daB_TN_c::_delete() { dComIfG_resDelete(&mPhaseReq1, "B_tn"); dComIfG_resDelete(&mPhaseReq2, mArcName); if (mHioInit) { - s_hioinit = 0; + hio_set = 0; } if (heap != NULL) { @@ -5073,8 +5073,8 @@ int daB_TN_c::create() { return cPhs_ERROR_e; } - if (s_hioinit == 0) { - s_hioinit = 1; + if (hio_set == 0) { + hio_set = 1; mHioInit = 1; l_HIO.mUnk1 = -1; } diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index c7625f788d..ce7a543f18 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -123,7 +123,7 @@ enum L5_R50_RES_FIL_ID { }; /* 80639F74 0001+00 data_80639F74 @1009 */ -static bool hioInit; +static bool hio_set; static daB_YO_HIO_c l_HIO; @@ -3074,7 +3074,7 @@ int daB_YO_c::_delete() { dComIfG_resDelete(&mPhase5, "E_FZ"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (mpRoomArenaBgW != NULL) { @@ -3305,8 +3305,8 @@ cPhs__Step daB_YO_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index c6f4eb6d93..58a2133e02 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -27,7 +27,7 @@ public: STATIC_ASSERT(sizeof(daB_YOI_HIO_c) == 0x10); -static bool hioInit; +static bool hio_set; static daB_YOI_HIO_c l_HIO; @@ -968,7 +968,7 @@ int daB_YOI_c::_delete() { dComIfG_resDelete(&mPhase, "B_YO"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { @@ -1013,8 +1013,8 @@ cPhs__Step daB_YOI_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index 4a1f56fd0e..f8092cfa85 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -399,8 +399,8 @@ void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) { } } -/* 8064F5F5 0003+00 l_initHIO None */ -static u8 l_initHIO; +/* 8064F5F5 0003+00 hio_set None */ +static u8 hio_set; static daB_ZANT_HIO_c l_HIO; @@ -5364,7 +5364,7 @@ int daB_ZANT_c::_delete() { dComIfG_resDelete(&mPhase, "B_zan"); if (mInitHIO) { - l_initHIO = false; + hio_set = false; } if (heap != NULL) { @@ -5487,8 +5487,8 @@ int daB_ZANT_c::create() { return cPhs_ERROR_e; } - if (!l_initHIO) { - l_initHIO = true; + if (!hio_set) { + hio_set = true; mInitHIO = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index afcd9b98d4..4bec7cbca0 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -337,7 +337,7 @@ void daB_ZANTZ_c::cc_set() { } } -static u8 l_initHIO; +static u8 hio_set; static daB_ZANTZ_HIO_c l_HIO; @@ -380,7 +380,7 @@ static int daB_ZANTZ_IsDelete(daB_ZANTZ_c* i_this) { int daB_ZANTZ_c::_delete() { if (mInitHIO) { - l_initHIO = false; + hio_set = false; } dComIfG_resDelete(&mPhase, "B_oh"); @@ -441,8 +441,8 @@ int daB_ZANTZ_c::create() { return cPhs_ERROR_e; } - if (!l_initHIO) { - l_initHIO = true; + if (!hio_set) { + hio_set = true; mInitHIO = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 92ad841bb3..9c71ef8564 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -45,7 +45,7 @@ static land_pos land_pos127[20] = { static int wait_bck[3] = {ANM_PITA_LEFTUP, ANM_PITA_RIGHT, ANM_PITA_DOWN}; -static u8 l_HIOInit; +static u8 hio_set; static daBd_HIO_c l_HIO; static cXyz land_sp_pos[4] = { @@ -933,7 +933,7 @@ static int daBd_Delete(bd_class* i_this) { fopAcM_RegisterDeleteID(i_this, "Bd"); dComIfG_resDelete(&i_this->mPhase, "Bd"); if (i_this->field_0x9E8 != 0) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } if (a_this->heap != 0) { @@ -989,9 +989,9 @@ static int daBd_Create(fopAc_ac_c* i_act_this) { return cPhs_ERROR_e; } OS_REPORT("//////////////BD SET 2 !!\n"); - if (l_HIOInit == 0) { + if (hio_set == 0) { i_this->field_0x9E8 = 1; - l_HIOInit = 1; + hio_set = 1; l_HIO.id = mDoHIO_CREATE_CHILD("小鳥", (JORReflexible*)&l_HIO); } fopAcM_SetMtx(i_act_this, i_this->mpMorf->getModel()->getBaseTRMtx()); diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 4435487b75..af480cb457 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -397,7 +397,7 @@ int daCstatue_c::create() { return result; } -static int daCstatue_Create(void* actor) { +static int daCstatue_Create(fopAc_ac_c* actor) { return static_cast(actor)->create(); } @@ -413,7 +413,7 @@ daCstatue_c::~daCstatue_c() { dComIfG_resDelete(&mPhaseReq, mResName); } -static int daCstatue_Delete(void* actor) { +static int daCstatue_Delete(daCstatue_c* actor) { static_cast(actor)->~daCstatue_c(); return cPhs_LOADING_e; } @@ -1166,7 +1166,7 @@ int daCstatue_c::execute() { return 1; } -static int daCstatue_Execute(void* actor) { +static int daCstatue_Execute(daCstatue_c* actor) { return static_cast(actor)->execute(); } @@ -1200,12 +1200,16 @@ int daCstatue_c::draw() { return 1; } -static int daCstatue_Draw(void* actor) { +static int daCstatue_Draw(daCstatue_c* actor) { return static_cast(actor)->draw(); } static actor_method_class l_daCstatue_Method = { - daCstatue_Create, daCstatue_Delete, daCstatue_Execute, NULL, daCstatue_Draw, + (process_method_func)daCstatue_Create, + (process_method_func)daCstatue_Delete, + (process_method_func)daCstatue_Execute, + (process_method_func)NULL, + (process_method_func)daCstatue_Draw, }; extern actor_process_profile_definition g_profile_CSTATUE = { diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index ed82391076..2d02b3fe40 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -18,7 +18,7 @@ /* 8066F2B6 0002+00 data_8066F2B6 None */ static bool noFallCheck; -static bool hioInit; +static bool hio_set; static daDo_HIO_c l_HIO; @@ -2346,7 +2346,7 @@ static int daDo_Delete(do_class* i_this) { u32 actor_id = fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhase, "Do"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (i_this->heap) { i_this->mSound.deleteObject(); @@ -2425,9 +2425,9 @@ static cPhs__Step daDo_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = 1; + hio_set = 1; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index f689d3f209..633b2e2b43 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -50,9 +50,8 @@ char* daDoor20_c::getArcName() { } } -static char bmdName[32]; - char* daDoor20_c::getBmdName() { + static char bmdName[32]; switch(door_param2_c::getKind(this)) { case 0: case 1: @@ -1524,110 +1523,109 @@ void daDoor20_c::startDemoProc() { } } -static char* table[19] = { - "DEFAULT_STOP_OPEN", - "DEFAULT_STOP_OPEN", - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, -}; - -static char* tate_table[4] = { - "DEFAULT_SHUTTER_DOOR_10", - "DEFAULT_SHUTTER_DOOR_10", - "DEFAULT_SHUTTER_DOOR_F_STOP", - "DEFAULT_SHUTTER_DOOR_F_STOP", -}; - -static char* tate_w_table[4] = { - "WOLF_SHUTTER_DOOR_10", - "WOLF_SHUTTER_DOOR_10", - "WOLF_SHUTTER_DOOR_F_STOP", - "WOLF_SHUTTER_DOOR_F_STOP", -}; - -static char* yoko_table[4] = { - "DEFAULT_SHUTTER_DOOR_14", - "DEFAULT_SHUTTER_DOOR_14", - "DEFAULT_SHUTTER_DOOR_F_STOP_14", - "DEFAULT_SHUTTER_DOOR_F_STOP_14", -}; - -static char* yoko_w_table[4] = { - "WOLF_SHUTTER_DOOR_14", - "WOLF_SHUTTER_DOOR_14", - "WOLF_SHUTTER_DOOR_F_STOP_14", - "WOLF_SHUTTER_DOOR_F_STOP_14", -}; - -static char* lv8_table[4] = { - "DEFAULT_SHUTTER_DOOR_18", - "DEFAULT_SHUTTER_DOOR_18", - "DEFAULT_SHUTTER_DOOR_F_STOP_18", - "DEFAULT_SHUTTER_DOOR_F_STOP_18", -}; - -static char* lv8_w_table[4] = { - "WOLF_SHUTTER_DOOR_18", - "WOLF_SHUTTER_DOOR_18", - "WOLF_SHUTTER_DOOR_F_STOP_18", - "WOLF_SHUTTER_DOOR_F_STOP_18", -}; - -static char* knob_table[7] = { - "DEFAULT_KNOB_DOOR_F", - "DEFAULT_KNOB_DOOR_B", - "DEFAULT_KNOB_DOOR_F_STOP", - "DEFAULT_KNOB_DOOR_B_STOP", - "DEFAULT_KNOB_DOOR_NOTOPEN_F", - "DEFAULT_KNOB_DOOR_NOTOPEN_B", - "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F", -}; - -static char* lv7_table[4] = { - "DEFAULT_SHUTTER_DOOR_20", - "DEFAULT_SHUTTER_DOOR_20", - "DEFAULT_SHUTTER_DOOR_F_STOP_20", - "DEFAULT_SHUTTER_DOOR_F_STOP_20", -}; - -static char* lv7_w_table[4] = { - "WOLF_SHUTTER_DOOR_20", - "WOLF_SHUTTER_DOOR_20", - "WOLF_SHUTTER_DOOR_F_STOP_20", - "WOLF_SHUTTER_DOOR_F_STOP_20", -}; - -static char* lv9_table[4] = { - "DEFAULT_SHUTTER_DOOR_22", - "DEFAULT_SHUTTER_DOOR_22", - "DEFAULT_SHUTTER_DOOR_F_STOP_22", - "DEFAULT_SHUTTER_DOOR_F_STOP_22", -}; - -static char* lv9_w_table[4] = { - "WOLF_SHUTTER_DOOR_22", - "WOLF_SHUTTER_DOOR_22", - "WOLF_SHUTTER_DOOR_F_STOP_22", - "WOLF_SHUTTER_DOOR_F_STOP_22", -}; - - void daDoor20_c::makeEventId() { + static char* table[19] = { + "DEFAULT_STOP_OPEN", + "DEFAULT_STOP_OPEN", + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + }; + + static char* tate_table[4] = { + "DEFAULT_SHUTTER_DOOR_10", + "DEFAULT_SHUTTER_DOOR_10", + "DEFAULT_SHUTTER_DOOR_F_STOP", + "DEFAULT_SHUTTER_DOOR_F_STOP", + }; + + static char* tate_w_table[4] = { + "WOLF_SHUTTER_DOOR_10", + "WOLF_SHUTTER_DOOR_10", + "WOLF_SHUTTER_DOOR_F_STOP", + "WOLF_SHUTTER_DOOR_F_STOP", + }; + + static char* yoko_table[4] = { + "DEFAULT_SHUTTER_DOOR_14", + "DEFAULT_SHUTTER_DOOR_14", + "DEFAULT_SHUTTER_DOOR_F_STOP_14", + "DEFAULT_SHUTTER_DOOR_F_STOP_14", + }; + + static char* yoko_w_table[4] = { + "WOLF_SHUTTER_DOOR_14", + "WOLF_SHUTTER_DOOR_14", + "WOLF_SHUTTER_DOOR_F_STOP_14", + "WOLF_SHUTTER_DOOR_F_STOP_14", + }; + + static char* lv8_table[4] = { + "DEFAULT_SHUTTER_DOOR_18", + "DEFAULT_SHUTTER_DOOR_18", + "DEFAULT_SHUTTER_DOOR_F_STOP_18", + "DEFAULT_SHUTTER_DOOR_F_STOP_18", + }; + + static char* lv8_w_table[4] = { + "WOLF_SHUTTER_DOOR_18", + "WOLF_SHUTTER_DOOR_18", + "WOLF_SHUTTER_DOOR_F_STOP_18", + "WOLF_SHUTTER_DOOR_F_STOP_18", + }; + + static char* knob_table[7] = { + "DEFAULT_KNOB_DOOR_F", + "DEFAULT_KNOB_DOOR_B", + "DEFAULT_KNOB_DOOR_F_STOP", + "DEFAULT_KNOB_DOOR_B_STOP", + "DEFAULT_KNOB_DOOR_NOTOPEN_F", + "DEFAULT_KNOB_DOOR_NOTOPEN_B", + "DEFAULT_KNOB_DOOR_TALK_NOTOPEN_F", + }; + + static char* lv7_table[4] = { + "DEFAULT_SHUTTER_DOOR_20", + "DEFAULT_SHUTTER_DOOR_20", + "DEFAULT_SHUTTER_DOOR_F_STOP_20", + "DEFAULT_SHUTTER_DOOR_F_STOP_20", + }; + + static char* lv7_w_table[4] = { + "WOLF_SHUTTER_DOOR_20", + "WOLF_SHUTTER_DOOR_20", + "WOLF_SHUTTER_DOOR_F_STOP_20", + "WOLF_SHUTTER_DOOR_F_STOP_20", + }; + + static char* lv9_table[4] = { + "DEFAULT_SHUTTER_DOOR_22", + "DEFAULT_SHUTTER_DOOR_22", + "DEFAULT_SHUTTER_DOOR_F_STOP_22", + "DEFAULT_SHUTTER_DOOR_F_STOP_22", + }; + + static char* lv9_w_table[4] = { + "WOLF_SHUTTER_DOOR_22", + "WOLF_SHUTTER_DOOR_22", + "WOLF_SHUTTER_DOOR_F_STOP_22", + "WOLF_SHUTTER_DOOR_F_STOP_22", + }; + for (int i = 0; i < 19; i++) { field_0x692[i] = dComIfGp_getEventManager().getEventIdx(this, table[i], 0xff); field_0x6b8[i] = 0xff; @@ -1831,39 +1829,38 @@ void daDoor20_c::getRestartPos(cXyz* param_1) { param_1->z = current.pos.z - fVar1 * field_0x680.z; } -static char* action_table[29] = { - "WAIT", - "STOP_OPEN", - "STOP_CLOSE", - "OPEN", - "CLOSE", - "SMOKE", - "SMOKE_END", - "SETGOAL", - "UNLOCK", - "SETSTART", - "SETANGLE", - "ADJUSTMENT", - "OPEN_PUSH", - "OPEN_PULL", - "OPEN_PUSH2", - "OPEN_PULL2", - "TALK", - "SETSTART_PUSH", - "SETSTART_PULL", - "END_CHECK", - "DROP_BF", - "DROP_AF", - "DELETE_LOCK", - "OPEN_INIT", - "ADJUSTMENT2", - "NOT_OPEN", - "MESSAGE", - "LIGHT_ANM", - "LIGHT_ANM2", -}; - int daDoor20_c::getDemoAction() { + static char* action_table[29] = { + "WAIT", + "STOP_OPEN", + "STOP_CLOSE", + "OPEN", + "CLOSE", + "SMOKE", + "SMOKE_END", + "SETGOAL", + "UNLOCK", + "SETSTART", + "SETANGLE", + "ADJUSTMENT", + "OPEN_PUSH", + "OPEN_PULL", + "OPEN_PUSH2", + "OPEN_PULL2", + "TALK", + "SETSTART_PUSH", + "SETSTART_PULL", + "END_CHECK", + "DROP_BF", + "DROP_AF", + "DELETE_LOCK", + "OPEN_INIT", + "ADJUSTMENT2", + "NOT_OPEN", + "MESSAGE", + "LIGHT_ANM", + "LIGHT_ANM2", + }; return dComIfGp_evmng_getMyActIdx(field_0x6cc, action_table, 29, 0, 0); } diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index 87f0764873..5852c7858e 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -338,7 +338,7 @@ void e_ai_class::damage_check() { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_AI_HIO_c l_HIO; @@ -828,7 +828,7 @@ int e_ai_class::Delete() { dComIfG_resDelete(&m_phase, "E_AI"); if (m_HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -902,8 +902,8 @@ int e_ai_class::Create() { } OS_REPORT("//////////////E_AI SET 2 !!\n"); - if (!l_HIOInit) { - l_HIOInit = TRUE; + if (!hio_set) { + hio_set = TRUE; m_HIOInit = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("アモス", &l_HIO); } diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index 11d7757715..9e91eb2808 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -29,7 +29,7 @@ public: STATIC_ASSERT(sizeof(daE_BA_HIO_c) == 0x1C); -static bool hioInit; +static bool hio_set; static daE_BA_HIO_c l_HIO; @@ -968,7 +968,7 @@ static int daE_BA_Delete(e_ba_class* i_this) { fopEn_enemy_c* a_this = &i_this->mEnemy; dComIfG_resDelete(&i_this->mPhase, i_this->mArcName); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (a_this->heap != NULL) { i_this->mpMorf->stopZelAnime(); @@ -1057,9 +1057,9 @@ static cPhs__Step daE_BA_Create(fopAc_ac_c* i_this) { } } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index 7a3b5e46fd..e518312df7 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -16,7 +16,7 @@ #include "Z2AudioLib/Z2Instances.h" /* 80685675 0003+00 data_80685675 None */ -static bool hioInit; +static bool hio_set; static daE_Bee_HIO_c l_HIO; @@ -671,7 +671,7 @@ static int daE_Bee_Delete(e_bee_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_bee"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { @@ -738,9 +738,9 @@ static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index be5ab07f42..317653b21f 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -239,7 +239,7 @@ fopAc_ac_c* daE_BG_c::search_esa() { } } -static u8 l_initHIO; +static u8 hio_set; static daE_BG_HIO_c l_HIO; @@ -1271,7 +1271,7 @@ int daE_BG_c::_delete() { dComIfG_resDelete(&mPhaseReq, "E_BG"); if (mHIOInit) { - l_initHIO = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.field_0x4); } @@ -1349,8 +1349,8 @@ int daE_BG_c::create() { return cPhs_ERROR_e; } - if (l_initHIO == FALSE) { - l_initHIO = 1; + if (hio_set == FALSE) { + hio_set = 1; mHIOInit = 1; l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("爆弾魚", &l_HIO); } diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index 9d62c814f2..47be524d05 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -183,7 +183,7 @@ static void damage_check(e_bi_class* i_this) { /* 8068DB1C 0001+00 data_8068DB1C @1009 */ /* 8068DB1D 0003+00 data_8068DB1D None */ -static u8 l_initHIO; +static u8 hio_set; static daE_BI_HIO_c l_HIO; @@ -843,7 +843,7 @@ static int daE_BI_Delete(e_bi_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_BI"); if (i_this->hio_init != 0) { - l_initHIO = 0; + hio_set = 0; } if (actor->heap != NULL) { @@ -896,9 +896,9 @@ static cPhs__Step daE_BI_Create(fopAc_ac_c* actor) { return phase; } - if (l_initHIO == 0) { + if (hio_set == 0) { i_this->hio_init = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.no = -1; } diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index 1abedf4744..3f40108d5c 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -198,7 +198,7 @@ static void e_bs_appear(e_bs_class* i_this) { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_BS_HIO_c l_HIO; @@ -783,7 +783,7 @@ static int daE_BS_Delete(e_bs_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_BS"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -848,9 +848,9 @@ static int daE_BS_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("ベビースタル", &l_HIO); } diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index d820bc4123..3bcab8c744 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -92,7 +92,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { return 1; } -static u8 l_HIOInit; +static u8 hio_set; static daE_BU_HIO_c l_HIO; @@ -994,7 +994,7 @@ static int daE_BU_Delete(e_bu_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_BU"); if (i_this->HIOInit != 0) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1076,9 +1076,9 @@ static int daE_BU_Create(fopAc_ac_c* i_this) { a_this->action = ACTION_FLY; } - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("バブル", &l_HIO); } diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index 8089ea8704..1e57cd2415 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -25,7 +25,7 @@ daE_Bug_HIO_c::daE_Bug_HIO_c() { /* 80697E6C 0001+00 data_80697E6C @1009 */ /* 80697E6D 0003+00 data_80697E6D None */ -static u8 l_initHIO; +static u8 hio_set; static daE_Bug_HIO_c l_HIO; @@ -768,7 +768,7 @@ static int daE_Bug_Delete(e_bug_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_bug"); if (i_this->field_0x7dac != 0) { - l_initHIO = 0; + hio_set = 0; } if (a_this->heap != NULL) { @@ -831,9 +831,9 @@ static cPhs__Step daE_Bug_Create(fopAc_ac_c* a_this) { } OS_REPORT("//////////////E_BUG SET 2 !!\n"); - if (l_initHIO == 0) { + if (hio_set == 0) { i_this->field_0x7dac = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index 4ee02f5626..509b2b691d 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -162,7 +162,7 @@ static BOOL way_bg_check(e_cr_class* a_this, f32 param_1) { return FALSE; } -static u8 l_HIOInit; +static u8 hio_set; static daE_CR_HIO_c l_HIO; @@ -447,7 +447,7 @@ static int daE_CR_Delete(e_cr_class* a_this) { dComIfG_resDelete(&a_this->phase, "E_CR"); if (a_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -495,9 +495,9 @@ static int daE_CR_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////E_CR SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("クレイジーランナー", &l_HIO); } diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index f29b02251b..1698612837 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -265,7 +265,7 @@ static void damage_check(e_db_class* i_this) { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_DB_HIO_c l_HIO; @@ -2019,7 +2019,7 @@ static int daE_DB_Delete(e_db_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_db"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -2102,9 +2102,9 @@ static int daE_DB_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////E_DB SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("デグババ", &l_HIO); } diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index 33b3f8fa3c..692d48d7d1 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -336,7 +336,7 @@ static BOOL way_bg_check(e_dd_class* i_this, f32 param_2) { return FALSE; } -u8 l_initHIO; +u8 hio_set; static daE_DD_HIO_c l_HIO; @@ -1560,7 +1560,7 @@ static int daE_DD_Delete(e_dd_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_dd"); if (i_this->field_0xe90 != 0) { - l_initHIO = 0; + hio_set = 0; } if (a_this->heap != NULL) { @@ -1700,9 +1700,9 @@ static cPhs__Step daE_DD_Create(fopAc_ac_c* a_this) { } } - if (l_initHIO == 0) { + if (hio_set == 0) { i_this->field_0xe90 = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index 0f35f2d978..5e5376bc66 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -166,7 +166,7 @@ int daE_DF_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { return 1; } -static u8 l_initHIO; +static u8 hio_set; static daE_DF_HIO_c l_HIO; @@ -609,7 +609,7 @@ int daE_DF_c::Draw() { int daE_DF_c::Delete() { dComIfG_resDelete(&mPhaseReq, "E_DF"); if (mHIOInit) { - l_initHIO = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.mNo); } if (heap != NULL) { @@ -661,8 +661,8 @@ int daE_DF_c::Create() { return cPhs_ERROR_e; } - if (!l_initHIO) { - l_initHIO = TRUE; + if (!hio_set) { + hio_set = TRUE; mHIOInit = TRUE; l_HIO.mNo = mDoHIO_CREATE_CHILD("デクレシア", &l_HIO); } diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index f547d690e5..2c95e4759e 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -355,7 +355,7 @@ static BOOL other_bg_check2(e_dn_class* i_this, cXyz* i_pos) { } /* 804EEF2D 0003+00 data_804EEF2D None */ -u8 l_initHIO; +u8 hio_set; daE_DN_HIO_c l_HIO; @@ -3288,7 +3288,7 @@ static int daE_DN_Delete(e_dn_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_dn"); if (i_this->hio_init != 0) { - l_initHIO = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.no); } @@ -3396,9 +3396,9 @@ static cPhs__Step daE_DN_Create(fopAc_ac_c* actor) { return cPhs_ERROR_e; } - if (l_initHIO == 0) { + if (hio_set == 0) { i_this->hio_init = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.no = mDoHIO_CREATE_CHILD("リザードマン", &l_HIO); } diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 64a0962fa7..548b763633 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -157,7 +157,7 @@ dCcD_SrcSph E_DT_n::cc_dt_tongue_src = { }; /* 806B629D 0003+00 data_806B629D None */ -static bool hioInit; +static bool hio_set; static daE_DT_HIO_c l_HIO; @@ -2401,7 +2401,7 @@ int daE_DT_c::_delete() { dComIfG_resDelete(&mPhase[1], "Dalways"); dComIfG_resDelete(&mPhase[2], "E_OT"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { mSound.deleteObject(); @@ -2485,8 +2485,8 @@ cPhs__Step daE_DT_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index ec5b2e38bb..4e0888721e 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -127,7 +127,7 @@ static f32 dummy_117095() { } #endif -bool l_HIOInit; +bool hio_set; static daE_FB_HIO_c l_HIO; @@ -857,7 +857,7 @@ int daE_FB_c::_delete() { } if (mHIOInit) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -942,8 +942,8 @@ cPhs__Step daE_FB_c::create() { return cPhs_ERROR_e; } - if (l_HIOInit == false) { - l_HIOInit = true; + if (hio_set == false) { + hio_set = true; mHIOInit = 1; l_HIO.mId = mDoHIO_CREATE_CHILD("フリザド（大）", &l_HIO); } diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index a8cd7c4061..0ceb54aca4 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -106,7 +106,7 @@ void daE_FK_c::initSwordSph() { OnAt(); } -static u8 l_HIOInit; +static u8 hio_set; static daE_FK_HIO_c l_HIO; @@ -671,7 +671,7 @@ int daE_FK_c::Delete() { dComIfG_resDelete(&mPhase, "E_fk"); if (mHIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -743,8 +743,8 @@ int daE_FK_c::Create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = TRUE; + if (!hio_set) { + hio_set = TRUE; mHIOInit = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("ファントム騎馬兵", &l_HIO); } diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 12695a2e6c..2b81b30437 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -235,7 +235,7 @@ static void* s_fmobj_del(void* i_actor, void* i_data) { } /* 804FAE95 0003+00 data_804FAE95 None */ -static u8 l_initHIO; +static u8 hio_set; static daE_FM_HIO_c l_HIO; @@ -3458,7 +3458,7 @@ static int daE_FM_Delete(e_fm_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_fm"); if (i_this->mInitHIO != 0) { - l_initHIO = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.no); } @@ -3773,9 +3773,9 @@ static int daE_FM_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////E_FM SET 2 !!\n"); - if (!l_initHIO) { + if (!hio_set) { a_this->mInitHIO = TRUE; - l_initHIO = TRUE; + hio_set = TRUE; l_HIO.no = mDoHIO_CREATE_CHILD("火魔人", &l_HIO); } diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index a7787262eb..4e0188535c 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -72,7 +72,7 @@ static s16 s_AtCount; } // namespace -static bool hioInit; +static bool hio_set; static daE_Fs_HIO_c l_HIO; @@ -696,7 +696,7 @@ static int daE_Fs_Delete(e_fs_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_FS"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (a_this->heap != NULL) { @@ -771,9 +771,9 @@ static cPhs__Step daE_Fs_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp index ffa924646e..0878eb9688 100644 --- a/src/d/actor/d_a_e_ga.cpp +++ b/src/d/actor/d_a_e_ga.cpp @@ -151,7 +151,7 @@ static int daE_Ga_IsDelete(e_ga_class* a_this) { return 1; } -static u8 l_HIOInit; +static u8 hio_set; static int daE_Ga_Delete(e_ga_class* a_this) { fopAc_ac_c* actor = &a_this->actor; @@ -165,7 +165,7 @@ static int daE_Ga_Delete(e_ga_class* a_this) { dComIfG_resDelete(&a_this->phase, "E_ga"); if (a_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; } return 1; @@ -222,9 +222,9 @@ static int daE_Ga_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////E_GA SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = -1; } diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index 745e3dbedb..2cdce165c6 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -46,7 +46,7 @@ enum daE_GE_Action { /* 9 */ ACTION_MAX }; -static u8 l_HIOInit; +static u8 hio_set; static daE_GE_HIO_c l_HIO; @@ -1241,7 +1241,7 @@ int daE_GE_c::_delete() { dComIfG_resDelete(&mPhaseReq, "E_GE"); if (mHIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1309,9 +1309,9 @@ int daE_GE_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { mHIOInit = true; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("グェー", &l_HIO); } diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index b39de4e9b4..1bf8685e98 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -156,7 +156,7 @@ void daE_GI_c::setActionMode(int i_actionMode, int i_moveMode) { offHeadLockFlg(); } -static u8 l_HIOInit; +static u8 hio_set; static daE_GI_HIO_c l_HIO; @@ -970,7 +970,7 @@ int daE_GI_c::_delete() { dComIfG_resDelete(&mPhase, "E_GI"); if (mHIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1042,8 +1042,8 @@ int daE_GI_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = TRUE; + if (!hio_set) { + hio_set = TRUE; mHIOInit = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("ギブド", &l_HIO); } diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index f053165dc3..2662d37ea4 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -134,7 +134,7 @@ void daE_GM_c::setAction(actionFunc action) { (this->*mAction)(); } -static u8 l_initHIO; +static u8 hio_set; static daE_GM_HIO_c l_HIO; @@ -1646,8 +1646,8 @@ int daE_GM_c::_delete() { l_coreActorID = fpcM_ERROR_PROCESS_ID_e; } - if (l_initHIO != 0) { - l_initHIO = 0; + if (hio_set != 0) { + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1755,8 +1755,8 @@ cPhs__Step daE_GM_c::create() { OS_REPORT("//////////////E_GM SET 2 !!\n"); - if (l_initHIO == 0) { - l_initHIO = 1; + if (hio_set == 0) { + hio_set = 1; field_0xa77 = 1; l_HIO.id = -1; } diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index ea3a36a972..cb36237df5 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -277,7 +277,7 @@ static void damage_check(e_gob_class* i_this) { } /* 806DF2C5 0003+00 data_806DF2C5 None */ -static u8 l_initHIO; +static u8 hio_set; static daE_GOB_HIO_c l_HIO; @@ -2231,7 +2231,7 @@ static int daE_GOB_Delete(e_gob_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_gob"); if (i_this->mInitHIO) { - l_initHIO = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -2291,9 +2291,9 @@ static int daE_GOB_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////E_GOB SET 2 !!\n"); - if (l_initHIO == 0) { + if (hio_set == 0) { a_this->mInitHIO = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.id = mDoHIO_CREATE_CHILD("マグネゴロン", &l_HIO); } diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index 2a8e5c283e..a678880082 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -47,7 +47,7 @@ static int daE_GS_Draw(e_gs_class* a_this) { return 1; } -static u8 l_HIOInit; +static u8 hio_set; static daE_GS_HIO_c l_HIO; @@ -158,7 +158,7 @@ static int daE_GS_Delete(e_gs_class* a_this) { dComIfG_resDelete(&a_this->phase, "E_gs"); if (a_this->hio_init) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -202,9 +202,9 @@ static int daE_GS_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { a_this->hio_init = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("幽霊兵士", &l_HIO); } diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index a28b43e334..ac087a09ca 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -213,7 +213,7 @@ static void damage_check(e_hb_class* i_this) { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_HB_HIO_c l_HIO; @@ -1327,7 +1327,7 @@ static int daE_HB_Delete(e_hb_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_hb"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1410,9 +1410,9 @@ static int daE_HB_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////E_HB SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("デグババ（ボックリ）", &l_HIO); } diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index 4a993f23e6..781ee1ad77 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -578,7 +578,7 @@ void daE_HM_c::UpDeathAction() { } } -static bool l_HIOInit; +static bool hio_set; static daE_HM_HIO_c l_HIO; @@ -1361,7 +1361,7 @@ int daE_HM_c::Delete() { dComIfG_resDelete(&mPhase,"E_HM"); if (field_0xa84 != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.field_0x04); } @@ -1531,8 +1531,8 @@ int daE_HM_c::Create() { return cPhs_ERROR_e; } - if (l_HIOInit == 0) { - l_HIOInit = true; + if (hio_set == 0) { + hio_set = true; field_0xa84 = 1; l_HIO.field_0x04 = mDoHIO_CREATE_CHILD("E_HM", &l_HIO); } diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 1b052ddb2a..e37042a121 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -164,7 +164,7 @@ int daE_HP_c::LampJointCallBack(J3DJoint* i_joint, int param_1) { return 1; } -static bool l_HIOInit; +static bool hio_set; static daE_HP_HIO_c l_HIO; @@ -1128,7 +1128,7 @@ int daE_HP_c::_delete() { dComIfG_resDelete(&mPhaseReq, "E_HP"); if (field_0xdf9 != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mChild); } @@ -1236,8 +1236,8 @@ int daE_HP_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; field_0xdf9 = 1; // "General-purpose Poe" l_HIO.mChild = mDoHIO_CREATE_CHILD("汎用ポゥ", &l_HIO); diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index c7b54ecaba..d9be18d622 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -99,7 +99,7 @@ bool daE_HZ_c::checkBck(int i_index) { return false; } -static u8 l_HIOInit; +static u8 hio_set; static daE_HZ_HIO_c l_HIO; @@ -1854,7 +1854,7 @@ int daE_HZ_c::_delete() { dComIfG_resDelete(&mPhaseReq2, mpName); if (mHIOInit) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.enemy_sample); } @@ -2043,9 +2043,9 @@ int daE_HZ_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { mHIOInit = true; - l_HIOInit = true; + hio_set = true; l_HIO.enemy_sample = mDoHIO_CREATE_CHILD("Hajiki-san", &l_HIO); } diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index 87be188988..c0b066b933 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -913,7 +913,7 @@ static void anm_se_set(e_hzelda_class* i_this) { } } -static u8 l_initHIO; +static u8 hio_set; static daE_HZELDA_HIO_c l_HIO; @@ -1297,7 +1297,7 @@ static int daE_HZELDA_Delete(e_hzelda_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "Hzelda"); if (i_this->mInitHIO) { - l_initHIO = 0; + hio_set = 0; } if (i_this->heap != NULL) { @@ -1387,9 +1387,9 @@ static int daE_HZELDA_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (l_initHIO == 0) { + if (hio_set == 0) { a_this->mInitHIO = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index b8c55ae6e6..82ba88099c 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -197,7 +197,7 @@ static void e_is_wait(e_is_class* a_this) { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_IS_HIO_c l_HIO; @@ -605,7 +605,7 @@ static int daE_IS_Delete(e_is_class* a_this) { dComIfG_resDelete(&a_this->phase, "E_IS"); if (a_this->hioInit) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -654,9 +654,9 @@ static int daE_IS_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////E_IS SET 2 !!\n"); - if (l_HIOInit == 0) { + if (hio_set == 0) { a_this->hioInit = 1; - l_HIOInit = 1; + hio_set = 1; l_HIO.id = mDoHIO_CREATE_CHILD("動くイデリア石像", &l_HIO); } diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index c1e0ebc77e..d9a3f49a77 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -213,7 +213,7 @@ void daE_KK_c::setActionMode(int i_action, int i_mode) { mMoveMode = i_mode; } -static u8 l_initHIO; +static u8 hio_set; static daE_KK_HIO_c l_HIO; @@ -1307,7 +1307,7 @@ int daE_KK_c::_delete() { dComIfG_resDelete(&mPhaseReq, "E_KK"); if (mHIOInit != 0) { - l_initHIO = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.field_0x4); } @@ -1380,8 +1380,8 @@ int daE_KK_c::create() { if (field_0x679 != 1 && field_0x67b != 0xFF && fopAcM_isSwitch(this, field_0x67b)) { return cPhs_ERROR_e; } - if (!l_initHIO) { - l_initHIO = 1; + if (!hio_set) { + hio_set = 1; mHIOInit = 1; l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("氷の剣士", &l_HIO); } diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index 1e1ba54ce3..d7b11024a4 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -90,7 +90,7 @@ static int daE_MB_Draw(e_mb_class* i_this) { } /* 80708C2D 0003+00 data_80708C2D None */ -static u8 l_initHIO; +static u8 hio_set; static daE_MB_HIO_c l_HIO; @@ -625,7 +625,7 @@ static int daE_MB_Delete(e_mb_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_mb"); if (i_this->mInitHIO) { - l_initHIO = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.no); } @@ -700,9 +700,9 @@ static int daE_MB_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!l_initHIO) { + if (!hio_set) { a_this->mInitHIO = TRUE; - l_initHIO = TRUE; + hio_set = TRUE; l_HIO.no = mDoHIO_CREATE_CHILD("ボス戦ブーメラン猿", &l_HIO); } diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index 99e271328a..e91a974fd9 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -289,7 +289,7 @@ static BOOL other_bg_check2(e_mf_class* i_this, cXyz* param_2) { return FALSE; } -u8 l_initHIO; +u8 hio_set; daE_MF_HIO_c l_HIO; @@ -3075,7 +3075,7 @@ static int daE_MF_Delete(e_mf_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_mf"); if (i_this->field_0x10b9 != 0) { - l_initHIO = 0; + hio_set = 0; } if (a_this->heap != NULL) { @@ -3174,9 +3174,9 @@ static cPhs__Step daE_MF_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (l_initHIO == 0) { + if (hio_set == 0) { i_this->field_0x10b9 = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 602b8fb812..359ad64c22 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -141,7 +141,7 @@ static cXyz STAGE_CENTER_POS; static s16 STAGE_ANGLE_Y; /* 8071CB0A 0001+00 .bss */ -u8 l_initHIO; +u8 hio_set; static daE_MK_HIO_c l_HIO; @@ -2783,7 +2783,7 @@ static int daE_MK_Delete(e_mk_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_mk"); if (i_this->hioInit != 0) { - l_initHIO = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.no); } @@ -2871,9 +2871,9 @@ static int daE_MK_Create(fopAc_ac_c* i_actor) { } lbl_210_bss_130 = 0; - if (l_initHIO == 0) { + if (hio_set == 0) { mk->hioInit = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.no = mDoHIO_CREATE_CHILD("ブーメラン猿", &l_HIO); } diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index 3ea3a5be48..b6c19b78af 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -87,7 +87,7 @@ static BOOL pl_check(e_mm_class* i_this, f32 i_range, s16) { return 0; } -static u8 l_HIOInit; +static u8 hio_set; static daE_MM_HIO_c l_HIO; @@ -999,7 +999,7 @@ static int daE_MM_Delete(e_mm_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_MM"); if (i_this->field_0xc00) { - l_HIOInit = 0; + hio_set = 0; } if (actor->heap != NULL) { @@ -1054,9 +1054,9 @@ static int daE_MM_Create(fopAc_ac_c* actor) { OS_REPORT("//////////////E_MM SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { i_this->field_0xc00 = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("マグネメット", &l_HIO); } diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index a68682f589..b8595f2ce5 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -109,7 +109,7 @@ static void ms_disappear(e_ms_class* i_this) { } /* 807297FD 0003+00 data_807297FD None */ -static u8 hioInit; +static u8 hio_set; static daE_MS_HIO_c l_HIO; @@ -949,7 +949,7 @@ static int daE_MS_IsDelete(e_ms_class* i_this) { static int daE_MS_Delete(e_ms_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "E_MS"); if (i_this->mHIOInit) { - hioInit = 0; + hio_set = 0; } if (i_this->heap) { @@ -1017,9 +1017,9 @@ static int daE_MS_Create(fopAc_ac_c* actor) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { i_this->mHIOInit = 1; - hioInit = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 617b0dc8e1..319811a76b 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -15,7 +15,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" -static bool l_hioInit; +static bool hio_set; static daE_Nest_HIO_c l_HIO; @@ -924,7 +924,7 @@ static int daE_Nest_Delete(e_nest_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_nest"); if (i_this->mHIOInit) { - l_hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { @@ -980,9 +980,9 @@ static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!l_hioInit) { + if (!hio_set) { _this->mHIOInit = true; - l_hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index 123fe49ff4..5c98407484 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -131,7 +131,7 @@ static int daE_NZ_Draw(e_nz_class* i_this) { return 1; } -bool l_HIOInit; +bool hio_set; static daE_NZ_HIO_c l_HIO; @@ -648,7 +648,7 @@ static int daE_NZ_Delete(e_nz_class* i_this) { fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhase, "E_NZ"); if (i_this->mIsHIOOwner) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -696,9 +696,9 @@ static int daE_NZ_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = 1; - l_HIOInit = true; + hio_set = true; // Ghost Rat l_HIO.mId = mDoHIO_CREATE_CHILD("幽霊ネズミ", &l_HIO); } diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index c715cf7730..8ef12705d1 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -87,7 +87,7 @@ static dCcD_SrcSph cc_ot_at_src = { } // namespace /* 8073D2AD 0003+00 data_8073D2AD None */ -static bool hioInit; +static bool hio_set; static daE_OT_HIO_c l_HIO; @@ -697,7 +697,7 @@ int daE_OT_c::_delete() { dComIfG_resDelete(&mPhase, "E_OT"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { @@ -753,8 +753,8 @@ cPhs__Step daE_OT_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index f4eca05de1..ce1057b26d 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -129,7 +129,7 @@ enum Mode { }; /* 8074C385 0003+00 data_8074C385 None */ -static bool hioInit; +static bool hio_set; static daE_PM_HIO_c l_HIO; @@ -2623,7 +2623,7 @@ int daE_PM_c::Delete() { dComIfG_resDelete(&mPhase, "E_PM"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { @@ -2800,8 +2800,8 @@ cPhs__Step daE_PM_c::Create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 0e28a30c05..7e0e1c5b77 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -71,7 +71,7 @@ daE_PO_HIO_c::daE_PO_HIO_c() { mModelSize = 1.0f; } -static u8 l_HIOInit; +static u8 hio_set; static daE_PO_HIO_c l_HIO; static s16 mRollCount; @@ -2839,7 +2839,7 @@ static int daE_PO_Delete(e_po_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_PO"); if (i_this->field_0xECC != 0) { - l_HIOInit = FALSE; + hio_set = FALSE; } if (a_this->heap != NULL) { i_this->mSound1.deleteObject(); @@ -2946,9 +2946,9 @@ static int daE_PO_Create(fopAc_ac_c* i_act_this) { return cPhs_ERROR_e; } - if (l_HIOInit == FALSE) { + if (hio_set == FALSE) { i_this->field_0xECC = 1; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.field_0x04[0] = mDoHIO_CREATE_CHILD("ポウ", (JORReflexible*)&l_HIO); } diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index 7a90ee5ec6..379a10a442 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -182,8 +182,8 @@ void daE_PZ_c::mEntrySUB(bool param_0) { } } -/* 80761DFD 0003+00 l_initHIO None */ -static u8 l_initHIO; +/* 80761DFD 0003+00 hio_set None */ +static u8 hio_set; /* 80761E0C 001C+01 data_80761E0C l_HIO */ static daE_PZ_HIO_c l_HIO; @@ -2363,7 +2363,7 @@ int daE_PZ_c::_delete() { } if (mInitHIO != 0) { - l_initHIO = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.no); } @@ -2521,8 +2521,8 @@ int daE_PZ_c::create() { } } - if (!l_initHIO) { - l_initHIO = true; + if (!hio_set) { + hio_set = true; mInitHIO = true; l_HIO.no = mDoHIO_CREATE_CHILD("ファントムザント", &l_HIO); } diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index 33b198bff2..d60287ceec 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -43,7 +43,7 @@ static void anm_init(e_rb_class* i_this, int i_anm, f32 i_morf, u8 i_mode, f32 i i_this->modelMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_rb", i_anm), i_mode, i_morf, i_speed, 0.0f, -1.0f); } -static u8 l_HIOInit; +static u8 hio_set; static daE_RB_HIO_c l_HIO; @@ -742,7 +742,7 @@ static int daE_RB_Delete(e_rb_class* i_this) { dComIfG_resDelete(&i_this->phase, "E_rb"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -816,9 +816,9 @@ static int daE_RB_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////E_RB SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("リーバ", &l_HIO); } diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 331a517ade..186ca6bab6 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -581,7 +581,7 @@ static BOOL pl_pass_check(e_rd_class* i_this, f32 param_2) { static e_rd_class* boss; -static u8 l_initHIO; +static u8 hio_set; static daE_RD_HIO_c l_HIO; @@ -6804,7 +6804,7 @@ static int daE_RD_Delete(e_rd_class* i_this) { dComIfG_resDelete(&i_this->mPhase, i_this->mResName); if (i_this->field_0x125c != 0) { - l_initHIO = 0; + hio_set = 0; } if (a_this->heap != NULL) { @@ -7256,9 +7256,9 @@ static cPhs__Step daE_RD_Create(fopAc_ac_c* a_this) { ride_game_actor_set(i_this); } - if (l_initHIO == 0) { + if (hio_set == 0) { i_this->field_0x125c = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index 7b5f083b32..cd7842fb99 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -876,7 +876,7 @@ static void* shot_s_sub(void* i_actor, void* i_data) { return NULL; } -static u8 s_HIOinit; +static u8 hio_set; static daE_RDB_HIO_c l_HIO; @@ -1738,7 +1738,7 @@ static int daE_RDB_Delete(e_rdb_class* i_this) { fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhase, "E_rdb"); if (i_this->field_0xfce != 0) { - s_HIOinit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.mID); } @@ -1840,9 +1840,9 @@ static int daE_RDB_Create(fopAc_ac_c* actor) { i_this->mAction = ACTION_WAIT; i_this->mMode = 0; - if (s_HIOinit == 0) { + if (hio_set == 0) { i_this->field_0xfce = 1; - s_HIOinit = 1; + hio_set = 1; l_HIO.mID = -1; } diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 1889fd1ce8..e3192621f7 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -193,7 +193,7 @@ enum Joint { static e_rdy_class* boss; -static bool hioInit; +static bool hio_set; static daE_RDY_HIO_c l_HIO; @@ -4695,7 +4695,7 @@ static int daE_RDY_Delete(e_rdy_class* i_this) { dComIfG_resDelete(&i_this->mPhase, i_this->mpArcName); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (a_this->heap != NULL) { @@ -4909,9 +4909,9 @@ static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index 3806e166f1..2732be24aa 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -157,7 +157,7 @@ static BOOL pl_at_check(e_s1_class* i_this, f32 i_check_range) { } static u8 l_no_fail; // when enabled, enemy will never revive after defeated -static u8 l_initHIO; +static u8 hio_set; static daE_S1_HIO_c l_HIO; @@ -2034,7 +2034,7 @@ static int daE_S1_Delete(e_s1_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_S2"); if (i_this->mInitHIO) { - l_initHIO = false; + hio_set = false; } if (a_this->heap != NULL) { @@ -2158,9 +2158,9 @@ static int daE_S1_Create(fopAc_ac_c* i_this) { } } - if (!l_initHIO) { + if (!hio_set) { a_this->mInitHIO = true; - l_initHIO = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index 6a6bfbb95b..30b28d03a0 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -252,7 +252,7 @@ static void* s_bomb_sub(void* arg0, void* arg1) { return NULL; } -static u8 l_HIOInit; +static u8 hio_set; static daE_SB_HIO_c l_HIO; @@ -1059,7 +1059,7 @@ int daE_SB_c::Draw() { int daE_SB_c::Delete() { dComIfG_resDelete(&mPhaseReq, "E_SB"); if (field_0xbbc) { - l_HIOInit = 0; + hio_set = 0; } if (heap != NULL) { @@ -1109,8 +1109,8 @@ cPhs__Step daE_SB_c::Create() { return cPhs_ERROR_e; } - if (l_HIOInit == 0) { - l_HIOInit = 1; + if (hio_set == 0) { + hio_set = 1; field_0xbbc = 1; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index cc6380feb7..fe1b32491c 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -327,7 +327,7 @@ static int pl_check(e_sf_class* i_this, f32 i_distance, s16 param_3) { return 0; } -static bool l_initHIO; +static bool hio_set; static daE_SF_HIO_c l_HIO; @@ -1684,7 +1684,7 @@ static int daE_SF_Delete(e_sf_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_sf"); if (i_this->mIsFirstSpawn) { - l_initHIO = false; + hio_set = false; } if (a_this->heap != NULL) { @@ -1786,9 +1786,9 @@ static cPhs__Step daE_SF_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (!l_initHIO) { + if (!hio_set) { i_this->mIsFirstSpawn = true; - l_initHIO = 1; + hio_set = 1; l_HIO.id = -1; } diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index f1b1e51634..aae75bcccf 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -202,7 +202,7 @@ static void damage_check(e_sh_class* i_this) { } } -static bool l_HIOInit; +static bool hio_set; static daE_SH_HIO_c l_HIO; @@ -1114,7 +1114,7 @@ static int daE_SH_Delete(e_sh_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_sh"); if (i_this->mInitState != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mChild); } @@ -1213,9 +1213,9 @@ static int daE_SH_Create(fopAc_ac_c* i_this) { } OS_REPORT(""); - if (!l_HIOInit) { + if (!hio_set) { sh->mInitState = 1; - l_HIOInit = true; + hio_set = true; l_HIO.mChild = mDoHIO_CREATE_CHILD("E_sh", &l_HIO); } diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index 2ba1994dbe..77d12e8b86 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -456,7 +456,7 @@ void daE_SM_c::SmDamageCheck() { cLib_addCalc2(&field_0x69c, 0.0f, 0.05f, 100.0f); } -static u8 l_initHIO; +static u8 hio_set; static daE_Sm_HIO_c l_HIO; @@ -1823,7 +1823,7 @@ int daE_SM_c::Delete() { } if (field_0x115c != 0) { - l_initHIO = 0; + hio_set = 0; } if (heap != NULL) { @@ -1918,8 +1918,8 @@ cPhs__Step daE_SM_c::Create() { return cPhs_ERROR_e; } - if (l_initHIO == 0) { - l_initHIO = 1; + if (hio_set == 0) { + hio_set = 1; field_0x115c = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index 5a6b130a15..c86cf0fb42 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -293,7 +293,7 @@ static int nodeCallBack(J3DJoint* i_joint, int param_2) { static BOOL small; -static bool l_initHIO; +static bool hio_set; static daE_ST_HIO_c l_HIO; @@ -2851,7 +2851,7 @@ static int daE_ST_Delete(e_st_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_st"); if (i_this->mIsFirstSpawn) { - l_initHIO = false; + hio_set = false; } if (a_this->heap != NULL) { @@ -3046,9 +3046,9 @@ static cPhs__Step daE_ST_Create(fopAc_ac_c* a_this) { OS_REPORT("//////////////E_ST SET 2 !!\n"); - if (!l_initHIO) { + if (!hio_set) { i_this->mIsFirstSpawn = true; - l_initHIO = true; + hio_set = true; l_HIO.id = -1; } diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 1beeea21d9..a18ca69d99 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -201,7 +201,7 @@ static u8 data_807B0201; static u8 data_807B0202; /* 807B0203 0001+00 data_807B0203 None */ -static u8 l_initHIO; +static u8 hio_set; void daE_SW_c::setActionMode(s16 i_actionMode, s16 i_moveMode) { if (field_0x6e6 != 0) { @@ -1615,7 +1615,7 @@ int daE_SW_c::_delete() { dComIfG_resDelete(&mPhase, "E_SW"); if (field_0xaf9 != 0) { - l_initHIO = 0; + hio_set = 0; } if (field_0xaf8 != 0) { @@ -1700,9 +1700,9 @@ cPhs__Step daE_SW_c::create() { } } - if (l_initHIO == 0) { + if (hio_set == 0) { field_0xaf9 = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index 979d2d6ed4..f62aa40fbd 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -1034,7 +1034,7 @@ static void anm_se_set(e_th_class* i_this) { } } -static u8 l_initHIO; +static u8 hio_set; static daE_TH_HIO_c l_HIO; @@ -1161,7 +1161,7 @@ static int daE_TH_Delete(e_th_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_th"); if (i_this->mInitHIO) { - l_initHIO = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.no); } @@ -1228,9 +1228,9 @@ static int daE_TH_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (!l_initHIO) { + if (!hio_set) { i_this->mInitHIO = TRUE; - l_initHIO = TRUE; + hio_set = TRUE; l_HIO.no = mDoHIO_CREATE_CHILD("鉄球兵", &l_HIO); } diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index 1723f19804..06263e632d 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -40,7 +40,7 @@ enum Mode { // Not sure if these are correct... /* 0xC */ MODE_TK_WAIT01, }; -static bool hioInit; +static bool hio_set; static daE_TK_HIO_c l_HIO; @@ -650,7 +650,7 @@ static int daE_TK_IsDelete(e_tk_class* i_this) { static int daE_TK_Delete(e_tk_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "E_tk"); if (i_this->mInitHIO) { - hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { i_this->mpMorf->stopZelAnime(); @@ -709,9 +709,9 @@ static int daE_TK_Create(fopAc_ac_c* i_this) { a_this->mPathDirection = 0x1; a_this->mAction = ACT_TK_PATHSWIM; } - if (hioInit == false) { + if (hio_set == false) { a_this->mInitHIO = true; - hioInit = true; + hio_set = true; l_HIO.field_0x04 = -1; } a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index d879c92183..ef82742b36 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -38,7 +38,7 @@ enum Mode { // Not sure if these are correct... /* 0xC */ MODE_TK2_WAIT01, }; -static bool hioInit; +static bool hio_set; static daE_TK2_HIO_c l_HIO; @@ -463,7 +463,7 @@ static int daE_TK2_IsDelete(e_tk2_class* i_this) { static int daE_TK2_Delete(e_tk2_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "E_tk2"); if (i_this->mInitHIO) { - hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { i_this->mpMorf->stopZelAnime(); @@ -512,9 +512,9 @@ static int daE_TK2_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (hioInit == false) { + if (hio_set == false) { a_this->mInitHIO = true; - hioInit = true; + hio_set = true; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index fe64e2f3bc..d4baf9725f 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -150,7 +150,7 @@ void daE_TT_c::calcHitGroundSpeed() { } } -static u8 l_HIOInit; +static u8 hio_set; static daE_TT_HIO_c l_HIO; @@ -1180,7 +1180,7 @@ int daE_TT_c::_delete() { dComIfG_resDelete(&mPhaseReq2, "E_TT"); if (mHIOInit) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1272,8 +1272,8 @@ int daE_TT_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.id = mDoHIO_CREATE_CHILD("テクタイト", &l_HIO); // Tektite } diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index b014b59f73..141c8ee117 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -207,7 +207,7 @@ daE_VA_HIO_c::daE_VA_HIO_c() { /* 807CF4B5 0003+00 data_807CF4B5 None */ #pragma push #pragma force_active on -static u8 init_hio; +static u8 hio_set; #pragma pop static daE_VA_HIO_c l_HIO; @@ -3625,7 +3625,7 @@ int daE_VA_c::_delete() { dComIfG_resDelete(&mPhase, "E_VA"); if (mInitHIO) { - init_hio = false; + hio_set = false; } for (int i = 0; i < 2; i++) { @@ -3780,8 +3780,8 @@ int daE_VA_c::create() { return cPhs_ERROR_e; } - if (!init_hio) { - init_hio = true; + if (!hio_set) { + hio_set = true; mInitHIO = true; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index efa90aca4c..e3c58328db 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -175,19 +175,10 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { return 1; } -/* 807E35B4 0001+00 data_807E35B4 @1009 */ -/* 807E35B5 0001+00 data_807E35B5 None */ -/* 807E35B6 0001+00 data_807E35B6 None */ -/* 807E35B7 0001+00 data_807E35B7 None */ static s8 lbl_244_bss_45; static s8 lbl_244_bss_46; static s8 lbl_244_bss_47; -static bool l_HIOInit; - -// static u8 lbl_244_bss_48; -// static u8 lbl_244_bss_49; -// static u8 lbl_244_bss_4a; -// static u8 lbl_244_bss_4b; +static bool hio_set; static daE_WB_HIO_c l_HIO; @@ -5473,7 +5464,7 @@ static int daE_WB_Delete(e_wb_class* i_this) { fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhase, i_this->mResName); if (i_this->field_0x17e0 != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -5692,9 +5683,9 @@ static int daE_WB_Create(fopAc_ac_c* a_this) { OS_REPORT("//////////////E_WB SET NON !!\n"); return cPhs_ERROR_e; } else { - if (!l_HIOInit) { + if (!hio_set) { i_this->field_0x17e0 = 1; - l_HIOInit = true; + hio_set = true; l_HIO.mId = mDoHIO_CREATE_CHILD("イノシシ", &l_HIO); } diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 3a80bc3951..8708d5c321 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -150,7 +150,7 @@ s16 daE_WS_c::calcTargetAngle(cXyz i_basePos, cXyz i_targetPos) { return cM_atan2s(sp1C.x, sp1C.z); } -static u8 l_HIOInit; +static u8 hio_set; static daE_WS_HIO_c l_HIO; @@ -872,7 +872,7 @@ int daE_WS_c::_delete() { dComIfG_resDelete(&mPhase, "E_WS"); if (mHIOInit) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -920,8 +920,8 @@ int daE_WS_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.id = mDoHIO_CREATE_CHILD("スタルウォール", &l_HIO); } diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index fb53e66cfa..d57f6c23cc 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -145,7 +145,7 @@ namespace { }; } // namespace -static u8 l_HIOInit; +static u8 hio_set; static daE_WW_HIO_c l_HIO; @@ -2132,7 +2132,7 @@ static int daE_WW_IsDelete(daE_WW_c* i_this) { int daE_WW_c::_delete() { dComIfG_resDelete(&mPhase, "E_WW"); if (field_0xec4 != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.field_0x04); } @@ -2233,8 +2233,8 @@ int daE_WW_c::create() { return cPhs_ERROR_e; } - if (l_HIOInit == false) { - l_HIOInit = true; + if (hio_set == false) { + hio_set = true; field_0xec4 = 1; l_HIO.field_0x04 = mDoHIO_CREATE_CHILD("ホワイトウルフォス", (JORReflexible*)&l_HIO); } diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index 2c99c9f10f..8395641bca 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -17,7 +17,7 @@ static f32 S_area_dis; -static bool hioInit; +static bool hio_set; static daE_YC_HIO_c l_HIO; @@ -728,7 +728,7 @@ static int daE_YC_Delete(e_yc_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_yc"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { @@ -764,9 +764,9 @@ static cPhs__Step daE_YC_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp index e6303395b6..45e10382fe 100644 --- a/src/d/actor/d_a_e_yg.cpp +++ b/src/d/actor/d_a_e_yg.cpp @@ -184,7 +184,7 @@ static void sibuki_set(e_yg_class* i_this) { } } -static bool l_initHIO; +static bool hio_set; static daE_YG_HIO_c l_HIO; @@ -1304,7 +1304,7 @@ static int daE_YG_Delete(e_yg_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "E_YG"); if (i_this->mIsFirstSpawn) { - l_initHIO = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1359,9 +1359,9 @@ static cPhs__Step daE_YG_Create(fopAc_ac_c* actor) { return cPhs_ERROR_e; } - if (!l_initHIO) { + if (!hio_set) { i_this->mIsFirstSpawn = 1; - l_initHIO = true; + hio_set = true; l_HIO.id = mDoHIO_CREATE_CHILD("グース", &l_HIO); } diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index a583fb29d7..93bb9e7f5d 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -277,7 +277,7 @@ static void damage_check(e_yh_class* i_this) { } } -static bool l_HIOInit; +static bool hio_set; static daE_YH_HIO_c l_HIO; @@ -2064,7 +2064,7 @@ static int daE_YH_Delete(e_yh_class* i_this) { fopAcM_RegisterDeleteID(a_this, "E_YH"); dComIfG_resDelete(&i_this->mPhase, "E_yd"); if (i_this->mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -2157,9 +2157,9 @@ static int daE_YH_Create(fopAc_ac_c* a_this) { OS_REPORT("//////////////E_YH SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = true; - l_HIOInit = true; + hio_set = true; l_HIO.mId = mDoHIO_CREATE_CHILD("デグババ", &l_HIO); } diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 9a36615219..a2db2014fa 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -507,7 +507,7 @@ void daE_YMB_c::setCameraSwitch() { } } -static u8 l_initHIO; +static u8 hio_set; static daE_YMB_HIO_c l_HIO; @@ -3098,7 +3098,7 @@ int daE_YMB_c::_delete() { dComIfG_resDelete(&mPhase, "E_YB"); if (field_0x1520 != 0) { - l_initHIO = 0; + hio_set = 0; } if (heap != NULL) { @@ -3190,8 +3190,8 @@ cPhs__Step daE_YMB_c::create() { mpBgW->SetRideCallback(rideCallBack); - if (l_initHIO == 0) { - l_initHIO = 1; + if (hio_set == 0) { + hio_set = 1; field_0x1520 = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 8bc320e7a5..5ad7c499ae 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -122,7 +122,7 @@ daE_ZH_HIO_c::daE_ZH_HIO_c() { } /* 8082F725 0003+00 data_8082F725 None */ -static u8 l_initHIO; +static u8 hio_set; static daE_ZH_HIO_c l_HIO; @@ -2111,7 +2111,7 @@ int daE_ZH_c::_delete() { } if (field_0xe04 != 0) { - l_initHIO = 0; + hio_set = 0; } if (heap != NULL) { @@ -2217,8 +2217,8 @@ cPhs__Step daE_ZH_c::create() { return cPhs_ERROR_e; } - if (l_initHIO == 0) { - l_initHIO = 1; + if (hio_set == 0) { + hio_set = 1; field_0xe04 = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index b2024a8620..d1c3287dc2 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -65,7 +65,7 @@ public: /* 0x1A */ s16 stun_time; // 麻痺時間 - Stun Time }; -static u8 l_initHIO; +static u8 hio_set; static daE_ZM_HIO_c l_HIO; @@ -872,7 +872,7 @@ int daE_ZM_c::_delete() { } if (field_0xc28) { - l_initHIO = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -959,8 +959,8 @@ cPhs__Step daE_ZM_c::create() { } else if (arg0 != 20 && !fopAcM_entrySolidHeap(this, useHeapInit, 0xA90)) { return cPhs_ERROR_e; } else { - if (arg0 != 20 && l_initHIO == 0) { - l_initHIO = 1; + if (arg0 != 20 && hio_set == 0) { + hio_set = 1; field_0xc28 = true; l_HIO.id = -1; } diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index c0e29474a9..905f49b16e 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -136,7 +136,7 @@ static BOOL way_bg_check(fr_class* i_this) { } } -static bool l_initHIO; +static bool hio_set; static daFr_HIO_c l_HIO; @@ -647,7 +647,7 @@ static int daFr_Delete(fr_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "Fr"); if (i_this->field_0x9e4) { - l_initHIO = false; + hio_set = false; } mDoHIO_DELETE_CHILD(l_HIO.field_0x4); @@ -699,9 +699,9 @@ static int daFr_Create(fopAc_ac_c* a_this) { OS_REPORT("//////////////FR SET 2 !!\n"); - if (!l_initHIO) { + if (!hio_set) { i_this->field_0x9e4 = 1; - l_initHIO = true; + hio_set = true; l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("カエル", &l_HIO); } diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 3ee4e7aadc..d6068ff672 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -270,7 +270,7 @@ int daKago_c::executeBalloonMenu() { return 1; } -static u8 l_HIOInit; +static u8 hio_set; static daKago_HIO_c l_HIO; f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { @@ -3696,7 +3696,7 @@ int daKago_c::_delete() { dComIfG_resDelete(&mPhase, field_0x75c); if (field_0xb54 != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mChild); } @@ -3805,9 +3805,9 @@ int daKago_c::create() { return cPhs_ERROR_e; } - if (l_HIOInit == 0) { + if (hio_set == 0) { field_0xb54 = 1; - l_HIOInit = 1; + hio_set = 1; l_HIO.mChild = mDoHIO_CREATE_CHILD("", &l_HIO); } diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index dc697813ea..24c177007b 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -521,7 +521,7 @@ static npc_henna_class* henna; /* 804BBBD4 0001+00 data_804BBBD4 None */ static u8 data_804BBBD4; -static u8 l_HIOInit; +static u8 hio_set; static dmg_rod_HIO_c l_HIO; @@ -6011,7 +6011,7 @@ static int dmg_rod_Delete(dmg_rod_class* i_this) { dComIfG_resDelete(&i_this->phase, i_this->arcname); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -6270,9 +6270,9 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////MG_ROD SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("釣りシステム", &l_HIO); } diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 5b4b734f88..13deb6780d 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -13,6 +13,7 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_kankyo_mng.h" #include "d/actor/d_a_mirror.h" +#include "JSystem/JAudio2/JAUSectionHeap.h" void daNbomb_c::coHitCallback(fopAc_ac_c* i_hitActor) { if (fopAcM_GetGroup(i_hitActor) == fopAc_ENEMY_e || @@ -1671,6 +1672,8 @@ static int daNbomb_Draw(daNbomb_c* i_this) { } AUDIO_INSTANCES; +template<> +JAUSectionHeap* JASGlobalInstance::sInstance; static actor_method_class l_daNbombMethod = { (process_method_func)daNbomb_Create, diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 6c09fb705d..72f4dc7f5e 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -193,24 +193,6 @@ dCcD_SrcCyl const daNpcCd2_c::m_cylDat = { } // mCyl }; -static Vec const a_transScaleTbl[30] = { - {1.0f, 1.0f, 1.0f}, {1.0f, 1.1983438f, 2.173357f}, - {1.0f, 0.5581154f, 1.0f}, {1.0f, 0.95, 1.0f}, - {1.0f, 1.1642542f, 1.0f}, {1.0f, 1.0820773f, 1.0f}, - {1.0f, 0.78816104f, 1.0f}, {1.0f, 0.91999996f, 1.0f}, - {1.0f, 1.0f, 1.0f}, {1.0f, 1.1983438f, 2.173357f}, - {1.0f, 0.5581154f, 1.0f}, {1.0f, 0.95, 1.0f}, - {1.0f, 1.1642542f, 1.0f}, {1.0f, 1.0820773f, 1.0f}, - {1.0f, 0.78816104f, 1.0f}, {1.0f, 0.91999996f, 1.0f}, - {1.0f, 1.0f, 1.0f}, {1.0f, 0.95, 1.0f}, - {1.0f, 1.0999999f, 1.0f}, {1.0f, 0.5656486f, 1.0f}, - {1.0f, 0.9f, 1.0f}, {1.0f, 0.8630768f, 1.0f}, - {1.0f, 1.0529536f, 1.0f}, {1.0f, 1.0f, 1.0f}, - {1.0f, 0.95, 1.0f}, {1.0f, 1.0999999f, 1.0f}, - {1.0f, 0.5656486f, 1.0f}, {1.0f, 0.9f, 1.0f}, - {1.0f, 0.8630768f, 1.0f}, {1.0f, 1.0529536f, 1.0f}, -}; - int daNpcCd2_c::NpcCreate(int param_1) { J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1); JUT_ASSERT(590, NULL != a_mdlData_p); @@ -241,6 +223,23 @@ int daNpcCd2_c::NpcCreate(int param_1) { field_0xac4 = 0; field_0xaa4 = 0; } + static Vec const a_transScaleTbl[30] = { + {1.0f, 1.0f, 1.0f}, {1.0f, 1.1983438f, 2.173357f}, + {1.0f, 0.5581154f, 1.0f}, {1.0f, 0.95, 1.0f}, + {1.0f, 1.1642542f, 1.0f}, {1.0f, 1.0820773f, 1.0f}, + {1.0f, 0.78816104f, 1.0f}, {1.0f, 0.91999996f, 1.0f}, + {1.0f, 1.0f, 1.0f}, {1.0f, 1.1983438f, 2.173357f}, + {1.0f, 0.5581154f, 1.0f}, {1.0f, 0.95, 1.0f}, + {1.0f, 1.1642542f, 1.0f}, {1.0f, 1.0820773f, 1.0f}, + {1.0f, 0.78816104f, 1.0f}, {1.0f, 0.91999996f, 1.0f}, + {1.0f, 1.0f, 1.0f}, {1.0f, 0.95, 1.0f}, + {1.0f, 1.0999999f, 1.0f}, {1.0f, 0.5656486f, 1.0f}, + {1.0f, 0.9f, 1.0f}, {1.0f, 0.8630768f, 1.0f}, + {1.0f, 1.0529536f, 1.0f}, {1.0f, 1.0f, 1.0f}, + {1.0f, 0.95, 1.0f}, {1.0f, 1.0999999f, 1.0f}, + {1.0f, 0.5656486f, 1.0f}, {1.0f, 0.9f, 1.0f}, + {1.0f, 0.8630768f, 1.0f}, {1.0f, 1.0529536f, 1.0f}, + }; cXyz cStack_38(a_transScaleTbl[param_1]); mpMorf->offTranslate(); mpMorf->setTranslateScale(cStack_38); @@ -334,899 +333,7 @@ static anmTblPrm const l_btpTWTbl[30] = { l_resMATa2[1], -1, l_resWCNa2[1], 7, l_resWONa2[1], 7, l_resWGNa2[1], 7, l_resWANb2[1], 7, }; -// TODO: these four tables should be converted into proper structs instead of byte arrays - -#pragma push -#pragma force_active on -static u8 a_jntTbl_M[16][19][20] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0xFF, 0xEE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCE, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0xF6, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, - 0xFF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0A, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xBA, 0x00, 0x0A, 0xFF, 0xE2, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, - 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0xFF, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0B, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0A, 0x00, 0x00, 0xFF, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xF6, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0xFF, 0xEE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCE, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0xF6, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x00, 0x0A, 0x00, 0x1E, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, - 0xFF, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0A, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xBA, 0x00, 0x0A, 0xFF, 0xE2, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, - 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0xFF, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0B, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0A, 0x00, 0x00, 0xFF, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xF6, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -#pragma push -#pragma force_active on -static u8 a_prmTbl_M[1024] = { - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xE6, 0x66, 0x66, 0x41, 0x80, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0xB3, 0x33, 0x33, 0x00, 0xF0, 0x00, 0x00, - 0x3F, 0xB3, 0x33, 0x33, 0x3F, 0xE6, 0x66, 0x66, 0x41, 0x60, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x33, 0x33, 0x33, 0x00, 0x8C, 0x00, 0x00, - 0x3F, 0xD9, 0x99, 0x9A, 0x40, 0x00, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x40, 0x90, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x66, 0x66, 0x66, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xA6, 0x66, 0x66, 0x3F, 0x99, 0x99, 0x9A, 0x41, 0x40, 0x00, 0x00, 0x40, 0x6C, 0xCC, 0xCD, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x40, 0xB0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x40, 0xB0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x66, 0x66, 0x66, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xE6, 0x66, 0x66, 0x41, 0x70, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xE6, 0x66, 0x66, 0x41, 0x80, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xE6, 0x66, 0x66, 0x41, 0x80, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0xB3, 0x33, 0x33, 0x00, 0xF0, 0x00, 0x00, - 0x3F, 0xB3, 0x33, 0x33, 0x3F, 0xE6, 0x66, 0x66, 0x41, 0x60, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x42, 0x70, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x33, 0x33, 0x33, 0x00, 0x8C, 0x00, 0x00, - 0x3F, 0xD9, 0x99, 0x9A, 0x40, 0x00, 0x00, 0x00, 0x41, 0x40, 0x00, 0x00, 0x40, 0x90, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x66, 0x66, 0x66, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xA6, 0x66, 0x66, 0x3F, 0x99, 0x99, 0x9A, 0x41, 0x40, 0x00, 0x00, 0x40, 0x6C, 0xCC, 0xCD, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x40, 0xB0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00, 0x40, 0xB0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x66, 0x66, 0x66, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xE6, 0x66, 0x66, 0x41, 0x70, 0x00, 0x00, 0x40, 0xA0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xE6, 0x66, 0x66, 0x41, 0x80, 0x00, 0x00, 0x40, 0xC0, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, -}; -#pragma pop - -#pragma push -#pragma force_active on -static u8 a_jntTbl_W[14][21][20] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, - 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xBE, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xFF, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xBF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xF6, - 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, - 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0A, 0x00, 0x00, 0xFF, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0A, 0x00, 0x00, 0xFF, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xF6, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x08, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xBE, 0x99, 0x99, 0x9A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xFF, 0xCE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xF6, 0x00, 0x05, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x05, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, - 0xFF, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, - 0xFF, 0xE2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFF, 0xF6, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; -#pragma pop - -#pragma push -#pragma force_active on -static u8 a_prmTbl_W[896] = { - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xB3, 0x33, 0x33, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xA6, 0x66, 0x66, 0x3F, 0x99, 0x99, 0x9A, 0x41, 0x20, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x19, 0x99, 0x9A, 0x00, 0x8C, 0x00, 0x00, - 0x3F, 0xE6, 0x66, 0x66, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, 0x40, 0x4C, 0xCC, 0xCD, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x96, 0x00, 0x00, - 0x3F, 0xA6, 0x66, 0x66, 0x3F, 0x99, 0x99, 0x9A, 0x41, 0x00, 0x00, 0x00, 0x40, 0x33, 0x33, 0x33, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xB3, 0x33, 0x33, 0x3F, 0xA6, 0x66, 0x66, 0x41, 0x20, 0x00, 0x00, 0x40, 0x26, 0x66, 0x66, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xCC, 0xCC, 0xCD, 0x41, 0x20, 0x00, 0x00, 0x40, 0x8C, 0xCC, 0xCD, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xB3, 0x33, 0x33, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xA6, 0x66, 0x66, 0x3F, 0x99, 0x99, 0x9A, 0x41, 0x20, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x19, 0x99, 0x9A, 0x00, 0x8C, 0x00, 0x00, - 0x3F, 0xE6, 0x66, 0x66, 0x3F, 0xC0, 0x00, 0x00, 0x41, 0x10, 0x00, 0x00, 0x40, 0x4C, 0xCC, 0xCD, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x4C, 0xCC, 0xCD, 0x00, 0x96, 0x00, 0x00, - 0x3F, 0xA6, 0x66, 0x66, 0x3F, 0x99, 0x99, 0x9A, 0x41, 0x00, 0x00, 0x00, 0x40, 0x33, 0x33, 0x33, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xB3, 0x33, 0x33, 0x3F, 0xA6, 0x66, 0x66, 0x41, 0x20, 0x00, 0x00, 0x40, 0x26, 0x66, 0x66, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, - 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, - 0x3F, 0xC0, 0x00, 0x00, 0x3F, 0xCC, 0xCC, 0xCD, 0x41, 0x20, 0x00, 0x00, 0x40, 0x8C, 0xCC, 0xCD, - 0x43, 0x34, 0x00, 0x00, 0x41, 0xF0, 0x00, 0x00, 0x42, 0x48, 0x66, 0x66, 0x42, 0x0C, 0x00, 0x00, -}; -#pragma pop +#include "d/actor/d_a_npc_cd2_HIO.inc" J3DAnmTransform* daNpcCd2_c::getAnmP(int param_1, int param_2) { int a_anmNum = param_1; @@ -1488,8 +595,6 @@ J3DAnmTransform* daNpcCd2_c::getAnmP(int param_1, int param_2) { return (J3DAnmTransform*)dComIfG_getObjectRes(name, index); } -//static u8 lit_3982[12]; - daNpcCd2_HIO_c l_Cd2_HIO; int daNpcCd2_c::setAttention(int param_1) { @@ -1621,11 +726,6 @@ int daNpcCd2_c::drawShadow(f32 param_0) { return 1; } -static s32 const a_jntNumTbl[13][2] = { - {-1, -1}, {7, -1}, {11, -1}, {-1, 11}, {7, -1}, {-1, 11}, {1, -1}, - {-1, 11}, {-1, 7}, {10, -1}, {-1, 11}, {10, -1}, {-1, 11}, -}; - int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) { if (i_model == NULL) { return 0; @@ -1634,6 +734,10 @@ int daNpcCd2_c::drawObj(int idx, J3DModel* i_model, f32 i_scale) { return 0; } int x = isM_() ? 0 : 1; + static s32 const a_jntNumTbl[13][2] = { + {-1, -1}, {7, -1}, {11, -1}, {-1, 11}, {7, -1}, {-1, 11}, {1, -1}, + {-1, 11}, {-1, 7}, {10, -1}, {-1, 11}, {10, -1}, {-1, 11}, + }; s32 jntNum = a_jntNumTbl[idx][x]; if (i_model && jntNum >= 0) { g_env_light.setLightTevColorType_MAJI(i_model, &tevStr); @@ -1675,9 +779,9 @@ int daNpcCd2_c::drawNpc() { static inline f32 Cd2_HIO_jntTZ(int param_1, int param_2) { f32 rv; if (param_1 < 16) { - rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x04[2]; + rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x04.field_0x00[2]; } else { - rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x04[2]; + rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x04.field_0x00[2]; } return 10.0f * rv; } @@ -1685,9 +789,9 @@ static inline f32 Cd2_HIO_jntTZ(int param_1, int param_2) { static inline f32 Cd2_HIO_jntTY(int param_1, int param_2) { f32 rv; if (param_1 < 16) { - rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x04[1]; + rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x04.field_0x00[1]; } else { - rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x04[1]; + rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x04.field_0x00[1]; } return 10.0f * rv; } @@ -1695,9 +799,9 @@ static inline f32 Cd2_HIO_jntTY(int param_1, int param_2) { static inline f32 Cd2_HIO_jntTX(int param_1, int param_2) { f32 rv; if (param_1 < 16) { - rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x04[0]; + rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x04.field_0x00[0]; } else { - rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x04[0]; + rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x04.field_0x00[0]; } return 10.0f * rv; } @@ -1705,9 +809,9 @@ static inline f32 Cd2_HIO_jntTX(int param_1, int param_2) { static inline s16 Cd2_HIO_jntRZ(int param_1, int param_2) { s16 rv; if (param_1 < 16) { - rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x10[2]; + rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x04.field_0x0C[2]; } else { - rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x10[2]; + rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x04.field_0x0C[2]; } return 182.04444885253906f * rv; } @@ -1715,9 +819,9 @@ static inline s16 Cd2_HIO_jntRZ(int param_1, int param_2) { static inline s16 Cd2_HIO_jntRY(int param_1, int param_2) { s16 rv; if (param_1 < 16) { - rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x10[1]; + rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x04.field_0x0C[1]; } else { - rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x10[1]; + rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x04.field_0x0C[1]; } return 182.04444885253906f * rv; } @@ -1725,9 +829,9 @@ static inline s16 Cd2_HIO_jntRY(int param_1, int param_2) { static inline s16 Cd2_HIO_jntRX(int param_1, int param_2) { s16 rv; if (param_1 < 16) { - rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x10[0]; + rv = l_Cd2_HIO.field_0x0004[param_1].field_0x004[param_2].field_0x04.field_0x0C[0]; } else { - rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x10[0]; + rv = l_Cd2_HIO.field_0x20c4[param_1 - 16].field_0x004[param_2].field_0x04.field_0x0C[0]; } return 182.04444885253906f * rv; } @@ -2028,18 +1132,3 @@ void PathTrace_c::checkObstacleSub(fopAc_ac_c* pObstacle) { } } } - -daNpcCd2_HIO_c::daNpcCd2_HIO_c() { - for (int i = 0; i < 16; i++) { - for (int j = 0; j < 19; j++) { - memcpy(&field_0x0004[i].field_0x004[j].field_0x04, a_jntTbl_M[i][j], 20); - } - memcpy(&field_0x0004[i].mMaxLmtX_BACKBONE, a_prmTbl_M + i * 0x40, 0x40); - } - for (int i = 0; i < 14; i++) { - for (int j = 0; j < 21; j++) { - memcpy(&field_0x20c4[i].field_0x004[j].field_0x04, a_jntTbl_W[i][j], 20); - } - memcpy(&field_0x20c4[i].mMaxLmtX_BACKBONE, a_prmTbl_W + i * 0x40, 0x40); - } -} diff --git a/src/d/actor/d_a_npc_cd2_HIO.inc b/src/d/actor/d_a_npc_cd2_HIO.inc new file mode 100644 index 0000000000..463a6f2e64 --- /dev/null +++ b/src/d/actor/d_a_npc_cd2_HIO.inc @@ -0,0 +1,712 @@ +#include "d/actor/d_a_npc_cd2.h" + +daNpcCd2_HIO_c::daNpcCd2_HIO_c() { + static daNpcCd2_HIO_Jnt_UnkStruct_s a_jntTbl_M[16][19] = { + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x0B, 0x00, -0x12}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, -0.3f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x14}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x32}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x41}}, + {{0.0f, 0.0f, 0.0f}, {0x00, -0x0A, 0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x46, 0x0A, 0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x32, -0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {-0x46, 0x0A, -0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x32, 0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x0F}}, + {{0.0f, 0.0f, 0.0f}, {0x0A, 0x00, -0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x0B}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x01}}, + {{0.0f, 0.0f, 0.0f}, {0x0A, 0x00, -0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, -0x0A, 0x0B}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x01}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x0B, 0x00, -0x12}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, -0.3f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x14}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x32}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x41}}, + {{0.0f, 0.0f, 0.0f}, {0x00, -0x0A, 0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x46, 0x0A, 0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x32, -0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {-0x46, 0x0A, -0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x32, 0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x0F}}, + {{0.0f, 0.0f, 0.0f}, {0x0A, 0x00, -0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x0B}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x01}}, + {{0.0f, 0.0f, 0.0f}, {0x0A, 0x00, -0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, -0x0A, 0x0B}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x01}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + } + }; + static daNpcCd2_HIO_Child_UnkStruct_s a_prmTbl_M[16] = { + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.8f, 16.0f, 6.0f, 180.0f, 40.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.4f, 240, 1.4f, 1.8f, 14.0f, 6.0f, 180.0f, 60.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 0.7f, 140, 1.7f, 2.0f, 12.0f, 4.5f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 0.9f, 200, 1.3f, 1.2f, 12.0f, 3.7f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.5f, 16.0f, 5.5f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.5f, 16.0f, 5.5f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 0.9f, 200, 1.5f, 1.8f, 15.0f, 5.0f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.8f, 16.0f, 6.0f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.8f, 16.0f, 6.0f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.4f, 240, 1.4f, 1.8f, 14.0f, 6.0f, 180.0f, 60.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 0.7f, 140, 1.7f, 2.0f, 12.0f, 4.5f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 0.9f, 200, 1.3f, 1.2f, 12.0f, 3.7f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.5f, 16.0f, 5.5f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.5f, 16.0f, 5.5f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 0.9f, 200, 1.5f, 1.8f, 15.0f, 5.0f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.8f, 16.0f, 6.0f, 180.0f, 30.0f, 50.099998f, 35.0f}, + }; + for (int i = 0; i < 16; i++) { + for (int j = 0; j < 19; j++) { + memcpy(&field_0x0004[i].field_0x004[j].field_0x04, &a_jntTbl_M[i][j], 20); + } + memcpy(&field_0x0004[i].field_0x1D0, &a_prmTbl_M[i], 0x40); + } + static daNpcCd2_HIO_Jnt_UnkStruct_s a_jntTbl_W[14][21] = { + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0B, 0x08}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, -0.3f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x14}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x32}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x41}}, + {{0.0f, 0.0f, 0.0f}, {0x00, -0x0A, 0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x08, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x08, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x0F}}, + {{0.0f, 0.0f, 0.0f}, {0x0A, 0x00, -0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x0B}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x01}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x0A, 0x00, -0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, -0x0A, 0x0B}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x01}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x14, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0B, 0x08}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, -0.3f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x14}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x32}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, -0x41}}, + {{0.0f, 0.0f, 0.0f}, {0x00, -0x0A, 0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x08, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x05}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x08, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x0F}}, + {{0.0f, 0.0f, 0.0f}, {0x0A, 0x00, -0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x0A, 0x0B}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x01}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x0A, 0x00, -0x1E}}, + {{0.0f, 0.0f, 0.0f}, {0x00, -0x0A, 0x0B}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x01}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + }, + { + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + {{0.0f, 0.0f, 0.0f}, {0x00, 0x00, 0x00}}, + } + }; + static daNpcCd2_HIO_Child_UnkStruct_s a_prmTbl_W[] = { + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.4f, 1.5f, 10.0f, 4.0f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.5f, 10.0f, 3.5f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.3f, 1.2f, 10.0f, 3.5f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 0.6f, 140, 1.8f, 1.5f, 9.0f, 3.2f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 0.8f, 150, 1.3f, 1.2f, 8.0f, 2.8f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.4f, 1.3f, 10.0f, 2.6f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.6f, 10.0f, 4.4f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.4f, 1.5f, 10.0f, 4.0f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.5f, 10.0f, 3.5f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.3f, 1.2f, 10.0f, 3.5f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 0.6f, 140, 1.8f, 1.5f, 9.0f, 3.2f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 0.8f, 150, 1.3f, 1.2f, 8.0f, 2.8f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.4f, 1.3f, 10.0f, 2.6f, 180.0f, 30.0f, 50.099998f, 35.0f}, + {-14000, 10000, -18000, -10000, 0, 0, 0, 0, 4000, 15000, -8000, -15000, 1.0f, 200, 1.5f, 1.6f, 10.0f, 4.4f, 180.0f, 30.0f, 50.099998f, 35.0f}, + }; + for (int i = 0; i < 14; i++) { + for (int j = 0; j < 21; j++) { + memcpy(&field_0x20c4[i].field_0x004[j].field_0x04, &a_jntTbl_W[i][j], 20); + } + memcpy(&field_0x20c4[i].field_0x1FC, &a_prmTbl_W[i], 0x40); + } +} diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index decd32629d..043b1aa540 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -502,7 +502,7 @@ static BOOL message(npc_du_class* i_this) { return FALSE; } -static bool l_initHIO; +static bool hio_set; static u8 lit_3757[12]; @@ -591,7 +591,7 @@ static int daNpc_Du_Delete(npc_du_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "Npc_Du"); if (i_this->mIsFirstSpawn) { - l_initHIO = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -660,9 +660,9 @@ static cPhs__Step daNpc_Du_Create(fopAc_ac_c* a_this) { } OS_REPORT("//////////////NPC_DU SET 2 !!\n"); - if (!l_initHIO) { + if (!hio_set) { i_this->mIsFirstSpawn = 1; - l_initHIO = true; + hio_set = true; l_HIO.id = mDoHIO_CREATE_CHILD("アヒル", &l_HIO); } diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 1846f27af9..61212d3c96 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -423,7 +423,7 @@ static void* s_fish_sub(void* param_0, void* param_1) { return 0; } -static u8 l_HIOInit; +static u8 hio_set; static daNpc_Henna_HIO_c l_HIO; @@ -2592,7 +2592,7 @@ static bool daNpc_Henna_IsDelete(npc_henna_class* param_0) { static int daNpc_Henna_Delete(npc_henna_class* i_this) { dComIfG_resDelete(&i_this->phase, "Henna"); if (i_this->hio_init != 0) { - l_HIOInit = 0; + hio_set = 0; } return 1; } @@ -2694,9 +2694,9 @@ static int daNpc_Henna_Create(fopAc_ac_c* i_this) { } OS_REPORT("//////////////NPC_HENNA SET 2 !!\n"); - if (!l_HIOInit ) { + if (!hio_set ) { a_this->hio_init = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; // "Henna" l_HIO.id = mDoHIO_CREATE_CHILD("ヘナさま", &l_HIO); } diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 6e745d74c9..df3fa31072 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -300,7 +300,7 @@ static npc_ks_class* leader; static u32 call_pt; -static u8 l_HIOInit; +static u8 hio_set; static daNpc_Ks_HIO_c l_HIO; @@ -6878,7 +6878,7 @@ static int daNpc_Ks_Delete(npc_ks_class* i_this) { dComIfG_resDelete(&i_this->mPhase, i_this->res_name); if (i_this->hio_init != 0) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.no); } @@ -7402,9 +7402,9 @@ static int daNpc_Ks_Create(fopAc_ac_c* actor) { } OS_REPORT("//////////////NPC_KS SET 2 !!\n"); - if (l_HIOInit == 0) { + if (hio_set == 0) { i_this->hio_init = 1; - l_HIOInit = 1; + hio_set = 1; l_HIO.no = mDoHIO_CREATE_CHILD("コザル", &l_HIO); // Kozaru } diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 5e410ee76f..496e90a3c1 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -301,7 +301,7 @@ static s16 climb_angle_get(npc_ne_class* i_this) { } /* 80A92AC5 0003+00 data_80A92AC5 None */ -static bool l_hioInit; +static bool hio_set; static daNpc_Ne_HIO_c l_HIO; @@ -3025,7 +3025,7 @@ static int daNpc_Ne_IsDelete(npc_ne_class* i_this) { static int daNpc_Ne_Delete(npc_ne_class* i_this) { dComIfG_resDelete(&i_this->mPhase, i_this->mResName); if (i_this->mHIOInit != 0) { - l_hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { i_this->mSound.deleteObject(); @@ -3163,9 +3163,9 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { } } - if (!l_hioInit) { + if (!hio_set) { _this->mHIOInit = 1; - l_hioInit = true; + hio_set = true; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index d64bf2db59..e51ad61dc1 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -14,7 +14,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" -static bool hioInit; +static bool hio_set; static daNpc_Sq_HIO_c l_HIO; @@ -291,7 +291,7 @@ static int daNpc_Sq_IsDelete(npc_sq_class* i_this) { static int daNpc_Sq_Delete(npc_sq_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "Sq"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } return 1; } @@ -337,9 +337,9 @@ static cPhs__Step daNpc_Sq_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index cdbfadc75b..616b263fde 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -420,7 +420,7 @@ static cXyz return_pos_get(npc_tkj2_class* i_this) { return player->current.pos; } -static u8 l_initHIO; +static u8 hio_set; static daNpc_Tkj2_HIO_c l_HIO; @@ -1029,7 +1029,7 @@ static int daNpc_Tkj2_Delete(npc_tkj2_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "Tkj2"); if (i_this->field_0xa9c != 0) { - l_initHIO = 0; + hio_set = 0; } if (a_this->heap != NULL) { @@ -1093,9 +1093,9 @@ static cPhs__Step daNpc_Tkj2_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (l_initHIO == 0) { + if (hio_set == 0) { i_this->field_0xa9c = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index da17324ba9..ee0c02efd4 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -13,7 +13,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" -static bool hioInit; +static bool hio_set; static daObj_AriHIO_c l_HIO; @@ -523,7 +523,7 @@ void daObjARI_c::Z_BufferChk() { int daObjARI_c::Delete() { dComIfG_resDelete(&mPhase, "I_Ari"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { mpMorf->stopZelAnime(); @@ -640,8 +640,8 @@ cPhs__Step daObjARI_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_balloon.cpp b/src/d/actor/d_a_obj_balloon.cpp index b36140b816..fcbea2b3cb 100644 --- a/src/d/actor/d_a_obj_balloon.cpp +++ b/src/d/actor/d_a_obj_balloon.cpp @@ -62,7 +62,7 @@ void daObj_Balloon_c::saveBestScore() { dComIfGp_setMessageCountNumber(m_balloon_score); } -static u8 l_initHIO; +static u8 hio_set; static daObj_Balloon_HIO_c l_HIO; @@ -204,7 +204,7 @@ int daObj_Balloon_c::_delete() { dComIfG_resDelete(&mPhase, "Obj_bal"); Z2GetAudioMgr()->seStop(Z2SE_OBJ_WATERMILL_ROUND, 0); if (mHIOInit) { - l_initHIO = false; + hio_set = false; } return 1; } @@ -245,9 +245,9 @@ int daObj_Balloon_c::create() { return cPhs_ERROR_e; } - if (!l_initHIO) { + if (!hio_set) { mHIOInit = true; - l_initHIO = true; + hio_set = true; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 910f90ac72..120c05a999 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -47,7 +47,7 @@ daObj_BattaHIO_c::daObj_BattaHIO_c() { mModelScaleFemale = 1.4f; } -static bool l_HIOInit; +static bool hio_set; static daObj_BattaHIO_c l_HIO; @@ -527,7 +527,7 @@ int daObjBATTA_c::_delete() { dComIfG_resDelete(&mPhase, "Bat"); if (mIsHIOOwner != 0) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -641,8 +641,8 @@ int daObjBATTA_c::create() { OS_REPORT("/////////////////// BATTA SET OK /////////////////\n"); - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mIsHIOOwner = true; // Golden Bugs l_HIO.mId = mDoHIO_CREATE_CHILD("黄金蟲(バッタ)", &l_HIO); diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index efe0c02d5e..51d47ec630 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -13,7 +13,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" -static bool hioInit; +static bool hio_set; static daObj_ChoHIO_c l_HIO; @@ -448,7 +448,7 @@ void daObjCHO_c::ObjHit() { int daObjCHO_c::Delete() { dComIfG_resDelete(&mPhaseReq, "I_Cho"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { mpMorf->stopZelAnime(); @@ -565,8 +565,8 @@ cPhs__Step daObjCHO_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 989aa9a45b..78f200f9e8 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -13,7 +13,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" -static bool hioInit; +static bool hio_set; static daObj_DanHIO_c l_HIO; @@ -424,7 +424,7 @@ int daObjDAN_c::Execute() { int daObjDAN_c::Delete() { dComIfG_resDelete(&mPhase, "I_Dan"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { mpMorf->stopZelAnime(); @@ -538,8 +538,8 @@ cPhs__Step daObjDAN_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp index 19aae2eea0..31dde10a02 100644 --- a/src/d/actor/d_a_obj_food.cpp +++ b/src/d/actor/d_a_obj_food.cpp @@ -14,7 +14,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" -static bool hioInit; +static bool hio_set; static daObj_Food_HIO_c l_HIO; @@ -389,7 +389,7 @@ static int daObj_Food_IsDelete(obj_food_class* i_this) { static int daObj_Food_Delete(obj_food_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "Obj_fd"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } if (i_this->heap != NULL) { i_this->mSound.deleteObject(); @@ -433,9 +433,9 @@ static cPhs__Step daObj_Food_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp index f41a3073a2..0242c01f92 100644 --- a/src/d/actor/d_a_obj_fw.cpp +++ b/src/d/actor/d_a_obj_fw.cpp @@ -29,7 +29,7 @@ daObj_Fw_HIO_c::daObj_Fw_HIO_c() { size = 1.0f; } -static u8 l_initHIO; +static u8 hio_set; static daObj_Fw_HIO_c l_HIO; @@ -192,7 +192,7 @@ static int daObj_Fw_Delete(obj_fw_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "RYUW00"); if (i_this->field_0x624 != 0) { - l_initHIO = 0; + hio_set = 0; } dComIfG_Bgsp().Release(i_this->mpBgW); @@ -277,9 +277,9 @@ static cPhs__Step daObj_Fw_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (l_initHIO == 0) { + if (hio_set == 0) { i_this->field_0x624 = 1; - l_initHIO = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp index 2dee46fc3b..33d4ccc6a0 100644 --- a/src/d/actor/d_a_obj_gm.cpp +++ b/src/d/actor/d_a_obj_gm.cpp @@ -594,7 +594,7 @@ static int daObj_Gm_IsDelete(obj_gm_class* i_this) { return 1; } -static bool l_initHIO; +static bool hio_set; static int daObj_Gm_Delete(obj_gm_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->actor; @@ -603,7 +603,7 @@ static int daObj_Gm_Delete(obj_gm_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "OBJ_GM"); if (i_this->mIsFirstSpawn) { - l_initHIO = false; + hio_set = false; } if (a_this->heap != NULL) { @@ -663,9 +663,9 @@ static cPhs__Step daObj_Gm_Create(fopAc_ac_c* a_this) { OS_REPORT("//////////////OBJ_GM SET 2 !!\n"); - if (!l_initHIO) { + if (!hio_set) { i_this->mIsFirstSpawn = true; - l_initHIO = true; + hio_set = true; l_HIO.id = -1; } diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 862aaab606..6d5cbfbe62 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -272,7 +272,7 @@ int daObjGOMIKABE_c::CreateHeap() { return 1; } -static bool l_HIOInit; +static bool hio_set; static daObjGOMIKABE_HIO_c l_HIO; @@ -309,8 +309,8 @@ int daObjGOMIKABE_c::create() { mBaseScale.set(1.0f, 1.0f, 1.0f); } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mIsHIOOwner = 1; // Garbage Wall l_HIO.mId = mDoHIO_CREATE_CHILD("ごみ壁", &l_HIO); @@ -379,7 +379,7 @@ int daObjGOMIKABE_c::Draw() { int daObjGOMIKABE_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName); if (mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } return 1; diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index 704f5d32be..da3c4778b5 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -52,7 +52,7 @@ void daObjIce_s_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 para cLib_addCalcAngleS(¶m_1, param_3 * (param_2 / param_4), 5, 0x100, 1); } -static u8 l_HIOInit; +static u8 hio_set; static daOBJ_ICE_S_HIO_c l_HIO; @@ -192,8 +192,8 @@ int daObjIce_s_c::create() { return rv; } } - if (!l_HIOInit) { - l_HIOInit = TRUE; + if (!hio_set) { + hio_set = TRUE; field_0x640 = 1; l_HIO.mId = mDoHIO_CREATE_CHILD("氷の足場小", &l_HIO); } @@ -286,7 +286,7 @@ int daObjIce_s_c::Draw() { int daObjIce_s_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName); if (field_0x640 != 0) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.mId); } return 1; diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp index 09b8b62985..1e78250bb4 100644 --- a/src/d/actor/d_a_obj_ito.cpp +++ b/src/d/actor/d_a_obj_ito.cpp @@ -18,7 +18,7 @@ daObj_Ito_HIO_c::daObj_Ito_HIO_c() { field_0x10 = 1; } -static u8 l_initHio; +static u8 hio_set; static daObj_Ito_HIO_c l_HIO; @@ -539,7 +539,7 @@ static int daObj_Ito_Delete(obj_ito_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "OBJ_ITO"); if (i_this->field_0x150b != 0) { - l_initHio = 0; + hio_set = 0; } if (a_this->heap != NULL) { @@ -613,9 +613,9 @@ static cPhs__Step daObj_Ito_Create(fopAc_ac_c* a_this) { OS_REPORT("//////////////OBJ_ITO SET 2 !!\n"); - if (l_initHio == 0) { + if (hio_set == 0) { i_this->field_0x150b = 1; - l_initHio = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 7ce815ab13..e3dbeee34b 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -13,7 +13,7 @@ #include "d/d_procname.h" #include "f_op/f_op_camera_mng.h" -static bool hioInit; +static bool hio_set; static daObj_KabHIO_c l_HIO; @@ -642,7 +642,7 @@ void daObjKABUTO_c::ObjHit() { int daObjKABUTO_c::Delete() { dComIfG_resDelete(&mPhaseReq, "Kab_m"); if (mHIOInit) { - hioInit = false; + hio_set = false; } if (heap != NULL) { mpMorf->stopZelAnime(); @@ -750,8 +750,8 @@ cPhs__Step daObjKABUTO_c::create() { return cPhs_ERROR_e; } - if (!hioInit) { - hioInit = true; + if (!hio_set) { + hio_set = true; mHIOInit = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index 2a90740521..6ea9116146 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -40,7 +40,7 @@ public: /* 0x0C */ f32 model_scale_male; // モデルスケール(オス) - Model Scale (Male) }; -static u8 l_initHIO; +static u8 hio_set; static daObj_KagHIO_c l_HIO; @@ -582,7 +582,7 @@ int daObjKAG_c::_delete() { dComIfG_resDelete(&mPhase, "I_Kag"); if (field_0x85f != 0) { - l_initHIO = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -695,8 +695,8 @@ cPhs__Step daObjKAG_c::create() { OS_REPORT("/////////// I_kag SET OK ///////\n"); - if (l_initHIO == 0) { - l_initHIO = 1; + if (hio_set == 0) { + hio_set = 1; field_0x85f = 1; l_HIO.id = mDoHIO_CREATE_CHILD("黄金蟲(カゲロウ)", &l_HIO); } diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index 1005914025..052283761a 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_lib.h" -static u8 l_initHIO; +static u8 hio_set; static daObj_KamHIO_c l_HIO; @@ -693,7 +693,7 @@ int daObjKAM_c::Execute() { int daObjKAM_c::Delete() { dComIfG_resDelete(&mPhase, "I_Kam"); if (field_0xa64 != 0) { - l_initHIO = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.field_0x4); } if (heap != NULL) { @@ -805,8 +805,8 @@ int daObjKAM_c::create() { return cPhs_ERROR_e; } - if (l_initHIO == FALSE) { - l_initHIO = TRUE; + if (hio_set == FALSE) { + hio_set = TRUE; field_0xa64 = 1; // Golden Mantis l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("黄金蟲(カマキリ)", &l_HIO); diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 60be0364f3..a0f1bb939e 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -691,8 +691,8 @@ void daObj_Kanban2_c::setSmokeEffect(cXyz i_pos) { fopAcM_effSmokeSet1(&field_0x9e0, &field_0x9e4, &i_pos, NULL, 0.02 * field_0x600, &tevStr, 1); } -/* 80585CB5 0003+00 l_initHIO None */ -static u8 l_initHIO; +/* 80585CB5 0003+00 hio_set None */ +static u8 hio_set; static daObj_Kanban2_HIO_c l_HIO; @@ -1660,7 +1660,7 @@ int daObj_Kanban2_c::_delete() { dComIfG_resDelete(&mPhase, "Obj_kn2"); if (mInitHIO) { - l_initHIO = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -1721,8 +1721,8 @@ int daObj_Kanban2_c::create() { return cPhs_ERROR_e; } - if (!l_initHIO) { - l_initHIO = true; + if (!hio_set) { + hio_set = true; mInitHIO = true; l_HIO.id = mDoHIO_CREATE_CHILD("細切れ看板", &l_HIO); } diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 09b05d6be5..e0a649a674 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_lib.h" -static u8 hioInit; +static u8 hio_set; static daObj_KatHIO_c l_HIO; @@ -626,7 +626,7 @@ void daObjKAT_c::Z_BufferChk() { int daObjKAT_c::Delete() { dComIfG_resDelete(&mPhase, "Kat"); if (field_0xa70 != 0) { - hioInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.field_0x4); } if (heap != NULL) { @@ -728,8 +728,8 @@ int daObjKAT_c::create() { return cPhs_ERROR_e; } - if (hioInit == 0) { - hioInit = 1; + if (hio_set == 0) { + hio_set = 1; field_0xa70 = 1; // Golden Snail l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("黄金蟲(カタツムリ)", &l_HIO); diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 05e30dd828..205b0e2bc4 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -24,7 +24,7 @@ void daObj_Kbox_HIO_c::genMessage(JORMContext* ctx) { } #endif -static bool l_HIOInit; +static bool hio_set; static daObj_Kbox_HIO_c l_HIO; @@ -431,7 +431,7 @@ static int daObj_Kbox_Delete(obj_kbox_class* i_this) { fopAcM_GetID(a_this); dComIfG_resDelete(&i_this->mPhase, "Obj_kbox"); if (i_this->mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } dComIfG_Bgsp().Release(i_this->mBgw); @@ -486,9 +486,9 @@ static int daObj_Kbox_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = true; - l_HIOInit = true; + hio_set = true; l_HIO.mId = mDoHIO_CREATE_CHILD("スカル魚専用木箱", &l_HIO); } fopAcM_SetMtx(a_this, i_this->mModel->getBaseTRMtx()); diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index ac9a10a87f..a1e8f5b110 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -50,7 +50,7 @@ static int daObj_Key_Draw(obj_key_class* i_this) { return 1; } -static u8 l_HIOInit; +static u8 hio_set; static daObj_Key_HIO_c l_HIO; @@ -553,7 +553,7 @@ static int daObj_Key_Delete(obj_key_class* i_this) { dComIfG_resDelete(&i_this->phase, "Obj_key"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -616,9 +616,9 @@ static int daObj_Key_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////OBJ_KEY SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { a_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("カギＯＢＪ", &l_HIO); } diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index 67e36b4da9..7ca8611077 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -254,7 +254,7 @@ static void chain_control3(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int } /* 80C43CE5 0003+00 data_80C43CE5 None */ -static u8 l_HIOInit; +static u8 hio_set; static daObj_Keyhole_HIO_c l_HIO; @@ -634,7 +634,7 @@ static int daObj_Keyhole_Delete(obj_keyhole_class* i_this) { dComIfG_resDelete(&i_this->phase, i_this->arcname); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -757,9 +757,9 @@ static int daObj_Keyhole_Create(fopAc_ac_c* a_this) { i_this->arg0 = 0; } - if (!l_HIOInit) { + if (!hio_set) { i_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("リアル施錠", &l_HIO); } diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index 2168f577f4..5922cb1ad0 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -12,7 +12,7 @@ static int ki_bmd[2] = {9, 10}; -static bool hioInit; +static bool hio_set; static daObj_Ki_HIO_c l_HIO; @@ -100,7 +100,7 @@ static int daObj_Ki_IsDelete(obj_ki_class* i_this) { static int daObj_Ki_Delete(obj_ki_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "Obj_Ki"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } dComIfG_Bgsp().Release(i_this->mpBgW); return 1; @@ -160,9 +160,9 @@ static cPhs__Step daObj_Ki_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 7c52cd9edd..2aa8b20005 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -48,7 +48,7 @@ static void ride_call_back(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param ((obj_kita_class*)param_1)->field_0x590 = 20; } -static bool l_HIOInit; +static bool hio_set; static daObj_Kita_HIO_c l_HIO; @@ -171,7 +171,7 @@ static int daObj_Kita_Delete(obj_kita_class* i_this) { fopAcM_RegisterDeleteID(i_this, "Obj_Kita"); dComIfG_resDelete(&i_this->mPhase, "Obj_kita"); if (i_this->mIsHIOOwner) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -244,9 +244,9 @@ static int daObj_Kita_Create(fopAc_ac_c* a_this) { i_this->mKitas[i].mScaleX = cM_rndFX(0.05f) + 1.0f; } - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = true; - l_HIOInit = 1; + hio_set = 1; l_HIO.mId = mDoHIO_CREATE_CHILD("風で動く連続板", &l_HIO); } diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 621413f632..761cee8f8d 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -697,14 +697,14 @@ int daObjKUW_c::Execute() { return 1; } -static bool l_HIOInit; +static bool hio_set; static daObj_KuwHIO_c l_HIO; int daObjKUW_c::Delete() { dComIfG_resDelete(&mPhase, "I_Kuw"); if (mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } @@ -810,8 +810,8 @@ int daObjKUW_c::create() { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mIsHIOOwner = true; l_HIO.mId = mDoHIO_CREATE_CHILD("黄金蟲(クワガタ)", &l_HIO); } diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index 0163bbe96d..d98ee17945 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -88,7 +88,7 @@ static void msima_start(obj_msima_class* i_this) { /* 80C9CEA4 0001+00 data_80C9CEA4 @1009 */ /* 80C9CEA5 0003+00 data_80C9CEA5 None */ -static bool l_HIOInit; +static bool hio_set; static daObj_Msima_HIO_c l_HIO; @@ -366,7 +366,7 @@ static int daObj_Msima_Delete(obj_msima_class* i_this) { fopAcM_GetID(a_this); dComIfG_resDelete(&i_this->mPhase, "MAGNESIMA"); if (i_this->mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } dComIfG_Bgsp().Release(i_this->mpBgW); @@ -458,9 +458,9 @@ static int daObj_Msima_Create(fopAc_ac_c* a_this) { return cPhs_ERROR_e; } - if (!l_HIOInit) { + if (!hio_set) { i_this->mIsHIOOwner = true; - l_HIOInit = 1; + hio_set = 1; // Magma Island l_HIO.mId = mDoHIO_CREATE_CHILD("マグネ島", &l_HIO); } diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index 72657355a8..e0f7332d6d 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -170,7 +170,7 @@ static void action(obj_rw_class* i_this) { i_this->field_0x670 = i_this->field_0x66c * (20.0f + TREG_F(16)) * cM_ssin(i_this->field_0x672); } -static u8 l_HIOInit; +static u8 hio_set; static daOBJ_RW_HIO_c l_HIO; @@ -267,7 +267,7 @@ static int daOBJ_RW_Delete(obj_rw_class* i_this) { dComIfG_resDelete(&i_this->phase, "Obj_rw"); if (i_this->HIOInit) { - l_HIOInit = FALSE; + hio_set = FALSE; mDoHIO_DELETE_CHILD(l_HIO.id); } @@ -310,9 +310,9 @@ static int daOBJ_RW_Create(fopAc_ac_c* actor) { OS_REPORT("//////////////OBJ_RW SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { i_this->HIOInit = TRUE; - l_HIOInit = TRUE; + hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("いのししまる焼き", &l_HIO); } diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 620671511f..b457f617cd 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -140,7 +140,7 @@ static void* shot_b_sub(void* param_1, void* param_2) { /* 80D158F4 0001+00 data_80D158F4 @1009 */ /* 80D158F5 0003+00 data_80D158F5 None */ -static u8 l_HIOInit; +static u8 hio_set; static daObj_Toby_HIO_c l_HIO; @@ -416,7 +416,7 @@ static int daObj_Toby_Delete(obj_toby_class* i_this) { } dComIfG_resDelete(&i_this->mPhase, i_this->mArcName); if (i_this->field_0x6370 != 0) { - l_HIOInit = 0; + hio_set = 0; mDoHIO_DELETE_CHILD(l_HIO.field_0x4); } return 1; @@ -588,9 +588,9 @@ static int daObj_Toby_Create(fopAc_ac_c* a_this) { OS_REPORT("//////////////OBJ_TOBY SET 2 !!\n"); - if (!l_HIOInit) { + if (!hio_set) { i_this->field_0x6370 = 1; - l_HIOInit = 1; + hio_set = 1; l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("飛び床", &l_HIO); } diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 617ae6ee6d..1252922559 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -433,7 +433,7 @@ void daObjTOMBO_c::BoomChk() { } } -static bool l_HIOInit; +static bool hio_set; static daObj_TomHIO_c l_HIO; @@ -533,7 +533,7 @@ void daObjTOMBO_c::Z_BufferChk() { int daObjTOMBO_c::Delete() { dComIfG_resDelete(&mPhase, "Tombo"); if (mIsHIOOwner) { - l_HIOInit = false; + hio_set = false; mDoHIO_DELETE_CHILD(l_HIO.mId); } if (heap != NULL) { @@ -638,8 +638,8 @@ int daObjTOMBO_c::create() { if (!fopAcM_entrySolidHeap(this, useHeapInit, 0xaa0)) { return cPhs_ERROR_e; } - if (!l_HIOInit) { - l_HIOInit = true; + if (!hio_set) { + hio_set = true; mIsHIOOwner = true; // Golden Dragonfly l_HIO.mId = mDoHIO_CREATE_CHILD("黄金蟲(トンボ)", &l_HIO); diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index de4faf2a17..ba29686f2e 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -13,7 +13,7 @@ #include "d/d_com_inf_game.h" #include "d/d_procname.h" -static bool hioInit; +static bool hio_set; static daSq_HIO_c l_HIO; @@ -463,7 +463,7 @@ static int daSq_IsDelete(sq_class* i_this) { static int daSq_Delete(sq_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "Sq"); if (i_this->mHIOInit) { - hioInit = false; + hio_set = false; } return 1; } @@ -514,9 +514,9 @@ static cPhs__Step daSq_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!hioInit) { + if (!hio_set) { _this->mHIOInit = true; - hioInit = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index c397cf96a0..af1d6d38c1 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -7450,8 +7450,8 @@ bool dCamera_c::railCamera(s32 param_0) { cSGlobe eyeFromCenter = bestEyePos - mViewCache.mCenter; cSAngle unkAngle1 = eyeFromCenter.U() - mViewCache.mDirection.U(); - static cSAngle yawSnapThreshold = 120.0f; - if (unkAngle1.Abs() > yawSnapThreshold) { + static cSAngle _120 = 120.0f; + if (unkAngle1.Abs() > _120) { setUSOAngle(); } @@ -7681,8 +7681,8 @@ bool dCamera_c::paraRailCamera(s32 param_0) { cSGlobe cStack_260 = paraRail->field_0x10 - mViewCache.mCenter; cSAngle acStack_2cc = cStack_260.U() - mViewCache.mDirection.U(); - static cSAngle paraRailCamera = 120.0f; - if (acStack_2cc.Abs() > paraRailCamera) { + static cSAngle _120 = 120.0f; + if (acStack_2cc.Abs() > _120) { setUSOAngle(); } From 9ac6dd004476c5d78e4b4798b30a5dd821c34c22 Mon Sep 17 00:00:00 2001 From: kipcode66 Date: Sun, 21 Dec 2025 20:48:09 -0500 Subject: [PATCH 02/35] next round of standard compiler fixes (#2969) * next round of standard compiler fixes * Fix weak function order issue * fix missmatch with ShieldD version --- include/JSystem/JAudio2/JASTrack.h | 15 +++++++++++++++ include/JSystem/JGadget/binary.h | 2 +- include/JSystem/JGadget/linklist.h | 2 +- include/d/d_path.h | 2 +- include/global.h | 6 ++++++ src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp | 6 +++--- src/JSystem/J3DGraphBase/J3DTransform.cpp | 8 ++++---- src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp | 10 +++++----- src/JSystem/JAudio2/JASAudioThread.cpp | 3 ++- src/JSystem/JAudio2/JASBNKParser.cpp | 10 +++++----- src/JSystem/JAudio2/JASBasicWaveBank.cpp | 3 ++- src/JSystem/JAudio2/JASCalc.cpp | 15 +++++++++------ src/JSystem/JAudio2/JASSimpleWaveBank.cpp | 3 ++- src/JSystem/JKernel/JKRDvdArchive.cpp | 6 +++--- src/JSystem/JKernel/JKRDvdFile.cpp | 3 ++- src/JSystem/JKernel/JKRThread.cpp | 2 +- src/JSystem/JMessage/processor.cpp | 4 ++-- src/JSystem/JUtility/JUTCacheFont.cpp | 9 +++++---- src/JSystem/JUtility/JUTGraphFifo.cpp | 3 ++- src/JSystem/JUtility/JUTTexture.cpp | 4 ++-- src/d/d_camera.cpp | 2 +- 21 files changed, 74 insertions(+), 44 deletions(-) diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h index a5eac30c6d..b749e87471 100644 --- a/include/JSystem/JAudio2/JASTrack.h +++ b/include/JSystem/JAudio2/JASTrack.h @@ -181,6 +181,7 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded { /* 0x000 */ JASSeqCtrl mSeqCtrl; /* 0x05C */ JASTrackPort mTrackPort; /* 0x080 */ JASRegisterParam mRegisterParam; +#ifdef __MWERKS__ /* 0x09C */ union { struct { MoveParam_ volume; @@ -192,6 +193,20 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded { } params; MoveParam_ array[6]; } mMoveParam; +#else + /* 0x09C */ union MoveParam_u { + struct { + MoveParam_ volume; + MoveParam_ pitch; + MoveParam_ fxmix; + MoveParam_ pan; + MoveParam_ dolby; + MoveParam_ distFilter; + } params; + MoveParam_ array[6]; + MoveParam_u() {} + } mMoveParam; +#endif /* 0x0e4 */ JASOscillator::Data mOscParam[2]; /* 0x114 */ JASOscillator::Point mOscPoint[4]; /* 0x12C */ JASTrack* mParent; diff --git a/include/JSystem/JGadget/binary.h b/include/JSystem/JGadget/binary.h index 93b2a9c008..fc6c2641fb 100644 --- a/include/JSystem/JGadget/binary.h +++ b/include/JSystem/JGadget/binary.h @@ -92,7 +92,7 @@ struct TParseValue : public Parser { } static const void* advance(const void* data, s32 advanceNum) { - return (char*)data + (advanceNum * sizeof(Parser::ParseType)); + return (char*)data + (advanceNum * sizeof(typename Parser::ParseType)); } }; diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index da51a35060..2fcb281f06 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -262,7 +262,7 @@ struct TLinkList_factory : public TLinkList { } typename TLinkList::iterator Erase_destroy(T* param_0) { - typename TLinkList::iterator spC(Erase(param_0)); + typename TLinkList::iterator spC(this->Erase(param_0)); Do_destroy(param_0); return spC; } diff --git a/include/d/d_path.h b/include/d/d_path.h index 534d2b3d89..37a876a8f8 100644 --- a/include/d/d_path.h +++ b/include/d/d_path.h @@ -2,7 +2,7 @@ #define D_D_PATH_H #include "dolphin/types.h" -#include "mtx.h" +#include "dolphin/mtx.h" class cBgS_PolyInfo; struct cXyz; diff --git a/include/global.h b/include/global.h index f9057a67ae..5176f8021e 100644 --- a/include/global.h +++ b/include/global.h @@ -131,4 +131,10 @@ static const float INF = 2000000000.0f; #define SJIS(character, value) ((u32)value) #endif +#ifdef __MWERKS__ +#define ASM asm +#else +#define ASM +#endif + #endif diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp index 17112fb93c..d8ddfdea22 100644 --- a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp @@ -274,7 +274,7 @@ int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) { u8* pDListPos = pDList; int uVar13; for (; - (int)pDListPos - (int)pDList < pModelData->getShapeNodePointer(i)->getShapeDraw(j)->getDisplayListSize(); + (intptr_t)pDListPos - (intptr_t)pDList < pModelData->getShapeNodePointer(i)->getShapeDraw(j)->getDisplayListSize(); pDListPos += r23 * uVar13 //TODO: This loop's logic has drastically different codegen between GCN and Shield // in a way that so far can't be pinned down as just compiler differences. This @@ -388,8 +388,8 @@ void J3DSkinDeform::changeFastSkinDL(J3DModelData* pModelData) { dl = (u8*)dl + vtxSize * vtxCount; } - int dlistSize = ((int)dst - (int)displayListStart + 0x1f) & ~0x1f; - while ((int)dst - (int)displayListStart < pShapeNode->getShapeDraw(j)->getDisplayListSize()) { + int dlistSize = ((intptr_t)dst - (intptr_t)displayListStart + 0x1f) & ~0x1f; + while ((intptr_t)dst - (intptr_t)displayListStart < pShapeNode->getShapeDraw(j)->getDisplayListSize()) { *dst++ = 0; } diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/src/JSystem/J3DGraphBase/J3DTransform.cpp index b13262e852..cdc744c272 100644 --- a/src/JSystem/J3DGraphBase/J3DTransform.cpp +++ b/src/JSystem/J3DGraphBase/J3DTransform.cpp @@ -101,7 +101,7 @@ void J3DCalcYBBoardMtx(Mtx mtx) { mtx[2][2] = vec.z * z; } -asm void J3DPSCalcInverseTranspose(__REGISTER Mtx src, __REGISTER Mtx33 dst) { +ASM void J3DPSCalcInverseTranspose(__REGISTER Mtx src, __REGISTER Mtx33 dst) { #ifdef __MWERKS__ // clang-format off psq_l f0, 0(src), 1, 0 psq_l f1, 4(src), 0, 0 @@ -290,7 +290,7 @@ void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo& srt, Mtx dst) { dst[2][2] = 1.0f; } -asm void J3DScaleNrmMtx(__REGISTER Mtx mtx, const __REGISTER Vec& scl) { +ASM void J3DScaleNrmMtx(__REGISTER Mtx mtx, const __REGISTER Vec& scl) { #ifdef __MWERKS__ // clang-format off nofralloc; @@ -326,7 +326,7 @@ asm void J3DScaleNrmMtx(__REGISTER Mtx mtx, const __REGISTER Vec& scl) { #endif // clang-format on } -asm void J3DScaleNrmMtx33(__REGISTER Mtx33 mtx, const __REGISTER Vec& scale) { +ASM void J3DScaleNrmMtx33(__REGISTER Mtx33 mtx, const __REGISTER Vec& scale) { #ifdef __MWERKS__ // clang-format off psq_l f0, 0(mtx), 0, 0 psq_l f6, 0(scale), 0, 0 @@ -352,7 +352,7 @@ asm void J3DScaleNrmMtx33(__REGISTER Mtx33 mtx, const __REGISTER Vec& scale) { #endif // clang-format on } -asm void J3DMtxProjConcat(__REGISTER Mtx mtx1, __REGISTER Mtx mtx2, __REGISTER Mtx dst) { +ASM void J3DMtxProjConcat(__REGISTER Mtx mtx1, __REGISTER Mtx mtx2, __REGISTER Mtx dst) { #ifdef __MWERKS__ // clang-format off psq_l f2, 0(mtx1), 0, 0 psq_l f3, 8(mtx1), 0, 0 diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index 3abd6ea603..895652ef40 100644 --- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -70,9 +70,9 @@ void J3DClusterLoader_v15::readCluster(const J3DClusterBlock* block) { mpDeformData->mVtxNrm = JSUConvertOffsetToPtr(block, block->mVtxNrm); void* clusterPointer = block->mClusterPointer; - int clusterKeyPointerSize = (int)block->mClusterKeyPointer - (int)clusterPointer; - int clusterVertexPointerSize = (int)block->mClusterVertex - (int)clusterPointer; - int vtxPosSize = (int)block->mVtxPos - (int)clusterPointer; + int clusterKeyPointerSize = (intptr_t)block->mClusterKeyPointer - (intptr_t)clusterPointer; + int clusterVertexPointerSize = (intptr_t)block->mClusterVertex - (intptr_t)clusterPointer; + int vtxPosSize = (intptr_t)block->mVtxPos - (intptr_t)clusterPointer; u8* arr = new (0x20) u8[vtxPosSize]; memcpy(arr, JSUConvertOffsetToPtr(block, clusterPointer), vtxPosSize); mpDeformData->mClusterPointer = (J3DCluster*)arr; @@ -81,10 +81,10 @@ void J3DClusterLoader_v15::readCluster(const J3DClusterBlock* block) { for (int i = 0; i < mpDeformData->getClusterNum(); i++) { J3DCluster* cluster = &mpDeformData->mClusterPointer[i]; - cluster->mClusterKey = JSUConvertOffsetToPtr(arr - (int)clusterPointer, cluster->mClusterKey); + cluster->mClusterKey = JSUConvertOffsetToPtr(arr - (intptr_t)clusterPointer, cluster->mClusterKey); cluster->field_0x18 = JSUConvertOffsetToPtr(block, cluster->field_0x18); cluster->mClusterVertex = - JSUConvertOffsetToPtr(arr - (int)clusterPointer, cluster->mClusterVertex); + JSUConvertOffsetToPtr(arr - (intptr_t)clusterPointer, cluster->mClusterVertex); J3DDeformer* deformer = new J3DDeformer(mpDeformData); if (cluster->field_0x14 != 0) { deformer->field_0xc = new f32[cluster->field_0x14 * 3]; diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/src/JSystem/JAudio2/JASAudioThread.cpp index e689a9607f..fef909dd16 100644 --- a/src/JSystem/JAudio2/JASAudioThread.cpp +++ b/src/JSystem/JAudio2/JASAudioThread.cpp @@ -9,6 +9,7 @@ #include "JSystem/JAudio2/JASProbe.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "dolphin/dsp.h" +#include "stdint.h" JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority) : @@ -60,7 +61,7 @@ void* JASAudioThread::run() { while (true) { OSMessage msg = waitMessageBlock(); - switch ((int)msg) { + switch ((intptr_t)msg) { case AUDIOMSG_DMA: if (sbPauseFlag) { JASDriver::stopDMA(); diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp index dbaad63bee..0df05ca9b8 100644 --- a/src/JSystem/JAudio2/JASBNKParser.cpp +++ b/src/JSystem/JAudio2/JASBNKParser.cpp @@ -40,13 +40,13 @@ JASBasicBank* JASBNKParser::createBasicBank(void const* stream, JKRHeap* heap) { JASBNKParser::Ver1::TChunk* JASBNKParser::Ver1::findChunk(void const* stream, u32 id) { TFileHeader* header = (TFileHeader*)stream; - void* end = (void*)((int)stream + header->mSize); - TChunk* chunk = (TChunk*)((int)stream + 0x20); + void* end = (void*)((intptr_t)stream + header->mSize); + TChunk* chunk = (TChunk*)((intptr_t)stream + 0x20); while (chunk < end) { if (chunk->mID == id) { return chunk; } - chunk = (TChunk*)(((int)chunk + 0xb + chunk->mSize) & ~3); + chunk = (TChunk*)(((intptr_t)chunk + 0xb + chunk->mSize) & ~3); } return NULL; } @@ -85,7 +85,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h bank->newInstTable(list_chunk->mCount, heap); for (int i = 0; i < list_chunk->mCount; i++) { if (list_chunk->mOffsets[i] != 0) { - u32* data = (u32*)((int)stream + list_chunk->mOffsets[i]); + u32* data = (u32*)((intptr_t)stream + list_chunk->mOffsets[i]); switch (*data++) { case 'Inst': { JASBasicInst* inst = new (heap, 0) JASBasicInst(); @@ -126,7 +126,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h u32 offset = *data++; if (offset != 0) { JASDrumSet::TPerc* perc = new (heap, 0) JASDrumSet::TPerc(); - u32* ptr = (u32*)((int)stream + offset); + u32* ptr = (u32*)((intptr_t)stream + offset); TPercData* perc_data = (TPercData*)(ptr + 1); perc->setVolume(perc_data->mVolume); perc->setPitch(perc_data->mPitch); diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/src/JSystem/JAudio2/JASBasicWaveBank.cpp index 922d00a85f..f7417e174d 100644 --- a/src/JSystem/JAudio2/JASBasicWaveBank.cpp +++ b/src/JSystem/JAudio2/JASBasicWaveBank.cpp @@ -4,6 +4,7 @@ #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" +#include "stdint.h" JASBasicWaveBank::JASBasicWaveBank() { mWaveTable = NULL; @@ -130,5 +131,5 @@ int JASBasicWaveBank::TWaveHandle::getWavePtr() const { if (base == 0) { return 0; } - return (int)base + field_0x4.field_0x08; + return (intptr_t)base + field_0x4.field_0x08; } diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/src/JSystem/JAudio2/JASCalc.cpp index 861b8dcd67..0578810cd6 100644 --- a/src/JSystem/JAudio2/JASCalc.cpp +++ b/src/JSystem/JAudio2/JASCalc.cpp @@ -6,8 +6,8 @@ void JASCalc::imixcopy(const s16* s1, const s16* s2, s16* dst, u32 n) { for (n; n != 0; n--) { - *dst++ = *((s16*)s1)++; - *dst++ = *((s16*)s2)++; + *dst++ = *(s1)++; + *dst++ = *(s2)++; } } @@ -21,10 +21,10 @@ void JASCalc::bcopyfast(const void* src, void* dest, u32 size) { u32* udest = (u32*)dest; for (size = size / (4 * sizeof(u32)); size != 0; size--) { - copy1 = *((u32*)usrc)++; - copy2 = *((u32*)usrc)++; - copy3 = *((u32*)usrc)++; - copy4 = *((u32*)usrc)++; + copy1 = *(usrc)++; + copy2 = *(usrc)++; + copy3 = *(usrc)++; + copy4 = *(usrc)++; *udest++ = copy1; *udest++ = copy2; @@ -263,6 +263,9 @@ s16 const JASCalc::CUTOFF_TO_IIR_TABLE[128][4] = { 0x7FFF, 0x0000, 0x0000, 0x0000, }; +template <> +s16 JASCalc::clamp(s32); + // currently required because of missing functions // JASCalc::hannWindow(short *, u32) // JASCalc::hammWindow(short *, u32) diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp index 98e6136b3d..a20d6cbdea 100644 --- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp +++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp @@ -1,6 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASSimpleWaveBank.h" +#include "stdint.h" JASSimpleWaveBank::JASSimpleWaveBank() { mWaveTable = NULL; @@ -42,7 +43,7 @@ int JASSimpleWaveBank::TWaveHandle::getWavePtr() const { if (base == NULL) { return NULL; } - return (int)base + mWaveInfo.field_0x08; + return (intptr_t)base + mWaveInfo.field_0x08; } JASSimpleWaveBank::TWaveHandle::TWaveHandle() { diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index de013a2834..f5ec5aed60 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -89,9 +89,9 @@ bool JKRDvdArchive::open(s32 entryNum) { sizeof(SArcHeader), NULL, NULL); DCInvalidateRange(mArcInfoBlock, arcHeader->file_data_offset); - mNodes = (SDIDirEntry*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset); - mFiles = (SDIFileEntry*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset); - mStringTable = (char*)((int)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset); + mNodes = (SDIDirEntry*)((intptr_t)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset); + mFiles = (SDIFileEntry*)((intptr_t)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset); + mStringTable = (char*)((intptr_t)&mArcInfoBlock->num_nodes + mArcInfoBlock->string_table_offset); mExpandedSize = NULL; u8 useCompression; diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/src/JSystem/JKernel/JKRDvdFile.cpp index 9df201adb7..8cb3790993 100644 --- a/src/JSystem/JKernel/JKRDvdFile.cpp +++ b/src/JSystem/JKernel/JKRDvdFile.cpp @@ -3,6 +3,7 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" +#include "stdint.h" JSUList JKRDvdFile::sDvdList; @@ -123,7 +124,7 @@ s32 JKRDvdFile::sync(void) { OSReceiveMessage(&mMessageQueue2, &message, 1); mOSThread = NULL; OSUnlockMutex(&mMutex1); - return (int)message; + return (intptr_t)message; } void JKRDvdFile::doneProcess(s32 id, DVDFileInfo* fileInfo) { diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index a884fcf615..510ccd3132 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -82,7 +82,7 @@ void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param mStackMemory = JKRAllocFromHeap(mHeap, mStackSize, 0x20); mThreadRecord = (OSThread*)JKRAllocFromHeap(mHeap, sizeof(OSThread), 0x20); - void* stackBase = (void*)((int)mStackMemory + mStackSize); + void* stackBase = (void*)((intptr_t)mStackMemory + mStackSize); OSCreateThread(mThreadRecord, start, this, stackBase, mStackSize, param_3, 1); } diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp index 2be956ef19..f110012717 100644 --- a/src/JSystem/JMessage/processor.cpp +++ b/src/JSystem/JMessage/processor.cpp @@ -331,9 +331,9 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) { u32 queryResult = on_branch_queryResult(); if (queryResult > 0x7FFFFFFF) { switch (queryResult) { - case -1: + case 0xFFFFFFFF: return pszCurrent_; - case -2: + case 0xFFFFFFFE: eStatus_ = STATUS_NORMAL; break; default: diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index 6ed26d4fb8..b1202d6e78 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -6,6 +6,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JKernel/JKRAram.h" #include "dolphin/gx.h" +#include "stdint.h" JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) { initialize_state(); @@ -424,18 +425,18 @@ void JUTCacheFont::invalidiateAllCache() { if (uVar2 == 0) { iVar1 = 0; } else { - iVar1 = (int)piVar3 - field_0x94; + iVar1 = (intptr_t)piVar3 - field_0x94; } *piVar3 = iVar1; if (uVar2 == mCachePage - 1) { iVar1 = 0; } else { - iVar1 = (int)piVar3 + field_0x94; + iVar1 = (intptr_t)piVar3 + field_0x94; } piVar3[1] = iVar1; - piVar3 = (int*)((int)piVar3 + field_0x94); + piVar3 = (int*)((intptr_t)piVar3 + field_0x94); } - field_0xa8 = (int)piVar3 - field_0x94; + field_0xa8 = (intptr_t)piVar3 - field_0x94; field_0xa4 = (TGlyphCacheInfo*)mCacheBuffer; field_0x9c = NULL; field_0xa0 = NULL; diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/src/JSystem/JUtility/JUTGraphFifo.cpp index 2add552e85..98f7db2c39 100644 --- a/src/JSystem/JUtility/JUTGraphFifo.cpp +++ b/src/JSystem/JUtility/JUTGraphFifo.cpp @@ -2,6 +2,7 @@ #include "JSystem/JUtility/JUTGraphFifo.h" #include "JSystem/JKernel/JKRHeap.h" +#include "stdint.h" static bool data_804514B8; @@ -16,7 +17,7 @@ JUTGraphFifo::JUTGraphFifo(u32 size) { GXInitFifoPtrs(mFifo, mBase, mBase); } else { mBase = JKRAllocFromSysHeap(mSize + 0xA0, 32); - mBase = (void*)((int)mBase + 0x1F & ~0x1F); + mBase = (void*)((intptr_t)mBase + 0x1F & ~0x1F); mFifo = GXInit(mBase, mSize); data_804514B8 = true; sCurrentFifo = this; diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/src/JSystem/JUtility/JUTTexture.cpp index d62f8961ee..3a5926586d 100644 --- a/src/JSystem/JUtility/JUTTexture.cpp +++ b/src/JSystem/JUtility/JUTTexture.cpp @@ -18,10 +18,10 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { if (param_0 && param_1 < 0x10) { mTexInfo = param_0; - mTexData = (void*)((int)mTexInfo + mTexInfo->imageOffset); + mTexData = (void*)((intptr_t)mTexInfo + mTexInfo->imageOffset); if (mTexInfo->imageOffset == 0) { - mTexData = (void*)((int)mTexInfo + 0x20); + mTexData = (void*)((intptr_t)mTexInfo + 0x20); } field_0x2c = NULL; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index af1d6d38c1..0b4a9ba890 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -9037,7 +9037,7 @@ bool dCamera_c::eventCamera(s32 param_0) { mEventData.field_0xc == specialType[20] || mEventData.field_0xc == specialType[21] || mEventData.field_0xc == specialType[22] || mEventData.field_0xc == specialType[23] || mEventData.field_0xc == specialType[24] || mEventData.field_0xc == specialType[18]) && - *(int*)((int)&mEventData + 0xc) != -1) // fakematch to force additional load + *(int*)((intptr_t)&mEventData + 0xc) != -1) // fakematch to force additional load { var_r29 = 28; } else if (mEventData.field_0xc == specialType[14] && var_r29 != 2) { From bda8dc6af80ce4ddee889fb21aa97ccfebe0cc1e Mon Sep 17 00:00:00 2001 From: kipcode66 Date: Mon, 22 Dec 2025 05:20:08 -0500 Subject: [PATCH 03/35] 4th round of standard compiler fixes (#2984) * 4th round of standard compiler fixes * use of fpcM_ERROR_PROCESS_ID_e in gWolfBustersID --- include/JSystem/JHostIO/JOREntry.h | 1 + include/d/actor/d_a_npc_kn.h | 2 +- include/revolution/os.h | 20 ++++---- src/d/actor/d_a_b_ds.cpp | 4 +- src/d/actor/d_a_b_yo.cpp | 2 +- src/d/actor/d_a_bd.cpp | 2 +- src/d/actor/d_a_cow.cpp | 2 +- src/d/actor/d_a_demo00.cpp | 4 +- src/d/actor/d_a_e_dd.cpp | 4 +- src/d/actor/d_a_e_gb.cpp | 10 ++-- src/d/actor/d_a_e_gm.cpp | 4 +- src/d/actor/d_a_e_kr.cpp | 2 +- src/d/actor/d_a_e_mk.cpp | 2 +- src/d/actor/d_a_e_pm.cpp | 6 ++- src/d/actor/d_a_e_po.cpp | 6 +-- src/d/actor/d_a_e_pz.cpp | 4 +- src/d/actor/d_a_e_s1.cpp | 6 +-- src/d/actor/d_a_e_sm2.cpp | 4 +- src/d/actor/d_a_e_st.cpp | 4 +- src/d/actor/d_a_e_wb.cpp | 2 +- src/d/actor/d_a_e_yk.cpp | 3 +- src/d/actor/d_a_e_yr.cpp | 2 +- src/d/actor/d_a_movie_player.cpp | 2 +- src/d/actor/d_a_npc_ashB.cpp | 3 +- src/d/actor/d_a_npc_bans.cpp | 18 ++++---- src/d/actor/d_a_npc_bouS.cpp | 4 +- src/d/actor/d_a_npc_chat.cpp | 68 ++++++++++++++-------------- src/d/actor/d_a_npc_coach.cpp | 2 +- src/d/actor/d_a_npc_grz.cpp | 6 +-- src/d/actor/d_a_npc_gwolf.cpp | 2 +- src/d/actor/d_a_npc_jagar.cpp | 2 +- src/d/actor/d_a_npc_kasi_kyu.cpp | 3 +- src/d/actor/d_a_npc_kn.cpp | 4 +- src/d/actor/d_a_npc_kn_base.inc | 2 +- src/d/actor/d_a_npc_seib.cpp | 2 +- src/d/actor/d_a_npc_taro.cpp | 2 +- src/d/actor/d_a_npc_wrestler.cpp | 2 +- src/d/actor/d_a_npc_ykm.cpp | 6 +-- src/d/actor/d_a_npc_zelR.cpp | 2 +- src/d/actor/d_a_obj_TvCdlst.cpp | 2 +- src/d/actor/d_a_obj_bemos.cpp | 4 +- src/d/actor/d_a_obj_bk_leaf.cpp | 2 +- src/d/actor/d_a_obj_brg.cpp | 2 +- src/d/actor/d_a_obj_drop.cpp | 2 +- src/d/actor/d_a_obj_gra2.cpp | 4 +- src/d/actor/d_a_obj_iceblock.cpp | 6 +-- src/d/actor/d_a_obj_kanban2.cpp | 14 +++--- src/d/actor/d_a_obj_kznkarm.cpp | 2 +- src/d/actor/d_a_obj_lp.cpp | 4 +- src/d/actor/d_a_obj_maki.cpp | 2 +- src/d/actor/d_a_obj_nameplate.cpp | 2 +- src/d/actor/d_a_obj_prop.cpp | 2 +- src/d/actor/d_a_obj_sakuita_rope.cpp | 2 +- src/d/actor/d_a_obj_sekizoa.cpp | 12 ++--- src/d/actor/d_a_obj_smtile.cpp | 8 ++-- src/d/actor/d_a_obj_ss_item.cpp | 2 +- src/d/actor/d_a_obj_twGate.cpp | 8 ++-- src/d/actor/d_a_obj_zdoor.cpp | 4 +- src/d/actor/d_a_tag_Lv6Gate.cpp | 6 ++- src/d/actor/d_a_tag_evt.cpp | 2 +- src/d/actor/d_a_tag_myna_light.cpp | 2 +- src/d/actor/d_a_tag_pachi.cpp | 2 +- src/d/actor/d_a_tag_push.cpp | 2 +- src/d/actor/d_a_tag_ss_drink.cpp | 2 +- tools/converters/matDL_dis.py | 6 +-- 65 files changed, 170 insertions(+), 162 deletions(-) diff --git a/include/JSystem/JHostIO/JOREntry.h b/include/JSystem/JHostIO/JOREntry.h index 829c78a3ec..76780640e7 100644 --- a/include/JSystem/JHostIO/JOREntry.h +++ b/include/JSystem/JHostIO/JOREntry.h @@ -2,6 +2,7 @@ #define JORENTRY_H #include "JSystem/JHostIO/JHIComm.h" +#include "dolphin/os.h" template class JHIpvector { diff --git a/include/d/actor/d_a_npc_kn.h b/include/d/actor/d_a_npc_kn.h index ba2ca57241..38061ff17c 100644 --- a/include/d/actor/d_a_npc_kn.h +++ b/include/d/actor/d_a_npc_kn.h @@ -179,7 +179,7 @@ public: public: void initialize() { - memset(&mFootLPos, 0, (int)&field_0xe3c - (int)&mFootLPos); + memset(&mFootLPos, 0, (intptr_t)&field_0xe3c - (intptr_t)&mFootLPos); mFaceMotionSeqMngr.initialize(); mMotionSeqMngr.initialize(); diff --git a/include/revolution/os.h b/include/revolution/os.h index c2b6248f20..7ab36c7361 100644 --- a/include/revolution/os.h +++ b/include/revolution/os.h @@ -320,9 +320,9 @@ extern BOOL __OSInReboot; #define ASSERT(cond) ASSERTLINE(__LINE__, cond) -static inline u8 __OSf32tou8(register f32 in) { +static inline u8 __OSf32tou8(__REGISTER f32 in) { f32 a; - register f32* ptr = &a; + __REGISTER f32* ptr = &a; u8 r; #if defined(__MWERKS__) @@ -336,9 +336,9 @@ static inline u8 __OSf32tou8(register f32 in) { return r; } -static inline u16 __OSf32tou16(register f32 in) { +static inline u16 __OSf32tou16(__REGISTER f32 in) { f32 a; - register f32* ptr = &a; + __REGISTER f32* ptr = &a; u16 r; #if defined(__MWERKS__) @@ -352,9 +352,9 @@ static inline u16 __OSf32tou16(register f32 in) { return r; } -static inline s16 __OSf32tos16(register f32 in) { +static inline s16 __OSf32tos16(__REGISTER f32 in) { f32 a; - register f32* ptr = &a; + __REGISTER f32* ptr = &a; s16 r; #if defined(__MWERKS__) @@ -368,8 +368,8 @@ static inline s16 __OSf32tos16(register f32 in) { return r; } -static inline f32 __OSu16tof32(register u16 const* arg) { - register f32 ret; +static inline f32 __OSu16tof32(__REGISTER u16 const* arg) { + __REGISTER f32 ret; #if defined(__MWERKS__) asm { psq_l ret, 0(arg), 1, 3 }; @@ -381,8 +381,8 @@ static inline f32 __OSu16tof32(register u16 const* arg) { return ret; } -static inline f32 __OSs16tof32(register s16 const* arg) { - register f32 ret; +static inline f32 __OSs16tof32(__REGISTER s16 const* arg) { + __REGISTER f32 ret; #if defined(__MWERKS__) asm { psq_l ret, 0(arg), 1, 5 }; diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index c559e6d25f..2a24597c0c 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -790,8 +790,8 @@ void daB_DS_c::mCreateTrap(bool param_0) { angle.x = 0; pos.y = 1708.0f; - static s16 mBirthAngle01_dt[4] = {0x0000, 0x4000, 0x8000, 0xc000}; - static s16 mBirthAngle02_dt[3] = {0x0000, 0x5555, 0xaaaa}; + static s16 mBirthAngle01_dt[4] = {0x0000, 0x4000, -0x8000, -0x4000}; + static s16 mBirthAngle02_dt[3] = {0x0000, 0x5555, -0x5556}; static f32 mBirthYpos02_dt[3] = {1150.0f, 350.0f, -450.0f}; if (mBossPhase == 0) { diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index ce7a543f18..1129892346 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -569,7 +569,7 @@ void daB_YO_c::setIcicleSubNumber() { } void daB_YO_c::setWindowBreakEffect(int param_0) { - static s16 yo_window_angle[6] = {0xC000, 0xE000, 0x6000, 0x2000, 0x4000, 0x0000}; + static s16 yo_window_angle[6] = {-0x4000, -0x2000, 0x6000, 0x2000, 0x4000, 0x0000}; static u16 madoware_effect_id[4] = {0x87C1, 0x87C2, 0x87C3, 0x87C4}; csXyz angle(0, yo_window_angle[param_0], 0); cXyz pos(0.0f, 0.0f, 0.0f); diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 9c71ef8564..786ff431cb 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -281,7 +281,7 @@ static void drop_check(bd_class* i_this) { static void turn_set(bd_class* i_this) { - s16 angle_table[3] = {0x8000, 0x4000, -0x4000}; + s16 angle_table[3] = {-0x8000, 0x4000, -0x4000}; s16 angle = angle_table[(int)cM_rndF(2.99f)]; i_this->mTargetAngleY = i_this->enemy.current.angle.y + angle; } diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index 8807f4443b..0dc61d0bb8 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -59,7 +59,7 @@ static f32 l_CowRoomPosX[20] = {-10600.0f, -10600.0f, -10800.0f, -10800.0f, -110 static f32 l_CowRoomPosZ[2] = {-19646.0f, -20926.0f}; #define N_WOLF_BUSTERS 3 -extern fpc_ProcID gWolfBustersID[N_WOLF_BUSTERS] = {-1, -1, -1}; +extern fpc_ProcID gWolfBustersID[N_WOLF_BUSTERS] = {fpcM_ERROR_PROCESS_ID_e, fpcM_ERROR_PROCESS_ID_e, fpcM_ERROR_PROCESS_ID_e}; } // namespace diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index 6459c6e67f..ba2020af60 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -1465,8 +1465,8 @@ static void ke_move(daDemo00_c* i_this, mDoExt_3DlineMat0_c* param_2, demo_s1_ke static void ke_set(daDemo00_c* i_this) { static s16 ke_za[22] = { - 0xFCE0, 0xFE70, 0, 0x0190, 0x0320, 0xFCE0, 0xFE70, 0, 0x0190, 0x0320, - 0xFCE0, 0xFE70, 0, 0x0190, 0x0320, 0x04B0, 0xFCE0, 0xFE70, 0, + -0x0320, -0x0190, 0, 0x0190, 0x0320, -0x0320, -0x0190, 0, 0x0190, 0x0320, + -0x0320, -0x0190, 0, 0x0190, 0x0320, 0x04B0, -0x0320, -0x0190, 0, 0x0190, 0x0320, 0x04B0, }; diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index 692d48d7d1..3cbb299229 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -1622,11 +1622,11 @@ static int useHeapInit(fopAc_ac_c* a_this) { static int kabe_initial_pos_set(e_dd_class* i_this) { static s16 ya[5] = { - -0x4000, 0x4000, 0x0000, 0x8000, 0x0000, + -0x4000, 0x4000, 0x0000, -0x8000, 0x0000, }; static s16 xa[5] = { - 0xC000, 0xC000, 0xC000, 0xC000, 0x8000, + -0x4000, -0x4000, -0x4000, -0x4000, -0x8000, }; fopAc_ac_c* a_this = &i_this->actor; diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index 46593a7671..c343855360 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -522,8 +522,8 @@ static void e_gb_start(e_gb_class* i_this) { static void kuki_control1(e_gb_class* i_this) { static s16 pow_xa[17] = { - 0xD000, 0xD800, 0xE000, - 0xE800, 0xF000, 0x0000, + -0x3000, -0x2800, -0x2000, + -0x1800, -0x1000, 0x0000, 0x1000, 0x1800, 0x2000, 0x2800, 0x3000, 0x3800, 0x3000, 0x2000, 0x1000, @@ -531,9 +531,9 @@ static void kuki_control1(e_gb_class* i_this) { }; static s16 pow_xa_chance[17] = { - 0xC800, 0xD000, 0xD800, - 0xE000, 0xE800, 0xF000, - 0xF800, 0x0000, 0x0000, + -0x3800, -0x3000, -0x2800, + -0x2000, -0x1800, -0x1000, + -0x0800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0800, 0x0000, 0x0800, 0x0000, 0x0800, diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index 2662d37ea4..a8ac1c38fb 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -332,11 +332,11 @@ void daE_GM_c::appear() { } static s16 const l_rand[4] = { - 0xF800, 0x0400, 0xFC00, 0x0800, + -0x0800, 0x0400, -0x0400, 0x0800, }; static s16 const l_rand2[4] = { - 0xD000, 0x3800, 0xB800, 0x5000, + -0x3000, 0x3800, -0x4800, 0x5000, }; static f32 const l_rand_base_spd[4] = { diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index 1b5d7983bf..dcf169de9e 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -2233,7 +2233,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModel* model = kr->mpMorf->getModel(); - model->setUserArea((int)kr); + model->setUserArea((intptr_t)kr); for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) { if (i != 0) { diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 359ad64c22..342145b851 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_mk.h" -#include "..\assets\GZ2E01\res\Object\E_mk.h" +#include "res/Object/E_mk.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_obj_pillar.h" diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index ce1057b26d..44012d42c8 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -2056,7 +2056,8 @@ void daE_PM_c::BossAction() { } int daE_PM_c::Execute() { - s_LinkPos = &fopAcM_GetPosition(daPy_getPlayerActorClass()); + daPy_py_c* actor = daPy_getPlayerActorClass(); + s_LinkPos = &fopAcM_GetPosition(actor); s_TargetAngle = cLib_targetAngleY(¤t.pos, s_LinkPos); s_dis = current.pos.abs(*s_LinkPos); @@ -2078,7 +2079,8 @@ int daE_PM_c::Execute() { } LampAction(); - setMidnaBindEffect(this, &mCreatureSound, ¤t.pos, &cXyz(1.5f, 1.5f, 1.5f)); + cXyz i_effSize(1.5f, 1.5f, 1.5f); + setMidnaBindEffect(this, &mCreatureSound, ¤t.pos, &i_effSize); EyeMove(); mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); setCcCylinder(); diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 7e0e1c5b77..d8fa2eb877 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -1,5 +1,5 @@ /** -* @file d_a_e_po.cpp + * @file d_a_e_po.cpp * */ @@ -1706,8 +1706,8 @@ static void e_po_holl_demo(e_po_class* i_this) { }; static s16 mKAngInit_dt[4] = { 0x0000, - 0x8000, - 0x8000, + -0x8000, + -0x8000, 0x0000, }; diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index 379a10a442..aced6e3cab 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -1766,8 +1766,8 @@ static const struct { }; static const s16 mDBaBa_birthAngle_dt[] = { - 0x0000, 0x2AAA, 0x5554, 0x7FFE, 0xAAA8, 0xD552, - 0x1000, 0x3AAA, 0x6554, 0x8FFE, 0xBAA8, 0xE552, + 0x0000, 0x2AAA, 0x5554, 0x7FFE, -0x5558, -0x2AAE, + 0x1000, 0x3AAA, 0x6554, -0x7002, -0x4558, -0x1AAE, }; static const f32 mDBaBa_birthHani_dt[] = { diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index 2732be24aa..b7280cec47 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -1554,9 +1554,9 @@ static void ke_set(e_s1_class* i_this) { cMtx_XrotM(*calc_mtx, (ZREG_S(1) + (int)cM_rndF2(2000.0f) + 3000)); static s16 ke_za[] = { - 0xFCE0, 0xFE70, 0x0000, 0x0190, 0x0320, 0xFCE0, 0xFE70, - 0x0000, 0x0190, 0x0320, 0xFCE0, 0xFE70, 0x0000, 0x0190, - 0x0320, 0x04B0, 0xFCE0, 0xFE70, 0x0000, 0x0190, 0x0320, + -0x0320, -0x0190, 0x0000, 0x0190, 0x0320, -0x0320, -0x0190, + 0x0000, 0x0190, 0x0320, -0x0320, -0x0190, 0x0000, 0x0190, + 0x0320, 0x04B0, -0x0320, -0x0190, 0x0000, 0x0190, 0x0320, 0x04B0, }; diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index 6d88146a7f..09b2dcf99c 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -898,8 +898,8 @@ static void damage_check(e_sm2_class* i_this) { for (int j = 0; j < bun_d[i_this->sizetype]; j++) { static int j_d[] = {0, 6, 1, 5, 2, 4, 0, 6, 1, 5, 2, 4}; static s16 ya_d[] = { - 0x0000, 0x8000, 0x0000, 0x8000, 0x0000, 0x8000, - 0x0000, 0x8000, 0x0000, 0x8000, 0x0000, 0x8000, + 0x0000, -0x8000, 0x0000, -0x8000, 0x0000, -0x8000, + 0x0000, -0x8000, 0x0000, -0x8000, 0x0000, -0x8000, }; static f32 y_ad[] = {20.0f, 30.0f, 40.0f, 50.0f, 60.0f,}; diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index c86cf0fb42..f9e054df78 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -2909,11 +2909,11 @@ static int useHeapInit(fopAc_ac_c* a_this) { } static s16 ya[6] = { - -0x4000, 0x4000, 0x0000, 0x8000, 0x0000, 0x0000, + -0x4000, 0x4000, 0x0000, -0x8000, 0x0000, 0x0000, }; static s16 xa[6] = { - -0x4000, -0x4000, -0x4000, -0x4000, 0x0000, 0x8000, + -0x4000, -0x4000, -0x4000, -0x4000, 0x0000, -0x8000, }; static int kabe_initial_pos_set(e_st_class* i_this) { diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index e3c58328db..f6b24f569c 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -1991,7 +1991,7 @@ static void e_wb_b_ikki(e_wb_class* i_this) { csXyz cStack_a8; for (int i = 0; i < 2; i++) { static s16 f_ya[2] = { - 0x8000, + -0x8000, 0x0000, }; diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index 11e9670cdf..77cd789eb5 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -1356,7 +1356,8 @@ static int daE_YK_Execute(e_yk_class* i_this) { i_this->mCollisionSphere.SetR(30.0f * l_HIO.mModelScale); dComIfG_Ccsp()->Set(&i_this->mCollisionSphere); - setMidnaBindEffect(_this,&i_this->mCreature,&_this->eyePos,&cXyz(0.5f,0.5f,0.5f)); + cXyz i_effSize(0.5f,0.5f,0.5f); + setMidnaBindEffect(_this,&i_this->mCreature,&_this->eyePos,&i_effSize); } return 1; diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index 54c33fcded..a2af66423f 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -2407,7 +2407,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModel* model = yr->mpMorfSO->getModel(); - model->setUserArea((int)yr); + model->setUserArea((intptr_t)yr); for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) { if (i != 0) { diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 3656cd0a0a..0356df3dae 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -3710,7 +3710,7 @@ BOOL daMP_WaitUntilPrepare() { OSMessage msg; OSReceiveMessage(&daMP_PrepareReadyQueue, &msg, 1); - if ((BOOL)msg) { + if ((intptr_t)msg) { return TRUE; } else { return FALSE; diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 173543ff2f..6658577cb0 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -929,6 +929,7 @@ bool daNpcAshB_c::talk(void* param_0) { bool daNpcAshB_c::demo(void* param_0) { dEvent_manager_c& evtmgr = dComIfGp_getEventManager(); BOOL r26 = FALSE; + dComIfG_play_c* play; switch (mMode) { case 0: @@ -940,7 +941,7 @@ bool daNpcAshB_c::demo(void* param_0) { case 2: #if VERSION != VERSION_SHIELD_DEBUG // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; + play = &g_dComIfG_gameInfo.play; if (play->getEvent().runCheck() && !eventInfo.checkCommandTalk()) #else if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 59e55c1cf9..4f6ea12fc8 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -266,23 +266,23 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[20] = }; static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[84] = { - {0, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, - {1, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {0, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {1, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, 0, 1}, {1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {6, 0, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, 0, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0xA, 0, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0xB, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, - {2, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, - {3, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {2, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {3, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0xC, -1, 1}, {3, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0xD, -1, 1}, {3, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, - {0x10, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, - {0x12, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, - {0x13, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {0x10, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {0x12, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {0x13, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0xD, -1, 1}, {0xC, 0, 1}, {3, 0, 0}, {-1, 0, 0}, - {0x11, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, - {4, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {0x11, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {4, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0xE, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0xF, 0, 1}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index 75dd6c94ab..4300c85670 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -325,8 +325,8 @@ daNpcBouS_HIOParam const daNpcBouS_Param_c::m = { 100.0f, 80.0f, 654.78497f, - 0xEB51, - 0xA3C6, + -0x14AF, + -0x5C3A, 0, }; diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index e5514c21e9..94295c8996 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -1377,7 +1377,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0x14, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, - 0.0f, 0.0f, 0.0f, 0xB, 0, 0xFFEE, 0, 0, + 0.0f, 0.0f, 0.0f, 0xB, 0, -0x0012, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1411,23 +1411,23 @@ static jntTblMPrm a_jntTbl_M[16] = { { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFEC, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFCE, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFBF, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0xFFF6, 5, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0032, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0041, 0, 0, + 0.0f, 0.0f, 0.0f, 0, -0x000A, 5, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0x14, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0x46, 0xA, 0x1E, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0x32, 0xFFFB, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0x32, -0x0005, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0xA, 5, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0x14, 0, 0, 0, - 0.0f, 0.0f, 0.0f, 0xFFBA, 0xA, 0xFFE2, 0, 0, + 0.0f, 0.0f, 0.0f, -0x0046, 0xA, -0x001E, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0x32, 5, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0xF, 0, 0, - 0.0f, 0.0f, 0.0f, 0xA, 0, 0xFFE2, 0, 0, + 0.0f, 0.0f, 0.0f, 0xA, 0, -0x001E, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0xA, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, - 0.0f, 0.0f, 0.0f, 0xA, 0, 0xFFE2, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0xFFF6, 0xB, 0, 0, + 0.0f, 0.0f, 0.0f, 0xA, 0, -0x001E, 0, 0, + 0.0f, 0.0f, 0.0f, 0, -0x000A, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, }, @@ -1553,7 +1553,7 @@ static jntTblMPrm a_jntTbl_M[16] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0x14, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, - 0.0f, 0.0f, 0.0f, 0xB, 0, 0xFFEE, 0, 0, + 0.0f, 0.0f, 0.0f, 0xB, 0, -0x0012, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, @@ -1587,23 +1587,23 @@ static jntTblMPrm a_jntTbl_M[16] = { { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFEC, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFCE, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFBF, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0xFFF6, 5, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0032, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0041, 0, 0, + 0.0f, 0.0f, 0.0f, 0, -0x000A, 5, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0x14, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0x46, 0xA, 0x1E, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0x32, 0xFFFB, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0x32, -0x0005, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0xA, 5, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0x14, 0, 0, 0, - 0.0f, 0.0f, 0.0f, 0xFFBA, 0xA, 0xFFE2, 0, 0, + 0.0f, 0.0f, 0.0f, -0x0046, 0xA, -0x001E, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0x32, 5, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0xF, 0, 0, - 0.0f, 0.0f, 0.0f, 0xA, 0, 0xFFE2, 0, 0, + 0.0f, 0.0f, 0.0f, 0xA, 0, -0x001E, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0xA, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, - 0.0f, 0.0f, 0.0f, 0xA, 0, 0xFFE2, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0xFFF6, 0xB, 0, 0, + 0.0f, 0.0f, 0.0f, 0xA, 0, -0x001E, 0, 0, + 0.0f, 0.0f, 0.0f, 0, -0x000A, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, }, @@ -1877,10 +1877,10 @@ static jntTblWPrm a_jntTbl_W[14] = { { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFEC, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFCE, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFBF, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0xFFF6, 5, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0032, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0041, 0, 0, + 0.0f, 0.0f, 0.0f, 0, -0x000A, 5, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0xA, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 8, 0, 0, 0, 0, @@ -1889,12 +1889,12 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 8, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0xF, 0, 0, - 0.0f, 0.0f, 0.0f, 0xA, 0, 0xFFE2, 0, 0, + 0.0f, 0.0f, 0.0f, 0xA, 0, -0x001E, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0xA, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, - 0.0f, 0.0f, 0.0f, 0xA, 0, 0xFFE2, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0xFFF6, 0xB, 0, 0, + 0.0f, 0.0f, 0.0f, 0xA, 0, -0x001E, 0, 0, + 0.0f, 0.0f, 0.0f, 0, -0x000A, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, @@ -2045,10 +2045,10 @@ static jntTblWPrm a_jntTbl_W[14] = { { 0.0f, -0.3f, 0.0f, 0, 0, 0, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFEC, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFCE, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0, 0xFFBF, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0xFFF6, 5, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0014, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0032, 0, 0, + 0.0f, 0.0f, 0.0f, 0, 0, -0x0041, 0, 0, + 0.0f, 0.0f, 0.0f, 0, -0x000A, 5, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0xA, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 8, 0, 0, 0, 0, @@ -2057,12 +2057,12 @@ static jntTblWPrm a_jntTbl_W[14] = { 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 8, 0, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0xF, 0, 0, - 0.0f, 0.0f, 0.0f, 0xA, 0, 0xFFE2, 0, 0, + 0.0f, 0.0f, 0.0f, 0xA, 0, -0x01E, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0xA, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, - 0.0f, 0.0f, 0.0f, 0xA, 0, 0xFFE2, 0, 0, - 0.0f, 0.0f, 0.0f, 0, 0xFFF6, 0xB, 0, 0, + 0.0f, 0.0f, 0.0f, 0xA, 0, -0x001E, 0, 0, + 0.0f, 0.0f, 0.0f, 0, -0x000A, 0xB, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 1, 0, 0, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0, 0, }, diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index f246849bc8..6958626c34 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -241,7 +241,7 @@ daNpcCoach_Attr_c const daNpcCoach_c::M_attr = { 0, 0, 1000.0f, - 0xE000, + -0x2000, 0x4000, 0, 0xFF, diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 345d8e6237..1fb7bf9135 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -420,9 +420,9 @@ daNpc_Grz_HIOParam const daNpc_Grz_Param_c::m = { false, false, 60, - 0xFFD8, - 0xFFD8, - 0xFFD8, + -40, + -40, + -40, 11.0f, 35.0f, 500.0f, diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index 6013dcf907..9ac8c14951 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -852,7 +852,7 @@ BOOL daNpc_GWolf_c::isDelete() { 0x0153, 0x01EC, 0x01ED, 0x01EE, 0x01EF, 0x01F0, 0x01F1, }; static s16 l_playerNoList[7] = { - 0xFFFF, 2, 3, 4, 5, 6, 7, + -1, 2, 3, 4, 5, 6, 7, }; if (mType == 3 || mType == 2) { diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 41c4b032a7..1c780a12ff 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -142,7 +142,7 @@ daNpc_Jagar_HIOParam const daNpc_Jagar_Param_c::m = { 35.0f, 30.0f, 0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -10.0f, 45.0f, -45.0f, 0.6f, 12.0f, 3, 6, 5, 6, 110.0f, 500.0f, 300.0f, -300.0f, - 60, 8, 0, 0, 0, 0.0f, 0.0f, 4.0f, 0.0f, 0.0f, + 60, 8, 0, 0, 0, 0, 0, 4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, // Jagar-specific: 1400.0f, 200.0f, -800.0f, 16.0f, 1800.0f, diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 60c4d24a07..77bf43fa33 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -726,6 +726,7 @@ BOOL daNpcKasiKyu_c::chkFindPlayer() { } int daNpcKasiKyu_c::wait(int param_1) { + dComIfG_play_c* play; switch (mMode) { case -1: break; @@ -774,7 +775,7 @@ int daNpcKasiKyu_c::wait(int param_1) { #if VERSION != VERSION_SHIELD_DEBUG // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; + play = &g_dComIfG_gameInfo.play; if (play->getEvent().runCheck()) #else if (dComIfGp_event_runCheck()) diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index 50c404e922..e39128192c 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -787,7 +787,7 @@ u8 daNpc_Kn_c::getPath() { BOOL daNpc_Kn_c::isDelete() { static s16 l_appearFlag[7] = { - 0xFFFF, 0x0153, 0x0152, 0x0154, 0x0155, 0x0156, 0x0157, + -1, 0x0153, 0x0152, 0x0154, 0x0155, 0x0156, 0x0157, }; static s16 l_delFlag[7] = { 0x0153, 0x0152, 0x0154, 0x0155, 0x0156, 0x0157, 0x0158, @@ -832,7 +832,7 @@ void daNpc_Kn_c::resetCol() { void daNpc_Kn_c::reset() { initialize(); - memset(&mpTeachAction, 0, (int)&field_0x1754 - (int)&mpTeachAction); + memset(&mpTeachAction, 0, (intptr_t)&field_0x1754 - (intptr_t)&mpTeachAction); if (mpMatAnm != NULL) { mpMatAnm->initialize(); diff --git a/src/d/actor/d_a_npc_kn_base.inc b/src/d/actor/d_a_npc_kn_base.inc index ed489e16c1..e8ff2bb1c0 100644 --- a/src/d/actor/d_a_npc_kn_base.inc +++ b/src/d/actor/d_a_npc_kn_base.inc @@ -797,7 +797,7 @@ void daNpc_Kn_c::evtChange() { void daNpc_Kn_c::clrParam() { field_0xDB2 = mCurAngle; mCutType = 0; - memset((void*)&mEvtNo, 0, (int)(void*)&field_0xe3c - (int)(void*)&mEvtNo); // fake match? + memset((void*)&mEvtNo, 0, (intptr_t)(void*)&field_0xe3c - (intptr_t)(void*)&mEvtNo); // fake match? mJntAnm.clrDirectFlag(); } diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 4de76d8f4f..6544919b9a 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -17,7 +17,7 @@ static daNpcT_evtData_c l_evtList[3] = { static char* l_resNameList[2] = {"", "seiB"}; -static s8 l_loadResPtrn0[2] = {1, 0xFF}; +static s8 l_loadResPtrn0[2] = {1, -1}; static s8* l_loadResPtrnList[2] = { l_loadResPtrn0, diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 6d4f42c386..1a8072004e 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -18,7 +18,7 @@ #include "d/d_msg_object.h" #include "f_op/f_op_actor.h" #include "f_op/f_op_camera_mng.h" -#include "types.h" +#include "dolphin/types.h" daNpc_Maro_c::actionFunc dummy_lit_3931() { return &daNpc_Maro_c::choccai; diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index d8371e656a..10d86a5df1 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -439,7 +439,7 @@ const daNpcWrestler_HIOParam daNpcWrestler_Param_c::m = { 10.0f, 400, 400, - 0xFF00, + -0x0100, 400.0f, 14, 11, diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 390c94e71e..543e3f5559 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -461,7 +461,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_faceMotionSequenceData[64] = }; static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[188] = { - {0, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {0, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {1, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {7, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {8, -1, 1}, {0, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -470,7 +470,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[188] = { {0xC, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0xD, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0xD, -1, 1}, {2, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, - {2, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {2, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {5, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0xF, -1, 1}, {6, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0x10, -1, 1}, {0, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, @@ -485,7 +485,7 @@ static daNpcT_MotionSeqMngr_c::sequenceStepData_c l_motionSequenceData[188] = { {0x2C, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0x2D, -1, 1}, {0x2E, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0x29, -1, 1}, {0x2E, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, - {0x2E, 0xF7, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, + {0x2E, -9, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0x2F, -1, 1}, {0x30, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {0x30, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, {4, -1, 0}, {-1, 0, 0}, {-1, 0, 0}, {-1, 0, 0}, diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index f409f4774a..8d1362e9d5 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -27,7 +27,7 @@ static char* l_resNameList[2] = { }; static s8 l_loadResPtrn0[2] = { - 1, 0xFF + 1, -1 }; static s8* l_loadResPtrnList[2] = { diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index 751b7126f0..7c44b64ff7 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_TvCdlst.h" -#include "include/d/d_com_inf_game.h" +#include "d/d_com_inf_game.h" static daTvCdlst_HIO_c l_HIO; diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index c93c0904d8..8e3ef9a5a8 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -54,8 +54,8 @@ static Vec const l_craw_offset[4] = { s16 const daObjBm_c::M_dir_base[4] = { 0x0000, 0x4000, - 0x8000, - 0xC000, + -0x8000, + -0x4000, }; static const char* l_arcName = "Obj_bm"; diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp index f864ff5874..fddca4fb8e 100644 --- a/src/d/actor/d_a_obj_bk_leaf.cpp +++ b/src/d/actor/d_a_obj_bk_leaf.cpp @@ -161,7 +161,7 @@ static actor_method_class l_daBkLeaf_Method = { extern actor_process_profile_definition g_profile_Obj_BkLeaf = {fpcLy_CURRENT_e, 7, - fpcLy_CURRENT_e, + fpcPi_CURRENT_e, PROC_Obj_BkLeaf, &g_fpcLf_Method.base, sizeof(daBkLeaf_c), diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index c9ddbbf5a0..24e6142181 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -601,7 +601,7 @@ static void himo_cut_control1(obj_brg_class* i_this, cXyz* param_1, f32 param_2) sp74.y = 0.0f; sp74.z = param_2; - int i, temp_r27 = (int) ++param_1; + int i, temp_r27 = (intptr_t) ++param_1; f32 var_f31, var_f30, var_f29, var_f28, var_f27; for (i = 1; i < 5; i++, param_1++) { var_f28 = i_this->field_0xaf30 * cM_ssin( (i_this->field_0xaf20 * 6000) + (NREG_S(3) - 10000) * (temp_r27 + i) ) diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index cac20e8ce2..e317b9cdfc 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -327,7 +327,7 @@ int daObjDrop_c::modeWait() { case 3: removeBodyEffect(); - static const s16 target_rel_angle[] = {0xC000, 0x0000, 0x4000}; + static const s16 target_rel_angle[] = {-0x4000, 0x0000, 0x4000}; static const s16 target_angle_x[] = {0x0000, 0x2000, 0x0000}; for (int i = 0; i < 3; i++) { diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index e4265578d5..b849f33d21 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -203,7 +203,7 @@ static char* l_evtNameList[2] = { }; static u16 l_entryJntNoList[4] = { - 5, 6, 7, -1, + 5, 6, 7, 0xFFFF, }; static int jointCtrlCallBack(J3DJoint* i_joint, int param_2) { @@ -368,7 +368,7 @@ static const f32 l_bgcParam[20] = { -0.5f, 1.0f, 0.5f, -1.0f, }; -const s16 l_dirToAngleTBL[4] = {0, 0x4000, 0x8000, 0xC000}; +const s16 l_dirToAngleTBL[4] = {0, 0x4000, -0x8000, -0x4000}; int daObj_GrA_c::CreateHeap() { J3DModelData* aMdlData_p = NULL; diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 40b675c690..93c7062220 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -114,7 +114,7 @@ static const Vec l_dir_vec[4] = { {-1.0f, 0.0f, 0.0f}, }; -static const s16 l_dir_angle[4] = {0x0000, 0x4000, 0x8000, 0xC000}; +static const s16 l_dir_angle[4] = {0x0000, 0x4000, -0x8000, -0x4000}; const static dCcD_SrcCyl l_cyl_src = { { @@ -424,7 +424,7 @@ void daObjIceBlk_c::clrCounter() { void daObjIceBlk_c::mode_proc_call() { typedef void (daObjIceBlk_c::*modeProc)(void); - static modeProc l_func[] = {&mode_proc_wait, &mode_proc_walk}; + static modeProc l_func[] = {&daObjIceBlk_c::mode_proc_wait, &daObjIceBlk_c::mode_proc_walk}; if (getSwbit2() != 0xFF && !fopAcM_isSwitch(this, getSwbit2())) { mCcCyl.OnAtSPrmBit(1); @@ -730,7 +730,7 @@ BOOL daObjIceBlk_c::checkFall() { void daObjIceBlk_c::event_proc_call() { typedef void (daObjIceBlk_c::*actionFunc)(void); - static actionFunc l_func[] = {&actionWait, &actionOrderEvent, &actionEvent, &actionDead}; + static actionFunc l_func[] = {&daObjIceBlk_c::actionWait, &daObjIceBlk_c::actionOrderEvent, &daObjIceBlk_c::actionEvent, &daObjIceBlk_c::actionDead}; (this->*l_func[mAction])(); } diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index a0f1bb939e..e4ab3ac050 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -112,14 +112,14 @@ static char* l_kn2_bmdidx[] = { }; static s16 dKn2_CarryOffset[] = { - 0xD07D, - 0xBA21, - 0xBA21, - 0xE37E, + -0x2f83, + -0x45df, + -0x45df, + -0x1c82, 0x1D9F, - 0xB36C, - 0xC9C8, - 0xC66D, + -0x4c94, + -0x3638, + -0x3993, }; static struct { diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp index 3907766d16..7ea35c1e2e 100644 --- a/src/d/actor/d_a_obj_kznkarm.cpp +++ b/src/d/actor/d_a_obj_kznkarm.cpp @@ -84,7 +84,7 @@ void daObjKznkarm_Hio_c::genMessage(JORMContext* ctx) { -5.0f, -30.0f, 0.6f, 0.94f, 40.0f, 40.0f, -60.0f, -6.0f, -6.0f, -60.0f, 0.0f, - 12.0f, 0, 0x1000, 0, 0xE000, + 12.0f, 0, 0x1000, 0, -0x2000, }; static char* l_arcName = "J_Kazami"; diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index 374a9215e7..aff7b4de82 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -59,7 +59,7 @@ static int target_info_count; static void* s_ks_sub(void* param_1, void* param_2) { if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == 0x60) { if (target_info_count < 10) { - target_info[target_info_count] = (int)param_1; + target_info[target_info_count] = (intptr_t)param_1; target_info_count++; } return param_1; @@ -220,7 +220,7 @@ static int daObj_Lp_Execute(obj_lp_class* i_this) { target_info[i] = 0; } - target_info[0] = (int)dComIfGp_getPlayer(0); + target_info[0] = (intptr_t)dComIfGp_getPlayer(0); target_info_count = 1; if (strcmp(dComIfGp_getStartStageName(), "D_MN05") == 0) { diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index 8ab96846e8..dba1c62a8b 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -19,7 +19,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "types.h" +#include "dolphin/types.h" daObj_Maki_HIO_c::daObj_Maki_HIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index 3bc335f88f..13980a228b 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -10,7 +10,7 @@ #include "d/d_a_obj.h" #include "dolphin/mtx.h" #include "f_op/f_op_actor.h" -#include "include/SSystem/SComponent/c_math.h" +#include "SSystem/SComponent/c_math.h" // clang-format off daObjNameplate_c::M_attrs const daObjNameplate_c::M_attr = { diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp index a037e42944..709d8837dc 100644 --- a/src/d/actor/d_a_obj_prop.cpp +++ b/src/d/actor/d_a_obj_prop.cpp @@ -60,7 +60,7 @@ int daObjProp_c::draw() { return 1; } -static const s16 ADD_ANGLE[] = {0x1800, 0xE800}; +static const s16 ADD_ANGLE[] = {0x1800, -0x1800}; int daObjProp_c::execute() { shape_angle.y += ADD_ANGLE[mArg]; diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index 66585092e2..60b096d963 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -65,7 +65,7 @@ int Sakuita_c::setModelData(J3DModelData* i_modelData) { } daObjItaRope_Attr_c const daObjItaRope_c::M_attr = { - -5.0f, 0.2f, 0.5f, 0.8f, 0.0f, + -5.0f, 0.2f, 0.5f, 0.8f, 0, }; void Sakuita_c::create(cXyz* param_1, s16 param_2, s8 param_3) { diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index d1ed19203c..20c8bfb288 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -27,14 +27,14 @@ static char* l_resNameList[3] = { }; static s8 l_loadResPtrn0[2] = { - 0x01, - 0xFF, + 1, + -1, }; static s8 l_loadResPtrn1[3] = { - 0x01, - 0x02, - 0xFF, + 1, + 2, + -1, }; static s8* l_loadResPtrnList[8] = { @@ -836,7 +836,7 @@ int daObj_Sekizoa_c::setYariAnm(int i_frame, int i_mode, f32 i_morf) { u32 param_0; u32 param_1; } yariAnmData[24] = { - {-1, 0}, + {0xFFFFFFFF, 0}, {ANM_YARIA_STILL_L, 1}, {ANM_YARIA_STILL_L, 1}, {ANM_YARIA_STILL_L, 1}, diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp index ccb0f7eaad..a3d3963b8d 100644 --- a/src/d/actor/d_a_obj_smtile.cpp +++ b/src/d/actor/d_a_obj_smtile.cpp @@ -21,10 +21,10 @@ static char* l_resNameList[2] = { static s8 l_tileMoveData[21][4] = { 0x01, 0x03, 0x05, 0x01, 0x01, 0x02, 0x04, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x02, 0x04, 0x00, 0x00, 0x02, 0x03, 0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, - 0x00, 0xFF, 0x02, 0x01, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x00, 0x04, 0x00, 0x00, 0x01, 0x03, 0x00, 0xFF, 0x02, 0x03, 0xFF, 0x02, 0x04, 0x00, - 0x00, 0x02, 0x03, 0x02, 0xFF, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0xFF, - 0x02, 0x02, 0xFF, 0x03, 0x05, 0x02, 0xFF, 0x02, 0x04, 0x02, 0xFF, 0x01, 0x03, 0x02, + 0x00, -0x1, 0x02, 0x01, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x01, 0x03, 0x00, -0x1, 0x02, 0x03, -0x1, 0x02, 0x04, 0x00, + 0x00, 0x02, 0x03, 0x02, -0x1, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, -0x1, + 0x02, 0x02, -0x1, 0x03, 0x05, 0x02, -0x1, 0x02, 0x04, 0x02, -0x1, 0x01, 0x03, 0x02, }; daObj_SMTile_c::~daObj_SMTile_c() { diff --git a/src/d/actor/d_a_obj_ss_item.cpp b/src/d/actor/d_a_obj_ss_item.cpp index 59fbb9f9da..ceb32622f6 100644 --- a/src/d/actor/d_a_obj_ss_item.cpp +++ b/src/d/actor/d_a_obj_ss_item.cpp @@ -374,7 +374,7 @@ static actor_method_class daObj_SSItem_MethodTable = { extern actor_process_profile_definition g_profile_OBJ_SSITEM = { fpcLy_CURRENT_e, 7, - fpcLy_CURRENT_e, + fpcPi_CURRENT_e, PROC_OBJ_SSITEM, &g_fpcLf_Method.base, sizeof(daObj_SSItem_c), diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index 4df7a162a7..50d769f82c 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -46,19 +46,19 @@ static int const l_bmdIdx[13] = { 6, 6, 6, -1, -1, -1, 6, 6, 6, 6, 6, 6, -1, }; -static u32 const l_dzbIdx[13] = { +static int const l_dzbIdx[13] = { 15, 15, 15, -1, -1, -1, 15, 15, 15, 15, 15, 15, -1, }; -static u32 const l_btkIdx[13] = { +static int const l_btkIdx[13] = { 12, 12, 12, -1, -1, -1, 12, 12, 12, 12, 12, 12, -1, }; -static u32 const l_brkIdx[13] = { +static int const l_brkIdx[13] = { 9, 9, 9, -1, -1, -1, 9, 9, 9, 9, 9, 9, -1, }; -static u32 const l_twFlagIdx[13] = { +static int const l_twFlagIdx[13] = { 0, 1, 2, 4, -1, -1, 0, 1, 1, 2, 2, 4, 4, }; diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index e23cff73c1..b5f4f4ecb4 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -64,8 +64,8 @@ static const s16 l_open_limit_max[3] = { static const s16 l_open_limit_min[3] = { 0x1388, - 0xAAAB, - 0xAE39, + -0x5555, + -0x51C7, }; static const s16 l_open_speed[3] = { diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index 76034636c2..66332e1789 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -288,8 +288,10 @@ void daTagLv6Gate_c::create_init() { initBaseMtx(); if (!fopAcM_isSwitch(this, getSwitchNo1())) { - parentActorID = fopAcM_create(PROC_NPC_TKS, 2, &cXyz(-13.272481f, 2887.0f, -10373.718f), - fopAcM_GetRoomNo(this), &csXyz(0, 0x7FFF, 0), NULL, -1); + cXyz i_pos(-13.272481f, 2887.0f, -10373.718f); + csXyz i_angle(0, 0x7FFF, 0); + parentActorID = fopAcM_create(PROC_NPC_TKS, 2, &i_pos, + fopAcM_GetRoomNo(this), &i_angle, NULL, -1); } } diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index a4b48deadc..414a68a3d8 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -235,7 +235,7 @@ static actor_method_class daTag_Evt_MethodTable = { extern actor_process_profile_definition g_profile_TAG_EVT = { fpcLy_CURRENT_e, 7, - fpcLy_CURRENT_e, + fpcPi_CURRENT_e, PROC_TAG_EVT, &g_fpcLf_Method.base, sizeof(daTag_Evt_c), diff --git a/src/d/actor/d_a_tag_myna_light.cpp b/src/d/actor/d_a_tag_myna_light.cpp index a7fb443563..c62fcd84e7 100644 --- a/src/d/actor/d_a_tag_myna_light.cpp +++ b/src/d/actor/d_a_tag_myna_light.cpp @@ -162,7 +162,7 @@ static actor_method_class daTag_MynaLight_MethodTable = { extern actor_process_profile_definition g_profile_TAG_MNLIGHT = { fpcLy_CURRENT_e, 7, - fpcLy_CURRENT_e, + fpcPi_CURRENT_e, PROC_TAG_MNLIGHT, &g_fpcLf_Method.base, sizeof(daTag_MynaLight_c), diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index fd12d75a47..63a1c8d297 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -69,7 +69,7 @@ static actor_method_class l_daTagPati_Method = { extern actor_process_profile_definition g_profile_TAG_PATI = { fpcLy_CURRENT_e, 7, - fpcLy_CURRENT_e, + fpcPi_CURRENT_e, PROC_TAG_PATI, &g_fpcLf_Method.base, sizeof(daTagPati_c), diff --git a/src/d/actor/d_a_tag_push.cpp b/src/d/actor/d_a_tag_push.cpp index f18a56ab83..49dc2230e5 100644 --- a/src/d/actor/d_a_tag_push.cpp +++ b/src/d/actor/d_a_tag_push.cpp @@ -159,7 +159,7 @@ static actor_method_class daTag_Push_MethodTable = { extern actor_process_profile_definition g_profile_TAG_PUSH = { fpcLy_CURRENT_e, 8, - fpcLy_CURRENT_e, + fpcPi_CURRENT_e, PROC_TAG_PUSH, &g_fpcLf_Method.base, sizeof(daTag_Push_c), diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp index 1f09b87d0b..0c6ab21804 100644 --- a/src/d/actor/d_a_tag_ss_drink.cpp +++ b/src/d/actor/d_a_tag_ss_drink.cpp @@ -267,7 +267,7 @@ static actor_method_class daTag_SSDrink_MethodTable = { extern actor_process_profile_definition g_profile_TAG_SSDRINK = { fpcLy_CURRENT_e, 7, - fpcLy_CURRENT_e, + fpcPi_CURRENT_e, PROC_TAG_SSDRINK, &g_fpcLf_Method.base, sizeof(daTag_SSDrink_c), diff --git a/tools/converters/matDL_dis.py b/tools/converters/matDL_dis.py index e712018e12..d104e8e637 100755 --- a/tools/converters/matDL_dis.py +++ b/tools/converters/matDL_dis.py @@ -317,9 +317,9 @@ def convert_binary_to_matDL_c_source(src_path, dest_path, symbol_name, scope): macro_name = os.path.splitext(os.path.basename(src_path))[0] with open(src_path, "rb") as binary_file, open(dest_path, "w") as c_file: c_file.write("#ifndef LOAD_BP_REG\n") - c_file.write("#define U32_AS_U8(v) (((v) >> 24) & 0xFF), (((v) >> 16) & 0xFF), (((v) >> 8) & 0xFF), (((v) >> 0) & 0xFF)\n") - c_file.write("#define U24_AS_U8(v) (((v) >> 16) & 0xFF), (((v) >> 8) & 0xFF), (((v) >> 0) & 0xFF)\n") - c_file.write("#define U16_AS_U8(v) (((v) >> 8) & 0xFF), (((v) >> 0) & 0xFF)\n") + c_file.write("#define U32_AS_U8(v) (u8)(((v) >> 24) & 0xFF), (u8)(((v) >> 16) & 0xFF), (u8)(((v) >> 8) & 0xFF), (u8)(((v) >> 0) & 0xFF)\n") + c_file.write("#define U24_AS_U8(v) (u8)(((v) >> 16) & 0xFF), (u8)(((v) >> 8) & 0xFF), (u8)(((v) >> 0) & 0xFF)\n") + c_file.write("#define U16_AS_U8(v) (u8)(((v) >> 8) & 0xFF), (u8)(((v) >> 0) & 0xFF)\n") c_file.write("#define IMAGE_ADDR(addr) (u32)(addr) >> 5\n") c_file.write("#define LOAD_BP_REG(reg, value) GX_CMD_LOAD_BP_REG, reg, U24_AS_U8(value)\n") c_file.write("#define LOAD_XF_REG(reg, num_args, ...) GX_CMD_LOAD_XF_REG, U16_AS_U8(num_args-1), U16_AS_U8(reg), __VA_ARGS__\n") From 758f83dda575773fe3028598f61a4d621bcb5876 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Mon, 22 Dec 2025 12:27:31 -0800 Subject: [PATCH 04/35] JAHostIO, JAWExtSystem debug (#2985) --- configure.py | 21 ++ include/JSystem/J2DGraph/J2DOrthoGraph.h | 4 +- include/JSystem/J2DGraph/J2DPrint.h | 5 + include/JSystem/J2DGraph/J2DTevs.h | 18 +- include/JSystem/J2DGraph/J2DTextBox.h | 2 + include/JSystem/J2DGraph/J2DWindow.h | 11 + .../JSystem/JAHNodeLib/JAHSoundPlayerNode.h | 11 + include/JSystem/JAHostIO/JAHFrameNode.h | 29 +++ include/JSystem/JAHostIO/JAHPubDefine.h | 29 +++ include/JSystem/JAHostIO/JAHUTableEdit.h | 11 + include/JSystem/JAHostIO/JAHVirtualNode.h | 23 ++ include/JSystem/JAHostIO/JAHioMessage.h | 52 +++++ include/JSystem/JAHostIO/JAHioMgr.h | 28 +++ include/JSystem/JAHostIO/JAHioNode.h | 55 +++++ include/JSystem/JAHostIO/JAHioUtil.h | 10 + include/JSystem/JAWExtSystem/JAWExtSystem.h | 49 ++++ .../JSystem/JAWExtSystem/JAWGraphContext.h | 43 ++++ include/JSystem/JAWExtSystem/JAWSystem.h | 22 ++ include/JSystem/JAWExtSystem/JAWWindow.h | 112 +++++++++ include/JSystem/JAWExtSystem/JAWWindow3D.h | 10 + include/JSystem/JAWWinLib/JAWBankView.h | 20 ++ include/JSystem/JAWWinLib/JAWChView.h | 14 ++ include/JSystem/JAWWinLib/JAWEntrySeView.h | 11 + include/JSystem/JAWWinLib/JAWHioBankEdit.h | 11 + include/JSystem/JAWWinLib/JAWHioReceiver.h | 55 +++++ include/JSystem/JAWWinLib/JAWPlaySeView.h | 11 + include/JSystem/JAWWinLib/JAWPlayerChView.h | 11 + include/JSystem/JAWWinLib/JAWReportView.h | 11 + include/JSystem/JAWWinLib/JAWSysMemView.h | 11 + include/JSystem/JAWWinLib/JAWVolume.h | 11 + include/JSystem/JAudio2/JASReport.h | 5 + include/JSystem/JAudio2/JAUSeqCollection.h | 1 + include/JSystem/JGadget/search.h | 6 + include/JSystem/JGadget/std-list.h | 180 +++++++++++++++ include/JSystem/JGadget/std-memory.h | 6 + include/JSystem/JHostIO/JORReflexible.h | 5 +- include/JSystem/JHostIO/JORServer.h | 13 +- include/JSystem/JSupport/JSUList.h | 8 +- include/JSystem/JUtility/JUTGamePad.h | 3 + include/JSystem/JUtility/JUTResFont.h | 1 + include/JSystem/JUtility/JUTTexture.h | 1 - include/Z2AudioLib/Z2AudioCS.h | 6 +- include/Z2AudioLib/Z2DebugSys.h | 37 ++- include/Z2AudioLib/Z2F1TestWindow.h | 47 ++++ include/Z2AudioLib/Z2FxLineMgr.h | 7 +- include/Z2AudioLib/Z2SeView.h | 17 ++ include/Z2AudioLib/Z2SoundPlayer.h | 74 ++++++ include/Z2AudioLib/Z2TrackView.h | 15 ++ include/Z2AudioLib/Z2WaveArcLoader.h | 11 + include/m_Do/m_Do_audio.h | 21 +- src/JSystem/J2DGraph/J2DGrafContext.cpp | 8 + src/JSystem/J2DGraph/J2DMaterial.cpp | 28 ++- src/JSystem/J2DGraph/J2DTevs.cpp | 15 +- src/JSystem/J2DGraph/J2DTextBox.cpp | 42 ++-- src/JSystem/J2DGraph/J2DTextBoxEx.cpp | 51 ++--- src/JSystem/J2DGraph/J2DWindow.cpp | 91 ++++++-- src/JSystem/JAHostIO/JAHioMessage.cpp | 49 ++++ src/JSystem/JAHostIO/JAHioMgr.cpp | 55 +++++ src/JSystem/JAHostIO/JAHioNode.cpp | 115 ++++++++++ src/JSystem/JAHostIO/JAHioUtil.cpp | 14 ++ src/JSystem/JAWExtSystem/JAWExtSystem.cpp | 166 ++++++++++++++ src/JSystem/JAWExtSystem/JAWGraphContext.cpp | 190 ++++++++++++++++ src/JSystem/JAWExtSystem/JAWSystem.cpp | 17 ++ src/JSystem/JAWExtSystem/JAWWindow.cpp | 213 ++++++++++++++++++ src/JSystem/JAWExtSystem/JAWWindow3D.cpp | 5 + src/JSystem/JAudio2/JASReport.cpp | 71 ++++-- .../MSL/MSL_C++/MSL_Common/Include/iterator.h | 31 +++ .../MSL/MSL_C/MSL_Common/Include/printf.h | 1 + src/Z2AudioLib/Z2DebugSys.cpp | 119 ++++++++++ src/Z2AudioLib/Z2SoundPlayer.cpp | 112 +++++++++ src/m_Do/m_Do_audio.cpp | 126 ++++++++++- 71 files changed, 2555 insertions(+), 139 deletions(-) create mode 100644 include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h create mode 100644 include/JSystem/JAHostIO/JAHFrameNode.h create mode 100644 include/JSystem/JAHostIO/JAHPubDefine.h create mode 100644 include/JSystem/JAHostIO/JAHUTableEdit.h create mode 100644 include/JSystem/JAHostIO/JAHVirtualNode.h create mode 100644 include/JSystem/JAHostIO/JAHioMessage.h create mode 100644 include/JSystem/JAHostIO/JAHioMgr.h create mode 100644 include/JSystem/JAHostIO/JAHioNode.h create mode 100644 include/JSystem/JAHostIO/JAHioUtil.h create mode 100644 include/JSystem/JAWExtSystem/JAWExtSystem.h create mode 100644 include/JSystem/JAWExtSystem/JAWGraphContext.h create mode 100644 include/JSystem/JAWExtSystem/JAWSystem.h create mode 100644 include/JSystem/JAWExtSystem/JAWWindow.h create mode 100644 include/JSystem/JAWExtSystem/JAWWindow3D.h create mode 100644 include/JSystem/JAWWinLib/JAWBankView.h create mode 100644 include/JSystem/JAWWinLib/JAWChView.h create mode 100644 include/JSystem/JAWWinLib/JAWEntrySeView.h create mode 100644 include/JSystem/JAWWinLib/JAWHioBankEdit.h create mode 100644 include/JSystem/JAWWinLib/JAWHioReceiver.h create mode 100644 include/JSystem/JAWWinLib/JAWPlaySeView.h create mode 100644 include/JSystem/JAWWinLib/JAWPlayerChView.h create mode 100644 include/JSystem/JAWWinLib/JAWReportView.h create mode 100644 include/JSystem/JAWWinLib/JAWSysMemView.h create mode 100644 include/JSystem/JAWWinLib/JAWVolume.h create mode 100644 include/JSystem/JGadget/std-list.h create mode 100644 include/Z2AudioLib/Z2F1TestWindow.h create mode 100644 include/Z2AudioLib/Z2SeView.h create mode 100644 include/Z2AudioLib/Z2SoundPlayer.h create mode 100644 include/Z2AudioLib/Z2TrackView.h create mode 100644 include/Z2AudioLib/Z2WaveArcLoader.h create mode 100644 src/JSystem/JAHostIO/JAHioMessage.cpp create mode 100644 src/JSystem/JAHostIO/JAHioMgr.cpp create mode 100644 src/JSystem/JAHostIO/JAHioNode.cpp create mode 100644 src/JSystem/JAHostIO/JAHioUtil.cpp create mode 100644 src/JSystem/JAWExtSystem/JAWExtSystem.cpp create mode 100644 src/JSystem/JAWExtSystem/JAWGraphContext.cpp create mode 100644 src/JSystem/JAWExtSystem/JAWSystem.cpp create mode 100644 src/JSystem/JAWExtSystem/JAWWindow.cpp create mode 100644 src/JSystem/JAWExtSystem/JAWWindow3D.cpp create mode 100644 src/Z2AudioLib/Z2DebugSys.cpp create mode 100644 src/Z2AudioLib/Z2SoundPlayer.cpp diff --git a/configure.py b/configure.py index fac13cd35e..da2d7ca241 100755 --- a/configure.py +++ b/configure.py @@ -1098,6 +1098,25 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUStreamFileTable.cpp"), ], ), + JSystemLib( + "JAWExtSystem", + [ + Object(Matching, "JSystem/JAWExtSystem/JAWSystem.cpp"), + Object(NonMatching, "JSystem/JAWExtSystem/JAWWindow.cpp"), + Object(Matching, "JSystem/JAWExtSystem/JAWWindow3D.cpp"), + Object(NonMatching, "JSystem/JAWExtSystem/JAWGraphContext.cpp"), + Object(NonMatching, "JSystem/JAWExtSystem/JAWExtSystem.cpp"), + ], + ), + JSystemLib( + "JAHostIO", + [ + Object(Matching, "JSystem/JAHostIO/JAHioMessage.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHioMgr.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHioNode.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHioUtil.cpp"), + ] + ), JSystemLib( "JMessage", [ @@ -1136,6 +1155,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2WolfHowlMgr.cpp"), Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SpeechMgr2.cpp"), Object(Equivalent, "Z2AudioLib/Z2AudioMgr.cpp"), # weak func order + Object(NonMatching, "Z2AudioLib/Z2DebugSys.cpp"), + Object(NonMatching, "Z2AudioLib/Z2SoundPlayer.cpp"), ], }, { diff --git a/include/JSystem/J2DGraph/J2DOrthoGraph.h b/include/JSystem/J2DGraph/J2DOrthoGraph.h index 8e10a75a8d..a46c22ed34 100644 --- a/include/JSystem/J2DGraph/J2DOrthoGraph.h +++ b/include/JSystem/J2DGraph/J2DOrthoGraph.h @@ -19,8 +19,8 @@ public: virtual s32 getGrafType() const { return 1; } virtual void setLookat(); - f32 getWidthPower() const { return mBounds.getWidth() / mOrtho.getWidth(); } - f32 getHeightPower() const { return mBounds.getHeight() / mOrtho.getHeight(); } + f32 getWidthPower() { return mBounds.getWidth() / mOrtho.getWidth(); } + f32 getHeightPower() { return mBounds.getHeight() / mOrtho.getHeight(); } void setOrtho(f32 x, f32 y, f32 width, f32 height, f32 far, f32 near) { JGeometry::TBox2 ortho(x, y, x + width, y + height); diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index 48bdb59bc9..1bb748a80d 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -40,6 +40,11 @@ public: virtual ~J2DPrint(); + JUTFont* getFont() const { return mFont; } + f32 getCursorV() const { return mCursorV; } + void setCharColor(JUtility::TColor color) { mCharColor = color; } + void setGradColor(JUtility::TColor color) { mGradColor = color; } + f32 print_va(u8 alpha, const char* fmt, va_list args) { return J2DPrint_print_alpha_va(this, alpha, fmt, args); } diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h index 5630d4a028..2d8a9d7ef8 100644 --- a/include/JSystem/J2DGraph/J2DTevs.h +++ b/include/JSystem/J2DGraph/J2DTevs.h @@ -256,15 +256,15 @@ public: private: /* 0x0 */ u32 mFlags; - GXIndTexStageID getIndStage() const { return (GXIndTexStageID)(mFlags & 0x03); } - GXIndTexFormat getIndFormat() const { return (GXIndTexFormat)((mFlags >> 2) & 0x03); } - GXIndTexBiasSel getBiasSel() const { return (GXIndTexBiasSel)((mFlags >> 4) & 0x07); } - GXIndTexWrap getWrapS() const { return (GXIndTexWrap)((mFlags >> 8) & 0x07); } - GXIndTexWrap getWrapT() const { return (GXIndTexWrap)((mFlags >> 11) & 0x07); } - GXIndTexMtxID getMtxSel() const { return (GXIndTexMtxID)((mFlags >> 16) & 0x0F); } - GXBool getPrev() const { return (GXBool)((mFlags >> 20) & 0x01); } - GXBool getLod() const { return (GXBool)((mFlags >> 21) & 0x01); } - GXIndTexAlphaSel getAlphaSel() const { return (GXIndTexAlphaSel)((mFlags >> 22) & 0x03); } + u8 getIndStage() const { return (mFlags & 0x03); } + u8 getIndFormat() const { return (mFlags >> 2) & 0x03; } + u8 getBiasSel() const { return (mFlags >> 4) & 0x07; } + u8 getWrapS() const { return (mFlags >> 8) & 0x07; } + u8 getWrapT() const { return (mFlags >> 11) & 0x07; } + u8 getMtxSel() const { return (mFlags >> 16) & 0x0F; } + u8 getPrev() const { return (mFlags >> 20) & 0x01; } + u8 getLod() const { return (mFlags >> 21) & 0x01; } + u8 getAlphaSel() const { return (mFlags >> 22) & 0x03; } }; /** diff --git a/include/JSystem/J2DGraph/J2DTextBox.h b/include/JSystem/J2DGraph/J2DTextBox.h index d8327bdff2..417e6ede77 100644 --- a/include/JSystem/J2DGraph/J2DTextBox.h +++ b/include/JSystem/J2DGraph/J2DTextBox.h @@ -171,7 +171,9 @@ public: /* 0x0130 */ u8 mFlags; /* 0x0131 */ bool mTextFontOwned; /* 0x0132 */ u16 mStringLength; +#if PLATFORM_GCN /* 0x0134 */ u8 field_0x134[4]; +#endif }; // Size: 0x138 #endif /* J2DTEXTBOX_H */ diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h index 5b03b3ef9a..f467b953db 100644 --- a/include/JSystem/J2DGraph/J2DWindow.h +++ b/include/JSystem/J2DGraph/J2DWindow.h @@ -7,6 +7,13 @@ class JSURandomInputStream; class JUTTexture; +enum J2DTextureBase { + TEXTUREBASE_0 = 0, +}; + +enum J2DWindowMirror { +}; + /** * @ingroup jsystem-j2d * @@ -32,8 +39,12 @@ public: J2DWindow(J2DPane*, JSURandomInputStream*, J2DMaterial*); J2DWindow(J2DPane*, JSURandomInputStream*, JKRArchive*); J2DWindow(); + J2DWindow(u64, const JGeometry::TBox2&, const char*, J2DTextureBase, const ResTLUT*); + void initiate(const ResTIMG*, const ResTIMG*, const ResTIMG*, const ResTIMG*, const ResTLUT*, J2DWindowMirror, const JGeometry::TBox2&); void private_readStream(J2DPane*, JSURandomInputStream*, JKRArchive*); + void initinfo(); void initinfo2(); + static J2DWindowMirror convertMirror(J2DTextureBase); void draw_private(JGeometry::TBox2 const&, JGeometry::TBox2 const&); void setContentsColor(JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor); diff --git a/include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h b/include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h new file mode 100644 index 0000000000..625b2b9a1c --- /dev/null +++ b/include/JSystem/JAHNodeLib/JAHSoundPlayerNode.h @@ -0,0 +1,11 @@ +#ifndef JAHSOUNDPLAYERNODE_H +#define JAHSOUNDPLAYERNODE_H + +#include "JSystem/JAHostIO/JAHFrameNode.h" + +class JAHSoundPlayerNode : public JAHFrameNode { +public: + JAHSoundPlayerNode(); +}; + +#endif /* JAHSOUNDPLAYERNODE_H */ diff --git a/include/JSystem/JAHostIO/JAHFrameNode.h b/include/JSystem/JAHostIO/JAHFrameNode.h new file mode 100644 index 0000000000..51a08a2cf4 --- /dev/null +++ b/include/JSystem/JAHostIO/JAHFrameNode.h @@ -0,0 +1,29 @@ +#ifndef JAHFRAMENODE_H +#define JAHFRAMENODE_H + +#include "dolphin/types.h" +#include "JSystem/JAHostIO/JAHioNode.h" + +class JAHVirtualNode; + +class JAHFrameNode : public JAHioNode { +public: + JAHFrameNode(const char*); + /* vt[07] */ virtual ~JAHFrameNode(); + /* vt[02] */ virtual void listenPropertyEvent(const JORPropertyEvent*); + /* vt[05] */ virtual void genMessage(JORMContext*); + /* vt[06] */ virtual void listenNodeEvent(const JORNodeEvent*); + /* vt[0C] */ virtual s32 getNodeType(); + /* vt[11] */ virtual void onCurrentNodeFrame(); + /* vt[12] */ virtual void onFrame(); + + void framework(); + void currentFramework(); + + JSULink* getFrameNodeLink() { return &mFrameNodeLink; } + + /* 0x44 */ JSUTree mTree; + /* 0x60 */ JSULink mFrameNodeLink; +}; + +#endif /* JAHFRAMENODE_H */ diff --git a/include/JSystem/JAHostIO/JAHPubDefine.h b/include/JSystem/JAHostIO/JAHPubDefine.h new file mode 100644 index 0000000000..b67d462bc5 --- /dev/null +++ b/include/JSystem/JAHostIO/JAHPubDefine.h @@ -0,0 +1,29 @@ +#ifndef JAHPUBDEFINE_H +#define JAHPUBDEFINE_H + +#include "JSystem/JUtility/JUTAssert.h" + +template +class JAHSingletonBase { +public: + JAHSingletonBase() { sInstance = (T*)this; } + virtual ~JAHSingletonBase() { sInstance = NULL; } + + static T* newInstance() { + JUT_ASSERT(82, sInstance==NULL); + if (!sInstance) { + sInstance = new T(); + } + JUT_ASSERT(85, sInstance!=NULL); + return sInstance; + } + + static T* getIns() { + JUT_ASSERT(110, sInstance); + return sInstance; + } + + static T* sInstance; +}; + +#endif /* JAHPUBDEFINE_H */ diff --git a/include/JSystem/JAHostIO/JAHUTableEdit.h b/include/JSystem/JAHostIO/JAHUTableEdit.h new file mode 100644 index 0000000000..ba8498c5bc --- /dev/null +++ b/include/JSystem/JAHostIO/JAHUTableEdit.h @@ -0,0 +1,11 @@ +#ifndef JAHUTABLEDIT_H +#define JAHUTABLEDIT_H + +#include "JSystem/JAHostIO/JAHVirtualNode.h" + +class JAHUSeBox : public JAHVirtualNode { +public: + JAHUSeBox(); +}; + +#endif /* JAHUTABLEDIT_H */ diff --git a/include/JSystem/JAHostIO/JAHVirtualNode.h b/include/JSystem/JAHostIO/JAHVirtualNode.h new file mode 100644 index 0000000000..50cdbc8725 --- /dev/null +++ b/include/JSystem/JAHostIO/JAHVirtualNode.h @@ -0,0 +1,23 @@ +#ifndef JAHVIRTUALNODE_H +#define JAHVIRTUALNODE_H + +#include "JSystem/JAHostIO/JAHioNode.h" +#include "JSystem/JSupport/JSUList.h" + +class JAHControl; + +class JAHVirtualNode { +public: + JAHVirtualNode(); + virtual void updateNode(); + virtual void message(JAHControl&); + virtual void onFrame(); + virtual void onCurrentNodeFrame(); + virtual void propertyEvent(JAH_P_Event, u32); + virtual void nodeEvent(JAH_N_Event); + + /* 0x04 */ JSUTree mTree; + /* 0x20 */ char mName[32]; +}; + +#endif /* JAHVIRTUALNODE_H */ diff --git a/include/JSystem/JAHostIO/JAHioMessage.h b/include/JSystem/JAHostIO/JAHioMessage.h new file mode 100644 index 0000000000..dabba5158a --- /dev/null +++ b/include/JSystem/JAHostIO/JAHioMessage.h @@ -0,0 +1,52 @@ +#ifndef JAHIOMESSAGE_H +#define JAHIOMESSAGE_H + +#include "dolphin/types.h" + +class JAHioNode; +class JORMContext; + +class JAHControl { +public: + JAHControl(JORMContext*, JAHioNode*); + void returnY(u16); + void indent(s8); + void makeComment(const char*, u32, u8, u32); + + static u16 getLineHeight() { return smLineHeight; } + static u16 getContWidth() { return smContWidth; } + static u16 getIntervalX() { return smIntX; } + static u16 getNameWidth() { return smNameWidth; } + + static u16 smButtonWidth[]; + static u16 smCommentWidth[]; + static u16 smComboWidth[]; + static u16 smYTop; + static u16 smXLeft; + static u16 smIndentSize; + static u16 smLineHeight; + static u16 smContWidth; + static u16 smIntX; + static u16 smIntY; + static u16 smNameWidth; + + u16 getX() { return mX; } + u16 getY() { return mY; } + JORMContext* getContext() { return mContext; } + + void tabX(u16 param_1) { + mX += param_1 + smIntX; + } + void returnYDirectSize(u16 param_1) { + mY += param_1; + mX = smXLeft + field_0x4 * smIndentSize; + } + + /* 0x00 */ u16 mX; + /* 0x02 */ u16 mY; + /* 0x04 */ u16 field_0x4; + /* 0x08 */ JORMContext* mContext; + /* 0x0C */ JAHioNode* mNode; +}; + +#endif /* JAHIOMESSAGE_H */ diff --git a/include/JSystem/JAHostIO/JAHioMgr.h b/include/JSystem/JAHostIO/JAHioMgr.h new file mode 100644 index 0000000000..ec53e89af5 --- /dev/null +++ b/include/JSystem/JAHostIO/JAHioMgr.h @@ -0,0 +1,28 @@ +#ifndef JAHIOMGR_H +#define JAHIOMGR_H + +#include "JSystem/JAHostIO/JAHPubDefine.h" +#include "JSystem/JSupport/JSUList.h" + +class JAHFrameNode; +class JAHioNode; +class JORReflexible; + +class JAHioMgr : public JAHSingletonBase { +public: + JAHioMgr(); + void init_OnGame(); + bool isGameMode(); + void appendRootNode(JORReflexible*, JAHioNode*); + void appendFrameNode(JAHioNode*); + void removeFrameNode(JAHioNode*); + u32 framework(); + + u32 getNodeSysType() { return field_0x8; } + + /* 0x04 */ s32 field_0x4; + /* 0x08 */ u32 field_0x8; + JSUList field_0xc; +}; + +#endif /* JAHIOMGR_H */ diff --git a/include/JSystem/JAHostIO/JAHioNode.h b/include/JSystem/JAHostIO/JAHioNode.h new file mode 100644 index 0000000000..c48861eee9 --- /dev/null +++ b/include/JSystem/JAHostIO/JAHioNode.h @@ -0,0 +1,55 @@ +#ifndef JAHIONODE_H +#define JAHIONODE_H + +#include "JSystem/JHostIO/JORReflexible.h" +#include "JSystem/JSupport/JSUList.h" + +enum JAH_N_Event { + JAH_N_EVENT0 = 0, + JAH_N_EVENT1 = 1, + JAH_N_EVENT2 = 2, +}; + +enum JAH_P_Event { + JAH_P_EVENT0 = 0, + JAH_P_EVENT1 = 1, +}; + +class JAHControl; + +class JAHioNode : public JORReflexible { +public: + JAHioNode(const char*); + /* vt[07] */ virtual ~JAHioNode(); + /* vt[02] */ virtual void listenPropertyEvent(const JORPropertyEvent*); + /* vt[05] */ virtual void genMessage(JORMContext*); + /* vt[06] */ virtual void listenNodeEvent(const JORNodeEvent*); + /* vt[08] */ virtual void message(JAHControl&) {} + /* vt[09] */ virtual void appendNode(JAHioNode*, const char*); + /* vt[0A] */ virtual void prependNode(JAHioNode*, const char*); + /* vt[0B] */ virtual void removeNode(JAHioNode*); + /* vt[0C] */ virtual s32 getNodeType() { return 0; } + /* vt[0D] */ virtual u32 getNodeKind() const; + /* vt[0E] */ virtual u32 getNodeIcon() const { return 0; } + /* vt[0F] */ virtual void propertyEvent(JAH_P_Event, u32) {} + /* vt[10] */ virtual void nodeEvent(JAH_N_Event) {} + void updateNode(); + void setNodeName(const char*); + void generateRealChildren(JORMContext*); + void generateTempChildren(JORMContext*); + JAHioNode* getParent(); + + static JAHioNode* getCurrentNode() { return smCurrentNode; } + + static JAHioNode* smCurrentNode; + + JSUTree* getTree() { return &mTree; } + char* getNodeName() { return mName; } + void setLastChild(JAHioNode* node) { mLastChild = node; } + + /* 0x04 */ JSUTree mTree; + /* 0x20 */ char mName[32]; + /* 0x40 */ JAHioNode* mLastChild; +}; + +#endif /* JAHIONODE_H */ diff --git a/include/JSystem/JAHostIO/JAHioUtil.h b/include/JSystem/JAHostIO/JAHioUtil.h new file mode 100644 index 0000000000..08522c8ba1 --- /dev/null +++ b/include/JSystem/JAHostIO/JAHioUtil.h @@ -0,0 +1,10 @@ +#ifndef JAHIOUTIL_H +#define JAHIOUTIL_H + +namespace JAHioUtil { + char* getString(const char* msg, ...); + + extern char mStringBuffer[]; +} + +#endif /* JAHIOUTIL_H */ diff --git a/include/JSystem/JAWExtSystem/JAWExtSystem.h b/include/JSystem/JAWExtSystem/JAWExtSystem.h new file mode 100644 index 0000000000..609592d832 --- /dev/null +++ b/include/JSystem/JAWExtSystem/JAWExtSystem.h @@ -0,0 +1,49 @@ +#ifndef JAWEXTSYSTEM_H +#define JAWEXTSYSTEM_H + +#include "JSystem/JAWExtSystem/JAWSystem.h" +#include "JSystem/JGadget/std-list.h" + +class JAWWindow; +class JUTGamePad; + +namespace JAWExtSystem { + BOOL registWindow(u32, JAWWindow*, int, int); + BOOL destroyWindow(u32, JAWWindow*); + void nextPage(); + void prevPage(); + void nextWindow(); + void prevWindow(); + void draw(); + void padProc(const JUTGamePad&); + + class TSystemInterface : public JAWSystemInterface { + public: + TSystemInterface() {} + virtual BOOL registWindow(u32 param_1, JAWWindow* param_2, int param_3, int param_4) { + return JAWExtSystem::registWindow(param_1, param_2, param_3, param_4); + } + virtual BOOL destroyWindow(u32 param_1, JAWWindow* param_2) { + return JAWExtSystem::destroyWindow(param_1, param_2); + } + virtual void setForegroundWindow(JAWWindow*) {} + }; + + class TCurrentHeap { + public: + TCurrentHeap(const TSystemInterface& interface) { + heap = JKRGetCurrentHeap(); + JKRSetCurrentHeap(interface.getCurrentHeap()); + } + ~TCurrentHeap() { JKRSetCurrentHeap(heap); } + + /* 0x00 */ JKRHeap* heap; + }; + + extern JGadget::TList sPage[128]; + extern TSystemInterface sInterface; + extern s32 sCurrentPage; + extern u8 lbl_80748E44; +} + +#endif /* JAWEXTSYSTEM_H */ diff --git a/include/JSystem/JAWExtSystem/JAWGraphContext.h b/include/JSystem/JAWExtSystem/JAWGraphContext.h new file mode 100644 index 0000000000..2719500e1c --- /dev/null +++ b/include/JSystem/JAWExtSystem/JAWGraphContext.h @@ -0,0 +1,43 @@ +#ifndef JAWGRAPHCONTEXT_H +#define JAWGRAPHCONTEXT_H + +#include "JSystem/JUtility/TColor.h" +#include "JSystem/JGeometry.h" + +class J2DPrint; +class JUTResFont; + +class JAWGraphContext { +public: + JAWGraphContext(); + ~JAWGraphContext(); + void reset(); + void color(u8, u8, u8, u8); + void color(const JUtility::TColor&); + void locate(int, int); + void print(char const*, ...); + void print(int, int, const char*, ...); + void color(const JUtility::TColor&, const JUtility::TColor&, const JUtility::TColor&, const JUtility::TColor&); + void fillBox(const JGeometry::TBox2&); + void drawFrame(const JGeometry::TBox2&); + void line(const JGeometry::TVec2&, const JGeometry::TVec2&); + void setGXforPrint(); + void setGXforDraw(); + + /* 0x00 */ J2DPrint* field_0x0; + /* 0x04 */ JUtility::TColor field_0x4; + /* 0x08 */ JUtility::TColor field_0x8; + /* 0x0C */ JUtility::TColor field_0xc; + /* 0x10 */ JUtility::TColor field_0x10; + /* 0x14 */ u8 mParentAlpha; + /* 0x15 */ u8 field_0x15; + /* 0x16 */ u8 field_0x16; + /* 0x18 */ int field_0x18; + + void setParentAlpha(u8 alpha) { mParentAlpha = alpha; } + + static JUTResFont* sFont; + static bool lbl_8074CD30; +}; + +#endif /* JAWGRAPHCONTEXT_H */ diff --git a/include/JSystem/JAWExtSystem/JAWSystem.h b/include/JSystem/JAWExtSystem/JAWSystem.h new file mode 100644 index 0000000000..7d9338354e --- /dev/null +++ b/include/JSystem/JAWExtSystem/JAWSystem.h @@ -0,0 +1,22 @@ +#ifndef JAWSYSTEM_H +#define JAWSYSTEM_H + +#include "JSystem/JKernel/JKRHeap.h" + +class JAWWindow; + +class JAWSystemInterface { +public: + JAWSystemInterface(); + virtual BOOL registWindow(u32, JAWWindow*, int, int) = 0; + virtual BOOL destroyWindow(u32, JAWWindow*) = 0; + virtual void setForegroundWindow(JAWWindow*) = 0; + + /* 0x04 */ JKRHeap* mHeap; + + JKRHeap* getCurrentHeap() const; + + static JAWSystemInterface* sInstance; +}; + +#endif /* JAWSYSTEM_H */ diff --git a/include/JSystem/JAWExtSystem/JAWWindow.h b/include/JSystem/JAWExtSystem/JAWWindow.h new file mode 100644 index 0000000000..942a25a90c --- /dev/null +++ b/include/JSystem/JAWExtSystem/JAWWindow.h @@ -0,0 +1,112 @@ +#ifndef JAWWINDOW_H +#define JAWWINDOW_H + +#include "JSystem/JAWExtSystem/JAWGraphContext.h" +#include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/J2DGraph/J2DWindow.h" +#include "JSystem/JGeometry.h" + +class JAWGraphContext; +class JUTGamePad; + +class JUTPoint { +public: + JUTPoint(int i_x, int i_y) { + x = i_x; + y = i_y; + } + + /* 0x00*/ int x; + /* 0x04*/ int y; +}; + +class JAWWindow { +public: + class TJ2DWindowDraw : public J2DWindow { + public: + TJ2DWindowDraw(u32, const JGeometry::TBox2&, const char*); + + void drawPane(int x, int y, const J2DGrafContext* p_grafCtx) { + J2DPane::draw(x, y, p_grafCtx, true, true); + calcMtx(); + } + }; + + class TWindowText : public J2DPane { + public: + TWindowText(JAWWindow*); + virtual void drawSelf(f32, f32); + virtual void drawSelf(f32, f32, Mtx*); + + /* 0x0FC */ JAWGraphContext field_0xfc; + /* 0x118 */ JAWWindow* m_pParent; + /* 0x11C */ JUTPoint field_0x11c; + }; + + JAWWindow(const char*, int, int); + virtual ~JAWWindow(); + virtual void onDraw(JAWGraphContext*); + virtual BOOL onInit(); + virtual void frameWork() {} + virtual void onPadProc(const JUTGamePad&) {} + virtual void onTrigA(const JUTGamePad&) {} + virtual void onTrigB(const JUTGamePad&) {} + virtual void onTrigX(const JUTGamePad&) {} + virtual void onTrigY(const JUTGamePad&) {} + virtual void onTrigMenu(const JUTGamePad&) {} + virtual void onTrigL(const JUTGamePad&) {} + virtual void onTrigZ(const JUTGamePad&) {} + virtual void onTrigUp(const JUTGamePad&) {} + virtual void onTrigDown(const JUTGamePad&) {} + virtual void onTrigLeft(const JUTGamePad&) {} + virtual void onTrigRight(const JUTGamePad&) {} + virtual void onReleaseA(const JUTGamePad&) {} + virtual void onReleaseB(const JUTGamePad&) {} + virtual void onReleaseX(const JUTGamePad&) {} + virtual void onReleaseY(const JUTGamePad&) {} + virtual void onReleaseMenu(const JUTGamePad&) {} + virtual void onReleaseL(const JUTGamePad&) {} + virtual void onReleaseZ(const JUTGamePad&) {} + virtual void onReleaseUp(const JUTGamePad&) {} + virtual void onReleaseDown(const JUTGamePad&) {} + virtual void onReleaseLeft(const JUTGamePad&) {} + virtual void onReleaseRight(const JUTGamePad&) {} + virtual void onKeyA(const JUTGamePad&) {} + virtual void onKeyB(const JUTGamePad&) {} + virtual void onKeyX(const JUTGamePad&) {} + virtual void onKeyY(const JUTGamePad&) {} + virtual void onKeyMenu(const JUTGamePad&) {} + virtual void onKeyL(const JUTGamePad&) {} + virtual void onKeyZ(const JUTGamePad&) {} + virtual void onKeyUp(const JUTGamePad&) {} + virtual void onKeyDown(const JUTGamePad&) {} + virtual void onKeyLeft(const JUTGamePad&) {} + virtual void onKeyRight(const JUTGamePad&) {} + + BOOL initIf(); + void setTitleColor(const JUtility::TColor&, const JUtility::TColor&); + void setWindowColor(const JUtility::TColor&, const JUtility::TColor&, const JUtility::TColor&, const JUtility::TColor&); + void move(f32, f32); + void addPosition(f32, f32); + void addSize(f32, f32); + static JUtility::TColor convJudaColor(u16); + void padProc(const JUTGamePad&); + + /* 0x004 */ Mtx mMatrix; + /* 0x034 */ u8 field_0x34[0x38 - 0x34]; + /* 0x038 */ TJ2DWindowDraw field_0x38; + /* 0x180 */ J2DTextBox field_0x180; + /* 0x2B0 */ TWindowText field_0x2b0; + /* 0x3D8 */ JUtility::TColor field_0x3d8; + /* 0x3DC */ JUtility::TColor field_0x3dc; + /* 0x3E0 */ JUtility::TColor field_0x3e0; + /* 0x3E4 */ JUtility::TColor field_0x3e4; + /* 0x3E8 */ int field_0x3e8; + /* 0x3EC */ u8 field_0x3ec; + + void setMatrix(Mtx mtx) { MTXCopy(mtx, mMatrix); } + void setAlpha(u8 alpha) { field_0x38.setAlpha(alpha); } + void draw(int x, int y, const J2DGrafContext* p_grafCtx) { field_0x38.drawPane(x, y, p_grafCtx); } +}; + +#endif /* JAWWINDOW_H */ diff --git a/include/JSystem/JAWExtSystem/JAWWindow3D.h b/include/JSystem/JAWExtSystem/JAWWindow3D.h new file mode 100644 index 0000000000..e14b399ff5 --- /dev/null +++ b/include/JSystem/JAWExtSystem/JAWWindow3D.h @@ -0,0 +1,10 @@ +#ifndef JAWWINDOW3D_H +#define JAWWINDOW3D_H + +#include "JSystem/JGeometry.h" + +namespace JAWWindow3D { + extern JGeometry::TVec2 sPtOrigin; +} + +#endif /* JAWWINDOW3D_H */ diff --git a/include/JSystem/JAWWinLib/JAWBankView.h b/include/JSystem/JAWWinLib/JAWBankView.h new file mode 100644 index 0000000000..2ee0d2ce71 --- /dev/null +++ b/include/JSystem/JAWWinLib/JAWBankView.h @@ -0,0 +1,20 @@ +#ifndef JAWBANKVIEW_H +#define JAWBANKVIEW_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class JAWBankView : public JAWWindow { +public: + JAWBankView(); + + /* 0x3F0 */ int field_0x3f0; + /* 0x3F4 */ int field_0x3f4; + /* 0x3F8 */ int field_0x3f8; + /* 0x3FC */ int field_0x3fc; + /* 0x400 */ u8 field_0x400; + /* 0x404 */ int field_0x404; + /* 0x408 */ f32 field_0x408; + /* 0x40C */ u8 field_0x40c[4]; +}; + +#endif /* JAWBANKVIEW_H */ diff --git a/include/JSystem/JAWWinLib/JAWChView.h b/include/JSystem/JAWWinLib/JAWChView.h new file mode 100644 index 0000000000..5ee7c45476 --- /dev/null +++ b/include/JSystem/JAWWinLib/JAWChView.h @@ -0,0 +1,14 @@ +#ifndef JAWCHVIEW_H +#define JAWCHVIEW_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class JAWChView : public JAWWindow { +public: + JAWChView(); + + /* 0x3F0 */ int field_0x3f0; + /* 0x3F4 */ u8 field_0x3f4[4]; +}; + +#endif /* JAWCHVIEW_H */ diff --git a/include/JSystem/JAWWinLib/JAWEntrySeView.h b/include/JSystem/JAWWinLib/JAWEntrySeView.h new file mode 100644 index 0000000000..af7822706e --- /dev/null +++ b/include/JSystem/JAWWinLib/JAWEntrySeView.h @@ -0,0 +1,11 @@ +#ifndef JAWENTRYSEVIEW_H +#define JAWENTRYSEVIEW_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class JAWEntrySeViewBasic : public JAWWindow { +public: + JAWEntrySeViewBasic(); +}; + +#endif /* JAWENTRYSEVIEW_H */ diff --git a/include/JSystem/JAWWinLib/JAWHioBankEdit.h b/include/JSystem/JAWWinLib/JAWHioBankEdit.h new file mode 100644 index 0000000000..20eb6fda1b --- /dev/null +++ b/include/JSystem/JAWWinLib/JAWHioBankEdit.h @@ -0,0 +1,11 @@ +#ifndef JAWHIOBANKEDIT_H +#define JAWHIOBANKEDIT_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class JAWHioBankEdit : public JAWWindow { +public: + JAWHioBankEdit(); +}; + +#endif /* JAWHIOBANKEDIT_H */ diff --git a/include/JSystem/JAWWinLib/JAWHioReceiver.h b/include/JSystem/JAWWinLib/JAWHioReceiver.h new file mode 100644 index 0000000000..bf89b70040 --- /dev/null +++ b/include/JSystem/JAWWinLib/JAWHioReceiver.h @@ -0,0 +1,55 @@ +#ifndef JAWHIORECEIVER_H +#define JAWHIORECEIVER_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" +#include "JSystem/JHostIO/JHIComm.h" +#include "JSystem/JHostIO/JHICommonMem.h" +#include "JSystem/JAudio2/JAISound.h" + +class JAISeqData; + +class JADHioReceiver : JHITag { +public: + JADHioReceiver(); + virtual ~JADHioReceiver(); + virtual void receive(const char*, s32); + virtual u32 parse(u32,char*, u32) = 0; +}; + + +class JAWHioReceiver : public JAWWindow { +public: + class TSeqList { + public: + class TSeqData { + public: + }; + + bool getSeqData(JAISoundID, JAISeqData*) const; + + /* 0x00 */ JSUList mList; + }; + + class THioReceiver : public JADHioReceiver { + public: + THioReceiver(); + virtual ~THioReceiver(); + virtual u32 parse(u32,char*, u32); + + /* 0x0C */ int field_0xc; + /* 0x10 */ u8 field_0x10; + /* 0x14 */ TSeqList field_0x14; + /* 0x20 */ int field_0x20; + /* 0x24 */ int field_0x24; + /* 0x28 */ int field_0x28; + /* 0x2C */ int field_0x2c; + }; + + JAWHioReceiver(); + + const TSeqList* getSeqList() const { return &field_0x3f0.field_0x14; } + + /* 0x3F0 */ THioReceiver field_0x3f0; +}; + +#endif /* JAWHIORECEIVER_H */ diff --git a/include/JSystem/JAWWinLib/JAWPlaySeView.h b/include/JSystem/JAWWinLib/JAWPlaySeView.h new file mode 100644 index 0000000000..f47ab904e0 --- /dev/null +++ b/include/JSystem/JAWWinLib/JAWPlaySeView.h @@ -0,0 +1,11 @@ +#ifndef JAWPLAYSEVIEW_H +#define JAWPLAYSEVIEW_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class JAWPlaySeViewBasic : public JAWWindow { +public: + JAWPlaySeViewBasic(); +}; + +#endif /* JAWPLAYSEVIEW_H */ diff --git a/include/JSystem/JAWWinLib/JAWPlayerChView.h b/include/JSystem/JAWWinLib/JAWPlayerChView.h new file mode 100644 index 0000000000..c8d23053ae --- /dev/null +++ b/include/JSystem/JAWWinLib/JAWPlayerChView.h @@ -0,0 +1,11 @@ +#ifndef JAWPLAYERCHVIEW_H +#define JAWPLAYERCHVIEW_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class JAWPlayerChView : public JAWWindow { +public: + JAWPlayerChView(); +}; + +#endif /* JAWPLAYERCHVIEW_H */ diff --git a/include/JSystem/JAWWinLib/JAWReportView.h b/include/JSystem/JAWWinLib/JAWReportView.h new file mode 100644 index 0000000000..8d6023dfb2 --- /dev/null +++ b/include/JSystem/JAWWinLib/JAWReportView.h @@ -0,0 +1,11 @@ +#ifndef JAWREPORTVIEW_H +#define JAWREPORTVIEW_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class JAWReportView : public JAWWindow { +public: + JAWReportView(); +}; + +#endif /* JAWREPORTVIEW_H */ diff --git a/include/JSystem/JAWWinLib/JAWSysMemView.h b/include/JSystem/JAWWinLib/JAWSysMemView.h new file mode 100644 index 0000000000..b4421dde61 --- /dev/null +++ b/include/JSystem/JAWWinLib/JAWSysMemView.h @@ -0,0 +1,11 @@ +#ifndef JAWSYSMEMVIEW_H +#define JAWSYSMEMVIEW_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class JAWSysMemView : public JAWWindow { +public: + JAWSysMemView(); +}; + +#endif /* JAWSYSMEMVIEW_H */ diff --git a/include/JSystem/JAWWinLib/JAWVolume.h b/include/JSystem/JAWWinLib/JAWVolume.h new file mode 100644 index 0000000000..33cd460f18 --- /dev/null +++ b/include/JSystem/JAWWinLib/JAWVolume.h @@ -0,0 +1,11 @@ +#ifndef JAWVOLUME_H +#define JAWVOLUME_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class JAWVolume : public JAWWindow { +public: + JAWVolume(int, int); +}; + +#endif /* JAWVOLUME_H */ diff --git a/include/JSystem/JAudio2/JASReport.h b/include/JSystem/JAudio2/JASReport.h index 1f20132ffb..139fe9438e 100644 --- a/include/JSystem/JAudio2/JASReport.h +++ b/include/JSystem/JAudio2/JASReport.h @@ -1,6 +1,11 @@ #ifndef JASREPORT_H #define JASREPORT_H +class JKRHeap; + +void JASReportInit(JKRHeap*, int); +int JASReportGetLineMax(); +int JASReportCopyBuffer(char *, int); void JASReport(const char* message, ...); #endif /* JASREPORT_H */ diff --git a/include/JSystem/JAudio2/JAUSeqCollection.h b/include/JSystem/JAudio2/JAUSeqCollection.h index 7cfa1d97ad..586f33e4a7 100644 --- a/include/JSystem/JAudio2/JAUSeqCollection.h +++ b/include/JSystem/JAudio2/JAUSeqCollection.h @@ -50,6 +50,7 @@ public: ~JAUSeqDataMgr_SeqCollection(); const void* getResource() const { return field_0x4; } + void init(const void* param_1) { JAUSeqCollection::init(param_1); } /* 0x14 */ JAISeqDataUser* user_; }; diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h index c53045668a..161902bf12 100644 --- a/include/JSystem/JGadget/search.h +++ b/include/JSystem/JGadget/search.h @@ -38,6 +38,12 @@ template { }; +template +struct TIterator_reverse : public std::reverse_iterator { + TIterator_reverse() {} + TIterator_reverse(Iterator it) : std::reverse_iterator(it) {} +}; + template inline Iterator findUpperBound_binary_all(Iterator first, Iterator last, const T& val, Predicate p) { return std::upper_bound(first, last, val, p); diff --git a/include/JSystem/JGadget/std-list.h b/include/JSystem/JGadget/std-list.h new file mode 100644 index 0000000000..ec51da33ea --- /dev/null +++ b/include/JSystem/JGadget/std-list.h @@ -0,0 +1,180 @@ +#ifndef STD_LIST_H +#define STD_LIST_H + +#include "JSystem/JGadget/define.h" +#include "JSystem/JGadget/search.h" +#include "JSystem/JGadget/std-memory.h" + +namespace JGadget { + template > + struct TList { + struct TNode_ { + /* 0x00 */ TNode_* pNext_; + /* 0x04 */ TNode_* pPrev_; + }; + + struct iterator : public TIterator { + iterator() {p_ = NULL; } + iterator(TNode_* pNode) { p_ = pNode; } + + iterator& operator++() { p_ = p_->pNext_; return *this; } + iterator& operator--() { p_ = p_->pPrev_; return *this; } + iterator operator++(int) { const iterator old(*this); (void)++*this; return old; } + iterator operator--(int) { const iterator old(*this); (void)--*this; return old; } + friend bool operator==(iterator a, iterator b) { return a.p_ == b.p_; } + friend bool operator!=(iterator a, iterator b) { return !(a == b); } + T& operator*() const { + JUT_ASSERT(125, p_!=NULL); + return *(T*)&p_[1]; + } + + /* 0x00 */ TNode_* p_; + }; + + struct const_iterator { + const_iterator(TNode_* pNode) { p_ = pNode; } + + const_iterator& operator++() { p_ = p_->pNext_; return *this; } + const_iterator& operator--() { p_ = p_->pPrev_; return *this; } + friend bool operator==(const_iterator a, const_iterator b) { return a.p_ == b.p_; } + friend bool operator!=(const_iterator a, const_iterator b) { return !(a == b); } + + /* 0x00 */ TNode_* p_; + }; + + TList(const Allocator& allocator = Allocator()) { + field_0x4 = 0; + Initialize_(); + } + ~TList() { + int r30; + int r29; + JGadget_outMessage* r28; + int r27; + Confirm(); + clear(); + r30 = 0; + r29 = 1; + if (empty()) { + return; + } + + JGadget_outMessage out(JGadget_outMessage::warning, __FILE__, 229); + r30 = 1; + r28 = &out; + *r28 << "empty()"; + r27 = 0; + if (!r27) { + r29 = 0; + } + } + + iterator push_front(const T& element) { return insert(begin(), element); } + iterator push_back(const T& element) { return insert(end(), element); } + iterator insert(iterator it, const T& element) { + TNode_* p = it.p_; + JUT_ASSERT(286, p!=NULL); + TNode_* prev = p->pPrev_; + TNode_* node = CreateNode_(p, prev, element); + if (!node) { + return end(); + } + p->pPrev_ = node; + prev->pNext_ = node; + field_0x4++; + return iterator(node); + } + + iterator erase(iterator start, iterator end) { + while (start != end) { + start = erase(start); + } + return start; + } + + iterator erase(iterator it) { + JUT_ASSERT(314, !empty()); + TNode_* p = it.p_; + JUT_ASSERT(316, p!=NULL); + TNode_* next = p->pNext_; + p->pPrev_->pNext_ = next; + next->pPrev_ = p->pPrev_; + DestroyNode_(p); + field_0x4--; + return iterator(next); + } + + void clear() { erase(begin(), end()); } + BOOL empty() const { return size() == 0; } + int size() const { return field_0x4; } + iterator begin() { return iterator(oEnd_.pNext_); } + iterator end() { return iterator(&oEnd_); } + const_iterator begin() const { return const_iterator(oEnd_.pNext_); } + const_iterator end() const { return const_iterator((TNode_*)&oEnd_); } + TIterator_reverse rbegin() { return TIterator_reverse(begin()); } + TIterator_reverse rend() { return TIterator_reverse(end()); } + + void Initialize_() { + oEnd_.pNext_ = &oEnd_; + oEnd_.pPrev_ = &oEnd_; + } + + BOOL Confirm() const { + u32 r28 = 0; + const_iterator local_24 = end(); + if (local_24.p_ != &oEnd_) { + return FALSE; + } + const_iterator local_28 = begin(); + if (local_28.p_ != oEnd_.pNext_) { + return FALSE; + } + for (; local_28 != local_24; ++local_28) { + TNode_* node = local_28.p_; + if (node->pNext_->pPrev_ != node) { + return FALSE; + } + if (node->pPrev_->pNext_ != node) { + return FALSE; + } + r28++; + } + if (local_28.p_ != &oEnd_) { + return FALSE; + } + if (r28 != size()) { + return FALSE; + } + return TRUE; + } + + TNode_* CreateNode_(TNode_ *pNext, TNode_ *pPrev, const T& pObject) { + JUT_ASSERT(483, pNext!=NULL); + JUT_ASSERT(484, pPrev!=NULL); + TNode_* node = (TNode_*)mAllocator.AllocateRaw(sizeof(TNode_) + sizeof(T)); + if (!node) { + JGADGET_WARNMSG(489, "can\'t allocate memory"); + return NULL; + } + node->pNext_ = pNext; + node->pPrev_ = pPrev; + mAllocator.construct((T*)&node[1], pObject); + return node; + } + + void DestroyNode_(TNode_* p) { + JUT_ASSERT(501, p!=NULL); + JUT_ASSERT(502, p!=&oEnd_); + JUT_ASSERT(503, p->pNext_->pPrev_!=p); + JUT_ASSERT(504, p->pPrev_->pNext_!=p); + mAllocator.destroy((T*)&p[1]); + mAllocator.DeallocateRaw((T*)p); + } + + /* 0x00 */ Allocator mAllocator; + /* 0x04 */ int field_0x4; + /* 0x08 */ TNode_ oEnd_; + }; +} + +#endif /* STD_LIST_H */ diff --git a/include/JSystem/JGadget/std-memory.h b/include/JSystem/JGadget/std-memory.h index 477da2a9ef..5b5a64b59e 100644 --- a/include/JSystem/JGadget/std-memory.h +++ b/include/JSystem/JGadget/std-memory.h @@ -22,7 +22,13 @@ struct TAllocator { delete mem; } + void construct(T* p, const T& other) { + JUT_ASSERT(67, p!=NULL); + new(p) T(other); + } + void destroy(T* p) { + (void)p; JUT_ASSERT(68, p!=NULL); } diff --git a/include/JSystem/JHostIO/JORReflexible.h b/include/JSystem/JHostIO/JORReflexible.h index 0f7a7a4db7..4789cfd202 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/include/JSystem/JHostIO/JORReflexible.h @@ -28,7 +28,10 @@ struct JORPropertyEvent : JOREvent { }; struct JORGenEvent : JOREvent {}; -struct JORNodeEvent : JOREvent {}; + +struct JORNodeEvent : JOREvent { + /* 0x00 */ u32 field_0x0; +}; struct JORMContext; struct JORServer; diff --git a/include/JSystem/JHostIO/JORServer.h b/include/JSystem/JHostIO/JORServer.h index dbbdcfddd1..a695fd5faa 100644 --- a/include/JSystem/JHostIO/JORServer.h +++ b/include/JSystem/JHostIO/JORServer.h @@ -131,7 +131,7 @@ public: /* 0x1107C */ CallbackLinkList m_eventCallbackList; }; -inline void JOR_MESSAGELOOP() { +inline u32 JOR_MESSAGELOOP() { JORServer* server = JORServer::getInstance(); JHIComPortManager::getInstance()->dispatchMessage(); if (server->getEvent()) { @@ -160,7 +160,7 @@ inline void JOR_MESSAGELOOP() { } server->doneEvent(); } - JHIEventLoop(); + return JHIEventLoop(); } inline void JOR_INIT() { @@ -174,8 +174,17 @@ inline void JOR_SETROOTNODE(const char* name, JORReflexible* node, u32 param_3, inline JORMContext* attachJORMContext(u32 msgID) { return JORServer::getInstance()->attachMCTX(msgID); } + +inline JORMContext* JORAttachMContext(u32 msgID) { + return JORServer::getInstance()->attachMCTX(msgID); +} + inline void releaseJORMContext(JORMContext* mctx) { JORServer::getInstance()->releaseMCTX(mctx); } +inline void JORReleaseMContext(JORMContext* mctx) { + JORServer::getInstance()->releaseMCTX(mctx); +} + #endif /* JORSERVER_H */ diff --git a/include/JSystem/JSupport/JSUList.h b/include/JSystem/JSupport/JSUList.h index 8e0f044d3a..a2bb967cc3 100644 --- a/include/JSystem/JSupport/JSUList.h +++ b/include/JSystem/JSupport/JSUList.h @@ -190,6 +190,8 @@ public: bool appendChild(JSUTree* child) { return this->append(child); } + bool prependChild(JSUTree* child) { return this->prepend(child); } + bool removeChild(JSUTree* child) { return this->remove(child); } bool insertChild(JSUTree* before, JSUTree* child) { return this->insert(before, child); } @@ -226,11 +228,11 @@ public: return *this; } - T* getObject() { return this->mTree->getObject(); } + T* getObject() const { return this->mTree->getObject(); } bool operator==(JSUTree* other) { return this->mTree == other; } - bool operator!=(JSUTree* other) { return this->mTree != other; } + bool operator!=(const JSUTree* other) const { return this->mTree != other; } JSUTreeIterator operator++(int) { JSUTreeIterator prev = *this; @@ -245,7 +247,7 @@ public: T* operator*() { return this->getObject(); } - T* operator->() { return this->getObject(); } + T* operator->() const { return this->getObject(); } private: JSUTree* mTree; diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h index 0df3f24640..5d9fb62c96 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/include/JSystem/JUtility/JUTGamePad.h @@ -81,6 +81,8 @@ public: u32 getButton() const { return mButton.mButton; } u32 getTrigger() const { return mButton.mTrigger; } + u32 getRelease() const { return mButton.mRelease; } + u32 getRepeat() const { return mButton.mRepeat; } f32 getMainStickX() const { return mMainStick.mPosX; } f32 getMainStickY() const { return mMainStick.mPosY; } f32 getMainStickValue() const { return mMainStick.mValue; } @@ -100,6 +102,7 @@ public: JUTGamePadRecordBase* getPadReplay() const { return mPadReplay; } JUTGamePadRecordBase* getPadRecord() const { return mPadRecord; } + bool testButton(u32 button) const { return mButton.mButton & button; } bool testTrigger(u32 button) const { return mButton.mTrigger & button; } bool isPushing3ButtonReset() const { diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 3b2fd3c4c6..819c77c05e 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -80,5 +80,6 @@ public: }; extern u8 const JUTResFONT_Ascfont_fix12[16736]; +extern u8 const JUTResFONT_Ascfont_fix16[16736]; #endif /* JUTRESFONT_H */ diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index 6c28534685..2fc24af2c2 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -70,7 +70,6 @@ public: const ResTIMG* getTexInfo() const { return mTexInfo; } s32 getFormat() const { return mTexInfo->format; } - s32 getTransparency() { return mTexInfo->alphaEnabled; } s32 getTransparency() const { return mTexInfo->alphaEnabled; } s32 getWidth() const { return mTexInfo->width; } s32 getHeight() const { return mTexInfo->height; } diff --git a/include/Z2AudioLib/Z2AudioCS.h b/include/Z2AudioLib/Z2AudioCS.h index 2f9f79fe05..226e77867b 100644 --- a/include/Z2AudioLib/Z2AudioCS.h +++ b/include/Z2AudioLib/Z2AudioCS.h @@ -1,7 +1,7 @@ #ifndef Z2AUDIOCS_H #define Z2AUDIOCS_H -#include +#include "dolphin/types.h" class JKRHeap; class JKRArchive; @@ -9,8 +9,8 @@ class JKRArchive; class Z2AudioCS { public: static void newSpkSoundMemPool(); - int init(JKRHeap*, JKRArchive*, s32, s32); - void update(); + static int init(JKRHeap*, JKRArchive*, s32, s32); + static void update(); static void connect(s32); static void disconnect(s32); static void extensionProcess(s32, s32); diff --git a/include/Z2AudioLib/Z2DebugSys.h b/include/Z2AudioLib/Z2DebugSys.h index 9172d241ee..a98292e8c1 100644 --- a/include/Z2AudioLib/Z2DebugSys.h +++ b/include/Z2AudioLib/Z2DebugSys.h @@ -1,12 +1,45 @@ #ifndef Z2DEBUGSYS_H #define Z2DEBUGSYS_H -#include "JSystem/JAudio2/JASGadget.h" #include "JSystem/JAudio2/JAISeqDataMgr.h" +#include "JSystem/JAudio2/JASGadget.h" +#include "JSystem/JAudio2/JAUSeqCollection.h" +#include "JSystem/JAHostIO/JAHFrameNode.h" +#include "JSystem/JAHostIO/JAHioMessage.h" +#include "JSystem/JAWWinLib/JAWHioReceiver.h" + +class Z2ParamNode : public JAHFrameNode { +public: + Z2ParamNode() : JAHFrameNode("サウンド各種パラメータ") {} + + /* vt[07] */ virtual ~Z2ParamNode() {} + /* vt[08] */ virtual void message(JAHControl& control); + /* vt[0F] */ virtual void propertyEvent(JAH_P_Event, u32); + /* vt[12] */ virtual void onFrame(); +}; + +class Z2HioSeSeqDataMgr : public JAUSeqDataMgr_SeqCollection { +public: + Z2HioSeSeqDataMgr(const void * param_1, const JAWHioReceiver* param_2) { + field_0x18 = param_2; + init(param_1); + }; + virtual ~Z2HioSeSeqDataMgr() {} + virtual SeqDataReturnValue getSeqData(JAISoundID param_1, JAISeqData* param_2) { + if (field_0x18->getSeqList()->getSeqData(param_1, param_2)) { + param_2->field_0x4 = 4; + return SeqDataReturnValue_2; + } else { + return JAUSeqDataMgr_SeqCollection::getSeqData(param_1, param_2); + } + } + + /* 0x18 */ const JAWHioReceiver * field_0x18; +}; struct Z2DebugSys : public JASGlobalInstance { Z2DebugSys(); - ~Z2DebugSys(); + ~Z2DebugSys() {} void initJAW(); void initSoundHioNode(); diff --git a/include/Z2AudioLib/Z2F1TestWindow.h b/include/Z2AudioLib/Z2F1TestWindow.h new file mode 100644 index 0000000000..162e5e4b82 --- /dev/null +++ b/include/Z2AudioLib/Z2F1TestWindow.h @@ -0,0 +1,47 @@ +#ifndef Z2F1TESTWINDOW_H +#define Z2F1TESTWINDOW_H + +#include "JSystem/JAHostIO/JAHUTableEdit.h" +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class Z2F1TestWindow : public JAWWindow { +public: + Z2F1TestWindow(); + + /* 0x3F0 */ f32 field_0x3f0; + /* 0x3F4 */ f32 field_0x3f4; + /* 0x3F8 */ f32 field_0x3f8[500]; + /* 0xBC8 */ int field_0xbc8; + /* 0xBCC */ int field_0xbcc; + /* 0xBD0 */ u8 field_0xbd0; + /* 0xBD4 */ f32 field_0xbd4; +}; + +class Z2F1SwingTestNode : public JAHFrameNode, public Z2F1TestWindow { +public: + Z2F1SwingTestNode(); + + /* 0xC48 */ JAHUSeBox field_0xc48; + /* 0xCD0 */ JAHUSeBox field_0xcd0; + /* 0xD58 */ u8 field_0xd58; + /* 0xD59 */ u8 field_0xd59; + /* 0xD5A */ u8 field_0xd5a; + /* 0xD5B */ u8 field_0xd5b; + /* 0xD5C */ f32 field_0xd5c; + /* 0xD60 */ f32 field_0xd60; + /* 0xD64 */ f32 field_0xd64; + /* 0xD68 */ f32 field_0xd68; + /* 0xD6C */ u8 field_0xd6c[0xD70 - 0xD6C]; +}; + +class Z2AudSettingView : public JAWWindow { +public: + Z2AudSettingView(); +}; + +class Z2DSPCheck : public JAWWindow { +public: + Z2DSPCheck() : JAWWindow("Z2DSPCheck", 500, 450) {} +}; + +#endif /* Z2F1TESTWINDOW_H */ diff --git a/include/Z2AudioLib/Z2FxLineMgr.h b/include/Z2AudioLib/Z2FxLineMgr.h index 162b7244a6..0614f531da 100644 --- a/include/Z2AudioLib/Z2FxLineMgr.h +++ b/include/Z2AudioLib/Z2FxLineMgr.h @@ -2,11 +2,16 @@ #define Z2FXLINEMGR_H #include "JSystem/JAudio2/JASGadget.h" +#include "JSystem/JAHostIO/JAHFrameNode.h" class JKRArchive; +class JKRExpHeap; class JKRHeap; -struct Z2FxLineEditNode {}; +class Z2FxLineEditNode : public JAHFrameNode { +public: + Z2FxLineEditNode(JKRExpHeap*); +}; struct Z2FxLineConfig { /* 0x00 */ u8 field_0x0; diff --git a/include/Z2AudioLib/Z2SeView.h b/include/Z2AudioLib/Z2SeView.h new file mode 100644 index 0000000000..c6d0ea46e3 --- /dev/null +++ b/include/Z2AudioLib/Z2SeView.h @@ -0,0 +1,17 @@ +#ifndef Z2SEVIEW_H +#define Z2SEVIEW_H + +#include "JSystem/JAWWinLib/JAWEntrySeView.h" +#include "JSystem/JAWWinLib/JAWPlaySeView.h" + +class Z2EntrySeView : public JAWEntrySeViewBasic { +public: + Z2EntrySeView() {} +}; + +class Z2PlaySeView : public JAWPlaySeViewBasic { +public: + Z2PlaySeView() {} +}; + +#endif /* Z2SEVIEW_H */ diff --git a/include/Z2AudioLib/Z2SoundPlayer.h b/include/Z2AudioLib/Z2SoundPlayer.h new file mode 100644 index 0000000000..6937ba63af --- /dev/null +++ b/include/Z2AudioLib/Z2SoundPlayer.h @@ -0,0 +1,74 @@ +#ifndef Z2SOUNDPLAYER_H +#define Z2SOUNDPLAYER_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" +#include "JSystem/JAudio2/JAISoundHandles.h" + +class Z2SoundPlayer : public JAWWindow { +public: + Z2SoundPlayer(const char*); + virtual ~Z2SoundPlayer() {} + virtual void onDraw(JAWGraphContext*); + virtual void frameWork(); + virtual void onPadProc(const JUTGamePad&); + virtual void onTrigA(const JUTGamePad&); + virtual void onTrigB(const JUTGamePad&); + virtual void onTrigX(const JUTGamePad&); + virtual void onTrigY(const JUTGamePad&); + virtual void onTrigL(const JUTGamePad&); + virtual void onTrigZ(const JUTGamePad&); + virtual void onKeyMenu(const JUTGamePad&); + virtual void onKeyUp(const JUTGamePad&); + virtual void onKeyDown(const JUTGamePad&); + virtual void onKeyLeft(const JUTGamePad&); + virtual void onKeyRight(const JUTGamePad&); + + u32 getCursorMoveMax(const JUTGamePad&); + + /* 0x3ED */ u8 field_0x3ed; + /* 0x3EE */ u8 field_0x3ee; + /* 0x3EF */ u8 field_0x3ef; + /* 0x3F0 */ u8 field_0x3f0; + /* 0x3F4 */ const char* field_0x3f4; + /* 0x3F8 */ short field_0x3f8; + /* 0x3FA */ short field_0x3fa; + /* 0x3FC */ short field_0x3fc; + /* 0x3FE */ short field_0x3fe; + /* 0x400 */ short field_0x400; + /* 0x402 */ short field_0x402; + /* 0x404 */ const char* field_0x404; + /* 0x408 */ const char* field_0x408; + /* 0x40C */ const char* field_0x40c; + /* 0x410 */ const char* field_0x410; + /* 0x414 */ const char* field_0x414; + /* 0x418 */ const char* field_0x418; + /* 0x41C */ const char* field_0x41c; + /* 0x420 */ const char* field_0x420; + /* 0x424 */ const char* field_0x424; + /* 0x428 */ const char* field_0x428; + /* 0x42C */ const char* field_0x42c; + /* 0x430 */ const char* field_0x430; + /* 0x434 */ const char* field_0x434; + /* 0x438 */ const char* field_0x438; + /* 0x43C */ const char* field_0x43c; + /* 0x440 */ const char* field_0x440; + /* 0x444 */ short field_0x444; + /* 0x446 */ u8 field_0x446; + /* 0x448 */ short* field_0x448[7]; + /* 0x464 */ int field_0x464; + /* 0x468 */ int field_0x468; + /* 0x46C */ JAISoundHandle field_0x46c[8]; + /* 0x48C */ JAISoundHandles field_0x48c; + /* 0x494 */ JAISoundHandle field_0x494; + /* 0x498 */ JAISoundHandle* field_0x498; + /* 0x49C */ JAISoundHandle field_0x49c; + /* 0x4A0 */ int field_0x4a0; + /* 0x4A4 */ f32 field_0x4a4; + /* 0x4A8 */ f32 field_0x4a8; + /* 0x4AC */ f32 field_0x4ac; + /* 0x4B0 */ f32 field_0x4b0; + /* 0x4B4 */ f32 field_0x4b4; + /* 0x4B8 */ f32 field_0x4b8; +}; + +#endif /* Z2SOUNDPLAYER_H */ diff --git a/include/Z2AudioLib/Z2TrackView.h b/include/Z2AudioLib/Z2TrackView.h new file mode 100644 index 0000000000..4605f284b3 --- /dev/null +++ b/include/Z2AudioLib/Z2TrackView.h @@ -0,0 +1,15 @@ +#ifndef Z2TRACKVIEW_H +#define Z2TRACKVIEW_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class Z2TrackView : public JAWWindow { +public: + enum DispMode { + DISPMODE0 + }; + + Z2TrackView(u8, DispMode); +}; + +#endif /* Z2TRACKVIEW_H */ diff --git a/include/Z2AudioLib/Z2WaveArcLoader.h b/include/Z2AudioLib/Z2WaveArcLoader.h new file mode 100644 index 0000000000..81a4bc2123 --- /dev/null +++ b/include/Z2AudioLib/Z2WaveArcLoader.h @@ -0,0 +1,11 @@ +#ifndef Z2WAVEARCLOADER_H +#define Z2WAVEARCLOADER_H + +#include "JSystem/JAWExtSystem/JAWWindow.h" + +class Z2WaveArcLoader : public JAWWindow { +public: + Z2WaveArcLoader(); +}; + +#endif /* Z2WAVEARCLOADER_H */ diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 922da1b042..5cd89860fb 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -8,9 +8,20 @@ class mDoAud_zelAudio_c : public Z2AudioMgr { public: void reset(); - mDoAud_zelAudio_c() {} + mDoAud_zelAudio_c() { +#if DEBUG + setMode(2); +#endif + } ~mDoAud_zelAudio_c() {} +#if DEBUG + u8 getMode() { return field_0x13bd; } + void setMode(u8 mode) { field_0x13bd = mode; } + + /* 0x13BD */ u8 field_0x13bd; +#endif + static void onInitFlag() { mInitFlag = true; } static bool isInitFlag() { return mInitFlag; } static bool isResetFlag() { return mResetFlag; } @@ -293,6 +304,14 @@ inline void mDoAud_talkIn() { Z2AudioMgr::getInterface()->talkIn(); } +inline void mDoAud_setOutputMode(u32 mode) { + Z2AudioMgr::getInterface()->setOutputMode(mode); +} + +inline void mDoAud_loadStaticWaves() { + Z2AudioMgr::getInterface()->loadStaticWaves(); +} + inline int mDoAud_monsSeStart(u32 i_soundId, const Vec* i_pos, u32 i_actorId, u32 param_3, s8 i_reverb) { (void)i_actorId; diff --git a/src/JSystem/J2DGraph/J2DGrafContext.cpp b/src/JSystem/J2DGraph/J2DGrafContext.cpp index 4af69d8d09..05a1d89cf5 100644 --- a/src/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/src/JSystem/J2DGraph/J2DGrafContext.cpp @@ -5,6 +5,9 @@ J2DGrafContext::J2DGrafContext(f32 x, f32 y, f32 width, f32 height) : mBounds(x, y, x + width, y + height), mScissorBounds(x, y, x + width, y + height) { + if (x < 0.0f || y < 0.0f) { + OS_REPORT("J2DWarning::ViewPort-Bounds \"Avoid using negative values for left or top.\"\n"); + } JUtility::TColor color(-1); setColor(color); setLineWidth(6); @@ -81,6 +84,11 @@ void J2DGrafContext::scissor(JGeometry::TBox2 const& bounds) { } void J2DGrafContext::place(JGeometry::TBox2 const& bounds) { + if (bounds.i.x < 0.0f || bounds.i.y < 0.0f) { + if (mBounds.i.x >= 0.0f && mBounds.i.y >= 0.0f) { + OS_REPORT("J2DWarning::ViewPort-Bounds \"Avoid using negative values for left or top.\"\n"); + } + } mBounds = bounds; mScissorBounds = bounds; } diff --git a/src/JSystem/J2DGraph/J2DMaterial.cpp b/src/JSystem/J2DGraph/J2DMaterial.cpp index 059d12e7bb..4fadaf5ace 100644 --- a/src/JSystem/J2DGraph/J2DMaterial.cpp +++ b/src/JSystem/J2DGraph/J2DMaterial.cpp @@ -40,7 +40,7 @@ void J2DMaterial::setGX() { } J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) { - J2DTevBlock* block; + J2DTevBlock* block = NULL; if (noAlign) { if (block_type <= 1) { @@ -67,12 +67,15 @@ J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) { block = new (-4) J2DTevBlock16(); } } + if (!block) { + OS_PANIC(101, "Error : allocate memory."); + } return block; } J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) { - J2DIndBlock* block; + J2DIndBlock* block = NULL; if (noAlign) { if (block_type != 0) { @@ -87,6 +90,9 @@ J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) { block = new (-4) J2DIndBlockNull(); } } + if (!block) { + OS_PANIC(133, "Error : allocate memory."); + } return block; } @@ -116,8 +122,18 @@ J2DMaterial::J2DMaterialAnmPointer::J2DMaterialAnmPointer() { } void J2DMaterial::makeAnmPointer() { + int r29; + int r28; if (mAnmPointer == NULL) { mAnmPointer = new J2DMaterialAnmPointer(); + r29 = 1; + if (mAnmPointer == NULL) { + OS_PANIC(171, "Error : allocate memory."); + r28 = 0; + if (!r28) { + r29 = 0; + } + } } } @@ -157,9 +173,7 @@ void J2DMaterial::setAnimation(J2DAnmTextureSRTKey* anm) { u16 index = getIndex(); for (u16 i = 0; i < matNum; i++) { - u16 matID = anm->getUpdateMaterialID(i); - - if (index == matID) { + if (index == anm->getUpdateMaterialID(i)) { u8 mtxID = anm->getUpdateTexMtxID(i); mAnmPointer->mSRTIds[mtxID] = i; } @@ -183,9 +197,7 @@ void J2DMaterial::setAnimation(J2DAnmTexPattern* anm) { J3DAnmTexPatternFullTable* anmTbl = anm->getAnmTable(); for (u16 i = 0; i < matNum; i++) { - u16 matID = anm->getUpdateMaterialID(i); - - if (index == matID) { + if (index == anm->getUpdateMaterialID(i)) { mAnmPointer->mPatternIds[anmTbl[i].mTexNo] = i; } } diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp index 703046a687..18281a0092 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/src/JSystem/J2DGraph/J2DTevs.cpp @@ -10,13 +10,14 @@ #include "dolphin/gx.h" void J2DTexMtx::load(u32 mtxIdx) { - GXLoadTexMtxImm(mTexMtx, mtxIdx * 3 + GX_TEXMTX0, mInfo.getTexMtxType()); + GXLoadTexMtxImm(mTexMtx, mtxIdx * 3 + GX_TEXMTX0, (GXTexMtxType)mInfo.mTexMtxType); } void J2DTexMtx::calc() { - if (mInfo.mTexMtxDCC == J2DTexMtxInfo::DCC_NONE) { + u32 dcc = mInfo.mTexMtxDCC; + if (dcc == J2DTexMtxInfo::DCC_NONE) { getTextureMtx(mInfo.mTexSRTInfo, mInfo.mCenter, mTexMtx); - } else if (mInfo.mTexMtxDCC == J2DTexMtxInfo::DCC_MAYA) { + } else if (dcc == J2DTexMtxInfo::DCC_MAYA) { getTextureMtxMaya(mInfo.mTexSRTInfo, mTexMtx); } } @@ -58,8 +59,8 @@ void J2DTexMtx::getTextureMtxMaya(J2DTextureSRTInfo const& param_0, Mtx param_1) } void J2DIndTevStage::load(u8 tevStage) { - GXSetTevIndirect((GXTevStageID)tevStage, getIndStage(), getIndFormat(), getBiasSel(), - getMtxSel(), getWrapS(), getWrapT(), getPrev(), getLod(), getAlphaSel()); + GXSetTevIndirect((GXTevStageID)tevStage, (GXIndTexStageID)getIndStage(), (GXIndTexFormat)getIndFormat(), (GXIndTexBiasSel)getBiasSel(), + (GXIndTexMtxID)getMtxSel(), (GXIndTexWrap)getWrapS(), (GXIndTexWrap)getWrapT(), (GXBool)getPrev(), (GXBool)getLod(), (GXIndTexAlphaSel)getAlphaSel()); } void J2DIndTexMtx::load(u8 indTexMtx) { @@ -68,11 +69,11 @@ void J2DIndTexMtx::load(u8 indTexMtx) { } void J2DIndTexCoordScale::load(u8 indTexStage) { - GXSetIndTexCoordScale((GXIndTexStageID)indTexStage, mInfo.getScaleS(), mInfo.getScaleT()); + GXSetIndTexCoordScale((GXIndTexStageID)indTexStage, (GXIndTexScale)mInfo.mScaleS, (GXIndTexScale)mInfo.mScaleT); } void J2DIndTexOrder::load(u8 indTexStage) { - GXSetIndTexOrder((GXIndTexStageID)indTexStage, mInfo.getTexCoordID(), mInfo.getTexMapID()); + GXSetIndTexOrder((GXIndTexStageID)indTexStage, (GXTexCoordID)mInfo.mTexCoordID, (GXTexMapID)mInfo.mTexMapID); } static void dummyVirtual(J2DTevBlock* block, J2DIndBlock* indBlock) { diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/src/JSystem/J2DGraph/J2DTextBox.cpp index 9a96d1e4e0..2370cbf41a 100644 --- a/src/JSystem/J2DGraph/J2DTextBox.cpp +++ b/src/JSystem/J2DGraph/J2DTextBox.cpp @@ -4,6 +4,7 @@ #include "JSystem/J2DGraph/J2DPrint.h" #include "JSystem/JSupport/JSURandomInputStream.h" #include "JSystem/JUtility/JUTResFont.h" +#include "JSystem/JUtility/JUTResource.h" J2DTextBox::J2DTextBox() : mFont(NULL), mCharColor(), mGradientColor(), mStringPtr(NULL), mWhiteColor(), mBlackColor() { @@ -77,12 +78,8 @@ J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 para if (mStringPtr != NULL) { mStringLength = strLength; - int temp_r0 = (u16)strLength - 1; - u16 var_r26_2 = info.field_0x1e; - if (temp_r0 < var_r26_2) { - var_r26_2 = (u16)temp_r0; - } + u16 var_r26_2 = strLength - 1 < info.field_0x1e ? u16(strLength - 1) : info.field_0x1e; p_stream->peek(mStringPtr, var_r26_2); mStringPtr[var_r26_2] = 0; @@ -94,20 +91,11 @@ J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 para mWhiteColor = JUtility::TColor(0xFFFFFFFF); if (mat != NULL && mat->getTevBlock() != NULL) { - if (mat->getTevBlock()->getTevStageNum() != 1) { - J2DGXColorS10* color0p = mat->getTevBlock()->getTevColor(0); - GXColorS10 color0; - color0.r = color0p->r; - color0.g = color0p->g; - color0.b = color0p->b; - color0.a = color0p->a; + u8 tevStageNum = u32(mat->getTevBlock()->getTevStageNum()); + if (tevStageNum != 1) { + J2DGXColorS10 color0(*mat->getTevBlock()->getTevColor(0)); - J2DGXColorS10* color1p = mat->getTevBlock()->getTevColor(1); - GXColorS10 color1; - color1.r = color1p->r; - color1.g = color1p->g; - color1.b = color1p->b; - color1.a = color1p->a; + J2DGXColorS10 color1(*mat->getTevBlock()->getTevColor(1)); mBlackColor = JUtility::TColor(((u8)color0.r << 0x18) | ((u8)color0.g << 0x10) | ((u8)color0.b << 8) | (u8)color0.a); @@ -194,6 +182,7 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str mKind = header.mTag; makePaneStream(p_pane, p_stream); + {JUTResReference ref;} u8 spA = p_stream->readU8(); ResFONT* fontPtr = (ResFONT*)getPointer(p_stream, 'FONT', p_archive); @@ -203,7 +192,8 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str mCharColor.set(p_stream->read32b()); mGradientColor.set(p_stream->read32b()); - mFlags = p_stream->read8b(); + u8 tmp = p_stream->read8b(); + mFlags = tmp; mCharSpacing = p_stream->readS16(); mLineSpacing = p_stream->readS16(); mFontSizeX = p_stream->read16b(); @@ -223,8 +213,8 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str spA -= 10; if (spA != 0) { - u8 sp8 = p_stream->read8b(); - if (sp8 != 0) { + tmp = p_stream->read8b(); + if (tmp != 0) { setConnectParent(true); } @@ -241,6 +231,7 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str if (spA != 0) { mWhiteColor.set(p_stream->read32b()); + spA--; } field_0x10c = 0.0f; @@ -283,7 +274,7 @@ void J2DTextBox::draw(f32 posX, f32 posY) { GXSetTevDirect((GXTevStageID)i); } GXSetNumTexGens(1); - GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125); + GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60); if (mStringPtr != NULL) { print.print(0.0f, 0.0f, mAlpha, "%s", mStringPtr); @@ -309,7 +300,7 @@ void J2DTextBox::draw(f32 posX, f32 posY, f32 param_2, J2DTextBoxHBinding hBind) GXSetTevDirect((GXTevStageID)i); } GXSetNumTexGens(1); - GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125); + GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60); if (mStringPtr != NULL) { print.printReturn(mStringPtr, param_2, 0.0f, hBind, VBIND_TOP, 0.0f, -mFontSizeY, @@ -337,8 +328,7 @@ s32 J2DTextBox::setString(char const* string, ...) { } mStringLength = 0; - char* tmp = new char[len + 1]; - mStringPtr = tmp; + mStringPtr = new char[len + 1]; if (mStringPtr) { mStringLength = len + 1; @@ -416,7 +406,7 @@ void J2DTextBox::drawSelf(f32 param_0, f32 param_1, Mtx* p_mtx) { GXSetTevDirect((GXTevStageID)i); } GXSetNumTexGens(1); - GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60, GX_FALSE, 125); + GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 60); print.locate(param_0 + mBounds.i.x, param_1 + mBounds.i.y); if (mStringPtr != NULL) { diff --git a/src/JSystem/J2DGraph/J2DTextBoxEx.cpp b/src/JSystem/J2DGraph/J2DTextBoxEx.cpp index c5bf9fcd3d..637e7e972f 100644 --- a/src/JSystem/J2DGraph/J2DTextBoxEx.cpp +++ b/src/JSystem/J2DGraph/J2DTextBoxEx.cpp @@ -70,12 +70,8 @@ J2DTextBoxEx::J2DTextBoxEx(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 if (mStringPtr != NULL) { mStringLength = strLength; - int temp_r0 = (u16)strLength - 1; - u16 var_r26_2 = info.field_0x1e; - if (temp_r0 < var_r26_2) { - var_r26_2 = (u16)temp_r0; - } + u16 var_r26_2 = strLength - 1 < info.field_0x1e ? u16(strLength - 1) : info.field_0x1e; p_stream->peek(mStringPtr, var_r26_2); mStringPtr[var_r26_2] = 0; @@ -291,7 +287,8 @@ void J2DTextBoxEx::setTevStage(bool param_0) { setStage(stage, STAGE_0); } else { setStage(stage, STAGE_1); - setStage(mMaterial->getTevBlock()->getTevStage(1), STAGE_2); + stage = mMaterial->getTevBlock()->getTevStage(1); + setStage(stage, STAGE_2); } } @@ -360,12 +357,10 @@ bool J2DTextBoxEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor para return false; } - bool bvar = false; - if (param_0 != 0 || param_1 != -1) { - bvar = true; - } + bool bvar = (param_0 != 0) || (param_1 != -1); - mMaterial->getTevBlock()->setTevStageNum(bvar ? 2 : 1); + u8 stageNum = bvar ? 2 : 1; + mMaterial->getTevBlock()->setTevStageNum(stageNum); setTevOrder(bvar); setTevStage(bvar); @@ -396,38 +391,32 @@ bool J2DTextBoxEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* pa return false; } - bool tevStageNum = mMaterial->getTevBlock()->getTevStageNum() != 1; + u32 tevStageNum = mMaterial->getTevBlock()->getTevStageNum(); + bool manyTevStages = tevStageNum == 1 ? false : true; *param_0 = JUtility::TColor(0); *param_1 = JUtility::TColor(0xffffffff); - if (tevStageNum) { - J2DGXColorS10* local_30 = mMaterial->getTevBlock()->getTevColor(0); - s16 color0r = local_30->r; - s16 color0g = local_30->g; - s16 color0b = local_30->b; - s16 color0a = local_30->a; - J2DGXColorS10* local_38 = mMaterial->getTevBlock()->getTevColor(1); - s16 color1r = local_38->r; - s16 color1g = local_38->g; - s16 color1b = local_38->b; - s16 color1a = local_38->a; + if (manyTevStages) { + J2DGXColorS10 color0(*mMaterial->getTevBlock()->getTevColor(0)); + J2DGXColorS10 color1(*mMaterial->getTevBlock()->getTevColor(1)); *param_0 = JUtility::TColor( - (((u8)color0r) << 24) | (((u8)color0g) << 16) | (((u8)color0b) << 8) | - ((u8)color0a)); + (((u8)color0.r) << 24) | (((u8)color0.g) << 16) | (((u8)color0.b) << 8) | + ((u8)color0.a)); *param_1 = JUtility::TColor( - (((u8)color1r) << 24) | (((u8)color1g) << 16) | (((u8)color1b) << 8) | - ((u8)color1a)); + (((u8)color1.r) << 24) | (((u8)color1.g) << 16) | (((u8)color1.b) << 8) | + ((u8)color1.a)); } return true; } bool J2DTextBoxEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) const { - if ((u32)param_0 == 0 && (u32)param_1 == 0xffffffff) { + if (param_0 == 0 && param_1 == 0xffffffff) { return 1; } - mMaterial->getTevBlock()->getTevStageNum(); - if (mMaterial->getTevBlock()->getMaxStage() == 1) { + u32 tevStageNum = mMaterial->getTevBlock()->getTevStageNum(); + u8 maxStage = mMaterial->getTevBlock()->getMaxStage(); + if (maxStage == 1) { return 0; - } + } return 1; } diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/src/JSystem/J2DGraph/J2DWindow.cpp index 3196f9b4f1..4ea29be479 100644 --- a/src/JSystem/J2DGraph/J2DWindow.cpp +++ b/src/JSystem/J2DGraph/J2DWindow.cpp @@ -1,6 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DWindow.h" +#include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JSupport/JSURandomInputStream.h" #include "JSystem/JUtility/JUTPalette.h" #include "JSystem/JUtility/JUTResource.h" @@ -144,6 +145,43 @@ J2DWindow::J2DWindow(J2DPane* param_0, JSURandomInputStream* param_1, J2DMateria initinfo2(); } +J2DWindow::J2DWindow(u64 param_0, const JGeometry::TBox2& param_1, const char* param_2, J2DTextureBase param_3, const ResTLUT* param_4) : + J2DPane(param_0, param_1), + field_0x100(NULL), + field_0x104(NULL), + field_0x108(NULL), + field_0x10c(NULL), + field_0x110(NULL), + mPalette(NULL) { + const ResTIMG* r30 = (const ResTIMG*)J2DScreen::getNameResource(param_2); + initiate(r30, r30, r30, r30, param_4, convertMirror(param_3), param_1); +} + +void J2DWindow::initiate(const ResTIMG* param_0, const ResTIMG* param_1, const ResTIMG* param_2, const ResTIMG* param_3, const ResTLUT* param_4, J2DWindowMirror param_5, const JGeometry::TBox2& param_6) { + if (param_0) { + field_0x100 = new JUTTexture(param_0, 0); + } + if (param_1) { + field_0x104 = new JUTTexture(param_1, 0); + } + if (param_2) { + field_0x108 = new JUTTexture(param_2, 0); + } + if (param_3) { + field_0x10c = new JUTTexture(param_3, 0); + } + if (param_4) { + mPalette = new JUTPalette(GX_TLUT0, const_cast(param_4)); + } + field_0x144 = param_5; + if (field_0x100 && field_0x104 && field_0x108 && field_0x10c) { + field_0x114.set(field_0x100->getWidth(), field_0x100->getHeight(), param_6.getWidth() - field_0x104->getWidth(), param_6.getHeight() - field_0x108->getHeight()); + } else { + field_0x114.set(0.0f, 0.0f, param_6.getWidth(), param_6.getHeight()); + } + initinfo(); +} + void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param_1, JKRArchive* param_2) { s32 local_188 = param_1->getPosition(); @@ -183,7 +221,7 @@ void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param field_0x12C.set(param_1->read32b()); field_0x130.set(param_1->read32b()); field_0x134.set(param_1->read32b()); - r27 -= 14; + r27 -= u8(14); field_0x110 = NULL; if (r27) { timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2); @@ -200,11 +238,20 @@ void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param } if (r27) { mWhite = JUtility::TColor(param_1->readU32()); + r27--; } param_1->seek(local_188 + local_180[1], JSUStreamSeekFrom_SET); initinfo2(); } +void J2DWindow::initinfo() { + mKind = 'WIN1'; + setContentsColor(JUtility::TColor(0xffffffff)); + mBlack = JUtility::TColor(0); + mWhite = JUtility::TColor(0xffffffff); + initinfo2(); +} + void J2DWindow::initinfo2() { if (field_0x100 && field_0x104 && field_0x108 && field_0x10c) { field_0x140 = field_0x100->getWidth() + field_0x104->getWidth(); @@ -229,6 +276,10 @@ void J2DWindow::initinfo2() { } } +J2DWindowMirror J2DWindow::convertMirror(J2DTextureBase) { + +} + J2DWindow::~J2DWindow() { delete field_0x100; delete field_0x104; @@ -488,10 +539,27 @@ void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2, void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param_2, bool param_3, bool param_4, bool param_5) { - u16 r31 = param_4 ? u16(0x8000) : u16(0); - u16 r30 = param_3 ? u16(0x8000) : u16(0); - u16 r29 = param_4 ? u16(0) : u16(0x8000); - u16 r28 = param_3 ? u16(0) : u16(0x8000); + u16 r31, r30, r29, r28; + if (param_4) { + r31 = 0x8000; + } else { + r31 = 0; + } + if (param_3) { + r30 = 0x8000; + } else { + r30 = 0; + } + if (param_4) { + r29 = 0; + } else { + r29 = 0x8000; + } + if (param_3) { + r28 = 0; + } else { + r28 = 0x8000; + } drawFrameTexture(param_0, param_1, param_2, param_0->getWidth(), param_0->getHeight(), r28, r29, r30, r31, param_5); } @@ -575,11 +643,7 @@ void J2DWindow::setTevMode(JUTTexture* param_0, JUtility::TColor param_1, } JUTTexture* J2DWindow::getFrameTexture(u8 param_0, u8 param_1) const { - JUTTexture* tmp[4] = {NULL, NULL, NULL, NULL}; - tmp[0] = field_0x100; - tmp[1] = field_0x104; - tmp[2] = field_0x108; - tmp[3] = field_0x10c; + JUTTexture* tmp[4] = {field_0x100, field_0x104, field_0x108, field_0x10c}; if (param_0 >= 4 || param_1 != 0) { return NULL; } @@ -587,12 +651,7 @@ JUTTexture* J2DWindow::getFrameTexture(u8 param_0, u8 param_1) const { } bool J2DWindow::isUsed(ResTIMG const* param_0) { - JUTTexture* tmp[5] = {NULL, NULL, NULL, NULL, NULL}; - tmp[0] = field_0x100; - tmp[1] = field_0x104; - tmp[2] = field_0x108; - tmp[3] = field_0x10c; - tmp[4] = field_0x110; + JUTTexture* tmp[5] = {field_0x100, field_0x104, field_0x108, field_0x10c, field_0x110}; for (u8 i = 0; i < 5; i++) { if (tmp[i] && tmp[i]->getTexInfo() == param_0) { return true; diff --git a/src/JSystem/JAHostIO/JAHioMessage.cpp b/src/JSystem/JAHostIO/JAHioMessage.cpp new file mode 100644 index 0000000000..93fda0dd72 --- /dev/null +++ b/src/JSystem/JAHostIO/JAHioMessage.cpp @@ -0,0 +1,49 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JAHostIO/JAHioMessage.h" +#include "JSystem/JAHostIO/JAHioNode.h" +#include "JSystem/JAHostIO/JAHioUtil.h" +#include "JSystem/JHostIO/JORMContext.h" + +u16 JAHControl::smButtonWidth[] = {20, 50, 100, 150, 300, 600}; +u16 JAHControl::smCommentWidth[] = {20, 50, 100, 200, 400, 800}; +u16 JAHControl::smComboWidth[] = { 50, 100, 150, 200, 300, 600}; +u16 JAHControl::smYTop = 5; +u16 JAHControl::smXLeft = 5; +u16 JAHControl::smIndentSize = 30; +u16 JAHControl::smLineHeight = 23; +u16 JAHControl::smContWidth = 450; +u16 JAHControl::smIntX = 2; +u16 JAHControl::smIntY = 5; +u16 JAHControl::smNameWidth = 150; + +void JAHControl::returnY(u16 param_1) { + mY += u16(smIntY + smLineHeight * param_1); + mX = smXLeft + field_0x4 * smIndentSize; +} + +void JAHControl::indent(s8 param_1) { + field_0x4 += param_1; + mX = smXLeft + field_0x4 * smIndentSize; +} + +void JAHControl::makeComment(const char* label, u32 id, u8 param_3, u32 style) { + mContext->genLabel(label, id, style, NULL, mX, mY, smCommentWidth[param_3], smLineHeight); + returnY(1); +} + +JAHControl::JAHControl(JORMContext* mctx, JAHioNode* node) { + mContext = mctx; + mNode = node; + mX = smXLeft; + mY = smYTop; + field_0x4 = 0; + char* name = node->getNodeName(); + if (name) { + makeComment(JAHioUtil::getString("■■■ %s ■■■", name), 0xCCCC0000, 5, 0); + } else { + makeComment("■■■ NO NAMED NODE ■■■", 0, 5, 0); + } + indent(1); + returnY(1); +} diff --git a/src/JSystem/JAHostIO/JAHioMgr.cpp b/src/JSystem/JAHostIO/JAHioMgr.cpp new file mode 100644 index 0000000000..5c1a324651 --- /dev/null +++ b/src/JSystem/JAHostIO/JAHioMgr.cpp @@ -0,0 +1,55 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JAHostIO/JAHioMgr.h" +#include "JSystem/JAHostIO/JAHFrameNode.h" +#include "JSystem/JHostIO/JORServer.h" + +JAHioMgr::JAHioMgr() : field_0x4(0), field_0x8(0) {} + +void JAHioMgr::init_OnGame() { + field_0x4 = 0; +} + +bool JAHioMgr::isGameMode() { + return field_0x4 == 0; +} + +void JAHioMgr::appendRootNode(JORReflexible* param_1, JAHioNode* node) { + JUT_ASSERT(44, isGameMode()); + JORMContext* mctx = JORAttachMContext(12); + mctx->genNode(param_1, 1, node->getNodeName(), node, 0, 0); + JORReleaseMContext(mctx); + appendFrameNode(node); +} + +void JAHioMgr::appendFrameNode(JAHioNode* node) { + if (node->getNodeType() == 1) { + field_0xc.append(((JAHFrameNode*)node)->getFrameNodeLink()); + } +} + +void JAHioMgr::removeFrameNode(JAHioNode* node) { + if (node->getNodeType() == 1) { + field_0xc.remove(((JAHFrameNode*)node)->getFrameNodeLink()); + } + JSUTreeIterator it; + for (it = node->getTree()->getFirstChild(); it != node->getTree()->getEndChild(); ++it) { + removeFrameNode(*it); + } +} + +u32 JAHioMgr::framework() { + JSUListIterator it; + for (it = field_0xc.getFirst(); it != field_0xc.getEnd(); ++it) { + it->framework(); + } + JAHioNode* node = JAHioNode::getCurrentNode(); + if (node && node->getNodeType() == 1) { + ((JAHFrameNode*)node)->currentFramework(); + } + u32 r30 = 0; + if (field_0x4 == 1) { + r30 = JOR_MESSAGELOOP(); + } + return r30; +} diff --git a/src/JSystem/JAHostIO/JAHioNode.cpp b/src/JSystem/JAHostIO/JAHioNode.cpp new file mode 100644 index 0000000000..abca30fb39 --- /dev/null +++ b/src/JSystem/JAHostIO/JAHioNode.cpp @@ -0,0 +1,115 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JAHostIO/JAHioNode.h" +#include "JSystem/JAHostIO/JAHioMessage.h" +#include "JSystem/JAHostIO/JAHioMgr.h" +#include "JSystem/JHostIO/JORServer.h" + +JAHioNode::JAHioNode(const char* name) : mTree(this) { + mLastChild = NULL; + if (name) { + setNodeName(name); + } else { + setNodeName("no named"); + } +} + +JAHioNode::~JAHioNode() { + if (getParent()) { + getParent()->removeNode(this); + } +} + +void JAHioNode::updateNode() { + JORMContext* mctx = JORReflexible::getJORServer()->attachMCTX(5); + mctx->invalidNode(this, 3); + JORReflexible::getJORServer()->releaseMCTX(mctx); +} + +void JAHioNode::setNodeName(const char* name) { + int size = strlen(name) + 1; + JUT_ASSERT(51, size < 32); + strcpy(mName, name); +} + +void JAHioNode::genMessage(JORMContext* mctx) { + JAHControl control(mctx, this); + message(control); + if (JAHSingletonBase::getIns()->getNodeSysType() == 0) { + generateTempChildren(mctx); + } else { + generateRealChildren(mctx); + } +} + +void JAHioNode::appendNode(JAHioNode* node, const char* name) { + mTree.appendChild(&node->mTree); + JAHSingletonBase::getIns()->appendFrameNode(node); + if (name) { + node->setNodeName(name); + } + updateNode(); +} + +void JAHioNode::prependNode(JAHioNode* node, const char* name) { + mTree.prependChild(&node->mTree); + JAHSingletonBase::getIns()->appendFrameNode(node); + if (name) { + node->setNodeName(name); + } + updateNode(); +} + +void JAHioNode::removeNode(JAHioNode* node) { + if (smCurrentNode == this) { + smCurrentNode = NULL; + } + mTree.removeChild(&node->mTree); + JAHSingletonBase::getIns()->removeFrameNode(node); + updateNode(); +} + +void JAHioNode::generateRealChildren(JORMContext* mctx) { + for (JSUTreeIterator it(mTree.getFirstChild()); it != mTree.getEndChild(); ++it) { + JAHioNode* node = it.getObject(); + mctx->startNode(node->mName, node, 4, node->getNodeIcon()); + node->genMessage(mctx); + mctx->endNode(); + } +} + +void JAHioNode::generateTempChildren(JORMContext* mctx) { + for (JSUTreeIterator it(mTree.getFirstChild()); it != mTree.getEndChild(); ++it) { + JAHioNode* node = it.getObject(); + mctx->genNode(node->mName, node, 4, node->getNodeIcon()); + } +} + +u32 JAHioNode::getNodeKind() const { return 0; } + +JAHioNode* JAHioNode::getParent() { + if (mTree.getParent()) { + return mTree.getParent()->getObject(); + } + return NULL; +} + +void JAHioNode::listenPropertyEvent(const JORPropertyEvent* event) { + propertyEvent(JAH_P_EVENT0, (u32)event->id); + JORReflexible::listenPropertyEvent(event); + propertyEvent(JAH_P_EVENT1, (u32)event->id); +} + +void JAHioNode::listenNodeEvent(const JORNodeEvent* event) { + if (event->field_0x0 == 3) { + smCurrentNode = this; + if (getParent()) { + getParent()->setLastChild(this); + } + nodeEvent(JAH_N_EVENT0); + } else if (event->field_0x0 == 4) { + nodeEvent(JAH_N_EVENT1); + } else if (event->field_0x0 == 5) { + nodeEvent(JAH_N_EVENT2); + } +} diff --git a/src/JSystem/JAHostIO/JAHioUtil.cpp b/src/JSystem/JAHostIO/JAHioUtil.cpp new file mode 100644 index 0000000000..6c938ec2b7 --- /dev/null +++ b/src/JSystem/JAHostIO/JAHioUtil.cpp @@ -0,0 +1,14 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JAHostIO/JAHioUtil.h" +#include "stdio.h" + +char JAHioUtil::mStringBuffer[256]; + +char* JAHioUtil::getString(const char* msg, ...) { + va_list args; + va_start(msg, args); + vsprintf(mStringBuffer, msg, args); + va_end(args); + return mStringBuffer; +} diff --git a/src/JSystem/JAWExtSystem/JAWExtSystem.cpp b/src/JSystem/JAWExtSystem/JAWExtSystem.cpp new file mode 100644 index 0000000000..4e63330b3d --- /dev/null +++ b/src/JSystem/JAWExtSystem/JAWExtSystem.cpp @@ -0,0 +1,166 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JAWExtSystem/JAWExtSystem.h" +#include "JSystem/J2DGraph/J2DOrthoGraph.h" +#include "JSystem/JAWExtSystem/JAWGraphContext.h" +#include "JSystem/JAWExtSystem/JAWWindow.h" +#include "JSystem/JUtility/JUTGamePad.h" +#include "algorithm.h" + +JGadget::TList JAWExtSystem::sPage[128]; +JAWExtSystem::TSystemInterface JAWExtSystem::sInterface; +s32 JAWExtSystem::sCurrentPage = ARRAY_SIZE(sPage) - 1; +u8 JAWExtSystem::lbl_80748E44; + +BOOL JAWExtSystem::registWindow(u32 param_1, JAWWindow* param_2, int param_3, int param_4) { + TCurrentHeap heap(sInterface); + if (param_1 >= ARRAY_SIZE(sPage)) { + return FALSE; + } + param_2->move(param_3, param_4); + sPage[param_1].push_back(param_2); + if (sCurrentPage > param_1) { + sCurrentPage = param_1; + } + return TRUE; +} + +BOOL JAWExtSystem::destroyWindow(u32 param_1, JAWWindow* param_2) { + TCurrentHeap heap(sInterface); + if (param_1 >= ARRAY_SIZE(sPage)) { + return FALSE; + } + JGadget::TList* page = &sPage[param_1]; + JGadget::TList::iterator it = std::find(page->begin(), page->end(), param_2); + if (it == page->end()) { + return FALSE; + } + page->erase(it); + return TRUE; +} + +void JAWExtSystem::nextPage() { + int page = sCurrentPage; + do { + sCurrentPage++; + if (sCurrentPage >= ARRAY_SIZE(sPage)) { + sCurrentPage = 0; + } + if (page == sCurrentPage) { + break; + } + } while (sPage[sCurrentPage].empty()); +} + +void JAWExtSystem::prevPage() { + int page = sCurrentPage; + do { + sCurrentPage--; + if (sCurrentPage < 0) { + sCurrentPage = ARRAY_SIZE(sPage) - 1; + } + if (page == sCurrentPage) { + break; + } + } while (sPage[sCurrentPage].empty()); +} + +void JAWExtSystem::nextWindow() { + JGadget::TList* page = &sPage[sCurrentPage]; + JGadget::TList::iterator begin = page->begin(); + if (begin == page->end()) { + return; + } + JAWWindow* window = *begin; + page->erase(begin); + page->push_back(window); +} + +void JAWExtSystem::prevWindow() { + JGadget::TList* page = &sPage[sCurrentPage]; + JGadget::TList::iterator end = page->end(); + end--; + if (end == page->end()) { + return; + } + JAWWindow* window = *end; + page->erase(end); + page->push_front(window); +} + +void JAWExtSystem::draw() { + TCurrentHeap heap(sInterface); + if (!JAWGraphContext::lbl_8074CD30) { + return; + } + J2DOrthoGraph ortho(0.0f, 0.0f, 640.0f, 480.0f, -1.0f, 1.0f); + ortho.setOrtho(0.0f, -20.0f, 640.0f, 520.0f, -1.0, 1.0f); + ortho.setPort(); + JGadget::TList* page = &sPage[sCurrentPage]; + JGadget::TIterator_reverse::iterator> it; + for (it = page->rbegin(); it != page->rend(); it++) { + JAWWindow** window = &*it; + (*window)->initIf(); + (*window)->setAlpha(lbl_80748E44); + (*window)->draw(0, 0, &ortho); + } + for (int i = 0; i < ARRAY_SIZE(sPage); i++) { + JGadget::TList* page = &sPage[i]; + JGadget::TIterator_reverse::iterator> it; + for (it = page->rbegin(); it != page->rend(); it++) { + JAWWindow** window = &*it; + (*window)->frameWork(); + } + } + GXSetScissor(0, 0, 640, 480); +} + +void JAWExtSystem::padProc(const JUTGamePad& pad) { + TCurrentHeap heap(sInterface); + if (pad.getAnalogR() && pad.testTrigger(PAD_BUTTON_MENU)) { + JAWGraphContext::lbl_8074CD30 ^= true; + } + if (!JAWGraphContext::lbl_8074CD30) { + return; + } + JGadget::TList* page = &sPage[sCurrentPage]; + JGadget::TList::iterator begin = page->begin(); + if (begin == page->end()) { + return; + } + JAWWindow* window = *begin; + if (pad.getAnalogR()) { + f32 f31 = pad.getAnalogL() * 0.1f + 8.0f; + int r25 = f31 * pad.getMainStickX(); + int r28 = -int(f31 * pad.getMainStickY()); + if (pad.testButton(PAD_BUTTON_X)) { + window->addSize(r25, r28); + } else if (pad.testButton(PAD_BUTTON_B)) { + int r29 = lbl_80748E44; + r29 += (r28 > 0 ? -2 : r28 < 0 ? 2 : 0) * (pad.getAnalogL() ? 2 : 1); + if (r29 < 0) { + r29 = 0; + } + if (r29 >= 256) { + r29 = 255; + } + lbl_80748E44 = r29; + } else { + window->addPosition(r25, r28); + } + if (pad.testTrigger(PAD_BUTTON_RIGHT)) { + nextPage(); + } + if (pad.testTrigger(PAD_BUTTON_LEFT)) { + prevPage(); + } + if (pad.testTrigger(PAD_BUTTON_UP)) { + prevWindow(); + } + if (pad.testTrigger(PAD_BUTTON_DOWN)) { + nextWindow(); + } + } else { + window->padProc(pad); + } +} diff --git a/src/JSystem/JAWExtSystem/JAWGraphContext.cpp b/src/JSystem/JAWExtSystem/JAWGraphContext.cpp new file mode 100644 index 0000000000..66d5605362 --- /dev/null +++ b/src/JSystem/JAWExtSystem/JAWGraphContext.cpp @@ -0,0 +1,190 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JAWExtSystem/JAWGraphContext.h" +#include "JSystem/J2DGraph/J2DPrint.h" +#include "JSystem/JUtility/JUTResFont.h" + +JUTResFont* JAWGraphContext::sFont; + bool JAWGraphContext::lbl_8074CD30; + +JAWGraphContext::JAWGraphContext() : + field_0x0(NULL), + field_0x4(255, 255, 255, 255), + field_0x8(255, 255, 255, 255), + field_0xc(255, 255, 255, 255), + field_0x10(255, 255, 255, 255) { + mParentAlpha = 255; + field_0x15 = 6; + field_0x16 = 6; + field_0x18 = 0; + if (!sFont) { + sFont = new JUTResFont((ResFONT*)JUTResFONT_Ascfont_fix12, NULL); + } + field_0x0 = new J2DPrint(sFont, JUtility::TColor(255, 255, 255, 255), JUtility::TColor(255, 255, 255, 255)); + field_0x0->initiate(); + locate(0, 0); +} + +JAWGraphContext::~JAWGraphContext() {} + +void JAWGraphContext::reset() { + locate(0, 0); + color(255, 255, 255, 255); + setGXforPrint(); +} + +void JAWGraphContext::color(u8 r, u8 g, u8 b, u8 a) { + color(JUtility::TColor(r, g, b, a)); +} + +void JAWGraphContext::color(const JUtility::TColor& c) { + color(c, c, c, c); +} + +void JAWGraphContext::locate(int param_1, int param_2) { + field_0x0->locate(param_1 * field_0x0->getFont()->getWidth(), (param_2 + 1) * field_0x0->getFont()->getHeight()); +} + +void JAWGraphContext::print(char const* msg, ...) { + va_list args; + if (field_0x0->getCursorV() > 640.0f) { + return; + } + if (field_0x18) { + setGXforPrint(); + } + va_start(args, msg); + u8 alpha = field_0x4.a * mParentAlpha / 255; + field_0x0->print_va(alpha, msg, args); + va_end(args); +} + +void JAWGraphContext::print(int param_1, int param_2, const char* msg, ...) { + va_list args; + locate(param_1, param_2); + if (field_0x0->getCursorV() > 640.0f) { + return; + } + if (field_0x18) { + setGXforPrint(); + } + va_start(args, msg); + u8 alpha = field_0x4.a * mParentAlpha / 255; + field_0x0->print_va(alpha, msg, args); + va_end(args); +} + +void JAWGraphContext::color(const JUtility::TColor& param_1, const JUtility::TColor& param_2, const JUtility::TColor& param_3, const JUtility::TColor& param_4) { + field_0x4 = param_1; + field_0x8 = param_2; + field_0xc = param_3; + field_0x10 = param_4; + field_0x0->setCharColor(param_1); + field_0x0->setGradColor(param_2); +} + +void JAWGraphContext::fillBox(const JGeometry::TBox2& box) { + if (field_0x18 != 1) { + setGXforDraw(); + } + JUtility::TColor color0(field_0x4); + JUtility::TColor color1(field_0x8); + JUtility::TColor color2(field_0xc); + JUtility::TColor color3(field_0x10); + if (mParentAlpha != 255) { + color0.a = field_0x4.a * mParentAlpha / 255; + color1.a = field_0x8.a * mParentAlpha / 255; + color2.a = field_0xc.a * mParentAlpha / 255; + color3.a = field_0x10.a * mParentAlpha / 255; + } + GXBegin(GX_QUADS, GX_VTXFMT0, 4); + GXPosition3s16(box.i.x, box.i.y, 0); + GXColor1u32(color0); + GXPosition3s16(box.f.x, box.i.y, 0); + GXColor1u32(color2); + GXPosition3s16(box.f.x, box.f.y, 0); + GXColor1u32(color3); + GXPosition3s16(box.i.x, box.f.y, 0); + GXColor1u32(color1); + GXEnd(); +} + +void JAWGraphContext::drawFrame(const JGeometry::TBox2& box) { + if (field_0x18 != 1) { + setGXforDraw(); + } + JUtility::TColor color0(field_0x4); + JUtility::TColor color1(field_0x8); + JUtility::TColor color2(field_0xc); + JUtility::TColor color3(field_0x10); + if (mParentAlpha != 255) { + color0.a = field_0x4.a * mParentAlpha / 255; + color1.a = field_0x8.a * mParentAlpha / 255; + color2.a = field_0xc.a * mParentAlpha / 255; + color3.a = field_0x10.a * mParentAlpha / 255; + } + GXBegin(GX_LINESTRIP, GX_VTXFMT0, 5); + GXPosition3s16(box.i.x, box.i.y, 0); + GXColor1u32(color0); + GXPosition3s16(box.f.x, box.i.y, 0); + GXColor1u32(color2); + GXPosition3s16(box.f.x, box.f.y, 0); + GXColor1u32(color3); + GXPosition3s16(box.i.x, box.f.y, 0); + GXColor1u32(color1); + GXPosition3s16(box.i.x, box.i.y, 0); + GXColor1u32(color0); + GXEnd(); +} + +void JAWGraphContext::line(const JGeometry::TVec2& p1, const JGeometry::TVec2& p2) { + if (field_0x18 != 1) { + setGXforDraw(); + } + JUtility::TColor color0(field_0x4); + JUtility::TColor color1(field_0x8); + if (mParentAlpha != 255) { + color0.a = field_0x4.a * mParentAlpha / 255; + color1.a = field_0x8.a * mParentAlpha / 255; + } + GXBegin(GX_LINES, GX_VTXFMT0, 2); + GXPosition3s16(p1.x, p1.y, 0); + GXColor1u32(color0); + GXPosition3s16(p2.x, p2.y, 0); + GXColor1u32(color1); + GXEnd(); +} + +void JAWGraphContext::setGXforPrint() { + GXSetNumChans(1); + GXSetNumTevStages(1); + GXSetNumTexGens(1); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR0A0); + GXSetTevOp(GX_TEVSTAGE0, GX_MODULATE); + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_SET); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_RGBX8, 15); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); + field_0x18 = 0; +} + +void JAWGraphContext::setGXforDraw() { + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); + GXSetNumChans(1); + GXSetNumTexGens(0); + GXSetNumTevStages(1); + GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR); + GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0); + GXSetChanCtrl(GX_COLOR0A0, GX_DISABLE, GX_SRC_REG, GX_SRC_VTX, 0, GX_DF_NONE, GX_AF_NONE); + GXSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_AND, GX_ALWAYS, 0); + GXSetPointSize(field_0x15, GX_TO_ZERO); + GXSetLineWidth(field_0x16, GX_TO_ZERO); + GXSetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_SET); + field_0x18 = 1; +} diff --git a/src/JSystem/JAWExtSystem/JAWSystem.cpp b/src/JSystem/JAWExtSystem/JAWSystem.cpp new file mode 100644 index 0000000000..37e8e74c51 --- /dev/null +++ b/src/JSystem/JAWExtSystem/JAWSystem.cpp @@ -0,0 +1,17 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JAWExtSystem/JAWSystem.h" + +JAWSystemInterface* JAWSystemInterface::sInstance; + +JAWSystemInterface::JAWSystemInterface() { + mHeap = NULL; + sInstance = this; +} + +JKRHeap* JAWSystemInterface::getCurrentHeap() const { + if (mHeap) { + return mHeap; + } + return JKRGetCurrentHeap(); +} diff --git a/src/JSystem/JAWExtSystem/JAWWindow.cpp b/src/JSystem/JAWExtSystem/JAWWindow.cpp new file mode 100644 index 0000000000..0a8b8f1afd --- /dev/null +++ b/src/JSystem/JAWExtSystem/JAWWindow.cpp @@ -0,0 +1,213 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JAWExtSystem/JAWWindow.h" +#include "JSystem/JUtility/JUTGamePad.h" +#include "JSystem/JUtility/JUTResFont.h" +#include "JSystem/JGeometry.h" + +JAWWindow::JAWWindow(const char* param_1, int param_2, int param_3) : + field_0x38('WIN1', JGeometry::TBox2(0.0f, 0.0f, param_2, param_3), "frame_lu.bti"), + field_0x180('TITL', JGeometry::TBox2(10.0f, 10.0f, 640.0f, 170.0f), (const ResFONT*)JUTResFONT_Ascfont_fix16, param_1, -1, HBIND_LEFT, VBIND_TOP), + field_0x2b0(this), + field_0x3d8(JUtility::TColor(0, 0, 0, 255)), + field_0x3dc(JUtility::TColor(0, 0, 0, 255)), + field_0x3e0(JUtility::TColor(0, 0, 0, 255)), + field_0x3e4(JUtility::TColor(0, 0, 0, 255)) { + field_0x3e8 = 0; + field_0x3ec = 0; + field_0x38.setContentsColor(field_0x3d8, field_0x3e0, field_0x3dc, field_0x3e4); + field_0x180.setCharColor(JUtility::TColor(0, 255, 0, 255)); + field_0x180.setGradColor(JUtility::TColor(255, 255, 255, 255)); + field_0x38.appendChild(&field_0x180); + field_0x38.appendChild(&field_0x2b0); +} + +JAWWindow::TJ2DWindowDraw::TJ2DWindowDraw(u32 param_1, const JGeometry::TBox2& param_2, const char* param_3) : J2DWindow(param_1, param_2, param_3, TEXTUREBASE_0, NULL) {} + +JAWWindow::~JAWWindow() {} + +BOOL JAWWindow::initIf() { + if (field_0x3ec) { + return TRUE; + } else { + field_0x3ec = TRUE; + return onInit(); + } +} + +BOOL JAWWindow::onInit() { return TRUE; } + +void JAWWindow::setTitleColor(const JUtility::TColor& param_1, const JUtility::TColor& param_2) { + field_0x180.setCharColor(param_1); + field_0x180.setGradColor(param_2); +} + +void JAWWindow::setWindowColor(const JUtility::TColor& param_1, const JUtility::TColor& param_2, const JUtility::TColor& param_3, const JUtility::TColor& param_4) { + field_0x3d8 = param_1; + field_0x3dc = param_2; + field_0x3e0 = param_3; + field_0x3e4 = param_4; + field_0x38.setContentsColor(field_0x3d8, field_0x3e0, field_0x3dc, field_0x3e4); +} + +void JAWWindow::onDraw(JAWGraphContext*) {} + +void JAWWindow::move(f32 param_1, f32 param_2) { + field_0x38.move(param_1, param_2); +} + +void JAWWindow::addPosition(f32 param_1, f32 param_2) { + field_0x38.add(param_1, param_2); +} + +void JAWWindow::addSize(f32 width, f32 height) { + JGeometry::TBox2 bounds = field_0x38.getBounds(); + f32 newWidth = width + bounds.getWidth(); + f32 newHeight = height + bounds.getHeight(); + if (newWidth < 36.0f) { + newWidth = 36.0f; + } else if (newWidth > 640.0f) { + newWidth = 640.0f; + } + if (newHeight < 36.0f) { + newHeight = 36.0f; + } else if (newHeight > 480.0f) { + newHeight = 480.0f; + } + field_0x38.resize(newWidth, newHeight); +} + +JUtility::TColor JAWWindow::convJudaColor(u16 param_1) { + return JUtility::TColor((param_1 & 0xf800) >> 8, (param_1 & 0x7c0) >> 3, (param_1 & 0x3e) << 2, 255); +} + +void JAWWindow::padProc(const JUTGamePad& pad) { + u32 trigger = pad.getTrigger(); + u32 release = pad.getRelease(); + u32 button = pad.getButton(); + u32 repeat = pad.getRepeat(); + onPadProc(pad); + if (trigger & PAD_BUTTON_A) { + onTrigA(pad); + } + if (trigger & PAD_BUTTON_B) { + onTrigB(pad); + } + if (trigger & PAD_BUTTON_X) { + onTrigX(pad); + } + if (trigger & PAD_BUTTON_Y) { + onTrigY(pad); + } + if (trigger & PAD_BUTTON_MENU) { + onTrigMenu(pad); + } + if (trigger & PAD_TRIGGER_L) { + onTrigL(pad); + } + if (trigger & PAD_TRIGGER_Z) { + onTrigZ(pad); + } + if (trigger & PAD_BUTTON_UP) { + onTrigUp(pad); + } + if (trigger & PAD_BUTTON_DOWN) { + onTrigDown(pad); + } + if (trigger & PAD_BUTTON_LEFT) { + onTrigLeft(pad); + } + if (trigger & PAD_BUTTON_RIGHT) { + onTrigRight(pad); + } + if (release & PAD_BUTTON_A) { + onReleaseA(pad); + } + if (release & PAD_BUTTON_B) { + onReleaseB(pad); + } + if (release & PAD_BUTTON_X) { + onReleaseX(pad); + } + if (release & PAD_BUTTON_Y) { + onReleaseY(pad); + } + if (release & PAD_BUTTON_MENU) { + onReleaseMenu(pad); + } + if (release & PAD_TRIGGER_L) { + onReleaseL(pad); + } + if (release & PAD_TRIGGER_Z) { + onReleaseZ(pad); + } + if (release & PAD_BUTTON_UP) { + onReleaseUp(pad); + } + if (release & PAD_BUTTON_DOWN) { + onReleaseDown(pad); + } + if (release & PAD_BUTTON_LEFT) { + onReleaseLeft(pad); + } + if (release & PAD_BUTTON_RIGHT) { + onReleaseRight(pad); + } + if (repeat & PAD_BUTTON_A) { + onKeyA(pad); + } + if (repeat & PAD_BUTTON_B) { + onKeyB(pad); + } + if (repeat & PAD_BUTTON_X) { + onKeyX(pad); + } + if (repeat & PAD_BUTTON_Y) { + onKeyY(pad); + } + if (repeat & PAD_BUTTON_MENU) { + onKeyMenu(pad); + } + if (repeat & PAD_TRIGGER_L) { + onKeyL(pad); + } + if (repeat & PAD_TRIGGER_Z) { + onKeyZ(pad); + } + if (repeat & PAD_BUTTON_UP) { + onKeyUp(pad); + } + if (repeat & PAD_BUTTON_DOWN) { + onKeyDown(pad); + } + if (repeat & PAD_BUTTON_LEFT) { + onKeyLeft(pad); + } + if (repeat & PAD_BUTTON_RIGHT) { + onKeyRight(pad); + } +} + +JAWWindow::TWindowText::TWindowText(JAWWindow* window) : + J2DPane('TEXT', JGeometry::TBox2(10.0f, 30.0f, 650.0f, 510.0f)), + m_pParent(window), + field_0x11c(0, 0) { +} + +void JAWWindow::TWindowText::drawSelf(f32 param_1, f32 param_2) { + Mtx mtx; + MTXIdentity(mtx); + drawSelf(param_1, param_2, &mtx); +} + +void JAWWindow::TWindowText::drawSelf(f32, f32, Mtx* param_3) { + field_0xfc.reset(); + MTXTrans(*param_3, -field_0x11c.x, -field_0x11c.y, 0.0f); + Mtx stack_48; + MTXConcat(*param_3, mGlobalMtx, stack_48); + GXLoadPosMtxImm(stack_48, 0); + field_0xfc.setParentAlpha(mColorAlpha); + JUT_ASSERT(209, m_pParent != 0); + m_pParent->setMatrix(stack_48); + m_pParent->onDraw(&field_0xfc); +} diff --git a/src/JSystem/JAWExtSystem/JAWWindow3D.cpp b/src/JSystem/JAWExtSystem/JAWWindow3D.cpp new file mode 100644 index 0000000000..5f78c7f2a8 --- /dev/null +++ b/src/JSystem/JAWExtSystem/JAWWindow3D.cpp @@ -0,0 +1,5 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JAWExtSystem/JAWWindow3D.h" + +JGeometry::TVec2 JAWWindow3D::sPtOrigin(0, 0); diff --git a/src/JSystem/JAudio2/JASReport.cpp b/src/JSystem/JAudio2/JASReport.cpp index cc4a65c75c..f0983ae257 100644 --- a/src/JSystem/JAudio2/JASReport.cpp +++ b/src/JSystem/JAudio2/JASReport.cpp @@ -5,7 +5,9 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASReport.h" +#include "JSystem/JAudio2/JASCalc.h" #include "JSystem/JAudio2/JASMutex.h" +#include "JSystem/JKernel/JKRHeap.h" #include "stdio.h" static OSMutex sMutex; @@ -18,19 +20,58 @@ static int sLineCount; static int sTop; -void JASReport(const char * str, ...) { - if(sBuffer) { - va_list vl; - va_start(vl, str); - JASMutexLock mutexLock(&sMutex); - vsnprintf(sBuffer + (sTop * 64), 64, str, vl); - va_end(vl); - - sTop++; - if (sTop >= sLineMax) - sTop = 0; - - if (sLineCount < sLineMax) - sLineCount++; - } +void JASReportInit(JKRHeap* heap, int lineMax) { + JUT_ASSERT(33, sBuffer == NULL); + JUT_ASSERT(35, heap != NULL); + OSInitMutex(&sMutex); + sLineMax = lineMax; + sBuffer = new (heap, 0) char[sLineMax * 64]; + JUT_ASSERT(41, sBuffer); +} + +int JASReportGetLineMax() { + return sLineMax; +} + +int JASReportCopyBuffer(char *param_1,int lines) { + if (!sBuffer) { + return 0; + } + if (lines < 0) { + lines = sLineMax; + } + char* dest = param_1; + JASMutexLock lock(&sMutex); + int i; + int r30 = sTop - 1; + char* src; + for (i = 0; i < sLineCount && i < lines; i++) { + if (r30 < 0) { + r30 = sLineMax - 1; + } + src = &sBuffer[r30 * 64]; + JASCalc::bcopy(src, dest, 64); + r30--; + dest += 64; + } + return i; +} + +void JASReport(const char * str, ...) { + va_list vl; + if(!sBuffer) { + return; + } + + va_start(vl, str); + JASMutexLock mutexLock(&sMutex); + vsnprintf(sBuffer + (sTop * 64), 64, str, vl); + va_end(vl); + + sTop++; + if (sTop >= sLineMax) + sTop = 0; + + if (sLineCount < sLineMax) + sLineCount++; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h index 73ca5de699..89bc271d5a 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h @@ -42,6 +42,37 @@ template< typedef Category iterator_category; }; +template +struct reverse_iterator : public iterator::iterator_category, + typename iterator_traits::value_type, + typename iterator_traits::difference_type, + typename iterator_traits::pointer, + typename iterator_traits::reference> { + typedef typename iterator_traits::difference_type difference_type; + typedef typename iterator_traits::value_type value_type; + typedef typename iterator_traits::pointer pointer; + typedef typename iterator_traits::reference reference; + typedef typename iterator_traits::iterator_category iterator_category; + + reverse_iterator() {} + reverse_iterator(Iterator it) : current(it) {} + reverse_iterator operator++(int) { const reverse_iterator old(*this); --current; return old; } + reference operator*() { + tmp = current; + return *--tmp; + } + + Iterator base() const { return current; } + + Iterator tmp; + Iterator current; +}; + +template +bool operator!= (const reverse_iterator& lhs, const reverse_iterator& rhs) { + return (lhs.base() != rhs.base()) != false; +} + template inline void __advance(InputIterator& i, Distance n, input_iterator_tag) { for (; n > 0; --n) diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h index ea14c07a35..0e2bb9673b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h @@ -13,6 +13,7 @@ int printf(const char* format, ...); int sprintf(char* s, const char* format, ...); int snprintf(char* s, size_t n, const char* format, ...); int vsnprintf(char* s, size_t n, const char* format, va_list arg); +int vsprintf(char* s, const char* format, va_list arg); int vprintf(const char* format, va_list arg); int vswprintf(wchar_t* s, size_t n, const wchar_t* format, va_list arg); diff --git a/src/Z2AudioLib/Z2DebugSys.cpp b/src/Z2AudioLib/Z2DebugSys.cpp new file mode 100644 index 0000000000..55ee66519c --- /dev/null +++ b/src/Z2AudioLib/Z2DebugSys.cpp @@ -0,0 +1,119 @@ +#include "Z2AudioLib/Z2DebugSys.h" +#include "JSystem/JAHNodeLib/JAHSoundPlayerNode.h" +#include "JSystem/JAHostIO/JAHioMgr.h" +#include "JSystem/JAWExtSystem/JAWExtSystem.h" +#include "JSystem/JAWWinLib/JAWBankView.h" +#include "JSystem/JAWWinLib/JAWChView.h" +#include "JSystem/JAWWinLib/JAWHioBankEdit.h" +#include "JSystem/JAWWinLib/JAWHioReceiver.h" +#include "JSystem/JAWWinLib/JAWPlayerChView.h" +#include "JSystem/JAWWinLib/JAWReportView.h" +#include "JSystem/JAWWinLib/JAWSysMemView.h" +#include "JSystem/JAWWinLib/JAWVolume.h" +#include "JSystem/JAudio2/JASReport.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "Z2AudioLib/Z2F1TestWindow.h" +#include "Z2AudioLib/Z2FxLineMgr.h" +#include "Z2AudioLib/Z2SeView.h" +#include "Z2AudioLib/Z2SoundPlayer.h" +#include "Z2AudioLib/Z2TrackView.h" +#include "Z2AudioLib/Z2WaveArcLoader.h" +#include "m_Do/m_Do_hostIO.h" +#include "m_Do/m_Do_ext.h" + +Z2DebugSys::Z2DebugSys() : JASGlobalInstance(true) { } + +void Z2DebugSys::initJAW() { + JKRHeap* oldHeap = JKRHeap::getCurrentHeap(); + JKRExpHeap* heap = mDoExt_getGameHeap(); + Z2SoundPlayer* soundPlayer; + JAWSysMemView* sysMemView; + JAWBankView* bankView; + JAWChView* chView; + Z2TrackView* trackView; + JAWReportView* reportView; + JAWHioBankEdit* hioBankEdit; + Z2WaveArcLoader* waveArcLoader; + JAWVolume* volume; + Z2PlaySeView* playSeView; + Z2AudSettingView* audSettingView; + Z2DSPCheck* dspCheck; + Z2EntrySeView* entrySeView; + JAWPlayerChView* playerChView; + JKRSetCurrentHeap(heap); + u32 local_50 = heap->getFreeSize(); + soundPlayer = new (heap, 0) Z2SoundPlayer("GC-Zelda2"); + sysMemView = new (heap, 0) JAWSysMemView(); + bankView = new (heap, 0) JAWBankView(); + chView = new (heap, 0) JAWChView(); + trackView = new (heap, 0) Z2TrackView(0, Z2TrackView::DISPMODE0); + reportView = new (heap, 0) JAWReportView(); + JASReportInit(heap, 500); + hioBankEdit = new (heap, 0) JAWHioBankEdit(); + waveArcLoader = new (heap, 0) Z2WaveArcLoader(); + volume = new (heap, 0) JAWVolume(90, 480); + playSeView = new (heap, 0) Z2PlaySeView(); + audSettingView = new (heap, 0) Z2AudSettingView(); + dspCheck = new (heap, 0) Z2DSPCheck(); + JAWExtSystem::registWindow(1, soundPlayer, 10, 22); + entrySeView = new (heap, 0) Z2EntrySeView(); + JAWExtSystem::registWindow(2, entrySeView, 10, 22); + JAWExtSystem::registWindow(3, playSeView, 10, 22); + JAWExtSystem::registWindow(4, sysMemView, 10, 22); + JAWExtSystem::registWindow(5, bankView, 10, 22); + JAWExtSystem::registWindow(6, chView, 10, 22); + JAWExtSystem::registWindow(7, trackView, 10, 22); + playerChView = new (heap, 0) JAWPlayerChView(); + JAWExtSystem::registWindow(8, playerChView, 10, 22); + JAWExtSystem::registWindow(11, reportView, 330, 0); + JAWExtSystem::registWindow(12, hioBankEdit, 10, 0); + JAWExtSystem::registWindow(13, volume, 0, 0); + JAWExtSystem::registWindow(15, waveArcLoader, 10, 100); + JAWExtSystem::registWindow(16, dspCheck, 10, 100); + JAWExtSystem::registWindow(17, audSettingView, 10, 100); + JKRSetCurrentHeap(oldHeap); +} + +void Z2DebugSys::initSoundHioNode() { + JKRHeap* oldHeap = JKRHeap::getCurrentHeap(); + JKRExpHeap* heap = mDoExt_getGameHeap(); + JKRSetCurrentHeap(heap); + s32 freeSize = heap->getFreeSize(); + JAHSingletonBase::newInstance(); + JAHioNode* soundRoot = new (heap, 0) JAHioNode("サウンド"); + JUT_ASSERT(239, soundRoot); + JAHSingletonBase::getIns()->init_OnGame(); + JAHSingletonBase::getIns()->appendRootNode(&mDoHIO_root, soundRoot); + mDoHIO_createChild("サウンド", soundRoot); + JAHSoundPlayerNode* soundPlayerNode = new (heap, 0) JAHSoundPlayerNode(); + JUT_ASSERT(258, soundPlayerNode); + soundRoot->appendNode(soundPlayerNode, NULL); + Z2ParamNode* paramNode = new (heap, 0) Z2ParamNode(); + JUT_ASSERT(262, paramNode); + soundRoot->appendNode(paramNode, NULL); + Z2FxLineEditNode* fxNode = new (heap, 0) Z2FxLineEditNode(heap); + JUT_ASSERT(267, fxNode); + soundRoot->appendNode(fxNode, NULL); + Z2F1SwingTestNode* f1TestWin = new (heap, 0) Z2F1SwingTestNode(); + JUT_ASSERT(284, f1TestWin); + soundRoot->appendNode(f1TestWin, NULL); + JAWExtSystem::registWindow(10, f1TestWin, 10, 22); + JKRSetCurrentHeap(oldHeap); +} + +void Z2DebugSys::debugframework() { + JAHSingletonBase::getIns()->framework(); +} + +JAISeqDataMgr* Z2DebugSys::initSeSeqDataMgr(const void* param_1) { + Z2HioSeSeqDataMgr* seqDataMgr = NULL; + JKRHeap* oldHeap = JKRHeap::getCurrentHeap(); + JKRExpHeap* heap = mDoExt_getGameHeap(); + JKRSetCurrentHeap(heap); + s32 freeSize = heap->getFreeSize(); + JAWHioReceiver* receiver = new (heap, 0) JAWHioReceiver(); + JAWExtSystem::registWindow(0, receiver, 10, 22); + seqDataMgr = new (heap, 0) Z2HioSeSeqDataMgr(param_1, receiver); + JKRSetCurrentHeap(oldHeap); + return seqDataMgr; +} diff --git a/src/Z2AudioLib/Z2SoundPlayer.cpp b/src/Z2AudioLib/Z2SoundPlayer.cpp new file mode 100644 index 0000000000..d2d6fdecf3 --- /dev/null +++ b/src/Z2AudioLib/Z2SoundPlayer.cpp @@ -0,0 +1,112 @@ +#include "Z2AudioLib/Z2SoundPlayer.h" +#include "Z2AudioLib/Z2SeqMgr.h" + +Z2SoundPlayer::Z2SoundPlayer(const char* param_1) : JAWWindow("Player for JAudio2", 500, 140), field_0x48c(field_0x46c, 8) { + field_0x3ed = 0; + field_0x3ee = 0; + field_0x3ef = 0; + field_0x3f0 = 0; + field_0x3f4 = param_1; + field_0x3f8 = 0; + field_0x3fc = 0; + field_0x3fa = 0; + field_0x3fe = 0; + field_0x400 = 0; + field_0x402 = 0; + field_0x444 = 0; + field_0x446 = 0; + field_0x404 = "CMD_PORT"; + field_0x408 = "END_PORT"; + field_0x40c = "STA_PORT"; + field_0x410 = "WAIT_PORT"; + field_0x414 = "NUM_PORT"; + field_0x418 = "PORT_5"; + field_0x41c = "MAP_PORT"; + field_0x420 = "NOTE_PORT"; + field_0x424 = "SE_SELECT_PORT"; + field_0x428 = "BGM_STATUS_PORT"; + field_0x42c = "BGM_PORT2"; + field_0x430 = "BGM_PORT3"; + field_0x434 = "PORT12"; + field_0x438 = "PORT13"; + field_0x43c = "FILTER_PORT"; + field_0x440 = "FX_PORT"; + u8 r30 = 0; + field_0x448[r30++] = &field_0x3f8; + field_0x448[r30++] = &field_0x3fa; + field_0x448[r30++] = &field_0x3fc; + field_0x448[r30++] = &field_0x3fe; + field_0x448[r30++] = &field_0x400; + field_0x448[r30++] = &field_0x402; + field_0x448[r30] = &field_0x444; + field_0x464 = 0; + field_0x468 = 7; + field_0x4a0 = 0; + field_0x4a4 = 1.0f; + field_0x4a8 = 0.5f; + field_0x4ac = 1.0f; + field_0x4b0 = 0.0f; + field_0x4b4 = 0.0f; + field_0x4b8 = 1.0f; + field_0x498 = Z2GetSeqMgr()->getSubBgmHandle(); +} + +void Z2SoundPlayer::onDraw(JAWGraphContext*) { + +} + +void Z2SoundPlayer::onTrigA(const JUTGamePad&) { + +} + +void Z2SoundPlayer::onTrigB(const JUTGamePad&) { + +} + +void Z2SoundPlayer::frameWork() { + +} + +void Z2SoundPlayer::onPadProc(const JUTGamePad&) { + +} + +void Z2SoundPlayer::onTrigX(const JUTGamePad&) { + +} + +void Z2SoundPlayer::onTrigY(const JUTGamePad&) { + + +} +void Z2SoundPlayer::onTrigZ(const JUTGamePad&) { + + +} +void Z2SoundPlayer::onTrigL(const JUTGamePad&) { + +} + +void Z2SoundPlayer::onKeyLeft(const JUTGamePad&) { + +} + +void Z2SoundPlayer::onKeyRight(const JUTGamePad&) { + +} + +void Z2SoundPlayer::onKeyUp(const JUTGamePad&) { + +} + +void Z2SoundPlayer::onKeyDown(const JUTGamePad&) { + +} + +void Z2SoundPlayer::onKeyMenu(const JUTGamePad&) { + +} + +u32 Z2SoundPlayer::getCursorMoveMax(const JUTGamePad&) { + +} diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 1e45660cc3..4a1479d1b7 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -4,11 +4,20 @@ */ #include "m_Do/m_Do_audio.h" +#include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JKernel/JKRSolidHeap.h" +#include "JSystem/JUtility/JUTConsole.h" +#include "Z2AudioLib/Z2AudioCS.h" #include "d/d_com_inf_game.h" +#include "d/d_debug_viewer.h" #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_dvd_thread.h" +#if PLATFORM_WII || PLATFORM_SHIELD +#include +#endif + /* 80450BB8 0001+00 data_80450BB8 None */ /* 80450BB9 0001+00 data_80450BB9 None */ /* 80450BBA 0002+00 data_80450BBA None */ @@ -30,32 +39,88 @@ static mDoDvdThd_toMainRam_c* l_affCommand; static mDoDvdThd_mountXArchive_c* l_arcCommand; +static mDoDvdThd_mountArchive_c* l_CSarcCommand; + +#if DEBUG +static void dummy() { + OSReport("mDoAud_Create():Initial of Audio system \n"); +} +#endif + static void mDoAud_Create() { if (l_affCommand == NULL) { +#if DEBUG + if (!mDoRst::getLogoScnFlag()) { + return; + } +#endif l_affCommand = mDoDvdThd_toMainRam_c::create("/Audiores/Z2Sound.baa", 2, NULL); if (l_affCommand == NULL) { return; } +#if DEBUG + JUTReportConsole("mDoAud_Create loading Z2Sound.baa \n"); +#endif } if (l_arcCommand == NULL) { +#if DEBUG + if (!mDoRst::getLogoScnFlag()) { + return; + } +#endif l_arcCommand = mDoDvdThd_mountXArchive_c::create("/Audiores/Seqs/Z2SoundSeqs.arc", 0, JKRArchive::MOUNT_DVD, NULL); if (l_arcCommand == NULL) { return; } +#if DEBUG + JUTReportConsole_f("mDoAud_Create loading Z2SoundSeqs.arc\n"); +#endif } +#if PLATFORM_WII || PLATFORM_SHIELD + if (l_CSarcCommand == NULL) { +#if DEBUG + if (!mDoRst::getLogoScnFlag()) { + return; + } +#endif - if (l_affCommand->sync() && l_arcCommand->sync()) { + l_CSarcCommand = mDoDvdThd_mountArchive_c::create("/Audiores/Z2CSRes.arc", 0, JKRHeap::getRootHeap2()); + + if (l_CSarcCommand == NULL) { + return; + } +#if DEBUG + JUTReportConsole_f("mDoAud_Create loading Z2CSRes.arc\n"); +#endif + } +#endif + if ( + l_affCommand->sync() +#if PLATFORM_WII || PLATFORM_SHIELD + && l_CSarcCommand->sync() +#endif + && l_arcCommand->sync() + ) { +#if DEBUG + JUTReportConsole("mDoAud_Create sync ok.\n"); +#endif if (g_mDoAud_audioHeap != NULL) { - s32 groupID = JKRHeap::sCurrentHeap->changeGroupID(5); - g_mDoAud_zelAudio - .init(g_mDoAud_audioHeap, 0xA00000, l_affCommand->getMemAddress(), - l_arcCommand->getArchive()); - JKRHeap::sCurrentHeap->changeGroupID(groupID); - g_mDoAud_audioHeap->adjustSize(); + s32 groupID = JKRGetCurrentHeap()->changeGroupID(5); +#if PLATFORM_GCN + const int audioMemSize = 0xA00000; +#else + const int audioMemSize = 0xB00000; +#endif + g_mDoAud_zelAudio.init(g_mDoAud_audioHeap, audioMemSize, l_affCommand->getMemAddress(), l_arcCommand->getArchive()); +#if PLATFORM_WII || PLATFORM_SHIELD + Z2AudioCS::init(mDoExt_getGameHeap(), l_CSarcCommand->getArchive(), 15, 1); +#endif + JKRGetCurrentHeap()->changeGroupID(groupID); + s32 r28 = g_mDoAud_audioHeap->adjustSize(); } else { // "Cannot initialize audio due to heap allocation failure\n" OSReport_Error("ヒープ確保失敗につきオーディオ初期化できません\n"); @@ -63,16 +128,31 @@ static void mDoAud_Create() { (g_mDoAud_zelAudio) .setEventBit(dComIfGs_getPEventBit()); +#if DEBUG + JUTReportConsole("mDoAud_Create g_mDoAud_zelAudio.reset before \n"); +#endif (g_mDoAud_zelAudio).reset(); +#if DEBUG + JUTReportConsole("mDoAud_Create g_mDoAud_zelAudio.reset after\n"); +#endif - u32 soundMode = OSGetSoundMode(); - Z2AudioMgr::getInterface()->setOutputMode(soundMode); - JKRHeap::free(l_affCommand->getMemAddress(), NULL); +#if PLATFORM_GCN + mDoAud_setOutputMode(OSGetSoundMode()); +#else + mDoAud_setOutputMode(SCGetSoundMode()); +#endif + JKRFree(l_affCommand->getMemAddress()); l_affCommand->destroy(); l_arcCommand->destroy(); - +#if PLATFORM_WII || PLATFORM_SHIELD + l_CSarcCommand->destroy(); + mDoAud_loadStaticWaves(); +#endif mDoAud_zelAudio_c::onInitFlag(); mDoDvdThd::SyncWidthSound = true; +#if DEBUG + JUTReportConsole("mDoAud_Create done!\n"); +#endif } } @@ -82,7 +162,31 @@ void mDoAud_Execute() { mDoAud_Create(); } } else { +#if DEBUG + static const char* l_outputModeName[3] = {"MONO", "STEREO", "DOLBY"}; + static const u32 l_outputMode[3] = {0, 1, 2}; + if (mDoCPd_c::getHoldL(0)) { + if (mDoCPd_c::getTrigLeft(0)) { + if (g_mDoAud_zelAudio.getMode() == 0) { + g_mDoAud_zelAudio.setMode(2); + } else { + g_mDoAud_zelAudio.setMode(g_mDoAud_zelAudio.getMode() - 1); + } + } else if (mDoCPd_c::getTrigRight(0)) { + if (g_mDoAud_zelAudio.getMode() >= 2) { + g_mDoAud_zelAudio.setMode(0); + } else { + g_mDoAud_zelAudio.setMode(g_mDoAud_zelAudio.getMode() + 1); + } + } + g_mDoAud_zelAudio.setOutputMode(l_outputMode[g_mDoAud_zelAudio.getMode()]); + } + dDbVw_Report(20, 30, "%s", l_outputModeName[g_mDoAud_zelAudio.getMode()]); +#endif g_mDoAud_zelAudio.gframeProcess(); +#if DEBUG + Z2AudioCS::update(); +#endif } } From 6f137f2a6bd7e10ab014794f175310510c1ee89a Mon Sep 17 00:00:00 2001 From: Niklas Bauer Date: Mon, 22 Dec 2025 21:32:48 +0100 Subject: [PATCH 05/35] Update README after GCN matching (#2986) --- README.md | 93 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index a9cbf127c3..9ed07684a9 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,68 @@ -The Legend of Zelda: Twilight Princess -[![Build Status]][actions] [![Code Progress]][progress] [![DOL Progress]][progress] [![RELs Progress]][progress] [![Discord Badge]][discord] -============= +# The Legend of Zelda: Twilight Princess + +[![Build Status]][actions] [![Discord Badge]][discord] [![GZ2E01]][progress] [![GZ2P01]][progress] [![GZ2J01]][progress] [![ShieldD]][progress] [Build Status]: https://github.com/zeldaret/tp/actions/workflows/build.yml/badge.svg [actions]: https://github.com/zeldaret/tp/actions/workflows/build.yml -[Code Progress]: https://decomp.dev/zeldaret/tp.svg?mode=shield&category=all&measure=code&label=Code -[DOL Progress]: https://decomp.dev/zeldaret/tp.svg?mode=shield&category=dol&measure=code&label=DOL -[RELs Progress]: https://decomp.dev/zeldaret/tp.svg?mode=shield&category=modules&measure=code&label=RELs -[progress]: https://decomp.dev/zeldaret/tp [Discord Badge]: https://img.shields.io/discord/688807550715560050?color=%237289DA&logo=discord&logoColor=%23FFFFFF [discord]: https://discord.com/invite/DqwyCBYKqf -A work-in-progress decompilation of The Legend of Zelda: Twilight Princess (GCN USA). +[GZ2E01]: https://decomp.dev/zeldaret/tp/GZ2E01.svg?mode=shield&label=GZ2E01 +[GZ2P01]: https://decomp.dev/zeldaret/tp/GZ2P01.svg?mode=shield&label=GZ2P01 +[GZ2J01]: https://decomp.dev/zeldaret/tp/GZ2J01.svg?mode=shield&label=GZ2J01 + +[ShieldD]: https://decomp.dev/zeldaret/tp/ShieldD.svg?mode=shield&label=ShieldD +[progress]: https://decomp.dev/zeldaret/tp -This repository does **not** contain any game assets or assembly whatsoever. An existing copy of the game is required. +A work-in-progress decompilation of The Legend of Zelda: Twilight Princess. -More information about the project can be found here: https://zsrtp.link +The code for the GameCube releases is completely matching. However, not every Translation Unit (TU) has been linked yet. Work is continuing by aligning the Debug version and getting the Wii versions to match. All versions are built from the same codebase using conditional compilation. + +> [!IMPORTANT] +> This repository does **not** contain any game assets or assembly whatsoever. An existing copy of the game is required. +> +> This project itself **is not**, and will not, produce a port, to PC or any other platform. It is a decompilation of the original game code, which can be compiled back into a binary identical to the original. + + +[A visual][Progress] + + +The project can target the following supported versions: + +- **`GZ2E01`**: GameCube - North America +- **`GZ2P01`**: GameCube - Europe/Australia +- **`GZ2J01`**: GameCube - Japan +- `RZDE01_00`: Wii - North America (Rev 0) +- `RZDE01_02`: Wii - North America (Rev 2) +- `RZDP01`: Wii - Europe/Australia +- `RZDJ01`: Wii - Japan +- `Shield`: Nvidia Shield - China +- `ShieldD`: Nvidia Shield - China (Debug Version) + +More information about the project can be found here: -* [Progress](https://zsrtp.link/progress) -* [Dependencies](#dependencies) -* [Building](#building) -* [Diffing](#diffing) -* [Contributing](https://zsrtp.link/contribute) -* [FAQ](https://zsrtp.link/about) +- [Progress](https://zsrtp.link/progress) +- [Dependencies](#dependencies) +- [Building](#building) +- [Diffing](#diffing) +- [Contributing](#contributing) +- [FAQ](https://zsrtp.link/about) -Dependencies -============ +## Dependencies -Windows --------- +You will need the following dependencies: + +- git +- ninja +- python3 +- clang-format (optional) + +### Windows On Windows, it's **highly recommended** to use native tooling. WSL or msys2 are **not** required. When running under WSL, [objdiff](#diffing) is unable to get filesystem notifications for automatic rebuilds. @@ -39,8 +72,7 @@ When running under WSL, [objdiff](#diffing) is unable to get filesystem notifica - Download [ninja](https://github.com/ninja-build/ninja/releases) and add it to `%PATH%`. - Quick install via pip: `pip install ninja` -macOS ------- +### macOS - Install [ninja](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages): @@ -50,15 +82,13 @@ macOS [wibo](https://github.com/decompals/wibo), a minimal 32-bit Windows binary wrapper, will be automatically downloaded and used. -Linux ------- +### Linux - Install [ninja](https://github.com/ninja-build/ninja/wiki/Pre-built-Ninja-packages). [wibo](https://github.com/decompals/wibo), a minimal 32-bit Windows binary wrapper, will be automatically downloaded and used. -Building -======== +## Building - Clone the repository: @@ -76,15 +106,14 @@ Building python configure.py ``` - To use a version other than `GZ2E01` (USA), specify it with `--version`. + To use a version other than `GZ2E01` (GCN USA), specify it with `--version`. - Build: ```sh ninja ``` -Diffing -======= +## Diffing Once the initial build succeeds, an `objdiff.json` should exist in the project root. @@ -92,4 +121,8 @@ Download the latest release from [encounter/objdiff](https://github.com/encounte Select an object from the left sidebar to begin diffing. Changes to the project will rebuild automatically: changes to source files, headers, `configure.py`, `splits.txt` or `symbols.txt`. -![](assets/objdiff.png) +![objdiff application window](assets/objdiff.png) + +## Contributing + +If you've got all the requirements set up and want to learn how to contribute to the decompilation effort, join our [Discord server][discord] and check out our [contribution guide](https://zsrtp.link/contribute). From cd1e12a8f49eb47e1064048f47f09d0f6f23cf1e Mon Sep 17 00:00:00 2001 From: Max Roncace Date: Mon, 22 Dec 2025 18:41:19 -0500 Subject: [PATCH 06/35] GCN data 100% matching (#2987) * Update GZ2J01 symbols from linked DOL * GCN data 100% matching * Run dtk apply --- config/GZ2E01/config.yml | 6 + config/GZ2E01/rels/d_a_arrow/splits.txt | 2 +- config/GZ2E01/rels/d_a_arrow/symbols.txt | 6 +- config/GZ2E01/rels/d_a_b_bh/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_bh/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_bq/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_bq/symbols.txt | 3 +- config/GZ2E01/rels/d_a_b_dr/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_dr/symbols.txt | 3 +- config/GZ2E01/rels/d_a_b_dre/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_dre/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_ds/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_ds/symbols.txt | 33 +- config/GZ2E01/rels/d_a_b_gg/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_gg/symbols.txt | 3 +- config/GZ2E01/rels/d_a_b_gm/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_gm/symbols.txt | 5 +- config/GZ2E01/rels/d_a_b_gnd/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_gnd/symbols.txt | 7 +- config/GZ2E01/rels/d_a_b_go/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_go/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_gos/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_gos/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_mgn/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_mgn/symbols.txt | 5 +- config/GZ2E01/rels/d_a_b_ob/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_ob/symbols.txt | 9 +- config/GZ2E01/rels/d_a_b_oh/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_oh/symbols.txt | 2 +- config/GZ2E01/rels/d_a_b_tn/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_tn/symbols.txt | 3 +- config/GZ2E01/rels/d_a_b_yo/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_yo/symbols.txt | 3 +- config/GZ2E01/rels/d_a_b_yo_ice/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_yo_ice/symbols.txt | 5 +- config/GZ2E01/rels/d_a_b_zant/splits.txt | 2 +- config/GZ2E01/rels/d_a_b_zant/symbols.txt | 3 +- .../GZ2E01/rels/d_a_b_zant_magic/symbols.txt | 3 +- .../GZ2E01/rels/d_a_b_zant_mobile/splits.txt | 2 +- .../GZ2E01/rels/d_a_b_zant_mobile/symbols.txt | 2 +- config/GZ2E01/rels/d_a_balloon_2D/splits.txt | 2 +- config/GZ2E01/rels/d_a_bd/splits.txt | 2 +- config/GZ2E01/rels/d_a_bd/symbols.txt | 2 +- config/GZ2E01/rels/d_a_bg_obj/symbols.txt | 3 +- config/GZ2E01/rels/d_a_boomerang/symbols.txt | 11 +- config/GZ2E01/rels/d_a_bullet/splits.txt | 2 +- config/GZ2E01/rels/d_a_canoe/splits.txt | 2 +- config/GZ2E01/rels/d_a_canoe/symbols.txt | 4 +- config/GZ2E01/rels/d_a_coach_2D/splits.txt | 2 +- config/GZ2E01/rels/d_a_cow/splits.txt | 2 +- config/GZ2E01/rels/d_a_cow/symbols.txt | 3 +- config/GZ2E01/rels/d_a_crod/symbols.txt | 2 +- config/GZ2E01/rels/d_a_cstatue/splits.txt | 2 +- config/GZ2E01/rels/d_a_cstatue/symbols.txt | 3 +- config/GZ2E01/rels/d_a_demo00/splits.txt | 2 +- config/GZ2E01/rels/d_a_demo00/symbols.txt | 5 +- config/GZ2E01/rels/d_a_demo_item/splits.txt | 2 +- config/GZ2E01/rels/d_a_demo_item/symbols.txt | 2 +- config/GZ2E01/rels/d_a_do/splits.txt | 2 +- config/GZ2E01/rels/d_a_do/symbols.txt | 4 +- config/GZ2E01/rels/d_a_door_boss/symbols.txt | 5 +- .../GZ2E01/rels/d_a_door_bossL1/symbols.txt | 5 +- .../GZ2E01/rels/d_a_door_bossL5/symbols.txt | 5 +- .../GZ2E01/rels/d_a_door_dbdoor00/symbols.txt | 3 +- .../GZ2E01/rels/d_a_door_knob00/symbols.txt | 3 +- .../GZ2E01/rels/d_a_door_mbossL1/symbols.txt | 5 +- config/GZ2E01/rels/d_a_door_push/symbols.txt | 7 +- .../GZ2E01/rels/d_a_door_shutter/symbols.txt | 3 +- config/GZ2E01/rels/d_a_dshutter/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_ai/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ai/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_arrow/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_arrow/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_ba/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ba/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_bee/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_bee/symbols.txt | 6 +- config/GZ2E01/rels/d_a_e_bg/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_bg/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_bi/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_bi/symbols.txt | 6 +- config/GZ2E01/rels/d_a_e_bs/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_bs/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_bu/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_bu/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_bug/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_bug/symbols.txt | 8 +- config/GZ2E01/rels/d_a_e_cr/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_cr/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_db/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_db/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_dd/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_dd/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_df/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_df/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_dk/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_dk/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_dn/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_dn/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_dt/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_dt/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_fb/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_fb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_fk/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_fk/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_fm/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_fm/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_fs/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_fs/symbols.txt | 7 +- config/GZ2E01/rels/d_a_e_fz/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_fz/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_ga/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ga/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_gb/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_gb/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_ge/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ge/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_gi/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_gi/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_gm/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_gm/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_gob/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_gob/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_gs/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_gs/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_hb/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_hb/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_hm/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_hm/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_hp/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_hp/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_hz/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_hz/symbols.txt | 6 +- config/GZ2E01/rels/d_a_e_hzelda/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_hzelda/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_is/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_is/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_kg/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_kg/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_kk/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_kk/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_kr/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_kr/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_mb/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_mb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_mf/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_mf/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_mk/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_mk/symbols.txt | 4 +- config/GZ2E01/rels/d_a_e_mk_bo/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_mk_bo/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_mm/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_mm/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_mm_mt/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_ms/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ms/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_nest/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_nest/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_nz/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_nz/symbols.txt | 8 +- config/GZ2E01/rels/d_a_e_oc/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_oc/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_oct_bg/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_oct_bg/symbols.txt | 11 +- config/GZ2E01/rels/d_a_e_ot/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ot/symbols.txt | 10 +- config/GZ2E01/rels/d_a_e_ph/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ph/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_pm/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_pm/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_po/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_po/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_pz/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_pz/symbols.txt | 13 +- config/GZ2E01/rels/d_a_e_rb/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_rb/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_rd/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_rd/symbols.txt | 13 +- config/GZ2E01/rels/d_a_e_rdb/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_rdb/symbols.txt | 4 +- config/GZ2E01/rels/d_a_e_rdy/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_rdy/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_s1/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_s1/symbols.txt | 7 +- config/GZ2E01/rels/d_a_e_sb/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_sb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_sf/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_sf/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_sg/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_sg/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_sh/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_sh/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_sm/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_sm/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_sm2/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_sm2/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_st/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_st/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_sw/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_sw/symbols.txt | 11 +- config/GZ2E01/rels/d_a_e_th/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_th/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_tk/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_tk/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_tk2/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_tk2/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_tt/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_tt/symbols.txt | 10 +- config/GZ2E01/rels/d_a_e_vt/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_vt/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_wb/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_wb/symbols.txt | 25 +- config/GZ2E01/rels/d_a_e_ws/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ws/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_ww/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ww/symbols.txt | 7 +- config/GZ2E01/rels/d_a_e_yc/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_yc/symbols.txt | 2 +- config/GZ2E01/rels/d_a_e_yd/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_yd/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_yg/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_yg/symbols.txt | 9 +- config/GZ2E01/rels/d_a_e_yh/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_yh/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_yk/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_yk/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_ym/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ym/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_ymb/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_ymb/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_yr/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_yr/symbols.txt | 3 +- config/GZ2E01/rels/d_a_e_zh/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_zh/symbols.txt | 6 +- config/GZ2E01/rels/d_a_e_zm/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_zm/symbols.txt | 5 +- config/GZ2E01/rels/d_a_e_zs/splits.txt | 2 +- config/GZ2E01/rels/d_a_e_zs/symbols.txt | 3 +- config/GZ2E01/rels/d_a_econt/symbols.txt | 2 +- config/GZ2E01/rels/d_a_ep/symbols.txt | 3 +- .../GZ2E01/rels/d_a_formation_mng/symbols.txt | 3 +- config/GZ2E01/rels/d_a_fr/splits.txt | 2 +- config/GZ2E01/rels/d_a_fr/symbols.txt | 2 +- config/GZ2E01/rels/d_a_grass/splits.txt | 2 +- config/GZ2E01/rels/d_a_grass/symbols.txt | 8 +- config/GZ2E01/rels/d_a_horse/splits.txt | 2 +- config/GZ2E01/rels/d_a_horse/symbols.txt | 31 +- config/GZ2E01/rels/d_a_kago/splits.txt | 2 +- config/GZ2E01/rels/d_a_kago/symbols.txt | 2 +- config/GZ2E01/rels/d_a_kytag06/splits.txt | 2 +- config/GZ2E01/rels/d_a_kytag06/symbols.txt | 3 +- config/GZ2E01/rels/d_a_mant/symbols.txt | 3 +- config/GZ2E01/rels/d_a_mg_fish/splits.txt | 2 +- config/GZ2E01/rels/d_a_mg_fish/symbols.txt | 5 +- config/GZ2E01/rels/d_a_mg_fshop/splits.txt | 2 +- config/GZ2E01/rels/d_a_mg_fshop/symbols.txt | 3 +- config/GZ2E01/rels/d_a_mg_rod/splits.txt | 2 +- config/GZ2E01/rels/d_a_mg_rod/symbols.txt | 15 +- config/GZ2E01/rels/d_a_myna/splits.txt | 2 +- config/GZ2E01/rels/d_a_myna/symbols.txt | 3 +- config/GZ2E01/rels/d_a_nbomb/splits.txt | 2 +- config/GZ2E01/rels/d_a_nbomb/symbols.txt | 3 +- config/GZ2E01/rels/d_a_ni/splits.txt | 2 +- config/GZ2E01/rels/d_a_ni/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_aru/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_aru/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_ash/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_ash/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_ashB/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_ashB/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_bans/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_bans/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_besu/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_besu/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_blue_ns/splits.txt | 2 +- .../GZ2E01/rels/d_a_npc_blue_ns/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_bou/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_bou/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_bouS/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_bouS/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_cdn3/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_chat/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_chat/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_chin/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_chin/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_clerka/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_clerka/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_clerkb/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_clerkb/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_clerkt/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_clerkt/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_df/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_doc/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_doc/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_doorboy/splits.txt | 2 +- .../GZ2E01/rels/d_a_npc_doorboy/symbols.txt | 3 +- .../GZ2E01/rels/d_a_npc_drainSol/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_du/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_du/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_fairy/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_fairy/symbols.txt | 3 +- .../rels/d_a_npc_fairy_seirei/splits.txt | 2 +- .../rels/d_a_npc_fairy_seirei/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_fish/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_gnd/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_gnd/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_gra/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_gra/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_grc/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_grc/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_grd/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_grd/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_grm/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_grm/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_grmc/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_grmc/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_gro/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_gro/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_grr/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_grr/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_grs/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_grs/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_grz/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_grz/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_guard/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_gwolf/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_gwolf/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_hanjo/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_hanjo/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_henna/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_henna/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_hoz/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_hoz/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_impal/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_impal/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_ins/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_ins/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_jagar/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_jagar/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_kakashi/splits.txt | 2 +- .../GZ2E01/rels/d_a_npc_kakashi/symbols.txt | 3 +- .../GZ2E01/rels/d_a_npc_kasi_hana/splits.txt | 2 +- .../GZ2E01/rels/d_a_npc_kasi_hana/symbols.txt | 3 +- .../GZ2E01/rels/d_a_npc_kasi_kyu/splits.txt | 2 +- .../GZ2E01/rels/d_a_npc_kasi_kyu/symbols.txt | 3 +- .../GZ2E01/rels/d_a_npc_kasi_mich/splits.txt | 2 +- .../GZ2E01/rels/d_a_npc_kasi_mich/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_kkri/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_kkri/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_kn/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_kn/symbols.txt | 7 +- config/GZ2E01/rels/d_a_npc_knj/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_knj/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_kolin/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_kolin/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_kolinb/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_kolinb/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_ks/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_ks/symbols.txt | 9 +- config/GZ2E01/rels/d_a_npc_kyury/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_len/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_len/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_lf/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_lf/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_lud/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_lud/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_maro/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_maro/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_midp/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_midp/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_moi/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_moi/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_moir/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_moir/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_myna2/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_myna2/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_ne/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_ne/symbols.txt | 2 +- .../GZ2E01/rels/d_a_npc_pachi_besu/splits.txt | 2 +- .../rels/d_a_npc_pachi_besu/symbols.txt | 5 +- .../GZ2E01/rels/d_a_npc_pachi_maro/splits.txt | 2 +- .../rels/d_a_npc_pachi_maro/symbols.txt | 3 +- .../GZ2E01/rels/d_a_npc_pachi_taro/splits.txt | 2 +- .../rels/d_a_npc_pachi_taro/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_passer/symbols.txt | 3 +- .../GZ2E01/rels/d_a_npc_passer2/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_post/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_post/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_pouya/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_prayer/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_prayer/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_raca/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_raca/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_rafrel/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_rafrel/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_saru/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_saru/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_seib/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_seib/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_seic/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_seic/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_seid/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_seid/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_seira/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_seira/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_seira2/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_seira2/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_seirei/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_seirei/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_shad/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_shad/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_shaman/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_shaman/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_shoe/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_shoe/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_sola/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_sola/symbols.txt | 3 +- .../GZ2E01/rels/d_a_npc_soldierA/splits.txt | 2 +- .../GZ2E01/rels/d_a_npc_soldierA/symbols.txt | 5 +- .../GZ2E01/rels/d_a_npc_soldierB/splits.txt | 2 +- .../GZ2E01/rels/d_a_npc_soldierB/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_sq/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_sq/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_taro/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_taro/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_the/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_the/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_theB/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_theB/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_tk/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_tk/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_tkc/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_tkc/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_tkj/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_tkj/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_tkj2/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_tkj2/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_tks/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_tks/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_toby/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_toby/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_tr/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_tr/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_uri/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_uri/symbols.txt | 3 +- .../GZ2E01/rels/d_a_npc_wrestler/splits.txt | 2 +- .../GZ2E01/rels/d_a_npc_wrestler/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_yamid/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_yamid/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_yamis/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_yamis/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_yamit/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_yamit/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_yelia/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_yelia/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_ykm/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_ykm/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_ykw/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_ykw/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_zanb/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_zanb/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_zant/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_zant/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_zelR/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_zelR/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_zelRo/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_zelRo/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_zelda/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_zelda/symbols.txt | 3 +- config/GZ2E01/rels/d_a_npc_zra/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_zra/symbols.txt | 2 +- config/GZ2E01/rels/d_a_npc_zrc/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_zrc/symbols.txt | 5 +- config/GZ2E01/rels/d_a_npc_zrz/splits.txt | 2 +- config/GZ2E01/rels/d_a_npc_zrz/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_Turara/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_Turara/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_TvCdlst/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_Y_taihou/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_Y_taihou/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_amiShutter/splits.txt | 2 +- .../rels/d_a_obj_amiShutter/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_ari/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_ari/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_automata/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_automata/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_avalanche/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_balloon/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_balloon/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_barDesk/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_barDesk/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_batta/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_batta/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_bed/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_bemos/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_bemos/symbols.txt | 2 + .../GZ2E01/rels/d_a_obj_bk_leaf/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_bky_rock/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_bmWindow/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_bmWindow/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_bmshutter/symbols.txt | 7 +- .../GZ2E01/rels/d_a_obj_bosswarp/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_boumato/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_brg/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_bsGate/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_bsGate/symbols.txt | 3 +- .../rels/d_a_obj_bubblePilar/splits.txt | 2 +- .../rels/d_a_obj_bubblePilar/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_carry/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_cb/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_cb/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_cblock/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_cblock/symbols.txt | 4 +- config/GZ2E01/rels/d_a_obj_cdoor/symbols.txt | 7 +- .../rels/d_a_obj_chandelier/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_chest/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_cho/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_cho/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_cwall/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_cwall/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_dan/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_dan/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_digsnow/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_dmelevator/splits.txt | 2 +- .../rels/d_a_obj_dmelevator/symbols.txt | 10 +- config/GZ2E01/rels/d_a_obj_drop/symbols.txt | 7 +- .../GZ2E01/rels/d_a_obj_fireWood/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_fireWood2/splits.txt | 2 +- .../rels/d_a_obj_firepillar/symbols.txt | 5 +- .../rels/d_a_obj_firepillar2/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_food/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_food/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_fw/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_fw/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_gadget/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_gadget/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_gb/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_geyser/symbols.txt | 7 +- .../GZ2E01/rels/d_a_obj_glowSphere/splits.txt | 2 +- .../rels/d_a_obj_glowSphere/symbols.txt | 7 +- config/GZ2E01/rels/d_a_obj_gm/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_gm/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_goGate/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_goGate/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_gomikabe/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_gomikabe/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_gpTaru/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_gpTaru/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_gra2/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_gra2/symbols.txt | 9 +- .../rels/d_a_obj_groundwater/splits.txt | 2 +- .../rels/d_a_obj_groundwater/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_h_saku/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_heavySw/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_heavySw/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_hfuta/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_hsTarget/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_ice_s/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_iceblock/symbols.txt | 7 +- .../GZ2E01/rels/d_a_obj_iceleaf/symbols.txt | 7 +- config/GZ2E01/rels/d_a_obj_ita/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_itamato/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_ito/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_ito/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kabuto/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_kabuto/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kag/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_kag/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_kago/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_kago/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_kamakiri/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_kamakiri/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kanban2/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_kanban2/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_kantera/symbols.txt | 5 +- .../rels/d_a_obj_katatsumuri/splits.txt | 2 +- .../rels/d_a_obj_katatsumuri/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kbacket/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_kbacket/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_kbox/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_kbox/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_key/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_key/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_keyhole/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_keyhole/symbols.txt | 6 +- config/GZ2E01/rels/d_a_obj_kgate/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_ki/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_ki/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_kiPot/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_kita/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_kita/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_kshutter/symbols.txt | 13 +- .../GZ2E01/rels/d_a_obj_ktOnFire/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_kuwagata/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_kuwagata/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_ladder/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_lbox/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_lbox/symbols.txt | 2 +- .../rels/d_a_obj_life_container/symbols.txt | 5 +- .../rels/d_a_obj_lv1Candle00/splits.txt | 2 +- .../rels/d_a_obj_lv1Candle01/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv2Candle/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv3Candle/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv3Water/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv3Water/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_lv3Water2/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv3Water2/symbols.txt | 3 +- .../rels/d_a_obj_lv4CandleDemoTag/splits.txt | 2 +- .../rels/d_a_obj_lv4CandleDemoTag/symbols.txt | 2 +- .../rels/d_a_obj_lv4CandleTag/splits.txt | 2 +- .../rels/d_a_obj_lv4CandleTag/symbols.txt | 3 +- .../rels/d_a_obj_lv4EdShutter/splits.txt | 2 +- .../rels/d_a_obj_lv4EdShutter/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_lv4Gate/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv4Gate/symbols.txt | 3 +- .../rels/d_a_obj_lv4HsTarget/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv4PoGate/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv4PoGate/symbols.txt | 3 +- .../rels/d_a_obj_lv4RailWall/symbols.txt | 5 +- .../rels/d_a_obj_lv4SlideWall/splits.txt | 2 +- .../rels/d_a_obj_lv4SlideWall/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_lv4bridge/symbols.txt | 5 +- .../rels/d_a_obj_lv4digsand/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_lv4floor/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_lv4sand/symbols.txt | 3 +- .../rels/d_a_obj_lv5FloorBoard/splits.txt | 2 +- .../rels/d_a_obj_lv5FloorBoard/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_lv5IceWall/splits.txt | 2 +- .../rels/d_a_obj_lv5IceWall/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_lv5SwIce/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv5SwIce/symbols.txt | 3 +- .../rels/d_a_obj_lv6ChangeGate/splits.txt | 2 +- .../rels/d_a_obj_lv6ChangeGate/symbols.txt | 3 +- .../rels/d_a_obj_lv6FurikoTrap/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv6Lblock/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv6Lblock/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_lv6SwGate/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv6SwGate/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_lv6SzGate/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv6SzGate/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_lv6Tenbin/splits.txt | 2 +- .../rels/d_a_obj_lv6TogeRoll/splits.txt | 2 +- .../rels/d_a_obj_lv6TogeRoll/symbols.txt | 3 +- .../rels/d_a_obj_lv6TogeTrap/splits.txt | 2 +- .../rels/d_a_obj_lv6TogeTrap/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_lv6bemos/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_lv6bemos2/symbols.txt | 7 +- .../GZ2E01/rels/d_a_obj_lv6swturn/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_lv7BsGate/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv7BsGate/symbols.txt | 3 +- .../rels/d_a_obj_lv7PropellerY/splits.txt | 2 +- .../rels/d_a_obj_lv7PropellerY/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_lv7bridge/symbols.txt | 5 +- .../rels/d_a_obj_lv8KekkaiTrap/splits.txt | 2 +- .../rels/d_a_obj_lv8KekkaiTrap/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_lv8Lift/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_lv8Lift/symbols.txt | 3 +- .../rels/d_a_obj_lv8OptiLift/splits.txt | 2 +- .../rels/d_a_obj_lv8OptiLift/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_lv8UdFloor/splits.txt | 2 +- .../rels/d_a_obj_lv8UdFloor/symbols.txt | 3 +- .../rels/d_a_obj_lv9SwShutter/splits.txt | 2 +- .../rels/d_a_obj_lv9SwShutter/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_magLift/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_magLift/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_magLiftRot/splits.txt | 2 +- .../rels/d_a_obj_magLiftRot/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_magne_arm/symbols.txt | 13 +- config/GZ2E01/rels/d_a_obj_maki/splits.txt | 2 +- .../rels/d_a_obj_master_sword/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_mgate/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_mie/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_mie/symbols.txt | 2 +- .../rels/d_a_obj_mirror_6pole/symbols.txt | 3 +- .../rels/d_a_obj_mirror_screw/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_movebox/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_movebox/symbols.txt | 11 +- config/GZ2E01/rels/d_a_obj_msima/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_msima/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_mvstair/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_myogan/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_myogan/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_nameplate/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_nan/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_nan/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_nougu/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_octhashi/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_oiltubo/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_onsenTaru/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_onsenTaru/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_pdoor/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_pdtile/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_pillar/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_pillar/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_pleaf/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_poCandle/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_poCandle/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_poFire/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_poFire/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_poTbox/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_poTbox/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_pumpkin/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_pumpkin/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_rfHole/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_rfHole/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_rgate/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_riverrock/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_riverrock/symbols.txt | 2 +- .../rels/d_a_obj_rope_bridge/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_rotBridge/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_rotTrap/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_rotTrap/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_rstair/symbols.txt | 7 +- config/GZ2E01/rels/d_a_obj_rw/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_rw/symbols.txt | 2 +- .../rels/d_a_obj_sWallShutter/splits.txt | 2 +- .../rels/d_a_obj_sWallShutter/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_saidan/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_saidan/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_scannon/symbols.txt | 3 +- .../rels/d_a_obj_scannon_crs/symbols.txt | 3 +- .../rels/d_a_obj_scannon_ten/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_sekidoor/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_sekidoor/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_sekizo/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_sekizo/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_sekizoa/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_sekizoa/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_shield/symbols.txt | 7 +- .../GZ2E01/rels/d_a_obj_smallkey/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_smgdoor/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_smtile/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_snowEffTag/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_so/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_so/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_spinLift/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_spinLift/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_ss_drink/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_stairBlock/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_stick/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_stone/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_stopper/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_stopper/symbols.txt | 6 +- .../GZ2E01/rels/d_a_obj_stopper2/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_swBallA/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_swBallB/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_swBallC/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_swhang/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_sword/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_swpush/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_swpush/symbols.txt | 6 +- .../GZ2E01/rels/d_a_obj_swpush2/symbols.txt | 7 +- config/GZ2E01/rels/d_a_obj_swpush5/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_swpush5/symbols.txt | 8 +- config/GZ2E01/rels/d_a_obj_swturn/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_syRock/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_syRock/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_taFence/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_taFence/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_takaraDai/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_ten/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_ten/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_thdoor/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_timeFire/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_timer/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_tks/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_tks/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_toby/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_toby/symbols.txt | 6 +- .../GZ2E01/rels/d_a_obj_tobyhouse/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_tobyhouse/symbols.txt | 2 +- .../GZ2E01/rels/d_a_obj_togeTrap/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_togeTrap/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_tombo/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_tombo/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_tp/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_treesh/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_twGate/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_volcball/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_volcbom/symbols.txt | 7 +- .../GZ2E01/rels/d_a_obj_warp_kbrg/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_warp_obrg/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_waterGate/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_waterGate/symbols.txt | 3 +- .../rels/d_a_obj_waterPillar/splits.txt | 2 +- .../rels/d_a_obj_waterPillar/symbols.txt | 3 +- config/GZ2E01/rels/d_a_obj_wdStick/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_wdStick/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_web0/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_web0/symbols.txt | 2 +- config/GZ2E01/rels/d_a_obj_web1/splits.txt | 2 +- config/GZ2E01/rels/d_a_obj_web1/symbols.txt | 2 +- .../rels/d_a_obj_well_cover/symbols.txt | 5 +- .../rels/d_a_obj_wood_statue/symbols.txt | 5 +- config/GZ2E01/rels/d_a_obj_yel_bag/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_yel_bag/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_yobikusa/symbols.txt | 3 +- .../GZ2E01/rels/d_a_obj_zrTurara/splits.txt | 2 +- .../GZ2E01/rels/d_a_obj_zrTurara/symbols.txt | 2 +- .../rels/d_a_obj_zrTuraraRock/splits.txt | 2 +- .../rels/d_a_obj_zrTuraraRock/symbols.txt | 5 +- .../GZ2E01/rels/d_a_obj_zraMark/symbols.txt | 2 +- config/GZ2E01/rels/d_a_peru/splits.txt | 2 +- config/GZ2E01/rels/d_a_peru/symbols.txt | 3 +- config/GZ2E01/rels/d_a_ppolamp/symbols.txt | 4 +- .../GZ2E01/rels/d_a_scene_exit2/symbols.txt | 5 +- config/GZ2E01/rels/d_a_spinner/splits.txt | 2 +- config/GZ2E01/rels/d_a_spinner/symbols.txt | 4 +- config/GZ2E01/rels/d_a_sq/splits.txt | 2 +- config/GZ2E01/rels/d_a_sq/symbols.txt | 2 +- config/GZ2E01/rels/d_a_swBall/symbols.txt | 3 +- config/GZ2E01/rels/d_a_swLBall/symbols.txt | 5 +- config/GZ2E01/rels/d_a_swc00/symbols.txt | 5 +- config/GZ2E01/rels/d_a_tag_CstaSw/splits.txt | 2 +- config/GZ2E01/rels/d_a_tag_TWgate/symbols.txt | 3 +- config/GZ2E01/rels/d_a_tag_csw/symbols.txt | 3 +- config/GZ2E01/rels/d_a_tag_evtmsg/symbols.txt | 3 +- .../GZ2E01/rels/d_a_tag_firewall/symbols.txt | 2 +- config/GZ2E01/rels/d_a_tag_hstop/splits.txt | 2 +- config/GZ2E01/rels/d_a_tag_lantern/splits.txt | 2 +- .../GZ2E01/rels/d_a_tag_lv2prchk/symbols.txt | 5 +- .../GZ2E01/rels/d_a_tag_lv6CstaSw/splits.txt | 2 +- config/GZ2E01/rels/d_a_tag_poFire/splits.txt | 2 +- .../rels/d_a_tag_river_back/symbols.txt | 5 +- .../rels/d_a_tag_statue_evt/symbols.txt | 5 +- .../GZ2E01/rels/d_a_tag_waterfall/splits.txt | 2 +- .../GZ2E01/rels/d_a_tag_waterfall/symbols.txt | 2 +- config/GZ2E01/rels/d_a_tbox/splits.txt | 2 +- config/GZ2E01/rels/d_a_tbox/symbols.txt | 3 +- config/GZ2E01/rels/d_a_tbox2/symbols.txt | 5 +- config/GZ2E01/rels/d_a_title/splits.txt | 2 +- config/GZ2E01/rels/d_a_title/symbols.txt | 3 +- config/GZ2E01/rels/d_a_ykgr/splits.txt | 2 +- config/GZ2E01/splits.txt | 7 +- config/GZ2E01/symbols.txt | 5783 ++++++++-------- config/GZ2J01/config.yml | 6 + config/GZ2J01/rels/d_a_arrow/splits.txt | 2 +- config/GZ2J01/rels/d_a_arrow/symbols.txt | 6 +- config/GZ2J01/rels/d_a_b_bh/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_bh/symbols.txt | 2 +- config/GZ2J01/rels/d_a_b_bq/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_bq/symbols.txt | 7 +- config/GZ2J01/rels/d_a_b_dr/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_dr/symbols.txt | 7 +- config/GZ2J01/rels/d_a_b_dre/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_dre/symbols.txt | 2 +- config/GZ2J01/rels/d_a_b_ds/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_ds/symbols.txt | 23 +- config/GZ2J01/rels/d_a_b_gg/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_gg/symbols.txt | 5 +- config/GZ2J01/rels/d_a_b_gm/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_gm/symbols.txt | 5 +- config/GZ2J01/rels/d_a_b_gnd/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_gnd/symbols.txt | 7 +- config/GZ2J01/rels/d_a_b_go/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_go/symbols.txt | 2 +- config/GZ2J01/rels/d_a_b_gos/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_gos/symbols.txt | 2 +- config/GZ2J01/rels/d_a_b_mgn/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_mgn/symbols.txt | 5 +- config/GZ2J01/rels/d_a_b_ob/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_ob/symbols.txt | 6 +- config/GZ2J01/rels/d_a_b_oh/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_oh/symbols.txt | 2 +- config/GZ2J01/rels/d_a_b_tn/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_tn/symbols.txt | 5 +- config/GZ2J01/rels/d_a_b_yo/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_yo/symbols.txt | 5 +- config/GZ2J01/rels/d_a_b_yo_ice/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_yo_ice/symbols.txt | 5 +- config/GZ2J01/rels/d_a_b_zant/splits.txt | 2 +- config/GZ2J01/rels/d_a_b_zant/symbols.txt | 5 +- .../GZ2J01/rels/d_a_b_zant_magic/symbols.txt | 3 +- .../GZ2J01/rels/d_a_b_zant_mobile/splits.txt | 2 +- .../GZ2J01/rels/d_a_b_zant_mobile/symbols.txt | 2 +- config/GZ2J01/rels/d_a_balloon_2D/splits.txt | 2 +- config/GZ2J01/rels/d_a_bd/splits.txt | 2 +- config/GZ2J01/rels/d_a_bd/symbols.txt | 2 +- config/GZ2J01/rels/d_a_bg_obj/symbols.txt | 5 +- config/GZ2J01/rels/d_a_boomerang/symbols.txt | 3 +- config/GZ2J01/rels/d_a_bullet/splits.txt | 2 +- config/GZ2J01/rels/d_a_canoe/splits.txt | 2 +- config/GZ2J01/rels/d_a_canoe/symbols.txt | 4 +- config/GZ2J01/rels/d_a_coach_2D/splits.txt | 2 +- config/GZ2J01/rels/d_a_cow/splits.txt | 2 +- config/GZ2J01/rels/d_a_cow/symbols.txt | 3 +- config/GZ2J01/rels/d_a_crod/symbols.txt | 2 +- config/GZ2J01/rels/d_a_cstatue/splits.txt | 2 +- config/GZ2J01/rels/d_a_cstatue/symbols.txt | 3 +- config/GZ2J01/rels/d_a_demo00/splits.txt | 2 +- config/GZ2J01/rels/d_a_demo00/symbols.txt | 5 +- config/GZ2J01/rels/d_a_demo_item/splits.txt | 2 +- config/GZ2J01/rels/d_a_demo_item/symbols.txt | 1 + config/GZ2J01/rels/d_a_do/splits.txt | 2 +- config/GZ2J01/rels/d_a_do/symbols.txt | 4 +- config/GZ2J01/rels/d_a_door_boss/symbols.txt | 5 +- .../GZ2J01/rels/d_a_door_bossL1/symbols.txt | 5 +- .../GZ2J01/rels/d_a_door_bossL5/symbols.txt | 5 +- .../GZ2J01/rels/d_a_door_dbdoor00/symbols.txt | 5 +- .../GZ2J01/rels/d_a_door_knob00/symbols.txt | 5 +- .../GZ2J01/rels/d_a_door_mbossL1/symbols.txt | 5 +- config/GZ2J01/rels/d_a_door_push/symbols.txt | 7 +- .../GZ2J01/rels/d_a_door_shutter/symbols.txt | 3 +- config/GZ2J01/rels/d_a_dshutter/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_ai/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ai/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_arrow/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_arrow/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_ba/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ba/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_bee/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_bee/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_bg/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_bg/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_bi/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_bi/symbols.txt | 6 +- config/GZ2J01/rels/d_a_e_bs/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_bs/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_bu/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_bu/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_bug/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_bug/symbols.txt | 8 +- config/GZ2J01/rels/d_a_e_cr/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_cr/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_db/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_db/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_dd/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_dd/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_df/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_df/symbols.txt | 6 +- config/GZ2J01/rels/d_a_e_dk/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_dk/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_dn/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_dn/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_dt/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_dt/symbols.txt | 4 +- config/GZ2J01/rels/d_a_e_fb/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_fb/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_fk/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_fk/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_fm/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_fm/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_fs/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_fs/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_fz/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_fz/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_ga/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ga/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_gb/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_gb/symbols.txt | 9 +- config/GZ2J01/rels/d_a_e_ge/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ge/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_gi/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_gi/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_gm/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_gm/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_gob/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_gob/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_gs/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_gs/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_hb/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_hb/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_hm/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_hm/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_hp/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_hp/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_hz/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_hz/symbols.txt | 6 +- config/GZ2J01/rels/d_a_e_hzelda/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_hzelda/symbols.txt | 9 +- config/GZ2J01/rels/d_a_e_is/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_is/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_kg/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_kg/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_kk/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_kk/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_kr/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_kr/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_mb/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_mb/symbols.txt | 18 +- config/GZ2J01/rels/d_a_e_mf/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_mf/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_mk/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_mk/symbols.txt | 4 +- config/GZ2J01/rels/d_a_e_mk_bo/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_mk_bo/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_mm/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_mm/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_mm_mt/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_ms/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ms/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_nest/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_nest/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_nz/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_nz/symbols.txt | 8 +- config/GZ2J01/rels/d_a_e_oc/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_oc/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_oct_bg/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_oct_bg/symbols.txt | 11 +- config/GZ2J01/rels/d_a_e_ot/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ot/symbols.txt | 10 +- config/GZ2J01/rels/d_a_e_ph/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ph/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_pm/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_pm/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_po/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_po/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_pz/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_pz/symbols.txt | 13 +- config/GZ2J01/rels/d_a_e_rb/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_rb/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_rd/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_rd/symbols.txt | 14 +- config/GZ2J01/rels/d_a_e_rdb/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_rdb/symbols.txt | 6 +- config/GZ2J01/rels/d_a_e_rdy/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_rdy/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_s1/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_s1/symbols.txt | 7 +- config/GZ2J01/rels/d_a_e_sb/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_sb/symbols.txt | 10 +- config/GZ2J01/rels/d_a_e_sf/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_sf/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_sg/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_sg/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_sh/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_sh/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_sm/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_sm/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_sm2/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_sm2/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_st/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_st/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_sw/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_sw/symbols.txt | 11 +- config/GZ2J01/rels/d_a_e_th/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_th/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_tk/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_tk/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_tk2/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_tk2/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_tt/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_tt/symbols.txt | 10 +- config/GZ2J01/rels/d_a_e_vt/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_vt/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_wb/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_wb/symbols.txt | 18 +- config/GZ2J01/rels/d_a_e_ws/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ws/symbols.txt | 6 +- config/GZ2J01/rels/d_a_e_ww/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ww/symbols.txt | 7 +- config/GZ2J01/rels/d_a_e_yc/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_yc/symbols.txt | 2 +- config/GZ2J01/rels/d_a_e_yd/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_yd/symbols.txt | 6 +- config/GZ2J01/rels/d_a_e_yg/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_yg/symbols.txt | 7 +- config/GZ2J01/rels/d_a_e_yh/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_yh/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_yk/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_yk/symbols.txt | 6 +- config/GZ2J01/rels/d_a_e_ym/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ym/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_ymb/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_ymb/symbols.txt | 5 +- config/GZ2J01/rels/d_a_e_yr/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_yr/symbols.txt | 3 +- config/GZ2J01/rels/d_a_e_zh/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_zh/symbols.txt | 10 +- config/GZ2J01/rels/d_a_e_zm/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_zm/symbols.txt | 6 +- config/GZ2J01/rels/d_a_e_zs/splits.txt | 2 +- config/GZ2J01/rels/d_a_e_zs/symbols.txt | 3 +- config/GZ2J01/rels/d_a_econt/symbols.txt | 2 +- config/GZ2J01/rels/d_a_ep/symbols.txt | 3 +- .../GZ2J01/rels/d_a_formation_mng/symbols.txt | 3 +- config/GZ2J01/rels/d_a_fr/splits.txt | 2 +- config/GZ2J01/rels/d_a_fr/symbols.txt | 2 +- config/GZ2J01/rels/d_a_grass/splits.txt | 2 +- config/GZ2J01/rels/d_a_horse/splits.txt | 2 +- config/GZ2J01/rels/d_a_horse/symbols.txt | 17 +- config/GZ2J01/rels/d_a_hozelda/splits.txt | 1 + config/GZ2J01/rels/d_a_kago/splits.txt | 2 +- config/GZ2J01/rels/d_a_kago/symbols.txt | 2 +- config/GZ2J01/rels/d_a_kytag03/symbols.txt | 2 +- config/GZ2J01/rels/d_a_kytag06/splits.txt | 2 +- config/GZ2J01/rels/d_a_kytag06/symbols.txt | 3 +- config/GZ2J01/rels/d_a_mant/symbols.txt | 3 +- config/GZ2J01/rels/d_a_mg_fish/splits.txt | 2 +- config/GZ2J01/rels/d_a_mg_fish/symbols.txt | 7 +- config/GZ2J01/rels/d_a_mg_fshop/splits.txt | 2 +- config/GZ2J01/rels/d_a_mg_fshop/symbols.txt | 5 +- config/GZ2J01/rels/d_a_mg_rod/splits.txt | 2 +- config/GZ2J01/rels/d_a_mg_rod/symbols.txt | 15 +- config/GZ2J01/rels/d_a_myna/splits.txt | 2 +- config/GZ2J01/rels/d_a_myna/symbols.txt | 3 +- config/GZ2J01/rels/d_a_nbomb/splits.txt | 2 +- config/GZ2J01/rels/d_a_nbomb/symbols.txt | 3 +- config/GZ2J01/rels/d_a_ni/splits.txt | 2 +- config/GZ2J01/rels/d_a_ni/symbols.txt | 11 +- config/GZ2J01/rels/d_a_npc_aru/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_aru/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_ash/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_ash/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_ashB/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_ashB/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_bans/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_bans/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_besu/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_besu/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_blue_ns/splits.txt | 2 +- .../GZ2J01/rels/d_a_npc_blue_ns/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_bou/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_bou/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_bouS/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_bouS/symbols.txt | 5 +- config/GZ2J01/rels/d_a_npc_cdn3/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_chat/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_chat/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_chin/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_chin/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_clerka/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_clerka/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_clerkb/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_clerkb/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_clerkt/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_clerkt/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_df/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_doc/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_doc/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_doorboy/splits.txt | 2 +- .../GZ2J01/rels/d_a_npc_doorboy/symbols.txt | 3 +- .../GZ2J01/rels/d_a_npc_drainSol/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_du/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_du/symbols.txt | 2 +- config/GZ2J01/rels/d_a_npc_fairy/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_fairy/symbols.txt | 3 +- .../rels/d_a_npc_fairy_seirei/splits.txt | 2 +- .../rels/d_a_npc_fairy_seirei/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_fish/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_gnd/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_gnd/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_gra/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_gra/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_grc/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_grc/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_grd/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_grd/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_grm/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_grm/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_grmc/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_grmc/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_gro/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_gro/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_grr/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_grr/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_grs/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_grs/symbols.txt | 5 +- config/GZ2J01/rels/d_a_npc_grz/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_grz/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_guard/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_gwolf/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_gwolf/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_hanjo/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_hanjo/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_henna/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_henna/symbols.txt | 5 +- config/GZ2J01/rels/d_a_npc_hoz/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_hoz/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_impal/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_impal/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_ins/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_ins/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_jagar/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_jagar/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_kakashi/splits.txt | 2 +- .../GZ2J01/rels/d_a_npc_kakashi/symbols.txt | 3 +- .../GZ2J01/rels/d_a_npc_kasi_hana/splits.txt | 2 +- .../GZ2J01/rels/d_a_npc_kasi_hana/symbols.txt | 3 +- .../GZ2J01/rels/d_a_npc_kasi_kyu/splits.txt | 2 +- .../GZ2J01/rels/d_a_npc_kasi_kyu/symbols.txt | 5 +- .../GZ2J01/rels/d_a_npc_kasi_mich/splits.txt | 2 +- .../GZ2J01/rels/d_a_npc_kasi_mich/symbols.txt | 5 +- config/GZ2J01/rels/d_a_npc_kkri/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_kkri/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_kn/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_kn/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_knj/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_knj/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_kolin/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_kolin/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_kolinb/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_kolinb/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_ks/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_ks/symbols.txt | 7 +- config/GZ2J01/rels/d_a_npc_kyury/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_len/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_len/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_lf/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_lf/symbols.txt | 6 +- config/GZ2J01/rels/d_a_npc_lud/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_lud/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_maro/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_maro/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_midp/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_midp/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_moi/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_moi/symbols.txt | 5 +- config/GZ2J01/rels/d_a_npc_moir/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_moir/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_myna2/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_myna2/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_ne/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_ne/symbols.txt | 2 +- .../GZ2J01/rels/d_a_npc_pachi_besu/splits.txt | 2 +- .../rels/d_a_npc_pachi_besu/symbols.txt | 3 +- .../GZ2J01/rels/d_a_npc_pachi_maro/splits.txt | 2 +- .../rels/d_a_npc_pachi_maro/symbols.txt | 3 +- .../GZ2J01/rels/d_a_npc_pachi_taro/splits.txt | 2 +- .../rels/d_a_npc_pachi_taro/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_passer/symbols.txt | 3 +- .../GZ2J01/rels/d_a_npc_passer2/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_post/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_post/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_pouya/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_prayer/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_prayer/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_raca/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_raca/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_rafrel/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_rafrel/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_saru/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_saru/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_seib/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_seib/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_seic/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_seic/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_seid/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_seid/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_seira/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_seira/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_seira2/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_seira2/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_seirei/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_seirei/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_shad/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_shad/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_shaman/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_shaman/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_shoe/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_shoe/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_sola/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_sola/symbols.txt | 3 +- .../GZ2J01/rels/d_a_npc_soldierA/splits.txt | 2 +- .../GZ2J01/rels/d_a_npc_soldierA/symbols.txt | 3 +- .../GZ2J01/rels/d_a_npc_soldierB/splits.txt | 2 +- .../GZ2J01/rels/d_a_npc_soldierB/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_sq/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_sq/symbols.txt | 2 +- config/GZ2J01/rels/d_a_npc_taro/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_taro/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_the/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_the/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_theB/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_theB/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_tk/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_tk/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_tkc/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_tkc/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_tkj/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_tkj/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_tkj2/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_tkj2/symbols.txt | 2 +- config/GZ2J01/rels/d_a_npc_tks/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_tks/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_toby/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_toby/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_tr/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_tr/symbols.txt | 2 +- config/GZ2J01/rels/d_a_npc_uri/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_uri/symbols.txt | 3 +- .../GZ2J01/rels/d_a_npc_wrestler/splits.txt | 2 +- .../GZ2J01/rels/d_a_npc_wrestler/symbols.txt | 5 +- config/GZ2J01/rels/d_a_npc_yamid/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_yamid/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_yamis/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_yamis/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_yamit/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_yamit/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_yelia/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_yelia/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_ykm/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_ykm/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_ykw/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_ykw/symbols.txt | 5 +- config/GZ2J01/rels/d_a_npc_zanb/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_zanb/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_zant/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_zant/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_zelR/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_zelR/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_zelRo/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_zelRo/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_zelda/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_zelda/symbols.txt | 3 +- config/GZ2J01/rels/d_a_npc_zra/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_zra/symbols.txt | 2 +- config/GZ2J01/rels/d_a_npc_zrc/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_zrc/symbols.txt | 5 +- config/GZ2J01/rels/d_a_npc_zrz/splits.txt | 2 +- config/GZ2J01/rels/d_a_npc_zrz/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_Turara/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_Turara/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_TvCdlst/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_Y_taihou/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_Y_taihou/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_amiShutter/splits.txt | 2 +- .../rels/d_a_obj_amiShutter/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_ari/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_ari/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_automata/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_automata/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_avalanche/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_balloon/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_balloon/symbols.txt | 5 +- config/GZ2J01/rels/d_a_obj_barDesk/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_barDesk/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_batta/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_batta/symbols.txt | 5 +- config/GZ2J01/rels/d_a_obj_bed/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_bemos/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_bemos/symbols.txt | 10 +- .../GZ2J01/rels/d_a_obj_bk_leaf/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_bky_rock/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_bmWindow/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_bmWindow/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_bmshutter/symbols.txt | 8 +- .../GZ2J01/rels/d_a_obj_bosswarp/symbols.txt | 5 +- config/GZ2J01/rels/d_a_obj_boumato/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_brg/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_bsGate/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_bsGate/symbols.txt | 6 +- .../rels/d_a_obj_bubblePilar/splits.txt | 2 +- .../rels/d_a_obj_bubblePilar/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_carry/symbols.txt | 17 +- config/GZ2J01/rels/d_a_obj_cb/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_cb/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_cblock/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_cblock/symbols.txt | 4 +- config/GZ2J01/rels/d_a_obj_cdoor/symbols.txt | 8 +- .../rels/d_a_obj_chandelier/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_chest/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_cho/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_cho/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_cwall/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_cwall/symbols.txt | 5 +- config/GZ2J01/rels/d_a_obj_dan/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_dan/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_digsnow/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_dmelevator/splits.txt | 2 +- .../rels/d_a_obj_dmelevator/symbols.txt | 10 +- config/GZ2J01/rels/d_a_obj_drop/symbols.txt | 8 +- .../GZ2J01/rels/d_a_obj_fireWood/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_fireWood2/splits.txt | 2 +- .../rels/d_a_obj_firepillar/symbols.txt | 6 +- .../rels/d_a_obj_firepillar2/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_food/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_food/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_fw/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_fw/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_gadget/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_gadget/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_gb/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_geyser/symbols.txt | 8 +- .../GZ2J01/rels/d_a_obj_glowSphere/splits.txt | 2 +- .../rels/d_a_obj_glowSphere/symbols.txt | 8 +- config/GZ2J01/rels/d_a_obj_gm/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_gm/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_goGate/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_goGate/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_gomikabe/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_gomikabe/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_gpTaru/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_gpTaru/symbols.txt | 5 +- config/GZ2J01/rels/d_a_obj_gra2/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_gra2/symbols.txt | 3 +- .../rels/d_a_obj_groundwater/splits.txt | 2 +- .../rels/d_a_obj_groundwater/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_h_saku/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_heavySw/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_heavySw/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_hfuta/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_hfuta/symbols.txt | 4 +- .../GZ2J01/rels/d_a_obj_hsTarget/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_ice_s/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_iceblock/symbols.txt | 8 +- .../GZ2J01/rels/d_a_obj_iceleaf/symbols.txt | 7 +- config/GZ2J01/rels/d_a_obj_ita/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_itamato/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_ito/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_ito/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_kabuto/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_kabuto/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_kag/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_kag/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_kago/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_kago/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_kamakiri/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_kamakiri/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_kanban2/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_kanban2/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_kantera/symbols.txt | 6 +- .../rels/d_a_obj_katatsumuri/splits.txt | 2 +- .../rels/d_a_obj_katatsumuri/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_kbacket/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_kbacket/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_kbox/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_kbox/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_key/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_key/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_keyhole/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_keyhole/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_kgate/symbols.txt | 7 +- config/GZ2J01/rels/d_a_obj_ki/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_ki/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_kiPot/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_kiPot/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_kita/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_kita/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_kshutter/symbols.txt | 14 +- .../GZ2J01/rels/d_a_obj_ktOnFire/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_kuwagata/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_kuwagata/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_kznkarm/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_ladder/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_lbox/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_lbox/symbols.txt | 2 +- .../rels/d_a_obj_life_container/symbols.txt | 5 +- .../rels/d_a_obj_lv1Candle00/splits.txt | 2 +- .../rels/d_a_obj_lv1Candle01/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv2Candle/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv3Candle/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv3Water/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv3Water/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_lv3Water2/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv3Water2/symbols.txt | 3 +- .../rels/d_a_obj_lv4CandleDemoTag/splits.txt | 2 +- .../rels/d_a_obj_lv4CandleDemoTag/symbols.txt | 3 +- .../rels/d_a_obj_lv4CandleTag/splits.txt | 2 +- .../rels/d_a_obj_lv4CandleTag/symbols.txt | 6 +- .../rels/d_a_obj_lv4EdShutter/splits.txt | 2 +- .../rels/d_a_obj_lv4EdShutter/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_lv4Gate/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv4Gate/symbols.txt | 6 +- .../rels/d_a_obj_lv4HsTarget/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv4PoGate/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv4PoGate/symbols.txt | 6 +- .../rels/d_a_obj_lv4RailWall/symbols.txt | 6 +- .../rels/d_a_obj_lv4SlideWall/splits.txt | 2 +- .../rels/d_a_obj_lv4SlideWall/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv4bridge/symbols.txt | 6 +- .../rels/d_a_obj_lv4digsand/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv4floor/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv4sand/symbols.txt | 6 +- .../rels/d_a_obj_lv5FloorBoard/splits.txt | 2 +- .../rels/d_a_obj_lv5FloorBoard/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv5IceWall/splits.txt | 2 +- .../rels/d_a_obj_lv5IceWall/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv5SwIce/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv5SwIce/symbols.txt | 6 +- .../rels/d_a_obj_lv6ChangeGate/splits.txt | 2 +- .../rels/d_a_obj_lv6ChangeGate/symbols.txt | 6 +- .../rels/d_a_obj_lv6FurikoTrap/splits.txt | 2 +- .../rels/d_a_obj_lv6FurikoTrap/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv6Lblock/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv6Lblock/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv6SwGate/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv6SwGate/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv6SzGate/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv6SzGate/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv6Tenbin/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv6Tenbin/symbols.txt | 2 +- .../rels/d_a_obj_lv6TogeRoll/splits.txt | 2 +- .../rels/d_a_obj_lv6TogeRoll/symbols.txt | 6 +- .../rels/d_a_obj_lv6TogeTrap/splits.txt | 2 +- .../rels/d_a_obj_lv6TogeTrap/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv6bemos/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv6bemos2/symbols.txt | 7 +- .../GZ2J01/rels/d_a_obj_lv6swturn/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv7BsGate/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv7BsGate/symbols.txt | 6 +- .../rels/d_a_obj_lv7PropellerY/splits.txt | 2 +- .../rels/d_a_obj_lv7PropellerY/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv7bridge/symbols.txt | 5 +- .../rels/d_a_obj_lv8KekkaiTrap/splits.txt | 2 +- .../rels/d_a_obj_lv8KekkaiTrap/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_lv8Lift/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_lv8Lift/symbols.txt | 6 +- .../rels/d_a_obj_lv8OptiLift/splits.txt | 2 +- .../rels/d_a_obj_lv8OptiLift/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_lv8UdFloor/splits.txt | 2 +- .../rels/d_a_obj_lv8UdFloor/symbols.txt | 6 +- .../rels/d_a_obj_lv9SwShutter/splits.txt | 2 +- .../rels/d_a_obj_lv9SwShutter/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_magLift/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_magLift/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_magLiftRot/splits.txt | 2 +- .../rels/d_a_obj_magLiftRot/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_magne_arm/symbols.txt | 9 +- config/GZ2J01/rels/d_a_obj_maki/splits.txt | 2 +- .../rels/d_a_obj_master_sword/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_mgate/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_mie/splits.txt | 2 +- .../rels/d_a_obj_mirror_6pole/symbols.txt | 3 +- .../rels/d_a_obj_mirror_screw/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_movebox/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_movebox/symbols.txt | 11 +- config/GZ2J01/rels/d_a_obj_msima/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_msima/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_mvstair/symbols.txt | 8 +- config/GZ2J01/rels/d_a_obj_myogan/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_myogan/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_nameplate/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_nan/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_nan/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_nougu/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_octhashi/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_oiltubo/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_onsenTaru/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_onsenTaru/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_pdoor/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_pdtile/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_pillar/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_pillar/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_pleaf/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_poCandle/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_poCandle/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_poFire/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_poFire/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_poTbox/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_poTbox/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_pumpkin/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_pumpkin/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_rfHole/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_rfHole/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_rgate/symbols.txt | 8 +- .../GZ2J01/rels/d_a_obj_riverrock/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_riverrock/symbols.txt | 2 +- .../rels/d_a_obj_rope_bridge/symbols.txt | 5 +- .../GZ2J01/rels/d_a_obj_rotBridge/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_rotTrap/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_rotTrap/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_rstair/symbols.txt | 8 +- config/GZ2J01/rels/d_a_obj_rw/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_rw/symbols.txt | 2 +- .../rels/d_a_obj_sWallShutter/splits.txt | 2 +- .../rels/d_a_obj_sWallShutter/symbols.txt | 5 +- config/GZ2J01/rels/d_a_obj_saidan/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_saidan/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_scannon/symbols.txt | 3 +- .../rels/d_a_obj_scannon_crs/symbols.txt | 3 +- .../rels/d_a_obj_scannon_ten/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_sekidoor/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_sekidoor/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_sekizo/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_sekizo/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_sekizoa/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_sekizoa/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_shield/symbols.txt | 8 +- .../GZ2J01/rels/d_a_obj_smallkey/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_smgdoor/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_smtile/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_snowEffTag/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_so/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_so/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_spinLift/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_spinLift/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_ss_drink/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_stairBlock/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_stick/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_stone/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_stopper/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_stopper/symbols.txt | 7 +- .../GZ2J01/rels/d_a_obj_stopper2/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_swBallA/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_swBallB/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_swBallC/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_swLight/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_swhang/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_sword/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_swpush/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_swpush/symbols.txt | 8 +- .../GZ2J01/rels/d_a_obj_swpush2/symbols.txt | 8 +- config/GZ2J01/rels/d_a_obj_swpush5/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_swpush5/symbols.txt | 8 +- config/GZ2J01/rels/d_a_obj_swturn/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_syRock/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_syRock/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_taFence/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_taFence/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_takaraDai/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_takaraDai/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_ten/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_ten/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_thdoor/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_timeFire/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_timer/symbols.txt | 5 +- config/GZ2J01/rels/d_a_obj_tks/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_tks/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_toby/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_toby/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_tobyhouse/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_tobyhouse/symbols.txt | 2 +- .../GZ2J01/rels/d_a_obj_togeTrap/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_togeTrap/symbols.txt | 5 +- config/GZ2J01/rels/d_a_obj_tombo/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_tombo/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_tp/symbols.txt | 3 +- config/GZ2J01/rels/d_a_obj_treesh/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_twGate/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_volcball/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_volcbom/symbols.txt | 7 +- .../GZ2J01/rels/d_a_obj_warp_kbrg/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_warp_obrg/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_waterGate/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_waterGate/symbols.txt | 6 +- .../rels/d_a_obj_waterPillar/splits.txt | 2 +- .../rels/d_a_obj_waterPillar/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_wdStick/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_wdStick/symbols.txt | 6 +- config/GZ2J01/rels/d_a_obj_web0/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_web0/symbols.txt | 2 +- config/GZ2J01/rels/d_a_obj_web1/splits.txt | 2 +- config/GZ2J01/rels/d_a_obj_web1/symbols.txt | 2 +- .../rels/d_a_obj_well_cover/symbols.txt | 6 +- .../rels/d_a_obj_wood_statue/symbols.txt | 5 +- config/GZ2J01/rels/d_a_obj_yel_bag/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_yel_bag/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_yobikusa/symbols.txt | 3 +- .../GZ2J01/rels/d_a_obj_zrTurara/splits.txt | 2 +- .../GZ2J01/rels/d_a_obj_zrTurara/symbols.txt | 2 +- .../rels/d_a_obj_zrTuraraRock/splits.txt | 2 +- .../rels/d_a_obj_zrTuraraRock/symbols.txt | 6 +- .../GZ2J01/rels/d_a_obj_zraMark/symbols.txt | 4 +- config/GZ2J01/rels/d_a_peru/splits.txt | 2 +- config/GZ2J01/rels/d_a_peru/symbols.txt | 3 +- config/GZ2J01/rels/d_a_ppolamp/symbols.txt | 4 +- .../GZ2J01/rels/d_a_scene_exit2/symbols.txt | 5 +- config/GZ2J01/rels/d_a_spinner/splits.txt | 2 +- config/GZ2J01/rels/d_a_spinner/symbols.txt | 4 +- config/GZ2J01/rels/d_a_sq/splits.txt | 2 +- config/GZ2J01/rels/d_a_sq/symbols.txt | 2 +- config/GZ2J01/rels/d_a_swBall/symbols.txt | 6 +- config/GZ2J01/rels/d_a_swLBall/symbols.txt | 6 +- config/GZ2J01/rels/d_a_swc00/symbols.txt | 5 +- config/GZ2J01/rels/d_a_tag_CstaSw/splits.txt | 2 +- config/GZ2J01/rels/d_a_tag_TWgate/symbols.txt | 3 +- config/GZ2J01/rels/d_a_tag_csw/symbols.txt | 3 +- config/GZ2J01/rels/d_a_tag_evtmsg/symbols.txt | 3 +- .../GZ2J01/rels/d_a_tag_firewall/symbols.txt | 2 +- config/GZ2J01/rels/d_a_tag_hstop/splits.txt | 2 +- config/GZ2J01/rels/d_a_tag_lantern/splits.txt | 2 +- .../GZ2J01/rels/d_a_tag_lv2prchk/symbols.txt | 6 +- .../GZ2J01/rels/d_a_tag_lv6CstaSw/splits.txt | 2 +- config/GZ2J01/rels/d_a_tag_poFire/splits.txt | 2 +- .../rels/d_a_tag_river_back/symbols.txt | 6 +- .../rels/d_a_tag_statue_evt/symbols.txt | 5 +- .../GZ2J01/rels/d_a_tag_waterfall/splits.txt | 2 +- .../GZ2J01/rels/d_a_tag_waterfall/symbols.txt | 2 +- config/GZ2J01/rels/d_a_tbox/splits.txt | 2 +- config/GZ2J01/rels/d_a_tbox/symbols.txt | 5 +- config/GZ2J01/rels/d_a_tbox2/symbols.txt | 7 +- config/GZ2J01/rels/d_a_title/splits.txt | 2 +- config/GZ2J01/rels/d_a_title/symbols.txt | 3 +- config/GZ2J01/rels/d_a_ykgr/splits.txt | 2 +- config/GZ2J01/splits.txt | 11 +- config/GZ2J01/symbols.txt | 5914 ++++++++-------- config/GZ2P01/config.yml | 6 + config/GZ2P01/rels/d_a_arrow/splits.txt | 2 +- config/GZ2P01/rels/d_a_arrow/symbols.txt | 6 +- config/GZ2P01/rels/d_a_b_bh/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_bh/symbols.txt | 2 +- config/GZ2P01/rels/d_a_b_bq/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_bq/symbols.txt | 7 +- config/GZ2P01/rels/d_a_b_dr/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_dr/symbols.txt | 7 +- config/GZ2P01/rels/d_a_b_dre/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_dre/symbols.txt | 2 +- config/GZ2P01/rels/d_a_b_ds/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_ds/symbols.txt | 23 +- config/GZ2P01/rels/d_a_b_gg/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_gg/symbols.txt | 5 +- config/GZ2P01/rels/d_a_b_gm/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_gm/symbols.txt | 5 +- config/GZ2P01/rels/d_a_b_gnd/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_gnd/symbols.txt | 7 +- config/GZ2P01/rels/d_a_b_go/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_go/symbols.txt | 2 +- config/GZ2P01/rels/d_a_b_gos/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_gos/symbols.txt | 2 +- config/GZ2P01/rels/d_a_b_mgn/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_mgn/symbols.txt | 5 +- config/GZ2P01/rels/d_a_b_ob/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_ob/symbols.txt | 6 +- config/GZ2P01/rels/d_a_b_oh/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_oh/symbols.txt | 2 +- config/GZ2P01/rels/d_a_b_tn/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_tn/symbols.txt | 5 +- config/GZ2P01/rels/d_a_b_yo/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_yo/symbols.txt | 5 +- config/GZ2P01/rels/d_a_b_yo_ice/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_yo_ice/symbols.txt | 5 +- config/GZ2P01/rels/d_a_b_zant/splits.txt | 2 +- config/GZ2P01/rels/d_a_b_zant/symbols.txt | 5 +- .../GZ2P01/rels/d_a_b_zant_magic/symbols.txt | 3 +- .../GZ2P01/rels/d_a_b_zant_mobile/splits.txt | 2 +- .../GZ2P01/rels/d_a_b_zant_mobile/symbols.txt | 2 +- config/GZ2P01/rels/d_a_balloon_2D/splits.txt | 2 +- config/GZ2P01/rels/d_a_bd/splits.txt | 2 +- config/GZ2P01/rels/d_a_bd/symbols.txt | 2 +- config/GZ2P01/rels/d_a_bg_obj/symbols.txt | 5 +- config/GZ2P01/rels/d_a_boomerang/symbols.txt | 3 +- config/GZ2P01/rels/d_a_bullet/splits.txt | 2 +- config/GZ2P01/rels/d_a_canoe/splits.txt | 2 +- config/GZ2P01/rels/d_a_canoe/symbols.txt | 4 +- config/GZ2P01/rels/d_a_coach_2D/splits.txt | 2 +- config/GZ2P01/rels/d_a_cow/splits.txt | 2 +- config/GZ2P01/rels/d_a_cow/symbols.txt | 3 +- config/GZ2P01/rels/d_a_crod/symbols.txt | 2 +- config/GZ2P01/rels/d_a_cstatue/splits.txt | 2 +- config/GZ2P01/rels/d_a_cstatue/symbols.txt | 3 +- config/GZ2P01/rels/d_a_demo00/splits.txt | 2 +- config/GZ2P01/rels/d_a_demo00/symbols.txt | 5 +- config/GZ2P01/rels/d_a_demo_item/splits.txt | 2 +- config/GZ2P01/rels/d_a_demo_item/symbols.txt | 1 + config/GZ2P01/rels/d_a_do/splits.txt | 2 +- config/GZ2P01/rels/d_a_do/symbols.txt | 4 +- config/GZ2P01/rels/d_a_door_boss/symbols.txt | 5 +- .../GZ2P01/rels/d_a_door_bossL1/symbols.txt | 5 +- .../GZ2P01/rels/d_a_door_bossL5/symbols.txt | 5 +- .../GZ2P01/rels/d_a_door_dbdoor00/symbols.txt | 5 +- .../GZ2P01/rels/d_a_door_knob00/symbols.txt | 5 +- .../GZ2P01/rels/d_a_door_mbossL1/symbols.txt | 5 +- config/GZ2P01/rels/d_a_door_push/symbols.txt | 7 +- .../GZ2P01/rels/d_a_door_shutter/symbols.txt | 3 +- config/GZ2P01/rels/d_a_dshutter/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_ai/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ai/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_arrow/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_arrow/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_ba/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ba/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_bee/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_bee/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_bg/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_bg/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_bi/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_bi/symbols.txt | 6 +- config/GZ2P01/rels/d_a_e_bs/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_bs/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_bu/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_bu/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_bug/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_bug/symbols.txt | 8 +- config/GZ2P01/rels/d_a_e_cr/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_cr/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_db/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_db/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_dd/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_dd/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_df/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_df/symbols.txt | 6 +- config/GZ2P01/rels/d_a_e_dk/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_dk/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_dn/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_dn/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_dt/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_dt/symbols.txt | 4 +- config/GZ2P01/rels/d_a_e_fb/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_fb/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_fk/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_fk/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_fm/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_fm/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_fs/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_fs/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_fz/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_fz/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_ga/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ga/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_gb/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_gb/symbols.txt | 9 +- config/GZ2P01/rels/d_a_e_ge/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ge/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_gi/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_gi/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_gm/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_gm/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_gob/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_gob/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_gs/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_gs/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_hb/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_hb/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_hm/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_hm/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_hp/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_hp/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_hz/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_hz/symbols.txt | 6 +- config/GZ2P01/rels/d_a_e_hzelda/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_hzelda/symbols.txt | 9 +- config/GZ2P01/rels/d_a_e_is/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_is/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_kg/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_kg/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_kk/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_kk/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_kr/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_kr/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_mb/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_mb/symbols.txt | 18 +- config/GZ2P01/rels/d_a_e_mf/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_mf/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_mk/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_mk/symbols.txt | 4 +- config/GZ2P01/rels/d_a_e_mk_bo/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_mk_bo/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_mm/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_mm/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_mm_mt/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_ms/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ms/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_nest/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_nest/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_nz/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_nz/symbols.txt | 8 +- config/GZ2P01/rels/d_a_e_oc/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_oc/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_oct_bg/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_oct_bg/symbols.txt | 11 +- config/GZ2P01/rels/d_a_e_ot/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ot/symbols.txt | 10 +- config/GZ2P01/rels/d_a_e_ph/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ph/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_pm/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_pm/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_po/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_po/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_pz/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_pz/symbols.txt | 10 +- config/GZ2P01/rels/d_a_e_rb/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_rb/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_rd/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_rd/symbols.txt | 14 +- config/GZ2P01/rels/d_a_e_rdb/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_rdb/symbols.txt | 6 +- config/GZ2P01/rels/d_a_e_rdy/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_rdy/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_s1/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_s1/symbols.txt | 7 +- config/GZ2P01/rels/d_a_e_sb/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_sb/symbols.txt | 10 +- config/GZ2P01/rels/d_a_e_sf/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_sf/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_sg/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_sg/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_sh/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_sh/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_sm/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_sm/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_sm2/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_sm2/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_st/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_st/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_sw/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_sw/symbols.txt | 11 +- config/GZ2P01/rels/d_a_e_th/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_th/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_tk/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_tk/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_tk2/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_tk2/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_tt/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_tt/symbols.txt | 10 +- config/GZ2P01/rels/d_a_e_vt/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_vt/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_wb/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_wb/symbols.txt | 18 +- config/GZ2P01/rels/d_a_e_ws/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ws/symbols.txt | 6 +- config/GZ2P01/rels/d_a_e_ww/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ww/symbols.txt | 7 +- config/GZ2P01/rels/d_a_e_yc/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_yc/symbols.txt | 2 +- config/GZ2P01/rels/d_a_e_yd/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_yd/symbols.txt | 6 +- config/GZ2P01/rels/d_a_e_yg/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_yg/symbols.txt | 7 +- config/GZ2P01/rels/d_a_e_yh/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_yh/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_yk/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_yk/symbols.txt | 6 +- config/GZ2P01/rels/d_a_e_ym/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ym/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_ymb/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_ymb/symbols.txt | 5 +- config/GZ2P01/rels/d_a_e_yr/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_yr/symbols.txt | 3 +- config/GZ2P01/rels/d_a_e_zh/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_zh/symbols.txt | 10 +- config/GZ2P01/rels/d_a_e_zm/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_zm/symbols.txt | 6 +- config/GZ2P01/rels/d_a_e_zs/splits.txt | 2 +- config/GZ2P01/rels/d_a_e_zs/symbols.txt | 3 +- config/GZ2P01/rels/d_a_econt/symbols.txt | 2 +- config/GZ2P01/rels/d_a_ep/symbols.txt | 3 +- .../GZ2P01/rels/d_a_formation_mng/symbols.txt | 3 +- config/GZ2P01/rels/d_a_fr/splits.txt | 2 +- config/GZ2P01/rels/d_a_fr/symbols.txt | 2 +- config/GZ2P01/rels/d_a_grass/splits.txt | 2 +- config/GZ2P01/rels/d_a_grass/symbols.txt | 8 +- config/GZ2P01/rels/d_a_horse/splits.txt | 2 +- config/GZ2P01/rels/d_a_horse/symbols.txt | 17 +- config/GZ2P01/rels/d_a_hozelda/splits.txt | 1 + config/GZ2P01/rels/d_a_kago/splits.txt | 2 +- config/GZ2P01/rels/d_a_kago/symbols.txt | 2 +- config/GZ2P01/rels/d_a_kytag03/symbols.txt | 2 +- config/GZ2P01/rels/d_a_kytag06/splits.txt | 2 +- config/GZ2P01/rels/d_a_kytag06/symbols.txt | 3 +- config/GZ2P01/rels/d_a_mant/symbols.txt | 3 +- config/GZ2P01/rels/d_a_mg_fish/splits.txt | 2 +- config/GZ2P01/rels/d_a_mg_fish/symbols.txt | 5 +- config/GZ2P01/rels/d_a_mg_fshop/splits.txt | 2 +- config/GZ2P01/rels/d_a_mg_fshop/symbols.txt | 5 +- config/GZ2P01/rels/d_a_mg_rod/splits.txt | 2 +- config/GZ2P01/rels/d_a_mg_rod/symbols.txt | 15 +- config/GZ2P01/rels/d_a_midna/splits.txt | 1 + config/GZ2P01/rels/d_a_myna/splits.txt | 2 +- config/GZ2P01/rels/d_a_myna/symbols.txt | 3 +- config/GZ2P01/rels/d_a_nbomb/splits.txt | 2 +- config/GZ2P01/rels/d_a_nbomb/symbols.txt | 3 +- config/GZ2P01/rels/d_a_ni/splits.txt | 2 +- config/GZ2P01/rels/d_a_ni/symbols.txt | 9 +- config/GZ2P01/rels/d_a_npc_aru/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_aru/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_ash/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_ash/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_ashB/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_ashB/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_bans/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_bans/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_besu/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_besu/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_blue_ns/splits.txt | 2 +- .../GZ2P01/rels/d_a_npc_blue_ns/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_bou/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_bou/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_bouS/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_bouS/symbols.txt | 5 +- config/GZ2P01/rels/d_a_npc_cdn3/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_chat/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_chat/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_chin/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_chin/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_clerka/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_clerka/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_clerkb/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_clerkb/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_clerkt/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_clerkt/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_df/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_doc/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_doc/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_doorboy/splits.txt | 2 +- .../GZ2P01/rels/d_a_npc_doorboy/symbols.txt | 3 +- .../GZ2P01/rels/d_a_npc_drainSol/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_du/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_du/symbols.txt | 2 +- config/GZ2P01/rels/d_a_npc_fairy/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_fairy/symbols.txt | 3 +- .../rels/d_a_npc_fairy_seirei/splits.txt | 2 +- .../rels/d_a_npc_fairy_seirei/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_fish/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_gnd/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_gnd/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_gra/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_gra/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_grc/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_grc/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_grd/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_grd/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_grm/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_grm/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_grmc/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_grmc/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_gro/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_gro/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_grr/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_grr/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_grs/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_grs/symbols.txt | 5 +- config/GZ2P01/rels/d_a_npc_grz/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_grz/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_guard/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_gwolf/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_gwolf/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_hanjo/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_hanjo/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_henna/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_henna/symbols.txt | 5 +- config/GZ2P01/rels/d_a_npc_hoz/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_hoz/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_impal/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_impal/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_ins/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_ins/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_jagar/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_jagar/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_kakashi/splits.txt | 2 +- .../GZ2P01/rels/d_a_npc_kakashi/symbols.txt | 3 +- .../GZ2P01/rels/d_a_npc_kasi_hana/splits.txt | 2 +- .../GZ2P01/rels/d_a_npc_kasi_hana/symbols.txt | 3 +- .../GZ2P01/rels/d_a_npc_kasi_kyu/splits.txt | 2 +- .../GZ2P01/rels/d_a_npc_kasi_kyu/symbols.txt | 5 +- .../GZ2P01/rels/d_a_npc_kasi_mich/splits.txt | 2 +- .../GZ2P01/rels/d_a_npc_kasi_mich/symbols.txt | 5 +- config/GZ2P01/rels/d_a_npc_kkri/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_kkri/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_kn/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_kn/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_knj/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_knj/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_kolin/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_kolin/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_kolinb/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_kolinb/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_ks/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_ks/symbols.txt | 7 +- config/GZ2P01/rels/d_a_npc_kyury/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_len/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_len/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_lf/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_lf/symbols.txt | 6 +- config/GZ2P01/rels/d_a_npc_lud/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_lud/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_maro/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_maro/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_midp/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_midp/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_moi/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_moi/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_moir/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_moir/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_myna2/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_myna2/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_ne/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_ne/symbols.txt | 2 +- .../GZ2P01/rels/d_a_npc_pachi_besu/splits.txt | 2 +- .../rels/d_a_npc_pachi_besu/symbols.txt | 3 +- .../GZ2P01/rels/d_a_npc_pachi_maro/splits.txt | 2 +- .../rels/d_a_npc_pachi_maro/symbols.txt | 3 +- .../GZ2P01/rels/d_a_npc_pachi_taro/splits.txt | 2 +- .../rels/d_a_npc_pachi_taro/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_passer/symbols.txt | 3 +- .../GZ2P01/rels/d_a_npc_passer2/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_post/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_post/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_pouya/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_prayer/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_prayer/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_raca/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_raca/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_rafrel/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_rafrel/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_saru/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_saru/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_seib/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_seib/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_seic/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_seic/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_seid/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_seid/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_seira/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_seira/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_seira2/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_seira2/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_seirei/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_seirei/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_shad/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_shad/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_shaman/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_shaman/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_shoe/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_shoe/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_sola/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_sola/symbols.txt | 3 +- .../GZ2P01/rels/d_a_npc_soldierA/splits.txt | 2 +- .../GZ2P01/rels/d_a_npc_soldierA/symbols.txt | 3 +- .../GZ2P01/rels/d_a_npc_soldierB/splits.txt | 2 +- .../GZ2P01/rels/d_a_npc_soldierB/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_sq/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_sq/symbols.txt | 2 +- config/GZ2P01/rels/d_a_npc_taro/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_taro/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_the/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_the/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_theB/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_theB/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_tk/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_tk/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_tkc/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_tkc/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_tkj/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_tkj/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_tkj2/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_tkj2/symbols.txt | 2 +- config/GZ2P01/rels/d_a_npc_tks/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_tks/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_toby/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_toby/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_tr/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_tr/symbols.txt | 2 +- config/GZ2P01/rels/d_a_npc_uri/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_uri/symbols.txt | 3 +- .../GZ2P01/rels/d_a_npc_wrestler/splits.txt | 2 +- .../GZ2P01/rels/d_a_npc_wrestler/symbols.txt | 5 +- config/GZ2P01/rels/d_a_npc_yamid/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_yamid/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_yamis/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_yamis/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_yamit/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_yamit/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_yelia/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_yelia/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_ykm/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_ykm/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_ykw/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_ykw/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_zanb/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_zanb/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_zant/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_zant/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_zelR/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_zelR/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_zelRo/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_zelRo/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_zelda/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_zelda/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_zra/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_zrc/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_zrc/symbols.txt | 3 +- config/GZ2P01/rels/d_a_npc_zrz/splits.txt | 2 +- config/GZ2P01/rels/d_a_npc_zrz/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_Turara/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_Turara/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_TvCdlst/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_Y_taihou/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_Y_taihou/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_amiShutter/splits.txt | 2 +- .../rels/d_a_obj_amiShutter/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_ari/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_ari/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_automata/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_automata/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_avalanche/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_balloon/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_balloon/symbols.txt | 5 +- config/GZ2P01/rels/d_a_obj_barDesk/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_barDesk/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_batta/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_batta/symbols.txt | 5 +- config/GZ2P01/rels/d_a_obj_bed/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_bemos/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_bemos/symbols.txt | 10 +- .../GZ2P01/rels/d_a_obj_bk_leaf/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_bky_rock/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_bmWindow/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_bmWindow/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_bmshutter/symbols.txt | 8 +- .../GZ2P01/rels/d_a_obj_bosswarp/symbols.txt | 5 +- config/GZ2P01/rels/d_a_obj_boumato/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_brg/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_bsGate/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_bsGate/symbols.txt | 6 +- .../rels/d_a_obj_bubblePilar/splits.txt | 2 +- .../rels/d_a_obj_bubblePilar/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_carry/symbols.txt | 17 +- config/GZ2P01/rels/d_a_obj_cb/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_cb/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_cblock/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_cblock/symbols.txt | 4 +- config/GZ2P01/rels/d_a_obj_cdoor/symbols.txt | 8 +- .../rels/d_a_obj_chandelier/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_chest/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_cho/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_cho/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_cwall/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_cwall/symbols.txt | 5 +- config/GZ2P01/rels/d_a_obj_dan/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_dan/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_digsnow/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_dmelevator/splits.txt | 2 +- .../rels/d_a_obj_dmelevator/symbols.txt | 10 +- config/GZ2P01/rels/d_a_obj_drop/symbols.txt | 8 +- .../GZ2P01/rels/d_a_obj_fireWood/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_fireWood2/splits.txt | 2 +- .../rels/d_a_obj_firepillar/symbols.txt | 6 +- .../rels/d_a_obj_firepillar2/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_food/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_food/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_fw/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_fw/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_gadget/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_gadget/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_gb/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_geyser/symbols.txt | 8 +- .../GZ2P01/rels/d_a_obj_glowSphere/splits.txt | 2 +- .../rels/d_a_obj_glowSphere/symbols.txt | 8 +- config/GZ2P01/rels/d_a_obj_gm/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_gm/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_goGate/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_goGate/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_gomikabe/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_gomikabe/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_gpTaru/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_gpTaru/symbols.txt | 5 +- config/GZ2P01/rels/d_a_obj_gra2/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_gra2/symbols.txt | 3 +- .../rels/d_a_obj_groundwater/splits.txt | 2 +- .../rels/d_a_obj_groundwater/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_h_saku/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_heavySw/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_heavySw/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_hfuta/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_hfuta/symbols.txt | 4 +- .../GZ2P01/rels/d_a_obj_hsTarget/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_ice_s/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_iceblock/symbols.txt | 8 +- .../GZ2P01/rels/d_a_obj_iceleaf/symbols.txt | 7 +- config/GZ2P01/rels/d_a_obj_ita/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_itamato/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_ito/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_ito/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_kabuto/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_kabuto/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_kag/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_kag/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_kago/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_kago/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_kamakiri/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_kamakiri/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_kanban2/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_kanban2/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_kantera/symbols.txt | 6 +- .../rels/d_a_obj_katatsumuri/splits.txt | 2 +- .../rels/d_a_obj_katatsumuri/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_kbacket/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_kbacket/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_kbox/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_kbox/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_key/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_key/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_keyhole/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_keyhole/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_kgate/symbols.txt | 7 +- config/GZ2P01/rels/d_a_obj_ki/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_ki/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_kiPot/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_kiPot/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_kita/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_kita/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_kshutter/symbols.txt | 14 +- .../GZ2P01/rels/d_a_obj_ktOnFire/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_kuwagata/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_kuwagata/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_kznkarm/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_ladder/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_lbox/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_lbox/symbols.txt | 2 +- .../rels/d_a_obj_life_container/symbols.txt | 5 +- .../rels/d_a_obj_lv1Candle00/splits.txt | 2 +- .../rels/d_a_obj_lv1Candle01/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv2Candle/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv3Candle/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv3Water/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv3Water/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_lv3Water2/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv3Water2/symbols.txt | 3 +- .../rels/d_a_obj_lv4CandleDemoTag/splits.txt | 2 +- .../rels/d_a_obj_lv4CandleDemoTag/symbols.txt | 3 +- .../rels/d_a_obj_lv4CandleTag/splits.txt | 2 +- .../rels/d_a_obj_lv4CandleTag/symbols.txt | 6 +- .../rels/d_a_obj_lv4EdShutter/splits.txt | 2 +- .../rels/d_a_obj_lv4EdShutter/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_lv4Gate/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv4Gate/symbols.txt | 6 +- .../rels/d_a_obj_lv4HsTarget/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv4PoGate/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv4PoGate/symbols.txt | 6 +- .../rels/d_a_obj_lv4RailWall/symbols.txt | 6 +- .../rels/d_a_obj_lv4SlideWall/splits.txt | 2 +- .../rels/d_a_obj_lv4SlideWall/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv4bridge/symbols.txt | 6 +- .../rels/d_a_obj_lv4digsand/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv4floor/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv4sand/symbols.txt | 6 +- .../rels/d_a_obj_lv5FloorBoard/splits.txt | 2 +- .../rels/d_a_obj_lv5FloorBoard/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv5IceWall/splits.txt | 2 +- .../rels/d_a_obj_lv5IceWall/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv5SwIce/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv5SwIce/symbols.txt | 6 +- .../rels/d_a_obj_lv6ChangeGate/splits.txt | 2 +- .../rels/d_a_obj_lv6ChangeGate/symbols.txt | 6 +- .../rels/d_a_obj_lv6FurikoTrap/splits.txt | 2 +- .../rels/d_a_obj_lv6FurikoTrap/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv6Lblock/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv6Lblock/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv6SwGate/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv6SwGate/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv6SzGate/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv6SzGate/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv6Tenbin/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv6Tenbin/symbols.txt | 2 +- .../rels/d_a_obj_lv6TogeRoll/splits.txt | 2 +- .../rels/d_a_obj_lv6TogeRoll/symbols.txt | 6 +- .../rels/d_a_obj_lv6TogeTrap/splits.txt | 2 +- .../rels/d_a_obj_lv6TogeTrap/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv6bemos/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv6bemos2/symbols.txt | 7 +- .../GZ2P01/rels/d_a_obj_lv6swturn/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv7BsGate/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv7BsGate/symbols.txt | 6 +- .../rels/d_a_obj_lv7PropellerY/splits.txt | 2 +- .../rels/d_a_obj_lv7PropellerY/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv7bridge/symbols.txt | 5 +- .../rels/d_a_obj_lv8KekkaiTrap/splits.txt | 2 +- .../rels/d_a_obj_lv8KekkaiTrap/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_lv8Lift/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_lv8Lift/symbols.txt | 6 +- .../rels/d_a_obj_lv8OptiLift/splits.txt | 2 +- .../rels/d_a_obj_lv8OptiLift/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_lv8UdFloor/splits.txt | 2 +- .../rels/d_a_obj_lv8UdFloor/symbols.txt | 6 +- .../rels/d_a_obj_lv9SwShutter/splits.txt | 2 +- .../rels/d_a_obj_lv9SwShutter/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_magLift/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_magLift/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_magLiftRot/splits.txt | 2 +- .../rels/d_a_obj_magLiftRot/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_magne_arm/symbols.txt | 9 +- config/GZ2P01/rels/d_a_obj_maki/splits.txt | 2 +- .../rels/d_a_obj_master_sword/symbols.txt | 5 +- config/GZ2P01/rels/d_a_obj_mgate/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_mie/splits.txt | 2 +- .../rels/d_a_obj_mirror_6pole/symbols.txt | 3 +- .../rels/d_a_obj_mirror_screw/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_movebox/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_movebox/symbols.txt | 7 +- config/GZ2P01/rels/d_a_obj_msima/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_msima/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_mvstair/symbols.txt | 8 +- config/GZ2P01/rels/d_a_obj_myogan/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_myogan/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_nameplate/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_nan/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_nan/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_nougu/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_octhashi/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_oiltubo/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_onsenTaru/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_onsenTaru/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_pdoor/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_pdtile/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_pillar/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_pillar/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_pleaf/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_poCandle/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_poCandle/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_poFire/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_poFire/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_poTbox/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_poTbox/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_pumpkin/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_pumpkin/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_rfHole/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_rfHole/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_rgate/symbols.txt | 8 +- .../GZ2P01/rels/d_a_obj_riverrock/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_riverrock/symbols.txt | 2 +- .../rels/d_a_obj_rope_bridge/symbols.txt | 5 +- .../GZ2P01/rels/d_a_obj_rotBridge/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_rotTrap/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_rotTrap/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_rstair/symbols.txt | 8 +- config/GZ2P01/rels/d_a_obj_rw/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_rw/symbols.txt | 2 +- .../rels/d_a_obj_sWallShutter/splits.txt | 2 +- .../rels/d_a_obj_sWallShutter/symbols.txt | 5 +- config/GZ2P01/rels/d_a_obj_saidan/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_saidan/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_scannon/symbols.txt | 3 +- .../rels/d_a_obj_scannon_crs/symbols.txt | 3 +- .../rels/d_a_obj_scannon_ten/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_sekidoor/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_sekidoor/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_sekizo/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_sekizo/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_sekizoa/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_sekizoa/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_shield/symbols.txt | 8 +- .../GZ2P01/rels/d_a_obj_smallkey/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_smgdoor/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_smtile/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_snowEffTag/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_so/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_so/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_spinLift/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_spinLift/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_ss_drink/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_stairBlock/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_stick/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_stone/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_stopper/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_stopper/symbols.txt | 7 +- .../GZ2P01/rels/d_a_obj_stopper2/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_swBallA/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_swBallB/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_swBallC/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_swLight/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_swhang/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_sword/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_swpush/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_swpush/symbols.txt | 8 +- .../GZ2P01/rels/d_a_obj_swpush2/symbols.txt | 8 +- config/GZ2P01/rels/d_a_obj_swpush5/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_swpush5/symbols.txt | 8 +- config/GZ2P01/rels/d_a_obj_swturn/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_syRock/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_syRock/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_taFence/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_taFence/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_takaraDai/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_takaraDai/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_ten/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_ten/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_thdoor/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_timeFire/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_timer/symbols.txt | 5 +- config/GZ2P01/rels/d_a_obj_tks/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_tks/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_toby/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_toby/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_tobyhouse/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_tobyhouse/symbols.txt | 2 +- .../GZ2P01/rels/d_a_obj_togeTrap/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_togeTrap/symbols.txt | 5 +- config/GZ2P01/rels/d_a_obj_tombo/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_tombo/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_tp/symbols.txt | 3 +- config/GZ2P01/rels/d_a_obj_treesh/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_twGate/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_volcball/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_volcbom/symbols.txt | 7 +- .../GZ2P01/rels/d_a_obj_warp_kbrg/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_warp_obrg/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_waterGate/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_waterGate/symbols.txt | 6 +- .../rels/d_a_obj_waterPillar/splits.txt | 2 +- .../rels/d_a_obj_waterPillar/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_wdStick/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_wdStick/symbols.txt | 6 +- config/GZ2P01/rels/d_a_obj_web0/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_web0/symbols.txt | 2 +- config/GZ2P01/rels/d_a_obj_web1/splits.txt | 2 +- config/GZ2P01/rels/d_a_obj_web1/symbols.txt | 2 +- .../rels/d_a_obj_well_cover/symbols.txt | 6 +- .../rels/d_a_obj_wood_statue/symbols.txt | 5 +- config/GZ2P01/rels/d_a_obj_yel_bag/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_yel_bag/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_yobikusa/symbols.txt | 3 +- .../GZ2P01/rels/d_a_obj_zrTurara/splits.txt | 2 +- .../GZ2P01/rels/d_a_obj_zrTurara/symbols.txt | 2 +- .../rels/d_a_obj_zrTuraraRock/splits.txt | 2 +- .../rels/d_a_obj_zrTuraraRock/symbols.txt | 6 +- .../GZ2P01/rels/d_a_obj_zraMark/symbols.txt | 4 +- config/GZ2P01/rels/d_a_peru/splits.txt | 2 +- config/GZ2P01/rels/d_a_peru/symbols.txt | 3 +- config/GZ2P01/rels/d_a_ppolamp/symbols.txt | 4 +- .../GZ2P01/rels/d_a_scene_exit2/symbols.txt | 5 +- config/GZ2P01/rels/d_a_spinner/splits.txt | 2 +- config/GZ2P01/rels/d_a_spinner/symbols.txt | 4 +- config/GZ2P01/rels/d_a_sq/splits.txt | 2 +- config/GZ2P01/rels/d_a_sq/symbols.txt | 2 +- config/GZ2P01/rels/d_a_swBall/symbols.txt | 6 +- config/GZ2P01/rels/d_a_swLBall/symbols.txt | 6 +- config/GZ2P01/rels/d_a_swc00/symbols.txt | 5 +- config/GZ2P01/rels/d_a_tag_CstaSw/splits.txt | 2 +- config/GZ2P01/rels/d_a_tag_TWgate/symbols.txt | 3 +- config/GZ2P01/rels/d_a_tag_csw/symbols.txt | 3 +- config/GZ2P01/rels/d_a_tag_evtmsg/symbols.txt | 3 +- .../GZ2P01/rels/d_a_tag_firewall/symbols.txt | 2 +- config/GZ2P01/rels/d_a_tag_hstop/splits.txt | 2 +- config/GZ2P01/rels/d_a_tag_lantern/splits.txt | 2 +- .../GZ2P01/rels/d_a_tag_lv2prchk/symbols.txt | 6 +- .../GZ2P01/rels/d_a_tag_lv6CstaSw/splits.txt | 2 +- config/GZ2P01/rels/d_a_tag_poFire/splits.txt | 2 +- .../rels/d_a_tag_river_back/symbols.txt | 6 +- .../rels/d_a_tag_statue_evt/symbols.txt | 5 +- .../GZ2P01/rels/d_a_tag_waterfall/splits.txt | 2 +- .../GZ2P01/rels/d_a_tag_waterfall/symbols.txt | 2 +- config/GZ2P01/rels/d_a_tbox/splits.txt | 2 +- config/GZ2P01/rels/d_a_tbox/symbols.txt | 5 +- config/GZ2P01/rels/d_a_tbox2/symbols.txt | 7 +- config/GZ2P01/rels/d_a_title/splits.txt | 2 +- config/GZ2P01/rels/d_a_title/symbols.txt | 3 +- config/GZ2P01/rels/d_a_ykgr/splits.txt | 2 +- config/GZ2P01/splits.txt | 15 +- config/GZ2P01/symbols.txt | 6025 +++++++++-------- include/JSystem/JKernel/JKRArchive.h | 2 +- include/d/actor/d_a_obj_tornado2.h | 2 +- include/d/actor/d_a_tag_kago_fall.h | 2 +- include/d/d_s_logo.h | 2 + src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 2 - src/JSystem/JAudio2/JASDrumSet.cpp | 14 +- .../MSL/MSL_C/MSL_Common/Src/alloc.c | 1 - src/d/actor/d_a_alink_crawl.inc | 12 +- src/d/actor/d_a_b_bq.cpp | 84 +- src/d/actor/d_a_b_tn.cpp | 8 +- src/d/actor/d_a_door_knob00.cpp | 76 +- src/d/actor/d_a_door_push.cpp | 4 +- src/d/actor/d_a_e_dd.cpp | 24 +- src/d/actor/d_a_e_dk.cpp | 3 +- src/d/actor/d_a_e_oct_bg.cpp | 105 +- src/d/actor/d_a_e_sg.cpp | 8 +- src/d/actor/d_a_e_tk.cpp | 24 +- src/d/actor/d_a_e_tk2.cpp | 24 +- src/d/actor/d_a_e_tk_ball.cpp | 2 +- src/d/actor/d_a_e_yd.cpp | 8 +- src/d/actor/d_a_e_yk.cpp | 12 +- src/d/actor/d_a_hitobj.cpp | 30 +- src/d/actor/d_a_hozelda.cpp | 2 - src/d/actor/d_a_midna.cpp | 2 - src/d/actor/d_a_npc_du.cpp | 2 - src/d/actor/d_a_npc_lf.cpp | 20 +- src/d/actor/d_a_npc_tk.cpp | 8 +- src/d/actor/d_a_npc_tr.cpp | 8 +- src/d/actor/d_a_obj_Y_taihou.cpp | 15 +- src/d/actor/d_a_obj_barDesk.cpp | 2 - src/d/actor/d_a_obj_boumato.cpp | 20 +- src/d/actor/d_a_obj_cb.cpp | 8 +- src/d/actor/d_a_obj_cblock.cpp | 4 - src/d/actor/d_a_obj_crope.cpp | 14 +- src/d/actor/d_a_obj_dmelevator.cpp | 10 +- src/d/actor/d_a_obj_fan.cpp | 28 +- src/d/actor/d_a_obj_ladder.cpp | 81 +- src/d/actor/d_a_obj_lbox.cpp | 32 +- src/d/actor/d_a_obj_myogan.cpp | 8 +- src/d/actor/d_a_obj_nan.cpp | 8 +- src/d/actor/d_a_obj_octhashi.cpp | 28 +- src/d/actor/d_a_obj_riverrock.cpp | 8 +- src/d/actor/d_a_obj_rock.cpp | 24 +- src/d/actor/d_a_obj_so.cpp | 10 +- src/d/actor/d_a_obj_ten.cpp | 8 +- src/d/actor/d_a_obj_web0.cpp | 8 +- src/d/actor/d_a_obj_web1.cpp | 8 +- src/d/actor/d_a_obj_wflag.cpp | 6 +- src/d/actor/d_a_obj_ystone.cpp | 24 +- src/d/actor/d_a_tag_kago_fall.cpp | 2 +- src/d/actor/d_a_tag_statue_evt.cpp | 52 +- src/d/d_msg_scrn_staff.cpp | 8 +- 2576 files changed, 14309 insertions(+), 12675 deletions(-) diff --git a/config/GZ2E01/config.yml b/config/GZ2E01/config.yml index ac267026d9..edd4c3ab12 100644 --- a/config/GZ2E01/config.yml +++ b/config/GZ2E01/config.yml @@ -13,6 +13,12 @@ force_active: [ block_relocations: - source: .sdata:0x804505ac add_relocations: +- source: extab:0x80005624 + type: abs + target: __dt__26__partial_array_destructorFv +- source: extab:0x80005644 + type: abs + target: __dt__26__partial_array_destructorFv - source: .sdata:0x804505ac type: abs target: buffer__14mDoMtx_stack_c diff --git a/config/GZ2E01/rels/d_a_arrow/splits.txt b/config/GZ2E01/rels/d_a_arrow/splits.txt index 5066c91f19..7c1a6042c3 100644 --- a/config/GZ2E01/rels/d_a_arrow/splits.txt +++ b/config/GZ2E01/rels/d_a_arrow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_arrow.cpp: diff --git a/config/GZ2E01/rels/d_a_arrow/symbols.txt b/config/GZ2E01/rels/d_a_arrow/symbols.txt index 536c6fe5d8..44325c2768 100644 --- a/config/GZ2E01/rels/d_a_arrow/symbols.txt +++ b/config/GZ2E01/rels/d_a_arrow/symbols.txt @@ -59,7 +59,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3768 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3768 = .rodata:0x00000000; // type:object size:0xC scope:local l_atCpsSrc = .rodata:0x0000000C; // type:object size:0x4C scope:global l_coSphSrc = .rodata:0x00000058; // type:object size:0x40 scope:global @4130 = .rodata:0x00000098; // type:object size:0x4 scope:local align:4 data:float @@ -112,7 +112,8 @@ tmpColor$5589 = .rodata:0x00000164; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_45_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4777 = .data:0x00000020; // type:object size:0xC scope:local data:4byte @4874 = .data:0x0000002C; // type:object size:0xC scope:local @4974 = .data:0x00000038; // type:object size:0xC scope:local @@ -149,6 +150,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @4612 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte localOffset$4611 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_b_bh/splits.txt b/config/GZ2E01/rels/d_a_b_bh/splits.txt index afc6dbfe7e..55331d74cd 100644 --- a/config/GZ2E01/rels/d_a_b_bh/splits.txt +++ b/config/GZ2E01/rels/d_a_b_bh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_bh.cpp: diff --git a/config/GZ2E01/rels/d_a_b_bh/symbols.txt b/config/GZ2E01/rels/d_a_b_bh/symbols.txt index c22efde037..414a56ece1 100644 --- a/config/GZ2E01/rels/d_a_b_bh/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_bh/symbols.txt @@ -128,7 +128,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3759 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte bh = .bss:0x0000006C; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_b_bq/splits.txt b/config/GZ2E01/rels/d_a_b_bq/splits.txt index bcc48ab376..5c0f9c5a63 100644 --- a/config/GZ2E01/rels/d_a_b_bq/splits.txt +++ b/config/GZ2E01/rels/d_a_b_bq/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_bq.cpp: diff --git a/config/GZ2E01/rels/d_a_b_bq/symbols.txt b/config/GZ2E01/rels/d_a_b_bq/symbols.txt index 898084b407..ab663ecf85 100644 --- a/config/GZ2E01/rels/d_a_b_bq/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_bq/symbols.txt @@ -261,7 +261,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_139_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4431 = .data:0x00000020; // type:object size:0xA8 scope:local fireno$4463 = .data:0x000000C8; // type:object size:0x8 scope:local fireno$4473 = .data:0x000000D0; // type:object size:0x4 scope:local diff --git a/config/GZ2E01/rels/d_a_b_dr/splits.txt b/config/GZ2E01/rels/d_a_b_dr/splits.txt index 6bfa586d0a..0ecd3a4dcc 100644 --- a/config/GZ2E01/rels/d_a_b_dr/splits.txt +++ b/config/GZ2E01/rels/d_a_b_dr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_dr.cpp: diff --git a/config/GZ2E01/rels/d_a_b_dr/symbols.txt b/config/GZ2E01/rels/d_a_b_dr/symbols.txt index 4807429dba..f625f17459 100644 --- a/config/GZ2E01/rels/d_a_b_dr/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_dr/symbols.txt @@ -226,7 +226,8 @@ DOWN_SPH_DT$8062 = .rodata:0x000004FC; // type:object size:0xB4 scope:local alig ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_140_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_dr_week_src__22@unnamed@d_a_b_dr_cpp@ = .data:0x00000020; // type:object size:0x44 scope:global cc_dr_tail_src__22@unnamed@d_a_b_dr_cpp@ = .data:0x00000064; // type:object size:0x40 scope:global cc_dr_breath_at_src__22@unnamed@d_a_b_dr_cpp@ = .data:0x000000A4; // type:object size:0x40 scope:global diff --git a/config/GZ2E01/rels/d_a_b_dre/splits.txt b/config/GZ2E01/rels/d_a_b_dre/splits.txt index 31c56cd8e5..f7a33f0d9e 100644 --- a/config/GZ2E01/rels/d_a_b_dre/splits.txt +++ b/config/GZ2E01/rels/d_a_b_dre/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_dre.cpp: diff --git a/config/GZ2E01/rels/d_a_b_dre/symbols.txt b/config/GZ2E01/rels/d_a_b_dre/symbols.txt index dfdf3b33b9..6a2ffb43c0 100644 --- a/config/GZ2E01/rels/d_a_b_dre/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_dre/symbols.txt @@ -166,7 +166,7 @@ s_HeadPos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000060; // type:object size:0xC s_BodyPos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000078; // type:object size:0xC scope:global @3770 = .bss:0x00000084; // type:object size:0xC scope:local s_TalePos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000090; // type:object size:0xC scope:global -init$0000 = .bss:0x0000009C; // type:object size:0x1 scope:local align:1 data:byte +data_805CB0D4 = .bss:0x0000009C; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000A8; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_b_ds/splits.txt b/config/GZ2E01/rels/d_a_b_ds/splits.txt index 8dd0cb3279..f2729a483b 100644 --- a/config/GZ2E01/rels/d_a_b_ds/splits.txt +++ b/config/GZ2E01/rels/d_a_b_ds/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_ds.cpp: diff --git a/config/GZ2E01/rels/d_a_b_ds/symbols.txt b/config/GZ2E01/rels/d_a_b_ds/symbols.txt index 0f3b4ad2e5..9338c720bd 100644 --- a/config/GZ2E01/rels/d_a_b_ds/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_ds/symbols.txt @@ -450,7 +450,8 @@ B2_ETC_CC_DT$10792 = .rodata:0x0000078C; // type:object size:0x28 scope:local al ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_142_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3811 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3812 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3820 = .data:0x00000030; // type:object size:0x6 scope:local @@ -530,12 +531,12 @@ handR_ang = .bss:0x000000A6; // type:object size:0x2 scope:global handX_ang = .bss:0x000000A8; // type:object size:0x2 scope:global breathTimerBase = .bss:0x000000AA; // type:object size:0x1 scope:local align:1 data:byte @5249 = .bss:0x000000AC; // type:object size:0xC scope:local -init$3146 = .bss:0x000000B8; // type:object size:0x1 scope:local data:byte +init$3146 = .bss:0x000000B8; // type:object size:0x1 scope:local align:1 data:byte @5252 = .bss:0x000000BC; // type:object size:0xC scope:local @5253 = .bss:0x000000C8; // type:object size:0xC scope:local mOpPlayerDt$5248 = .bss:0x000000D4; // type:object size:0x24 scope:local @5255 = .bss:0x000000F8; // type:object size:0xC scope:local -init$3152 = .bss:0x00000104; // type:object size:0x1 scope:local data:byte +init$3152 = .bss:0x00000104; // type:object size:0x1 scope:local align:1 data:byte @5258 = .bss:0x00000108; // type:object size:0xC scope:local @5259 = .bss:0x00000114; // type:object size:0xC scope:local @5260 = .bss:0x00000120; // type:object size:0xC scope:local @@ -552,11 +553,11 @@ init$3152 = .bss:0x00000104; // type:object size:0x1 scope:local data:byte @5271 = .bss:0x000001A4; // type:object size:0xC scope:local mOpCenterDt$5254 = .bss:0x000001B0; // type:object size:0xB4 scope:local @5273 = .bss:0x00000264; // type:object size:0xC scope:local -init$3170 = .bss:0x00000270; // type:object size:0x1 scope:local data:byte +init$3170 = .bss:0x00000270; // type:object size:0x1 scope:local align:1 data:byte @5276 = .bss:0x00000274; // type:object size:0xC scope:local mOpCenterBodyDt$5272 = .bss:0x00000280; // type:object size:0x18 scope:local @5278 = .bss:0x00000298; // type:object size:0xC scope:local -init$3175 = .bss:0x000002A4; // type:object size:0x1 scope:local data:byte +init$3175 = .bss:0x000002A4; // type:object size:0x1 scope:local align:1 data:byte @5281 = .bss:0x000002A8; // type:object size:0xC scope:local @5282 = .bss:0x000002B4; // type:object size:0xC scope:local @5283 = .bss:0x000002C0; // type:object size:0xC scope:local @@ -573,30 +574,30 @@ init$3175 = .bss:0x000002A4; // type:object size:0x1 scope:local data:byte @5294 = .bss:0x00000344; // type:object size:0xC scope:local mOpEyeDt$5277 = .bss:0x00000350; // type:object size:0xB4 scope:local @5296 = .bss:0x00000404; // type:object size:0xC scope:local -init$3193 = .bss:0x00000410; // type:object size:0x1 scope:local data:byte +init$3193 = .bss:0x00000410; // type:object size:0x1 scope:local align:1 data:byte @5299 = .bss:0x00000414; // type:object size:0xC scope:local mOpEyeBodyDt$5295 = .bss:0x00000420; // type:object size:0x18 scope:local @6354 = .bss:0x00000438; // type:object size:0xC scope:local -init$4244 = .bss:0x00000444; // type:object size:0x1 scope:local data:byte +init$4244 = .bss:0x00000444; // type:object size:0x1 scope:local align:1 data:byte @6357 = .bss:0x00000448; // type:object size:0xC scope:local @6358 = .bss:0x00000454; // type:object size:0xC scope:local @6359 = .bss:0x00000460; // type:object size:0xC scope:local @6360 = .bss:0x0000046C; // type:object size:0xC scope:local down_center_dt$6353 = .bss:0x00000478; // type:object size:0x3C scope:local @6362 = .bss:0x000004B4; // type:object size:0xC scope:local -init$4252 = .bss:0x000004C0; // type:object size:0x1 scope:local data:byte +init$4252 = .bss:0x000004C0; // type:object size:0x1 scope:local align:1 data:byte @6365 = .bss:0x000004C4; // type:object size:0xC scope:local @6366 = .bss:0x000004D0; // type:object size:0xC scope:local @6367 = .bss:0x000004DC; // type:object size:0xC scope:local @6368 = .bss:0x000004E8; // type:object size:0xC scope:local down_eye_dt$6361 = .bss:0x000004F4; // type:object size:0x3C scope:local @7447 = .bss:0x00000530; // type:object size:0xC scope:local -init$5330 = .bss:0x0000053C; // type:object size:0x1 scope:local data:byte +init$5330 = .bss:0x0000053C; // type:object size:0x1 scope:local align:1 data:byte @7450 = .bss:0x00000540; // type:object size:0xC scope:local @7451 = .bss:0x0000054C; // type:object size:0xC scope:local mOp2PlayerDt$7446 = .bss:0x00000558; // type:object size:0x24 scope:local @7453 = .bss:0x0000057C; // type:object size:0xC scope:local -init$5336 = .bss:0x00000588; // type:object size:0x1 scope:local data:byte +init$5336 = .bss:0x00000588; // type:object size:0x1 scope:local align:1 data:byte @7456 = .bss:0x0000058C; // type:object size:0xC scope:local @7457 = .bss:0x00000598; // type:object size:0xC scope:local @7458 = .bss:0x000005A4; // type:object size:0xC scope:local @@ -605,7 +606,7 @@ init$5336 = .bss:0x00000588; // type:object size:0x1 scope:local data:byte @7461 = .bss:0x000005C8; // type:object size:0xC scope:local mOp2CenterDt$7452 = .bss:0x000005D4; // type:object size:0x54 scope:local @7463 = .bss:0x00000628; // type:object size:0xC scope:local -init$5346 = .bss:0x00000634; // type:object size:0x1 scope:local data:byte +init$5346 = .bss:0x00000634; // type:object size:0x1 scope:local align:1 data:byte @7466 = .bss:0x00000638; // type:object size:0xC scope:local @7467 = .bss:0x00000644; // type:object size:0xC scope:local @7468 = .bss:0x00000650; // type:object size:0xC scope:local @@ -614,24 +615,24 @@ init$5346 = .bss:0x00000634; // type:object size:0x1 scope:local data:byte @7471 = .bss:0x00000674; // type:object size:0xC scope:local mOp2EyeDt$7462 = .bss:0x00000680; // type:object size:0x54 scope:local @9091 = .bss:0x000006D4; // type:object size:0xC scope:local -init$6933 = .bss:0x000006E0; // type:object size:0x1 scope:local data:byte +init$6933 = .bss:0x000006E0; // type:object size:0x1 scope:local align:1 data:byte @9094 = .bss:0x000006E4; // type:object size:0xC scope:local mEd2CenterDt$9090 = .bss:0x000006F0; // type:object size:0x18 scope:local @9096 = .bss:0x00000708; // type:object size:0xC scope:local -init$6938 = .bss:0x00000714; // type:object size:0x1 scope:local data:byte +init$6938 = .bss:0x00000714; // type:object size:0x1 scope:local align:1 data:byte @9099 = .bss:0x00000718; // type:object size:0xC scope:local mEd22EyeDt$9095 = .bss:0x00000724; // type:object size:0x18 scope:local -init$7517 = .bss:0x0000073C; // type:object size:0x1 scope:local data:byte +init$7517 = .bss:0x0000073C; // type:object size:0x1 scope:local align:1 data:byte mWaitDt$9733 = .bss:0x00000740; // type:object size:0xC scope:local data:4byte @10210 = .bss:0x0000074C; // type:object size:0xC scope:local -init$8022 = .bss:0x00000758; // type:object size:0x1 scope:local data:byte +init$8022 = .bss:0x00000758; // type:object size:0x1 scope:local align:1 data:byte @10213 = .bss:0x0000075C; // type:object size:0xC scope:local @10214 = .bss:0x00000768; // type:object size:0xC scope:local @10215 = .bss:0x00000774; // type:object size:0xC scope:local @10216 = .bss:0x00000780; // type:object size:0xC scope:local head_cc_dt$10209 = .bss:0x0000078C; // type:object size:0x3C scope:local @10829 = .bss:0x000007C8; // type:object size:0xC scope:local -init$8634 = .bss:0x000007D4; // type:object size:0x1 scope:local data:byte +init$8634 = .bss:0x000007D4; // type:object size:0x1 scope:local align:1 data:byte @10832 = .bss:0x000007D8; // type:object size:0xC scope:local @10833 = .bss:0x000007E4; // type:object size:0xC scope:local @10834 = .bss:0x000007F0; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_b_gg/splits.txt b/config/GZ2E01/rels/d_a_b_gg/splits.txt index 76df93067a..37bbd10322 100644 --- a/config/GZ2E01/rels/d_a_b_gg/splits.txt +++ b/config/GZ2E01/rels/d_a_b_gg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gg.cpp: diff --git a/config/GZ2E01/rels/d_a_b_gg/symbols.txt b/config/GZ2E01/rels/d_a_b_gg/symbols.txt index ba3557c376..b36361f6c0 100644 --- a/config/GZ2E01/rels/d_a_b_gg/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_gg/symbols.txt @@ -267,7 +267,8 @@ ccSphSrc$3982 = .rodata:0x00000100; // type:object size:0x40 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_143_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3790 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3791 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3799 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_b_gm/splits.txt b/config/GZ2E01/rels/d_a_b_gm/splits.txt index 6fe68269de..caea243977 100644 --- a/config/GZ2E01/rels/d_a_b_gm/splits.txt +++ b/config/GZ2E01/rels/d_a_b_gm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gm.cpp: diff --git a/config/GZ2E01/rels/d_a_b_gm/symbols.txt b/config/GZ2E01/rels/d_a_b_gm/symbols.txt index 90604e9d5e..a049b7034a 100644 --- a/config/GZ2E01/rels/d_a_b_gm/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_gm/symbols.txt @@ -184,7 +184,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_144_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double name$4019 = .data:0x00000020; // type:object size:0x6 scope:local name$4042 = .data:0x00000028; // type:object size:0x8 scope:local @4354 = .data:0x00000030; // type:object size:0x2C scope:local @@ -227,7 +228,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_144_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4C scope:global data:byte ko_ct = .bss:0x000000A0; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_b_gnd/splits.txt b/config/GZ2E01/rels/d_a_b_gnd/splits.txt index c7e4552796..f369fe0fd7 100644 --- a/config/GZ2E01/rels/d_a_b_gnd/splits.txt +++ b/config/GZ2E01/rels/d_a_b_gnd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gnd.cpp: diff --git a/config/GZ2E01/rels/d_a_b_gnd/symbols.txt b/config/GZ2E01/rels/d_a_b_gnd/symbols.txt index 2bb590d871..984cdfcb81 100644 --- a/config/GZ2E01/rels/d_a_b_gnd/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_gnd/symbols.txt @@ -307,7 +307,8 @@ blur_model$8822 = .rodata:0x00000340; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_145_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_color$3983 = .data:0x00000020; // type:object size:0x4 scope:local chk_x$4163 = .data:0x00000024; // type:object size:0x10 scope:local chk_z$4164 = .data:0x00000034; // type:object size:0x10 scope:local @@ -362,13 +363,15 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3810 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte @4187 = .bss:0x00000070; // type:object size:0xC scope:local +init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte k_pos$4186 = .bss:0x00000080; // type:object size:0xC scope:local @4509 = .bss:0x0000008C; // type:object size:0xC scope:local b_path = .bss:0x00000098; // type:object size:0x60 scope:local align:4 data:float +unk_bss_0xF0 = .bss:0x000000F8; // type:object size:0x4 scope:local data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000FC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000100; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000104; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_b_go/splits.txt b/config/GZ2E01/rels/d_a_b_go/splits.txt index 6ef11f39b6..b7954231f5 100644 --- a/config/GZ2E01/rels/d_a_b_go/splits.txt +++ b/config/GZ2E01/rels/d_a_b_go/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_go.cpp: diff --git a/config/GZ2E01/rels/d_a_b_go/symbols.txt b/config/GZ2E01/rels/d_a_b_go/symbols.txt index dfe1704b06..32bbe05aad 100644 --- a/config/GZ2E01/rels/d_a_b_go/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_go/symbols.txt @@ -56,6 +56,6 @@ __vt__8cM3dGAab = .data:0x00000068; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000074; // type:object size:0x24 scope:global __vt__12daB_GO_HIO_c = .data:0x00000098; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +data_80604140 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_b_gos/splits.txt b/config/GZ2E01/rels/d_a_b_gos/splits.txt index 6ce1eba36b..ebd4ea4c44 100644 --- a/config/GZ2E01/rels/d_a_b_gos/splits.txt +++ b/config/GZ2E01/rels/d_a_b_gos/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gos.cpp: diff --git a/config/GZ2E01/rels/d_a_b_gos/symbols.txt b/config/GZ2E01/rels/d_a_b_gos/symbols.txt index 885d96fb44..e970d7e409 100644 --- a/config/GZ2E01/rels/d_a_b_gos/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_gos/symbols.txt @@ -61,6 +61,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B0; // type:object size:0x24 scope:global __vt__13daB_GOS_HIO_c = .data:0x000001D4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global boss = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte -init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte +data_8060560C = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x00000010; // type:object size:0xC scope:local l_HIO = .bss:0x0000001C; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_b_mgn/splits.txt b/config/GZ2E01/rels/d_a_b_mgn/splits.txt index 13e6c0c18c..76998b0b2e 100644 --- a/config/GZ2E01/rels/d_a_b_mgn/splits.txt +++ b/config/GZ2E01/rels/d_a_b_mgn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_mgn.cpp: diff --git a/config/GZ2E01/rels/d_a_b_mgn/symbols.txt b/config/GZ2E01/rels/d_a_b_mgn/symbols.txt index 8c3ec76c1f..3e137c12e1 100644 --- a/config/GZ2E01/rels/d_a_b_mgn/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_mgn/symbols.txt @@ -224,7 +224,8 @@ cc_set_jnt$7875 = .rodata:0x00000258; // type:object size:0x3C scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_148_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3807 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3808 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3816 = .data:0x00000030; // type:object size:0x6 scope:local @@ -255,6 +256,6 @@ __vt__12J3DFrameCtrl = .data:0x00000380; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x0000038C; // type:object size:0xC scope:global __vt__13daB_MGN_HIO_c = .data:0x00000398; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3944 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_b_ob/splits.txt b/config/GZ2E01/rels/d_a_b_ob/splits.txt index 453f3327f9..fcbb33befc 100644 --- a/config/GZ2E01/rels/d_a_b_ob/splits.txt +++ b/config/GZ2E01/rels/d_a_b_ob/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_ob.cpp: diff --git a/config/GZ2E01/rels/d_a_b_ob/symbols.txt b/config/GZ2E01/rels/d_a_b_ob/symbols.txt index e24d0372d2..33bc667a85 100644 --- a/config/GZ2E01/rels/d_a_b_ob/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_ob/symbols.txt @@ -298,7 +298,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_149_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double iso_eff$5401 = .data:0x00000020; // type:object size:0xA scope:local buf_p = .data:0x0000002C; // type:object size:0x4C scope:global size_p = .data:0x00000078; // type:object size:0x4C scope:global @@ -351,16 +352,16 @@ pno = .bss:0x0000007C; // type:object size:0x4 scope:global data:4byte fin = .bss:0x00000080; // type:object size:0x4 scope:global data:4byte bf_ct = .bss:0x00000084; // type:object size:0x4 scope:global data:4byte @5008 = .bss:0x00000088; // type:object size:0xC scope:local -init$2871 = .bss:0x00000094; // type:object size:0x1 scope:local align:1 +init$2871 = .bss:0x00000094; // type:object size:0x1 scope:local align:1 data:byte @5011 = .bss:0x00000098; // type:object size:0xC scope:local @5012 = .bss:0x000000A4; // type:object size:0xC scope:local @5013 = .bss:0x000000B0; // type:object size:0xC scope:local sdemo_p$5007 = .bss:0x000000BC; // type:object size:0x30 scope:local @6147 = .bss:0x000000EC; // type:object size:0xC scope:local -init$3982 = .bss:0x000000F8; // type:object size:0x1 scope:local align:1 +init$3982 = .bss:0x000000F8; // type:object size:0x1 scope:local align:1 data:byte room_pos$6146 = .bss:0x000000FC; // type:object size:0xC scope:local @6151 = .bss:0x00000108; // type:object size:0xC scope:local -init$3986 = .bss:0x00000114; // type:object size:0x1 scope:local align:1 +init$3986 = .bss:0x00000114; // type:object size:0x1 scope:local align:1 data:byte sc$6150 = .bss:0x00000118; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000124; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000128; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_b_oh/splits.txt b/config/GZ2E01/rels/d_a_b_oh/splits.txt index 63c656903c..1707d87f7a 100644 --- a/config/GZ2E01/rels/d_a_b_oh/splits.txt +++ b/config/GZ2E01/rels/d_a_b_oh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_oh.cpp: diff --git a/config/GZ2E01/rels/d_a_b_oh/symbols.txt b/config/GZ2E01/rels/d_a_b_oh/symbols.txt index daed63a928..4f725e6d8f 100644 --- a/config/GZ2E01/rels/d_a_b_oh/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_oh/symbols.txt @@ -100,7 +100,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +data_8061DBB5 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3645 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte boss = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_b_tn/splits.txt b/config/GZ2E01/rels/d_a_b_tn/splits.txt index c90af169cd..7345bf245e 100644 --- a/config/GZ2E01/rels/d_a_b_tn/splits.txt +++ b/config/GZ2E01/rels/d_a_b_tn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_tn.cpp: diff --git a/config/GZ2E01/rels/d_a_b_tn/symbols.txt b/config/GZ2E01/rels/d_a_b_tn/symbols.txt index c4bae1e7f5..b1150b9d7f 100644 --- a/config/GZ2E01/rels/d_a_b_tn/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_tn/symbols.txt @@ -270,7 +270,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_152_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3799 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3800 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3808 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_b_yo/splits.txt b/config/GZ2E01/rels/d_a_b_yo/splits.txt index 639db0fa1a..1bfd860136 100644 --- a/config/GZ2E01/rels/d_a_b_yo/splits.txt +++ b/config/GZ2E01/rels/d_a_b_yo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_yo.cpp: diff --git a/config/GZ2E01/rels/d_a_b_yo/symbols.txt b/config/GZ2E01/rels/d_a_b_yo/symbols.txt index 532ee0f219..3bd816b927 100644 --- a/config/GZ2E01/rels/d_a_b_yo/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_yo/symbols.txt @@ -222,7 +222,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_153_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_yo_src__22@unnamed@d_a_b_yo_cpp@ = .data:0x00000020; // type:object size:0x44 scope:global cc_yo_tg_src__22@unnamed@d_a_b_yo_cpp@ = .data:0x00000064; // type:object size:0x40 scope:global cc_yo_iron_src__22@unnamed@d_a_b_yo_cpp@ = .data:0x000000A4; // type:object size:0x40 scope:global diff --git a/config/GZ2E01/rels/d_a_b_yo_ice/splits.txt b/config/GZ2E01/rels/d_a_b_yo_ice/splits.txt index 8349ae09b3..baa4f2e91c 100644 --- a/config/GZ2E01/rels/d_a_b_yo_ice/splits.txt +++ b/config/GZ2E01/rels/d_a_b_yo_ice/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_yo_ice.cpp: diff --git a/config/GZ2E01/rels/d_a_b_yo_ice/symbols.txt b/config/GZ2E01/rels/d_a_b_yo_ice/symbols.txt index 742844fe30..c67ddad914 100644 --- a/config/GZ2E01/rels/d_a_b_yo_ice/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_yo_ice/symbols.txt @@ -110,7 +110,8 @@ yoi_fall_timer = .rodata:0x0000002C; // type:object size:0x28 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_154_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_yo_src__26@unnamed@d_a_b_yo_ice_cpp@ = .data:0x00000020; // type:object size:0x44 scope:global cc_yo_iron_src__26@unnamed@d_a_b_yo_ice_cpp@ = .data:0x00000064; // type:object size:0x44 scope:global cc_yo_cam_src__26@unnamed@d_a_b_yo_ice_cpp@ = .data:0x000000A8; // type:object size:0x44 scope:global @@ -130,6 +131,6 @@ __vt__8cM3dGCyl = .data:0x00000214; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000220; // type:object size:0xC scope:global __vt__13daB_YOI_HIO_c = .data:0x0000022C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3771 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_b_zant/splits.txt b/config/GZ2E01/rels/d_a_b_zant/splits.txt index 89293dbc7f..2954410a88 100644 --- a/config/GZ2E01/rels/d_a_b_zant/splits.txt +++ b/config/GZ2E01/rels/d_a_b_zant/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_zant.cpp: diff --git a/config/GZ2E01/rels/d_a_b_zant/symbols.txt b/config/GZ2E01/rels/d_a_b_zant/symbols.txt index 9c25cd6e55..b68a33d756 100644 --- a/config/GZ2E01/rels/d_a_b_zant/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_zant/symbols.txt @@ -289,7 +289,8 @@ damage_jump_speed$7712 = .rodata:0x0000024C; // type:object size:0x2C scope:loca ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_155_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_zant_src__24@unnamed@d_a_b_zant_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_zant_sword_src__24@unnamed@d_a_b_zant_cpp@ = .data:0x00000060; // type:object size:0x40 scope:global cc_zant_roll_src__24@unnamed@d_a_b_zant_cpp@ = .data:0x000000A0; // type:object size:0x44 scope:global diff --git a/config/GZ2E01/rels/d_a_b_zant_magic/symbols.txt b/config/GZ2E01/rels/d_a_b_zant_magic/symbols.txt index 85a55a6e8e..7ec44ca2ed 100644 --- a/config/GZ2E01/rels/d_a_b_zant_magic/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_zant_magic/symbols.txt @@ -46,7 +46,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_156_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_zant_src__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x00000020; // type:object size:0x4C scope:global cc_zant_src2__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x0000006C; // type:object size:0x40 scope:global cc_zant_src3__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x000000AC; // type:object size:0x40 scope:global diff --git a/config/GZ2E01/rels/d_a_b_zant_mobile/splits.txt b/config/GZ2E01/rels/d_a_b_zant_mobile/splits.txt index 80ce04e0f1..48fb27a5d2 100644 --- a/config/GZ2E01/rels/d_a_b_zant_mobile/splits.txt +++ b/config/GZ2E01/rels/d_a_b_zant_mobile/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_zant_mobile.cpp: diff --git a/config/GZ2E01/rels/d_a_b_zant_mobile/symbols.txt b/config/GZ2E01/rels/d_a_b_zant_mobile/symbols.txt index 8c5ab370d9..9e52faf26a 100644 --- a/config/GZ2E01/rels/d_a_b_zant_mobile/symbols.txt +++ b/config/GZ2E01/rels/d_a_b_zant_mobile/symbols.txt @@ -88,6 +88,6 @@ __vt__12J3DFrameCtrl = .data:0x000000F8; // type:object size:0xC scope:global __vt__14dBgS_ObjGndChk = .data:0x00000104; // type:object size:0x30 scope:global __vt__15daB_ZANTZ_HIO_c = .data:0x00000134; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_157_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_balloon_2D/splits.txt b/config/GZ2E01/rels/d_a_balloon_2D/splits.txt index 9180d9a115..be330b7a5c 100644 --- a/config/GZ2E01/rels/d_a_balloon_2D/splits.txt +++ b/config/GZ2E01/rels/d_a_balloon_2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_balloon_2D.cpp: diff --git a/config/GZ2E01/rels/d_a_bd/splits.txt b/config/GZ2E01/rels/d_a_bd/splits.txt index c01e402d7c..0c5664cb56 100644 --- a/config/GZ2E01/rels/d_a_bd/splits.txt +++ b/config/GZ2E01/rels/d_a_bd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_bd.cpp: diff --git a/config/GZ2E01/rels/d_a_bd/symbols.txt b/config/GZ2E01/rels/d_a_bd/symbols.txt index 5731497f87..0c0a76c15e 100644 --- a/config/GZ2E01/rels/d_a_bd/symbols.txt +++ b/config/GZ2E01/rels/d_a_bd/symbols.txt @@ -131,7 +131,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3937 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3946 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_bg_obj/symbols.txt b/config/GZ2E01/rels/d_a_bg_obj/symbols.txt index 53d7c32053..f84a475af3 100644 --- a/config/GZ2E01/rels/d_a_bg_obj/symbols.txt +++ b/config/GZ2E01/rels/d_a_bg_obj/symbols.txt @@ -80,7 +80,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_4_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_tri_src = .data:0x00000020; // type:object size:0x54 scope:global l_specName = .data:0x00000074; // type:object size:0x4 scope:global data:4byte @3761 = .data:0x00000078; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_boomerang/symbols.txt b/config/GZ2E01/rels/d_a_boomerang/symbols.txt index 1e869c1d51..9b59fce77d 100644 --- a/config/GZ2E01/rels/d_a_boomerang/symbols.txt +++ b/config/GZ2E01/rels/d_a_boomerang/symbols.txt @@ -125,7 +125,8 @@ l_lockSeFlg = .rodata:0x00000040; // type:object size:0x14 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_46_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @5412 = .data:0x00000020; // type:object size:0xC scope:local data:4byte @5579 = .data:0x0000002C; // type:object size:0xC scope:local data:4byte l_atCpsSrc = .data:0x00000038; // type:object size:0x4C scope:global @@ -163,13 +164,13 @@ __vt__19daBoomerang_sight_c = .data:0x000001E4; // type:object size:0x10 scope:g @1010 = .bss:0x00000038; // type:object size:0x1 scope:local @1009 = .bss:0x0000003C; // type:object size:0x1 scope:local l_HIO = .bss:0x00000040; // type:object size:0x1 scope:global -init$2449 = .bss:0x00000041; // type:object size:0x1 scope:local align:1 +init$2449 = .bss:0x00000041; // type:object size:0x1 scope:local align:1 data:byte effDirection$5075 = .bss:0x00000044; // type:object size:0xC scope:local -init$2452 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 +init$2452 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte effScale0$5078 = .bss:0x00000054; // type:object size:0xC scope:local -init$2455 = .bss:0x00000060; // type:object size:0x1 scope:local align:1 +init$2455 = .bss:0x00000060; // type:object size:0x1 scope:local align:1 data:byte effScaleSand$5081 = .bss:0x00000064; // type:object size:0xC scope:local -init$2458 = .bss:0x00000070; // type:object size:0x1 scope:local align:1 +init$2458 = .bss:0x00000070; // type:object size:0x1 scope:local align:1 data:byte effScaleGrass$5084 = .bss:0x00000074; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_bullet/splits.txt b/config/GZ2E01/rels/d_a_bullet/splits.txt index 580fde4232..a68bf22432 100644 --- a/config/GZ2E01/rels/d_a_bullet/splits.txt +++ b/config/GZ2E01/rels/d_a_bullet/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_bullet.cpp: diff --git a/config/GZ2E01/rels/d_a_canoe/splits.txt b/config/GZ2E01/rels/d_a_canoe/splits.txt index c45ab13f2f..a4ad8e394c 100644 --- a/config/GZ2E01/rels/d_a_canoe/splits.txt +++ b/config/GZ2E01/rels/d_a_canoe/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_canoe.cpp: diff --git a/config/GZ2E01/rels/d_a_canoe/symbols.txt b/config/GZ2E01/rels/d_a_canoe/symbols.txt index 2d70658869..c1eea38106 100644 --- a/config/GZ2E01/rels/d_a_canoe/symbols.txt +++ b/config/GZ2E01/rels/d_a_canoe/symbols.txt @@ -40,7 +40,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3766 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3766 = .rodata:0x00000000; // type:object size:0xC scope:local l_arcName = .rodata:0x0000000C; // type:object size:0x6 scope:global data:string l_arcName2 = .rodata:0x00000014; // type:object size:0x7 scope:global data:string l_arcName3 = .rodata:0x0000001C; // type:object size:0x8 scope:global data:string @@ -124,8 +124,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @5103 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte paddleRippleScale$5102 = .bss:0x00000058; // type:object size:0xC scope:local @5356 = .bss:0x00000064; // type:object size:0xC scope:local +init$0001 = .bss:0x00000070; // type:object size:0x1 scope:local align:1 data:byte bodyRippleScale$5355 = .bss:0x00000074; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_coach_2D/splits.txt b/config/GZ2E01/rels/d_a_coach_2D/splits.txt index 1f225391f5..6d1128a89f 100644 --- a/config/GZ2E01/rels/d_a_coach_2D/splits.txt +++ b/config/GZ2E01/rels/d_a_coach_2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_coach_2D.cpp: diff --git a/config/GZ2E01/rels/d_a_cow/splits.txt b/config/GZ2E01/rels/d_a_cow/splits.txt index 38d3de1d06..35666f2bdc 100644 --- a/config/GZ2E01/rels/d_a_cow/splits.txt +++ b/config/GZ2E01/rels/d_a_cow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_cow.cpp: diff --git a/config/GZ2E01/rels/d_a_cow/symbols.txt b/config/GZ2E01/rels/d_a_cow/symbols.txt index db9bd84e51..2b0e1640f5 100644 --- a/config/GZ2E01/rels/d_a_cow/symbols.txt +++ b/config/GZ2E01/rels/d_a_cow/symbols.txt @@ -201,7 +201,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_163_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__21@unnamed@d_a_cow_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global pen_dir__21@unnamed@d_a_cow_cpp@ = .data:0x00000060; // type:object size:0x2 scope:global data:2byte gate_dir__21@unnamed@d_a_cow_cpp@ = .data:0x00000062; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2E01/rels/d_a_crod/symbols.txt b/config/GZ2E01/rels/d_a_crod/symbols.txt index c41167bdd7..3110023bf4 100644 --- a/config/GZ2E01/rels/d_a_crod/symbols.txt +++ b/config/GZ2E01/rels/d_a_crod/symbols.txt @@ -44,4 +44,4 @@ __vt__10cCcD_GStts = .data:0x000000A8; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x000000B4; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000C0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000CC; // type:object size:0xC scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_cstatue/splits.txt b/config/GZ2E01/rels/d_a_cstatue/splits.txt index e80e577aa1..ea8ebe0f7e 100644 --- a/config/GZ2E01/rels/d_a_cstatue/splits.txt +++ b/config/GZ2E01/rels/d_a_cstatue/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_cstatue.cpp: diff --git a/config/GZ2E01/rels/d_a_cstatue/symbols.txt b/config/GZ2E01/rels/d_a_cstatue/symbols.txt index 146823774d..3f329debd2 100644 --- a/config/GZ2E01/rels/d_a_cstatue/symbols.txt +++ b/config/GZ2E01/rels/d_a_cstatue/symbols.txt @@ -131,7 +131,8 @@ brkIdx$6115 = .rodata:0x00000308; // type:object size:0xA scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_164_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_atCpsSrc = .data:0x00000020; // type:object size:0x4C scope:global l_cylSrc = .data:0x0000006C; // type:object size:0x44 scope:global l_sphSrc = .data:0x000000B0; // type:object size:0x40 scope:global diff --git a/config/GZ2E01/rels/d_a_demo00/splits.txt b/config/GZ2E01/rels/d_a_demo00/splits.txt index 480c9e0411..a59a8f3eac 100644 --- a/config/GZ2E01/rels/d_a_demo00/splits.txt +++ b/config/GZ2E01/rels/d_a_demo00/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_demo00.cpp: diff --git a/config/GZ2E01/rels/d_a_demo00/symbols.txt b/config/GZ2E01/rels/d_a_demo00/symbols.txt index fc69e6351b..4c7f71f3dc 100644 --- a/config/GZ2E01/rels/d_a_demo00/symbols.txt +++ b/config/GZ2E01/rels/d_a_demo00/symbols.txt @@ -42,7 +42,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3727 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3727 = .rodata:0x00000000; // type:object size:0xC scope:local @4004 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @4122 = .rodata:0x00000010; // type:object size:0x4 scope:local @4123 = .rodata:0x00000014; // type:object size:0x4 scope:local align:4 data:float @@ -117,7 +117,8 @@ l_itemNo$localstatic3$execute__10daDemo00_cFv = .rodata:0x0000006C; // type:obje ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_48_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_lightData = .data:0x00000020; // type:object size:0x18 scope:global @4662 = .data:0x00000038; // type:object size:0xC scope:local data:4byte @4676 = .data:0x00000044; // type:object size:0xC scope:local data:4byte diff --git a/config/GZ2E01/rels/d_a_demo_item/splits.txt b/config/GZ2E01/rels/d_a_demo_item/splits.txt index 8f26b5f468..6009d922bf 100644 --- a/config/GZ2E01/rels/d_a_demo_item/splits.txt +++ b/config/GZ2E01/rels/d_a_demo_item/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_demo_item.cpp: diff --git a/config/GZ2E01/rels/d_a_demo_item/symbols.txt b/config/GZ2E01/rels/d_a_demo_item/symbols.txt index c8478e43ab..65c7458e22 100644 --- a/config/GZ2E01/rels/d_a_demo_item/symbols.txt +++ b/config/GZ2E01/rels/d_a_demo_item/symbols.txt @@ -96,7 +96,7 @@ l_wolf_offset = .bss:0x0000006C; // type:object size:0xC scope:global @3760 = .bss:0x00000078; // type:object size:0xC scope:local l_horse_offset = .bss:0x00000084; // type:object size:0xC scope:global @4275 = .bss:0x00000090; // type:object size:0xC scope:local -init$1935 = .bss:0x0000009C; // type:object size:0x1 scope:local +init$1935 = .bss:0x0000009C; // type:object size:0x1 scope:local align:1 data:byte @4278 = .bss:0x000000A0; // type:object size:0xC scope:local @4279 = .bss:0x000000AC; // type:object size:0xC scope:local offset_tbl$4274 = .bss:0x000000B8; // type:object size:0x24 scope:local diff --git a/config/GZ2E01/rels/d_a_do/splits.txt b/config/GZ2E01/rels/d_a_do/splits.txt index 4048a749bb..bcd5ed0814 100644 --- a/config/GZ2E01/rels/d_a_do/splits.txt +++ b/config/GZ2E01/rels/d_a_do/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_do.cpp: diff --git a/config/GZ2E01/rels/d_a_do/symbols.txt b/config/GZ2E01/rels/d_a_do/symbols.txt index 598470af7f..3547a91977 100644 --- a/config/GZ2E01/rels/d_a_do/symbols.txt +++ b/config/GZ2E01/rels/d_a_do/symbols.txt @@ -200,13 +200,15 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte +noFallCheck = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte target_info = .bss:0x00000074; // type:object size:0x14 scope:global target_info_count = .bss:0x00000088; // type:object size:0x4 scope:global data:4byte target_bgc = .bss:0x0000008C; // type:object size:0x14 scope:global @5578 = .bss:0x000000A0; // type:object size:0xC scope:local +init$0000 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte scc$5577 = .bss:0x000000B0; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000BC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000C0; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_door_boss/symbols.txt b/config/GZ2E01/rels/d_a_door_boss/symbols.txt index 4767613840..4ef7fa00dd 100644 --- a/config/GZ2E01/rels/d_a_door_boss/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_boss/symbols.txt @@ -60,7 +60,8 @@ l_staff_name = .rodata:0x00000058; // type:object size:0xD scope:global data:str ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_166_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double action_table$3817 = .data:0x00000020; // type:object size:0x2C scope:local @3939 = .data:0x0000004C; // type:object size:0x2C scope:local @3938 = .data:0x00000078; // type:object size:0x2C scope:local @@ -74,4 +75,4 @@ g_profile_BOSS_DOOR = .data:0x00000124; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_door_bossL1/symbols.txt b/config/GZ2E01/rels/d_a_door_bossL1/symbols.txt index 1bc1880ca9..f57fa5b430 100644 --- a/config/GZ2E01/rels/d_a_door_bossL1/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_bossL1/symbols.txt @@ -93,7 +93,8 @@ l_lv6_eff_b$4257 = .rodata:0x00000074; // type:object size:0x4 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_64_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_stageName$3673 = .data:0x00000020; // type:object size:0x50 scope:local @3700 = .data:0x00000070; // type:object size:0x28 scope:local @3713 = .data:0x00000098; // type:object size:0x28 scope:local @@ -111,4 +112,4 @@ g_profile_L1BOSS_DOOR = .data:0x00000240; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000270; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000027C; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000002A0; // type:object size:0xC scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_door_bossL5/symbols.txt b/config/GZ2E01/rels/d_a_door_bossL5/symbols.txt index 47cd28ae83..46e61149a6 100644 --- a/config/GZ2E01/rels/d_a_door_bossL5/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_bossL5/symbols.txt @@ -70,7 +70,8 @@ l_staff_name = .rodata:0x00000034; // type:object size:0xD scope:global data:str ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_167_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double action_table$3861 = .data:0x00000020; // type:object size:0x38 scope:local @3952 = .data:0x00000058; // type:object size:0x2C scope:local @3951 = .data:0x00000084; // type:object size:0x38 scope:local @@ -84,4 +85,4 @@ g_profile_L5BOSS_DOOR = .data:0x0000013C; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x0000016C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000178; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x0000019C; // type:object size:0xC scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_door_dbdoor00/symbols.txt b/config/GZ2E01/rels/d_a_door_dbdoor00/symbols.txt index 012a27ccbc..d259d973dd 100644 --- a/config/GZ2E01/rels/d_a_door_dbdoor00/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_dbdoor00/symbols.txt @@ -53,7 +53,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_6_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmd_base_name = .data:0x00000020; // type:object size:0x4 scope:global data:4byte action_table$3865 = .data:0x00000024; // type:object size:0x24 scope:local @3957 = .data:0x00000048; // type:object size:0x24 scope:local diff --git a/config/GZ2E01/rels/d_a_door_knob00/symbols.txt b/config/GZ2E01/rels/d_a_door_knob00/symbols.txt index 8e6a14b2dd..b629c4e60b 100644 --- a/config/GZ2E01/rels/d_a_door_knob00/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_knob00/symbols.txt @@ -76,7 +76,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_7_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmd_base_name = .data:0x00000020; // type:object size:0x4 scope:global data:4byte ev_name_table$4009 = .data:0x00000024; // type:object size:0x1C scope:local action_table$4177 = .data:0x00000040; // type:object size:0x40 scope:local diff --git a/config/GZ2E01/rels/d_a_door_mbossL1/symbols.txt b/config/GZ2E01/rels/d_a_door_mbossL1/symbols.txt index 54c9a0bed8..24458203e0 100644 --- a/config/GZ2E01/rels/d_a_door_mbossL1/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_mbossL1/symbols.txt @@ -143,7 +143,8 @@ l_eff_id_lv4$4706 = .rodata:0x00000094; // type:object size:0xA scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_168_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_door_open_demo = .data:0x00000020; // type:object size:0x2C scope:global l_door_open_demoB = .data:0x0000004C; // type:object size:0x2C scope:global l_door_open_demoLv5 = .data:0x00000078; // type:object size:0x10 scope:global @@ -168,4 +169,4 @@ __vt__14dBgS_ObjGndChk = .data:0x00000358; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000388; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000394; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000003B8; // type:object size:0xC scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_door_push/symbols.txt b/config/GZ2E01/rels/d_a_door_push/symbols.txt index affd271169..d79d13330a 100644 --- a/config/GZ2E01/rels/d_a_door_push/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_push/symbols.txt @@ -52,7 +52,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_169_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float @3792 = .data:0x0000003C; // type:object size:0xC scope:local data:4byte @@ -65,5 +66,5 @@ action_table$3910 = .data:0x0000009C; // type:object size:0xC scope:local daDoorPush_METHODS = .data:0x000000A8; // type:object size:0x20 scope:global g_profile_PushDoor = .data:0x000000C8; // type:object size:0x30 scope:global __vt__12daDoorPush_c = .data:0x000000F8; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 -init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_door_shutter/symbols.txt b/config/GZ2E01/rels/d_a_door_shutter/symbols.txt index d9b55d0b4b..88669bf327 100644 --- a/config/GZ2E01/rels/d_a_door_shutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_door_shutter/symbols.txt @@ -139,7 +139,8 @@ l_eff_id$4449 = .rodata:0x00000044; // type:object size:0x4 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_8_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3980 = .data:0x00000020; // type:object size:0x34 scope:local @4126 = .data:0x00000054; // type:object size:0x34 scope:local @4496 = .data:0x00000088; // type:object size:0x34 scope:local diff --git a/config/GZ2E01/rels/d_a_dshutter/symbols.txt b/config/GZ2E01/rels/d_a_dshutter/symbols.txt index fae8ea8767..f3d957ffe2 100644 --- a/config/GZ2E01/rels/d_a_dshutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_dshutter/symbols.txt @@ -40,7 +40,8 @@ l_heap_size = .rodata:0x00000018; // type:object size:0xC scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_10_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0xC scope:global @3631 = .data:0x0000002C; // type:object size:0xC scope:local @3632 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_ai/splits.txt b/config/GZ2E01/rels/d_a_e_ai/splits.txt index baa5914f6b..8effc34a59 100644 --- a/config/GZ2E01/rels/d_a_e_ai/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ai/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ai.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ai/symbols.txt b/config/GZ2E01/rels/d_a_e_ai/symbols.txt index bbb0483d7c..9406df7a15 100644 --- a/config/GZ2E01/rels/d_a_e_ai/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ai/symbols.txt @@ -96,7 +96,8 @@ shield_sph_src$3818 = .rodata:0x0000007C; // type:object size:0x40 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_170_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -113,6 +114,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000114; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000138; // type:object size:0xC scope:global __vt__12daE_AI_HIO_c = .data:0x00000144; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_arrow/splits.txt b/config/GZ2E01/rels/d_a_e_arrow/splits.txt index 13f6223baa..706fc8f133 100644 --- a/config/GZ2E01/rels/d_a_e_arrow/splits.txt +++ b/config/GZ2E01/rels/d_a_e_arrow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_arrow.cpp: diff --git a/config/GZ2E01/rels/d_a_e_arrow/symbols.txt b/config/GZ2E01/rels/d_a_e_arrow/symbols.txt index b32fd228c9..d53d22a879 100644 --- a/config/GZ2E01/rels/d_a_e_arrow/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_arrow/symbols.txt @@ -88,7 +88,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_171_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double fire_name$4663 = .data:0x00000020; // type:object size:0x8 scope:local at_sph_src$5035 = .data:0x00000028; // type:object size:0x40 scope:local tg_sph_src$5036 = .data:0x00000068; // type:object size:0x40 scope:local diff --git a/config/GZ2E01/rels/d_a_e_ba/splits.txt b/config/GZ2E01/rels/d_a_e_ba/splits.txt index 6e14363e38..5b53c9a3b1 100644 --- a/config/GZ2E01/rels/d_a_e_ba/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ba/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ba.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ba/symbols.txt b/config/GZ2E01/rels/d_a_e_ba/symbols.txt index 1640972ff5..9ed9de9bdb 100644 --- a/config/GZ2E01/rels/d_a_e_ba/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ba/symbols.txt @@ -95,7 +95,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_172_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3826 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3827 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3835 = .data:0x00000030; // type:object size:0x6 scope:local @@ -114,7 +115,7 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12daE_BA_HIO_c = .data:0x00000184; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3963 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte check_index$4162 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_e_bee/splits.txt b/config/GZ2E01/rels/d_a_e_bee/splits.txt index 07fbd9ead7..24515fbaeb 100644 --- a/config/GZ2E01/rels/d_a_e_bee/splits.txt +++ b/config/GZ2E01/rels/d_a_e_bee/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bee.cpp: diff --git a/config/GZ2E01/rels/d_a_e_bee/symbols.txt b/config/GZ2E01/rels/d_a_e_bee/symbols.txt index 6c2bf35204..0deebb878e 100644 --- a/config/GZ2E01/rels/d_a_e_bee/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bee/symbols.txt @@ -106,12 +106,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3765 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte -init$0000 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte +ccCylSet = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte @4455 = .bss:0x00000068; // type:object size:0xC scope:local -init$2267 = .bss:0x00000074; // type:object size:0x1 scope:local align:1 +init$2267 = .bss:0x00000074; // type:object size:0x1 scope:local align:1 data:byte non$4454 = .bss:0x00000078; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000088; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_bg/splits.txt b/config/GZ2E01/rels/d_a_e_bg/splits.txt index 3dfd48865c..ef7b3fe271 100644 --- a/config/GZ2E01/rels/d_a_e_bg/splits.txt +++ b/config/GZ2E01/rels/d_a_e_bg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bg.cpp: diff --git a/config/GZ2E01/rels/d_a_e_bg/symbols.txt b/config/GZ2E01/rels/d_a_e_bg/symbols.txt index beed6f3d59..dbc6558b68 100644 --- a/config/GZ2E01/rels/d_a_e_bg/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bg/symbols.txt @@ -105,6 +105,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global __vt__12daE_BG_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_bi/splits.txt b/config/GZ2E01/rels/d_a_e_bi/splits.txt index 58283d77c8..653298655a 100644 --- a/config/GZ2E01/rels/d_a_e_bi/splits.txt +++ b/config/GZ2E01/rels/d_a_e_bi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bi.cpp: diff --git a/config/GZ2E01/rels/d_a_e_bi/symbols.txt b/config/GZ2E01/rels/d_a_e_bi/symbols.txt index 94901e64f2..5aae62e605 100644 --- a/config/GZ2E01/rels/d_a_e_bi/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bi/symbols.txt @@ -102,7 +102,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_175_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -140,10 +141,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte @4522 = .bss:0x00000070; // type:object size:0xC scope:local +init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte sc$4521 = .bss:0x00000080; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000008C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000090; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_bs/splits.txt b/config/GZ2E01/rels/d_a_e_bs/splits.txt index 52104b5bdc..4683bf1c88 100644 --- a/config/GZ2E01/rels/d_a_e_bs/splits.txt +++ b/config/GZ2E01/rels/d_a_e_bs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bs.cpp: diff --git a/config/GZ2E01/rels/d_a_e_bs/symbols.txt b/config/GZ2E01/rels/d_a_e_bs/symbols.txt index 2e290ad3a0..c0fa1bc1b0 100644 --- a/config/GZ2E01/rels/d_a_e_bs/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bs/symbols.txt @@ -97,7 +97,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_177_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -116,6 +117,6 @@ __vt__8cM3dGAab = .data:0x00000184; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000190; // type:object size:0x24 scope:global __vt__12daE_BS_HIO_c = .data:0x000001B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_bu/splits.txt b/config/GZ2E01/rels/d_a_e_bu/splits.txt index d099d0c2a5..cb43e2362d 100644 --- a/config/GZ2E01/rels/d_a_e_bu/splits.txt +++ b/config/GZ2E01/rels/d_a_e_bu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bu.cpp: diff --git a/config/GZ2E01/rels/d_a_e_bu/symbols.txt b/config/GZ2E01/rels/d_a_e_bu/symbols.txt index c5b4183809..b47d05ea80 100644 --- a/config/GZ2E01/rels/d_a_e_bu/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bu/symbols.txt @@ -96,7 +96,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_178_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -115,7 +116,7 @@ __vt__8cM3dGAab = .data:0x00000194; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001A0; // type:object size:0x24 scope:global __vt__12daE_BU_HIO_c = .data:0x000001C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte check_index$4007 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_e_bug/splits.txt b/config/GZ2E01/rels/d_a_e_bug/splits.txt index ab9630a930..4327da7562 100644 --- a/config/GZ2E01/rels/d_a_e_bug/splits.txt +++ b/config/GZ2E01/rels/d_a_e_bug/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bug.cpp: diff --git a/config/GZ2E01/rels/d_a_e_bug/symbols.txt b/config/GZ2E01/rels/d_a_e_bug/symbols.txt index 92424d7f92..fbefe44d68 100644 --- a/config/GZ2E01/rels/d_a_e_bug/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_bug/symbols.txt @@ -113,15 +113,15 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3824 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte -init$0000 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000065; // type:object size:0x1 scope:local align:1 data:byte +l_roomNo = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte +data_80697E8D = .bss:0x00000065; // type:object size:0x1 scope:local align:1 data:byte @3831 = .bss:0x00000068; // type:object size:0xC scope:local at_pos = .bss:0x00000074; // type:object size:0xC scope:global align:4 data:float at_size = .bss:0x00000080; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte +data_80697EAC = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000088; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000008C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000090; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_cr/splits.txt b/config/GZ2E01/rels/d_a_e_cr/splits.txt index 1e0c62a5d5..84d4c3ce75 100644 --- a/config/GZ2E01/rels/d_a_e_cr/splits.txt +++ b/config/GZ2E01/rels/d_a_e_cr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_cr.cpp: diff --git a/config/GZ2E01/rels/d_a_e_cr/symbols.txt b/config/GZ2E01/rels/d_a_e_cr/symbols.txt index 5cb834e7ab..9ef4c787b3 100644 --- a/config/GZ2E01/rels/d_a_e_cr/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_cr/symbols.txt @@ -71,7 +71,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_180_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -86,6 +87,6 @@ __vt__8cM3dGAab = .data:0x000000F8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000104; // type:object size:0x24 scope:global __vt__12daE_CR_HIO_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_db/splits.txt b/config/GZ2E01/rels/d_a_e_db/splits.txt index 04791bb43c..ae0869a6ab 100644 --- a/config/GZ2E01/rels/d_a_e_db/splits.txt +++ b/config/GZ2E01/rels/d_a_e_db/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_db.cpp: diff --git a/config/GZ2E01/rels/d_a_e_db/symbols.txt b/config/GZ2E01/rels/d_a_e_db/symbols.txt index b7557c0bc2..444504e036 100644 --- a/config/GZ2E01/rels/d_a_e_db/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_db/symbols.txt @@ -140,7 +140,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_182_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local @@ -164,6 +165,6 @@ __vt__8cM3dGAab = .data:0x000002F0; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:global __vt__12daE_DB_HIO_c = .data:0x00000310; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_dd/splits.txt b/config/GZ2E01/rels/d_a_e_dd/splits.txt index 31e1c647ec..5fb2c94238 100644 --- a/config/GZ2E01/rels/d_a_e_dd/splits.txt +++ b/config/GZ2E01/rels/d_a_e_dd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dd.cpp: diff --git a/config/GZ2E01/rels/d_a_e_dd/symbols.txt b/config/GZ2E01/rels/d_a_e_dd/symbols.txt index 2c29dc26d1..b685997279 100644 --- a/config/GZ2E01/rels/d_a_e_dd/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_dd/symbols.txt @@ -110,7 +110,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_184_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -134,7 +135,7 @@ __vt__12dBgS_ObjAcch = .data:0x000001B0; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001D4; // type:object size:0xC scope:global __vt__12daE_DD_HIO_c = .data:0x000001E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x28 scope:global data:byte check_index$4196 = .bss:0x00000040; // type:object size:0xFF scope:local diff --git a/config/GZ2E01/rels/d_a_e_df/splits.txt b/config/GZ2E01/rels/d_a_e_df/splits.txt index c29b8e5455..0c09a27f69 100644 --- a/config/GZ2E01/rels/d_a_e_df/splits.txt +++ b/config/GZ2E01/rels/d_a_e_df/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_df.cpp: diff --git a/config/GZ2E01/rels/d_a_e_df/symbols.txt b/config/GZ2E01/rels/d_a_e_df/symbols.txt index 9dcde89c43..da9e8d0dc7 100644 --- a/config/GZ2E01/rels/d_a_e_df/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_df/symbols.txt @@ -85,7 +85,8 @@ ccCylSrc$3961 = .rodata:0x0000002C; // type:object size:0x44 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_185_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3795 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3796 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3804 = .data:0x00000030; // type:object size:0x6 scope:local @@ -97,6 +98,6 @@ __vt__8cM3dGCyl = .data:0x000000A0; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000AC; // type:object size:0xC scope:global __vt__12daE_DF_HIO_c = .data:0x000000B8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3932 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_dk/splits.txt b/config/GZ2E01/rels/d_a_e_dk/splits.txt index d180106753..440de014bc 100644 --- a/config/GZ2E01/rels/d_a_e_dk/splits.txt +++ b/config/GZ2E01/rels/d_a_e_dk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dk.cpp: diff --git a/config/GZ2E01/rels/d_a_e_dk/symbols.txt b/config/GZ2E01/rels/d_a_e_dk/symbols.txt index 3552e2161b..6f277cd1d2 100644 --- a/config/GZ2E01/rels/d_a_e_dk/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_dk/symbols.txt @@ -106,7 +106,8 @@ dk_btk_name__22@unnamed@d_a_e_dk_cpp@ = .rodata:0x00000014; // type:object size: ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_186_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_dk_src__22@unnamed@d_a_e_dk_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_dk_at_src__22@unnamed@d_a_e_dk_cpp@ = .data:0x00000060; // type:object size:0x40 scope:global cc_dk_core_src__22@unnamed@d_a_e_dk_cpp@ = .data:0x000000A0; // type:object size:0x40 scope:global @@ -123,6 +124,6 @@ __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001A0; // type:object size:0xC scope:global __vt__12daE_DK_HIO_c = .data:0x000001AC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +data_806AD7F8 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3759 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_dn/splits.txt b/config/GZ2E01/rels/d_a_e_dn/splits.txt index 3dec0f57eb..091f7de8b8 100644 --- a/config/GZ2E01/rels/d_a_e_dn/splits.txt +++ b/config/GZ2E01/rels/d_a_e_dn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dn.cpp: diff --git a/config/GZ2E01/rels/d_a_e_dn/symbols.txt b/config/GZ2E01/rels/d_a_e_dn/symbols.txt index 644a4de6cd..383d4a2e94 100644 --- a/config/GZ2E01/rels/d_a_e_dn/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_dn/symbols.txt @@ -173,7 +173,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_65_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -219,7 +220,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte target_info = .bss:0x0000007C; // type:object size:0x28 scope:global diff --git a/config/GZ2E01/rels/d_a_e_dt/splits.txt b/config/GZ2E01/rels/d_a_e_dt/splits.txt index b0863c0ccd..2bde2c4c57 100644 --- a/config/GZ2E01/rels/d_a_e_dt/splits.txt +++ b/config/GZ2E01/rels/d_a_e_dt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dt.cpp: diff --git a/config/GZ2E01/rels/d_a_e_dt/symbols.txt b/config/GZ2E01/rels/d_a_e_dt/symbols.txt index 7ff748e24a..a24fffc558 100644 --- a/config/GZ2E01/rels/d_a_e_dt/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_dt/symbols.txt @@ -255,7 +255,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_187_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3787 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x30 scope:local data:byte mDt_OtamaNum__6E_DT_n = .bss:0x00000084; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_fb/splits.txt b/config/GZ2E01/rels/d_a_e_fb/splits.txt index 764e18f891..b043402c97 100644 --- a/config/GZ2E01/rels/d_a_e_fb/splits.txt +++ b/config/GZ2E01/rels/d_a_e_fb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fb.cpp: diff --git a/config/GZ2E01/rels/d_a_e_fb/symbols.txt b/config/GZ2E01/rels/d_a_e_fb/symbols.txt index 6ae5f04ebc..1448a9ed4a 100644 --- a/config/GZ2E01/rels/d_a_e_fb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fb/symbols.txt @@ -114,7 +114,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000078; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_fk/splits.txt b/config/GZ2E01/rels/d_a_e_fk/splits.txt index 6bda4f5c6b..50a0f28b85 100644 --- a/config/GZ2E01/rels/d_a_e_fk/splits.txt +++ b/config/GZ2E01/rels/d_a_e_fk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fk.cpp: diff --git a/config/GZ2E01/rels/d_a_e_fk/symbols.txt b/config/GZ2E01/rels/d_a_e_fk/symbols.txt index 2b65d35d70..1e1e8d6818 100644 --- a/config/GZ2E01/rels/d_a_e_fk/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fk/symbols.txt @@ -132,7 +132,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_189_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3843 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte s_dis__22@unnamed@d_a_e_fk_cpp@ = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_fm/splits.txt b/config/GZ2E01/rels/d_a_e_fm/splits.txt index 4694668680..56f30c0aa8 100644 --- a/config/GZ2E01/rels/d_a_e_fm/splits.txt +++ b/config/GZ2E01/rels/d_a_e_fm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fm.cpp: diff --git a/config/GZ2E01/rels/d_a_e_fm/symbols.txt b/config/GZ2E01/rels/d_a_e_fm/symbols.txt index e5876d4d68..a9d4680477 100644 --- a/config/GZ2E01/rels/d_a_e_fm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fm/symbols.txt @@ -241,7 +241,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_66_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double h_id$3853 = .data:0x00000020; // type:object size:0x6 scope:local chain_z = .data:0x00000028; // type:object size:0x64 scope:local tame_name$4558 = .data:0x0000008C; // type:object size:0x4 scope:local @@ -303,7 +304,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3772 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xB0 scope:local data:byte @3819 = .bss:0x00000104; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_fs/splits.txt b/config/GZ2E01/rels/d_a_e_fs/splits.txt index 4c707c74c0..0ad263ab26 100644 --- a/config/GZ2E01/rels/d_a_e_fs/splits.txt +++ b/config/GZ2E01/rels/d_a_e_fs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fs.cpp: diff --git a/config/GZ2E01/rels/d_a_e_fs/symbols.txt b/config/GZ2E01/rels/d_a_e_fs/symbols.txt index 80f5183849..9bac4573d1 100644 --- a/config/GZ2E01/rels/d_a_e_fs/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fs/symbols.txt @@ -91,7 +91,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_190_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3796 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3797 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3805 = .data:0x00000030; // type:object size:0x6 scope:local @@ -129,11 +130,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local s_AtCount__22@unnamed@d_a_e_fs_cpp@ = .bss:0x00000046; // type:object size:0x2 scope:global data:2byte -hio_set = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte @3933 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x1C scope:global data:byte @4275 = .bss:0x00000074; // type:object size:0xC scope:local -init$2218 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 +init$2218 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 data:byte sc$4274 = .bss:0x00000084; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000090; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000094; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_fz/splits.txt b/config/GZ2E01/rels/d_a_e_fz/splits.txt index c4e0d9a5e5..c475968316 100644 --- a/config/GZ2E01/rels/d_a_e_fz/splits.txt +++ b/config/GZ2E01/rels/d_a_e_fz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fz.cpp: diff --git a/config/GZ2E01/rels/d_a_e_fz/symbols.txt b/config/GZ2E01/rels/d_a_e_fz/symbols.txt index 4baaff79ea..cb7f9a15e1 100644 --- a/config/GZ2E01/rels/d_a_e_fz/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_fz/symbols.txt @@ -93,7 +93,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_191_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3682 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3683 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3691 = .data:0x00000030; // type:object size:0x6 scope:local @@ -111,6 +112,6 @@ __vt__8cM3dGAab = .data:0x0000015C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000168; // type:object size:0x24 scope:global __vt__12daE_FZ_HIO_c = .data:0x0000018C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +data_806C1BA0 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3819 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x38 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_ga/splits.txt b/config/GZ2E01/rels/d_a_e_ga/splits.txt index 9eedebfb9b..a593112a61 100644 --- a/config/GZ2E01/rels/d_a_e_ga/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ga/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ga.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ga/symbols.txt b/config/GZ2E01/rels/d_a_e_ga/symbols.txt index 64c39bb1ca..ea080e9058 100644 --- a/config/GZ2E01/rels/d_a_e_ga/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ga/symbols.txt @@ -41,6 +41,6 @@ l_daE_Ga_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_E_GA = .data:0x00000020; // type:object size:0x30 scope:global __vt__12daE_Ga_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_gb/splits.txt b/config/GZ2E01/rels/d_a_e_gb/splits.txt index d6d78508ea..edd944731f 100644 --- a/config/GZ2E01/rels/d_a_e_gb/splits.txt +++ b/config/GZ2E01/rels/d_a_e_gb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gb.cpp: diff --git a/config/GZ2E01/rels/d_a_e_gb/symbols.txt b/config/GZ2E01/rels/d_a_e_gb/symbols.txt index e88440aed4..ebc7d01fb1 100644 --- a/config/GZ2E01/rels/d_a_e_gb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_gb/symbols.txt @@ -167,7 +167,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_192_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local @@ -192,6 +193,6 @@ __vt__8cM3dGAab = .data:0x00000238; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000244; // type:object size:0xC scope:global __vt__12daE_GB_HIO_c = .data:0x00000250; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_192_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +data_806C7928 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3922 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x20 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_e_ge/splits.txt b/config/GZ2E01/rels/d_a_e_ge/splits.txt index 60894697a0..38aa83d186 100644 --- a/config/GZ2E01/rels/d_a_e_ge/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ge/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ge.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ge/symbols.txt b/config/GZ2E01/rels/d_a_e_ge/symbols.txt index 44659e7211..e006aa553a 100644 --- a/config/GZ2E01/rels/d_a_e_ge/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ge/symbols.txt @@ -127,7 +127,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_193_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3783 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3784 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3792 = .data:0x00000030; // type:object size:0x6 scope:local @@ -153,7 +154,7 @@ __vt__8cM3dGAab = .data:0x000001FC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000208; // type:object size:0x24 scope:global __vt__12daE_GE_HIO_c = .data:0x0000022C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3920 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x34 scope:global data:byte target_count = .bss:0x0000004C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_gi/splits.txt b/config/GZ2E01/rels/d_a_e_gi/splits.txt index 2d4d4d7c9f..7b4b9d46bf 100644 --- a/config/GZ2E01/rels/d_a_e_gi/splits.txt +++ b/config/GZ2E01/rels/d_a_e_gi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gi.cpp: diff --git a/config/GZ2E01/rels/d_a_e_gi/symbols.txt b/config/GZ2E01/rels/d_a_e_gi/symbols.txt index 387991fb14..39af69323a 100644 --- a/config/GZ2E01/rels/d_a_e_gi/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_gi/symbols.txt @@ -124,7 +124,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_194_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3786 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3787 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3795 = .data:0x00000030; // type:object size:0x6 scope:local @@ -142,7 +143,7 @@ __vt__8cM3dGSph = .data:0x00000160; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000016C; // type:object size:0x24 scope:global __vt__12daE_GI_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3923 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte m_cry_gi = .bss:0x00000044; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_gm/splits.txt b/config/GZ2E01/rels/d_a_e_gm/splits.txt index a7a62ae9bc..2a940ae23c 100644 --- a/config/GZ2E01/rels/d_a_e_gm/splits.txt +++ b/config/GZ2E01/rels/d_a_e_gm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gm.cpp: diff --git a/config/GZ2E01/rels/d_a_e_gm/symbols.txt b/config/GZ2E01/rels/d_a_e_gm/symbols.txt index c60ff60423..db0dcb16ba 100644 --- a/config/GZ2E01/rels/d_a_e_gm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_gm/symbols.txt @@ -135,7 +135,8 @@ l_heapsize = .rodata:0x00000140; // type:object size:0x8 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_195_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local @@ -217,7 +218,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4050 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte @4061 = .bss:0x0000007C; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_gob/splits.txt b/config/GZ2E01/rels/d_a_e_gob/splits.txt index 479e8b6be6..d1648abdbc 100644 --- a/config/GZ2E01/rels/d_a_e_gob/splits.txt +++ b/config/GZ2E01/rels/d_a_e_gob/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gob.cpp: diff --git a/config/GZ2E01/rels/d_a_e_gob/symbols.txt b/config/GZ2E01/rels/d_a_e_gob/symbols.txt index 18bade7ae4..23ea9f23e3 100644 --- a/config/GZ2E01/rels/d_a_e_gob/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_gob/symbols.txt @@ -207,7 +207,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3758 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte ms = .bss:0x00000074; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_e_gs/splits.txt b/config/GZ2E01/rels/d_a_e_gs/splits.txt index 1119561263..479ee51db3 100644 --- a/config/GZ2E01/rels/d_a_e_gs/splits.txt +++ b/config/GZ2E01/rels/d_a_e_gs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gs.cpp: diff --git a/config/GZ2E01/rels/d_a_e_gs/symbols.txt b/config/GZ2E01/rels/d_a_e_gs/symbols.txt index 4bce071f0c..761f1a11e7 100644 --- a/config/GZ2E01/rels/d_a_e_gs/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_gs/symbols.txt @@ -38,6 +38,6 @@ l_daE_GS_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_E_GS = .data:0x00000020; // type:object size:0x30 scope:global __vt__12daE_GS_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_hb/splits.txt b/config/GZ2E01/rels/d_a_e_hb/splits.txt index 9f53805739..ef28826270 100644 --- a/config/GZ2E01/rels/d_a_e_hb/splits.txt +++ b/config/GZ2E01/rels/d_a_e_hb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hb.cpp: diff --git a/config/GZ2E01/rels/d_a_e_hb/symbols.txt b/config/GZ2E01/rels/d_a_e_hb/symbols.txt index e15f981354..7c95937515 100644 --- a/config/GZ2E01/rels/d_a_e_hb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hb/symbols.txt @@ -122,7 +122,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_68_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -145,6 +146,6 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000001FC; // type:object size:0x14 scope:global __vt__12daE_HB_HIO_c = .data:0x00000210; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_hm/splits.txt b/config/GZ2E01/rels/d_a_e_hm/splits.txt index 74d7a16ae5..422c8424ba 100644 --- a/config/GZ2E01/rels/d_a_e_hm/splits.txt +++ b/config/GZ2E01/rels/d_a_e_hm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hm.cpp: diff --git a/config/GZ2E01/rels/d_a_e_hm/symbols.txt b/config/GZ2E01/rels/d_a_e_hm/symbols.txt index ab9bc3414e..93bfa6a9b6 100644 --- a/config/GZ2E01/rels/d_a_e_hm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hm/symbols.txt @@ -146,7 +146,8 @@ ccShpSrc$3893 = .rodata:0x00000040; // type:object size:0x40 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_199_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3670 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3671 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3679 = .data:0x00000030; // type:object size:0x6 scope:local @@ -181,7 +182,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3807 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_e_hp/splits.txt b/config/GZ2E01/rels/d_a_e_hp/splits.txt index 5d40f97ca1..1c44f1d8cc 100644 --- a/config/GZ2E01/rels/d_a_e_hp/splits.txt +++ b/config/GZ2E01/rels/d_a_e_hp/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hp.cpp: diff --git a/config/GZ2E01/rels/d_a_e_hp/symbols.txt b/config/GZ2E01/rels/d_a_e_hp/symbols.txt index d4918268e6..fc775b935a 100644 --- a/config/GZ2E01/rels/d_a_e_hp/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hp/symbols.txt @@ -101,7 +101,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_200_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3784 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3785 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3793 = .data:0x00000030; // type:object size:0x6 scope:local @@ -122,6 +123,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global __vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3921 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_hz/splits.txt b/config/GZ2E01/rels/d_a_e_hz/splits.txt index ee33ab3807..2265bcd5bb 100644 --- a/config/GZ2E01/rels/d_a_e_hz/splits.txt +++ b/config/GZ2E01/rels/d_a_e_hz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hz.cpp: diff --git a/config/GZ2E01/rels/d_a_e_hz/symbols.txt b/config/GZ2E01/rels/d_a_e_hz/symbols.txt index 61b863e987..90d1352f55 100644 --- a/config/GZ2E01/rels/d_a_e_hz/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hz/symbols.txt @@ -134,7 +134,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_201_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3845 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3846 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3854 = .data:0x00000030; // type:object size:0x6 scope:local @@ -170,13 +171,14 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3982 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global data:byte m_near_bomb = .bss:0x00000090; // type:object size:0x4 scope:global m_near_carry = .bss:0x00000094; // type:object size:0x4 scope:global m_near_weapon = .bss:0x00000098; // type:object size:0x4 scope:global @5585 = .bss:0x0000009C; // type:object size:0xC scope:local +init$0000 = .bss:0x000000A8; // type:object size:0x1 scope:local align:1 data:byte sc$5584 = .bss:0x000000AC; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B8; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000BC; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_hzelda/splits.txt b/config/GZ2E01/rels/d_a_e_hzelda/splits.txt index 4ea18ee7f1..cc06bc408a 100644 --- a/config/GZ2E01/rels/d_a_e_hzelda/splits.txt +++ b/config/GZ2E01/rels/d_a_e_hzelda/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hzelda.cpp: diff --git a/config/GZ2E01/rels/d_a_e_hzelda/symbols.txt b/config/GZ2E01/rels/d_a_e_hzelda/symbols.txt index 911200ee6f..b03bc04e63 100644 --- a/config/GZ2E01/rels/d_a_e_hzelda/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_hzelda/symbols.txt @@ -120,7 +120,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_202_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double b_id$4252 = .data:0x00000020; // type:object size:0x6 scope:local @4500 = .data:0x00000028; // type:object size:0x30 scope:local b_id$4879 = .data:0x00000058; // type:object size:0x6 scope:local @@ -143,6 +144,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000284; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000002A8; // type:object size:0xC scope:global __vt__16daE_HZELDA_HIO_c = .data:0x000002B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_202_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3762 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_e_is/splits.txt b/config/GZ2E01/rels/d_a_e_is/splits.txt index ed3b485b0e..dd431b766a 100644 --- a/config/GZ2E01/rels/d_a_e_is/splits.txt +++ b/config/GZ2E01/rels/d_a_e_is/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_is.cpp: diff --git a/config/GZ2E01/rels/d_a_e_is/symbols.txt b/config/GZ2E01/rels/d_a_e_is/symbols.txt index de0695fffa..792d94b2ec 100644 --- a/config/GZ2E01/rels/d_a_e_is/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_is/symbols.txt @@ -86,7 +86,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_203_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double at_sph_src$4258 = .data:0x00000020; // type:object size:0x40 scope:local cc_cyl_src$4259 = .data:0x00000060; // type:object size:0x44 scope:local core_sph_src$4260 = .data:0x000000A4; // type:object size:0x40 scope:local @@ -101,6 +102,6 @@ __vt__8cM3dGAab = .data:0x00000170; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12daE_IS_HIO_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_kg/splits.txt b/config/GZ2E01/rels/d_a_e_kg/splits.txt index 32fc575c97..269805d8f1 100644 --- a/config/GZ2E01/rels/d_a_e_kg/splits.txt +++ b/config/GZ2E01/rels/d_a_e_kg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kg.cpp: diff --git a/config/GZ2E01/rels/d_a_e_kg/symbols.txt b/config/GZ2E01/rels/d_a_e_kg/symbols.txt index 3fdd2fd24e..f44fc2d426 100644 --- a/config/GZ2E01/rels/d_a_e_kg/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_kg/symbols.txt @@ -88,7 +88,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_204_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_e_kk/splits.txt b/config/GZ2E01/rels/d_a_e_kk/splits.txt index 78b412d9ef..685d22cf7f 100644 --- a/config/GZ2E01/rels/d_a_e_kk/splits.txt +++ b/config/GZ2E01/rels/d_a_e_kk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kk.cpp: diff --git a/config/GZ2E01/rels/d_a_e_kk/symbols.txt b/config/GZ2E01/rels/d_a_e_kk/symbols.txt index 56245a3771..166b173641 100644 --- a/config/GZ2E01/rels/d_a_e_kk/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_kk/symbols.txt @@ -109,7 +109,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_205_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3671 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3672 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3680 = .data:0x00000030; // type:object size:0x6 scope:local @@ -127,6 +128,6 @@ __vt__8cM3dGAab = .data:0x00000174; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000180; // type:object size:0x24 scope:global __vt__12daE_KK_HIO_c = .data:0x000001A4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3808 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_kr/splits.txt b/config/GZ2E01/rels/d_a_e_kr/splits.txt index 38a744babe..42848809b2 100644 --- a/config/GZ2E01/rels/d_a_e_kr/splits.txt +++ b/config/GZ2E01/rels/d_a_e_kr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kr.cpp: diff --git a/config/GZ2E01/rels/d_a_e_kr/symbols.txt b/config/GZ2E01/rels/d_a_e_kr/symbols.txt index 37823a7cbb..63b0da4b14 100644 --- a/config/GZ2E01/rels/d_a_e_kr/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_kr/symbols.txt @@ -133,7 +133,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_206_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_e_mb/splits.txt b/config/GZ2E01/rels/d_a_e_mb/splits.txt index a359d07601..91f3010614 100644 --- a/config/GZ2E01/rels/d_a_e_mb/splits.txt +++ b/config/GZ2E01/rels/d_a_e_mb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mb.cpp: diff --git a/config/GZ2E01/rels/d_a_e_mb/symbols.txt b/config/GZ2E01/rels/d_a_e_mb/symbols.txt index e9f87eb36e..e57704174d 100644 --- a/config/GZ2E01/rels/d_a_e_mb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_mb/symbols.txt @@ -107,7 +107,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_207_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3759 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte @3824 = .bss:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_mf/splits.txt b/config/GZ2E01/rels/d_a_e_mf/splits.txt index 58906b79fe..f17172d89e 100644 --- a/config/GZ2E01/rels/d_a_e_mf/splits.txt +++ b/config/GZ2E01/rels/d_a_e_mf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mf.cpp: diff --git a/config/GZ2E01/rels/d_a_e_mf/symbols.txt b/config/GZ2E01/rels/d_a_e_mf/symbols.txt index bdc4ac0739..9e1c2745c3 100644 --- a/config/GZ2E01/rels/d_a_e_mf/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_mf/symbols.txt @@ -170,7 +170,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_209_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3707 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3708 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3716 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_e_mk/splits.txt b/config/GZ2E01/rels/d_a_e_mk/splits.txt index 4c7bea7ee9..cb3d85174f 100644 --- a/config/GZ2E01/rels/d_a_e_mk/splits.txt +++ b/config/GZ2E01/rels/d_a_e_mk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mk.cpp: diff --git a/config/GZ2E01/rels/d_a_e_mk/symbols.txt b/config/GZ2E01/rels/d_a_e_mk/symbols.txt index 4e43672c35..af0ca443a1 100644 --- a/config/GZ2E01/rels/d_a_e_mk/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_mk/symbols.txt @@ -258,12 +258,12 @@ demo_jump_pos_3 = .bss:0x00000084; // type:object size:0xC scope:global @3769 = .bss:0x00000090; // type:object size:0xC scope:local STAGE_CENTER_POS = .bss:0x0000009C; // type:object size:0xC scope:global align:4 data:float STAGE_ANGLE_Y = .bss:0x000000A8; // type:object size:0x2 scope:global data:2byte -init$0000 = .bss:0x000000AA; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x000000AA; // type:object size:0x1 scope:local align:1 data:byte @3772 = .bss:0x000000AC; // type:object size:0xC scope:local l_HIO = .bss:0x000000B8; // type:object size:0x24 scope:global data:byte target_info = .bss:0x000000DC; // type:object size:0x50 scope:global data:4byte target_info_count = .bss:0x0000012C; // type:object size:0x4 scope:global data:4byte -init$0000 = .bss:0x00000130; // type:object size:0x1 scope:local align:1 data:byte +lbl_210_bss_130 = .bss:0x00000130; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000134; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000138; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000013C; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_mk_bo/splits.txt b/config/GZ2E01/rels/d_a_e_mk_bo/splits.txt index 9f8095f62a..30a241f6a1 100644 --- a/config/GZ2E01/rels/d_a_e_mk_bo/splits.txt +++ b/config/GZ2E01/rels/d_a_e_mk_bo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mk_bo.cpp: diff --git a/config/GZ2E01/rels/d_a_e_mk_bo/symbols.txt b/config/GZ2E01/rels/d_a_e_mk_bo/symbols.txt index 7cf3369313..ba57d64374 100644 --- a/config/GZ2E01/rels/d_a_e_mk_bo/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_mk_bo/symbols.txt @@ -68,7 +68,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_211_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double bo_eno_1$4378 = .data:0x00000020; // type:object size:0x8 scope:local bo_eno_2$4379 = .data:0x00000028; // type:object size:0x8 scope:local bo_eno_12$4402 = .data:0x00000030; // type:object size:0x4 scope:local diff --git a/config/GZ2E01/rels/d_a_e_mm/splits.txt b/config/GZ2E01/rels/d_a_e_mm/splits.txt index 6f15426eb2..c6f4ae2d2d 100644 --- a/config/GZ2E01/rels/d_a_e_mm/splits.txt +++ b/config/GZ2E01/rels/d_a_e_mm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mm.cpp: diff --git a/config/GZ2E01/rels/d_a_e_mm/symbols.txt b/config/GZ2E01/rels/d_a_e_mm/symbols.txt index 27ebf1265a..b52d4c1e86 100644 --- a/config/GZ2E01/rels/d_a_e_mm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_mm/symbols.txt @@ -81,7 +81,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_212_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -100,6 +101,6 @@ __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12daE_MM_HIO_c = .data:0x000001A8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x34 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_mm_mt/symbols.txt b/config/GZ2E01/rels/d_a_e_mm_mt/symbols.txt index 8276c181e4..18a377d8d7 100644 --- a/config/GZ2E01/rels/d_a_e_mm_mt/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_mm_mt/symbols.txt @@ -78,7 +78,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_213_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_e_ms/splits.txt b/config/GZ2E01/rels/d_a_e_ms/splits.txt index 2941c2ee33..8a93758f63 100644 --- a/config/GZ2E01/rels/d_a_e_ms/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ms/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ms.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ms/symbols.txt b/config/GZ2E01/rels/d_a_e_ms/symbols.txt index 0416a451d6..e5861c6f7c 100644 --- a/config/GZ2E01/rels/d_a_e_ms/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ms/symbols.txt @@ -107,7 +107,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_214_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3679 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3680 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3688 = .data:0x00000030; // type:object size:0x6 scope:local @@ -142,7 +143,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3816 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte target_info = .bss:0x00000070; // type:object size:0x50 scope:global diff --git a/config/GZ2E01/rels/d_a_e_nest/splits.txt b/config/GZ2E01/rels/d_a_e_nest/splits.txt index 8ad0484758..e12dca12d4 100644 --- a/config/GZ2E01/rels/d_a_e_nest/splits.txt +++ b/config/GZ2E01/rels/d_a_e_nest/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_nest.cpp: diff --git a/config/GZ2E01/rels/d_a_e_nest/symbols.txt b/config/GZ2E01/rels/d_a_e_nest/symbols.txt index fff71ebdf3..0103015e20 100644 --- a/config/GZ2E01/rels/d_a_e_nest/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_nest/symbols.txt @@ -118,6 +118,6 @@ __vt__8cM3dGAab = .data:0x00000110; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000011C; // type:object size:0x24 scope:global __vt__14daE_Nest_HIO_c = .data:0x00000140; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3994 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_nz/splits.txt b/config/GZ2E01/rels/d_a_e_nz/splits.txt index a781156b2e..6bac93cb42 100644 --- a/config/GZ2E01/rels/d_a_e_nz/splits.txt +++ b/config/GZ2E01/rels/d_a_e_nz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_nz.cpp: diff --git a/config/GZ2E01/rels/d_a_e_nz/symbols.txt b/config/GZ2E01/rels/d_a_e_nz/symbols.txt index 6c50f55d1d..7c4edd85b9 100644 --- a/config/GZ2E01/rels/d_a_e_nz/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_nz/symbols.txt @@ -81,7 +81,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_215_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -116,11 +117,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte -lbl_215_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte +data_8072C454 = .bss:0x00000074; // type:object size:0x4 data:4byte @4220 = .bss:0x00000078; // type:object size:0xC scope:local +init$0000 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte sc$4219 = .bss:0x00000088; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000094; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000098; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_oc/splits.txt b/config/GZ2E01/rels/d_a_e_oc/splits.txt index 783af67c8f..4f15d581c2 100644 --- a/config/GZ2E01/rels/d_a_e_oc/splits.txt +++ b/config/GZ2E01/rels/d_a_e_oc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_oc.cpp: diff --git a/config/GZ2E01/rels/d_a_e_oc/symbols.txt b/config/GZ2E01/rels/d_a_e_oc/symbols.txt index 8af22da6c9..28127c03b5 100644 --- a/config/GZ2E01/rels/d_a_e_oc/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_oc/symbols.txt @@ -192,7 +192,8 @@ oc_attackc_trans__6E_OC_n = .rodata:0x00000054; // type:object size:0x28 scope:g ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_216_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3790 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3791 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3799 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_e_oct_bg/splits.txt b/config/GZ2E01/rels/d_a_e_oct_bg/splits.txt index fd7fd9801f..a9c2c451fb 100644 --- a/config/GZ2E01/rels/d_a_e_oct_bg/splits.txt +++ b/config/GZ2E01/rels/d_a_e_oct_bg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_oct_bg.cpp: diff --git a/config/GZ2E01/rels/d_a_e_oct_bg/symbols.txt b/config/GZ2E01/rels/d_a_e_oct_bg/symbols.txt index 009177bc9c..90e1f56598 100644 --- a/config/GZ2E01/rels/d_a_e_oct_bg/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_oct_bg/symbols.txt @@ -108,7 +108,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_217_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3618 = .data:0x00000020; // type:object size:0xC scope:local data:4byte cc_obg_src__26@unnamed@d_a_e_oct_bg_cpp@ = .data:0x0000002C; // type:object size:0x40 scope:global cc_obg_at_src__26@unnamed@d_a_e_oct_bg_cpp@ = .data:0x0000006C; // type:object size:0x40 scope:global @@ -165,11 +166,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +struct_8073A13D = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte -init$0000 = .bss:0x00000079; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x0000007A; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_78 = .bss:0x00000078; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_79 = .bss:0x00000079; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_7A = .bss:0x0000007A; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_7B = .bss:0x0000007B; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_ot/splits.txt b/config/GZ2E01/rels/d_a_e_ot/splits.txt index 7e4baaea3c..754e31e143 100644 --- a/config/GZ2E01/rels/d_a_e_ot/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ot/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ot.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ot/symbols.txt b/config/GZ2E01/rels/d_a_e_ot/symbols.txt index a8b7e3c902..734eefc6c6 100644 --- a/config/GZ2E01/rels/d_a_e_ot/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ot/symbols.txt @@ -95,7 +95,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_218_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3789 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3790 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3798 = .data:0x00000030; // type:object size:0x6 scope:local @@ -138,12 +139,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3926 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte -init$0000 = .bss:0x00000074; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000075; // type:object size:0x1 scope:local align:1 data:byte +data_8073D2DC = .bss:0x00000074; // type:object size:0x1 scope:local align:1 data:byte +data_8073D2DD = .bss:0x00000075; // type:object size:0x1 scope:local align:1 data:byte @4086 = .bss:0x00000078; // type:object size:0xC scope:local +init$0000 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte sc$4085 = .bss:0x00000088; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000094; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000098; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_ph/splits.txt b/config/GZ2E01/rels/d_a_e_ph/splits.txt index 98f255d16e..48eb4106b1 100644 --- a/config/GZ2E01/rels/d_a_e_ph/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ph/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ph.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ph/symbols.txt b/config/GZ2E01/rels/d_a_e_ph/symbols.txt index b76eb82272..eb78c230c3 100644 --- a/config/GZ2E01/rels/d_a_e_ph/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ph/symbols.txt @@ -120,6 +120,6 @@ __vt__8cM3dGAab = .data:0x0000005C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000068; // type:object size:0x24 scope:global __vt__12daE_PH_HIO_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +initialized = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3762 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_pm/splits.txt b/config/GZ2E01/rels/d_a_e_pm/splits.txt index 63707dd671..6c70901c73 100644 --- a/config/GZ2E01/rels/d_a_e_pm/splits.txt +++ b/config/GZ2E01/rels/d_a_e_pm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_pm.cpp: diff --git a/config/GZ2E01/rels/d_a_e_pm/symbols.txt b/config/GZ2E01/rels/d_a_e_pm/symbols.txt index 8e32b5fd71..09e8f72ba6 100644 --- a/config/GZ2E01/rels/d_a_e_pm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_pm/symbols.txt @@ -205,7 +205,8 @@ ccCylSrc$4052 = .rodata:0x00000050; // type:object size:0x44 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_220_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3789 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3790 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3798 = .data:0x00000030; // type:object size:0x6 scope:local @@ -246,7 +247,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3928 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4C scope:global data:byte s_dis__22@unnamed@d_a_e_pm_cpp@ = .bss:0x000000A0; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_e_po/splits.txt b/config/GZ2E01/rels/d_a_e_po/splits.txt index ca4de81d74..fe8c87b3c7 100644 --- a/config/GZ2E01/rels/d_a_e_po/splits.txt +++ b/config/GZ2E01/rels/d_a_e_po/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_po.cpp: diff --git a/config/GZ2E01/rels/d_a_e_po/symbols.txt b/config/GZ2E01/rels/d_a_e_po/symbols.txt index 868aa46850..d7f0034a53 100644 --- a/config/GZ2E01/rels/d_a_e_po/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_po/symbols.txt @@ -313,7 +313,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_221_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3796 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3797 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3805 = .data:0x00000030; // type:object size:0x6 scope:local @@ -363,7 +364,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3933 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global align:4 data:float mRollCount = .bss:0x00000090; // type:object size:0x2 scope:global diff --git a/config/GZ2E01/rels/d_a_e_pz/splits.txt b/config/GZ2E01/rels/d_a_e_pz/splits.txt index 1a3b9f60c7..d7f10891c5 100644 --- a/config/GZ2E01/rels/d_a_e_pz/splits.txt +++ b/config/GZ2E01/rels/d_a_e_pz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_pz.cpp: diff --git a/config/GZ2E01/rels/d_a_e_pz/symbols.txt b/config/GZ2E01/rels/d_a_e_pz/symbols.txt index b82313eecb..5d97bf684f 100644 --- a/config/GZ2E01/rels/d_a_e_pz/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_pz/symbols.txt @@ -218,7 +218,8 @@ mDBaBa_birthHani_dt = .rodata:0x00000264; // type:object size:0x30 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_222_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local @@ -268,13 +269,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3922 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global align:4 data:float lbl_222_bss_70 = .bss:0x00000070; // type:object size:0x1 data:byte lbl_222_bss_71 = .bss:0x00000071; // type:object size:0x1 data:byte @4339 = .bss:0x00000074; // type:object size:0xC scope:local -init$4340 = .bss:0x00000080; // type:object size:0x1 scope:local +init$4340 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 data:byte @4342 = .bss:0x00000084; // type:object size:0xC scope:local @4343 = .bss:0x00000090; // type:object size:0xC scope:local @4344 = .bss:0x0000009C; // type:object size:0xC scope:local @@ -294,7 +295,7 @@ init$4340 = .bss:0x00000080; // type:object size:0x1 scope:local @4358 = .bss:0x00000144; // type:object size:0xC scope:local mPzCenterInit_dt$4338 = .bss:0x00000150; // type:object size:0xD8 scope:local @4360 = .bss:0x00000228; // type:object size:0xC scope:local -init$4361 = .bss:0x00000234; // type:object size:0x1 scope:local +init$4361 = .bss:0x00000234; // type:object size:0x1 scope:local align:1 data:byte @4363 = .bss:0x00000238; // type:object size:0xC scope:local @4364 = .bss:0x00000244; // type:object size:0xC scope:local @4365 = .bss:0x00000250; // type:object size:0xC scope:local @@ -314,12 +315,12 @@ init$4361 = .bss:0x00000234; // type:object size:0x1 scope:local @4379 = .bss:0x000002F8; // type:object size:0xC scope:local mPzEyeInit_dt$4359 = .bss:0x00000304; // type:object size:0xD8 scope:local @5677 = .bss:0x000003DC; // type:object size:0xC scope:local -init$5678 = .bss:0x000003E8; // type:object size:0x1 scope:local +init$5678 = .bss:0x000003E8; // type:object size:0x1 scope:local align:1 data:byte @5680 = .bss:0x000003EC; // type:object size:0xC scope:local @5681 = .bss:0x000003F8; // type:object size:0xC scope:local mPzDeadDemo_mCenter_dt$5676 = .bss:0x00000404; // type:object size:0x24 scope:local @5683 = .bss:0x00000428; // type:object size:0xC scope:local -init$5684 = .bss:0x00000434; // type:object size:0x1 scope:local +init$5684 = .bss:0x00000434; // type:object size:0x1 scope:local align:1 data:byte @5686 = .bss:0x00000438; // type:object size:0xC scope:local @5687 = .bss:0x00000444; // type:object size:0xC scope:local mPzDeadDemo_mEye_dt$5682 = .bss:0x00000450; // type:object size:0x24 scope:local diff --git a/config/GZ2E01/rels/d_a_e_rb/splits.txt b/config/GZ2E01/rels/d_a_e_rb/splits.txt index 4869ba857e..eca44bdd6f 100644 --- a/config/GZ2E01/rels/d_a_e_rb/splits.txt +++ b/config/GZ2E01/rels/d_a_e_rb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rb.cpp: diff --git a/config/GZ2E01/rels/d_a_e_rb/symbols.txt b/config/GZ2E01/rels/d_a_e_rb/symbols.txt index 6336b03581..81233af077 100644 --- a/config/GZ2E01/rels/d_a_e_rb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rb/symbols.txt @@ -89,7 +89,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_223_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -107,7 +108,7 @@ __vt__8cM3dGPla = .data:0x00000154; // type:object size:0xC scope:global __vt__14dBgS_ObjGndChk = .data:0x00000160; // type:object size:0x30 scope:global __vt__12daE_RB_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte child = .bss:0x00000028; // type:object size:0x28 scope:global diff --git a/config/GZ2E01/rels/d_a_e_rd/splits.txt b/config/GZ2E01/rels/d_a_e_rd/splits.txt index 1ca151ccc3..60a5b045bb 100644 --- a/config/GZ2E01/rels/d_a_e_rd/splits.txt +++ b/config/GZ2E01/rels/d_a_e_rd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rd.cpp: diff --git a/config/GZ2E01/rels/d_a_e_rd/symbols.txt b/config/GZ2E01/rels/d_a_e_rd/symbols.txt index cae9547108..8b250dd142 100644 --- a/config/GZ2E01/rels/d_a_e_rd/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rd/symbols.txt @@ -379,7 +379,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_70_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$4087 = .data:0x00000020; // type:object size:0x8 scope:local e_env$4088 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$4096 = .data:0x00000030; // type:object size:0x6 scope:local @@ -442,7 +443,7 @@ hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @4224 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x50 scope:global data:byte S_find = .bss:0x000000AC; // type:object size:0x2 scope:global data:2byte -data_80519338 = .bss:0x000000AE; // type:object size:0x1 scope:local align:1 data:byte +lbl_70_bss_AE = .bss:0x000000AE; // type:object size:0x1 scope:local align:1 data:byte @4242 = .bss:0x000000B0; // type:object size:0xC scope:local S_find_pos = .bss:0x000000BC; // type:object size:0xC scope:global align:4 data:float data_80519200 = .bss:0x000000C8; // type:object size:0x1 data:byte @@ -452,10 +453,10 @@ target_info_count = .bss:0x000000F4; // type:object size:0x4 scope:global data:4 data_80519230 = .bss:0x000000F8; // type:object size:0x1 scope:local data:byte check_index$5284 = .bss:0x000000FC; // type:object size:0xFF scope:local rd_count = .bss:0x000001FC; // type:object size:0x4 scope:global data:4byte -lbl_70_bss_AE = .bss:0x00000200; // type:object size:0x1 scope:local align:1 data:byte +data_80519338 = .bss:0x00000200; // type:object size:0x1 scope:local align:1 data:byte c_start = .bss:0x00000204; // type:object size:0x4 scope:global @11269 = .bss:0x00000208; // type:object size:0xC scope:local -init$8899 = .bss:0x00000214; // type:object size:0x1 scope:local +init$8899 = .bss:0x00000214; // type:object size:0x1 scope:local align:1 data:byte @11272 = .bss:0x00000218; // type:object size:0xC scope:local @11273 = .bss:0x00000224; // type:object size:0xC scope:local @11274 = .bss:0x00000230; // type:object size:0xC scope:local @@ -463,11 +464,11 @@ init$8899 = .bss:0x00000214; // type:object size:0x1 scope:local @11276 = .bss:0x00000248; // type:object size:0xC scope:local set_pos$11268 = .bss:0x00000254; // type:object size:0x48 scope:local @11412 = .bss:0x0000029C; // type:object size:0xC scope:local -init$9041 = .bss:0x000002A8; // type:object size:0x1 scope:local +init$9041 = .bss:0x000002A8; // type:object size:0x1 scope:local align:1 data:byte @11415 = .bss:0x000002AC; // type:object size:0xC scope:local @11416 = .bss:0x000002B8; // type:object size:0xC scope:local set_pos$11411 = .bss:0x000002C4; // type:object size:0x24 scope:local -instanceCount = .bss:0x000002E8; // type:object size:0x1 scope:local +instanceCount = .bss:0x000002E8; // type:object size:0x1 scope:local data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000002EC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000002F0; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000002F4; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_rdb/splits.txt b/config/GZ2E01/rels/d_a_e_rdb/splits.txt index 2da6925dd4..7ebbf7142d 100644 --- a/config/GZ2E01/rels/d_a_e_rdb/splits.txt +++ b/config/GZ2E01/rels/d_a_e_rdb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rdb.cpp: diff --git a/config/GZ2E01/rels/d_a_e_rdb/symbols.txt b/config/GZ2E01/rels/d_a_e_rdb/symbols.txt index 0ef48322af..f70d05c598 100644 --- a/config/GZ2E01/rels/d_a_e_rdb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rdb/symbols.txt @@ -202,7 +202,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_224_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3886 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3887 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3895 = .data:0x00000030; // type:object size:0x6 scope:local @@ -247,6 +248,7 @@ hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4023 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @5932 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte @5935 = .bss:0x00000070; // type:object size:0xC scope:local @5936 = .bss:0x0000007C; // type:object size:0xC scope:local @5937 = .bss:0x00000088; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_rdy/splits.txt b/config/GZ2E01/rels/d_a_e_rdy/splits.txt index 14adc48ce3..283e3b7f93 100644 --- a/config/GZ2E01/rels/d_a_e_rdy/splits.txt +++ b/config/GZ2E01/rels/d_a_e_rdy/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rdy.cpp: diff --git a/config/GZ2E01/rels/d_a_e_rdy/symbols.txt b/config/GZ2E01/rels/d_a_e_rdy/symbols.txt index 611015941e..8e5315363b 100644 --- a/config/GZ2E01/rels/d_a_e_rdy/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_rdy/symbols.txt @@ -266,7 +266,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_225_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3897 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3898 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3906 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_e_s1/splits.txt b/config/GZ2E01/rels/d_a_e_s1/splits.txt index 5a762f1348..d3ca26d184 100644 --- a/config/GZ2E01/rels/d_a_e_s1/splits.txt +++ b/config/GZ2E01/rels/d_a_e_s1/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_s1.cpp: diff --git a/config/GZ2E01/rels/d_a_e_s1/symbols.txt b/config/GZ2E01/rels/d_a_e_s1/symbols.txt index decbf834d9..f76e561fba 100644 --- a/config/GZ2E01/rels/d_a_e_s1/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_s1/symbols.txt @@ -170,7 +170,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_226_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -212,8 +213,8 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte +l_no_fail = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x2C scope:global data:byte check_index$4023 = .bss:0x00000080; // type:object size:0xFF scope:local diff --git a/config/GZ2E01/rels/d_a_e_sb/splits.txt b/config/GZ2E01/rels/d_a_e_sb/splits.txt index 2cb921f87b..aaaf974979 100644 --- a/config/GZ2E01/rels/d_a_e_sb/splits.txt +++ b/config/GZ2E01/rels/d_a_e_sb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sb.cpp: diff --git a/config/GZ2E01/rels/d_a_e_sb/symbols.txt b/config/GZ2E01/rels/d_a_e_sb/symbols.txt index dd060af475..05aae4508b 100644 --- a/config/GZ2E01/rels/d_a_e_sb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sb/symbols.txt @@ -136,7 +136,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3653 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x40 scope:local data:byte s_Bomb__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000094; // type:object size:0x4 scope:local data:4byte diff --git a/config/GZ2E01/rels/d_a_e_sf/splits.txt b/config/GZ2E01/rels/d_a_e_sf/splits.txt index 270eba4def..d7984ce3e8 100644 --- a/config/GZ2E01/rels/d_a_e_sf/splits.txt +++ b/config/GZ2E01/rels/d_a_e_sf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sf.cpp: diff --git a/config/GZ2E01/rels/d_a_e_sf/symbols.txt b/config/GZ2E01/rels/d_a_e_sf/symbols.txt index 9120708750..00edcc90c8 100644 --- a/config/GZ2E01/rels/d_a_e_sf/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sf/symbols.txt @@ -130,7 +130,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_228_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3787 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3788 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3796 = .data:0x00000030; // type:object size:0x6 scope:local @@ -171,7 +172,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3924 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte target_info = .bss:0x0000007C; // type:object size:0x28 scope:global diff --git a/config/GZ2E01/rels/d_a_e_sg/splits.txt b/config/GZ2E01/rels/d_a_e_sg/splits.txt index e6a36a6d30..64f3eea100 100644 --- a/config/GZ2E01/rels/d_a_e_sg/splits.txt +++ b/config/GZ2E01/rels/d_a_e_sg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sg.cpp: diff --git a/config/GZ2E01/rels/d_a_e_sg/symbols.txt b/config/GZ2E01/rels/d_a_e_sg/symbols.txt index f5ce865d87..2a7bc877ff 100644 --- a/config/GZ2E01/rels/d_a_e_sg/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sg/symbols.txt @@ -127,7 +127,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3762 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte stick_pt = .bss:0x0000006C; // type:object size:0x4 scope:global data:4byte @@ -137,6 +137,7 @@ bg_on = .bss:0x00000098; // type:object size:0xA scope:global bg_cross = .bss:0x000000B0; // type:object size:0x78 scope:global target_info_count = .bss:0x00000128; // type:object size:0x4 scope:global data:4byte @4849 = .bss:0x0000012C; // type:object size:0xC scope:local +init$0000 = .bss:0x00000138; // type:object size:0x1 scope:local align:1 data:byte sc$4848 = .bss:0x0000013C; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000148; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000014C; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_sh/splits.txt b/config/GZ2E01/rels/d_a_e_sh/splits.txt index 209a4f3e61..6825b26511 100644 --- a/config/GZ2E01/rels/d_a_e_sh/splits.txt +++ b/config/GZ2E01/rels/d_a_e_sh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sh.cpp: diff --git a/config/GZ2E01/rels/d_a_e_sh/symbols.txt b/config/GZ2E01/rels/d_a_e_sh/symbols.txt index 0fd6daf0fb..c3fb292aec 100644 --- a/config/GZ2E01/rels/d_a_e_sh/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sh/symbols.txt @@ -122,7 +122,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_230_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local @@ -144,6 +145,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_sm/splits.txt b/config/GZ2E01/rels/d_a_e_sm/splits.txt index e4721f6ea5..c5a1c25381 100644 --- a/config/GZ2E01/rels/d_a_e_sm/splits.txt +++ b/config/GZ2E01/rels/d_a_e_sm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sm.cpp: diff --git a/config/GZ2E01/rels/d_a_e_sm/symbols.txt b/config/GZ2E01/rels/d_a_e_sm/symbols.txt index cb9445af26..50b1f1271a 100644 --- a/config/GZ2E01/rels/d_a_e_sm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sm/symbols.txt @@ -171,7 +171,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_231_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3799 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3800 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3808 = .data:0x00000030; // type:object size:0x6 scope:local @@ -206,7 +207,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3936 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:global data:byte s_Dis__22@unnamed@d_a_e_sm_cpp@ = .bss:0x00000068; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_e_sm2/splits.txt b/config/GZ2E01/rels/d_a_e_sm2/splits.txt index c9c06b9044..4d8f456d71 100644 --- a/config/GZ2E01/rels/d_a_e_sm2/splits.txt +++ b/config/GZ2E01/rels/d_a_e_sm2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sm2.cpp: diff --git a/config/GZ2E01/rels/d_a_e_sm2/symbols.txt b/config/GZ2E01/rels/d_a_e_sm2/symbols.txt index 993373d7fb..46372eca8a 100644 --- a/config/GZ2E01/rels/d_a_e_sm2/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sm2/symbols.txt @@ -142,7 +142,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_232_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3669 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3670 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3678 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_e_st/splits.txt b/config/GZ2E01/rels/d_a_e_st/splits.txt index 1baa0316a0..054aadbcba 100644 --- a/config/GZ2E01/rels/d_a_e_st/splits.txt +++ b/config/GZ2E01/rels/d_a_e_st/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_st.cpp: diff --git a/config/GZ2E01/rels/d_a_e_st/symbols.txt b/config/GZ2E01/rels/d_a_e_st/symbols.txt index 2a7922e962..d86aaa06f7 100644 --- a/config/GZ2E01/rels/d_a_e_st/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_st/symbols.txt @@ -189,7 +189,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_233_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -235,7 +236,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local small = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -hio_set = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x24 scope:global data:byte @6303 = .bss:0x00000080; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_sw/splits.txt b/config/GZ2E01/rels/d_a_e_sw/splits.txt index b75966e443..7df766053f 100644 --- a/config/GZ2E01/rels/d_a_e_sw/splits.txt +++ b/config/GZ2E01/rels/d_a_e_sw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sw.cpp: diff --git a/config/GZ2E01/rels/d_a_e_sw/symbols.txt b/config/GZ2E01/rels/d_a_e_sw/symbols.txt index 0d1b97909a..260f825759 100644 --- a/config/GZ2E01/rels/d_a_e_sw/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_sw/symbols.txt @@ -162,7 +162,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_235_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3788 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3789 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3797 = .data:0x00000030; // type:object size:0x6 scope:local @@ -233,10 +234,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local target_info__22@unnamed@d_a_e_sw_cpp@ = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte target_dist__22@unnamed@d_a_e_sw_cpp@ = .bss:0x0000004C; // type:object size:0x4 scope:global align:4 data:float -init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000051; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000052; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000053; // type:object size:0x1 scope:local align:1 data:byte +data_807B0200 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte +data_807B0201 = .bss:0x00000051; // type:object size:0x1 scope:local align:1 data:byte +data_807B0202 = .bss:0x00000052; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000053; // type:object size:0x1 scope:local align:1 data:byte @3925 = .bss:0x00000054; // type:object size:0xC scope:local l_HIO = .bss:0x00000060; // type:object size:0x24 scope:global align:4 data:float sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_th/splits.txt b/config/GZ2E01/rels/d_a_e_th/splits.txt index aa251c7a89..59e500d184 100644 --- a/config/GZ2E01/rels/d_a_e_th/splits.txt +++ b/config/GZ2E01/rels/d_a_e_th/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_th.cpp: diff --git a/config/GZ2E01/rels/d_a_e_th/symbols.txt b/config/GZ2E01/rels/d_a_e_th/symbols.txt index c54eaa912d..d5ba6a945d 100644 --- a/config/GZ2E01/rels/d_a_e_th/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_th/symbols.txt @@ -157,7 +157,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_236_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local @@ -177,6 +178,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000001D4; // type:object size:0x14 scope:gl __vt__12dBgS_ObjAcch = .data:0x000001E8; // type:object size:0x24 scope:global __vt__12daE_TH_HIO_c = .data:0x0000020C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3922 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_tk/splits.txt b/config/GZ2E01/rels/d_a_e_tk/splits.txt index 8bdea734c5..3de29d9a96 100644 --- a/config/GZ2E01/rels/d_a_e_tk/splits.txt +++ b/config/GZ2E01/rels/d_a_e_tk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tk.cpp: diff --git a/config/GZ2E01/rels/d_a_e_tk/symbols.txt b/config/GZ2E01/rels/d_a_e_tk/symbols.txt index 269234ce6c..532d7bd5c2 100644 --- a/config/GZ2E01/rels/d_a_e_tk/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_tk/symbols.txt @@ -78,6 +78,6 @@ __vt__8cM3dGAab = .data:0x000000FC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000108; // type:object size:0x24 scope:global __vt__12daE_TK_HIO_c = .data:0x0000012C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_tk2/splits.txt b/config/GZ2E01/rels/d_a_e_tk2/splits.txt index c66e709551..ef62327e76 100644 --- a/config/GZ2E01/rels/d_a_e_tk2/splits.txt +++ b/config/GZ2E01/rels/d_a_e_tk2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tk2.cpp: diff --git a/config/GZ2E01/rels/d_a_e_tk2/symbols.txt b/config/GZ2E01/rels/d_a_e_tk2/symbols.txt index 6d79ece770..4190e8dcad 100644 --- a/config/GZ2E01/rels/d_a_e_tk2/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_tk2/symbols.txt @@ -71,6 +71,6 @@ __vt__8cM3dGAab = .data:0x000000D0; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000DC; // type:object size:0x24 scope:global __vt__13daE_TK2_HIO_c = .data:0x00000100; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_tt/splits.txt b/config/GZ2E01/rels/d_a_e_tt/splits.txt index e485f25f41..8046205c30 100644 --- a/config/GZ2E01/rels/d_a_e_tt/splits.txt +++ b/config/GZ2E01/rels/d_a_e_tt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tt.cpp: diff --git a/config/GZ2E01/rels/d_a_e_tt/symbols.txt b/config/GZ2E01/rels/d_a_e_tt/symbols.txt index 8dfffeea7b..2dbde3a248 100644 --- a/config/GZ2E01/rels/d_a_e_tt/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_tt/symbols.txt @@ -118,7 +118,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_241_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3787 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3788 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3796 = .data:0x00000030; // type:object size:0x6 scope:local @@ -162,19 +163,24 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3924 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte m_attack_tt = .bss:0x0000006C; // type:object size:0x4 scope:global data:4byte @4154 = .bss:0x00000070; // type:object size:0xC scope:local +init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte sc$4153 = .bss:0x00000080; // type:object size:0xC scope:local @4269 = .bss:0x0000008C; // type:object size:0xC scope:local +init$0001 = .bss:0x00000098; // type:object size:0x1 scope:local align:1 data:byte sc$4268 = .bss:0x0000009C; // type:object size:0xC scope:local @4302 = .bss:0x000000A8; // type:object size:0xC scope:local +init$0002 = .bss:0x000000B4; // type:object size:0x1 scope:local align:1 data:byte sc$4301 = .bss:0x000000B8; // type:object size:0xC scope:local @4400 = .bss:0x000000C4; // type:object size:0xC scope:local +init$0003 = .bss:0x000000D0; // type:object size:0x1 scope:local align:1 data:byte sc$4399 = .bss:0x000000D4; // type:object size:0xC scope:local @4489 = .bss:0x000000E0; // type:object size:0xC scope:local +init$0004 = .bss:0x000000EC; // type:object size:0x1 scope:local align:1 data:byte sc$4488 = .bss:0x000000F0; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000FC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000100; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_vt/splits.txt b/config/GZ2E01/rels/d_a_e_vt/splits.txt index 859828df19..5c0a91de09 100644 --- a/config/GZ2E01/rels/d_a_e_vt/splits.txt +++ b/config/GZ2E01/rels/d_a_e_vt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_vt.cpp: diff --git a/config/GZ2E01/rels/d_a_e_vt/symbols.txt b/config/GZ2E01/rels/d_a_e_vt/symbols.txt index b743286d69..286d5e238c 100644 --- a/config/GZ2E01/rels/d_a_e_vt/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_vt/symbols.txt @@ -247,7 +247,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_242_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3786 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3787 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3795 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_e_wb/splits.txt b/config/GZ2E01/rels/d_a_e_wb/splits.txt index 95cd6f7d43..df396c14c2 100644 --- a/config/GZ2E01/rels/d_a_e_wb/splits.txt +++ b/config/GZ2E01/rels/d_a_e_wb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_wb.cpp: diff --git a/config/GZ2E01/rels/d_a_e_wb/symbols.txt b/config/GZ2E01/rels/d_a_e_wb/symbols.txt index 0a2fa43ab7..8b017bb842 100644 --- a/config/GZ2E01/rels/d_a_e_wb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_wb/symbols.txt @@ -485,7 +485,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_244_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_color$4786 = .data:0x00000020; // type:object size:0x4 scope:local chk_x$5015 = .data:0x00000024; // type:object size:0x10 scope:local chk_z$5016 = .data:0x00000034; // type:object size:0x10 scope:local @@ -539,10 +540,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_244_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte -lbl_244_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte -lbl_244_bss_47 = .bss:0x00000047; // type:object size:0x1 data:byte -hio_set = .bss:0x00000048; // type:object size:0x1 data:byte +lbl_244_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +lbl_244_bss_46 = .bss:0x00000046; // type:object size:0x1 scope:local data:byte +lbl_244_bss_47 = .bss:0x00000047; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte @4435 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x5C scope:global data:byte @4746 = .bss:0x000000B4; // type:object size:0xC scope:local @@ -550,35 +551,35 @@ b_path = .bss:0x000000C0; // type:object size:0x60 scope:global align:4 data:flo @5743 = .bss:0x00000120; // type:object size:0xC scope:local b_path2 = .bss:0x0000012C; // type:object size:0x60 scope:global align:4 data:float @6258 = .bss:0x0000018C; // type:object size:0xC scope:local -init$3541 = .bss:0x00000198; // type:object size:0x1 scope:local +init$3541 = .bss:0x00000198; // type:object size:0x1 scope:local align:1 data:byte arrow_rd_pos$6257 = .bss:0x0000019C; // type:object size:0xC scope:local @6279 = .bss:0x000001A8; // type:object size:0xC scope:local saku_p = .bss:0x000001B4; // type:object size:0xC scope:global @6280 = .bss:0x000001C0; // type:object size:0xC scope:local saku_p2 = .bss:0x000001CC; // type:object size:0xC scope:global @6285 = .bss:0x000001D8; // type:object size:0xC scope:local -init$3568 = .bss:0x000001E4; // type:object size:0x1 scope:local +init$3568 = .bss:0x000001E4; // type:object size:0x1 scope:local align:1 data:byte @6288 = .bss:0x000001E8; // type:object size:0xC scope:local ikki_pos$6284 = .bss:0x000001F4; // type:object size:0x18 scope:local @6400 = .bss:0x0000020C; // type:object size:0xC scope:local -init$3681 = .bss:0x00000218; // type:object size:0x1 scope:local +init$3681 = .bss:0x00000218; // type:object size:0x1 scope:local align:1 data:byte @6403 = .bss:0x0000021C; // type:object size:0xC scope:local f_pos$6399 = .bss:0x00000228; // type:object size:0x18 scope:local @6612 = .bss:0x00000240; // type:object size:0xC scope:local -init$3883 = .bss:0x0000024C; // type:object size:0x1 scope:local +init$3883 = .bss:0x0000024C; // type:object size:0x1 scope:local align:1 data:byte @6615 = .bss:0x00000250; // type:object size:0xC scope:local ikki2_pos$6611 = .bss:0x0000025C; // type:object size:0x18 scope:local @7515 = .bss:0x00000274; // type:object size:0xC scope:local -init$4754 = .bss:0x00000280; // type:object size:0x1 scope:local +init$4754 = .bss:0x00000280; // type:object size:0x1 scope:local align:1 data:byte sc$7514 = .bss:0x00000284; // type:object size:0xC scope:local rd_count = .bss:0x00000290; // type:object size:0x4 scope:global data:4byte @7814 = .bss:0x00000294; // type:object size:0xC scope:local -init$5045 = .bss:0x000002A0; // type:object size:0x1 scope:local +init$5045 = .bss:0x000002A0; // type:object size:0x1 scope:local align:1 data:byte @7817 = .bss:0x000002A4; // type:object size:0xC scope:local @7818 = .bss:0x000002B0; // type:object size:0xC scope:local sh_pos$7813 = .bss:0x000002BC; // type:object size:0x24 scope:local @7820 = .bss:0x000002E0; // type:object size:0xC scope:local -init$5051 = .bss:0x000002EC; // type:object size:0x1 scope:local +init$5051 = .bss:0x000002EC; // type:object size:0x1 scope:local align:1 data:byte @7823 = .bss:0x000002F0; // type:object size:0xC scope:local @7824 = .bss:0x000002FC; // type:object size:0xC scope:local sh_posH$7819 = .bss:0x00000308; // type:object size:0x24 scope:local diff --git a/config/GZ2E01/rels/d_a_e_ws/splits.txt b/config/GZ2E01/rels/d_a_e_ws/splits.txt index f71158b422..f37746f346 100644 --- a/config/GZ2E01/rels/d_a_e_ws/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ws/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ws.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ws/symbols.txt b/config/GZ2E01/rels/d_a_e_ws/symbols.txt index 2646d45ed2..5b34d233df 100644 --- a/config/GZ2E01/rels/d_a_e_ws/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ws/symbols.txt @@ -113,7 +113,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_245_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3681 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3682 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3690 = .data:0x00000030; // type:object size:0x6 scope:local @@ -131,6 +132,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000184; // type:object size:0xC scope:global __vt__12daE_WS_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3818 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x28 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_ww/splits.txt b/config/GZ2E01/rels/d_a_e_ww/splits.txt index ef80bf3cbf..5ae499a796 100644 --- a/config/GZ2E01/rels/d_a_e_ww/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ww/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ww.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ww/symbols.txt b/config/GZ2E01/rels/d_a_e_ww/symbols.txt index dcbed608d1..4917454898 100644 --- a/config/GZ2E01/rels/d_a_e_ww/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ww/symbols.txt @@ -153,7 +153,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_246_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3784 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3785 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3793 = .data:0x00000030; // type:object size:0x6 scope:local @@ -191,10 +192,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3921 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte -init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte +lbl_237_bss_30 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte @4585 = .bss:0x00000080; // type:object size:0xC scope:local @4586 = .bss:0x0000008C; // type:object size:0xC scope:local @4587 = .bss:0x00000098; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_yc/splits.txt b/config/GZ2E01/rels/d_a_e_yc/splits.txt index 7fad049fed..8d356c7a5c 100644 --- a/config/GZ2E01/rels/d_a_e_yc/splits.txt +++ b/config/GZ2E01/rels/d_a_e_yc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yc.cpp: diff --git a/config/GZ2E01/rels/d_a_e_yc/symbols.txt b/config/GZ2E01/rels/d_a_e_yc/symbols.txt index 85e66be261..1e93b74912 100644 --- a/config/GZ2E01/rels/d_a_e_yc/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yc/symbols.txt @@ -100,6 +100,6 @@ __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12daE_YC_HIO_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global S_area_dis = .bss:0x00000008; // type:object size:0x4 scope:global align:4 data:float -init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte @3710 = .bss:0x00000010; // type:object size:0xC scope:local l_HIO = .bss:0x0000001C; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_yd/splits.txt b/config/GZ2E01/rels/d_a_e_yd/splits.txt index 7939bb0da7..773dc5f0c8 100644 --- a/config/GZ2E01/rels/d_a_e_yd/splits.txt +++ b/config/GZ2E01/rels/d_a_e_yd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yd.cpp: diff --git a/config/GZ2E01/rels/d_a_e_yd/symbols.txt b/config/GZ2E01/rels/d_a_e_yd/symbols.txt index 263caefc96..c3858fc68b 100644 --- a/config/GZ2E01/rels/d_a_e_yd/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yd/symbols.txt @@ -125,7 +125,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_248_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -149,6 +150,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000001FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000210; // type:object size:0xC scope:global __vt__12daE_YD_HIO_c = .data:0x0000021C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_yg/splits.txt b/config/GZ2E01/rels/d_a_e_yg/splits.txt index f2340e27d2..426a57515c 100644 --- a/config/GZ2E01/rels/d_a_e_yg/splits.txt +++ b/config/GZ2E01/rels/d_a_e_yg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yg.cpp: diff --git a/config/GZ2E01/rels/d_a_e_yg/symbols.txt b/config/GZ2E01/rels/d_a_e_yg/symbols.txt index 573ee44528..a917c55cbe 100644 --- a/config/GZ2E01/rels/d_a_e_yg/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yg/symbols.txt @@ -128,7 +128,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_250_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3680 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3681 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3689 = .data:0x00000030; // type:object size:0x6 scope:local @@ -165,11 +166,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3817 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte @3917 = .bss:0x00000070; // type:object size:0xC scope:local -init$1863 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 +init$1863 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte @3920 = .bss:0x00000080; // type:object size:0xC scope:local @3921 = .bss:0x0000008C; // type:object size:0xC scope:local e_pos$3916 = .bss:0x00000098; // type:object size:0x24 scope:local @@ -204,7 +205,7 @@ ke_p = .bss:0x000001AC; // type:object size:0x9C scope:global align:4 data:float @4714 = .bss:0x000002D8; // type:object size:0xC scope:local ke_a = .bss:0x000002E4; // type:object size:0x4E scope:global data:2byte @5031 = .bss:0x00000334; // type:object size:0xC scope:local -init$2973 = .bss:0x00000340; // type:object size:0x1 scope:local align:1 +init$2973 = .bss:0x00000340; // type:object size:0x1 scope:local align:1 data:byte sc$5030 = .bss:0x00000344; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000350; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000354; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_e_yh/splits.txt b/config/GZ2E01/rels/d_a_e_yh/splits.txt index aa325aec54..cd016865d1 100644 --- a/config/GZ2E01/rels/d_a_e_yh/splits.txt +++ b/config/GZ2E01/rels/d_a_e_yh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yh.cpp: diff --git a/config/GZ2E01/rels/d_a_e_yh/symbols.txt b/config/GZ2E01/rels/d_a_e_yh/symbols.txt index d2316c664e..afad1be1ac 100644 --- a/config/GZ2E01/rels/d_a_e_yh/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yh/symbols.txt @@ -142,7 +142,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_251_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local @@ -167,6 +168,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global __vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_yk/splits.txt b/config/GZ2E01/rels/d_a_e_yk/splits.txt index 13da412364..92ff20ea9f 100644 --- a/config/GZ2E01/rels/d_a_e_yk/splits.txt +++ b/config/GZ2E01/rels/d_a_e_yk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yk.cpp: diff --git a/config/GZ2E01/rels/d_a_e_yk/symbols.txt b/config/GZ2E01/rels/d_a_e_yk/symbols.txt index 5bc08e1bd5..5a80b27083 100644 --- a/config/GZ2E01/rels/d_a_e_yk/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yk/symbols.txt @@ -93,7 +93,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_252_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3820 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3821 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3829 = .data:0x00000030; // type:object size:0x6 scope:local @@ -111,7 +112,7 @@ __vt__8cM3dGAab = .data:0x00000140; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000014C; // type:object size:0x24 scope:global __vt__12daE_YK_HIO_c = .data:0x00000170; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_252_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3957 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:local data:byte check_index$4191 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_e_ym/splits.txt b/config/GZ2E01/rels/d_a_e_ym/splits.txt index 4d2dd8ee29..e9631d3c46 100644 --- a/config/GZ2E01/rels/d_a_e_ym/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ym/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ym.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ym/symbols.txt b/config/GZ2E01/rels/d_a_e_ym/symbols.txt index edbf36ac7f..32d8376a4f 100644 --- a/config/GZ2E01/rels/d_a_e_ym/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ym/symbols.txt @@ -182,7 +182,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_253_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3804 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3805 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3813 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_e_ymb/splits.txt b/config/GZ2E01/rels/d_a_e_ymb/splits.txt index c1864cfec7..e9bd5fd369 100644 --- a/config/GZ2E01/rels/d_a_e_ymb/splits.txt +++ b/config/GZ2E01/rels/d_a_e_ymb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ymb.cpp: diff --git a/config/GZ2E01/rels/d_a_e_ymb/symbols.txt b/config/GZ2E01/rels/d_a_e_ymb/symbols.txt index ddf36384b6..1ce7d20050 100644 --- a/config/GZ2E01/rels/d_a_e_ymb/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ymb/symbols.txt @@ -237,7 +237,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_255_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_ymb_src__23@unnamed@d_a_e_ymb_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_ymb_at_src__23@unnamed@d_a_e_ymb_cpp@ = .data:0x00000060; // type:object size:0x40 scope:global cc_ymb_eye_src__23@unnamed@d_a_e_ymb_cpp@ = .data:0x000000A0; // type:object size:0x40 scope:global @@ -288,7 +289,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3786 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3797 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_yr/splits.txt b/config/GZ2E01/rels/d_a_e_yr/splits.txt index 632a763104..584302b521 100644 --- a/config/GZ2E01/rels/d_a_e_yr/splits.txt +++ b/config/GZ2E01/rels/d_a_e_yr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yr.cpp: diff --git a/config/GZ2E01/rels/d_a_e_yr/symbols.txt b/config/GZ2E01/rels/d_a_e_yr/symbols.txt index 2316e9981e..26b4522032 100644 --- a/config/GZ2E01/rels/d_a_e_yr/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_yr/symbols.txt @@ -131,7 +131,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_256_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_e_zh/splits.txt b/config/GZ2E01/rels/d_a_e_zh/splits.txt index 21ab275493..21948d2db6 100644 --- a/config/GZ2E01/rels/d_a_e_zh/splits.txt +++ b/config/GZ2E01/rels/d_a_e_zh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zh.cpp: diff --git a/config/GZ2E01/rels/d_a_e_zh/symbols.txt b/config/GZ2E01/rels/d_a_e_zh/symbols.txt index 057473dca4..5a984351c6 100644 --- a/config/GZ2E01/rels/d_a_e_zh/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_zh/symbols.txt @@ -172,7 +172,8 @@ START_EFF_DT$4324 = .rodata:0x00000080; // type:object size:0x58 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_257_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_zhSph_src__22@unnamed@d_a_e_zh_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_zhCyl_src__22@unnamed@d_a_e_zh_cpp@ = .data:0x00000060; // type:object size:0x44 scope:global cc_zhCyl_at_src__22@unnamed@d_a_e_zh_cpp@ = .data:0x000000A4; // type:object size:0x44 scope:global @@ -210,11 +211,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_257_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3773 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte mStartFlag = .bss:0x00000070; // type:object size:0x4 scope:local data:4byte @4079 = .bss:0x00000074; // type:object size:0xC scope:local +init$0000 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 data:byte @4082 = .bss:0x00000084; // type:object size:0xC scope:local @4083 = .bss:0x00000090; // type:object size:0xC scope:local @4084 = .bss:0x0000009C; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_e_zm/splits.txt b/config/GZ2E01/rels/d_a_e_zm/splits.txt index 7bc8d7cd26..710ff47c1c 100644 --- a/config/GZ2E01/rels/d_a_e_zm/splits.txt +++ b/config/GZ2E01/rels/d_a_e_zm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zm.cpp: diff --git a/config/GZ2E01/rels/d_a_e_zm/symbols.txt b/config/GZ2E01/rels/d_a_e_zm/symbols.txt index d1f84ec0e8..69444edab6 100644 --- a/config/GZ2E01/rels/d_a_e_zm/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_zm/symbols.txt @@ -93,7 +93,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_258_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -114,6 +115,6 @@ __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12daE_ZM_HIO_c = .data:0x000001A8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_e_zs/splits.txt b/config/GZ2E01/rels/d_a_e_zs/splits.txt index 4534718056..5f0cc235f2 100644 --- a/config/GZ2E01/rels/d_a_e_zs/splits.txt +++ b/config/GZ2E01/rels/d_a_e_zs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zs.cpp: diff --git a/config/GZ2E01/rels/d_a_e_zs/symbols.txt b/config/GZ2E01/rels/d_a_e_zs/symbols.txt index 7637b700ac..9d84cab909 100644 --- a/config/GZ2E01/rels/d_a_e_zs/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_zs/symbols.txt @@ -73,7 +73,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_259_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3788 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3789 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3797 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2E01/rels/d_a_econt/symbols.txt b/config/GZ2E01/rels/d_a_econt/symbols.txt index da4095ce69..817f43d493 100644 --- a/config/GZ2E01/rels/d_a_econt/symbols.txt +++ b/config/GZ2E01/rels/d_a_econt/symbols.txt @@ -17,4 +17,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3873 = .rodata:0x0000000C; // type:object size:0x4 scope:local l_daEcont_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_ECONT = .data:0x00000020; // type:object size:0x30 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +data_805197E0 = .bss:0x00000000; // type:object size:0x4 scope:global align:1 diff --git a/config/GZ2E01/rels/d_a_ep/symbols.txt b/config/GZ2E01/rels/d_a_ep/symbols.txt index 0b79f07e39..4a50e0f326 100644 --- a/config/GZ2E01/rels/d_a_ep/symbols.txt +++ b/config/GZ2E01/rels/d_a_ep/symbols.txt @@ -103,7 +103,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_11_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double w_eff_id$3717 = .data:0x00000020; // type:object size:0x8 scope:local actions$4245 = .data:0x00000028; // type:object size:0x8 scope:local l_particle_fire_A$4270 = .data:0x00000030; // type:object size:0x4 scope:local diff --git a/config/GZ2E01/rels/d_a_formation_mng/symbols.txt b/config/GZ2E01/rels/d_a_formation_mng/symbols.txt index 416f3c3b46..c33e6b8549 100644 --- a/config/GZ2E01/rels/d_a_formation_mng/symbols.txt +++ b/config/GZ2E01/rels/d_a_formation_mng/symbols.txt @@ -54,7 +54,8 @@ M_attr__10daFmtMng_c = .rodata:0x00000000; // type:object size:0x18 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_260_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3861 = .data:0x00000020; // type:object size:0xC scope:local @3862 = .data:0x0000002C; // type:object size:0xC scope:local @3863 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_fr/splits.txt b/config/GZ2E01/rels/d_a_fr/splits.txt index 62ca034015..8c00ffee96 100644 --- a/config/GZ2E01/rels/d_a_fr/splits.txt +++ b/config/GZ2E01/rels/d_a_fr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_fr.cpp: diff --git a/config/GZ2E01/rels/d_a_fr/symbols.txt b/config/GZ2E01/rels/d_a_fr/symbols.txt index 001e901d7e..26a7e4749b 100644 --- a/config/GZ2E01/rels/d_a_fr/symbols.txt +++ b/config/GZ2E01/rels/d_a_fr/symbols.txt @@ -91,6 +91,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000134; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000158; // type:object size:0xC scope:global __vt__10daFr_HIO_c = .data:0x00000164; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_grass/splits.txt b/config/GZ2E01/rels/d_a_grass/splits.txt index bca15e795c..8b7f060e12 100644 --- a/config/GZ2E01/rels/d_a_grass/splits.txt +++ b/config/GZ2E01/rels/d_a_grass/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_grass.cpp: diff --git a/config/GZ2E01/rels/d_a_grass/symbols.txt b/config/GZ2E01/rels/d_a_grass/symbols.txt index e03aed0aa1..ca4fbb0fc1 100644 --- a/config/GZ2E01/rels/d_a_grass/symbols.txt +++ b/config/GZ2E01/rels/d_a_grass/symbols.txt @@ -233,16 +233,16 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local data_8052790d = .bss:0x00000045; // type:object size:0x1 scope:local @4293 = .bss:0x00000048; // type:object size:0xC scope:local -init$4294 = .bss:0x00000054; // type:object size:0x1 scope:local +init$4294 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte ang$4292 = .bss:0x00000058; // type:object size:0x6 scope:local exec_count_dammy$4868 = .bss:0x0000005E; // type:object size:0x2 scope:local -init$4869 = .bss:0x00000060; // type:object size:0x1 scope:local +init$4869 = .bss:0x00000060; // type:object size:0x1 scope:local align:1 data:byte exec_count_dammy2$4871 = .bss:0x00000062; // type:object size:0x2 scope:local -init$4872 = .bss:0x00000064; // type:object size:0x1 scope:local +init$4872 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte mAngleZ$5046 = .bss:0x00000068; // type:object size:0xBB8 scope:local data_805284E8 = .bss:0x00000C20; // type:object size:0x1 scope:local data:byte @5442 = .bss:0x00000C24; // type:object size:0xC scope:local -init$5443 = .bss:0x00000C30; // type:object size:0x1 scope:local +init$5443 = .bss:0x00000C30; // type:object size:0x1 scope:local align:1 data:byte ang$5441 = .bss:0x00000C34; // type:object size:0x6 scope:local @6340 = .bss:0x00000C3C; // type:object size:0xC scope:local @6342 = .bss:0x00000C48; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_horse/splits.txt b/config/GZ2E01/rels/d_a_horse/splits.txt index c0f908f9c2..3d4856ee98 100644 --- a/config/GZ2E01/rels/d_a_horse/splits.txt +++ b/config/GZ2E01/rels/d_a_horse/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_horse.cpp: diff --git a/config/GZ2E01/rels/d_a_horse/symbols.txt b/config/GZ2E01/rels/d_a_horse/symbols.txt index cfc9fdd211..8b813652a9 100644 --- a/config/GZ2E01/rels/d_a_horse/symbols.txt +++ b/config/GZ2E01/rels/d_a_horse/symbols.txt @@ -263,7 +263,8 @@ stopStandFootEffectFrame$9721 = .rodata:0x00000344; // type:object size:0x30 sco ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_262_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_autoUpHeight = .data:0x00000020; // type:object size:0x4 scope:global align:4 data:float l_cylSrc = .data:0x00000024; // type:object size:0x44 scope:global l_sphSrc = .data:0x00000068; // type:object size:0x40 scope:global @@ -322,46 +323,46 @@ l_frontFootOffset = .bss:0x00000054; // type:object size:0xC scope:global align: @4180 = .bss:0x00000060; // type:object size:0xC scope:local l_backFootOffset = .bss:0x0000006C; // type:object size:0xC scope:global align:4 data:float @7279 = .bss:0x00000078; // type:object size:0xC scope:local -init$4891 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 +init$4891 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte localEyePos$7278 = .bss:0x00000088; // type:object size:0xC scope:local @7469 = .bss:0x00000094; // type:object size:0xC scope:local -init$5140 = .bss:0x000000A0; // type:object size:0x1 scope:local align:1 +init$5140 = .bss:0x000000A0; // type:object size:0x1 scope:local align:1 data:byte runScale$7468 = .bss:0x000000A4; // type:object size:0xC scope:local @7473 = .bss:0x000000B0; // type:object size:0xC scope:local -init$5144 = .bss:0x000000BC; // type:object size:0x1 scope:local align:1 +init$5144 = .bss:0x000000BC; // type:object size:0x1 scope:local align:1 data:byte landScale$7472 = .bss:0x000000C0; // type:object size:0xC scope:local @7477 = .bss:0x000000CC; // type:object size:0xC scope:local -init$5083 = .bss:0x000000D8; // type:object size:0x1 scope:local align:1 +init$5083 = .bss:0x000000D8; // type:object size:0x1 scope:local align:1 data:byte grassRunScale$7476 = .bss:0x000000DC; // type:object size:0xC scope:local @7481 = .bss:0x000000E8; // type:object size:0xC scope:local -init$5091 = .bss:0x000000F4; // type:object size:0x1 scope:local align:1 +init$5091 = .bss:0x000000F4; // type:object size:0x1 scope:local align:1 data:byte waterDirection$7480 = .bss:0x000000F8; // type:object size:0xC scope:local @8516 = .bss:0x00000104; // type:object size:0xC scope:local -init$6089 = .bss:0x00000110; // type:object size:0x1 scope:local align:1 +init$6089 = .bss:0x00000110; // type:object size:0x1 scope:local align:1 data:byte reinLeftStart$8515 = .bss:0x00000114; // type:object size:0xC scope:local @8520 = .bss:0x00000120; // type:object size:0xC scope:local -init$6093 = .bss:0x0000012C; // type:object size:0x1 scope:local align:1 +init$6093 = .bss:0x0000012C; // type:object size:0x1 scope:local align:1 data:byte reinRightStart$8519 = .bss:0x00000130; // type:object size:0xC scope:local @8524 = .bss:0x0000013C; // type:object size:0xC scope:local -init$6097 = .bss:0x00000148; // type:object size:0x1 scope:local align:1 +init$6097 = .bss:0x00000148; // type:object size:0x1 scope:local align:1 data:byte localNeckLeft$8523 = .bss:0x0000014C; // type:object size:0xC scope:local @8528 = .bss:0x00000158; // type:object size:0xC scope:local -init$6101 = .bss:0x00000164; // type:object size:0x1 scope:local align:1 +init$6101 = .bss:0x00000164; // type:object size:0x1 scope:local align:1 data:byte localNeckRight$8527 = .bss:0x00000168; // type:object size:0xC scope:local @8753 = .bss:0x00000174; // type:object size:0xC scope:local -init$6311 = .bss:0x00000180; // type:object size:0x1 scope:local align:1 +init$6311 = .bss:0x00000180; // type:object size:0x1 scope:local align:1 data:byte saddleLeft$8752 = .bss:0x00000184; // type:object size:0xC scope:local @8757 = .bss:0x00000190; // type:object size:0xC scope:local -init$6315 = .bss:0x0000019C; // type:object size:0x1 scope:local align:1 +init$6315 = .bss:0x0000019C; // type:object size:0x1 scope:local align:1 data:byte saddleRight$8756 = .bss:0x000001A0; // type:object size:0xC scope:local @8813 = .bss:0x000001AC; // type:object size:0xC scope:local -init$6374 = .bss:0x000001B8; // type:object size:0x1 scope:local align:1 +init$6374 = .bss:0x000001B8; // type:object size:0x1 scope:local align:1 data:byte localCenterPos$8812 = .bss:0x000001BC; // type:object size:0xC scope:local @8817 = .bss:0x000001C8; // type:object size:0xC scope:local -init$6378 = .bss:0x000001D4; // type:object size:0x1 scope:local align:1 +init$6378 = .bss:0x000001D4; // type:object size:0x1 scope:local align:1 data:byte localFrontPos$8816 = .bss:0x000001D8; // type:object size:0xC scope:local @8821 = .bss:0x000001E4; // type:object size:0xC scope:local -init$6382 = .bss:0x000001F0; // type:object size:0x1 scope:local align:1 +init$6382 = .bss:0x000001F0; // type:object size:0x1 scope:local align:1 data:byte localBackPos$8820 = .bss:0x000001F4; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000200; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000204; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_kago/splits.txt b/config/GZ2E01/rels/d_a_kago/splits.txt index 60a4519ae8..187e17317b 100644 --- a/config/GZ2E01/rels/d_a_kago/splits.txt +++ b/config/GZ2E01/rels/d_a_kago/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kago.cpp: diff --git a/config/GZ2E01/rels/d_a_kago/symbols.txt b/config/GZ2E01/rels/d_a_kago/symbols.txt index 97454c22bf..ac2d8c9f12 100644 --- a/config/GZ2E01/rels/d_a_kago/symbols.txt +++ b/config/GZ2E01/rels/d_a_kago/symbols.txt @@ -246,6 +246,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001D8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001FC; // type:object size:0xC scope:global __vt__12daKago_HIO_c = .data:0x00000208; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3924 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x5C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_kytag06/splits.txt b/config/GZ2E01/rels/d_a_kytag06/splits.txt index e9f6e13722..dcf1d65e9f 100644 --- a/config/GZ2E01/rels/d_a_kytag06/splits.txt +++ b/config/GZ2E01/rels/d_a_kytag06/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kytag06.cpp: diff --git a/config/GZ2E01/rels/d_a_kytag06/symbols.txt b/config/GZ2E01/rels/d_a_kytag06/symbols.txt index e144c2c19a..89befec2ff 100644 --- a/config/GZ2E01/rels/d_a_kytag06/symbols.txt +++ b/config/GZ2E01/rels/d_a_kytag06/symbols.txt @@ -104,7 +104,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_269_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double S_time_table$3766 = .data:0x00000020; // type:object size:0x20 scope:local S_wether_table$3767 = .data:0x00000040; // type:object size:0x8 scope:local S_wether_mode_pat01$3768 = .data:0x00000048; // type:object size:0x4 scope:local diff --git a/config/GZ2E01/rels/d_a_mant/symbols.txt b/config/GZ2E01/rels/d_a_mant/symbols.txt index 99efb28da3..aa8258cb18 100644 --- a/config/GZ2E01/rels/d_a_mant/symbols.txt +++ b/config/GZ2E01/rels/d_a_mant/symbols.txt @@ -69,7 +69,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_277_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_Egnd_mantTEX = .data:0x00000020; // type:object size:0x4000 scope:global l_Egnd_mantTEX_U = .data:0x00004020; // type:object size:0x4000 scope:global data:byte l_Egnd_mantPAL = .data:0x00008020; // type:object size:0x60 scope:global diff --git a/config/GZ2E01/rels/d_a_mg_fish/splits.txt b/config/GZ2E01/rels/d_a_mg_fish/splits.txt index 4da77c631e..e21d310b8f 100644 --- a/config/GZ2E01/rels/d_a_mg_fish/splits.txt +++ b/config/GZ2E01/rels/d_a_mg_fish/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_mg_fish.cpp: diff --git a/config/GZ2E01/rels/d_a_mg_fish/symbols.txt b/config/GZ2E01/rels/d_a_mg_fish/symbols.txt index 497e465a62..de4194feeb 100644 --- a/config/GZ2E01/rels/d_a_mg_fish/symbols.txt +++ b/config/GZ2E01/rels/d_a_mg_fish/symbols.txt @@ -254,7 +254,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_78_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double check_kind = .data:0x00000020; // type:object size:0x8 scope:global vib_p$3694 = .data:0x00000028; // type:object size:0x10 scope:local learn_d$3913 = .data:0x00000038; // type:object size:0x5 scope:local @@ -310,7 +311,7 @@ lit_1007 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byt l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte s_fish_ct = .bss:0x00000070; // type:object size:0x4 scope:global data:4byte @7455 = .bss:0x00000074; // type:object size:0xC scope:local -init$5256 = .bss:0x00000080; // type:object size:0x1 scope:local +init$5256 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 data:byte @7458 = .bss:0x00000084; // type:object size:0xC scope:local @7459 = .bss:0x00000090; // type:object size:0xC scope:local @7460 = .bss:0x0000009C; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_mg_fshop/splits.txt b/config/GZ2E01/rels/d_a_mg_fshop/splits.txt index 99e5c38b1d..355b6fcd8d 100644 --- a/config/GZ2E01/rels/d_a_mg_fshop/splits.txt +++ b/config/GZ2E01/rels/d_a_mg_fshop/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_mg_fshop.cpp: diff --git a/config/GZ2E01/rels/d_a_mg_fshop/symbols.txt b/config/GZ2E01/rels/d_a_mg_fshop/symbols.txt index 221dabcba8..abfb0e82d2 100644 --- a/config/GZ2E01/rels/d_a_mg_fshop/symbols.txt +++ b/config/GZ2E01/rels/d_a_mg_fshop/symbols.txt @@ -159,7 +159,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_278_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double koro2_map_LV1 = .data:0x00000020; // type:object size:0x87 scope:global koro2_map_LV2 = .data:0x000000A8; // type:object size:0x87 scope:global koro2_map_LV3 = .data:0x00000130; // type:object size:0x87 scope:global diff --git a/config/GZ2E01/rels/d_a_mg_rod/splits.txt b/config/GZ2E01/rels/d_a_mg_rod/splits.txt index 394a33fa23..5554500b0a 100644 --- a/config/GZ2E01/rels/d_a_mg_rod/splits.txt +++ b/config/GZ2E01/rels/d_a_mg_rod/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_mg_rod.cpp: diff --git a/config/GZ2E01/rels/d_a_mg_rod/symbols.txt b/config/GZ2E01/rels/d_a_mg_rod/symbols.txt index c2ade85265..f0913c830a 100644 --- a/config/GZ2E01/rels/d_a_mg_rod/symbols.txt +++ b/config/GZ2E01/rels/d_a_mg_rod/symbols.txt @@ -108,7 +108,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3879 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3879 = .rodata:0x00000000; // type:object size:0xC scope:local @4285 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @4286 = .rodata:0x00000010; // type:object size:0x4 scope:local @4287 = .rodata:0x00000014; // type:object size:0x4 scope:local data:string @@ -296,7 +296,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_50_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double check_kind = .data:0x00000020; // type:object size:0x8 scope:global l_color$4439 = .data:0x00000028; // type:object size:0x4 scope:local l_color$4445 = .data:0x0000002C; // type:object size:0x4 scope:local @@ -363,22 +364,22 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local henna = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte data_804BBBD4 = .bss:0x0000004C; // type:object size:0x1 data:byte -hio_set = .bss:0x0000004D; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004D; // type:object size:0x1 scope:local align:1 data:byte @4280 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x28 scope:global data:byte @4921 = .bss:0x00000084; // type:object size:0xC scope:local old_line_pos = .bss:0x00000090; // type:object size:0x4B0 scope:global @5446 = .bss:0x00000540; // type:object size:0xC scope:local -init$5447 = .bss:0x0000054C; // type:object size:0x1 scope:local data:byte +init$5447 = .bss:0x0000054C; // type:object size:0x1 scope:local align:1 data:byte sc$5445 = .bss:0x00000550; // type:object size:0xC scope:local @8906 = .bss:0x0000055C; // type:object size:0xC scope:local -init$8907 = .bss:0x00000568; // type:object size:0x1 scope:local data:byte +init$8907 = .bss:0x00000568; // type:object size:0x1 scope:local align:1 data:byte @8909 = .bss:0x0000056C; // type:object size:0xC scope:local sp_pos$8905 = .bss:0x00000578; // type:object size:0x18 scope:local old_stick_x$9448 = .bss:0x00000590; // type:object size:0x4 scope:local -init$9449 = .bss:0x00000594; // type:object size:0x1 scope:local data:byte +init$9449 = .bss:0x00000594; // type:object size:0x1 scope:local align:1 data:byte old_stick_sx$9451 = .bss:0x00000598; // type:object size:0x4 scope:local -init$9452 = .bss:0x0000059C; // type:object size:0x1 scope:local data:byte +init$9452 = .bss:0x0000059C; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000005A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000005A4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000005A8; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_myna/splits.txt b/config/GZ2E01/rels/d_a_myna/splits.txt index c0186af5c6..a8a798c952 100644 --- a/config/GZ2E01/rels/d_a_myna/splits.txt +++ b/config/GZ2E01/rels/d_a_myna/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_myna.cpp: diff --git a/config/GZ2E01/rels/d_a_myna/symbols.txt b/config/GZ2E01/rels/d_a_myna/symbols.txt index b68f6f56be..f5a12e8cf4 100644 --- a/config/GZ2E01/rels/d_a_myna/symbols.txt +++ b/config/GZ2E01/rels/d_a_myna/symbols.txt @@ -139,7 +139,8 @@ mCcDSph__8daMyna_c = .rodata:0x00000000; // type:object size:0x40 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_281_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3800 = .data:0x00000020; // type:object size:0xC scope:local @3801 = .data:0x0000002C; // type:object size:0xC scope:local @3802 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_nbomb/splits.txt b/config/GZ2E01/rels/d_a_nbomb/splits.txt index 2629644480..320058d8d3 100644 --- a/config/GZ2E01/rels/d_a_nbomb/splits.txt +++ b/config/GZ2E01/rels/d_a_nbomb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_nbomb.cpp: diff --git a/config/GZ2E01/rels/d_a_nbomb/symbols.txt b/config/GZ2E01/rels/d_a_nbomb/symbols.txt index f873820527..2bcd278d60 100644 --- a/config/GZ2E01/rels/d_a_nbomb/symbols.txt +++ b/config/GZ2E01/rels/d_a_nbomb/symbols.txt @@ -64,7 +64,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3767 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3767 = .rodata:0x00000000; // type:object size:0xC scope:local l_localCenterOffset = .rodata:0x0000000C; // type:object size:0xC scope:global l_arcNameBombF = .rodata:0x00000018; // type:object size:0x6 scope:global data:string l_arcNameBombE = .rodata:0x00000020; // type:object size:0x5 scope:global data:string @@ -174,6 +174,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @5069 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte effectScale$5068 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_ni/splits.txt b/config/GZ2E01/rels/d_a_ni/splits.txt index 3886f5dde4..049eb272ce 100644 --- a/config/GZ2E01/rels/d_a_ni/splits.txt +++ b/config/GZ2E01/rels/d_a_ni/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_ni.cpp: diff --git a/config/GZ2E01/rels/d_a_ni/symbols.txt b/config/GZ2E01/rels/d_a_ni/symbols.txt index 53c053f4bb..a1ac98d20d 100644 --- a/config/GZ2E01/rels/d_a_ni/symbols.txt +++ b/config/GZ2E01/rels/d_a_ni/symbols.txt @@ -138,7 +138,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_282_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double hane_id$3986 = .data:0x00000020; // type:object size:0x8 scope:local @5125 = .data:0x00000028; // type:object size:0x7C scope:local j_w$5390 = .data:0x000000A4; // type:object size:0x10 scope:local @@ -175,7 +176,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_282_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +data_8095158d = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3953 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:local data:byte target_info = .bss:0x00000090; // type:object size:0x28 scope:local diff --git a/config/GZ2E01/rels/d_a_npc_aru/splits.txt b/config/GZ2E01/rels/d_a_npc_aru/splits.txt index d1b15daa93..9176d9c9a3 100644 --- a/config/GZ2E01/rels/d_a_npc_aru/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_aru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_aru.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_aru/symbols.txt b/config/GZ2E01/rels/d_a_npc_aru/symbols.txt index 67e61325ea..5f13666a0d 100644 --- a/config/GZ2E01/rels/d_a_npc_aru/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_aru/symbols.txt @@ -162,7 +162,8 @@ heapSize$4024 = .rodata:0x000000A0; // type:object size:0x18 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_283_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x60 scope:global l_resNameList = .data:0x00000088; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_npc_ash/splits.txt b/config/GZ2E01/rels/d_a_npc_ash/splits.txt index 3d076d9682..5a51cf1673 100644 --- a/config/GZ2E01/rels/d_a_npc_ash/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_ash/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ash.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_ash/symbols.txt b/config/GZ2E01/rels/d_a_npc_ash/symbols.txt index 7edb733e6a..dc4b4f9d88 100644 --- a/config/GZ2E01/rels/d_a_npc_ash/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_ash/symbols.txt @@ -164,7 +164,8 @@ m__16daNpcAsh_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:globa ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_284_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xD8 scope:global l_btpGetParamList = .data:0x000000F8; // type:object size:0xC scope:global l_btkGetParamList = .data:0x00000104; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_npc_ashB/splits.txt b/config/GZ2E01/rels/d_a_npc_ashB/splits.txt index b3323a0527..2e9e1fdfd6 100644 --- a/config/GZ2E01/rels/d_a_npc_ashB/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_ashB/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ashB.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_ashB/symbols.txt b/config/GZ2E01/rels/d_a_npc_ashB/symbols.txt index 4fd774c69f..7fd59e8cdf 100644 --- a/config/GZ2E01/rels/d_a_npc_ashB/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_ashB/symbols.txt @@ -152,7 +152,8 @@ m__17daNpcAshB_Param_c = .rodata:0x00000000; // type:object size:0x70 scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_285_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xFC scope:global l_btpGetParamList = .data:0x0000011C; // type:object size:0x30 scope:global l_btkGetParamList = .data:0x0000014C; // type:object size:0x30 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_bans/splits.txt b/config/GZ2E01/rels/d_a_npc_bans/splits.txt index 409489c74c..ba8af2b74e 100644 --- a/config/GZ2E01/rels/d_a_npc_bans/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_bans/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bans.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_bans/symbols.txt b/config/GZ2E01/rels/d_a_npc_bans/symbols.txt index 2711365fd0..e774c50238 100644 --- a/config/GZ2E01/rels/d_a_npc_bans/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_bans/symbols.txt @@ -157,7 +157,8 @@ id$5349 = .rodata:0x00000138; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_286_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global data:4byte l_evtList = .data:0x00000040; // type:object size:0x48 scope:global l_resNameList = .data:0x00000088; // type:object size:0x18 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_besu/splits.txt b/config/GZ2E01/rels/d_a_npc_besu/splits.txt index 81d7a73a58..039e493173 100644 --- a/config/GZ2E01/rels/d_a_npc_besu/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_besu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_besu.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_besu/symbols.txt b/config/GZ2E01/rels/d_a_npc_besu/symbols.txt index 0a770424e3..b530556a73 100644 --- a/config/GZ2E01/rels/d_a_npc_besu/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_besu/symbols.txt @@ -171,7 +171,8 @@ jointNo$5355 = .rodata:0x00000174; // type:object size:0x4 scope:local data:4byt ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_79_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x30 scope:global data:4byte l_evtList = .data:0x00000050; // type:object size:0x68 scope:global l_resNameList = .data:0x000000B8; // type:object size:0x30 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_blue_ns/splits.txt b/config/GZ2E01/rels/d_a_npc_blue_ns/splits.txt index 4851562802..443044817f 100644 --- a/config/GZ2E01/rels/d_a_npc_blue_ns/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_blue_ns/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_blue_ns.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_blue_ns/symbols.txt b/config/GZ2E01/rels/d_a_npc_blue_ns/symbols.txt index 1f5a7a7587..6e0999ab13 100644 --- a/config/GZ2E01/rels/d_a_npc_blue_ns/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_blue_ns/symbols.txt @@ -151,7 +151,8 @@ ptclOffsetY$5218 = .rodata:0x00000220; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_287_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x6C scope:global l_arcNames = .data:0x0000008C; // type:object size:0x4 scope:global data:4byte l_evtNames = .data:0x00000090; // type:object size:0x1C scope:global diff --git a/config/GZ2E01/rels/d_a_npc_bou/splits.txt b/config/GZ2E01/rels/d_a_npc_bou/splits.txt index a6fb5dd13c..3573b6f10f 100644 --- a/config/GZ2E01/rels/d_a_npc_bou/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_bou/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bou.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_bou/symbols.txt b/config/GZ2E01/rels/d_a_npc_bou/symbols.txt index 8a1e2761c7..72aecb4e0c 100644 --- a/config/GZ2E01/rels/d_a_npc_bou/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_bou/symbols.txt @@ -145,7 +145,8 @@ heapSize$4096 = .rodata:0x0000009C; // type:object size:0x18 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_288_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:local data:4byte l_evtList = .data:0x00000028; // type:object size:0x58 scope:global l_resNameList = .data:0x00000080; // type:object size:0x1C scope:local diff --git a/config/GZ2E01/rels/d_a_npc_bouS/splits.txt b/config/GZ2E01/rels/d_a_npc_bouS/splits.txt index 9469997a33..bb08fe9cd1 100644 --- a/config/GZ2E01/rels/d_a_npc_bouS/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_bouS/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bouS.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_bouS/symbols.txt b/config/GZ2E01/rels/d_a_npc_bouS/symbols.txt index 4f15c73a03..1688b8dc85 100644 --- a/config/GZ2E01/rels/d_a_npc_bouS/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_bouS/symbols.txt @@ -163,7 +163,8 @@ m__17daNpcBouS_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_289_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x114 scope:global l_btpGetParamList = .data:0x00000134; // type:object size:0x3C scope:global l_btkGetParamList = .data:0x00000170; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_cdn3/symbols.txt b/config/GZ2E01/rels/d_a_npc_cdn3/symbols.txt index 88d5d73120..cf7a23409e 100644 --- a/config/GZ2E01/rels/d_a_npc_cdn3/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_cdn3/symbols.txt @@ -122,7 +122,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_290_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3940 = .data:0x00000020; // type:object size:0xC scope:local @3941 = .data:0x0000002C; // type:object size:0xC scope:local @3942 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_npc_chat/splits.txt b/config/GZ2E01/rels/d_a_npc_chat/splits.txt index eac5f9fb3a..27a480b479 100644 --- a/config/GZ2E01/rels/d_a_npc_chat/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_chat/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_chat.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_chat/symbols.txt b/config/GZ2E01/rels/d_a_npc_chat/symbols.txt index b575129547..62c46d38e1 100644 --- a/config/GZ2E01/rels/d_a_npc_chat/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_chat/symbols.txt @@ -290,7 +290,8 @@ a_jntNumTbl$5570 = .rodata:0x000005C8; // type:object size:0x68 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_291_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameTbl = .data:0x00000020; // type:object size:0x78 scope:global l_bmdTbl = .data:0x00000098; // type:object size:0xF0 scope:global data:4byte l_bmdTWTbl = .data:0x00000188; // type:object size:0xF0 scope:global data:4byte @@ -352,7 +353,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3881 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4430 = .bss:0x00000058; // type:object size:0xC scope:local -init$2253 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 +init$2253 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte @4433 = .bss:0x00000068; // type:object size:0xC scope:local @4434 = .bss:0x00000074; // type:object size:0xC scope:local @4435 = .bss:0x00000080; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_npc_chin/splits.txt b/config/GZ2E01/rels/d_a_npc_chin/splits.txt index 6879f55230..940f849f8e 100644 --- a/config/GZ2E01/rels/d_a_npc_chin/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_chin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_chin.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_chin/symbols.txt b/config/GZ2E01/rels/d_a_npc_chin/symbols.txt index f4d00e1b99..9b8d480dd6 100644 --- a/config/GZ2E01/rels/d_a_npc_chin/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_chin/symbols.txt @@ -225,7 +225,8 @@ m__17daNpcChin_Param_c = .rodata:0x00000014; // type:object size:0x6C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_292_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x18C scope:global l_btpGetParamList = .data:0x000001AC; // type:object size:0xB4 scope:global l_btkGetParamList = .data:0x00000260; // type:object size:0x6C scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_clerka/splits.txt b/config/GZ2E01/rels/d_a_npc_clerka/splits.txt index 8a24e56b31..4c215a3cb0 100644 --- a/config/GZ2E01/rels/d_a_npc_clerka/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_clerka/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerka.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_clerka/symbols.txt b/config/GZ2E01/rels/d_a_npc_clerka/symbols.txt index f40d3a2a5b..a9dc936e24 100644 --- a/config/GZ2E01/rels/d_a_npc_clerka/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_clerka/symbols.txt @@ -135,7 +135,8 @@ m__20daNpc_clerkA_Param_c = .rodata:0x00000000; // type:object size:0x90 scope:g ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_293_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_clerkb/splits.txt b/config/GZ2E01/rels/d_a_npc_clerkb/splits.txt index bf1e54d934..3275bd53cb 100644 --- a/config/GZ2E01/rels/d_a_npc_clerkb/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_clerkb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerkb.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_clerkb/symbols.txt b/config/GZ2E01/rels/d_a_npc_clerkb/symbols.txt index 6b7021863a..94f5e0c8f3 100644 --- a/config/GZ2E01/rels/d_a_npc_clerkb/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_clerkb/symbols.txt @@ -138,7 +138,8 @@ m__20daNpc_clerkB_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:g ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_294_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_clerkt/splits.txt b/config/GZ2E01/rels/d_a_npc_clerkt/splits.txt index 6cfa914495..62e30d2ada 100644 --- a/config/GZ2E01/rels/d_a_npc_clerkt/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_clerkt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerkt.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_clerkt/symbols.txt b/config/GZ2E01/rels/d_a_npc_clerkt/symbols.txt index 8e7c8ec376..1951947dd0 100644 --- a/config/GZ2E01/rels/d_a_npc_clerkt/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_clerkt/symbols.txt @@ -131,7 +131,8 @@ m__19daNpcClerkt_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_295_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_df/splits.txt b/config/GZ2E01/rels/d_a_npc_df/splits.txt index 4a1bc8869c..361302ea7c 100644 --- a/config/GZ2E01/rels/d_a_npc_df/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_df/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_df.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_doc/splits.txt b/config/GZ2E01/rels/d_a_npc_doc/splits.txt index faec1c0187..705d650271 100644 --- a/config/GZ2E01/rels/d_a_npc_doc/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_doc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_doc.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_doc/symbols.txt b/config/GZ2E01/rels/d_a_npc_doc/symbols.txt index 82c00201b1..0fdf389d73 100644 --- a/config/GZ2E01/rels/d_a_npc_doc/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_doc/symbols.txt @@ -129,7 +129,8 @@ heapSize$3968 = .rodata:0x00000090; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_298_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_npc_doorboy/splits.txt b/config/GZ2E01/rels/d_a_npc_doorboy/splits.txt index 17f7c28a81..77332a5fd2 100644 --- a/config/GZ2E01/rels/d_a_npc_doorboy/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_doorboy/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_doorboy.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_doorboy/symbols.txt b/config/GZ2E01/rels/d_a_npc_doorboy/symbols.txt index ae16f6b4bf..78d471230d 100644 --- a/config/GZ2E01/rels/d_a_npc_doorboy/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_doorboy/symbols.txt @@ -99,7 +99,8 @@ m__20daNpcDoorBoy_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:g ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_299_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x48 scope:global l_btpGetParamList = .data:0x00000068; // type:object size:0xC scope:global l_arcNames = .data:0x00000074; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_drainSol/splits.txt b/config/GZ2E01/rels/d_a_npc_drainSol/splits.txt index 2cf697f780..3bb08a07cc 100644 --- a/config/GZ2E01/rels/d_a_npc_drainSol/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_drainSol/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_drainSol.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_du/splits.txt b/config/GZ2E01/rels/d_a_npc_du/splits.txt index 28773a55db..cb4a20abd8 100644 --- a/config/GZ2E01/rels/d_a_npc_du/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_du/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_du.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_du/symbols.txt b/config/GZ2E01/rels/d_a_npc_du/symbols.txt index 4a1a3d66ea..1c2324cbb6 100644 --- a/config/GZ2E01/rels/d_a_npc_du/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_du/symbols.txt @@ -78,6 +78,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000B8; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000000DC; // type:object size:0xC scope:global __vt__14daNpc_Du_HIO_c = .data:0x000000E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_npc_fairy/splits.txt b/config/GZ2E01/rels/d_a_npc_fairy/splits.txt index 27fbb571b1..d20ffe84b7 100644 --- a/config/GZ2E01/rels/d_a_npc_fairy/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_fairy/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_fairy.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_fairy/symbols.txt b/config/GZ2E01/rels/d_a_npc_fairy/symbols.txt index 87b39e6d30..0ed1ad6d9e 100644 --- a/config/GZ2E01/rels/d_a_npc_fairy/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_fairy/symbols.txt @@ -214,7 +214,8 @@ sEvtBitNo$5358 = .rodata:0x00000190; // type:object size:0xA scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_302_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_loadResPtrn0 = .data:0x00000028; // type:object size:0x2 scope:global l_loadResPtrnList = .data:0x0000002C; // type:object size:0x14 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_fairy_seirei/splits.txt b/config/GZ2E01/rels/d_a_npc_fairy_seirei/splits.txt index 7d1251d591..53c3ab2401 100644 --- a/config/GZ2E01/rels/d_a_npc_fairy_seirei/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_fairy_seirei/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_fairy_seirei.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_fairy_seirei/symbols.txt b/config/GZ2E01/rels/d_a_npc_fairy_seirei/symbols.txt index 3f0d3c4b05..ce5e9c3d99 100644 --- a/config/GZ2E01/rels/d_a_npc_fairy_seirei/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_fairy_seirei/symbols.txt @@ -99,7 +99,8 @@ sTempBit$4575 = .rodata:0x000000BC; // type:object size:0x10 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_80_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_evtList = .data:0x00000020; // type:object size:0x8 scope:global l_resNameList = .data:0x00000028; // type:object size:0x8 scope:global l_loadResPtrn0 = .data:0x00000030; // type:object size:0x2 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_fish/symbols.txt b/config/GZ2E01/rels/d_a_npc_fish/symbols.txt index eb1b5ed532..0ca2aa1f78 100644 --- a/config/GZ2E01/rels/d_a_npc_fish/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_fish/symbols.txt @@ -21,7 +21,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_81_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double fish_d127_S = .data:0x00000020; // type:object size:0x3D4 scope:global fish_d127 = .data:0x000003F4; // type:object size:0x460 scope:global lf_pos = .data:0x00000854; // type:object size:0x90 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_gnd/splits.txt b/config/GZ2E01/rels/d_a_npc_gnd/splits.txt index 504644c041..b136cd9de7 100644 --- a/config/GZ2E01/rels/d_a_npc_gnd/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_gnd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gnd.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_gnd/symbols.txt b/config/GZ2E01/rels/d_a_npc_gnd/symbols.txt index a6d44def0e..94e918f3f8 100644 --- a/config/GZ2E01/rels/d_a_npc_gnd/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_gnd/symbols.txt @@ -124,7 +124,8 @@ m__17daNpc_Gnd_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_304_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_gra/splits.txt b/config/GZ2E01/rels/d_a_npc_gra/splits.txt index 2ec441a606..5204f31b61 100644 --- a/config/GZ2E01/rels/d_a_npc_gra/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_gra/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gra.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_gra/symbols.txt b/config/GZ2E01/rels/d_a_npc_gra/symbols.txt index e68d7cb061..d0fd02ada6 100644 --- a/config/GZ2E01/rels/d_a_npc_gra/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_gra/symbols.txt @@ -314,7 +314,8 @@ l_prticles_id$6368 = .rodata:0x00000694; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_305_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x28 scope:global data:4byte l_bckGetParamList = .data:0x00000048; // type:object size:0x198 scope:global l_btpGetParamList = .data:0x000001E0; // type:object size:0x80 scope:global @@ -419,7 +420,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4083 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @5080 = .bss:0x00000058; // type:object size:0xC scope:local -init$2720 = .bss:0x00000064; // type:object size:0x1 scope:local +init$2720 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$5079 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_grc/splits.txt b/config/GZ2E01/rels/d_a_npc_grc/splits.txt index 32077a261b..5421ecbe9c 100644 --- a/config/GZ2E01/rels/d_a_npc_grc/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_grc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grc.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_grc/symbols.txt b/config/GZ2E01/rels/d_a_npc_grc/symbols.txt index 7f87ed2877..dac0649998 100644 --- a/config/GZ2E01/rels/d_a_npc_grc/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_grc/symbols.txt @@ -146,7 +146,8 @@ m__17daNpc_grC_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_306_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x98 scope:global l_btpGetParamList = .data:0x000000C8; // type:object size:0x30 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_grd/splits.txt b/config/GZ2E01/rels/d_a_npc_grd/splits.txt index 2ac90e7e25..49e082901e 100644 --- a/config/GZ2E01/rels/d_a_npc_grd/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_grd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grd.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_grd/symbols.txt b/config/GZ2E01/rels/d_a_npc_grd/symbols.txt index 0a0fdf3121..3384f1ebef 100644 --- a/config/GZ2E01/rels/d_a_npc_grd/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_grd/symbols.txt @@ -138,7 +138,8 @@ m__17daNpc_Grd_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_307_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x60 scope:global l_btpGetParamList = .data:0x00000088; // type:object size:0x20 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_grm/splits.txt b/config/GZ2E01/rels/d_a_npc_grm/splits.txt index 4a5fe1ac5f..79a9e8515b 100644 --- a/config/GZ2E01/rels/d_a_npc_grm/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_grm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grm.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_grm/symbols.txt b/config/GZ2E01/rels/d_a_npc_grm/symbols.txt index df1332c8ad..963d1ae3b7 100644 --- a/config/GZ2E01/rels/d_a_npc_grm/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_grm/symbols.txt @@ -122,7 +122,8 @@ m__17daNpc_grM_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_308_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_npc_grmc/splits.txt b/config/GZ2E01/rels/d_a_npc_grmc/splits.txt index 21ee0e831e..e02b25c3ce 100644 --- a/config/GZ2E01/rels/d_a_npc_grmc/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_grmc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grmc.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_grmc/symbols.txt b/config/GZ2E01/rels/d_a_npc_grmc/symbols.txt index 9d2ca12630..823a0eb698 100644 --- a/config/GZ2E01/rels/d_a_npc_grmc/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_grmc/symbols.txt @@ -122,7 +122,8 @@ m__18daNpc_grMC_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_309_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_npc_gro/splits.txt b/config/GZ2E01/rels/d_a_npc_gro/splits.txt index e2d96b0ebf..bace7d2e35 100644 --- a/config/GZ2E01/rels/d_a_npc_gro/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_gro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gro.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_gro/symbols.txt b/config/GZ2E01/rels/d_a_npc_gro/symbols.txt index 5744eebc95..e974d5fb87 100644 --- a/config/GZ2E01/rels/d_a_npc_gro/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_gro/symbols.txt @@ -169,7 +169,8 @@ heapSize$4387 = .rodata:0x0000006C; // type:object size:0x10 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_310_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4083 = .data:0x00000020; // type:object size:0xC scope:local l_bmdGetParamList = .data:0x0000002C; // type:object size:0x18 scope:global l_bckGetParamList = .data:0x00000044; // type:object size:0xB8 scope:global @@ -234,7 +235,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4095 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4818 = .bss:0x00000058; // type:object size:0xC scope:local -init$2468 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 +init$2468 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$4817 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_grr/splits.txt b/config/GZ2E01/rels/d_a_npc_grr/splits.txt index ba92d3e917..037f7ff4b9 100644 --- a/config/GZ2E01/rels/d_a_npc_grr/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_grr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grr.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_grr/symbols.txt b/config/GZ2E01/rels/d_a_npc_grr/symbols.txt index 729b3950d8..3b6f24d4ce 100644 --- a/config/GZ2E01/rels/d_a_npc_grr/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_grr/symbols.txt @@ -158,7 +158,8 @@ heapSize$4308 = .rodata:0x0000006C; // type:object size:0x10 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_311_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x98 scope:global l_btpGetParamList = .data:0x000000C0; // type:object size:0x30 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_grs/splits.txt b/config/GZ2E01/rels/d_a_npc_grs/splits.txt index d87b3a701a..34574a7d50 100644 --- a/config/GZ2E01/rels/d_a_npc_grs/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_grs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grs.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_grs/symbols.txt b/config/GZ2E01/rels/d_a_npc_grs/symbols.txt index 8a39651aec..0235fab6e0 100644 --- a/config/GZ2E01/rels/d_a_npc_grs/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_grs/symbols.txt @@ -133,7 +133,8 @@ jointNo$5517 = .rodata:0x000001B4; // type:object size:0x18 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_312_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x40 scope:global l_btpGetParamList = .data:0x00000070; // type:object size:0x18 scope:global @@ -188,7 +189,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4050 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4752 = .bss:0x00000058; // type:object size:0xC scope:local -init$4753 = .bss:0x00000064; // type:object size:0x1 scope:local +init$4753 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$4751 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_grz/splits.txt b/config/GZ2E01/rels/d_a_npc_grz/splits.txt index cc54401f18..c51a768db1 100644 --- a/config/GZ2E01/rels/d_a_npc_grz/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_grz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grz.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_grz/symbols.txt b/config/GZ2E01/rels/d_a_npc_grz/symbols.txt index 8d815e1955..e3476901b4 100644 --- a/config/GZ2E01/rels/d_a_npc_grz/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_grz/symbols.txt @@ -230,7 +230,8 @@ l_prticles_id$6299 = .rodata:0x00000428; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_313_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x110 scope:global l_btpGetParamList = .data:0x00000138; // type:object size:0x50 scope:global @@ -301,7 +302,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3810 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4691 = .bss:0x00000058; // type:object size:0xC scope:local -init$2545 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 +init$2545 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$4690 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_guard/symbols.txt b/config/GZ2E01/rels/d_a_npc_guard/symbols.txt index ba54089013..7bff172518 100644 --- a/config/GZ2E01/rels/d_a_npc_guard/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_guard/symbols.txt @@ -100,7 +100,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_314_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3824 = .data:0x00000020; // type:object size:0xC scope:local @3825 = .data:0x0000002C; // type:object size:0xC scope:local @3826 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_npc_gwolf/splits.txt b/config/GZ2E01/rels/d_a_npc_gwolf/splits.txt index 42883f6ff7..c17a45cb67 100644 --- a/config/GZ2E01/rels/d_a_npc_gwolf/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_gwolf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gwolf.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_gwolf/symbols.txt b/config/GZ2E01/rels/d_a_npc_gwolf/symbols.txt index 04b694c57f..b1512bcfb6 100644 --- a/config/GZ2E01/rels/d_a_npc_gwolf/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_gwolf/symbols.txt @@ -157,7 +157,8 @@ m__19daNpc_GWolf_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_315_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x60 scope:global l_btkGetParamList = .data:0x00000088; // type:object size:0x8 scope:global data:4byte @@ -229,7 +230,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4017 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4815 = .bss:0x00000058; // type:object size:0xC scope:local -init$2502 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 +init$2502 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$4814 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_hanjo/splits.txt b/config/GZ2E01/rels/d_a_npc_hanjo/splits.txt index bc6918cd37..c736549d52 100644 --- a/config/GZ2E01/rels/d_a_npc_hanjo/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_hanjo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_hanjo.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_hanjo/symbols.txt b/config/GZ2E01/rels/d_a_npc_hanjo/symbols.txt index a6563d2cfc..4d36c49f29 100644 --- a/config/GZ2E01/rels/d_a_npc_hanjo/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_hanjo/symbols.txt @@ -190,7 +190,8 @@ bmdTypeList$4495 = .rodata:0x00000110; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_316_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global data:4byte l_evtList = .data:0x00000040; // type:object size:0x58 scope:global data:4byte l_resNameList = .data:0x00000098; // type:object size:0x18 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_henna/splits.txt b/config/GZ2E01/rels/d_a_npc_henna/splits.txt index e6393bbd2a..1a347004d1 100644 --- a/config/GZ2E01/rels/d_a_npc_henna/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_henna/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_henna.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_henna/symbols.txt b/config/GZ2E01/rels/d_a_npc_henna/symbols.txt index ba8b7a3937..f993f99182 100644 --- a/config/GZ2E01/rels/d_a_npc_henna/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_henna/symbols.txt @@ -271,7 +271,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_82_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double check_kind = .data:0x00000020; // type:object size:0x8 scope:global data:2byte @4437 = .data:0x00000028; // type:object size:0x34 scope:local @4753 = .data:0x0000005C; // type:object size:0x30 scope:local @@ -304,7 +305,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3900 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_hoz/splits.txt b/config/GZ2E01/rels/d_a_npc_hoz/splits.txt index da0da0f2cb..9b67dfd4f1 100644 --- a/config/GZ2E01/rels/d_a_npc_hoz/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_hoz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_hoz.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_hoz/symbols.txt b/config/GZ2E01/rels/d_a_npc_hoz/symbols.txt index 63d40af73b..ed13eec7d4 100644 --- a/config/GZ2E01/rels/d_a_npc_hoz/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_hoz/symbols.txt @@ -146,7 +146,8 @@ heapSize$4117 = .rodata:0x00000090; // type:object size:0x1C scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_318_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x48 scope:global l_resNameList = .data:0x00000078; // type:object size:0x1C scope:global diff --git a/config/GZ2E01/rels/d_a_npc_impal/splits.txt b/config/GZ2E01/rels/d_a_npc_impal/splits.txt index 15d6699d8c..05a4157c3e 100644 --- a/config/GZ2E01/rels/d_a_npc_impal/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_impal/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_impal.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_impal/symbols.txt b/config/GZ2E01/rels/d_a_npc_impal/symbols.txt index d76d1167c6..1b67485a1e 100644 --- a/config/GZ2E01/rels/d_a_npc_impal/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_impal/symbols.txt @@ -143,7 +143,8 @@ m__18daNpcImpal_Param_c = .rodata:0x00000000; // type:object size:0x70 scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_319_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xD8 scope:global l_btpGetParamList = .data:0x000000F8; // type:object size:0x78 scope:global l_btkGetParamList = .data:0x00000170; // type:object size:0x30 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_ins/splits.txt b/config/GZ2E01/rels/d_a_npc_ins/splits.txt index e7e21d357f..2d98d7204d 100644 --- a/config/GZ2E01/rels/d_a_npc_ins/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_ins/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ins.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_ins/symbols.txt b/config/GZ2E01/rels/d_a_npc_ins/symbols.txt index 396b720a73..37f8506937 100644 --- a/config/GZ2E01/rels/d_a_npc_ins/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_ins/symbols.txt @@ -170,7 +170,8 @@ m__16daNpcIns_Param_c = .rodata:0x000000C0; // type:object size:0x70 scope:globa ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_321_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x120 scope:global l_btpGetParamList = .data:0x00000140; // type:object size:0x60 scope:global l_btkGetParamList = .data:0x000001A0; // type:object size:0x18 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_jagar/splits.txt b/config/GZ2E01/rels/d_a_npc_jagar/splits.txt index 5de90e7bb2..8b9a2c5f73 100644 --- a/config/GZ2E01/rels/d_a_npc_jagar/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_jagar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_jagar.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_jagar/symbols.txt b/config/GZ2E01/rels/d_a_npc_jagar/symbols.txt index 097a79e4b4..f90163c402 100644 --- a/config/GZ2E01/rels/d_a_npc_jagar/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_jagar/symbols.txt @@ -156,7 +156,8 @@ heapSize$4099 = .rodata:0x000000A0; // type:object size:0x10 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_322_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:local data:4byte l_evtList = .data:0x00000028; // type:object size:0x48 scope:global l_resNameList = .data:0x00000070; // type:object size:0x14 scope:local diff --git a/config/GZ2E01/rels/d_a_npc_kakashi/splits.txt b/config/GZ2E01/rels/d_a_npc_kakashi/splits.txt index 0ce59dbfc3..e27d65f5d1 100644 --- a/config/GZ2E01/rels/d_a_npc_kakashi/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_kakashi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kakashi.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_kakashi/symbols.txt b/config/GZ2E01/rels/d_a_npc_kakashi/symbols.txt index cd0602264e..f5bdb10ffe 100644 --- a/config/GZ2E01/rels/d_a_npc_kakashi/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_kakashi/symbols.txt @@ -129,7 +129,8 @@ id$5174 = .rodata:0x00000108; // type:object size:0x4 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_83_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte l_evtList = .data:0x00000038; // type:object size:0xA8 scope:global l_resNameList = .data:0x000000E0; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_kasi_hana/splits.txt b/config/GZ2E01/rels/d_a_npc_kasi_hana/splits.txt index e8b02ace71..f69d6af5fa 100644 --- a/config/GZ2E01/rels/d_a_npc_kasi_hana/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_kasi_hana/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_hana.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_kasi_hana/symbols.txt b/config/GZ2E01/rels/d_a_npc_kasi_hana/symbols.txt index 3d8ca10feb..e4b37ee577 100644 --- a/config/GZ2E01/rels/d_a_npc_kasi_hana/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_kasi_hana/symbols.txt @@ -197,7 +197,8 @@ m__21daNpcKasiHana_Param_c = .rodata:0x00000048; // type:object size:0x7C scope: ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_323_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xB4 scope:global l_btpGetParamList = .data:0x000000D4; // type:object size:0xC scope:global l_arcNames = .data:0x000000E0; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_kasi_kyu/splits.txt b/config/GZ2E01/rels/d_a_npc_kasi_kyu/splits.txt index b92316ec8d..220ccfb44c 100644 --- a/config/GZ2E01/rels/d_a_npc_kasi_kyu/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_kasi_kyu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_kyu.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_kasi_kyu/symbols.txt b/config/GZ2E01/rels/d_a_npc_kasi_kyu/symbols.txt index 96c6bf0246..f06cc8e792 100644 --- a/config/GZ2E01/rels/d_a_npc_kasi_kyu/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_kasi_kyu/symbols.txt @@ -153,7 +153,8 @@ m__20daNpcKasiKyu_Param_c = .rodata:0x00000000; // type:object size:0x74 scope:g ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_324_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xC0 scope:global l_btpGetParamList = .data:0x000000E0; // type:object size:0xC scope:global l_arcNames = .data:0x000000EC; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_kasi_mich/splits.txt b/config/GZ2E01/rels/d_a_npc_kasi_mich/splits.txt index caef80f2c4..3d9458405b 100644 --- a/config/GZ2E01/rels/d_a_npc_kasi_mich/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_kasi_mich/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_mich.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_kasi_mich/symbols.txt b/config/GZ2E01/rels/d_a_npc_kasi_mich/symbols.txt index f88b449d53..9e5caf50d7 100644 --- a/config/GZ2E01/rels/d_a_npc_kasi_mich/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_kasi_mich/symbols.txt @@ -151,7 +151,8 @@ m__21daNpcKasiMich_Param_c = .rodata:0x00000000; // type:object size:0x74 scope: ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_325_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xC0 scope:global l_btpGetParamList = .data:0x000000E0; // type:object size:0xC scope:global l_arcNames = .data:0x000000EC; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_kkri/splits.txt b/config/GZ2E01/rels/d_a_npc_kkri/splits.txt index 62166bee72..bdea450be0 100644 --- a/config/GZ2E01/rels/d_a_npc_kkri/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_kkri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kkri.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_kkri/symbols.txt b/config/GZ2E01/rels/d_a_npc_kkri/symbols.txt index 05e90bd228..7ca2cab9a3 100644 --- a/config/GZ2E01/rels/d_a_npc_kkri/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_kkri/symbols.txt @@ -141,7 +141,8 @@ heapSize$4005 = .rodata:0x0000008C; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_84_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x28 scope:global l_resNameList = .data:0x00000058; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_npc_kn/splits.txt b/config/GZ2E01/rels/d_a_npc_kn/splits.txt index a970c3d3d4..7acb87c62b 100644 --- a/config/GZ2E01/rels/d_a_npc_kn/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_kn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kn.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_kn/symbols.txt b/config/GZ2E01/rels/d_a_npc_kn/symbols.txt index 91fb91b8c0..e4b67c771c 100644 --- a/config/GZ2E01/rels/d_a_npc_kn/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_kn/symbols.txt @@ -300,7 +300,8 @@ heapSize$6094 = .rodata:0x0000015C; // type:object size:0x20 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_327_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daNpc_Kn_c = .data:0x00000020; // type:object size:0x44 scope:global mCcDSph__10daNpc_Kn_c = .data:0x00000064; // type:object size:0x40 scope:global l_bmdData = .data:0x000000A4; // type:object size:0x18 scope:global @@ -463,10 +464,10 @@ mFindCount__10daNpc_Kn_c = .bss:0x00000110; // type:object size:0x4 scope:global @5904 = .bss:0x00000114; // type:object size:0xC scope:local l_HIO = .bss:0x00000120; // type:object size:0x4 scope:global data:4byte @12316 = .bss:0x00000124; // type:object size:0xC scope:local -init$9794 = .bss:0x00000130; // type:object size:0x1 scope:local align:1 +init$9794 = .bss:0x00000130; // type:object size:0x1 scope:local align:1 data:byte lightAParticleScale$12315 = .bss:0x00000134; // type:object size:0xC scope:local @12320 = .bss:0x00000140; // type:object size:0xC scope:local -init$9798 = .bss:0x0000014C; // type:object size:0x1 scope:local align:1 +init$9798 = .bss:0x0000014C; // type:object size:0x1 scope:local align:1 data:byte lightALocalTrans$12319 = .bss:0x00000150; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000015C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000160; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_knj/splits.txt b/config/GZ2E01/rels/d_a_npc_knj/splits.txt index 62eac259b2..9344b72d55 100644 --- a/config/GZ2E01/rels/d_a_npc_knj/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_knj/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_knj.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_knj/symbols.txt b/config/GZ2E01/rels/d_a_npc_knj/symbols.txt index 48d9207f2a..3bc5fa0a52 100644 --- a/config/GZ2E01/rels/d_a_npc_knj/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_knj/symbols.txt @@ -95,7 +95,8 @@ m__17daNpc_Knj_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_328_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_kolin/splits.txt b/config/GZ2E01/rels/d_a_npc_kolin/splits.txt index ce50229f88..c8f93513d6 100644 --- a/config/GZ2E01/rels/d_a_npc_kolin/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_kolin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kolin.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_kolin/symbols.txt b/config/GZ2E01/rels/d_a_npc_kolin/symbols.txt index dca65681f3..aec71a71cb 100644 --- a/config/GZ2E01/rels/d_a_npc_kolin/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_kolin/symbols.txt @@ -174,7 +174,8 @@ jointNo$5054 = .rodata:0x00000150; // type:object size:0x4 scope:local data:4byt ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_85_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte l_evtList = .data:0x00000038; // type:object size:0x48 scope:global l_resNameList = .data:0x00000080; // type:object size:0x20 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_kolinb/splits.txt b/config/GZ2E01/rels/d_a_npc_kolinb/splits.txt index 917e244263..c7e2bf4b20 100644 --- a/config/GZ2E01/rels/d_a_npc_kolinb/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_kolinb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kolinb.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_kolinb/symbols.txt b/config/GZ2E01/rels/d_a_npc_kolinb/symbols.txt index 17c9f64118..ebadebe8c1 100644 --- a/config/GZ2E01/rels/d_a_npc_kolinb/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_kolinb/symbols.txt @@ -112,7 +112,8 @@ heapSize$3973 = .rodata:0x0000008C; // type:object size:0x10 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_329_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x10 scope:global l_resNameList = .data:0x00000040; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_ks/splits.txt b/config/GZ2E01/rels/d_a_npc_ks/splits.txt index b774877f84..6a4ac28794 100644 --- a/config/GZ2E01/rels/d_a_npc_ks/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_ks/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ks.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_ks/symbols.txt b/config/GZ2E01/rels/d_a_npc_ks/symbols.txt index d4fded6381..3497382d06 100644 --- a/config/GZ2E01/rels/d_a_npc_ks/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_ks/symbols.txt @@ -459,7 +459,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_330_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double saru_p = .data:0x00000020; // type:object size:0x20 scope:global data:4byte @4808 = .data:0x00000040; // type:object size:0x38 scope:local guide_path_04 = .data:0x00000078; // type:object size:0x16C scope:global @@ -522,16 +523,16 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa obj_pos = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float leader = .bss:0x00000060; // type:object size:0x4 scope:global data:4byte call_pt = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte -hio_set = .bss:0x00000068; // type:object size:0x1 data:byte +hio_set = .bss:0x00000068; // type:object size:0x1 scope:local align:1 data:byte @4025 = .bss:0x0000006C; // type:object size:0xC scope:local l_HIO = .bss:0x00000078; // type:object size:0x38 scope:global data:byte target_info = .bss:0x000000B0; // type:object size:0x28 scope:global target_info_count = .bss:0x000000D8; // type:object size:0x4 scope:global data:4byte target_bgc = .bss:0x000000DC; // type:object size:0x28 scope:global start_pya$6091 = .bss:0x00000104; // type:object size:0x2 scope:local -init$3911 = .bss:0x00000106; // type:object size:0x1 scope:local data:byte +init$3911 = .bss:0x00000106; // type:object size:0x1 scope:local align:1 data:byte @7870 = .bss:0x00000108; // type:object size:0xC scope:local -init$5647 = .bss:0x00000114; // type:object size:0x1 scope:local data:byte +init$5647 = .bss:0x00000114; // type:object size:0x1 scope:local align:1 data:byte sc$7869 = .bss:0x00000118; // type:object size:0xC scope:local c_start = .bss:0x00000124; // type:object size:0x4 scope:global sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000128; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_kyury/splits.txt b/config/GZ2E01/rels/d_a_npc_kyury/splits.txt index 890ea4f9c6..05452c7d1d 100644 --- a/config/GZ2E01/rels/d_a_npc_kyury/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_kyury/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kyury.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_len/splits.txt b/config/GZ2E01/rels/d_a_npc_len/splits.txt index ea206a79f3..4b15da9176 100644 --- a/config/GZ2E01/rels/d_a_npc_len/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_len/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_len.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_len/symbols.txt b/config/GZ2E01/rels/d_a_npc_len/symbols.txt index 2547fb8cd5..4708bfa381 100644 --- a/config/GZ2E01/rels/d_a_npc_len/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_len/symbols.txt @@ -139,7 +139,8 @@ heapSize$4002 = .rodata:0x00000094; // type:object size:0x28 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_332_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x38 scope:global l_resNameList = .data:0x00000068; // type:object size:0x10 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_lf/splits.txt b/config/GZ2E01/rels/d_a_npc_lf/splits.txt index 62c53eb27e..d6b4e82ab3 100644 --- a/config/GZ2E01/rels/d_a_npc_lf/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_lf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_lf.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_lf/symbols.txt b/config/GZ2E01/rels/d_a_npc_lf/symbols.txt index 78af2651dd..1797c14bc9 100644 --- a/config/GZ2E01/rels/d_a_npc_lf/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_lf/symbols.txt @@ -60,6 +60,6 @@ l_daNPC_LF_Method = .data:0x0000000C; // type:object size:0x20 scope:local g_profile_NPC_LF = .data:0x0000002C; // type:object size:0x30 scope:global __vt__14daNPC_LF_HIO_c = .data:0x0000005C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_333_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_npc_lud/splits.txt b/config/GZ2E01/rels/d_a_npc_lud/splits.txt index 5eda121326..63ee988277 100644 --- a/config/GZ2E01/rels/d_a_npc_lud/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_lud/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_lud.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_lud/symbols.txt b/config/GZ2E01/rels/d_a_npc_lud/symbols.txt index b0a775fb0e..90b90ae622 100644 --- a/config/GZ2E01/rels/d_a_npc_lud/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_lud/symbols.txt @@ -148,7 +148,8 @@ jointNo$5056 = .rodata:0x0000012C; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_334_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x28 scope:global data:4byte l_evtList = .data:0x00000048; // type:object size:0x30 scope:global l_resNameList = .data:0x00000078; // type:object size:0x18 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_maro/splits.txt b/config/GZ2E01/rels/d_a_npc_maro/splits.txt index ba8135bb4c..5d28bb8b3f 100644 --- a/config/GZ2E01/rels/d_a_npc_maro/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_maro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_maro.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_maro/symbols.txt b/config/GZ2E01/rels/d_a_npc_maro/symbols.txt index 871241f090..02613d1b31 100644 --- a/config/GZ2E01/rels/d_a_npc_maro/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_maro/symbols.txt @@ -184,7 +184,8 @@ heapSize$4152 = .rodata:0x00000090; // type:object size:0x44 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_86_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4085 = .data:0x00000020; // type:object size:0xC scope:local l_bmdData = .data:0x0000002C; // type:object size:0x10 scope:global l_evtList = .data:0x0000003C; // type:object size:0x78 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_midp/splits.txt b/config/GZ2E01/rels/d_a_npc_midp/splits.txt index 08a2a0000f..ba2d9fce2e 100644 --- a/config/GZ2E01/rels/d_a_npc_midp/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_midp/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_midp.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_midp/symbols.txt b/config/GZ2E01/rels/d_a_npc_midp/symbols.txt index 6e61391adb..a2e7a479b3 100644 --- a/config/GZ2E01/rels/d_a_npc_midp/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_midp/symbols.txt @@ -122,7 +122,8 @@ m__18daNpc_midP_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_335_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_moi/splits.txt b/config/GZ2E01/rels/d_a_npc_moi/splits.txt index c582fd1167..b0e43d984e 100644 --- a/config/GZ2E01/rels/d_a_npc_moi/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_moi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_moi.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_moi/symbols.txt b/config/GZ2E01/rels/d_a_npc_moi/symbols.txt index 8a2852335b..c338594010 100644 --- a/config/GZ2E01/rels/d_a_npc_moi/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_moi/symbols.txt @@ -184,7 +184,8 @@ jointNo$5214 = .rodata:0x00000178; // type:object size:0x18 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_337_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x40 scope:global data:4byte l_evtList = .data:0x00000060; // type:object size:0x20 scope:global l_resNameList = .data:0x00000080; // type:object size:0x18 scope:global @@ -253,7 +254,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3839 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @5529 = .bss:0x00000058; // type:object size:0xC scope:local -init$5530 = .bss:0x00000064; // type:object size:0x1 scope:local +init$5530 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte lightOffset$5528 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_moir/splits.txt b/config/GZ2E01/rels/d_a_npc_moir/splits.txt index e8e9e22828..001fc8bad9 100644 --- a/config/GZ2E01/rels/d_a_npc_moir/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_moir/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_moir.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_moir/symbols.txt b/config/GZ2E01/rels/d_a_npc_moir/symbols.txt index e1cb62301a..123a14b7f9 100644 --- a/config/GZ2E01/rels/d_a_npc_moir/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_moir/symbols.txt @@ -224,7 +224,8 @@ m__17daNpcMoiR_Param_c = .rodata:0x00000000; // type:object size:0x74 scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_338_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x1D4 scope:global data:4byte l_btpGetParamList = .data:0x000001F4; // type:object size:0x18 scope:global l_btkGetParamList = .data:0x0000020C; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_myna2/splits.txt b/config/GZ2E01/rels/d_a_npc_myna2/splits.txt index 77202a83fa..d080d4d9e3 100644 --- a/config/GZ2E01/rels/d_a_npc_myna2/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_myna2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_myna2.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_myna2/symbols.txt b/config/GZ2E01/rels/d_a_npc_myna2/symbols.txt index 20b3fe9bc0..8c35377b4d 100644 --- a/config/GZ2E01/rels/d_a_npc_myna2/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_myna2/symbols.txt @@ -147,7 +147,8 @@ heapSize$4340 = .rodata:0x00000074; // type:object size:0x14 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_339_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x78 scope:global l_btpGetParamList = .data:0x000000A0; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_ne/splits.txt b/config/GZ2E01/rels/d_a_npc_ne/splits.txt index 3792d29dc1..b9b54ed0c4 100644 --- a/config/GZ2E01/rels/d_a_npc_ne/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_ne/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ne.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_ne/symbols.txt b/config/GZ2E01/rels/d_a_npc_ne/symbols.txt index 133301a293..4ade7f37f2 100644 --- a/config/GZ2E01/rels/d_a_npc_ne/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_ne/symbols.txt @@ -205,7 +205,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_340_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3985 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte target_info = .bss:0x00000070; // type:object size:0x14 scope:local diff --git a/config/GZ2E01/rels/d_a_npc_pachi_besu/splits.txt b/config/GZ2E01/rels/d_a_npc_pachi_besu/splits.txt index b2918b0a86..efa7371efc 100644 --- a/config/GZ2E01/rels/d_a_npc_pachi_besu/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_pachi_besu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_besu.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_pachi_besu/symbols.txt b/config/GZ2E01/rels/d_a_npc_pachi_besu/symbols.txt index 3c13b9e54b..95b04ab7ce 100644 --- a/config/GZ2E01/rels/d_a_npc_pachi_besu/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_pachi_besu/symbols.txt @@ -159,7 +159,8 @@ m__24daNpc_Pachi_Besu_Param_c = .rodata:0x00000000; // type:object size:0x8C sco ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_342_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x30 scope:global data:4byte l_evtList = .data:0x00000050; // type:object size:0x10 scope:global l_resNameList = .data:0x00000060; // type:object size:0x20 scope:global @@ -226,7 +227,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3963 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4664 = .bss:0x00000058; // type:object size:0xC scope:local -init$2384 = .bss:0x00000064; // type:object size:0x1 scope:local +init$2384 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte center$4663 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_pachi_maro/splits.txt b/config/GZ2E01/rels/d_a_npc_pachi_maro/splits.txt index f73b896535..1dbce106b5 100644 --- a/config/GZ2E01/rels/d_a_npc_pachi_maro/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_pachi_maro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_maro.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_pachi_maro/symbols.txt b/config/GZ2E01/rels/d_a_npc_pachi_maro/symbols.txt index 6078227f33..c76d37d84e 100644 --- a/config/GZ2E01/rels/d_a_npc_pachi_maro/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_pachi_maro/symbols.txt @@ -160,7 +160,8 @@ m__24daNpc_Pachi_Maro_Param_c = .rodata:0x00000000; // type:object size:0x90 sco ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_343_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x10 scope:global l_resNameList = .data:0x00000040; // type:object size:0x2C scope:global diff --git a/config/GZ2E01/rels/d_a_npc_pachi_taro/splits.txt b/config/GZ2E01/rels/d_a_npc_pachi_taro/splits.txt index da9fa3003b..c42248e020 100644 --- a/config/GZ2E01/rels/d_a_npc_pachi_taro/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_pachi_taro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_taro.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_pachi_taro/symbols.txt b/config/GZ2E01/rels/d_a_npc_pachi_taro/symbols.txt index b870dbe5b6..f3c2f73ba4 100644 --- a/config/GZ2E01/rels/d_a_npc_pachi_taro/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_pachi_taro/symbols.txt @@ -206,7 +206,8 @@ sHitMsg$5762 = .rodata:0x000001C8; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_344_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x28 scope:global data:4byte l_evtList = .data:0x00000048; // type:object size:0x58 scope:global l_resNameList = .data:0x000000A0; // type:object size:0x30 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_passer/symbols.txt b/config/GZ2E01/rels/d_a_npc_passer/symbols.txt index a79d6e0fa0..edcb2f0db5 100644 --- a/config/GZ2E01/rels/d_a_npc_passer/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_passer/symbols.txt @@ -106,7 +106,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_345_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3829 = .data:0x00000020; // type:object size:0xC scope:local @3830 = .data:0x0000002C; // type:object size:0xC scope:local @3831 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_npc_passer2/symbols.txt b/config/GZ2E01/rels/d_a_npc_passer2/symbols.txt index 341f485a19..daeedfcc56 100644 --- a/config/GZ2E01/rels/d_a_npc_passer2/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_passer2/symbols.txt @@ -53,7 +53,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_346_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3845 = .data:0x00000020; // type:object size:0xC scope:local @3846 = .data:0x0000002C; // type:object size:0xC scope:local ActionTable__14daNpcPasser2_c = .data:0x00000038; // type:object size:0x18 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_post/splits.txt b/config/GZ2E01/rels/d_a_npc_post/splits.txt index 80c6bc51a7..f0d7ba3a4a 100644 --- a/config/GZ2E01/rels/d_a_npc_post/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_post/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_post.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_post/symbols.txt b/config/GZ2E01/rels/d_a_npc_post/symbols.txt index d9deb9e5fd..1d94aa89b4 100644 --- a/config/GZ2E01/rels/d_a_npc_post/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_post/symbols.txt @@ -153,7 +153,8 @@ jointNo$4959 = .rodata:0x0000012C; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_347_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global data:4byte l_evtList = .data:0x00000040; // type:object size:0x28 scope:global l_resNameList = .data:0x00000068; // type:object size:0x10 scope:global @@ -212,7 +213,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3839 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4753 = .bss:0x00000058; // type:object size:0xC scope:local -init$2635 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 +init$2635 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte prtclScl$4752 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_pouya/splits.txt b/config/GZ2E01/rels/d_a_npc_pouya/splits.txt index 72ca6c813d..0a07fee93b 100644 --- a/config/GZ2E01/rels/d_a_npc_pouya/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_pouya/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pouya.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_prayer/splits.txt b/config/GZ2E01/rels/d_a_npc_prayer/splits.txt index 900921e858..2b8c0f686b 100644 --- a/config/GZ2E01/rels/d_a_npc_prayer/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_prayer/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_prayer.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_prayer/symbols.txt b/config/GZ2E01/rels/d_a_npc_prayer/symbols.txt index 9bb6b3c68b..3baddaf89f 100644 --- a/config/GZ2E01/rels/d_a_npc_prayer/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_prayer/symbols.txt @@ -112,7 +112,8 @@ m__17daNpcPray_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_349_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x48 scope:global l_arcNames = .data:0x00000068; // type:object size:0x8 scope:global data:4byte l_evtNames = .data:0x00000070; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_raca/splits.txt b/config/GZ2E01/rels/d_a_npc_raca/splits.txt index e53162b79b..3b4879897b 100644 --- a/config/GZ2E01/rels/d_a_npc_raca/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_raca/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_raca.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_raca/symbols.txt b/config/GZ2E01/rels/d_a_npc_raca/symbols.txt index 42d57312ea..43cd93f7ca 100644 --- a/config/GZ2E01/rels/d_a_npc_raca/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_raca/symbols.txt @@ -127,7 +127,8 @@ m__18daNpc_Raca_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_350_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_rafrel/splits.txt b/config/GZ2E01/rels/d_a_npc_rafrel/splits.txt index 4da058c3ca..380c17f07b 100644 --- a/config/GZ2E01/rels/d_a_npc_rafrel/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_rafrel/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_rafrel.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_rafrel/symbols.txt b/config/GZ2E01/rels/d_a_npc_rafrel/symbols.txt index 5eb6ef2d15..c3297c7c2b 100644 --- a/config/GZ2E01/rels/d_a_npc_rafrel/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_rafrel/symbols.txt @@ -186,7 +186,8 @@ m__19daNpcRafrel_Param_c = .rodata:0x00000000; // type:object size:0x74 scope:gl ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_351_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x15C scope:global l_btpGetParamList = .data:0x0000017C; // type:object size:0x30 scope:global l_btkGetParamList = .data:0x000001AC; // type:object size:0x3C scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_saru/splits.txt b/config/GZ2E01/rels/d_a_npc_saru/splits.txt index 38f46e186f..4053dd1f49 100644 --- a/config/GZ2E01/rels/d_a_npc_saru/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_saru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_saru.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_saru/symbols.txt b/config/GZ2E01/rels/d_a_npc_saru/symbols.txt index 914321d7f2..660e83808f 100644 --- a/config/GZ2E01/rels/d_a_npc_saru/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_saru/symbols.txt @@ -142,7 +142,8 @@ jointNo$4884 = .rodata:0x00000114; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_352_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global l_evtList = .data:0x00000040; // type:object size:0x18 scope:global data:4byte l_resNameList = .data:0x00000058; // type:object size:0x10 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_seib/splits.txt b/config/GZ2E01/rels/d_a_npc_seib/splits.txt index fe60c75324..6674273a27 100644 --- a/config/GZ2E01/rels/d_a_npc_seib/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_seib/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seib.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_seib/symbols.txt b/config/GZ2E01/rels/d_a_npc_seib/symbols.txt index a0581c8815..455366aa74 100644 --- a/config/GZ2E01/rels/d_a_npc_seib/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_seib/symbols.txt @@ -97,7 +97,8 @@ m__18daNpc_seiB_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_353_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_seic/splits.txt b/config/GZ2E01/rels/d_a_npc_seic/splits.txt index a9fce8ef65..afd500af28 100644 --- a/config/GZ2E01/rels/d_a_npc_seic/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_seic/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seic.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_seic/symbols.txt b/config/GZ2E01/rels/d_a_npc_seic/symbols.txt index b80dc9a3d1..0197bc5404 100644 --- a/config/GZ2E01/rels/d_a_npc_seic/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_seic/symbols.txt @@ -97,7 +97,8 @@ m__18daNpc_seiC_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_354_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_seid/splits.txt b/config/GZ2E01/rels/d_a_npc_seid/splits.txt index 571bdf0ce5..15cb8b939b 100644 --- a/config/GZ2E01/rels/d_a_npc_seid/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_seid/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seid.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_seid/symbols.txt b/config/GZ2E01/rels/d_a_npc_seid/symbols.txt index 50b11f5905..e812cf432c 100644 --- a/config/GZ2E01/rels/d_a_npc_seid/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_seid/symbols.txt @@ -97,7 +97,8 @@ m__18daNpc_seiD_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_355_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_seira/splits.txt b/config/GZ2E01/rels/d_a_npc_seira/splits.txt index 6f9580eece..360d26d4f7 100644 --- a/config/GZ2E01/rels/d_a_npc_seira/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_seira/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seira.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_seira/symbols.txt b/config/GZ2E01/rels/d_a_npc_seira/symbols.txt index f8ca9d9901..b1ddc81471 100644 --- a/config/GZ2E01/rels/d_a_npc_seira/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_seira/symbols.txt @@ -151,7 +151,8 @@ m__19daNpc_Seira_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_356_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:local data:4byte l_evtList = .data:0x00000030; // type:object size:0x20 scope:global l_resNameList = .data:0x00000050; // type:object size:0x14 scope:local diff --git a/config/GZ2E01/rels/d_a_npc_seira2/splits.txt b/config/GZ2E01/rels/d_a_npc_seira2/splits.txt index 1e3cf84c59..c31bda4213 100644 --- a/config/GZ2E01/rels/d_a_npc_seira2/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_seira2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seira2.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_seira2/symbols.txt b/config/GZ2E01/rels/d_a_npc_seira2/symbols.txt index 4382d0f4c4..70513af06f 100644 --- a/config/GZ2E01/rels/d_a_npc_seira2/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_seira2/symbols.txt @@ -146,7 +146,8 @@ m__20daNpc_Seira2_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:g ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_357_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:local data:4byte l_evtList = .data:0x00000030; // type:object size:0x10 scope:global l_resNameList = .data:0x00000040; // type:object size:0x10 scope:local diff --git a/config/GZ2E01/rels/d_a_npc_seirei/splits.txt b/config/GZ2E01/rels/d_a_npc_seirei/splits.txt index 5524c64304..1a85f3eea2 100644 --- a/config/GZ2E01/rels/d_a_npc_seirei/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_seirei/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seirei.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_seirei/symbols.txt b/config/GZ2E01/rels/d_a_npc_seirei/symbols.txt index 52314da8a5..3a51506f28 100644 --- a/config/GZ2E01/rels/d_a_npc_seirei/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_seirei/symbols.txt @@ -107,7 +107,8 @@ id2$4628 = .rodata:0x000000D0; // type:object size:0xE scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_358_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x20 scope:global l_resNameList = .data:0x00000048; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_npc_shad/splits.txt b/config/GZ2E01/rels/d_a_npc_shad/splits.txt index 9a40f41420..eca80600c7 100644 --- a/config/GZ2E01/rels/d_a_npc_shad/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_shad/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shad.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_shad/symbols.txt b/config/GZ2E01/rels/d_a_npc_shad/symbols.txt index a536670e37..d37d31b49e 100644 --- a/config/GZ2E01/rels/d_a_npc_shad/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_shad/symbols.txt @@ -228,7 +228,8 @@ m__17daNpcShad_Param_c = .rodata:0x00000000; // type:object size:0x70 scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_359_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x1B0 scope:global l_btpGetParamList = .data:0x000001D0; // type:object size:0x84 scope:global l_btkGetParamList = .data:0x00000254; // type:object size:0x3C scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_shaman/splits.txt b/config/GZ2E01/rels/d_a_npc_shaman/splits.txt index d3038040b4..302e760cbf 100644 --- a/config/GZ2E01/rels/d_a_npc_shaman/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_shaman/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shaman.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_shaman/symbols.txt b/config/GZ2E01/rels/d_a_npc_shaman/symbols.txt index 006cd0949c..46cc03fc59 100644 --- a/config/GZ2E01/rels/d_a_npc_shaman/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_shaman/symbols.txt @@ -142,7 +142,8 @@ heapSize$3961 = .rodata:0x0000008C; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_360_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x30 scope:global l_resNameList = .data:0x00000058; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_shoe/splits.txt b/config/GZ2E01/rels/d_a_npc_shoe/splits.txt index f8ee3e5ae4..8d043bcfb6 100644 --- a/config/GZ2E01/rels/d_a_npc_shoe/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_shoe/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shoe.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_shoe/symbols.txt b/config/GZ2E01/rels/d_a_npc_shoe/symbols.txt index b32413fbf3..8700d4452f 100644 --- a/config/GZ2E01/rels/d_a_npc_shoe/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_shoe/symbols.txt @@ -99,7 +99,8 @@ m__17daNpcShoe_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_361_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x3C scope:global l_btpGetParamList = .data:0x0000005C; // type:object size:0xC scope:global l_arcNames = .data:0x00000068; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_sola/splits.txt b/config/GZ2E01/rels/d_a_npc_sola/splits.txt index 54258a8bbd..216e2cab50 100644 --- a/config/GZ2E01/rels/d_a_npc_sola/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_sola/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_sola.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_sola/symbols.txt b/config/GZ2E01/rels/d_a_npc_sola/symbols.txt index 6a10a31239..53bc6d8934 100644 --- a/config/GZ2E01/rels/d_a_npc_sola/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_sola/symbols.txt @@ -110,7 +110,8 @@ m__18daNpc_solA_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_364_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_soldierA/splits.txt b/config/GZ2E01/rels/d_a_npc_soldierA/splits.txt index a507647d91..3636817a07 100644 --- a/config/GZ2E01/rels/d_a_npc_soldierA/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_soldierA/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_soldierA.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_soldierA/symbols.txt b/config/GZ2E01/rels/d_a_npc_soldierA/symbols.txt index 9f820c954b..e6236bb7e4 100644 --- a/config/GZ2E01/rels/d_a_npc_soldierA/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_soldierA/symbols.txt @@ -110,7 +110,8 @@ m__22daNpc_SoldierA_Param_c = .rodata:0x00000000; // type:object size:0x6C scope ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_365_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x38 scope:global l_evtGetParamList = .data:0x00000068; // type:object size:0x10 scope:global @@ -163,7 +164,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4017 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4641 = .bss:0x00000058; // type:object size:0xC scope:local -init$2332 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 +init$2332 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$4640 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_soldierB/splits.txt b/config/GZ2E01/rels/d_a_npc_soldierB/splits.txt index b95d52395c..828f7aff8e 100644 --- a/config/GZ2E01/rels/d_a_npc_soldierB/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_soldierB/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_soldierB.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_soldierB/symbols.txt b/config/GZ2E01/rels/d_a_npc_soldierB/symbols.txt index 00ed918c61..769a13c5e8 100644 --- a/config/GZ2E01/rels/d_a_npc_soldierB/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_soldierB/symbols.txt @@ -102,7 +102,8 @@ m__22daNpc_SoldierB_Param_c = .rodata:0x00000000; // type:object size:0x6C scope ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_366_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x20 scope:global l_evtGetParamList = .data:0x00000050; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_sq/splits.txt b/config/GZ2E01/rels/d_a_npc_sq/splits.txt index 7efa26d57f..37fe155ab8 100644 --- a/config/GZ2E01/rels/d_a_npc_sq/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_sq/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_sq.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_sq/symbols.txt b/config/GZ2E01/rels/d_a_npc_sq/symbols.txt index 79147cea87..99c99be8b4 100644 --- a/config/GZ2E01/rels/d_a_npc_sq/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_sq/symbols.txt @@ -72,6 +72,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000D0; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000000F4; // type:object size:0xC scope:global __vt__14daNpc_Sq_HIO_c = .data:0x00000100; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_npc_taro/splits.txt b/config/GZ2E01/rels/d_a_npc_taro/splits.txt index 619e79a536..4c7a8ca5fd 100644 --- a/config/GZ2E01/rels/d_a_npc_taro/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_taro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_taro.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_taro/symbols.txt b/config/GZ2E01/rels/d_a_npc_taro/symbols.txt index 3732336b93..f5addc1aef 100644 --- a/config/GZ2E01/rels/d_a_npc_taro/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_taro/symbols.txt @@ -195,7 +195,8 @@ jointNo$5646 = .rodata:0x0000014C; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_87_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3931 = .data:0x00000020; // type:object size:0xC scope:local l_bmdData = .data:0x0000002C; // type:object size:0x28 scope:local data:4byte l_evtList = .data:0x00000054; // type:object size:0xD8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_the/splits.txt b/config/GZ2E01/rels/d_a_npc_the/splits.txt index 2671f4c863..d4943eaf12 100644 --- a/config/GZ2E01/rels/d_a_npc_the/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_the/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_the.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_the/symbols.txt b/config/GZ2E01/rels/d_a_npc_the/symbols.txt index 53b6c8c6ec..d917e95c77 100644 --- a/config/GZ2E01/rels/d_a_npc_the/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_the/symbols.txt @@ -152,7 +152,8 @@ m__16daNpcThe_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:globa ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_368_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global l_bckGetParamList = .data:0x00000030; // type:object size:0xD8 scope:global data:4byte l_btpGetParamList = .data:0x00000108; // type:object size:0x70 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_theB/splits.txt b/config/GZ2E01/rels/d_a_npc_theB/splits.txt index 79afbbf067..48817a6f5e 100644 --- a/config/GZ2E01/rels/d_a_npc_theB/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_theB/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_theB.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_theB/symbols.txt b/config/GZ2E01/rels/d_a_npc_theB/symbols.txt index 8d861d320a..65a85fb1e4 100644 --- a/config/GZ2E01/rels/d_a_npc_theB/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_theB/symbols.txt @@ -141,7 +141,8 @@ m__17daNpcTheB_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_369_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x4 scope:global l_bckGetParamList = .data:0x00000024; // type:object size:0x70 scope:global data:4byte l_btpGetParamList = .data:0x00000094; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_tk/splits.txt b/config/GZ2E01/rels/d_a_npc_tk/splits.txt index 96b50cacee..4491eb8d0d 100644 --- a/config/GZ2E01/rels/d_a_npc_tk/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_tk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tk.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_tk/symbols.txt b/config/GZ2E01/rels/d_a_npc_tk/symbols.txt index c154b22a84..87b75200a9 100644 --- a/config/GZ2E01/rels/d_a_npc_tk/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_tk/symbols.txt @@ -226,10 +226,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local m_near_angle = .bss:0x00000046; // type:object size:0x2 scope:global m_near_actor = .bss:0x00000048; // type:object size:0x4 scope:global -init$0000 = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @3994 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x40 scope:global data:byte @5011 = .bss:0x0000009C; // type:object size:0xC scope:local +init$0000 = .bss:0x000000A8; // type:object size:0x1 scope:local align:1 data:byte sc$5010 = .bss:0x000000AC; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B8; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000BC; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_tkc/splits.txt b/config/GZ2E01/rels/d_a_npc_tkc/splits.txt index 4233f137a5..30572bf897 100644 --- a/config/GZ2E01/rels/d_a_npc_tkc/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_tkc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkc.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_tkc/symbols.txt b/config/GZ2E01/rels/d_a_npc_tkc/symbols.txt index 325506cb7a..639ba5efcb 100644 --- a/config/GZ2E01/rels/d_a_npc_tkc/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_tkc/symbols.txt @@ -127,7 +127,8 @@ m_cameraItemNum$4552 = .rodata:0x000000B4; // type:object size:0x4 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_371_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x18 scope:global l_btpGetParamList = .data:0x00000038; // type:object size:0x8 scope:global l_btkGetParamList = .data:0x00000040; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_tkj/splits.txt b/config/GZ2E01/rels/d_a_npc_tkj/splits.txt index 71d468cee5..f1a6c89309 100644 --- a/config/GZ2E01/rels/d_a_npc_tkj/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_tkj/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkj.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_tkj/symbols.txt b/config/GZ2E01/rels/d_a_npc_tkj/symbols.txt index 618369b1f9..a34ee12158 100644 --- a/config/GZ2E01/rels/d_a_npc_tkj/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_tkj/symbols.txt @@ -127,7 +127,8 @@ m__17daNpc_Tkj_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_88_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_tkj2/splits.txt b/config/GZ2E01/rels/d_a_npc_tkj2/splits.txt index 85c1b46230..c785c234c9 100644 --- a/config/GZ2E01/rels/d_a_npc_tkj2/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_tkj2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkj2.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_tkj2/symbols.txt b/config/GZ2E01/rels/d_a_npc_tkj2/symbols.txt index 7b52fac1e6..80f9f74909 100644 --- a/config/GZ2E01/rels/d_a_npc_tkj2/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_tkj2/symbols.txt @@ -105,6 +105,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000F4; // type:object size:0x30 scope:global __vt__8cM3dGPla = .data:0x00000124; // type:object size:0xC scope:global __vt__16daNpc_Tkj2_HIO_c = .data:0x00000130; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_npc_tks/splits.txt b/config/GZ2E01/rels/d_a_npc_tks/splits.txt index 2a20f200a9..b3946b9fa9 100644 --- a/config/GZ2E01/rels/d_a_npc_tks/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_tks/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tks.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_tks/symbols.txt b/config/GZ2E01/rels/d_a_npc_tks/symbols.txt index 1e7cc7c0f4..981ef02378 100644 --- a/config/GZ2E01/rels/d_a_npc_tks/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_tks/symbols.txt @@ -205,7 +205,8 @@ m__16daNpcTks_Param_c = .rodata:0x00000000; // type:object size:0x98 scope:globa ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_373_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xB0 scope:global data:4byte l_btpGetParamList = .data:0x000000D0; // type:object size:0x8 scope:global l_btkGetParamList = .data:0x000000D8; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_npc_toby/splits.txt b/config/GZ2E01/rels/d_a_npc_toby/splits.txt index a7a571dd23..f600125f41 100644 --- a/config/GZ2E01/rels/d_a_npc_toby/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_toby/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_toby.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_toby/symbols.txt b/config/GZ2E01/rels/d_a_npc_toby/symbols.txt index bc0e485f09..913fcfafd7 100644 --- a/config/GZ2E01/rels/d_a_npc_toby/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_toby/symbols.txt @@ -166,7 +166,8 @@ jointNo$5107 = .rodata:0x00000138; // type:object size:0x4 scope:local data:4byt ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_374_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:local l_evtList = .data:0x00000038; // type:object size:0x38 scope:global l_resNameList = .data:0x00000070; // type:object size:0x24 scope:local diff --git a/config/GZ2E01/rels/d_a_npc_tr/splits.txt b/config/GZ2E01/rels/d_a_npc_tr/splits.txt index 59b845f265..13215f94b7 100644 --- a/config/GZ2E01/rels/d_a_npc_tr/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_tr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tr.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_tr/symbols.txt b/config/GZ2E01/rels/d_a_npc_tr/symbols.txt index e10a860fed..faa32dbe0a 100644 --- a/config/GZ2E01/rels/d_a_npc_tr/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_tr/symbols.txt @@ -52,6 +52,6 @@ l_daNPC_TR_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_NPC_TR = .data:0x00000020; // type:object size:0x30 scope:global __vt__14daNPC_TR_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_npc_uri/splits.txt b/config/GZ2E01/rels/d_a_npc_uri/splits.txt index 6078d6002d..bb119068a8 100644 --- a/config/GZ2E01/rels/d_a_npc_uri/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_uri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_uri.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_uri/symbols.txt b/config/GZ2E01/rels/d_a_npc_uri/symbols.txt index ad14b98dd0..1e1e8a16a9 100644 --- a/config/GZ2E01/rels/d_a_npc_uri/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_uri/symbols.txt @@ -153,7 +153,8 @@ jointNo$5001 = .rodata:0x00000130; // type:object size:0x4 scope:local data:4byt ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_376_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_evtList = .data:0x00000030; // type:object size:0x58 scope:global l_resNameList = .data:0x00000088; // type:object size:0x18 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_wrestler/splits.txt b/config/GZ2E01/rels/d_a_npc_wrestler/splits.txt index eaccbb31a9..934a28d841 100644 --- a/config/GZ2E01/rels/d_a_npc_wrestler/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_wrestler/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_wrestler.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_wrestler/symbols.txt b/config/GZ2E01/rels/d_a_npc_wrestler/symbols.txt index 4d52014992..25e93ad841 100644 --- a/config/GZ2E01/rels/d_a_npc_wrestler/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_wrestler/symbols.txt @@ -290,7 +290,8 @@ m__21daNpcWrestler_Param_c = .rodata:0x00000000; // type:object size:0x194 scope ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_378_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resALink = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_resName = .data:0x00000024; // type:object size:0x14 scope:global l_bmdGetParamList = .data:0x00000038; // type:object size:0x14 scope:global @@ -446,5 +447,5 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3974 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x4 scope:global data:4byte @4628 = .bss:0x00000018; // type:object size:0xC scope:local -init$localstatic4$setAttnPos__15daNpcWrestler_cFv = .bss:0x00000024; // type:object size:0x1 data:byte +init$localstatic4$setAttnPos__15daNpcWrestler_cFv = .bss:0x00000024; // type:object size:0x1 scope:local data:byte eyeOffset$localstatic3$setAttnPos__15daNpcWrestler_cFv = .bss:0x00000028; // type:object size:0xC scope:local align:4 data:float diff --git a/config/GZ2E01/rels/d_a_npc_yamid/splits.txt b/config/GZ2E01/rels/d_a_npc_yamid/splits.txt index 4e5b6053ef..8d95996c47 100644 --- a/config/GZ2E01/rels/d_a_npc_yamid/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_yamid/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamid.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_yamid/symbols.txt b/config/GZ2E01/rels/d_a_npc_yamid/symbols.txt index 2efa555dcc..f67f5aebd6 100644 --- a/config/GZ2E01/rels/d_a_npc_yamid/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_yamid/symbols.txt @@ -126,7 +126,8 @@ m__19daNpc_yamiD_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_379_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:local data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:local diff --git a/config/GZ2E01/rels/d_a_npc_yamis/splits.txt b/config/GZ2E01/rels/d_a_npc_yamis/splits.txt index b7b99cc049..a91265e7ed 100644 --- a/config/GZ2E01/rels/d_a_npc_yamis/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_yamis/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamis.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_yamis/symbols.txt b/config/GZ2E01/rels/d_a_npc_yamis/symbols.txt index 77248659af..7b26a12f97 100644 --- a/config/GZ2E01/rels/d_a_npc_yamis/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_yamis/symbols.txt @@ -126,7 +126,8 @@ m__19daNpc_yamiS_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_380_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_yamit/splits.txt b/config/GZ2E01/rels/d_a_npc_yamit/splits.txt index 5123a528b9..10e3caa091 100644 --- a/config/GZ2E01/rels/d_a_npc_yamit/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_yamit/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamit.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_yamit/symbols.txt b/config/GZ2E01/rels/d_a_npc_yamit/symbols.txt index ba983d37f2..48efbf3071 100644 --- a/config/GZ2E01/rels/d_a_npc_yamit/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_yamit/symbols.txt @@ -127,7 +127,8 @@ m__19daNpc_yamiT_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_381_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_yelia/splits.txt b/config/GZ2E01/rels/d_a_npc_yelia/splits.txt index 659821fce1..ed090e1617 100644 --- a/config/GZ2E01/rels/d_a_npc_yelia/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_yelia/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yelia.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_yelia/symbols.txt b/config/GZ2E01/rels/d_a_npc_yelia/symbols.txt index 0f82b70ec8..8fb268811e 100644 --- a/config/GZ2E01/rels/d_a_npc_yelia/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_yelia/symbols.txt @@ -145,7 +145,8 @@ heapSize$4085 = .rodata:0x0000008C; // type:object size:0x28 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_382_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte l_evtList = .data:0x00000038; // type:object size:0x30 scope:global data:4byte l_resNameList = .data:0x00000068; // type:object size:0x20 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_ykm/splits.txt b/config/GZ2E01/rels/d_a_npc_ykm/splits.txt index 455aafa992..7a0ad09b1e 100644 --- a/config/GZ2E01/rels/d_a_npc_ykm/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_ykm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ykm.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_ykm/symbols.txt b/config/GZ2E01/rels/d_a_npc_ykm/symbols.txt index f2cd5f787e..1b930d2b59 100644 --- a/config/GZ2E01/rels/d_a_npc_ykm/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_ykm/symbols.txt @@ -223,7 +223,8 @@ motionTbl1$7524 = .rodata:0x0000027C; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_383_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x30 scope:global data:4byte l_evtList = .data:0x00000050; // type:object size:0x50 scope:global l_resNameList = .data:0x000000A0; // type:object size:0x14 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_ykw/splits.txt b/config/GZ2E01/rels/d_a_npc_ykw/splits.txt index 152024a144..3ae68555b8 100644 --- a/config/GZ2E01/rels/d_a_npc_ykw/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_ykw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ykw.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_ykw/symbols.txt b/config/GZ2E01/rels/d_a_npc_ykw/symbols.txt index 7c24d05f74..9b13cd4940 100644 --- a/config/GZ2E01/rels/d_a_npc_ykw/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_ykw/symbols.txt @@ -205,7 +205,8 @@ motionTbl2$6949 = .rodata:0x00000200; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_384_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x50 scope:global data:4byte l_resNameList = .data:0x00000078; // type:object size:0x14 scope:global @@ -282,7 +283,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4126 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @5372 = .bss:0x00000058; // type:object size:0xC scope:local -init$5373 = .bss:0x00000064; // type:object size:0x1 scope:local +init$5373 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte prtclScl$5371 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_zanb/splits.txt b/config/GZ2E01/rels/d_a_npc_zanb/splits.txt index 0158ee265e..7a1d0a3734 100644 --- a/config/GZ2E01/rels/d_a_npc_zanb/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_zanb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zanb.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_zanb/symbols.txt b/config/GZ2E01/rels/d_a_npc_zanb/symbols.txt index 4b9fed1c96..ca41c6b498 100644 --- a/config/GZ2E01/rels/d_a_npc_zanb/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_zanb/symbols.txt @@ -126,7 +126,8 @@ heapSize$3959 = .rodata:0x0000008C; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_385_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_zant/splits.txt b/config/GZ2E01/rels/d_a_npc_zant/splits.txt index c45ca889d4..305bb39828 100644 --- a/config/GZ2E01/rels/d_a_npc_zant/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_zant/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zant.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_zant/symbols.txt b/config/GZ2E01/rels/d_a_npc_zant/symbols.txt index f53f9897e8..b9caf46147 100644 --- a/config/GZ2E01/rels/d_a_npc_zant/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_zant/symbols.txt @@ -109,7 +109,8 @@ m__18daNpc_Zant_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_386_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_zelR/splits.txt b/config/GZ2E01/rels/d_a_npc_zelR/splits.txt index 74d2758af7..1524fdf90e 100644 --- a/config/GZ2E01/rels/d_a_npc_zelR/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_zelR/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelR.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_zelR/symbols.txt b/config/GZ2E01/rels/d_a_npc_zelR/symbols.txt index e70b987e61..32d264ef51 100644 --- a/config/GZ2E01/rels/d_a_npc_zelR/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_zelR/symbols.txt @@ -125,7 +125,8 @@ m__18daNpc_ZelR_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_387_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_zelRo/splits.txt b/config/GZ2E01/rels/d_a_npc_zelRo/splits.txt index 15253cc4f3..16deca4e7c 100644 --- a/config/GZ2E01/rels/d_a_npc_zelRo/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_zelRo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelRo.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_zelRo/symbols.txt b/config/GZ2E01/rels/d_a_npc_zelRo/symbols.txt index 798f1daa12..b5a8be878c 100644 --- a/config/GZ2E01/rels/d_a_npc_zelRo/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_zelRo/symbols.txt @@ -125,7 +125,8 @@ m__19daNpc_ZelRo_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_388_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_zelda/splits.txt b/config/GZ2E01/rels/d_a_npc_zelda/splits.txt index cd55e99530..8631652295 100644 --- a/config/GZ2E01/rels/d_a_npc_zelda/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_zelda/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelda.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_zelda/symbols.txt b/config/GZ2E01/rels/d_a_npc_zelda/symbols.txt index 7d979a0213..a5aaed6338 100644 --- a/config/GZ2E01/rels/d_a_npc_zelda/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_zelda/symbols.txt @@ -128,7 +128,8 @@ heapSize$3959 = .rodata:0x0000008C; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_389_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_zra/splits.txt b/config/GZ2E01/rels/d_a_npc_zra/splits.txt index fdd0db056d..78b8667de2 100644 --- a/config/GZ2E01/rels/d_a_npc_zra/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_zra/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zra.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_zra/symbols.txt b/config/GZ2E01/rels/d_a_npc_zra/symbols.txt index a9d3358056..df4a2bc56f 100644 --- a/config/GZ2E01/rels/d_a_npc_zra/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_zra/symbols.txt @@ -558,7 +558,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3887 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @5533 = .bss:0x00000058; // type:object size:0xC scope:local -init$5534 = .bss:0x00000064; // type:object size:0x1 scope:local +init$5534 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$5532 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_zrc/splits.txt b/config/GZ2E01/rels/d_a_npc_zrc/splits.txt index 13d61ed3c3..b8a63e20be 100644 --- a/config/GZ2E01/rels/d_a_npc_zrc/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_zrc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zrc.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_zrc/symbols.txt b/config/GZ2E01/rels/d_a_npc_zrc/symbols.txt index d0bbf2de0a..4c4853c126 100644 --- a/config/GZ2E01/rels/d_a_npc_zrc/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_zrc/symbols.txt @@ -203,7 +203,8 @@ heapSize$4316 = .rodata:0x00000074; // type:object size:0x14 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_391_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x100 scope:global l_btpGetParamList = .data:0x00000130; // type:object size:0x78 scope:global @@ -268,7 +269,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4021 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4773 = .bss:0x00000058; // type:object size:0xC scope:local -init$4774 = .bss:0x00000064; // type:object size:0x1 scope:local +init$4774 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$4772 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_npc_zrz/splits.txt b/config/GZ2E01/rels/d_a_npc_zrz/splits.txt index d9247f5178..3b956ad03c 100644 --- a/config/GZ2E01/rels/d_a_npc_zrz/splits.txt +++ b/config/GZ2E01/rels/d_a_npc_zrz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zrz.cpp: diff --git a/config/GZ2E01/rels/d_a_npc_zrz/symbols.txt b/config/GZ2E01/rels/d_a_npc_zrz/symbols.txt index a2ca13fae4..fde864b2e5 100644 --- a/config/GZ2E01/rels/d_a_npc_zrz/symbols.txt +++ b/config/GZ2E01/rels/d_a_npc_zrz/symbols.txt @@ -179,7 +179,8 @@ key_color$5707 = .rodata:0x000001AC; // type:object size:0x20 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_392_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global l_bmdGTGetParamList = .data:0x00000028; // type:object size:0x8 scope:global l_bckGetParamList = .data:0x00000030; // type:object size:0x28 scope:global @@ -253,7 +254,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4021 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4997 = .bss:0x00000058; // type:object size:0xC scope:local -init$2630 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 +init$2630 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$4996 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_Turara/splits.txt b/config/GZ2E01/rels/d_a_obj_Turara/splits.txt index 575da2d3dc..b23d39cc51 100644 --- a/config/GZ2E01/rels/d_a_obj_Turara/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_Turara/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_Turara.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_Turara/symbols.txt b/config/GZ2E01/rels/d_a_obj_Turara/symbols.txt index b180808a32..438a180032 100644 --- a/config/GZ2E01/rels/d_a_obj_Turara/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_Turara/symbols.txt @@ -74,7 +74,8 @@ l_bmdIdx = .rodata:0x00000044; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_394_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daTurara_c = .data:0x00000020; // type:object size:0x44 scope:global @3924 = .data:0x00000064; // type:object size:0xC scope:local @3925 = .data:0x00000070; // type:object size:0xC scope:local @@ -98,4 +99,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000204; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3653 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:local data:byte -lbl_394_bss_34 = .bss:0x00000034; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_TvCdlst/splits.txt b/config/GZ2E01/rels/d_a_obj_TvCdlst/splits.txt index 2b151c4284..31397c8c64 100644 --- a/config/GZ2E01/rels/d_a_obj_TvCdlst/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_TvCdlst/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_TvCdlst.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_Y_taihou/splits.txt b/config/GZ2E01/rels/d_a_obj_Y_taihou/splits.txt index b9e412e91c..e632e90b64 100644 --- a/config/GZ2E01/rels/d_a_obj_Y_taihou/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_Y_taihou/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_Y_taihou.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_Y_taihou/symbols.txt b/config/GZ2E01/rels/d_a_obj_Y_taihou/symbols.txt index f5282eece9..b820727ec4 100644 --- a/config/GZ2E01/rels/d_a_obj_Y_taihou/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_Y_taihou/symbols.txt @@ -95,8 +95,9 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local l_wheelMinR$3836 = .bss:0x00000048; // type:object size:0x4 scope:local align:4 data:float -lbl_396_bss_4C = .bss:0x0000004C; // type:object size:0x1 scope:local data:byte +lbl_396_bss_4C$0000 = .bss:0x0000004C; // type:object size:0x1 scope:local data:byte @3951 = .bss:0x00000050; // type:object size:0xC scope:local +init$0000 = .bss:0x0000005C; // type:object size:0x1 scope:local align:1 data:byte l_effectScale$3950 = .bss:0x00000060; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000006C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000070; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_amiShutter/splits.txt b/config/GZ2E01/rels/d_a_obj_amiShutter/splits.txt index d7e169e10b..71b4e6d012 100644 --- a/config/GZ2E01/rels/d_a_obj_amiShutter/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_amiShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_amiShutter.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_amiShutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_amiShutter/symbols.txt index 89047d3bfb..71186b1acb 100644 --- a/config/GZ2E01/rels/d_a_obj_amiShutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_amiShutter/symbols.txt @@ -60,7 +60,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_397_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3759 = .data:0x00000020; // type:object size:0xC scope:local @3760 = .data:0x0000002C; // type:object size:0xC scope:local @3761 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_ari/splits.txt b/config/GZ2E01/rels/d_a_obj_ari/splits.txt index 47d0b4945c..cdd94232c9 100644 --- a/config/GZ2E01/rels/d_a_obj_ari/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_ari/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ari.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_ari/symbols.txt b/config/GZ2E01/rels/d_a_obj_ari/symbols.txt index 7c9c6041c6..03be6aaea1 100644 --- a/config/GZ2E01/rels/d_a_obj_ari/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ari/symbols.txt @@ -98,6 +98,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_AriHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3771 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_automata/splits.txt b/config/GZ2E01/rels/d_a_obj_automata/splits.txt index 5219aac973..5e25b728d7 100644 --- a/config/GZ2E01/rels/d_a_obj_automata/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_automata/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_automata.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_automata/symbols.txt b/config/GZ2E01/rels/d_a_obj_automata/symbols.txt index 0fe850493f..b3b202b55b 100644 --- a/config/GZ2E01/rels/d_a_obj_automata/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_automata/symbols.txt @@ -62,7 +62,8 @@ playMode$4222 = .rodata:0x00000078; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_399_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:local l_resNameList = .data:0x00000028; // type:object size:0x8 scope:local l_ccDCyl = .data:0x00000030; // type:object size:0x44 scope:local diff --git a/config/GZ2E01/rels/d_a_obj_avalanche/symbols.txt b/config/GZ2E01/rels/d_a_obj_avalanche/symbols.txt index 7784d9cbb0..c4fafc2f5b 100644 --- a/config/GZ2E01/rels/d_a_obj_avalanche/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_avalanche/symbols.txt @@ -40,7 +40,8 @@ l_check_pos = .rodata:0x00000008; // type:object size:0x18 scope:global align:4 ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_400_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte @@ -55,4 +56,4 @@ daObjAvalanche_METHODS = .data:0x000000AC; // type:object size:0x20 scope:global g_profile_Obj_Avalanche = .data:0x000000CC; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000FC; // type:object size:0xC scope:global __vt__16daObjAvalanche_c = .data:0x00000108; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_balloon/splits.txt b/config/GZ2E01/rels/d_a_obj_balloon/splits.txt index cb6f8049b2..0ffb55264c 100644 --- a/config/GZ2E01/rels/d_a_obj_balloon/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_balloon/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_balloon.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_balloon/symbols.txt b/config/GZ2E01/rels/d_a_obj_balloon/symbols.txt index 14fa45f7fb..0e464827a2 100644 --- a/config/GZ2E01/rels/d_a_obj_balloon/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_balloon/symbols.txt @@ -55,7 +55,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_401_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double m_combo_type__29@unnamed@d_a_obj_balloon_cpp@ = .data:0x00000020; // type:object size:0x4 scope:global balloon_radius$3706 = .data:0x00000024; // type:object size:0xC scope:local kago_wall_hit_id$3736 = .data:0x00000030; // type:object size:0x4 scope:local @@ -92,7 +93,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa m_combo_count__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x00000048; // type:object size:0x4 scope:global m_combo_next_score__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x0000004C; // type:object size:0x4 scope:global m_balloon_score__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x00000050; // type:object size:0x4 scope:global data:4byte -init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3651 = .bss:0x00000058; // type:object size:0xC scope:local l_HIO = .bss:0x00000064; // type:object size:0x20 scope:global data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_barDesk/splits.txt b/config/GZ2E01/rels/d_a_obj_barDesk/splits.txt index 9550ce4bbd..35cf1e837d 100644 --- a/config/GZ2E01/rels/d_a_obj_barDesk/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_barDesk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_barDesk.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_barDesk/symbols.txt b/config/GZ2E01/rels/d_a_obj_barDesk/symbols.txt index 37580febc9..d93e026832 100644 --- a/config/GZ2E01/rels/d_a_obj_barDesk/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_barDesk/symbols.txt @@ -41,7 +41,8 @@ particle_id$3871 = .rodata:0x00000040; // type:object size:0x4 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_402_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daBarDesk_c = .data:0x00000020; // type:object size:0x44 scope:global @3821 = .data:0x00000064; // type:object size:0xC scope:local @3822 = .data:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_batta/splits.txt b/config/GZ2E01/rels/d_a_obj_batta/splits.txt index d77e6ade50..9a6a91870e 100644 --- a/config/GZ2E01/rels/d_a_obj_batta/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_batta/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_batta.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_batta/symbols.txt b/config/GZ2E01/rels/d_a_obj_batta/symbols.txt index e550aefccb..4b5f776e3e 100644 --- a/config/GZ2E01/rels/d_a_obj_batta/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_batta/symbols.txt @@ -98,7 +98,8 @@ l_musiya_num = .rodata:0x000000EC; // type:object size:0x4 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_403_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__27@unnamed@d_a_obj_batta_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global @3903 = .data:0x00000060; // type:object size:0xC scope:local data:4byte @3907 = .data:0x0000006C; // type:object size:0xC scope:local data:4byte @@ -130,6 +131,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_bed/splits.txt b/config/GZ2E01/rels/d_a_obj_bed/splits.txt index 562ad25411..a598360305 100644 --- a/config/GZ2E01/rels/d_a_obj_bed/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_bed/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bed.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_bemos/splits.txt b/config/GZ2E01/rels/d_a_obj_bemos/splits.txt index 0e8d243f29..1094792c45 100644 --- a/config/GZ2E01/rels/d_a_obj_bemos/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_bemos/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bemos.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_bemos/symbols.txt b/config/GZ2E01/rels/d_a_obj_bemos/symbols.txt index bcd648626a..97decd8398 100644 --- a/config/GZ2E01/rels/d_a_obj_bemos/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bemos/symbols.txt @@ -210,6 +210,7 @@ init$2180 = .bss:0x00000046; // type:object size:0x1 scope:local data:byte init$2232 = .bss:0x00000047; // type:object size:0x1 scope:local data:byte init$2548 = .bss:0x00000048; // type:object size:0x1 scope:local data:byte @4973 = .bss:0x0000004C; // type:object size:0xC scope:local +init$0000 = .bss:0x00000058; // type:object size:0x1 scope:local @4976 = .bss:0x0000005C; // type:object size:0xC scope:local @4977 = .bss:0x00000068; // type:object size:0xC scope:local @4978 = .bss:0x00000074; // type:object size:0xC scope:local @@ -221,6 +222,7 @@ M_wrt_work__Q29daObjBm_c5Bgc_c = .bss:0x00000854; // type:object size:0x54 scope @5104 = .bss:0x000008A8; // type:object size:0xC scope:local M_wall_work__Q29daObjBm_c5Bgc_c = .bss:0x000008B4; // type:object size:0xA10 scope:global align:4 data:float @5249 = .bss:0x000012C4; // type:object size:0xC scope:local +init$0001 = .bss:0x000012D0; // type:object size:0x1 scope:local touch_work$5248 = .bss:0x000012D4; // type:object size:0x70 scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00001344; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00001348; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_bk_leaf/symbols.txt b/config/GZ2E01/rels/d_a_obj_bk_leaf/symbols.txt index 0f0af3406c..05672f2198 100644 --- a/config/GZ2E01/rels/d_a_obj_bk_leaf/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bk_leaf/symbols.txt @@ -24,7 +24,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_408_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_bmdName = .data:0x00000024; // type:object size:0x4 scope:global l_bckName = .data:0x00000028; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_bky_rock/symbols.txt b/config/GZ2E01/rels/d_a_obj_bky_rock/symbols.txt index 3ef94b9f43..60b68ac196 100644 --- a/config/GZ2E01/rels/d_a_obj_bky_rock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bky_rock/symbols.txt @@ -77,7 +77,8 @@ PIECE_SCALE_BASE$4100 = .rodata:0x00000148; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_409_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte @3933 = .data:0x00000024; // type:object size:0xC scope:local @3934 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_bmWindow/splits.txt b/config/GZ2E01/rels/d_a_obj_bmWindow/splits.txt index d1029e8604..d219cb3d61 100644 --- a/config/GZ2E01/rels/d_a_obj_bmWindow/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_bmWindow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bmWindow.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_bmWindow/symbols.txt b/config/GZ2E01/rels/d_a_obj_bmWindow/symbols.txt index 60849e2f03..3db57c5389 100644 --- a/config/GZ2E01/rels/d_a_obj_bmWindow/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bmWindow/symbols.txt @@ -64,7 +64,8 @@ particle_id$4102 = .rodata:0x000000B8; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_410_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daBmWindow_c = .data:0x00000020; // type:object size:0x44 scope:global @3865 = .data:0x00000064; // type:object size:0xC scope:local @3866 = .data:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_bmshutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_bmshutter/symbols.txt index b3a1635f59..d8881dbed6 100644 --- a/config/GZ2E01/rels/d_a_obj_bmshutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bmshutter/symbols.txt @@ -44,7 +44,8 @@ l_check_area = .rodata:0x00000018; // type:object size:0x30 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_411_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3852 = .data:0x00000024; // type:object size:0xC scope:local @3853 = .data:0x00000030; // type:object size:0xC scope:local @@ -58,5 +59,5 @@ l_func$3894 = .data:0x000000A8; // type:object size:0x24 scope:local l_daObjBmSh_Method = .data:0x000000CC; // type:object size:0x20 scope:global g_profile_Obj_BoomShutter = .data:0x000000EC; // type:object size:0x30 scope:global __vt__11daObjBmSh_c = .data:0x0000011C; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 -init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_bosswarp/symbols.txt b/config/GZ2E01/rels/d_a_obj_bosswarp/symbols.txt index 12a9bb93dc..8445d37539 100644 --- a/config/GZ2E01/rels/d_a_obj_bosswarp/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bosswarp/symbols.txt @@ -79,7 +79,8 @@ l_dangeon_clr_bitNo$4282 = .rodata:0x00000130; // type:object size:0x24 scope:lo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_91_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte l_clearEvName = .data:0x00000024; // type:object size:0x24 scope:global l_warp_check_evName = .data:0x00000048; // type:object size:0x4 scope:global @@ -103,4 +104,4 @@ action_table$4273 = .data:0x00000158; // type:object size:0x3C scope:local l_daObjBossWarp_Method = .data:0x00000218; // type:object size:0x20 scope:local g_profile_Obj_BossWarp = .data:0x00000238; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000268; // type:object size:0xC scope:global -lbl_91_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_boumato/splits.txt b/config/GZ2E01/rels/d_a_obj_boumato/splits.txt index 34ec9e6528..c5e1a6e159 100644 --- a/config/GZ2E01/rels/d_a_obj_boumato/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_boumato/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_boumato.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_brg/splits.txt b/config/GZ2E01/rels/d_a_obj_brg/splits.txt index 54a4e56398..19b12eecaa 100644 --- a/config/GZ2E01/rels/d_a_obj_brg/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_brg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_brg.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_bsGate/splits.txt b/config/GZ2E01/rels/d_a_obj_bsGate/splits.txt index 6a36cbb38a..78db365ff0 100644 --- a/config/GZ2E01/rels/d_a_obj_bsGate/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_bsGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bsGate.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_bsGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_bsGate/symbols.txt index 7a5451f026..266dd02cd5 100644 --- a/config/GZ2E01/rels/d_a_obj_bsGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bsGate/symbols.txt @@ -41,7 +41,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_415_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3724 = .data:0x00000020; // type:object size:0xC scope:local @3725 = .data:0x0000002C; // type:object size:0xC scope:local @3726 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_bubblePilar/splits.txt b/config/GZ2E01/rels/d_a_obj_bubblePilar/splits.txt index cddb6bae12..8b593ec5a6 100644 --- a/config/GZ2E01/rels/d_a_obj_bubblePilar/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_bubblePilar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bubblePilar.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_bubblePilar/symbols.txt b/config/GZ2E01/rels/d_a_obj_bubblePilar/symbols.txt index 9595b5f520..3f48df6ef5 100644 --- a/config/GZ2E01/rels/d_a_obj_bubblePilar/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_bubblePilar/symbols.txt @@ -38,7 +38,8 @@ particle_id$3953 = .rodata:0x0000003C; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_416_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__13daBubbPilar_c = .data:0x00000020; // type:object size:0x44 scope:global @3843 = .data:0x00000064; // type:object size:0xC scope:local @3844 = .data:0x00000070; // type:object size:0xC scope:local @@ -55,4 +56,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000148; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3623 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:local -init$1367 = .bss:0x0000001C; // type:object size:0x1 scope:local data:byte +init$1367 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_carry/symbols.txt b/config/GZ2E01/rels/d_a_obj_carry/symbols.txt index 59b63fb4c9..1e68b41417 100644 --- a/config/GZ2E01/rels/d_a_obj_carry/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_carry/symbols.txt @@ -263,7 +263,8 @@ particle_id$7914 = .rodata:0x00000BA0; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_18_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x38 scope:global l_bmdName = .data:0x00000058; // type:object size:0x38 scope:global kibako_jv_offset = .data:0x00000090; // type:object size:0x18 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_cb/splits.txt b/config/GZ2E01/rels/d_a_obj_cb/splits.txt index a0b87e2f7a..af71e3063b 100644 --- a/config/GZ2E01/rels/d_a_obj_cb/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_cb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cb.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_cb/symbols.txt b/config/GZ2E01/rels/d_a_obj_cb/symbols.txt index 0fa8a0f378..2687b4d656 100644 --- a/config/GZ2E01/rels/d_a_obj_cb/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_cb/symbols.txt @@ -53,6 +53,6 @@ __vt__8cM3dGAab = .data:0x0000005C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000068; // type:object size:0x24 scope:global __vt__14daObj_Cb_HIO_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_cblock/splits.txt b/config/GZ2E01/rels/d_a_obj_cblock/splits.txt index ca395a0774..2cfb7b4906 100644 --- a/config/GZ2E01/rels/d_a_obj_cblock/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_cblock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cblock.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_cblock/symbols.txt b/config/GZ2E01/rels/d_a_obj_cblock/symbols.txt index 1424000d96..6a1abd7b8d 100644 --- a/config/GZ2E01/rels/d_a_obj_cblock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_cblock/symbols.txt @@ -68,7 +68,8 @@ l_cull_box = .rodata:0x00000000; // type:object size:0x18 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_419_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_side_co_offset = .data:0x00000024; // type:object size:0x30 scope:global l_cyl_src = .data:0x00000054; // type:object size:0x44 scope:global @@ -104,6 +105,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_chainOffset = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3645 = .bss:0x00000060; // type:object size:0xC scope:local l_smokeSetOffset = .bss:0x0000006C; // type:object size:0xC scope:global +init$0000 = .bss:0x00000078; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_cdoor/symbols.txt b/config/GZ2E01/rels/d_a_obj_cdoor/symbols.txt index d9ddea02f2..4417b2c606 100644 --- a/config/GZ2E01/rels/d_a_obj_cdoor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_cdoor/symbols.txt @@ -40,7 +40,8 @@ l_attentionOffsetY = .rodata:0x00000010; // type:object size:0x8 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_420_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_moveOffsetY = .data:0x00000028; // type:object size:0x8 scope:global @4020 = .data:0x00000030; // type:object size:0xC scope:local @@ -56,5 +57,5 @@ l_daObjCdoor_Method = .data:0x000000D8; // type:object size:0x20 scope:global g_profile_Obj_Cdoor = .data:0x000000F8; // type:object size:0x30 scope:global __vt__12daObjCdoor_c = .data:0x00000128; // type:object size:0x2C scope:global __vt__12J3DFrameCtrl = .data:0x00000154; // type:object size:0xC scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 -init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_chandelier/symbols.txt b/config/GZ2E01/rels/d_a_obj_chandelier/symbols.txt index b29239f506..088a3f0226 100644 --- a/config/GZ2E01/rels/d_a_obj_chandelier/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_chandelier/symbols.txt @@ -53,7 +53,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_421_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3715 = .data:0x00000024; // type:object size:0xC scope:local @3716 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_chest/symbols.txt b/config/GZ2E01/rels/d_a_obj_chest/symbols.txt index b457b70b62..54973a27dd 100644 --- a/config/GZ2E01/rels/d_a_obj_chest/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_chest/symbols.txt @@ -60,7 +60,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_422_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3876 = .data:0x00000024; // type:object size:0xC scope:local @3877 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_cho/splits.txt b/config/GZ2E01/rels/d_a_obj_cho/splits.txt index bc07dfd3e9..fb9fefedb8 100644 --- a/config/GZ2E01/rels/d_a_obj_cho/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_cho/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cho.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_cho/symbols.txt b/config/GZ2E01/rels/d_a_obj_cho/symbols.txt index 358f24b81d..1e23062966 100644 --- a/config/GZ2E01/rels/d_a_obj_cho/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_cho/symbols.txt @@ -96,6 +96,6 @@ __vt__10daObjCHO_c = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_ChoHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_cwall/splits.txt b/config/GZ2E01/rels/d_a_obj_cwall/splits.txt index f093cbb230..c54f8ce49c 100644 --- a/config/GZ2E01/rels/d_a_obj_cwall/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_cwall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cwall.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_cwall/symbols.txt b/config/GZ2E01/rels/d_a_obj_cwall/symbols.txt index df0b6979e8..28627bf98a 100644 --- a/config/GZ2E01/rels/d_a_obj_cwall/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_cwall/symbols.txt @@ -100,7 +100,8 @@ l_check_max_wolf = .rodata:0x00000058; // type:object size:0xC scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_433_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_cull_box = .data:0x00000028; // type:object size:0x18 scope:global l_side_co_offset = .data:0x00000040; // type:object size:0x30 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_dan/splits.txt b/config/GZ2E01/rels/d_a_obj_dan/splits.txt index df7be832f3..3cdee62db3 100644 --- a/config/GZ2E01/rels/d_a_obj_dan/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_dan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_dan.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_dan/symbols.txt b/config/GZ2E01/rels/d_a_obj_dan/symbols.txt index cda5b9f43b..fdb9192547 100644 --- a/config/GZ2E01/rels/d_a_obj_dan/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_dan/symbols.txt @@ -86,6 +86,6 @@ __vt__10daObjDAN_c = .data:0x000000BC; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000C8; // type:object size:0xC scope:global __vt__14daObj_DanHIO_c = .data:0x000000D4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_digsnow/symbols.txt b/config/GZ2E01/rels/d_a_obj_digsnow/symbols.txt index 0abdbc9a84..3fb2a69dfa 100644 --- a/config/GZ2E01/rels/d_a_obj_digsnow/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_digsnow/symbols.txt @@ -44,7 +44,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_437_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3713 = .data:0x00000024; // type:object size:0xC scope:local @3714 = .data:0x00000030; // type:object size:0xC scope:local @@ -60,4 +61,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__14dBgS_ObjGndChk = .data:0x0000011C; // type:object size:0x30 scope:global __vt__14daObjDigSnow_c = .data:0x0000014C; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_dmelevator/splits.txt b/config/GZ2E01/rels/d_a_obj_dmelevator/splits.txt index d4cf3d408f..ae33f5fd67 100644 --- a/config/GZ2E01/rels/d_a_obj_dmelevator/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_dmelevator/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_dmelevator.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_dmelevator/symbols.txt b/config/GZ2E01/rels/d_a_obj_dmelevator/symbols.txt index 19af75ed29..f004ac127a 100644 --- a/config/GZ2E01/rels/d_a_obj_dmelevator/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_dmelevator/symbols.txt @@ -82,7 +82,8 @@ l_swOffset = .rodata:0x00000000; // type:object size:0xC scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_438_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_el_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_sw_arcName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000028; // type:object size:0x4 scope:global @@ -127,13 +128,14 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3654 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000058; // type:object size:0xC scope:local @3658 = .bss:0x00000064; // type:object size:0xC scope:local @3659 = .bss:0x00000070; // type:object size:0xC scope:local l_push_check_pos$3653 = .bss:0x0000007C; // type:object size:0x30 scope:local -init$0000 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x000000AE; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte +init$0003 = .bss:0x000000AE; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_drop/symbols.txt b/config/GZ2E01/rels/d_a_obj_drop/symbols.txt index 6d34713eb1..f95a35d596 100644 --- a/config/GZ2E01/rels/d_a_obj_drop/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_drop/symbols.txt @@ -80,7 +80,8 @@ target_angle_x$4297 = .rodata:0x00000090; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_439_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4815 = .data:0x00000020; // type:object size:0xC scope:local @4816 = .data:0x0000002C; // type:object size:0xC scope:local @4817 = .data:0x00000038; // type:object size:0xC scope:local @@ -102,5 +103,5 @@ __vt__10dCcD_GStts = .data:0x00000190; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001B4; // type:object size:0x24 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 -init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_fireWood/splits.txt b/config/GZ2E01/rels/d_a_obj_fireWood/splits.txt index ed5962a1db..9e72d60d5a 100644 --- a/config/GZ2E01/rels/d_a_obj_fireWood/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_fireWood/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fireWood.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_fireWood2/splits.txt b/config/GZ2E01/rels/d_a_obj_fireWood2/splits.txt index 8aeaef0582..c0e1563474 100644 --- a/config/GZ2E01/rels/d_a_obj_fireWood2/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_fireWood2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fireWood2.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_firepillar/symbols.txt b/config/GZ2E01/rels/d_a_obj_firepillar/symbols.txt index 100ec3d9cd..9f69197274 100644 --- a/config/GZ2E01/rels/d_a_obj_firepillar/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_firepillar/symbols.txt @@ -40,7 +40,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_447_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:local align:4 data:float l_cps_src = .data:0x00000038; // type:object size:0x4C scope:local @3789 = .data:0x00000084; // type:object size:0xC scope:local @@ -54,4 +55,4 @@ __vt__10cCcD_GStts = .data:0x00000128; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x00000134; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000140; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000014C; // type:object size:0x24 scope:global -lbl_447_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_firepillar2/symbols.txt b/config/GZ2E01/rels/d_a_obj_firepillar2/symbols.txt index 2d2e1cfd64..59c76b1b71 100644 --- a/config/GZ2E01/rels/d_a_obj_firepillar2/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_firepillar2/symbols.txt @@ -59,7 +59,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_448_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:local align:4 data:float l_cps_src = .data:0x0000003C; // type:object size:0x4C scope:local @@ -81,4 +82,4 @@ __vt__10dCcD_GStts = .data:0x0000016C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001A8; // type:object size:0xC scope:global -lbl_448_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_food/splits.txt b/config/GZ2E01/rels/d_a_obj_food/splits.txt index 00ffb11a11..397338c68c 100644 --- a/config/GZ2E01/rels/d_a_obj_food/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_food/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_food.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_food/symbols.txt b/config/GZ2E01/rels/d_a_obj_food/symbols.txt index 8cc295a232..495e38aa46 100644 --- a/config/GZ2E01/rels/d_a_obj_food/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_food/symbols.txt @@ -70,6 +70,6 @@ __vt__8cM3dGAab = .data:0x000000E4; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F0; // type:object size:0x24 scope:global __vt__16daObj_Food_HIO_c = .data:0x00000114; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3642 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_fw/splits.txt b/config/GZ2E01/rels/d_a_obj_fw/splits.txt index b07e9ec321..39b7b0be41 100644 --- a/config/GZ2E01/rels/d_a_obj_fw/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_fw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fw.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_fw/symbols.txt b/config/GZ2E01/rels/d_a_obj_fw/symbols.txt index 5c6998a4d3..bb5a3adf18 100644 --- a/config/GZ2E01/rels/d_a_obj_fw/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_fw/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Fw_Method = .data:0x00000010; // type:object size:0x20 scope:global g_profile_OBJ_FW = .data:0x00000030; // type:object size:0x30 scope:global __vt__14daObj_Fw_HIO_c = .data:0x00000060; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3642 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_gadget/splits.txt b/config/GZ2E01/rels/d_a_obj_gadget/splits.txt index 73f2637801..e67e4a0030 100644 --- a/config/GZ2E01/rels/d_a_obj_gadget/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_gadget/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gadget.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_gadget/symbols.txt b/config/GZ2E01/rels/d_a_obj_gadget/symbols.txt index 4555461a40..97542334a7 100644 --- a/config/GZ2E01/rels/d_a_obj_gadget/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gadget/symbols.txt @@ -79,7 +79,8 @@ l_ccDObjData = .rodata:0x0000002C; // type:object size:0x30 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_454_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global l_ccDCyl = .data:0x00000038; // type:object size:0x44 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_gb/symbols.txt b/config/GZ2E01/rels/d_a_obj_gb/symbols.txt index 028ef25ccf..6cbdb3e271 100644 --- a/config/GZ2E01/rels/d_a_obj_gb/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gb/symbols.txt @@ -28,7 +28,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_457_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double bmd$3914 = .data:0x00000020; // type:object size:0x8 scope:local brk$3915 = .data:0x00000028; // type:object size:0x8 scope:local btk$3916 = .data:0x00000030; // type:object size:0x8 scope:local diff --git a/config/GZ2E01/rels/d_a_obj_geyser/symbols.txt b/config/GZ2E01/rels/d_a_obj_geyser/symbols.txt index aa99a123e1..ff23b18df7 100644 --- a/config/GZ2E01/rels/d_a_obj_geyser/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_geyser/symbols.txt @@ -74,7 +74,8 @@ l_scale = .rodata:0x00000008; // type:object size:0x18 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_458_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cps_src = .data:0x0000003C; // type:object size:0x4C scope:global @@ -94,5 +95,5 @@ __vt__10dCcD_GStts = .data:0x0000018C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000198; // type:object size:0xC scope:global __vt__8cM3dGLin = .data:0x000001A4; // type:object size:0xC scope:global __vt__13daObjGeyser_c = .data:0x000001B0; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 -init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_glowSphere/splits.txt b/config/GZ2E01/rels/d_a_obj_glowSphere/splits.txt index 7a32f7c9c4..bfeaf6a9fb 100644 --- a/config/GZ2E01/rels/d_a_obj_glowSphere/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_glowSphere/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_glowSphere.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_glowSphere/symbols.txt b/config/GZ2E01/rels/d_a_obj_glowSphere/symbols.txt index 9ec9ba5dab..a8c46c925c 100644 --- a/config/GZ2E01/rels/d_a_obj_glowSphere/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_glowSphere/symbols.txt @@ -69,7 +69,8 @@ mCcDObjInfo__10daGlwSph_c = .rodata:0x00000008; // type:object size:0x30 scope:g ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_459_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:local align:4 data:float mCcDSph__10daGlwSph_c = .data:0x00000038; // type:object size:0x40 scope:global l_prmColor = .data:0x00000078; // type:object size:0x4 scope:local @@ -119,8 +120,8 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_HIO = .bss:0x00000054; // type:object size:0xC scope:local align:4 data:float @3673 = .bss:0x00000060; // type:object size:0xC scope:local mSphMng__10daGlwSph_c = .bss:0x0000006C; // type:object size:0x3C4 scope:global -lbl_459_bss_430 = .bss:0x00000430; // type:object size:0x1 scope:local data:byte -lbl_459_bss_431 = .bss:0x00000431; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000430; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000431; // type:object size:0x1 scope:local align:1 data:byte sSeId$4016 = .bss:0x00000434; // type:object size:0x14 scope:local data:4byte mSphSe__12_GlSph_Mng_c = .bss:0x00000448; // type:object size:0x2 scope:global data:2byte mSeClrTmr__12_GlSph_Mng_c = .bss:0x0000044A; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2E01/rels/d_a_obj_gm/splits.txt b/config/GZ2E01/rels/d_a_obj_gm/splits.txt index 5a84ec5cc0..f07956488e 100644 --- a/config/GZ2E01/rels/d_a_obj_gm/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_gm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gm.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_gm/symbols.txt b/config/GZ2E01/rels/d_a_obj_gm/symbols.txt index 2608c59e73..56f6602a9f 100644 --- a/config/GZ2E01/rels/d_a_obj_gm/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gm/symbols.txt @@ -70,7 +70,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_460_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double obj_size = .data:0x00000020; // type:object size:0x1C scope:global weg = .data:0x0000003C; // type:object size:0x1C scope:global tim = .data:0x00000058; // type:object size:0xE scope:global @@ -89,6 +90,6 @@ __vt__8cM3dGAab = .data:0x0000018C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000198; // type:object size:0x24 scope:global __vt__14daObj_Gm_HIO_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3661 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_goGate/splits.txt b/config/GZ2E01/rels/d_a_obj_goGate/splits.txt index 354717688c..0d2a15792b 100644 --- a/config/GZ2E01/rels/d_a_obj_goGate/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_goGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_goGate.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_goGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_goGate/symbols.txt index 6ff435f84c..a2505cd7f8 100644 --- a/config/GZ2E01/rels/d_a_obj_goGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_goGate/symbols.txt @@ -41,7 +41,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_461_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3727 = .data:0x00000020; // type:object size:0xC scope:local @3728 = .data:0x0000002C; // type:object size:0xC scope:local @3729 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_gomikabe/splits.txt b/config/GZ2E01/rels/d_a_obj_gomikabe/splits.txt index e2b75e2cd5..f807654679 100644 --- a/config/GZ2E01/rels/d_a_obj_gomikabe/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_gomikabe/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gomikabe.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt index 99f0c23f4d..bac3e3da28 100644 --- a/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gomikabe/symbols.txt @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3761 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_gpTaru/splits.txt b/config/GZ2E01/rels/d_a_obj_gpTaru/splits.txt index e824a86e22..dc3917df81 100644 --- a/config/GZ2E01/rels/d_a_obj_gpTaru/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_gpTaru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gpTaru.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_gpTaru/symbols.txt b/config/GZ2E01/rels/d_a_obj_gpTaru/symbols.txt index 436b0400af..64e7c503c8 100644 --- a/config/GZ2E01/rels/d_a_obj_gpTaru/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gpTaru/symbols.txt @@ -107,7 +107,8 @@ mCcDObjInfo__10daGpTaru_c = .rodata:0x00000014; // type:object size:0x30 scope:g ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_96_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daGpTaru_c = .data:0x00000020; // type:object size:0x44 scope:global @4338 = .data:0x00000064; // type:object size:0xC scope:local @4339 = .data:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_gra2/splits.txt b/config/GZ2E01/rels/d_a_obj_gra2/splits.txt index 5b6e332a9a..863e63fc7e 100644 --- a/config/GZ2E01/rels/d_a_obj_gra2/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_gra2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gra2.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_gra2/symbols.txt b/config/GZ2E01/rels/d_a_obj_gra2/symbols.txt index f07a434312..08c722e7bc 100644 --- a/config/GZ2E01/rels/d_a_obj_gra2/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_gra2/symbols.txt @@ -327,7 +327,8 @@ l_prticles_id$6229 = .rodata:0x00000254; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_463_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resFileNameList = .data:0x00000020; // type:object size:0x10 scope:global l_exLoadRes_GRAa = .data:0x00000030; // type:object size:0x10 scope:global l_exLoadRes_GRA_jump = .data:0x00000040; // type:object size:0x10 scope:global @@ -469,7 +470,7 @@ l_centerOfst = .bss:0x00000054; // type:object size:0xC scope:global @4027 = .bss:0x00000060; // type:object size:0xC scope:local l_HIO = .bss:0x0000006C; // type:object size:0x4 scope:global @5037 = .bss:0x00000070; // type:object size:0xC scope:local -init$5038 = .bss:0x0000007C; // type:object size:0x1 scope:local +init$5038 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte @5040 = .bss:0x00000080; // type:object size:0xC scope:local @5041 = .bss:0x0000008C; // type:object size:0xC scope:local @5042 = .bss:0x00000098; // type:object size:0xC scope:local @@ -486,10 +487,10 @@ init$5038 = .bss:0x0000007C; // type:object size:0x1 scope:local @5053 = .bss:0x0000011C; // type:object size:0xC scope:local aTrembleTrans$5036 = .bss:0x00000128; // type:object size:0xB4 scope:local @5298 = .bss:0x000001DC; // type:object size:0xC scope:local -init$5299 = .bss:0x000001E8; // type:object size:0x1 scope:local +init$5299 = .bss:0x000001E8; // type:object size:0x1 scope:local align:1 data:byte aOfst$5297 = .bss:0x000001EC; // type:object size:0xC scope:local @5404 = .bss:0x000001F8; // type:object size:0xC scope:local -init$5405 = .bss:0x00000204; // type:object size:0x1 scope:local +init$5405 = .bss:0x00000204; // type:object size:0x1 scope:local align:1 data:byte aEyeOfst$5403 = .bss:0x00000208; // type:object size:0xC scope:local @5648 = .bss:0x00000214; // type:object size:0xC scope:local @5651 = .bss:0x00000224; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_groundwater/splits.txt b/config/GZ2E01/rels/d_a_obj_groundwater/splits.txt index d8ef2670d5..080dbe02cc 100644 --- a/config/GZ2E01/rels/d_a_obj_groundwater/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_groundwater/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_groundwater.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_groundwater/symbols.txt b/config/GZ2E01/rels/d_a_obj_groundwater/symbols.txt index 9df302ee99..2d205727b3 100644 --- a/config/GZ2E01/rels/d_a_obj_groundwater/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_groundwater/symbols.txt @@ -41,7 +41,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_467_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3993 = .data:0x00000020; // type:object size:0xC scope:local @3994 = .data:0x0000002C; // type:object size:0xC scope:local @3995 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_h_saku/splits.txt b/config/GZ2E01/rels/d_a_obj_h_saku/splits.txt index 183f8e88a3..73a1dbdfd5 100644 --- a/config/GZ2E01/rels/d_a_obj_h_saku/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_h_saku/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_h_saku.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_heavySw/splits.txt b/config/GZ2E01/rels/d_a_obj_heavySw/splits.txt index fdbfff035e..7c3c1ca60d 100644 --- a/config/GZ2E01/rels/d_a_obj_heavySw/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_heavySw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_heavySw.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_heavySw/symbols.txt b/config/GZ2E01/rels/d_a_obj_heavySw/symbols.txt index 334059a3b4..6ba64ae3b8 100644 --- a/config/GZ2E01/rels/d_a_obj_heavySw/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_heavySw/symbols.txt @@ -60,7 +60,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_476_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3770 = .data:0x00000020; // type:object size:0xC scope:local @3771 = .data:0x0000002C; // type:object size:0xC scope:local @3772 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_hfuta/splits.txt b/config/GZ2E01/rels/d_a_obj_hfuta/splits.txt index 489dc0a1ba..e160aa45c9 100644 --- a/config/GZ2E01/rels/d_a_obj_hfuta/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_hfuta/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_hfuta.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt b/config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt index 419425f3e1..763e376aab 100644 --- a/config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_hfuta/symbols.txt @@ -63,6 +63,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3687 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local data:byte @3690 = .bss:0x00000058; // type:object size:0xC scope:local @3691 = .bss:0x00000064; // type:object size:0xC scope:local @3692 = .bss:0x00000070; // type:object size:0xC scope:local @@ -106,7 +107,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3730 = .bss:0x00000238; // type:object size:0xC scope:local @3731 = .bss:0x00000244; // type:object size:0xC scope:local l_rot_data$3686 = .bss:0x00000250; // type:object size:0x102 scope:local -init$0000 = .bss:0x00000352; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000352; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000354; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000358; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000035C; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_hsTarget/splits.txt b/config/GZ2E01/rels/d_a_obj_hsTarget/splits.txt index 159497784a..b4b384c34e 100644 --- a/config/GZ2E01/rels/d_a_obj_hsTarget/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_hsTarget/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_hsTarget.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_ice_s/splits.txt b/config/GZ2E01/rels/d_a_obj_ice_s/splits.txt index 5a1b8599f3..1fe95ce4db 100644 --- a/config/GZ2E01/rels/d_a_obj_ice_s/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_ice_s/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ice_s.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt index 23c57b9e6f..2d6551c178 100644 --- a/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ice_s/symbols.txt @@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3639 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_iceblock/symbols.txt b/config/GZ2E01/rels/d_a_obj_iceblock/symbols.txt index 4bdd2a3dd1..e2aa9afc5e 100644 --- a/config/GZ2E01/rels/d_a_obj_iceblock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_iceblock/symbols.txt @@ -89,7 +89,8 @@ l_check_offsetXZ$4641 = .rodata:0x00000168; // type:object size:0x3C scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_481_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @4231 = .data:0x00000024; // type:object size:0xC scope:local @4232 = .data:0x00000030; // type:object size:0xC scope:local @@ -110,5 +111,5 @@ __vt__8cM3dGAab = .data:0x00000164; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000170; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000194; // type:object size:0xC scope:global __vt__13daObjIceBlk_c = .data:0x000001A0; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 -init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_iceleaf/symbols.txt b/config/GZ2E01/rels/d_a_obj_iceleaf/symbols.txt index 4e26d78eba..968ddd7b96 100644 --- a/config/GZ2E01/rels/d_a_obj_iceleaf/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_iceleaf/symbols.txt @@ -55,7 +55,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_482_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000024; // type:object size:0x44 scope:global @3975 = .data:0x00000068; // type:object size:0xC scope:local @@ -77,5 +78,5 @@ __vt__8cM3dGCyl = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001B4; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001D8; // type:object size:0xC scope:global -init$1997 = .bss:0x00000000; // type:object size:0x1 data:byte -init$2129 = .bss:0x00000001; // type:object size:0x1 data:byte +init$1997 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$2129 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_ita/splits.txt b/config/GZ2E01/rels/d_a_obj_ita/splits.txt index 596b188993..86d91f3f61 100644 --- a/config/GZ2E01/rels/d_a_obj_ita/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_ita/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ita.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_itamato/splits.txt b/config/GZ2E01/rels/d_a_obj_itamato/splits.txt index 978d110e95..7e960f0232 100644 --- a/config/GZ2E01/rels/d_a_obj_itamato/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_itamato/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_itamato.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_ito/splits.txt b/config/GZ2E01/rels/d_a_obj_ito/splits.txt index 57e4daea3e..07bfd8fd4c 100644 --- a/config/GZ2E01/rels/d_a_obj_ito/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_ito/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ito.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_ito/symbols.txt b/config/GZ2E01/rels/d_a_obj_ito/symbols.txt index 7c0a0e3415..a548ca3657 100644 --- a/config/GZ2E01/rels/d_a_obj_ito/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ito/symbols.txt @@ -80,6 +80,6 @@ __vt__8cM3dGSph = .data:0x000000B8; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000000C4; // type:object size:0x14 scope:global __vt__15daObj_Ito_HIO_c = .data:0x000000D8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3765 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kabuto/splits.txt b/config/GZ2E01/rels/d_a_obj_kabuto/splits.txt index ede0d65156..906b589a51 100644 --- a/config/GZ2E01/rels/d_a_obj_kabuto/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_kabuto/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kabuto.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kabuto/symbols.txt b/config/GZ2E01/rels/d_a_obj_kabuto/symbols.txt index b8e837cd04..e380990650 100644 --- a/config/GZ2E01/rels/d_a_obj_kabuto/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kabuto/symbols.txt @@ -101,6 +101,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KabHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kag/splits.txt b/config/GZ2E01/rels/d_a_obj_kag/splits.txt index 0f89dce71b..a3d02bfa53 100644 --- a/config/GZ2E01/rels/d_a_obj_kag/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_kag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kag.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kag/symbols.txt b/config/GZ2E01/rels/d_a_obj_kag/symbols.txt index 7970aa57b2..6eefbd8374 100644 --- a/config/GZ2E01/rels/d_a_obj_kag/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kag/symbols.txt @@ -101,7 +101,8 @@ l_musiya_num = .rodata:0x0000010C; // type:object size:0x4 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_489_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__25@unnamed@d_a_obj_kag_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global @3980 = .data:0x00000060; // type:object size:0xC scope:local data:4byte @4341 = .data:0x0000006C; // type:object size:0xC scope:local data:4byte @@ -128,6 +129,6 @@ __vt__8cM3dGPla = .data:0x00000194; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001A0; // type:object size:0xC scope:global __vt__14daObj_KagHIO_c = .data:0x000001AC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_kago/splits.txt b/config/GZ2E01/rels/d_a_obj_kago/splits.txt index 6083fbd40d..14dd82a7fa 100644 --- a/config/GZ2E01/rels/d_a_obj_kago/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_kago/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kago.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kago/symbols.txt b/config/GZ2E01/rels/d_a_obj_kago/symbols.txt index e7c33f21ba..71c582affd 100644 --- a/config/GZ2E01/rels/d_a_obj_kago/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kago/symbols.txt @@ -90,7 +90,8 @@ heapSize$3870 = .rodata:0x0000005C; // type:object size:0x14 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_491_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:local data:4byte l_resNameList = .data:0x00000030; // type:object size:0x8 scope:local l_ccDCyl = .data:0x00000038; // type:object size:0x44 scope:local diff --git a/config/GZ2E01/rels/d_a_obj_kamakiri/splits.txt b/config/GZ2E01/rels/d_a_obj_kamakiri/splits.txt index 0f4ccae4fd..a54be4fbf7 100644 --- a/config/GZ2E01/rels/d_a_obj_kamakiri/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_kamakiri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kamakiri.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kamakiri/symbols.txt b/config/GZ2E01/rels/d_a_obj_kamakiri/symbols.txt index abc7ce9de9..0b5d0c4ebc 100644 --- a/config/GZ2E01/rels/d_a_obj_kamakiri/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kamakiri/symbols.txt @@ -98,6 +98,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KamHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_kanban2/splits.txt b/config/GZ2E01/rels/d_a_obj_kanban2/splits.txt index 61180c71f8..28418b62ab 100644 --- a/config/GZ2E01/rels/d_a_obj_kanban2/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_kanban2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kanban2.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kanban2/symbols.txt b/config/GZ2E01/rels/d_a_obj_kanban2/symbols.txt index a5049a2f87..7e4def76ff 100644 --- a/config/GZ2E01/rels/d_a_obj_kanban2/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kanban2/symbols.txt @@ -147,10 +147,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_98_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3965 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte @4561 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte sc$4560 = .bss:0x00000070; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_kantera/symbols.txt b/config/GZ2E01/rels/d_a_obj_kantera/symbols.txt index 8665afda0e..b64d328382 100644 --- a/config/GZ2E01/rels/d_a_obj_kantera/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kantera/symbols.txt @@ -50,7 +50,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_494_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4184 = .data:0x00000020; // type:object size:0xC scope:local @4185 = .data:0x0000002C; // type:object size:0xC scope:local @4186 = .data:0x00000038; // type:object size:0xC scope:local @@ -66,4 +67,4 @@ __vt__8cM3dGAab = .data:0x00000100; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000010C; // type:object size:0x24 scope:global __vt__15daItemKantera_c = .data:0x00000130; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x00000174; // type:object size:0xC scope:global -lbl_494_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_katatsumuri/splits.txt b/config/GZ2E01/rels/d_a_obj_katatsumuri/splits.txt index a445b88e2d..4fb5fc047f 100644 --- a/config/GZ2E01/rels/d_a_obj_katatsumuri/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_katatsumuri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_katatsumuri.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_katatsumuri/symbols.txt b/config/GZ2E01/rels/d_a_obj_katatsumuri/symbols.txt index 23642053b4..4dac95e845 100644 --- a/config/GZ2E01/rels/d_a_obj_katatsumuri/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_katatsumuri/symbols.txt @@ -94,6 +94,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KatHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_kbacket/splits.txt b/config/GZ2E01/rels/d_a_obj_kbacket/splits.txt index 10d5a8fb94..99aea992f8 100644 --- a/config/GZ2E01/rels/d_a_obj_kbacket/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_kbacket/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kbacket.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kbacket/symbols.txt b/config/GZ2E01/rels/d_a_obj_kbacket/symbols.txt index 537a647d53..e954828f32 100644 --- a/config/GZ2E01/rels/d_a_obj_kbacket/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kbacket/symbols.txt @@ -81,7 +81,8 @@ l_ccDObjData = .rodata:0x0000002C; // type:object size:0x30 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_99_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_resNameList = .data:0x00000030; // type:object size:0x4 scope:global data:4byte l_ccDCyl = .data:0x00000034; // type:object size:0x44 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_kbox/splits.txt b/config/GZ2E01/rels/d_a_obj_kbox/splits.txt index 517449ef35..dcb92fa326 100644 --- a/config/GZ2E01/rels/d_a_obj_kbox/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_kbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kbox.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kbox/symbols.txt b/config/GZ2E01/rels/d_a_obj_kbox/symbols.txt index d47ce36508..f4f2b7d9ea 100644 --- a/config/GZ2E01/rels/d_a_obj_kbox/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kbox/symbols.txt @@ -105,10 +105,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @3976 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte sc$3975 = .bss:0x00000070; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_key/splits.txt b/config/GZ2E01/rels/d_a_obj_key/splits.txt index f0e95d6771..c38900b510 100644 --- a/config/GZ2E01/rels/d_a_obj_key/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_key/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_key.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_key/symbols.txt b/config/GZ2E01/rels/d_a_obj_key/symbols.txt index c56aef8e4e..1be44badfd 100644 --- a/config/GZ2E01/rels/d_a_obj_key/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_key/symbols.txt @@ -74,7 +74,7 @@ __vt__8cM3dGAab = .data:0x00000060; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000006C; // type:object size:0x24 scope:global __vt__15daObj_Key_HIO_c = .data:0x00000090; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3773 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte target_info_count = .bss:0x00000028; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2E01/rels/d_a_obj_keyhole/splits.txt b/config/GZ2E01/rels/d_a_obj_keyhole/splits.txt index 93c8d55660..718783fd0a 100644 --- a/config/GZ2E01/rels/d_a_obj_keyhole/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_keyhole/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_keyhole.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_keyhole/symbols.txt b/config/GZ2E01/rels/d_a_obj_keyhole/symbols.txt index 6eb9ea689f..9e59b0df9c 100644 --- a/config/GZ2E01/rels/d_a_obj_keyhole/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_keyhole/symbols.txt @@ -89,7 +89,8 @@ estimateSizeTbl$4475 = .rodata:0x000000B0; // type:object size:0x14 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_499_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double bmd_d$4377 = .data:0x00000020; // type:object size:0x28 scope:local mdl_f$4378 = .data:0x00000048; // type:object size:0x28 scope:local bck_d$4396 = .data:0x00000070; // type:object size:0x28 scope:local @@ -121,10 +122,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3650 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @3934 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte @3937 = .bss:0x00000070; // type:object size:0xC scope:local @3938 = .bss:0x0000007C; // type:object size:0xC scope:local @3939 = .bss:0x00000088; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_kgate/symbols.txt b/config/GZ2E01/rels/d_a_obj_kgate/symbols.txt index 61c0f81181..f2d9d60e27 100644 --- a/config/GZ2E01/rels/d_a_obj_kgate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kgate/symbols.txt @@ -96,7 +96,8 @@ l_tg_offset$4833 = .rodata:0x00000158; // type:object size:0x30 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_100_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0xC scope:global l_evName$4056 = .data:0x0000002C; // type:object size:0xC scope:local @4582 = .data:0x00000038; // type:object size:0xC scope:local @@ -116,4 +117,4 @@ __vt__8cM3dGAab = .data:0x00000140; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x0000014C; // type:object size:0xC scope:global __vt__12daObjKGate_c = .data:0x00000158; // type:object size:0x28 scope:global init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 -init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_ki/splits.txt b/config/GZ2E01/rels/d_a_obj_ki/splits.txt index a220f5d6da..0274050b1b 100644 --- a/config/GZ2E01/rels/d_a_obj_ki/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_ki/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ki.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_ki/symbols.txt b/config/GZ2E01/rels/d_a_obj_ki/symbols.txt index 9a2754b5af..be0b46d673 100644 --- a/config/GZ2E01/rels/d_a_obj_ki/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ki/symbols.txt @@ -47,6 +47,6 @@ l_daObj_Ki_Method = .data:0x00000010; // type:object size:0x20 scope:global g_profile_OBJ_KI = .data:0x00000030; // type:object size:0x30 scope:global __vt__14daObj_Ki_HIO_c = .data:0x00000060; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kiPot/splits.txt b/config/GZ2E01/rels/d_a_obj_kiPot/splits.txt index 212bdb7626..938fc2db32 100644 --- a/config/GZ2E01/rels/d_a_obj_kiPot/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_kiPot/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kiPot.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kita/splits.txt b/config/GZ2E01/rels/d_a_obj_kita/splits.txt index 332b298e53..c5fa02f337 100644 --- a/config/GZ2E01/rels/d_a_obj_kita/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_kita/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kita.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kita/symbols.txt b/config/GZ2E01/rels/d_a_obj_kita/symbols.txt index bac9b5db57..3934771498 100644 --- a/config/GZ2E01/rels/d_a_obj_kita/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kita/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global __vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_kshutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_kshutter/symbols.txt index f1c7eb96eb..4a78c2963c 100644 --- a/config/GZ2E01/rels/d_a_obj_kshutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kshutter/symbols.txt @@ -73,7 +73,8 @@ l_eff_id$4307 = .rodata:0x00000084; // type:object size:0xA scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_506_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x14 scope:global l_anmName = .data:0x00000034; // type:object size:0x28 scope:global l_eventName = .data:0x0000005C; // type:object size:0x28 scope:global @@ -102,8 +103,8 @@ daObjKshtr_METHODS = .data:0x00000200; // type:object size:0x20 scope:global g_profile_Obj_Kshutter = .data:0x00000220; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000250; // type:object size:0xC scope:global __vt__12daObjKshtr_c = .data:0x0000025C; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 -init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000002; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000003; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x00000002; // type:object size:0x1 scope:local align:1 data:byte +init$0003 = .bss:0x00000003; // type:object size:0x1 scope:local align:1 data:byte +init$0004 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_ktOnFire/splits.txt b/config/GZ2E01/rels/d_a_obj_ktOnFire/splits.txt index 7c63735e8c..03141eab1b 100644 --- a/config/GZ2E01/rels/d_a_obj_ktOnFire/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_ktOnFire/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ktOnFire.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kuwagata/splits.txt b/config/GZ2E01/rels/d_a_obj_kuwagata/splits.txt index c9ede69e1b..e3532a60e6 100644 --- a/config/GZ2E01/rels/d_a_obj_kuwagata/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_kuwagata/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kuwagata.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt b/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt index 6b58a43d16..fef3b93622 100644 --- a/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_kuwagata/symbols.txt @@ -99,6 +99,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KuwHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_ladder/symbols.txt b/config/GZ2E01/rels/d_a_obj_ladder/symbols.txt index 9414292f6f..3b0880eb7a 100644 --- a/config/GZ2E01/rels/d_a_obj_ladder/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ladder/symbols.txt @@ -51,7 +51,8 @@ M_arcname__Q211daObjLadder5Act_c = .rodata:0x00000024; // type:object size:0x5 s ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_103_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double L_attr_type__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@ = .data:0x00000020; // type:object size:0x30 scope:local @3878 = .data:0x00000050; // type:object size:0xC scope:local @3879 = .data:0x0000005C; // type:object size:0xC scope:local @@ -64,4 +65,4 @@ g_profile_Obj_Ladder = .data:0x000000E8; // type:object size:0x30 scope:global __vt__14dBgS_ObjGndChk = .data:0x00000118; // type:object size:0x30 scope:global __vt__Q211daObjLadder5Act_c = .data:0x00000148; // type:object size:0x28 scope:global M_tmp_mtx__Q211daObjLadder5Act_c = .bss:0x00000000; // type:object size:0x30 scope:global -lbl_103_bss_30 = .bss:0x00000030; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000030; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lbox/splits.txt b/config/GZ2E01/rels/d_a_obj_lbox/splits.txt index 3fff317a32..8c2427e5c2 100644 --- a/config/GZ2E01/rels/d_a_obj_lbox/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lbox.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lbox/symbols.txt b/config/GZ2E01/rels/d_a_obj_lbox/symbols.txt index f6f81222cf..b6f5b49362 100644 --- a/config/GZ2E01/rels/d_a_obj_lbox/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lbox/symbols.txt @@ -47,6 +47,6 @@ __vt__8cM3dGAab = .data:0x0000009C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000A8; // type:object size:0x24 scope:global __vt__16daObj_Lbox_HIO_c = .data:0x000000CC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_life_container/symbols.txt b/config/GZ2E01/rels/d_a_obj_life_container/symbols.txt index 61eb544282..424192702d 100644 --- a/config/GZ2E01/rels/d_a_obj_life_container/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_life_container/symbols.txt @@ -78,7 +78,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_53_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4479 = .data:0x00000020; // type:object size:0xC scope:local @4480 = .data:0x0000002C; // type:object size:0xC scope:local @4481 = .data:0x00000038; // type:object size:0xC scope:local @@ -97,4 +98,4 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__11daObjLife_c = .data:0x00000184; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001C8; // type:object size:0xC scope:global -lbl_53_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv1Candle00/splits.txt b/config/GZ2E01/rels/d_a_obj_lv1Candle00/splits.txt index 0ea456e188..ed188e11ad 100644 --- a/config/GZ2E01/rels/d_a_obj_lv1Candle00/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv1Candle00/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv1Candle00.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv1Candle01/splits.txt b/config/GZ2E01/rels/d_a_obj_lv1Candle01/splits.txt index 68a546f9e6..e4fb138496 100644 --- a/config/GZ2E01/rels/d_a_obj_lv1Candle01/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv1Candle01/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv1Candle01.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv2Candle/splits.txt b/config/GZ2E01/rels/d_a_obj_lv2Candle/splits.txt index 62f91bb2ed..b618332442 100644 --- a/config/GZ2E01/rels/d_a_obj_lv2Candle/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv2Candle/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv2Candle.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv3Candle/splits.txt b/config/GZ2E01/rels/d_a_obj_lv3Candle/splits.txt index dd14a358b4..ebe5dd296f 100644 --- a/config/GZ2E01/rels/d_a_obj_lv3Candle/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv3Candle/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Candle.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv3Water/splits.txt b/config/GZ2E01/rels/d_a_obj_lv3Water/splits.txt index ce388d462c..47234d64fd 100644 --- a/config/GZ2E01/rels/d_a_obj_lv3Water/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv3Water/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Water.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv3Water/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv3Water/symbols.txt index 395b466335..c3904d96eb 100644 --- a/config/GZ2E01/rels/d_a_obj_lv3Water/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv3Water/symbols.txt @@ -50,7 +50,8 @@ estimateSizeTbl$3746 = .rodata:0x000001A8; // type:object size:0x2A scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_518_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x54 scope:global @3830 = .data:0x00000074; // type:object size:0xC scope:local @3831 = .data:0x00000080; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv3Water2/splits.txt b/config/GZ2E01/rels/d_a_obj_lv3Water2/splits.txt index b224967d11..844154d523 100644 --- a/config/GZ2E01/rels/d_a_obj_lv3Water2/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv3Water2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Water2.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv3Water2/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv3Water2/symbols.txt index 178ea7b961..acfa06cd3c 100644 --- a/config/GZ2E01/rels/d_a_obj_lv3Water2/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv3Water2/symbols.txt @@ -47,7 +47,8 @@ l_btkIdx = .rodata:0x00000008; // type:object size:0x4 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_519_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x4 scope:global @3767 = .data:0x00000024; // type:object size:0xC scope:local @3768 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/splits.txt b/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/splits.txt index 212da12114..bd0f1f032b 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/splits.txt @@ -10,7 +10,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4CandleDemoTag.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt index d35995e8c0..fc76308d7d 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt @@ -54,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3632 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte -hio_set = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4CandleTag/splits.txt b/config/GZ2E01/rels/d_a_obj_lv4CandleTag/splits.txt index 1482725f04..41a6e44e77 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4CandleTag/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4CandleTag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4CandleTag.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv4CandleTag/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4CandleTag/symbols.txt index 6d3d54516a..f3eccbf113 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4CandleTag/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4CandleTag/symbols.txt @@ -41,7 +41,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_524_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3686 = .data:0x00000020; // type:object size:0xC scope:local @3687 = .data:0x0000002C; // type:object size:0xC scope:local @3688 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv4EdShutter/splits.txt b/config/GZ2E01/rels/d_a_obj_lv4EdShutter/splits.txt index 83fbb12549..0473970533 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4EdShutter/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4EdShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4EdShutter.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv4EdShutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4EdShutter/symbols.txt index af557bc7c0..0044f39bcb 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4EdShutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4EdShutter/symbols.txt @@ -50,7 +50,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_525_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3721 = .data:0x00000020; // type:object size:0xC scope:local @3722 = .data:0x0000002C; // type:object size:0xC scope:local @3723 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv4Gate/splits.txt b/config/GZ2E01/rels/d_a_obj_lv4Gate/splits.txt index c303a6c3b5..d140489c9b 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4Gate/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4Gate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4Gate.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv4Gate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4Gate/symbols.txt index 2e951f990a..332f096bca 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4Gate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4Gate/symbols.txt @@ -40,7 +40,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_526_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3725 = .data:0x00000020; // type:object size:0xC scope:local @3726 = .data:0x0000002C; // type:object size:0xC scope:local @3727 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv4HsTarget/splits.txt b/config/GZ2E01/rels/d_a_obj_lv4HsTarget/splits.txt index 6f82fdbe60..84dc0254c9 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4HsTarget/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4HsTarget/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4HsTarget.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv4PoGate/splits.txt b/config/GZ2E01/rels/d_a_obj_lv4PoGate/splits.txt index eebf3bbd28..cfe3d115f5 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4PoGate/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4PoGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4PoGate.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv4PoGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4PoGate/symbols.txt index 4abc55c44d..dd0c2116d2 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4PoGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4PoGate/symbols.txt @@ -55,7 +55,8 @@ particle_id$3866 = .rodata:0x00000030; // type:object size:0x14 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_528_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3727 = .data:0x00000020; // type:object size:0xC scope:local @3728 = .data:0x0000002C; // type:object size:0xC scope:local @3729 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv4RailWall/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4RailWall/symbols.txt index e07252aed7..44e1d3607c 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4RailWall/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4RailWall/symbols.txt @@ -56,7 +56,8 @@ l_spd_tbl$3801 = .rodata:0x00000020; // type:object size:0x44 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_529_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3758 = .data:0x00000024; // type:object size:0xC scope:local @3759 = .data:0x00000030; // type:object size:0xC scope:local @@ -72,4 +73,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__17dEvLib_callback_c = .data:0x0000011C; // type:object size:0x18 scope:global __vt__14daObjLv4Wall_c = .data:0x00000134; // type:object size:0x48 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4SlideWall/splits.txt b/config/GZ2E01/rels/d_a_obj_lv4SlideWall/splits.txt index 0013f2b984..8fc8c7c869 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4SlideWall/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4SlideWall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4SlideWall.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv4SlideWall/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4SlideWall/symbols.txt index 6e6c69830f..b0b70d2087 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4SlideWall/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4SlideWall/symbols.txt @@ -40,7 +40,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_530_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3720 = .data:0x00000020; // type:object size:0xC scope:local @3721 = .data:0x0000002C; // type:object size:0xC scope:local @3722 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv4bridge/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4bridge/symbols.txt index b1f2847f63..2ebfbb2174 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4bridge/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4bridge/symbols.txt @@ -43,7 +43,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_531_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3702 = .data:0x00000024; // type:object size:0xC scope:local @3703 = .data:0x00000030; // type:object size:0xC scope:local @@ -53,4 +54,4 @@ daObjLv4Brg_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global g_profile_Obj_Lv4Bridge = .data:0x0000008C; // type:object size:0x30 scope:global __vt__17dEvLib_callback_c = .data:0x000000BC; // type:object size:0x18 scope:global __vt__13daObjLv4Brg_c = .data:0x000000D4; // type:object size:0x48 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4digsand/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4digsand/symbols.txt index 879fe47ae6..df486208fc 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4digsand/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4digsand/symbols.txt @@ -44,7 +44,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_533_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte @3715 = .data:0x00000024; // type:object size:0xC scope:local @3716 = .data:0x00000030; // type:object size:0xC scope:local @@ -60,4 +61,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__14dBgS_ObjGndChk = .data:0x0000011C; // type:object size:0x30 scope:global __vt__16daObjL4DigSand_c = .data:0x0000014C; // type:object size:0x28 scope:global -lbl_533_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4floor/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4floor/symbols.txt index 2d9d9abaaf..0c2ab206d2 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4floor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4floor/symbols.txt @@ -30,7 +30,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_534_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3678 = .data:0x00000024; // type:object size:0xC scope:local @3679 = .data:0x00000030; // type:object size:0xC scope:local @@ -39,4 +40,4 @@ l_func$3677 = .data:0x00000048; // type:object size:0x24 scope:local daObjLv4Floor_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global g_profile_Obj_Lv4Floor = .data:0x0000008C; // type:object size:0x30 scope:global __vt__15daObjLv4Floor_c = .data:0x000000BC; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv4sand/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv4sand/symbols.txt index 7ee6d149ae..a23f49092e 100644 --- a/config/GZ2E01/rels/d_a_obj_lv4sand/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv4sand/symbols.txt @@ -43,7 +43,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_538_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3754 = .data:0x00000024; // type:object size:0xC scope:local @3755 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/splits.txt b/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/splits.txt index 03c8eb538f..cadd4c57b6 100644 --- a/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5FloorBoard.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/symbols.txt index 2eac480fb6..bc8cd5383d 100644 --- a/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv5FloorBoard/symbols.txt @@ -41,7 +41,8 @@ mCcDObjInfo__12daFlorBoad_c = .rodata:0x00000004; // type:object size:0x30 scope ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_539_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daFlorBoad_c = .data:0x00000020; // type:object size:0x44 scope:global @3839 = .data:0x00000064; // type:object size:0xC scope:local @3840 = .data:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv5IceWall/splits.txt b/config/GZ2E01/rels/d_a_obj_lv5IceWall/splits.txt index 723c8fa8f9..53d5edc56b 100644 --- a/config/GZ2E01/rels/d_a_obj_lv5IceWall/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv5IceWall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5IceWall.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv5IceWall/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv5IceWall/symbols.txt index 807ec02ae0..c3a5d6c460 100644 --- a/config/GZ2E01/rels/d_a_obj_lv5IceWall/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv5IceWall/symbols.txt @@ -55,7 +55,8 @@ l_eff_break_b$4077 = .rodata:0x00000078; // type:object size:0x4 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_540_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daIceWall_c = .data:0x00000020; // type:object size:0x44 scope:global @3891 = .data:0x00000064; // type:object size:0xC scope:local @3892 = .data:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv5SwIce/splits.txt b/config/GZ2E01/rels/d_a_obj_lv5SwIce/splits.txt index d874b76741..63f82db0cf 100644 --- a/config/GZ2E01/rels/d_a_obj_lv5SwIce/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv5SwIce/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5SwIce.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv5SwIce/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv5SwIce/symbols.txt index c44ff405e5..d7126438ad 100644 --- a/config/GZ2E01/rels/d_a_obj_lv5SwIce/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv5SwIce/symbols.txt @@ -44,7 +44,8 @@ l_eff_break$3922 = .rodata:0x00000048; // type:object size:0x4 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_541_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daLv5SwIce_c = .data:0x00000020; // type:object size:0x44 scope:global @3837 = .data:0x00000064; // type:object size:0xC scope:local @3838 = .data:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/splits.txt b/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/splits.txt index 1f51bcecf7..96725b61e7 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6ChangeGate.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/symbols.txt index c2d0a46f7b..c46a180e8d 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6ChangeGate/symbols.txt @@ -61,7 +61,8 @@ mCcDObjInfo__17daLv6ChangeGate_c = .rodata:0x00000008; // type:object size:0x30 ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_544_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__17daLv6ChangeGate_c = .data:0x00000020; // type:object size:0x44 scope:global @3874 = .data:0x00000064; // type:object size:0xC scope:local @3875 = .data:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv6FurikoTrap/splits.txt b/config/GZ2E01/rels/d_a_obj_lv6FurikoTrap/splits.txt index 9f6a1bccd7..2147daf592 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6FurikoTrap/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6FurikoTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6FurikoTrap.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv6Lblock/splits.txt b/config/GZ2E01/rels/d_a_obj_lv6Lblock/splits.txt index c457136059..ac127f1004 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6Lblock/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6Lblock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6Lblock.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv6Lblock/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6Lblock/symbols.txt index 02c819dfdd..14d4bc67e2 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6Lblock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6Lblock/symbols.txt @@ -40,7 +40,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_546_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_liftUpMax = .data:0x00000020; // type:object size:0x8 scope:global @3734 = .data:0x00000028; // type:object size:0xC scope:local @3735 = .data:0x00000034; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv6SwGate/splits.txt b/config/GZ2E01/rels/d_a_obj_lv6SwGate/splits.txt index feefe6f370..5b6673926d 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6SwGate/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6SwGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6SwGate.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv6SwGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6SwGate/symbols.txt index 4f493cb9d1..d8b5fe5be2 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6SwGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6SwGate/symbols.txt @@ -56,7 +56,8 @@ mCcDObjInfo__13daLv6SwGate_c = .rodata:0x0000000C; // type:object size:0x30 scop ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_547_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__13daLv6SwGate_c = .data:0x00000020; // type:object size:0x44 scope:global l_cull_box = .data:0x00000064; // type:object size:0x18 scope:global align:4 data:float @3948 = .data:0x0000007C; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv6SzGate/splits.txt b/config/GZ2E01/rels/d_a_obj_lv6SzGate/splits.txt index 48d480013a..11a87ce927 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6SzGate/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6SzGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6SzGate.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv6SzGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6SzGate/symbols.txt index 1071142231..c913f65210 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6SzGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6SzGate/symbols.txt @@ -49,7 +49,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_548_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global align:4 data:float @3799 = .data:0x00000038; // type:object size:0xC scope:local @3800 = .data:0x00000044; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv6Tenbin/splits.txt b/config/GZ2E01/rels/d_a_obj_lv6Tenbin/splits.txt index 474b2d7989..ba47f9d24c 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6Tenbin/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6Tenbin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6Tenbin.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/splits.txt b/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/splits.txt index 407a59b7f6..250d23638c 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6TogeRoll.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/symbols.txt index 72e2e5d3ba..a54ca051e6 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6TogeRoll/symbols.txt @@ -73,7 +73,8 @@ mSpeed__12daTogeRoll_c = .rodata:0x0000006C; // type:object size:0x40 scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_550_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__12daTogeRoll_c = .data:0x00000020; // type:object size:0x40 scope:global mCcDCps__12daTogeRoll_c = .data:0x00000060; // type:object size:0x4C scope:global @3971 = .data:0x000000AC; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/splits.txt b/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/splits.txt index 12d78e691e..a5b238b4e7 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6TogeTrap.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/symbols.txt index 526b759908..303c8d3f6d 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6TogeTrap/symbols.txt @@ -96,7 +96,8 @@ estimateSizeTbl$3689 = .rodata:0x000000D4; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_551_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__15daLv6TogeTrap_c = .data:0x00000020; // type:object size:0x40 scope:global mCcDCyl__15daLv6TogeTrap_c = .data:0x00000060; // type:object size:0x44 scope:global l_resNameIdx = .data:0x000000A4; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_obj_lv6bemos/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6bemos/symbols.txt index 324bc4689e..1fa03a00f1 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6bemos/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6bemos/symbols.txt @@ -53,7 +53,8 @@ l_particle_id$3914 = .rodata:0x00000078; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_552_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cps_src = .data:0x0000003C; // type:object size:0x4C scope:global @@ -71,4 +72,4 @@ __vt__8cM3dGAab = .data:0x00000174; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x00000180; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x0000018C; // type:object size:0xC scope:global __vt__11daObjL6Bm_c = .data:0x00000198; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6bemos2/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6bemos2/symbols.txt index 2d58b6f243..ff4b495319 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6bemos2/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6bemos2/symbols.txt @@ -82,7 +82,8 @@ l_eff_id$4949 = .rodata:0x00000090; // type:object size:0x4 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_553_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte l_eye_matName = .data:0x00000024; // type:object size:0x4 scope:global l_head_joint = .data:0x00000028; // type:object size:0x4 scope:global @@ -116,5 +117,5 @@ __vt__8cM3dGAab = .data:0x00000294; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x000002A0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000002AC; // type:object size:0xC scope:global __vt__12daObjLv6Bm_c = .data:0x000002B8; // type:object size:0x28 scope:global -init$2007 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte -init$2384 = .bss:0x00000001; // type:object size:0x1 scope:local data:byte +init$2007 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$2384 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv6swturn/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv6swturn/symbols.txt index b3944c664e..b615b905cb 100644 --- a/config/GZ2E01/rels/d_a_obj_lv6swturn/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv6swturn/symbols.txt @@ -33,7 +33,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_556_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3777 = .data:0x00000024; // type:object size:0xC scope:local @3778 = .data:0x00000030; // type:object size:0xC scope:local @@ -41,4 +42,4 @@ l_func$3776 = .data:0x0000003C; // type:object size:0x18 scope:local daObjLv6SwTurn_METHODS = .data:0x00000054; // type:object size:0x20 scope:global g_profile_Obj_Lv6SwTurn = .data:0x00000074; // type:object size:0x30 scope:global __vt__16daObjLv6SwTurn_c = .data:0x000000A4; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv7BsGate/splits.txt b/config/GZ2E01/rels/d_a_obj_lv7BsGate/splits.txt index 48e060cb8c..9caacfae4b 100644 --- a/config/GZ2E01/rels/d_a_obj_lv7BsGate/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv7BsGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv7BsGate.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv7BsGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv7BsGate/symbols.txt index be6833bfe0..1161f16444 100644 --- a/config/GZ2E01/rels/d_a_obj_lv7BsGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv7BsGate/symbols.txt @@ -41,7 +41,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_557_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x8 scope:global l_bmdIdx = .data:0x00000028; // type:object size:0x8 scope:global l_dzbIdx = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_lv7PropellerY/splits.txt b/config/GZ2E01/rels/d_a_obj_lv7PropellerY/splits.txt index b44e37500d..d9cac35233 100644 --- a/config/GZ2E01/rels/d_a_obj_lv7PropellerY/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv7PropellerY/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv7PropellerY.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv7PropellerY/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv7PropellerY/symbols.txt index c7fcc45cb4..e7c571648a 100644 --- a/config/GZ2E01/rels/d_a_obj_lv7PropellerY/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv7PropellerY/symbols.txt @@ -47,7 +47,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_558_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x8 scope:global l_bmdIdx = .data:0x00000028; // type:object size:0x8 scope:global l_dzbIdx = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_lv7bridge/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv7bridge/symbols.txt index 56e9f70756..b2bc06f70f 100644 --- a/config/GZ2E01/rels/d_a_obj_lv7bridge/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv7bridge/symbols.txt @@ -60,7 +60,8 @@ l_bck$3780 = .rodata:0x00000040; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_559_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_cyl_src = .data:0x00000028; // type:object size:0x44 scope:global @3941 = .data:0x0000006C; // type:object size:0xC scope:local @@ -76,4 +77,4 @@ __vt__8cM3dGCyl = .data:0x0000011C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000128; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x0000014C; // type:object size:0xC scope:global __vt__13daObjLv7Brg_c = .data:0x00000158; // type:object size:0x28 scope:global -init$3943 = .bss:0x00000000; // type:object size:0x1 data:byte +init$3943 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/splits.txt b/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/splits.txt index c238d6e60b..9fd8a3621c 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8KekkaiTrap.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt index a24277ea4d..90f5408339 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt @@ -37,7 +37,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_560_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x4 scope:global l_bmdIdx = .data:0x00000024; // type:object size:0x4 scope:global l_dzbIdx = .data:0x00000028; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_lv8Lift/splits.txt b/config/GZ2E01/rels/d_a_obj_lv8Lift/splits.txt index 42da1a289d..b010fad4da 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8Lift/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8Lift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8Lift.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv8Lift/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv8Lift/symbols.txt index 5952d161a2..5ad9bcd61f 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8Lift/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8Lift/symbols.txt @@ -72,7 +72,8 @@ mSpeed__10daL8Lift_c = .rodata:0x00000004; // type:object size:0x40 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_561_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3822 = .data:0x00000020; // type:object size:0xC scope:local @3823 = .data:0x0000002C; // type:object size:0xC scope:local @3824 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv8OptiLift/splits.txt b/config/GZ2E01/rels/d_a_obj_lv8OptiLift/splits.txt index 3f0e9d6446..c16aadb3a1 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8OptiLift/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8OptiLift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8OptiLift.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv8OptiLift/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv8OptiLift/symbols.txt index facf538f92..66af4b8baa 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8OptiLift/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8OptiLift/symbols.txt @@ -66,7 +66,8 @@ mSpeed__12daOptiLift_c = .rodata:0x00000004; // type:object size:0x40 scope:glob ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_562_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3826 = .data:0x00000020; // type:object size:0xC scope:local @3827 = .data:0x0000002C; // type:object size:0xC scope:local @3828 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv8UdFloor/splits.txt b/config/GZ2E01/rels/d_a_obj_lv8UdFloor/splits.txt index cd46526bd9..0ba2d8c00a 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8UdFloor/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8UdFloor/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8UdFloor.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv8UdFloor/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv8UdFloor/symbols.txt index a477be3cdb..37fffe52e9 100644 --- a/config/GZ2E01/rels/d_a_obj_lv8UdFloor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv8UdFloor/symbols.txt @@ -49,7 +49,8 @@ l_heap_size = .rodata:0x00000014; // type:object size:0x8 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_563_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x8 scope:global @3736 = .data:0x00000028; // type:object size:0xC scope:local @3737 = .data:0x00000034; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_lv9SwShutter/splits.txt b/config/GZ2E01/rels/d_a_obj_lv9SwShutter/splits.txt index 4c797f16d5..55b103d011 100644 --- a/config/GZ2E01/rels/d_a_obj_lv9SwShutter/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_lv9SwShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv9SwShutter.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_lv9SwShutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_lv9SwShutter/symbols.txt index 6b2fc0490b..6b5cc29c1d 100644 --- a/config/GZ2E01/rels/d_a_obj_lv9SwShutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_lv9SwShutter/symbols.txt @@ -41,7 +41,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_564_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3722 = .data:0x00000020; // type:object size:0xC scope:local @3723 = .data:0x0000002C; // type:object size:0xC scope:local @3724 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_magLift/splits.txt b/config/GZ2E01/rels/d_a_obj_magLift/splits.txt index dbc092c03c..e7e0ec08dc 100644 --- a/config/GZ2E01/rels/d_a_obj_magLift/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_magLift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_magLift.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_magLift/symbols.txt b/config/GZ2E01/rels/d_a_obj_magLift/symbols.txt index b9e1627575..e73a126125 100644 --- a/config/GZ2E01/rels/d_a_obj_magLift/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_magLift/symbols.txt @@ -50,7 +50,8 @@ mSpeed__11daMagLift_c = .rodata:0x00000000; // type:object size:0x40 scope:globa ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_565_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3736 = .data:0x00000020; // type:object size:0xC scope:local @3737 = .data:0x0000002C; // type:object size:0xC scope:local @3738 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_magLiftRot/splits.txt b/config/GZ2E01/rels/d_a_obj_magLiftRot/splits.txt index d2be67dce9..8478afda34 100644 --- a/config/GZ2E01/rels/d_a_obj_magLiftRot/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_magLiftRot/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_magLiftRot.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_magLiftRot/symbols.txt b/config/GZ2E01/rels/d_a_obj_magLiftRot/symbols.txt index cf02349663..9ecf6ceccf 100644 --- a/config/GZ2E01/rels/d_a_obj_magLiftRot/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_magLiftRot/symbols.txt @@ -56,7 +56,8 @@ l_brkIdx = .rodata:0x00000054; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_566_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0xC scope:local @3856 = .data:0x0000002C; // type:object size:0xC scope:local @3857 = .data:0x00000038; // type:object size:0xC scope:local @@ -73,4 +74,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x40 scope:local align:4 data:float -lbl_566_bss_54 = .bss:0x00000054; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_magne_arm/symbols.txt b/config/GZ2E01/rels/d_a_obj_magne_arm/symbols.txt index 7ef2976255..fcb0f0f4c0 100644 --- a/config/GZ2E01/rels/d_a_obj_magne_arm/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_magne_arm/symbols.txt @@ -135,7 +135,8 @@ l_offsetF$3738 = .rodata:0x000000AC; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_105_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cull_box2 = .data:0x0000003C; // type:object size:0x18 scope:global align:4 data:float @@ -203,11 +204,11 @@ __vt__11daObjMarm_c = .data:0x000003BC; // type:object size:0x28 scope:global @1012 = .bss:0x00000034; // type:object size:0x1 scope:local @1010 = .bss:0x00000038; // type:object size:0x1 scope:local @1009 = .bss:0x0000003C; // type:object size:0x1 scope:local -init$1932 = .bss:0x0000003D; // type:object size:0x1 scope:local data:byte -init$2022 = .bss:0x0000003E; // type:object size:0x1 scope:local data:byte -init$2031 = .bss:0x0000003F; // type:object size:0x1 scope:local data:byte -init$2040 = .bss:0x00000040; // type:object size:0x1 scope:local data:byte -init$2049 = .bss:0x00000041; // type:object size:0x1 scope:local data:byte +init$1932 = .bss:0x0000003D; // type:object size:0x1 scope:local align:1 data:byte +init$2022 = .bss:0x0000003E; // type:object size:0x1 scope:local align:1 data:byte +init$2031 = .bss:0x0000003F; // type:object size:0x1 scope:local align:1 data:byte +init$2040 = .bss:0x00000040; // type:object size:0x1 scope:local align:1 data:byte +init$2049 = .bss:0x00000041; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000044; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000048; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000004C; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_maki/splits.txt b/config/GZ2E01/rels/d_a_obj_maki/splits.txt index 231f501a3c..bc0ce90e20 100644 --- a/config/GZ2E01/rels/d_a_obj_maki/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_maki/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_maki.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_master_sword/symbols.txt b/config/GZ2E01/rels/d_a_obj_master_sword/symbols.txt index e3b88d97e9..5790ad398e 100644 --- a/config/GZ2E01/rels/d_a_obj_master_sword/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_master_sword/symbols.txt @@ -40,7 +40,8 @@ mAttr__18daObjMasterSword_c = .rodata:0x00000000; // type:object size:0x4 scope: ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_568_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte @3655 = .data:0x00000024; // type:object size:0xC scope:local @3656 = .data:0x00000030; // type:object size:0xC scope:local @@ -55,4 +56,4 @@ __vt__12dBgS_ObjAcch = .data:0x0000010C; // type:object size:0x24 scope:global __vt__8cM3dGCyl = .data:0x00000130; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x0000013C; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000148; // type:object size:0xC scope:global -lbl_568_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$localstatic4$initCollision__18daObjMasterSword_cFv = .bss:0x00000000; // type:object size:0x1 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_mgate/symbols.txt b/config/GZ2E01/rels/d_a_obj_mgate/symbols.txt index 2b184db269..33ebb681a8 100644 --- a/config/GZ2E01/rels/d_a_obj_mgate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_mgate/symbols.txt @@ -34,7 +34,8 @@ l_roll_crash_check_areaL2 = .rodata:0x0000005C; // type:object size:0x30 scope:g ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_107_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_bmdName = .data:0x00000028; // type:object size:0x8 scope:global l_dzbName = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_mie/splits.txt b/config/GZ2E01/rels/d_a_obj_mie/splits.txt index e998395be8..8749728261 100644 --- a/config/GZ2E01/rels/d_a_obj_mie/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_mie/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_mie.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_mie/symbols.txt b/config/GZ2E01/rels/d_a_obj_mie/symbols.txt index a474173367..5d876478b6 100644 --- a/config/GZ2E01/rels/d_a_obj_mie/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_mie/symbols.txt @@ -110,7 +110,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3822 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:local data:4byte @4599 = .bss:0x00000058; // type:object size:0xC scope:local -init$2448 = .bss:0x00000064; // type:object size:0x1 scope:local +init$2448 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte scl$4598 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_mirror_6pole/symbols.txt b/config/GZ2E01/rels/d_a_obj_mirror_6pole/symbols.txt index c5a8276ec5..20053ff09f 100644 --- a/config/GZ2E01/rels/d_a_obj_mirror_6pole/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_mirror_6pole/symbols.txt @@ -24,7 +24,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_572_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3617 = .data:0x00000024; // type:object size:0xC scope:local @3618 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_mirror_screw/symbols.txt b/config/GZ2E01/rels/d_a_obj_mirror_screw/symbols.txt index 8b8162a036..728772b67b 100644 --- a/config/GZ2E01/rels/d_a_obj_mirror_screw/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_mirror_screw/symbols.txt @@ -30,7 +30,8 @@ M_attr__18daObjMirrorScrew_c = .rodata:0x00000000; // type:object size:0x18 scop ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_575_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3648 = .data:0x00000024; // type:object size:0xC scope:local @3649 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_movebox/splits.txt b/config/GZ2E01/rels/d_a_obj_movebox/splits.txt index 440e7adb31..4d3883bd3b 100644 --- a/config/GZ2E01/rels/d_a_obj_movebox/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_movebox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_movebox.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_movebox/symbols.txt b/config/GZ2E01/rels/d_a_obj_movebox/symbols.txt index a51b0803aa..089e852736 100644 --- a/config/GZ2E01/rels/d_a_obj_movebox/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_movebox/symbols.txt @@ -99,7 +99,8 @@ particle_id$4913 = .rodata:0x00000770; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_20_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4747 = .data:0x00000020; // type:object size:0xC scope:local @4748 = .data:0x0000002C; // type:object size:0xC scope:local @4749 = .data:0x00000038; // type:object size:0xC scope:local @@ -139,19 +140,19 @@ M_wrt_work__Q212daObjMovebox5Bgc_c = .bss:0x000007EC; // type:object size:0x54 s @3672 = .bss:0x00000840; // type:object size:0xC scope:local M_wall_work__Q212daObjMovebox5Bgc_c = .bss:0x0000084C; // type:object size:0xA10 scope:global align:4 data:float @3909 = .bss:0x0000125C; // type:object size:0xC scope:local -init$3910 = .bss:0x00001268; // type:object size:0x1 scope:local +init$3910 = .bss:0x00001268; // type:object size:0x1 scope:local align:1 data:byte touch_work$3908 = .bss:0x0000126C; // type:object size:0x70 scope:local @4501 = .bss:0x000012DC; // type:object size:0xC scope:local -init$4502 = .bss:0x000012E8; // type:object size:0x1 scope:local +init$4502 = .bss:0x000012E8; // type:object size:0x1 scope:local align:1 data:byte scl$4500 = .bss:0x000012EC; // type:object size:0xC scope:local @4574 = .bss:0x000012F8; // type:object size:0xC scope:local -init$4575 = .bss:0x00001304; // type:object size:0x1 scope:local +init$4575 = .bss:0x00001304; // type:object size:0x1 scope:local align:1 data:byte @4577 = .bss:0x00001308; // type:object size:0xC scope:local @4578 = .bss:0x00001314; // type:object size:0xC scope:local @4579 = .bss:0x00001320; // type:object size:0xC scope:local dir_vec$4573 = .bss:0x0000132C; // type:object size:0x30 scope:local @4762 = .bss:0x0000135C; // type:object size:0xC scope:local -init$4763 = .bss:0x00001368; // type:object size:0x1 scope:local +init$4763 = .bss:0x00001368; // type:object size:0x1 scope:local align:1 data:byte particle_scale$4761 = .bss:0x0000136C; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00001378; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000137C; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_msima/splits.txt b/config/GZ2E01/rels/d_a_obj_msima/splits.txt index 8991846e80..fabed8f8e3 100644 --- a/config/GZ2E01/rels/d_a_obj_msima/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_msima/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_msima.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_msima/symbols.txt b/config/GZ2E01/rels/d_a_obj_msima/symbols.txt index 38370071a8..be5beff62b 100644 --- a/config/GZ2E01/rels/d_a_obj_msima/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_msima/symbols.txt @@ -88,7 +88,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3858 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte @3958 = .bss:0x00000068; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_mvstair/symbols.txt b/config/GZ2E01/rels/d_a_obj_mvstair/symbols.txt index e10f6e58a7..084b5591bc 100644 --- a/config/GZ2E01/rels/d_a_obj_mvstair/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_mvstair/symbols.txt @@ -62,7 +62,8 @@ l_heap_size = .rodata:0x00000028; // type:object size:0x8 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_578_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global @3754 = .data:0x00000028; // type:object size:0xC scope:local @3755 = .data:0x00000034; // type:object size:0xC scope:local @@ -79,4 +80,4 @@ g_profile_Obj_MvStair = .data:0x00000108; // type:object size:0x30 scope:global __vt__18dPa_levelEcallBack = .data:0x00000138; // type:object size:0x24 scope:global __vt__12daObjStair_c = .data:0x0000015C; // type:object size:0x28 scope:global init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 -init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_myogan/splits.txt b/config/GZ2E01/rels/d_a_obj_myogan/splits.txt index 7be77c73e5..5c659cc14b 100644 --- a/config/GZ2E01/rels/d_a_obj_myogan/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_myogan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_myogan.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_myogan/symbols.txt b/config/GZ2E01/rels/d_a_obj_myogan/symbols.txt index 443e77d0be..e686fb3bce 100644 --- a/config/GZ2E01/rels/d_a_obj_myogan/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_myogan/symbols.txt @@ -29,6 +29,6 @@ g_profile_OBJ_MYOGAN = .data:0x00000020; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000050; // type:object size:0xC scope:global __vt__18daObj_Myogan_HIO_c = .data:0x0000005C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_nameplate/symbols.txt b/config/GZ2E01/rels/d_a_obj_nameplate/symbols.txt index a2e77a79dc..8ce4a38d5f 100644 --- a/config/GZ2E01/rels/d_a_obj_nameplate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_nameplate/symbols.txt @@ -38,7 +38,7 @@ ccSphSrc$3700 = .rodata:0x00000040; // type:object size:0x40 scope:local @3769 = .rodata:0x00000088; // type:object size:0x4 scope:local @3791 = .rodata:0x00000090; // type:object size:0x8 scope:local align:8 data:double @stringBase0 = .rodata:0x00000098; // type:object size:0x19 scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global +l_arcName__16daObjNameplate_c = .data:0x00000000; // type:object size:0x4 scope:global l_daObjNameplate_Method = .data:0x00000004; // type:object size:0x20 scope:global g_profile_Obj_NamePlate = .data:0x00000024; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x00000054; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_obj_nan/splits.txt b/config/GZ2E01/rels/d_a_obj_nan/splits.txt index 52a0243278..09b90966dd 100644 --- a/config/GZ2E01/rels/d_a_obj_nan/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_nan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_nan.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_nan/symbols.txt b/config/GZ2E01/rels/d_a_obj_nan/symbols.txt index 9334555715..a7ab4688f9 100644 --- a/config/GZ2E01/rels/d_a_obj_nan/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_nan/symbols.txt @@ -92,7 +92,8 @@ l_heapsize = .rodata:0x000000DC; // type:object size:0x4 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_581_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__25@unnamed@d_a_obj_nan_cpp@ = .data:0x00000020; // type:object size:0x40 scope:local @3924 = .data:0x00000060; // type:object size:0xC scope:local data:4byte @4034 = .data:0x0000006C; // type:object size:0xC scope:local data:4byte @@ -122,6 +123,6 @@ __vt__8cM3dGPla = .data:0x000001B8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001C4; // type:object size:0xC scope:global __vt__14daObj_NanHIO_c = .data:0x000001D0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -l_hio_init = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_nougu/splits.txt b/config/GZ2E01/rels/d_a_obj_nougu/splits.txt index 1a55b7b10a..84941b9b11 100644 --- a/config/GZ2E01/rels/d_a_obj_nougu/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_nougu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_nougu.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_octhashi/symbols.txt b/config/GZ2E01/rels/d_a_obj_octhashi/symbols.txt index 22c78c2d1f..926785fa7a 100644 --- a/config/GZ2E01/rels/d_a_obj_octhashi/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_octhashi/symbols.txt @@ -82,4 +82,4 @@ __vt__8cM3dGSph = .data:0x000000B0; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x000000BC; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000C8; // type:object size:0xC scope:global __vt__15daObjOCTHASHI_c = .data:0x000000D4; // type:object size:0x28 scope:global -l_cyl_height_init = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +l_cyl_height_init = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_oiltubo/symbols.txt b/config/GZ2E01/rels/d_a_obj_oiltubo/symbols.txt index 072ab31ce5..9b62cc4e69 100644 --- a/config/GZ2E01/rels/d_a_obj_oiltubo/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_oiltubo/symbols.txt @@ -51,7 +51,8 @@ mCcDObjInfo__15daObj_Oiltubo_c = .rodata:0x00000000; // type:object size:0x30 sc ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_585_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resFileName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_bmdFileName = .data:0x00000024; // type:object size:0x4 scope:global l_bbmdFileName = .data:0x00000028; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_onsenTaru/splits.txt b/config/GZ2E01/rels/d_a_obj_onsenTaru/splits.txt index 83f9bc9133..c482a16aea 100644 --- a/config/GZ2E01/rels/d_a_obj_onsenTaru/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_onsenTaru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_onsenTaru.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_onsenTaru/symbols.txt b/config/GZ2E01/rels/d_a_obj_onsenTaru/symbols.txt index cafdb093f6..6e1c3467d8 100644 --- a/config/GZ2E01/rels/d_a_obj_onsenTaru/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_onsenTaru/symbols.txt @@ -70,7 +70,8 @@ mCcDObjInfo__11daOnsTaru_c = .rodata:0x00000008; // type:object size:0x30 scope: ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_588_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daOnsTaru_c = .data:0x00000020; // type:object size:0x44 scope:global @4002 = .data:0x00000064; // type:object size:0xC scope:local @4003 = .data:0x00000070; // type:object size:0xC scope:local @@ -93,4 +94,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:local data:byte -init$1920 = .bss:0x00000024; // type:object size:0x1 scope:local data:byte +init$1920 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_pdoor/symbols.txt b/config/GZ2E01/rels/d_a_obj_pdoor/symbols.txt index 016e24bf15..0f9e648e83 100644 --- a/config/GZ2E01/rels/d_a_obj_pdoor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_pdoor/symbols.txt @@ -33,7 +33,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_589_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:local align:4 data:float @3781 = .data:0x0000003C; // type:object size:0xC scope:local @@ -42,4 +43,4 @@ l_func$3780 = .data:0x00000054; // type:object size:0x18 scope:local daObjPDoor_METHODS = .data:0x0000006C; // type:object size:0x20 scope:local g_profile_Obj_PushDoor = .data:0x0000008C; // type:object size:0x30 scope:global __vt__12daObjPDoor_c = .data:0x000000BC; // type:object size:0x28 scope:global -lbl_589_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_pdtile/symbols.txt b/config/GZ2E01/rels/d_a_obj_pdtile/symbols.txt index d3a6dac6a2..bc52a5dd0c 100644 --- a/config/GZ2E01/rels/d_a_obj_pdtile/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_pdtile/symbols.txt @@ -58,7 +58,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_590_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName4 = .data:0x00000020; // type:object size:0x4 scope:local l_dzbidx4 = .data:0x00000024; // type:object size:0x8 scope:local l_bmdidx4 = .data:0x0000002C; // type:object size:0x8 scope:local diff --git a/config/GZ2E01/rels/d_a_obj_pillar/splits.txt b/config/GZ2E01/rels/d_a_obj_pillar/splits.txt index f220bcb15f..f1c6137890 100644 --- a/config/GZ2E01/rels/d_a_obj_pillar/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_pillar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pillar.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_pillar/symbols.txt b/config/GZ2E01/rels/d_a_obj_pillar/symbols.txt index d1086c010e..e8c397d91c 100644 --- a/config/GZ2E01/rels/d_a_obj_pillar/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_pillar/symbols.txt @@ -66,7 +66,8 @@ l_shake_data = .rodata:0x00000064; // type:object size:0x30 scope:local data:2by ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_593_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:local @4193 = .data:0x00000028; // type:object size:0xC scope:local @4194 = .data:0x00000034; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_pleaf/splits.txt b/config/GZ2E01/rels/d_a_obj_pleaf/splits.txt index b40bc20f27..504fb1b960 100644 --- a/config/GZ2E01/rels/d_a_obj_pleaf/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_pleaf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pleaf.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_poCandle/splits.txt b/config/GZ2E01/rels/d_a_obj_poCandle/splits.txt index 4df1a366a5..cc39941536 100644 --- a/config/GZ2E01/rels/d_a_obj_poCandle/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_poCandle/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poCandle.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_poCandle/symbols.txt b/config/GZ2E01/rels/d_a_obj_poCandle/symbols.txt index fb218223e2..85a06cf1d9 100644 --- a/config/GZ2E01/rels/d_a_obj_poCandle/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_poCandle/symbols.txt @@ -56,7 +56,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_595_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3774 = .data:0x00000020; // type:object size:0xC scope:local @3775 = .data:0x0000002C; // type:object size:0xC scope:local @3776 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_poFire/splits.txt b/config/GZ2E01/rels/d_a_obj_poFire/splits.txt index 94cfbd0ed4..f88811c765 100644 --- a/config/GZ2E01/rels/d_a_obj_poFire/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_poFire/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poFire.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_poFire/symbols.txt b/config/GZ2E01/rels/d_a_obj_poFire/symbols.txt index 0b75ee8de5..cec1e34cf9 100644 --- a/config/GZ2E01/rels/d_a_obj_poFire/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_poFire/symbols.txt @@ -77,7 +77,8 @@ itemNo = .rodata:0x0000001C; // type:object size:0x4 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_596_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3740 = .data:0x00000020; // type:object size:0xC scope:local @3741 = .data:0x0000002C; // type:object size:0xC scope:local @3742 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_poTbox/splits.txt b/config/GZ2E01/rels/d_a_obj_poTbox/splits.txt index 1d8f74ec86..0fa2b1ca2d 100644 --- a/config/GZ2E01/rels/d_a_obj_poTbox/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_poTbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poTbox.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_poTbox/symbols.txt b/config/GZ2E01/rels/d_a_obj_poTbox/symbols.txt index eb6e8888f1..877008ed62 100644 --- a/config/GZ2E01/rels/d_a_obj_poTbox/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_poTbox/symbols.txt @@ -38,7 +38,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_597_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x8 scope:global l_bmdIdx = .data:0x00000028; // type:object size:0x8 scope:global l_dzbIdx = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_pumpkin/splits.txt b/config/GZ2E01/rels/d_a_obj_pumpkin/splits.txt index f1acf4b648..a4a83c5585 100644 --- a/config/GZ2E01/rels/d_a_obj_pumpkin/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_pumpkin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pumpkin.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_pumpkin/symbols.txt b/config/GZ2E01/rels/d_a_obj_pumpkin/symbols.txt index bb1597b4d5..9c910683bb 100644 --- a/config/GZ2E01/rels/d_a_obj_pumpkin/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_pumpkin/symbols.txt @@ -83,7 +83,8 @@ l_ccDObjData = .rodata:0x00000034; // type:object size:0x30 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_599_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:local data:4byte l_resNameList = .data:0x00000028; // type:object size:0x8 scope:local l_ccDCyl = .data:0x00000030; // type:object size:0x44 scope:local diff --git a/config/GZ2E01/rels/d_a_obj_rfHole/splits.txt b/config/GZ2E01/rels/d_a_obj_rfHole/splits.txt index b7bae7bc58..dd169c4040 100644 --- a/config/GZ2E01/rels/d_a_obj_rfHole/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_rfHole/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rfHole.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_rfHole/symbols.txt b/config/GZ2E01/rels/d_a_obj_rfHole/symbols.txt index 05689f8049..f0ae86a723 100644 --- a/config/GZ2E01/rels/d_a_obj_rfHole/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rfHole/symbols.txt @@ -46,7 +46,8 @@ particle_id$3917 = .rodata:0x00000030; // type:object size:0xA scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_601_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3835 = .data:0x00000020; // type:object size:0xC scope:local @3836 = .data:0x0000002C; // type:object size:0xC scope:local @3837 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_rgate/symbols.txt b/config/GZ2E01/rels/d_a_obj_rgate/symbols.txt index 1ab375754e..a46e9b9292 100644 --- a/config/GZ2E01/rels/d_a_obj_rgate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rgate/symbols.txt @@ -82,7 +82,8 @@ l_cyl_src = .rodata:0x00000018; // type:object size:0x44 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_602_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @4797 = .data:0x00000024; // type:object size:0xC scope:local @4798 = .data:0x00000030; // type:object size:0xC scope:local @@ -98,4 +99,4 @@ __vt__8cM3dGCyl = .data:0x000000F0; // type:object size:0xC scope:global __vt__12daObjRgate_c = .data:0x000000FC; // type:object size:0x28 scope:global l_evName$4049 = .bss:0x00000000; // type:object size:0x4 scope:local init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x00000005; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000005; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_riverrock/splits.txt b/config/GZ2E01/rels/d_a_obj_riverrock/splits.txt index ecd6bae4b0..5ee30642ca 100644 --- a/config/GZ2E01/rels/d_a_obj_riverrock/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_riverrock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_riverrock.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_riverrock/symbols.txt b/config/GZ2E01/rels/d_a_obj_riverrock/symbols.txt index 7c6ec090d9..753fc3b818 100644 --- a/config/GZ2E01/rels/d_a_obj_riverrock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_riverrock/symbols.txt @@ -70,6 +70,6 @@ __vt__8cM3dGAab = .data:0x00000060; // type:object size:0xC scope:global __vt__16daObjRIVERROCK_c = .data:0x0000006C; // type:object size:0x28 scope:global __vt__20daObjRIVERROCK_HIO_c = .data:0x00000094; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_603_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3626 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_rope_bridge/symbols.txt b/config/GZ2E01/rels/d_a_obj_rope_bridge/symbols.txt index 04d88e4f0e..c7cf71b1f5 100644 --- a/config/GZ2E01/rels/d_a_obj_rope_bridge/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rope_bridge/symbols.txt @@ -69,7 +69,8 @@ l_rope_cullbox = .rodata:0x00000048; // type:object size:0x18 scope:global align ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_110_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_ropeArcName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte l_rope_offsetL = .data:0x0000002C; // type:object size:0x18 scope:global @@ -98,4 +99,4 @@ __vt__8cM3dGSph = .data:0x00000240; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x0000024C; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x00000258; // type:object size:0x14 scope:global __vt__14daObjRBridge_c = .data:0x0000026C; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_rotBridge/splits.txt b/config/GZ2E01/rels/d_a_obj_rotBridge/splits.txt index ca839421bc..fb53325064 100644 --- a/config/GZ2E01/rels/d_a_obj_rotBridge/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_rotBridge/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rotBridge.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_rotTrap/splits.txt b/config/GZ2E01/rels/d_a_obj_rotTrap/splits.txt index 22f0c2ec29..bb3bd8b87b 100644 --- a/config/GZ2E01/rels/d_a_obj_rotTrap/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_rotTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rotTrap.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_rotTrap/symbols.txt b/config/GZ2E01/rels/d_a_obj_rotTrap/symbols.txt index 19f842b5db..5ef2d7bec9 100644 --- a/config/GZ2E01/rels/d_a_obj_rotTrap/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rotTrap/symbols.txt @@ -48,7 +48,8 @@ mCcDObjInfo__11daRotTrap_c = .rodata:0x00000004; // type:object size:0x30 scope: ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_606_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daRotTrap_c = .data:0x00000020; // type:object size:0x44 scope:global atPos = .data:0x00000064; // type:object size:0xA8 scope:global atR = .data:0x0000010C; // type:object size:0x38 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_rstair/symbols.txt b/config/GZ2E01/rels/d_a_obj_rstair/symbols.txt index 41115de13f..fd51298fcc 100644 --- a/config/GZ2E01/rels/d_a_obj_rstair/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rstair/symbols.txt @@ -42,7 +42,8 @@ l_target_angleY = .rodata:0x00000010; // type:object size:0x10 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_608_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte l_water_check_offset = .data:0x00000024; // type:object size:0xC scope:local @3811 = .data:0x00000030; // type:object size:0xC scope:local @@ -57,5 +58,5 @@ daObjRotStair_METHODS = .data:0x000000C0; // type:object size:0x20 scope:local g_profile_Obj_RotStair = .data:0x000000E0; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000110; // type:object size:0xC scope:global __vt__15daObjRotStair_c = .data:0x0000011C; // type:object size:0x28 scope:global -lbl_608_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte -lbl_608_bss_1 = .bss:0x00000001; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_rw/splits.txt b/config/GZ2E01/rels/d_a_obj_rw/splits.txt index 512cc1b3b7..35df00ee56 100644 --- a/config/GZ2E01/rels/d_a_obj_rw/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_rw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rw.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_rw/symbols.txt b/config/GZ2E01/rels/d_a_obj_rw/symbols.txt index 8b1229d7c2..8cbf2eb9a2 100644 --- a/config/GZ2E01/rels/d_a_obj_rw/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_rw/symbols.txt @@ -60,6 +60,6 @@ __vt__8cM3dGAab = .data:0x00000100; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x0000010C; // type:object size:0xC scope:global __vt__14daOBJ_RW_HIO_c = .data:0x00000118; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_sWallShutter/splits.txt b/config/GZ2E01/rels/d_a_obj_sWallShutter/splits.txt index 954037f834..ebdb2c2f98 100644 --- a/config/GZ2E01/rels/d_a_obj_sWallShutter/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_sWallShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sWallShutter.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_sWallShutter/symbols.txt b/config/GZ2E01/rels/d_a_obj_sWallShutter/symbols.txt index e051b1b9a3..8e25afd18e 100644 --- a/config/GZ2E01/rels/d_a_obj_sWallShutter/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_sWallShutter/symbols.txt @@ -48,7 +48,8 @@ l_dzbIdx = .rodata:0x00000028; // type:object size:0x8 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_111_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x8 scope:global @3746 = .data:0x00000028; // type:object size:0xC scope:local @3747 = .data:0x00000034; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_saidan/splits.txt b/config/GZ2E01/rels/d_a_obj_saidan/splits.txt index e2d85e7f2b..29bfc7d674 100644 --- a/config/GZ2E01/rels/d_a_obj_saidan/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_saidan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_saidan.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_saidan/symbols.txt b/config/GZ2E01/rels/d_a_obj_saidan/symbols.txt index 727a8cfe60..e8edbe0233 100644 --- a/config/GZ2E01/rels/d_a_obj_saidan/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_saidan/symbols.txt @@ -39,7 +39,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_610_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3718 = .data:0x00000020; // type:object size:0xC scope:local @3719 = .data:0x0000002C; // type:object size:0xC scope:local @3720 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_scannon/symbols.txt b/config/GZ2E01/rels/d_a_obj_scannon/symbols.txt index cca49d14f5..16dba36b15 100644 --- a/config/GZ2E01/rels/d_a_obj_scannon/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_scannon/symbols.txt @@ -84,7 +84,8 @@ s_demoTable__11daSCannon_c = .rodata:0x0000003C; // type:object size:0x30 scope: ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_613_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName_Comp = .data:0x00000020; // type:object size:0x4 scope:global l_arcName_Crash = .data:0x00000024; // type:object size:0x4 scope:global l_arcName_Zev = .data:0x00000028; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_obj_scannon_crs/symbols.txt b/config/GZ2E01/rels/d_a_obj_scannon_crs/symbols.txt index 7f42524809..9be19a1cbf 100644 --- a/config/GZ2E01/rels/d_a_obj_scannon_crs/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_scannon_crs/symbols.txt @@ -63,7 +63,8 @@ MIDNA_BEAM_OFFSET$4360 = .rodata:0x00000080; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_614_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_obj_scannon_ten/symbols.txt b/config/GZ2E01/rels/d_a_obj_scannon_ten/symbols.txt index d496487486..bd96b7f374 100644 --- a/config/GZ2E01/rels/d_a_obj_scannon_ten/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_scannon_ten/symbols.txt @@ -72,7 +72,8 @@ PARTICLE_NAME$4297 = .rodata:0x00000040; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_615_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_obj_sekidoor/splits.txt b/config/GZ2E01/rels/d_a_obj_sekidoor/splits.txt index 540e8a3867..561aaf3ff7 100644 --- a/config/GZ2E01/rels/d_a_obj_sekidoor/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_sekidoor/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekidoor.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_sekidoor/symbols.txt b/config/GZ2E01/rels/d_a_obj_sekidoor/symbols.txt index 641ed1e750..0523d5a30c 100644 --- a/config/GZ2E01/rels/d_a_obj_sekidoor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_sekidoor/symbols.txt @@ -37,7 +37,8 @@ id$4006 = .rodata:0x00000020; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_616_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global l_dzbData = .data:0x00000028; // type:object size:0x8 scope:global l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_sekizo/splits.txt b/config/GZ2E01/rels/d_a_obj_sekizo/splits.txt index 8e5032b6ec..cb711953d2 100644 --- a/config/GZ2E01/rels/d_a_obj_sekizo/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_sekizo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekizo.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_sekizo/symbols.txt b/config/GZ2E01/rels/d_a_obj_sekizo/symbols.txt index d39a03eb98..6a10ccaada 100644 --- a/config/GZ2E01/rels/d_a_obj_sekizo/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_sekizo/symbols.txt @@ -25,7 +25,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_617_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global l_dzbData = .data:0x00000028; // type:object size:0x8 scope:global l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_sekizoa/splits.txt b/config/GZ2E01/rels/d_a_obj_sekizoa/splits.txt index 9b3d30fcbd..6e652aa808 100644 --- a/config/GZ2E01/rels/d_a_obj_sekizoa/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_sekizoa/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekizoa.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_sekizoa/symbols.txt b/config/GZ2E01/rels/d_a_obj_sekizoa/symbols.txt index 11f2d720e6..a690ced928 100644 --- a/config/GZ2E01/rels/d_a_obj_sekizoa/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_sekizoa/symbols.txt @@ -154,7 +154,8 @@ heapSize$4093 = .rodata:0x0000009C; // type:object size:0x20 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_618_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x48 scope:global l_evtList = .data:0x00000068; // type:object size:0x50 scope:global data:4byte l_resNameList = .data:0x000000B8; // type:object size:0xC scope:global diff --git a/config/GZ2E01/rels/d_a_obj_shield/symbols.txt b/config/GZ2E01/rels/d_a_obj_shield/symbols.txt index 53dcf466f7..9bef48a30a 100644 --- a/config/GZ2E01/rels/d_a_obj_shield/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_shield/symbols.txt @@ -67,7 +67,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_619_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4189 = .data:0x00000020; // type:object size:0xC scope:local @4190 = .data:0x0000002C; // type:object size:0xC scope:local @4191 = .data:0x00000038; // type:object size:0xC scope:local @@ -88,5 +89,5 @@ __vt__8cM3dGAab = .data:0x00000160; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000016C; // type:object size:0x24 scope:global __vt__14daItemShield_c = .data:0x00000190; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001D4; // type:object size:0xC scope:global -lbl_619_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte -lbl_619_bss_1 = .bss:0x00000001; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_smallkey/symbols.txt b/config/GZ2E01/rels/d_a_obj_smallkey/symbols.txt index 60aa409d3b..af9c1794d8 100644 --- a/config/GZ2E01/rels/d_a_obj_smallkey/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_smallkey/symbols.txt @@ -81,7 +81,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_621_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4652 = .data:0x00000020; // type:object size:0xC scope:local @4653 = .data:0x0000002C; // type:object size:0xC scope:local @4654 = .data:0x00000038; // type:object size:0xC scope:local @@ -102,4 +103,4 @@ __vt__8cM3dGAab = .data:0x00000184; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000190; // type:object size:0x24 scope:global __vt__7daKey_c = .data:0x000001B4; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001F8; // type:object size:0xC scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_smgdoor/symbols.txt b/config/GZ2E01/rels/d_a_obj_smgdoor/symbols.txt index 40ac5fd5f9..e4a30d1076 100644 --- a/config/GZ2E01/rels/d_a_obj_smgdoor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_smgdoor/symbols.txt @@ -61,4 +61,4 @@ l_func$3923 = .data:0x00000094; // type:object size:0x24 scope:local daObjSmgDoor_METHODS = .data:0x000000B8; // type:object size:0x20 scope:global g_profile_Obj_SmgDoor = .data:0x000000D8; // type:object size:0x30 scope:global __vt__14daObjSmgDoor_c = .data:0x00000108; // type:object size:0x28 scope:global -init$1847 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1847 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_smtile/splits.txt b/config/GZ2E01/rels/d_a_obj_smtile/splits.txt index 0d2f9be9c3..5d1eb3043a 100644 --- a/config/GZ2E01/rels/d_a_obj_smtile/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_smtile/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_smtile.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_snowEffTag/splits.txt b/config/GZ2E01/rels/d_a_obj_snowEffTag/splits.txt index f429528250..b52be28dd5 100644 --- a/config/GZ2E01/rels/d_a_obj_snowEffTag/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_snowEffTag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_snowEffTag.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_so/splits.txt b/config/GZ2E01/rels/d_a_obj_so/splits.txt index 866abd824a..73d7243a3f 100644 --- a/config/GZ2E01/rels/d_a_obj_so/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_so/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_so.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_so/symbols.txt b/config/GZ2E01/rels/d_a_obj_so/symbols.txt index b45ea51f55..980a06e3b2 100644 --- a/config/GZ2E01/rels/d_a_obj_so/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_so/symbols.txt @@ -141,6 +141,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000B4; // type:object size:0x24 scope:global __vt__14dBgS_ObjGndChk = .data:0x000000D8; // type:object size:0x30 scope:global __vt__14daObj_So_HIO_c = .data:0x00000108; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_628_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3774 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_obj_spinLift/splits.txt b/config/GZ2E01/rels/d_a_obj_spinLift/splits.txt index 4e398c4423..8dddbc306e 100644 --- a/config/GZ2E01/rels/d_a_obj_spinLift/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_spinLift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_spinLift.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_spinLift/symbols.txt b/config/GZ2E01/rels/d_a_obj_spinLift/symbols.txt index e6ef9cf494..742a89a2f6 100644 --- a/config/GZ2E01/rels/d_a_obj_spinLift/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_spinLift/symbols.txt @@ -61,4 +61,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3631 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -init$1678 = .bss:0x00000024; // type:object size:0x1 data:byte +init$1678 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_ss_drink/symbols.txt b/config/GZ2E01/rels/d_a_obj_ss_drink/symbols.txt index 4fcb3535ec..564eb04975 100644 --- a/config/GZ2E01/rels/d_a_obj_ss_drink/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ss_drink/symbols.txt @@ -67,7 +67,8 @@ mCcDObjInfo__15daObj_SSDrink_c = .rodata:0x00000000; // type:object size:0x30 sc ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_630_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resFileName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_bmdName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte mCcDCyl__15daObj_SSDrink_c = .data:0x00000028; // type:object size:0x44 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_stairBlock/splits.txt b/config/GZ2E01/rels/d_a_obj_stairBlock/splits.txt index 7f0ca5486d..0a98b4691c 100644 --- a/config/GZ2E01/rels/d_a_obj_stairBlock/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_stairBlock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stairBlock.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_stick/splits.txt b/config/GZ2E01/rels/d_a_obj_stick/splits.txt index 75e845f3f0..8d108c032c 100644 --- a/config/GZ2E01/rels/d_a_obj_stick/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_stick/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stick.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_stone/symbols.txt b/config/GZ2E01/rels/d_a_obj_stone/symbols.txt index 0217fd117f..c485683901 100644 --- a/config/GZ2E01/rels/d_a_obj_stone/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_stone/symbols.txt @@ -114,7 +114,8 @@ l_carry_eff_id$5307 = .rodata:0x00000180; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_633_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:local @4015 = .data:0x00000028; // type:object size:0xC scope:local @4016 = .data:0x00000034; // type:object size:0xC scope:local @@ -134,4 +135,4 @@ __vt__8cM3dGSph = .data:0x00000174; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000180; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000018C; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001B0; // type:object size:0xC scope:global -lbl_633_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_stopper/splits.txt b/config/GZ2E01/rels/d_a_obj_stopper/splits.txt index 439634cbe9..5d445edd08 100644 --- a/config/GZ2E01/rels/d_a_obj_stopper/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_stopper/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stopper.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_stopper/symbols.txt b/config/GZ2E01/rels/d_a_obj_stopper/symbols.txt index 733ca766ee..f26c6bb968 100644 --- a/config/GZ2E01/rels/d_a_obj_stopper/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_stopper/symbols.txt @@ -73,7 +73,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_634_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3843 = .data:0x00000020; // type:object size:0xC scope:local @3844 = .data:0x0000002C; // type:object size:0xC scope:local @3845 = .data:0x00000038; // type:object size:0xC scope:local @@ -112,8 +113,9 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3627 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte l_offset$3626 = .bss:0x00000058; // type:object size:0xC scope:local -init$0000 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000068; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000006C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000070; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_stopper2/symbols.txt b/config/GZ2E01/rels/d_a_obj_stopper2/symbols.txt index bc78527162..fb53cdc87d 100644 --- a/config/GZ2E01/rels/d_a_obj_stopper2/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_stopper2/symbols.txt @@ -39,7 +39,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_635_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x10 scope:global l_staffName = .data:0x00000034; // type:object size:0x4 scope:global data:4byte @@ -51,4 +52,4 @@ l_func$3768 = .data:0x00000068; // type:object size:0x30 scope:local action_table$3859 = .data:0x00000098; // type:object size:0xC scope:local l_daObjStopper2_Method = .data:0x000000A4; // type:object size:0x20 scope:global g_profile_Obj_Stopper2 = .data:0x000000C4; // type:object size:0x30 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_swBallA/symbols.txt b/config/GZ2E01/rels/d_a_obj_swBallA/symbols.txt index 2f88812263..6b28dd457d 100644 --- a/config/GZ2E01/rels/d_a_obj_swBallA/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swBallA/symbols.txt @@ -43,7 +43,8 @@ l_color = .rodata:0x00000000; // type:object size:0x4 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_638_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3956 = .data:0x00000024; // type:object size:0xC scope:local @3957 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_swBallB/symbols.txt b/config/GZ2E01/rels/d_a_obj_swBallB/symbols.txt index 8c721372f6..dd68bf1a94 100644 --- a/config/GZ2E01/rels/d_a_obj_swBallB/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swBallB/symbols.txt @@ -45,7 +45,8 @@ l_event_bitB = .rodata:0x00000010; // type:object size:0xC scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_639_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @4007 = .data:0x00000024; // type:object size:0xC scope:local @4008 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_swBallC/symbols.txt b/config/GZ2E01/rels/d_a_obj_swBallC/symbols.txt index f961a68e9c..d2096a75a9 100644 --- a/config/GZ2E01/rels/d_a_obj_swBallC/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swBallC/symbols.txt @@ -49,7 +49,8 @@ l_color = .rodata:0x00000000; // type:object size:0x4 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_640_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte @@ -64,4 +65,4 @@ action_table$3966 = .data:0x0000008C; // type:object size:0x34 scope:local l_daObjSwBallC_Method = .data:0x00000128; // type:object size:0x20 scope:global g_profile_Obj_SwBallC = .data:0x00000148; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000178; // type:object size:0xC scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_swhang/symbols.txt b/config/GZ2E01/rels/d_a_obj_swhang/symbols.txt index 8059a56259..cc32bbcb5c 100644 --- a/config/GZ2E01/rels/d_a_obj_swhang/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swhang/symbols.txt @@ -61,7 +61,8 @@ l_heap_size = .rodata:0x00000050; // type:object size:0x14 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_643_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x14 scope:global l_pull_jnt = .data:0x00000034; // type:object size:0x14 scope:global l_hang_offset = .data:0x00000048; // type:object size:0x3C scope:global @@ -78,4 +79,4 @@ __vt__8cM3dGSph = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__17dEvLib_callback_c = .data:0x000001B4; // type:object size:0x18 scope:global __vt__13daObjSwHang_c = .data:0x000001CC; // type:object size:0x48 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_sword/symbols.txt b/config/GZ2E01/rels/d_a_obj_sword/symbols.txt index b40ad5b297..b6e7016a48 100644 --- a/config/GZ2E01/rels/d_a_obj_sword/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_sword/symbols.txt @@ -30,7 +30,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_644_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global align:4 data:float @3900 = .data:0x00000038; // type:object size:0xC scope:local @3901 = .data:0x00000044; // type:object size:0xC scope:local @@ -45,4 +46,4 @@ __vt__12daObjSword_c = .data:0x000000F4; // type:object size:0x44 scope:global __vt__8cM3dGCyl = .data:0x00000138; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000150; // type:object size:0x24 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_swpush/splits.txt b/config/GZ2E01/rels/d_a_obj_swpush/splits.txt index 53f6db86bf..0fa179e99c 100644 --- a/config/GZ2E01/rels/d_a_obj_swpush/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_swpush/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swpush.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_swpush/symbols.txt b/config/GZ2E01/rels/d_a_obj_swpush/symbols.txt index adec071440..cb1496a4d6 100644 --- a/config/GZ2E01/rels/d_a_obj_swpush/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swpush/symbols.txt @@ -78,7 +78,8 @@ tri_id$3921 = .rodata:0x00000124; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_21_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double M_arcname__Q211daObjSwpush5Act_c = .data:0x00000020; // type:object size:0xC scope:global @4518 = .data:0x0000002C; // type:object size:0xC scope:local @4519 = .data:0x00000038; // type:object size:0xC scope:local @@ -114,12 +115,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3915 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x00000058; // type:object size:0xC scope:local @3919 = .bss:0x00000064; // type:object size:0xC scope:local @3920 = .bss:0x00000070; // type:object size:0xC scope:local no_push_vec$3914 = .bss:0x0000007C; // type:object size:0x30 scope:local init$0000 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_swpush2/symbols.txt b/config/GZ2E01/rels/d_a_obj_swpush2/symbols.txt index aa0953599d..a75ba0052f 100644 --- a/config/GZ2E01/rels/d_a_obj_swpush2/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swpush2/symbols.txt @@ -72,7 +72,8 @@ M_attr__Q212daObjSwpush25Act_c = .rodata:0x0000000C; // type:object size:0xE0 sc ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_645_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4336 = .data:0x00000020; // type:object size:0xC scope:local @4337 = .data:0x0000002C; // type:object size:0xC scope:local @4338 = .data:0x00000038; // type:object size:0xC scope:local @@ -87,5 +88,5 @@ mode_proc$4343 = .data:0x000000C8; // type:object size:0x30 scope:local Mthd_Table__Q212daObjSwpush229@unnamed@d_a_obj_swpush2_cpp@ = .data:0x000000F8; // type:object size:0x20 scope:global g_profile_Obj_Swpush2 = .data:0x00000118; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000148; // type:object size:0xC scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 -init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_swpush5/splits.txt b/config/GZ2E01/rels/d_a_obj_swpush5/splits.txt index 7e9bde187b..a87bc61af8 100644 --- a/config/GZ2E01/rels/d_a_obj_swpush5/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_swpush5/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swpush5.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_swpush5/symbols.txt b/config/GZ2E01/rels/d_a_obj_swpush5/symbols.txt index 9f8473382a..d9d9505f77 100644 --- a/config/GZ2E01/rels/d_a_obj_swpush5/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swpush5/symbols.txt @@ -58,7 +58,8 @@ l_dzbIdx = .rodata:0x00000000; // type:object size:0x8 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_115_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3907 = .data:0x00000024; // type:object size:0xC scope:local @3908 = .data:0x00000030; // type:object size:0xC scope:local @@ -94,12 +95,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3654 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local @3657 = .bss:0x00000058; // type:object size:0xC scope:local @3658 = .bss:0x00000064; // type:object size:0xC scope:local @3659 = .bss:0x00000070; // type:object size:0xC scope:local l_push_check_pos$3653 = .bss:0x0000007C; // type:object size:0x30 scope:local -init$0000 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte -init$0000 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_swturn/symbols.txt b/config/GZ2E01/rels/d_a_obj_swturn/symbols.txt index 2f166db17a..be168321e9 100644 --- a/config/GZ2E01/rels/d_a_obj_swturn/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_swturn/symbols.txt @@ -42,7 +42,8 @@ l_tame_time_cnt = .rodata:0x00000020; // type:object size:0x2 scope:local data:s ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_647_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:local @3813 = .data:0x00000028; // type:object size:0xC scope:local @3814 = .data:0x00000034; // type:object size:0xC scope:local @@ -50,4 +51,4 @@ l_func$3812 = .data:0x00000040; // type:object size:0x18 scope:local daObjSwTurn_METHODS = .data:0x00000058; // type:object size:0x20 scope:local g_profile_Obj_SwTurn = .data:0x00000078; // type:object size:0x30 scope:global __vt__13daObjSwTurn_c = .data:0x000000A8; // type:object size:0x28 scope:global -lbl_647_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_syRock/splits.txt b/config/GZ2E01/rels/d_a_obj_syRock/splits.txt index 98115bf46b..25c9737f3f 100644 --- a/config/GZ2E01/rels/d_a_obj_syRock/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_syRock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_syRock.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_syRock/symbols.txt b/config/GZ2E01/rels/d_a_obj_syRock/symbols.txt index e594d06dcb..8c145bcb77 100644 --- a/config/GZ2E01/rels/d_a_obj_syRock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_syRock/symbols.txt @@ -85,7 +85,8 @@ mCcDObjInfo__10daSyRock_c = .rodata:0x00000028; // type:object size:0x30 scope:g ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_648_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daSyRock_c = .data:0x00000020; // type:object size:0x44 scope:global @3922 = .data:0x00000064; // type:object size:0xC scope:local @3923 = .data:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_taFence/splits.txt b/config/GZ2E01/rels/d_a_obj_taFence/splits.txt index 9100cabbfd..fb142af441 100644 --- a/config/GZ2E01/rels/d_a_obj_taFence/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_taFence/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_taFence.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_taFence/symbols.txt b/config/GZ2E01/rels/d_a_obj_taFence/symbols.txt index b68863616a..32ea092875 100644 --- a/config/GZ2E01/rels/d_a_obj_taFence/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_taFence/symbols.txt @@ -63,7 +63,8 @@ l_check_area = .rodata:0x00000064; // type:object size:0x30 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_650_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daTaFence_c = .data:0x00000020; // type:object size:0x44 scope:global @3870 = .data:0x00000064; // type:object size:0xC scope:local @3871 = .data:0x00000070; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_takaraDai/splits.txt b/config/GZ2E01/rels/d_a_obj_takaraDai/splits.txt index c34759ac2b..0495e417cb 100644 --- a/config/GZ2E01/rels/d_a_obj_takaraDai/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_takaraDai/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_takaraDai.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_ten/splits.txt b/config/GZ2E01/rels/d_a_obj_ten/splits.txt index 2df8d2c33b..a8d1a89795 100644 --- a/config/GZ2E01/rels/d_a_obj_ten/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_ten/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ten.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_ten/symbols.txt b/config/GZ2E01/rels/d_a_obj_ten/symbols.txt index fcdde94fff..c7180f4387 100644 --- a/config/GZ2E01/rels/d_a_obj_ten/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_ten/symbols.txt @@ -96,6 +96,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_TenHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -data_80D0BAB8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_thdoor/symbols.txt b/config/GZ2E01/rels/d_a_obj_thdoor/symbols.txt index b3c2f5c6f7..7fb63b61e4 100644 --- a/config/GZ2E01/rels/d_a_obj_thdoor/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_thdoor/symbols.txt @@ -65,4 +65,4 @@ __vt__10dCcD_GStts = .data:0x00000138; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x00000150; // type:object size:0xC scope:global __vt__13daObjThDoor_c = .data:0x0000015C; // type:object size:0x28 scope:global -init$1622 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$1622 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_timeFire/splits.txt b/config/GZ2E01/rels/d_a_obj_timeFire/splits.txt index 209705648c..d62d887178 100644 --- a/config/GZ2E01/rels/d_a_obj_timeFire/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_timeFire/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_timeFire.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_timer/symbols.txt b/config/GZ2E01/rels/d_a_obj_timer/symbols.txt index d46b9e5ac9..3c0e1a2158 100644 --- a/config/GZ2E01/rels/d_a_obj_timer/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_timer/symbols.txt @@ -21,7 +21,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_22_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3726 = .data:0x00000020; // type:object size:0xC scope:local @3727 = .data:0x0000002C; // type:object size:0xC scope:local mode_proc$3725 = .data:0x00000038; // type:object size:0x18 scope:local diff --git a/config/GZ2E01/rels/d_a_obj_tks/splits.txt b/config/GZ2E01/rels/d_a_obj_tks/splits.txt index 44d257f0e5..1029e9ea60 100644 --- a/config/GZ2E01/rels/d_a_obj_tks/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_tks/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tks.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_tks/symbols.txt b/config/GZ2E01/rels/d_a_obj_tks/symbols.txt index 8162b14fec..0ae332bbae 100644 --- a/config/GZ2E01/rels/d_a_obj_tks/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_tks/symbols.txt @@ -118,7 +118,8 @@ m_cameraItemNum$4211 = .rodata:0x00000080; // type:object size:0x4 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_660_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x30 scope:global l_btpGetParamList = .data:0x00000050; // type:object size:0x8 scope:global l_btkGetParamList = .data:0x00000058; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2E01/rels/d_a_obj_toby/splits.txt b/config/GZ2E01/rels/d_a_obj_toby/splits.txt index 001ef71e37..811b4206de 100644 --- a/config/GZ2E01/rels/d_a_obj_toby/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_toby/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_toby.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_toby/symbols.txt b/config/GZ2E01/rels/d_a_obj_toby/symbols.txt index 8a40ef99ad..07bff19a25 100644 --- a/config/GZ2E01/rels/d_a_obj_toby/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_toby/symbols.txt @@ -98,16 +98,16 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3801 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float hz_check_pos_z = .bss:0x00000064; // type:object size:0x4 scope:local align:4 data:float @3946 = .bss:0x00000068; // type:object size:0xC scope:local -init$3947 = .bss:0x00000074; // type:object size:0x1 scope:local +init$3947 = .bss:0x00000074; // type:object size:0x1 scope:local align:1 data:byte sc$3945 = .bss:0x00000078; // type:object size:0xC scope:local @4167 = .bss:0x00000084; // type:object size:0xC scope:local -init$4168 = .bss:0x00000090; // type:object size:0x1 scope:local +init$4168 = .bss:0x00000090; // type:object size:0x1 scope:local align:1 data:byte sc$4166 = .bss:0x00000094; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A4; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_tobyhouse/splits.txt b/config/GZ2E01/rels/d_a_obj_tobyhouse/splits.txt index dadb6ac0d5..a544cc1029 100644 --- a/config/GZ2E01/rels/d_a_obj_tobyhouse/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_tobyhouse/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tobyhouse.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_tobyhouse/symbols.txt b/config/GZ2E01/rels/d_a_obj_tobyhouse/symbols.txt index 82e9d1efcb..da1311f185 100644 --- a/config/GZ2E01/rels/d_a_obj_tobyhouse/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_tobyhouse/symbols.txt @@ -90,7 +90,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$1832 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +init$1832 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4351 = .bss:0x00000048; // type:object size:0xC scope:local l_shotSmokeScale$4350 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_togeTrap/splits.txt b/config/GZ2E01/rels/d_a_obj_togeTrap/splits.txt index de025bfe8e..1abacdd127 100644 --- a/config/GZ2E01/rels/d_a_obj_togeTrap/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_togeTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_togeTrap.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_togeTrap/symbols.txt b/config/GZ2E01/rels/d_a_obj_togeTrap/symbols.txt index 007fae8716..dc18142a4b 100644 --- a/config/GZ2E01/rels/d_a_obj_togeTrap/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_togeTrap/symbols.txt @@ -59,7 +59,8 @@ mCcDObjInfo__12daTogeTrap_c = .rodata:0x00000014; // type:object size:0x30 scope ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_665_data_10 = .data:0x00000010; // type:object size:0x10 scope:local +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daTogeTrap_c = .data:0x00000020; // type:object size:0x44 scope:global @3883 = .data:0x00000064; // type:object size:0xC scope:local @3884 = .data:0x00000070; // type:object size:0xC scope:local @@ -79,4 +80,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000184; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:local align:4 data:float -init$1675 = .bss:0x00000034; // type:object size:0x1 scope:local data:byte +init$1675 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_tombo/splits.txt b/config/GZ2E01/rels/d_a_obj_tombo/splits.txt index 94e308ea4c..328d05f7a0 100644 --- a/config/GZ2E01/rels/d_a_obj_tombo/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_tombo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tombo.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt b/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt index f90429ab44..437b88320e 100644 --- a/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_tombo/symbols.txt @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float diff --git a/config/GZ2E01/rels/d_a_obj_tp/symbols.txt b/config/GZ2E01/rels/d_a_obj_tp/symbols.txt index 484cc4570e..6179d6e519 100644 --- a/config/GZ2E01/rels/d_a_obj_tp/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_tp/symbols.txt @@ -45,7 +45,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_669_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4263 = .data:0x00000020; // type:object size:0x20 scope:local bmd$4283 = .data:0x00000040; // type:object size:0x8 scope:local brk$4284 = .data:0x00000048; // type:object size:0x8 scope:local diff --git a/config/GZ2E01/rels/d_a_obj_treesh/splits.txt b/config/GZ2E01/rels/d_a_obj_treesh/splits.txt index 7114495ecf..dfdb10d330 100644 --- a/config/GZ2E01/rels/d_a_obj_treesh/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_treesh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_treesh.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_twGate/splits.txt b/config/GZ2E01/rels/d_a_obj_twGate/splits.txt index f12d5051ef..e1861ecbfd 100644 --- a/config/GZ2E01/rels/d_a_obj_twGate/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_twGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_twGate.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_volcball/symbols.txt b/config/GZ2E01/rels/d_a_obj_volcball/symbols.txt index 0e59010226..1848acb05f 100644 --- a/config/GZ2E01/rels/d_a_obj_volcball/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_volcball/symbols.txt @@ -90,7 +90,8 @@ l_fall_effect_id$4173 = .rodata:0x0000007C; // type:object size:0x8 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_675_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_param = .data:0x00000024; // type:object size:0xA8 scope:global @3929 = .data:0x000000CC; // type:object size:0xC scope:local @@ -111,4 +112,4 @@ __vt__12dBgS_ObjAcch = .data:0x0000021C; // type:object size:0x24 scope:global __vt__8cM3dGAab = .data:0x00000240; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x0000024C; // type:object size:0xC scope:global __vt__17dEvLib_callback_c = .data:0x00000258; // type:object size:0x18 scope:global -init$1953 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$1953 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_volcbom/symbols.txt b/config/GZ2E01/rels/d_a_obj_volcbom/symbols.txt index 1ed74a9263..b43f1a91f3 100644 --- a/config/GZ2E01/rels/d_a_obj_volcbom/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_volcbom/symbols.txt @@ -95,7 +95,8 @@ l_effect_id$4032 = .rodata:0x00000054; // type:object size:0xE scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_676_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:local l_staff_name = .data:0x00000028; // type:object size:0x4 scope:local data:4byte @@ -123,5 +124,5 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global __vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global -init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte -init$2146 = .bss:0x00000001; // type:object size:0x1 scope:local data:byte +init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$2146 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_warp_kbrg/symbols.txt b/config/GZ2E01/rels/d_a_obj_warp_kbrg/symbols.txt index e1904d4f9d..c0cdeb667b 100644 --- a/config/GZ2E01/rels/d_a_obj_warp_kbrg/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_warp_kbrg/symbols.txt @@ -81,7 +81,8 @@ l_midna_wait_offset = .rodata:0x00000054; // type:object size:0xC scope:global a ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_677_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_evArcName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte l_portal_warp_name = .data:0x0000002C; // type:object size:0x8 scope:global @@ -105,4 +106,4 @@ daObjWarpKBrg_METHODS = .data:0x00000194; // type:object size:0x20 scope:global g_profile_Obj_KakarikoBrg = .data:0x000001B4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000001E4; // type:object size:0xC scope:global __vt__15daObjWarpKBrg_c = .data:0x000001F0; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_warp_obrg/symbols.txt b/config/GZ2E01/rels/d_a_obj_warp_obrg/symbols.txt index c13a57bd7d..eb807a9701 100644 --- a/config/GZ2E01/rels/d_a_obj_warp_obrg/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_warp_obrg/symbols.txt @@ -62,7 +62,8 @@ l_midna_wait_offset = .rodata:0x00000040; // type:object size:0xC scope:global a ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_678_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_portal_warp_name = .data:0x00000024; // type:object size:0x8 scope:global l_staff_name = .data:0x0000002C; // type:object size:0x8 scope:global @@ -79,4 +80,4 @@ daObjWarpOBrg_METHODS = .data:0x000000EC; // type:object size:0x20 scope:global g_profile_Obj_OrdinBrg = .data:0x0000010C; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x0000013C; // type:object size:0xC scope:global __vt__15daObjWarpOBrg_c = .data:0x00000148; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_waterGate/splits.txt b/config/GZ2E01/rels/d_a_obj_waterGate/splits.txt index eaa5cc3564..4c25b796bc 100644 --- a/config/GZ2E01/rels/d_a_obj_waterGate/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_waterGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_waterGate.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_waterGate/symbols.txt b/config/GZ2E01/rels/d_a_obj_waterGate/symbols.txt index 0f22c9598c..3136149814 100644 --- a/config/GZ2E01/rels/d_a_obj_waterGate/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_waterGate/symbols.txt @@ -41,7 +41,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_679_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3728 = .data:0x00000020; // type:object size:0xC scope:local @3729 = .data:0x0000002C; // type:object size:0xC scope:local @3730 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_waterPillar/splits.txt b/config/GZ2E01/rels/d_a_obj_waterPillar/splits.txt index dc39edf04a..f393d68cbc 100644 --- a/config/GZ2E01/rels/d_a_obj_waterPillar/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_waterPillar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_waterPillar.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_waterPillar/symbols.txt b/config/GZ2E01/rels/d_a_obj_waterPillar/symbols.txt index fa5a5f02a7..ff46abbb10 100644 --- a/config/GZ2E01/rels/d_a_obj_waterPillar/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_waterPillar/symbols.txt @@ -97,7 +97,8 @@ mCcDObjCoInfo__12daWtPillar_c = .rodata:0x00000050; // type:object size:0x30 sco ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_680_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global mCcDCps__12daWtPillar_c = .data:0x00000038; // type:object size:0x4C scope:global mCcDCyl__12daWtPillar_c = .data:0x00000084; // type:object size:0x44 scope:global diff --git a/config/GZ2E01/rels/d_a_obj_wdStick/splits.txt b/config/GZ2E01/rels/d_a_obj_wdStick/splits.txt index 9b0de2fc3d..a1be6e322b 100644 --- a/config/GZ2E01/rels/d_a_obj_wdStick/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_wdStick/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_wdStick.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_wdStick/symbols.txt b/config/GZ2E01/rels/d_a_obj_wdStick/symbols.txt index 57f173dcd8..0fa3904b46 100644 --- a/config/GZ2E01/rels/d_a_obj_wdStick/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_wdStick/symbols.txt @@ -96,7 +96,8 @@ mCcDObjInfo__11daWdStick_c = .rodata:0x00000000; // type:object size:0x30 scope: ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_683_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__11daWdStick_c = .data:0x00000020; // type:object size:0x40 scope:global @4470 = .data:0x00000060; // type:object size:0xC scope:local @4471 = .data:0x0000006C; // type:object size:0xC scope:local @@ -120,4 +121,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:local data:2byte -lbl_683_bss_20 = .bss:0x00000020; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_web0/splits.txt b/config/GZ2E01/rels/d_a_obj_web0/splits.txt index 9a26cfe380..c8a5052714 100644 --- a/config/GZ2E01/rels/d_a_obj_web0/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_web0/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_web0.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_web0/symbols.txt b/config/GZ2E01/rels/d_a_obj_web0/symbols.txt index 6b37e0c92d..54e81d608c 100644 --- a/config/GZ2E01/rels/d_a_obj_web0/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_web0/symbols.txt @@ -41,6 +41,6 @@ __vt__8cM3dGAab = .data:0x0000009C; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A8; // type:object size:0xC scope:global __vt__16daObj_Web0_HIO_c = .data:0x000000B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_web1/splits.txt b/config/GZ2E01/rels/d_a_obj_web1/splits.txt index bcd1efd14d..dcf156365f 100644 --- a/config/GZ2E01/rels/d_a_obj_web1/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_web1/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_web1.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_web1/symbols.txt b/config/GZ2E01/rels/d_a_obj_web1/symbols.txt index cde5972d11..b69a2e19bb 100644 --- a/config/GZ2E01/rels/d_a_obj_web1/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_web1/symbols.txt @@ -51,6 +51,6 @@ __vt__8cM3dGAab = .data:0x000000A0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000AC; // type:object size:0xC scope:global __vt__16daObj_Web1_HIO_c = .data:0x000000B8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_obj_well_cover/symbols.txt b/config/GZ2E01/rels/d_a_obj_well_cover/symbols.txt index 41fb200107..61384ffa4d 100644 --- a/config/GZ2E01/rels/d_a_obj_well_cover/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_well_cover/symbols.txt @@ -33,7 +33,8 @@ particle_id$3806 = .rodata:0x00000028; // type:object size:0x6 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_686_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3731 = .data:0x00000024; // type:object size:0xC scope:local @3732 = .data:0x00000030; // type:object size:0xC scope:local @@ -41,4 +42,4 @@ l_func$3730 = .data:0x0000003C; // type:object size:0x18 scope:local l_daObjWCover_Method = .data:0x00000054; // type:object size:0x20 scope:global g_profile_Obj_WellCover = .data:0x00000074; // type:object size:0x30 scope:global __vt__13daObjWCover_c = .data:0x000000A4; // type:object size:0x28 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_wood_statue/symbols.txt b/config/GZ2E01/rels/d_a_obj_wood_statue/symbols.txt index 3ecc026a57..c3aebe47c3 100644 --- a/config/GZ2E01/rels/d_a_obj_wood_statue/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_wood_statue/symbols.txt @@ -75,7 +75,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_691_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte l_eventName = .data:0x00000024; // type:object size:0x4 scope:local data:4byte action_table$4273 = .data:0x00000028; // type:object size:0x10 scope:local @@ -96,4 +97,4 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__14daObjWStatue_c = .data:0x00000184; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001C8; // type:object size:0xC scope:global -init$2078 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$2078 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_yel_bag/splits.txt b/config/GZ2E01/rels/d_a_obj_yel_bag/splits.txt index b346ff5bf5..b3de7d6524 100644 --- a/config/GZ2E01/rels/d_a_obj_yel_bag/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_yel_bag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_yel_bag.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_yel_bag/symbols.txt b/config/GZ2E01/rels/d_a_obj_yel_bag/symbols.txt index a01bbf7938..0f17b9d144 100644 --- a/config/GZ2E01/rels/d_a_obj_yel_bag/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_yel_bag/symbols.txt @@ -81,7 +81,8 @@ m__18daObj_YBag_Param_c = .rodata:0x00000030; // type:object size:0x2C scope:glo ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_693_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:local data:4byte l_loadRes_YBAG0 = .data:0x00000028; // type:object size:0xC scope:local l_loadRes_list = .data:0x00000034; // type:object size:0x8 scope:local diff --git a/config/GZ2E01/rels/d_a_obj_yobikusa/symbols.txt b/config/GZ2E01/rels/d_a_obj_yobikusa/symbols.txt index 5c34216a40..d2a0e14e4b 100644 --- a/config/GZ2E01/rels/d_a_obj_yobikusa/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_yobikusa/symbols.txt @@ -55,7 +55,8 @@ ccCylSrc$3880 = .rodata:0x00000064; // type:object size:0x44 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_116_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName1 = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_arcName2 = .data:0x00000024; // type:object size:0x4 scope:global data:4byte @3641 = .data:0x00000028; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_obj_zrTurara/splits.txt b/config/GZ2E01/rels/d_a_obj_zrTurara/splits.txt index ad9e149c7a..61516da5d9 100644 --- a/config/GZ2E01/rels/d_a_obj_zrTurara/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_zrTurara/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zrTurara.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_zrTurara/symbols.txt b/config/GZ2E01/rels/d_a_obj_zrTurara/symbols.txt index 570732f0a5..8e811eb29e 100644 --- a/config/GZ2E01/rels/d_a_obj_zrTurara/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_zrTurara/symbols.txt @@ -63,4 +63,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000160; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3651 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:byte -init$1683 = .bss:0x00000020; // type:object size:0x1 data:byte +init$1683 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_zrTuraraRock/splits.txt b/config/GZ2E01/rels/d_a_obj_zrTuraraRock/splits.txt index ee108a21c3..135f45df92 100644 --- a/config/GZ2E01/rels/d_a_obj_zrTuraraRock/splits.txt +++ b/config/GZ2E01/rels/d_a_obj_zrTuraraRock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zrTuraraRock.cpp: diff --git a/config/GZ2E01/rels/d_a_obj_zrTuraraRock/symbols.txt b/config/GZ2E01/rels/d_a_obj_zrTuraraRock/symbols.txt index 360119b63b..6ddd25e442 100644 --- a/config/GZ2E01/rels/d_a_obj_zrTuraraRock/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_zrTuraraRock/symbols.txt @@ -56,7 +56,8 @@ mCcDObjInfo__12daZrTuraRc_c = .rodata:0x00000014; // type:object size:0x30 scope ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_698_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__12daZrTuraRc_c = .data:0x00000020; // type:object size:0x40 scope:global @3871 = .data:0x00000060; // type:object size:0xC scope:local @3872 = .data:0x0000006C; // type:object size:0xC scope:local @@ -74,4 +75,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000014C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:global align:4 data:float -init$1850 = .bss:0x00000034; // type:object size:0x1 data:byte +init$1850 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_obj_zraMark/symbols.txt b/config/GZ2E01/rels/d_a_obj_zraMark/symbols.txt index 490464f01e..686096b256 100644 --- a/config/GZ2E01/rels/d_a_obj_zraMark/symbols.txt +++ b/config/GZ2E01/rels/d_a_obj_zraMark/symbols.txt @@ -76,4 +76,4 @@ __vt__18daNpcF_ActorMngr_c = .data:0x00000058; // type:object size:0xC scope:glo __vt__8cM3dGCyl = .data:0x00000064; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000070; // type:object size:0xC scope:global roottype$4501 = .bss:0x00000000; // type:object size:0x4 scope:local -init$2350 = .bss:0x00000004; // type:object size:0x1 data:byte +init$2350 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_peru/splits.txt b/config/GZ2E01/rels/d_a_peru/splits.txt index 1714f683e7..71725d20e9 100644 --- a/config/GZ2E01/rels/d_a_peru/splits.txt +++ b/config/GZ2E01/rels/d_a_peru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_peru.cpp: diff --git a/config/GZ2E01/rels/d_a_peru/symbols.txt b/config/GZ2E01/rels/d_a_peru/symbols.txt index ecf60f88c3..834048b2bd 100644 --- a/config/GZ2E01/rels/d_a_peru/symbols.txt +++ b/config/GZ2E01/rels/d_a_peru/symbols.txt @@ -167,7 +167,8 @@ m__14daPeru_Param_c = .rodata:0x00000000; // type:object size:0x98 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_703_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2E01/rels/d_a_ppolamp/symbols.txt b/config/GZ2E01/rels/d_a_ppolamp/symbols.txt index 65e95cbb01..999840bd88 100644 --- a/config/GZ2E01/rels/d_a_ppolamp/symbols.txt +++ b/config/GZ2E01/rels/d_a_ppolamp/symbols.txt @@ -55,9 +55,9 @@ __vt__11daPPolamp_c = .data:0x00000060; // type:object size:0xC scope:global @1012 = .bss:0x00000034; // type:object size:0x1 scope:local @1010 = .bss:0x00000038; // type:object size:0x1 scope:local @1009 = .bss:0x0000003C; // type:object size:0x1 scope:local -init$1515 = .bss:0x0000003D; // type:object size:0x1 scope:local +init$1515 = .bss:0x0000003D; // type:object size:0x1 scope:local align:1 data:byte TEV_COLOR_1$3795 = .bss:0x00000040; // type:object size:0x8 scope:local -init$1520 = .bss:0x00000049; // type:object size:0x1 scope:local +init$1520 = .bss:0x00000049; // type:object size:0x1 scope:local align:1 data:byte TEV_COLOR_2$3800 = .bss:0x0000004C; // type:object size:0x8 scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000054; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000058; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_scene_exit2/symbols.txt b/config/GZ2E01/rels/d_a_scene_exit2/symbols.txt index 1ad1eac76a..3ecbdbc0e0 100644 --- a/config/GZ2E01/rels/d_a_scene_exit2/symbols.txt +++ b/config/GZ2E01/rels/d_a_scene_exit2/symbols.txt @@ -32,7 +32,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_117_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte @3699 = .data:0x00000028; // type:object size:0xC scope:local @@ -43,4 +44,4 @@ l_func$3698 = .data:0x00000058; // type:object size:0x30 scope:local action_table$3745 = .data:0x00000088; // type:object size:0xC scope:local l_daScExit_Method = .data:0x00000094; // type:object size:0x20 scope:global g_profile_SCENE_EXIT2 = .data:0x000000B4; // type:object size:0x30 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_spinner/splits.txt b/config/GZ2E01/rels/d_a_spinner/splits.txt index 6daada460c..428e044482 100644 --- a/config/GZ2E01/rels/d_a_spinner/splits.txt +++ b/config/GZ2E01/rels/d_a_spinner/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_spinner.cpp: diff --git a/config/GZ2E01/rels/d_a_spinner/symbols.txt b/config/GZ2E01/rels/d_a_spinner/symbols.txt index 7ac12c3804..65209762ca 100644 --- a/config/GZ2E01/rels/d_a_spinner/symbols.txt +++ b/config/GZ2E01/rels/d_a_spinner/symbols.txt @@ -42,7 +42,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3768 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3768 = .rodata:0x00000000; // type:object size:0xC scope:local @4168 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @4241 = .rodata:0x00000010; // type:object size:0x4 scope:local @4242 = .rodata:0x00000014; // type:object size:0x4 scope:local data:string @@ -120,8 +120,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte effDirection$4433 = .bss:0x00000048; // type:object size:0xC scope:local @4437 = .bss:0x00000054; // type:object size:0xC scope:local +init$0001 = .bss:0x00000060; // type:object size:0x1 scope:local align:1 data:byte particleScale$4436 = .bss:0x00000064; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000070; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000074; // type:object size:0x4 scope:global diff --git a/config/GZ2E01/rels/d_a_sq/splits.txt b/config/GZ2E01/rels/d_a_sq/splits.txt index 88422c0ac5..5d9a75a943 100644 --- a/config/GZ2E01/rels/d_a_sq/splits.txt +++ b/config/GZ2E01/rels/d_a_sq/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_sq.cpp: diff --git a/config/GZ2E01/rels/d_a_sq/symbols.txt b/config/GZ2E01/rels/d_a_sq/symbols.txt index a77a9fd5d4..475085d670 100644 --- a/config/GZ2E01/rels/d_a_sq/symbols.txt +++ b/config/GZ2E01/rels/d_a_sq/symbols.txt @@ -78,6 +78,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000104; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000128; // type:object size:0xC scope:global __vt__10daSq_HIO_c = .data:0x00000134; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x30 scope:global data:byte diff --git a/config/GZ2E01/rels/d_a_swBall/symbols.txt b/config/GZ2E01/rels/d_a_swBall/symbols.txt index 428926fec5..86bd6915a4 100644 --- a/config/GZ2E01/rels/d_a_swBall/symbols.txt +++ b/config/GZ2E01/rels/d_a_swBall/symbols.txt @@ -27,7 +27,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_707_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3847 = .data:0x00000020; // type:object size:0xC scope:local @3848 = .data:0x0000002C; // type:object size:0xC scope:local l_func$3846 = .data:0x00000038; // type:object size:0x18 scope:local diff --git a/config/GZ2E01/rels/d_a_swLBall/symbols.txt b/config/GZ2E01/rels/d_a_swLBall/symbols.txt index 06b88f20c8..b2db90297b 100644 --- a/config/GZ2E01/rels/d_a_swLBall/symbols.txt +++ b/config/GZ2E01/rels/d_a_swLBall/symbols.txt @@ -28,7 +28,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_708_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3835 = .data:0x00000020; // type:object size:0xC scope:local @3836 = .data:0x0000002C; // type:object size:0xC scope:local @3837 = .data:0x00000038; // type:object size:0xC scope:local @@ -37,4 +38,4 @@ l_daSwLBall_Method = .data:0x00000068; // type:object size:0x20 scope:local g_profile_SwLBall = .data:0x00000088; // type:object size:0x30 scope:global l_target_info = .bss:0x00000000; // type:object size:0x8 scope:local l_target_info_count = .bss:0x00000008; // type:object size:0x4 scope:local data:4byte -lbl_708_bss_C = .bss:0x0000000C; // type:object size:0x1 scope:local data:byte +init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_swc00/symbols.txt b/config/GZ2E01/rels/d_a_swc00/symbols.txt index 545f2ea6e3..22827ca1b5 100644 --- a/config/GZ2E01/rels/d_a_swc00/symbols.txt +++ b/config/GZ2E01/rels/d_a_swc00/symbols.txt @@ -25,7 +25,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_120_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3812 = .data:0x00000020; // type:object size:0x40 scope:local @3820 = .data:0x00000060; // type:object size:0xC scope:local @3821 = .data:0x0000006C; // type:object size:0xC scope:local @@ -35,4 +36,4 @@ l_func$3819 = .data:0x00000090; // type:object size:0x30 scope:local @3996 = .data:0x000000C0; // type:object size:0x40 scope:local l_daSwc00_Method = .data:0x00000100; // type:object size:0x20 scope:global g_profile_SWC00 = .data:0x00000120; // type:object size:0x30 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_tag_CstaSw/splits.txt b/config/GZ2E01/rels/d_a_tag_CstaSw/splits.txt index cc92263021..fab27d3113 100644 --- a/config/GZ2E01/rels/d_a_tag_CstaSw/splits.txt +++ b/config/GZ2E01/rels/d_a_tag_CstaSw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_CstaSw.cpp: diff --git a/config/GZ2E01/rels/d_a_tag_TWgate/symbols.txt b/config/GZ2E01/rels/d_a_tag_TWgate/symbols.txt index 0128bc5b6c..e3bf2fe545 100644 --- a/config/GZ2E01/rels/d_a_tag_TWgate/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_TWgate/symbols.txt @@ -57,7 +57,8 @@ l_zevParamTbl = .rodata:0x00000004; // type:object size:0x70 scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_713_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_myName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte @3744 = .data:0x00000024; // type:object size:0xC scope:local @3745 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_tag_csw/symbols.txt b/config/GZ2E01/rels/d_a_tag_csw/symbols.txt index 4d351e5f0e..011897da2d 100644 --- a/config/GZ2E01/rels/d_a_tag_csw/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_csw/symbols.txt @@ -50,7 +50,8 @@ l_dbz_idx = .rodata:0x00000010; // type:object size:0x8 scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_718_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000024; // type:object size:0x44 scope:global l_tg_src = .data:0x00000068; // type:object size:0x44 scope:global diff --git a/config/GZ2E01/rels/d_a_tag_evtmsg/symbols.txt b/config/GZ2E01/rels/d_a_tag_evtmsg/symbols.txt index edcabf4735..8d1f8008d9 100644 --- a/config/GZ2E01/rels/d_a_tag_evtmsg/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_evtmsg/symbols.txt @@ -29,7 +29,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_33_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mEvtCutNameList__14daTag_EvtMsg_c = .data:0x00000020; // type:object size:0xC scope:global @3802 = .data:0x0000002C; // type:object size:0xC scope:local @3803 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_tag_firewall/symbols.txt b/config/GZ2E01/rels/d_a_tag_firewall/symbols.txt index 60644395e6..b86d848408 100644 --- a/config/GZ2E01/rels/d_a_tag_firewall/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_firewall/symbols.txt @@ -34,4 +34,4 @@ g_profile_Tag_FWall = .data:0x00000068; // type:object size:0x30 scope:global __vt__8cM3dGAab = .data:0x00000098; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x000000A4; // type:object size:0xC scope:global fire_leader = .bss:0x00000000; // type:object size:0x4 scope:global -init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte +fire_num = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_tag_hstop/splits.txt b/config/GZ2E01/rels/d_a_tag_hstop/splits.txt index cbd78c8d11..701b189842 100644 --- a/config/GZ2E01/rels/d_a_tag_hstop/splits.txt +++ b/config/GZ2E01/rels/d_a_tag_hstop/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_hstop.cpp: diff --git a/config/GZ2E01/rels/d_a_tag_lantern/splits.txt b/config/GZ2E01/rels/d_a_tag_lantern/splits.txt index 2a71e6d3db..7af2bf0b37 100644 --- a/config/GZ2E01/rels/d_a_tag_lantern/splits.txt +++ b/config/GZ2E01/rels/d_a_tag_lantern/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_lantern.cpp: diff --git a/config/GZ2E01/rels/d_a_tag_lv2prchk/symbols.txt b/config/GZ2E01/rels/d_a_tag_lv2prchk/symbols.txt index 39ac12522f..b56b0d22ef 100644 --- a/config/GZ2E01/rels/d_a_tag_lv2prchk/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_lv2prchk/symbols.txt @@ -19,10 +19,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_128_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3667 = .data:0x00000020; // type:object size:0xC scope:local @3668 = .data:0x0000002C; // type:object size:0xC scope:local l_func$3666 = .data:0x00000038; // type:object size:0x18 scope:local l_daTagLv2PrChk_Method = .data:0x00000050; // type:object size:0x20 scope:global g_profile_Tag_Lv2PrChk = .data:0x00000070; // type:object size:0x30 scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_tag_lv6CstaSw/splits.txt b/config/GZ2E01/rels/d_a_tag_lv6CstaSw/splits.txt index 00e0980c33..21926072bd 100644 --- a/config/GZ2E01/rels/d_a_tag_lv6CstaSw/splits.txt +++ b/config/GZ2E01/rels/d_a_tag_lv6CstaSw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_lv6CstaSw.cpp: diff --git a/config/GZ2E01/rels/d_a_tag_poFire/splits.txt b/config/GZ2E01/rels/d_a_tag_poFire/splits.txt index d792935823..d468cdd6e9 100644 --- a/config/GZ2E01/rels/d_a_tag_poFire/splits.txt +++ b/config/GZ2E01/rels/d_a_tag_poFire/splits.txt @@ -10,7 +10,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_poFire.cpp: diff --git a/config/GZ2E01/rels/d_a_tag_river_back/symbols.txt b/config/GZ2E01/rels/d_a_tag_river_back/symbols.txt index 54acfc5e55..58c8200336 100644 --- a/config/GZ2E01/rels/d_a_tag_river_back/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_river_back/symbols.txt @@ -25,7 +25,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_736_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte @@ -37,4 +38,4 @@ l_func$3711 = .data:0x0000005C; // type:object size:0x30 scope:local action_table$3769 = .data:0x0000008C; // type:object size:0x8 scope:local l_daTagRiverBack_Method = .data:0x00000094; // type:object size:0x20 scope:global g_profile_Tag_RiverBack = .data:0x000000B4; // type:object size:0x30 scope:global -init$1712 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_tag_statue_evt/symbols.txt b/config/GZ2E01/rels/d_a_tag_statue_evt/symbols.txt index 07074cf75b..5b4cb03b7d 100644 --- a/config/GZ2E01/rels/d_a_tag_statue_evt/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_statue_evt/symbols.txt @@ -46,7 +46,8 @@ l_event_bit = .rodata:0x00000000; // type:object size:0xC scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_133_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_eff_id = .data:0x00000024; // type:object size:0x6 scope:global l_eventName = .data:0x0000002C; // type:object size:0x18 scope:global @@ -63,4 +64,4 @@ l_statue_ang$3944 = .data:0x00000128; // type:object size:0xC scope:local l_daTagStatue_Method = .data:0x00000134; // type:object size:0x20 scope:global g_profile_Tag_Statue = .data:0x00000154; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_tag_waterfall/splits.txt b/config/GZ2E01/rels/d_a_tag_waterfall/splits.txt index 5b17cf97a0..b3d0072010 100644 --- a/config/GZ2E01/rels/d_a_tag_waterfall/splits.txt +++ b/config/GZ2E01/rels/d_a_tag_waterfall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_waterfall.cpp: diff --git a/config/GZ2E01/rels/d_a_tag_waterfall/symbols.txt b/config/GZ2E01/rels/d_a_tag_waterfall/symbols.txt index 8142d9f829..1f47cdf10a 100644 --- a/config/GZ2E01/rels/d_a_tag_waterfall/symbols.txt +++ b/config/GZ2E01/rels/d_a_tag_waterfall/symbols.txt @@ -34,6 +34,6 @@ l_daTagWaterFall_Method = .data:0x00000004; // type:object size:0x20 scope:local g_profile_Tag_WaterFall = .data:0x00000024; // type:object size:0x30 scope:global __vt__20daTagWaterFall_HIO_c = .data:0x00000054; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_751_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +masterWaterfallTagExists = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3753 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:local data:byte diff --git a/config/GZ2E01/rels/d_a_tbox/splits.txt b/config/GZ2E01/rels/d_a_tbox/splits.txt index fd0c1fb717..78c5420e61 100644 --- a/config/GZ2E01/rels/d_a_tbox/splits.txt +++ b/config/GZ2E01/rels/d_a_tbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tbox.cpp: diff --git a/config/GZ2E01/rels/d_a_tbox/symbols.txt b/config/GZ2E01/rels/d_a_tbox/symbols.txt index cbedcda2bf..54a738b96b 100644 --- a/config/GZ2E01/rels/d_a_tbox/symbols.txt +++ b/config/GZ2E01/rels/d_a_tbox/symbols.txt @@ -141,7 +141,8 @@ eff_id$4956 = .rodata:0x00000128; // type:object size:0xC scope:local ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_41_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_staff_name = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000024; // type:object size:0x44 scope:global l_modelInfo = .data:0x00000068; // type:object size:0x54 scope:global diff --git a/config/GZ2E01/rels/d_a_tbox2/symbols.txt b/config/GZ2E01/rels/d_a_tbox2/symbols.txt index 4642a379df..a12e4d18fa 100644 --- a/config/GZ2E01/rels/d_a_tbox2/symbols.txt +++ b/config/GZ2E01/rels/d_a_tbox2/symbols.txt @@ -57,7 +57,8 @@ l_cyl_info = .rodata:0x00000020; // type:object size:0x3C scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_42_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_staff_name = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000028; // type:object size:0x44 scope:global @@ -81,5 +82,5 @@ __vt__8cM3dGAab = .data:0x000001B0; // type:object size:0xC scope:global __vt__12daTboxBase_c = .data:0x000001BC; // type:object size:0x2C scope:global __vt__12J3DFrameCtrl = .data:0x000001E8; // type:object size:0xC scope:global __vt__9daTbox2_c = .data:0x000001F4; // type:object size:0x2C scope:global -init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte init$0000 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2E01/rels/d_a_title/splits.txt b/config/GZ2E01/rels/d_a_title/splits.txt index 32c1100f78..9f93927b3a 100644 --- a/config/GZ2E01/rels/d_a_title/splits.txt +++ b/config/GZ2E01/rels/d_a_title/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_title.cpp: diff --git a/config/GZ2E01/rels/d_a_title/symbols.txt b/config/GZ2E01/rels/d_a_title/symbols.txt index deca8571cc..b0d3612329 100644 --- a/config/GZ2E01/rels/d_a_title/symbols.txt +++ b/config/GZ2E01/rels/d_a_title/symbols.txt @@ -52,7 +52,8 @@ l_arcName = .rodata:0x0000000C; // type:object size:0x6 scope:global data:string ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_756_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4031 = .data:0x00000020; // type:object size:0xC scope:local @4032 = .data:0x0000002C; // type:object size:0xC scope:local @4033 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2E01/rels/d_a_ykgr/splits.txt b/config/GZ2E01/rels/d_a_ykgr/splits.txt index 124324536a..1b63dedc27 100644 --- a/config/GZ2E01/rels/d_a_ykgr/splits.txt +++ b/config/GZ2E01/rels/d_a_ykgr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_ykgr.cpp: diff --git a/config/GZ2E01/splits.txt b/config/GZ2E01/splits.txt index 57edd993c1..57e3ef80c8 100644 --- a/config/GZ2E01/splits.txt +++ b/config/GZ2E01/splits.txt @@ -837,7 +837,7 @@ d/actor/d_a_obj_item.cpp: .text start:0x8015DFD8 end:0x8015E010 .ctors start:0x80373828 end:0x8037382C .rodata start:0x80393D88 end:0x80393D98 - .data start:0x803B9DA0 end:0x803BA058 + .data start:0x803B9DA0 end:0x803BA078 .sdata start:0x804506A8 end:0x804506B0 .sbss start:0x80451010 end:0x80451018 .sdata2 start:0x80453550 end:0x804535E0 @@ -845,7 +845,7 @@ d/actor/d_a_obj_item.cpp: d/d_insect.cpp: .text start:0x8015E010 end:0x8015E3F8 .rodata start:0x80393D98 end:0x80393DA8 - .data start:0x803BA058 end:0x803BA088 + .data start:0x803BA078 end:0x803BA088 .sdata2 start:0x804535E0 end:0x80453600 d/actor/d_a_obj_ss_base.cpp: @@ -1895,6 +1895,7 @@ JSystem/JAudio2/JASTrack.cpp: .rodata start:0x8039AFD0 end:0x8039B018 .data start:0x803C5B68 end:0x803C5B90 .bss start:0x804316A8 end:0x80431B18 + .sbss start:0x80451230 end:0x80451238 .sdata2 start:0x804555A0 end:0x804555D8 JSystem/JAudio2/JASTrackPort.cpp: @@ -2445,10 +2446,10 @@ JSystem/JKernel/JKRFileCache.cpp: JSystem/JKernel/JKRArchivePub.cpp: .text start:0x802D5778 end:0x802D6294 + .data start:0x803CC288 end:0x803CC2D8 JSystem/JKernel/JKRArchivePri.cpp: .text start:0x802D6294 end:0x802D69B8 - .data start:0x803CC288 end:0x803CC2D8 .sbss start:0x80451420 end:0x80451428 JSystem/JKernel/JKRMemArchive.cpp: diff --git a/config/GZ2E01/symbols.txt b/config/GZ2E01/symbols.txt index 223a9443a2..6470afbf9d 100644 --- a/config/GZ2E01/symbols.txt +++ b/config/GZ2E01/symbols.txt @@ -1,9 +1,9 @@ -__check_pad3 = .init:0x80003100; // type:function size:0x40 scope:local align:4 -__set_debug_bba = .init:0x80003140; // type:function size:0xC scope:local align:4 -__get_debug_bba = .init:0x8000314C; // type:function size:0x8 scope:local align:4 -__start = .init:0x80003154; // type:function size:0x15C scope:weak align:4 -__init_registers = .init:0x800032B0; // type:function size:0x90 scope:local align:4 -__init_data = .init:0x80003340; // type:function size:0xC0 scope:local align:4 +__check_pad3 = .init:0x80003100; // type:function size:0x40 scope:global align:4 +__set_debug_bba = .init:0x80003140; // type:function size:0xC scope:global align:4 +__get_debug_bba = .init:0x8000314C; // type:function size:0x8 scope:global align:4 +__start = .init:0x80003154; // type:function size:0x15C scope:global align:4 +__init_registers = .init:0x800032B0; // type:function size:0x90 scope:global align:4 +__init_data = .init:0x80003340; // type:function size:0xC0 scope:global align:4 __init_hardware = .init:0x80003400; // type:function size:0x24 scope:global align:4 __flush_cache = .init:0x80003424; // type:function size:0x34 scope:global align:4 memset = .init:0x80003458; // type:function size:0x30 scope:global align:4 @@ -16,11 +16,11 @@ __TRK_reset = .init:0x80005518; // type:function size:0x2C scope:global align:4 gTRKInterruptVectorTableEnd = .init:0x80005518; // type:label scope:global _rom_copy_info = .init:0x80005544; // type:object size:0x84 scope:global data:4byte _bss_init_info = .init:0x800055C8; // type:object size:0x20 scope:global data:4byte -@etb_80005600 = extab:0x80005600; // type:object size:0x8 scope:local hidden -@etb_80005608 = extab:0x80005608; // type:object size:0x8 scope:local hidden -@etb_80005610 = extab:0x80005610; // type:object size:0x18 scope:local hidden -@etb_80005628 = extab:0x80005628; // type:object size:0x8 scope:local hidden -@etb_80005630 = extab:0x80005630; // type:object size:0x18 scope:local hidden +@154 = extab:0x80005600; // type:object size:0x8 scope:local hidden +@159 = extab:0x80005608; // type:object size:0x8 scope:local hidden +@180 = extab:0x80005610; // type:object size:0x18 scope:local hidden +@188 = extab:0x80005628; // type:object size:0x8 scope:local hidden +@211 = extab:0x80005630; // type:object size:0x18 scope:local hidden @206 = extabindex:0x80005660; // type:object size:0xC scope:local @211 = extabindex:0x8000566C; // type:object size:0xC scope:local @232 = extabindex:0x80005678; // type:object size:0xC scope:local @@ -30,13 +30,13 @@ _eti_init_info = extabindex:0x8000569C; // type:object size:0x20 scope:global version_check__Fv = .text:0x800056C0; // type:function size:0x68 scope:global align:4 CheckHeap1__9HeapCheckFv = .text:0x80005728; // type:function size:0x64 scope:global align:4 CheckHeap__FUl = .text:0x8000578C; // type:function size:0xBC scope:global align:4 -countUsed__FP10JKRExpHeap = .text:0x80005848; // type:function size:0x58 scope:global align:4 +countUsed__FP10JKRExpHeap = .text:0x80005848; // type:function size:0x58 scope:local align:4 getUsedCount__9HeapCheckCFv = .text:0x800058A0; // type:function size:0x24 scope:global align:4 heapDisplay__9HeapCheckCFv = .text:0x800058C4; // type:function size:0x214 scope:global align:4 debugDisplay__Fv = .text:0x80005AD8; // type:function size:0x274 scope:global align:4 Debug_console__FUl = .text:0x80005D4C; // type:function size:0x400 scope:global align:4 LOAD_COPYDATE__FPv = .text:0x8000614C; // type:function size:0x7C scope:global align:4 -debug__Fv = .text:0x800061C8; // type:function size:0xC4 scope:global align:4 +debug__Fv = .text:0x800061C8; // type:function size:0xC4 scope:local align:4 main01__Fv = .text:0x8000628C; // type:function size:0x1C8 scope:global align:4 main = .text:0x80006454; // type:function size:0x184 scope:global align:4 dump_sort__7JKRHeapFv = .text:0x800065D8; // type:function size:0x8 scope:global align:4 @@ -44,25 +44,25 @@ __sinit_m_Do_main_cpp = .text:0x800065E0; // type:function size:0x1B8 scope:loca OSSwitchFiberEx__FUlUlUlUlUlUl = .text:0x80006798; // type:function size:0x30 scope:global align:4 my_PutString__FPCc = .text:0x800067C8; // type:function size:0x2C scope:global align:4 OSVAttention__FPCcP16__va_list_struct = .text:0x800067F4; // type:function size:0x20 scope:global align:4 -OSAttention = .text:0x80006814; // type:function size:0x80 scope:global align:4 -OSReportDisable = .text:0x80006894; // type:function size:0xC scope:global align:4 -OSReportEnable = .text:0x800068A0; // type:function size:0xC scope:global align:4 -OSReportForceEnableOn = .text:0x800068AC; // type:function size:0xC scope:global align:4 -OSReportForceEnableOff = .text:0x800068B8; // type:function size:0xC scope:global align:4 +OSAttention = .text:0x80006814; // type:function size:0x80 scope:weak align:4 +OSReportDisable = .text:0x80006894; // type:function size:0xC scope:weak align:4 +OSReportEnable = .text:0x800068A0; // type:function size:0xC scope:weak align:4 +OSReportForceEnableOn = .text:0x800068AC; // type:function size:0xC scope:weak align:4 +OSReportForceEnableOff = .text:0x800068B8; // type:function size:0xC scope:weak align:4 OSReportInit__Fv = .text:0x800068C4; // type:function size:0x18 scope:global align:4 mDoPrintf_vprintf_Interrupt__FPCcP16__va_list_struct = .text:0x800068DC; // type:function size:0x88 scope:global align:4 mDoPrintf_vprintf_Thread__FPCcP16__va_list_struct = .text:0x80006964; // type:function size:0x20 scope:global align:4 mDoPrintf_vprintf__FPCcP16__va_list_struct = .text:0x80006984; // type:function size:0x8C scope:global align:4 mDoPrintf_VReport = .text:0x80006A10; // type:function size:0x8C scope:global align:4 -OSVReport = .text:0x80006A9C; // type:function size:0x20 scope:global align:4 -OSReport = .text:0x80006ABC; // type:function size:0x80 scope:global align:4 -OSReport_FatalError = .text:0x80006B3C; // type:function size:0xD0 scope:global align:4 -OSReport_Error = .text:0x80006C0C; // type:function size:0xE0 scope:global align:4 -OSReport_Warning = .text:0x80006CEC; // type:function size:0xE0 scope:global align:4 -OSReport_System = .text:0x80006DCC; // type:function size:0xB0 scope:global align:4 -OSPanic = .text:0x80006E7C; // type:function size:0x138 scope:global align:4 +OSVReport = .text:0x80006A9C; // type:function size:0x20 scope:weak align:4 +OSReport = .text:0x80006ABC; // type:function size:0x80 scope:weak align:4 +OSReport_FatalError = .text:0x80006B3C; // type:function size:0xD0 scope:weak align:4 +OSReport_Error = .text:0x80006C0C; // type:function size:0xE0 scope:weak align:4 +OSReport_Warning = .text:0x80006CEC; // type:function size:0xE0 scope:weak align:4 +OSReport_System = .text:0x80006DCC; // type:function size:0xB0 scope:weak align:4 +OSPanic = .text:0x80006E7C; // type:function size:0x138 scope:weak align:4 reset__17mDoAud_zelAudio_cFv = .text:0x80006FB4; // type:function size:0xC scope:global align:4 -mDoAud_Create__Fv = .text:0x80006FC0; // type:function size:0x1A4 scope:global align:4 +mDoAud_Create__Fv = .text:0x80006FC0; // type:function size:0x1A4 scope:local align:4 mDoAud_Execute__Fv = .text:0x80007164; // type:function size:0x58 scope:global align:4 mDoAud_setSceneName__FPCcll = .text:0x800071BC; // type:function size:0x3C scope:global align:4 mDoAud_load1stDynamicWave__Fv = .text:0x800071F8; // type:function size:0x2C scope:global align:4 @@ -71,17 +71,17 @@ mDoAud_setFadeInStart__FUc = .text:0x80007254; // type:function size:0x30 scope: mDoAud_resetProcess__Fv = .text:0x80007284; // type:function size:0x40 scope:global align:4 mDoAud_resetRecover__Fv = .text:0x800072C4; // type:function size:0x54 scope:global align:4 __sinit_m_Do_audio_cpp = .text:0x80007318; // type:function size:0x50 scope:local align:4 -__dt__17mDoAud_zelAudio_cFv = .text:0x80007368; // type:function size:0x60 scope:global align:4 -__dt__10Z2AudioMgrFv = .text:0x800073C8; // type:function size:0x470 scope:global align:4 -__dt__14JAISoundHandleFv = .text:0x80007838; // type:function size:0x50 scope:global align:4 -__dt__12Z2MultiSeObjFv = .text:0x80007888; // type:function size:0x54 scope:global align:4 -__dt__16JAISeCategoryMgrFv = .text:0x800078DC; // type:function size:0x78 scope:global align:4 +__dt__17mDoAud_zelAudio_cFv = .text:0x80007368; // type:function size:0x60 scope:weak align:4 +__dt__10Z2AudioMgrFv = .text:0x800073C8; // type:function size:0x470 scope:weak align:4 +__dt__14JAISoundHandleFv = .text:0x80007838; // type:function size:0x50 scope:weak align:4 +__dt__12Z2MultiSeObjFv = .text:0x80007888; // type:function size:0x54 scope:weak align:4 +__dt__16JAISeCategoryMgrFv = .text:0x800078DC; // type:function size:0x78 scope:weak align:4 create__8mDoCPd_cFv = .text:0x80007954; // type:function size:0x140 scope:global align:4 read__8mDoCPd_cFv = .text:0x80007A94; // type:function size:0xE8 scope:global align:4 convert__8mDoCPd_cFP27interface_of_controller_padP10JUTGamePad = .text:0x80007B7C; // type:function size:0x154 scope:global align:4 LRlockCheck__8mDoCPd_cFP27interface_of_controller_pad = .text:0x80007CD0; // type:function size:0xA4 scope:global align:4 recalibrate__8mDoCPd_cFv = .text:0x80007D74; // type:function size:0x28 scope:global align:4 -createTimg__FUsUsUl = .text:0x80007D9C; // type:function size:0xA8 scope:global align:4 +createTimg__FUsUsUl = .text:0x80007D9C; // type:function size:0xA8 scope:local align:4 create__13mDoGph_gInf_cFv = .text:0x80007E44; // type:function size:0x14C scope:global align:4 beginRender__13mDoGph_gInf_cFv = .text:0x80007F90; // type:function size:0x48 scope:global align:4 fadeOut__13mDoGph_gInf_cFfR8_GXColor = .text:0x80007FD8; // type:function size:0x50 scope:global align:4 @@ -93,36 +93,36 @@ darwFilter__F8_GXColor = .text:0x800080F4; // type:function size:0x23C scope:glo calcFade__13mDoGph_gInf_cFv = .text:0x80008330; // type:function size:0xEC scope:global align:4 mDoGph_BlankingON__Fv = .text:0x8000841C; // type:function size:0x4 scope:global align:4 mDoGph_BlankingOFF__Fv = .text:0x80008420; // type:function size:0x4 scope:global align:4 -dScnPly_BeforeOfPaint__Fv = .text:0x80008424; // type:function size:0x2C scope:global align:4 +dScnPly_BeforeOfPaint__Fv = .text:0x80008424; // type:function size:0x2C scope:local align:4 mDoGph_BeforeOfDraw__Fv = .text:0x80008450; // type:function size:0x24 scope:global align:4 mDoGph_AfterOfDraw__Fv = .text:0x80008474; // type:function size:0x1BC scope:global align:4 -drawDepth2__FP10view_classP15view_port_classi = .text:0x80008630; // type:function size:0xB54 scope:global align:4 -__dt__4cXyzFv = .text:0x80009184; // type:function size:0x3C scope:global align:4 -trimming__FP10view_classP15view_port_class = .text:0x800091C0; // type:function size:0x2F4 scope:global align:4 +drawDepth2__FP10view_classP15view_port_classi = .text:0x80008630; // type:function size:0xB54 scope:local align:4 +__dt__4cXyzFv = .text:0x80009184; // type:function size:0x3C scope:weak align:4 +trimming__FP10view_classP15view_port_class = .text:0x800091C0; // type:function size:0x2F4 scope:local align:4 mDoGph_drawFilterQuad__FScSc = .text:0x800094B4; // type:function size:0x90 scope:global align:4 create__Q213mDoGph_gInf_c7bloom_cFv = .text:0x80009544; // type:function size:0xB4 scope:global align:4 remove__Q213mDoGph_gInf_c7bloom_cFv = .text:0x800095F8; // type:function size:0x58 scope:global align:4 draw__Q213mDoGph_gInf_c7bloom_cFv = .text:0x80009650; // type:function size:0xB10 scope:global align:4 -retry_captue_frame__FP10view_classP15view_port_classi = .text:0x8000A160; // type:function size:0x130 scope:global align:4 -motionBlure__FP10view_class = .text:0x8000A290; // type:function size:0x274 scope:global align:4 -setLight__Fv = .text:0x8000A504; // type:function size:0x88 scope:global align:4 -drawItem3D__Fv = .text:0x8000A58C; // type:function size:0x78 scope:global align:4 +retry_captue_frame__FP10view_classP15view_port_classi = .text:0x8000A160; // type:function size:0x130 scope:local align:4 +motionBlure__FP10view_class = .text:0x8000A290; // type:function size:0x274 scope:local align:4 +setLight__Fv = .text:0x8000A504; // type:function size:0x88 scope:local align:4 +drawItem3D__Fv = .text:0x8000A58C; // type:function size:0x78 scope:local align:4 mDoGph_Painter__Fv = .text:0x8000A604; // type:function size:0xB14 scope:global align:4 -__dt__13J2DOrthoGraphFv = .text:0x8000B118; // type:function size:0x5C scope:global align:4 +__dt__13J2DOrthoGraphFv = .text:0x8000B118; // type:function size:0x5C scope:weak align:4 mDoGph_Create__Fv = .text:0x8000B174; // type:function size:0x5C scope:global align:4 __sinit_m_Do_graphic_cpp = .text:0x8000B1D0; // type:function size:0x14 scope:local align:4 -getAtnActorID__9daPy_py_cCFv = .text:0x8000B1E4; // type:function size:0x8 scope:global align:4 -myGetHeapTypeByString__FP7JKRHeap = .text:0x8000B1EC; // type:function size:0x200 scope:global align:4 -myMemoryErrorRoutine__FPvUli = .text:0x8000B3EC; // type:function size:0x1DC scope:global align:4 +getAtnActorID__9daPy_py_cCFv = .text:0x8000B1E4; // type:function size:0x8 scope:weak align:4 +myGetHeapTypeByString__FP7JKRHeap = .text:0x8000B1EC; // type:function size:0x200 scope:local align:4 +myMemoryErrorRoutine__FPvUli = .text:0x8000B3EC; // type:function size:0x1DC scope:local align:4 myHeapCheckRecursive__FP7JKRHeap = .text:0x8000B5C8; // type:function size:0xA0 scope:global align:4 mDoMch_HeapCheckAll__Fv = .text:0x8000B668; // type:function size:0x24 scope:global align:4 -developKeyCheck__FUlUl = .text:0x8000B68C; // type:function size:0xB0 scope:global align:4 +developKeyCheck__FUlUl = .text:0x8000B68C; // type:function size:0xB0 scope:local align:4 mDoMch_IsProgressiveMode__Fv = .text:0x8000B73C; // type:function size:0x2C scope:global align:4 exceptionReadPad__FPUlPUl = .text:0x8000B768; // type:function size:0x30 scope:global align:4 exceptionRestart__Fv = .text:0x8000B798; // type:function size:0x30 scope:global align:4 myExceptionCallback__FUsP9OSContextUlUl = .text:0x8000B7C8; // type:function size:0x194 scope:global align:4 -fault_callback_scroll__FUsP9OSContextUlUl = .text:0x8000B95C; // type:function size:0x398 scope:global align:4 -my_PrintHeap__FPCcUl = .text:0x8000BCF4; // type:function size:0x4 scope:global align:4 +fault_callback_scroll__FUsP9OSContextUlUl = .text:0x8000B95C; // type:function size:0x398 scope:local align:4 +my_PrintHeap__FPCcUl = .text:0x8000BCF4; // type:function size:0x4 scope:local align:4 my_SysPrintHeap__FPCcPvUl = .text:0x8000BCF8; // type:function size:0x4C scope:global align:4 mDoMch_Create__Fv = .text:0x8000BD44; // type:function size:0x388 scope:global align:4 mDoMtx_XYZrotS__FPA4_fsss = .text:0x8000C0CC; // type:function size:0x98 scope:global align:4 @@ -155,8 +155,8 @@ ZXYrotS__14mDoMtx_stack_cFRC5csXyz = .text:0x8000CF0C; // type:function size:0x3 ZXYrotM__14mDoMtx_stack_cFRC5csXyz = .text:0x8000CF44; // type:function size:0x38 scope:global align:4 quatM__14mDoMtx_stack_cFPC10Quaternion = .text:0x8000CF7C; // type:function size:0x3C scope:global align:4 __sinit_m_Do_mtx_cpp = .text:0x8000CFB8; // type:function size:0x7C scope:local align:4 -__dt__18mDoMtx_quatStack_cFv = .text:0x8000D034; // type:function size:0x3C scope:global align:4 -__dt__14mDoMtx_stack_cFv = .text:0x8000D070; // type:function size:0x3C scope:global align:4 +__dt__18mDoMtx_quatStack_cFv = .text:0x8000D034; // type:function size:0x3C scope:weak align:4 +__dt__14mDoMtx_stack_cFv = .text:0x8000D070; // type:function size:0x3C scope:weak align:4 mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs = .text:0x8000D0AC; // type:function size:0x274 scope:global align:4 initPlay__14mDoExt_baseAnmFsifss = .text:0x8000D320; // type:function size:0x108 scope:global align:4 play__14mDoExt_baseAnmFv = .text:0x8000D428; // type:function size:0x54 scope:global align:4 @@ -387,16 +387,16 @@ setup__14mDoLib_clipperFffff = .text:0x8001528C; // type:function size:0x84 scop mDoLib_project__FP3VecP3Vec = .text:0x80015310; // type:function size:0x1DC scope:global align:4 mDoLib_pos2camera__FP3VecP3Vec = .text:0x800154EC; // type:function size:0x58 scope:global align:4 __sinit_m_Do_lib_cpp = .text:0x80015544; // type:function size:0x4C scope:local align:4 -__dt__11J3DUClipperFv = .text:0x80015590; // type:function size:0x48 scope:global align:4 -my_OSCancelAlarmAll__Fv = .text:0x800155D8; // type:function size:0x4 scope:global align:4 -destroyVideo__Fv = .text:0x800155DC; // type:function size:0x38 scope:global align:4 +__dt__11J3DUClipperFv = .text:0x80015590; // type:function size:0x48 scope:weak align:4 +my_OSCancelAlarmAll__Fv = .text:0x800155D8; // type:function size:0x4 scope:local align:4 +destroyVideo__Fv = .text:0x800155DC; // type:function size:0x38 scope:local align:4 mDoRst_reset__FiUli = .text:0x80015614; // type:function size:0x138 scope:global align:4 mDoRst_resetCallBack__FiPv = .text:0x8001574C; // type:function size:0xA8 scope:global align:4 -getResetData__6mDoRstFv = .text:0x800157F4; // type:function size:0x8 scope:global align:4 +getResetData__6mDoRstFv = .text:0x800157F4; // type:function size:0x8 scope:weak align:4 main__9mDoDvdThdFPv = .text:0x800157FC; // type:function size:0x5C scope:global align:4 create__9mDoDvdThdFl = .text:0x80015858; // type:function size:0x5C scope:global align:4 suspend__9mDoDvdThdFv = .text:0x800158B4; // type:function size:0x28 scope:global align:4 -my_DVDConvertPathToEntrynum__FPCc = .text:0x800158DC; // type:function size:0x20 scope:global align:4 +my_DVDConvertPathToEntrynum__FPCc = .text:0x800158DC; // type:function size:0x20 scope:local align:4 __dt__19mDoDvdThd_command_cFv = .text:0x800158FC; // type:function size:0x48 scope:global align:4 __ct__17mDoDvdThd_param_cFv = .text:0x80015944; // type:function size:0x48 scope:global align:4 kick__17mDoDvdThd_param_cFv = .text:0x8001598C; // type:function size:0x28 scope:global align:4 @@ -404,7 +404,7 @@ waitForKick__17mDoDvdThd_param_cFv = .text:0x800159B4; // type:function size:0x2 getFirstCommand__17mDoDvdThd_param_cFv = .text:0x800159DC; // type:function size:0x8 scope:global align:4 addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c = .text:0x800159E4; // type:function size:0x58 scope:global align:4 cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c = .text:0x80015A3C; // type:function size:0x54 scope:global align:4 -cb__FPv = .text:0x80015A90; // type:function size:0x48 scope:global align:4 +cb__FPv = .text:0x80015A90; // type:function size:0x48 scope:local align:4 mainLoop__17mDoDvdThd_param_cFv = .text:0x80015AD8; // type:function size:0x9C scope:global align:4 __ct__19mDoDvdThd_command_cFv = .text:0x80015B74; // type:function size:0x44 scope:global align:4 __dt__20mDoDvdThd_callback_cFv = .text:0x80015BB8; // type:function size:0x60 scope:global align:4 @@ -426,8 +426,8 @@ execute__21mDoDvdThd_toMainRam_cFv = .text:0x800164BC; // type:function size:0xB __sinit_m_Do_dvd_thread_cpp = .text:0x80016574; // type:function size:0x28 scope:local align:4 mDoDvdErr_ThdInit__Fv = .text:0x8001659C; // type:function size:0xC0 scope:global align:4 mDoDvdErr_ThdCleanup__Fv = .text:0x8001665C; // type:function size:0x48 scope:global align:4 -mDoDvdErr_Watch__FPv = .text:0x800166A4; // type:function size:0x60 scope:global align:4 -AlarmHandler__FP7OSAlarmP9OSContext = .text:0x80016704; // type:function size:0x28 scope:global align:4 +mDoDvdErr_Watch__FPv = .text:0x800166A4; // type:function size:0x60 scope:local align:4 +AlarmHandler__FP7OSAlarmP9OSContext = .text:0x80016704; // type:function size:0x28 scope:local align:4 __ct__15mDoMemCd_Ctrl_cFv = .text:0x8001672C; // type:function size:0x4 scope:global align:4 ThdInit__15mDoMemCd_Ctrl_cFv = .text:0x80016730; // type:function size:0xA0 scope:global align:4 main__15mDoMemCd_Ctrl_cFv = .text:0x800167D0; // type:function size:0xC4 scope:global align:4 @@ -449,15 +449,15 @@ mount__15mDoMemCd_Ctrl_cFv = .text:0x80017148; // type:function size:0x12C scope loadfile__15mDoMemCd_Ctrl_cFv = .text:0x80017274; // type:function size:0x60 scope:global align:4 checkspace__15mDoMemCd_Ctrl_cFv = .text:0x800172D4; // type:function size:0x8C scope:global align:4 setCardState__15mDoMemCd_Ctrl_cFl = .text:0x80017360; // type:function size:0xBC scope:global align:4 -mDoMemCd_main__FPv = .text:0x8001741C; // type:function size:0x54 scope:global align:4 +mDoMemCd_main__FPv = .text:0x8001741C; // type:function size:0x54 scope:local align:4 __sinit_m_Do_MemCard_cpp = .text:0x80017470; // type:function size:0x28 scope:local align:4 mDoMemCdRWm_Store__FP12CARDFileInfoPvUl = .text:0x80017498; // type:function size:0x204 scope:global align:4 mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl = .text:0x8001769C; // type:function size:0x1E0 scope:global align:4 -mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData = .text:0x8001787C; // type:function size:0x168 scope:global align:4 -mDoMemCdRWm_SetCardStat__FP12CARDFileInfo = .text:0x800179E4; // type:function size:0x168 scope:global align:4 -mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo = .text:0x80017B4C; // type:function size:0x128 scope:global align:4 -mDoMemCdRWm_CalcCheckSum__FPvUl = .text:0x80017C74; // type:function size:0x40 scope:global align:4 -mDoMemCdRWm_CalcCheckSumGameData__FPvUl = .text:0x80017CB4; // type:function size:0x38 scope:global align:4 +mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData = .text:0x8001787C; // type:function size:0x168 scope:local align:4 +mDoMemCdRWm_SetCardStat__FP12CARDFileInfo = .text:0x800179E4; // type:function size:0x168 scope:local align:4 +mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo = .text:0x80017B4C; // type:function size:0x128 scope:local align:4 +mDoMemCdRWm_CalcCheckSum__FPvUl = .text:0x80017C74; // type:function size:0x40 scope:local align:4 +mDoMemCdRWm_CalcCheckSumGameData__FPvUl = .text:0x80017CB4; // type:function size:0x38 scope:local align:4 mDoMemCdRWm_TestCheckSumGameData__FPv = .text:0x80017CEC; // type:function size:0x4C scope:global align:4 mDoMemCdRWm_SetCheckSumGameData__FPUcUc = .text:0x80017D38; // type:function size:0x44 scope:global align:4 print_f__FPCce = .text:0x80017D7C; // type:function size:0x8C scope:global align:4 @@ -470,15 +470,15 @@ exception_addition__FP10JUTConsole = .text:0x8001814C; // type:function size:0x3 execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle = .text:0x8001817C; // type:function size:0x128 scope:global align:4 draw__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle = .text:0x800182A4; // type:function size:0x4 scope:global align:4 cDmrNowMidnaTalk__Fv = .text:0x800182A8; // type:function size:0x80 scope:global align:4 -__dt__24JPTraceParticleCallBack4Fv = .text:0x80018328; // type:function size:0x60 scope:global align:4 +__dt__24JPTraceParticleCallBack4Fv = .text:0x80018328; // type:function size:0x60 scope:weak align:4 __sinit_c_damagereaction_cpp = .text:0x80018388; // type:function size:0x4C scope:local align:4 -execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x800183D4; // type:function size:0x4 scope:global align:4 -draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x800183D8; // type:function size:0x4 scope:global align:4 +execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x800183D4; // type:function size:0x4 scope:weak align:4 +draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x800183D8; // type:function size:0x4 scope:weak align:4 cCc_Init__Fv = .text:0x800183DC; // type:function size:0x168 scope:global align:4 cDyl_IsLinked__Fs = .text:0x80018544; // type:function size:0x38 scope:global align:4 cDyl_Unlink__Fs = .text:0x8001857C; // type:function size:0x44 scope:global align:4 cDyl_LinkASync__Fs = .text:0x800185C0; // type:function size:0xC8 scope:global align:4 -cDyl_InitCallback__FPv = .text:0x80018688; // type:function size:0xDC scope:global align:4 +cDyl_InitCallback__FPv = .text:0x80018688; // type:function size:0xDC scope:local align:4 cDyl_InitAsync__Fv = .text:0x80018764; // type:function size:0x34 scope:global align:4 cDyl_InitAsyncIsDone__Fv = .text:0x80018798; // type:function size:0x6C scope:global align:4 phase_01__7cDylPhsFPv = .text:0x80018804; // type:function size:0x8 scope:global align:4 @@ -486,8 +486,8 @@ phase_02__7cDylPhsFPs = .text:0x8001880C; // type:function size:0x38 scope:globa phase_03__7cDylPhsFPv = .text:0x80018844; // type:function size:0x8 scope:global align:4 Link__7cDylPhsFP30request_of_phase_process_classs = .text:0x8001884C; // type:function size:0x44 scope:global align:4 Unlink__7cDylPhsFP30request_of_phase_process_classs = .text:0x80018890; // type:function size:0x4C scope:global align:4 -getModuleName__24DynamicModuleControlBaseCFv = .text:0x800188DC; // type:function size:0x8 scope:global align:4 -__dt__20DynamicModuleControlFv = .text:0x800188E4; // type:function size:0x60 scope:global align:4 +getModuleName__24DynamicModuleControlBaseCFv = .text:0x800188DC; // type:function size:0x8 scope:weak align:4 +__dt__20DynamicModuleControlFv = .text:0x800188E4; // type:function size:0x60 scope:weak align:4 __ct__11fapGm_HIO_cFv = .text:0x80018944; // type:function size:0x100 scope:global align:4 fapGm_After__Fv = .text:0x80018A44; // type:function size:0x28 scope:global align:4 fapGm_Execute__Fv = .text:0x80018A6C; // type:function size:0x34 scope:global align:4 @@ -495,17 +495,17 @@ fapGm_Create__Fv = .text:0x80018AA0; // type:function size:0x40 scope:global ali __dt__11fapGm_HIO_cFv = .text:0x80018AE0; // type:function size:0x48 scope:global align:4 __sinit_f_ap_game_cpp = .text:0x80018B28; // type:function size:0x3C scope:local align:4 __ct__10fopAc_ac_cFv = .text:0x80018B64; // type:function size:0x6C scope:global align:4 -__dt__5csXyzFv = .text:0x80018BD0; // type:function size:0x3C scope:global align:4 -__ct__11J3DLightObjFv = .text:0x80018C0C; // type:function size:0x38 scope:global align:4 -__dt__11dEvt_info_cFv = .text:0x80018C44; // type:function size:0x48 scope:global align:4 +__dt__5csXyzFv = .text:0x80018BD0; // type:function size:0x3C scope:weak align:4 +__ct__11J3DLightObjFv = .text:0x80018C0C; // type:function size:0x38 scope:weak align:4 +__dt__11dEvt_info_cFv = .text:0x80018C44; // type:function size:0x48 scope:weak align:4 __dt__10fopAc_ac_cFv = .text:0x80018C8C; // type:function size:0x54 scope:global align:4 fopAc_IsActor__FPv = .text:0x80018CE0; // type:function size:0x2C scope:global align:4 -fopAc_Draw__FPv = .text:0x80018D0C; // type:function size:0xCC scope:global align:4 -fopAc_Execute__FPv = .text:0x80018DD8; // type:function size:0x1A0 scope:global align:4 -fopAc_IsDelete__FPv = .text:0x80018F78; // type:function size:0x54 scope:global align:4 -fopAc_Delete__FPv = .text:0x80018FCC; // type:function size:0x80 scope:global align:4 -fopAc_Create__FPv = .text:0x8001904C; // type:function size:0x3B0 scope:global align:4 -getFileListInfo__15dStage_roomDt_cCFv = .text:0x800193FC; // type:function size:0x8 scope:global align:4 +fopAc_Draw__FPv = .text:0x80018D0C; // type:function size:0xCC scope:local align:4 +fopAc_Execute__FPv = .text:0x80018DD8; // type:function size:0x1A0 scope:local align:4 +fopAc_IsDelete__FPv = .text:0x80018F78; // type:function size:0x54 scope:local align:4 +fopAc_Delete__FPv = .text:0x80018FCC; // type:function size:0x80 scope:local align:4 +fopAc_Create__FPv = .text:0x8001904C; // type:function size:0x3B0 scope:local align:4 +getFileListInfo__15dStage_roomDt_cCFv = .text:0x800193FC; // type:function size:0x8 scope:weak align:4 initBallModel__13fopEn_enemy_cFv = .text:0x80019404; // type:function size:0xF8 scope:global align:4 checkBallModelDraw__13fopEn_enemy_cFv = .text:0x800194FC; // type:function size:0x24 scope:global align:4 setBallModelEffect__13fopEn_enemy_cFP12dKy_tevstr_c = .text:0x80019520; // type:function size:0x180 scope:global align:4 @@ -600,11 +600,11 @@ fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci = .text:0x8001D020 fopAcM_effHamonSet__FPUlPC4cXyzff = .text:0x8001D10C; // type:function size:0xE8 scope:global align:4 fopAcM_riverStream__FP4cXyzPsPff = .text:0x8001D1F4; // type:function size:0x8 scope:global align:4 fopAcM_carryOffRevise__FP10fopAc_ac_c = .text:0x8001D1FC; // type:function size:0x130 scope:global align:4 -vectle_calc__FPC10DOUBLE_POSP4cXyz = .text:0x8001D32C; // type:function size:0xA8 scope:global align:4 -get_vectle_calc__FPC4cXyzPC4cXyzP4cXyz = .text:0x8001D3D4; // type:function size:0x58 scope:global align:4 +vectle_calc__FPC10DOUBLE_POSP4cXyz = .text:0x8001D32C; // type:function size:0xA8 scope:local align:4 +get_vectle_calc__FPC4cXyzPC4cXyzP4cXyz = .text:0x8001D3D4; // type:function size:0x58 scope:local align:4 fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData = .text:0x8001D42C; // type:function size:0x178 scope:global align:4 fopAcM_getProcNameString__FPC10fopAc_ac_c = .text:0x8001D5A4; // type:function size:0x48 scope:global align:4 -fopAcM_findObjectCB__FPC10fopAc_ac_cPv = .text:0x8001D5EC; // type:function size:0xAC scope:global align:4 +fopAcM_findObjectCB__FPC10fopAc_ac_cPv = .text:0x8001D5EC; // type:function size:0xAC scope:local align:4 fopAcM_searchFromName__FPCcUlUl = .text:0x8001D698; // type:function size:0x58 scope:global align:4 fopAcM_findObject4EventCB__FP10fopAc_ac_cPv = .text:0x8001D6F0; // type:function size:0xB0 scope:global align:4 fopAcM_searchFromName4Event__FPCcs = .text:0x8001D7A0; // type:function size:0xF0 scope:global align:4 @@ -612,7 +612,7 @@ fopAcM_getWaterY__FPC4cXyzPf = .text:0x8001D890; // type:function size:0x70 scop fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz = .text:0x8001D900; // type:function size:0xA8 scope:global align:4 fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii = .text:0x8001D9A8; // type:function size:0x13C scope:global align:4 fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos = .text:0x8001DAE4; // type:function size:0xAC scope:global align:4 -__dt__8cM3dGPlaFv = .text:0x8001DB90; // type:function size:0x48 scope:global align:4 +__dt__8cM3dGPlaFv = .text:0x8001DB90; // type:function size:0x48 scope:weak align:4 fopAcM_getPolygonAngle__FPC8cM3dGPlas = .text:0x8001DBD8; // type:function size:0x90 scope:global align:4 lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c = .text:0x8001DC68; // type:function size:0x54 scope:global align:4 gndCheck__11fopAcM_gc_cFPC4cXyz = .text:0x8001DCBC; // type:function size:0x60 scope:global align:4 @@ -620,38 +620,38 @@ roofCheck__11fopAcM_rc_cFPC4cXyz = .text:0x8001DD1C; // type:function size:0x68 waterCheck__11fopAcM_wt_cFPC4cXyz = .text:0x8001DD84; // type:function size:0x8C scope:global align:4 fopAcM_initManager__Fv = .text:0x8001DE10; // type:function size:0x4 scope:global align:4 __sinit_f_op_actor_mng_cpp = .text:0x8001DE14; // type:function size:0x11C scope:local align:4 -__dt__11dBgS_WtrChkFv = .text:0x8001DF30; // type:function size:0x78 scope:global align:4 -__dt__15dBgS_ObjRoofChkFv = .text:0x8001DFA8; // type:function size:0x78 scope:global align:4 -__dt__14dBgS_ObjGndChkFv = .text:0x8001E020; // type:function size:0x78 scope:global align:4 -__dt__5l_HIOFv = .text:0x8001E098; // type:function size:0x3C scope:global align:4 -@20@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0D4; // type:function size:0x8 scope:local align:4 -@76@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0DC; // type:function size:0x8 scope:local align:4 -@60@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0E4; // type:function size:0x8 scope:local align:4 -@16@__dt__11dBgS_WtrChkFv = .text:0x8001E0EC; // type:function size:0x8 scope:local align:4 -@52@__dt__11dBgS_WtrChkFv = .text:0x8001E0F4; // type:function size:0x8 scope:local align:4 -@36@__dt__11dBgS_WtrChkFv = .text:0x8001E0FC; // type:function size:0x8 scope:local align:4 -@16@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E104; // type:function size:0x8 scope:local align:4 -@52@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E10C; // type:function size:0x8 scope:local align:4 -@36@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E114; // type:function size:0x8 scope:local align:4 -onFrollCrashFlg__9daPy_py_cFUci = .text:0x8001E11C; // type:function size:0x4 scope:global align:4 -checkWolfDash__9daPy_py_cCFv = .text:0x8001E120; // type:function size:0x8 scope:global align:4 -checkFrontRoll__9daPy_py_cCFv = .text:0x8001E128; // type:function size:0x8 scope:global align:4 -checkHorseRide__9daPy_py_cCFv = .text:0x8001E130; // type:function size:0x8 scope:global align:4 -getGrabActorID__9daPy_py_cCFv = .text:0x8001E138; // type:function size:0x8 scope:global align:4 -fopCam_Draw__FP12camera_class = .text:0x8001E140; // type:function size:0x40 scope:global align:4 -fopCam_Execute__FP12camera_class = .text:0x8001E180; // type:function size:0x48 scope:global align:4 +__dt__11dBgS_WtrChkFv = .text:0x8001DF30; // type:function size:0x78 scope:weak align:4 +__dt__15dBgS_ObjRoofChkFv = .text:0x8001DFA8; // type:function size:0x78 scope:weak align:4 +__dt__14dBgS_ObjGndChkFv = .text:0x8001E020; // type:function size:0x78 scope:weak align:4 +__dt__5l_HIOFv = .text:0x8001E098; // type:function size:0x3C scope:weak align:4 +@20@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0D4; // type:function size:0x8 scope:weak align:4 +@76@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0DC; // type:function size:0x8 scope:weak align:4 +@60@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0E4; // type:function size:0x8 scope:weak align:4 +@16@__dt__11dBgS_WtrChkFv = .text:0x8001E0EC; // type:function size:0x8 scope:weak align:4 +@52@__dt__11dBgS_WtrChkFv = .text:0x8001E0F4; // type:function size:0x8 scope:weak align:4 +@36@__dt__11dBgS_WtrChkFv = .text:0x8001E0FC; // type:function size:0x8 scope:weak align:4 +@16@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E104; // type:function size:0x8 scope:weak align:4 +@52@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E10C; // type:function size:0x8 scope:weak align:4 +@36@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E114; // type:function size:0x8 scope:weak align:4 +onFrollCrashFlg__9daPy_py_cFUci = .text:0x8001E11C; // type:function size:0x4 scope:weak align:4 +checkWolfDash__9daPy_py_cCFv = .text:0x8001E120; // type:function size:0x8 scope:weak align:4 +checkFrontRoll__9daPy_py_cCFv = .text:0x8001E128; // type:function size:0x8 scope:weak align:4 +checkHorseRide__9daPy_py_cCFv = .text:0x8001E130; // type:function size:0x8 scope:weak align:4 +getGrabActorID__9daPy_py_cCFv = .text:0x8001E138; // type:function size:0x8 scope:weak align:4 +fopCam_Draw__FP12camera_class = .text:0x8001E140; // type:function size:0x40 scope:local align:4 +fopCam_Execute__FP12camera_class = .text:0x8001E180; // type:function size:0x48 scope:local align:4 fopCam_IsDelete__FP12camera_class = .text:0x8001E1C8; // type:function size:0x54 scope:global align:4 fopCam_Delete__FP12camera_class = .text:0x8001E21C; // type:function size:0x54 scope:global align:4 -fopCam_Create__FPv = .text:0x8001E270; // type:function size:0x98 scope:global align:4 +fopCam_Create__FPv = .text:0x8001E270; // type:function size:0x98 scope:local align:4 fopCamM_GetParam__FP12camera_class = .text:0x8001E308; // type:function size:0x8 scope:global align:4 fopCamM_Create__FisPv = .text:0x8001E310; // type:function size:0x64 scope:global align:4 fopCamM_Management__Fv = .text:0x8001E374; // type:function size:0x4 scope:global align:4 fopCamM_Init__Fv = .text:0x8001E378; // type:function size:0x4 scope:global align:4 -fopOvlp_Draw__FPv = .text:0x8001E37C; // type:function size:0x28 scope:global align:4 -fopOvlp_Execute__FPv = .text:0x8001E3A4; // type:function size:0x28 scope:global align:4 -fopOvlp_IsDelete__FPv = .text:0x8001E3CC; // type:function size:0x28 scope:global align:4 -fopOvlp_Delete__FPv = .text:0x8001E3F4; // type:function size:0x28 scope:global align:4 -fopOvlp_Create__FPv = .text:0x8001E41C; // type:function size:0x68 scope:global align:4 +fopOvlp_Draw__FPv = .text:0x8001E37C; // type:function size:0x28 scope:local align:4 +fopOvlp_Execute__FPv = .text:0x8001E3A4; // type:function size:0x28 scope:local align:4 +fopOvlp_IsDelete__FPv = .text:0x8001E3CC; // type:function size:0x28 scope:local align:4 +fopOvlp_Delete__FPv = .text:0x8001E3F4; // type:function size:0x28 scope:local align:4 +fopOvlp_Create__FPv = .text:0x8001E41C; // type:function size:0x68 scope:local align:4 fopOvlpM_SceneIsStop__Fv = .text:0x8001E484; // type:function size:0x40 scope:global align:4 fopOvlpM_SceneIsStart__Fv = .text:0x8001E4C4; // type:function size:0x40 scope:global align:4 fopOvlpM_IsOutReq__FP18overlap_task_class = .text:0x8001E504; // type:function size:0x18 scope:global align:4 @@ -665,24 +665,24 @@ fopOvlpM_Request__FsUs = .text:0x8001E604; // type:function size:0x4C scope:glob fopOvlpM_Management__Fv = .text:0x8001E650; // type:function size:0x48 scope:global align:4 fopOvlpM_Cancel__Fv = .text:0x8001E698; // type:function size:0x50 scope:global align:4 fopOvlpM_Init__Fv = .text:0x8001E6E8; // type:function size:0x4 scope:global align:4 -fopOvlpReq_phase_Done__FP21overlap_request_class = .text:0x8001E6EC; // type:function size:0x5C scope:global align:4 -fopOvlpReq_phase_IsDone__FP21overlap_request_class = .text:0x8001E748; // type:function size:0x4C scope:global align:4 -fopOvlpReq_phase_IsWaitOfFadeout__FP21overlap_request_class = .text:0x8001E794; // type:function size:0x50 scope:global align:4 -fopOvlpReq_phase_WaitOfFadeout__FP21overlap_request_class = .text:0x8001E7E4; // type:function size:0x70 scope:global align:4 -fopOvlpReq_phase_IsComplete__FP21overlap_request_class = .text:0x8001E854; // type:function size:0x50 scope:global align:4 -fopOvlpReq_phase_IsCreated__FP21overlap_request_class = .text:0x8001E8A4; // type:function size:0x60 scope:global align:4 -fopOvlpReq_phase_Create__FP21overlap_request_class = .text:0x8001E904; // type:function size:0x50 scope:global align:4 +fopOvlpReq_phase_Done__FP21overlap_request_class = .text:0x8001E6EC; // type:function size:0x5C scope:local align:4 +fopOvlpReq_phase_IsDone__FP21overlap_request_class = .text:0x8001E748; // type:function size:0x4C scope:local align:4 +fopOvlpReq_phase_IsWaitOfFadeout__FP21overlap_request_class = .text:0x8001E794; // type:function size:0x50 scope:local align:4 +fopOvlpReq_phase_WaitOfFadeout__FP21overlap_request_class = .text:0x8001E7E4; // type:function size:0x70 scope:local align:4 +fopOvlpReq_phase_IsComplete__FP21overlap_request_class = .text:0x8001E854; // type:function size:0x50 scope:local align:4 +fopOvlpReq_phase_IsCreated__FP21overlap_request_class = .text:0x8001E8A4; // type:function size:0x60 scope:local align:4 +fopOvlpReq_phase_Create__FP21overlap_request_class = .text:0x8001E904; // type:function size:0x50 scope:local align:4 fopOvlpReq_Request__FP21overlap_request_classsUs = .text:0x8001E954; // type:function size:0x9C scope:global align:4 fopOvlpReq_Handler__FP21overlap_request_class = .text:0x8001E9F0; // type:function size:0x98 scope:global align:4 fopOvlpReq_Cancel__FP21overlap_request_class = .text:0x8001EA88; // type:function size:0x2C scope:global align:4 fopOvlpReq_Is_PeektimeLimit__FP21overlap_request_class = .text:0x8001EAB4; // type:function size:0x10 scope:global align:4 fopOvlpReq_SetPeektime__FP21overlap_request_classUs = .text:0x8001EAC4; // type:function size:0x14 scope:global align:4 fopOvlpReq_OverlapClr__FP21overlap_request_class = .text:0x8001EAD8; // type:function size:0x5C scope:global align:4 -fopScn_Draw__FP11scene_class = .text:0x8001EB34; // type:function size:0x28 scope:global align:4 -fopScn_Execute__FP11scene_class = .text:0x8001EB5C; // type:function size:0x28 scope:global align:4 -fopScn_IsDelete__FPv = .text:0x8001EB84; // type:function size:0x28 scope:global align:4 -fopScn_Delete__FPv = .text:0x8001EBAC; // type:function size:0x54 scope:global align:4 -fopScn_Create__FPv = .text:0x8001EC00; // type:function size:0x74 scope:global align:4 +fopScn_Draw__FP11scene_class = .text:0x8001EB34; // type:function size:0x28 scope:local align:4 +fopScn_Execute__FP11scene_class = .text:0x8001EB5C; // type:function size:0x28 scope:local align:4 +fopScn_IsDelete__FPv = .text:0x8001EB84; // type:function size:0x28 scope:local align:4 +fopScn_Delete__FPv = .text:0x8001EBAC; // type:function size:0x54 scope:local align:4 +fopScn_Create__FPv = .text:0x8001EC00; // type:function size:0x74 scope:local align:4 fopScnIt_Judge__FPFPvPv_PvPv = .text:0x8001EC74; // type:function size:0x3C scope:global align:4 fopScnM_SearchByID__FUi = .text:0x8001ECB0; // type:function size:0x30 scope:global align:4 fopScnM_ChangeReq__FP11scene_classssUs = .text:0x8001ECE0; // type:function size:0x5C scope:global align:4 @@ -691,15 +691,15 @@ fopScnM_CreateReq__FssUsUl = .text:0x8001ED84; // type:function size:0x48 scope: fopScnM_ReRequest__FsUl = .text:0x8001EDCC; // type:function size:0x44 scope:global align:4 fopScnM_Management__Fv = .text:0x8001EE10; // type:function size:0x20 scope:global align:4 fopScnM_Init__Fv = .text:0x8001EE30; // type:function size:0x4 scope:global align:4 -fopScnRq_phase_ClearOverlap__FP19scene_request_class = .text:0x8001EE34; // type:function size:0x30 scope:global align:4 -fopScnRq_phase_Execute__FP19scene_request_class = .text:0x8001EE64; // type:function size:0x20 scope:global align:4 -fopScnRq_phase_IsDoingOverlap__FP19scene_request_class = .text:0x8001EE84; // type:function size:0x30 scope:global align:4 -fopScnRq_phase_IsDoneOverlap__FP19scene_request_class = .text:0x8001EEB4; // type:function size:0x30 scope:global align:4 -fopScnRq_phase_Done__FP19scene_request_class = .text:0x8001EEE4; // type:function size:0x40 scope:global align:4 -fopScnRq_Execute__FP19scene_request_class = .text:0x8001EF24; // type:function size:0x48 scope:global align:4 -fopScnRq_PostMethod__FPvP19scene_request_class = .text:0x8001EF6C; // type:function size:0x44 scope:global align:4 -fopScnRq_Cancel__FP19scene_request_class = .text:0x8001EFB0; // type:function size:0x40 scope:global align:4 -fopScnRq_FadeRequest__FsUs = .text:0x8001EFF0; // type:function size:0x44 scope:global align:4 +fopScnRq_phase_ClearOverlap__FP19scene_request_class = .text:0x8001EE34; // type:function size:0x30 scope:local align:4 +fopScnRq_phase_Execute__FP19scene_request_class = .text:0x8001EE64; // type:function size:0x20 scope:local align:4 +fopScnRq_phase_IsDoingOverlap__FP19scene_request_class = .text:0x8001EE84; // type:function size:0x30 scope:local align:4 +fopScnRq_phase_IsDoneOverlap__FP19scene_request_class = .text:0x8001EEB4; // type:function size:0x30 scope:local align:4 +fopScnRq_phase_Done__FP19scene_request_class = .text:0x8001EEE4; // type:function size:0x40 scope:local align:4 +fopScnRq_Execute__FP19scene_request_class = .text:0x8001EF24; // type:function size:0x48 scope:local align:4 +fopScnRq_PostMethod__FPvP19scene_request_class = .text:0x8001EF6C; // type:function size:0x44 scope:local align:4 +fopScnRq_Cancel__FP19scene_request_class = .text:0x8001EFB0; // type:function size:0x40 scope:local align:4 +fopScnRq_FadeRequest__FsUs = .text:0x8001EFF0; // type:function size:0x44 scope:local align:4 fopScnRq_Request__FiP11scene_classsPvsUs = .text:0x8001F034; // type:function size:0xC8 scope:global align:4 fopScnRq_ReRequest__FUisPv = .text:0x8001F0FC; // type:function size:0x20 scope:global align:4 fopScnRq_Handler__Fv = .text:0x8001F11C; // type:function size:0x20 scope:global align:4 @@ -711,18 +711,18 @@ fopVw_Execute__FP10view_class = .text:0x8001F1D0; // type:function size:0x28 sco fopVw_IsDelete__FPv = .text:0x8001F1F8; // type:function size:0x28 scope:global align:4 fopVw_Delete__FP10view_class = .text:0x8001F220; // type:function size:0x28 scope:global align:4 fopVw_Create__FPv = .text:0x8001F248; // type:function size:0x3C scope:global align:4 -fopKy_Draw__FPv = .text:0x8001F284; // type:function size:0x3C scope:global align:4 -fopKy_Execute__FPv = .text:0x8001F2C0; // type:function size:0x54 scope:global align:4 -fopKy_IsDelete__FPv = .text:0x8001F314; // type:function size:0x54 scope:global align:4 -fopKy_Delete__FPv = .text:0x8001F368; // type:function size:0x4C scope:global align:4 -fopKy_Create__FPv = .text:0x8001F3B4; // type:function size:0xD4 scope:global align:4 -fopMsg_Draw__FPv = .text:0x8001F488; // type:function size:0x28 scope:global align:4 -fopMsg_Execute__FPv = .text:0x8001F4B0; // type:function size:0x38 scope:global align:4 -fopMsg_IsDelete__FPv = .text:0x8001F4E8; // type:function size:0x54 scope:global align:4 -fopMsg_Delete__FPv = .text:0x8001F53C; // type:function size:0x4C scope:global align:4 +fopKy_Draw__FPv = .text:0x8001F284; // type:function size:0x3C scope:local align:4 +fopKy_Execute__FPv = .text:0x8001F2C0; // type:function size:0x54 scope:local align:4 +fopKy_IsDelete__FPv = .text:0x8001F314; // type:function size:0x54 scope:local align:4 +fopKy_Delete__FPv = .text:0x8001F368; // type:function size:0x4C scope:local align:4 +fopKy_Create__FPv = .text:0x8001F3B4; // type:function size:0xD4 scope:local align:4 +fopMsg_Draw__FPv = .text:0x8001F488; // type:function size:0x28 scope:local align:4 +fopMsg_Execute__FPv = .text:0x8001F4B0; // type:function size:0x38 scope:local align:4 +fopMsg_IsDelete__FPv = .text:0x8001F4E8; // type:function size:0x54 scope:local align:4 +fopMsg_Delete__FPv = .text:0x8001F53C; // type:function size:0x4C scope:local align:4 fopMsg_Create__FPv = .text:0x8001F588; // type:function size:0xD8 scope:global align:4 fopKyM_CreateAppend__Fv = .text:0x8001F660; // type:function size:0x58 scope:global align:4 -createAppend__FiP4cXyzP4cXyz = .text:0x8001F6B8; // type:function size:0x90 scope:global align:4 +createAppend__FiP4cXyzP4cXyz = .text:0x8001F6B8; // type:function size:0x90 scope:local align:4 fopKyM_Delete__FPv = .text:0x8001F748; // type:function size:0x20 scope:global align:4 fopKyM_Create__FsPFPv_iPv = .text:0x8001F768; // type:function size:0x50 scope:global align:4 fopKyM_create__FsiP4cXyzP4cXyzPFPv_i = .text:0x8001F7B8; // type:function size:0x60 scope:global align:4 @@ -733,8 +733,8 @@ fopMsgM_setStageLayer__FPv = .text:0x8001F9B4; // type:function size:0x70 scope: fopMsgM_SearchByID__FUi = .text:0x8001FA24; // type:function size:0x20 scope:global align:4 fopMsgM_GetAppend__FPv = .text:0x8001FA44; // type:function size:0x8 scope:global align:4 fopMsgM_Delete__FPv = .text:0x8001FA4C; // type:function size:0x20 scope:global align:4 -createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi = .text:0x8001FA6C; // type:function size:0xE4 scope:global align:4 -createTimerAppend__FiUlUcUcffffUi = .text:0x8001FB50; // type:function size:0xFC scope:global align:4 +createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi = .text:0x8001FA6C; // type:function size:0xE4 scope:local align:4 +createTimerAppend__FiUlUcUcffffUi = .text:0x8001FB50; // type:function size:0xFC scope:local align:4 fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i = .text:0x8001FC4C; // type:function size:0x74 scope:global align:4 fop_Timer_create__FsUcUlUcUcffffPFPv_i = .text:0x8001FCC0; // type:function size:0x74 scope:global align:4 fopMsgM_messageSet__FUlP10fopAc_ac_cUl = .text:0x8001FD34; // type:function size:0x150 scope:global align:4 @@ -745,9 +745,9 @@ fopMsgM_setMessageID__FUi = .text:0x80020100; // type:function size:0x8 scope:gl fopMsgM_Create__FsPFPv_iPv = .text:0x80020108; // type:function size:0x50 scope:global align:4 setAlpha__7J2DPaneFUc = .text:0x80020158; // type:function size:0x8 scope:global align:4 fopMsgM_valueIncrease__FiiUc = .text:0x80020160; // type:function size:0x16C scope:global align:4 -setBlendRatio__10J2DPictureFff = .text:0x800202CC; // type:function size:0x6C scope:global align:4 -append__10J2DPictureFPCcf = .text:0x80020338; // type:function size:0x30 scope:global align:4 -insert__10J2DPictureFPCcUcf = .text:0x80020368; // type:function size:0x34 scope:global align:4 +setBlendRatio__10J2DPictureFff = .text:0x800202CC; // type:function size:0x6C scope:weak align:4 +append__10J2DPictureFPCcf = .text:0x80020338; // type:function size:0x30 scope:weak align:4 +insert__10J2DPictureFPCcUcf = .text:0x80020368; // type:function size:0x34 scope:weak align:4 fopMsgM_createExpHeap__FUlP7JKRHeap = .text:0x8002039C; // type:function size:0x44 scope:global align:4 fopMsgM_destroyExpHeap__FP10JKRExpHeap = .text:0x800203E0; // type:function size:0x20 scope:global align:4 fopDwIt_GetTag__Fv = .text:0x80020400; // type:function size:0x44 scope:global align:4 @@ -914,7 +914,7 @@ fpcLnTg_Move__FP8line_tagi = .text:0x800235A8; // type:function size:0x58 scope: fpcLnTg_QueueTo__FP8line_tag = .text:0x80023600; // type:function size:0x34 scope:global align:4 fpcLnTg_ToQueue__FP8line_tagi = .text:0x80023634; // type:function size:0x58 scope:global align:4 fpcLnTg_Init__FP8line_tagPv = .text:0x8002368C; // type:function size:0x34 scope:global align:4 -fpcLnIt_MethodCall__FP16create_tag_classP13method_filter = .text:0x800236C0; // type:function size:0x68 scope:global align:4 +fpcLnIt_MethodCall__FP16create_tag_classP13method_filter = .text:0x800236C0; // type:function size:0x68 scope:local align:4 fpcLnIt_Queue__FPFPvPv_i = .text:0x80023728; // type:function size:0x3C scope:global align:4 fpcMtdIt_Method__FP15node_list_classPFPv_i = .text:0x80023764; // type:function size:0x24 scope:global align:4 fpcMtdTg_Do__FP24process_method_tag_class = .text:0x80023788; // type:function size:0x30 scope:global align:4 @@ -944,13 +944,13 @@ set__18dStage_nextStage_cFPCcScsScScUc = .text:0x80023E28; // type:function size dStage_SetErrorRoom__Fv = .text:0x80023E94; // type:function size:0x30 scope:global align:4 dStage_SetErrorStage__Fv = .text:0x80023EC4; // type:function size:0x30 scope:global align:4 dStage_GetKeepDoorInfo__Fv = .text:0x80023EF4; // type:function size:0xC scope:global align:4 -dStage_isBossStage__FP11dStage_dt_c = .text:0x80023F00; // type:function size:0x50 scope:global align:4 -dStage_KeepDoorInfoInit__FP11dStage_dt_c = .text:0x80023F50; // type:function size:0x34 scope:global align:4 -dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x80023F84; // type:function size:0xD8 scope:global align:4 +dStage_isBossStage__FP11dStage_dt_c = .text:0x80023F00; // type:function size:0x50 scope:local align:4 +dStage_KeepDoorInfoInit__FP11dStage_dt_c = .text:0x80023F50; // type:function size:0x34 scope:local align:4 +dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x80023F84; // type:function size:0xD8 scope:local align:4 dStage_GetRoomKeepDoorInfo__Fv = .text:0x8002405C; // type:function size:0xC scope:global align:4 -dStage_initRoomKeepDoorInfo__Fv = .text:0x80024068; // type:function size:0x10 scope:global align:4 -dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x80024078; // type:function size:0xFC scope:global align:4 -dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv = .text:0x80024174; // type:function size:0x28 scope:global align:4 +dStage_initRoomKeepDoorInfo__Fv = .text:0x80024068; // type:function size:0x10 scope:local align:4 +dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x80024078; // type:function size:0xFC scope:local align:4 +dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv = .text:0x80024174; // type:function size:0x28 scope:local align:4 set__19dStage_startStage_cFPCcScsSc = .text:0x8002419C; // type:function size:0x4C scope:global align:4 init__20dStage_roomControl_cFv = .text:0x800241E8; // type:function size:0x150 scope:global align:4 initZone__20dStage_roomControl_cFv = .text:0x80024338; // type:function size:0x4C scope:global align:4 @@ -958,12 +958,12 @@ getStatusRoomDt__20dStage_roomControl_cFi = .text:0x80024384; // type:function s getMemoryBlock__20dStage_roomControl_cFi = .text:0x800243B0; // type:function size:0x38 scope:global align:4 setStayNo__20dStage_roomControl_cFi = .text:0x800243E8; // type:function size:0x3C scope:global align:4 setNextStayNo__20dStage_roomControl_cFi = .text:0x80024424; // type:function size:0x8 scope:global align:4 -stayRoomCheck__FiPUci = .text:0x8002442C; // type:function size:0x34 scope:global align:4 -createRoomScene__Fi = .text:0x80024460; // type:function size:0x88 scope:global align:4 +stayRoomCheck__FiPUci = .text:0x8002442C; // type:function size:0x34 scope:local align:4 +createRoomScene__Fi = .text:0x80024460; // type:function size:0x88 scope:local align:4 checkRoomDisp__20dStage_roomControl_cCFi = .text:0x800244E8; // type:function size:0x34 scope:global align:4 loadRoom__20dStage_roomControl_cFiPUcb = .text:0x8002451C; // type:function size:0x200 scope:global align:4 zoneCountCheck__20dStage_roomControl_cCFi = .text:0x8002471C; // type:function size:0x120 scope:global align:4 -getStagInfo__16dStage_stageDt_cCFv = .text:0x8002483C; // type:function size:0x8 scope:global align:4 +getStagInfo__16dStage_stageDt_cCFv = .text:0x8002483C; // type:function size:0x8 scope:weak align:4 createMemoryBlock__20dStage_roomControl_cFiUl = .text:0x80024844; // type:function size:0x64 scope:global align:4 destroyMemoryBlock__20dStage_roomControl_cFv = .text:0x800248A8; // type:function size:0x64 scope:global align:4 setArcBank__20dStage_roomControl_cFiPCc = .text:0x8002490C; // type:function size:0x34 scope:global align:4 @@ -975,81 +975,81 @@ add__Q220dStage_roomControl_c9roomDzs_cFUcUc = .text:0x80024B44; // type:functio init__16dStage_stageDt_cFv = .text:0x80024C1C; // type:function size:0x8C scope:global align:4 initFileList2__15dStage_roomDt_cFv = .text:0x80024CA8; // type:function size:0xC scope:global align:4 init__15dStage_roomDt_cFv = .text:0x80024CB4; // type:function size:0x5C scope:global align:4 -dStage_roomInit__Fi = .text:0x80024D10; // type:function size:0xA0 scope:global align:4 -SetTimePass__20dStage_roomControl_cFi = .text:0x80024DB0; // type:function size:0x8 scope:global align:4 -getRoom__16dStage_stageDt_cCFv = .text:0x80024DB8; // type:function size:0x8 scope:global align:4 +dStage_roomInit__Fi = .text:0x80024D10; // type:function size:0xA0 scope:local align:4 +SetTimePass__20dStage_roomControl_cFi = .text:0x80024DB0; // type:function size:0x8 scope:weak align:4 +getRoom__16dStage_stageDt_cCFv = .text:0x80024DB8; // type:function size:0x8 scope:weak align:4 dStage_searchName__FPCc = .text:0x80024DC0; // type:function size:0x70 scope:global align:4 dStage_getName__FsSc = .text:0x80024E30; // type:function size:0xAC scope:global align:4 dStage_getName2__FsSc = .text:0x80024EDC; // type:function size:0x20 scope:global align:4 -dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class = .text:0x80024EFC; // type:function size:0x9C scope:global align:4 -dStage_cameraCreate__FP24stage_camera2_data_classii = .text:0x80024F98; // type:function size:0x6C scope:global align:4 -getPlayer__15dStage_roomDt_cCFv = .text:0x80025004; // type:function size:0x8 scope:global align:4 -getPlayer__16dStage_stageDt_cCFv = .text:0x8002500C; // type:function size:0x8 scope:global align:4 -dStage_playerInit__FP11dStage_dt_cPviPv = .text:0x80025014; // type:function size:0x2A4 scope:global align:4 -dStage_cameraInit__FP11dStage_dt_cPviPv = .text:0x800252B8; // type:function size:0x50 scope:global align:4 -dStage_RoomCameraInit__FP11dStage_dt_cPviPv = .text:0x80025308; // type:function size:0x34 scope:global align:4 -dStage_arrowInit__FP11dStage_dt_cPviPv = .text:0x8002533C; // type:function size:0x34 scope:global align:4 +dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class = .text:0x80024EFC; // type:function size:0x9C scope:local align:4 +dStage_cameraCreate__FP24stage_camera2_data_classii = .text:0x80024F98; // type:function size:0x6C scope:local align:4 +getPlayer__15dStage_roomDt_cCFv = .text:0x80025004; // type:function size:0x8 scope:weak align:4 +getPlayer__16dStage_stageDt_cCFv = .text:0x8002500C; // type:function size:0x8 scope:weak align:4 +dStage_playerInit__FP11dStage_dt_cPviPv = .text:0x80025014; // type:function size:0x2A4 scope:local align:4 +dStage_cameraInit__FP11dStage_dt_cPviPv = .text:0x800252B8; // type:function size:0x50 scope:local align:4 +dStage_RoomCameraInit__FP11dStage_dt_cPviPv = .text:0x80025308; // type:function size:0x34 scope:local align:4 +dStage_arrowInit__FP11dStage_dt_cPviPv = .text:0x8002533C; // type:function size:0x34 scope:local align:4 getMapInfo2__15dStage_roomDt_cCFi = .text:0x80025370; // type:function size:0x8C scope:global align:4 -getMapInfoBase__15dStage_roomDt_cCFv = .text:0x800253FC; // type:function size:0x8 scope:global align:4 +getMapInfoBase__15dStage_roomDt_cCFv = .text:0x800253FC; // type:function size:0x8 scope:weak align:4 getMapInfo2__16dStage_stageDt_cCFi = .text:0x80025404; // type:function size:0x8C scope:global align:4 -getMapInfoBase__16dStage_stageDt_cCFv = .text:0x80025490; // type:function size:0x8 scope:global align:4 -dStage_paletteInfoInit__FP11dStage_dt_cPviPv = .text:0x80025498; // type:function size:0x34 scope:global align:4 -dStage_pselectInfoInit__FP11dStage_dt_cPviPv = .text:0x800254CC; // type:function size:0x34 scope:global align:4 -dStage_envrInfoInit__FP11dStage_dt_cPviPv = .text:0x80025500; // type:function size:0x34 scope:global align:4 -dStage_filiInfo2Init__FP11dStage_dt_cPviPv = .text:0x80025534; // type:function size:0x38 scope:global align:4 -dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv = .text:0x8002556C; // type:function size:0x20 scope:global align:4 -dStage_filiInfoInit__FP11dStage_dt_cPviPv = .text:0x8002558C; // type:function size:0x54 scope:global align:4 -dStage_vrboxInfoInit__FP11dStage_dt_cPviPv = .text:0x800255E0; // type:function size:0x34 scope:global align:4 -dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv = .text:0x80025614; // type:function size:0x34 scope:global align:4 -dStage_plightInfoInit__FP11dStage_dt_cPviPv = .text:0x80025648; // type:function size:0x64 scope:global align:4 -dStage_lgtvInfoInit__FP11dStage_dt_cPviPv = .text:0x800256AC; // type:function size:0x8C scope:global align:4 +getMapInfoBase__16dStage_stageDt_cCFv = .text:0x80025490; // type:function size:0x8 scope:weak align:4 +dStage_paletteInfoInit__FP11dStage_dt_cPviPv = .text:0x80025498; // type:function size:0x34 scope:local align:4 +dStage_pselectInfoInit__FP11dStage_dt_cPviPv = .text:0x800254CC; // type:function size:0x34 scope:local align:4 +dStage_envrInfoInit__FP11dStage_dt_cPviPv = .text:0x80025500; // type:function size:0x34 scope:local align:4 +dStage_filiInfo2Init__FP11dStage_dt_cPviPv = .text:0x80025534; // type:function size:0x38 scope:local align:4 +dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv = .text:0x8002556C; // type:function size:0x20 scope:local align:4 +dStage_filiInfoInit__FP11dStage_dt_cPviPv = .text:0x8002558C; // type:function size:0x54 scope:local align:4 +dStage_vrboxInfoInit__FP11dStage_dt_cPviPv = .text:0x800255E0; // type:function size:0x34 scope:local align:4 +dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv = .text:0x80025614; // type:function size:0x34 scope:local align:4 +dStage_plightInfoInit__FP11dStage_dt_cPviPv = .text:0x80025648; // type:function size:0x64 scope:local align:4 +dStage_lgtvInfoInit__FP11dStage_dt_cPviPv = .text:0x800256AC; // type:function size:0x8C scope:local align:4 dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi = .text:0x80025738; // type:function size:0xC scope:global align:4 -dStage_stagInfoInit__FP11dStage_dt_cPviPv = .text:0x80025744; // type:function size:0xE8 scope:global align:4 +dStage_stagInfoInit__FP11dStage_dt_cPviPv = .text:0x80025744; // type:function size:0xE8 scope:local align:4 resetOldMulti__16dStage_stageDt_cFv = .text:0x8002582C; // type:function size:0xC scope:global align:4 -dStage_sclsInfoInit__FP11dStage_dt_cPviPv = .text:0x80025838; // type:function size:0x34 scope:global align:4 -dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x8002586C; // type:function size:0xEC scope:global align:4 -dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x80025958; // type:function size:0xE0 scope:global align:4 -dStage_actorInit__FP11dStage_dt_cPviPv = .text:0x80025A38; // type:function size:0xEC scope:global align:4 -dStage_actorInit_always__FP11dStage_dt_cPviPv = .text:0x80025B24; // type:function size:0xD8 scope:global align:4 -dStage_tgscInfoInit__FP11dStage_dt_cPviPv = .text:0x80025BFC; // type:function size:0xE0 scope:global align:4 -dStage_doorInfoInit__FP11dStage_dt_cPviPv = .text:0x80025CDC; // type:function size:0xCC scope:global align:4 -dStage_roomReadInit__FP11dStage_dt_cPviPv = .text:0x80025DA8; // type:function size:0x98 scope:global align:4 +dStage_sclsInfoInit__FP11dStage_dt_cPviPv = .text:0x80025838; // type:function size:0x34 scope:local align:4 +dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x8002586C; // type:function size:0xEC scope:local align:4 +dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x80025958; // type:function size:0xE0 scope:local align:4 +dStage_actorInit__FP11dStage_dt_cPviPv = .text:0x80025A38; // type:function size:0xEC scope:local align:4 +dStage_actorInit_always__FP11dStage_dt_cPviPv = .text:0x80025B24; // type:function size:0xD8 scope:local align:4 +dStage_tgscInfoInit__FP11dStage_dt_cPviPv = .text:0x80025BFC; // type:function size:0xE0 scope:local align:4 +dStage_doorInfoInit__FP11dStage_dt_cPviPv = .text:0x80025CDC; // type:function size:0xCC scope:local align:4 +dStage_roomReadInit__FP11dStage_dt_cPviPv = .text:0x80025DA8; // type:function size:0x98 scope:local align:4 dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi = .text:0x80025E40; // type:function size:0x30 scope:global align:4 -dStage_ppntInfoInit__FP11dStage_dt_cPviPv = .text:0x80025E70; // type:function size:0x34 scope:global align:4 -dStage_pathInfoInit__FP11dStage_dt_cPviPv = .text:0x80025EA4; // type:function size:0xA0 scope:global align:4 -dStage_rppnInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F44; // type:function size:0x34 scope:global align:4 -dStage_rpatInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F78; // type:function size:0xA0 scope:global align:4 -dStage_soundInfoInit__FP11dStage_dt_cPviPv = .text:0x80026018; // type:function size:0x34 scope:global align:4 -dStage_soundInfoInitCL__FP11dStage_dt_cPviPv = .text:0x8002604C; // type:function size:0x34 scope:global align:4 -dStage_setLayerTagName__FP9FuncTableii = .text:0x80026080; // type:function size:0x34 scope:global align:4 -dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei = .text:0x800260B4; // type:function size:0xC8 scope:global align:4 -dStage_stEventInfoInit__FP11dStage_dt_cPviPv = .text:0x8002617C; // type:function size:0x34 scope:global align:4 -dStage_mapEventInfoInit__FP11dStage_dt_cPviPv = .text:0x800261B0; // type:function size:0x34 scope:global align:4 -dStage_floorInfoInit__FP11dStage_dt_cPviPv = .text:0x800261E4; // type:function size:0x34 scope:global align:4 -dStage_memaInfoInit__FP11dStage_dt_cPviPv = .text:0x80026218; // type:function size:0x80 scope:global align:4 -dStage_mecoInfoInit__FP11dStage_dt_cPviPv = .text:0x80026298; // type:function size:0x84 scope:global align:4 -dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv = .text:0x8002631C; // type:function size:0x30 scope:global align:4 -dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv = .text:0x8002634C; // type:function size:0x10 scope:global align:4 -dStage_dt_c_offsetToPtr__FPv = .text:0x8002635C; // type:function size:0x44 scope:global align:4 -dStage_mapPathInit__FP11dStage_dt_cPviPv = .text:0x800263A0; // type:function size:0x30 scope:global align:4 -dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv = .text:0x800263D0; // type:function size:0x30 scope:global align:4 -dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv = .text:0x80026400; // type:function size:0x5C scope:global align:4 -readMult__FP11dStage_dt_cP14dStage_Multi_cb = .text:0x8002645C; // type:function size:0x180 scope:global align:4 -dStage_multInfoInit__FP11dStage_dt_cPviPv = .text:0x800265DC; // type:function size:0x94 scope:global align:4 -dStage_lbnkInfoInit__FP11dStage_dt_cPviPv = .text:0x80026670; // type:function size:0x34 scope:global align:4 -dStage_roomTresureInit__FP11dStage_dt_cPviPv = .text:0x800266A4; // type:function size:0x68 scope:global align:4 -dStage_layerTresureInit__FP11dStage_dt_cPviPv = .text:0x8002670C; // type:function size:0x24 scope:global align:4 -dStage_dmapInfoInit__FP11dStage_dt_cPviPv = .text:0x80026730; // type:function size:0x34 scope:global align:4 -dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x80026764; // type:function size:0x78 scope:global align:4 -dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x800267DC; // type:function size:0x68 scope:global align:4 -dStage_elstInfoInit__FP11dStage_dt_cPviPv = .text:0x80026844; // type:function size:0x54 scope:global align:4 -dKankyo_create__Fv = .text:0x80026898; // type:function size:0x7C scope:global align:4 -layerMemoryInfoLoader__FPvP11dStage_dt_ci = .text:0x80026914; // type:function size:0x2C scope:global align:4 -dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c = .text:0x80026940; // type:function size:0x74 scope:global align:4 -layerTableLoader__FPvP11dStage_dt_ci = .text:0x800269B4; // type:function size:0x134 scope:global align:4 +dStage_ppntInfoInit__FP11dStage_dt_cPviPv = .text:0x80025E70; // type:function size:0x34 scope:local align:4 +dStage_pathInfoInit__FP11dStage_dt_cPviPv = .text:0x80025EA4; // type:function size:0xA0 scope:local align:4 +dStage_rppnInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F44; // type:function size:0x34 scope:local align:4 +dStage_rpatInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F78; // type:function size:0xA0 scope:local align:4 +dStage_soundInfoInit__FP11dStage_dt_cPviPv = .text:0x80026018; // type:function size:0x34 scope:local align:4 +dStage_soundInfoInitCL__FP11dStage_dt_cPviPv = .text:0x8002604C; // type:function size:0x34 scope:local align:4 +dStage_setLayerTagName__FP9FuncTableii = .text:0x80026080; // type:function size:0x34 scope:local align:4 +dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei = .text:0x800260B4; // type:function size:0xC8 scope:local align:4 +dStage_stEventInfoInit__FP11dStage_dt_cPviPv = .text:0x8002617C; // type:function size:0x34 scope:local align:4 +dStage_mapEventInfoInit__FP11dStage_dt_cPviPv = .text:0x800261B0; // type:function size:0x34 scope:local align:4 +dStage_floorInfoInit__FP11dStage_dt_cPviPv = .text:0x800261E4; // type:function size:0x34 scope:local align:4 +dStage_memaInfoInit__FP11dStage_dt_cPviPv = .text:0x80026218; // type:function size:0x80 scope:local align:4 +dStage_mecoInfoInit__FP11dStage_dt_cPviPv = .text:0x80026298; // type:function size:0x84 scope:local align:4 +dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv = .text:0x8002631C; // type:function size:0x30 scope:local align:4 +dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv = .text:0x8002634C; // type:function size:0x10 scope:local align:4 +dStage_dt_c_offsetToPtr__FPv = .text:0x8002635C; // type:function size:0x44 scope:local align:4 +dStage_mapPathInit__FP11dStage_dt_cPviPv = .text:0x800263A0; // type:function size:0x30 scope:local align:4 +dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv = .text:0x800263D0; // type:function size:0x30 scope:local align:4 +dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv = .text:0x80026400; // type:function size:0x5C scope:local align:4 +readMult__FP11dStage_dt_cP14dStage_Multi_cb = .text:0x8002645C; // type:function size:0x180 scope:local align:4 +dStage_multInfoInit__FP11dStage_dt_cPviPv = .text:0x800265DC; // type:function size:0x94 scope:local align:4 +dStage_lbnkInfoInit__FP11dStage_dt_cPviPv = .text:0x80026670; // type:function size:0x34 scope:local align:4 +dStage_roomTresureInit__FP11dStage_dt_cPviPv = .text:0x800266A4; // type:function size:0x68 scope:local align:4 +dStage_layerTresureInit__FP11dStage_dt_cPviPv = .text:0x8002670C; // type:function size:0x24 scope:local align:4 +dStage_dmapInfoInit__FP11dStage_dt_cPviPv = .text:0x80026730; // type:function size:0x34 scope:local align:4 +dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x80026764; // type:function size:0x78 scope:local align:4 +dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x800267DC; // type:function size:0x68 scope:local align:4 +dStage_elstInfoInit__FP11dStage_dt_cPviPv = .text:0x80026844; // type:function size:0x54 scope:local align:4 +dKankyo_create__Fv = .text:0x80026898; // type:function size:0x7C scope:local align:4 +layerMemoryInfoLoader__FPvP11dStage_dt_ci = .text:0x80026914; // type:function size:0x2C scope:local align:4 +dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c = .text:0x80026940; // type:function size:0x74 scope:local align:4 +layerTableLoader__FPvP11dStage_dt_ci = .text:0x800269B4; // type:function size:0x134 scope:local align:4 getElst__16dStage_stageDt_cFv = .text:0x80026AE8; // type:function size:0x8 scope:global align:4 -layerActorLoader__FPvP11dStage_dt_ci = .text:0x80026AF0; // type:function size:0x68 scope:global align:4 -dStage_dt_c_stageLoader__FPvP11dStage_dt_c = .text:0x80026B58; // type:function size:0x64 scope:global align:4 +layerActorLoader__FPvP11dStage_dt_ci = .text:0x80026AF0; // type:function size:0x68 scope:local align:4 +dStage_dt_c_stageLoader__FPvP11dStage_dt_c = .text:0x80026B58; // type:function size:0x64 scope:local align:4 dStage_dt_c_roomLoader__FPvP11dStage_dt_ci = .text:0x80026BBC; // type:function size:0x78 scope:global align:4 dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci = .text:0x80026C34; // type:function size:0x58 scope:global align:4 dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c = .text:0x80026C8C; // type:function size:0x50 scope:global align:4 @@ -1060,183 +1060,183 @@ setOldMulti__16dStage_stageDt_cFv = .text:0x80026FDC; // type:function size:0xC dStage_RoomCheck__FP11cBgS_GndChk = .text:0x80026FE8; // type:function size:0x114 scope:global align:4 dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs = .text:0x800270FC; // type:function size:0x74 scope:global align:4 dStage_changeScene__FifUlScsi = .text:0x80027170; // type:function size:0x170 scope:global align:4 -getSclsInfo__15dStage_roomDt_cCFv = .text:0x800272E0; // type:function size:0x8 scope:global align:4 -getSclsInfo__16dStage_stageDt_cCFv = .text:0x800272E8; // type:function size:0x8 scope:global align:4 +getSclsInfo__15dStage_roomDt_cCFv = .text:0x800272E0; // type:function size:0x8 scope:weak align:4 +getSclsInfo__16dStage_stageDt_cCFv = .text:0x800272E8; // type:function size:0x8 scope:weak align:4 dStage_changeScene4Event__FiScibfUlsi = .text:0x800272F0; // type:function size:0x1C0 scope:global align:4 dStage_restartRoom__FUlUli = .text:0x800274B0; // type:function size:0x74 scope:global align:4 -setCamera__15dStage_roomDt_cFP18stage_camera_class = .text:0x80027524; // type:function size:0x8 scope:global align:4 -getCamera__15dStage_roomDt_cCFv = .text:0x8002752C; // type:function size:0x8 scope:global align:4 -setArrow__15dStage_roomDt_cFP17stage_arrow_class = .text:0x80027534; // type:function size:0x8 scope:global align:4 -getArrow__15dStage_roomDt_cCFv = .text:0x8002753C; // type:function size:0x8 scope:global align:4 -setPlayer__15dStage_roomDt_cFP17stage_actor_class = .text:0x80027544; // type:function size:0x8 scope:global align:4 -setPlayerNum__15dStage_roomDt_cFUs = .text:0x8002754C; // type:function size:0x8 scope:global align:4 -getPlayerNum__15dStage_roomDt_cCFv = .text:0x80027554; // type:function size:0x8 scope:global align:4 -setRoom__15dStage_roomDt_cFP14roomRead_class = .text:0x8002755C; // type:function size:0x34 scope:global align:4 -getRoom__15dStage_roomDt_cCFv = .text:0x80027590; // type:function size:0x34 scope:global align:4 -setMapInfo__15dStage_roomDt_cFP20stage_map_info_class = .text:0x800275C4; // type:function size:0x8 scope:global align:4 -getMapInfo__15dStage_roomDt_cCFv = .text:0x800275CC; // type:function size:0x8 scope:global align:4 -setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class = .text:0x800275D4; // type:function size:0x8 scope:global align:4 -setPaletteInfo__15dStage_roomDt_cFP24stage_palette_info_class = .text:0x800275DC; // type:function size:0x34 scope:global align:4 -getPaletteInfo__15dStage_roomDt_cCFv = .text:0x80027610; // type:function size:0x34 scope:global align:4 -setPselectInfo__15dStage_roomDt_cFP24stage_pselect_info_class = .text:0x80027644; // type:function size:0x34 scope:global align:4 -getPselectInfo__15dStage_roomDt_cCFv = .text:0x80027678; // type:function size:0x34 scope:global align:4 -setEnvrInfo__15dStage_roomDt_cFP21stage_envr_info_class = .text:0x800276AC; // type:function size:0x34 scope:global align:4 -getEnvrInfo__15dStage_roomDt_cCFv = .text:0x800276E0; // type:function size:0x34 scope:global align:4 -setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class = .text:0x80027714; // type:function size:0x8 scope:global align:4 -getVrboxInfo__15dStage_roomDt_cCFv = .text:0x8002771C; // type:function size:0x8 scope:global align:4 -setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class = .text:0x80027724; // type:function size:0x8 scope:global align:4 -getVrboxcolInfo__15dStage_roomDt_cCFv = .text:0x8002772C; // type:function size:0x8 scope:global align:4 -setPlightInfo__15dStage_roomDt_cFP23stage_plight_info_class = .text:0x80027734; // type:function size:0x34 scope:global align:4 -getPlightInfo__15dStage_roomDt_cCFv = .text:0x80027768; // type:function size:0x34 scope:global align:4 -setPaletteNumInfo__15dStage_roomDt_cFi = .text:0x8002779C; // type:function size:0x34 scope:global align:4 -getPaletteNumInfo__15dStage_roomDt_cCFv = .text:0x800277D0; // type:function size:0x34 scope:global align:4 -setPselectNumInfo__15dStage_roomDt_cFi = .text:0x80027804; // type:function size:0x34 scope:global align:4 -getPselectNumInfo__15dStage_roomDt_cCFv = .text:0x80027838; // type:function size:0x34 scope:global align:4 -setEnvrNumInfo__15dStage_roomDt_cFi = .text:0x8002786C; // type:function size:0x34 scope:global align:4 -getEnvrNumInfo__15dStage_roomDt_cCFv = .text:0x800278A0; // type:function size:0x34 scope:global align:4 -setVrboxNumInfo__15dStage_roomDt_cFi = .text:0x800278D4; // type:function size:0x8 scope:global align:4 -getVrboxNumInfo__15dStage_roomDt_cCFv = .text:0x800278DC; // type:function size:0x8 scope:global align:4 -setVrboxcolNumInfo__15dStage_roomDt_cFi = .text:0x800278E4; // type:function size:0x8 scope:global align:4 -getVrboxcolNumInfo__15dStage_roomDt_cCFv = .text:0x800278EC; // type:function size:0x8 scope:global align:4 -setPlightNumInfo__15dStage_roomDt_cFi = .text:0x800278F4; // type:function size:0x34 scope:global align:4 -getPlightNumInfo__15dStage_roomDt_cCFv = .text:0x80027928; // type:function size:0x34 scope:global align:4 -setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class = .text:0x8002795C; // type:function size:0x8 scope:global align:4 -getLightVecInfo__15dStage_roomDt_cCFv = .text:0x80027964; // type:function size:0x8 scope:global align:4 -setLightVecInfoNum__15dStage_roomDt_cFi = .text:0x8002796C; // type:function size:0x8 scope:global align:4 -getLightVecInfoNum__15dStage_roomDt_cCFv = .text:0x80027974; // type:function size:0x8 scope:global align:4 -setStagInfo__15dStage_roomDt_cFP21stage_stag_info_class = .text:0x8002797C; // type:function size:0x34 scope:global align:4 -getStagInfo__15dStage_roomDt_cCFv = .text:0x800279B0; // type:function size:0x34 scope:global align:4 -setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class = .text:0x800279E4; // type:function size:0x8 scope:global align:4 -setPntInfo__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x800279EC; // type:function size:0x34 scope:global align:4 -getPntInf__15dStage_roomDt_cCFv = .text:0x80027A20; // type:function size:0x34 scope:global align:4 -setPathInfo__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027A54; // type:function size:0x34 scope:global align:4 -getPathInf__15dStage_roomDt_cCFv = .text:0x80027A88; // type:function size:0x34 scope:global align:4 -setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x80027ABC; // type:function size:0x8 scope:global align:4 -getPnt2Inf__15dStage_roomDt_cCFv = .text:0x80027AC4; // type:function size:0x8 scope:global align:4 -setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027ACC; // type:function size:0x8 scope:global align:4 -getPath2Inf__15dStage_roomDt_cCFv = .text:0x80027AD4; // type:function size:0x8 scope:global align:4 -setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027ADC; // type:function size:0x8 scope:global align:4 -getSoundInf__15dStage_roomDt_cCFv = .text:0x80027AE4; // type:function size:0x8 scope:global align:4 -setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027AEC; // type:function size:0x8 scope:global align:4 -getSoundInfCL__15dStage_roomDt_cCFv = .text:0x80027AF4; // type:function size:0x8 scope:global align:4 -setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c = .text:0x80027AFC; // type:function size:0x8 scope:global align:4 -getMapEventInfo__15dStage_roomDt_cCFv = .text:0x80027B04; // type:function size:0x8 scope:global align:4 -setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c = .text:0x80027B0C; // type:function size:0x8 scope:global align:4 -getFileList2Info__15dStage_roomDt_cCFv = .text:0x80027B14; // type:function size:0x8 scope:global align:4 -setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c = .text:0x80027B1C; // type:function size:0x8 scope:global align:4 -setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c = .text:0x80027B24; // type:function size:0x8 scope:global align:4 -getFloorInfo__15dStage_roomDt_cCFv = .text:0x80027B2C; // type:function size:0x8 scope:global align:4 -setMemoryConfig__15dStage_roomDt_cFP21dStage_MemoryConfig_c = .text:0x80027B34; // type:function size:0x30 scope:global align:4 -getMemoryConfig__15dStage_roomDt_cCFv = .text:0x80027B64; // type:function size:0x34 scope:global align:4 -setMemoryMap__15dStage_roomDt_cFP18dStage_MemoryMap_c = .text:0x80027B98; // type:function size:0x30 scope:global align:4 -getMemoryMap__15dStage_roomDt_cCFv = .text:0x80027BC8; // type:function size:0x34 scope:global align:4 -setMulti__15dStage_roomDt_cFP14dStage_Multi_c = .text:0x80027BFC; // type:function size:0x30 scope:global align:4 -getMulti__15dStage_roomDt_cCFv = .text:0x80027C2C; // type:function size:0x34 scope:global align:4 -setOldMulti__15dStage_roomDt_cFv = .text:0x80027C60; // type:function size:0x30 scope:global align:4 -resetOldMulti__15dStage_roomDt_cFv = .text:0x80027C90; // type:function size:0x30 scope:global align:4 -getOldMulti__15dStage_roomDt_cCFv = .text:0x80027CC0; // type:function size:0x34 scope:global align:4 -setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c = .text:0x80027CF4; // type:function size:0x8 scope:global align:4 -getLbnk__15dStage_roomDt_cCFv = .text:0x80027CFC; // type:function size:0x8 scope:global align:4 -setTresure__15dStage_roomDt_cFP19stage_tresure_class = .text:0x80027D04; // type:function size:0x8 scope:global align:4 -getTresure__15dStage_roomDt_cCFv = .text:0x80027D0C; // type:function size:0x8 scope:global align:4 -setDMap__15dStage_roomDt_cFP13dStage_DMap_c = .text:0x80027D14; // type:function size:0x4 scope:global align:4 -getDMap__15dStage_roomDt_cCFv = .text:0x80027D18; // type:function size:0x8 scope:global align:4 -setDrTg__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027D20; // type:function size:0x8 scope:global align:4 -getDrTg__15dStage_roomDt_cCFv = .text:0x80027D28; // type:function size:0x8 scope:global align:4 -setDoor__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027D30; // type:function size:0x8 scope:global align:4 -getDoor__15dStage_roomDt_cCFv = .text:0x80027D38; // type:function size:0x8 scope:global align:4 -setMapPath__15dStage_roomDt_cFPv = .text:0x80027D40; // type:function size:0x30 scope:global align:4 -getMapPath__15dStage_roomDt_cFv = .text:0x80027D70; // type:function size:0x34 scope:global align:4 -setElst__15dStage_roomDt_cFP13dStage_Elst_c = .text:0x80027DA4; // type:function size:0x34 scope:global align:4 -getElst__15dStage_roomDt_cFv = .text:0x80027DD8; // type:function size:0x38 scope:global align:4 -setCamera__16dStage_stageDt_cFP18stage_camera_class = .text:0x80027E10; // type:function size:0x8 scope:global align:4 -getCamera__16dStage_stageDt_cCFv = .text:0x80027E18; // type:function size:0x8 scope:global align:4 -setArrow__16dStage_stageDt_cFP17stage_arrow_class = .text:0x80027E20; // type:function size:0x8 scope:global align:4 -getArrow__16dStage_stageDt_cCFv = .text:0x80027E28; // type:function size:0x8 scope:global align:4 -setPlayer__16dStage_stageDt_cFP17stage_actor_class = .text:0x80027E30; // type:function size:0x8 scope:global align:4 -setPlayerNum__16dStage_stageDt_cFUs = .text:0x80027E38; // type:function size:0x8 scope:global align:4 -getPlayerNum__16dStage_stageDt_cCFv = .text:0x80027E40; // type:function size:0x8 scope:global align:4 -setRoom__16dStage_stageDt_cFP14roomRead_class = .text:0x80027E48; // type:function size:0x8 scope:global align:4 -setMapInfo__16dStage_stageDt_cFP20stage_map_info_class = .text:0x80027E50; // type:function size:0x8 scope:global align:4 -getMapInfo__16dStage_stageDt_cCFv = .text:0x80027E58; // type:function size:0x8 scope:global align:4 -setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class = .text:0x80027E60; // type:function size:0x8 scope:global align:4 -setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class = .text:0x80027E68; // type:function size:0x8 scope:global align:4 -getPaletteInfo__16dStage_stageDt_cCFv = .text:0x80027E70; // type:function size:0x8 scope:global align:4 -setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class = .text:0x80027E78; // type:function size:0x8 scope:global align:4 -getPselectInfo__16dStage_stageDt_cCFv = .text:0x80027E80; // type:function size:0x8 scope:global align:4 -setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class = .text:0x80027E88; // type:function size:0x8 scope:global align:4 -getEnvrInfo__16dStage_stageDt_cCFv = .text:0x80027E90; // type:function size:0x8 scope:global align:4 -setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class = .text:0x80027E98; // type:function size:0x8 scope:global align:4 -getVrboxInfo__16dStage_stageDt_cCFv = .text:0x80027EA0; // type:function size:0x8 scope:global align:4 -setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class = .text:0x80027EA8; // type:function size:0x8 scope:global align:4 -getVrboxcolInfo__16dStage_stageDt_cCFv = .text:0x80027EB0; // type:function size:0x8 scope:global align:4 -setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class = .text:0x80027EB8; // type:function size:0x8 scope:global align:4 -getPlightInfo__16dStage_stageDt_cCFv = .text:0x80027EC0; // type:function size:0x8 scope:global align:4 -setPaletteNumInfo__16dStage_stageDt_cFi = .text:0x80027EC8; // type:function size:0x8 scope:global align:4 -getPaletteNumInfo__16dStage_stageDt_cCFv = .text:0x80027ED0; // type:function size:0x8 scope:global align:4 -setPselectNumInfo__16dStage_stageDt_cFi = .text:0x80027ED8; // type:function size:0x8 scope:global align:4 -getPselectNumInfo__16dStage_stageDt_cCFv = .text:0x80027EE0; // type:function size:0x8 scope:global align:4 -setEnvrNumInfo__16dStage_stageDt_cFi = .text:0x80027EE8; // type:function size:0x8 scope:global align:4 -getEnvrNumInfo__16dStage_stageDt_cCFv = .text:0x80027EF0; // type:function size:0x8 scope:global align:4 -setVrboxNumInfo__16dStage_stageDt_cFi = .text:0x80027EF8; // type:function size:0x8 scope:global align:4 -getVrboxNumInfo__16dStage_stageDt_cCFv = .text:0x80027F00; // type:function size:0x8 scope:global align:4 -setVrboxcolNumInfo__16dStage_stageDt_cFi = .text:0x80027F08; // type:function size:0x8 scope:global align:4 -getVrboxcolNumInfo__16dStage_stageDt_cCFv = .text:0x80027F10; // type:function size:0x8 scope:global align:4 -setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class = .text:0x80027F18; // type:function size:0x34 scope:global align:4 -getLightVecInfo__16dStage_stageDt_cCFv = .text:0x80027F4C; // type:function size:0x34 scope:global align:4 -setLightVecInfoNum__16dStage_stageDt_cFi = .text:0x80027F80; // type:function size:0x34 scope:global align:4 -getLightVecInfoNum__16dStage_stageDt_cCFv = .text:0x80027FB4; // type:function size:0x34 scope:global align:4 -setPlightNumInfo__16dStage_stageDt_cFi = .text:0x80027FE8; // type:function size:0x8 scope:global align:4 -getPlightNumInfo__16dStage_stageDt_cCFv = .text:0x80027FF0; // type:function size:0x8 scope:global align:4 -setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class = .text:0x80027FF8; // type:function size:0x8 scope:global align:4 -setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class = .text:0x80028000; // type:function size:0x8 scope:global align:4 -setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x80028008; // type:function size:0x8 scope:global align:4 -getPntInf__16dStage_stageDt_cCFv = .text:0x80028010; // type:function size:0x8 scope:global align:4 -setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x80028018; // type:function size:0x8 scope:global align:4 -getPathInf__16dStage_stageDt_cCFv = .text:0x80028020; // type:function size:0x8 scope:global align:4 -setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x80028028; // type:function size:0x8 scope:global align:4 -getPnt2Inf__16dStage_stageDt_cCFv = .text:0x80028030; // type:function size:0x8 scope:global align:4 -setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x80028038; // type:function size:0x8 scope:global align:4 -getPath2Inf__16dStage_stageDt_cCFv = .text:0x80028040; // type:function size:0x8 scope:global align:4 -setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x80028048; // type:function size:0x8 scope:global align:4 -getSoundInf__16dStage_stageDt_cCFv = .text:0x80028050; // type:function size:0x8 scope:global align:4 -setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x80028058; // type:function size:0x8 scope:global align:4 -getSoundInfCL__16dStage_stageDt_cCFv = .text:0x80028060; // type:function size:0x8 scope:global align:4 -setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c = .text:0x80028068; // type:function size:0x8 scope:global align:4 -getMapEventInfo__16dStage_stageDt_cCFv = .text:0x80028070; // type:function size:0x8 scope:global align:4 -setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c = .text:0x80028078; // type:function size:0x34 scope:global align:4 -getFileList2Info__16dStage_stageDt_cCFv = .text:0x800280AC; // type:function size:0x34 scope:global align:4 -setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c = .text:0x800280E0; // type:function size:0x34 scope:global align:4 -getFileListInfo__16dStage_stageDt_cCFv = .text:0x80028114; // type:function size:0x34 scope:global align:4 -setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c = .text:0x80028148; // type:function size:0x8 scope:global align:4 -getFloorInfo__16dStage_stageDt_cCFv = .text:0x80028150; // type:function size:0x8 scope:global align:4 -setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c = .text:0x80028158; // type:function size:0x8 scope:global align:4 -getMemoryConfig__16dStage_stageDt_cCFv = .text:0x80028160; // type:function size:0x8 scope:global align:4 -setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c = .text:0x80028168; // type:function size:0x8 scope:global align:4 -getMemoryMap__16dStage_stageDt_cCFv = .text:0x80028170; // type:function size:0x8 scope:global align:4 -setMulti__16dStage_stageDt_cFP14dStage_Multi_c = .text:0x80028178; // type:function size:0x8 scope:global align:4 -getMulti__16dStage_stageDt_cCFv = .text:0x80028180; // type:function size:0x8 scope:global align:4 -getOldMulti__16dStage_stageDt_cCFv = .text:0x80028188; // type:function size:0x8 scope:global align:4 -setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c = .text:0x80028190; // type:function size:0x34 scope:global align:4 -getLbnk__16dStage_stageDt_cCFv = .text:0x800281C4; // type:function size:0x34 scope:global align:4 -setTresure__16dStage_stageDt_cFP19stage_tresure_class = .text:0x800281F8; // type:function size:0x8 scope:global align:4 -getTresure__16dStage_stageDt_cCFv = .text:0x80028200; // type:function size:0x8 scope:global align:4 -setDMap__16dStage_stageDt_cFP13dStage_DMap_c = .text:0x80028208; // type:function size:0x8 scope:global align:4 -getDMap__16dStage_stageDt_cCFv = .text:0x80028210; // type:function size:0x8 scope:global align:4 -setDrTg__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x80028218; // type:function size:0x8 scope:global align:4 -getDrTg__16dStage_stageDt_cCFv = .text:0x80028220; // type:function size:0x8 scope:global align:4 -setDoor__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x80028228; // type:function size:0x8 scope:global align:4 -getDoor__16dStage_stageDt_cCFv = .text:0x80028230; // type:function size:0x8 scope:global align:4 -setMapPath__16dStage_stageDt_cFPv = .text:0x80028238; // type:function size:0x4 scope:global align:4 -getMapPath__16dStage_stageDt_cFv = .text:0x8002823C; // type:function size:0x8 scope:global align:4 -setElst__16dStage_stageDt_cFP13dStage_Elst_c = .text:0x80028244; // type:function size:0x8 scope:global align:4 +setCamera__15dStage_roomDt_cFP18stage_camera_class = .text:0x80027524; // type:function size:0x8 scope:weak align:4 +getCamera__15dStage_roomDt_cCFv = .text:0x8002752C; // type:function size:0x8 scope:weak align:4 +setArrow__15dStage_roomDt_cFP17stage_arrow_class = .text:0x80027534; // type:function size:0x8 scope:weak align:4 +getArrow__15dStage_roomDt_cCFv = .text:0x8002753C; // type:function size:0x8 scope:weak align:4 +setPlayer__15dStage_roomDt_cFP17stage_actor_class = .text:0x80027544; // type:function size:0x8 scope:weak align:4 +setPlayerNum__15dStage_roomDt_cFUs = .text:0x8002754C; // type:function size:0x8 scope:weak align:4 +getPlayerNum__15dStage_roomDt_cCFv = .text:0x80027554; // type:function size:0x8 scope:weak align:4 +setRoom__15dStage_roomDt_cFP14roomRead_class = .text:0x8002755C; // type:function size:0x34 scope:weak align:4 +getRoom__15dStage_roomDt_cCFv = .text:0x80027590; // type:function size:0x34 scope:weak align:4 +setMapInfo__15dStage_roomDt_cFP20stage_map_info_class = .text:0x800275C4; // type:function size:0x8 scope:weak align:4 +getMapInfo__15dStage_roomDt_cCFv = .text:0x800275CC; // type:function size:0x8 scope:weak align:4 +setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class = .text:0x800275D4; // type:function size:0x8 scope:weak align:4 +setPaletteInfo__15dStage_roomDt_cFP24stage_palette_info_class = .text:0x800275DC; // type:function size:0x34 scope:weak align:4 +getPaletteInfo__15dStage_roomDt_cCFv = .text:0x80027610; // type:function size:0x34 scope:weak align:4 +setPselectInfo__15dStage_roomDt_cFP24stage_pselect_info_class = .text:0x80027644; // type:function size:0x34 scope:weak align:4 +getPselectInfo__15dStage_roomDt_cCFv = .text:0x80027678; // type:function size:0x34 scope:weak align:4 +setEnvrInfo__15dStage_roomDt_cFP21stage_envr_info_class = .text:0x800276AC; // type:function size:0x34 scope:weak align:4 +getEnvrInfo__15dStage_roomDt_cCFv = .text:0x800276E0; // type:function size:0x34 scope:weak align:4 +setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class = .text:0x80027714; // type:function size:0x8 scope:weak align:4 +getVrboxInfo__15dStage_roomDt_cCFv = .text:0x8002771C; // type:function size:0x8 scope:weak align:4 +setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class = .text:0x80027724; // type:function size:0x8 scope:weak align:4 +getVrboxcolInfo__15dStage_roomDt_cCFv = .text:0x8002772C; // type:function size:0x8 scope:weak align:4 +setPlightInfo__15dStage_roomDt_cFP23stage_plight_info_class = .text:0x80027734; // type:function size:0x34 scope:weak align:4 +getPlightInfo__15dStage_roomDt_cCFv = .text:0x80027768; // type:function size:0x34 scope:weak align:4 +setPaletteNumInfo__15dStage_roomDt_cFi = .text:0x8002779C; // type:function size:0x34 scope:weak align:4 +getPaletteNumInfo__15dStage_roomDt_cCFv = .text:0x800277D0; // type:function size:0x34 scope:weak align:4 +setPselectNumInfo__15dStage_roomDt_cFi = .text:0x80027804; // type:function size:0x34 scope:weak align:4 +getPselectNumInfo__15dStage_roomDt_cCFv = .text:0x80027838; // type:function size:0x34 scope:weak align:4 +setEnvrNumInfo__15dStage_roomDt_cFi = .text:0x8002786C; // type:function size:0x34 scope:weak align:4 +getEnvrNumInfo__15dStage_roomDt_cCFv = .text:0x800278A0; // type:function size:0x34 scope:weak align:4 +setVrboxNumInfo__15dStage_roomDt_cFi = .text:0x800278D4; // type:function size:0x8 scope:weak align:4 +getVrboxNumInfo__15dStage_roomDt_cCFv = .text:0x800278DC; // type:function size:0x8 scope:weak align:4 +setVrboxcolNumInfo__15dStage_roomDt_cFi = .text:0x800278E4; // type:function size:0x8 scope:weak align:4 +getVrboxcolNumInfo__15dStage_roomDt_cCFv = .text:0x800278EC; // type:function size:0x8 scope:weak align:4 +setPlightNumInfo__15dStage_roomDt_cFi = .text:0x800278F4; // type:function size:0x34 scope:weak align:4 +getPlightNumInfo__15dStage_roomDt_cCFv = .text:0x80027928; // type:function size:0x34 scope:weak align:4 +setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class = .text:0x8002795C; // type:function size:0x8 scope:weak align:4 +getLightVecInfo__15dStage_roomDt_cCFv = .text:0x80027964; // type:function size:0x8 scope:weak align:4 +setLightVecInfoNum__15dStage_roomDt_cFi = .text:0x8002796C; // type:function size:0x8 scope:weak align:4 +getLightVecInfoNum__15dStage_roomDt_cCFv = .text:0x80027974; // type:function size:0x8 scope:weak align:4 +setStagInfo__15dStage_roomDt_cFP21stage_stag_info_class = .text:0x8002797C; // type:function size:0x34 scope:weak align:4 +getStagInfo__15dStage_roomDt_cCFv = .text:0x800279B0; // type:function size:0x34 scope:weak align:4 +setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class = .text:0x800279E4; // type:function size:0x8 scope:weak align:4 +setPntInfo__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x800279EC; // type:function size:0x34 scope:weak align:4 +getPntInf__15dStage_roomDt_cCFv = .text:0x80027A20; // type:function size:0x34 scope:weak align:4 +setPathInfo__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027A54; // type:function size:0x34 scope:weak align:4 +getPathInf__15dStage_roomDt_cCFv = .text:0x80027A88; // type:function size:0x34 scope:weak align:4 +setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x80027ABC; // type:function size:0x8 scope:weak align:4 +getPnt2Inf__15dStage_roomDt_cCFv = .text:0x80027AC4; // type:function size:0x8 scope:weak align:4 +setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027ACC; // type:function size:0x8 scope:weak align:4 +getPath2Inf__15dStage_roomDt_cCFv = .text:0x80027AD4; // type:function size:0x8 scope:weak align:4 +setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027ADC; // type:function size:0x8 scope:weak align:4 +getSoundInf__15dStage_roomDt_cCFv = .text:0x80027AE4; // type:function size:0x8 scope:weak align:4 +setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027AEC; // type:function size:0x8 scope:weak align:4 +getSoundInfCL__15dStage_roomDt_cCFv = .text:0x80027AF4; // type:function size:0x8 scope:weak align:4 +setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c = .text:0x80027AFC; // type:function size:0x8 scope:weak align:4 +getMapEventInfo__15dStage_roomDt_cCFv = .text:0x80027B04; // type:function size:0x8 scope:weak align:4 +setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c = .text:0x80027B0C; // type:function size:0x8 scope:weak align:4 +getFileList2Info__15dStage_roomDt_cCFv = .text:0x80027B14; // type:function size:0x8 scope:weak align:4 +setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c = .text:0x80027B1C; // type:function size:0x8 scope:weak align:4 +setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c = .text:0x80027B24; // type:function size:0x8 scope:weak align:4 +getFloorInfo__15dStage_roomDt_cCFv = .text:0x80027B2C; // type:function size:0x8 scope:weak align:4 +setMemoryConfig__15dStage_roomDt_cFP21dStage_MemoryConfig_c = .text:0x80027B34; // type:function size:0x30 scope:weak align:4 +getMemoryConfig__15dStage_roomDt_cCFv = .text:0x80027B64; // type:function size:0x34 scope:weak align:4 +setMemoryMap__15dStage_roomDt_cFP18dStage_MemoryMap_c = .text:0x80027B98; // type:function size:0x30 scope:weak align:4 +getMemoryMap__15dStage_roomDt_cCFv = .text:0x80027BC8; // type:function size:0x34 scope:weak align:4 +setMulti__15dStage_roomDt_cFP14dStage_Multi_c = .text:0x80027BFC; // type:function size:0x30 scope:weak align:4 +getMulti__15dStage_roomDt_cCFv = .text:0x80027C2C; // type:function size:0x34 scope:weak align:4 +setOldMulti__15dStage_roomDt_cFv = .text:0x80027C60; // type:function size:0x30 scope:weak align:4 +resetOldMulti__15dStage_roomDt_cFv = .text:0x80027C90; // type:function size:0x30 scope:weak align:4 +getOldMulti__15dStage_roomDt_cCFv = .text:0x80027CC0; // type:function size:0x34 scope:weak align:4 +setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c = .text:0x80027CF4; // type:function size:0x8 scope:weak align:4 +getLbnk__15dStage_roomDt_cCFv = .text:0x80027CFC; // type:function size:0x8 scope:weak align:4 +setTresure__15dStage_roomDt_cFP19stage_tresure_class = .text:0x80027D04; // type:function size:0x8 scope:weak align:4 +getTresure__15dStage_roomDt_cCFv = .text:0x80027D0C; // type:function size:0x8 scope:weak align:4 +setDMap__15dStage_roomDt_cFP13dStage_DMap_c = .text:0x80027D14; // type:function size:0x4 scope:weak align:4 +getDMap__15dStage_roomDt_cCFv = .text:0x80027D18; // type:function size:0x8 scope:weak align:4 +setDrTg__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027D20; // type:function size:0x8 scope:weak align:4 +getDrTg__15dStage_roomDt_cCFv = .text:0x80027D28; // type:function size:0x8 scope:weak align:4 +setDoor__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027D30; // type:function size:0x8 scope:weak align:4 +getDoor__15dStage_roomDt_cCFv = .text:0x80027D38; // type:function size:0x8 scope:weak align:4 +setMapPath__15dStage_roomDt_cFPv = .text:0x80027D40; // type:function size:0x30 scope:weak align:4 +getMapPath__15dStage_roomDt_cFv = .text:0x80027D70; // type:function size:0x34 scope:weak align:4 +setElst__15dStage_roomDt_cFP13dStage_Elst_c = .text:0x80027DA4; // type:function size:0x34 scope:weak align:4 +getElst__15dStage_roomDt_cFv = .text:0x80027DD8; // type:function size:0x38 scope:weak align:4 +setCamera__16dStage_stageDt_cFP18stage_camera_class = .text:0x80027E10; // type:function size:0x8 scope:weak align:4 +getCamera__16dStage_stageDt_cCFv = .text:0x80027E18; // type:function size:0x8 scope:weak align:4 +setArrow__16dStage_stageDt_cFP17stage_arrow_class = .text:0x80027E20; // type:function size:0x8 scope:weak align:4 +getArrow__16dStage_stageDt_cCFv = .text:0x80027E28; // type:function size:0x8 scope:weak align:4 +setPlayer__16dStage_stageDt_cFP17stage_actor_class = .text:0x80027E30; // type:function size:0x8 scope:weak align:4 +setPlayerNum__16dStage_stageDt_cFUs = .text:0x80027E38; // type:function size:0x8 scope:weak align:4 +getPlayerNum__16dStage_stageDt_cCFv = .text:0x80027E40; // type:function size:0x8 scope:weak align:4 +setRoom__16dStage_stageDt_cFP14roomRead_class = .text:0x80027E48; // type:function size:0x8 scope:weak align:4 +setMapInfo__16dStage_stageDt_cFP20stage_map_info_class = .text:0x80027E50; // type:function size:0x8 scope:weak align:4 +getMapInfo__16dStage_stageDt_cCFv = .text:0x80027E58; // type:function size:0x8 scope:weak align:4 +setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class = .text:0x80027E60; // type:function size:0x8 scope:weak align:4 +setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class = .text:0x80027E68; // type:function size:0x8 scope:weak align:4 +getPaletteInfo__16dStage_stageDt_cCFv = .text:0x80027E70; // type:function size:0x8 scope:weak align:4 +setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class = .text:0x80027E78; // type:function size:0x8 scope:weak align:4 +getPselectInfo__16dStage_stageDt_cCFv = .text:0x80027E80; // type:function size:0x8 scope:weak align:4 +setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class = .text:0x80027E88; // type:function size:0x8 scope:weak align:4 +getEnvrInfo__16dStage_stageDt_cCFv = .text:0x80027E90; // type:function size:0x8 scope:weak align:4 +setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class = .text:0x80027E98; // type:function size:0x8 scope:weak align:4 +getVrboxInfo__16dStage_stageDt_cCFv = .text:0x80027EA0; // type:function size:0x8 scope:weak align:4 +setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class = .text:0x80027EA8; // type:function size:0x8 scope:weak align:4 +getVrboxcolInfo__16dStage_stageDt_cCFv = .text:0x80027EB0; // type:function size:0x8 scope:weak align:4 +setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class = .text:0x80027EB8; // type:function size:0x8 scope:weak align:4 +getPlightInfo__16dStage_stageDt_cCFv = .text:0x80027EC0; // type:function size:0x8 scope:weak align:4 +setPaletteNumInfo__16dStage_stageDt_cFi = .text:0x80027EC8; // type:function size:0x8 scope:weak align:4 +getPaletteNumInfo__16dStage_stageDt_cCFv = .text:0x80027ED0; // type:function size:0x8 scope:weak align:4 +setPselectNumInfo__16dStage_stageDt_cFi = .text:0x80027ED8; // type:function size:0x8 scope:weak align:4 +getPselectNumInfo__16dStage_stageDt_cCFv = .text:0x80027EE0; // type:function size:0x8 scope:weak align:4 +setEnvrNumInfo__16dStage_stageDt_cFi = .text:0x80027EE8; // type:function size:0x8 scope:weak align:4 +getEnvrNumInfo__16dStage_stageDt_cCFv = .text:0x80027EF0; // type:function size:0x8 scope:weak align:4 +setVrboxNumInfo__16dStage_stageDt_cFi = .text:0x80027EF8; // type:function size:0x8 scope:weak align:4 +getVrboxNumInfo__16dStage_stageDt_cCFv = .text:0x80027F00; // type:function size:0x8 scope:weak align:4 +setVrboxcolNumInfo__16dStage_stageDt_cFi = .text:0x80027F08; // type:function size:0x8 scope:weak align:4 +getVrboxcolNumInfo__16dStage_stageDt_cCFv = .text:0x80027F10; // type:function size:0x8 scope:weak align:4 +setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class = .text:0x80027F18; // type:function size:0x34 scope:weak align:4 +getLightVecInfo__16dStage_stageDt_cCFv = .text:0x80027F4C; // type:function size:0x34 scope:weak align:4 +setLightVecInfoNum__16dStage_stageDt_cFi = .text:0x80027F80; // type:function size:0x34 scope:weak align:4 +getLightVecInfoNum__16dStage_stageDt_cCFv = .text:0x80027FB4; // type:function size:0x34 scope:weak align:4 +setPlightNumInfo__16dStage_stageDt_cFi = .text:0x80027FE8; // type:function size:0x8 scope:weak align:4 +getPlightNumInfo__16dStage_stageDt_cCFv = .text:0x80027FF0; // type:function size:0x8 scope:weak align:4 +setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class = .text:0x80027FF8; // type:function size:0x8 scope:weak align:4 +setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class = .text:0x80028000; // type:function size:0x8 scope:weak align:4 +setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x80028008; // type:function size:0x8 scope:weak align:4 +getPntInf__16dStage_stageDt_cCFv = .text:0x80028010; // type:function size:0x8 scope:weak align:4 +setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x80028018; // type:function size:0x8 scope:weak align:4 +getPathInf__16dStage_stageDt_cCFv = .text:0x80028020; // type:function size:0x8 scope:weak align:4 +setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x80028028; // type:function size:0x8 scope:weak align:4 +getPnt2Inf__16dStage_stageDt_cCFv = .text:0x80028030; // type:function size:0x8 scope:weak align:4 +setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x80028038; // type:function size:0x8 scope:weak align:4 +getPath2Inf__16dStage_stageDt_cCFv = .text:0x80028040; // type:function size:0x8 scope:weak align:4 +setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x80028048; // type:function size:0x8 scope:weak align:4 +getSoundInf__16dStage_stageDt_cCFv = .text:0x80028050; // type:function size:0x8 scope:weak align:4 +setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x80028058; // type:function size:0x8 scope:weak align:4 +getSoundInfCL__16dStage_stageDt_cCFv = .text:0x80028060; // type:function size:0x8 scope:weak align:4 +setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c = .text:0x80028068; // type:function size:0x8 scope:weak align:4 +getMapEventInfo__16dStage_stageDt_cCFv = .text:0x80028070; // type:function size:0x8 scope:weak align:4 +setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c = .text:0x80028078; // type:function size:0x34 scope:weak align:4 +getFileList2Info__16dStage_stageDt_cCFv = .text:0x800280AC; // type:function size:0x34 scope:weak align:4 +setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c = .text:0x800280E0; // type:function size:0x34 scope:weak align:4 +getFileListInfo__16dStage_stageDt_cCFv = .text:0x80028114; // type:function size:0x34 scope:weak align:4 +setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c = .text:0x80028148; // type:function size:0x8 scope:weak align:4 +getFloorInfo__16dStage_stageDt_cCFv = .text:0x80028150; // type:function size:0x8 scope:weak align:4 +setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c = .text:0x80028158; // type:function size:0x8 scope:weak align:4 +getMemoryConfig__16dStage_stageDt_cCFv = .text:0x80028160; // type:function size:0x8 scope:weak align:4 +setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c = .text:0x80028168; // type:function size:0x8 scope:weak align:4 +getMemoryMap__16dStage_stageDt_cCFv = .text:0x80028170; // type:function size:0x8 scope:weak align:4 +setMulti__16dStage_stageDt_cFP14dStage_Multi_c = .text:0x80028178; // type:function size:0x8 scope:weak align:4 +getMulti__16dStage_stageDt_cCFv = .text:0x80028180; // type:function size:0x8 scope:weak align:4 +getOldMulti__16dStage_stageDt_cCFv = .text:0x80028188; // type:function size:0x8 scope:weak align:4 +setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c = .text:0x80028190; // type:function size:0x34 scope:weak align:4 +getLbnk__16dStage_stageDt_cCFv = .text:0x800281C4; // type:function size:0x34 scope:weak align:4 +setTresure__16dStage_stageDt_cFP19stage_tresure_class = .text:0x800281F8; // type:function size:0x8 scope:weak align:4 +getTresure__16dStage_stageDt_cCFv = .text:0x80028200; // type:function size:0x8 scope:weak align:4 +setDMap__16dStage_stageDt_cFP13dStage_DMap_c = .text:0x80028208; // type:function size:0x8 scope:weak align:4 +getDMap__16dStage_stageDt_cCFv = .text:0x80028210; // type:function size:0x8 scope:weak align:4 +setDrTg__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x80028218; // type:function size:0x8 scope:weak align:4 +getDrTg__16dStage_stageDt_cCFv = .text:0x80028220; // type:function size:0x8 scope:weak align:4 +setDoor__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x80028228; // type:function size:0x8 scope:weak align:4 +getDoor__16dStage_stageDt_cCFv = .text:0x80028230; // type:function size:0x8 scope:weak align:4 +setMapPath__16dStage_stageDt_cFPv = .text:0x80028238; // type:function size:0x4 scope:weak align:4 +getMapPath__16dStage_stageDt_cFv = .text:0x8002823C; // type:function size:0x8 scope:weak align:4 +setElst__16dStage_stageDt_cFP13dStage_Elst_c = .text:0x80028244; // type:function size:0x8 scope:weak align:4 __sinit_d_stage_cpp = .text:0x8002824C; // type:function size:0xDC scope:local align:4 __arraydtor$5375 = .text:0x80028328; // type:function size:0x38 scope:local align:4 -__dt__19dStage_roomStatus_cFv = .text:0x80028360; // type:function size:0x3C scope:global align:4 -__ct__19dStage_roomStatus_cFv = .text:0x8002839C; // type:function size:0x7C scope:global align:4 -__dt__19dStage_KeepDoorInfoFv = .text:0x80028418; // type:function size:0x64 scope:global align:4 -__dt__21stage_tgsc_data_classFv = .text:0x8002847C; // type:function size:0x3C scope:global align:4 -__ct__21stage_tgsc_data_classFv = .text:0x800284B8; // type:function size:0x4 scope:global align:4 +__dt__19dStage_roomStatus_cFv = .text:0x80028360; // type:function size:0x3C scope:weak align:4 +__ct__19dStage_roomStatus_cFv = .text:0x8002839C; // type:function size:0x7C scope:weak align:4 +__dt__19dStage_KeepDoorInfoFv = .text:0x80028418; // type:function size:0x64 scope:weak align:4 +__dt__21stage_tgsc_data_classFv = .text:0x8002847C; // type:function size:0x3C scope:weak align:4 +__ct__21stage_tgsc_data_classFv = .text:0x800284B8; // type:function size:0x4 scope:weak align:4 getIconSize__15renderingAmap_cCFUc = .text:0x800284BC; // type:function size:0x14 scope:global align:4 draw__15renderingAmap_cFv = .text:0x800284D0; // type:function size:0x3F4 scope:global align:4 getDispType__15renderingAmap_cCFv = .text:0x800288C4; // type:function size:0x9C scope:global align:4 @@ -1290,20 +1290,20 @@ _move__6dMap_cFffif = .text:0x8002A32C; // type:function size:0x828 scope:global _draw__6dMap_cFv = .text:0x8002AB54; // type:function size:0x58 scope:global align:4 getFirstData__6dMap_cFUc = .text:0x8002ABAC; // type:function size:0x20 scope:global align:4 getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c = .text:0x8002ABCC; // type:function size:0x20 scope:global align:4 -draw__12dDlst_base_cFv = .text:0x8002ABEC; // type:function size:0x4 scope:global align:4 -isDrawType__11dDrawPath_cFi = .text:0x8002ABF0; // type:function size:0x8 scope:global align:4 -__dt__18dRenderingFDAmap_cFv = .text:0x8002ABF8; // type:function size:0x7C scope:global align:4 -__dt__15dRenderingMap_cFv = .text:0x8002AC74; // type:function size:0x6C scope:global align:4 -__dt__28dDrawPathWithNormalPattern_cFv = .text:0x8002ACE0; // type:function size:0x5C scope:global align:4 -__dt__11dDrawPath_cFv = .text:0x8002AD3C; // type:function size:0x48 scope:global align:4 -getLineColor__11dDrawPath_cFii = .text:0x8002AD84; // type:function size:0x2C scope:global align:4 -__dt__15renderingAmap_cFv = .text:0x8002ADB0; // type:function size:0xBC scope:global align:4 -__ct__15renderingAmap_cFv = .text:0x8002AE6C; // type:function size:0xB4 scope:global align:4 -__dt__6dMap_cFv = .text:0x8002AF20; // type:function size:0xE0 scope:global align:4 -isRendIcon__15renderingAmap_cCFv = .text:0x8002B000; // type:function size:0x8 scope:global align:4 -__dt__28renderingPlusDoorAndCursor_cFv = .text:0x8002B008; // type:function size:0xAC scope:global align:4 -__dt__19renderingPlusDoor_cFv = .text:0x8002B0B4; // type:function size:0x9C scope:global align:4 -__dt__16renderingDAmap_cFv = .text:0x8002B150; // type:function size:0x8C scope:global align:4 +draw__12dDlst_base_cFv = .text:0x8002ABEC; // type:function size:0x4 scope:weak align:4 +isDrawType__11dDrawPath_cFi = .text:0x8002ABF0; // type:function size:0x8 scope:weak align:4 +__dt__18dRenderingFDAmap_cFv = .text:0x8002ABF8; // type:function size:0x7C scope:weak align:4 +__dt__15dRenderingMap_cFv = .text:0x8002AC74; // type:function size:0x6C scope:weak align:4 +__dt__28dDrawPathWithNormalPattern_cFv = .text:0x8002ACE0; // type:function size:0x5C scope:weak align:4 +__dt__11dDrawPath_cFv = .text:0x8002AD3C; // type:function size:0x48 scope:weak align:4 +getLineColor__11dDrawPath_cFii = .text:0x8002AD84; // type:function size:0x2C scope:weak align:4 +__dt__15renderingAmap_cFv = .text:0x8002ADB0; // type:function size:0xBC scope:weak align:4 +__ct__15renderingAmap_cFv = .text:0x8002AE6C; // type:function size:0xB4 scope:weak align:4 +__dt__6dMap_cFv = .text:0x8002AF20; // type:function size:0xE0 scope:weak align:4 +isRendIcon__15renderingAmap_cCFv = .text:0x8002B000; // type:function size:0x8 scope:weak align:4 +__dt__28renderingPlusDoorAndCursor_cFv = .text:0x8002B008; // type:function size:0xAC scope:weak align:4 +__dt__19renderingPlusDoor_cFv = .text:0x8002B0B4; // type:function size:0x9C scope:weak align:4 +__dt__16renderingDAmap_cFv = .text:0x8002B150; // type:function size:0x8C scope:weak align:4 ct__14dComIfG_play_cFv = .text:0x8002B1DC; // type:function size:0x50 scope:global align:4 init__14dComIfG_play_cFv = .text:0x8002B22C; // type:function size:0x7C scope:global align:4 dComIfGp_checkItemGet__FUci = .text:0x8002B2A8; // type:function size:0x20 scope:global align:4 @@ -1340,11 +1340,11 @@ dComIfG_changeOpeningScene__FP11scene_classs = .text:0x8002CC54; // type:functio dComIfG_resetToOpening__FP11scene_class = .text:0x8002CD44; // type:function size:0x74 scope:global align:4 phase_1__FPc = .text:0x8002CDB8; // type:function size:0x80 scope:local align:4 phase_2__FPc = .text:0x8002CE38; // type:function size:0x7C scope:local align:4 -phase_3__FPc = .text:0x8002CEB4; // type:function size:0x8 scope:global align:4 +phase_3__FPc = .text:0x8002CEB4; // type:function size:0x8 scope:local align:4 dComIfG_resLoad__FP30request_of_phase_process_classPCc = .text:0x8002CEBC; // type:function size:0x40 scope:global align:4 -phase_01__FP12phaseParam_c = .text:0x8002CEFC; // type:function size:0x60 scope:global align:4 -phase_02__FP12phaseParam_c = .text:0x8002CF5C; // type:function size:0x5C scope:global align:4 -phase_03__FP12phaseParam_c = .text:0x8002CFB8; // type:function size:0x8 scope:global align:4 +phase_01__FP12phaseParam_c = .text:0x8002CEFC; // type:function size:0x60 scope:local align:4 +phase_02__FP12phaseParam_c = .text:0x8002CF5C; // type:function size:0x5C scope:local align:4 +phase_03__FP12phaseParam_c = .text:0x8002CFB8; // type:function size:0x8 scope:local align:4 dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap = .text:0x8002CFC0; // type:function size:0x48 scope:global align:4 dComIfG_resDelete__FP30request_of_phase_process_classPCc = .text:0x8002D008; // type:function size:0x64 scope:global align:4 dComIfGp_getReverb__Fi = .text:0x8002D06C; // type:function size:0x48 scope:global align:4 @@ -1365,7 +1365,7 @@ dComIfGs_BossLife_public_Get__Fv = .text:0x8002D910; // type:function size:0x14 dComIfGs_sense_type_change_Set__FSc = .text:0x8002D924; // type:function size:0x14 scope:global align:4 dComIfGs_sense_type_change_Get__Fv = .text:0x8002D938; // type:function size:0x14 scope:global align:4 dComIfGs_onZoneSwitch__Fii = .text:0x8002D94C; // type:function size:0x64 scope:global align:4 -getZoneNo__20dStage_roomControl_cFi = .text:0x8002D9B0; // type:function size:0x1C scope:global align:4 +getZoneNo__20dStage_roomControl_cFi = .text:0x8002D9B0; // type:function size:0x1C scope:weak align:4 dComIfGs_offZoneSwitch__Fii = .text:0x8002D9CC; // type:function size:0x64 scope:global align:4 dComIfGs_isZoneSwitch__Fii = .text:0x8002DA30; // type:function size:0x6C scope:global align:4 dComIfGs_onOneZoneSwitch__Fii = .text:0x8002DA9C; // type:function size:0x64 scope:global align:4 @@ -1408,7 +1408,7 @@ dComIfGs_setSelectEquipClothes__FUc = .text:0x8002EEB0; // type:function size:0x dComIfGs_setSelectEquipSword__FUc = .text:0x8002EEC0; // type:function size:0xD4 scope:global align:4 dComIfGs_setSelectEquipShield__FUc = .text:0x8002EF94; // type:function size:0xAC scope:global align:4 dComIfGs_setKeyNum__FiUc = .text:0x8002F040; // type:function size:0xA0 scope:global align:4 -dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc = .text:0x8002F0E0; // type:function size:0x48 scope:global align:4 +dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc = .text:0x8002F0E0; // type:function size:0x48 scope:local align:4 setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc = .text:0x8002F128; // type:function size:0x74 scope:global align:4 dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc = .text:0x8002F19C; // type:function size:0xB0 scope:global align:4 dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc = .text:0x8002F24C; // type:function size:0x60 scope:global align:4 @@ -1452,43 +1452,43 @@ dComIfGs_isVisitedRoom__Fi = .text:0x8002FC98; // type:function size:0x5C scope: dComIfGs_staffroll_next_go__Fv = .text:0x8002FCF4; // type:function size:0x14 scope:global align:4 dComIfGs_staffroll_next_go_check__Fv = .text:0x8002FD08; // type:function size:0x10 scope:global align:4 __sinit_d_com_inf_game_cpp = .text:0x8002FD18; // type:function size:0x5C scope:local align:4 -__dt__13dComIfG_inf_cFv = .text:0x8002FD74; // type:function size:0x74 scope:global align:4 -__dt__14dComIfG_play_cFv = .text:0x8002FDE8; // type:function size:0x110 scope:global align:4 -__dt__11cBgS_ChkElmFv = .text:0x8002FEF8; // type:function size:0x48 scope:global align:4 -__dt__4dCcSFv = .text:0x8002FF40; // type:function size:0x1B4 scope:global align:4 -__dt__12dCcMassS_ObjFv = .text:0x800300F4; // type:function size:0x60 scope:global align:4 -__dt__12dEvt_order_cFv = .text:0x80030154; // type:function size:0x3C scope:global align:4 -__dt__11dEvDtBase_cFv = .text:0x80030190; // type:function size:0x3C scope:global align:4 -__dt__14dDlst_window_cFv = .text:0x800301CC; // type:function size:0x3C scope:global align:4 -__dt__25dComIfG_camera_info_classFv = .text:0x80030208; // type:function size:0x3C scope:global align:4 -__ct__13dComIfG_inf_cFv = .text:0x80030244; // type:function size:0x284 scope:global align:4 -__ct__25dComIfG_camera_info_classFv = .text:0x800304C8; // type:function size:0x4 scope:global align:4 -__ct__14dDlst_window_cFv = .text:0x800304CC; // type:function size:0x4 scope:global align:4 -__dt__10dAttList_cFv = .text:0x800304D0; // type:function size:0x3C scope:global align:4 -__ct__10dAttList_cFv = .text:0x8003050C; // type:function size:0x4 scope:global align:4 -__dt__7cSAngleFv = .text:0x80030510; // type:function size:0x3C scope:global align:4 -__dt__10dAttDraw_cFv = .text:0x8003054C; // type:function size:0x154 scope:global align:4 -__dt__13mDoExt_bckAnmFv = .text:0x800306A0; // type:function size:0x54 scope:global align:4 -__dt__13mDoExt_bpkAnmFv = .text:0x800306F4; // type:function size:0x54 scope:global align:4 -__dt__13mDoExt_brkAnmFv = .text:0x80030748; // type:function size:0x54 scope:global align:4 -__dt__13mDoExt_btkAnmFv = .text:0x8003079C; // type:function size:0x54 scope:global align:4 -__ct__10dAttDraw_cFv = .text:0x800307F0; // type:function size:0x164 scope:global align:4 -__ct__13mDoExt_btkAnmFv = .text:0x80030954; // type:function size:0x48 scope:global align:4 -__ct__13mDoExt_brkAnmFv = .text:0x8003099C; // type:function size:0x48 scope:global align:4 -__ct__13mDoExt_bpkAnmFv = .text:0x800309E4; // type:function size:0x48 scope:global align:4 -__ct__13mDoExt_bckAnmFv = .text:0x80030A2C; // type:function size:0x48 scope:global align:4 -__dt__12dCcMassS_MngFv = .text:0x80030A74; // type:function size:0x168 scope:global align:4 -__dt__4cCcSFv = .text:0x80030BDC; // type:function size:0x74 scope:global align:4 -__dt__4dBgSFv = .text:0x80030C50; // type:function size:0x7C scope:global align:4 -__dt__4cBgSFv = .text:0x80030CCC; // type:function size:0x6C scope:global align:4 -__ct__11cBgS_ChkElmFv = .text:0x80030D38; // type:function size:0x3C scope:global align:4 -__ct__10dSv_zone_cFv = .text:0x80030D74; // type:function size:0xC scope:global align:4 -__ct__13dSv_memory2_cFv = .text:0x80030D80; // type:function size:0x30 scope:global align:4 -__ct__12dSv_memory_cFv = .text:0x80030DB0; // type:function size:0x30 scope:global align:4 -__dt__15cCcD_DivideAreaFv = .text:0x80030DE0; // type:function size:0x5C scope:global align:4 -__dt__8cM3dGCylFv = .text:0x80030E3C; // type:function size:0x48 scope:global align:4 -__dt__8cM3dGAabFv = .text:0x80030E84; // type:function size:0x48 scope:global align:4 -__dt__15cCcD_DivideInfoFv = .text:0x80030ECC; // type:function size:0x48 scope:global align:4 +__dt__13dComIfG_inf_cFv = .text:0x8002FD74; // type:function size:0x74 scope:weak align:4 +__dt__14dComIfG_play_cFv = .text:0x8002FDE8; // type:function size:0x110 scope:weak align:4 +__dt__11cBgS_ChkElmFv = .text:0x8002FEF8; // type:function size:0x48 scope:weak align:4 +__dt__4dCcSFv = .text:0x8002FF40; // type:function size:0x1B4 scope:weak align:4 +__dt__12dCcMassS_ObjFv = .text:0x800300F4; // type:function size:0x60 scope:weak align:4 +__dt__12dEvt_order_cFv = .text:0x80030154; // type:function size:0x3C scope:weak align:4 +__dt__11dEvDtBase_cFv = .text:0x80030190; // type:function size:0x3C scope:weak align:4 +__dt__14dDlst_window_cFv = .text:0x800301CC; // type:function size:0x3C scope:weak align:4 +__dt__25dComIfG_camera_info_classFv = .text:0x80030208; // type:function size:0x3C scope:weak align:4 +__ct__13dComIfG_inf_cFv = .text:0x80030244; // type:function size:0x284 scope:weak align:4 +__ct__25dComIfG_camera_info_classFv = .text:0x800304C8; // type:function size:0x4 scope:weak align:4 +__ct__14dDlst_window_cFv = .text:0x800304CC; // type:function size:0x4 scope:weak align:4 +__dt__10dAttList_cFv = .text:0x800304D0; // type:function size:0x3C scope:weak align:4 +__ct__10dAttList_cFv = .text:0x8003050C; // type:function size:0x4 scope:weak align:4 +__dt__7cSAngleFv = .text:0x80030510; // type:function size:0x3C scope:weak align:4 +__dt__10dAttDraw_cFv = .text:0x8003054C; // type:function size:0x154 scope:weak align:4 +__dt__13mDoExt_bckAnmFv = .text:0x800306A0; // type:function size:0x54 scope:weak align:4 +__dt__13mDoExt_bpkAnmFv = .text:0x800306F4; // type:function size:0x54 scope:weak align:4 +__dt__13mDoExt_brkAnmFv = .text:0x80030748; // type:function size:0x54 scope:weak align:4 +__dt__13mDoExt_btkAnmFv = .text:0x8003079C; // type:function size:0x54 scope:weak align:4 +__ct__10dAttDraw_cFv = .text:0x800307F0; // type:function size:0x164 scope:weak align:4 +__ct__13mDoExt_btkAnmFv = .text:0x80030954; // type:function size:0x48 scope:weak align:4 +__ct__13mDoExt_brkAnmFv = .text:0x8003099C; // type:function size:0x48 scope:weak align:4 +__ct__13mDoExt_bpkAnmFv = .text:0x800309E4; // type:function size:0x48 scope:weak align:4 +__ct__13mDoExt_bckAnmFv = .text:0x80030A2C; // type:function size:0x48 scope:weak align:4 +__dt__12dCcMassS_MngFv = .text:0x80030A74; // type:function size:0x168 scope:weak align:4 +__dt__4cCcSFv = .text:0x80030BDC; // type:function size:0x74 scope:weak align:4 +__dt__4dBgSFv = .text:0x80030C50; // type:function size:0x7C scope:weak align:4 +__dt__4cBgSFv = .text:0x80030CCC; // type:function size:0x6C scope:weak align:4 +__ct__11cBgS_ChkElmFv = .text:0x80030D38; // type:function size:0x3C scope:weak align:4 +__ct__10dSv_zone_cFv = .text:0x80030D74; // type:function size:0xC scope:weak align:4 +__ct__13dSv_memory2_cFv = .text:0x80030D80; // type:function size:0x30 scope:weak align:4 +__ct__12dSv_memory_cFv = .text:0x80030DB0; // type:function size:0x30 scope:weak align:4 +__dt__15cCcD_DivideAreaFv = .text:0x80030DE0; // type:function size:0x5C scope:weak align:4 +__dt__8cM3dGCylFv = .text:0x80030E3C; // type:function size:0x48 scope:weak align:4 +__dt__8cM3dGAabFv = .text:0x80030E84; // type:function size:0x48 scope:weak align:4 +__dt__15cCcD_DivideInfoFv = .text:0x80030ECC; // type:function size:0x48 scope:weak align:4 set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc = .text:0x80030F14; // type:function size:0xA8 scope:global align:4 reset__Q27daSus_c6data_cFv = .text:0x80030FBC; // type:function size:0x10 scope:global align:4 isSwitch__Q27daSus_c6data_cFv = .text:0x80030FCC; // type:function size:0x6C scope:global align:4 @@ -1538,10 +1538,10 @@ setRoomNo__12daObjCarry_cFiSc = .text:0x80031DAC; // type:function size:0xC scop getRoomNo__12daObjCarry_cFi = .text:0x80031DB8; // type:function size:0xC scope:global align:4 __sinit_d_com_static_cpp = .text:0x80031DC4; // type:function size:0xE8 scope:local align:4 __arraydtor$4479 = .text:0x80031EAC; // type:function size:0x38 scope:local align:4 -__ct__Q27daSus_c6room_cFv = .text:0x80031EE4; // type:function size:0xC scope:global align:4 +__ct__Q27daSus_c6room_cFv = .text:0x80031EE4; // type:function size:0xC scope:weak align:4 __arraydtor$3839 = .text:0x80031EF0; // type:function size:0x38 scope:local align:4 -__dt__Q27daSus_c6data_cFv = .text:0x80031F28; // type:function size:0x3C scope:global align:4 -__ct__Q27daSus_c6data_cFv = .text:0x80031F64; // type:function size:0x30 scope:global align:4 +__dt__Q27daSus_c6data_cFv = .text:0x80031F28; // type:function size:0x3C scope:weak align:4 +__ct__Q27daSus_c6data_cFv = .text:0x80031F64; // type:function size:0x30 scope:weak align:4 checkStateCarry__7dBomb_cFv = .text:0x80031F94; // type:function size:0x38 scope:global align:4 checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c = .text:0x80031FCC; // type:function size:0x28 scope:global align:4 checkWaterBomb__7dBomb_cFP10fopAc_ac_c = .text:0x80031FF4; // type:function size:0x28 scope:global align:4 @@ -1566,7 +1566,7 @@ dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc = .text:0x80032738; // getTime__11dLib_time_cFv = .text:0x80032804; // type:function size:0x7C scope:global align:4 stopTime__11dLib_time_cFv = .text:0x80032880; // type:function size:0x3C scope:global align:4 startTime__11dLib_time_cFv = .text:0x800328BC; // type:function size:0x5C scope:global align:4 -dSv_item_rename__FUc = .text:0x80032918; // type:function size:0x40 scope:global align:4 +dSv_item_rename__FUc = .text:0x80032918; // type:function size:0x40 scope:local align:4 init__21dSv_player_status_a_cFv = .text:0x80032958; // type:function size:0xF0 scope:global align:4 setSelectItemIndex__21dSv_player_status_a_cFiUc = .text:0x80032A48; // type:function size:0x14 scope:global align:4 getSelectItemIndex__21dSv_player_status_a_cCFi = .text:0x80032A5C; // type:function size:0x1C scope:global align:4 @@ -1731,8 +1731,8 @@ __ct__9dJntCol_cFv = .text:0x80035C8C; // type:function size:0x14 scope:global a init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli = .text:0x80035CA0; // type:function size:0x28 scope:global align:4 setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz = .text:0x80035CC8; // type:function size:0x100 scope:global align:4 searchNearPos__9dJntCol_cCFPC8cM3dGLinPC4cXyzP4cXyzi = .text:0x80035DC8; // type:function size:0xC94 scope:global align:4 -__dt__8cM3dGLinFv = .text:0x80036A5C; // type:function size:0x48 scope:global align:4 -__dt__8cM3dGSphFv = .text:0x80036AA4; // type:function size:0x48 scope:global align:4 +__dt__8cM3dGLinFv = .text:0x80036A5C; // type:function size:0x48 scope:weak align:4 +__dt__8cM3dGSphFv = .text:0x80036AA4; // type:function size:0x48 scope:weak align:4 getArrowOffsetPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz = .text:0x80036AEC; // type:function size:0x158 scope:global align:4 getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi = .text:0x80036C44; // type:function size:0x364 scope:global align:4 setArrowPosAndAngle__9dJntCol_cFPC4cXyzPC4cXyziP4cXyzP5csXyz = .text:0x80036FA8; // type:function size:0x90 scope:global align:4 @@ -1742,13 +1742,13 @@ make_eff_break_kotubo2__5daObjFP10fopAc_ac_c = .text:0x80037210; // type:functio make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c = .text:0x800372A0; // type:function size:0x90 scope:global align:4 make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c = .text:0x80037330; // type:function size:0x90 scope:global align:4 posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff = .text:0x800373C0; // type:function size:0x30 scope:global align:4 -posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff = .text:0x800373F0; // type:function size:0xFC scope:global align:4 -posMoveF_grade_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzffPC4cXyzPC4cXyz = .text:0x800374EC; // type:function size:0x134 scope:global align:4 +posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff = .text:0x800373F0; // type:function size:0xFC scope:local align:4 +posMoveF_grade_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzffPC4cXyzPC4cXyz = .text:0x800374EC; // type:function size:0x134 scope:local align:4 posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz = .text:0x80037620; // type:function size:0x168 scope:global align:4 quat_rotBaseY__5daObjFP10QuaternionRC4cXyz = .text:0x80037788; // type:function size:0x178 scope:global align:4 HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl = .text:0x80037900; // type:function size:0x14C scope:global align:4 -GetCoCP__12cCcD_CylAttrFv = .text:0x80037A4C; // type:function size:0x8 scope:global align:4 -GetCoCP__12cCcD_SphAttrFv = .text:0x80037A54; // type:function size:0x8 scope:global align:4 +GetCoCP__12cCcD_CylAttrFv = .text:0x80037A4C; // type:function size:0x8 scope:weak align:4 +GetCoCP__12cCcD_SphAttrFv = .text:0x80037A54; // type:function size:0x8 scope:weak align:4 getItemNo__12daItemBase_cFv = .text:0x80037A5C; // type:function size:0x8 scope:global align:4 hide__12daItemBase_cFv = .text:0x80037A64; // type:function size:0x10 scope:global align:4 show__12daItemBase_cFv = .text:0x80037A74; // type:function size:0x10 scope:global align:4 @@ -1771,19 +1771,19 @@ getOff__10e_wb_classFv = .text:0x80037CF4; // type:function size:0x74 scope:glob checkDownDamage__10e_wb_classFv = .text:0x80037D68; // type:function size:0x2C scope:global align:4 checkNormalRideMode__10e_wb_classCFv = .text:0x80037D94; // type:function size:0x28 scope:global align:4 setRunRideMode__10e_wb_classFv = .text:0x80037DBC; // type:function size:0x28 scope:global align:4 -__dt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFv = .text:0x80037DE4; // type:function size:0x60 scope:global align:4 -adaptor_do_MESSAGE__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFQ37JStudio4data15TEOperationDataPCvUl = .text:0x80037E44; // type:function size:0x30 scope:global align:4 -__dt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFv = .text:0x80037E74; // type:function size:0x60 scope:global align:4 -create__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x80037ED4; // type:function size:0x14C scope:global align:4 +__dt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFv = .text:0x80037DE4; // type:function size:0x60 scope:local align:4 +adaptor_do_MESSAGE__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFQ37JStudio4data15TEOperationDataPCvUl = .text:0x80037E44; // type:function size:0x30 scope:local align:4 +__dt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFv = .text:0x80037E74; // type:function size:0x60 scope:local align:4 +create__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x80037ED4; // type:function size:0x14C scope:local align:4 __ct__13dDemo_actor_cFv = .text:0x80038020; // type:function size:0x78 scope:global align:4 __dt__13dDemo_actor_cFv = .text:0x80038098; // type:function size:0x90 scope:global align:4 getActor__13dDemo_actor_cFv = .text:0x80038128; // type:function size:0x34 scope:global align:4 setActor__13dDemo_actor_cFP10fopAc_ac_c = .text:0x8003815C; // type:function size:0x40 scope:global align:4 getPrm_Morf__13dDemo_actor_cFv = .text:0x8003819C; // type:function size:0x19C scope:global align:4 getDemoIDData__13dDemo_actor_cFPiPiPiPUsPUc = .text:0x80038338; // type:function size:0x158 scope:global align:4 -dDemo_getJaiPointer__FPCcUliPUs = .text:0x80038490; // type:function size:0x88 scope:global align:4 +dDemo_getJaiPointer__FPCcUliPUs = .text:0x80038490; // type:function size:0x88 scope:local align:4 dDemo_setDemoData__FP10fopAc_ac_cUcP14mDoExt_McaMorfPCciPUsUlSc = .text:0x80038518; // type:function size:0x290 scope:global align:4 -branchFile__FPCc = .text:0x800387A8; // type:function size:0x44 scope:global align:4 +branchFile__FPCc = .text:0x800387A8; // type:function size:0x44 scope:local align:4 JSGSetData__13dDemo_actor_cFUlPCvUl = .text:0x800387EC; // type:function size:0x134 scope:global align:4 JSGSetTranslation__13dDemo_actor_cFRC3Vec = .text:0x80038920; // type:function size:0x60 scope:global align:4 JSGSetScaling__13dDemo_actor_cFRC3Vec = .text:0x80038980; // type:function size:0x28 scope:global align:4 @@ -1794,7 +1794,7 @@ JSGSetAnimationFrame__13dDemo_actor_cFf = .text:0x80038A40; // type:function siz JSGSetAnimationTransition__13dDemo_actor_cFf = .text:0x80038A54; // type:function size:0x14 scope:global align:4 JSGSetTextureAnimation__13dDemo_actor_cFUl = .text:0x80038A68; // type:function size:0x14 scope:global align:4 JSGSetTextureAnimationFrame__13dDemo_actor_cFf = .text:0x80038A7C; // type:function size:0x14 scope:global align:4 -getView__Fv = .text:0x80038A90; // type:function size:0x34 scope:global align:4 +getView__Fv = .text:0x80038A90; // type:function size:0x34 scope:local align:4 JSGGetProjectionNear__14dDemo_camera_cCFv = .text:0x80038AC4; // type:function size:0x34 scope:global align:4 JSGSetProjectionNear__14dDemo_camera_cFf = .text:0x80038AF8; // type:function size:0x14 scope:global align:4 JSGGetProjectionFar__14dDemo_camera_cCFv = .text:0x80038B0C; // type:function size:0x34 scope:global align:4 @@ -1850,13 +1850,13 @@ reset__7dDemo_cFv = .text:0x80039F04; // type:function size:0x18 scope:global al emitter_create__16dDemo_particle_cFUl = .text:0x80039F1C; // type:function size:0x80 scope:global align:4 __dt__16dDemo_particle_cFv = .text:0x80039F9C; // type:function size:0x60 scope:global align:4 __dt__14dDemo_camera_cFv = .text:0x80039FFC; // type:function size:0x60 scope:global align:4 -JSGFindNodeID__13dDemo_actor_cCFPCc = .text:0x8003A05C; // type:function size:0x2C scope:global align:4 -JSGGetNodeTransformation__13dDemo_actor_cCFUlPA4_f = .text:0x8003A088; // type:function size:0x40 scope:global align:4 -JSGGetAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A0C8; // type:function size:0x8 scope:global align:4 -JSGGetTextureAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A0D0; // type:function size:0x8 scope:global align:4 -JSGGetTranslation__13dDemo_actor_cCFP3Vec = .text:0x8003A0D8; // type:function size:0x1C scope:global align:4 -JSGGetScaling__13dDemo_actor_cCFP3Vec = .text:0x8003A0F4; // type:function size:0x1C scope:global align:4 -JSGGetRotation__13dDemo_actor_cCFP3Vec = .text:0x8003A110; // type:function size:0x78 scope:global align:4 +JSGFindNodeID__13dDemo_actor_cCFPCc = .text:0x8003A05C; // type:function size:0x2C scope:weak align:4 +JSGGetNodeTransformation__13dDemo_actor_cCFUlPA4_f = .text:0x8003A088; // type:function size:0x40 scope:weak align:4 +JSGGetAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A0C8; // type:function size:0x8 scope:weak align:4 +JSGGetTextureAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A0D0; // type:function size:0x8 scope:weak align:4 +JSGGetTranslation__13dDemo_actor_cCFP3Vec = .text:0x8003A0D8; // type:function size:0x1C scope:weak align:4 +JSGGetScaling__13dDemo_actor_cCFP3Vec = .text:0x8003A0F4; // type:function size:0x1C scope:weak align:4 +JSGGetRotation__13dDemo_actor_cCFP3Vec = .text:0x8003A110; // type:function size:0x78 scope:weak align:4 getKind__13door_param2_cFP10fopAc_ac_c = .text:0x8003A188; // type:function size:0xC scope:global align:4 getDoorModel__13door_param2_cFP10fopAc_ac_c = .text:0x8003A194; // type:function size:0xC scope:global align:4 getFrontOption__13door_param2_cFP10fopAc_ac_c = .text:0x8003A1A0; // type:function size:0xC scope:global align:4 @@ -1878,35 +1878,35 @@ getMBLightInf__13door_param2_cFP10fopAc_ac_c = .text:0x8003A254; // type:functio __ct__11dRes_info_cFv = .text:0x8003A260; // type:function size:0x20 scope:global align:4 __dt__11dRes_info_cFv = .text:0x8003A280; // type:function size:0xC8 scope:global align:4 set__11dRes_info_cFPCcPCcUcP7JKRHeap = .text:0x8003A348; // type:function size:0xA8 scope:global align:4 -setAlpha__FP16J3DMaterialTable = .text:0x8003A3F0; // type:function size:0xA0 scope:global align:4 -setIndirectTex__FP12J3DModelData = .text:0x8003A490; // type:function size:0x38C scope:global align:4 -setAlpha__FP12J3DModelData = .text:0x8003A81C; // type:function size:0x24 scope:global align:4 -addWarpMaterial__FP12J3DModelData = .text:0x8003A840; // type:function size:0x28C scope:global align:4 -__ct__11J3DTevStageFRC15J3DTevStageInfo = .text:0x8003AACC; // type:function size:0x60 scope:global align:4 -setTexMtx__14J3DTexGenBlockFUlP9J3DTexMtx = .text:0x8003AB2C; // type:function size:0x4 scope:global align:4 +setAlpha__FP16J3DMaterialTable = .text:0x8003A3F0; // type:function size:0xA0 scope:local align:4 +setIndirectTex__FP12J3DModelData = .text:0x8003A490; // type:function size:0x38C scope:local align:4 +setAlpha__FP12J3DModelData = .text:0x8003A81C; // type:function size:0x24 scope:local align:4 +addWarpMaterial__FP12J3DModelData = .text:0x8003A840; // type:function size:0x28C scope:local align:4 +__ct__11J3DTevStageFRC15J3DTevStageInfo = .text:0x8003AACC; // type:function size:0x60 scope:weak align:4 +setTexMtx__14J3DTexGenBlockFUlP9J3DTexMtx = .text:0x8003AB2C; // type:function size:0x4 scope:weak align:4 onWarpMaterial__11dRes_info_cFP12J3DModelData = .text:0x8003AB30; // type:function size:0xEC scope:global align:4 offWarpMaterial__11dRes_info_cFP12J3DModelData = .text:0x8003AC1C; // type:function size:0xEC scope:global align:4 setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff = .text:0x8003AD08; // type:function size:0x10C scope:global align:4 loaderBasicBmd__11dRes_info_cFUlPv = .text:0x8003AE14; // type:function size:0x33C scope:global align:4 -__dt__15J3DTevKColorAnmFv = .text:0x8003B150; // type:function size:0x3C scope:global align:4 -__ct__15J3DTevKColorAnmFv = .text:0x8003B18C; // type:function size:0x18 scope:global align:4 -__dt__14J3DTevColorAnmFv = .text:0x8003B1A4; // type:function size:0x3C scope:global align:4 -__ct__14J3DTevColorAnmFv = .text:0x8003B1E0; // type:function size:0x18 scope:global align:4 -__dt__11J3DTexNoAnmFv = .text:0x8003B1F8; // type:function size:0x48 scope:global align:4 -__ct__11J3DTexNoAnmFv = .text:0x8003B240; // type:function size:0x24 scope:global align:4 -__dt__12J3DTexMtxAnmFv = .text:0x8003B264; // type:function size:0x3C scope:global align:4 -__ct__12J3DTexMtxAnmFv = .text:0x8003B2A0; // type:function size:0x18 scope:global align:4 -__dt__14J3DMatColorAnmFv = .text:0x8003B2B8; // type:function size:0x3C scope:global align:4 -__ct__14J3DMatColorAnmFv = .text:0x8003B2F4; // type:function size:0x18 scope:global align:4 +__dt__15J3DTevKColorAnmFv = .text:0x8003B150; // type:function size:0x3C scope:weak align:4 +__ct__15J3DTevKColorAnmFv = .text:0x8003B18C; // type:function size:0x18 scope:weak align:4 +__dt__14J3DTevColorAnmFv = .text:0x8003B1A4; // type:function size:0x3C scope:weak align:4 +__ct__14J3DTevColorAnmFv = .text:0x8003B1E0; // type:function size:0x18 scope:weak align:4 +__dt__11J3DTexNoAnmFv = .text:0x8003B1F8; // type:function size:0x48 scope:weak align:4 +__ct__11J3DTexNoAnmFv = .text:0x8003B240; // type:function size:0x24 scope:weak align:4 +__dt__12J3DTexMtxAnmFv = .text:0x8003B264; // type:function size:0x3C scope:weak align:4 +__ct__12J3DTexMtxAnmFv = .text:0x8003B2A0; // type:function size:0x18 scope:weak align:4 +__dt__14J3DMatColorAnmFv = .text:0x8003B2B8; // type:function size:0x3C scope:weak align:4 +__ct__14J3DMatColorAnmFv = .text:0x8003B2F4; // type:function size:0x18 scope:weak align:4 loadResource__11dRes_info_cFv = .text:0x8003B30C; // type:function size:0x5C4 scope:global align:4 -__dt__18J3DAnmTransformKeyFv = .text:0x8003B8D0; // type:function size:0x6C scope:global align:4 -__dt__15J3DAnmTransformFv = .text:0x8003B93C; // type:function size:0x5C scope:global align:4 +__dt__18J3DAnmTransformKeyFv = .text:0x8003B8D0; // type:function size:0x6C scope:weak align:4 +__dt__15J3DAnmTransformFv = .text:0x8003B93C; // type:function size:0x5C scope:weak align:4 deleteArchiveRes__11dRes_info_cFv = .text:0x8003B998; // type:function size:0x104 scope:global align:4 -getArcHeader__FP10JKRArchive = .text:0x8003BA9C; // type:function size:0x28 scope:global align:4 +getArcHeader__FP10JKRArchive = .text:0x8003BA9C; // type:function size:0x28 scope:local align:4 setRes__11dRes_info_cFP10JKRArchiveP7JKRHeap = .text:0x8003BAC4; // type:function size:0x34 scope:global align:4 setRes__11dRes_info_cFv = .text:0x8003BAF8; // type:function size:0x1A0 scope:global align:4 -myGetMemBlockSize__FPv = .text:0x8003BC98; // type:function size:0x68 scope:global align:4 -myGetMemBlockSize0__FPv = .text:0x8003BD00; // type:function size:0x2C scope:global align:4 +myGetMemBlockSize__FPv = .text:0x8003BC98; // type:function size:0x68 scope:local align:4 +myGetMemBlockSize0__FPv = .text:0x8003BD00; // type:function size:0x2C scope:local align:4 dump_long__11dRes_info_cFP11dRes_info_ci = .text:0x8003BD2C; // type:function size:0x10C scope:global align:4 dump__11dRes_info_cFP11dRes_info_ci = .text:0x8003BE38; // type:function size:0x178 scope:global align:4 __dt__14dRes_control_cFv = .text:0x8003BFB0; // type:function size:0xC8 scope:global align:4 @@ -1924,12 +1924,12 @@ setObjectRes__14dRes_control_cFPCcPvUlP7JKRHeap = .text:0x8003C4E4; // type:func setStageRes__14dRes_control_cFPCcP7JKRHeap = .text:0x8003C5BC; // type:function size:0x7C scope:global align:4 dump__14dRes_control_cFv = .text:0x8003C638; // type:function size:0x80 scope:global align:4 getObjectResName2Index__14dRes_control_cFPCcPCc = .text:0x8003C6B8; // type:function size:0x7C scope:global align:4 -__dt__10J3DAnmBaseFv = .text:0x8003C734; // type:function size:0x48 scope:global align:4 -getKind__15J3DAnmTransformCFv = .text:0x8003C77C; // type:function size:0x8 scope:global align:4 -__dt__18mDoExt_transAnmBasFv = .text:0x8003C784; // type:function size:0x7C scope:global align:4 -getKind__18J3DAnmTransformKeyCFv = .text:0x8003C800; // type:function size:0x8 scope:global align:4 -getTransform__18J3DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8003C808; // type:function size:0x24 scope:global align:4 -calc__11J3DTexNoAnmCFPUs = .text:0x8003C82C; // type:function size:0x30 scope:global align:4 +__dt__10J3DAnmBaseFv = .text:0x8003C734; // type:function size:0x48 scope:weak align:4 +getKind__15J3DAnmTransformCFv = .text:0x8003C77C; // type:function size:0x8 scope:weak align:4 +__dt__18mDoExt_transAnmBasFv = .text:0x8003C784; // type:function size:0x7C scope:weak align:4 +getKind__18J3DAnmTransformKeyCFv = .text:0x8003C800; // type:function size:0x8 scope:weak align:4 +getTransform__18J3DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8003C808; // type:function size:0x24 scope:weak align:4 +calc__11J3DTexNoAnmCFPUs = .text:0x8003C82C; // type:function size:0x30 scope:weak align:4 create__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003C85C; // type:function size:0x98 scope:global align:4 remove__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003C8F4; // type:function size:0x58 scope:global align:4 rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class = .text:0x8003C94C; // type:function size:0xF4 scope:global align:4 @@ -1949,7 +1949,7 @@ renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class = .text: getDecoLineColor__18dRenderingFDAmap_cFii = .text:0x8003D68C; // type:function size:0x2C scope:global align:4 getDecorationLineWidth__18dRenderingFDAmap_cFi = .text:0x8003D6B8; // type:function size:0x2C scope:global align:4 __sinit_d_map_path_cpp = .text:0x8003D6E4; // type:function size:0x5C scope:local align:4 -__dt__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003D740; // type:function size:0x50 scope:global align:4 +__dt__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003D740; // type:function size:0x50 scope:weak align:4 addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s = .text:0x8003D790; // type:function size:0x88 scope:global align:4 isArrival__22dMenu_Fmap_room_data_cFv = .text:0x8003D818; // type:function size:0x50 scope:global align:4 buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii = .text:0x8003D868; // type:function size:0xC4 scope:global align:4 @@ -1972,9 +1972,9 @@ nextData__22dMenuFmapIconPointer_cFv = .text:0x8003E490; // type:function size:0 getValidData__22dMenuFmapIconPointer_cFv = .text:0x8003E510; // type:function size:0x68 scope:global align:4 getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s = .text:0x8003E578; // type:function size:0x170 scope:global align:4 isDrawDisp__19dMenuFmapIconDisp_cFv = .text:0x8003E6E8; // type:function size:0x428 scope:global align:4 -__dt__26fmpTresTypeGroupDataList_cFv = .text:0x8003EB10; // type:function size:0x60 scope:global align:4 -__dt__22fmpTresTypeGroupData_cFv = .text:0x8003EB70; // type:function size:0x120 scope:global align:4 -__ct__26fmpTresTypeGroupDataList_cFv = .text:0x8003EC90; // type:function size:0x10 scope:global align:4 +__dt__26fmpTresTypeGroupDataList_cFv = .text:0x8003EB10; // type:function size:0x60 scope:weak align:4 +__dt__22fmpTresTypeGroupData_cFv = .text:0x8003EB70; // type:function size:0x120 scope:weak align:4 +__ct__26fmpTresTypeGroupDataList_cFv = .text:0x8003EC90; // type:function size:0x10 scope:weak align:4 chkGetCompass__10dMapInfo_nFv = .text:0x8003ECA0; // type:function size:0x38 scope:global align:4 chkGetMap__10dMapInfo_nFv = .text:0x8003ECD8; // type:function size:0x38 scope:global align:4 isVisitedRoom__10dMapInfo_nFi = .text:0x8003ED10; // type:function size:0x50 scope:global align:4 @@ -2042,8 +2042,8 @@ drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff = .text:0x80041208; // t drawCursor__28renderingPlusDoorAndCursor_cFRC3Vecsif = .text:0x800412C0; // type:function size:0x19C scope:global align:4 beforeDrawPath__19renderingPlusDoor_cFv = .text:0x8004145C; // type:function size:0x4 scope:global align:4 __sinit_d_map_path_dmap_cpp = .text:0x80041460; // type:function size:0x20 scope:local align:4 -event_debug_evnt__21@unnamed@d_event_cpp@Fv = .text:0x80041480; // type:function size:0x8 scope:global align:4 -clear_tmpflag_for_message__21@unnamed@d_event_cpp@Fv = .text:0x80041488; // type:function size:0xF8 scope:global align:4 +event_debug_evnt__21@unnamed@d_event_cpp@Fv = .text:0x80041480; // type:function size:0x8 scope:local align:4 +clear_tmpflag_for_message__21@unnamed@d_event_cpp@Fv = .text:0x80041488; // type:function size:0xF8 scope:local align:4 __ct__14dEvt_control_cFv = .text:0x80041580; // type:function size:0x54 scope:global align:4 __ct__12dEvt_order_cFv = .text:0x800415D4; // type:function size:0x4 scope:global align:4 orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv = .text:0x800415D8; // type:function size:0x90 scope:global align:4 @@ -2100,10 +2100,10 @@ setPtI__14dEvt_control_cFPv = .text:0x800436BC; // type:function size:0x30 scope setPtI_Id__14dEvt_control_cFUi = .text:0x800436EC; // type:function size:0x8 scope:global align:4 setPtD__14dEvt_control_cFPv = .text:0x800436F4; // type:function size:0x30 scope:global align:4 setGtItm__14dEvt_control_cFUc = .text:0x80043724; // type:function size:0x8 scope:global align:4 -getTelopNo__FPCc = .text:0x8004372C; // type:function size:0x98 scope:global align:4 -getTelopNo__Fv = .text:0x800437C4; // type:function size:0x2C scope:global align:4 -getStartTelopNo__Fv = .text:0x800437F0; // type:function size:0x224 scope:global align:4 -dEvDt_Next_Stage__Fii = .text:0x80043A14; // type:function size:0x34C scope:global align:4 +getTelopNo__FPCc = .text:0x8004372C; // type:function size:0x98 scope:local align:4 +getTelopNo__Fv = .text:0x800437C4; // type:function size:0x2C scope:local align:4 +getStartTelopNo__Fv = .text:0x800437F0; // type:function size:0x224 scope:local align:4 +dEvDt_Next_Stage__Fii = .text:0x80043A14; // type:function size:0x34C scope:local align:4 flagCheck__11dEvDtFlag_cFi = .text:0x80043D60; // type:function size:0x68 scope:global align:4 flagSet__11dEvDtFlag_cFi = .text:0x80043DC8; // type:function size:0x68 scope:global align:4 flagMaxCheck__11dEvDtFlag_cFi = .text:0x80043E30; // type:function size:0x28 scope:global align:4 @@ -2134,7 +2134,7 @@ setStartDemo__18dEvent_exception_cFi = .text:0x800463F0; // type:function size:0 getEventName__18dEvent_exception_cFv = .text:0x80046480; // type:function size:0x168 scope:global align:4 getSubstance__16dEvent_manager_cFP11dEvDtData_ci = .text:0x800465E8; // type:function size:0xA0 scope:global align:4 __ct__16dEvent_manager_cFv = .text:0x80046688; // type:function size:0x58 scope:global align:4 -__ct__11dEvDtBase_cFv = .text:0x800466E0; // type:function size:0x30 scope:global align:4 +__ct__11dEvDtBase_cFv = .text:0x800466E0; // type:function size:0x30 scope:weak align:4 create__16dEvent_manager_cFv = .text:0x80046710; // type:function size:0xF0 scope:global align:4 setObjectArchive__16dEvent_manager_cFPc = .text:0x80046800; // type:function size:0x88 scope:global align:4 demoInit__16dEvent_manager_cFv = .text:0x80046888; // type:function size:0x7C scope:global align:4 @@ -2142,9 +2142,9 @@ roomInit__16dEvent_manager_cFi = .text:0x80046904; // type:function size:0xE8 sc roomFinish__16dEvent_manager_cFi = .text:0x800469EC; // type:function size:0x6C scope:global align:4 orderStartDemo__16dEvent_manager_cFv = .text:0x80046A58; // type:function size:0x1B4 scope:global align:4 remove__16dEvent_manager_cFv = .text:0x80046C0C; // type:function size:0x68 scope:global align:4 -extraOnObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C74; // type:function size:0x14 scope:global align:4 -extraOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C88; // type:function size:0x14 scope:global align:4 -allOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C9C; // type:function size:0x1C scope:global align:4 +extraOnObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C74; // type:function size:0x14 scope:local align:4 +extraOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C88; // type:function size:0x14 scope:local align:4 +allOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C9C; // type:function size:0x1C scope:local align:4 startProc__16dEvent_manager_cFP12dEvDtEvent_c = .text:0x80046CB8; // type:function size:0xE8 scope:global align:4 closeProc__16dEvent_manager_cFP12dEvDtEvent_c = .text:0x80046DA0; // type:function size:0xC scope:global align:4 endProc__16dEvent_manager_cFsi = .text:0x80046DAC; // type:function size:0xB8 scope:global align:4 @@ -2163,7 +2163,7 @@ endCheck__16dEvent_manager_cFs = .text:0x80047A78; // type:function size:0x64 sc endCheckOld__16dEvent_manager_cFPCc = .text:0x80047ADC; // type:function size:0x40 scope:global align:4 getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci = .text:0x80047B1C; // type:function size:0x230 scope:global align:4 getIsAddvance__16dEvent_manager_cFi = .text:0x80047D4C; // type:function size:0x60 scope:global align:4 -dEvmng_strcmp__FPCcPc = .text:0x80047DAC; // type:function size:0x64 scope:global align:4 +dEvmng_strcmp__FPCcPc = .text:0x80047DAC; // type:function size:0x64 scope:local align:4 getMyActIdx__16dEvent_manager_cFiPCPCciii = .text:0x80047E10; // type:function size:0x14C scope:global align:4 getMyNowCutName__16dEvent_manager_cFi = .text:0x80047F5C; // type:function size:0x6C scope:global align:4 getMyDataP__16dEvent_manager_cFiPCci = .text:0x80047FC8; // type:function size:0x124 scope:global align:4 @@ -2176,10 +2176,10 @@ cancelStaff__16dEvent_manager_cFPCc = .text:0x80048348; // type:function size:0x setGoal__16dEvent_manager_cFP4cXyz = .text:0x800483C4; // type:function size:0x1C scope:global align:4 getGoal__16dEvent_manager_cFv = .text:0x800483E0; // type:function size:0x8 scope:global align:4 getRunEventName__16dEvent_manager_cFv = .text:0x800483E8; // type:function size:0x84 scope:global align:4 -findShutterCallBack__FP10fopAc_ac_cPv = .text:0x8004846C; // type:function size:0xB4 scope:global align:4 +findShutterCallBack__FP10fopAc_ac_cPv = .text:0x8004846C; // type:function size:0xB4 scope:local align:4 specialCast_Shutter__16dEvent_manager_cFsi = .text:0x80048520; // type:function size:0xF8 scope:global align:4 specialCast__16dEvent_manager_cFPCci = .text:0x80048618; // type:function size:0x130 scope:global align:4 -dEv_talkman_get_action__Fi = .text:0x80048748; // type:function size:0xA8 scope:global align:4 +dEv_talkman_get_action__Fi = .text:0x80048748; // type:function size:0xA8 scope:local align:4 ChkPresentEnd__16dEvent_manager_cFv = .text:0x800487F0; // type:function size:0x3C scope:global align:4 checkStartDemo__16dEvent_manager_cFv = .text:0x8004882C; // type:function size:0x40 scope:global align:4 eventUpdate__17dEvLib_callback_cFv = .text:0x8004886C; // type:function size:0x38 scope:global align:4 @@ -2193,7 +2193,7 @@ executeStart__17dEvLib_callback_cFv = .text:0x80048A70; // type:function size:0x initRun__17dEvLib_callback_cFv = .text:0x80048B1C; // type:function size:0x2C scope:global align:4 executeRun__17dEvLib_callback_cFv = .text:0x80048B48; // type:function size:0x90 scope:global align:4 __sinit_d_event_lib_cpp = .text:0x80048BD8; // type:function size:0x7C scope:local align:4 -dSmplMdl_modelUpdateDL__FP8J3DModel = .text:0x80048C54; // type:function size:0x60 scope:global align:4 +dSmplMdl_modelUpdateDL__FP8J3DModel = .text:0x80048C54; // type:function size:0x60 scope:local align:4 __ct__15dSmplMdl_draw_cFv = .text:0x80048CB4; // type:function size:0xAC scope:global align:4 __ct__12diff_model_cFv = .text:0x80048D60; // type:function size:0x20 scope:global align:4 __dt__15dSmplMdl_draw_cFv = .text:0x80048D80; // type:function size:0x8C scope:global align:4 @@ -2356,16 +2356,16 @@ setEffectTwo__8dPaPoT_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC5csXyz clearTwoAllID__8dPaPoT_cFv = .text:0x80051294; // type:function size:0x54 scope:global align:4 setEffectFour__8dPaPoF_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff = .text:0x800512E8; // type:function size:0x13C scope:global align:4 clearFourAllID__8dPaPoF_cFv = .text:0x80051424; // type:function size:0x4C scope:global align:4 -getRightEffType__8dPaPoT_cCFi = .text:0x80051470; // type:function size:0xC scope:global align:4 -getLeftEffType__8dPaPoT_cCFi = .text:0x8005147C; // type:function size:0xC scope:global align:4 -getCenterEffType__7dPaPo_cCFi = .text:0x80051488; // type:function size:0xC scope:global align:4 -getRightEmitter__8dPaPoT_cFii = .text:0x80051494; // type:function size:0x48 scope:global align:4 -getLeftEmitter__8dPaPoT_cFii = .text:0x800514DC; // type:function size:0x48 scope:global align:4 -getCenterEmitter__7dPaPo_cFii = .text:0x80051524; // type:function size:0x48 scope:global align:4 -getBackRightEffType__8dPaPoF_cCFi = .text:0x8005156C; // type:function size:0xC scope:global align:4 -getBackLeftEffType__8dPaPoF_cCFi = .text:0x80051578; // type:function size:0xC scope:global align:4 -getBackRightEmitter__8dPaPoF_cFii = .text:0x80051584; // type:function size:0x48 scope:global align:4 -getBackLeftEmitter__8dPaPoF_cFii = .text:0x800515CC; // type:function size:0x48 scope:global align:4 +getRightEffType__8dPaPoT_cCFi = .text:0x80051470; // type:function size:0xC scope:weak align:4 +getLeftEffType__8dPaPoT_cCFi = .text:0x8005147C; // type:function size:0xC scope:weak align:4 +getCenterEffType__7dPaPo_cCFi = .text:0x80051488; // type:function size:0xC scope:weak align:4 +getRightEmitter__8dPaPoT_cFii = .text:0x80051494; // type:function size:0x48 scope:weak align:4 +getLeftEmitter__8dPaPoT_cFii = .text:0x800514DC; // type:function size:0x48 scope:weak align:4 +getCenterEmitter__7dPaPo_cFii = .text:0x80051524; // type:function size:0x48 scope:weak align:4 +getBackRightEffType__8dPaPoF_cCFi = .text:0x8005156C; // type:function size:0xC scope:weak align:4 +getBackLeftEffType__8dPaPoF_cCFi = .text:0x80051578; // type:function size:0xC scope:weak align:4 +getBackRightEmitter__8dPaPoF_cFii = .text:0x80051584; // type:function size:0x48 scope:weak align:4 +getBackLeftEmitter__8dPaPoF_cFii = .text:0x800515CC; // type:function size:0x48 scope:weak align:4 __sinit_d_particle_copoly_cpp = .text:0x80051614; // type:function size:0x19C scope:local align:4 dPath_GetPnt__FPC5dPathi = .text:0x800517B0; // type:function size:0x3C scope:global align:4 dPath_GetRoomPath__Fii = .text:0x800517EC; // type:function size:0xAC scope:global align:4 @@ -2383,17 +2383,17 @@ init__12dDlst_2DT2_cFP7ResTIMGffffUcUcUcff = .text:0x80052B4C; // type:function draw__11dDlst_2DM_cFv = .text:0x80052C58; // type:function size:0x4D4 scope:global align:4 draw__11dDlst_2Dm_cFv = .text:0x8005312C; // type:function size:0x520 scope:global align:4 draw__12dDlst_2DMt_cFv = .text:0x8005364C; // type:function size:0x390 scope:global align:4 -getTexture__10J2DPictureCFUc = .text:0x800539DC; // type:function size:0x24 scope:global align:4 +getTexture__10J2DPictureCFUc = .text:0x800539DC; // type:function size:0x24 scope:weak align:4 __ct__10dDlst_2D_cFP7ResTIMGssssUc = .text:0x80053A00; // type:function size:0x9C scope:global align:4 draw__10dDlst_2D_cFv = .text:0x80053A9C; // type:function size:0xC8 scope:global align:4 draw__11dDlst_blo_cFv = .text:0x80053B64; // type:function size:0x3C scope:global align:4 -clearAnmTransform__9J2DScreenFv = .text:0x80053BA0; // type:function size:0x20 scope:global align:4 -calcMtx__7J2DPaneFv = .text:0x80053BC0; // type:function size:0x40 scope:global align:4 -makeMatrix__7J2DPaneFff = .text:0x80053C00; // type:function size:0x3C scope:global align:4 -getTypeID__7J2DPaneCFv = .text:0x80053C3C; // type:function size:0x8 scope:global align:4 -setWhite__10J2DPictureFQ28JUtility6TColor = .text:0x80053C44; // type:function size:0x28 scope:global align:4 -setBlack__10J2DPictureFQ28JUtility6TColor = .text:0x80053C6C; // type:function size:0x28 scope:global align:4 -__dt__10J2DAnmBaseFv = .text:0x80053C94; // type:function size:0x48 scope:global align:4 +clearAnmTransform__9J2DScreenFv = .text:0x80053BA0; // type:function size:0x20 scope:weak align:4 +calcMtx__7J2DPaneFv = .text:0x80053BC0; // type:function size:0x40 scope:weak align:4 +makeMatrix__7J2DPaneFff = .text:0x80053C00; // type:function size:0x3C scope:weak align:4 +getTypeID__7J2DPaneCFv = .text:0x80053C3C; // type:function size:0x8 scope:weak align:4 +setWhite__10J2DPictureFQ28JUtility6TColor = .text:0x80053C44; // type:function size:0x28 scope:weak align:4 +setBlack__10J2DPictureFQ28JUtility6TColor = .text:0x80053C6C; // type:function size:0x28 scope:weak align:4 +__dt__10J2DAnmBaseFv = .text:0x80053C94; // type:function size:0x48 scope:weak align:4 init__8cM_rnd_cFiii = .text:0x80053CDC; // type:function size:0x10 scope:global align:4 get__8cM_rnd_cFv = .text:0x80053CEC; // type:function size:0xF4 scope:global align:4 getF__8cM_rnd_cFf = .text:0x80053DE0; // type:function size:0x38 scope:global align:4 @@ -2403,14 +2403,14 @@ draw__18dDlst_effectLine_cFv = .text:0x80053E9C; // type:function size:0x358 sco update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff = .text:0x800541F4; // type:function size:0x94 scope:global align:4 set__18dDlst_shadowPoly_cFP10cBgD_Vtx_tUsUsUsP8cM3dGPla = .text:0x80054288; // type:function size:0x12C scope:global align:4 draw__18dDlst_shadowPoly_cFv = .text:0x800543B4; // type:function size:0xC4 scope:global align:4 -J3DDrawBuffer__create__FUl = .text:0x80054478; // type:function size:0x78 scope:global align:4 +J3DDrawBuffer__create__FUl = .text:0x80054478; // type:function size:0x78 scope:local align:4 reset__18dDlst_shadowReal_cFv = .text:0x800544F0; // type:function size:0x10 scope:global align:4 imageDraw__18dDlst_shadowReal_cFPA4_f = .text:0x80054500; // type:function size:0xD4 scope:global align:4 draw__18dDlst_shadowReal_cFv = .text:0x800545D4; // type:function size:0xB4 scope:global align:4 -psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla = .text:0x80054688; // type:function size:0x1CC scope:global align:4 -realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c = .text:0x80054854; // type:function size:0x218 scope:global align:4 -__dt__14ShdwDrawPoly_cFv = .text:0x80054A6C; // type:function size:0x60 scope:global align:4 -setkankyoShadow__FP12dKy_tevstr_cPf = .text:0x80054ACC; // type:function size:0x104 scope:global align:4 +psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla = .text:0x80054688; // type:function size:0x1CC scope:local align:4 +realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c = .text:0x80054854; // type:function size:0x218 scope:local align:4 +__dt__14ShdwDrawPoly_cFv = .text:0x80054A6C; // type:function size:0x60 scope:weak align:4 +setkankyoShadow__FP12dKy_tevstr_cPf = .text:0x80054ACC; // type:function size:0x104 scope:local align:4 setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c = .text:0x80054BD0; // type:function size:0x458 scope:global align:4 set__18dDlst_shadowReal_cFUlP8J3DModelP4cXyzffP12dKy_tevstr_cff = .text:0x80055028; // type:function size:0x1AC scope:global align:4 add__18dDlst_shadowReal_cFP8J3DModel = .text:0x800551D4; // type:function size:0x38 scope:global align:4 @@ -2427,11 +2427,11 @@ setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG = .text:0x80055FE8; // type:fun newData__13dDlst_peekZ_cFssPUl = .text:0x80056018; // type:function size:0x68 scope:global align:4 peekData__13dDlst_peekZ_cFv = .text:0x80056080; // type:function size:0x70 scope:global align:4 __ct__12dDlst_list_cFv = .text:0x800560F0; // type:function size:0xD8 scope:global align:4 -__ct__26mDoExt_3DlineMatSortPacketFv = .text:0x800561C8; // type:function size:0x30 scope:global align:4 -__dt__18dDlst_shadowReal_cFv = .text:0x800561F8; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_shadowTri_cFv = .text:0x80056270; // type:function size:0x60 scope:global align:4 -__ct__18dDlst_shadowReal_cFv = .text:0x800562D0; // type:function size:0x74 scope:global align:4 -__ct__17dDlst_shadowTri_cFv = .text:0x80056344; // type:function size:0x48 scope:global align:4 +__ct__26mDoExt_3DlineMatSortPacketFv = .text:0x800561C8; // type:function size:0x30 scope:weak align:4 +__dt__18dDlst_shadowReal_cFv = .text:0x800561F8; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_shadowTri_cFv = .text:0x80056270; // type:function size:0x60 scope:weak align:4 +__ct__18dDlst_shadowReal_cFv = .text:0x800562D0; // type:function size:0x74 scope:weak align:4 +__ct__17dDlst_shadowTri_cFv = .text:0x80056344; // type:function size:0x48 scope:weak align:4 __ct__20dDlst_shadowSimple_cFv = .text:0x8005638C; // type:function size:0x4 scope:global align:4 init__12dDlst_list_cFv = .text:0x80056390; // type:function size:0xFC scope:global align:4 __dt__12dDlst_list_cFv = .text:0x8005648C; // type:function size:0xAC scope:global align:4 @@ -2446,9 +2446,9 @@ draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c = .text:0x800567C4; // typ wipeIn__12dDlst_list_cFfR8_GXColor = .text:0x8005681C; // type:function size:0xBC scope:global align:4 wipeIn__12dDlst_list_cFf = .text:0x800568D8; // type:function size:0x28 scope:global align:4 calcWipe__12dDlst_list_cFv = .text:0x80056900; // type:function size:0xA0 scope:global align:4 -getTri__22dDlst_shadowRealPoly_cFv = .text:0x800569A0; // type:function size:0x8 scope:global align:4 -getTriMax__22dDlst_shadowRealPoly_cFv = .text:0x800569A8; // type:function size:0x8 scope:global align:4 -searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen = .text:0x800569B0; // type:function size:0x4 scope:global align:4 +getTri__22dDlst_shadowRealPoly_cFv = .text:0x800569A0; // type:function size:0x8 scope:weak align:4 +getTriMax__22dDlst_shadowRealPoly_cFv = .text:0x800569A8; // type:function size:0x8 scope:weak align:4 +searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen = .text:0x800569B0; // type:function size:0x4 scope:weak align:4 __sinit_d_drawlist_cpp = .text:0x800569B4; // type:function size:0x28 scope:local align:4 dKyd_dmpalet_getp__Fv = .text:0x800569DC; // type:function size:0xC scope:global align:4 dKyd_dmpselect_getp__Fv = .text:0x800569E8; // type:function size:0xC scope:global align:4 @@ -2462,10 +2462,10 @@ dKyd_darkworld_tbl_getp__Fv = .text:0x80056A70; // type:function size:0xC scope: dKyd_light_size_tbl_getp__Fv = .text:0x80056A7C; // type:function size:0xC scope:global align:4 dKyd_light_tw_size_tbl_getp__Fv = .text:0x80056A88; // type:function size:0xC scope:global align:4 dKyd_BloomInf_tbl_getp__Fi = .text:0x80056A94; // type:function size:0x14 scope:global align:4 -dKyw_setDrawPacketList__FP9J3DPacketi = .text:0x80056AA8; // type:function size:0x50 scope:global align:4 -dKyw_setDrawPacketListIndScreen__FP9J3DPacketi = .text:0x80056AF8; // type:function size:0x50 scope:global align:4 -dKyw_setDrawPacketListSky__FP9J3DPacketi = .text:0x80056B48; // type:function size:0x90 scope:global align:4 -dKyw_setDrawPacketListXluBg__FP9J3DPacketi = .text:0x80056BD8; // type:function size:0x88 scope:global align:4 +dKyw_setDrawPacketList__FP9J3DPacketi = .text:0x80056AA8; // type:function size:0x50 scope:local align:4 +dKyw_setDrawPacketListIndScreen__FP9J3DPacketi = .text:0x80056AF8; // type:function size:0x50 scope:local align:4 +dKyw_setDrawPacketListSky__FP9J3DPacketi = .text:0x80056B48; // type:function size:0x90 scope:local align:4 +dKyw_setDrawPacketListXluBg__FP9J3DPacketi = .text:0x80056BD8; // type:function size:0x88 scope:local align:4 draw__18dKankyo_sun_PacketFv = .text:0x80056C60; // type:function size:0x38 scope:global align:4 draw__22dKankyo_sunlenz_PacketFv = .text:0x80056C98; // type:function size:0x38 scope:global align:4 __dt__8RAIN_EFFFv = .text:0x80056CD0; // type:function size:0x3C scope:global align:4 @@ -2495,30 +2495,30 @@ draw__18dKankyo_mud_PacketFv = .text:0x8005703C; // type:function size:0x30 scop __dt__11EF_EVIL_EFFFv = .text:0x8005706C; // type:function size:0x3C scope:global align:4 __ct__11EF_EVIL_EFFFv = .text:0x800570A8; // type:function size:0x4 scope:global align:4 draw__19dKankyo_evil_PacketFv = .text:0x800570AC; // type:function size:0x30 scope:global align:4 -dKyw_drawSun__Fi = .text:0x800570DC; // type:function size:0x30 scope:global align:4 -dKyw_Sun_Draw__Fv = .text:0x8005710C; // type:function size:0x24 scope:global align:4 -dKyw_drawSunlenz__Fi = .text:0x80057130; // type:function size:0x44 scope:global align:4 -dKyw_Sunlenz_Draw__Fv = .text:0x80057174; // type:function size:0x24 scope:global align:4 -dKyw_drawRain__Fi = .text:0x80057198; // type:function size:0x30 scope:global align:4 -dKyw_Rain_Draw__Fv = .text:0x800571C8; // type:function size:0x24 scope:global align:4 -dKyw_drawSnow__Fi = .text:0x800571EC; // type:function size:0x30 scope:global align:4 -dKyw_Snow_Draw__Fv = .text:0x8005721C; // type:function size:0x24 scope:global align:4 -dKyw_drawStar__Fi = .text:0x80057240; // type:function size:0x30 scope:global align:4 -dKyw_Star_Draw__Fv = .text:0x80057270; // type:function size:0x24 scope:global align:4 -dKyw_drawHousi__Fi = .text:0x80057294; // type:function size:0x30 scope:global align:4 -dKyw_Housi_Draw__Fv = .text:0x800572C4; // type:function size:0x24 scope:global align:4 -dKyw_drawCloud__Fi = .text:0x800572E8; // type:function size:0x30 scope:global align:4 -dKyw_Cloud_Draw__Fv = .text:0x80057318; // type:function size:0x24 scope:global align:4 -dKyw_drawVrkumo__Fi = .text:0x8005733C; // type:function size:0x30 scope:global align:4 -dKyw_Vrkumo_Draw__Fv = .text:0x8005736C; // type:function size:0x24 scope:global align:4 -dKyw_shstar_packet__Fi = .text:0x80057390; // type:function size:0x30 scope:global align:4 -dKyw_shstar_Draw__Fv = .text:0x800573C0; // type:function size:0x24 scope:global align:4 -dKyw_odour_packet__Fi = .text:0x800573E4; // type:function size:0x30 scope:global align:4 -dKyw_Odour_Draw__Fv = .text:0x80057414; // type:function size:0x24 scope:global align:4 -dKyw_mud_packet__Fi = .text:0x80057438; // type:function size:0x30 scope:global align:4 -dKyw_mud_Draw__Fv = .text:0x80057468; // type:function size:0x24 scope:global align:4 -dKyw_evil_packet__Fi = .text:0x8005748C; // type:function size:0x30 scope:global align:4 -dKyw_evil_Draw__Fv = .text:0x800574BC; // type:function size:0x24 scope:global align:4 +dKyw_drawSun__Fi = .text:0x800570DC; // type:function size:0x30 scope:local align:4 +dKyw_Sun_Draw__Fv = .text:0x8005710C; // type:function size:0x24 scope:local align:4 +dKyw_drawSunlenz__Fi = .text:0x80057130; // type:function size:0x44 scope:local align:4 +dKyw_Sunlenz_Draw__Fv = .text:0x80057174; // type:function size:0x24 scope:local align:4 +dKyw_drawRain__Fi = .text:0x80057198; // type:function size:0x30 scope:local align:4 +dKyw_Rain_Draw__Fv = .text:0x800571C8; // type:function size:0x24 scope:local align:4 +dKyw_drawSnow__Fi = .text:0x800571EC; // type:function size:0x30 scope:local align:4 +dKyw_Snow_Draw__Fv = .text:0x8005721C; // type:function size:0x24 scope:local align:4 +dKyw_drawStar__Fi = .text:0x80057240; // type:function size:0x30 scope:local align:4 +dKyw_Star_Draw__Fv = .text:0x80057270; // type:function size:0x24 scope:local align:4 +dKyw_drawHousi__Fi = .text:0x80057294; // type:function size:0x30 scope:local align:4 +dKyw_Housi_Draw__Fv = .text:0x800572C4; // type:function size:0x24 scope:local align:4 +dKyw_drawCloud__Fi = .text:0x800572E8; // type:function size:0x30 scope:local align:4 +dKyw_Cloud_Draw__Fv = .text:0x80057318; // type:function size:0x24 scope:local align:4 +dKyw_drawVrkumo__Fi = .text:0x8005733C; // type:function size:0x30 scope:local align:4 +dKyw_Vrkumo_Draw__Fv = .text:0x8005736C; // type:function size:0x24 scope:local align:4 +dKyw_shstar_packet__Fi = .text:0x80057390; // type:function size:0x30 scope:local align:4 +dKyw_shstar_Draw__Fv = .text:0x800573C0; // type:function size:0x24 scope:local align:4 +dKyw_odour_packet__Fi = .text:0x800573E4; // type:function size:0x30 scope:local align:4 +dKyw_Odour_Draw__Fv = .text:0x80057414; // type:function size:0x24 scope:local align:4 +dKyw_mud_packet__Fi = .text:0x80057438; // type:function size:0x30 scope:local align:4 +dKyw_mud_Draw__Fv = .text:0x80057468; // type:function size:0x24 scope:local align:4 +dKyw_evil_packet__Fi = .text:0x8005748C; // type:function size:0x30 scope:local align:4 +dKyw_evil_Draw__Fv = .text:0x800574BC; // type:function size:0x24 scope:local align:4 dKyw_wether_init__Fv = .text:0x800574E0; // type:function size:0x50C scope:global align:4 dKyw_wether_init2__Fv = .text:0x800579EC; // type:function size:0x18 scope:global align:4 dKyw_wether_delete__Fv = .text:0x80057A04; // type:function size:0x280 scope:global align:4 @@ -2534,37 +2534,37 @@ __dt__22dKankyo_sunlenz_PacketFv = .text:0x800580A4; // type:function size:0x84 __dt__18dKankyo_sun_PacketFv = .text:0x80058128; // type:function size:0x84 scope:global align:4 dKyw_wether_delete2__Fv = .text:0x800581AC; // type:function size:0x60 scope:global align:4 __dt__21dKankyo_vrkumo_PacketFv = .text:0x8005820C; // type:function size:0x84 scope:global align:4 -wether_move_thunder__Fv = .text:0x80058290; // type:function size:0x68 scope:global align:4 +wether_move_thunder__Fv = .text:0x80058290; // type:function size:0x68 scope:local align:4 dKyw_wether_move__Fv = .text:0x800582F8; // type:function size:0x20 scope:global align:4 -wether_move_sun__Fv = .text:0x80058318; // type:function size:0x57C scope:global align:4 -wether_move_rain__Fv = .text:0x80058894; // type:function size:0x26C scope:global align:4 -wether_move_snow__Fv = .text:0x80058B00; // type:function size:0x8C scope:global align:4 -wether_move_star__Fv = .text:0x80058B8C; // type:function size:0x38C scope:global align:4 -wether_move_housi__Fv = .text:0x80058F18; // type:function size:0x4C4 scope:global align:4 -wether_move_odour__Fv = .text:0x800593DC; // type:function size:0x1A4 scope:global align:4 -wether_move_moya__Fv = .text:0x80059580; // type:function size:0x1A8 scope:global align:4 -wether_move_vrkumo__Fv = .text:0x80059728; // type:function size:0x710 scope:global align:4 -wether_move_mud__Fv = .text:0x80059E38; // type:function size:0x13C scope:global align:4 -wether_move_evil__Fv = .text:0x80059F74; // type:function size:0x144 scope:global align:4 +wether_move_sun__Fv = .text:0x80058318; // type:function size:0x57C scope:local align:4 +wether_move_rain__Fv = .text:0x80058894; // type:function size:0x26C scope:local align:4 +wether_move_snow__Fv = .text:0x80058B00; // type:function size:0x8C scope:local align:4 +wether_move_star__Fv = .text:0x80058B8C; // type:function size:0x38C scope:local align:4 +wether_move_housi__Fv = .text:0x80058F18; // type:function size:0x4C4 scope:local align:4 +wether_move_odour__Fv = .text:0x800593DC; // type:function size:0x1A4 scope:local align:4 +wether_move_moya__Fv = .text:0x80059580; // type:function size:0x1A8 scope:local align:4 +wether_move_vrkumo__Fv = .text:0x80059728; // type:function size:0x710 scope:local align:4 +wether_move_mud__Fv = .text:0x80059E38; // type:function size:0x13C scope:local align:4 +wether_move_evil__Fv = .text:0x80059F74; // type:function size:0x144 scope:local align:4 dKyw_wether_move_draw__Fv = .text:0x8005A0B8; // type:function size:0x9C scope:global align:4 dKyw_wether_move_draw2__Fv = .text:0x8005A154; // type:function size:0x20 scope:global align:4 dKyw_wether_draw__Fv = .text:0x8005A174; // type:function size:0x190 scope:global align:4 dKyw_wether_draw2__Fv = .text:0x8005A304; // type:function size:0x3C scope:global align:4 dKyw_wether_proc__Fv = .text:0x8005A340; // type:function size:0x23C scope:global align:4 -dKyw_wind_init__Fv = .text:0x8005A57C; // type:function size:0x44 scope:global align:4 +dKyw_wind_init__Fv = .text:0x8005A57C; // type:function size:0x44 scope:local align:4 dKyw_wind_set__Fv = .text:0x8005A5C0; // type:function size:0x520 scope:global align:4 dKyw_get_wind_vec__Fv = .text:0x8005AAE0; // type:function size:0x10 scope:global align:4 dKyw_get_wind_pow__Fv = .text:0x8005AAF0; // type:function size:0x10 scope:global align:4 dKyw_get_wind_vecpow__Fv = .text:0x8005AB00; // type:function size:0x64 scope:global align:4 dKyw_plight_collision_set__FP4cXyzssfffff = .text:0x8005AB64; // type:function size:0xCC scope:global align:4 -squal_proc__Fv = .text:0x8005AC30; // type:function size:0x114 scope:global align:4 -dKyw_pntwind_init__Fv = .text:0x8005AD44; // type:function size:0x54 scope:global align:4 -pntwind_set__FP14WIND_INFLUENCE = .text:0x8005AD98; // type:function size:0x64 scope:global align:4 +squal_proc__Fv = .text:0x8005AC30; // type:function size:0x114 scope:local align:4 +dKyw_pntwind_init__Fv = .text:0x8005AD44; // type:function size:0x54 scope:local align:4 +pntwind_set__FP14WIND_INFLUENCE = .text:0x8005AD98; // type:function size:0x64 scope:local align:4 dKyw_pntwind_set__FP14WIND_INFLUENCE = .text:0x8005ADFC; // type:function size:0x2C scope:global align:4 -dKyw_pntlight_set__FP14WIND_INFLUENCE = .text:0x8005AE28; // type:function size:0x30 scope:global align:4 +dKyw_pntlight_set__FP14WIND_INFLUENCE = .text:0x8005AE28; // type:function size:0x30 scope:local align:4 dKyw_pntwind_cut__FP14WIND_INFLUENCE = .text:0x8005AE58; // type:function size:0x38 scope:global align:4 -pntwind_get_info__FP4cXyzP4cXyzPfUc = .text:0x8005AE90; // type:function size:0x3AC scope:global align:4 -dKyw_pntwind_get_info__FP4cXyzP4cXyzPf = .text:0x8005B23C; // type:function size:0x24 scope:global align:4 +pntwind_get_info__FP4cXyzP4cXyzPfUc = .text:0x8005AE90; // type:function size:0x3AC scope:local align:4 +dKyw_pntwind_get_info__FP4cXyzP4cXyzPf = .text:0x8005B23C; // type:function size:0x24 scope:local align:4 dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf = .text:0x8005B260; // type:function size:0x24 scope:global align:4 dKyw_pntwind_get_vecpow__FP4cXyz = .text:0x8005B284; // type:function size:0x74 scope:global align:4 dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf = .text:0x8005B2F8; // type:function size:0x238 scope:global align:4 @@ -2573,22 +2573,22 @@ dKyw_custom_windpower__Ff = .text:0x8005B60C; // type:function size:0x10 scope:g dKyw_evt_wind_set__Fss = .text:0x8005B61C; // type:function size:0x1C scope:global align:4 dKyw_evt_wind_set_go__Fv = .text:0x8005B638; // type:function size:0x14 scope:global align:4 dKyw_rain_set__Fi = .text:0x8005B64C; // type:function size:0x14 scope:global align:4 -vectle_calc__FP10DOUBLE_POSP4cXyz = .text:0x8005B660; // type:function size:0xA8 scope:global align:4 -get_vectle_calc__FP4cXyzP4cXyzP4cXyz = .text:0x8005B708; // type:function size:0x58 scope:global align:4 +vectle_calc__FP10DOUBLE_POSP4cXyz = .text:0x8005B660; // type:function size:0xA8 scope:local align:4 +get_vectle_calc__FP4cXyzP4cXyzP4cXyz = .text:0x8005B708; // type:function size:0x58 scope:local align:4 dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz = .text:0x8005B760; // type:function size:0x20 scope:global align:4 -dKy_set_eyevect_calc__FP12camera_classP3Vecff = .text:0x8005B780; // type:function size:0xB0 scope:global align:4 +dKy_set_eyevect_calc__FP12camera_classP3Vecff = .text:0x8005B780; // type:function size:0xB0 scope:local align:4 dKy_set_eyevect_calc2__FP12camera_classP3Vecff = .text:0x8005B830; // type:function size:0xFC scope:global align:4 -dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID = .text:0x8005B92C; // type:function size:0xF8 scope:global align:4 -dKyr_set_btitex__FP9_GXTexObjP7ResTIMG = .text:0x8005BA24; // type:function size:0x24 scope:global align:4 +dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID = .text:0x8005B92C; // type:function size:0xF8 scope:local align:4 +dKyr_set_btitex__FP9_GXTexObjP7ResTIMG = .text:0x8005BA24; // type:function size:0x24 scope:local align:4 dKyr_lenzflare_move__Fv = .text:0x8005BA48; // type:function size:0x490 scope:global align:4 -dKyr_moon_arrival_check__Fv = .text:0x8005BED8; // type:function size:0x30 scope:global align:4 +dKyr_moon_arrival_check__Fv = .text:0x8005BED8; // type:function size:0x30 scope:local align:4 dKyr_sun_move__Fv = .text:0x8005BF08; // type:function size:0xD54 scope:global align:4 dKyr_rain_init__Fv = .text:0x8005CC5C; // type:function size:0x14C scope:global align:4 -rain_bg_chk__FP19dKankyo_rain_Packeti = .text:0x8005CDA8; // type:function size:0x28 scope:global align:4 -overhead_bg_chk__Fv = .text:0x8005CDD0; // type:function size:0x1A8 scope:global align:4 -forward_overhead_bg_chk__FP4cXyzf = .text:0x8005CF78; // type:function size:0x214 scope:global align:4 +rain_bg_chk__FP19dKankyo_rain_Packeti = .text:0x8005CDA8; // type:function size:0x28 scope:local align:4 +overhead_bg_chk__Fv = .text:0x8005CDD0; // type:function size:0x1A8 scope:local align:4 +forward_overhead_bg_chk__FP4cXyzf = .text:0x8005CF78; // type:function size:0x214 scope:local align:4 dKyr_rain_move__Fv = .text:0x8005D18C; // type:function size:0x1724 scope:global align:4 -d_krain_cut_turn_check__Fv = .text:0x8005E8B0; // type:function size:0x48 scope:global align:4 +d_krain_cut_turn_check__Fv = .text:0x8005E8B0; // type:function size:0x48 scope:local align:4 dKyr_housi_move__Fv = .text:0x8005E8F8; // type:function size:0x12E4 scope:global align:4 dKyr_snow_init__Fv = .text:0x8005FBDC; // type:function size:0x16C scope:global align:4 dKyr_snow_move__Fv = .text:0x8005FD48; // type:function size:0x15DC scope:global align:4 @@ -2596,8 +2596,8 @@ dKyr_star_init__Fv = .text:0x80061324; // type:function size:0xE8 scope:global a dKyr_star_move__Fv = .text:0x8006140C; // type:function size:0x2C scope:global align:4 cloud_shadow_move__Fv = .text:0x80061438; // type:function size:0xC74 scope:global align:4 vrkumo_move__Fv = .text:0x800620AC; // type:function size:0xA30 scope:global align:4 -dKr_cullVtx_Set__Fv = .text:0x80062ADC; // type:function size:0x70 scope:global align:4 -dKyr_draw_rev_moon__FPA4_fPPUc = .text:0x80062B4C; // type:function size:0xB24 scope:global align:4 +dKr_cullVtx_Set__Fv = .text:0x80062ADC; // type:function size:0x70 scope:local align:4 +dKyr_draw_rev_moon__FPA4_fPPUc = .text:0x80062B4C; // type:function size:0xB24 scope:local align:4 dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc = .text:0x80063670; // type:function size:0xDDC scope:global align:4 dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc = .text:0x8006444C; // type:function size:0x11E0 scope:global align:4 dKyr_drawRain__FPA4_fPPUc = .text:0x8006562C; // type:function size:0xA1C scope:global align:4 @@ -2619,14 +2619,14 @@ dKyr_mud_move__Fv = .text:0x8006C85C; // type:function size:0x7C0 scope:global a dKyr_mud_draw__FPA4_fPPUc = .text:0x8006D01C; // type:function size:0x8F8 scope:global align:4 dKyr_evil_init__Fv = .text:0x8006D914; // type:function size:0xF0 scope:global align:4 dKyr_evil_move__Fv = .text:0x8006DA04; // type:function size:0x78 scope:global align:4 -dKyr_evil_draw2__FPA4_fPPUc = .text:0x8006DA7C; // type:function size:0x9CC scope:global align:4 -dKyr_near_bosslight_check__F4cXyz = .text:0x8006E448; // type:function size:0x268 scope:global align:4 +dKyr_evil_draw2__FPA4_fPPUc = .text:0x8006DA7C; // type:function size:0x9CC scope:local align:4 +dKyr_near_bosslight_check__F4cXyz = .text:0x8006E448; // type:function size:0x268 scope:local align:4 dKyr_evil_draw__FPA4_fPPUc = .text:0x8006E6B0; // type:function size:0xAB0 scope:global align:4 -getKandelaarFlamePos__9daPy_py_cFv = .text:0x8006F160; // type:function size:0x8 scope:global align:4 -makedata__25@unnamed@d_vibration_cpp@FPUsUll = .text:0x8006F168; // type:function size:0x1C scope:global align:4 -rollshift__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F184; // type:function size:0x20 scope:global align:4 -makebits__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F1A4; // type:function size:0x34 scope:global align:4 -randombit__25@unnamed@d_vibration_cpp@Fll = .text:0x8006F1D8; // type:function size:0x90 scope:global align:4 +getKandelaarFlamePos__9daPy_py_cFv = .text:0x8006F160; // type:function size:0x8 scope:weak align:4 +makedata__25@unnamed@d_vibration_cpp@FPUsUll = .text:0x8006F168; // type:function size:0x1C scope:local align:4 +rollshift__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F184; // type:function size:0x20 scope:local align:4 +makebits__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F1A4; // type:function size:0x34 scope:local align:4 +randombit__25@unnamed@d_vibration_cpp@Fll = .text:0x8006F1D8; // type:function size:0x90 scope:local align:4 Run__12dVibration_cFv = .text:0x8006F268; // type:function size:0x7BC scope:global align:4 StartShock__12dVibration_cFii4cXyz = .text:0x8006FA24; // type:function size:0xEC scope:global align:4 StartQuake__12dVibration_cFii4cXyz = .text:0x8006FB10; // type:function size:0xFC scope:global align:4 @@ -2638,7 +2638,7 @@ setDefault__12dVibration_cFv = .text:0x8006FE84; // type:function size:0x80 scop Init__12dVibration_cFv = .text:0x8006FF04; // type:function size:0x34 scope:global align:4 Pause__12dVibration_cFv = .text:0x8006FF38; // type:function size:0xC0 scope:global align:4 Remove__12dVibration_cFv = .text:0x8006FFF8; // type:function size:0x20 scope:global align:4 -padLockButton__25@unnamed@d_attention_cpp@Fl = .text:0x80070018; // type:function size:0x20 scope:global align:4 +padLockButton__25@unnamed@d_attention_cpp@Fl = .text:0x80070018; // type:function size:0x20 scope:local align:4 __ct__11dAttParam_cFl = .text:0x80070038; // type:function size:0xD8 scope:global align:4 __dt__11dAttParam_cFv = .text:0x80070110; // type:function size:0x48 scope:global align:4 __ct__15dAttDrawParam_cFv = .text:0x80070158; // type:function size:0x20 scope:global align:4 @@ -2649,26 +2649,26 @@ GetLockonList__12dAttention_cFl = .text:0x80070844; // type:function size:0x3C s getActionBtnB__12dAttention_cFv = .text:0x80070880; // type:function size:0xF4 scope:global align:4 getActionBtnXY__12dAttention_cFv = .text:0x80070974; // type:function size:0xFC scope:global align:4 chkAttMask__12dAttention_cFUlUl = .text:0x80070A70; // type:function size:0x50 scope:global align:4 -check_event_condition__FUlUs = .text:0x80070AC0; // type:function size:0x6C scope:global align:4 -check_flontofplayer__FUlss = .text:0x80070B2C; // type:function size:0xC8 scope:global align:4 -distace_weight__Ffsf = .text:0x80070BF4; // type:function size:0x4C scope:global align:4 -distace_angle_adjust__Ffsf = .text:0x80070C40; // type:function size:0x60 scope:global align:4 -check_distace__FP4cXyzsP4cXyzffff = .text:0x80070CA0; // type:function size:0x1F0 scope:global align:4 +check_event_condition__FUlUs = .text:0x80070AC0; // type:function size:0x6C scope:local align:4 +check_flontofplayer__FUlss = .text:0x80070B2C; // type:function size:0xC8 scope:local align:4 +distace_weight__Ffsf = .text:0x80070BF4; // type:function size:0x4C scope:local align:4 +distace_angle_adjust__Ffsf = .text:0x80070C40; // type:function size:0x60 scope:local align:4 +check_distace__FP4cXyzsP4cXyzffff = .text:0x80070CA0; // type:function size:0x1F0 scope:local align:4 calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl = .text:0x80070E90; // type:function size:0x230 scope:global align:4 setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl = .text:0x800710C0; // type:function size:0x180 scope:global align:4 initList__12dAttention_cFUl = .text:0x80071240; // type:function size:0x14C scope:global align:4 -select_attention__FP10fopAc_ac_cPv = .text:0x8007138C; // type:function size:0x40 scope:global align:4 +select_attention__FP10fopAc_ac_cPv = .text:0x8007138C; // type:function size:0x40 scope:local align:4 makeList__12dAttention_cFv = .text:0x800713CC; // type:function size:0x58 scope:global align:4 setOwnerAttentionPos__12dAttention_cFv = .text:0x80071424; // type:function size:0x64 scope:global align:4 SelectAttention__12dAttention_cFP10fopAc_ac_c = .text:0x80071488; // type:function size:0x1F4 scope:global align:4 -__dt__7cSGlobeFv = .text:0x8007167C; // type:function size:0x3C scope:global align:4 +__dt__7cSGlobeFv = .text:0x8007167C; // type:function size:0x3C scope:weak align:4 sortList__12dAttention_cFv = .text:0x800716B8; // type:function size:0x1EC scope:global align:4 stockAttention__12dAttention_cFv = .text:0x800718A4; // type:function size:0xBC scope:global align:4 nextAttention__12dAttention_cFv = .text:0x80071960; // type:function size:0x108 scope:global align:4 freeAttention__12dAttention_cFv = .text:0x80071A68; // type:function size:0x30 scope:global align:4 chaseAttention__12dAttention_cFv = .text:0x80071A98; // type:function size:0x228 scope:global align:4 EnemyDistance__12dAttention_cFP10fopAc_ac_c = .text:0x80071CC0; // type:function size:0xAC scope:global align:4 -sound_attention__FP10fopAc_ac_cPv = .text:0x80071D6C; // type:function size:0x80 scope:global align:4 +sound_attention__FP10fopAc_ac_cPv = .text:0x80071D6C; // type:function size:0x80 scope:local align:4 runSoundProc__12dAttention_cFv = .text:0x80071DEC; // type:function size:0x98 scope:global align:4 runDrawProc__12dAttention_cFv = .text:0x80071E84; // type:function size:0x270 scope:global align:4 runDebugDisp__12dAttention_cFv = .text:0x800720F4; // type:function size:0x4 scope:global align:4 @@ -2683,7 +2683,7 @@ lockSoundStart__12dAttention_cFUl = .text:0x80072D80; // type:function size:0x58 setAnm__10dAttDraw_cFUcf = .text:0x80072DD8; // type:function size:0x210 scope:global align:4 setAlphaAnm__10dAttDraw_cFUcUc = .text:0x80072FE8; // type:function size:0x1C scope:global align:4 alphaAnm__10dAttDraw_cFv = .text:0x80073004; // type:function size:0x2A8 scope:global align:4 -setTevKColor__11J3DTevBlockFUlPC10J3DGXColor = .text:0x800732AC; // type:function size:0x4 scope:global align:4 +setTevKColor__11J3DTevBlockFUlPC10J3DGXColor = .text:0x800732AC; // type:function size:0x4 scope:weak align:4 draw__10dAttDraw_cFR4cXyzPA4_f = .text:0x800732B0; // type:function size:0x28C scope:global align:4 LockonTarget__12dAttention_cFl = .text:0x8007353C; // type:function size:0xA0 scope:global align:4 LockonReleaseDistanse__12dAttention_cFv = .text:0x800735DC; // type:function size:0xF0 scope:global align:4 @@ -2707,7 +2707,7 @@ convPId__10dAttLook_cFUi = .text:0x80073CA4; // type:function size:0x30 scope:gl init__10dAttLook_cFv = .text:0x80073CD4; // type:function size:0x18 scope:global align:4 proc__10dAttLook_cFv = .text:0x80073CEC; // type:function size:0x1C scope:global align:4 request__10dAttLook_cFP10fopAc_ac_cfffsi = .text:0x80073D08; // type:function size:0x2BC scope:global align:4 -__dt__15dAttDrawParam_cFv = .text:0x80073FC4; // type:function size:0x48 scope:global align:4 +__dt__15dAttDrawParam_cFv = .text:0x80073FC4; // type:function size:0x48 scope:weak align:4 __sinit_d_attention_cpp = .text:0x8007400C; // type:function size:0x3C scope:local align:4 setCode__5dBgPcFR5sBgPc = .text:0x80074048; // type:function size:0x2C scope:global align:4 __ct__6dBgPlcFv = .text:0x80074074; // type:function size:0xC scope:global align:4 @@ -2770,7 +2770,7 @@ MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb = .text:0x80075774; MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075880; // type:function size:0xDC scope:global align:4 MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x8007595C; // type:function size:0xC8 scope:global align:4 dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075A24; // type:function size:0x80 scope:global align:4 -dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075AA4; // type:function size:0x34 scope:global align:4 +dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075AA4; // type:function size:0x34 scope:local align:4 dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075AD8; // type:function size:0x6C scope:global align:4 dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075B44; // type:function size:0x40 scope:global align:4 RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c = .text:0x80075B84; // type:function size:0x70 scope:global align:4 @@ -2816,15 +2816,15 @@ ChkGndThinCellingOff__9dBgS_AcchFv = .text:0x800773E0; // type:function size:0xC OnWallSort__9dBgS_AcchFv = .text:0x800773EC; // type:function size:0x10 scope:global align:4 ChkWallSort__9dBgS_AcchFv = .text:0x800773FC; // type:function size:0xC scope:global align:4 ChkLineDown__9dBgS_AcchFv = .text:0x80077408; // type:function size:0xC scope:global align:4 -__dt__12dBgS_AcchCirFv = .text:0x80077414; // type:function size:0x70 scope:global align:4 -@36@__dt__9dBgS_AcchFv = .text:0x80077484; // type:function size:0x8 scope:local align:4 -@20@__dt__9dBgS_AcchFv = .text:0x8007748C; // type:function size:0x8 scope:local align:4 -checkPlayerFly__9daPy_py_cCFv = .text:0x80077494; // type:function size:0x8 scope:global align:4 +__dt__12dBgS_AcchCirFv = .text:0x80077414; // type:function size:0x70 scope:weak align:4 +@36@__dt__9dBgS_AcchFv = .text:0x80077484; // type:function size:0x8 scope:weak align:4 +@20@__dt__9dBgS_AcchFv = .text:0x8007748C; // type:function size:0x8 scope:weak align:4 +checkPlayerFly__9daPy_py_cCFv = .text:0x80077494; // type:function size:0x8 scope:weak align:4 __ct__8dBgS_ChkFv = .text:0x8007749C; // type:function size:0x4C scope:global align:4 __dt__8dBgS_ChkFv = .text:0x800774E8; // type:function size:0x78 scope:global align:4 GetPolyPassChkInfo__8dBgS_ChkFv = .text:0x80077560; // type:function size:0x4 scope:global align:4 GetGrpPassChkInfo__8dBgS_ChkFv = .text:0x80077564; // type:function size:0x10 scope:global align:4 -@16@__dt__8dBgS_ChkFv = .text:0x80077574; // type:function size:0x8 scope:local align:4 +@16@__dt__8dBgS_ChkFv = .text:0x80077574; // type:function size:0x8 scope:weak align:4 __ct__11dBgS_GndChkFv = .text:0x8007757C; // type:function size:0x74 scope:global align:4 __dt__11dBgS_GndChkFv = .text:0x800775F0; // type:function size:0x88 scope:global align:4 __ct__18dBgS_ObjGndChk_WtrFv = .text:0x80077678; // type:function size:0x98 scope:global align:4 @@ -2835,27 +2835,27 @@ __dt__18dBgS_ObjGndChk_AllFv = .text:0x800778E8; // type:function size:0xA0 scop __dt__14dBgS_CamGndChkFv = .text:0x80077988; // type:function size:0x78 scope:global align:4 __ct__18dBgS_CamGndChk_WtrFv = .text:0x80077A00; // type:function size:0x98 scope:global align:4 __dt__18dBgS_CamGndChk_WtrFv = .text:0x80077A98; // type:function size:0x78 scope:global align:4 -@20@__dt__11dBgS_GndChkFv = .text:0x80077B10; // type:function size:0x8 scope:local align:4 -@76@__dt__11dBgS_GndChkFv = .text:0x80077B18; // type:function size:0x8 scope:local align:4 -@60@__dt__11dBgS_GndChkFv = .text:0x80077B20; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B28; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B30; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B38; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B40; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B48; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B50; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077B58; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077B60; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077B68; // type:function size:0x8 scope:local align:4 -@20@__dt__14dBgS_CamGndChkFv = .text:0x80077B70; // type:function size:0x8 scope:local align:4 -@76@__dt__14dBgS_CamGndChkFv = .text:0x80077B78; // type:function size:0x8 scope:local align:4 -@60@__dt__14dBgS_CamGndChkFv = .text:0x80077B80; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077B88; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077B90; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077B98; // type:function size:0x8 scope:local align:4 +@20@__dt__11dBgS_GndChkFv = .text:0x80077B10; // type:function size:0x8 scope:weak align:4 +@76@__dt__11dBgS_GndChkFv = .text:0x80077B18; // type:function size:0x8 scope:weak align:4 +@60@__dt__11dBgS_GndChkFv = .text:0x80077B20; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B28; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B30; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B38; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B40; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B48; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B50; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077B58; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077B60; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077B68; // type:function size:0x8 scope:weak align:4 +@20@__dt__14dBgS_CamGndChkFv = .text:0x80077B70; // type:function size:0x8 scope:weak align:4 +@76@__dt__14dBgS_CamGndChkFv = .text:0x80077B78; // type:function size:0x8 scope:weak align:4 +@60@__dt__14dBgS_CamGndChkFv = .text:0x80077B80; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077B88; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077B90; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077B98; // type:function size:0x8 scope:weak align:4 __ct__15dBgS_GrpPassChkFv = .text:0x80077BA0; // type:function size:0x24 scope:global align:4 __dt__15dBgS_GrpPassChkFv = .text:0x80077BC4; // type:function size:0x5C scope:global align:4 -__dt__15cBgS_GrpPassChkFv = .text:0x80077C20; // type:function size:0x48 scope:global align:4 +__dt__15cBgS_GrpPassChkFv = .text:0x80077C20; // type:function size:0x48 scope:weak align:4 __ct__11dBgS_LinChkFv = .text:0x80077C68; // type:function size:0x74 scope:global align:4 __dt__11dBgS_LinChkFv = .text:0x80077CDC; // type:function size:0x88 scope:global align:4 Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c = .text:0x80077D64; // type:function size:0x40 scope:global align:4 @@ -2877,36 +2877,36 @@ __ct__15dBgS_RopeLinChkFv = .text:0x8007838C; // type:function size:0x5C scope:g __dt__15dBgS_RopeLinChkFv = .text:0x800783E8; // type:function size:0x78 scope:global align:4 __ct__16dBgS_HorseLinChkFv = .text:0x80078460; // type:function size:0x5C scope:global align:4 __dt__16dBgS_HorseLinChkFv = .text:0x800784BC; // type:function size:0x78 scope:global align:4 -@20@__dt__11dBgS_LinChkFv = .text:0x80078534; // type:function size:0x8 scope:local align:4 -@104@__dt__11dBgS_LinChkFv = .text:0x8007853C; // type:function size:0x8 scope:local align:4 -@88@__dt__11dBgS_LinChkFv = .text:0x80078544; // type:function size:0x8 scope:local align:4 -@20@__dt__14dBgS_CamLinChkFv = .text:0x8007854C; // type:function size:0x8 scope:local align:4 -@104@__dt__14dBgS_CamLinChkFv = .text:0x80078554; // type:function size:0x8 scope:local align:4 -@88@__dt__14dBgS_CamLinChkFv = .text:0x8007855C; // type:function size:0x8 scope:local align:4 -@20@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x80078564; // type:function size:0x8 scope:local align:4 -@104@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x8007856C; // type:function size:0x8 scope:local align:4 -@88@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x80078574; // type:function size:0x8 scope:local align:4 -@20@__dt__14dBgS_ObjLinChkFv = .text:0x8007857C; // type:function size:0x8 scope:local align:4 -@104@__dt__14dBgS_ObjLinChkFv = .text:0x80078584; // type:function size:0x8 scope:local align:4 -@88@__dt__14dBgS_ObjLinChkFv = .text:0x8007858C; // type:function size:0x8 scope:local align:4 -@20@__dt__15dBgS_LinkLinChkFv = .text:0x80078594; // type:function size:0x8 scope:local align:4 -@104@__dt__15dBgS_LinkLinChkFv = .text:0x8007859C; // type:function size:0x8 scope:local align:4 -@88@__dt__15dBgS_LinkLinChkFv = .text:0x800785A4; // type:function size:0x8 scope:local align:4 -@20@__dt__15dBgS_BombLinChkFv = .text:0x800785AC; // type:function size:0x8 scope:local align:4 -@104@__dt__15dBgS_BombLinChkFv = .text:0x800785B4; // type:function size:0x8 scope:local align:4 -@88@__dt__15dBgS_BombLinChkFv = .text:0x800785BC; // type:function size:0x8 scope:local align:4 -@20@__dt__16dBgS_ArrowLinChkFv = .text:0x800785C4; // type:function size:0x8 scope:local align:4 -@104@__dt__16dBgS_ArrowLinChkFv = .text:0x800785CC; // type:function size:0x8 scope:local align:4 -@88@__dt__16dBgS_ArrowLinChkFv = .text:0x800785D4; // type:function size:0x8 scope:local align:4 -@20@__dt__20dBgS_BoomerangLinChkFv = .text:0x800785DC; // type:function size:0x8 scope:local align:4 -@104@__dt__20dBgS_BoomerangLinChkFv = .text:0x800785E4; // type:function size:0x8 scope:local align:4 -@88@__dt__20dBgS_BoomerangLinChkFv = .text:0x800785EC; // type:function size:0x8 scope:local align:4 -@20@__dt__15dBgS_RopeLinChkFv = .text:0x800785F4; // type:function size:0x8 scope:local align:4 -@104@__dt__15dBgS_RopeLinChkFv = .text:0x800785FC; // type:function size:0x8 scope:local align:4 -@88@__dt__15dBgS_RopeLinChkFv = .text:0x80078604; // type:function size:0x8 scope:local align:4 -@20@__dt__16dBgS_HorseLinChkFv = .text:0x8007860C; // type:function size:0x8 scope:local align:4 -@104@__dt__16dBgS_HorseLinChkFv = .text:0x80078614; // type:function size:0x8 scope:local align:4 -@88@__dt__16dBgS_HorseLinChkFv = .text:0x8007861C; // type:function size:0x8 scope:local align:4 +@20@__dt__11dBgS_LinChkFv = .text:0x80078534; // type:function size:0x8 scope:weak align:4 +@104@__dt__11dBgS_LinChkFv = .text:0x8007853C; // type:function size:0x8 scope:weak align:4 +@88@__dt__11dBgS_LinChkFv = .text:0x80078544; // type:function size:0x8 scope:weak align:4 +@20@__dt__14dBgS_CamLinChkFv = .text:0x8007854C; // type:function size:0x8 scope:weak align:4 +@104@__dt__14dBgS_CamLinChkFv = .text:0x80078554; // type:function size:0x8 scope:weak align:4 +@88@__dt__14dBgS_CamLinChkFv = .text:0x8007855C; // type:function size:0x8 scope:weak align:4 +@20@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x80078564; // type:function size:0x8 scope:weak align:4 +@104@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x8007856C; // type:function size:0x8 scope:weak align:4 +@88@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x80078574; // type:function size:0x8 scope:weak align:4 +@20@__dt__14dBgS_ObjLinChkFv = .text:0x8007857C; // type:function size:0x8 scope:weak align:4 +@104@__dt__14dBgS_ObjLinChkFv = .text:0x80078584; // type:function size:0x8 scope:weak align:4 +@88@__dt__14dBgS_ObjLinChkFv = .text:0x8007858C; // type:function size:0x8 scope:weak align:4 +@20@__dt__15dBgS_LinkLinChkFv = .text:0x80078594; // type:function size:0x8 scope:weak align:4 +@104@__dt__15dBgS_LinkLinChkFv = .text:0x8007859C; // type:function size:0x8 scope:weak align:4 +@88@__dt__15dBgS_LinkLinChkFv = .text:0x800785A4; // type:function size:0x8 scope:weak align:4 +@20@__dt__15dBgS_BombLinChkFv = .text:0x800785AC; // type:function size:0x8 scope:weak align:4 +@104@__dt__15dBgS_BombLinChkFv = .text:0x800785B4; // type:function size:0x8 scope:weak align:4 +@88@__dt__15dBgS_BombLinChkFv = .text:0x800785BC; // type:function size:0x8 scope:weak align:4 +@20@__dt__16dBgS_ArrowLinChkFv = .text:0x800785C4; // type:function size:0x8 scope:weak align:4 +@104@__dt__16dBgS_ArrowLinChkFv = .text:0x800785CC; // type:function size:0x8 scope:weak align:4 +@88@__dt__16dBgS_ArrowLinChkFv = .text:0x800785D4; // type:function size:0x8 scope:weak align:4 +@20@__dt__20dBgS_BoomerangLinChkFv = .text:0x800785DC; // type:function size:0x8 scope:weak align:4 +@104@__dt__20dBgS_BoomerangLinChkFv = .text:0x800785E4; // type:function size:0x8 scope:weak align:4 +@88@__dt__20dBgS_BoomerangLinChkFv = .text:0x800785EC; // type:function size:0x8 scope:weak align:4 +@20@__dt__15dBgS_RopeLinChkFv = .text:0x800785F4; // type:function size:0x8 scope:weak align:4 +@104@__dt__15dBgS_RopeLinChkFv = .text:0x800785FC; // type:function size:0x8 scope:weak align:4 +@88@__dt__15dBgS_RopeLinChkFv = .text:0x80078604; // type:function size:0x8 scope:weak align:4 +@20@__dt__16dBgS_HorseLinChkFv = .text:0x8007860C; // type:function size:0x8 scope:weak align:4 +@104@__dt__16dBgS_HorseLinChkFv = .text:0x80078614; // type:function size:0x8 scope:weak align:4 +@88@__dt__16dBgS_HorseLinChkFv = .text:0x8007861C; // type:function size:0x8 scope:weak align:4 __ct__16dBgS_MoveBgActorFv = .text:0x80078624; // type:function size:0x44 scope:global align:4 CheckCreateHeap__FP10fopAc_ac_c = .text:0x80078668; // type:function size:0x20 scope:local align:4 CreateHeap__16dBgS_MoveBgActorFv = .text:0x80078688; // type:function size:0x8 scope:global align:4 @@ -2923,17 +2923,17 @@ MoveBGDelete__16dBgS_MoveBgActorFv = .text:0x800788DC; // type:function size:0x7 MoveBGExecute__16dBgS_MoveBgActorFv = .text:0x80078950; // type:function size:0xC4 scope:global align:4 __ct__11dBgS_SphChkFv = .text:0x80078A14; // type:function size:0xAC scope:global align:4 __dt__11dBgS_SphChkFv = .text:0x80078AC0; // type:function size:0xB0 scope:global align:4 -@20@__dt__11dBgS_SphChkFv = .text:0x80078B70; // type:function size:0x8 scope:local align:4 -@36@__dt__11dBgS_SphChkFv = .text:0x80078B78; // type:function size:0x8 scope:local align:4 -@72@__dt__11dBgS_SphChkFv = .text:0x80078B80; // type:function size:0x8 scope:local align:4 -@56@__dt__11dBgS_SphChkFv = .text:0x80078B88; // type:function size:0x8 scope:local align:4 +@20@__dt__11dBgS_SphChkFv = .text:0x80078B70; // type:function size:0x8 scope:weak align:4 +@36@__dt__11dBgS_SphChkFv = .text:0x80078B78; // type:function size:0x8 scope:weak align:4 +@72@__dt__11dBgS_SphChkFv = .text:0x80078B80; // type:function size:0x8 scope:weak align:4 +@56@__dt__11dBgS_SphChkFv = .text:0x80078B88; // type:function size:0x8 scope:weak align:4 Set__14dBgS_SplGrpChkFR4cXyzf = .text:0x80078B90; // type:function size:0x20 scope:global align:4 __ct__14dBgS_SplGrpChkFv = .text:0x80078BB0; // type:function size:0xC8 scope:global align:4 __dt__14dBgS_SplGrpChkFv = .text:0x80078C78; // type:function size:0x94 scope:global align:4 Init__14dBgS_SplGrpChkFv = .text:0x80078D0C; // type:function size:0x40 scope:global align:4 -@16@__dt__14dBgS_SplGrpChkFv = .text:0x80078D4C; // type:function size:0x8 scope:local align:4 -@52@__dt__14dBgS_SplGrpChkFv = .text:0x80078D54; // type:function size:0x8 scope:local align:4 -@36@__dt__14dBgS_SplGrpChkFv = .text:0x80078D5C; // type:function size:0x8 scope:local align:4 +@16@__dt__14dBgS_SplGrpChkFv = .text:0x80078D4C; // type:function size:0x8 scope:weak align:4 +@52@__dt__14dBgS_SplGrpChkFv = .text:0x80078D54; // type:function size:0x8 scope:weak align:4 +@36@__dt__14dBgS_SplGrpChkFv = .text:0x80078D5C; // type:function size:0x8 scope:weak align:4 __ct__16dBgS_PolyPassChkFv = .text:0x80078D64; // type:function size:0x4C scope:global align:4 __dt__16dBgS_PolyPassChkFv = .text:0x80078DB0; // type:function size:0x5C scope:global align:4 SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk = .text:0x80078E0C; // type:function size:0x5C scope:global align:4 @@ -2955,13 +2955,13 @@ SetStatue__16dBgS_PolyPassChkFv = .text:0x80078F7C; // type:function size:0xC sc ClrStatue__16dBgS_PolyPassChkFv = .text:0x80078F88; // type:function size:0xC scope:global align:4 SetIronBall__16dBgS_PolyPassChkFv = .text:0x80078F94; // type:function size:0xC scope:global align:4 ClrIronBall__16dBgS_PolyPassChkFv = .text:0x80078FA0; // type:function size:0xC scope:global align:4 -__dt__16cBgS_PolyPassChkFv = .text:0x80078FAC; // type:function size:0x48 scope:global align:4 +__dt__16cBgS_PolyPassChkFv = .text:0x80078FAC; // type:function size:0x48 scope:weak align:4 __ct__12dBgS_RoofChkFv = .text:0x80078FF4; // type:function size:0x9C scope:global align:4 __dt__12dBgS_RoofChkFv = .text:0x80079090; // type:function size:0x94 scope:global align:4 Init__12dBgS_RoofChkFv = .text:0x80079124; // type:function size:0x28 scope:global align:4 -@16@__dt__12dBgS_RoofChkFv = .text:0x8007914C; // type:function size:0x8 scope:local align:4 -@52@__dt__12dBgS_RoofChkFv = .text:0x80079154; // type:function size:0x8 scope:local align:4 -@36@__dt__12dBgS_RoofChkFv = .text:0x8007915C; // type:function size:0x8 scope:local align:4 +@16@__dt__12dBgS_RoofChkFv = .text:0x8007914C; // type:function size:0x8 scope:weak align:4 +@52@__dt__12dBgS_RoofChkFv = .text:0x80079154; // type:function size:0x8 scope:weak align:4 +@36@__dt__12dBgS_RoofChkFv = .text:0x8007915C; // type:function size:0x8 scope:weak align:4 __ct__11dBgS_WtrChkFv = .text:0x80079164; // type:function size:0x60 scope:global align:4 __ct__11cBgW_RwgElmFv = .text:0x800791C4; // type:function size:0x10 scope:global align:4 __dt__11cBgW_RwgElmFv = .text:0x800791D4; // type:function size:0x48 scope:global align:4 @@ -2989,7 +2989,7 @@ Set__4cBgWFP6cBgD_tUlPA3_A4_f = .text:0x80079F38; // type:function size:0x24C sc __dt__11cBgW_GrpElmFv = .text:0x8007A184; // type:function size:0x60 scope:global align:4 __ct__11cBgW_GrpElmFv = .text:0x8007A1E4; // type:function size:0x1C scope:global align:4 RwgLineCheck__4cBgWFUsP11cBgS_LinChk = .text:0x8007A200; // type:function size:0x144 scope:global align:4 -__dt__8cM3dGTriFv = .text:0x8007A344; // type:function size:0x5C scope:global align:4 +__dt__8cM3dGTriFv = .text:0x8007A344; // type:function size:0x5C scope:weak align:4 LineCheckRp__4cBgWFP11cBgS_LinChki = .text:0x8007A3A0; // type:function size:0x18C scope:global align:4 LineCheckGrpRp__4cBgWFP11cBgS_LinChkii = .text:0x8007A52C; // type:function size:0x12C scope:global align:4 LineCheck__4cBgWFP11cBgS_LinChk = .text:0x8007A658; // type:function size:0x28 scope:global align:4 @@ -3093,9 +3093,9 @@ CallArrowStickCallBack__4dBgWFP10fopAc_ac_cP10fopAc_ac_cR4cXyz = .text:0x8007E47 OffMoveFlag__4dBgWFv = .text:0x8007E4A4; // type:function size:0x10 scope:global align:4 ChkMoveFlag__4dBgWCFv = .text:0x8007E4B4; // type:function size:0xC scope:global align:4 dBgW_NewSet__FP6cBgD_tUlPA3_A4_f = .text:0x8007E4C0; // type:function size:0x88 scope:global align:4 -__dt__4dBgWFv = .text:0x8007E548; // type:function size:0x60 scope:global align:4 +__dt__4dBgWFv = .text:0x8007E548; // type:function size:0x60 scope:weak align:4 __ct__9dBgW_BaseFv = .text:0x8007E5A8; // type:function size:0x50 scope:global align:4 -__dt__9cBgW_BgIdFv = .text:0x8007E5F8; // type:function size:0x48 scope:global align:4 +__dt__9cBgW_BgIdFv = .text:0x8007E5F8; // type:function size:0x48 scope:weak align:4 __dt__9dBgW_BaseFv = .text:0x8007E640; // type:function size:0x5C scope:global align:4 ClrDBgWBase__9dBgW_BaseFv = .text:0x8007E69C; // type:function size:0x34 scope:global align:4 ChkMemoryError__9dBgW_BaseFv = .text:0x8007E6D0; // type:function size:0x8 scope:global align:4 @@ -3173,7 +3173,7 @@ CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz = .text:0x80083244; // TransPosWork__6dBgWSvFP4cXyziii = .text:0x80083300; // type:function size:0x21C scope:global align:4 TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz = .text:0x8008351C; // type:function size:0xBC scope:global align:4 MatrixCrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz = .text:0x800835D8; // type:function size:0x4 scope:global align:4 -__dt__6dBgWSvFv = .text:0x800835DC; // type:function size:0x70 scope:global align:4 +__dt__6dBgWSvFv = .text:0x800835DC; // type:function size:0x70 scope:weak align:4 ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv = .text:0x8008364C; // type:function size:0x14 scope:global align:4 ct__22dCcD_GAtTgCoCommonBaseFv = .text:0x80083660; // type:function size:0x18 scope:global align:4 SetHitApid__22dCcD_GAtTgCoCommonBaseFUi = .text:0x80083678; // type:function size:0x10 scope:global align:4 @@ -3305,9 +3305,9 @@ Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v = .text:0x800852E0; // Clear__12dCcMassS_ObjFv = .text:0x800852F0; // type:function size:0x44 scope:global align:4 ClearPointer__15dCcMassS_HitInfFv = .text:0x80085334; // type:function size:0x1C scope:global align:4 __ct__12dCcMassS_MngFv = .text:0x80085350; // type:function size:0x100 scope:global align:4 -__dt__12cCcD_CpsAttrFv = .text:0x80085450; // type:function size:0x90 scope:global align:4 -__dt__12cCcD_CylAttrFv = .text:0x800854E0; // type:function size:0x8C scope:global align:4 -__dt__14cCcD_ShapeAttrFv = .text:0x8008556C; // type:function size:0x5C scope:global align:4 +__dt__12cCcD_CpsAttrFv = .text:0x80085450; // type:function size:0x90 scope:weak align:4 +__dt__12cCcD_CylAttrFv = .text:0x800854E0; // type:function size:0x8C scope:weak align:4 +__dt__14cCcD_ShapeAttrFv = .text:0x8008556C; // type:function size:0x5C scope:weak align:4 __ct__12dCcMassS_ObjFv = .text:0x800855C8; // type:function size:0x1C scope:global align:4 Ct__12dCcMassS_MngFv = .text:0x800855E4; // type:function size:0x4C scope:global align:4 SetAttr__12dCcMassS_MngFffUcUc = .text:0x80085630; // type:function size:0x60 scope:global align:4 @@ -3333,7 +3333,7 @@ ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCc SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz = .text:0x80086AC0; // type:function size:0x2CC scope:global align:4 ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c = .text:0x80086D8C; // type:function size:0x230 scope:global align:4 chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c = .text:0x80086FBC; // type:function size:0x260 scope:global align:4 -__dt__12cCcD_SphAttrFv = .text:0x8008721C; // type:function size:0x8C scope:global align:4 +__dt__12cCcD_SphAttrFv = .text:0x8008721C; // type:function size:0x8C scope:weak align:4 MoveAfterCheck__4dCcSFv = .text:0x800872A8; // type:function size:0x4 scope:global align:4 DrawAfter__4dCcSFv = .text:0x800872AC; // type:function size:0x4 scope:global align:4 Move__4dCcSFv = .text:0x800872B0; // type:function size:0x20 scope:global align:4 @@ -3343,16 +3343,16 @@ ChkAtTgMtrlHit__4dCcSFUcUc = .text:0x80087330; // type:function size:0x1C scope: ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts = .text:0x8008734C; // type:function size:0x64 scope:global align:4 pl_cut_LRC__Fi = .text:0x800873B0; // type:function size:0x24 scope:global align:4 cc_pl_cut_bit_get__Fv = .text:0x800873D4; // type:function size:0xF0 scope:global align:4 -getMapInfo__FSc = .text:0x800874C4; // type:function size:0x2C scope:global align:4 -getHitId__FP8cCcD_Obji = .text:0x800874F0; // type:function size:0x24 scope:global align:4 +getMapInfo__FSc = .text:0x800874C4; // type:function size:0x2C scope:local align:4 +getHitId__FP8cCcD_Obji = .text:0x800874F0; // type:function size:0x24 scope:local align:4 def_se_set__FP10Z2CreatureP8cCcD_ObjUlP10fopAc_ac_c = .text:0x80087514; // type:function size:0x80 scope:global align:4 -at_power_get__FP11dCcU_AtInfo = .text:0x80087594; // type:function size:0x4C4 scope:global align:4 +at_power_get__FP11dCcU_AtInfo = .text:0x80087594; // type:function size:0x4C4 scope:local align:4 at_power_check__FP11dCcU_AtInfo = .text:0x80087A58; // type:function size:0x1AC scope:global align:4 cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo = .text:0x80087C04; // type:function size:0x530 scope:global align:4 -checkCutJumpCancelTurn__9daPy_py_cCFv = .text:0x80088134; // type:function size:0x8 scope:global align:4 +checkCutJumpCancelTurn__9daPy_py_cCFv = .text:0x80088134; // type:function size:0x8 scope:weak align:4 rationalBezierRatio__8dCamMathFff = .text:0x8008813C; // type:function size:0x148 scope:global align:4 zoomFovy__8dCamMathFff = .text:0x80088284; // type:function size:0x5C scope:global align:4 -__dt__7cDegreeFv = .text:0x800882E0; // type:function size:0x3C scope:global align:4 +__dt__7cDegreeFv = .text:0x800882E0; // type:function size:0x3C scope:weak align:4 xyzRotateX__8dCamMathFR4cXyz7cSAngle = .text:0x8008831C; // type:function size:0x68 scope:global align:4 xyzRotateY__8dCamMathFR4cXyz7cSAngle = .text:0x80088384; // type:function size:0x68 scope:global align:4 xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz = .text:0x800883EC; // type:function size:0x48 scope:global align:4 @@ -3367,8 +3367,8 @@ __ct__11dCamSetup_cFv = .text:0x80088668; // type:function size:0x250 scope:glob __dt__11dCamSetup_cFv = .text:0x800888B8; // type:function size:0x60 scope:global align:4 CheckLatitudeRange__11dCamSetup_cFPs = .text:0x80088918; // type:function size:0x70 scope:global align:4 PlayerHideDist__11dCamSetup_cFv = .text:0x80088988; // type:function size:0x28 scope:global align:4 -__dt__9dCstick_cFv = .text:0x800889B0; // type:function size:0x48 scope:global align:4 -isStageEvent__25@unnamed@d_ev_camera_cpp@Fi = .text:0x800889F8; // type:function size:0x84 scope:global align:4 +__dt__9dCstick_cFv = .text:0x800889B0; // type:function size:0x48 scope:weak align:4 +isStageEvent__25@unnamed@d_ev_camera_cpp@Fi = .text:0x800889F8; // type:function size:0x84 scope:local align:4 StartEventCamera__9dCamera_cFiie = .text:0x80088A7C; // type:function size:0x140 scope:global align:4 EndEventCamera__9dCamera_cFi = .text:0x80088BBC; // type:function size:0x68 scope:global align:4 searchEventArgData__9dCamera_cFPc = .text:0x80088C24; // type:function size:0x8C scope:global align:4 @@ -3393,22 +3393,22 @@ uniformTransEvCamera__9dCamera_cFv = .text:0x8008BE2C; // type:function size:0x2 uniformBrakeEvCamera__9dCamera_cFv = .text:0x8008BE50; // type:function size:0x24 scope:global align:4 uniformAcceleEvCamera__9dCamera_cFv = .text:0x8008BE74; // type:function size:0x24 scope:global align:4 transEvCamera__9dCamera_cFi = .text:0x8008BE98; // type:function size:0x28B8 scope:global align:4 -isRelChar__25@unnamed@d_ev_camera_cpp@Fc = .text:0x8008E750; // type:function size:0x24 scope:global align:4 -__as__7cSGlobeFRC7cSGlobe = .text:0x8008E774; // type:function size:0x1C scope:global align:4 -abs__4cXyzCFv = .text:0x8008E790; // type:function size:0x104 scope:global align:4 -U__7cSGlobeFRC7cSAngle = .text:0x8008E894; // type:function size:0x3C scope:global align:4 -__ami__4cXyzFRC3Vec = .text:0x8008E8D0; // type:function size:0x34 scope:global align:4 -__apl__4cXyzFRC3Vec = .text:0x8008E904; // type:function size:0x34 scope:global align:4 +isRelChar__25@unnamed@d_ev_camera_cpp@Fc = .text:0x8008E750; // type:function size:0x24 scope:local align:4 +__as__7cSGlobeFRC7cSGlobe = .text:0x8008E774; // type:function size:0x1C scope:weak align:4 +abs__4cXyzCFv = .text:0x8008E790; // type:function size:0x104 scope:weak align:4 +U__7cSGlobeFRC7cSAngle = .text:0x8008E894; // type:function size:0x3C scope:weak align:4 +__ami__4cXyzFRC3Vec = .text:0x8008E8D0; // type:function size:0x34 scope:weak align:4 +__apl__4cXyzFRC3Vec = .text:0x8008E904; // type:function size:0x34 scope:weak align:4 watchActorEvCamera__9dCamera_cFv = .text:0x8008E938; // type:function size:0x1120 scope:global align:4 -V__7cSGlobeFRC7cSAngle = .text:0x8008FA58; // type:function size:0x3C scope:global align:4 -lineCollisionCheck__25@unnamed@d_ev_camera_cpp@F4cXyz4cXyzP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c = .text:0x8008FA94; // type:function size:0x54 scope:global align:4 +V__7cSGlobeFRC7cSAngle = .text:0x8008FA58; // type:function size:0x3C scope:weak align:4 +lineCollisionCheck__25@unnamed@d_ev_camera_cpp@F4cXyz4cXyzP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c = .text:0x8008FA94; // type:function size:0x54 scope:local align:4 restorePosEvCamera__9dCamera_cFv = .text:0x8008FAE8; // type:function size:0x68C scope:global align:4 talktoEvCamera__9dCamera_cFv = .text:0x80090174; // type:function size:0xBC scope:global align:4 maptoolIdEvCamera__9dCamera_cFv = .text:0x80090230; // type:function size:0x248 scope:global align:4 styleEvCamera__9dCamera_cFv = .text:0x80090478; // type:function size:0x9C scope:global align:4 gameOverEvCamera__9dCamera_cFv = .text:0x80090514; // type:function size:0xF54 scope:global align:4 tactEvCamera__9dCamera_cFv = .text:0x80091468; // type:function size:0xF04 scope:global align:4 -dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs = .text:0x8009236C; // type:function size:0x4C scope:global align:4 +dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs = .text:0x8009236C; // type:function size:0x4C scope:weak align:4 turnToActorEvCamera__9dCamera_cFv = .text:0x800923B8; // type:function size:0x8 scope:global align:4 stbWaitEvCamera__9dCamera_cFv = .text:0x800923C0; // type:function size:0x110 scope:global align:4 saveEvCamera__9dCamera_cFv = .text:0x800924D0; // type:function size:0xBC scope:global align:4 @@ -3426,23 +3426,23 @@ hintTalkEvCamera__9dCamera_cFv = .text:0x800965AC; // type:function size:0x930 s bspTransEvCamera__9dCamera_cFv = .text:0x80096EDC; // type:function size:0x7B8 scope:global align:4 portalWarpEvCamera__9dCamera_cFv = .text:0x80097694; // type:function size:0x8 scope:global align:4 __sinit_d_ev_camera_cpp = .text:0x8009769C; // type:function size:0x80 scope:local align:4 -attentionPos__9dCamera_cFP10fopAc_ac_c = .text:0x8009771C; // type:function size:0x1C scope:global align:4 -directionOf__9dCamera_cFP10fopAc_ac_c = .text:0x80097738; // type:function size:0x24 scope:global align:4 -positionOf__9dCamera_cFP10fopAc_ac_c = .text:0x8009775C; // type:function size:0x1C scope:global align:4 -setFlag__9dCamera_cFUl = .text:0x80097778; // type:function size:0x14 scope:global align:4 -eyePos__9dCamera_cFP10fopAc_ac_c = .text:0x8009778C; // type:function size:0x1C scope:global align:4 -checkNoDraw__9daMidna_cCFv = .text:0x800977A8; // type:function size:0xC scope:global align:4 -checkMidnaRide__9daPy_py_cCFv = .text:0x800977B4; // type:function size:0xC scope:global align:4 -fopAcM_GetID__FPCv = .text:0x800977C0; // type:function size:0x18 scope:global align:4 -__as__4cXyzFRC4cXyz = .text:0x800977D8; // type:function size:0x1C scope:global align:4 -__ct__4cXyzFRC4cXyz = .text:0x800977F4; // type:function size:0x1C scope:global align:4 -__dt__Q29dCamera_c26@class$5983d_ev_camera_cppFv = .text:0x80097810; // type:function size:0x3C scope:local align:4 -__ct__Q29dCamera_c26@class$5983d_ev_camera_cppFv = .text:0x8009784C; // type:function size:0x4 scope:local align:4 -checkCanoeRide__9daPy_py_cCFv = .text:0x80097850; // type:function size:0x8 scope:global align:4 -checkBoardRide__9daPy_py_cCFv = .text:0x80097858; // type:function size:0x8 scope:global align:4 -checkSpinnerRide__9daPy_py_cCFv = .text:0x80097860; // type:function size:0x8 scope:global align:4 -checkBoarRide__9daPy_py_cCFv = .text:0x80097868; // type:function size:0x8 scope:global align:4 -getShadowTalkAtnPos__9daAlink_cFv = .text:0x80097870; // type:function size:0x8 scope:global align:4 +attentionPos__9dCamera_cFP10fopAc_ac_c = .text:0x8009771C; // type:function size:0x1C scope:weak align:4 +directionOf__9dCamera_cFP10fopAc_ac_c = .text:0x80097738; // type:function size:0x24 scope:weak align:4 +positionOf__9dCamera_cFP10fopAc_ac_c = .text:0x8009775C; // type:function size:0x1C scope:weak align:4 +setFlag__9dCamera_cFUl = .text:0x80097778; // type:function size:0x14 scope:weak align:4 +eyePos__9dCamera_cFP10fopAc_ac_c = .text:0x8009778C; // type:function size:0x1C scope:weak align:4 +checkNoDraw__9daMidna_cCFv = .text:0x800977A8; // type:function size:0xC scope:weak align:4 +checkMidnaRide__9daPy_py_cCFv = .text:0x800977B4; // type:function size:0xC scope:weak align:4 +fopAcM_GetID__FPCv = .text:0x800977C0; // type:function size:0x18 scope:weak align:4 +__as__4cXyzFRC4cXyz = .text:0x800977D8; // type:function size:0x1C scope:weak align:4 +__ct__4cXyzFRC4cXyz = .text:0x800977F4; // type:function size:0x1C scope:weak align:4 +__dt__Q29dCamera_c26@class$3517d_ev_camera_cppFv = .text:0x80097810; // type:function size:0x3C scope:weak align:4 +__ct__Q29dCamera_c26@class$3517d_ev_camera_cppFv = .text:0x8009784C; // type:function size:0x4 scope:weak align:4 +checkCanoeRide__9daPy_py_cCFv = .text:0x80097850; // type:function size:0x8 scope:weak align:4 +checkBoardRide__9daPy_py_cCFv = .text:0x80097858; // type:function size:0x8 scope:weak align:4 +checkSpinnerRide__9daPy_py_cCFv = .text:0x80097860; // type:function size:0x8 scope:weak align:4 +checkBoarRide__9daPy_py_cCFv = .text:0x80097868; // type:function size:0x8 scope:weak align:4 +getShadowTalkAtnPos__9daAlink_cFv = .text:0x80097870; // type:function size:0x8 scope:weak align:4 Init__14d2DBSplinePathFll = .text:0x80097878; // type:function size:0x8C scope:global align:4 Step__14d2DBSplinePathFv = .text:0x80097904; // type:function size:0x168 scope:global align:4 Calc__14d2DBSplinePathFP4cXyz = .text:0x80097A6C; // type:function size:0xB4 scope:global align:4 @@ -3860,16 +3860,16 @@ __dt__6dMdl_cFv = .text:0x8009C808; // type:function size:0x5C scope:global alig remove__10dMdl_mng_cFv = .text:0x8009C864; // type:function size:0x5C scope:global align:4 reset__10dMdl_mng_cFv = .text:0x8009C8C0; // type:function size:0x18 scope:global align:4 entry__10dMdl_mng_cFP12J3DModelDataUsi = .text:0x8009C8D8; // type:function size:0x58 scope:global align:4 -__ct__6dMdl_cFv = .text:0x8009C930; // type:function size:0x34 scope:global align:4 +__ct__6dMdl_cFv = .text:0x8009C930; // type:function size:0x34 scope:weak align:4 entry__8dEyeHL_cFP12J3DModelDataPCc = .text:0x8009C964; // type:function size:0xC4 scope:global align:4 remove__8dEyeHL_cFv = .text:0x8009CA28; // type:function size:0x20 scope:global align:4 update__12dEyeHL_mng_cFv = .text:0x8009CA48; // type:function size:0xCC scope:global align:4 entry__12dEyeHL_mng_cFP8dEyeHL_c = .text:0x8009CB14; // type:function size:0x20 scope:global align:4 remove__12dEyeHL_mng_cFP8dEyeHL_c = .text:0x8009CB34; // type:function size:0x54 scope:global align:4 -messageSet__FUlb = .text:0x8009CB88; // type:function size:0x60C scope:global align:4 +messageSet__FUlb = .text:0x8009CB88; // type:function size:0x60C scope:local align:4 draw__14dDvdErrorMsg_cFl = .text:0x8009D194; // type:function size:0x1C0 scope:global align:4 execute__14dDvdErrorMsg_cFv = .text:0x8009D354; // type:function size:0xBC scope:global align:4 -drawCapture__FUc = .text:0x8009D410; // type:function size:0x380 scope:global align:4 +drawCapture__FUc = .text:0x8009D410; // type:function size:0x380 scope:local align:4 execute__19dShutdownErrorMsg_cFv = .text:0x8009D790; // type:function size:0xEC scope:global align:4 getE3Zhint__9daAlink_cFv = .text:0x8009D87C; // type:function size:0x8 scope:global align:4 getAlinkArcName__9daAlink_cFv = .text:0x8009D884; // type:function size:0x8 scope:global align:4 @@ -6076,13 +6076,13 @@ getBtpFrm__12daItemBase_cFv = .text:0x80145180; // type:function size:0x1C scope getShadowSize__12daItemBase_cFv = .text:0x8014519C; // type:function size:0x18 scope:global align:4 getCollisionH__12daItemBase_cFv = .text:0x801451B4; // type:function size:0x1C scope:global align:4 getCollisionR__12daItemBase_cFv = .text:0x801451D0; // type:function size:0x1C scope:global align:4 -isLoadRoom__Fi = .text:0x801451EC; // type:function size:0xF0 scope:global align:4 +isLoadRoom__Fi = .text:0x801451EC; // type:function size:0xF0 scope:local align:4 execute__9daNocrm_cFv = .text:0x801452DC; // type:function size:0x22C scope:global align:4 getRoomNo__9daNocrm_cFi = .text:0x80145508; // type:function size:0xA0 scope:global align:4 -daNocrm_create__FP9daNocrm_c = .text:0x801455A8; // type:function size:0xFC scope:global align:4 -daNocrm_Delete__FP9daNocrm_c = .text:0x801456A4; // type:function size:0x8 scope:global align:4 -daNocrm_execute__FP9daNocrm_c = .text:0x801456AC; // type:function size:0x20 scope:global align:4 -daNocrm_draw__FP9daNocrm_c = .text:0x801456CC; // type:function size:0x8 scope:global align:4 +daNocrm_create__FP9daNocrm_c = .text:0x801455A8; // type:function size:0xFC scope:local align:4 +daNocrm_Delete__FP9daNocrm_c = .text:0x801456A4; // type:function size:0x8 scope:local align:4 +daNocrm_execute__FP9daNocrm_c = .text:0x801456AC; // type:function size:0x20 scope:local align:4 +daNocrm_draw__FP9daNocrm_c = .text:0x801456CC; // type:function size:0x8 scope:local align:4 initialize__18daNpcT_ActorMngr_cFv = .text:0x801456D4; // type:function size:0xC scope:global align:4 entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c = .text:0x801456E0; // type:function size:0x1C scope:global align:4 remove__18daNpcT_ActorMngr_cFv = .text:0x801456FC; // type:function size:0xC scope:global align:4 @@ -6446,13 +6446,13 @@ setHitodamaParticle__9daNpcCd_cFv = .text:0x8015736C; // type:function size:0x1B getNpcMdlDataP__9daNpcCd_cFi = .text:0x80157524; // type:function size:0x64 scope:global align:4 getObjMdlDataP__9daNpcCd_cFi = .text:0x80157588; // type:function size:0x78 scope:global align:4 __ct__13daNpcCd_HIO_cFv = .text:0x80157600; // type:function size:0x1A0 scope:global align:4 -__dt__19daNpcCd_HIO_Child_cFv = .text:0x801577A0; // type:function size:0x70 scope:global align:4 -__dt__17daNpcCd_HIO_Jnt_cFv = .text:0x80157810; // type:function size:0x48 scope:global align:4 -__ct__19daNpcCd_HIO_Child_cFv = .text:0x80157858; // type:function size:0x58 scope:global align:4 -__ct__17daNpcCd_HIO_Jnt_cFv = .text:0x801578B0; // type:function size:0x10 scope:global align:4 -__dt__18fOpAcm_HIO_entry_cFv = .text:0x801578C0; // type:function size:0x5C scope:global align:4 -__dt__14mDoHIO_entry_cFv = .text:0x8015791C; // type:function size:0x48 scope:global align:4 -__dt__13daNpcCd_HIO_cFv = .text:0x80157964; // type:function size:0xAC scope:global align:4 +__dt__19daNpcCd_HIO_Child_cFv = .text:0x801577A0; // type:function size:0x70 scope:weak align:4 +__dt__17daNpcCd_HIO_Jnt_cFv = .text:0x80157810; // type:function size:0x48 scope:weak align:4 +__ct__19daNpcCd_HIO_Child_cFv = .text:0x80157858; // type:function size:0x58 scope:weak align:4 +__ct__17daNpcCd_HIO_Jnt_cFv = .text:0x801578B0; // type:function size:0x10 scope:weak align:4 +__dt__18fOpAcm_HIO_entry_cFv = .text:0x801578C0; // type:function size:0x5C scope:weak align:4 +__dt__14mDoHIO_entry_cFv = .text:0x8015791C; // type:function size:0x48 scope:weak align:4 +__dt__13daNpcCd_HIO_cFv = .text:0x80157964; // type:function size:0xAC scope:weak align:4 __sinit_d_a_npc_cd_cpp = .text:0x80157A10; // type:function size:0x2A4 scope:local align:4 jntNodeCallBack__FP8J3DJointi = .text:0x80157CB4; // type:function size:0x4C scope:local align:4 NpcCreate__10daNpcCd2_cFi = .text:0x80157D00; // type:function size:0x228 scope:global align:4 @@ -6499,18 +6499,18 @@ __dt__21daNpcCd2_HIO_MChild_cFv = .text:0x8015A798; // type:function size:0x70 s __ct__21daNpcCd2_HIO_MChild_cFv = .text:0x8015A808; // type:function size:0x58 scope:global align:4 __dt__14daNpcCd2_HIO_cFv = .text:0x8015A860; // type:function size:0xAC scope:global align:4 __sinit_d_a_npc_cd2_cpp = .text:0x8015A90C; // type:function size:0x4C0 scope:local align:4 -Reflect__FP4cXyzRC13cBgS_PolyInfof = .text:0x8015ADCC; // type:function size:0x2EC scope:global align:4 +Reflect__FP4cXyzRC13cBgS_PolyInfof = .text:0x8015ADCC; // type:function size:0x2EC scope:local align:4 getData__12daItemBase_cFv = .text:0x8015B0B8; // type:function size:0xC scope:global align:4 initBaseMtx__8daItem_cFv = .text:0x8015B0C4; // type:function size:0x44 scope:global align:4 setBaseMtx__8daItem_cFv = .text:0x8015B108; // type:function size:0x88 scope:global align:4 setBaseMtx_0__8daItem_cFv = .text:0x8015B190; // type:function size:0x38 scope:global align:4 setBaseMtx_1__8daItem_cFv = .text:0x8015B1C8; // type:function size:0x8C scope:global align:4 -itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B254; // type:function size:0xCC scope:global align:4 -itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B320; // type:function size:0xB8 scope:global align:4 +itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B254; // type:function size:0xCC scope:local align:4 +itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B320; // type:function size:0xB8 scope:local align:4 CreateInit__8daItem_cFv = .text:0x8015B3D8; // type:function size:0x3E4 scope:global align:4 setCullInfo__8daItem_cFv = .text:0x8015B7BC; // type:function size:0x18 scope:global align:4 _daItem_create__8daItem_cFv = .text:0x8015B7D4; // type:function size:0x268 scope:global align:4 -__dt__16Z2SoundObjSimpleFv = .text:0x8015BA3C; // type:function size:0x60 scope:global align:4 +__dt__16Z2SoundObjSimpleFv = .text:0x8015BA3C; // type:function size:0x60 scope:weak align:4 _daItem_execute__8daItem_cFv = .text:0x8015BA9C; // type:function size:0x2E8 scope:global align:4 _daItem_draw__8daItem_cFv = .text:0x8015BD84; // type:function size:0x64 scope:global align:4 _daItem_delete__8daItem_cFv = .text:0x8015BDE8; // type:function size:0x78 scope:global align:4 @@ -6554,13 +6554,13 @@ initFlag__8daItem_cFv = .text:0x8015DAAC; // type:function size:0x144 scope:glob initScale__8daItem_cFv = .text:0x8015DBF0; // type:function size:0x50 scope:global align:4 initSpeed__8daItem_cFi = .text:0x8015DC40; // type:function size:0x1F8 scope:global align:4 initAngle__8daItem_cFv = .text:0x8015DE38; // type:function size:0x18 scope:global align:4 -daItem_Draw__FP8daItem_c = .text:0x8015DE50; // type:function size:0x20 scope:global align:4 -daItem_Execute__FP8daItem_c = .text:0x8015DE70; // type:function size:0x20 scope:global align:4 -daItem_Delete__FP8daItem_c = .text:0x8015DE90; // type:function size:0x20 scope:global align:4 -daItem_Create__FP10fopAc_ac_c = .text:0x8015DEB0; // type:function size:0x20 scope:global align:4 +daItem_Draw__FP8daItem_c = .text:0x8015DE50; // type:function size:0x20 scope:local align:4 +daItem_Execute__FP8daItem_c = .text:0x8015DE70; // type:function size:0x20 scope:local align:4 +daItem_Delete__FP8daItem_c = .text:0x8015DE90; // type:function size:0x20 scope:local align:4 +daItem_Create__FP10fopAc_ac_c = .text:0x8015DEB0; // type:function size:0x20 scope:local align:4 __sinit_d_a_obj_item_cpp = .text:0x8015DED0; // type:function size:0x108 scope:local align:4 -getItemPos__9daPy_py_cCFv = .text:0x8015DFD8; // type:function size:0x1C scope:global align:4 -getLeftHandPos__9daPy_py_cCFv = .text:0x8015DFF4; // type:function size:0x1C scope:global align:4 +getItemPos__9daPy_py_cCFv = .text:0x8015DFD8; // type:function size:0x1C scope:weak align:4 +getLeftHandPos__9daPy_py_cCFv = .text:0x8015DFF4; // type:function size:0x1C scope:weak align:4 __ct__9dInsect_cFv = .text:0x8015E010; // type:function size:0x68 scope:global align:4 Insect_GetDemoMain__9dInsect_cFv = .text:0x8015E078; // type:function size:0x1F4 scope:global align:4 CalcZBuffer__9dInsect_cFf = .text:0x8015E26C; // type:function size:0x18C scope:global align:4 @@ -6863,21 +6863,21 @@ checkNoAttention__12daTagMstop_cCFv = .text:0x80182D64; // type:function size:0x checkNoAttention__12daTagMhint_cCFv = .text:0x80182D78; // type:function size:0x14 scope:global align:4 set__4cXyzFfff = .text:0x80182D8C; // type:function size:0x10 scope:global align:4 checkEndMessage__12daTagMwait_cFv = .text:0x80182D9C; // type:function size:0x38 scope:global align:4 -dEnvSe_Draw__FP8dEnvSe_c = .text:0x80182DD4; // type:function size:0x8 scope:global align:4 -dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath = .text:0x80182DDC; // type:function size:0x1FC scope:global align:4 +dEnvSe_Draw__FP8dEnvSe_c = .text:0x80182DD4; // type:function size:0x8 scope:local align:4 +dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath = .text:0x80182DDC; // type:function size:0x1FC scope:local align:4 execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc = .text:0x80182FD8; // type:function size:0x4A8 scope:global align:4 execute__8dEnvSe_cFv = .text:0x80183480; // type:function size:0x120 scope:global align:4 -dEnvSe_Execute__FP8dEnvSe_c = .text:0x801835A0; // type:function size:0x20 scope:global align:4 -dEnvSe_IsDelete__FP8dEnvSe_c = .text:0x801835C0; // type:function size:0x8 scope:global align:4 -dEnvSe_Delete__FP8dEnvSe_c = .text:0x801835C8; // type:function size:0x8 scope:global align:4 -dEnvSe_Create__FP8dEnvSe_c = .text:0x801835D0; // type:function size:0x28 scope:global align:4 +dEnvSe_Execute__FP8dEnvSe_c = .text:0x801835A0; // type:function size:0x20 scope:local align:4 +dEnvSe_IsDelete__FP8dEnvSe_c = .text:0x801835C0; // type:function size:0x8 scope:local align:4 +dEnvSe_Delete__FP8dEnvSe_c = .text:0x801835C8; // type:function size:0x8 scope:local align:4 +dEnvSe_Create__FP8dEnvSe_c = .text:0x801835D0; // type:function size:0x28 scope:local align:4 __ct__9dFs_HIO_cFv = .text:0x801835F8; // type:function size:0x74 scope:global align:4 __ct__14dFile_select_cFP10JKRArchive = .text:0x8018366C; // type:function size:0xF0 scope:global align:4 __dt__14dFile_select_cFv = .text:0x8018375C; // type:function size:0xA90 scope:global align:4 -__dt__15J2DAnmTevRegKeyFv = .text:0x801841EC; // type:function size:0x88 scope:global align:4 -__dt__19J2DAnmTextureSRTKeyFv = .text:0x80184274; // type:function size:0x88 scope:global align:4 -__dt__11J2DAnmColorFv = .text:0x801842FC; // type:function size:0x74 scope:global align:4 -__dt__15J2DAnmTransformFv = .text:0x80184370; // type:function size:0x5C scope:global align:4 +__dt__15J2DAnmTevRegKeyFv = .text:0x801841EC; // type:function size:0x88 scope:weak align:4 +__dt__19J2DAnmTextureSRTKeyFv = .text:0x80184274; // type:function size:0x88 scope:weak align:4 +__dt__11J2DAnmColorFv = .text:0x801842FC; // type:function size:0x74 scope:weak align:4 +__dt__15J2DAnmTransformFv = .text:0x80184370; // type:function size:0x5C scope:weak align:4 _create__14dFile_select_cFv = .text:0x801843CC; // type:function size:0x130 scope:global align:4 _move__14dFile_select_cFv = .text:0x801844FC; // type:function size:0x168 scope:global align:4 selFileWakuAnm__14dFile_select_cFv = .text:0x80184664; // type:function size:0x23C scope:global align:4 @@ -6905,7 +6905,7 @@ menuSelect__14dFile_select_cFv = .text:0x80186774; // type:function size:0x178 s menuSelectStart__14dFile_select_cFv = .text:0x801868EC; // type:function size:0x194 scope:global align:4 menuSelectCansel__14dFile_select_cFv = .text:0x80186A80; // type:function size:0xC8 scope:global align:4 menuMoveAnmInitSet__14dFile_select_cFii = .text:0x80186B48; // type:function size:0x13C scope:global align:4 -setWhite__10J2DTextBoxFQ28JUtility6TColor = .text:0x80186C84; // type:function size:0x28 scope:global align:4 +setWhite__10J2DTextBoxFQ28JUtility6TColor = .text:0x80186C84; // type:function size:0x28 scope:weak align:4 menuMoveAnm__14dFile_select_cFv = .text:0x80186CAC; // type:function size:0x168 scope:global align:4 menuSelectAnmSet__14dFile_select_cFv = .text:0x80186E14; // type:function size:0x184 scope:global align:4 menuSelectMoveAnm__14dFile_select_cFv = .text:0x80186F98; // type:function size:0x284 scope:global align:4 @@ -6962,8 +6962,8 @@ backDatSelWait__14dFile_select_cFv = .text:0x8018AC3C; // type:function size:0xF backDatSelWait2__14dFile_select_cFv = .text:0x8018AD38; // type:function size:0x64 scope:global align:4 nextModeWait__14dFile_select_cFv = .text:0x8018AD9C; // type:function size:0x4 scope:global align:4 screenSet__14dFile_select_cFv = .text:0x8018ADA0; // type:function size:0x1140 scope:global align:4 -setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor = .text:0x8018BEE0; // type:function size:0x48 scope:global align:4 -setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey = .text:0x8018BF28; // type:function size:0x4 scope:global align:4 +setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor = .text:0x8018BEE0; // type:function size:0x48 scope:weak align:4 +setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey = .text:0x8018BF28; // type:function size:0x4 scope:weak align:4 screenSetCopySel__14dFile_select_cFv = .text:0x8018BF2C; // type:function size:0x5F8 scope:global align:4 screenSetYesNo__14dFile_select_cFv = .text:0x8018C524; // type:function size:0x3D0 scope:global align:4 screenSet3Menu__14dFile_select_cFv = .text:0x8018C8F4; // type:function size:0x3DC scope:global align:4 @@ -7056,16 +7056,16 @@ createMaskModel__16dFile_select3D_cFv = .text:0x80190BA8; // type:function size: createMirrorModel__16dFile_select3D_cFv = .text:0x80190D68; // type:function size:0x280 scope:global align:4 toItem3Dpos__16dFile_select3D_cFfffP4cXyz = .text:0x80190FE8; // type:function size:0xEC scope:global align:4 calcViewMtx__16dFile_select3D_cFPA4_f = .text:0x801910D4; // type:function size:0x5C scope:global align:4 -getTransform__15J2DAnmTransformCFUsP16J3DTransformInfo = .text:0x80191130; // type:function size:0x4 scope:global align:4 -__dt__10JUTNameTabFv = .text:0x80191134; // type:function size:0x48 scope:global align:4 -__dt__17dDlst_FileSel3m_cFv = .text:0x8019117C; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_FileSelYn_cFv = .text:0x801911F4; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_FileSelCp_cFv = .text:0x8019126C; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_FileSelDt_cFv = .text:0x801912E4; // type:function size:0x78 scope:global align:4 -__dt__15dDlst_FileSel_cFv = .text:0x8019135C; // type:function size:0x84 scope:global align:4 -__dt__9dFs_HIO_cFv = .text:0x801913E0; // type:function size:0x48 scope:global align:4 +getTransform__15J2DAnmTransformCFUsP16J3DTransformInfo = .text:0x80191130; // type:function size:0x4 scope:weak align:4 +__dt__10JUTNameTabFv = .text:0x80191134; // type:function size:0x48 scope:weak align:4 +__dt__17dDlst_FileSel3m_cFv = .text:0x8019117C; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_FileSelYn_cFv = .text:0x801911F4; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_FileSelCp_cFv = .text:0x8019126C; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_FileSelDt_cFv = .text:0x801912E4; // type:function size:0x78 scope:weak align:4 +__dt__15dDlst_FileSel_cFv = .text:0x8019135C; // type:function size:0x84 scope:weak align:4 +__dt__9dFs_HIO_cFv = .text:0x801913E0; // type:function size:0x48 scope:weak align:4 __sinit_d_file_select_cpp = .text:0x80191428; // type:function size:0x744 scope:local align:4 -getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x80191B6C; // type:function size:0x40 scope:global align:4 +getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x80191B6C; // type:function size:0x40 scope:weak align:4 __ct__15dFile_warning_cFP10JKRArchiveUc = .text:0x80191BAC; // type:function size:0x6C scope:global align:4 __dt__15dFile_warning_cFv = .text:0x80191C18; // type:function size:0xDC scope:global align:4 screenSet__15dFile_warning_cFv = .text:0x80191CF4; // type:function size:0x224 scope:global align:4 @@ -7080,11 +7080,11 @@ _draw__15dFile_warning_cFv = .text:0x80192190; // type:function size:0x3C scope: drawSelf__15dFile_warning_cFv = .text:0x801921CC; // type:function size:0x2C scope:global align:4 setText__15dFile_warning_cFUl = .text:0x801921F8; // type:function size:0x48 scope:global align:4 setFontColor__15dFile_warning_cFQ28JUtility6TColorQ28JUtility6TColor = .text:0x80192240; // type:function size:0xCC scope:global align:4 -setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor = .text:0x8019230C; // type:function size:0x48 scope:global align:4 +setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor = .text:0x8019230C; // type:function size:0x48 scope:weak align:4 draw__16dDlst_FileWarn_cFv = .text:0x80192354; // type:function size:0x38 scope:global align:4 __sinit_d_file_sel_warning_cpp = .text:0x8019238C; // type:function size:0x40 scope:local align:4 -__dt__16dDlst_FileWarn_cFv = .text:0x801923CC; // type:function size:0x48 scope:global align:4 -setAnimation__9J2DScreenFP15J2DAnmTransform = .text:0x80192414; // type:function size:0x20 scope:global align:4 +__dt__16dDlst_FileWarn_cFv = .text:0x801923CC; // type:function size:0x48 scope:weak align:4 +setAnimation__9J2DScreenFP15J2DAnmTransform = .text:0x80192414; // type:function size:0x20 scope:weak align:4 __ct__12dFile_info_cFP10JKRArchiveUc = .text:0x80192434; // type:function size:0x6C scope:global align:4 __dt__12dFile_info_cFv = .text:0x801924A0; // type:function size:0xD0 scope:global align:4 screenSet__12dFile_info_cFv = .text:0x80192570; // type:function size:0x3E4 scope:global align:4 @@ -7097,7 +7097,7 @@ modeMove__12dFile_info_cFv = .text:0x80192D5C; // type:function size:0x4 scope:g _draw__12dFile_info_cFv = .text:0x80192D60; // type:function size:0x3C scope:global align:4 draw__16dDlst_FileInfo_cFv = .text:0x80192D9C; // type:function size:0xEC scope:global align:4 __sinit_d_file_sel_info_cpp = .text:0x80192E88; // type:function size:0x40 scope:local align:4 -__dt__16dDlst_FileInfo_cFv = .text:0x80192EC8; // type:function size:0x48 scope:global align:4 +__dt__16dDlst_FileInfo_cFv = .text:0x80192EC8; // type:function size:0x48 scope:weak align:4 __ct__14dBrightCheck_cFP10JKRArchive = .text:0x80192F10; // type:function size:0x88 scope:global align:4 __dt__14dBrightCheck_cFv = .text:0x80192F98; // type:function size:0x98 scope:global align:4 screenSet__14dBrightCheck_cFv = .text:0x80193030; // type:function size:0x4A0 scope:global align:4 @@ -7107,9 +7107,9 @@ modeMove__14dBrightCheck_cFv = .text:0x8019350C; // type:function size:0x88 scop _draw__14dBrightCheck_cFv = .text:0x80193594; // type:function size:0x3C scope:global align:4 draw__19dDlst_BrightCheck_cFv = .text:0x801935D0; // type:function size:0x38 scope:global align:4 __sinit_d_bright_check_cpp = .text:0x80193608; // type:function size:0x40 scope:local align:4 -__dt__19dDlst_BrightCheck_cFv = .text:0x80193648; // type:function size:0x48 scope:global align:4 +__dt__19dDlst_BrightCheck_cFv = .text:0x80193648; // type:function size:0x48 scope:weak align:4 __ct__8dScope_cFUc = .text:0x80193690; // type:function size:0x2D0 scope:global align:4 -__ct__Q28JUtility6TColorFv = .text:0x80193960; // type:function size:0xC scope:global align:4 +__ct__Q28JUtility6TColorFv = .text:0x80193960; // type:function size:0xC scope:weak align:4 __dt__8dScope_cFv = .text:0x8019396C; // type:function size:0x224 scope:global align:4 _execute__8dScope_cFUl = .text:0x80193B90; // type:function size:0xD8 scope:global align:4 draw__8dScope_cFv = .text:0x80193C68; // type:function size:0x338 scope:global align:4 @@ -7120,12 +7120,12 @@ move_init__8dScope_cFv = .text:0x80194048; // type:function size:0x4 scope:globa move_proc__8dScope_cFv = .text:0x8019404C; // type:function size:0x4 scope:global align:4 close_init__8dScope_cFv = .text:0x80194050; // type:function size:0x4 scope:global align:4 close_proc__8dScope_cFv = .text:0x80194054; // type:function size:0x80 scope:global align:4 -__dt__11dMeterSub_cFv = .text:0x801940D4; // type:function size:0x48 scope:global align:4 -_create__11dMeterSub_cFv = .text:0x8019411C; // type:function size:0x8 scope:global align:4 -_delete__11dMeterSub_cFv = .text:0x80194124; // type:function size:0x8 scope:global align:4 -draw__11dMeterSub_cFv = .text:0x8019412C; // type:function size:0x4 scope:global align:4 -_execute__11dMeterSub_cFUl = .text:0x80194130; // type:function size:0x8 scope:global align:4 -isDead__11dMeterSub_cFv = .text:0x80194138; // type:function size:0x8 scope:global align:4 +__dt__11dMeterSub_cFv = .text:0x801940D4; // type:function size:0x48 scope:weak align:4 +_create__11dMeterSub_cFv = .text:0x8019411C; // type:function size:0x8 scope:weak align:4 +_delete__11dMeterSub_cFv = .text:0x80194124; // type:function size:0x8 scope:weak align:4 +draw__11dMeterSub_cFv = .text:0x8019412C; // type:function size:0x4 scope:weak align:4 +_execute__11dMeterSub_cFUl = .text:0x80194130; // type:function size:0x8 scope:weak align:4 +isDead__11dMeterSub_cFv = .text:0x80194138; // type:function size:0x8 scope:weak align:4 __sinit_d_scope_cpp = .text:0x80194140; // type:function size:0xA4 scope:local align:4 __ct__19dSelect_cursorHIO_cFv = .text:0x801941E4; // type:function size:0x3C scope:global align:4 __ct__16dSelect_cursor_cFUcfP10JKRArchive = .text:0x80194220; // type:function size:0x7CC scope:global align:4 @@ -7143,13 +7143,13 @@ setBtk0Animation__16dSelect_cursor_cFP19J2DAnmTextureSRTKey = .text:0x801955F0; setCursorAnimation__16dSelect_cursor_cFv = .text:0x80195724; // type:function size:0x1BC scope:global align:4 setBckAnimation__16dSelect_cursor_cFP18J2DAnmTransformKey = .text:0x801958E0; // type:function size:0x60 scope:global align:4 moveCenter__16dSelect_cursor_cFP7J2DPaneff = .text:0x80195940; // type:function size:0x38 scope:global align:4 -__dt__19dSelect_cursorHIO_cFv = .text:0x80195978; // type:function size:0x48 scope:global align:4 -__dt__18J2DAnmTransformKeyFv = .text:0x801959C0; // type:function size:0x6C scope:global align:4 +__dt__19dSelect_cursorHIO_cFv = .text:0x80195978; // type:function size:0x48 scope:weak align:4 +__dt__18J2DAnmTransformKeyFv = .text:0x801959C0; // type:function size:0x6C scope:weak align:4 __ct__9dSi_HIO_cFv = .text:0x80195A2C; // type:function size:0x10 scope:global align:4 animation__14dSelect_icon_cFv = .text:0x80195A3C; // type:function size:0x104 scope:global align:4 setAlpha__14dSelect_icon_cFUc = .text:0x80195B40; // type:function size:0x30 scope:global align:4 setPos__14dSelect_icon_cFP7J2DPaneff = .text:0x80195B70; // type:function size:0xAC scope:global align:4 -__dt__9dSi_HIO_cFv = .text:0x80195C1C; // type:function size:0x48 scope:global align:4 +__dt__9dSi_HIO_cFv = .text:0x80195C1C; // type:function size:0x48 scope:weak align:4 __sinit_d_select_icon_cpp = .text:0x80195C64; // type:function size:0x38 scope:local align:4 shop_cam_action_init__16ShopCam_action_cFv = .text:0x80195C9C; // type:function size:0x17C scope:global align:4 shop_cam_action__16ShopCam_action_cFv = .text:0x80195E18; // type:function size:0x4F4 scope:global align:4 @@ -7167,8 +7167,8 @@ getCurrentPos__15dShopItemCtrl_cFi = .text:0x801969A0; // type:function size:0x9 isHomePos__15dShopItemCtrl_cFi = .text:0x80196A3C; // type:function size:0xB4 scope:global align:4 setRotateAnime__15dShopItemCtrl_cFi = .text:0x80196AF0; // type:function size:0xB4 scope:global align:4 setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb = .text:0x80196BA4; // type:function size:0x4F4 scope:global align:4 -dShopSystem_searchItemActor__FPvPv = .text:0x80197098; // type:function size:0x1D8 scope:global align:4 -dShopSystem_searchCameraActor__FPvPv = .text:0x80197270; // type:function size:0xC8 scope:global align:4 +dShopSystem_searchItemActor__FPvPv = .text:0x80197098; // type:function size:0x1D8 scope:local align:4 +dShopSystem_searchCameraActor__FPvPv = .text:0x80197270; // type:function size:0xC8 scope:local align:4 initShopSystem__13dShopSystem_cFv = .text:0x80197338; // type:function size:0x1AC scope:global align:4 __dt__13dShopSystem_cFv = .text:0x801974E4; // type:function size:0xDC scope:global align:4 onFlag__13dShopSystem_cFi = .text:0x801975C0; // type:function size:0x1C scope:global align:4 @@ -7215,9 +7215,9 @@ checkLeftTrigger__13dShopSystem_cFP9STControl = .text:0x8019AB60; // type:functi checkRightTrigger__13dShopSystem_cFP9STControl = .text:0x8019AB84; // type:function size:0x24 scope:global align:4 dpdMove__13dShopSystem_cFv = .text:0x8019ABA8; // type:function size:0x8 scope:global align:4 __sinit_d_shop_system_cpp = .text:0x8019ABB0; // type:function size:0x130 scope:local align:4 -beforeStartSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019ACE0; // type:function size:0x8 scope:global align:4 -beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019ACE8; // type:function size:0x8 scope:global align:4 -getResName2__13dShopSystem_cFi = .text:0x8019ACF0; // type:function size:0x8 scope:global align:4 +beforeStartSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019ACE0; // type:function size:0x8 scope:weak align:4 +beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019ACE8; // type:function size:0x8 scope:weak align:4 +getResName2__13dShopSystem_cFi = .text:0x8019ACF0; // type:function size:0x8 scope:weak align:4 draw__24dDlst_Gameover_CAPTURE_cFv = .text:0x8019ACF8; // type:function size:0x2E8 scope:global align:4 __ct__10dGov_HIO_cFv = .text:0x8019AFE0; // type:function size:0x64 scope:global align:4 _create__11dGameover_cFv = .text:0x8019B044; // type:function size:0x2B0 scope:global align:4 @@ -7246,17 +7246,17 @@ __ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive = .text:0x8019B940; // type:funct __dt__24dDlst_GameOverScrnDraw_cFv = .text:0x8019BBFC; // type:function size:0xB4 scope:global align:4 setBackAlpha__24dDlst_GameOverScrnDraw_cFf = .text:0x8019BCB0; // type:function size:0x44 scope:global align:4 draw__24dDlst_GameOverScrnDraw_cFv = .text:0x8019BCF4; // type:function size:0x248 scope:global align:4 -dGameover_Draw__FP11dGameover_c = .text:0x8019BF3C; // type:function size:0x20 scope:global align:4 -dGameover_Execute__FP11dGameover_c = .text:0x8019BF5C; // type:function size:0x20 scope:global align:4 -dGameover_IsDelete__FP11dGameover_c = .text:0x8019BF7C; // type:function size:0x8 scope:global align:4 -dGameover_Delete__FP11dGameover_c = .text:0x8019BF84; // type:function size:0x20 scope:global align:4 -dGameover_Create__FP9msg_class = .text:0x8019BFA4; // type:function size:0x20 scope:global align:4 +dGameover_Draw__FP11dGameover_c = .text:0x8019BF3C; // type:function size:0x20 scope:local align:4 +dGameover_Execute__FP11dGameover_c = .text:0x8019BF5C; // type:function size:0x20 scope:local align:4 +dGameover_IsDelete__FP11dGameover_c = .text:0x8019BF7C; // type:function size:0x8 scope:local align:4 +dGameover_Delete__FP11dGameover_c = .text:0x8019BF84; // type:function size:0x20 scope:local align:4 +dGameover_Create__FP9msg_class = .text:0x8019BFA4; // type:function size:0x20 scope:local align:4 d_GameOver_Create__FUc = .text:0x8019BFC4; // type:function size:0x44 scope:global align:4 d_GameOver_Delete__FRUi = .text:0x8019C008; // type:function size:0x64 scope:global align:4 -__dt__10dGov_HIO_cFv = .text:0x8019C06C; // type:function size:0x5C scope:global align:4 +__dt__10dGov_HIO_cFv = .text:0x8019C06C; // type:function size:0x5C scope:weak align:4 __sinit_d_gameover_cpp = .text:0x8019C0C8; // type:function size:0x204 scope:local align:4 -__dt__24dDlst_Gameover_CAPTURE_cFv = .text:0x8019C2CC; // type:function size:0x48 scope:global align:4 -__dt__12dMenu_save_cFv = .text:0x8019C314; // type:function size:0x74 scope:global align:4 +__dt__24dDlst_Gameover_CAPTURE_cFv = .text:0x8019C2CC; // type:function size:0x48 scope:weak align:4 +__dt__12dMenu_save_cFv = .text:0x8019C314; // type:function size:0x74 scope:weak align:4 dKy_WolfPowerup_AmbCol__FP11_GXColorS10 = .text:0x8019C388; // type:function size:0x1C scope:global align:4 dKy_sense_pat_get__Fv = .text:0x8019C3A4; // type:function size:0x768 scope:global align:4 dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10 = .text:0x8019CB0C; // type:function size:0x1D0 scope:global align:4 @@ -7266,16 +7266,16 @@ dKy_twi_wolflight_set__Fi = .text:0x8019CFE4; // type:function size:0x1BC scope: dKy_lightdir_set__FffP3Vec = .text:0x8019D1A0; // type:function size:0x124 scope:global align:4 dKy_GXInitLightSpot__FP12J3DLightInfofUc = .text:0x8019D2C4; // type:function size:0x188 scope:global align:4 dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc = .text:0x8019D44C; // type:function size:0xD4 scope:global align:4 -u8_data_ratio_set__FUcUcf = .text:0x8019D520; // type:function size:0x4C scope:global align:4 -s16_data_ratio_set__Fssf = .text:0x8019D56C; // type:function size:0x50 scope:global align:4 -kankyo_color_ratio_calc_common__Fsf = .text:0x8019D5BC; // type:function size:0x60 scope:global align:4 -kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f = .text:0x8019D61C; // type:function size:0x70 scope:global align:4 -kankyo_color_ratio_set__FUcUcfUcUcfsf = .text:0x8019D68C; // type:function size:0x104 scope:global align:4 -fl_data_ratio_set__Ffff = .text:0x8019D790; // type:function size:0x10 scope:global align:4 -float_kankyo_color_ratio_set__Fffffffff = .text:0x8019D7A0; // type:function size:0xD8 scope:global align:4 -get_parcent__Ffff = .text:0x8019D878; // type:function size:0x34 scope:global align:4 +u8_data_ratio_set__FUcUcf = .text:0x8019D520; // type:function size:0x4C scope:local align:4 +s16_data_ratio_set__Fssf = .text:0x8019D56C; // type:function size:0x50 scope:local align:4 +kankyo_color_ratio_calc_common__Fsf = .text:0x8019D5BC; // type:function size:0x60 scope:local align:4 +kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f = .text:0x8019D61C; // type:function size:0x70 scope:local align:4 +kankyo_color_ratio_set__FUcUcfUcUcfsf = .text:0x8019D68C; // type:function size:0x104 scope:local align:4 +fl_data_ratio_set__Ffff = .text:0x8019D790; // type:function size:0x10 scope:local align:4 +float_kankyo_color_ratio_set__Fffffffff = .text:0x8019D7A0; // type:function size:0xD8 scope:local align:4 +get_parcent__Ffff = .text:0x8019D878; // type:function size:0x34 scope:local align:4 dKy_get_parcent__Ffff = .text:0x8019D8AC; // type:function size:0x20 scope:global align:4 -dKy_FiveSenses_fullthrottle_dark_static1__Fv = .text:0x8019D8CC; // type:function size:0x480 scope:global align:4 +dKy_FiveSenses_fullthrottle_dark_static1__Fv = .text:0x8019D8CC; // type:function size:0x480 scope:local align:4 dKy_FiveSenses_fullthrottle_dark__Fv = .text:0x8019DD4C; // type:function size:0x20 scope:global align:4 dKy_light_influence_id__F4cXyzi = .text:0x8019DD6C; // type:function size:0x3D0 scope:global align:4 dKy_eflight_influence_id__F4cXyzi = .text:0x8019E13C; // type:function size:0x2C8 scope:global align:4 @@ -7284,26 +7284,26 @@ dKy_light_influence_col__FP8_GXColorf = .text:0x8019E430; // type:function size: dKy_light_influence_power__Fi = .text:0x8019E520; // type:function size:0x28 scope:global align:4 dKy_light_influence_yuragi__Fi = .text:0x8019E548; // type:function size:0x28 scope:global align:4 dKy_light_influence_distance__F4cXyzi = .text:0x8019E570; // type:function size:0x124 scope:global align:4 -plight_init__Fv = .text:0x8019E694; // type:function size:0x74 scope:global align:4 -darkmist_init__Fv = .text:0x8019E708; // type:function size:0x2C scope:global align:4 -plight_set__Fv = .text:0x8019E734; // type:function size:0x120 scope:global align:4 -bgparts_activelight_init__Fv = .text:0x8019E854; // type:function size:0x20 scope:global align:4 -dungeonlight_init__Fv = .text:0x8019E874; // type:function size:0x22C scope:global align:4 -undwater_init__Fv = .text:0x8019EAA0; // type:function size:0x130 scope:global align:4 +plight_init__Fv = .text:0x8019E694; // type:function size:0x74 scope:local align:4 +darkmist_init__Fv = .text:0x8019E708; // type:function size:0x2C scope:local align:4 +plight_set__Fv = .text:0x8019E734; // type:function size:0x120 scope:local align:4 +bgparts_activelight_init__Fv = .text:0x8019E854; // type:function size:0x20 scope:local align:4 +dungeonlight_init__Fv = .text:0x8019E874; // type:function size:0x22C scope:local align:4 +undwater_init__Fv = .text:0x8019EAA0; // type:function size:0x130 scope:local align:4 dKy_light_size_get__FPCc = .text:0x8019EBD0; // type:function size:0xC8 scope:global align:4 -envcolor_init__Fv = .text:0x8019EC98; // type:function size:0x5CC scope:global align:4 +envcolor_init__Fv = .text:0x8019EC98; // type:function size:0x5CC scope:local align:4 dKy_clear_game_init__Fv = .text:0x8019F264; // type:function size:0x84 scope:global align:4 __ct__18dScnKy_env_light_cFv = .text:0x8019F2E8; // type:function size:0x118 scope:global align:4 -__ct__19GB_MAPLE_COL_CHANGEFv = .text:0x8019F400; // type:function size:0x38 scope:global align:4 -__dt__10BOSS_LIGHTFv = .text:0x8019F438; // type:function size:0x3C scope:global align:4 -__ct__10BOSS_LIGHTFv = .text:0x8019F474; // type:function size:0x4 scope:global align:4 -__dt__13DUNGEON_LIGHTFv = .text:0x8019F478; // type:function size:0x3C scope:global align:4 -__ct__13DUNGEON_LIGHTFv = .text:0x8019F4B4; // type:function size:0x4 scope:global align:4 -__dt__15WIND_INF_ENTITYFv = .text:0x8019F4B8; // type:function size:0x3C scope:global align:4 -__ct__15WIND_INF_ENTITYFv = .text:0x8019F4F4; // type:function size:0x4 scope:global align:4 -__ct__15LIGHT_INFLUENCEFv = .text:0x8019F4F8; // type:function size:0x4 scope:global align:4 +__ct__19GB_MAPLE_COL_CHANGEFv = .text:0x8019F400; // type:function size:0x38 scope:weak align:4 +__dt__10BOSS_LIGHTFv = .text:0x8019F438; // type:function size:0x3C scope:weak align:4 +__ct__10BOSS_LIGHTFv = .text:0x8019F474; // type:function size:0x4 scope:weak align:4 +__dt__13DUNGEON_LIGHTFv = .text:0x8019F478; // type:function size:0x3C scope:weak align:4 +__ct__13DUNGEON_LIGHTFv = .text:0x8019F4B4; // type:function size:0x4 scope:weak align:4 +__dt__15WIND_INF_ENTITYFv = .text:0x8019F4B8; // type:function size:0x3C scope:weak align:4 +__ct__15WIND_INF_ENTITYFv = .text:0x8019F4F4; // type:function size:0x4 scope:weak align:4 +__ct__15LIGHT_INFLUENCEFv = .text:0x8019F4F8; // type:function size:0x4 scope:weak align:4 setDaytime__18dScnKy_env_light_cFv = .text:0x8019F4FC; // type:function size:0x284 scope:global align:4 -GetTimePass__20dStage_roomControl_cFv = .text:0x8019F780; // type:function size:0x8 scope:global align:4 +GetTimePass__20dStage_roomControl_cFv = .text:0x8019F780; // type:function size:0x8 scope:weak align:4 setSunpos__18dScnKy_env_light_cFv = .text:0x8019F788; // type:function size:0x280 scope:global align:4 getDaytime__18dScnKy_env_light_cFv = .text:0x8019FA08; // type:function size:0x8 scope:global align:4 dKy_getdaytime_hour__Fv = .text:0x8019FA10; // type:function size:0x2C scope:global align:4 @@ -7320,13 +7320,13 @@ setLight_bg__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfP setLight_actor__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10PfPf = .text:0x801A16C0; // type:function size:0x6A4 scope:global align:4 settingTevStruct_colget_actor__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf = .text:0x801A1D64; // type:function size:0x1F4 scope:global align:4 settingTevStruct_colget_player__18dScnKy_env_light_cFP12dKy_tevstr_c = .text:0x801A1F58; // type:function size:0x138 scope:global align:4 -cLib_addCalcU8__FPUcUcss = .text:0x801A2090; // type:function size:0x98 scope:global align:4 +cLib_addCalcU8__FPUcUcss = .text:0x801A2090; // type:function size:0x98 scope:local align:4 settingTevStruct_plightcol_plus__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_c11_GXColorS1011_GXColorS10Uc = .text:0x801A2128; // type:function size:0x169C scope:global align:4 settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c = .text:0x801A37C4; // type:function size:0xC58 scope:global align:4 setLightTevColorType__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c = .text:0x801A441C; // type:function size:0x4 scope:global align:4 -setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci = .text:0x801A4420; // type:function size:0x7E8 scope:global align:4 -setLight__13J3DColorBlockFUlP11J3DLightObj = .text:0x801A4C08; // type:function size:0x4 scope:global align:4 -setAmbColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x801A4C0C; // type:function size:0x4 scope:global align:4 +setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci = .text:0x801A4420; // type:function size:0x7E8 scope:local align:4 +setLight__13J3DColorBlockFUlP11J3DLightObj = .text:0x801A4C08; // type:function size:0x4 scope:weak align:4 +setAmbColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x801A4C0C; // type:function size:0x4 scope:weak align:4 dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci = .text:0x801A4C10; // type:function size:0x190 scope:global align:4 setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c = .text:0x801A4DA0; // type:function size:0xF0 scope:global align:4 CalcTevColor__18dScnKy_env_light_cFv = .text:0x801A4E90; // type:function size:0x94 scope:global align:4 @@ -7336,11 +7336,11 @@ SetBaseLight__18dScnKy_env_light_cFv = .text:0x801A516C; // type:function size:0 exeKankyo__18dScnKy_env_light_cFv = .text:0x801A5288; // type:function size:0x454 scope:global align:4 drawKankyo__18dScnKy_env_light_cFv = .text:0x801A56DC; // type:function size:0x50 scope:global align:4 dKy_undwater_filter_draw__Fv = .text:0x801A572C; // type:function size:0x440 scope:global align:4 -dKy_Draw__FP17sub_kankyo__class = .text:0x801A5B6C; // type:function size:0x2C scope:global align:4 -dKy_Execute__FP17sub_kankyo__class = .text:0x801A5B98; // type:function size:0x34 scope:global align:4 -dKy_IsDelete__FP17sub_kankyo__class = .text:0x801A5BCC; // type:function size:0x8 scope:global align:4 -dKy_Delete__FP17sub_kankyo__class = .text:0x801A5BD4; // type:function size:0x48 scope:global align:4 -dKy_Create__FPv = .text:0x801A5C1C; // type:function size:0x238 scope:global align:4 +dKy_Draw__FP17sub_kankyo__class = .text:0x801A5B6C; // type:function size:0x2C scope:local align:4 +dKy_Execute__FP17sub_kankyo__class = .text:0x801A5B98; // type:function size:0x34 scope:local align:4 +dKy_IsDelete__FP17sub_kankyo__class = .text:0x801A5BCC; // type:function size:0x8 scope:local align:4 +dKy_Delete__FP17sub_kankyo__class = .text:0x801A5BD4; // type:function size:0x48 scope:local align:4 +dKy_Create__FPv = .text:0x801A5C1C; // type:function size:0x238 scope:local align:4 dKy_setLight_init__Fv = .text:0x801A5E54; // type:function size:0x268 scope:global align:4 dKy_setLight__Fv = .text:0x801A60BC; // type:function size:0x24 scope:global align:4 dKy_GlobalLight_set__Fv = .text:0x801A60E0; // type:function size:0x114 scope:global align:4 @@ -7380,12 +7380,12 @@ dKy_Sound_init__Fv = .text:0x801A8190; // type:function size:0x30 scope:global a dKy_Sound_set__F4cXyziUii = .text:0x801A81C0; // type:function size:0x2B4 scope:global align:4 dKy_Sound_get__Fv = .text:0x801A8474; // type:function size:0x10 scope:global align:4 dKy_SordFlush_set__F4cXyzi = .text:0x801A8484; // type:function size:0xB4 scope:global align:4 -GxFogSet_Sub__FP8_GXColor = .text:0x801A8538; // type:function size:0xB0 scope:global align:4 -GxFog_set__Fv = .text:0x801A85E8; // type:function size:0x44 scope:global align:4 +GxFogSet_Sub__FP8_GXColor = .text:0x801A8538; // type:function size:0xB0 scope:local align:4 +GxFog_set__Fv = .text:0x801A85E8; // type:function size:0x44 scope:local align:4 dKy_GxFog_set__Fv = .text:0x801A862C; // type:function size:0x24 scope:global align:4 dKy_GxFog_tevstr_set__FP12dKy_tevstr_c = .text:0x801A8650; // type:function size:0xA8 scope:global align:4 dKy_GfFog_tevstr_set__FP12dKy_tevstr_c = .text:0x801A86F8; // type:function size:0xA8 scope:global align:4 -GxXFog_set__Fv = .text:0x801A87A0; // type:function size:0x44 scope:global align:4 +GxXFog_set__Fv = .text:0x801A87A0; // type:function size:0x44 scope:local align:4 dKy_change_colpat__FUc = .text:0x801A87E4; // type:function size:0x28 scope:global align:4 dKy_custom_colset__FUcUcf = .text:0x801A880C; // type:function size:0x48 scope:global align:4 dKy_setLight_mine__FP12dKy_tevstr_c = .text:0x801A8854; // type:function size:0x98 scope:global align:4 @@ -7403,7 +7403,7 @@ dKy_get_dayofweek__Fv = .text:0x801A8B38; // type:function size:0x20 scope:globa dKy_set_nexttime__Ff = .text:0x801A8B58; // type:function size:0x10 scope:global align:4 dKy_instant_timechg__Ff = .text:0x801A8B68; // type:function size:0x60 scope:global align:4 dKy_instant_rainchg__Fv = .text:0x801A8BC8; // type:function size:0x3C scope:global align:4 -NewAmbColGet__FP11_GXColorS10 = .text:0x801A8C04; // type:function size:0x21C scope:global align:4 +NewAmbColGet__FP11_GXColorS10 = .text:0x801A8C04; // type:function size:0x21C scope:local align:4 dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf = .text:0x801A8E20; // type:function size:0xDC4 scope:global align:4 dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf = .text:0x801A9BE4; // type:function size:0xD8 scope:global align:4 dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf = .text:0x801A9CBC; // type:function size:0xA4 scope:global align:4 @@ -7442,28 +7442,28 @@ dKy_shadow_mode_set__FUc = .text:0x801ACCDC; // type:function size:0x18 scope:gl dKy_shadow_mode_reset__FUc = .text:0x801ACCF4; // type:function size:0x18 scope:global align:4 dKy_shadow_mode_check__FUc = .text:0x801ACD0C; // type:function size:0x18 scope:global align:4 dKy_bg_MAxx_proc__FPv = .text:0x801ACD24; // type:function size:0xE98 scope:global align:4 -__dt__18dScnKy_env_light_cFv = .text:0x801ADBBC; // type:function size:0xE8 scope:global align:4 +__dt__18dScnKy_env_light_cFv = .text:0x801ADBBC; // type:function size:0xE8 scope:weak align:4 __sinit_d_kankyo_cpp = .text:0x801ADCA4; // type:function size:0x5C scope:local align:4 -dKankyo_DayProc__Fv = .text:0x801ADD00; // type:function size:0x38 scope:global align:4 -dKyeff_Draw__FP8dKyeff_c = .text:0x801ADD38; // type:function size:0x24 scope:global align:4 +dKankyo_DayProc__Fv = .text:0x801ADD00; // type:function size:0x38 scope:local align:4 +dKyeff_Draw__FP8dKyeff_c = .text:0x801ADD38; // type:function size:0x24 scope:local align:4 execute__8dKyeff_cFv = .text:0x801ADD5C; // type:function size:0x58 scope:global align:4 -dKyeff_Execute__FP8dKyeff_c = .text:0x801ADDB4; // type:function size:0x20 scope:global align:4 -dKyeff_IsDelete__FP8dKyeff_c = .text:0x801ADDD4; // type:function size:0x8 scope:global align:4 -dKyeff_Delete__FP8dKyeff_c = .text:0x801ADDDC; // type:function size:0x24 scope:global align:4 -dKyeff_Create__FP12kankyo_class = .text:0x801ADE00; // type:function size:0xA0 scope:global align:4 -dKyeff2_Draw__FP9dKyeff2_c = .text:0x801ADEA0; // type:function size:0x24 scope:global align:4 +dKyeff_Execute__FP8dKyeff_c = .text:0x801ADDB4; // type:function size:0x20 scope:local align:4 +dKyeff_IsDelete__FP8dKyeff_c = .text:0x801ADDD4; // type:function size:0x8 scope:local align:4 +dKyeff_Delete__FP8dKyeff_c = .text:0x801ADDDC; // type:function size:0x24 scope:local align:4 +dKyeff_Create__FP12kankyo_class = .text:0x801ADE00; // type:function size:0xA0 scope:local align:4 +dKyeff2_Draw__FP9dKyeff2_c = .text:0x801ADEA0; // type:function size:0x24 scope:local align:4 execute__9dKyeff2_cFv = .text:0x801ADEC4; // type:function size:0x24 scope:global align:4 -dKyeff2_Execute__FP9dKyeff2_c = .text:0x801ADEE8; // type:function size:0x20 scope:global align:4 -dKyeff2_IsDelete__FP9dKyeff2_c = .text:0x801ADF08; // type:function size:0x8 scope:global align:4 -dKyeff2_Delete__FP9dKyeff2_c = .text:0x801ADF10; // type:function size:0x24 scope:global align:4 -dKyeff2_Create__FP12kankyo_class = .text:0x801ADF34; // type:function size:0x24 scope:global align:4 +dKyeff2_Execute__FP9dKyeff2_c = .text:0x801ADEE8; // type:function size:0x20 scope:local align:4 +dKyeff2_IsDelete__FP9dKyeff2_c = .text:0x801ADF08; // type:function size:0x8 scope:local align:4 +dKyeff2_Delete__FP9dKyeff2_c = .text:0x801ADF10; // type:function size:0x24 scope:local align:4 +dKyeff2_Create__FP12kankyo_class = .text:0x801ADF34; // type:function size:0x24 scope:local align:4 createHeap__10dThunder_cFv = .text:0x801ADF58; // type:function size:0x5C scope:global align:4 adjustHeap__10dThunder_cFv = .text:0x801ADFB4; // type:function size:0x4C scope:global align:4 -dThunder_Draw__FP10dThunder_c = .text:0x801AE000; // type:function size:0x19C scope:global align:4 -dThunder_Execute__FP10dThunder_c = .text:0x801AE19C; // type:function size:0x1D8 scope:global align:4 -dThunder_IsDelete__FP10dThunder_c = .text:0x801AE374; // type:function size:0x8 scope:global align:4 -dThunder_Delete__FP10dThunder_c = .text:0x801AE37C; // type:function size:0x80 scope:global align:4 -dThunder_Create__FP12kankyo_class = .text:0x801AE3FC; // type:function size:0x5C scope:global align:4 +dThunder_Draw__FP10dThunder_c = .text:0x801AE000; // type:function size:0x19C scope:local align:4 +dThunder_Execute__FP10dThunder_c = .text:0x801AE19C; // type:function size:0x1D8 scope:local align:4 +dThunder_IsDelete__FP10dThunder_c = .text:0x801AE374; // type:function size:0x8 scope:local align:4 +dThunder_Delete__FP10dThunder_c = .text:0x801AE37C; // type:function size:0x80 scope:local align:4 +dThunder_Create__FP12kankyo_class = .text:0x801AE3FC; // type:function size:0x5C scope:local align:4 create__10dThunder_cFv = .text:0x801AE458; // type:function size:0x4E0 scope:global align:4 __ct__15dKantera_icon_cFv = .text:0x801AE938; // type:function size:0x3C scope:global align:4 __dt__15dKantera_icon_cFv = .text:0x801AE974; // type:function size:0xF4 scope:global align:4 @@ -7630,7 +7630,7 @@ screenInit__12dMenu_Dmap_cFv = .text:0x801BB634; // type:function size:0x1154 sc getPlayerIconPos__12dMenu_Dmap_cFScf = .text:0x801BC788; // type:function size:0xC0 scope:global align:4 getIconPos__12dMenu_Dmap_cFScf = .text:0x801BC848; // type:function size:0x5AC scope:global align:4 __dt__12dMenu_Dmap_cFv = .text:0x801BCDF4; // type:function size:0x350 scope:global align:4 -__dt__19dMenu_DmapMapCtrl_cFv = .text:0x801BD144; // type:function size:0x90 scope:global align:4 +__dt__19dMenu_DmapMapCtrl_cFv = .text:0x801BD144; // type:function size:0x90 scope:weak align:4 getCurFloorPos__12dMenu_Dmap_cFv = .text:0x801BD1D4; // type:function size:0x14 scope:global align:4 getDefaultCurFloorPos__12dMenu_Dmap_cFv = .text:0x801BD1E8; // type:function size:0x20 scope:global align:4 iconMoveCalc__12dMenu_Dmap_cFv = .text:0x801BD208; // type:function size:0x1B0 scope:global align:4 @@ -7639,8 +7639,8 @@ drawFloorScreenTop__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph = .text:0x801BD isMapMoveState__12dMenu_Dmap_cFv = .text:0x801BD690; // type:function size:0x34 scope:global align:4 floorChangeMode__12dMenu_Dmap_cFv = .text:0x801BD6C4; // type:function size:0xFC scope:global align:4 _create__12dMenu_Dmap_cFv = .text:0x801BD7C0; // type:function size:0x580 scope:global align:4 -append__10J2DPictureFPC7ResTIMGf = .text:0x801BDD40; // type:function size:0x30 scope:global align:4 -insert__10J2DPictureFPC7ResTIMGUcf = .text:0x801BDD70; // type:function size:0x34 scope:global align:4 +append__10J2DPictureFPC7ResTIMGf = .text:0x801BDD40; // type:function size:0x30 scope:weak align:4 +insert__10J2DPictureFPC7ResTIMGUcf = .text:0x801BDD70; // type:function size:0x34 scope:weak align:4 _move__12dMenu_Dmap_cFv = .text:0x801BDDA4; // type:function size:0x154 scope:global align:4 setMapTexture__12dMenu_Dmap_cFv = .text:0x801BDEF8; // type:function size:0x50 scope:global align:4 mapBgAnime__12dMenu_Dmap_cFv = .text:0x801BDF48; // type:function size:0x24 scope:global align:4 @@ -7679,12 +7679,12 @@ zoomIn_init_proc__12dMenu_Dmap_cFv = .text:0x801C008C; // type:function size:0x1 zoomIn_proc__12dMenu_Dmap_cFv = .text:0x801C01A0; // type:function size:0x9C scope:global align:4 zoomOut_init_proc__12dMenu_Dmap_cFv = .text:0x801C023C; // type:function size:0xB4 scope:global align:4 zoomOut_proc__12dMenu_Dmap_cFv = .text:0x801C02F0; // type:function size:0x90 scope:global align:4 -__dt__15renderingDmap_cFv = .text:0x801C0380; // type:function size:0xAC scope:global align:4 -__dt__20dMenu_StageMapCtrl_cFv = .text:0x801C042C; // type:function size:0x80 scope:global align:4 -__dt__15dMenu_DmapMap_cFv = .text:0x801C04AC; // type:function size:0x70 scope:global align:4 -__ct__15renderingDmap_cFv = .text:0x801C051C; // type:function size:0xA8 scope:global align:4 +__dt__15renderingDmap_cFv = .text:0x801C0380; // type:function size:0xAC scope:weak align:4 +__dt__20dMenu_StageMapCtrl_cFv = .text:0x801C042C; // type:function size:0x80 scope:weak align:4 +__dt__15dMenu_DmapMap_cFv = .text:0x801C04AC; // type:function size:0x70 scope:weak align:4 +__ct__15renderingDmap_cFv = .text:0x801C051C; // type:function size:0xA8 scope:weak align:4 __sinit_d_menu_dmap_cpp = .text:0x801C05C4; // type:function size:0x280 scope:local align:4 -@4@__dt__14dMenu_DmapBg_cFv = .text:0x801C0844; // type:function size:0x8 scope:local align:4 +@4@__dt__14dMenu_DmapBg_cFv = .text:0x801C0844; // type:function size:0x8 scope:weak align:4 hasMap__15renderingDmap_cCFv = .text:0x801C084C; // type:function size:0x20 scope:global align:4 isDrawIconSingle2__15renderingDmap_cCFPCQ27dTres_c6data_sbbi = .text:0x801C086C; // type:function size:0x2D4 scope:global align:4 getPlayerCursorSize__15renderingDmap_cFv = .text:0x801C0B40; // type:function size:0x8 scope:global align:4 @@ -7779,7 +7779,7 @@ setBButtonString__15dMenu_Fishing_cFUs = .text:0x801C5F68; // type:function size getFigure__15dMenu_Fishing_cFi = .text:0x801C6018; // type:function size:0x44 scope:global align:4 setFishParam__15dMenu_Fishing_cFiUsUc = .text:0x801C605C; // type:function size:0x1B4 scope:global align:4 setHIO__15dMenu_Fishing_cFb = .text:0x801C6210; // type:function size:0x38C scope:global align:4 -draw__15dMenu_Fishing_cFv = .text:0x801C659C; // type:function size:0x20 scope:global align:4 +draw__15dMenu_Fishing_cFv = .text:0x801C659C; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_fishing_cpp = .text:0x801C65BC; // type:function size:0x3C scope:local align:4 __ct__9dMf_HIO_cFv = .text:0x801C65F8; // type:function size:0x34 scope:global align:4 dMenuFmap_getStartStageName__FPv = .text:0x801C662C; // type:function size:0xB8 scope:global align:4 @@ -7867,7 +7867,7 @@ readWorldData__12dMenu_Fmap_cFUc = .text:0x801CB770; // type:function size:0x1C8 readAreaData__12dMenu_Fmap_cFUcb = .text:0x801CB938; // type:function size:0x5CC scope:global align:4 readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc = .text:0x801CBF04; // type:function size:0x190 scope:global align:4 readFieldMapData__12dMenu_Fmap_cFPPvPCcbb = .text:0x801CC094; // type:function size:0x1F0 scope:global align:4 -getExpandedResSize__10JKRArchiveCFPCv = .text:0x801CC284; // type:function size:0x2C scope:global align:4 +getExpandedResSize__10JKRArchiveCFPCv = .text:0x801CC284; // type:function size:0x2C scope:weak align:4 decodeFieldMapData__12dMenu_Fmap_cFv = .text:0x801CC2B0; // type:function size:0x23C scope:global align:4 decodePortalData__12dMenu_Fmap_cFv = .text:0x801CC4EC; // type:function size:0x30 scope:global align:4 readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc = .text:0x801CC51C; // type:function size:0x100 scope:global align:4 @@ -7904,10 +7904,10 @@ howlArrowPosInit__12dMenu_Fmap_cFv = .text:0x801CD814; // type:function size:0xA getHowlRegionID__12dMenu_Fmap_cFv = .text:0x801CD8B4; // type:function size:0x78 scope:global align:4 isLightVesselGet__12dMenu_Fmap_cFv = .text:0x801CD92C; // type:function size:0x30 scope:global align:4 getPlayerPos2D__12dMenu_Fmap_cFv = .text:0x801CD95C; // type:function size:0xD0 scope:global align:4 -__dt__9dMf_HIO_cFv = .text:0x801CDA2C; // type:function size:0x48 scope:global align:4 +__dt__9dMf_HIO_cFv = .text:0x801CDA2C; // type:function size:0x48 scope:weak align:4 __sinit_d_menu_fmap_cpp = .text:0x801CDA74; // type:function size:0x5F4 scope:local align:4 -twoValueLineInterpolation__FUcUcf = .text:0x801CE068; // type:function size:0x64 scope:global align:4 -twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor = .text:0x801CE0CC; // type:function size:0x90 scope:global align:4 +twoValueLineInterpolation__FUcUcf = .text:0x801CE068; // type:function size:0x64 scope:local align:4 +twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor = .text:0x801CE0CC; // type:function size:0x90 scope:local align:4 init__15renderingFmap_cFPUcUsUsUsUs = .text:0x801CE15C; // type:function size:0x2C scope:global align:4 entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff = .text:0x801CE188; // type:function size:0x9C scope:global align:4 isSwitchSpecialOff__15renderingFmap_cFi = .text:0x801CE224; // type:function size:0x64 scope:global align:4 @@ -7945,10 +7945,10 @@ getBackColor__15dMenu_FmapMap_cCFv = .text:0x801CF298; // type:function size:0x8 getColor__15dMenu_FmapMap_cFi = .text:0x801CF2A0; // type:function size:0xF4 scope:global align:4 setTexture__15dMenu_FmapMap_cFUsUsUsUs = .text:0x801CF394; // type:function size:0xBC scope:global align:4 setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff = .text:0x801CF450; // type:function size:0x80 scope:global align:4 -__dt__15renderingFmap_cFv = .text:0x801CF4D0; // type:function size:0x8C scope:global align:4 -isRenderingFloor__15renderingFmap_cFi = .text:0x801CF55C; // type:function size:0x8 scope:global align:4 -beforeDrawPath__15renderingFmap_cFv = .text:0x801CF564; // type:function size:0x4 scope:global align:4 -afterDrawPath__15renderingFmap_cFv = .text:0x801CF568; // type:function size:0x4 scope:global align:4 +__dt__15renderingFmap_cFv = .text:0x801CF4D0; // type:function size:0x8C scope:weak align:4 +isRenderingFloor__15renderingFmap_cFi = .text:0x801CF55C; // type:function size:0x8 scope:weak align:4 +beforeDrawPath__15renderingFmap_cFv = .text:0x801CF564; // type:function size:0x4 scope:weak align:4 +afterDrawPath__15renderingFmap_cFv = .text:0x801CF568; // type:function size:0x4 scope:weak align:4 __ct__18dMenu_Fmap2DBack_cFv = .text:0x801CF56C; // type:function size:0x770 scope:global align:4 __dt__18dMenu_Fmap2DBack_cFv = .text:0x801CFCDC; // type:function size:0x258 scope:global align:4 draw__18dMenu_Fmap2DBack_cFv = .text:0x801CFF34; // type:function size:0x8D0 scope:global align:4 @@ -8042,7 +8042,7 @@ checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv = .text:0x801D7AB4; // type:functi checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv = .text:0x801D7B58; // type:function size:0x74 scope:global align:4 setHIO__17dMenu_Fmap2DTop_cFb = .text:0x801D7BCC; // type:function size:0x4BC scope:global align:4 isWarpAccept__17dMenu_Fmap2DTop_cFv = .text:0x801D8088; // type:function size:0x84 scope:global align:4 -@4@__dt__18dMenu_Fmap2DBack_cFv = .text:0x801D810C; // type:function size:0x8 scope:local align:4 +@4@__dt__18dMenu_Fmap2DBack_cFv = .text:0x801D810C; // type:function size:0x8 scope:weak align:4 __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc = .text:0x801D8114; // type:function size:0x1E0 scope:global align:4 __dt__14dMenu_Insect_cFv = .text:0x801D82F4; // type:function size:0x364 scope:global align:4 _create__14dMenu_Insect_cFv = .text:0x801D8658; // type:function size:0x70 scope:global align:4 @@ -8078,7 +8078,7 @@ dpdMove__14dMenu_Insect_cFv = .text:0x801DA2FC; // type:function size:0x8 scope: setAButtonString__14dMenu_Insect_cFUs = .text:0x801DA304; // type:function size:0xB0 scope:global align:4 setBButtonString__14dMenu_Insect_cFUs = .text:0x801DA3B4; // type:function size:0xB0 scope:global align:4 setHIO__14dMenu_Insect_cFb = .text:0x801DA464; // type:function size:0x1CC scope:global align:4 -draw__14dMenu_Insect_cFv = .text:0x801DA630; // type:function size:0x20 scope:global align:4 +draw__14dMenu_Insect_cFv = .text:0x801DA630; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_insect_cpp = .text:0x801DA650; // type:function size:0x104 scope:local align:4 __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb = .text:0x801DA754; // type:function size:0x89C scope:global align:4 __dt__19dMenu_ItemExplain_cFv = .text:0x801DAFF0; // type:function size:0x480 scope:global align:4 @@ -8132,10 +8132,10 @@ read_next_fadein_move__14dMenu_Letter_cFv = .text:0x801DED04; // type:function s read_close_init__14dMenu_Letter_cFv = .text:0x801DEE20; // type:function size:0x4C scope:global align:4 read_close_move__14dMenu_Letter_cFv = .text:0x801DEE6C; // type:function size:0x1A4 scope:global align:4 screenSetMenu__14dMenu_Letter_cFv = .text:0x801DF010; // type:function size:0xA18 scope:global align:4 -getWhite__10J2DTextBoxCFv = .text:0x801DFA28; // type:function size:0xC scope:global align:4 -getBlack__10J2DTextBoxCFv = .text:0x801DFA34; // type:function size:0xC scope:global align:4 -getWhite__10J2DPictureCFv = .text:0x801DFA40; // type:function size:0xC scope:global align:4 -getBlack__10J2DPictureCFv = .text:0x801DFA4C; // type:function size:0xC scope:global align:4 +getWhite__10J2DTextBoxCFv = .text:0x801DFA28; // type:function size:0xC scope:weak align:4 +getBlack__10J2DTextBoxCFv = .text:0x801DFA34; // type:function size:0xC scope:weak align:4 +getWhite__10J2DPictureCFv = .text:0x801DFA40; // type:function size:0xC scope:weak align:4 +getBlack__10J2DPictureCFv = .text:0x801DFA4C; // type:function size:0xC scope:weak align:4 screenSetBase__14dMenu_Letter_cFv = .text:0x801DFA58; // type:function size:0x8D8 scope:global align:4 screenSetShadow__14dMenu_Letter_cFv = .text:0x801E0330; // type:function size:0xA8 scope:global align:4 screenSetLetter__14dMenu_Letter_cFv = .text:0x801E03D8; // type:function size:0x5D0 scope:global align:4 @@ -8150,8 +8150,8 @@ setAButtonString__14dMenu_Letter_cFUs = .text:0x801E1518; // type:function size: setBButtonString__14dMenu_Letter_cFUs = .text:0x801E15C8; // type:function size:0xB0 scope:global align:4 getLetterNum__14dMenu_Letter_cFv = .text:0x801E1678; // type:function size:0xD0 scope:global align:4 setHIO__14dMenu_Letter_cFb = .text:0x801E1748; // type:function size:0x5C8 scope:global align:4 -getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x801E1D10; // type:function size:0x4C scope:global align:4 -draw__14dMenu_Letter_cFv = .text:0x801E1D5C; // type:function size:0x20 scope:global align:4 +getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x801E1D10; // type:function size:0x4C scope:weak align:4 +draw__14dMenu_Letter_cFv = .text:0x801E1D5C; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_letter_cpp = .text:0x801E1D7C; // type:function size:0x194 scope:local align:4 __ct__14dMenu_Option_cFP10JKRArchiveP9STControl = .text:0x801E1F10; // type:function size:0x104 scope:global align:4 __dt__14dMenu_Option_cFv = .text:0x801E2014; // type:function size:0x48 scope:global align:4 @@ -8223,7 +8223,7 @@ yesnoSelectAnmSet__14dMenu_Option_cFv = .text:0x801E8AC8; // type:function size: yesnoCancelAnmSet__14dMenu_Option_cFv = .text:0x801E8C38; // type:function size:0x78 scope:global align:4 yesnoWakuAlpahAnmInit__14dMenu_Option_cFUcUcUcUc = .text:0x801E8CB0; // type:function size:0x4C scope:global align:4 yesnoWakuAlpahAnm__14dMenu_Option_cFUc = .text:0x801E8CFC; // type:function size:0x170 scope:global align:4 -draw__14dMenu_Option_cFv = .text:0x801E8E6C; // type:function size:0x20 scope:global align:4 +draw__14dMenu_Option_cFv = .text:0x801E8E6C; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_option_cpp = .text:0x801E8E8C; // type:function size:0x28C scope:local align:4 __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc = .text:0x801E9118; // type:function size:0x15F0 scope:global align:4 __dt__12dMenu_Ring_cFv = .text:0x801EA708; // type:function size:0x474 scope:global align:4 @@ -8278,7 +8278,7 @@ calcDistance__12dMenu_Ring_cFffff = .text:0x801EF174; // type:function size:0x2C clacEllipsePlotAverage__12dMenu_Ring_cFiff = .text:0x801EF1A0; // type:function size:0x2E4 scope:global align:4 dpdMove__12dMenu_Ring_cFv = .text:0x801EF484; // type:function size:0x8 scope:global align:4 openExplain__12dMenu_Ring_cFUc = .text:0x801EF48C; // type:function size:0xD4 scope:global align:4 -draw__12dMenu_Ring_cFv = .text:0x801EF560; // type:function size:0x20 scope:global align:4 +draw__12dMenu_Ring_cFv = .text:0x801EF560; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_ring_cpp = .text:0x801EF580; // type:function size:0xD4 scope:local align:4 __ct__9dMs_HIO_cFv = .text:0x801EF654; // type:function size:0x4C scope:global align:4 __ct__12dMenu_save_cFv = .text:0x801EF6A0; // type:function size:0x10C scope:global align:4 @@ -8405,9 +8405,9 @@ _draw__12dMenu_save_cFv = .text:0x801F69B8; // type:function size:0x44 scope:glo _draw2__12dMenu_save_cFv = .text:0x801F69FC; // type:function size:0xE0 scope:global align:4 draw__23dDlst_MenuSaveExplain_cFv = .text:0x801F6ADC; // type:function size:0x30 scope:global align:4 draw__16dDlst_MenuSave_cFv = .text:0x801F6B0C; // type:function size:0x38 scope:global align:4 -__dt__16dDlst_MenuSave_cFv = .text:0x801F6B44; // type:function size:0x48 scope:global align:4 -__dt__23dDlst_MenuSaveExplain_cFv = .text:0x801F6B8C; // type:function size:0x48 scope:global align:4 -__dt__9dMs_HIO_cFv = .text:0x801F6BD4; // type:function size:0x48 scope:global align:4 +__dt__16dDlst_MenuSave_cFv = .text:0x801F6B44; // type:function size:0x48 scope:weak align:4 +__dt__23dDlst_MenuSaveExplain_cFv = .text:0x801F6B8C; // type:function size:0x48 scope:weak align:4 +__dt__9dMs_HIO_cFv = .text:0x801F6BD4; // type:function size:0x48 scope:weak align:4 __sinit_d_menu_save_cpp = .text:0x801F6C1C; // type:function size:0x608 scope:local align:4 __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl = .text:0x801F7224; // type:function size:0x124 scope:global align:4 __dt__13dMenu_Skill_cFv = .text:0x801F7348; // type:function size:0x2F4 scope:global align:4 @@ -8438,7 +8438,7 @@ setBButtonString__13dMenu_Skill_cFUs = .text:0x801F9310; // type:function size:0 setNameString__13dMenu_Skill_cFUs = .text:0x801F93C0; // type:function size:0xB0 scope:global align:4 getSkillNum__13dMenu_Skill_cFv = .text:0x801F9470; // type:function size:0x90 scope:global align:4 setHIO__13dMenu_Skill_cFb = .text:0x801F9500; // type:function size:0x508 scope:global align:4 -draw__13dMenu_Skill_cFv = .text:0x801F9A08; // type:function size:0x20 scope:global align:4 +draw__13dMenu_Skill_cFv = .text:0x801F9A08; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_skill_cpp = .text:0x801F9A28; // type:function size:0xD4 scope:local align:4 __ct__9dMw_HIO_cFv = .text:0x801F9AFC; // type:function size:0x3C scope:global align:4 init__9dMw_HIO_cFv = .text:0x801F9B38; // type:function size:0x2DC scope:global align:4 @@ -8446,8 +8446,8 @@ getBombFlag__9dMw_HIO_cFv = .text:0x801F9E14; // type:function size:0x8 scope:gl getArrowFlag__9dMw_HIO_cFv = .text:0x801F9E1C; // type:function size:0x8 scope:global align:4 getPachinkoFlag__9dMw_HIO_cFv = .text:0x801F9E24; // type:function size:0x8 scope:global align:4 __ct__10dMw_DHIO_cFv = .text:0x801F9E2C; // type:function size:0x6C scope:global align:4 -__dt__10dMw_DHIO_cFv = .text:0x801F9E98; // type:function size:0x48 scope:global align:4 -__dt__9dMw_HIO_cFv = .text:0x801F9EE0; // type:function size:0x48 scope:global align:4 +__dt__10dMw_DHIO_cFv = .text:0x801F9E98; // type:function size:0x48 scope:weak align:4 +__dt__9dMw_HIO_cFv = .text:0x801F9EE0; // type:function size:0x48 scope:weak align:4 __sinit_d_menu_window_HIO_cpp = .text:0x801F9F28; // type:function size:0x5C scope:local align:4 dMw_UP_TRIGGER__Fv = .text:0x801F9F84; // type:function size:0x14 scope:global align:4 dMw_DOWN_TRIGGER__Fv = .text:0x801F9F98; // type:function size:0x14 scope:global align:4 @@ -8594,22 +8594,22 @@ __ct__19dMeter_mapIconHIO_cFv = .text:0x802004B4; // type:function size:0x214 sc __ct__16dMeter_fmapHIO_cFv = .text:0x802006C8; // type:function size:0x504 scope:global align:4 __dt__16dMeter_fmapHIO_cFv = .text:0x80200BCC; // type:function size:0x108 scope:global align:4 __ct__18dMeter_cursorHIO_cFv = .text:0x80200CD4; // type:function size:0x84 scope:global align:4 -__dt__25dMeter_drawLightDropHIO_cFv = .text:0x80200D58; // type:function size:0x48 scope:global align:4 -__dt__25dMeter_drawEmpButtonHIO_cFv = .text:0x80200DA0; // type:function size:0x48 scope:global align:4 -__dt__24dMeter_drawMiniGameHIO_cFv = .text:0x80200DE8; // type:function size:0x48 scope:global align:4 -__dt__21dMeter_drawSkillHIO_cFv = .text:0x80200E30; // type:function size:0x48 scope:global align:4 -__dt__27dMeter_drawCalibrationHIO_cFv = .text:0x80200E78; // type:function size:0x48 scope:global align:4 -__dt__22dMeter_drawInsectHIO_cFv = .text:0x80200EC0; // type:function size:0x48 scope:global align:4 -__dt__23dMeter_drawFishingHIO_cFv = .text:0x80200F08; // type:function size:0x48 scope:global align:4 -__dt__22dMeter_drawLetterHIO_cFv = .text:0x80200F50; // type:function size:0x48 scope:global align:4 -__dt__22dMeter_drawOptionHIO_cFv = .text:0x80200F98; // type:function size:0x48 scope:global align:4 -__dt__23dMeter_drawCollectHIO_cFv = .text:0x80200FE0; // type:function size:0x48 scope:global align:4 -__dt__19dMeter_mapIconHIO_cFv = .text:0x80201028; // type:function size:0x48 scope:global align:4 -__ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv = .text:0x80201070; // type:function size:0x28 scope:global align:4 -__dt__18dMeter_cursorHIO_cFv = .text:0x80201098; // type:function size:0x48 scope:global align:4 -__dt__16dMeter_ringHIO_cFv = .text:0x802010E0; // type:function size:0x48 scope:global align:4 -__dt__16dMeter_drawHIO_cFv = .text:0x80201128; // type:function size:0x114 scope:global align:4 -__dt__16dMeter_menuHIO_cFv = .text:0x8020123C; // type:function size:0x48 scope:global align:4 +__dt__25dMeter_drawLightDropHIO_cFv = .text:0x80200D58; // type:function size:0x48 scope:weak align:4 +__dt__25dMeter_drawEmpButtonHIO_cFv = .text:0x80200DA0; // type:function size:0x48 scope:weak align:4 +__dt__24dMeter_drawMiniGameHIO_cFv = .text:0x80200DE8; // type:function size:0x48 scope:weak align:4 +__dt__21dMeter_drawSkillHIO_cFv = .text:0x80200E30; // type:function size:0x48 scope:weak align:4 +__dt__27dMeter_drawCalibrationHIO_cFv = .text:0x80200E78; // type:function size:0x48 scope:weak align:4 +__dt__22dMeter_drawInsectHIO_cFv = .text:0x80200EC0; // type:function size:0x48 scope:weak align:4 +__dt__23dMeter_drawFishingHIO_cFv = .text:0x80200F08; // type:function size:0x48 scope:weak align:4 +__dt__22dMeter_drawLetterHIO_cFv = .text:0x80200F50; // type:function size:0x48 scope:weak align:4 +__dt__22dMeter_drawOptionHIO_cFv = .text:0x80200F98; // type:function size:0x48 scope:weak align:4 +__dt__23dMeter_drawCollectHIO_cFv = .text:0x80200FE0; // type:function size:0x48 scope:weak align:4 +__dt__19dMeter_mapIconHIO_cFv = .text:0x80201028; // type:function size:0x48 scope:weak align:4 +__ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv = .text:0x80201070; // type:function size:0x28 scope:weak align:4 +__dt__18dMeter_cursorHIO_cFv = .text:0x80201098; // type:function size:0x48 scope:weak align:4 +__dt__16dMeter_ringHIO_cFv = .text:0x802010E0; // type:function size:0x48 scope:weak align:4 +__dt__16dMeter_drawHIO_cFv = .text:0x80201128; // type:function size:0x114 scope:weak align:4 +__dt__16dMeter_menuHIO_cFv = .text:0x8020123C; // type:function size:0x48 scope:weak align:4 __sinit_d_meter_HIO_cpp = .text:0x80201284; // type:function size:0xA4 scope:local align:4 __ct__14dMeterButton_cFv = .text:0x80201328; // type:function size:0x48 scope:global align:4 __dt__14dMeterButton_cFv = .text:0x80201370; // type:function size:0x5C scope:global align:4 @@ -8879,7 +8879,7 @@ getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c = .text:0x8021C250; // type:fun getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c = .text:0x8021C370; // type:function size:0x1D4 scope:global align:4 getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c = .text:0x8021C544; // type:function size:0x160 scope:global align:4 getStringLength__13dMeter2Info_cFP10J2DTextBoxPc = .text:0x8021C6A4; // type:function size:0x150 scope:global align:4 -getFont__10J2DTextBoxCFv = .text:0x8021C7F4; // type:function size:0x8 scope:global align:4 +getFont__10J2DTextBoxCFv = .text:0x8021C7F4; // type:function size:0x8 scope:weak align:4 getStringLength__13dMeter2Info_cFP7JUTFontffPc = .text:0x8021C7FC; // type:function size:0x138 scope:global align:4 onDirectUseItem__13dMeter2Info_cFi = .text:0x8021C934; // type:function size:0x1C scope:global align:4 isDirectUseItem__13dMeter2Info_cFi = .text:0x8021C950; // type:function size:0x20 scope:global align:4 @@ -8967,11 +8967,11 @@ killSubContents__9dMeter2_cFUc = .text:0x802258A0; // type:function size:0xC0 sc isKeyVisible__9dMeter2_cFv = .text:0x80225960; // type:function size:0x98 scope:global align:4 isArrowEquip__9dMeter2_cFv = .text:0x802259F8; // type:function size:0x6C scope:global align:4 isPachinkoEquip__9dMeter2_cFv = .text:0x80225A64; // type:function size:0x3C scope:global align:4 -dMeter2_Draw__FP9dMeter2_c = .text:0x80225AA0; // type:function size:0x20 scope:global align:4 -dMeter2_Execute__FP9dMeter2_c = .text:0x80225AC0; // type:function size:0x20 scope:global align:4 -dMeter2_IsDelete__FP9dMeter2_c = .text:0x80225AE0; // type:function size:0x8 scope:global align:4 -dMeter2_Delete__FP9dMeter2_c = .text:0x80225AE8; // type:function size:0x20 scope:global align:4 -dMeter2_Create__FP9msg_class = .text:0x80225B08; // type:function size:0xB0 scope:global align:4 +dMeter2_Draw__FP9dMeter2_c = .text:0x80225AA0; // type:function size:0x20 scope:local align:4 +dMeter2_Execute__FP9dMeter2_c = .text:0x80225AC0; // type:function size:0x20 scope:local align:4 +dMeter2_IsDelete__FP9dMeter2_c = .text:0x80225AE0; // type:function size:0x8 scope:local align:4 +dMeter2_Delete__FP9dMeter2_c = .text:0x80225AE8; // type:function size:0x20 scope:local align:4 +dMeter2_Create__FP9msg_class = .text:0x80225B08; // type:function size:0xB0 scope:local align:4 __ct__13COutFontSet_cFv = .text:0x80225BB8; // type:function size:0x3C scope:global align:4 __dt__13COutFontSet_cFv = .text:0x80225BF4; // type:function size:0x48 scope:global align:4 initialize__13COutFontSet_cFv = .text:0x80225C3C; // type:function size:0x34 scope:global align:4 @@ -8987,15 +8987,15 @@ draw__10COutFont_cFP10J2DTextBoxfff = .text:0x80226DB0; // type:function size:0x reset__10COutFont_cFP10J2DTextBox = .text:0x80228448; // type:function size:0x48 scope:global align:4 setBlendAnime__10COutFont_cFP10J2DPictures = .text:0x80228490; // type:function size:0xA0 scope:global align:4 getBtiName__10COutFont_cFi = .text:0x80228530; // type:function size:0x48 scope:global align:4 -checkCharInfoCharactor__Fi = .text:0x80228578; // type:function size:0x54 scope:global align:4 -changeCodeToChar__FUs = .text:0x802285CC; // type:function size:0x3C scope:global align:4 -change1ByteTo2Bytes__Fi = .text:0x80228608; // type:function size:0x230 scope:global align:4 -changeKataToHira__Fi = .text:0x80228838; // type:function size:0x70 scope:global align:4 -isOutfontKanjiCode__Fi = .text:0x802288A8; // type:function size:0x54 scope:global align:4 -getFontCCColorTable__FUcUc = .text:0x802288FC; // type:function size:0xAC scope:global align:4 -getFontGCColorTable__FUcUc = .text:0x802289A8; // type:function size:0xAC scope:global align:4 -getOutFontNumberType__Fi = .text:0x80228A54; // type:function size:0x78 scope:global align:4 -getPohNum__Fv = .text:0x80228ACC; // type:function size:0x38 scope:global align:4 +checkCharInfoCharactor__Fi = .text:0x80228578; // type:function size:0x54 scope:local align:4 +changeCodeToChar__FUs = .text:0x802285CC; // type:function size:0x3C scope:local align:4 +change1ByteTo2Bytes__Fi = .text:0x80228608; // type:function size:0x230 scope:local align:4 +changeKataToHira__Fi = .text:0x80228838; // type:function size:0x70 scope:local align:4 +isOutfontKanjiCode__Fi = .text:0x802288A8; // type:function size:0x54 scope:local align:4 +getFontCCColorTable__FUcUc = .text:0x802288FC; // type:function size:0xAC scope:local align:4 +getFontGCColorTable__FUcUc = .text:0x802289A8; // type:function size:0xAC scope:local align:4 +getOutFontNumberType__Fi = .text:0x80228A54; // type:function size:0x78 scope:local align:4 +getPohNum__Fv = .text:0x80228ACC; // type:function size:0x38 scope:local align:4 __ct__19jmessage_tReferenceFv = .text:0x80228B04; // type:function size:0x1B0 scope:global align:4 __dt__19jmessage_tReferenceFv = .text:0x80228CB4; // type:function size:0x74 scope:global align:4 calcDistance__19jmessage_tReferenceFv = .text:0x80228D28; // type:function size:0xB8 scope:global align:4 @@ -9037,7 +9037,7 @@ do_name1__26jmessage_tMeasureProcessorFv = .text:0x8022B454; // type:function si do_rubyset__26jmessage_tMeasureProcessorFPCvUl = .text:0x8022B458; // type:function size:0x88 scope:global align:4 push_word__26jmessage_tMeasureProcessorFPc = .text:0x8022B4E0; // type:function size:0x78 scope:global align:4 __ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl = .text:0x8022B558; // type:function size:0x9C scope:global align:4 -__dt__26jmessage_tMeasureProcessorFv = .text:0x8022B5F4; // type:function size:0x60 scope:global align:4 +__dt__26jmessage_tMeasureProcessorFv = .text:0x8022B5F4; // type:function size:0x60 scope:weak align:4 do_reset__27jmessage_tSequenceProcessorFv = .text:0x8022B654; // type:function size:0x4 scope:global align:4 do_begin__27jmessage_tSequenceProcessorFPCvPCc = .text:0x8022B658; // type:function size:0x3E4 scope:global align:4 do_end__27jmessage_tSequenceProcessorFv = .text:0x8022BA3C; // type:function size:0x140 scope:global align:4 @@ -9096,7 +9096,7 @@ do_character__33jmessage_string_tMeasureProcessorFi = .text:0x8022FC28; // type: do_tag__33jmessage_string_tMeasureProcessorFUlPCvUl = .text:0x8022FDF0; // type:function size:0xB9C scope:global align:4 do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl = .text:0x8023098C; // type:function size:0x7C scope:global align:4 __ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl = .text:0x80230A08; // type:function size:0x54 scope:global align:4 -__dt__33jmessage_string_tMeasureProcessorFv = .text:0x80230A5C; // type:function size:0x60 scope:global align:4 +__dt__33jmessage_string_tMeasureProcessorFv = .text:0x80230A5C; // type:function size:0x60 scope:weak align:4 do_reset__34jmessage_string_tSequenceProcessorFv = .text:0x80230ABC; // type:function size:0x4 scope:global align:4 do_begin__34jmessage_string_tSequenceProcessorFPCvPCc = .text:0x80230AC0; // type:function size:0xBC scope:global align:4 do_end__34jmessage_string_tSequenceProcessorFv = .text:0x80230B7C; // type:function size:0x4 scope:global align:4 @@ -9123,12 +9123,12 @@ do_scale__35jmessage_string_tRenderingProcessorFf = .text:0x80232600; // type:fu do_linedown__35jmessage_string_tRenderingProcessorFs = .text:0x80232690; // type:function size:0x54 scope:global align:4 do_numset__35jmessage_string_tRenderingProcessorFs = .text:0x802326E4; // type:function size:0xD8 scope:global align:4 push_word__35jmessage_string_tRenderingProcessorFPCc = .text:0x802327BC; // type:function size:0x3C scope:global align:4 -__dt__35jmessage_string_tRenderingProcessorFv = .text:0x802327F8; // type:function size:0x60 scope:global align:4 -__dt__34jmessage_string_tSequenceProcessorFv = .text:0x80232858; // type:function size:0x84 scope:global align:4 -__dt__24jmessage_string_tControlFv = .text:0x802328DC; // type:function size:0x60 scope:global align:4 -__dt__28jmessage_tRenderingProcessorFv = .text:0x8023293C; // type:function size:0x60 scope:global align:4 -__dt__27jmessage_tSequenceProcessorFv = .text:0x8023299C; // type:function size:0x84 scope:global align:4 -getActorPos__19jmessage_tReferenceFv = .text:0x80232A20; // type:function size:0x1C scope:global align:4 +__dt__35jmessage_string_tRenderingProcessorFv = .text:0x802327F8; // type:function size:0x60 scope:weak align:4 +__dt__34jmessage_string_tSequenceProcessorFv = .text:0x80232858; // type:function size:0x84 scope:weak align:4 +__dt__24jmessage_string_tControlFv = .text:0x802328DC; // type:function size:0x60 scope:weak align:4 +__dt__28jmessage_tRenderingProcessorFv = .text:0x8023293C; // type:function size:0x60 scope:weak align:4 +__dt__27jmessage_tSequenceProcessorFv = .text:0x8023299C; // type:function size:0x84 scope:weak align:4 +getActorPos__19jmessage_tReferenceFv = .text:0x80232A20; // type:function size:0x1C scope:weak align:4 dMsgObject_getGroupID__Fv = .text:0x80232A3C; // type:function size:0x8 scope:global align:4 dMsgObject_searchSSItem__FPvPv = .text:0x80232A44; // type:function size:0xA8 scope:global align:4 __ct__20dMsgObject_HowlHIO_cFv = .text:0x80232AEC; // type:function size:0x280 scope:global align:4 @@ -9308,7 +9308,7 @@ setTag__10dMsgUnit_cFiiPcb = .text:0x80238CEC; // type:function size:0x390 scope __sinit_d_msg_unit_cpp = .text:0x8023907C; // type:function size:0x38 scope:local align:4 __ct__17dMsgScrn3Select_cFv = .text:0x802390B4; // type:function size:0x818 scope:global align:4 __dt__17dMsgScrn3Select_cFv = .text:0x802398CC; // type:function size:0x314 scope:global align:4 -__dt__14J2DAnmColorKeyFv = .text:0x80239BE0; // type:function size:0x84 scope:global align:4 +__dt__14J2DAnmColorKeyFv = .text:0x80239BE0; // type:function size:0x84 scope:weak align:4 isSelect__17dMsgScrn3Select_cFv = .text:0x80239C64; // type:function size:0x14 scope:global align:4 setString__17dMsgScrn3Select_cFPcPcPc = .text:0x80239C78; // type:function size:0x90 scope:global align:4 setRubyString__17dMsgScrn3Select_cFPcPcPc = .text:0x80239D08; // type:function size:0x90 scope:global align:4 @@ -9467,7 +9467,7 @@ __dt__15dMsgScrnLight_cFv = .text:0x80245B00; // type:function size:0x104 scope: draw__15dMsgScrnLight_cFPffffffUc = .text:0x80245C04; // type:function size:0x38C scope:global align:4 draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor = .text:0x80245F90; // type:function size:0x14C scope:global align:4 drawCommon__15dMsgScrnLight_cFfffff = .text:0x802460DC; // type:function size:0x26C scope:global align:4 -__dt__19dMsgScrnLight_HIO_cFv = .text:0x80246348; // type:function size:0x48 scope:global align:4 +__dt__19dMsgScrnLight_HIO_cFv = .text:0x80246348; // type:function size:0x48 scope:weak align:4 __sinit_d_msg_scrn_light_cpp = .text:0x80246390; // type:function size:0x3C scope:local align:4 __ct__15dMsgScrnPlace_cFv = .text:0x802463CC; // type:function size:0x3F8 scope:global align:4 __dt__15dMsgScrnPlace_cFv = .text:0x802467C4; // type:function size:0x160 scope:global align:4 @@ -9650,7 +9650,7 @@ event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024D93C; event040__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024D970; // type:function size:0x108 scope:global align:4 event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024DA78; // type:function size:0x30 scope:global align:4 event042__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024DAA8; // type:function size:0x8 scope:global align:4 -cLib_calcTimer__FPl = .text:0x8024DAB0; // type:function size:0x1C scope:global align:4 +cLib_calcTimer__FPl = .text:0x8024DAB0; // type:function size:0x1C scope:weak align:4 __sinit_d_msg_flow_cpp = .text:0x8024DACC; // type:function size:0x914 scope:local align:4 __ct__9dNm_HIO_cFv = .text:0x8024E3E0; // type:function size:0x28 scope:global align:4 __ct__7dName_cFP7J2DPane = .text:0x8024E408; // type:function size:0x60 scope:global align:4 @@ -9694,8 +9694,8 @@ displayInit__7dName_cFv = .text:0x80250CEC; // type:function size:0x168 scope:gl NameStrSet__7dName_cFv = .text:0x80250E54; // type:function size:0x1F4 scope:global align:4 getMenuPosIdx__7dName_cFUc = .text:0x80251048; // type:function size:0x4C scope:global align:4 draw__14dDlst_NameIN_cFv = .text:0x80251094; // type:function size:0xC8 scope:global align:4 -__dt__14dDlst_NameIN_cFv = .text:0x8025115C; // type:function size:0x48 scope:global align:4 -__dt__9dNm_HIO_cFv = .text:0x802511A4; // type:function size:0x48 scope:global align:4 +__dt__14dDlst_NameIN_cFv = .text:0x8025115C; // type:function size:0x48 scope:weak align:4 +__dt__9dNm_HIO_cFv = .text:0x802511A4; // type:function size:0x48 scope:weak align:4 __sinit_d_name_cpp = .text:0x802511EC; // type:function size:0x128 scope:local align:4 __ct__16dNpcLib_lookat_cFv = .text:0x80251314; // type:function size:0xF8 scope:global align:4 init__16dNpcLib_lookat_cFP8J3DModelPiP5csXyzP5csXyz = .text:0x8025140C; // type:function size:0x128 scope:global align:4 @@ -9704,29 +9704,29 @@ dbView__16dNpcLib_lookat_cFv = .text:0x80251B60; // type:function size:0x4 scope setPrm__16dNpcLib_lookat_cFv = .text:0x80251B64; // type:function size:0x394 scope:global align:4 update__16dNpcLib_lookat_cFv = .text:0x80251EF8; // type:function size:0x120 scope:global align:4 limitter__16dNpcLib_lookat_cFPssss = .text:0x80252018; // type:function size:0x7C scope:global align:4 -__dt__16dNpcLib_lookat_cFv = .text:0x80252094; // type:function size:0xE8 scope:global align:4 -dOvlpFd_Draw__FP14overlap1_class = .text:0x8025217C; // type:function size:0x8 scope:global align:4 -dOvlpFd_startFadeIn__Fi = .text:0x80252184; // type:function size:0x70 scope:global align:4 -dOvlpFd_FadeOut__FP14overlap1_class = .text:0x802521F4; // type:function size:0xD4 scope:global align:4 -dOvlpFd_Wait__FP14overlap1_class = .text:0x802522C8; // type:function size:0x38 scope:global align:4 -dOvlpFd_FadeIn__FP14overlap1_class = .text:0x80252300; // type:function size:0x12C scope:global align:4 -dOvlpFd_Execute__FP14overlap1_class = .text:0x8025242C; // type:function size:0x2C scope:global align:4 -dOvlpFd_IsDelete__FP14overlap1_class = .text:0x80252458; // type:function size:0x8 scope:global align:4 -dOvlpFd_Delete__FP14overlap1_class = .text:0x80252460; // type:function size:0x8 scope:global align:4 -dOvlpFd_Create__FPv = .text:0x80252468; // type:function size:0x14 scope:global align:4 +__dt__16dNpcLib_lookat_cFv = .text:0x80252094; // type:function size:0xE8 scope:weak align:4 +dOvlpFd_Draw__FP14overlap1_class = .text:0x8025217C; // type:function size:0x8 scope:local align:4 +dOvlpFd_startFadeIn__Fi = .text:0x80252184; // type:function size:0x70 scope:local align:4 +dOvlpFd_FadeOut__FP14overlap1_class = .text:0x802521F4; // type:function size:0xD4 scope:local align:4 +dOvlpFd_Wait__FP14overlap1_class = .text:0x802522C8; // type:function size:0x38 scope:local align:4 +dOvlpFd_FadeIn__FP14overlap1_class = .text:0x80252300; // type:function size:0x12C scope:local align:4 +dOvlpFd_Execute__FP14overlap1_class = .text:0x8025242C; // type:function size:0x2C scope:local align:4 +dOvlpFd_IsDelete__FP14overlap1_class = .text:0x80252458; // type:function size:0x8 scope:local align:4 +dOvlpFd_Delete__FP14overlap1_class = .text:0x80252460; // type:function size:0x8 scope:local align:4 +dOvlpFd_Create__FPv = .text:0x80252468; // type:function size:0x14 scope:local align:4 draw__15dOvlpFd2_dlst_cFv = .text:0x8025247C; // type:function size:0x514 scope:global align:4 __ct__10dOvlpFd2_cFv = .text:0x80252990; // type:function size:0x64 scope:global align:4 execFirstSnap__10dOvlpFd2_cFv = .text:0x802529F4; // type:function size:0x84 scope:global align:4 execFadeOut__10dOvlpFd2_cFv = .text:0x80252A78; // type:function size:0x148 scope:global align:4 execNextSnap__10dOvlpFd2_cFv = .text:0x80252BC0; // type:function size:0xA8 scope:global align:4 execFadeIn__10dOvlpFd2_cFv = .text:0x80252C68; // type:function size:0xA4 scope:global align:4 -dOvlpFd2_Draw__FP10dOvlpFd2_c = .text:0x80252D0C; // type:function size:0xFC scope:global align:4 -dOvlpFd2_Execute__FP10dOvlpFd2_c = .text:0x80252E08; // type:function size:0x2C scope:global align:4 -dOvlpFd2_IsDelete__FP10dOvlpFd2_c = .text:0x80252E34; // type:function size:0x8 scope:global align:4 -dOvlpFd2_Delete__FP10dOvlpFd2_c = .text:0x80252E3C; // type:function size:0x8 scope:global align:4 -dOvlpFd2_Create__FPv = .text:0x80252E44; // type:function size:0x2C scope:global align:4 -cLib_calcTimer__FPSc = .text:0x80252E70; // type:function size:0x1C scope:global align:4 -__dt__15dOvlpFd2_dlst_cFv = .text:0x80252E8C; // type:function size:0x48 scope:global align:4 +dOvlpFd2_Draw__FP10dOvlpFd2_c = .text:0x80252D0C; // type:function size:0xFC scope:local align:4 +dOvlpFd2_Execute__FP10dOvlpFd2_c = .text:0x80252E08; // type:function size:0x2C scope:local align:4 +dOvlpFd2_IsDelete__FP10dOvlpFd2_c = .text:0x80252E34; // type:function size:0x8 scope:local align:4 +dOvlpFd2_Delete__FP10dOvlpFd2_c = .text:0x80252E3C; // type:function size:0x8 scope:local align:4 +dOvlpFd2_Create__FPv = .text:0x80252E44; // type:function size:0x2C scope:local align:4 +cLib_calcTimer__FPSc = .text:0x80252E70; // type:function size:0x1C scope:weak align:4 +__dt__15dOvlpFd2_dlst_cFv = .text:0x80252E8C; // type:function size:0x48 scope:weak align:4 draw__16dDlst_snapShot_cFv = .text:0x80252ED4; // type:function size:0x54 scope:global align:4 draw__15dOvlpFd3_dlst_cFv = .text:0x80252F28; // type:function size:0x514 scope:global align:4 __ct__10dOvlpFd3_cFv = .text:0x8025343C; // type:function size:0xDC scope:global align:4 @@ -9734,12 +9734,12 @@ execFirstSnap__10dOvlpFd3_cFv = .text:0x80253518; // type:function size:0x94 sco execFadeOut__10dOvlpFd3_cFv = .text:0x802535AC; // type:function size:0xE0 scope:global align:4 execNextSnap__10dOvlpFd3_cFv = .text:0x8025368C; // type:function size:0xA4 scope:global align:4 execFadeIn__10dOvlpFd3_cFv = .text:0x80253730; // type:function size:0x7C scope:global align:4 -dOvlpFd3_Draw__FP10dOvlpFd3_c = .text:0x802537AC; // type:function size:0xD4 scope:global align:4 -dOvlpFd3_Execute__FP10dOvlpFd3_c = .text:0x80253880; // type:function size:0x2C scope:global align:4 -dOvlpFd3_IsDelete__FP10dOvlpFd3_c = .text:0x802538AC; // type:function size:0x8 scope:global align:4 -dOvlpFd3_Delete__FP10dOvlpFd3_c = .text:0x802538B4; // type:function size:0x8 scope:global align:4 -dOvlpFd3_Create__FPv = .text:0x802538BC; // type:function size:0x2C scope:global align:4 -__dt__15dOvlpFd3_dlst_cFv = .text:0x802538E8; // type:function size:0x48 scope:global align:4 +dOvlpFd3_Draw__FP10dOvlpFd3_c = .text:0x802537AC; // type:function size:0xD4 scope:local align:4 +dOvlpFd3_Execute__FP10dOvlpFd3_c = .text:0x80253880; // type:function size:0x2C scope:local align:4 +dOvlpFd3_IsDelete__FP10dOvlpFd3_c = .text:0x802538AC; // type:function size:0x8 scope:local align:4 +dOvlpFd3_Delete__FP10dOvlpFd3_c = .text:0x802538B4; // type:function size:0x8 scope:local align:4 +dOvlpFd3_Create__FPv = .text:0x802538BC; // type:function size:0x2C scope:local align:4 +__dt__15dOvlpFd3_dlst_cFv = .text:0x802538E8; // type:function size:0x48 scope:weak align:4 __ct__8CPaneMgrFv = .text:0x80253930; // type:function size:0x54 scope:global align:4 __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap = .text:0x80253984; // type:function size:0x94 scope:global align:4 __dt__8CPaneMgrFv = .text:0x80253A18; // type:function size:0x9C scope:global align:4 @@ -9767,9 +9767,9 @@ getBounds__8CPaneMgrFP7J2DPane = .text:0x80254FB8; // type:function size:0x130 s dPaneClass_showNullPane__FP9J2DScreen = .text:0x802550E8; // type:function size:0x44 scope:global align:4 dPaneClass_showNullPane__FP7J2DPane = .text:0x8025512C; // type:function size:0x58 scope:global align:4 dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive = .text:0x80255184; // type:function size:0x134 scope:global align:4 -__dt__20JSUMemoryInputStreamFv = .text:0x802552B8; // type:function size:0x70 scope:global align:4 -__dt__20JSURandomInputStreamFv = .text:0x80255328; // type:function size:0x60 scope:global align:4 -__dt__10JSUIosBaseFv = .text:0x80255388; // type:function size:0x48 scope:global align:4 +__dt__20JSUMemoryInputStreamFv = .text:0x802552B8; // type:function size:0x70 scope:weak align:4 +__dt__20JSURandomInputStreamFv = .text:0x80255328; // type:function size:0x60 scope:weak align:4 +__dt__10JSUIosBaseFv = .text:0x80255388; // type:function size:0x48 scope:weak align:4 __sinit_d_pane_class_cpp = .text:0x802553D0; // type:function size:0x1C scope:local align:4 __ct__13CPaneMgrAlphaFv = .text:0x802553EC; // type:function size:0x10 scope:global align:4 __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap = .text:0x802553FC; // type:function size:0x70 scope:global align:4 @@ -9794,16 +9794,16 @@ setBackupAlpha__17CPaneMgrAlphaMorfFv = .text:0x80255DD0; // type:function size: setAlphaMorfRate__17CPaneMgrAlphaMorfFf = .text:0x80255E28; // type:function size:0x70 scope:global align:4 childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane = .text:0x80255E98; // type:function size:0x90 scope:global align:4 childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef = .text:0x80255F28; // type:function size:0xF0 scope:global align:4 -setAnimation__7J2DPaneFP14J2DAnmVtxColor = .text:0x80256018; // type:function size:0x4 scope:global align:4 -setAnimation__7J2DPaneFP20J2DAnmVisibilityFull = .text:0x8025601C; // type:function size:0x4 scope:global align:4 -setAnimation__7J2DPaneFP16J2DAnmTexPattern = .text:0x80256020; // type:function size:0x4 scope:global align:4 -getMaterial__12J2DTextBoxExCFv = .text:0x80256024; // type:function size:0x8 scope:global align:4 -getMaterial__10J2DTextBoxCFv = .text:0x8025602C; // type:function size:0x8 scope:global align:4 -getMaterial__12J2DPictureExCFv = .text:0x80256034; // type:function size:0x8 scope:global align:4 -getMaterial__10J2DPictureCFv = .text:0x8025603C; // type:function size:0x8 scope:global align:4 -setAnimation__12J2DTextBoxExFP15J2DAnmTransform = .text:0x80256044; // type:function size:0x20 scope:global align:4 -setAnimation__12J2DPictureExFP15J2DAnmTransform = .text:0x80256064; // type:function size:0x20 scope:global align:4 -setAnimation__11J2DWindowExFP15J2DAnmTransform = .text:0x80256084; // type:function size:0x20 scope:global align:4 +setAnimation__7J2DPaneFP14J2DAnmVtxColor = .text:0x80256018; // type:function size:0x4 scope:weak align:4 +setAnimation__7J2DPaneFP20J2DAnmVisibilityFull = .text:0x8025601C; // type:function size:0x4 scope:weak align:4 +setAnimation__7J2DPaneFP16J2DAnmTexPattern = .text:0x80256020; // type:function size:0x4 scope:weak align:4 +getMaterial__12J2DTextBoxExCFv = .text:0x80256024; // type:function size:0x8 scope:weak align:4 +getMaterial__10J2DTextBoxCFv = .text:0x8025602C; // type:function size:0x8 scope:weak align:4 +getMaterial__12J2DPictureExCFv = .text:0x80256034; // type:function size:0x8 scope:weak align:4 +getMaterial__10J2DPictureCFv = .text:0x8025603C; // type:function size:0x8 scope:weak align:4 +setAnimation__12J2DTextBoxExFP15J2DAnmTransform = .text:0x80256044; // type:function size:0x20 scope:weak align:4 +setAnimation__12J2DPictureExFP15J2DAnmTransform = .text:0x80256064; // type:function size:0x20 scope:weak align:4 +setAnimation__11J2DWindowExFP15J2DAnmTransform = .text:0x80256084; // type:function size:0x20 scope:weak align:4 __ct__10dLog_HIO_cFv = .text:0x802560A4; // type:function size:0x10 scope:global align:4 preLoad_dyl_create__10dScnLogo_cFv = .text:0x802560B4; // type:function size:0x44 scope:global align:4 preLoad_dyl_remove__10dScnLogo_cFv = .text:0x802560F8; // type:function size:0x24 scope:global align:4 @@ -9827,29 +9827,29 @@ dolbyOutDraw2__10dScnLogo_cFv = .text:0x80257058; // type:function size:0x18 sco dvdWaitDraw__10dScnLogo_cFv = .text:0x80257070; // type:function size:0x214 scope:global align:4 nextSceneChange__10dScnLogo_cFv = .text:0x80257284; // type:function size:0x34 scope:global align:4 __dt__10dScnLogo_cFv = .text:0x802572B8; // type:function size:0x658 scope:global align:4 -phase_0__FP10dScnLogo_c = .text:0x80257910; // type:function size:0xAC scope:global align:4 -phase_1__FP10dScnLogo_c = .text:0x802579BC; // type:function size:0xB4 scope:global align:4 -phase_2__FP10dScnLogo_c = .text:0x80257A70; // type:function size:0x44 scope:global align:4 -resLoad__FP30request_of_phase_process_classP10dScnLogo_c = .text:0x80257AB4; // type:function size:0x2C scope:global align:4 +phase_0__FP10dScnLogo_c = .text:0x80257910; // type:function size:0xAC scope:local align:4 +phase_1__FP10dScnLogo_c = .text:0x802579BC; // type:function size:0xB4 scope:local align:4 +phase_2__FP10dScnLogo_c = .text:0x80257A70; // type:function size:0x44 scope:local align:4 +resLoad__FP30request_of_phase_process_classP10dScnLogo_c = .text:0x80257AB4; // type:function size:0x2C scope:local align:4 create__10dScnLogo_cFv = .text:0x80257AE0; // type:function size:0x184 scope:global align:4 logoInitGC__10dScnLogo_cFv = .text:0x80257C64; // type:function size:0x388 scope:global align:4 dvdDataLoad__10dScnLogo_cFv = .text:0x80257FEC; // type:function size:0x434 scope:global align:4 -dScnLogo_Create__FP11scene_class = .text:0x80258420; // type:function size:0x24 scope:global align:4 -dScnLogo_Execute__FP10dScnLogo_c = .text:0x80258444; // type:function size:0x40 scope:global align:4 -dScnLogo_Draw__FP10dScnLogo_c = .text:0x80258484; // type:function size:0x24 scope:global align:4 -dScnLogo_Delete__FP10dScnLogo_c = .text:0x802584A8; // type:function size:0x28 scope:global align:4 -dScnLogo_IsDelete__FP10dScnLogo_c = .text:0x802584D0; // type:function size:0x8 scope:global align:4 +dScnLogo_Create__FP11scene_class = .text:0x80258420; // type:function size:0x24 scope:local align:4 +dScnLogo_Execute__FP10dScnLogo_c = .text:0x80258444; // type:function size:0x40 scope:local align:4 +dScnLogo_Draw__FP10dScnLogo_c = .text:0x80258484; // type:function size:0x24 scope:local align:4 +dScnLogo_Delete__FP10dScnLogo_c = .text:0x802584A8; // type:function size:0x28 scope:local align:4 +dScnLogo_IsDelete__FP10dScnLogo_c = .text:0x802584D0; // type:function size:0x8 scope:local align:4 setProgressiveMode__10dScnLogo_cFUc = .text:0x802584D8; // type:function size:0x24 scope:global align:4 getProgressiveMode__10dScnLogo_cFv = .text:0x802584FC; // type:function size:0x24 scope:global align:4 isProgressiveMode__10dScnLogo_cFv = .text:0x80258520; // type:function size:0x2C scope:global align:4 setRenderMode__10dScnLogo_cFv = .text:0x8025854C; // type:function size:0x10 scope:global align:4 __dt__10dLog_HIO_cFv = .text:0x8025855C; // type:function size:0x48 scope:global align:4 -cLib_calcTimer__FPUs = .text:0x802585A4; // type:function size:0x1C scope:global align:4 +cLib_calcTimer__FPUs = .text:0x802585A4; // type:function size:0x1C scope:weak align:4 __sinit_d_s_logo_cpp = .text:0x802585C0; // type:function size:0x1CC scope:local align:4 __ct__9dSn_HIO_cFv = .text:0x8025878C; // type:function size:0x18 scope:global align:4 phase_1__FPc = .text:0x802587A4; // type:function size:0x7C scope:local align:4 phase_2__FPc = .text:0x80258820; // type:function size:0x58 scope:local align:4 -resLoad__FP30request_of_phase_process_classPc = .text:0x80258878; // type:function size:0x28 scope:global align:4 +resLoad__FP30request_of_phase_process_classPc = .text:0x80258878; // type:function size:0x28 scope:local align:4 create__10dScnName_cFv = .text:0x802588A0; // type:function size:0x28C scope:global align:4 setView__10dScnName_cFv = .text:0x80258B2C; // type:function size:0x9C scope:global align:4 execute__10dScnName_cFv = .text:0x80258BC8; // type:function size:0x94 scope:global align:4 @@ -9862,62 +9862,62 @@ FileSelectClose__10dScnName_cFv = .text:0x80258F20; // type:function size:0xB4 s brightCheckOpen__10dScnName_cFv = .text:0x80258FD4; // type:function size:0x34 scope:global align:4 brightCheck__10dScnName_cFv = .text:0x80259008; // type:function size:0xF0 scope:global align:4 changeGameScene__10dScnName_cFv = .text:0x802590F8; // type:function size:0xC8 scope:global align:4 -dScnName_Draw__FP10dScnName_c = .text:0x802591C0; // type:function size:0x20 scope:global align:4 -dScnName_Execute__FP10dScnName_c = .text:0x802591E0; // type:function size:0x20 scope:global align:4 -dScnName_IsDelete__FP10dScnName_c = .text:0x80259200; // type:function size:0x30 scope:global align:4 -dScnName_Delete__FP10dScnName_c = .text:0x80259230; // type:function size:0x28 scope:global align:4 -dScnName_Create__FP11scene_class = .text:0x80259258; // type:function size:0x3C scope:global align:4 -__dt__17dScnName_camera_cFv = .text:0x80259294; // type:function size:0x48 scope:global align:4 -__dt__9dSn_HIO_cFv = .text:0x802592DC; // type:function size:0x48 scope:global align:4 +dScnName_Draw__FP10dScnName_c = .text:0x802591C0; // type:function size:0x20 scope:local align:4 +dScnName_Execute__FP10dScnName_c = .text:0x802591E0; // type:function size:0x20 scope:local align:4 +dScnName_IsDelete__FP10dScnName_c = .text:0x80259200; // type:function size:0x30 scope:local align:4 +dScnName_Delete__FP10dScnName_c = .text:0x80259230; // type:function size:0x28 scope:local align:4 +dScnName_Create__FP11scene_class = .text:0x80259258; // type:function size:0x3C scope:local align:4 +__dt__17dScnName_camera_cFv = .text:0x80259294; // type:function size:0x48 scope:weak align:4 +__dt__9dSn_HIO_cFv = .text:0x802592DC; // type:function size:0x48 scope:weak align:4 __sinit_d_s_name_cpp = .text:0x80259324; // type:function size:0xDC scope:local align:4 calcPauseTimer__9dScnPly_cFv = .text:0x80259400; // type:function size:0x40 scope:global align:4 __ct__22dScnPly_env_otherHIO_cFv = .text:0x80259440; // type:function size:0x28 scope:global align:4 __ct__22dScnPly_env_debugHIO_cFv = .text:0x80259468; // type:function size:0x44 scope:global align:4 -dScnPly_Draw__FP9dScnPly_c = .text:0x802594AC; // type:function size:0x30C scope:global align:4 -dScnPly_Execute__FP9dScnPly_c = .text:0x802597B8; // type:function size:0xC4 scope:global align:4 -dScnPly_IsDelete__F9dScnPly_c = .text:0x8025987C; // type:function size:0x30 scope:global align:4 -dScnPly_Delete__FP9dScnPly_c = .text:0x802598AC; // type:function size:0x218 scope:global align:4 +dScnPly_Draw__FP9dScnPly_c = .text:0x802594AC; // type:function size:0x30C scope:local align:4 +dScnPly_Execute__FP9dScnPly_c = .text:0x802597B8; // type:function size:0xC4 scope:local align:4 +dScnPly_IsDelete__F9dScnPly_c = .text:0x8025987C; // type:function size:0x30 scope:local align:4 +dScnPly_Delete__FP9dScnPly_c = .text:0x802598AC; // type:function size:0x218 scope:local align:4 resetGame__9dScnPly_cFv = .text:0x80259AC4; // type:function size:0x138 scope:global align:4 offReset__9dScnPly_cFv = .text:0x80259BFC; // type:function size:0x74 scope:global align:4 -phase_00__FP9dScnPly_c = .text:0x80259C70; // type:function size:0x3C scope:global align:4 -phase_01__FP9dScnPly_c = .text:0x80259CAC; // type:function size:0xD0 scope:global align:4 -phase_0__FP9dScnPly_c = .text:0x80259D7C; // type:function size:0x8 scope:global align:4 -phase_1__FP9dScnPly_c = .text:0x80259D84; // type:function size:0x6B4 scope:global align:4 -phase_1_0__FP9dScnPly_c = .text:0x8025A438; // type:function size:0xC0 scope:global align:4 -phase_2__FP9dScnPly_c = .text:0x8025A4F8; // type:function size:0xDC scope:global align:4 -phase_3__FP9dScnPly_c = .text:0x8025A5D4; // type:function size:0x80 scope:global align:4 -phase_4__FP9dScnPly_c = .text:0x8025A654; // type:function size:0x3A0 scope:global align:4 -phase_5__FP9dScnPly_c = .text:0x8025A9F4; // type:function size:0xCC scope:global align:4 -phase_6__FP9dScnPly_c = .text:0x8025AAC0; // type:function size:0xCC scope:global align:4 -phase_compleate__FPv = .text:0x8025AB8C; // type:function size:0x8 scope:global align:4 -dScnPly_Create__FP11scene_class = .text:0x8025AB94; // type:function size:0x30 scope:global align:4 -__dt__22dScnPly_env_debugHIO_cFv = .text:0x8025ABC4; // type:function size:0x48 scope:global align:4 -__dt__22dScnPly_env_otherHIO_cFv = .text:0x8025AC0C; // type:function size:0x48 scope:global align:4 +phase_00__FP9dScnPly_c = .text:0x80259C70; // type:function size:0x3C scope:local align:4 +phase_01__FP9dScnPly_c = .text:0x80259CAC; // type:function size:0xD0 scope:local align:4 +phase_0__FP9dScnPly_c = .text:0x80259D7C; // type:function size:0x8 scope:local align:4 +phase_1__FP9dScnPly_c = .text:0x80259D84; // type:function size:0x6B4 scope:local align:4 +phase_1_0__FP9dScnPly_c = .text:0x8025A438; // type:function size:0xC0 scope:local align:4 +phase_2__FP9dScnPly_c = .text:0x8025A4F8; // type:function size:0xDC scope:local align:4 +phase_3__FP9dScnPly_c = .text:0x8025A5D4; // type:function size:0x80 scope:local align:4 +phase_4__FP9dScnPly_c = .text:0x8025A654; // type:function size:0x3A0 scope:local align:4 +phase_5__FP9dScnPly_c = .text:0x8025A9F4; // type:function size:0xCC scope:local align:4 +phase_6__FP9dScnPly_c = .text:0x8025AAC0; // type:function size:0xCC scope:local align:4 +phase_compleate__FPv = .text:0x8025AB8C; // type:function size:0x8 scope:local align:4 +dScnPly_Create__FP11scene_class = .text:0x8025AB94; // type:function size:0x30 scope:local align:4 +__dt__22dScnPly_env_debugHIO_cFv = .text:0x8025ABC4; // type:function size:0x48 scope:weak align:4 +__dt__22dScnPly_env_otherHIO_cFv = .text:0x8025AC0C; // type:function size:0x48 scope:weak align:4 __sinit_d_s_play_cpp = .text:0x8025AC54; // type:function size:0xB0 scope:local align:4 -__dt__17dScnPly_env_HIO_cFv = .text:0x8025AD04; // type:function size:0x74 scope:global align:4 -__dt__17dScnPly_reg_HIO_cFv = .text:0x8025AD78; // type:function size:0x48 scope:global align:4 -__dt__21dScnPly_preLoad_HIO_cFv = .text:0x8025ADC0; // type:function size:0x5C scope:global align:4 -dScnRoom_Draw__FP19room_of_scene_class = .text:0x8025AE1C; // type:function size:0x8 scope:global align:4 -getResetArchiveBank__FiPPCUc = .text:0x8025AE24; // type:function size:0x100 scope:global align:4 -resetArchiveBank__Fi = .text:0x8025AF24; // type:function size:0x28 scope:global align:4 -setArchiveBank__Fi = .text:0x8025AF4C; // type:function size:0x1A4 scope:global align:4 -objectDeleteJugge__FPvPv = .text:0x8025B0F0; // type:function size:0x60 scope:global align:4 -deleteJugge__FPvPv = .text:0x8025B150; // type:function size:0x24 scope:global align:4 -isCreatingCallback__FP10create_tagPUi = .text:0x8025B174; // type:function size:0x20 scope:global align:4 -isCreating__FUi = .text:0x8025B194; // type:function size:0x3C scope:global align:4 -loadDemoArchive__Fi = .text:0x8025B1D0; // type:function size:0x11C scope:global align:4 -objectSetCheck__FP19room_of_scene_class = .text:0x8025B2EC; // type:function size:0x278 scope:global align:4 -dScnRoom_Execute__FP19room_of_scene_class = .text:0x8025B564; // type:function size:0x110 scope:global align:4 -dScnRoom_IsDelete__FP19room_of_scene_class = .text:0x8025B674; // type:function size:0x8 scope:global align:4 -isReadRoom__Fi = .text:0x8025B67C; // type:function size:0xC0 scope:global align:4 -dScnRoom_Delete__FP19room_of_scene_class = .text:0x8025B73C; // type:function size:0x134 scope:global align:4 -phase_0__FP19room_of_scene_class = .text:0x8025B870; // type:function size:0x34 scope:global align:4 -phase_1__FP19room_of_scene_class = .text:0x8025B8A4; // type:function size:0xDC scope:global align:4 -phase_2__FP19room_of_scene_class = .text:0x8025B980; // type:function size:0x12C scope:global align:4 +__dt__17dScnPly_env_HIO_cFv = .text:0x8025AD04; // type:function size:0x74 scope:weak align:4 +__dt__17dScnPly_reg_HIO_cFv = .text:0x8025AD78; // type:function size:0x48 scope:weak align:4 +__dt__21dScnPly_preLoad_HIO_cFv = .text:0x8025ADC0; // type:function size:0x5C scope:weak align:4 +dScnRoom_Draw__FP19room_of_scene_class = .text:0x8025AE1C; // type:function size:0x8 scope:local align:4 +getResetArchiveBank__FiPPCUc = .text:0x8025AE24; // type:function size:0x100 scope:local align:4 +resetArchiveBank__Fi = .text:0x8025AF24; // type:function size:0x28 scope:local align:4 +setArchiveBank__Fi = .text:0x8025AF4C; // type:function size:0x1A4 scope:local align:4 +objectDeleteJugge__FPvPv = .text:0x8025B0F0; // type:function size:0x60 scope:local align:4 +deleteJugge__FPvPv = .text:0x8025B150; // type:function size:0x24 scope:local align:4 +isCreatingCallback__FP10create_tagPUi = .text:0x8025B174; // type:function size:0x20 scope:local align:4 +isCreating__FUi = .text:0x8025B194; // type:function size:0x3C scope:local align:4 +loadDemoArchive__Fi = .text:0x8025B1D0; // type:function size:0x11C scope:local align:4 +objectSetCheck__FP19room_of_scene_class = .text:0x8025B2EC; // type:function size:0x278 scope:local align:4 +dScnRoom_Execute__FP19room_of_scene_class = .text:0x8025B564; // type:function size:0x110 scope:local align:4 +dScnRoom_IsDelete__FP19room_of_scene_class = .text:0x8025B674; // type:function size:0x8 scope:local align:4 +isReadRoom__Fi = .text:0x8025B67C; // type:function size:0xC0 scope:local align:4 +dScnRoom_Delete__FP19room_of_scene_class = .text:0x8025B73C; // type:function size:0x134 scope:local align:4 +phase_0__FP19room_of_scene_class = .text:0x8025B870; // type:function size:0x34 scope:local align:4 +phase_1__FP19room_of_scene_class = .text:0x8025B8A4; // type:function size:0xDC scope:local align:4 +phase_2__FP19room_of_scene_class = .text:0x8025B980; // type:function size:0x12C scope:local align:4 setZoneNo__20dStage_roomControl_cFii = .text:0x8025BAAC; // type:function size:0x18 scope:global align:4 -phase_3__FP19room_of_scene_class = .text:0x8025BAC4; // type:function size:0x34 scope:global align:4 -phase_4__FP19room_of_scene_class = .text:0x8025BAF8; // type:function size:0x50 scope:global align:4 -dScnRoom_Create__FP11scene_class = .text:0x8025BB48; // type:function size:0x30 scope:global align:4 +phase_3__FP19room_of_scene_class = .text:0x8025BAC4; // type:function size:0x34 scope:local align:4 +phase_4__FP19room_of_scene_class = .text:0x8025BAF8; // type:function size:0x50 scope:local align:4 +dScnRoom_Create__FP11scene_class = .text:0x8025BB48; // type:function size:0x30 scope:local align:4 __ct__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025BB78; // type:function size:0x34 scope:global align:4 init__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025BBAC; // type:function size:0x68 scope:global align:4 __ct__26dSvBit_childSwDungeonHIO_cFv = .text:0x8025BC14; // type:function size:0x34 scope:global align:4 @@ -9943,23 +9943,23 @@ init__26dSvBit_childTransformHIO_cFv = .text:0x8025C0D4; // type:function size:0 __ct__22dSvBit_childOtherHIO_cFv = .text:0x8025C13C; // type:function size:0x3C scope:global align:4 init__22dSvBit_childOtherHIO_cFv = .text:0x8025C178; // type:function size:0x80 scope:global align:4 init__12dSvBit_HIO_cFv = .text:0x8025C1F8; // type:function size:0xA4 scope:global align:4 -__dt__22dSvBit_childOtherHIO_cFv = .text:0x8025C29C; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childTransformHIO_cFv = .text:0x8025C2E4; // type:function size:0x48 scope:global align:4 -__dt__25dSvBit_childDarknessHIO_cFv = .text:0x8025C32C; // type:function size:0x48 scope:global align:4 -__dt__29dSvBit_childTbPerfectionHIO_cFv = .text:0x8025C374; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childItOneZoneHIO_cFv = .text:0x8025C3BC; // type:function size:0x48 scope:global align:4 -__dt__23dSvBit_childItZoneHIO_cFv = .text:0x8025C404; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childItDungeonHIO_cFv = .text:0x8025C44C; // type:function size:0x48 scope:global align:4 -__dt__29dSvBit_childItPerfectionHIO_cFv = .text:0x8025C494; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childSwOneZoneHIO_cFv = .text:0x8025C4DC; // type:function size:0x48 scope:global align:4 -__dt__23dSvBit_childSwZoneHIO_cFv = .text:0x8025C524; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childSwDungeonHIO_cFv = .text:0x8025C56C; // type:function size:0x48 scope:global align:4 -__dt__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025C5B4; // type:function size:0x48 scope:global align:4 +__dt__22dSvBit_childOtherHIO_cFv = .text:0x8025C29C; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childTransformHIO_cFv = .text:0x8025C2E4; // type:function size:0x48 scope:weak align:4 +__dt__25dSvBit_childDarknessHIO_cFv = .text:0x8025C32C; // type:function size:0x48 scope:weak align:4 +__dt__29dSvBit_childTbPerfectionHIO_cFv = .text:0x8025C374; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childItOneZoneHIO_cFv = .text:0x8025C3BC; // type:function size:0x48 scope:weak align:4 +__dt__23dSvBit_childItZoneHIO_cFv = .text:0x8025C404; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childItDungeonHIO_cFv = .text:0x8025C44C; // type:function size:0x48 scope:weak align:4 +__dt__29dSvBit_childItPerfectionHIO_cFv = .text:0x8025C494; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childSwOneZoneHIO_cFv = .text:0x8025C4DC; // type:function size:0x48 scope:weak align:4 +__dt__23dSvBit_childSwZoneHIO_cFv = .text:0x8025C524; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childSwDungeonHIO_cFv = .text:0x8025C56C; // type:function size:0x48 scope:weak align:4 +__dt__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025C5B4; // type:function size:0x48 scope:weak align:4 __sinit_d_save_HIO_cpp = .text:0x8025C5FC; // type:function size:0x100 scope:local align:4 -__dt__12dSvBit_HIO_cFv = .text:0x8025C6FC; // type:function size:0x178 scope:global align:4 -__dt__25dSvBit_childTreasureHIO_cFv = .text:0x8025C874; // type:function size:0x60 scope:global align:4 -__dt__21dSvBit_childItemHIO_cFv = .text:0x8025C8D4; // type:function size:0x9C scope:global align:4 -__dt__23dSvBit_childSwitchHIO_cFv = .text:0x8025C970; // type:function size:0x9C scope:global align:4 +__dt__12dSvBit_HIO_cFv = .text:0x8025C6FC; // type:function size:0x178 scope:weak align:4 +__dt__25dSvBit_childTreasureHIO_cFv = .text:0x8025C874; // type:function size:0x60 scope:weak align:4 +__dt__21dSvBit_childItemHIO_cFv = .text:0x8025C8D4; // type:function size:0x9C scope:weak align:4 +__dt__23dSvBit_childSwitchHIO_cFv = .text:0x8025C970; // type:function size:0x9C scope:weak align:4 _create__8dTimer_cFv = .text:0x8025CA0C; // type:function size:0x4F8 scope:global align:4 _execute__8dTimer_cFv = .text:0x8025CF04; // type:function size:0x438 scope:global align:4 _draw__8dTimer_cFv = .text:0x8025D33C; // type:function size:0x80 scope:global align:4 @@ -10002,15 +10002,15 @@ draw__21dDlst_TimerScrnDraw_cFv = .text:0x80260690; // type:function size:0x418 checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv = .text:0x80260AA8; // type:function size:0x2C scope:global align:4 playBckAnimation__21dDlst_TimerScrnDraw_cFf = .text:0x80260AD4; // type:function size:0x80 scope:global align:4 drawPikari__21dDlst_TimerScrnDraw_cFi = .text:0x80260B54; // type:function size:0x3B0 scope:global align:4 -dTimer_Draw__FP8dTimer_c = .text:0x80260F04; // type:function size:0x20 scope:global align:4 -dTimer_Execute__FP8dTimer_c = .text:0x80260F24; // type:function size:0x20 scope:global align:4 -dTimer_IsDelete__FP8dTimer_c = .text:0x80260F44; // type:function size:0x8 scope:global align:4 -dTimer_Delete__FP8dTimer_c = .text:0x80260F4C; // type:function size:0x20 scope:global align:4 -dTimer_Create__FP9msg_class = .text:0x80260F6C; // type:function size:0x20 scope:global align:4 +dTimer_Draw__FP8dTimer_c = .text:0x80260F04; // type:function size:0x20 scope:local align:4 +dTimer_Execute__FP8dTimer_c = .text:0x80260F24; // type:function size:0x20 scope:local align:4 +dTimer_IsDelete__FP8dTimer_c = .text:0x80260F44; // type:function size:0x8 scope:local align:4 +dTimer_Delete__FP8dTimer_c = .text:0x80260F4C; // type:function size:0x20 scope:local align:4 +dTimer_Create__FP9msg_class = .text:0x80260F6C; // type:function size:0x20 scope:local align:4 dTimer_createTimer__FlUlUcUcffff = .text:0x80260F8C; // type:function size:0xA8 scope:global align:4 dTimer_createStockTimer__Fv = .text:0x80261034; // type:function size:0xCC scope:global align:4 dTimer_createGetIn2D__Fl4cXyz = .text:0x80261100; // type:function size:0x88 scope:global align:4 -dTimer_createStart2D__FlUs = .text:0x80261188; // type:function size:0x68 scope:global align:4 +dTimer_createStart2D__FlUs = .text:0x80261188; // type:function size:0x68 scope:local align:4 dTimer_isStart__Fv = .text:0x802611F0; // type:function size:0x54 scope:global align:4 dTimer_getRestTimeMs__Fv = .text:0x80261244; // type:function size:0x54 scope:global align:4 dTimer_show__Fv = .text:0x80261298; // type:function size:0x54 scope:global align:4 @@ -10018,20 +10018,20 @@ dTimer_hide__Fv = .text:0x802612EC; // type:function size:0x54 scope:global alig dTimer_isReadyFlag__Fv = .text:0x80261340; // type:function size:0x54 scope:global align:4 __dt__21dDlst_TimerScrnDraw_cFv = .text:0x80261394; // type:function size:0x48 scope:global align:4 createGetIn__8dTimer_cF4cXyz = .text:0x802613DC; // type:function size:0x40 scope:global align:4 -dkWmark_Create__FP12kankyo_class = .text:0x8026141C; // type:function size:0x224 scope:global align:4 +dkWmark_Create__FP12kankyo_class = .text:0x8026141C; // type:function size:0x224 scope:local align:4 __dt__9dkWmark_cFv = .text:0x80261640; // type:function size:0x5C scope:global align:4 -dkWmark_Delete__FP9dkWmark_c = .text:0x8026169C; // type:function size:0x28 scope:global align:4 +dkWmark_Delete__FP9dkWmark_c = .text:0x8026169C; // type:function size:0x28 scope:local align:4 setMatrix__9dkWmark_cFv = .text:0x802616C4; // type:function size:0x2A0 scope:global align:4 -dkWmark_Execute__FP9dkWmark_c = .text:0x80261964; // type:function size:0xB4 scope:global align:4 -dkWmark_Draw__FP9dkWmark_c = .text:0x80261A18; // type:function size:0x13C scope:global align:4 +dkWmark_Execute__FP9dkWmark_c = .text:0x80261964; // type:function size:0xB4 scope:local align:4 +dkWmark_Draw__FP9dkWmark_c = .text:0x80261A18; // type:function size:0x13C scope:local align:4 create__11dkWpillar_cFv = .text:0x80261B54; // type:function size:0x3B0 scope:global align:4 -dkWpillar_Create__FP12kankyo_class = .text:0x80261F04; // type:function size:0x20 scope:global align:4 +dkWpillar_Create__FP12kankyo_class = .text:0x80261F04; // type:function size:0x20 scope:local align:4 __dt__11dkWpillar_cFv = .text:0x80261F24; // type:function size:0xC8 scope:global align:4 -dkWpillar_Delete__FP11dkWpillar_c = .text:0x80261FEC; // type:function size:0x28 scope:global align:4 +dkWpillar_Delete__FP11dkWpillar_c = .text:0x80261FEC; // type:function size:0x28 scope:local align:4 execute__11dkWpillar_cFv = .text:0x80262014; // type:function size:0x94 scope:global align:4 -dkWpillar_Execute__FP11dkWpillar_c = .text:0x802620A8; // type:function size:0x20 scope:global align:4 +dkWpillar_Execute__FP11dkWpillar_c = .text:0x802620A8; // type:function size:0x20 scope:local align:4 draw__11dkWpillar_cFv = .text:0x802620C8; // type:function size:0xE4 scope:global align:4 -dkWpillar_Draw__FP11dkWpillar_c = .text:0x802621AC; // type:function size:0x20 scope:global align:4 +dkWpillar_Draw__FP11dkWpillar_c = .text:0x802621AC; // type:function size:0x20 scope:local align:4 __dt__24DynamicModuleControlBaseFv = .text:0x802621CC; // type:function size:0xB8 scope:global align:4 __ct__24DynamicModuleControlBaseFv = .text:0x80262284; // type:function size:0x4C scope:global align:4 link__24DynamicModuleControlBaseFv = .text:0x802622D0; // type:function size:0x94 scope:global align:4 @@ -10043,7 +10043,7 @@ __ct__20DynamicModuleControlFPCc = .text:0x80262660; // type:function size:0x70 mountCallback__20DynamicModuleControlFPv = .text:0x802626D0; // type:function size:0x8C scope:global align:4 initialize__20DynamicModuleControlFv = .text:0x8026275C; // type:function size:0x38 scope:global align:4 callback__20DynamicModuleControlFPv = .text:0x80262794; // type:function size:0x2C scope:global align:4 -calcSum2__FPCUsUl = .text:0x802627C0; // type:function size:0x28 scope:global align:4 +calcSum2__FPCUsUl = .text:0x802627C0; // type:function size:0x28 scope:local align:4 do_load__20DynamicModuleControlFv = .text:0x802627E8; // type:function size:0x314 scope:global align:4 do_load_async__20DynamicModuleControlFv = .text:0x80262AFC; // type:function size:0xC8 scope:global align:4 do_unload__20DynamicModuleControlFv = .text:0x80262BC4; // type:function size:0x48 scope:global align:4 @@ -10057,15 +10057,15 @@ ModuleEpilog = .text:0x8026308C; // type:function size:0x4 scope:global align:4 ModuleUnresolved = .text:0x80263090; // type:function size:0xBC scope:global align:4 ModuleConstructorsX = .text:0x8026314C; // type:function size:0x44 scope:global align:4 ModuleDestructorsX = .text:0x80263190; // type:function size:0x44 scope:global align:4 -do_link__24DynamicModuleControlBaseFv = .text:0x802631D4; // type:function size:0x8 scope:global align:4 -do_load__24DynamicModuleControlBaseFv = .text:0x802631DC; // type:function size:0x8 scope:global align:4 -do_unload__24DynamicModuleControlBaseFv = .text:0x802631E4; // type:function size:0x8 scope:global align:4 -do_unlink__24DynamicModuleControlBaseFv = .text:0x802631EC; // type:function size:0x8 scope:global align:4 -do_load_async__24DynamicModuleControlBaseFv = .text:0x802631F4; // type:function size:0x8 scope:global align:4 -dump2__24DynamicModuleControlBaseFv = .text:0x802631FC; // type:function size:0x4 scope:global align:4 -getModuleTypeString__24DynamicModuleControlBaseCFv = .text:0x80263200; // type:function size:0x10 scope:global align:4 -getModuleSize__24DynamicModuleControlBaseCFv = .text:0x80263210; // type:function size:0x8 scope:global align:4 -getModuleName__20DynamicModuleControlCFv = .text:0x80263218; // type:function size:0x8 scope:global align:4 +do_link__24DynamicModuleControlBaseFv = .text:0x802631D4; // type:function size:0x8 scope:weak align:4 +do_load__24DynamicModuleControlBaseFv = .text:0x802631DC; // type:function size:0x8 scope:weak align:4 +do_unload__24DynamicModuleControlBaseFv = .text:0x802631E4; // type:function size:0x8 scope:weak align:4 +do_unlink__24DynamicModuleControlBaseFv = .text:0x802631EC; // type:function size:0x8 scope:weak align:4 +do_load_async__24DynamicModuleControlBaseFv = .text:0x802631F4; // type:function size:0x8 scope:weak align:4 +dump2__24DynamicModuleControlBaseFv = .text:0x802631FC; // type:function size:0x4 scope:weak align:4 +getModuleTypeString__24DynamicModuleControlBaseCFv = .text:0x80263200; // type:function size:0x10 scope:weak align:4 +getModuleSize__24DynamicModuleControlBaseCFv = .text:0x80263210; // type:function size:0x8 scope:weak align:4 +getModuleName__20DynamicModuleControlCFv = .text:0x80263218; // type:function size:0x8 scope:weak align:4 init__3cMlFP7JKRHeap = .text:0x80263220; // type:function size:0x8 scope:global align:4 memalignB__3cMlFiUl = .text:0x80263228; // type:function size:0x38 scope:global align:4 free__3cMlFPv = .text:0x80263260; // type:function size:0x2C scope:global align:4 @@ -10139,16 +10139,16 @@ SetHit__10cCcD_ObjCoFP8cCcD_Obj = .text:0x802648D8; // type:function size:0x10 s ClrHit__10cCcD_ObjCoFv = .text:0x802648E8; // type:function size:0x18 scope:global align:4 SetIGrp__10cCcD_ObjCoFUl = .text:0x80264900; // type:function size:0x1C scope:global align:4 SetVsGrp__10cCcD_ObjCoFUl = .text:0x8026491C; // type:function size:0x1C scope:global align:4 -__dt__12cCcD_TriAttrFv = .text:0x80264938; // type:function size:0xA0 scope:global align:4 -CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz = .text:0x802649D8; // type:function size:0x8 scope:global align:4 -CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf = .text:0x802649E0; // type:function size:0x8 scope:global align:4 -ClrAt__9cCcD_SttsFv = .text:0x802649E8; // type:function size:0x4 scope:global align:4 -ClrTg__9cCcD_SttsFv = .text:0x802649EC; // type:function size:0xC scope:global align:4 +__dt__12cCcD_TriAttrFv = .text:0x80264938; // type:function size:0xA0 scope:weak align:4 +CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz = .text:0x802649D8; // type:function size:0x8 scope:weak align:4 +CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf = .text:0x802649E0; // type:function size:0x8 scope:weak align:4 +ClrAt__9cCcD_SttsFv = .text:0x802649E8; // type:function size:0x4 scope:weak align:4 +ClrTg__9cCcD_SttsFv = .text:0x802649EC; // type:function size:0xC scope:weak align:4 __sinit_c_cc_d_cpp = .text:0x802649F8; // type:function size:0x54 scope:local align:4 -@32@__dt__12cCcD_TriAttrFv = .text:0x80264A4C; // type:function size:0x8 scope:local align:4 -@32@__dt__12cCcD_CpsAttrFv = .text:0x80264A54; // type:function size:0x8 scope:local align:4 -@32@__dt__12cCcD_CylAttrFv = .text:0x80264A5C; // type:function size:0x8 scope:local align:4 -@32@__dt__12cCcD_SphAttrFv = .text:0x80264A64; // type:function size:0x8 scope:local align:4 +@32@__dt__12cCcD_TriAttrFv = .text:0x80264A4C; // type:function size:0x8 scope:weak align:4 +@32@__dt__12cCcD_CpsAttrFv = .text:0x80264A54; // type:function size:0x8 scope:weak align:4 +@32@__dt__12cCcD_CylAttrFv = .text:0x80264A5C; // type:function size:0x8 scope:weak align:4 +@32@__dt__12cCcD_SphAttrFv = .text:0x80264A64; // type:function size:0x8 scope:weak align:4 __ct__4cCcSFv = .text:0x80264A6C; // type:function size:0x28 scope:global align:4 Ct__4cCcSFv = .text:0x80264A94; // type:function size:0xCC scope:global align:4 Dt__4cCcSFv = .text:0x80264B60; // type:function size:0x20 scope:global align:4 @@ -10272,13 +10272,13 @@ __dt__11cBgS_GndChkFv = .text:0x80267C94; // type:function size:0x78 scope:globa SetPos__11cBgS_GndChkFPC3Vec = .text:0x80267D0C; // type:function size:0x1C scope:global align:4 SetPos__11cBgS_GndChkFPC4cXyz = .text:0x80267D28; // type:function size:0x1C scope:global align:4 PreCheck__11cBgS_GndChkFv = .text:0x80267D44; // type:function size:0x10 scope:global align:4 -@20@__dt__11cBgS_GndChkFv = .text:0x80267D54; // type:function size:0x8 scope:local align:4 +@20@__dt__11cBgS_GndChkFv = .text:0x80267D54; // type:function size:0x8 scope:weak align:4 __ct__11cBgS_LinChkFv = .text:0x80267D5C; // type:function size:0x60 scope:global align:4 __dt__11cBgS_LinChkFv = .text:0x80267DBC; // type:function size:0x8C scope:global align:4 ct__11cBgS_LinChkFv = .text:0x80267E48; // type:function size:0x88 scope:global align:4 Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi = .text:0x80267ED0; // type:function size:0x70 scope:global align:4 PreCalc__11cBgS_LinChkFv = .text:0x80267F40; // type:function size:0x40 scope:global align:4 -@20@__dt__11cBgS_LinChkFv = .text:0x80267F80; // type:function size:0x8 scope:local align:4 +@20@__dt__11cBgS_LinChkFv = .text:0x80267F80; // type:function size:0x8 scope:weak align:4 __ct__13cBgS_ShdwDrawFv = .text:0x80267F88; // type:function size:0x48 scope:global align:4 __dt__13cBgS_ShdwDrawFv = .text:0x80267FD0; // type:function size:0x78 scope:global align:4 Set__13cBgS_ShdwDrawFR4cXyzR4cXyz = .text:0x80268048; // type:function size:0x24 scope:global align:4 @@ -10299,7 +10299,7 @@ cBgW_CheckBGround__Ff = .text:0x802681E4; // type:function size:0x18 scope:globa cBgW_CheckBRoof__Ff = .text:0x802681FC; // type:function size:0x14 scope:global align:4 cBgW_CheckBWall__Ff = .text:0x80268210; // type:function size:0x50 scope:global align:4 cM2d_CrossCirLin__FR8cM2dGCirffffPfPf = .text:0x80268260; // type:function size:0x300 scope:global align:4 -cM3d_InDivPos1__FPC3VecPC3VecfP3Vec = .text:0x80268560; // type:function size:0x50 scope:global align:4 +cM3d_InDivPos1__FPC3VecPC3VecfP3Vec = .text:0x80268560; // type:function size:0x50 scope:local align:4 cM3d_InDivPos2__FPC3VecPC3VecfP3Vec = .text:0x802685B0; // type:function size:0x64 scope:global align:4 cM3d_Len2dSq__Fffff = .text:0x80268614; // type:function size:0x18 scope:global align:4 cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf = .text:0x8026862C; // type:function size:0xE4 scope:global align:4 @@ -10311,53 +10311,53 @@ cM3d_CalcPla__FPC3VecPC3VecPC3VecP3VecPf = .text:0x8026891C; // type:function si cM3d_Cross_AabAab__FPC8cM3dGAabPC8cM3dGAab = .text:0x802689E8; // type:function size:0x124 scope:global align:4 cM3d_Cross_AabCyl__FPC8cM3dGAabPC8cM3dGCyl = .text:0x80268B0C; // type:function size:0xA8 scope:global align:4 cM3d_Cross_AabSph__FPC8cM3dGAabPC8cM3dGSph = .text:0x80268BB4; // type:function size:0xA8 scope:global align:4 -cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf = .text:0x80268C5C; // type:function size:0x278 scope:global align:4 -cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec = .text:0x80268ED4; // type:function size:0x60 scope:global align:4 +cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf = .text:0x80268C5C; // type:function size:0x278 scope:local align:4 +cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec = .text:0x80268ED4; // type:function size:0x60 scope:local align:4 cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb = .text:0x80268F34; // type:function size:0x11C scope:global align:4 cM3d_Cross_MinMaxBoxLine__FPC3VecPC3VecPC3VecPC3Vec = .text:0x80269050; // type:function size:0xBDC scope:global align:4 -cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf = .text:0x80269C2C; // type:function size:0x138 scope:global align:4 -cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff = .text:0x80269D64; // type:function size:0xB4 scope:global align:4 -cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf = .text:0x80269E18; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec = .text:0x80269FBC; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026A160; // type:function size:0x184 scope:global align:4 +cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf = .text:0x80269C2C; // type:function size:0x138 scope:local align:4 +cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff = .text:0x80269D64; // type:function size:0xB4 scope:local align:4 +cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf = .text:0x80269E18; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec = .text:0x80269FBC; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026A160; // type:function size:0x184 scope:local align:4 cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026A2E4; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026A488; // type:function size:0x184 scope:global align:4 +cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026A488; // type:function size:0x184 scope:local align:4 cM3d_CrossY_Tri__FRC3VecRC3VecRC3VecRC8cM3dGPlaPC3Vec = .text:0x8026A60C; // type:function size:0x1AC scope:global align:4 cM3d_CrossY_Tri_Front__FRC3VecRC3VecRC3VecPC3Vec = .text:0x8026A7B8; // type:function size:0x108 scope:global align:4 -cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf = .text:0x8026A8C0; // type:function size:0x84 scope:global align:4 -cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026A944; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf = .text:0x8026AAE8; // type:function size:0xF0 scope:global align:4 -cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026ABD8; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026AD7C; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026AF20; // type:function size:0x184 scope:global align:4 +cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf = .text:0x8026A8C0; // type:function size:0x84 scope:local align:4 +cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026A944; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf = .text:0x8026AAE8; // type:function size:0xF0 scope:local align:4 +cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026ABD8; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026AD7C; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026AF20; // type:function size:0x184 scope:local align:4 cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb = .text:0x8026B0A4; // type:function size:0xD8 scope:global align:4 -cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec = .text:0x8026B17C; // type:function size:0xBC scope:global align:4 -cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec = .text:0x8026B238; // type:function size:0x48 scope:global align:4 +cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec = .text:0x8026B17C; // type:function size:0xBC scope:local align:4 +cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec = .text:0x8026B238; // type:function size:0x48 scope:local align:4 cM3d_Cross_LinSph__FPC8cM3dGLinPC8cM3dGSphP3Vec = .text:0x8026B280; // type:function size:0x268 scope:global align:4 cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec = .text:0x8026B4E8; // type:function size:0x3BC scope:global align:4 cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf = .text:0x8026B8A4; // type:function size:0x1A4 scope:global align:4 cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf = .text:0x8026BA48; // type:function size:0x234 scope:global align:4 cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf = .text:0x8026BC7C; // type:function size:0x80 scope:global align:4 -cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf = .text:0x8026BCFC; // type:function size:0x8C scope:global align:4 +cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf = .text:0x8026BCFC; // type:function size:0x8C scope:local align:4 cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphP3Vec = .text:0x8026BD88; // type:function size:0xD4 scope:global align:4 -cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec = .text:0x8026BE5C; // type:function size:0xA8 scope:global align:4 +cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec = .text:0x8026BE5C; // type:function size:0xA8 scope:local align:4 cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec = .text:0x8026BF04; // type:function size:0x328 scope:global align:4 cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf = .text:0x8026C22C; // type:function size:0x188 scope:global align:4 cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylP3Vec = .text:0x8026C3B4; // type:function size:0x21C scope:global align:4 cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec = .text:0x8026C5D0; // type:function size:0x374 scope:global align:4 cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec = .text:0x8026C944; // type:function size:0x700 scope:global align:4 -cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec = .text:0x8026D044; // type:function size:0x6C scope:global align:4 -cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec = .text:0x8026D0B0; // type:function size:0x64 scope:global align:4 +cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec = .text:0x8026D044; // type:function size:0x6C scope:local align:4 +cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec = .text:0x8026D0B0; // type:function size:0x64 scope:local align:4 cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec = .text:0x8026D114; // type:function size:0x2C0 scope:global align:4 cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec = .text:0x8026D3D4; // type:function size:0x70C scope:global align:4 -cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec = .text:0x8026DAE0; // type:function size:0x15C scope:global align:4 +cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec = .text:0x8026DAE0; // type:function size:0x15C scope:local align:4 cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec = .text:0x8026DC3C; // type:function size:0x1F0 scope:global align:4 cM3d_Cross_TriTri__FRC8cM3dGTriRC8cM3dGTriP3Vec = .text:0x8026DE2C; // type:function size:0x300 scope:global align:4 cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec = .text:0x8026E12C; // type:function size:0x3D0 scope:global align:4 cM3d_CalcVecAngle__FRC3VecPsPs = .text:0x8026E4FC; // type:function size:0x74 scope:global align:4 cM3d_CalcVecZAngle__FRC3VecP5csXyz = .text:0x8026E570; // type:function size:0x154 scope:global align:4 -cM3d_PlaneCrossLineProcWork__FfffffffPfPf = .text:0x8026E6C4; // type:function size:0x2C scope:global align:4 -cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin = .text:0x8026E6F0; // type:function size:0x1B0 scope:global align:4 +cM3d_PlaneCrossLineProcWork__FfffffffPfPf = .text:0x8026E6C4; // type:function size:0x2C scope:local align:4 +cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin = .text:0x8026E6F0; // type:function size:0x1B0 scope:local align:4 cM3d_3PlaneCrossPos__FRC8cM3dGPlaRC8cM3dGPlaRC8cM3dGPlaP3Vec = .text:0x8026E8A0; // type:function size:0xE0 scope:global align:4 cM3d_lineVsPosSuisenCross__FPC8cM3dGLinPC3VecP3Vec = .text:0x8026E980; // type:function size:0xDC scope:global align:4 cM3d_lineVsPosSuisenCross__FRC3VecRC3VecRC3VecP3Vec = .text:0x8026EA5C; // type:function size:0xDC scope:global align:4 @@ -10376,7 +10376,7 @@ SetMax__8cM3dGAabFRC4cXyz = .text:0x8026EDE4; // type:function size:0x40 scope:g CalcCenter__8cM3dGAabCFP4cXyz = .text:0x8026EE24; // type:function size:0x44 scope:global align:4 PlusR__8cM3dGAabFf = .text:0x8026EE68; // type:function size:0x4C scope:global align:4 __ct__8cM3dGCirFv = .text:0x8026EEB4; // type:function size:0x1C scope:global align:4 -__dt__8cM2dGCirFv = .text:0x8026EED0; // type:function size:0x48 scope:global align:4 +__dt__8cM2dGCirFv = .text:0x8026EED0; // type:function size:0x48 scope:weak align:4 __dt__8cM3dGCirFv = .text:0x8026EF18; // type:function size:0x5C scope:global align:4 Set__8cM3dGCirFffff = .text:0x8026EF74; // type:function size:0x14 scope:global align:4 __ct__8cM3dGCpsFv = .text:0x8026EF88; // type:function size:0x1C scope:global align:4 @@ -10495,7 +10495,7 @@ Xyz__7cSGlobeCFv = .text:0x80271AB4; // type:function size:0x40 scope:global ali Polar__7cSGlobeCFP7cSPolar = .text:0x80271AF4; // type:function size:0x3C scope:global align:4 Norm__7cSGlobeCFv = .text:0x80271B30; // type:function size:0x4C scope:global align:4 Invert__7cSGlobeFv = .text:0x80271B7C; // type:function size:0x2C scope:global align:4 -Adjust__6cAngleFfff = .text:0x80271BA8; // type:function size:0x2C scope:global align:4 +Adjust__6cAngleFfff = .text:0x80271BA8; // type:function size:0x2C scope:weak align:4 __sinit_c_angle_cpp = .text:0x80271BD4; // type:function size:0xB8 scope:local align:4 sBs_FillArea_s__FPvUls = .text:0x80271C8C; // type:function size:0x20 scope:global align:4 sBs_ClearArea__FPvUl = .text:0x80271CAC; // type:function size:0x24 scope:global align:4 @@ -10505,7 +10505,7 @@ ctor_subroutine__10JFWDisplayFb = .text:0x80272040; // type:function size:0xB8 s __ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb = .text:0x802720F8; // type:function size:0x68 scope:global align:4 __dt__10JFWDisplayFv = .text:0x80272160; // type:function size:0x7C scope:global align:4 createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb = .text:0x802721DC; // type:function size:0x84 scope:global align:4 -callDirectDraw__Fv = .text:0x80272260; // type:function size:0x58 scope:global align:4 +callDirectDraw__Fv = .text:0x80272260; // type:function size:0x58 scope:local align:4 prepareCopyDisp__10JFWDisplayFv = .text:0x802722B8; // type:function size:0xF4 scope:global align:4 drawendXfb_single__10JFWDisplayFv = .text:0x802723AC; // type:function size:0x48 scope:global align:4 exchangeXfb_double__10JFWDisplayFv = .text:0x802723F4; // type:function size:0x108 scope:global align:4 @@ -10517,24 +10517,24 @@ beginRender__10JFWDisplayFv = .text:0x80272798; // type:function size:0x26C scop endRender__10JFWDisplayFv = .text:0x80272A04; // type:function size:0xAC scope:global align:4 endFrame__10JFWDisplayFv = .text:0x80272AB0; // type:function size:0x1B0 scope:global align:4 waitBlanking__10JFWDisplayFi = .text:0x80272C60; // type:function size:0x50 scope:global align:4 -waitForTick__FUlUs = .text:0x80272CB0; // type:function size:0x120 scope:global align:4 -JFWThreadAlarmHandler__FP7OSAlarmP9OSContext = .text:0x80272DD0; // type:function size:0x40 scope:global align:4 +waitForTick__FUlUs = .text:0x80272CB0; // type:function size:0x120 scope:local align:4 +JFWThreadAlarmHandler__FP7OSAlarmP9OSContext = .text:0x80272DD0; // type:function size:0x40 scope:local align:4 threadSleep__10JFWDisplayFx = .text:0x80272E10; // type:function size:0xA8 scope:global align:4 clearEfb_init__10JFWDisplayFv = .text:0x80272EB8; // type:function size:0x74 scope:global align:4 clearEfb__10JFWDisplayFv = .text:0x80272F2C; // type:function size:0x2C scope:global align:4 clearEfb__10JFWDisplayF8_GXColor = .text:0x80272F58; // type:function size:0x44 scope:global align:4 clearEfb__10JFWDisplayFiiii8_GXColor = .text:0x80272F9C; // type:function size:0x380 scope:global align:4 calcCombinationRatio__10JFWDisplayFv = .text:0x8027331C; // type:function size:0x8C scope:global align:4 -JFWDrawDoneAlarm__Fv = .text:0x802733A8; // type:function size:0xDC scope:global align:4 -JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext = .text:0x80273484; // type:function size:0x78 scope:global align:4 -diagnoseGpHang__Fv = .text:0x802734FC; // type:function size:0x1E0 scope:global align:4 +JFWDrawDoneAlarm__Fv = .text:0x802733A8; // type:function size:0xDC scope:local align:4 +JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext = .text:0x80273484; // type:function size:0x78 scope:local align:4 +diagnoseGpHang__Fv = .text:0x802734FC; // type:function size:0x1E0 scope:local align:4 __sinit_JFWDisplay_cpp = .text:0x802736DC; // type:function size:0x48 scope:local align:4 -__dt__18JSUList<8JFWAlarm>Fv = .text:0x80273724; // type:function size:0x54 scope:global align:4 +__dt__18JSUList<8JFWAlarm>Fv = .text:0x80273724; // type:function size:0x54 scope:weak align:4 init__11J3DUClipperFv = .text:0x80273778; // type:function size:0x14 scope:global align:4 calcViewFrustum__11J3DUClipperFv = .text:0x8027378C; // type:function size:0x170 scope:global align:4 clip__11J3DUClipperCFPA4_Cf3Vecf = .text:0x802738FC; // type:function size:0x148 scope:global align:4 clip__11J3DUClipperCFPA4_CfP3VecP3Vec = .text:0x80273A44; // type:function size:0x3C4 scope:global align:4 -getUseMtxNum__11J3DShapeMtxCFv = .text:0x80273E08; // type:function size:0x8 scope:global align:4 +getUseMtxNum__11J3DShapeMtxCFv = .text:0x80273E08; // type:function size:0x8 scope:weak align:4 __ct__18JPAResourceManagerFPCvP7JKRHeap = .text:0x80273E10; // type:function size:0x58 scope:global align:4 getResource__18JPAResourceManagerCFUs = .text:0x80273E68; // type:function size:0x40 scope:global align:4 checkUserIndexDuplication__18JPAResourceManagerCFUs = .text:0x80273EA8; // type:function size:0x44 scope:global align:4 @@ -10556,7 +10556,7 @@ calcField__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80276 calcKey__11JPAResourceFP18JPAEmitterWorkData = .text:0x80276700; // type:function size:0x140 scope:global align:4 calcWorkData_c__11JPAResourceFP18JPAEmitterWorkData = .text:0x80276840; // type:function size:0x1CC scope:global align:4 calcWorkData_d__11JPAResourceFP18JPAEmitterWorkData = .text:0x80276A0C; // type:function size:0x80 scope:global align:4 -prepare__12JPAFieldBaseFP18JPAEmitterWorkDataP13JPAFieldBlock = .text:0x80276A8C; // type:function size:0x4 scope:global align:4 +prepare__12JPAFieldBaseFP18JPAEmitterWorkDataP13JPAFieldBlock = .text:0x80276A8C; // type:function size:0x4 scope:weak align:4 JPASetPointSize__FP18JPAEmitterWorkData = .text:0x80276A90; // type:function size:0x3C scope:global align:4 JPASetLineWidth__FP18JPAEmitterWorkData = .text:0x80276ACC; // type:function size:0x3C scope:global align:4 JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80276B08; // type:function size:0x44 scope:global align:4 @@ -10603,9 +10603,9 @@ JPACalcTexIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80277B94; JPACalcTexIdxRandom__FP18JPAEmitterWorkData = .text:0x80277C0C; // type:function size:0x1C scope:global align:4 JPACalcTexIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80277C28; // type:function size:0x3C scope:global align:4 JPALoadPosMtxCam__FP18JPAEmitterWorkData = .text:0x80277C64; // type:function size:0x28 scope:global align:4 -noLoadPrj__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x80277C8C; // type:function size:0x4 scope:global align:4 +noLoadPrj__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x80277C8C; // type:function size:0x4 scope:local align:4 loadPrj__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x80277C90; // type:function size:0x38 scope:global align:4 -loadPrjAnm__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x80277CC8; // type:function size:0x1C0 scope:global align:4 +loadPrjAnm__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x80277CC8; // type:function size:0x1C0 scope:local align:4 JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80277E88; // type:function size:0xE8 scope:global align:4 JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80277F70; // type:function size:0x118 scope:global align:4 JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80278088; // type:function size:0xFC scope:global align:4 @@ -10615,13 +10615,13 @@ dirTypePos__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = . dirTypePosInv__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = .text:0x802782EC; // type:function size:0x34 scope:global align:4 dirTypeEmtrDir__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = .text:0x80278320; // type:function size:0x1C scope:global align:4 dirTypePrevPtcl__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = .text:0x8027833C; // type:function size:0x98 scope:global align:4 -rotTypeY__FffRA3_A4_f = .text:0x802783D4; // type:function size:0x40 scope:global align:4 -rotTypeX__FffRA3_A4_f = .text:0x80278414; // type:function size:0x40 scope:global align:4 -rotTypeZ__FffRA3_A4_f = .text:0x80278454; // type:function size:0x40 scope:global align:4 -rotTypeXYZ__FffRA3_A4_f = .text:0x80278494; // type:function size:0x5C scope:global align:4 -basePlaneTypeXY__FPA4_fff = .text:0x802784F0; // type:function size:0x4C scope:global align:4 -basePlaneTypeXZ__FPA4_fff = .text:0x8027853C; // type:function size:0x4C scope:global align:4 -basePlaneTypeX__FPA4_fff = .text:0x80278588; // type:function size:0x70 scope:global align:4 +rotTypeY__FffRA3_A4_f = .text:0x802783D4; // type:function size:0x40 scope:local align:4 +rotTypeX__FffRA3_A4_f = .text:0x80278414; // type:function size:0x40 scope:local align:4 +rotTypeZ__FffRA3_A4_f = .text:0x80278454; // type:function size:0x40 scope:local align:4 +rotTypeXYZ__FffRA3_A4_f = .text:0x80278494; // type:function size:0x5C scope:local align:4 +basePlaneTypeXY__FPA4_fff = .text:0x802784F0; // type:function size:0x4C scope:local align:4 +basePlaneTypeXZ__FPA4_fff = .text:0x8027853C; // type:function size:0x4C scope:local align:4 +basePlaneTypeX__FPA4_fff = .text:0x80278588; // type:function size:0x70 scope:local align:4 JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x802785F8; // type:function size:0x39C scope:global align:4 JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80278994; // type:function size:0x414 scope:global align:4 JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80278DA8; // type:function size:0x220 scope:global align:4 @@ -10634,7 +10634,7 @@ JPADrawStripe__FP18JPAEmitterWorkData = .text:0x80279374; // type:function size: JPADrawStripeX__FP18JPAEmitterWorkData = .text:0x8027996C; // type:function size:0xA6C scope:global align:4 JPADrawEmitterCallBackB__FP18JPAEmitterWorkData = .text:0x8027A3D8; // type:function size:0x3C scope:global align:4 JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027A414; // type:function size:0x40 scope:global align:4 -makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap = .text:0x8027A454; // type:function size:0x288 scope:global align:4 +makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap = .text:0x8027A454; // type:function size:0x288 scope:local align:4 __ct__12JPABaseShapeFPCUcP7JKRHeap = .text:0x8027A6DC; // type:function size:0x10C scope:global align:4 setGX__12JPABaseShapeCFP18JPAEmitterWorkData = .text:0x8027A7E8; // type:function size:0x130 scope:global align:4 JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027A918; // type:function size:0x78 scope:global align:4 @@ -10659,9 +10659,9 @@ JPAVolumePoint__FP18JPAEmitterWorkData = .text:0x8027B144; // type:function size JPAVolumeLine__FP18JPAEmitterWorkData = .text:0x8027B220; // type:function size:0x11C scope:global align:4 JPAVolumeCircle__FP18JPAEmitterWorkData = .text:0x8027B33C; // type:function size:0x1AC scope:global align:4 JPAVolumeCube__FP18JPAEmitterWorkData = .text:0x8027B4E8; // type:function size:0x108 scope:global align:4 -JPAVolumeSphere__FP18JPAEmitterWorkData = .text:0x8027B5F0; // type:function size:0x28C scope:global align:4 -JPAVolumeCylinder__FP18JPAEmitterWorkData = .text:0x8027B87C; // type:function size:0x17C scope:global align:4 -JPAVolumeTorus__FP18JPAEmitterWorkData = .text:0x8027B9F8; // type:function size:0x120 scope:global align:4 +JPAVolumeSphere__FP18JPAEmitterWorkData = .text:0x8027B5F0; // type:function size:0x28C scope:local align:4 +JPAVolumeCylinder__FP18JPAEmitterWorkData = .text:0x8027B87C; // type:function size:0x17C scope:local align:4 +JPAVolumeTorus__FP18JPAEmitterWorkData = .text:0x8027B9F8; // type:function size:0x120 scope:local align:4 __ct__16JPADynamicsBlockFPCUc = .text:0x8027BB18; // type:function size:0x34 scope:global align:4 init__16JPADynamicsBlockFv = .text:0x8027BB4C; // type:function size:0x9C scope:global align:4 create__16JPADynamicsBlockFP18JPAEmitterWorkData = .text:0x8027BBE8; // type:function size:0x204 scope:global align:4 @@ -10685,16 +10685,16 @@ prepare__12JPAFieldSpinFP18JPAEmitterWorkDataP13JPAFieldBlock = .text:0x8027CE64 calc__12JPAFieldSpinFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle = .text:0x8027CFA8; // type:function size:0xE0 scope:global align:4 __ct__13JPAFieldBlockFPCUcP7JKRHeap = .text:0x8027D088; // type:function size:0x38 scope:global align:4 init__13JPAFieldBlockFP7JKRHeap = .text:0x8027D0C0; // type:function size:0x2EC scope:global align:4 -__dt__12JPAFieldBaseFv = .text:0x8027D3AC; // type:function size:0x48 scope:global align:4 -__dt__12JPAFieldSpinFv = .text:0x8027D3F4; // type:function size:0x5C scope:global align:4 -__dt__12JPAFieldDragFv = .text:0x8027D450; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldRandomFv = .text:0x8027D4AC; // type:function size:0x5C scope:global align:4 -__dt__18JPAFieldConvectionFv = .text:0x8027D508; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldVortexFv = .text:0x8027D564; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldNewtonFv = .text:0x8027D5C0; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldMagnetFv = .text:0x8027D61C; // type:function size:0x5C scope:global align:4 -__dt__11JPAFieldAirFv = .text:0x8027D678; // type:function size:0x5C scope:global align:4 -__dt__15JPAFieldGravityFv = .text:0x8027D6D4; // type:function size:0x5C scope:global align:4 +__dt__12JPAFieldBaseFv = .text:0x8027D3AC; // type:function size:0x48 scope:weak align:4 +__dt__12JPAFieldSpinFv = .text:0x8027D3F4; // type:function size:0x5C scope:weak align:4 +__dt__12JPAFieldDragFv = .text:0x8027D450; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldRandomFv = .text:0x8027D4AC; // type:function size:0x5C scope:weak align:4 +__dt__18JPAFieldConvectionFv = .text:0x8027D508; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldVortexFv = .text:0x8027D564; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldNewtonFv = .text:0x8027D5C0; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldMagnetFv = .text:0x8027D61C; // type:function size:0x5C scope:weak align:4 +__dt__11JPAFieldAirFv = .text:0x8027D678; // type:function size:0x5C scope:weak align:4 +__dt__15JPAFieldGravityFv = .text:0x8027D6D4; // type:function size:0x5C scope:weak align:4 __ct__11JPAKeyBlockFPCUc = .text:0x8027D730; // type:function size:0x10 scope:global align:4 calc__11JPAKeyBlockFf = .text:0x8027D740; // type:function size:0x94 scope:global align:4 __ct__10JPATextureFPCUc = .text:0x8027D7D4; // type:function size:0x68 scope:global align:4 @@ -10711,12 +10711,12 @@ forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter = .text:0x8027E2D8; // entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc = .text:0x8027E344; // type:function size:0x10 scope:global align:4 clearResourceManager__17JPAEmitterManagerFUc = .text:0x8027E354; // type:function size:0xA0 scope:global align:4 calcYBBCam__17JPAEmitterManagerFv = .text:0x8027E3F4; // type:function size:0x128 scope:global align:4 -__ct__25JSUList<14JPABaseEmitter>Fv = .text:0x8027E51C; // type:function size:0x30 scope:global align:4 -__dt__26JPANode<15JPABaseParticle>Fv = .text:0x8027E54C; // type:function size:0x3C scope:global align:4 -__ct__26JPANode<15JPABaseParticle>Fv = .text:0x8027E588; // type:function size:0x10 scope:global align:4 -__dt__25JSUList<14JPABaseEmitter>Fv = .text:0x8027E598; // type:function size:0x54 scope:global align:4 -__dt__14JPABaseEmitterFv = .text:0x8027E5EC; // type:function size:0x60 scope:global align:4 -__ct__14JPABaseEmitterFv = .text:0x8027E64C; // type:function size:0x58 scope:global align:4 +__ct__25JSUList<14JPABaseEmitter>Fv = .text:0x8027E51C; // type:function size:0x30 scope:weak align:4 +__dt__26JPANode<15JPABaseParticle>Fv = .text:0x8027E54C; // type:function size:0x3C scope:weak align:4 +__ct__26JPANode<15JPABaseParticle>Fv = .text:0x8027E588; // type:function size:0x10 scope:weak align:4 +__dt__25JSUList<14JPABaseEmitter>Fv = .text:0x8027E598; // type:function size:0x54 scope:weak align:4 +__dt__14JPABaseEmitterFv = .text:0x8027E5EC; // type:function size:0x60 scope:weak align:4 +__ct__14JPABaseEmitterFv = .text:0x8027E64C; // type:function size:0x58 scope:weak align:4 __dt__18JPAEmitterCallBackFv = .text:0x8027E6A4; // type:function size:0x48 scope:global align:4 init__14JPABaseEmitterFP17JPAEmitterManagerP11JPAResource = .text:0x8027E6EC; // type:function size:0x354 scope:global align:4 createParticle__14JPABaseEmitterFv = .text:0x8027EA40; // type:function size:0x120 scope:global align:4 @@ -10853,8 +10853,8 @@ __ct__Q37JStudio3ctb6TParseFPQ37JStudio3ctb8TControl = .text:0x8028135C; // type __dt__Q37JStudio3ctb6TParseFv = .text:0x8028137C; // type:function size:0x60 scope:global align:4 parseHeader_next__Q37JStudio3ctb6TParseFPPCvPUlUl = .text:0x802813DC; // type:function size:0x94 scope:global align:4 parseBlock_next__Q37JStudio3ctb6TParseFPPCvPUlUl = .text:0x80281470; // type:function size:0xE4 scope:global align:4 -__dt__Q37JStudio3ctb14TObject_TxyzRyFv = .text:0x80281554; // type:function size:0x60 scope:global align:4 -find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x802815B4; // type:function size:0x94 scope:global align:4 +__dt__Q37JStudio3ctb14TObject_TxyzRyFv = .text:0x80281554; // type:function size:0x60 scope:weak align:4 +find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x802815B4; // type:function size:0x94 scope:weak align:4 toFunction_outside__Q27JStudio14TFunctionValueFi = .text:0x80281648; // type:function size:0x48 scope:global align:4 __ct__Q27JStudio14TFunctionValueFv = .text:0x80281690; // type:function size:0x10 scope:global align:4 __dt__Q27JStudio14TFunctionValueFv = .text:0x802816A0; // type:function size:0x48 scope:global align:4 @@ -10921,31 +10921,31 @@ data_set__Q27JStudio22TFunctionValue_hermiteFPCfUlUl = .text:0x8028336C; // type initialize__Q27JStudio22TFunctionValue_hermiteFv = .text:0x802833BC; // type:function size:0x6C scope:global align:4 prepare__Q27JStudio22TFunctionValue_hermiteFv = .text:0x80283428; // type:function size:0x24 scope:global align:4 getValue__Q27JStudio22TFunctionValue_hermiteFd = .text:0x8028344C; // type:function size:0x124 scope:global align:4 -extrapolateParameter_raw__Q27JStudio13functionvalueFdd = .text:0x80283570; // type:function size:0x4 scope:global align:4 -extrapolateParameter_repeat__Q27JStudio13functionvalueFdd = .text:0x80283574; // type:function size:0x3C scope:global align:4 -extrapolateParameter_clamp__Q27JStudio13functionvalueFdd = .text:0x802835B0; // type:function size:0x2C scope:global align:4 -findUpperBound_binary_current__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCd = .text:0x802835DC; // type:function size:0x58 scope:global align:4 -findUpperBound_binary_current>__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80283634; // type:function size:0x224 scope:global align:4 -findUpperBound_binary_current__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCd = .text:0x80283858; // type:function size:0x70 scope:global align:4 -findUpperBound_binary_current>__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x802838C8; // type:function size:0x2FC scope:global align:4 -__dt__Q27JStudio22TFunctionValue_hermiteFv = .text:0x80283BC4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio29TFunctionValue_list_parameterFv = .text:0x80283C24; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio19TFunctionValue_listFv = .text:0x80283C84; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio25TFunctionValue_transitionFv = .text:0x80283CE4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio23TFunctionValue_constantFv = .text:0x80283D44; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio24TFunctionValue_compositeFv = .text:0x80283DA4; // type:function size:0x80 scope:global align:4 -upper_bound>__3stdFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80283E24; // type:function size:0x94 scope:global align:4 -upper_bound>__3stdFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x80283EB8; // type:function size:0xC8 scope:global align:4 +extrapolateParameter_raw__Q27JStudio13functionvalueFdd = .text:0x80283570; // type:function size:0x4 scope:weak align:4 +extrapolateParameter_repeat__Q27JStudio13functionvalueFdd = .text:0x80283574; // type:function size:0x3C scope:weak align:4 +extrapolateParameter_clamp__Q27JStudio13functionvalueFdd = .text:0x802835B0; // type:function size:0x2C scope:weak align:4 +findUpperBound_binary_current__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCd = .text:0x802835DC; // type:function size:0x58 scope:local align:4 +findUpperBound_binary_current>__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80283634; // type:function size:0x224 scope:local align:4 +findUpperBound_binary_current__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCd = .text:0x80283858; // type:function size:0x70 scope:local align:4 +findUpperBound_binary_current>__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x802838C8; // type:function size:0x2FC scope:local align:4 +__dt__Q27JStudio22TFunctionValue_hermiteFv = .text:0x80283BC4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio29TFunctionValue_list_parameterFv = .text:0x80283C24; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio19TFunctionValue_listFv = .text:0x80283C84; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio25TFunctionValue_transitionFv = .text:0x80283CE4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio23TFunctionValue_constantFv = .text:0x80283D44; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio24TFunctionValue_compositeFv = .text:0x80283DA4; // type:function size:0x80 scope:weak align:4 +upper_bound>__3stdFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80283E24; // type:function size:0x94 scope:weak align:4 +upper_bound>__3stdFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x80283EB8; // type:function size:0xC8 scope:weak align:4 __dt__Q37JStudio3fvb7TObjectFv = .text:0x80283F80; // type:function size:0x48 scope:global align:4 prepare__Q37JStudio3fvb7TObjectFRCQ47JStudio3fvb4data13TParse_TBlockPQ37JStudio3fvb8TControl = .text:0x80283FC8; // type:function size:0x224 scope:global align:4 -getCompositeData_raw___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x802841EC; // type:function size:0xC scope:global align:4 -getCompositeData_index___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x802841F8; // type:function size:0xC scope:global align:4 -getCompositeData_parameter___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284204; // type:function size:0xC scope:global align:4 -getCompositeData_add___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284210; // type:function size:0xC scope:global align:4 -getCompositeData_subtract___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x8028421C; // type:function size:0xC scope:global align:4 -getCompositeData_multiply___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284228; // type:function size:0xC scope:global align:4 -getCompositeData_divide___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284234; // type:function size:0xC scope:global align:4 -getCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@FQ47JStudio3fvb4data11TEComposite = .text:0x80284240; // type:function size:0x14 scope:global align:4 +getCompositeData_raw___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x802841EC; // type:function size:0xC scope:local align:4 +getCompositeData_index___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x802841F8; // type:function size:0xC scope:local align:4 +getCompositeData_parameter___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284204; // type:function size:0xC scope:local align:4 +getCompositeData_add___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284210; // type:function size:0xC scope:local align:4 +getCompositeData_subtract___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x8028421C; // type:function size:0xC scope:local align:4 +getCompositeData_multiply___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284228; // type:function size:0xC scope:local align:4 +getCompositeData_divide___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284234; // type:function size:0xC scope:local align:4 +getCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@FQ47JStudio3fvb4data11TEComposite = .text:0x80284240; // type:function size:0x14 scope:local align:4 __ct__Q37JStudio3fvb17TObject_compositeFRCQ47JStudio3fvb4data13TParse_TBlock = .text:0x80284254; // type:function size:0x80 scope:global align:4 prepare_data___Q37JStudio3fvb17TObject_compositeFRCQ57JStudio3fvb4data17TParse_TParagraph5TDataPQ37JStudio3fvb8TControl = .text:0x802842D4; // type:function size:0x64 scope:global align:4 __ct__Q37JStudio3fvb16TObject_constantFRCQ47JStudio3fvb4data13TParse_TBlock = .text:0x80284338; // type:function size:0x80 scope:global align:4 @@ -10973,13 +10973,13 @@ __ct__Q37JStudio3fvb6TParseFPQ37JStudio3fvb8TControl = .text:0x80284ADC; // type __dt__Q37JStudio3fvb6TParseFv = .text:0x80284AFC; // type:function size:0x60 scope:global align:4 parseHeader_next__Q37JStudio3fvb6TParseFPPCvPUlUl = .text:0x80284B5C; // type:function size:0x94 scope:global align:4 parseBlock_next__Q37JStudio3fvb6TParseFPPCvPUlUl = .text:0x80284BF0; // type:function size:0xF4 scope:global align:4 -__dt__Q37JStudio3fvb15TObject_hermiteFv = .text:0x80284CE4; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb22TObject_list_parameterFv = .text:0x80284D68; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb12TObject_listFv = .text:0x80284DEC; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb18TObject_transitionFv = .text:0x80284E70; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb16TObject_constantFv = .text:0x80284EF4; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb17TObject_compositeFv = .text:0x80284F78; // type:function size:0xA0 scope:global align:4 -find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x80285018; // type:function size:0x94 scope:global align:4 +__dt__Q37JStudio3fvb15TObject_hermiteFv = .text:0x80284CE4; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb22TObject_list_parameterFv = .text:0x80284D68; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb12TObject_listFv = .text:0x80284DEC; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb18TObject_transitionFv = .text:0x80284E70; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb16TObject_constantFv = .text:0x80284EF4; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb17TObject_compositeFv = .text:0x80284F78; // type:function size:0xA0 scope:weak align:4 +find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x80285018; // type:function size:0x94 scope:weak align:4 getData__Q47JStudio3fvb4data17TParse_TParagraphCFPQ57JStudio3fvb4data17TParse_TParagraph5TData = .text:0x802850AC; // type:function size:0x68 scope:global align:4 __ct__Q27JStudio8TControlFv = .text:0x80285114; // type:function size:0x98 scope:global align:4 __dt__Q27JStudio8TControlFv = .text:0x802851AC; // type:function size:0x7C scope:global align:4 @@ -11058,25 +11058,25 @@ do_paragraph__Q27JStudio16TObject_particleFUlPCvUl = .text:0x802877A8; // type:f __dt__Q27JStudio14TAdaptor_soundFv = .text:0x80287B3C; // type:function size:0x60 scope:global align:4 __ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound = .text:0x80287B9C; // type:function size:0x3C scope:global align:4 do_paragraph__Q27JStudio13TObject_soundFUlPCvUl = .text:0x80287BD8; // type:function size:0x32C scope:global align:4 -__dt__Q27JStudio13TObject_soundFv = .text:0x80287F04; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio16TObject_particleFv = .text:0x80287F64; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio15TObject_messageFv = .text:0x80287FC4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio13TObject_lightFv = .text:0x80288024; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio11TObject_fogFv = .text:0x80288084; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio14TObject_cameraFv = .text:0x802880E4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio20TObject_ambientLightFv = .text:0x80288144; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio13TObject_actorFv = .text:0x802881A4; // type:function size:0x60 scope:global align:4 +__dt__Q27JStudio13TObject_soundFv = .text:0x80287F04; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio16TObject_particleFv = .text:0x80287F64; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio15TObject_messageFv = .text:0x80287FC4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio13TObject_lightFv = .text:0x80288024; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio11TObject_fogFv = .text:0x80288084; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio14TObject_cameraFv = .text:0x802880E4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio20TObject_ambientLightFv = .text:0x80288144; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio13TObject_actorFv = .text:0x802881A4; // type:function size:0x60 scope:weak align:4 __sinit_jstudio-object_cpp = .text:0x80288204; // type:function size:0x3D8 scope:local align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x802885DC; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_Fv = .text:0x8028863C; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028869C; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_Fv = .text:0x802886FC; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028875C; // type:function size:0x60 scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x802887BC; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x80288818; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x80288874; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x802888D0; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028892C; // type:function size:0x5C scope:global align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x802885DC; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_Fv = .text:0x8028863C; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028869C; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_Fv = .text:0x802886FC; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028875C; // type:function size:0x60 scope:local align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x802887BC; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x80288818; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x80288874; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x802888D0; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028892C; // type:function size:0x5C scope:weak align:4 isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData = .text:0x80288988; // type:function size:0xF0 scope:global align:4 __ct__Q37JStudio3stb7TObjectFUlPCvUl = .text:0x80288A78; // type:function size:0x48 scope:global align:4 __ct__Q37JStudio3stb7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x80288AC0; // type:function size:0x70 scope:global align:4 @@ -11093,7 +11093,7 @@ process_sequence___Q37JStudio3stb7TObjectFv = .text:0x80288E2C; // type:function process_paragraph_reserved___Q37JStudio3stb7TObjectFUlPCvUl = .text:0x80288F80; // type:function size:0xE8 scope:global align:4 __ct__Q37JStudio3stb15TObject_controlFPCvUl = .text:0x80289068; // type:function size:0x4C scope:global align:4 __ct__Q37JStudio3stb8TControlFv = .text:0x802890B4; // type:function size:0x80 scope:global align:4 -__dt__Q37JStudio3stb15TObject_controlFv = .text:0x80289134; // type:function size:0x60 scope:global align:4 +__dt__Q37JStudio3stb15TObject_controlFv = .text:0x80289134; // type:function size:0x60 scope:weak align:4 __dt__Q37JStudio3stb8TControlFv = .text:0x80289194; // type:function size:0x94 scope:global align:4 appendObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject = .text:0x80289228; // type:function size:0x50 scope:global align:4 removeObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject = .text:0x80289278; // type:function size:0x38 scope:global align:4 @@ -11112,17 +11112,17 @@ parseBlock_next__Q37JStudio3stb6TParseFPPCvPUlUl = .text:0x8028978C; // type:fun parseHeader__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data14TParse_THeaderUl = .text:0x802897E0; // type:function size:0x8 scope:global align:4 parseBlock_block__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl = .text:0x802897E8; // type:function size:0x38 scope:global align:4 parseBlock_object__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data20TParse_TBlock_objectUl = .text:0x80289820; // type:function size:0x108 scope:global align:4 -find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x80289928; // type:function size:0x94 scope:global align:4 +find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x80289928; // type:function size:0x94 scope:weak align:4 getData__Q47JStudio3stb4data16TParse_TSequenceCFPQ57JStudio3stb4data16TParse_TSequence5TData = .text:0x802899BC; // type:function size:0x4C scope:global align:4 getData__Q47JStudio3stb4data17TParse_TParagraphCFPQ57JStudio3stb4data17TParse_TParagraph5TData = .text:0x80289A08; // type:function size:0x78 scope:global align:4 getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData = .text:0x80289A80; // type:function size:0x80 scope:global align:4 __dt__Q214JStudio_JStage13TCreateObjectFv = .text:0x80289B00; // type:function size:0x60 scope:global align:4 create__Q214JStudio_JStage13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x80289B60; // type:function size:0x184 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x80289CE4; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x80289DE8; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x80289EEC; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x80289FF0; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028A0F4; // type:function size:0x104 scope:global align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x80289CE4; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x80289DE8; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x80289EEC; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x80289FF0; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028A0F4; // type:function size:0x104 scope:weak align:4 transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl = .text:0x8028A1F8; // type:function size:0x98 scope:global align:4 transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl = .text:0x8028A290; // type:function size:0x98 scope:global align:4 transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl = .text:0x8028A328; // type:function size:0xA4 scope:global align:4 @@ -11154,11 +11154,11 @@ setJSG_ID___Q214JStudio_JStage14TAdaptor_actorFMQ26JStage6TActorFPCvPvUl_vQ37JSt setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl = .text:0x8028AD38; // type:function size:0x194 scope:global align:4 getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl = .text:0x8028AECC; // type:function size:0x198 scope:global align:4 __cl__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_CFfPQ27JStudio8TAdaptor = .text:0x8028B064; // type:function size:0xD4 scope:global align:4 -__dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv = .text:0x8028B138; // type:function size:0x60 scope:global align:4 +__dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv = .text:0x8028B138; // type:function size:0x60 scope:weak align:4 __sinit_object-actor_cpp = .text:0x8028B198; // type:function size:0x3D0 scope:local align:4 -__ct__Q27JStudio14TVariableValueFv = .text:0x8028B568; // type:function size:0x18 scope:global align:4 -__dt__Q214JStudio_JStage81TVariableValueOutput_object_Fv = .text:0x8028B580; // type:function size:0x60 scope:global align:4 -__cl__Q214JStudio_JStage81TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028B5E0; // type:function size:0x30 scope:global align:4 +__ct__Q27JStudio14TVariableValueFv = .text:0x8028B568; // type:function size:0x18 scope:weak align:4 +__dt__Q214JStudio_JStage81TVariableValueOutput_object_Fv = .text:0x8028B580; // type:function size:0x60 scope:weak align:4 +__cl__Q214JStudio_JStage81TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028B5E0; // type:function size:0x30 scope:weak align:4 __ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight = .text:0x8028B610; // type:function size:0x9C scope:global align:4 __dt__Q214JStudio_JStage21TAdaptor_ambientLightFv = .text:0x8028B6AC; // type:function size:0x74 scope:global align:4 adaptor_do_prepare__Q214JStudio_JStage21TAdaptor_ambientLightFv = .text:0x8028B720; // type:function size:0x4 scope:global align:4 @@ -11185,8 +11185,8 @@ getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl = .t setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl = .text:0x8028BFBC; // type:function size:0xE0 scope:global align:4 getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl = .text:0x8028C09C; // type:function size:0xE4 scope:global align:4 __sinit_object-camera_cpp = .text:0x8028C180; // type:function size:0x364 scope:local align:4 -__dt__Q214JStudio_JStage83TVariableValueOutput_object_Fv = .text:0x8028C4E4; // type:function size:0x60 scope:global align:4 -__cl__Q214JStudio_JStage83TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028C544; // type:function size:0x30 scope:global align:4 +__dt__Q214JStudio_JStage83TVariableValueOutput_object_Fv = .text:0x8028C4E4; // type:function size:0x60 scope:weak align:4 +__cl__Q214JStudio_JStage83TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028C544; // type:function size:0x30 scope:weak align:4 __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog = .text:0x8028C574; // type:function size:0x9C scope:global align:4 __dt__Q214JStudio_JStage12TAdaptor_fogFv = .text:0x8028C610; // type:function size:0x74 scope:global align:4 adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv = .text:0x8028C684; // type:function size:0x48 scope:global align:4 @@ -11195,8 +11195,8 @@ adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv = .text:0x8028C7B4; // type:f adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl = .text:0x8028C808; // type:function size:0x78 scope:global align:4 adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl = .text:0x8028C880; // type:function size:0x24 scope:global align:4 __sinit_object-fog_cpp = .text:0x8028C8A4; // type:function size:0x21C scope:local align:4 -__dt__Q214JStudio_JStage77TVariableValueOutput_object_Fv = .text:0x8028CAC0; // type:function size:0x60 scope:global align:4 -__cl__Q214JStudio_JStage77TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028CB20; // type:function size:0x30 scope:global align:4 +__dt__Q214JStudio_JStage77TVariableValueOutput_object_Fv = .text:0x8028CAC0; // type:function size:0x60 scope:weak align:4 +__cl__Q214JStudio_JStage77TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028CB20; // type:function size:0x30 scope:weak align:4 __ct__Q214JStudio_JStage14TAdaptor_lightFPCQ26JStage7TSystemPQ26JStage6TLight = .text:0x8028CB50; // type:function size:0xA4 scope:global align:4 __dt__Q214JStudio_JStage14TAdaptor_lightFv = .text:0x8028CBF4; // type:function size:0x74 scope:global align:4 adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv = .text:0x8028CC68; // type:function size:0x48 scope:global align:4 @@ -11207,16 +11207,16 @@ adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl = .text:0x8028D18 adaptor_do_FACULTY__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl = .text:0x8028D1B0; // type:function size:0x78 scope:global align:4 adaptor_do_ENABLE__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl = .text:0x8028D228; // type:function size:0x24 scope:global align:4 __cl__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_CFfPQ27JStudio8TAdaptor = .text:0x8028D24C; // type:function size:0xC scope:global align:4 -__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv = .text:0x8028D258; // type:function size:0x60 scope:global align:4 +__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv = .text:0x8028D258; // type:function size:0x60 scope:weak align:4 __sinit_object-light_cpp = .text:0x8028D2B8; // type:function size:0x298 scope:local align:4 __dt__Q215JStudio_JAudio213TCreateObjectFv = .text:0x8028D550; // type:function size:0x60 scope:global align:4 create__Q215JStudio_JAudio213TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x8028D5B0; // type:function size:0x74 scope:global align:4 createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject = .text:0x8028D624; // type:function size:0x104 scope:global align:4 -setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028D728; // type:function size:0x28 scope:global align:4 -setValue_PAN___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028D750; // type:function size:0x28 scope:global align:4 -setValue_PITCH___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028D778; // type:function size:0x28 scope:global align:4 -setValue_TEMPO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028D7A0; // type:function size:0x60 scope:global align:4 -setValue_ECHO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028D800; // type:function size:0x28 scope:global align:4 +setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028D728; // type:function size:0x28 scope:local align:4 +setValue_PAN___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028D750; // type:function size:0x28 scope:local align:4 +setValue_PITCH___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028D778; // type:function size:0x28 scope:local align:4 +setValue_TEMPO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028D7A0; // type:function size:0x60 scope:local align:4 +setValue_ECHO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028D800; // type:function size:0x28 scope:local align:4 __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject = .text:0x8028D828; // type:function size:0xCC scope:global align:4 __dt__Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x8028D8F4; // type:function size:0xB0 scope:global align:4 adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x8028D9A4; // type:function size:0xD0 scope:global align:4 @@ -11238,7 +11238,7 @@ __cl__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x8028DF04; // type:function size:0xA0 scope:global align:4 beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x8028DFA4; // type:function size:0xB0 scope:global align:4 endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl = .text:0x8028E054; // type:function size:0x40 scope:global align:4 -__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv = .text:0x8028E094; // type:function size:0x60 scope:global align:4 +__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv = .text:0x8028E094; // type:function size:0x60 scope:weak align:4 __sinit_object-sound_cpp = .text:0x8028E0F4; // type:function size:0x2AC scope:local align:4 __dt__Q217JStudio_JParticle13TCreateObjectFv = .text:0x8028E3A0; // type:function size:0x60 scope:global align:4 create__Q217JStudio_JParticle13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x8028E400; // type:function size:0x74 scope:global align:4 @@ -11246,7 +11246,7 @@ emitter_create__Q217JStudio_JParticle13TCreateObjectFUl = .text:0x8028E474; // t emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter = .text:0x8028E4E4; // type:function size:0x24 scope:global align:4 createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject = .text:0x8028E508; // type:function size:0x104 scope:global align:4 __ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject = .text:0x8028E60C; // type:function size:0xF4 scope:global align:4 -__dt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_Fv = .text:0x8028E700; // type:function size:0x60 scope:global align:4 +__dt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_Fv = .text:0x8028E700; // type:function size:0x60 scope:weak align:4 __dt__Q217JStudio_JParticle17TAdaptor_particleFv = .text:0x8028E760; // type:function size:0xF0 scope:global align:4 adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv = .text:0x8028E850; // type:function size:0x12C scope:global align:4 adaptor_do_end__Q217JStudio_JParticle17TAdaptor_particleFv = .text:0x8028E97C; // type:function size:0x4 scope:global align:4 @@ -11308,11 +11308,11 @@ getCommandHeap__9JASKernelFv = .text:0x80290AC8; // type:function size:0x8 scope setupAramHeap__9JASKernelFUlUl = .text:0x80290AD0; // type:function size:0x38 scope:global align:4 getAramHeap__9JASKernelFv = .text:0x80290B08; // type:function size:0xC scope:global align:4 __sinit_JASHeapCtrl_cpp = .text:0x80290B14; // type:function size:0x40 scope:local align:4 -__dt__7JASHeapFv = .text:0x80290B54; // type:function size:0x78 scope:global align:4 -onDispose__11JASDisposerFv = .text:0x80290BCC; // type:function size:0x4 scope:global align:4 +__dt__7JASHeapFv = .text:0x80290B54; // type:function size:0x78 scope:weak align:4 +onDispose__11JASDisposerFv = .text:0x80290BCC; // type:function size:0x4 scope:weak align:4 getResSize__15JASResArcLoaderFPC10JKRArchiveUs = .text:0x80290BD0; // type:function size:0x34 scope:global align:4 getResMaxSize__15JASResArcLoaderFPC10JKRArchive = .text:0x80290C04; // type:function size:0x78 scope:global align:4 -loadResourceCallback__15JASResArcLoaderFPv = .text:0x80290C7C; // type:function size:0x9C scope:global align:4 +loadResourceCallback__15JASResArcLoaderFPv = .text:0x80290C7C; // type:function size:0x9C scope:local align:4 loadResourceAsync__15JASResArcLoaderFP10JKRArchiveUsPUcUlPFUlUl_vUl = .text:0x80290D18; // type:function size:0x5C scope:global align:4 start__8JASProbeFPCc = .text:0x80290D74; // type:function size:0x50 scope:global align:4 stop__8JASProbeFv = .text:0x80290DC4; // type:function size:0x120 scope:global align:4 @@ -11323,7 +11323,7 @@ execAllCommand__10JASPortCmdFv = .text:0x80291060; // type:function size:0x34 sc execCommandOnce__Q210JASPortCmd9TPortHeadFv = .text:0x80291094; // type:function size:0x78 scope:global align:4 execCommandStay__Q210JASPortCmd9TPortHeadFv = .text:0x8029110C; // type:function size:0x60 scope:global align:4 __sinit_JASCmdStack_cpp = .text:0x8029116C; // type:function size:0x64 scope:local align:4 -__dt__Q210JASPortCmd9TPortHeadFv = .text:0x802911D0; // type:function size:0x58 scope:global align:4 +__dt__Q210JASPortCmd9TPortHeadFv = .text:0x802911D0; // type:function size:0x58 scope:weak align:4 __ct__8JASTrackFv = .text:0x80291228; // type:function size:0xF4 scope:global align:4 __dt__8JASTrackFv = .text:0x8029131C; // type:function size:0x128 scope:global align:4 setChannelMgrCount__8JASTrackFUl = .text:0x80291444; // type:function size:0x190 scope:global align:4 @@ -11414,7 +11414,7 @@ findIntr__10JASSeqCtrlFv = .text:0x80293B28; // type:function size:0x50 scope:gl checkIntr__10JASSeqCtrlFv = .text:0x80293B78; // type:function size:0x70 scope:global align:4 timerProcess__10JASSeqCtrlFv = .text:0x80293BE8; // type:function size:0x84 scope:global align:4 __sinit_JASSeqCtrl_cpp = .text:0x80293C6C; // type:function size:0x40 scope:local align:4 -__dt__12JASSeqParserFv = .text:0x80293CAC; // type:function size:0x48 scope:global align:4 +__dt__12JASSeqParserFv = .text:0x80293CAC; // type:function size:0x48 scope:weak align:4 conditionCheck__12JASSeqParserFP8JASTrackQ212JASSeqParser15BranchCondition = .text:0x80293CF4; // type:function size:0xD0 scope:global align:4 writeReg__12JASSeqParserFP8JASTrackUlUl = .text:0x80293DC4; // type:function size:0x204 scope:global align:4 readReg__12JASSeqParserCFP8JASTrackUl = .text:0x80293FC8; // type:function size:0x1C0 scope:global align:4 @@ -11514,7 +11514,7 @@ updateChannel__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannel = .text:0x8029 channelProc__13JASAramStreamFv = .text:0x802974AC; // type:function size:0x1AC scope:global align:4 channelStart__13JASAramStreamFv = .text:0x80297658; // type:function size:0x218 scope:global align:4 channelStop__13JASAramStreamFUs = .text:0x80297870; // type:function size:0x6C scope:global align:4 -__dt__38JASMemPool_MultiThreaded<10JASChannel>Fv = .text:0x802978DC; // type:function size:0x54 scope:global align:4 +__dt__38JASMemPool_MultiThreaded<10JASChannel>Fv = .text:0x802978DC; // type:function size:0x54 scope:weak align:4 noteOn__7JASBankFPC7JASBankiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv = .text:0x80297930; // type:function size:0x310 scope:global align:4 noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv = .text:0x80297C40; // type:function size:0x138 scope:global align:4 __ct__12JASBasicBankFv = .text:0x80297D78; // type:function size:0x2C scope:global align:4 @@ -11522,9 +11522,9 @@ newInstTable__12JASBasicBankFUcP7JKRHeap = .text:0x80297DA4; // type:function si getInstParam__12JASBasicBankCFiiiP12JASInstParam = .text:0x80297E00; // type:function size:0x68 scope:global align:4 setInst__12JASBasicBankFiP7JASInst = .text:0x80297E68; // type:function size:0x18 scope:global align:4 getInst__12JASBasicBankCFi = .text:0x80297E80; // type:function size:0x44 scope:global align:4 -__dt__7JASBankFv = .text:0x80297EC4; // type:function size:0x48 scope:global align:4 -__dt__12JASBasicBankFv = .text:0x80297F0C; // type:function size:0x5C scope:global align:4 -getType__12JASBasicBankCFv = .text:0x80297F68; // type:function size:0xC scope:global align:4 +__dt__7JASBankFv = .text:0x80297EC4; // type:function size:0x48 scope:weak align:4 +__dt__12JASBasicBankFv = .text:0x80297F0C; // type:function size:0x5C scope:weak align:4 +getType__12JASBasicBankCFv = .text:0x80297F68; // type:function size:0xC scope:weak align:4 getInstParam__12JASVoiceBankCFiiiP12JASInstParam = .text:0x80297F74; // type:function size:0x38 scope:global align:4 __dt__12JASVoiceBankFv = .text:0x80297FAC; // type:function size:0x5C scope:global align:4 getType__12JASVoiceBankCFv = .text:0x80298008; // type:function size:0xC scope:global align:4 @@ -11535,9 +11535,9 @@ setKeyRegionCount__12JASBasicInstFUlP7JKRHeap = .text:0x8029819C; // type:functi setOsc__12JASBasicInstFiPCQ213JASOscillator4Data = .text:0x8029821C; // type:function size:0x10 scope:global align:4 getKeyRegion__12JASBasicInstFi = .text:0x8029822C; // type:function size:0x24 scope:global align:4 __dt__Q212JASBasicInst7TKeymapFv = .text:0x80298250; // type:function size:0x3C scope:global align:4 -__dt__7JASInstFv = .text:0x8029828C; // type:function size:0x48 scope:global align:4 -__ct__Q212JASBasicInst7TKeymapFv = .text:0x802982D4; // type:function size:0xC scope:global align:4 -getType__12JASBasicInstCFv = .text:0x802982E0; // type:function size:0xC scope:global align:4 +__dt__7JASInstFv = .text:0x8029828C; // type:function size:0x48 scope:weak align:4 +__ct__Q212JASBasicInst7TKeymapFv = .text:0x802982D4; // type:function size:0xC scope:weak align:4 +getType__12JASBasicInstCFv = .text:0x802982E0; // type:function size:0xC scope:weak align:4 __ct__10JASDrumSetFv = .text:0x802982EC; // type:function size:0x28 scope:global align:4 __dt__10JASDrumSetFv = .text:0x80298314; // type:function size:0x5C scope:global align:4 newPercArray__10JASDrumSetFUcP7JKRHeap = .text:0x80298370; // type:function size:0x5C scope:global align:4 @@ -11548,7 +11548,7 @@ setRelease__Q210JASDrumSet5TPercFUl = .text:0x802984E4; // type:function size:0x getType__10JASDrumSetCFv = .text:0x802984EC; // type:function size:0xC scope:global align:4 __ct__16JASBasicWaveBankFv = .text:0x802984F8; // type:function size:0x60 scope:global align:4 __dt__16JASBasicWaveBankFv = .text:0x80298558; // type:function size:0x8C scope:global align:4 -__dt__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x802985E4; // type:function size:0x5C scope:global align:4 +__dt__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x802985E4; // type:function size:0x5C scope:weak align:4 getWaveGroup__16JASBasicWaveBankFUl = .text:0x80298640; // type:function size:0x24 scope:global align:4 setGroupCount__16JASBasicWaveBankFUlP7JKRHeap = .text:0x80298664; // type:function size:0xAC scope:global align:4 setWaveTableSize__16JASBasicWaveBankFUlP7JKRHeap = .text:0x80298710; // type:function size:0x80 scope:global align:4 @@ -11563,16 +11563,16 @@ onLoadDone__Q216JASBasicWaveBank10TWaveGroupFv = .text:0x80298B04; // type:funct onEraseDone__Q216JASBasicWaveBank10TWaveGroupFv = .text:0x80298B2C; // type:function size:0x28 scope:global align:4 getWaveID__Q216JASBasicWaveBank10TWaveGroupCFi = .text:0x80298B54; // type:function size:0x10 scope:global align:4 getWavePtr__Q216JASBasicWaveBank11TWaveHandleCFv = .text:0x80298B64; // type:function size:0x24 scope:global align:4 -__dt__11JASWaveBankFv = .text:0x80298B88; // type:function size:0x48 scope:global align:4 -__dt__13JASWaveHandleFv = .text:0x80298BD0; // type:function size:0x48 scope:global align:4 -__ct__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x80298C18; // type:function size:0x34 scope:global align:4 -__ct__Q216JASBasicWaveBank14TGroupWaveInfoFv = .text:0x80298C4C; // type:function size:0x18 scope:global align:4 -getWaveInfo__Q216JASBasicWaveBank11TWaveHandleCFv = .text:0x80298C64; // type:function size:0x8 scope:global align:4 -getWaveArc__16JASBasicWaveBankFUl = .text:0x80298C6C; // type:function size:0x20 scope:global align:4 -getArcCount__16JASBasicWaveBankCFv = .text:0x80298C8C; // type:function size:0x8 scope:global align:4 +__dt__11JASWaveBankFv = .text:0x80298B88; // type:function size:0x48 scope:weak align:4 +__dt__13JASWaveHandleFv = .text:0x80298BD0; // type:function size:0x48 scope:weak align:4 +__ct__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x80298C18; // type:function size:0x34 scope:weak align:4 +__ct__Q216JASBasicWaveBank14TGroupWaveInfoFv = .text:0x80298C4C; // type:function size:0x18 scope:weak align:4 +getWaveInfo__Q216JASBasicWaveBank11TWaveHandleCFv = .text:0x80298C64; // type:function size:0x8 scope:weak align:4 +getWaveArc__16JASBasicWaveBankFUl = .text:0x80298C6C; // type:function size:0x20 scope:weak align:4 +getArcCount__16JASBasicWaveBankCFv = .text:0x80298C8C; // type:function size:0x8 scope:weak align:4 __ct__17JASSimpleWaveBankFv = .text:0x80298C94; // type:function size:0x60 scope:global align:4 __dt__17JASSimpleWaveBankFv = .text:0x80298CF4; // type:function size:0x90 scope:global align:4 -__dt__Q217JASSimpleWaveBank11TWaveHandleFv = .text:0x80298D84; // type:function size:0x5C scope:global align:4 +__dt__Q217JASSimpleWaveBank11TWaveHandleFv = .text:0x80298D84; // type:function size:0x5C scope:weak align:4 setWaveTableSize__17JASSimpleWaveBankFUlP7JKRHeap = .text:0x80298DE0; // type:function size:0x80 scope:global align:4 getWaveHandle__17JASSimpleWaveBankCFUl = .text:0x80298E60; // type:function size:0x24 scope:global align:4 setWaveInfo__17JASSimpleWaveBankFUlRC11JASWaveInfo = .text:0x80298E84; // type:function size:0x94 scope:global align:4 @@ -11581,20 +11581,20 @@ getWavePtr__Q217JASSimpleWaveBank11TWaveHandleCFv = .text:0x80298F38; // type:fu __ct__Q217JASSimpleWaveBank11TWaveHandleFv = .text:0x80298F5C; // type:function size:0x34 scope:global align:4 getWaveInfo__Q217JASSimpleWaveBank11TWaveHandleCFv = .text:0x80298F90; // type:function size:0x8 scope:global align:4 getArcCount__17JASSimpleWaveBankCFv = .text:0x80298F98; // type:function size:0x8 scope:global align:4 -onLoadDone__10JASWaveArcFv = .text:0x80298FA0; // type:function size:0x4 scope:global align:4 -onEraseDone__10JASWaveArcFv = .text:0x80298FA4; // type:function size:0x4 scope:global align:4 -@4@__dt__17JASSimpleWaveBankFv = .text:0x80298FA8; // type:function size:0x8 scope:local align:4 +onLoadDone__10JASWaveArcFv = .text:0x80298FA0; // type:function size:0x4 scope:weak align:4 +onEraseDone__10JASWaveArcFv = .text:0x80298FA4; // type:function size:0x4 scope:weak align:4 +@4@__dt__17JASSimpleWaveBankFv = .text:0x80298FA8; // type:function size:0x8 scope:weak align:4 getGroupCount__11JASWSParserFPCv = .text:0x80298FB0; // type:function size:0x28 scope:global align:4 createWaveBank__11JASWSParserFPCvP7JKRHeap = .text:0x80298FD8; // type:function size:0x5C scope:global align:4 createBasicWaveBank__11JASWSParserFPCvP7JKRHeap = .text:0x80299034; // type:function size:0x230 scope:global align:4 createSimpleWaveBank__11JASWSParserFPCvP7JKRHeap = .text:0x80299264; // type:function size:0x22C scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80299490; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x802994A8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x802994C0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x802994D8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x802994F0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80299508; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80299520; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80299490; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x802994A8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x802994C0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x802994D8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x802994F0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80299508; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80299520; // type:function size:0x18 scope:weak align:4 createBank__12JASBNKParserFPCvP7JKRHeap = .text:0x80299538; // type:function size:0x20 scope:global align:4 createBasicBank__12JASBNKParserFPCvP7JKRHeap = .text:0x80299558; // type:function size:0xA8 scope:global align:4 findChunk__Q212JASBNKParser4Ver1FPCvUl = .text:0x80299600; // type:function size:0x3C scope:global align:4 @@ -11602,13 +11602,13 @@ createBasicBank__Q212JASBNKParser4Ver1FPCvP7JKRHeap = .text:0x8029963C; // type: createBasicBank__Q212JASBNKParser4Ver0FPCvP7JKRHeap = .text:0x80299A3C; // type:function size:0x42C scope:global align:4 findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc = .text:0x80299E68; // type:function size:0x124 scope:global align:4 getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point = .text:0x80299F8C; // type:function size:0x14 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80299FA0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80299FB8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80299FD0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80299FE8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A000; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A018; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A030; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80299FA0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80299FB8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80299FD0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80299FE8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A000; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A018; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A030; // type:function size:0x18 scope:weak align:4 __sinit_JASBNKParser_cpp = .text:0x8029A048; // type:function size:0x58 scope:local align:4 getRootHeap__16JASWaveArcLoaderFv = .text:0x8029A0A0; // type:function size:0x30 scope:global align:4 setCurrentDir__16JASWaveArcLoaderFPCc = .text:0x8029A0D0; // type:function size:0x60 scope:global align:4 @@ -11625,7 +11625,7 @@ erase__10JASWaveArcFv = .text:0x8029A640; // type:function size:0x24 scope:globa onDispose__10JASWaveArcFv = .text:0x8029A664; // type:function size:0x48 scope:global align:4 setEntryNum__10JASWaveArcFl = .text:0x8029A6AC; // type:function size:0x60 scope:global align:4 setFileName__10JASWaveArcFPCc = .text:0x8029A70C; // type:function size:0xAC scope:global align:4 -__dt__11JASDisposerFv = .text:0x8029A7B8; // type:function size:0x48 scope:global align:4 +__dt__11JASDisposerFv = .text:0x8029A7B8; // type:function size:0x48 scope:weak align:4 __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv = .text:0x8029A800; // type:function size:0x118 scope:global align:4 __dt__10JASChannelFv = .text:0x8029A918; // type:function size:0xD8 scope:global align:4 play__10JASChannelFv = .text:0x8029A9F0; // type:function size:0x70 scope:global align:4 @@ -11683,7 +11683,7 @@ stop__14JASAudioThreadFv = .text:0x8029CDC0; // type:function size:0x2C scope:gl run__14JASAudioThreadFv = .text:0x8029CDEC; // type:function size:0x17C scope:global align:4 DMACallback__14JASAudioThreadFv = .text:0x8029CF68; // type:function size:0x54 scope:global align:4 DSPCallback__14JASAudioThreadFPv = .text:0x8029CFBC; // type:function size:0x6C scope:global align:4 -__dt__14JASAudioThreadFv = .text:0x8029D028; // type:function size:0x8C scope:global align:4 +__dt__14JASAudioThreadFv = .text:0x8029D028; // type:function size:0x8C scope:weak align:4 __ct__15JASAudioReseterFv = .text:0x8029D0B4; // type:function size:0x48 scope:global align:4 __dt__15JASAudioReseterFv = .text:0x8029D0FC; // type:function size:0x3C scope:global align:4 start__15JASAudioReseterFUlb = .text:0x8029D138; // type:function size:0x9C scope:global align:4 @@ -11753,27 +11753,27 @@ subframeCallback__9JASDriverFv = .text:0x8029E2A8; // type:function size:0x28 sc DSPSyncCallback__9JASDriverFv = .text:0x8029E2D0; // type:function size:0x28 scope:global align:4 updateDacCallback__9JASDriverFv = .text:0x8029E2F8; // type:function size:0x28 scope:global align:4 __sinit_JASDriverIF_cpp = .text:0x8029E320; // type:function size:0x80 scope:local align:4 -__ct__Q214JASCallbackMgr9TCallbackFv = .text:0x8029E3A0; // type:function size:0x10 scope:global align:4 +__ct__Q214JASCallbackMgr9TCallbackFv = .text:0x8029E3A0; // type:function size:0x10 scope:weak align:4 clamp__14JASSoundParamsFv = .text:0x8029E3B0; // type:function size:0xCC scope:global align:4 combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams = .text:0x8029E47C; // type:function size:0x5C scope:global align:4 DSPReleaseHalt2__FUl = .text:0x8029E4E0; // type:function size:0x48 scope:global align:32 -setup_callback__FUs = .text:0x8029E540; // type:function size:0xC scope:global align:32 +setup_callback__FUs = .text:0x8029E540; // type:function size:0xC scope:local align:32 DsetupTable__FUlUlUlUlUl = .text:0x8029E560; // type:function size:0x64 scope:global align:32 DsetMixerLevel__Ff = .text:0x8029E5E0; // type:function size:0x24 scope:global align:32 DsyncFrame2ch__FUlUlUl = .text:0x8029E620; // type:function size:0x54 scope:global align:32 DsyncFrame4ch__FUlUlUlUlUl = .text:0x8029E680; // type:function size:0x50 scope:global align:32 -DspHandShake__FPv = .text:0x8029E6E0; // type:function size:0x38 scope:global align:32 +DspHandShake__FPv = .text:0x8029E6E0; // type:function size:0x38 scope:local align:32 DspBoot__FPFPv_v = .text:0x8029E720; // type:function size:0xAC scope:global align:32 DSPSendCommands2__FPUlUlPFUs_v = .text:0x8029E7E0; // type:function size:0xE8 scope:global align:32 -DspInitWork__Fv = .text:0x8029E8E0; // type:function size:0x2C scope:global align:32 -DspStartWork__FUlPFUs_v = .text:0x8029E920; // type:function size:0x48 scope:global align:32 +DspInitWork__Fv = .text:0x8029E8E0; // type:function size:0x2C scope:local align:32 +DspStartWork__FUlPFUs_v = .text:0x8029E920; // type:function size:0x48 scope:local align:32 DspFinishWork__FUs = .text:0x8029E980; // type:function size:0x68 scope:global align:32 -DSPAddTask = .text:0x8029EA00; // type:function size:0x84 scope:global align:32 +DSPAddTask = .text:0x8029EA00; // type:function size:0x84 scope:weak align:32 DSPAddPriorTask__FP15STRUCT_DSP_TASK = .text:0x8029EAA0; // type:function size:0x7C scope:global align:32 __DSPHandler = .text:0x8029EB20; // type:function size:0x304 scope:global align:32 DsyncFrame2__FUlUlUl = .text:0x8029EE40; // type:function size:0x50 scope:global align:32 -DsyncFrame3__FUlUlUlUlUl = .text:0x8029EEA0; // type:function size:0x58 scope:global align:32 -Dsp_Update_Request__Fv = .text:0x8029EF00; // type:function size:0x78 scope:global align:32 +DsyncFrame3__FUlUlUlUlUl = .text:0x8029EEA0; // type:function size:0x58 scope:local align:32 +Dsp_Update_Request__Fv = .text:0x8029EF00; // type:function size:0x78 scope:local align:32 Dsp_Running_Check__Fv = .text:0x8029EF80; // type:function size:0x14 scope:global align:32 Dsp_Running_Start__Fv = .text:0x8029EFA0; // type:function size:0xC scope:global align:32 __dt__10JAIAudibleFv = .text:0x8029EFAC; // type:function size:0x48 scope:global align:4 @@ -11795,19 +11795,19 @@ getTrack__5JAISeFv = .text:0x8029F84C; // type:function size:0x8 scope:global al getChildTrack__5JAISeFi = .text:0x8029F854; // type:function size:0x10 scope:global align:4 asSe__5JAISeFv = .text:0x8029F864; // type:function size:0x4 scope:global align:4 getTempoMgr__5JAISeFv = .text:0x8029F868; // type:function size:0x8 scope:global align:4 -@16@JAISound_tryDie___5JAISeFv = .text:0x8029F870; // type:function size:0x8 scope:local align:4 -@16@getTempoMgr__5JAISeFv = .text:0x8029F878; // type:function size:0x8 scope:local align:4 -@16@getChildTrack__5JAISeFi = .text:0x8029F880; // type:function size:0x8 scope:local align:4 -@16@getTrack__5JAISeFv = .text:0x8029F888; // type:function size:0x8 scope:local align:4 -@16@asSe__5JAISeFv = .text:0x8029F890; // type:function size:0x8 scope:local align:4 -@16@releaseChild__5JAISeFi = .text:0x8029F898; // type:function size:0x8 scope:local align:4 -@16@getChild__5JAISeFi = .text:0x8029F8A0; // type:function size:0x8 scope:local align:4 -@16@getNumChild__5JAISeCFv = .text:0x8029F8A8; // type:function size:0x8 scope:local align:4 +@16@JAISound_tryDie___5JAISeFv = .text:0x8029F870; // type:function size:0x8 scope:weak align:4 +@16@getTempoMgr__5JAISeFv = .text:0x8029F878; // type:function size:0x8 scope:weak align:4 +@16@getChildTrack__5JAISeFi = .text:0x8029F880; // type:function size:0x8 scope:weak align:4 +@16@getTrack__5JAISeFv = .text:0x8029F888; // type:function size:0x8 scope:weak align:4 +@16@asSe__5JAISeFv = .text:0x8029F890; // type:function size:0x8 scope:weak align:4 +@16@releaseChild__5JAISeFi = .text:0x8029F898; // type:function size:0x8 scope:weak align:4 +@16@getChild__5JAISeFi = .text:0x8029F8A0; // type:function size:0x8 scope:weak align:4 +@16@getNumChild__5JAISeCFv = .text:0x8029F8A8; // type:function size:0x8 scope:weak align:4 isUsingSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion = .text:0x8029F8B0; // type:function size:0x6C scope:global align:4 releaseSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion = .text:0x8029F91C; // type:function size:0xA8 scope:global align:4 JAISeMgr_calc___16JAISeCategoryMgrFv = .text:0x8029F9C4; // type:function size:0x16C scope:global align:4 JAISeMgr_freeDeadSe___16JAISeCategoryMgrFv = .text:0x8029FB30; // type:function size:0x104 scope:global align:4 -__dt__18JASMemPool<5JAISe>Fv = .text:0x8029FC34; // type:function size:0x54 scope:global align:4 +__dt__18JASMemPool<5JAISe>Fv = .text:0x8029FC34; // type:function size:0x54 scope:weak align:4 JAISeMgr_acceptsNewSe___16JAISeCategoryMgrCFUl = .text:0x8029FC88; // type:function size:0xB8 scope:global align:4 sortByPriority___16JAISeCategoryMgrFv = .text:0x8029FD40; // type:function size:0xA0 scope:global align:4 stop__16JAISeCategoryMgrFUl = .text:0x8029FDE0; // type:function size:0x54 scope:global align:4 @@ -11830,9 +11830,9 @@ calc__8JAISeMgrFv = .text:0x802A0574; // type:function size:0x190 scope:global a mixOut__8JAISeMgrFv = .text:0x802A0704; // type:function size:0x64 scope:global align:4 startSound__8JAISeMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A0768; // type:function size:0x168 scope:global align:4 getNumActiveSe__8JAISeMgrCFv = .text:0x802A08D0; // type:function size:0x2C scope:global align:4 -__dt__8JAISeMgrFv = .text:0x802A08FC; // type:function size:0x98 scope:global align:4 -__ct__16JAISeCategoryMgrFv = .text:0x802A0994; // type:function size:0xD8 scope:global align:4 -JASTrack_isFreeOrStopped__20@unnamed@JAISeq_cpp@FP8JASTrack = .text:0x802A0A6C; // type:function size:0x20 scope:global align:4 +__dt__8JAISeMgrFv = .text:0x802A08FC; // type:function size:0x98 scope:weak align:4 +__ct__16JAISeCategoryMgrFv = .text:0x802A0994; // type:function size:0xD8 scope:weak align:4 +JASTrack_isFreeOrStopped__20@unnamed@JAISeq_cpp@FP8JASTrack = .text:0x802A0A6C; // type:function size:0x20 scope:local align:4 __ct__6JAISeqFP9JAISeqMgrP28JAISoundStrategyMgr<6JAISeq> = .text:0x802A0A8C; // type:function size:0xD8 scope:global align:4 JAISeqMgr_startID___6JAISeqF10JAISoundIDPCQ29JGeometry8TVec3P11JAIAudienceii = .text:0x802A0B64; // type:function size:0xA0 scope:global align:4 playSeqData___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A0C04; // type:function size:0xA0 scope:global align:4 @@ -11842,7 +11842,7 @@ prepare_getSeqData___6JAISeqFv = .text:0x802A0EDC; // type:function size:0xB4 sc prepare___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A0F90; // type:function size:0xFC scope:global align:4 JAISeqMgr_calc___6JAISeqFv = .text:0x802A108C; // type:function size:0xF4 scope:global align:4 die___6JAISeqFv = .text:0x802A1180; // type:function size:0xE8 scope:global align:4 -__dt__27JASMemPool<13JAISoundChild>Fv = .text:0x802A1268; // type:function size:0x54 scope:global align:4 +__dt__27JASMemPool<13JAISoundChild>Fv = .text:0x802A1268; // type:function size:0x54 scope:weak align:4 JAISound_tryDie___6JAISeqFv = .text:0x802A12BC; // type:function size:0x8C scope:global align:4 mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A1348; // type:function size:0x1B4 scope:global align:4 JAISeqMgr_mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A14FC; // type:function size:0x74 scope:global align:4 @@ -11859,7 +11859,7 @@ isUsingSeqData__9JAISeqMgrFRC16JAISeqDataRegion = .text:0x802A1804; // type:func releaseSeqData__9JAISeqMgrFRC16JAISeqDataRegion = .text:0x802A1870; // type:function size:0xA4 scope:global align:4 __ct__9JAISeqMgrFb = .text:0x802A1914; // type:function size:0xF4 scope:global align:4 freeDeadSeq___9JAISeqMgrFv = .text:0x802A1A08; // type:function size:0xEC scope:global align:4 -__dt__19JASMemPool<6JAISeq>Fv = .text:0x802A1AF4; // type:function size:0x54 scope:global align:4 +__dt__19JASMemPool<6JAISeq>Fv = .text:0x802A1AF4; // type:function size:0x54 scope:weak align:4 startSound__9JAISeqMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A1B48; // type:function size:0x148 scope:global align:4 calc__9JAISeqMgrFv = .text:0x802A1C90; // type:function size:0x16C scope:global align:4 stop__9JAISeqMgrFv = .text:0x802A1DFC; // type:function size:0x40 scope:global align:4 @@ -11868,7 +11868,7 @@ stopSoundID__9JAISeqMgrF10JAISoundID = .text:0x802A1E8C; // type:function size:0 mixOut__9JAISeqMgrFv = .text:0x802A1EFC; // type:function size:0x5C scope:global align:4 beginStartSeq___9JAISeqMgrFv = .text:0x802A1F58; // type:function size:0x90 scope:global align:4 endStartSeq___9JAISeqMgrFP6JAISeqP14JAISoundHandle = .text:0x802A1FE8; // type:function size:0x108 scope:global align:4 -__dt__9JAISeqMgrFv = .text:0x802A20F0; // type:function size:0x94 scope:global align:4 +__dt__9JAISeqMgrFv = .text:0x802A20F0; // type:function size:0x94 scope:weak align:4 releaseSound__14JAISoundHandleFv = .text:0x802A2184; // type:function size:0x1C scope:global align:4 releaseHandle__8JAISoundFv = .text:0x802A21A0; // type:function size:0x1C scope:global align:4 attachHandle__8JAISoundFP14JAISoundHandle = .text:0x802A21BC; // type:function size:0x64 scope:global align:4 @@ -11903,7 +11903,7 @@ moveDolby__18JAISoundParamsMoveFfUl = .text:0x802A2F14; // type:function size:0x __ct__15JAISoundStarterFb = .text:0x802A2F6C; // type:function size:0x1C scope:global align:4 __dt__15JAISoundStarterFv = .text:0x802A2F88; // type:function size:0x64 scope:global align:4 startLevelSound__15JAISoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A2FEC; // type:function size:0xE8 scope:global align:4 -JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv = .text:0x802A30D4; // type:function size:0x30 scope:global align:4 +JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv = .text:0x802A30D4; // type:function size:0x30 scope:local align:4 __ct__9JAIStreamFP12JAIStreamMgrP31JAISoundStrategyMgr<9JAIStream> = .text:0x802A3104; // type:function size:0x98 scope:global align:4 JAIStreamMgr_startID___9JAIStreamF10JAISoundIDlPCQ29JGeometry8TVec3P11JAIAudiencei = .text:0x802A319C; // type:function size:0x94 scope:global align:4 prepare_prepareStream___9JAIStreamFv = .text:0x802A3230; // type:function size:0x1C4 scope:global align:4 @@ -11925,7 +11925,7 @@ __dt__16JAIStreamAramMgrFv = .text:0x802A3B20; // type:function size:0x48 scope: __ct__12JAIStreamMgrFb = .text:0x802A3B68; // type:function size:0xD4 scope:global align:4 startSound__12JAIStreamMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A3C3C; // type:function size:0x134 scope:global align:4 freeDeadStream___12JAIStreamMgrFv = .text:0x802A3D70; // type:function size:0xF8 scope:global align:4 -__dt__22JASMemPool<9JAIStream>Fv = .text:0x802A3E68; // type:function size:0x54 scope:global align:4 +__dt__22JASMemPool<9JAIStream>Fv = .text:0x802A3E68; // type:function size:0x54 scope:weak align:4 calc__12JAIStreamMgrFv = .text:0x802A3EBC; // type:function size:0x16C scope:global align:4 stop__12JAIStreamMgrFv = .text:0x802A4028; // type:function size:0x40 scope:global align:4 stop__12JAIStreamMgrFUl = .text:0x802A4068; // type:function size:0x50 scope:global align:4 @@ -11952,11 +11952,11 @@ readBSFT__17JAUAudioArcLoaderFPCv = .text:0x802A4968; // type:function size:0x28 beginBNKList__17JAUAudioArcLoaderFUlUl = .text:0x802A4990; // type:function size:0x24 scope:global align:4 endBNKList__17JAUAudioArcLoaderFv = .text:0x802A49B4; // type:function size:0x24 scope:global align:4 readMaxSeCategory__17JAUAudioArcLoaderFiii = .text:0x802A49D8; // type:function size:0x24 scope:global align:4 -__dt__17JAUAudioArcLoaderFv = .text:0x802A49FC; // type:function size:0x60 scope:global align:4 -__defctor__7JASHeapFv = .text:0x802A4A5C; // type:function size:0x24 scope:global align:4 +__dt__17JAUAudioArcLoaderFv = .text:0x802A49FC; // type:function size:0x60 scope:weak align:4 +__defctor__7JASHeapFv = .text:0x802A4A5C; // type:function size:0x24 scope:weak align:4 appendBankTable__22JAUBankTableDictionaryFP23JSULink<12JAUBankTable> = .text:0x802A4A80; // type:function size:0x20 scope:global align:4 -getBank__12JAUBankTableCFUl = .text:0x802A4AA0; // type:function size:0x24 scope:global align:4 -__ct__14JAISoundHandleFv = .text:0x802A4AC4; // type:function size:0xC scope:global align:4 +getBank__12JAUBankTableCFUl = .text:0x802A4AA0; // type:function size:0x24 scope:weak align:4 +__ct__14JAISoundHandleFv = .text:0x802A4AC4; // type:function size:0xC scope:weak align:4 __ct__18JAU_JASInitializerFv = .text:0x802A4AD0; // type:function size:0x58 scope:global align:4 initJASystem__18JAU_JASInitializerFP12JKRSolidHeap = .text:0x802A4B28; // type:function size:0x214 scope:global align:4 __ct__18JAU_JAIInitializerFv = .text:0x802A4D3C; // type:function size:0x24 scope:global align:4 @@ -11985,7 +11985,7 @@ __ct__Q214JAUSectionHeap16TSectionHeapDataFv = .text:0x802A5DF4; // type:functio setSeqDataArchive__14JAUSectionHeapFP10JKRArchive = .text:0x802A5E60; // type:function size:0x60 scope:global align:4 loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb = .text:0x802A5EC0; // type:function size:0x38 scope:global align:4 releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv = .text:0x802A5EF8; // type:function size:0x2C scope:global align:4 -JAUNewSectionHeap__FP12JKRSolidHeapb = .text:0x802A5F24; // type:function size:0x78 scope:global align:4 +JAUNewSectionHeap__FP12JKRSolidHeapb = .text:0x802A5F24; // type:function size:0x78 scope:local align:4 JAUNewSectionHeap__Fb = .text:0x802A5F9C; // type:function size:0x44 scope:global align:4 __ct__14JAUSectionHeapFP12JKRSolidHeapbl = .text:0x802A5FE0; // type:function size:0xB4 scope:global align:4 getOpenSection__14JAUSectionHeapFv = .text:0x802A6094; // type:function size:0xC scope:global align:4 @@ -11993,18 +11993,18 @@ setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser = .text:0x802A60A0; // type:f newDynamicSeqBlock__14JAUSectionHeapFUl = .text:0x802A60AC; // type:function size:0x124 scope:global align:4 getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData = .text:0x802A61D0; // type:function size:0xA0 scope:global align:4 releaseSeqData__14JAUSectionHeapFv = .text:0x802A6270; // type:function size:0x8 scope:global align:4 -__dt__14JAUSectionHeapFv = .text:0x802A6278; // type:function size:0x1C8 scope:global align:4 -getStreamFileEntry__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrF10JAISoundID = .text:0x802A6440; // type:function size:0x28 scope:global align:4 -__dt__10JAUSectionFv = .text:0x802A6468; // type:function size:0x10C scope:global align:4 -__dt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrFv = .text:0x802A6574; // type:function size:0x60 scope:global align:4 -set__Q23std16__bitset_base<8>FUlb = .text:0x802A65D4; // type:function size:0x40 scope:global align:4 -reset__Q23std16__bitset_base<8>FUl = .text:0x802A6614; // type:function size:0x20 scope:global align:4 -test__Q23std16__bitset_base<8>CFUl = .text:0x802A6634; // type:function size:0x28 scope:global align:4 -__ct__Q23std16__bitset_base<8>Fv = .text:0x802A665C; // type:function size:0x24 scope:global align:4 -@220@setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser = .text:0x802A6680; // type:function size:0x8 scope:local align:4 -@220@releaseSeqData__14JAUSectionHeapFv = .text:0x802A6688; // type:function size:0x8 scope:local align:4 -@220@getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData = .text:0x802A6690; // type:function size:0x8 scope:local align:4 -@220@__dt__14JAUSectionHeapFv = .text:0x802A6698; // type:function size:0x8 scope:local align:4 +__dt__14JAUSectionHeapFv = .text:0x802A6278; // type:function size:0x1C8 scope:weak align:4 +getStreamFileEntry__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrF10JAISoundID = .text:0x802A6440; // type:function size:0x28 scope:local align:4 +__dt__10JAUSectionFv = .text:0x802A6468; // type:function size:0x10C scope:weak align:4 +__dt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrFv = .text:0x802A6574; // type:function size:0x60 scope:local align:4 +set__Q23std16__bitset_base<8>FUlb = .text:0x802A65D4; // type:function size:0x40 scope:weak align:4 +reset__Q23std16__bitset_base<8>FUl = .text:0x802A6614; // type:function size:0x20 scope:weak align:4 +test__Q23std16__bitset_base<8>CFUl = .text:0x802A6634; // type:function size:0x28 scope:weak align:4 +__ct__Q23std16__bitset_base<8>Fv = .text:0x802A665C; // type:function size:0x24 scope:weak align:4 +@220@setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser = .text:0x802A6680; // type:function size:0x8 scope:weak align:4 +@220@releaseSeqData__14JAUSectionHeapFv = .text:0x802A6688; // type:function size:0x8 scope:weak align:4 +@220@getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData = .text:0x802A6690; // type:function size:0x8 scope:weak align:4 +@220@__dt__14JAUSectionHeapFv = .text:0x802A6698; // type:function size:0x8 scope:weak align:4 __ct__16JAUSeqCollectionFv = .text:0x802A66A0; // type:function size:0xC scope:global align:4 init__16JAUSeqCollectionFPCv = .text:0x802A66AC; // type:function size:0x50 scope:global align:4 getSeqData__16JAUSeqCollectionFiiP10JAISeqData = .text:0x802A66FC; // type:function size:0x58 scope:global align:4 @@ -12024,7 +12024,7 @@ __ct__23JAUDynamicSeqDataBlocksFv = .text:0x802A6A58; // type:function size:0x48 setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive = .text:0x802A6AA0; // type:function size:0x8 scope:global align:4 getSeqData__23JAUDynamicSeqDataBlocksF10JAISoundIDP14JAISeqDataUserP10JAISeqDatab = .text:0x802A6AA8; // type:function size:0xE4 scope:global align:4 appendDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP15JAUSeqDataBlock = .text:0x802A6B8C; // type:function size:0x68 scope:global align:4 -JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl = .text:0x802A6BF4; // type:function size:0x24 scope:global align:4 +JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl = .text:0x802A6BF4; // type:function size:0x24 scope:local align:4 loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser = .text:0x802A6C18; // type:function size:0x130 scope:global align:4 releaseIdleDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP14JAISeqDataUser = .text:0x802A6D48; // type:function size:0xB8 scope:global align:4 releaseIdleDynamicSeqDataBlock___23JAUDynamicSeqDataBlocksFP14JAISeqDataUserUl = .text:0x802A6E00; // type:function size:0xDC scope:global align:4 @@ -12040,7 +12040,7 @@ init__18JAUStreamFileTableFPCv = .text:0x802A742C; // type:function size:0x4C sc getNumFiles__18JAUStreamFileTableCFv = .text:0x802A7478; // type:function size:0xC scope:global align:4 getFilePath__18JAUStreamFileTableCFi = .text:0x802A7484; // type:function size:0x28 scope:global align:4 getStreamFileEntry__32JAUStreamDataMgr_StreamFileTableF10JAISoundID = .text:0x802A74AC; // type:function size:0x3C scope:global align:4 -__dt__32JAUStreamDataMgr_StreamFileTableFv = .text:0x802A74E8; // type:function size:0x60 scope:global align:4 +__dt__32JAUStreamDataMgr_StreamFileTableFv = .text:0x802A74E8; // type:function size:0x60 scope:weak align:4 __ct__Q28JMessage8TControlFv = .text:0x802A7548; // type:function size:0x44 scope:global align:4 __dt__Q28JMessage8TControlFv = .text:0x802A758C; // type:function size:0x48 scope:global align:4 reset__Q28JMessage8TControlFv = .text:0x802A75D4; // type:function size:0x60 scope:global align:4 @@ -12111,8 +12111,8 @@ process__Q28JMessage19TRenderingProcessorFPCc = .text:0x802A8B20; // type:functi do_begin___Q28JMessage19TRenderingProcessorFPCvPCc = .text:0x802A8BA4; // type:function size:0x4 scope:global align:4 do_end___Q28JMessage19TRenderingProcessorFv = .text:0x802A8BA8; // type:function size:0x4 scope:global align:4 do_tag___Q28JMessage19TRenderingProcessorFUlPCvUl = .text:0x802A8BAC; // type:function size:0x78 scope:global align:4 -on_message__Q28JMessage10TProcessorCFUl = .text:0x802A8C24; // type:function size:0x20 scope:global align:4 -getMessageText_messageCode__Q28JMessage10TProcessorCFUl = .text:0x802A8C44; // type:function size:0x98 scope:global align:4 +on_message__Q28JMessage10TProcessorCFUl = .text:0x802A8C24; // type:function size:0x20 scope:weak align:4 +getMessageText_messageCode__Q28JMessage10TProcessorCFUl = .text:0x802A8C44; // type:function size:0x98 scope:weak align:4 toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb = .text:0x802A8CDC; // type:function size:0x1E4 scope:global align:4 __ct__Q38JMessage18TResourceContainer10TCResourceFv = .text:0x802A8EC0; // type:function size:0x38 scope:global align:4 __dt__Q38JMessage18TResourceContainer10TCResourceFv = .text:0x802A8EF8; // type:function size:0x74 scope:global align:4 @@ -12128,7 +12128,7 @@ parseHeader_next__Q28JMessage6TParseFPPCvPUlUl = .text:0x802A91B8; // type:funct parseBlock_next__Q28JMessage6TParseFPPCvPUlUl = .text:0x802A92F4; // type:function size:0x19C scope:global align:4 parseCharacter_1Byte__Q28JMessage6localeFPPCc = .text:0x802A9490; // type:function size:0x18 scope:global align:4 parseCharacter_2Byte__Q28JMessage6localeFPPCc = .text:0x802A94A8; // type:function size:0x2C scope:global align:4 -lower_bound__3stdFPCUlPCUlRCUl = .text:0x802A94D4; // type:function size:0x54 scope:global align:4 +lower_bound__3stdFPCUlPCUlRCUl = .text:0x802A94D4; // type:function size:0x54 scope:weak align:4 parseCharacter_ShiftJIS__Q28JMessage6localeFPPCc = .text:0x802A9528; // type:function size:0x64 scope:global align:4 parseCharacter_UTF8__Q28JMessage6localeFPPCc = .text:0x802A958C; // type:function size:0x100 scope:global align:4 linearTransform__6Z2CalcFfffffb = .text:0x802A968C; // type:function size:0x68 scope:global align:4 @@ -12142,7 +12142,7 @@ __ct__16Z2AudioArcLoaderFP10JAUSection = .text:0x802A9A34; // type:function size readCommandMore__16Z2AudioArcLoaderFUl = .text:0x802A9A70; // type:function size:0x58 scope:global align:4 readBFCA__16Z2AudioArcLoaderFPCv = .text:0x802A9AC8; // type:function size:0x8C scope:global align:4 readBSTN__16Z2AudioArcLoaderFPCvUl = .text:0x802A9B54; // type:function size:0x4 scope:global align:4 -__dt__16Z2AudioArcLoaderFv = .text:0x802A9B58; // type:function size:0x70 scope:global align:4 +__dt__16Z2AudioArcLoaderFv = .text:0x802A9B58; // type:function size:0x70 scope:weak align:4 seqCallback__FP8JASTrackUs = .text:0x802A9BC8; // type:function size:0x2B8 scope:global align:4 __ct__10Z2SoundMgrFv = .text:0x802A9E80; // type:function size:0x68 scope:global align:4 startSound__10Z2SoundMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A9EE8; // type:function size:0x2C8 scope:global align:4 @@ -12164,12 +12164,12 @@ startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3UlfffffUl = .text:0x802AAC3C; // type:function size:0x2A0 scope:global align:4 setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc = .text:0x802AAEDC; // type:function size:0x98 scope:global align:4 getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc = .text:0x802AAF74; // type:function size:0x7C scope:global align:4 -__dt__14Z2SoundStarterFv = .text:0x802AAFF0; // type:function size:0x8C scope:global align:4 +__dt__14Z2SoundStarterFv = .text:0x802AAFF0; // type:function size:0x8C scope:weak align:4 __ct__14Z2SoundHandlesFv = .text:0x802AB07C; // type:function size:0x38 scope:global align:4 __dt__14Z2SoundHandlesFv = .text:0x802AB0B4; // type:function size:0x64 scope:global align:4 initHandlesPool__14Z2SoundHandlesFUc = .text:0x802AB118; // type:function size:0x8 scope:global align:4 deleteHandlesPool__14Z2SoundHandlesFv = .text:0x802AB120; // type:function size:0xE0 scope:global align:4 -__dt__31JASMemPool<17Z2SoundHandlePool>Fv = .text:0x802AB200; // type:function size:0x54 scope:global align:4 +__dt__31JASMemPool<17Z2SoundHandlePool>Fv = .text:0x802AB200; // type:function size:0x54 scope:weak align:4 getHandleSoundID__14Z2SoundHandlesF10JAISoundID = .text:0x802AB254; // type:function size:0x4C scope:global align:4 getHandleUserData__14Z2SoundHandlesFUl = .text:0x802AB2A0; // type:function size:0x38 scope:global align:4 getFreeHandle__14Z2SoundHandlesFv = .text:0x802AB2D8; // type:function size:0xF8 scope:global align:4 @@ -12321,11 +12321,11 @@ getStreamFilePath__11Z2SoundInfoF10JAISoundID = .text:0x802BBA10; // type:functi getStreamFileEntry__11Z2SoundInfoF10JAISoundID = .text:0x802BBA88; // type:function size:0x40 scope:global align:4 getSwBit__11Z2SoundInfoCF10JAISoundID = .text:0x802BBAC8; // type:function size:0x80 scope:global align:4 getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound = .text:0x802BBB48; // type:function size:0x98 scope:global align:4 -__dt__11Z2SoundInfoFv = .text:0x802BBBE0; // type:function size:0xDC scope:global align:4 -@4@getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID = .text:0x802BBCBC; // type:function size:0x8 scope:local align:4 -@4@getAudibleSw__11Z2SoundInfoCF10JAISoundID = .text:0x802BBCC4; // type:function size:0x8 scope:local align:4 -@8@__dt__11Z2SoundInfoFv = .text:0x802BBCCC; // type:function size:0x8 scope:local align:4 -@8@getStreamFileEntry__11Z2SoundInfoF10JAISoundID = .text:0x802BBCD4; // type:function size:0x8 scope:local align:4 +__dt__11Z2SoundInfoFv = .text:0x802BBBE0; // type:function size:0xDC scope:weak align:4 +@4@getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID = .text:0x802BBCBC; // type:function size:0x8 scope:weak align:4 +@4@getAudibleSw__11Z2SoundInfoCF10JAISoundID = .text:0x802BBCC4; // type:function size:0x8 scope:weak align:4 +@8@__dt__11Z2SoundInfoFv = .text:0x802BBCCC; // type:function size:0x8 scope:weak align:4 +@8@getStreamFileEntry__11Z2SoundInfoF10JAISoundID = .text:0x802BBCD4; // type:function size:0x8 scope:weak align:4 calc__15Z2AudibleAbsPosFRCQ29JGeometry8TVec3 = .text:0x802BBCDC; // type:function size:0x3C scope:global align:4 init__15Z2AudibleAbsPosFPQ29JGeometry8TVec3RCQ29JGeometry8TVec3PCQ29JGeometry8TVec3 = .text:0x802BBD18; // type:function size:0x7C scope:global align:4 __ct__9Z2AudibleFRCQ29JGeometry8TVec3PCQ29JGeometry8TVec3Ulb = .text:0x802BBD94; // type:function size:0xE0 scope:global align:4 @@ -12357,7 +12357,7 @@ calcMicPriority__9Z2SpotMicFf = .text:0x802BCFE4; // type:function size:0x58 sco calcMicVolume__9Z2SpotMicFfif = .text:0x802BD03C; // type:function size:0xF4 scope:global align:4 __ct__10Z2AudienceFv = .text:0x802BD130; // type:function size:0xCC scope:global align:4 __dt__10Z2AudienceFv = .text:0x802BD1FC; // type:function size:0x8C scope:global align:4 -__dt__22JASMemPool<9Z2Audible>Fv = .text:0x802BD288; // type:function size:0x54 scope:global align:4 +__dt__22JASMemPool<9Z2Audible>Fv = .text:0x802BD288; // type:function size:0x54 scope:weak align:4 setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib = .text:0x802BD2DC; // type:function size:0x5C scope:global align:4 newAudible__10Z2AudienceFRCQ29JGeometry8TVec310JAISoundIDPCQ29JGeometry8TVec3Ul = .text:0x802BD338; // type:function size:0x19C scope:global align:4 deleteAudible__10Z2AudienceFP10JAIAudible = .text:0x802BD4D4; // type:function size:0x3C scope:global align:4 @@ -12478,10 +12478,10 @@ framework__12Z2CreatureOIFUlSc = .text:0x802C2864; // type:function size:0x170 s startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc = .text:0x802C29D4; // type:function size:0x2B0 scope:global align:4 startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc = .text:0x802C2C84; // type:function size:0x50 scope:global align:4 startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc = .text:0x802C2CD4; // type:function size:0x10C scope:global align:4 -Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C2DE0; // type:function size:0x74 scope:global align:4 -Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl = .text:0x802C2E54; // type:function size:0x48 scope:global align:4 -Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C2E9C; // type:function size:0x48 scope:global align:4 -Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C2EE4; // type:function size:0x15C scope:global align:4 +Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C2DE0; // type:function size:0x74 scope:local align:4 +Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl = .text:0x802C2E54; // type:function size:0x48 scope:local align:4 +Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C2E9C; // type:function size:0x48 scope:local align:4 +Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C2EE4; // type:function size:0x15C scope:local align:4 __sinit_Z2Creature_cpp = .text:0x802C3040; // type:function size:0x1DC scope:local align:4 setLinkGroupInfo__14Z2CreatureLinkFUc = .text:0x802C321C; // type:function size:0x4 scope:global align:4 setLinkHp__14Z2CreatureLinkFll = .text:0x802C3220; // type:function size:0x8 scope:global align:4 @@ -12489,7 +12489,7 @@ setLinkSwordType__14Z2CreatureLinkFll = .text:0x802C3228; // type:function size: setLinkShieldType__14Z2CreatureLinkFll = .text:0x802C328C; // type:function size:0x64 scope:global align:4 setLinkBootsType__14Z2CreatureLinkFl = .text:0x802C32F0; // type:function size:0x4C scope:global align:4 __ct__14Z2CreatureLinkFv = .text:0x802C333C; // type:function size:0x128 scope:global align:4 -__dt__18Z2LinkSoundStarterFv = .text:0x802C3464; // type:function size:0x9C scope:global align:4 +__dt__18Z2LinkSoundStarterFv = .text:0x802C3464; // type:function size:0x9C scope:weak align:4 __dt__14Z2CreatureLinkFv = .text:0x802C3500; // type:function size:0xF8 scope:global align:4 deleteObject__14Z2CreatureLinkFv = .text:0x802C35F8; // type:function size:0x40 scope:global align:4 init__14Z2CreatureLinkFP3VecP3VecP3Vec = .text:0x802C3638; // type:function size:0xD8 scope:global align:4 @@ -12512,7 +12512,7 @@ setResumeAttack__14Z2CreatureLinkFb = .text:0x802C48D8; // type:function size:0x __ct__18Z2LinkSoundStarterFv = .text:0x802C48E8; // type:function size:0x40 scope:global align:4 startSound__18Z2LinkSoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3UlfffffUl = .text:0x802C4928; // type:function size:0x6D4 scope:global align:4 __ct__14Z2CreatureRideFv = .text:0x802C4FFC; // type:function size:0x7C scope:global align:4 -__dt__18Z2RideSoundStarterFv = .text:0x802C5078; // type:function size:0x9C scope:global align:4 +__dt__18Z2RideSoundStarterFv = .text:0x802C5078; // type:function size:0x9C scope:weak align:4 __dt__14Z2CreatureRideFv = .text:0x802C5114; // type:function size:0xD8 scope:global align:4 deleteObject__14Z2CreatureRideFv = .text:0x802C51EC; // type:function size:0x20 scope:global align:4 init__14Z2CreatureRideFP3VecP3VecUcUc = .text:0x802C520C; // type:function size:0x20 scope:global align:4 @@ -12524,8 +12524,8 @@ init__15Z2SoundObjCoachFP3VecUc = .text:0x802C54FC; // type:function size:0x20 s startWheelSound__15Z2SoundObjCoachFf = .text:0x802C551C; // type:function size:0x1A4 scope:global align:4 startFireSound__15Z2SoundObjCoachFUs = .text:0x802C56C0; // type:function size:0x100 scope:global align:4 startSound__15Z2SoundObjCoachF10JAISoundIDUlSc = .text:0x802C57C0; // type:function size:0xCC scope:global align:4 -@144@__dt__14Z2CreatureLinkFv = .text:0x802C588C; // type:function size:0x8 scope:local align:4 -@144@__dt__14Z2CreatureRideFv = .text:0x802C5894; // type:function size:0x8 scope:local align:4 +@144@__dt__14Z2CreatureLinkFv = .text:0x802C588C; // type:function size:0x8 scope:weak align:4 +@144@__dt__14Z2CreatureRideFv = .text:0x802C5894; // type:function size:0x8 scope:weak align:4 __ct__11Z2EnvSeBaseFP3Vec = .text:0x802C589C; // type:function size:0x10 scope:global align:4 __dt__11Z2EnvSeBaseFv = .text:0x802C58AC; // type:function size:0x5C scope:global align:4 startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl = .text:0x802C5908; // type:function size:0x1AC scope:global align:4 @@ -12592,7 +12592,7 @@ startGuideMelody__13Z2WolfHowlMgrFb = .text:0x802CBA88; // type:function size:0x skipCorrectDemo__13Z2WolfHowlMgrFv = .text:0x802CBB58; // type:function size:0x24 scope:global align:4 __sinit_Z2WolfHowlMgr_cpp = .text:0x802CBB7C; // type:function size:0xE4 scope:local align:4 __ct__12Z2SpeechMgr2Fv = .text:0x802CBC60; // type:function size:0x8C scope:global align:4 -__dt__15Z2SpeechStarterFv = .text:0x802CBCEC; // type:function size:0x9C scope:global align:4 +__dt__15Z2SpeechStarterFv = .text:0x802CBCEC; // type:function size:0x9C scope:weak align:4 setString__12Z2SpeechMgr2FPCUssUcUs = .text:0x802CBD88; // type:function size:0x1D8 scope:global align:4 setTextCount__12Z2SpeechMgr2Fs = .text:0x802CBF60; // type:function size:0x230 scope:global align:4 speakOneWord__12Z2SpeechMgr2Fb = .text:0x802CC190; // type:function size:0x16C scope:global align:4 @@ -12772,8 +12772,8 @@ run__9JKRThreadFv = .text:0x802D1E14; // type:function size:0x8 scope:global ali draw__15JKRThreadSwitchFP14JKRThreadName_ = .text:0x802D1E1C; // type:function size:0x30 scope:global align:4 __dt__15JKRThreadSwitchFv = .text:0x802D1E4C; // type:function size:0x48 scope:global align:4 __sinit_JKRThread_cpp = .text:0x802D1E94; // type:function size:0x68 scope:local align:4 -__dt__17JSUList<7JKRTask>Fv = .text:0x802D1EFC; // type:function size:0x54 scope:global align:4 -__dt__19JSUList<9JKRThread>Fv = .text:0x802D1F50; // type:function size:0x54 scope:global align:4 +__dt__17JSUList<7JKRTask>Fv = .text:0x802D1EFC; // type:function size:0x54 scope:weak align:4 +__dt__19JSUList<9JKRThread>Fv = .text:0x802D1F50; // type:function size:0x54 scope:weak align:4 create__7JKRAramFUlUllll = .text:0x802D1FA4; // type:function size:0x9C scope:global align:4 __ct__7JKRAramFUlUll = .text:0x802D2040; // type:function size:0x10C scope:global align:4 __dt__7JKRAramFv = .text:0x802D214C; // type:function size:0x90 scope:global align:4 @@ -12782,12 +12782,12 @@ checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl = .text:0x802D2248; // type:func changeGroupIdIfNeed__7JKRAramFPUci = .text:0x802D22DC; // type:function size:0x60 scope:global align:4 mainRamToAram__7JKRAramFPUcUlUl15JKRExpandSwitchUlP7JKRHeapiPUl = .text:0x802D233C; // type:function size:0x278 scope:global align:4 aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl = .text:0x802D25B4; // type:function size:0x27C scope:global align:4 -JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl = .text:0x802D2830; // type:function size:0x170 scope:global align:4 -decompSZS_subroutine__FPUcPUc = .text:0x802D29A0; // type:function size:0x2A0 scope:local align:4 +JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl = .text:0x802D2830; // type:function size:0x170 scope:local align:4 +decompSZS_subroutine__FPUcPUc = .text:0x802D29A0; // type:function size:0x2A0 scope:global align:4 firstSrcData__Fv = .text:0x802D2C40; // type:function size:0xA4 scope:local align:4 nextSrcData__FPUc = .text:0x802D2CE4; // type:function size:0xC8 scope:local align:4 __sinit_JKRAram_cpp = .text:0x802D2DAC; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRAMCommand>Fv = .text:0x802D2DF0; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRAMCommand>Fv = .text:0x802D2DF0; // type:function size:0x54 scope:weak align:4 __ct__11JKRAramHeapFUlUl = .text:0x802D2E44; // type:function size:0xD0 scope:global align:4 __dt__11JKRAramHeapFv = .text:0x802D2F14; // type:function size:0xA8 scope:global align:4 alloc__11JKRAramHeapFUlQ211JKRAramHeap10EAllocMode = .text:0x802D2FBC; // type:function size:0x78 scope:global align:4 @@ -12797,7 +12797,7 @@ getFreeSize__11JKRAramHeapFv = .text:0x802D3134; // type:function size:0x78 scop getTotalFreeSize__11JKRAramHeapFv = .text:0x802D31AC; // type:function size:0x6C scope:global align:4 dump__11JKRAramHeapFv = .text:0x802D3218; // type:function size:0x54 scope:global align:4 __sinit_JKRAramHeap_cpp = .text:0x802D326C; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRAramBlock>Fv = .text:0x802D32B0; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRAramBlock>Fv = .text:0x802D32B0; // type:function size:0x54 scope:weak align:4 __ct__12JKRAramBlockFUlUlUlUcb = .text:0x802D3304; // type:function size:0x74 scope:global align:4 __dt__12JKRAramBlockFv = .text:0x802D3378; // type:function size:0xBC scope:global align:4 allocHead__12JKRAramBlockFUlUcP11JKRAramHeap = .text:0x802D3434; // type:function size:0x9C scope:global align:4 @@ -12822,7 +12822,7 @@ write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl = .text sync__13JKRAramStreamFP20JKRAramStreamCommandi = .text:0x802D3FA0; // type:function size:0x94 scope:global align:4 setTransBuffer__13JKRAramStreamFPUcUlP7JKRHeap = .text:0x802D4034; // type:function size:0x54 scope:global align:4 __ct__20JKRAramStreamCommandFv = .text:0x802D4088; // type:function size:0xC scope:global align:4 -getAvailable__20JSURandomInputStreamCFv = .text:0x802D4094; // type:function size:0x5C scope:global align:4 +getAvailable__20JSURandomInputStreamCFv = .text:0x802D4094; // type:function size:0x5C scope:weak align:4 __ct__13JKRFileLoaderFv = .text:0x802D40F0; // type:function size:0x58 scope:global align:4 __dt__13JKRFileLoaderFv = .text:0x802D4148; // type:function size:0x8C scope:global align:4 unmount__13JKRFileLoaderFv = .text:0x802D41D4; // type:function size:0x50 scope:global align:4 @@ -12833,14 +12833,14 @@ detachResource__13JKRFileLoaderFPvP13JKRFileLoader = .text:0x802D43A0; // type:f findVolume__13JKRFileLoaderFPPCc = .text:0x802D4438; // type:function size:0x8C scope:global align:4 fetchVolumeName__13JKRFileLoaderFPclPCc = .text:0x802D44C4; // type:function size:0xDC scope:global align:4 __sinit_JKRFileLoader_cpp = .text:0x802D45A0; // type:function size:0x44 scope:local align:4 -__dt__24JSUList<13JKRFileLoader>Fv = .text:0x802D45E4; // type:function size:0x54 scope:global align:4 +__dt__24JSUList<13JKRFileLoader>Fv = .text:0x802D45E4; // type:function size:0x54 scope:weak align:4 __ct__12JKRArcFinderFP10JKRArchivell = .text:0x802D4638; // type:function size:0x8C scope:global align:4 findNextFile__12JKRArcFinderFv = .text:0x802D46C4; // type:function size:0xAC scope:global align:4 __ct__12JKRDvdFinderFPCc = .text:0x802D4770; // type:function size:0x84 scope:global align:4 __dt__12JKRDvdFinderFv = .text:0x802D47F4; // type:function size:0x80 scope:global align:4 findNextFile__12JKRDvdFinderFv = .text:0x802D4874; // type:function size:0x9C scope:global align:4 -__dt__13JKRFileFinderFv = .text:0x802D4910; // type:function size:0x48 scope:global align:4 -__dt__12JKRArcFinderFv = .text:0x802D4958; // type:function size:0x5C scope:global align:4 +__dt__13JKRFileFinderFv = .text:0x802D4910; // type:function size:0x48 scope:weak align:4 +__dt__12JKRArcFinderFv = .text:0x802D4958; // type:function size:0x5C scope:weak align:4 mount__12JKRFileCacheFPCcP7JKRHeapPCc = .text:0x802D49B4; // type:function size:0x100 scope:global align:4 __ct__12JKRFileCacheFPCcPCc = .text:0x802D4AB4; // type:function size:0x1BC scope:global align:4 __dt__12JKRFileCacheFv = .text:0x802D4C70; // type:function size:0xD4 scope:global align:4 @@ -12924,7 +12924,7 @@ getAramAddress__14JKRAramArchiveFPCc = .text:0x802D781C; // type:function size:0 fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli = .text:0x802D7858; // type:function size:0xBC scope:global align:4 fetchResource_subroutine__14JKRAramArchiveFUlUlP7JKRHeapiPPUc = .text:0x802D7914; // type:function size:0x150 scope:global align:4 getExpandedResSize__14JKRAramArchiveCFPCv = .text:0x802D7A64; // type:function size:0x12C scope:global align:4 -__dt__7JKRFileFv = .text:0x802D7B90; // type:function size:0x60 scope:global align:4 +__dt__7JKRFileFv = .text:0x802D7B90; // type:function size:0x60 scope:weak align:4 __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection = .text:0x802D7BF0; // type:function size:0xA8 scope:global align:4 __dt__13JKRDvdArchiveFv = .text:0x802D7C98; // type:function size:0x11C scope:global align:4 open__13JKRDvdArchiveFl = .text:0x802D7DB4; // type:function size:0x29C scope:global align:4 @@ -12956,32 +12956,32 @@ sync__10JKRDvdFileFv = .text:0x802D9A70; // type:function size:0x54 scope:global doneProcess__10JKRDvdFileFlP11DVDFileInfo = .text:0x802D9AC4; // type:function size:0x34 scope:global align:4 getFileSize__10JKRDvdFileCFv = .text:0x802D9AF8; // type:function size:0x8 scope:global align:4 __sinit_JKRDvdFile_cpp = .text:0x802D9B00; // type:function size:0x44 scope:local align:4 -__dt__21JSUList<10JKRDvdFile>Fv = .text:0x802D9B44; // type:function size:0x54 scope:global align:4 +__dt__21JSUList<10JKRDvdFile>Fv = .text:0x802D9B44; // type:function size:0x54 scope:weak align:4 loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl = .text:0x802D9B98; // type:function size:0xBC scope:global align:4 loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl = .text:0x802D9C54; // type:function size:0xBC scope:global align:4 loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl = .text:0x802D9D10; // type:function size:0x4D4 scope:global align:4 -JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl = .text:0x802DA1E4; // type:function size:0x178 scope:global align:4 +JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl = .text:0x802DA1E4; // type:function size:0x178 scope:local align:4 decompSZS_subroutine__FPUcPUc = .text:0x802DA35C; // type:function size:0x2B0 scope:local align:4 firstSrcData__Fv = .text:0x802DA60C; // type:function size:0xCC scope:local align:4 nextSrcData__FPUc = .text:0x802DA6D8; // type:function size:0xFC scope:local align:4 isErrorRetry__12JKRDvdRipperFv = .text:0x802DA7D4; // type:function size:0x8 scope:global align:4 __sinit_JKRDvdRipper_cpp = .text:0x802DA7DC; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRDMCommand>Fv = .text:0x802DA820; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRDMCommand>Fv = .text:0x802DA820; // type:function size:0x54 scope:weak align:4 loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl = .text:0x802DA874; // type:function size:0xA4 scope:global align:4 loadToAram__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchUlUlPUl = .text:0x802DA918; // type:function size:0xA8 scope:global align:4 loadToAram_Async__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchPFUl_vUlUlPUl = .text:0x802DA9C0; // type:function size:0xB4 scope:global align:4 callCommand_Async__16JKRDvdAramRipperFP12JKRADCommand = .text:0x802DAA74; // type:function size:0x364 scope:global align:4 -__dt__18JSUFileInputStreamFv = .text:0x802DADD8; // type:function size:0x70 scope:global align:4 +__dt__18JSUFileInputStreamFv = .text:0x802DADD8; // type:function size:0x70 scope:weak align:4 syncAram__16JKRDvdAramRipperFP12JKRADCommandi = .text:0x802DAE48; // type:function size:0xD4 scope:global align:4 __ct__12JKRADCommandFv = .text:0x802DAF1C; // type:function size:0x40 scope:global align:4 __dt__12JKRADCommandFv = .text:0x802DAF5C; // type:function size:0x8C scope:global align:4 -JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl = .text:0x802DAFE8; // type:function size:0x178 scope:global align:4 -decompSZS_subroutine__FPUcUl = .text:0x802DB160; // type:function size:0x288 scope:global align:4 +JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl = .text:0x802DAFE8; // type:function size:0x178 scope:local align:4 +decompSZS_subroutine__FPUcUl = .text:0x802DB160; // type:function size:0x288 scope:local align:4 firstSrcData__Fv = .text:0x802DB3E8; // type:function size:0xB4 scope:local align:4 nextSrcData__FPUc = .text:0x802DB49C; // type:function size:0xE4 scope:local align:4 -dmaBufferFlush__FUl = .text:0x802DB580; // type:function size:0x68 scope:global align:4 +dmaBufferFlush__FUl = .text:0x802DB580; // type:function size:0x68 scope:local align:4 __sinit_JKRDvdAramRipper_cpp = .text:0x802DB5E8; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRADCommand>Fv = .text:0x802DB62C; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRADCommand>Fv = .text:0x802DB62C; // type:function size:0x54 scope:weak align:4 create__9JKRDecompFl = .text:0x802DB680; // type:function size:0x60 scope:global align:4 __ct__9JKRDecompFl = .text:0x802DB6E0; // type:function size:0x50 scope:global align:4 __dt__9JKRDecompFv = .text:0x802DB730; // type:function size:0x60 scope:global align:4 @@ -13040,9 +13040,9 @@ __ct__Q27JGadget20TVector_pointer_voidFRCQ27JGadget14TAllocator = .text:0x80 __dt__Q27JGadget20TVector_pointer_voidFv = .text:0x802DCCFC; // type:function size:0xA8 scope:global align:4 insert__Q27JGadget20TVector_pointer_voidFPPvRCPv = .text:0x802DCDA4; // type:function size:0x20 scope:global align:4 erase__Q27JGadget20TVector_pointer_voidFPPvPPv = .text:0x802DCDC4; // type:function size:0x58 scope:global align:4 -insert__Q27JGadget38TVector>FPPvUlRCPv = .text:0x802DCE1C; // type:function size:0x70 scope:global align:4 -Insert_raw__Q27JGadget38TVector>FPPvUl = .text:0x802DCE8C; // type:function size:0x2A4 scope:global align:4 -insert__Q27JGadget38TVector>FPPvRCPv = .text:0x802DD130; // type:function size:0x58 scope:global align:4 +insert__Q27JGadget38TVector>FPPvUlRCPv = .text:0x802DCE1C; // type:function size:0x70 scope:weak align:4 +Insert_raw__Q27JGadget38TVector>FPPvUl = .text:0x802DCE8C; // type:function size:0x2A4 scope:weak align:4 +insert__Q27JGadget38TVector>FPPvRCPv = .text:0x802DD130; // type:function size:0x58 scope:weak align:4 __ct__12JUTCacheFontFPC7ResFONTUlP7JKRHeap = .text:0x802DD188; // type:function size:0x80 scope:global align:4 __dt__12JUTCacheFontFv = .text:0x802DD208; // type:function size:0x94 scope:global align:4 deleteMemBlocks_CacheFont__12JUTCacheFontFv = .text:0x802DD29C; // type:function size:0x84 scope:global align:4 @@ -13115,9 +13115,9 @@ isLeadByte__10JUTResFontCFi = .text:0x802DFDA4; // type:function size:0x34 scope getFontCode__10JUTResFontCFi = .text:0x802DFDD8; // type:function size:0x188 scope:global align:4 loadImage__10JUTResFontFi11_GXTexMapID = .text:0x802DFF60; // type:function size:0x164 scope:global align:4 convertSjis__10JUTResFontCFiPUs = .text:0x802E00C4; // type:function size:0x44 scope:global align:4 -isLeadByte_1Byte__7JUTFontFi = .text:0x802E0108; // type:function size:0x8 scope:global align:4 -isLeadByte_2Byte__7JUTFontFi = .text:0x802E0110; // type:function size:0x8 scope:global align:4 -isLeadByte_ShiftJIS__7JUTFontFi = .text:0x802E0118; // type:function size:0x30 scope:global align:4 +isLeadByte_1Byte__7JUTFontFi = .text:0x802E0108; // type:function size:0x8 scope:weak align:4 +isLeadByte_2Byte__7JUTFontFi = .text:0x802E0110; // type:function size:0x8 scope:weak align:4 +isLeadByte_ShiftJIS__7JUTFontFi = .text:0x802E0118; // type:function size:0x30 scope:weak align:4 __ct__10JUTDbPrintFP7JUTFontP7JKRHeap = .text:0x802E0148; // type:function size:0x48 scope:global align:4 start__10JUTDbPrintFP7JUTFontP7JKRHeap = .text:0x802E0190; // type:function size:0x74 scope:global align:4 changeFont__10JUTDbPrintFP7JUTFont = .text:0x802E0204; // type:function size:0x18 scope:global align:4 @@ -13147,7 +13147,7 @@ clear__Q210JUTGamePad7CRumbleFv = .text:0x802E15B4; // type:function size:0x24 s clear__Q210JUTGamePad7CRumbleFP10JUTGamePad = .text:0x802E15D8; // type:function size:0x5C scope:global align:4 startMotor__Q210JUTGamePad7CRumbleFi = .text:0x802E1634; // type:function size:0x58 scope:global align:4 stopMotor__Q210JUTGamePad7CRumbleFib = .text:0x802E168C; // type:function size:0x6C scope:global align:4 -getNumBit__FPUci = .text:0x802E16F8; // type:function size:0x28 scope:global align:4 +getNumBit__FPUci = .text:0x802E16F8; // type:function size:0x28 scope:local align:4 update__Q210JUTGamePad7CRumbleFs = .text:0x802E1720; // type:function size:0x184 scope:global align:4 triggerPatternedRumble__Q210JUTGamePad7CRumbleFUl = .text:0x802E18A4; // type:function size:0x28 scope:global align:4 startPatternedRumble__Q210JUTGamePad7CRumbleFPvQ310JUTGamePad7CRumble7ERumbleUl = .text:0x802E18CC; // type:function size:0x7C scope:global align:4 @@ -13159,10 +13159,10 @@ setRepeat__Q210JUTGamePad7CButtonFUlUlUl = .text:0x802E1A7C; // type:function si recalibrate__10JUTGamePadFUl = .text:0x802E1A98; // type:function size:0x64 scope:global align:4 checkCallback__19JUTGamePadLongPressFiUl = .text:0x802E1AFC; // type:function size:0x64 scope:global align:4 __sinit_JUTGamePad_cpp = .text:0x802E1B60; // type:function size:0xF4 scope:local align:4 -__dt__30JSUList<19JUTGamePadLongPress>Fv = .text:0x802E1C54; // type:function size:0x54 scope:global align:4 -__ct__Q210JUTGamePad6CStickFv = .text:0x802E1CA8; // type:function size:0x30 scope:global align:4 -__ct__Q210JUTGamePad7CButtonFv = .text:0x802E1CD8; // type:function size:0x30 scope:global align:4 -__dt__21JSUList<10JUTGamePad>Fv = .text:0x802E1D08; // type:function size:0x54 scope:global align:4 +__dt__30JSUList<19JUTGamePadLongPress>Fv = .text:0x802E1C54; // type:function size:0x54 scope:weak align:4 +__ct__Q210JUTGamePad6CStickFv = .text:0x802E1CA8; // type:function size:0x30 scope:weak align:4 +__ct__Q210JUTGamePad7CButtonFv = .text:0x802E1CD8; // type:function size:0x30 scope:weak align:4 +__dt__21JSUList<10JUTGamePad>Fv = .text:0x802E1D08; // type:function size:0x54 scope:weak align:4 __ct__12JUTExceptionFP14JUTDirectPrint = .text:0x802E1D5C; // type:function size:0xE4 scope:global align:4 create__12JUTExceptionFP14JUTDirectPrint = .text:0x802E1E40; // type:function size:0x68 scope:global align:4 run__12JUTExceptionFv = .text:0x802E1EA8; // type:function size:0x124 scope:global align:4 @@ -13173,7 +13173,7 @@ setFPException__12JUTExceptionFUl = .text:0x802E227C; // type:function size:0x48 showFloatSub__12JUTExceptionFif = .text:0x802E22C4; // type:function size:0x190 scope:global align:4 showFloat__12JUTExceptionFP9OSContext = .text:0x802E2454; // type:function size:0x124 scope:global align:4 searchPartialModule__12JUTExceptionFUlPUlPUlPUlPUl = .text:0x802E2578; // type:function size:0xC0 scope:global align:4 -search_name_part__FPUcPUci = .text:0x802E2638; // type:function size:0x78 scope:global align:4 +search_name_part__FPUcPUci = .text:0x802E2638; // type:function size:0x78 scope:local align:4 showStack__12JUTExceptionFP9OSContext = .text:0x802E26B0; // type:function size:0x100 scope:global align:4 showMainInfo__12JUTExceptionFUsP9OSContextUlUl = .text:0x802E27B0; // type:function size:0x2D4 scope:global align:4 showGPR__12JUTExceptionFP9OSContext = .text:0x802E2A84; // type:function size:0xC0 scope:global align:4 @@ -13195,7 +13195,7 @@ createConsole__12JUTExceptionFPvUl = .text:0x802E3FEC; // type:function size:0xE __ct__13JUTExternalFBFP16_GXRenderModeObj8_GXGammaPvUl = .text:0x802E40CC; // type:function size:0x20 scope:global align:4 __dt__12JUTExceptionFv = .text:0x802E40EC; // type:function size:0x60 scope:global align:4 __sinit_JUTException_cpp = .text:0x802E414C; // type:function size:0x48 scope:local align:4 -__dt__39JSUListFv = .text:0x802E4194; // type:function size:0x54 scope:global align:4 +__dt__39JSUListFv = .text:0x802E4194; // type:function size:0x54 scope:weak align:4 __ct__14JUTDirectPrintFv = .text:0x802E41E8; // type:function size:0x58 scope:global align:4 start__14JUTDirectPrintFv = .text:0x802E4240; // type:function size:0x48 scope:global align:4 erase__14JUTDirectPrintFiiii = .text:0x802E4288; // type:function size:0x94 scope:global align:4 @@ -13247,11 +13247,11 @@ bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor = .text adjustMeterLength__10JUTProcBarFUlPfffPi = .text:0x802E5CC4; // type:function size:0x144 scope:global align:4 draw__10JUTProcBarFv = .text:0x802E5E08; // type:function size:0x34 scope:global align:4 drawProcessBar__10JUTProcBarFv = .text:0x802E5E3C; // type:function size:0xF00 scope:global align:4 -addrToXPos__FPvi = .text:0x802E6D3C; // type:function size:0x68 scope:global align:4 -byteToXLen__Fii = .text:0x802E6DA4; // type:function size:0x68 scope:global align:4 -heapBar__FP7JKRHeapiiiii = .text:0x802E6E0C; // type:function size:0x194 scope:global align:4 +addrToXPos__FPvi = .text:0x802E6D3C; // type:function size:0x68 scope:local align:4 +byteToXLen__Fii = .text:0x802E6DA4; // type:function size:0x68 scope:local align:4 +heapBar__FP7JKRHeapiiiii = .text:0x802E6E0C; // type:function size:0x194 scope:local align:4 drawHeapBar__10JUTProcBarFv = .text:0x802E6FA0; // type:function size:0x3A0 scope:global align:4 -__ct__Q210JUTProcBar5CTimeFv = .text:0x802E7340; // type:function size:0x14 scope:global align:4 +__ct__Q210JUTProcBar5CTimeFv = .text:0x802E7340; // type:function size:0x14 scope:weak align:4 create__10JUTConsoleFUiUiP7JKRHeap = .text:0x802E7354; // type:function size:0x90 scope:global align:4 create__10JUTConsoleFUiPvUl = .text:0x802E73E4; // type:function size:0x88 scope:global align:4 __ct__10JUTConsoleFUiUib = .text:0x802E746C; // type:function size:0xF0 scope:global align:4 @@ -13301,10 +13301,10 @@ fillBox__14J2DGrafContextFRCQ29JGeometry8TBox2 = .text:0x802E9260; // type:fu drawFrame__14J2DGrafContextFRCQ29JGeometry8TBox2 = .text:0x802E9368; // type:function size:0x120 scope:global align:4 line__14J2DGrafContextFQ29JGeometry8TVec2Q29JGeometry8TVec2 = .text:0x802E9488; // type:function size:0xDC scope:global align:4 lineTo__14J2DGrafContextFQ29JGeometry8TVec2 = .text:0x802E9564; // type:function size:0x70 scope:global align:4 -__dt__14J2DGrafContextFv = .text:0x802E95D4; // type:function size:0x48 scope:global align:4 -place__14J2DGrafContextFffff = .text:0x802E961C; // type:function size:0x48 scope:global align:4 -getGrafType__14J2DGrafContextCFv = .text:0x802E9664; // type:function size:0x8 scope:global align:4 -setLookat__14J2DGrafContextFv = .text:0x802E966C; // type:function size:0x4 scope:global align:4 +__dt__14J2DGrafContextFv = .text:0x802E95D4; // type:function size:0x48 scope:weak align:4 +place__14J2DGrafContextFffff = .text:0x802E961C; // type:function size:0x48 scope:weak align:4 +getGrafType__14J2DGrafContextCFv = .text:0x802E9664; // type:function size:0x8 scope:weak align:4 +setLookat__14J2DGrafContextFv = .text:0x802E966C; // type:function size:0x4 scope:weak align:4 __ct__13J2DOrthoGraphFv = .text:0x802E9670; // type:function size:0x60 scope:global align:4 __ct__13J2DOrthoGraphFffffff = .text:0x802E96D0; // type:function size:0xE4 scope:global align:4 setPort__13J2DOrthoGraphFv = .text:0x802E97B4; // type:function size:0x58 scope:global align:4 @@ -13316,7 +13316,7 @@ J2DFillBox__FffffQ28JUtility6TColor = .text:0x802E9AC4; // type:function size:0x J2DFillBox__FRCQ29JGeometry8TBox2Q28JUtility6TColor = .text:0x802E9B0C; // type:function size:0x90 scope:global align:4 J2DDrawFrame__FffffQ28JUtility6TColorUc = .text:0x802E9B9C; // type:function size:0x4C scope:global align:4 J2DDrawFrame__FRCQ29JGeometry8TBox2Q28JUtility6TColorUc = .text:0x802E9BE8; // type:function size:0xA0 scope:global align:4 -getGrafType__13J2DOrthoGraphCFv = .text:0x802E9C88; // type:function size:0x8 scope:global align:4 +getGrafType__13J2DOrthoGraphCFv = .text:0x802E9C88; // type:function size:0x8 scope:weak align:4 load__9J2DTexMtxFUl = .text:0x802E9C90; // type:function size:0x34 scope:global align:4 calc__9J2DTexMtxFv = .text:0x802E9CC4; // type:function size:0x68 scope:global align:4 getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f = .text:0x802E9D2C; // type:function size:0x190 scope:global align:4 @@ -13325,21 +13325,21 @@ load__14J2DIndTevStageFUc = .text:0x802EA044; // type:function size:0x54 scope:g load__12J2DIndTexMtxFUc = .text:0x802EA098; // type:function size:0x34 scope:global align:4 load__19J2DIndTexCoordScaleFUc = .text:0x802EA0CC; // type:function size:0x30 scope:global align:4 load__14J2DIndTexOrderFUc = .text:0x802EA0FC; // type:function size:0x30 scope:global align:4 -getTevSwapModeTable__11J2DTevBlockFUl = .text:0x802EA12C; // type:function size:0x8 scope:global align:4 -getTevStage__11J2DTevBlockFUl = .text:0x802EA134; // type:function size:0x8 scope:global align:4 -getTevColor__11J2DTevBlockFUl = .text:0x802EA13C; // type:function size:0x8 scope:global align:4 -getTevOrder__11J2DTevBlockFUl = .text:0x802EA144; // type:function size:0x8 scope:global align:4 -getTevKAlphaSel__11J2DTevBlockFUl = .text:0x802EA14C; // type:function size:0x8 scope:global align:4 -getTevKColorSel__11J2DTevBlockFUl = .text:0x802EA154; // type:function size:0x8 scope:global align:4 -getTevKColor__11J2DTevBlockFUl = .text:0x802EA15C; // type:function size:0x8 scope:global align:4 -getFontNo__11J2DTevBlockCFv = .text:0x802EA164; // type:function size:0xC scope:global align:4 -getTexNo__11J2DTevBlockCFUl = .text:0x802EA170; // type:function size:0xC scope:global align:4 -getTevStageNum__11J2DTevBlockCFv = .text:0x802EA17C; // type:function size:0x8 scope:global align:4 -getIndTevStage__11J2DTevBlockFUl = .text:0x802EA184; // type:function size:0x8 scope:global align:4 -getIndTexCoordScale__11J2DIndBlockFUl = .text:0x802EA18C; // type:function size:0x8 scope:global align:4 -getIndTexMtx__11J2DIndBlockFUl = .text:0x802EA194; // type:function size:0x8 scope:global align:4 -getIndTexOrder__11J2DIndBlockFUl = .text:0x802EA19C; // type:function size:0x8 scope:global align:4 -getIndTexStageNum__11J2DIndBlockCFv = .text:0x802EA1A4; // type:function size:0x8 scope:global align:4 +getTevSwapModeTable__11J2DTevBlockFUl = .text:0x802EA12C; // type:function size:0x8 scope:weak align:4 +getTevStage__11J2DTevBlockFUl = .text:0x802EA134; // type:function size:0x8 scope:weak align:4 +getTevColor__11J2DTevBlockFUl = .text:0x802EA13C; // type:function size:0x8 scope:weak align:4 +getTevOrder__11J2DTevBlockFUl = .text:0x802EA144; // type:function size:0x8 scope:weak align:4 +getTevKAlphaSel__11J2DTevBlockFUl = .text:0x802EA14C; // type:function size:0x8 scope:weak align:4 +getTevKColorSel__11J2DTevBlockFUl = .text:0x802EA154; // type:function size:0x8 scope:weak align:4 +getTevKColor__11J2DTevBlockFUl = .text:0x802EA15C; // type:function size:0x8 scope:weak align:4 +getFontNo__11J2DTevBlockCFv = .text:0x802EA164; // type:function size:0xC scope:weak align:4 +getTexNo__11J2DTevBlockCFUl = .text:0x802EA170; // type:function size:0xC scope:weak align:4 +getTevStageNum__11J2DTevBlockCFv = .text:0x802EA17C; // type:function size:0x8 scope:weak align:4 +getIndTevStage__11J2DTevBlockFUl = .text:0x802EA184; // type:function size:0x8 scope:weak align:4 +getIndTexCoordScale__11J2DIndBlockFUl = .text:0x802EA18C; // type:function size:0x8 scope:weak align:4 +getIndTexMtx__11J2DIndBlockFUl = .text:0x802EA194; // type:function size:0x8 scope:weak align:4 +getIndTexOrder__11J2DIndBlockFUl = .text:0x802EA19C; // type:function size:0x8 scope:weak align:4 +getIndTexStageNum__11J2DIndBlockCFv = .text:0x802EA1A4; // type:function size:0x8 scope:weak align:4 __ct__11J2DMaterialFv = .text:0x802EA1AC; // type:function size:0x120 scope:global align:4 __dt__11J2DMaterialFv = .text:0x802EA2CC; // type:function size:0xC0 scope:global align:4 setGX__11J2DMaterialFv = .text:0x802EA38C; // type:function size:0x84 scope:global align:4 @@ -13464,202 +13464,202 @@ initialize__15J2DIndBlockFullFv = .text:0x802F1664; // type:function size:0xCC s setGX__15J2DIndBlockFullFv = .text:0x802F1730; // type:function size:0xCC scope:global align:4 initialize__10J2DPEBlockFv = .text:0x802F17FC; // type:function size:0x44 scope:global align:4 setGX__10J2DPEBlockFv = .text:0x802F1840; // type:function size:0x60 scope:global align:4 -__ct__14J2DIndTevStageFv = .text:0x802F18A0; // type:function size:0x94 scope:global align:4 -__ct__19J2DTevSwapModeTableFv = .text:0x802F1934; // type:function size:0xC scope:global align:4 -__ct__11J2DTevStageFv = .text:0x802F1940; // type:function size:0x68 scope:global align:4 -setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F19A8; // type:function size:0x1C8 scope:global align:4 -__ct__11J2DTevOrderFv = .text:0x802F1B70; // type:function size:0x20 scope:global align:4 -__ct__13J2DGXColorS10Fv = .text:0x802F1B90; // type:function size:0x4 scope:global align:4 -getType__15J2DIndBlockFullFv = .text:0x802F1B94; // type:function size:0xC scope:global align:4 -setIndTexStageNum__15J2DIndBlockFullFUc = .text:0x802F1BA0; // type:function size:0x8 scope:global align:4 -getIndTexStageNum__15J2DIndBlockFullCFv = .text:0x802F1BA8; // type:function size:0x8 scope:global align:4 -setIndTexOrder__15J2DIndBlockFullFUl14J2DIndTexOrder = .text:0x802F1BB0; // type:function size:0x1C scope:global align:4 -getIndTexOrder__15J2DIndBlockFullFUl = .text:0x802F1BCC; // type:function size:0x14 scope:global align:4 -setIndTexMtx__15J2DIndBlockFullFUl12J2DIndTexMtx = .text:0x802F1BE0; // type:function size:0x58 scope:global align:4 -getIndTexMtx__15J2DIndBlockFullFUl = .text:0x802F1C38; // type:function size:0x14 scope:global align:4 -setIndTexCoordScale__15J2DIndBlockFullFUl19J2DIndTexCoordScale = .text:0x802F1C4C; // type:function size:0x1C scope:global align:4 -getIndTexCoordScale__15J2DIndBlockFullFUl = .text:0x802F1C68; // type:function size:0x14 scope:global align:4 -__dt__15J2DIndBlockFullFv = .text:0x802F1C7C; // type:function size:0x9C scope:global align:4 -getType__13J2DTevBlock16Fv = .text:0x802F1D18; // type:function size:0xC scope:global align:4 -getMaxStage__13J2DTevBlock16Fv = .text:0x802F1D24; // type:function size:0x8 scope:global align:4 -setTexNo__13J2DTevBlock16FUlUs = .text:0x802F1D2C; // type:function size:0x10 scope:global align:4 -getTexNo__13J2DTevBlock16CFUl = .text:0x802F1D3C; // type:function size:0x10 scope:global align:4 -setFontNo__13J2DTevBlock16FUs = .text:0x802F1D4C; // type:function size:0x8 scope:global align:4 -getFontNo__13J2DTevBlock16CFv = .text:0x802F1D54; // type:function size:0x8 scope:global align:4 -setTevOrder__13J2DTevBlock16FUl11J2DTevOrder = .text:0x802F1D5C; // type:function size:0x24 scope:global align:4 -getTevOrder__13J2DTevBlock16FUl = .text:0x802F1D80; // type:function size:0x14 scope:global align:4 -setTevColor__13J2DTevBlock16FUl13J2DGXColorS10 = .text:0x802F1D94; // type:function size:0x2C scope:global align:4 -getTevColor__13J2DTevBlock16FUl = .text:0x802F1DC0; // type:function size:0x14 scope:global align:4 -setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor = .text:0x802F1DD4; // type:function size:0x2C scope:global align:4 -getTevKColor__13J2DTevBlock16FUl = .text:0x802F1E00; // type:function size:0x14 scope:global align:4 -setTevKColorSel__13J2DTevBlock16FUlUc = .text:0x802F1E14; // type:function size:0xC scope:global align:4 -getTevKColorSel__13J2DTevBlock16FUl = .text:0x802F1E20; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__13J2DTevBlock16FUlUc = .text:0x802F1E2C; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__13J2DTevBlock16FUl = .text:0x802F1E38; // type:function size:0xC scope:global align:4 -setTevStageNum__13J2DTevBlock16FUc = .text:0x802F1E44; // type:function size:0x8 scope:global align:4 -getTevStageNum__13J2DTevBlock16CFv = .text:0x802F1E4C; // type:function size:0x8 scope:global align:4 -setTevStage__13J2DTevBlock16FUl11J2DTevStage = .text:0x802F1E54; // type:function size:0x3C scope:global align:4 -getTevStage__13J2DTevBlock16FUl = .text:0x802F1E90; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo = .text:0x802F1EA4; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable = .text:0x802F1EDC; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__13J2DTevBlock16FUl = .text:0x802F1EEC; // type:function size:0x10 scope:global align:4 -setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage = .text:0x802F1EFC; // type:function size:0x14 scope:global align:4 -getIndTevStage__13J2DTevBlock16FUl = .text:0x802F1F10; // type:function size:0x14 scope:global align:4 -insertTexture__13J2DTevBlock16FUlPC7ResTIMG = .text:0x802F1F24; // type:function size:0x30 scope:global align:4 -getTexture__13J2DTevBlock16FUl = .text:0x802F1F54; // type:function size:0x20 scope:global align:4 -getPalette__13J2DTevBlock16FUl = .text:0x802F1F74; // type:function size:0x20 scope:global align:4 -getFont__13J2DTevBlock16Fv = .text:0x802F1F94; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__13J2DTevBlock16FUc = .text:0x802F1F9C; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__13J2DTevBlock16Fv = .text:0x802F1FAC; // type:function size:0xC scope:global align:4 -getType__12J2DTevBlock8Fv = .text:0x802F1FB8; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock8Fv = .text:0x802F1FC4; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock8FUlUs = .text:0x802F1FCC; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock8CFUl = .text:0x802F1FDC; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock8FUs = .text:0x802F1FEC; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock8CFv = .text:0x802F1FF4; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock8FUl11J2DTevOrder = .text:0x802F1FFC; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock8FUl = .text:0x802F2020; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock8FUl13J2DGXColorS10 = .text:0x802F2034; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock8FUl = .text:0x802F2060; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor = .text:0x802F2074; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock8FUl = .text:0x802F20A0; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock8FUlUc = .text:0x802F20B4; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock8FUl = .text:0x802F20C0; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock8FUlUc = .text:0x802F20CC; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock8FUl = .text:0x802F20D8; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock8FUc = .text:0x802F20E4; // type:function size:0x8 scope:global align:4 -getTevStageNum__12J2DTevBlock8CFv = .text:0x802F20EC; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock8FUl11J2DTevStage = .text:0x802F20F4; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock8FUl = .text:0x802F2130; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo = .text:0x802F2144; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable = .text:0x802F217C; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock8FUl = .text:0x802F218C; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage = .text:0x802F219C; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock8FUl = .text:0x802F21B0; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock8FUlPC7ResTIMG = .text:0x802F21C4; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock8FUl = .text:0x802F21F4; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock8FUl = .text:0x802F2214; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock8Fv = .text:0x802F2234; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock8FUc = .text:0x802F223C; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock8Fv = .text:0x802F224C; // type:function size:0xC scope:global align:4 -getType__12J2DTevBlock4Fv = .text:0x802F2258; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock4Fv = .text:0x802F2264; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock4FUlUs = .text:0x802F226C; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock4CFUl = .text:0x802F227C; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock4FUs = .text:0x802F228C; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock4CFv = .text:0x802F2294; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock4FUl11J2DTevOrder = .text:0x802F229C; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock4FUl = .text:0x802F22C0; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock4FUl13J2DGXColorS10 = .text:0x802F22D4; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock4FUl = .text:0x802F2300; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor = .text:0x802F2314; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock4FUl = .text:0x802F2340; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock4FUlUc = .text:0x802F2354; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock4FUl = .text:0x802F2360; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock4FUlUc = .text:0x802F236C; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock4FUl = .text:0x802F2378; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock4FUc = .text:0x802F2384; // type:function size:0x8 scope:global align:4 -getTevStageNum__12J2DTevBlock4CFv = .text:0x802F238C; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock4FUl11J2DTevStage = .text:0x802F2394; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock4FUl = .text:0x802F23D0; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo = .text:0x802F23E4; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable = .text:0x802F241C; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock4FUl = .text:0x802F242C; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage = .text:0x802F243C; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock4FUl = .text:0x802F2450; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock4FUlPC7ResTIMG = .text:0x802F2464; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock4FUl = .text:0x802F2494; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock4FUl = .text:0x802F24B4; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock4Fv = .text:0x802F24D4; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock4FUc = .text:0x802F24DC; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock4Fv = .text:0x802F24EC; // type:function size:0x10 scope:global align:4 -getType__12J2DTevBlock2Fv = .text:0x802F24FC; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock2Fv = .text:0x802F2508; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock2FUlUs = .text:0x802F2510; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock2CFUl = .text:0x802F2520; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock2FUs = .text:0x802F2530; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock2CFv = .text:0x802F2538; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock2FUl11J2DTevOrder = .text:0x802F2540; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock2FUl = .text:0x802F2564; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock2FUl13J2DGXColorS10 = .text:0x802F2578; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock2FUl = .text:0x802F25A4; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor = .text:0x802F25B8; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock2FUl = .text:0x802F25E4; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock2FUlUc = .text:0x802F25F8; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock2FUl = .text:0x802F2604; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock2FUlUc = .text:0x802F2610; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock2FUl = .text:0x802F261C; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock2FUc = .text:0x802F2628; // type:function size:0x8 scope:global align:4 -getTevStageNum__12J2DTevBlock2CFv = .text:0x802F2630; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock2FUl11J2DTevStage = .text:0x802F2638; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock2FUl = .text:0x802F2674; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo = .text:0x802F2688; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable = .text:0x802F26C0; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock2FUl = .text:0x802F26D0; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage = .text:0x802F26E0; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock2FUl = .text:0x802F26F4; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock2FUlPC7ResTIMG = .text:0x802F2708; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock2FUl = .text:0x802F2738; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock2FUl = .text:0x802F2758; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock2Fv = .text:0x802F2778; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock2FUc = .text:0x802F2780; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock2Fv = .text:0x802F2790; // type:function size:0x10 scope:global align:4 -getType__12J2DTevBlock1Fv = .text:0x802F27A0; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock1Fv = .text:0x802F27AC; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock1FUlUs = .text:0x802F27B4; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock1CFUl = .text:0x802F27C4; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock1FUs = .text:0x802F27D4; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock1CFv = .text:0x802F27DC; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock1FUl11J2DTevOrder = .text:0x802F27E4; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock1FUl = .text:0x802F2808; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock1FUl13J2DGXColorS10 = .text:0x802F281C; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock1FUl = .text:0x802F2848; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor = .text:0x802F285C; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock1FUl = .text:0x802F2888; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock1FUlUc = .text:0x802F289C; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock1FUl = .text:0x802F28A8; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock1FUlUc = .text:0x802F28B4; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock1FUl = .text:0x802F28C0; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock1FUc = .text:0x802F28CC; // type:function size:0x4 scope:global align:4 -getTevStageNum__12J2DTevBlock1CFv = .text:0x802F28D0; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock1FUl11J2DTevStage = .text:0x802F28D8; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock1FUl = .text:0x802F2914; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo = .text:0x802F2928; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable = .text:0x802F2960; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock1FUl = .text:0x802F2970; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage = .text:0x802F2980; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock1FUl = .text:0x802F2994; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock1FUlPC7ResTIMG = .text:0x802F29A8; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock1FUl = .text:0x802F29D8; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock1FUl = .text:0x802F29F8; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock1Fv = .text:0x802F2A18; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock1FUc = .text:0x802F2A20; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock1Fv = .text:0x802F2A30; // type:function size:0x10 scope:global align:4 -initialize__11J2DTevBlockFv = .text:0x802F2A40; // type:function size:0x4 scope:global align:4 -loadTexture__11J2DTevBlockF11_GXTexMapIDUl = .text:0x802F2A44; // type:function size:0x4 scope:global align:4 -setFontNo__11J2DTevBlockFUs = .text:0x802F2A48; // type:function size:0x4 scope:global align:4 -setTevOrder__11J2DTevBlockFUl11J2DTevOrder = .text:0x802F2A4C; // type:function size:0x4 scope:global align:4 -setTevKColorSel__11J2DTevBlockFUlUc = .text:0x802F2A50; // type:function size:0x4 scope:global align:4 -setTevKAlphaSel__11J2DTevBlockFUlUc = .text:0x802F2A54; // type:function size:0x4 scope:global align:4 -setTevStageNum__11J2DTevBlockFUc = .text:0x802F2A58; // type:function size:0x4 scope:global align:4 -setTevStage__11J2DTevBlockFUl11J2DTevStage = .text:0x802F2A5C; // type:function size:0x4 scope:global align:4 -setTevSwapModeInfo__11J2DTevBlockFUl18J2DTevSwapModeInfo = .text:0x802F2A60; // type:function size:0x4 scope:global align:4 -setTevSwapModeTable__11J2DTevBlockFUl19J2DTevSwapModeTable = .text:0x802F2A64; // type:function size:0x4 scope:global align:4 -setIndTevStage__11J2DTevBlockFUl14J2DIndTevStage = .text:0x802F2A68; // type:function size:0x4 scope:global align:4 -insertTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F2A6C; // type:function size:0x8 scope:global align:4 -insertTexture__11J2DTevBlockFUlPC7ResTIMGP10JUTPalette = .text:0x802F2A74; // type:function size:0x8 scope:global align:4 -insertTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F2A7C; // type:function size:0x8 scope:global align:4 -setTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F2A84; // type:function size:0x8 scope:global align:4 -setTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F2A8C; // type:function size:0x8 scope:global align:4 -removeTexture__11J2DTevBlockFUl = .text:0x802F2A94; // type:function size:0x8 scope:global align:4 -setFont__11J2DTevBlockFP7JUTFont = .text:0x802F2A9C; // type:function size:0x8 scope:global align:4 -setFont__11J2DTevBlockFP7ResFONT = .text:0x802F2AA4; // type:function size:0x8 scope:global align:4 -setPalette__11J2DTevBlockFUlPC7ResTLUT = .text:0x802F2AAC; // type:function size:0x8 scope:global align:4 -prepareTexture__11J2DTevBlockFUc = .text:0x802F2AB4; // type:function size:0x8 scope:global align:4 -getFont__11J2DTevBlockFv = .text:0x802F2ABC; // type:function size:0x8 scope:global align:4 -shiftDeleteFlag__11J2DTevBlockFUcb = .text:0x802F2AC4; // type:function size:0x4 scope:global align:4 -setUndeleteFlag__11J2DTevBlockFUc = .text:0x802F2AC8; // type:function size:0x4 scope:global align:4 -setFontUndeleteFlag__11J2DTevBlockFv = .text:0x802F2ACC; // type:function size:0x4 scope:global align:4 +__ct__14J2DIndTevStageFv = .text:0x802F18A0; // type:function size:0x94 scope:weak align:4 +__ct__19J2DTevSwapModeTableFv = .text:0x802F1934; // type:function size:0xC scope:weak align:4 +__ct__11J2DTevStageFv = .text:0x802F1940; // type:function size:0x68 scope:weak align:4 +setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F19A8; // type:function size:0x1C8 scope:weak align:4 +__ct__11J2DTevOrderFv = .text:0x802F1B70; // type:function size:0x20 scope:weak align:4 +__ct__13J2DGXColorS10Fv = .text:0x802F1B90; // type:function size:0x4 scope:weak align:4 +getType__15J2DIndBlockFullFv = .text:0x802F1B94; // type:function size:0xC scope:weak align:4 +setIndTexStageNum__15J2DIndBlockFullFUc = .text:0x802F1BA0; // type:function size:0x8 scope:weak align:4 +getIndTexStageNum__15J2DIndBlockFullCFv = .text:0x802F1BA8; // type:function size:0x8 scope:weak align:4 +setIndTexOrder__15J2DIndBlockFullFUl14J2DIndTexOrder = .text:0x802F1BB0; // type:function size:0x1C scope:weak align:4 +getIndTexOrder__15J2DIndBlockFullFUl = .text:0x802F1BCC; // type:function size:0x14 scope:weak align:4 +setIndTexMtx__15J2DIndBlockFullFUl12J2DIndTexMtx = .text:0x802F1BE0; // type:function size:0x58 scope:weak align:4 +getIndTexMtx__15J2DIndBlockFullFUl = .text:0x802F1C38; // type:function size:0x14 scope:weak align:4 +setIndTexCoordScale__15J2DIndBlockFullFUl19J2DIndTexCoordScale = .text:0x802F1C4C; // type:function size:0x1C scope:weak align:4 +getIndTexCoordScale__15J2DIndBlockFullFUl = .text:0x802F1C68; // type:function size:0x14 scope:weak align:4 +__dt__15J2DIndBlockFullFv = .text:0x802F1C7C; // type:function size:0x9C scope:weak align:4 +getType__13J2DTevBlock16Fv = .text:0x802F1D18; // type:function size:0xC scope:weak align:4 +getMaxStage__13J2DTevBlock16Fv = .text:0x802F1D24; // type:function size:0x8 scope:weak align:4 +setTexNo__13J2DTevBlock16FUlUs = .text:0x802F1D2C; // type:function size:0x10 scope:weak align:4 +getTexNo__13J2DTevBlock16CFUl = .text:0x802F1D3C; // type:function size:0x10 scope:weak align:4 +setFontNo__13J2DTevBlock16FUs = .text:0x802F1D4C; // type:function size:0x8 scope:weak align:4 +getFontNo__13J2DTevBlock16CFv = .text:0x802F1D54; // type:function size:0x8 scope:weak align:4 +setTevOrder__13J2DTevBlock16FUl11J2DTevOrder = .text:0x802F1D5C; // type:function size:0x24 scope:weak align:4 +getTevOrder__13J2DTevBlock16FUl = .text:0x802F1D80; // type:function size:0x14 scope:weak align:4 +setTevColor__13J2DTevBlock16FUl13J2DGXColorS10 = .text:0x802F1D94; // type:function size:0x2C scope:weak align:4 +getTevColor__13J2DTevBlock16FUl = .text:0x802F1DC0; // type:function size:0x14 scope:weak align:4 +setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor = .text:0x802F1DD4; // type:function size:0x2C scope:weak align:4 +getTevKColor__13J2DTevBlock16FUl = .text:0x802F1E00; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__13J2DTevBlock16FUlUc = .text:0x802F1E14; // type:function size:0xC scope:weak align:4 +getTevKColorSel__13J2DTevBlock16FUl = .text:0x802F1E20; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__13J2DTevBlock16FUlUc = .text:0x802F1E2C; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__13J2DTevBlock16FUl = .text:0x802F1E38; // type:function size:0xC scope:weak align:4 +setTevStageNum__13J2DTevBlock16FUc = .text:0x802F1E44; // type:function size:0x8 scope:weak align:4 +getTevStageNum__13J2DTevBlock16CFv = .text:0x802F1E4C; // type:function size:0x8 scope:weak align:4 +setTevStage__13J2DTevBlock16FUl11J2DTevStage = .text:0x802F1E54; // type:function size:0x3C scope:weak align:4 +getTevStage__13J2DTevBlock16FUl = .text:0x802F1E90; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo = .text:0x802F1EA4; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable = .text:0x802F1EDC; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__13J2DTevBlock16FUl = .text:0x802F1EEC; // type:function size:0x10 scope:weak align:4 +setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage = .text:0x802F1EFC; // type:function size:0x14 scope:weak align:4 +getIndTevStage__13J2DTevBlock16FUl = .text:0x802F1F10; // type:function size:0x14 scope:weak align:4 +insertTexture__13J2DTevBlock16FUlPC7ResTIMG = .text:0x802F1F24; // type:function size:0x30 scope:weak align:4 +getTexture__13J2DTevBlock16FUl = .text:0x802F1F54; // type:function size:0x20 scope:weak align:4 +getPalette__13J2DTevBlock16FUl = .text:0x802F1F74; // type:function size:0x20 scope:weak align:4 +getFont__13J2DTevBlock16Fv = .text:0x802F1F94; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__13J2DTevBlock16FUc = .text:0x802F1F9C; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__13J2DTevBlock16Fv = .text:0x802F1FAC; // type:function size:0xC scope:weak align:4 +getType__12J2DTevBlock8Fv = .text:0x802F1FB8; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock8Fv = .text:0x802F1FC4; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock8FUlUs = .text:0x802F1FCC; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock8CFUl = .text:0x802F1FDC; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock8FUs = .text:0x802F1FEC; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock8CFv = .text:0x802F1FF4; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock8FUl11J2DTevOrder = .text:0x802F1FFC; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock8FUl = .text:0x802F2020; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock8FUl13J2DGXColorS10 = .text:0x802F2034; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock8FUl = .text:0x802F2060; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor = .text:0x802F2074; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock8FUl = .text:0x802F20A0; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock8FUlUc = .text:0x802F20B4; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock8FUl = .text:0x802F20C0; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock8FUlUc = .text:0x802F20CC; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock8FUl = .text:0x802F20D8; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock8FUc = .text:0x802F20E4; // type:function size:0x8 scope:weak align:4 +getTevStageNum__12J2DTevBlock8CFv = .text:0x802F20EC; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock8FUl11J2DTevStage = .text:0x802F20F4; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock8FUl = .text:0x802F2130; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo = .text:0x802F2144; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable = .text:0x802F217C; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock8FUl = .text:0x802F218C; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage = .text:0x802F219C; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock8FUl = .text:0x802F21B0; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock8FUlPC7ResTIMG = .text:0x802F21C4; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock8FUl = .text:0x802F21F4; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock8FUl = .text:0x802F2214; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock8Fv = .text:0x802F2234; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock8FUc = .text:0x802F223C; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock8Fv = .text:0x802F224C; // type:function size:0xC scope:weak align:4 +getType__12J2DTevBlock4Fv = .text:0x802F2258; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock4Fv = .text:0x802F2264; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock4FUlUs = .text:0x802F226C; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock4CFUl = .text:0x802F227C; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock4FUs = .text:0x802F228C; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock4CFv = .text:0x802F2294; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock4FUl11J2DTevOrder = .text:0x802F229C; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock4FUl = .text:0x802F22C0; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock4FUl13J2DGXColorS10 = .text:0x802F22D4; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock4FUl = .text:0x802F2300; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor = .text:0x802F2314; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock4FUl = .text:0x802F2340; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock4FUlUc = .text:0x802F2354; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock4FUl = .text:0x802F2360; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock4FUlUc = .text:0x802F236C; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock4FUl = .text:0x802F2378; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock4FUc = .text:0x802F2384; // type:function size:0x8 scope:weak align:4 +getTevStageNum__12J2DTevBlock4CFv = .text:0x802F238C; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock4FUl11J2DTevStage = .text:0x802F2394; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock4FUl = .text:0x802F23D0; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo = .text:0x802F23E4; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable = .text:0x802F241C; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock4FUl = .text:0x802F242C; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage = .text:0x802F243C; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock4FUl = .text:0x802F2450; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock4FUlPC7ResTIMG = .text:0x802F2464; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock4FUl = .text:0x802F2494; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock4FUl = .text:0x802F24B4; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock4Fv = .text:0x802F24D4; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock4FUc = .text:0x802F24DC; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock4Fv = .text:0x802F24EC; // type:function size:0x10 scope:weak align:4 +getType__12J2DTevBlock2Fv = .text:0x802F24FC; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock2Fv = .text:0x802F2508; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock2FUlUs = .text:0x802F2510; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock2CFUl = .text:0x802F2520; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock2FUs = .text:0x802F2530; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock2CFv = .text:0x802F2538; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock2FUl11J2DTevOrder = .text:0x802F2540; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock2FUl = .text:0x802F2564; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock2FUl13J2DGXColorS10 = .text:0x802F2578; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock2FUl = .text:0x802F25A4; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor = .text:0x802F25B8; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock2FUl = .text:0x802F25E4; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock2FUlUc = .text:0x802F25F8; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock2FUl = .text:0x802F2604; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock2FUlUc = .text:0x802F2610; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock2FUl = .text:0x802F261C; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock2FUc = .text:0x802F2628; // type:function size:0x8 scope:weak align:4 +getTevStageNum__12J2DTevBlock2CFv = .text:0x802F2630; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock2FUl11J2DTevStage = .text:0x802F2638; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock2FUl = .text:0x802F2674; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo = .text:0x802F2688; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable = .text:0x802F26C0; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock2FUl = .text:0x802F26D0; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage = .text:0x802F26E0; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock2FUl = .text:0x802F26F4; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock2FUlPC7ResTIMG = .text:0x802F2708; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock2FUl = .text:0x802F2738; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock2FUl = .text:0x802F2758; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock2Fv = .text:0x802F2778; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock2FUc = .text:0x802F2780; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock2Fv = .text:0x802F2790; // type:function size:0x10 scope:weak align:4 +getType__12J2DTevBlock1Fv = .text:0x802F27A0; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock1Fv = .text:0x802F27AC; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock1FUlUs = .text:0x802F27B4; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock1CFUl = .text:0x802F27C4; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock1FUs = .text:0x802F27D4; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock1CFv = .text:0x802F27DC; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock1FUl11J2DTevOrder = .text:0x802F27E4; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock1FUl = .text:0x802F2808; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock1FUl13J2DGXColorS10 = .text:0x802F281C; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock1FUl = .text:0x802F2848; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor = .text:0x802F285C; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock1FUl = .text:0x802F2888; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock1FUlUc = .text:0x802F289C; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock1FUl = .text:0x802F28A8; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock1FUlUc = .text:0x802F28B4; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock1FUl = .text:0x802F28C0; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock1FUc = .text:0x802F28CC; // type:function size:0x4 scope:weak align:4 +getTevStageNum__12J2DTevBlock1CFv = .text:0x802F28D0; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock1FUl11J2DTevStage = .text:0x802F28D8; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock1FUl = .text:0x802F2914; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo = .text:0x802F2928; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable = .text:0x802F2960; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock1FUl = .text:0x802F2970; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage = .text:0x802F2980; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock1FUl = .text:0x802F2994; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock1FUlPC7ResTIMG = .text:0x802F29A8; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock1FUl = .text:0x802F29D8; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock1FUl = .text:0x802F29F8; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock1Fv = .text:0x802F2A18; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock1FUc = .text:0x802F2A20; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock1Fv = .text:0x802F2A30; // type:function size:0x10 scope:weak align:4 +initialize__11J2DTevBlockFv = .text:0x802F2A40; // type:function size:0x4 scope:weak align:4 +loadTexture__11J2DTevBlockF11_GXTexMapIDUl = .text:0x802F2A44; // type:function size:0x4 scope:weak align:4 +setFontNo__11J2DTevBlockFUs = .text:0x802F2A48; // type:function size:0x4 scope:weak align:4 +setTevOrder__11J2DTevBlockFUl11J2DTevOrder = .text:0x802F2A4C; // type:function size:0x4 scope:weak align:4 +setTevKColorSel__11J2DTevBlockFUlUc = .text:0x802F2A50; // type:function size:0x4 scope:weak align:4 +setTevKAlphaSel__11J2DTevBlockFUlUc = .text:0x802F2A54; // type:function size:0x4 scope:weak align:4 +setTevStageNum__11J2DTevBlockFUc = .text:0x802F2A58; // type:function size:0x4 scope:weak align:4 +setTevStage__11J2DTevBlockFUl11J2DTevStage = .text:0x802F2A5C; // type:function size:0x4 scope:weak align:4 +setTevSwapModeInfo__11J2DTevBlockFUl18J2DTevSwapModeInfo = .text:0x802F2A60; // type:function size:0x4 scope:weak align:4 +setTevSwapModeTable__11J2DTevBlockFUl19J2DTevSwapModeTable = .text:0x802F2A64; // type:function size:0x4 scope:weak align:4 +setIndTevStage__11J2DTevBlockFUl14J2DIndTevStage = .text:0x802F2A68; // type:function size:0x4 scope:weak align:4 +insertTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F2A6C; // type:function size:0x8 scope:weak align:4 +insertTexture__11J2DTevBlockFUlPC7ResTIMGP10JUTPalette = .text:0x802F2A74; // type:function size:0x8 scope:weak align:4 +insertTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F2A7C; // type:function size:0x8 scope:weak align:4 +setTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F2A84; // type:function size:0x8 scope:weak align:4 +setTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F2A8C; // type:function size:0x8 scope:weak align:4 +removeTexture__11J2DTevBlockFUl = .text:0x802F2A94; // type:function size:0x8 scope:weak align:4 +setFont__11J2DTevBlockFP7JUTFont = .text:0x802F2A9C; // type:function size:0x8 scope:weak align:4 +setFont__11J2DTevBlockFP7ResFONT = .text:0x802F2AA4; // type:function size:0x8 scope:weak align:4 +setPalette__11J2DTevBlockFUlPC7ResTLUT = .text:0x802F2AAC; // type:function size:0x8 scope:weak align:4 +prepareTexture__11J2DTevBlockFUc = .text:0x802F2AB4; // type:function size:0x8 scope:weak align:4 +getFont__11J2DTevBlockFv = .text:0x802F2ABC; // type:function size:0x8 scope:weak align:4 +shiftDeleteFlag__11J2DTevBlockFUcb = .text:0x802F2AC4; // type:function size:0x4 scope:weak align:4 +setUndeleteFlag__11J2DTevBlockFUc = .text:0x802F2AC8; // type:function size:0x4 scope:weak align:4 +setFontUndeleteFlag__11J2DTevBlockFv = .text:0x802F2ACC; // type:function size:0x4 scope:weak align:4 __ct__18J2DMaterialFactoryFRC16J2DMaterialBlock = .text:0x802F2AD0; // type:function size:0x1C4 scope:global align:4 countStages__18J2DMaterialFactoryCFi = .text:0x802F2C94; // type:function size:0x88 scope:global align:4 create__18J2DMaterialFactoryCFP11J2DMaterialiUlP15J2DResReferenceP15J2DResReferenceP10JKRArchive = .text:0x802F2D1C; // type:function size:0x910 scope:global align:4 @@ -13686,24 +13686,24 @@ newIndTexCoordScale__18J2DMaterialFactoryCFii = .text:0x802F3F78; // type:functi newAlphaComp__18J2DMaterialFactoryCFi = .text:0x802F3FE0; // type:function size:0x7C scope:global align:4 newBlend__18J2DMaterialFactoryCFi = .text:0x802F405C; // type:function size:0x7C scope:global align:4 newDither__18J2DMaterialFactoryCFi = .text:0x802F40D8; // type:function size:0x38 scope:global align:4 -__ct__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F4110; // type:function size:0x60 scope:global align:4 -JSUConvertOffsetToPtr<12J2DBlendInfo>__FPCvPCv = .text:0x802F4170; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J2DAlphaCompInfo>__FPCvPCv = .text:0x802F4188; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J2DTevSwapModeTableInfo>__FPCvPCv = .text:0x802F41A0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J2DTevSwapModeInfo>__FPCvPCv = .text:0x802F41B8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J2DTevStageInfo>__FPCvPCv = .text:0x802F41D0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<11_GXColorS10>__FPCvPCv = .text:0x802F41E8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J2DTevOrderInfo>__FPCvPCv = .text:0x802F4200; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<13J2DTexMtxInfo>__FPCvPCv = .text:0x802F4218; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J2DTexCoordInfo>__FPCvPCv = .text:0x802F4230; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J2DColorChanInfo>__FPCvPCv = .text:0x802F4248; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F4260; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<8_GXColor>__FPCvPCv = .text:0x802F4278; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<11_GXCullMode>__FPCvPCv = .text:0x802F4290; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<14J2DIndInitData>__FPCvPCv = .text:0x802F42A8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F42C0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J2DMaterialInitData>__FPCvPCv = .text:0x802F42D8; // type:function size:0x18 scope:global align:4 -J2DPrint_print_alpha_va__FP8J2DPrintUcPCcP16__va_list_struct = .text:0x802F42F0; // type:function size:0xA4 scope:global align:4 +__ct__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F4110; // type:function size:0x60 scope:weak align:4 +JSUConvertOffsetToPtr<12J2DBlendInfo>__FPCvPCv = .text:0x802F4170; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J2DAlphaCompInfo>__FPCvPCv = .text:0x802F4188; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J2DTevSwapModeTableInfo>__FPCvPCv = .text:0x802F41A0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J2DTevSwapModeInfo>__FPCvPCv = .text:0x802F41B8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J2DTevStageInfo>__FPCvPCv = .text:0x802F41D0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<11_GXColorS10>__FPCvPCv = .text:0x802F41E8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J2DTevOrderInfo>__FPCvPCv = .text:0x802F4200; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<13J2DTexMtxInfo>__FPCvPCv = .text:0x802F4218; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J2DTexCoordInfo>__FPCvPCv = .text:0x802F4230; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J2DColorChanInfo>__FPCvPCv = .text:0x802F4248; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F4260; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<8_GXColor>__FPCvPCv = .text:0x802F4278; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<11_GXCullMode>__FPCvPCv = .text:0x802F4290; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<14J2DIndInitData>__FPCvPCv = .text:0x802F42A8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F42C0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J2DMaterialInitData>__FPCvPCv = .text:0x802F42D8; // type:function size:0x18 scope:weak align:4 +J2DPrint_print_alpha_va = .text:0x802F42F0; // type:function size:0xA4 scope:global align:4 __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor = .text:0x802F4394; // type:function size:0x8C scope:global align:4 __dt__8J2DPrintFv = .text:0x802F4420; // type:function size:0x48 scope:global align:4 private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb = .text:0x802F4468; // type:function size:0x1F0 scope:global align:4 @@ -13870,26 +13870,26 @@ setTexCoord__10J2DPictureFPQ29JGeometry8TVec2PC10JUTTexture10J2DBinding9J2DMi isUsed__10J2DPictureFPC7ResTIMG = .text:0x802FF09C; // type:function size:0x64 scope:global align:4 getUsableTlut__10J2DPictureFUc = .text:0x802FF100; // type:function size:0xD0 scope:global align:4 getTlutID__10J2DPictureFPC7ResTIMGUc = .text:0x802FF1D0; // type:function size:0x34 scope:global align:4 -__ct__Q29JGeometry8TVec2Fv = .text:0x802FF204; // type:function size:0x4 scope:global align:4 -append__10J2DPictureFP10JUTTexturef = .text:0x802FF208; // type:function size:0x30 scope:global align:4 -append__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x802FF238; // type:function size:0x30 scope:global align:4 -load__10J2DPictureFUc = .text:0x802FF268; // type:function size:0x34 scope:global align:4 -load__10J2DPictureF11_GXTexMapIDUc = .text:0x802FF29C; // type:function size:0x4C scope:global align:4 -getTypeID__10J2DPictureCFv = .text:0x802FF2E8; // type:function size:0x8 scope:global align:4 -append__10J2DPictureFPCcP10JUTPalettef = .text:0x802FF2F0; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFP10JUTTexturef = .text:0x802FF320; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPCcP10JUTPalettef = .text:0x802FF350; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPCcf = .text:0x802FF380; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x802FF3B0; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPC7ResTIMGf = .text:0x802FF3E0; // type:function size:0x30 scope:global align:4 -remove__10J2DPictureFv = .text:0x802FF410; // type:function size:0x38 scope:global align:4 -draw__10J2DPictureFffUcbbb = .text:0x802FF448; // type:function size:0x98 scope:global align:4 -draw__10J2DPictureFffbbb = .text:0x802FF4E0; // type:function size:0x44 scope:global align:4 -drawOut__10J2DPictureFffffffff = .text:0x802FF524; // type:function size:0x64 scope:global align:4 -drawOut__10J2DPictureFffffff = .text:0x802FF588; // type:function size:0xAC scope:global align:4 -getTextureCount__10J2DPictureCFv = .text:0x802FF634; // type:function size:0x8 scope:global align:4 -isUsed__10J2DPictureFPC7ResFONT = .text:0x802FF63C; // type:function size:0x20 scope:global align:4 -rewriteAlpha__10J2DPictureFv = .text:0x802FF65C; // type:function size:0x4 scope:global align:4 +__ct__Q29JGeometry8TVec2Fv = .text:0x802FF204; // type:function size:0x4 scope:weak align:4 +append__10J2DPictureFP10JUTTexturef = .text:0x802FF208; // type:function size:0x30 scope:weak align:4 +append__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x802FF238; // type:function size:0x30 scope:weak align:4 +load__10J2DPictureFUc = .text:0x802FF268; // type:function size:0x34 scope:weak align:4 +load__10J2DPictureF11_GXTexMapIDUc = .text:0x802FF29C; // type:function size:0x4C scope:weak align:4 +getTypeID__10J2DPictureCFv = .text:0x802FF2E8; // type:function size:0x8 scope:weak align:4 +append__10J2DPictureFPCcP10JUTPalettef = .text:0x802FF2F0; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFP10JUTTexturef = .text:0x802FF320; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPCcP10JUTPalettef = .text:0x802FF350; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPCcf = .text:0x802FF380; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x802FF3B0; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPC7ResTIMGf = .text:0x802FF3E0; // type:function size:0x30 scope:weak align:4 +remove__10J2DPictureFv = .text:0x802FF410; // type:function size:0x38 scope:weak align:4 +draw__10J2DPictureFffUcbbb = .text:0x802FF448; // type:function size:0x98 scope:weak align:4 +draw__10J2DPictureFffbbb = .text:0x802FF4E0; // type:function size:0x44 scope:weak align:4 +drawOut__10J2DPictureFffffffff = .text:0x802FF524; // type:function size:0x64 scope:weak align:4 +drawOut__10J2DPictureFffffff = .text:0x802FF588; // type:function size:0xAC scope:weak align:4 +getTextureCount__10J2DPictureCFv = .text:0x802FF634; // type:function size:0x8 scope:weak align:4 +isUsed__10J2DPictureFPC7ResFONT = .text:0x802FF63C; // type:function size:0x20 scope:weak align:4 +rewriteAlpha__10J2DPictureFv = .text:0x802FF65C; // type:function size:0x4 scope:weak align:4 __ct__10J2DTextBoxFv = .text:0x802FF660; // type:function size:0x78 scope:global align:4 __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive = .text:0x802FF6D8; // type:function size:0x84 scope:global align:4 __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial = .text:0x802FF75C; // type:function size:0x468 scope:global align:4 @@ -13951,7 +13951,7 @@ draw__11J2DWindowExFffff = .text:0x80303568; // type:function size:0x58 scope:gl setCullBack__11J2DWindowExFb = .text:0x803035C0; // type:function size:0x3C scope:global align:4 isUsed__11J2DWindowExFPC7ResFONT = .text:0x803035FC; // type:function size:0x20 scope:global align:4 setAnimation__11J2DWindowExFP10J2DAnmBase = .text:0x8030361C; // type:function size:0x20 scope:global align:4 -getColor__14J2DAnmVtxColorCFUcUsP8_GXColor = .text:0x8030363C; // type:function size:0x4 scope:global align:4 +getColor__14J2DAnmVtxColorCFUcUsP8_GXColor = .text:0x8030363C; // type:function size:0x4 scope:weak align:4 initiate__12J2DPictureExFPC7ResTIMGPC7ResTLUT = .text:0x80303640; // type:function size:0xAC scope:global align:4 __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial = .text:0x803036EC; // type:function size:0x250 scope:global align:4 __dt__12J2DPictureExFv = .text:0x8030393C; // type:function size:0x90 scope:global align:4 @@ -14085,22 +14085,22 @@ readAnmVisibility__20J2DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData = .text:0 setAnmVisibility__20J2DAnmFullLoader_v15FP20J2DAnmVisibilityFullPC24J3DAnmVisibilityFullData = .text:0x8030A1B8; // type:function size:0x7C scope:global align:4 readAnmVtxColor__20J2DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData = .text:0x8030A234; // type:function size:0x28 scope:global align:4 setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFullData = .text:0x8030A25C; // type:function size:0xFC scope:global align:4 -__dt__14J2DAnmVtxColorFv = .text:0x8030A358; // type:function size:0x5C scope:global align:4 -__dt__20J2DAnmVisibilityFullFv = .text:0x8030A3B4; // type:function size:0x5C scope:global align:4 -__dt__12J2DAnmLoaderFv = .text:0x8030A410; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<25J3DAnmVisibilityFullTable>__FPCvPCv = .text:0x8030A458; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DAnmKRegKeyTable>__FPCvPCv = .text:0x8030A470; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DAnmCRegKeyTable>__FPCvPCv = .text:0x8030A488; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<25J3DAnmTexPatternFullTable>__FPCvPCv = .text:0x8030A4A0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<20J3DAnmColorFullTable>__FPCvPCv = .text:0x8030A4B8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<24J3DAnmTransformFullTable>__FPCvPCv = .text:0x8030A4D0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J3DAnmVtxColorIndexData>__FPCvPCv = .text:0x8030A4E8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J3DAnmColorKeyTable>__FPCvPCv = .text:0x8030A500; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<3Vec>__FPCvPCv = .text:0x8030A518; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<7ResNTAB>__FPCvPCv = .text:0x8030A530; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030A548; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030A560; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J3DAnmTransformKeyTable>__FPCvPCv = .text:0x8030A578; // type:function size:0x18 scope:global align:4 +__dt__14J2DAnmVtxColorFv = .text:0x8030A358; // type:function size:0x5C scope:weak align:4 +__dt__20J2DAnmVisibilityFullFv = .text:0x8030A3B4; // type:function size:0x5C scope:weak align:4 +__dt__12J2DAnmLoaderFv = .text:0x8030A410; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<25J3DAnmVisibilityFullTable>__FPCvPCv = .text:0x8030A458; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DAnmKRegKeyTable>__FPCvPCv = .text:0x8030A470; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DAnmCRegKeyTable>__FPCvPCv = .text:0x8030A488; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<25J3DAnmTexPatternFullTable>__FPCvPCv = .text:0x8030A4A0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<20J3DAnmColorFullTable>__FPCvPCv = .text:0x8030A4B8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<24J3DAnmTransformFullTable>__FPCvPCv = .text:0x8030A4D0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J3DAnmVtxColorIndexData>__FPCvPCv = .text:0x8030A4E8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J3DAnmColorKeyTable>__FPCvPCv = .text:0x8030A500; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<3Vec>__FPCvPCv = .text:0x8030A518; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<7ResNTAB>__FPCvPCv = .text:0x8030A530; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030A548; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030A560; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J3DAnmTransformKeyTable>__FPCvPCv = .text:0x8030A578; // type:function size:0x18 scope:weak align:4 getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo = .text:0x8030A590; // type:function size:0x56C scope:global align:4 calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo = .text:0x8030AAFC; // type:function size:0x428 scope:global align:4 searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen = .text:0x8030AF24; // type:function size:0xA4 scope:global align:4 @@ -14118,16 +14118,16 @@ getVisibility__20J2DAnmVisibilityFullCFUsPUc = .text:0x8030C048; // type:functio getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10 = .text:0x8030C0F0; // type:function size:0x2C4 scope:global align:4 getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor = .text:0x8030C3B4; // type:function size:0x2C4 scope:global align:4 searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen = .text:0x8030C678; // type:function size:0x104 scope:global align:4 -J2DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs = .text:0x8030C77C; // type:function size:0x234 scope:global align:4 -J2DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf = .text:0x8030C9B0; // type:function size:0x17C scope:global align:4 +J2DGetKeyFrameInterpolations__FfP18J3DAnmKeyTableBasePs = .text:0x8030C77C; // type:function size:0x234 scope:global align:4 +J2DGetKeyFrameInterpolationf__FfP18J3DAnmKeyTableBasePf = .text:0x8030C9B0; // type:function size:0x17C scope:global align:4 __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv = .text:0x8030CB2C; // type:function size:0x10 scope:global align:4 __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv = .text:0x8030CB3C; // type:function size:0x54 scope:global align:4 -__dt__16J2DAnmTexPatternFv = .text:0x8030CB90; // type:function size:0x90 scope:global align:4 -__dt__17J2DAnmVtxColorKeyFv = .text:0x8030CC20; // type:function size:0x6C scope:global align:4 -__dt__18J2DAnmVtxColorFullFv = .text:0x8030CC8C; // type:function size:0x6C scope:global align:4 -__dt__15J2DAnmColorFullFv = .text:0x8030CCF8; // type:function size:0x84 scope:global align:4 -getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8030CD7C; // type:function size:0x30 scope:global align:4 -__dt__19J2DAnmTransformFullFv = .text:0x8030CDAC; // type:function size:0x6C scope:global align:4 +__dt__16J2DAnmTexPatternFv = .text:0x8030CB90; // type:function size:0x90 scope:weak align:4 +__dt__17J2DAnmVtxColorKeyFv = .text:0x8030CC20; // type:function size:0x6C scope:weak align:4 +__dt__18J2DAnmVtxColorFullFv = .text:0x8030CC8C; // type:function size:0x6C scope:weak align:4 +__dt__15J2DAnmColorFullFv = .text:0x8030CCF8; // type:function size:0x84 scope:weak align:4 +getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8030CD7C; // type:function size:0x30 scope:weak align:4 +__dt__19J2DAnmTransformFullFv = .text:0x8030CDAC; // type:function size:0x6C scope:weak align:4 get__13J2DDataManageFPCc = .text:0x8030CE18; // type:function size:0x64 scope:global align:4 get__13J2DDataManageFP14JSUInputStream = .text:0x8030CE7C; // type:function size:0x94 scope:global align:4 getResReference__15J2DResReferenceCFUs = .text:0x8030CF10; // type:function size:0x34 scope:global align:4 @@ -14259,25 +14259,25 @@ load__26J3DShapeMtxMultiConcatViewCFv = .text:0x80313FA4; // type:function size: loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUsPA4_f = .text:0x8031419C; // type:function size:0x138 scope:global align:4 load__27J3DShapeMtxBBoardConcatViewCFv = .text:0x803142D4; // type:function size:0x110 scope:global align:4 load__28J3DShapeMtxYBBoardConcatViewCFv = .text:0x803143E4; // type:function size:0x13C scope:global align:4 -__dt__28J3DShapeMtxYBBoardConcatViewFv = .text:0x80314520; // type:function size:0x6C scope:global align:4 -getType__28J3DShapeMtxYBBoardConcatViewCFv = .text:0x8031458C; // type:function size:0xC scope:global align:4 -loadNrmMtx__21J3DShapeMtxConcatViewCFiUs = .text:0x80314598; // type:function size:0x4 scope:global align:4 -getUseMtxIndex__11J3DShapeMtxCFUs = .text:0x8031459C; // type:function size:0x8 scope:global align:4 -__dt__27J3DShapeMtxBBoardConcatViewFv = .text:0x803145A4; // type:function size:0x6C scope:global align:4 -getType__27J3DShapeMtxBBoardConcatViewCFv = .text:0x80314610; // type:function size:0xC scope:global align:4 -__dt__26J3DShapeMtxMultiConcatViewFv = .text:0x8031461C; // type:function size:0x6C scope:global align:4 -getType__26J3DShapeMtxMultiConcatViewCFv = .text:0x80314688; // type:function size:0xC scope:global align:4 -getUseMtxNum__26J3DShapeMtxMultiConcatViewCFv = .text:0x80314694; // type:function size:0x8 scope:global align:4 -getUseMtxIndex__26J3DShapeMtxMultiConcatViewCFUs = .text:0x8031469C; // type:function size:0x10 scope:global align:4 -loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUs = .text:0x803146AC; // type:function size:0x4 scope:global align:4 -__dt__16J3DShapeMtxMultiFv = .text:0x803146B0; // type:function size:0x5C scope:global align:4 -getType__16J3DShapeMtxMultiCFv = .text:0x8031470C; // type:function size:0xC scope:global align:4 -getUseMtxNum__16J3DShapeMtxMultiCFv = .text:0x80314718; // type:function size:0x8 scope:global align:4 -getUseMtxIndex__16J3DShapeMtxMultiCFUs = .text:0x80314720; // type:function size:0x10 scope:global align:4 -__dt__21J3DShapeMtxConcatViewFv = .text:0x80314730; // type:function size:0x5C scope:global align:4 -getType__21J3DShapeMtxConcatViewCFv = .text:0x8031478C; // type:function size:0xC scope:global align:4 -__dt__11J3DShapeMtxFv = .text:0x80314798; // type:function size:0x48 scope:global align:4 -getType__11J3DShapeMtxCFv = .text:0x803147E0; // type:function size:0xC scope:global align:4 +__dt__28J3DShapeMtxYBBoardConcatViewFv = .text:0x80314520; // type:function size:0x6C scope:weak align:4 +getType__28J3DShapeMtxYBBoardConcatViewCFv = .text:0x8031458C; // type:function size:0xC scope:weak align:4 +loadNrmMtx__21J3DShapeMtxConcatViewCFiUs = .text:0x80314598; // type:function size:0x4 scope:weak align:4 +getUseMtxIndex__11J3DShapeMtxCFUs = .text:0x8031459C; // type:function size:0x8 scope:weak align:4 +__dt__27J3DShapeMtxBBoardConcatViewFv = .text:0x803145A4; // type:function size:0x6C scope:weak align:4 +getType__27J3DShapeMtxBBoardConcatViewCFv = .text:0x80314610; // type:function size:0xC scope:weak align:4 +__dt__26J3DShapeMtxMultiConcatViewFv = .text:0x8031461C; // type:function size:0x6C scope:weak align:4 +getType__26J3DShapeMtxMultiConcatViewCFv = .text:0x80314688; // type:function size:0xC scope:weak align:4 +getUseMtxNum__26J3DShapeMtxMultiConcatViewCFv = .text:0x80314694; // type:function size:0x8 scope:weak align:4 +getUseMtxIndex__26J3DShapeMtxMultiConcatViewCFUs = .text:0x8031469C; // type:function size:0x10 scope:weak align:4 +loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUs = .text:0x803146AC; // type:function size:0x4 scope:weak align:4 +__dt__16J3DShapeMtxMultiFv = .text:0x803146B0; // type:function size:0x5C scope:weak align:4 +getType__16J3DShapeMtxMultiCFv = .text:0x8031470C; // type:function size:0xC scope:weak align:4 +getUseMtxNum__16J3DShapeMtxMultiCFv = .text:0x80314718; // type:function size:0x8 scope:weak align:4 +getUseMtxIndex__16J3DShapeMtxMultiCFUs = .text:0x80314720; // type:function size:0x10 scope:weak align:4 +__dt__21J3DShapeMtxConcatViewFv = .text:0x80314730; // type:function size:0x5C scope:weak align:4 +getType__21J3DShapeMtxConcatViewCFv = .text:0x8031478C; // type:function size:0xC scope:weak align:4 +__dt__11J3DShapeMtxFv = .text:0x80314798; // type:function size:0x48 scope:weak align:4 +getType__11J3DShapeMtxCFv = .text:0x803147E0; // type:function size:0xC scope:weak align:4 __sinit_J3DShapeMtx_cpp = .text:0x803147EC; // type:function size:0x138 scope:local align:4 countVertex__12J3DShapeDrawFUl = .text:0x80314924; // type:function size:0x50 scope:global align:4 addTexMtxIndexInDL__12J3DShapeDrawFUlUlUl = .text:0x80314974; // type:function size:0x148 scope:global align:4 @@ -14290,7 +14290,7 @@ addTexMtxIndexInVcd__8J3DShapeF7_GXAttr = .text:0x80314CBC; // type:function siz calcNBTScale__8J3DShapeFRC3VecPA3_A3_fPA3_A3_f = .text:0x80314DA8; // type:function size:0x80 scope:global align:4 countBumpMtxNum__8J3DShapeCFv = .text:0x80314E28; // type:function size:0x70 scope:global align:4 J3DLoadCPCmd__FUcUl = .text:0x80314E98; // type:function size:0x18 scope:global align:4 -J3DLoadArrayBasePtr__F7_GXAttrPv = .text:0x80314EB0; // type:function size:0x3C scope:global align:4 +J3DLoadArrayBasePtr__F7_GXAttrPv = .text:0x80314EB0; // type:function size:0x3C scope:local align:4 loadVtxArray__8J3DShapeCFv = .text:0x80314EEC; // type:function size:0x70 scope:global align:4 isSameVcdVatCmd__8J3DShapeFP8J3DShape = .text:0x80314F5C; // type:function size:0x3C scope:global align:4 makeVtxArrayCmd__8J3DShapeFv = .text:0x80314F98; // type:function size:0x2C8 scope:global align:4 @@ -14346,72 +14346,72 @@ diff__17J3DLockedMaterialFUl = .text:0x803170CC; // type:function size:0x4 scope calc__17J3DLockedMaterialFPA4_Cf = .text:0x803170D0; // type:function size:0x4 scope:global align:4 reset__17J3DLockedMaterialFv = .text:0x803170D4; // type:function size:0x4 scope:global align:4 change__17J3DLockedMaterialFv = .text:0x803170D8; // type:function size:0x4 scope:global align:4 -__dt__21J3DColorBlockLightOffFv = .text:0x803170DC; // type:function size:0x5C scope:global align:4 -__dt__13J3DColorBlockFv = .text:0x80317138; // type:function size:0x48 scope:global align:4 -__dt__21J3DTexGenBlockPatchedFv = .text:0x80317180; // type:function size:0x5C scope:global align:4 -__dt__14J3DTexGenBlockFv = .text:0x803171DC; // type:function size:0x48 scope:global align:4 -__dt__11J3DTevBlockFv = .text:0x80317224; // type:function size:0x48 scope:global align:4 -__dt__11J3DIndBlockFv = .text:0x8031726C; // type:function size:0x48 scope:global align:4 -__dt__10J3DPEBlockFv = .text:0x803172B4; // type:function size:0x48 scope:global align:4 -countDLSize__14J3DTexGenBlockFv = .text:0x803172FC; // type:function size:0x8 scope:global align:4 -countDLSize__13J3DColorBlockFv = .text:0x80317304; // type:function size:0x8 scope:global align:4 -countDLSize__11J3DTevBlockFv = .text:0x8031730C; // type:function size:0x8 scope:global align:4 -countDLSize__11J3DIndBlockFv = .text:0x80317314; // type:function size:0x8 scope:global align:4 -countDLSize__10J3DPEBlockFv = .text:0x8031731C; // type:function size:0x8 scope:global align:4 -load__13J3DColorBlockFv = .text:0x80317324; // type:function size:0x4 scope:global align:4 -getCullMode__13J3DColorBlockCFv = .text:0x80317328; // type:function size:0x8 scope:global align:4 -load__11J3DTevBlockFv = .text:0x80317330; // type:function size:0x4 scope:global align:4 -getNBTScale__14J3DTexGenBlockFv = .text:0x80317334; // type:function size:0x8 scope:global align:4 -patch__13J3DColorBlockFv = .text:0x8031733C; // type:function size:0x4 scope:global align:4 -diff__13J3DColorBlockFUl = .text:0x80317340; // type:function size:0x4 scope:global align:4 -diff__10J3DPEBlockFUl = .text:0x80317344; // type:function size:0x4 scope:global align:4 -reset__10J3DPEBlockFP10J3DPEBlock = .text:0x80317348; // type:function size:0x4 scope:global align:4 -reset__11J3DIndBlockFP11J3DIndBlock = .text:0x8031734C; // type:function size:0x4 scope:global align:4 -reset__11J3DTevBlockFP11J3DTevBlock = .text:0x80317350; // type:function size:0x4 scope:global align:4 -reset__14J3DTexGenBlockFP14J3DTexGenBlock = .text:0x80317354; // type:function size:0x4 scope:global align:4 -reset__13J3DColorBlockFP13J3DColorBlock = .text:0x80317358; // type:function size:0x4 scope:global align:4 -diffFog__10J3DPEBlockFv = .text:0x8031735C; // type:function size:0x4 scope:global align:4 -diffBlend__10J3DPEBlockFv = .text:0x80317360; // type:function size:0x4 scope:global align:4 -setFog__10J3DPEBlockFP6J3DFog = .text:0x80317364; // type:function size:0x4 scope:global align:4 -setFog__10J3DPEBlockF6J3DFog = .text:0x80317368; // type:function size:0x4 scope:global align:4 -setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp = .text:0x8031736C; // type:function size:0x4 scope:global align:4 -setBlend__10J3DPEBlockFPC8J3DBlend = .text:0x80317370; // type:function size:0x4 scope:global align:4 -setZMode__10J3DPEBlockFPC8J3DZMode = .text:0x80317374; // type:function size:0x4 scope:global align:4 -setZCompLoc__10J3DPEBlockFPCUc = .text:0x80317378; // type:function size:0x4 scope:global align:4 -setDither__10J3DPEBlockFUc = .text:0x8031737C; // type:function size:0x4 scope:global align:4 -setDither__10J3DPEBlockFPCUc = .text:0x80317380; // type:function size:0x4 scope:global align:4 -getDither__10J3DPEBlockCFv = .text:0x80317384; // type:function size:0x8 scope:global align:4 -getFogOffset__10J3DPEBlockCFv = .text:0x8031738C; // type:function size:0x8 scope:global align:4 -setFogOffset__10J3DPEBlockFUl = .text:0x80317394; // type:function size:0x4 scope:global align:4 -diff__15J3DIndBlockNullFUl = .text:0x80317398; // type:function size:0x4 scope:global align:4 -load__15J3DIndBlockNullFv = .text:0x8031739C; // type:function size:0x4 scope:global align:4 -reset__15J3DIndBlockNullFP11J3DIndBlock = .text:0x803173A0; // type:function size:0x4 scope:global align:4 -getType__15J3DIndBlockNullFv = .text:0x803173A4; // type:function size:0xC scope:global align:4 -__dt__15J3DIndBlockNullFv = .text:0x803173B0; // type:function size:0x5C scope:global align:4 -setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder = .text:0x8031740C; // type:function size:0x4 scope:global align:4 -setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder = .text:0x80317410; // type:function size:0x4 scope:global align:4 -setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx = .text:0x80317414; // type:function size:0x4 scope:global align:4 -setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale = .text:0x80317418; // type:function size:0x4 scope:global align:4 -setTexGenNum__14J3DTexGenBlockFPCUl = .text:0x8031741C; // type:function size:0x4 scope:global align:4 -setNBTScale__14J3DTexGenBlockF11J3DNBTScale = .text:0x80317420; // type:function size:0x4 scope:global align:4 -setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale = .text:0x80317424; // type:function size:0x4 scope:global align:4 -getTexMtxOffset__14J3DTexGenBlockCFv = .text:0x80317428; // type:function size:0x8 scope:global align:4 -setTexMtxOffset__14J3DTexGenBlockFUl = .text:0x80317430; // type:function size:0x4 scope:global align:4 -patchMatColor__13J3DColorBlockFv = .text:0x80317434; // type:function size:0x4 scope:global align:4 -diffAmbColor__13J3DColorBlockFv = .text:0x80317438; // type:function size:0x4 scope:global align:4 -diffMatColor__13J3DColorBlockFv = .text:0x8031743C; // type:function size:0x4 scope:global align:4 -diffColorChan__13J3DColorBlockFv = .text:0x80317440; // type:function size:0x4 scope:global align:4 -diffLightObj__13J3DColorBlockFUl = .text:0x80317444; // type:function size:0x4 scope:global align:4 -setMatColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x80317448; // type:function size:0x4 scope:global align:4 -setColorChanNum__13J3DColorBlockFPCUc = .text:0x8031744C; // type:function size:0x4 scope:global align:4 -setColorChan__13J3DColorBlockFUlPC12J3DColorChan = .text:0x80317450; // type:function size:0x4 scope:global align:4 -getLight__13J3DColorBlockFUl = .text:0x80317454; // type:function size:0x8 scope:global align:4 -setCullMode__13J3DColorBlockFUc = .text:0x8031745C; // type:function size:0x4 scope:global align:4 -setCullMode__13J3DColorBlockFPCUc = .text:0x80317460; // type:function size:0x4 scope:global align:4 -getMatColorOffset__13J3DColorBlockCFv = .text:0x80317464; // type:function size:0x8 scope:global align:4 -getColorChanOffset__13J3DColorBlockCFv = .text:0x8031746C; // type:function size:0x8 scope:global align:4 -setMatColorOffset__13J3DColorBlockFUl = .text:0x80317474; // type:function size:0x4 scope:global align:4 -setColorChanOffset__13J3DColorBlockFUl = .text:0x80317478; // type:function size:0x4 scope:global align:4 +__dt__21J3DColorBlockLightOffFv = .text:0x803170DC; // type:function size:0x5C scope:weak align:4 +__dt__13J3DColorBlockFv = .text:0x80317138; // type:function size:0x48 scope:weak align:4 +__dt__21J3DTexGenBlockPatchedFv = .text:0x80317180; // type:function size:0x5C scope:weak align:4 +__dt__14J3DTexGenBlockFv = .text:0x803171DC; // type:function size:0x48 scope:weak align:4 +__dt__11J3DTevBlockFv = .text:0x80317224; // type:function size:0x48 scope:weak align:4 +__dt__11J3DIndBlockFv = .text:0x8031726C; // type:function size:0x48 scope:weak align:4 +__dt__10J3DPEBlockFv = .text:0x803172B4; // type:function size:0x48 scope:weak align:4 +countDLSize__14J3DTexGenBlockFv = .text:0x803172FC; // type:function size:0x8 scope:weak align:4 +countDLSize__13J3DColorBlockFv = .text:0x80317304; // type:function size:0x8 scope:weak align:4 +countDLSize__11J3DTevBlockFv = .text:0x8031730C; // type:function size:0x8 scope:weak align:4 +countDLSize__11J3DIndBlockFv = .text:0x80317314; // type:function size:0x8 scope:weak align:4 +countDLSize__10J3DPEBlockFv = .text:0x8031731C; // type:function size:0x8 scope:weak align:4 +load__13J3DColorBlockFv = .text:0x80317324; // type:function size:0x4 scope:weak align:4 +getCullMode__13J3DColorBlockCFv = .text:0x80317328; // type:function size:0x8 scope:weak align:4 +load__11J3DTevBlockFv = .text:0x80317330; // type:function size:0x4 scope:weak align:4 +getNBTScale__14J3DTexGenBlockFv = .text:0x80317334; // type:function size:0x8 scope:weak align:4 +patch__13J3DColorBlockFv = .text:0x8031733C; // type:function size:0x4 scope:weak align:4 +diff__13J3DColorBlockFUl = .text:0x80317340; // type:function size:0x4 scope:weak align:4 +diff__10J3DPEBlockFUl = .text:0x80317344; // type:function size:0x4 scope:weak align:4 +reset__10J3DPEBlockFP10J3DPEBlock = .text:0x80317348; // type:function size:0x4 scope:weak align:4 +reset__11J3DIndBlockFP11J3DIndBlock = .text:0x8031734C; // type:function size:0x4 scope:weak align:4 +reset__11J3DTevBlockFP11J3DTevBlock = .text:0x80317350; // type:function size:0x4 scope:weak align:4 +reset__14J3DTexGenBlockFP14J3DTexGenBlock = .text:0x80317354; // type:function size:0x4 scope:weak align:4 +reset__13J3DColorBlockFP13J3DColorBlock = .text:0x80317358; // type:function size:0x4 scope:weak align:4 +diffFog__10J3DPEBlockFv = .text:0x8031735C; // type:function size:0x4 scope:weak align:4 +diffBlend__10J3DPEBlockFv = .text:0x80317360; // type:function size:0x4 scope:weak align:4 +setFog__10J3DPEBlockFP6J3DFog = .text:0x80317364; // type:function size:0x4 scope:weak align:4 +setFog__10J3DPEBlockF6J3DFog = .text:0x80317368; // type:function size:0x4 scope:weak align:4 +setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp = .text:0x8031736C; // type:function size:0x4 scope:weak align:4 +setBlend__10J3DPEBlockFPC8J3DBlend = .text:0x80317370; // type:function size:0x4 scope:weak align:4 +setZMode__10J3DPEBlockFPC8J3DZMode = .text:0x80317374; // type:function size:0x4 scope:weak align:4 +setZCompLoc__10J3DPEBlockFPCUc = .text:0x80317378; // type:function size:0x4 scope:weak align:4 +setDither__10J3DPEBlockFUc = .text:0x8031737C; // type:function size:0x4 scope:weak align:4 +setDither__10J3DPEBlockFPCUc = .text:0x80317380; // type:function size:0x4 scope:weak align:4 +getDither__10J3DPEBlockCFv = .text:0x80317384; // type:function size:0x8 scope:weak align:4 +getFogOffset__10J3DPEBlockCFv = .text:0x8031738C; // type:function size:0x8 scope:weak align:4 +setFogOffset__10J3DPEBlockFUl = .text:0x80317394; // type:function size:0x4 scope:weak align:4 +diff__15J3DIndBlockNullFUl = .text:0x80317398; // type:function size:0x4 scope:weak align:4 +load__15J3DIndBlockNullFv = .text:0x8031739C; // type:function size:0x4 scope:weak align:4 +reset__15J3DIndBlockNullFP11J3DIndBlock = .text:0x803173A0; // type:function size:0x4 scope:weak align:4 +getType__15J3DIndBlockNullFv = .text:0x803173A4; // type:function size:0xC scope:weak align:4 +__dt__15J3DIndBlockNullFv = .text:0x803173B0; // type:function size:0x5C scope:weak align:4 +setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder = .text:0x8031740C; // type:function size:0x4 scope:weak align:4 +setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder = .text:0x80317410; // type:function size:0x4 scope:weak align:4 +setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx = .text:0x80317414; // type:function size:0x4 scope:weak align:4 +setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale = .text:0x80317418; // type:function size:0x4 scope:weak align:4 +setTexGenNum__14J3DTexGenBlockFPCUl = .text:0x8031741C; // type:function size:0x4 scope:weak align:4 +setNBTScale__14J3DTexGenBlockF11J3DNBTScale = .text:0x80317420; // type:function size:0x4 scope:weak align:4 +setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale = .text:0x80317424; // type:function size:0x4 scope:weak align:4 +getTexMtxOffset__14J3DTexGenBlockCFv = .text:0x80317428; // type:function size:0x8 scope:weak align:4 +setTexMtxOffset__14J3DTexGenBlockFUl = .text:0x80317430; // type:function size:0x4 scope:weak align:4 +patchMatColor__13J3DColorBlockFv = .text:0x80317434; // type:function size:0x4 scope:weak align:4 +diffAmbColor__13J3DColorBlockFv = .text:0x80317438; // type:function size:0x4 scope:weak align:4 +diffMatColor__13J3DColorBlockFv = .text:0x8031743C; // type:function size:0x4 scope:weak align:4 +diffColorChan__13J3DColorBlockFv = .text:0x80317440; // type:function size:0x4 scope:weak align:4 +diffLightObj__13J3DColorBlockFUl = .text:0x80317444; // type:function size:0x4 scope:weak align:4 +setMatColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x80317448; // type:function size:0x4 scope:weak align:4 +setColorChanNum__13J3DColorBlockFPCUc = .text:0x8031744C; // type:function size:0x4 scope:weak align:4 +setColorChan__13J3DColorBlockFUlPC12J3DColorChan = .text:0x80317450; // type:function size:0x4 scope:weak align:4 +getLight__13J3DColorBlockFUl = .text:0x80317454; // type:function size:0x8 scope:weak align:4 +setCullMode__13J3DColorBlockFUc = .text:0x8031745C; // type:function size:0x4 scope:weak align:4 +setCullMode__13J3DColorBlockFPCUc = .text:0x80317460; // type:function size:0x4 scope:weak align:4 +getMatColorOffset__13J3DColorBlockCFv = .text:0x80317464; // type:function size:0x8 scope:weak align:4 +getColorChanOffset__13J3DColorBlockCFv = .text:0x8031746C; // type:function size:0x8 scope:weak align:4 +setMatColorOffset__13J3DColorBlockFUl = .text:0x80317474; // type:function size:0x4 scope:weak align:4 +setColorChanOffset__13J3DColorBlockFUl = .text:0x80317478; // type:function size:0x4 scope:weak align:4 initialize__21J3DColorBlockLightOffFv = .text:0x8031747C; // type:function size:0x60 scope:global align:4 initialize__22J3DColorBlockAmbientOnFv = .text:0x803174DC; // type:function size:0xA4 scope:global align:4 initialize__20J3DColorBlockLightOnFv = .text:0x80317580; // type:function size:0xC4 scope:global align:4 @@ -14883,8 +14883,8 @@ makeZModeTable__Fv = .text:0x803242A8; // type:function size:0x6C scope:global a makeTevSwapTable__Fv = .text:0x80324314; // type:function size:0x44 scope:global align:4 loadTexMtx__9J3DTexMtxCFUl = .text:0x80324358; // type:function size:0x64 scope:global align:4 loadPostTexMtx__9J3DTexMtxCFUl = .text:0x803243BC; // type:function size:0x60 scope:global align:4 -J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType = .text:0x8032441C; // type:function size:0x580 scope:global align:4 -J3DGDLoadPostTexMtxImm__FPA4_fUl = .text:0x8032499C; // type:function size:0x56C scope:global align:4 +J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType = .text:0x8032441C; // type:function size:0x580 scope:local align:4 +J3DGDLoadPostTexMtxImm__FPA4_fUl = .text:0x8032499C; // type:function size:0x56C scope:local align:4 initialize__13J3DDrawBufferFv = .text:0x80324F08; // type:function size:0x68 scope:global align:4 allocBuffer__13J3DDrawBufferFUl = .text:0x80324F70; // type:function size:0x98 scope:global align:4 __dt__13J3DDrawBufferFv = .text:0x80325008; // type:function size:0x60 scope:global align:4 @@ -14915,7 +14915,7 @@ makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTabl findImportantMtxIndex__12J3DJointTreeFv = .text:0x80325C00; // type:function size:0xAC scope:global align:4 calc__12J3DJointTreeFP12J3DMtxBufferRC3VecRA3_A4_Cf = .text:0x80325CAC; // type:function size:0x70 scope:global align:4 setMtxBuffer__10J3DMtxCalcFP12J3DMtxBuffer = .text:0x80325D1C; // type:function size:0x8 scope:global align:4 -__dt__12J3DJointTreeFv = .text:0x80325D24; // type:function size:0x64 scope:global align:4 +__dt__12J3DJointTreeFv = .text:0x80325D24; // type:function size:0x64 scope:weak align:4 clear__12J3DModelDataFv = .text:0x80325D88; // type:function size:0x18 scope:global align:4 __ct__12J3DModelDataFv = .text:0x80325DA0; // type:function size:0x74 scope:global align:4 newSharedDisplayList__12J3DModelDataFUl = .text:0x80325E14; // type:function size:0xB4 scope:global align:4 @@ -14924,8 +14924,8 @@ makeSharedDL__12J3DModelDataFv = .text:0x80325F94; // type:function size:0x78 sc simpleCalcMaterial__12J3DModelDataFUsPA4_f = .text:0x8032600C; // type:function size:0xC0 scope:global align:4 syncJ3DSysPointers__12J3DModelDataCFv = .text:0x803260CC; // type:function size:0x2C scope:global align:4 syncJ3DSysFlags__12J3DModelDataCFv = .text:0x803260F8; // type:function size:0x3C scope:global align:4 -__dt__13J3DShapeTableFv = .text:0x80326134; // type:function size:0x48 scope:global align:4 -__dt__12J3DModelDataFv = .text:0x8032617C; // type:function size:0x98 scope:global align:4 +__dt__13J3DShapeTableFv = .text:0x80326134; // type:function size:0x48 scope:weak align:4 +__dt__12J3DModelDataFv = .text:0x8032617C; // type:function size:0x98 scope:weak align:4 initialize__12J3DMtxBufferFv = .text:0x80326214; // type:function size:0x44 scope:global align:4 create__12J3DMtxBufferFP12J3DModelDataUl = .text:0x80326258; // type:function size:0x10C scope:global align:4 createAnmMtx__12J3DMtxBufferFP12J3DModelData = .text:0x80326364; // type:function size:0x8C scope:global align:4 @@ -14960,8 +14960,8 @@ calcNrmMtx__8J3DModelFv = .text:0x80328190; // type:function size:0x24 scope:glo calcBumpMtx__8J3DModelFv = .text:0x803281B4; // type:function size:0x104 scope:global align:4 calcBBoardMtx__8J3DModelFv = .text:0x803282B8; // type:function size:0x34 scope:global align:4 prepareShapePackets__8J3DModelFv = .text:0x803282EC; // type:function size:0x64 scope:global align:4 -__dt__8J3DModelFv = .text:0x80328350; // type:function size:0x64 scope:global align:4 -__dt__12J3DMtxBufferFv = .text:0x803283B4; // type:function size:0x48 scope:global align:4 +__dt__8J3DModelFv = .text:0x80328350; // type:function size:0x64 scope:weak align:4 +__dt__12J3DMtxBufferFv = .text:0x803283B4; // type:function size:0x48 scope:weak align:4 init__12J3DFrameCtrlFs = .text:0x803283FC; // type:function size:0x30 scope:global align:4 checkPass__12J3DFrameCtrlFf = .text:0x8032842C; // type:function size:0x5A0 scope:global align:4 update__12J3DFrameCtrlFv = .text:0x803289CC; // type:function size:0x474 scope:global align:4 @@ -14995,39 +14995,39 @@ getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10 = .text:0x8032B1F8; // type: getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor = .text:0x8032B4BC; // type:function size:0x2C4 scope:global align:4 searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable = .text:0x8032B780; // type:function size:0xFC scope:global align:4 searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData = .text:0x8032B87C; // type:function size:0x24 scope:global align:4 -J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs = .text:0x8032B8A0; // type:function size:0x234 scope:global align:4 -J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf = .text:0x8032BAD4; // type:function size:0x17C scope:global align:4 -__dt__14J3DAnmVtxColorFv = .text:0x8032BC50; // type:function size:0x5C scope:global align:4 -__dt__11J3DAnmColorFv = .text:0x8032BCAC; // type:function size:0x74 scope:global align:4 -__dt__16J3DAnmTexPatternFv = .text:0x8032BD20; // type:function size:0x74 scope:global align:4 -getKind__16J3DAnmTexPatternCFv = .text:0x8032BD94; // type:function size:0x8 scope:global align:4 -__dt__15J3DAnmTevRegKeyFv = .text:0x8032BD9C; // type:function size:0x88 scope:global align:4 -getKind__15J3DAnmTevRegKeyCFv = .text:0x8032BE24; // type:function size:0x8 scope:global align:4 -__dt__14J3DAnmColorKeyFv = .text:0x8032BE2C; // type:function size:0x84 scope:global align:4 -getKind__14J3DAnmColorKeyCFv = .text:0x8032BEB0; // type:function size:0x8 scope:global align:4 -__dt__15J3DAnmColorFullFv = .text:0x8032BEB8; // type:function size:0x84 scope:global align:4 -getKind__15J3DAnmColorFullCFv = .text:0x8032BF3C; // type:function size:0x8 scope:global align:4 -getKind__11J3DAnmColorCFv = .text:0x8032BF44; // type:function size:0x8 scope:global align:4 -getColor__11J3DAnmColorCFUsP8_GXColor = .text:0x8032BF4C; // type:function size:0x4 scope:global align:4 -__dt__17J3DAnmVtxColorKeyFv = .text:0x8032BF50; // type:function size:0x6C scope:global align:4 -getKind__17J3DAnmVtxColorKeyCFv = .text:0x8032BFBC; // type:function size:0x8 scope:global align:4 -__dt__18J3DAnmVtxColorFullFv = .text:0x8032BFC4; // type:function size:0x6C scope:global align:4 -getKind__18J3DAnmVtxColorFullCFv = .text:0x8032C030; // type:function size:0x8 scope:global align:4 -getKind__14J3DAnmVtxColorCFv = .text:0x8032C038; // type:function size:0x8 scope:global align:4 -getColor__14J3DAnmVtxColorCFUcUsP8_GXColor = .text:0x8032C040; // type:function size:0x4 scope:global align:4 -__dt__16J3DAnmClusterKeyFv = .text:0x8032C044; // type:function size:0x6C scope:global align:4 -getKind__16J3DAnmClusterKeyCFv = .text:0x8032C0B0; // type:function size:0x8 scope:global align:4 -__dt__13J3DAnmClusterFv = .text:0x8032C0B8; // type:function size:0x5C scope:global align:4 -getKind__13J3DAnmClusterCFv = .text:0x8032C114; // type:function size:0x8 scope:global align:4 -getWeight__13J3DAnmClusterCFUs = .text:0x8032C11C; // type:function size:0x8 scope:global align:4 -__dt__17J3DAnmClusterFullFv = .text:0x8032C124; // type:function size:0x6C scope:global align:4 -getKind__17J3DAnmClusterFullCFv = .text:0x8032C190; // type:function size:0x8 scope:global align:4 -__dt__19J3DAnmTextureSRTKeyFv = .text:0x8032C198; // type:function size:0x88 scope:global align:4 -getKind__19J3DAnmTextureSRTKeyCFv = .text:0x8032C220; // type:function size:0x8 scope:global align:4 -__dt__27J3DAnmTransformFullWithLerpFv = .text:0x8032C228; // type:function size:0x7C scope:global align:4 -getKind__27J3DAnmTransformFullWithLerpCFv = .text:0x8032C2A4; // type:function size:0x8 scope:global align:4 -__dt__19J3DAnmTransformFullFv = .text:0x8032C2AC; // type:function size:0x6C scope:global align:4 -getKind__19J3DAnmTransformFullCFv = .text:0x8032C318; // type:function size:0x8 scope:global align:4 +J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs = .text:0x8032B8A0; // type:function size:0x234 scope:weak align:4 +J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf = .text:0x8032BAD4; // type:function size:0x17C scope:weak align:4 +__dt__14J3DAnmVtxColorFv = .text:0x8032BC50; // type:function size:0x5C scope:weak align:4 +__dt__11J3DAnmColorFv = .text:0x8032BCAC; // type:function size:0x74 scope:weak align:4 +__dt__16J3DAnmTexPatternFv = .text:0x8032BD20; // type:function size:0x74 scope:weak align:4 +getKind__16J3DAnmTexPatternCFv = .text:0x8032BD94; // type:function size:0x8 scope:weak align:4 +__dt__15J3DAnmTevRegKeyFv = .text:0x8032BD9C; // type:function size:0x88 scope:weak align:4 +getKind__15J3DAnmTevRegKeyCFv = .text:0x8032BE24; // type:function size:0x8 scope:weak align:4 +__dt__14J3DAnmColorKeyFv = .text:0x8032BE2C; // type:function size:0x84 scope:weak align:4 +getKind__14J3DAnmColorKeyCFv = .text:0x8032BEB0; // type:function size:0x8 scope:weak align:4 +__dt__15J3DAnmColorFullFv = .text:0x8032BEB8; // type:function size:0x84 scope:weak align:4 +getKind__15J3DAnmColorFullCFv = .text:0x8032BF3C; // type:function size:0x8 scope:weak align:4 +getKind__11J3DAnmColorCFv = .text:0x8032BF44; // type:function size:0x8 scope:weak align:4 +getColor__11J3DAnmColorCFUsP8_GXColor = .text:0x8032BF4C; // type:function size:0x4 scope:weak align:4 +__dt__17J3DAnmVtxColorKeyFv = .text:0x8032BF50; // type:function size:0x6C scope:weak align:4 +getKind__17J3DAnmVtxColorKeyCFv = .text:0x8032BFBC; // type:function size:0x8 scope:weak align:4 +__dt__18J3DAnmVtxColorFullFv = .text:0x8032BFC4; // type:function size:0x6C scope:weak align:4 +getKind__18J3DAnmVtxColorFullCFv = .text:0x8032C030; // type:function size:0x8 scope:weak align:4 +getKind__14J3DAnmVtxColorCFv = .text:0x8032C038; // type:function size:0x8 scope:weak align:4 +getColor__14J3DAnmVtxColorCFUcUsP8_GXColor = .text:0x8032C040; // type:function size:0x4 scope:weak align:4 +__dt__16J3DAnmClusterKeyFv = .text:0x8032C044; // type:function size:0x6C scope:weak align:4 +getKind__16J3DAnmClusterKeyCFv = .text:0x8032C0B0; // type:function size:0x8 scope:weak align:4 +__dt__13J3DAnmClusterFv = .text:0x8032C0B8; // type:function size:0x5C scope:weak align:4 +getKind__13J3DAnmClusterCFv = .text:0x8032C114; // type:function size:0x8 scope:weak align:4 +getWeight__13J3DAnmClusterCFUs = .text:0x8032C11C; // type:function size:0x8 scope:weak align:4 +__dt__17J3DAnmClusterFullFv = .text:0x8032C124; // type:function size:0x6C scope:weak align:4 +getKind__17J3DAnmClusterFullCFv = .text:0x8032C190; // type:function size:0x8 scope:weak align:4 +__dt__19J3DAnmTextureSRTKeyFv = .text:0x8032C198; // type:function size:0x88 scope:weak align:4 +getKind__19J3DAnmTextureSRTKeyCFv = .text:0x8032C220; // type:function size:0x8 scope:weak align:4 +__dt__27J3DAnmTransformFullWithLerpFv = .text:0x8032C228; // type:function size:0x7C scope:weak align:4 +getKind__27J3DAnmTransformFullWithLerpCFv = .text:0x8032C2A4; // type:function size:0x8 scope:weak align:4 +__dt__19J3DAnmTransformFullFv = .text:0x8032C2AC; // type:function size:0x6C scope:weak align:4 +getKind__19J3DAnmTransformFullCFv = .text:0x8032C318; // type:function size:0x8 scope:weak align:4 initialize__14J3DMaterialAnmFv = .text:0x8032C320; // type:function size:0xA4 scope:global align:4 calc__14J3DMaterialAnmCFP11J3DMaterial = .text:0x8032C3C4; // type:function size:0x1E0 scope:global align:4 setMatColorAnm__14J3DMaterialAnmFiP14J3DMatColorAnm = .text:0x8032C5A4; // type:function size:0x40 scope:global align:4 @@ -15036,8 +15036,8 @@ setTexNoAnm__14J3DMaterialAnmFiP11J3DTexNoAnm = .text:0x8032C624; // type:functi setTevColorAnm__14J3DMaterialAnmFiP14J3DTevColorAnm = .text:0x8032C664; // type:function size:0x40 scope:global align:4 setTevKColorAnm__14J3DMaterialAnmFiP15J3DTevKColorAnm = .text:0x8032C6A4; // type:function size:0x40 scope:global align:4 __ct__12J3DSkinNListFv = .text:0x8032C6E4; // type:function size:0x20 scope:global align:4 -J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec = .text:0x8032C704; // type:function size:0xB8 scope:global align:4 -J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec = .text:0x8032C7BC; // type:function size:0xA0 scope:global align:4 +J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec = .text:0x8032C704; // type:function size:0xB8 scope:local align:4 +J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec = .text:0x8032C7BC; // type:function size:0xA0 scope:local align:4 calcSkin_VtxPosF32__12J3DSkinNListFPA4_fPvPv = .text:0x8032C85C; // type:function size:0x88 scope:global align:4 calcSkin_VtxNrmF32__12J3DSkinNListFPA4_fPvPv = .text:0x8032C8E4; // type:function size:0x88 scope:global align:4 __ct__13J3DSkinDeformFv = .text:0x8032C96C; // type:function size:0x44 scope:global align:4 @@ -15130,47 +15130,47 @@ newZMode__18J3DMaterialFactoryCFi = .text:0x8033282C; // type:function size:0x60 newZCompLoc__18J3DMaterialFactoryCFi = .text:0x8033288C; // type:function size:0x38 scope:global align:4 newDither__18J3DMaterialFactoryCFi = .text:0x803328C4; // type:function size:0x38 scope:global align:4 newNBTScale__18J3DMaterialFactoryCFi = .text:0x803328FC; // type:function size:0xA4 scope:global align:4 -load__14J3DPEBlockNullFv = .text:0x803329A0; // type:function size:0x4 scope:global align:4 -getType__14J3DPEBlockNullFv = .text:0x803329A4; // type:function size:0xC scope:global align:4 -__dt__14J3DPEBlockNullFv = .text:0x803329B0; // type:function size:0x5C scope:global align:4 -reset__15J3DTevBlockNullFP11J3DTevBlock = .text:0x80332A0C; // type:function size:0x4 scope:global align:4 -ptrToIndex__15J3DTevBlockNullFv = .text:0x80332A10; // type:function size:0x4 scope:global align:4 -indexToPtr__15J3DTevBlockNullFv = .text:0x80332A14; // type:function size:0x24 scope:global align:4 -getType__15J3DTevBlockNullFv = .text:0x80332A38; // type:function size:0xC scope:global align:4 -__dt__15J3DTevBlockNullFv = .text:0x80332A44; // type:function size:0x5C scope:global align:4 -calc__18J3DTexGenBlockNullFPA4_Cf = .text:0x80332AA0; // type:function size:0x4 scope:global align:4 -calcWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80332AA4; // type:function size:0x4 scope:global align:4 -calcPostTexMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80332AA8; // type:function size:0x4 scope:global align:4 -calcPostTexMtxWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80332AAC; // type:function size:0x4 scope:global align:4 -load__18J3DTexGenBlockNullFv = .text:0x80332AB0; // type:function size:0x4 scope:global align:4 -patch__18J3DTexGenBlockNullFv = .text:0x80332AB4; // type:function size:0x4 scope:global align:4 -diff__18J3DTexGenBlockNullFUl = .text:0x80332AB8; // type:function size:0x4 scope:global align:4 -diffTexMtx__18J3DTexGenBlockNullFv = .text:0x80332ABC; // type:function size:0x4 scope:global align:4 -diffTexGen__18J3DTexGenBlockNullFv = .text:0x80332AC0; // type:function size:0x4 scope:global align:4 -getType__18J3DTexGenBlockNullFv = .text:0x80332AC4; // type:function size:0xC scope:global align:4 -__dt__18J3DTexGenBlockNullFv = .text:0x80332AD0; // type:function size:0x5C scope:global align:4 -getType__17J3DColorBlockNullFv = .text:0x80332B2C; // type:function size:0xC scope:global align:4 -__dt__17J3DColorBlockNullFv = .text:0x80332B38; // type:function size:0x5C scope:global align:4 -__dt__11J3DMaterialFv = .text:0x80332B94; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<17J3DCurrentMtxInfo>__FPCvPCv = .text:0x80332BDC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DPatchingInfo>__FPCvPCv = .text:0x80332BF4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DDisplayListInit>__FPCvPCv = .text:0x80332C0C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DNBTScaleInfo>__FPCvPCv = .text:0x80332C24; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<12J3DZModeInfo>__FPCvPCv = .text:0x80332C3C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<12J3DBlendInfo>__FPCvPCv = .text:0x80332C54; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DAlphaCompInfo>__FPCvPCv = .text:0x80332C6C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<10J3DFogInfo>__FPCvPCv = .text:0x80332C84; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J3DTevSwapModeTableInfo>__FPCvPCv = .text:0x80332C9C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DTevSwapModeInfo>__FPCvPCv = .text:0x80332CB4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DTevStageInfo>__FPCvPCv = .text:0x80332CCC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DTevOrderInfo>__FPCvPCv = .text:0x80332CE4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<13J3DTexMtxInfo>__FPCvPCv = .text:0x80332CFC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DTexCoord2Info>__FPCvPCv = .text:0x80332D14; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DTexCoordInfo>__FPCvPCv = .text:0x80332D2C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<12J3DLightInfo>__FPCvPCv = .text:0x80332D44; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DColorChanInfo>__FPCvPCv = .text:0x80332D5C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<14J3DIndInitData>__FPCvPCv = .text:0x80332D74; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J3DMaterialInitData>__FPCvPCv = .text:0x80332D8C; // type:function size:0x18 scope:global align:4 +load__14J3DPEBlockNullFv = .text:0x803329A0; // type:function size:0x4 scope:weak align:4 +getType__14J3DPEBlockNullFv = .text:0x803329A4; // type:function size:0xC scope:weak align:4 +__dt__14J3DPEBlockNullFv = .text:0x803329B0; // type:function size:0x5C scope:weak align:4 +reset__15J3DTevBlockNullFP11J3DTevBlock = .text:0x80332A0C; // type:function size:0x4 scope:weak align:4 +ptrToIndex__15J3DTevBlockNullFv = .text:0x80332A10; // type:function size:0x4 scope:weak align:4 +indexToPtr__15J3DTevBlockNullFv = .text:0x80332A14; // type:function size:0x24 scope:weak align:4 +getType__15J3DTevBlockNullFv = .text:0x80332A38; // type:function size:0xC scope:weak align:4 +__dt__15J3DTevBlockNullFv = .text:0x80332A44; // type:function size:0x5C scope:weak align:4 +calc__18J3DTexGenBlockNullFPA4_Cf = .text:0x80332AA0; // type:function size:0x4 scope:weak align:4 +calcWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80332AA4; // type:function size:0x4 scope:weak align:4 +calcPostTexMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80332AA8; // type:function size:0x4 scope:weak align:4 +calcPostTexMtxWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80332AAC; // type:function size:0x4 scope:weak align:4 +load__18J3DTexGenBlockNullFv = .text:0x80332AB0; // type:function size:0x4 scope:weak align:4 +patch__18J3DTexGenBlockNullFv = .text:0x80332AB4; // type:function size:0x4 scope:weak align:4 +diff__18J3DTexGenBlockNullFUl = .text:0x80332AB8; // type:function size:0x4 scope:weak align:4 +diffTexMtx__18J3DTexGenBlockNullFv = .text:0x80332ABC; // type:function size:0x4 scope:weak align:4 +diffTexGen__18J3DTexGenBlockNullFv = .text:0x80332AC0; // type:function size:0x4 scope:weak align:4 +getType__18J3DTexGenBlockNullFv = .text:0x80332AC4; // type:function size:0xC scope:weak align:4 +__dt__18J3DTexGenBlockNullFv = .text:0x80332AD0; // type:function size:0x5C scope:weak align:4 +getType__17J3DColorBlockNullFv = .text:0x80332B2C; // type:function size:0xC scope:weak align:4 +__dt__17J3DColorBlockNullFv = .text:0x80332B38; // type:function size:0x5C scope:weak align:4 +__dt__11J3DMaterialFv = .text:0x80332B94; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<17J3DCurrentMtxInfo>__FPCvPCv = .text:0x80332BDC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DPatchingInfo>__FPCvPCv = .text:0x80332BF4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DDisplayListInit>__FPCvPCv = .text:0x80332C0C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DNBTScaleInfo>__FPCvPCv = .text:0x80332C24; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<12J3DZModeInfo>__FPCvPCv = .text:0x80332C3C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<12J3DBlendInfo>__FPCvPCv = .text:0x80332C54; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DAlphaCompInfo>__FPCvPCv = .text:0x80332C6C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<10J3DFogInfo>__FPCvPCv = .text:0x80332C84; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J3DTevSwapModeTableInfo>__FPCvPCv = .text:0x80332C9C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DTevSwapModeInfo>__FPCvPCv = .text:0x80332CB4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DTevStageInfo>__FPCvPCv = .text:0x80332CCC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DTevOrderInfo>__FPCvPCv = .text:0x80332CE4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<13J3DTexMtxInfo>__FPCvPCv = .text:0x80332CFC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DTexCoord2Info>__FPCvPCv = .text:0x80332D14; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DTexCoordInfo>__FPCvPCv = .text:0x80332D2C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<12J3DLightInfo>__FPCvPCv = .text:0x80332D44; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DColorChanInfo>__FPCvPCv = .text:0x80332D5C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<14J3DIndInitData>__FPCvPCv = .text:0x80332D74; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J3DMaterialInitData>__FPCvPCv = .text:0x80332D8C; // type:function size:0x18 scope:weak align:4 __ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21 = .text:0x80332DA4; // type:function size:0x1E0 scope:global align:4 countUniqueMaterials__22J3DMaterialFactory_v21Fv = .text:0x80332F84; // type:function size:0x24 scope:global align:4 countTexGens__22J3DMaterialFactory_v21CFi = .text:0x80332FA8; // type:function size:0x38 scope:global align:4 @@ -15197,16 +15197,16 @@ newZMode__22J3DMaterialFactory_v21CFi = .text:0x80333FA4; // type:function size: newZCompLoc__22J3DMaterialFactory_v21CFi = .text:0x80334004; // type:function size:0x38 scope:global align:4 newDither__22J3DMaterialFactory_v21CFi = .text:0x8033403C; // type:function size:0x38 scope:global align:4 newNBTScale__22J3DMaterialFactory_v21CFi = .text:0x80334074; // type:function size:0xA4 scope:global align:4 -JSUConvertOffsetToPtr<23J3DMaterialInitData_v21>__FPCvPCv = .text:0x80334118; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr<23J3DMaterialInitData_v21>__FPCvPCv = .text:0x80334118; // type:function size:0x18 scope:weak align:4 load__24J3DClusterLoaderDataBaseFPCv = .text:0x80334130; // type:function size:0x9C scope:global align:4 __ct__20J3DClusterLoader_v15Fv = .text:0x803341CC; // type:function size:0x1C scope:global align:4 __dt__20J3DClusterLoader_v15Fv = .text:0x803341E8; // type:function size:0x5C scope:global align:4 load__20J3DClusterLoader_v15FPCv = .text:0x80334244; // type:function size:0xB4 scope:global align:4 readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock = .text:0x803342F8; // type:function size:0x304 scope:global align:4 -__dt__16J3DClusterLoaderFv = .text:0x803345FC; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<16J3DClusterVertex>__FPCvPCv = .text:0x80334644; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<13J3DClusterKey>__FPCvPCv = .text:0x8033465C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<10J3DCluster>__FPCvPCv = .text:0x80334674; // type:function size:0x18 scope:global align:4 +__dt__16J3DClusterLoaderFv = .text:0x803345FC; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DClusterVertex>__FPCvPCv = .text:0x80334644; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<13J3DClusterKey>__FPCvPCv = .text:0x8033465C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<10J3DCluster>__FPCvPCv = .text:0x80334674; // type:function size:0x18 scope:weak align:4 __ct__14J3DModelLoaderFv = .text:0x8033468C; // type:function size:0x30 scope:global align:4 load__22J3DModelLoaderDataBaseFPCvUl = .text:0x803346BC; // type:function size:0x124 scope:global align:4 load__14J3DModelLoaderFPCvUl = .text:0x803347E0; // type:function size:0x2DC scope:global align:4 @@ -15214,7 +15214,7 @@ loadMaterialTable__14J3DModelLoaderFPCv = .text:0x80334ABC; // type:function siz loadBinaryDisplayList__14J3DModelLoaderFPCvUl = .text:0x80334C20; // type:function size:0x2C0 scope:global align:4 setupBBoardInfo__14J3DModelLoaderFv = .text:0x80334EE0; // type:function size:0x168 scope:global align:4 readInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl = .text:0x80335048; // type:function size:0x15C scope:global align:4 -getFmtType__FP17_GXVtxAttrFmtList7_GXAttr = .text:0x803351A4; // type:function size:0x2C scope:global align:4 +getFmtType__FP17_GXVtxAttrFmtList7_GXAttr = .text:0x803351A4; // type:function size:0x2C scope:local align:4 readVertex__14J3DModelLoaderFPC14J3DVertexBlock = .text:0x803351D0; // type:function size:0x220 scope:global align:4 readEnvelop__14J3DModelLoaderFPC16J3DEnvelopeBlock = .text:0x803353F0; // type:function size:0x90 scope:global align:4 readDraw__14J3DModelLoaderFPC12J3DDrawBlock = .text:0x80335480; // type:function size:0xB0 scope:global align:4 @@ -15229,30 +15229,30 @@ readTextureTable__14J3DModelLoaderFPC15J3DTextureBlock = .text:0x80335F5C; // ty readPatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80336028; // type:function size:0x140 scope:global align:4 readMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl = .text:0x80336168; // type:function size:0x1B4 scope:global align:4 modifyMaterial__14J3DModelLoaderFUl = .text:0x8033631C; // type:function size:0x7C scope:global align:4 -__dt__18J3DModelLoader_v26Fv = .text:0x80336398; // type:function size:0x5C scope:global align:4 -__dt__18J3DModelLoader_v21Fv = .text:0x803363F4; // type:function size:0x5C scope:global align:4 -__dt__14J3DModelLoaderFv = .text:0x80336450; // type:function size:0x48 scope:global align:4 -readMaterial_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x80336498; // type:function size:0x4 scope:global align:4 -readMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x8033649C; // type:function size:0x4 scope:global align:4 -readMaterialTable_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x803364A0; // type:function size:0x4 scope:global align:4 -readMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803364A4; // type:function size:0x4 scope:global align:4 -calcSizeMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803364A8; // type:function size:0x8 scope:global align:4 -calcSizeMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803364B0; // type:function size:0x8 scope:global align:4 -__dt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x803364B8; // type:function size:0x6C scope:global align:4 -init__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>FRC3VecRA3_A4_Cf = .text:0x80336524; // type:function size:0x48 scope:global align:4 -calc__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x8033656C; // type:function size:0x28 scope:global align:4 -__dt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80336594; // type:function size:0x6C scope:global align:4 -init__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>FRC3VecRA3_A4_Cf = .text:0x80336600; // type:function size:0x28 scope:global align:4 -calc__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80336628; // type:function size:0x28 scope:global align:4 -__ct__11J3DMaterialFv = .text:0x80336650; // type:function size:0x54 scope:global align:4 -__dt__10J3DTextureFv = .text:0x803366A4; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<7ResTIMG>__FPCvPCv = .text:0x803366EC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x80336704; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x8033671C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<17_GXVtxAttrFmtList>__FPCvPCv = .text:0x80336734; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<17J3DModelHierarchy>__FPCvPCv = .text:0x8033674C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DShapeInitData>__FPCvUl = .text:0x80336764; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8033677C; // type:function size:0x18 scope:global align:4 +__dt__18J3DModelLoader_v26Fv = .text:0x80336398; // type:function size:0x5C scope:weak align:4 +__dt__18J3DModelLoader_v21Fv = .text:0x803363F4; // type:function size:0x5C scope:weak align:4 +__dt__14J3DModelLoaderFv = .text:0x80336450; // type:function size:0x48 scope:weak align:4 +readMaterial_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x80336498; // type:function size:0x4 scope:weak align:4 +readMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x8033649C; // type:function size:0x4 scope:weak align:4 +readMaterialTable_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x803364A0; // type:function size:0x4 scope:weak align:4 +readMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803364A4; // type:function size:0x4 scope:weak align:4 +calcSizeMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803364A8; // type:function size:0x8 scope:weak align:4 +calcSizeMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803364B0; // type:function size:0x8 scope:weak align:4 +__dt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x803364B8; // type:function size:0x6C scope:weak align:4 +init__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>FRC3VecRA3_A4_Cf = .text:0x80336524; // type:function size:0x48 scope:weak align:4 +calc__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x8033656C; // type:function size:0x28 scope:weak align:4 +__dt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80336594; // type:function size:0x6C scope:weak align:4 +init__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>FRC3VecRA3_A4_Cf = .text:0x80336600; // type:function size:0x28 scope:weak align:4 +calc__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80336628; // type:function size:0x28 scope:weak align:4 +__ct__11J3DMaterialFv = .text:0x80336650; // type:function size:0x54 scope:weak align:4 +__dt__10J3DTextureFv = .text:0x803366A4; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<7ResTIMG>__FPCvPCv = .text:0x803366EC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x80336704; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x8033671C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<17_GXVtxAttrFmtList>__FPCvPCv = .text:0x80336734; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<17J3DModelHierarchy>__FPCvPCv = .text:0x8033674C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DShapeInitData>__FPCvUl = .text:0x80336764; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8033677C; // type:function size:0x18 scope:weak align:4 countMaterialNum__14J3DModelLoaderFPCv = .text:0x80336794; // type:function size:0x40 scope:global align:4 calcLoadSize__14J3DModelLoaderFPCvUl = .text:0x803367D4; // type:function size:0x1CC scope:global align:4 calcLoadMaterialTableSize__14J3DModelLoaderFPCv = .text:0x803369A0; // type:function size:0xF8 scope:global align:4 @@ -15270,7 +15270,7 @@ calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80337 calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl = .text:0x803370A0; // type:function size:0xD8 scope:global align:4 __ct__15J3DJointFactoryFRC13J3DJointBlock = .text:0x80337178; // type:function size:0x58 scope:global align:4 create__15J3DJointFactoryFi = .text:0x803371D0; // type:function size:0x168 scope:global align:4 -JSUConvertOffsetToPtr<16J3DJointInitData>__FPCvUl = .text:0x80337338; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr<16J3DJointInitData>__FPCvUl = .text:0x80337338; // type:function size:0x18 scope:weak align:4 __ct__15J3DShapeFactoryFRC13J3DShapeBlock = .text:0x80337350; // type:function size:0xB0 scope:global align:4 create__15J3DShapeFactoryFiUlP14_GXVtxDescList = .text:0x80337400; // type:function size:0x1BC scope:global align:4 newShapeMtx__15J3DShapeFactoryCFUlii = .text:0x803375BC; // type:function size:0x290 scope:global align:4 @@ -15279,10 +15279,10 @@ allocVcdVatCmdBuffer__15J3DShapeFactoryFUl = .text:0x803378D8; // type:function calcSize__15J3DShapeFactoryFiUl = .text:0x80337944; // type:function size:0x94 scope:global align:4 calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl = .text:0x803379D8; // type:function size:0x10 scope:global align:4 calcSizeShapeMtx__15J3DShapeFactoryCFUlii = .text:0x803379E8; // type:function size:0xF8 scope:global align:4 -JSUConvertOffsetToPtr<20J3DShapeDrawInitData>__FPCvUl = .text:0x80337AE0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J3DShapeMtxInitData>__FPCvUl = .text:0x80337AF8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80337B10; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<14_GXVtxDescList>__FPCvUl = .text:0x80337B28; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr<20J3DShapeDrawInitData>__FPCvUl = .text:0x80337AE0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J3DShapeMtxInitData>__FPCvUl = .text:0x80337AF8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80337B10; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<14_GXVtxDescList>__FPCvUl = .text:0x80337B28; // type:function size:0x18 scope:weak align:4 load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag = .text:0x80337B40; // type:function size:0x5F4 scope:global align:4 setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv = .text:0x80338134; // type:function size:0x334 scope:global align:4 __ct__20J3DAnmFullLoader_v15Fv = .text:0x80338468; // type:function size:0x1C scope:global align:4 @@ -15317,11 +15317,11 @@ readAnmTevReg__19J3DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData = .text:0x80339458; setAnmTevReg__19J3DAnmKeyLoader_v15FP15J3DAnmTevRegKeyPC19J3DAnmTevRegKeyData = .text:0x80339480; // type:function size:0x18C scope:global align:4 readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData = .text:0x8033960C; // type:function size:0x28 scope:global align:4 setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData = .text:0x80339634; // type:function size:0x168 scope:global align:4 -__dt__20J3DAnmVisibilityFullFv = .text:0x8033979C; // type:function size:0x5C scope:global align:4 -getKind__20J3DAnmVisibilityFullCFv = .text:0x803397F8; // type:function size:0x8 scope:global align:4 -__dt__12J3DAnmLoaderFv = .text:0x80339800; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<21J3DAnmClusterKeyTable>__FPCvPCv = .text:0x80339848; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<22J3DAnmClusterFullTable>__FPCvPCv = .text:0x80339860; // type:function size:0x18 scope:global align:4 +__dt__20J3DAnmVisibilityFullFv = .text:0x8033979C; // type:function size:0x5C scope:weak align:4 +getKind__20J3DAnmVisibilityFullCFv = .text:0x803397F8; // type:function size:0x8 scope:weak align:4 +__dt__12J3DAnmLoaderFv = .text:0x80339800; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<21J3DAnmClusterKeyTable>__FPCvPCv = .text:0x80339848; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<22J3DAnmClusterFullTable>__FPCvPCv = .text:0x80339860; // type:function size:0x18 scope:weak align:4 JMAEulerToQuat__FsssP10Quaternion = .text:0x80339878; // type:function size:0xC0 scope:global align:4 JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion = .text:0x80339938; // type:function size:0xF8 scope:global align:4 JMAFastVECNormalize__FPC3VecP3Vec = .text:0x80339A30; // type:function size:0x2C scope:global align:4 @@ -15329,7 +15329,7 @@ JMAVECScaleAdd__FPC3VecPC3VecP3Vecf = .text:0x80339A5C; // type:function size:0x JMAMTXApplyScale__FPA4_CfPA4_ffff = .text:0x80339A84; // type:function size:0x60 scope:global align:4 __ct__Q25JMath13TRandom_fast_FUl = .text:0x80339AE4; // type:function size:0x8 scope:global align:4 __sinit_JMATrigonometric_cpp = .text:0x80339AEC; // type:function size:0x1C4 scope:local align:4 -__ct__Q23std9pairFv = .text:0x80339CB0; // type:function size:0x10 scope:global align:4 +__ct__Q23std9pairFv = .text:0x80339CB0; // type:function size:0x10 scope:weak align:4 PPCMfmsr = .text:0x80339CC0; // type:function size:0x8 scope:global align:4 PPCMtmsr = .text:0x80339CC8; // type:function size:0x8 scope:global align:4 PPCMfhid0 = .text:0x80339CD0; // type:function size:0x8 scope:global align:4 @@ -15354,17 +15354,17 @@ PPCDisableSpeculation = .text:0x80339DA4; // type:function size:0x28 scope:globa PPCSetFpNonIEEEMode = .text:0x80339DCC; // type:function size:0x8 scope:global align:4 __OSFPRInit = .text:0x80339DD4; // type:function size:0x128 scope:global align:4 OSGetConsoleType = .text:0x80339EFC; // type:function size:0x28 scope:global align:4 -InquiryCallback = .text:0x80339F24; // type:function size:0x3C scope:global align:4 +InquiryCallback = .text:0x80339F24; // type:function size:0x3C scope:local align:4 OSInit = .text:0x80339F60; // type:function size:0x4E0 scope:global align:4 -OSExceptionInit = .text:0x8033A440; // type:function size:0x280 scope:global align:4 -__OSDBIntegrator = .text:0x8033A6C0; // type:function size:0x24 scope:global align:4 +OSExceptionInit = .text:0x8033A440; // type:function size:0x280 scope:local align:4 +__OSDBIntegrator = .text:0x8033A6C0; // type:function size:0x24 scope:local align:4 __OSDBINTSTART = .text:0x8033A6C0; // type:label scope:global -__OSDBJump = .text:0x8033A6E4; // type:function size:0x4 scope:global align:4 +__OSDBJump = .text:0x8033A6E4; // type:function size:0x4 scope:local align:4 __OSDBJUMPSTART = .text:0x8033A6E4; // type:label scope:global __OSSetExceptionHandler = .text:0x8033A6E8; // type:function size:0x1C scope:global align:4 __OSDBJUMPEND = .text:0x8033A6E8; // type:label scope:global __OSGetExceptionHandler = .text:0x8033A704; // type:function size:0x14 scope:global align:4 -OSExceptionVector = .text:0x8033A718; // type:function size:0x9C scope:global align:4 +OSExceptionVector = .text:0x8033A718; // type:function size:0x9C scope:local align:4 __OSEVStart = .text:0x8033A718; // type:label scope:global __DBVECTOR = .text:0x8033A770; // type:label scope:global data:4byte __OSEVSetNumber = .text:0x8033A780; // type:label scope:global data:4byte @@ -15375,14 +15375,14 @@ __OSGetDIConfig = .text:0x8033A860; // type:function size:0x14 scope:global alig OSRegisterVersion = .text:0x8033A874; // type:function size:0x2C scope:global align:4 OSInitAlarm = .text:0x8033A8A0; // type:function size:0x58 scope:global align:4 OSCreateAlarm = .text:0x8033A8F8; // type:function size:0x10 scope:global align:4 -InsertAlarm = .text:0x8033A908; // type:function size:0x250 scope:global align:4 +InsertAlarm = .text:0x8033A908; // type:function size:0x250 scope:local align:4 OSSetAlarm = .text:0x8033AB58; // type:function size:0x68 scope:global align:4 OSSetPeriodicAlarm = .text:0x8033ABC0; // type:function size:0x7C scope:global align:4 OSCancelAlarm = .text:0x8033AC3C; // type:function size:0x11C scope:global align:4 -DecrementerExceptionCallback = .text:0x8033AD58; // type:function size:0x230 scope:global align:4 -DecrementerExceptionHandler = .text:0x8033AF88; // type:function size:0x50 scope:global align:4 +DecrementerExceptionCallback = .text:0x8033AD58; // type:function size:0x230 scope:local align:4 +DecrementerExceptionHandler = .text:0x8033AF88; // type:function size:0x50 scope:local align:4 OnReset = .text:0x8033AFD8; // type:function size:0xA0 scope:local align:4 -DLInsert = .text:0x8033B078; // type:function size:0xAC scope:global align:4 +DLInsert = .text:0x8033B078; // type:function size:0xAC scope:local align:4 OSFreeToHeap = .text:0x8033B124; // type:function size:0x7C scope:global align:4 OSSetCurrentHeap = .text:0x8033B1A0; // type:function size:0x10 scope:global align:4 OSInitAlloc = .text:0x8033B1B0; // type:function size:0x70 scope:global align:4 @@ -15404,7 +15404,7 @@ DCZeroRange = .text:0x8033B664; // type:function size:0x2C scope:global align:4 ICInvalidateRange = .text:0x8033B690; // type:function size:0x34 scope:global align:4 ICFlashInvalidate = .text:0x8033B6C4; // type:function size:0x10 scope:global align:4 ICEnable = .text:0x8033B6D4; // type:function size:0x14 scope:global align:4 -__LCEnable = .text:0x8033B6E8; // type:function size:0xCC scope:global align:4 +__LCEnable = .text:0x8033B6E8; // type:function size:0xCC scope:local align:4 LCEnable = .text:0x8033B7B4; // type:function size:0x38 scope:global align:4 LCDisable = .text:0x8033B7EC; // type:function size:0x28 scope:global align:4 LCStoreBlocks = .text:0x8033B814; // type:function size:0x24 scope:global align:4 @@ -15413,8 +15413,8 @@ LCQueueWait = .text:0x8033B8E4; // type:function size:0x14 scope:global align:4 L2GlobalInvalidate = .text:0x8033B8F8; // type:function size:0x98 scope:global align:4 DMAErrorHandler = .text:0x8033B990; // type:function size:0x160 scope:global align:4 __OSCacheInit = .text:0x8033BAF0; // type:function size:0xF4 scope:global align:4 -__OSLoadFPUContext = .text:0x8033BBE4; // type:function size:0x124 scope:global align:4 -__OSSaveFPUContext = .text:0x8033BD08; // type:function size:0x128 scope:global align:4 +__OSLoadFPUContext = .text:0x8033BBE4; // type:function size:0x124 scope:local align:4 +__OSSaveFPUContext = .text:0x8033BD08; // type:function size:0x128 scope:local align:4 OSSaveFPUContext = .text:0x8033BE30; // type:function size:0x8 scope:global align:4 OSSetCurrentContext = .text:0x8033BE38; // type:function size:0x5C scope:global align:4 OSGetCurrentContext = .text:0x8033BE94; // type:function size:0xC scope:global align:4 @@ -15424,22 +15424,22 @@ OSGetStackPointer = .text:0x8033BFF8; // type:function size:0x8 scope:global ali OSClearContext = .text:0x8033C000; // type:function size:0x24 scope:global align:4 OSInitContext = .text:0x8033C024; // type:function size:0xBC scope:global align:4 OSDumpContext = .text:0x8033C0E0; // type:function size:0x2A8 scope:global align:4 -OSSwitchFPUContext = .text:0x8033C388; // type:function size:0x84 scope:global align:4 +OSSwitchFPUContext = .text:0x8033C388; // type:function size:0x84 scope:local align:4 __OSContextInit = .text:0x8033C40C; // type:function size:0x48 scope:global align:4 OSFillFPUContext = .text:0x8033C454; // type:function size:0x12C scope:global align:4 OSSetErrorHandler = .text:0x8033C580; // type:function size:0x218 scope:global align:4 __OSUnhandledException = .text:0x8033C798; // type:function size:0x2E8 scope:global align:4 -PackArgs = .text:0x8033CA80; // type:function size:0x188 scope:global align:4 -Run = .text:0x8033CC08; // type:function size:0x3C scope:global align:4 -ReadDisc = .text:0x8033CC44; // type:function size:0x6C scope:global align:4 +PackArgs = .text:0x8033CA80; // type:function size:0x188 scope:local align:4 +Run = .text:0x8033CC08; // type:function size:0x3C scope:local align:4 +ReadDisc = .text:0x8033CC44; // type:function size:0x6C scope:local align:4 Callback = .text:0x8033CCB0; // type:function size:0xC scope:local align:4 __OSGetExecParams = .text:0x8033CCBC; // type:function size:0x40 scope:global align:4 -GetApploaderPosition = .text:0x8033CCFC; // type:function size:0xC4 scope:global align:4 +GetApploaderPosition = .text:0x8033CCFC; // type:function size:0xC4 scope:local align:4 __OSBootDolSimple = .text:0x8033CDC0; // type:function size:0x484 scope:global align:4 __OSBootDol = .text:0x8033D244; // type:function size:0x19C scope:global align:4 -GetFontCode = .text:0x8033D3E0; // type:function size:0x174 scope:global align:4 +GetFontCode = .text:0x8033D3E0; // type:function size:0x174 scope:local align:4 OSGetFontEncode = .text:0x8033D554; // type:function size:0x64 scope:global align:4 -ParseStringS = .text:0x8033D5B8; // type:function size:0x13C scope:global align:4 +ParseStringS = .text:0x8033D5B8; // type:function size:0x13C scope:local align:4 OSDisableInterrupts = .text:0x8033D6F4; // type:function size:0x14 scope:global align:4 __RAS_OSDisableInterrupts_begin = .text:0x8033D6F4; // type:label scope:global __RAS_OSDisableInterrupts_end = .text:0x8033D700; // type:label scope:global @@ -15448,19 +15448,19 @@ OSRestoreInterrupts = .text:0x8033D71C; // type:function size:0x24 scope:global __OSSetInterruptHandler = .text:0x8033D740; // type:function size:0x1C scope:global align:4 __OSGetInterruptHandler = .text:0x8033D75C; // type:function size:0x14 scope:global align:4 __OSInterruptInit = .text:0x8033D770; // type:function size:0x74 scope:global align:4 -SetInterruptMask = .text:0x8033D7E4; // type:function size:0x2D8 scope:global align:4 +SetInterruptMask = .text:0x8033D7E4; // type:function size:0x2D8 scope:local align:4 __OSMaskInterrupts = .text:0x8033DABC; // type:function size:0x88 scope:global align:4 __OSUnmaskInterrupts = .text:0x8033DB44; // type:function size:0x88 scope:global align:4 __OSDispatchInterrupt = .text:0x8033DBCC; // type:function size:0x344 scope:global align:4 -ExternalInterruptHandler = .text:0x8033DF10; // type:function size:0x50 scope:global align:4 +ExternalInterruptHandler = .text:0x8033DF10; // type:function size:0x50 scope:local align:4 OSNotifyLink = .text:0x8033DF60; // type:function size:0x4 scope:global align:4 OSNotifyUnlink = .text:0x8033DF64; // type:function size:0x4 scope:global align:4 OSSetStringTable = .text:0x8033DF68; // type:function size:0xC scope:global align:4 -Relocate = .text:0x8033DF74; // type:function size:0x2BC scope:global align:4 -Link = .text:0x8033E230; // type:function size:0x2E0 scope:global align:4 +Relocate = .text:0x8033DF74; // type:function size:0x2BC scope:local align:4 +Link = .text:0x8033E230; // type:function size:0x2E0 scope:local align:4 OSLink = .text:0x8033E510; // type:function size:0x24 scope:global align:4 OSLinkFixed = .text:0x8033E534; // type:function size:0x3C scope:global align:4 -Undo = .text:0x8033E570; // type:function size:0x238 scope:global align:4 +Undo = .text:0x8033E570; // type:function size:0x238 scope:local align:4 OSUnlink = .text:0x8033E7A8; // type:function size:0x1D4 scope:global align:4 __OSModuleInit = .text:0x8033E97C; // type:function size:0x18 scope:global align:4 OSInitMessageQueue = .text:0x8033E994; // type:function size:0x60 scope:global align:4 @@ -15468,11 +15468,11 @@ OSSendMessage = .text:0x8033E9F4; // type:function size:0xC8 scope:global align: OSReceiveMessage = .text:0x8033EABC; // type:function size:0xDC scope:global align:4 OSJamMessage = .text:0x8033EB98; // type:function size:0xD4 scope:global align:4 OnReset = .text:0x8033EC6C; // type:function size:0x3C scope:local align:4 -MEMIntrruptHandler = .text:0x8033ECA8; // type:function size:0x6C scope:global align:4 +MEMIntrruptHandler = .text:0x8033ECA8; // type:function size:0x6C scope:local align:4 OSProtectRange = .text:0x8033ED14; // type:function size:0xC4 scope:global align:4 -Config24MB = .text:0x8033EDD8; // type:function size:0x80 scope:global align:4 -Config48MB = .text:0x8033EE58; // type:function size:0x80 scope:global align:4 -RealMode = .text:0x8033EED8; // type:function size:0x18 scope:global align:4 +Config24MB = .text:0x8033EDD8; // type:function size:0x80 scope:local align:4 +Config48MB = .text:0x8033EE58; // type:function size:0x80 scope:local align:4 +RealMode = .text:0x8033EED8; // type:function size:0x18 scope:local align:4 __OSInitMemoryProtection = .text:0x8033EEF0; // type:function size:0x118 scope:global align:4 OSInitMutex = .text:0x8033F008; // type:function size:0x38 scope:global align:4 OSLockMutex = .text:0x8033F040; // type:function size:0xDC scope:global align:4 @@ -15490,20 +15490,20 @@ OSSetSaveRegion = .text:0x8033F640; // type:function size:0xC scope:global align OSGetSaveRegion = .text:0x8033F64C; // type:function size:0x14 scope:global align:4 OSRegisterResetFunction = .text:0x8033F660; // type:function size:0x84 scope:global align:4 __OSCallResetFunctions = .text:0x8033F6E4; // type:function size:0xA8 scope:global align:4 -Reset = .text:0x8033F78C; // type:function size:0x70 scope:global align:4 -KillThreads = .text:0x8033F7FC; // type:function size:0x68 scope:global align:4 +Reset = .text:0x8033F78C; // type:function size:0x70 scope:local align:4 +KillThreads = .text:0x8033F7FC; // type:function size:0x68 scope:local align:4 __OSDoHotReset = .text:0x8033F864; // type:function size:0x48 scope:global align:4 OSResetSystem = .text:0x8033F8AC; // type:function size:0x200 scope:global align:4 OSGetResetCode = .text:0x8033FAAC; // type:function size:0x38 scope:global align:4 __OSResetSWInterruptHandler = .text:0x8033FAE4; // type:function size:0xF4 scope:global align:4 OSGetResetButtonState = .text:0x8033FBD8; // type:function size:0x298 scope:global align:4 OSGetResetSwitchState = .text:0x8033FE70; // type:function size:0x20 scope:global align:4 -WriteSramCallback = .text:0x8033FE90; // type:function size:0x60 scope:global align:4 -WriteSram = .text:0x8033FEF0; // type:function size:0x118 scope:global align:4 +WriteSramCallback = .text:0x8033FE90; // type:function size:0x60 scope:local align:4 +WriteSram = .text:0x8033FEF0; // type:function size:0x118 scope:local align:4 __OSInitSram = .text:0x80340008; // type:function size:0x13C scope:global align:4 __OSLockSram = .text:0x80340144; // type:function size:0x5C scope:global align:4 __OSLockSramEx = .text:0x803401A0; // type:function size:0x5C scope:global align:4 -UnlockSram = .text:0x803401FC; // type:function size:0x33C scope:global align:4 +UnlockSram = .text:0x803401FC; // type:function size:0x33C scope:local align:4 __OSUnlockSram = .text:0x80340538; // type:function size:0x24 scope:global align:4 __OSUnlockSramEx = .text:0x8034055C; // type:function size:0x24 scope:global align:4 __OSSyncSram = .text:0x80340580; // type:function size:0x10 scope:global align:4 @@ -15515,11 +15515,11 @@ OSGetWirelessID = .text:0x803407C8; // type:function size:0x84 scope:global alig OSSetWirelessID = .text:0x8034084C; // type:function size:0xAC scope:global align:4 OSGetGbsMode = .text:0x803408F8; // type:function size:0x70 scope:global align:4 OSSetGbsMode = .text:0x80340968; // type:function size:0xB8 scope:global align:4 -SystemCallVector = .text:0x80340A20; // type:function size:0x20 scope:global align:4 +SystemCallVector = .text:0x80340A20; // type:function size:0x20 scope:local align:4 __OSSystemCallVectorStart = .text:0x80340A20; // type:label scope:global __OSSystemCallVectorEnd = .text:0x80340A3C; // type:label scope:global __OSInitSystemCall = .text:0x80340A40; // type:function size:0x64 scope:global align:4 -DefaultSwitchThreadCallback = .text:0x80340AA4; // type:function size:0x4 scope:global align:4 +DefaultSwitchThreadCallback = .text:0x80340AA4; // type:function size:0x4 scope:local align:4 OSSetSwitchThreadCallback = .text:0x80340AA8; // type:function size:0x74 scope:global align:4 __OSThreadInit = .text:0x80340B1C; // type:function size:0x158 scope:global align:4 OSInitThreadQueue = .text:0x80340C74; // type:function size:0x10 scope:global align:4 @@ -15527,11 +15527,11 @@ OSGetCurrentThread = .text:0x80340C84; // type:function size:0xC scope:global al OSIsThreadTerminated = .text:0x80340C90; // type:function size:0x34 scope:global align:4 OSDisableScheduler = .text:0x80340CC4; // type:function size:0x40 scope:global align:4 OSEnableScheduler = .text:0x80340D04; // type:function size:0x40 scope:global align:4 -UnsetRun = .text:0x80340D44; // type:function size:0x68 scope:global align:4 +UnsetRun = .text:0x80340D44; // type:function size:0x68 scope:local align:4 __OSGetEffectivePriority = .text:0x80340DAC; // type:function size:0x3C scope:global align:4 -SetEffectivePriority = .text:0x80340DE8; // type:function size:0x1C0 scope:global align:4 +SetEffectivePriority = .text:0x80340DE8; // type:function size:0x1C0 scope:local align:4 __OSPromoteThread = .text:0x80340FA8; // type:function size:0x50 scope:global align:4 -SelectThread = .text:0x80340FF8; // type:function size:0x228 scope:global align:4 +SelectThread = .text:0x80340FF8; // type:function size:0x228 scope:local align:4 __OSReschedule = .text:0x80341220; // type:function size:0x30 scope:global align:4 OSYieldThread = .text:0x80341250; // type:function size:0x3C scope:global align:4 OSCreateThread = .text:0x8034128C; // type:function size:0x1E8 scope:global align:4 @@ -15544,65 +15544,65 @@ OSSleepThread = .text:0x80341BAC; // type:function size:0xEC scope:global align: OSWakeupThread = .text:0x80341C98; // type:function size:0x104 scope:global align:4 OSSetThreadPriority = .text:0x80341D9C; // type:function size:0xC0 scope:global align:4 OSGetThreadPriority = .text:0x80341E5C; // type:function size:0x8 scope:global align:4 -CheckThreadQueue = .text:0x80341E64; // type:function size:0x9C scope:global align:4 +CheckThreadQueue = .text:0x80341E64; // type:function size:0x9C scope:local align:4 OSCheckActiveThreads = .text:0x80341F00; // type:function size:0x750 scope:global align:4 OSClearStack = .text:0x80342650; // type:function size:0xAC scope:global align:4 OSGetTime = .text:0x803426FC; // type:function size:0x18 scope:global align:4 OSGetTick = .text:0x80342714; // type:function size:0x8 scope:global align:4 __OSGetSystemTime = .text:0x8034271C; // type:function size:0x64 scope:global align:4 __OSTimeToSystemTime = .text:0x80342780; // type:function size:0x58 scope:global align:4 -GetDates = .text:0x803427D8; // type:function size:0x19C scope:global align:4 +GetDates = .text:0x803427D8; // type:function size:0x19C scope:local align:4 OSTicksToCalendarTime = .text:0x80342974; // type:function size:0x204 scope:global align:4 __init_user = .text:0x80342B78; // type:function size:0x20 scope:global align:4 __init_cpp = .text:0x80342B98; // type:function size:0x54 scope:global align:4 _ExitProcess = .text:0x80342BEC; // type:function size:0x20 scope:global align:4 -SetExiInterruptMask = .text:0x80342C0C; // type:function size:0xF4 scope:global align:4 +SetExiInterruptMask = .text:0x80342C0C; // type:function size:0xF4 scope:local align:4 EXIImm = .text:0x80342D00; // type:function size:0x25C scope:global align:4 EXIImmEx = .text:0x80342F5C; // type:function size:0xA0 scope:global align:4 EXIDma = .text:0x80342FFC; // type:function size:0xEC scope:global align:4 EXISync = .text:0x803430E8; // type:function size:0x24C scope:global align:4 EXIClearInterrupts = .text:0x80343334; // type:function size:0x48 scope:global align:4 EXISetExiCallback = .text:0x8034337C; // type:function size:0x7C scope:global align:4 -__EXIProbe = .text:0x803433F8; // type:function size:0x174 scope:global align:4 +__EXIProbe = .text:0x803433F8; // type:function size:0x174 scope:local align:4 EXIProbe = .text:0x8034356C; // type:function size:0x80 scope:global align:4 EXIProbeEx = .text:0x803435EC; // type:function size:0xB4 scope:global align:4 EXIAttach = .text:0x803436A0; // type:function size:0x10C scope:global align:4 EXIDetach = .text:0x803437AC; // type:function size:0xBC scope:global align:4 EXISelect = .text:0x80343868; // type:function size:0x12C scope:global align:4 EXIDeselect = .text:0x80343994; // type:function size:0x110 scope:global align:4 -EXIIntrruptHandler = .text:0x80343AA4; // type:function size:0xC8 scope:global align:4 -TCIntrruptHandler = .text:0x80343B6C; // type:function size:0x218 scope:global align:4 -EXTIntrruptHandler = .text:0x80343D84; // type:function size:0xD0 scope:global align:4 +EXIIntrruptHandler = .text:0x80343AA4; // type:function size:0xC8 scope:local align:4 +TCIntrruptHandler = .text:0x80343B6C; // type:function size:0x218 scope:local align:4 +EXTIntrruptHandler = .text:0x80343D84; // type:function size:0xD0 scope:local align:4 EXIInit = .text:0x80343E54; // type:function size:0x1D4 scope:global align:4 EXILock = .text:0x80344028; // type:function size:0xF4 scope:global align:4 EXIUnlock = .text:0x8034411C; // type:function size:0xDC scope:global align:4 EXIGetState = .text:0x803441F8; // type:function size:0x18 scope:global align:4 -UnlockedHandler = .text:0x80344210; // type:function size:0x28 scope:global align:4 +UnlockedHandler = .text:0x80344210; // type:function size:0x28 scope:local align:4 EXIGetID = .text:0x80344238; // type:function size:0x3B0 scope:global align:4 -ProbeBarnacle = .text:0x803445E8; // type:function size:0x18C scope:global align:4 +ProbeBarnacle = .text:0x803445E8; // type:function size:0x18C scope:local align:4 __OSEnableBarnacle = .text:0x80344774; // type:function size:0x1BC scope:global align:4 InitializeUART = .text:0x80344930; // type:function size:0x70 scope:global align:4 WriteUARTN = .text:0x803449A0; // type:function size:0x200 scope:global align:4 SIBusy = .text:0x80344BA0; // type:function size:0x20 scope:global align:4 SIIsChanBusy = .text:0x80344BC0; // type:function size:0x3C scope:global align:4 -CompleteTransfer = .text:0x80344BFC; // type:function size:0x2FC scope:global align:4 -SIInterruptHandler = .text:0x80344EF8; // type:function size:0x344 scope:global align:4 -SIEnablePollingInterrupt = .text:0x8034523C; // type:function size:0x98 scope:global align:4 +CompleteTransfer = .text:0x80344BFC; // type:function size:0x2FC scope:local align:4 +SIInterruptHandler = .text:0x80344EF8; // type:function size:0x344 scope:local align:4 +SIEnablePollingInterrupt = .text:0x8034523C; // type:function size:0x98 scope:local align:4 SIRegisterPollingHandler = .text:0x803452D4; // type:function size:0xCC scope:global align:4 SIUnregisterPollingHandler = .text:0x803453A0; // type:function size:0xF4 scope:global align:4 SIInit = .text:0x80345494; // type:function size:0xB4 scope:global align:4 -__SITransfer = .text:0x80345548; // type:function size:0x20C scope:global align:4 +__SITransfer = .text:0x80345548; // type:function size:0x20C scope:local align:4 SIGetStatus = .text:0x80345754; // type:function size:0x7C scope:global align:4 SISetCommand = .text:0x803457D0; // type:function size:0x14 scope:global align:4 SITransferCommands = .text:0x803457E4; // type:function size:0x10 scope:global align:4 SISetXY = .text:0x803457F4; // type:function size:0x6C scope:global align:4 SIEnablePolling = .text:0x80345860; // type:function size:0x9C scope:global align:4 SIDisablePolling = .text:0x803458FC; // type:function size:0x6C scope:global align:4 -SIGetResponseRaw = .text:0x80345968; // type:function size:0xD4 scope:global align:4 +SIGetResponseRaw = .text:0x80345968; // type:function size:0xD4 scope:local align:4 SIGetResponse = .text:0x80345A3C; // type:function size:0xC4 scope:global align:4 AlarmHandler = .text:0x80345B00; // type:function size:0x8C scope:local align:4 SITransfer = .text:0x80345B8C; // type:function size:0x16C scope:global align:4 -GetTypeCallback = .text:0x80345CF8; // type:function size:0x298 scope:global align:4 +GetTypeCallback = .text:0x80345CF8; // type:function size:0x298 scope:local align:4 SIGetType = .text:0x80345F90; // type:function size:0x1C4 scope:global align:4 SIGetTypeAsync = .text:0x80346154; // type:function size:0x13C scope:global align:4 SISetSamplingRate = .text:0x80346290; // type:function size:0xE4 scope:global align:4 @@ -15618,7 +15618,7 @@ PSMTXConcat = .text:0x803464E4; // type:function size:0xCC scope:global align:4 PSMTXInverse = .text:0x803465B0; // type:function size:0xF8 scope:global align:4 PSMTXRotRad = .text:0x803466A8; // type:function size:0x70 scope:global align:4 PSMTXRotTrig = .text:0x80346718; // type:function size:0xB0 scope:global align:4 -__PSMTXRotAxisRadInternal = .text:0x803467C8; // type:function size:0xB0 scope:global align:4 +__PSMTXRotAxisRadInternal = .text:0x803467C8; // type:function size:0xB0 scope:local align:4 PSMTXRotAxisRad = .text:0x80346878; // type:function size:0x70 scope:global align:4 PSMTXTrans = .text:0x803468E8; // type:function size:0x34 scope:global align:4 PSMTXTransApply = .text:0x8034691C; // type:function size:0x4C scope:global align:4 @@ -15652,9 +15652,9 @@ C_QUATSlerp = .text:0x80347500; // type:function size:0x174 scope:global align:4 __DVDInitWA = .text:0x80347674; // type:function size:0x40 scope:global align:4 __DVDInterruptHandler = .text:0x803476B4; // type:function size:0x2E0 scope:global align:4 AlarmHandler = .text:0x80347994; // type:function size:0x84 scope:local align:4 -AlarmHandlerForTimeout = .text:0x80347A18; // type:function size:0x70 scope:global align:4 -Read = .text:0x80347A88; // type:function size:0x110 scope:global align:4 -SeekTwiceBeforeRead = .text:0x80347B98; // type:function size:0x80 scope:global align:4 +AlarmHandlerForTimeout = .text:0x80347A18; // type:function size:0x70 scope:local align:4 +Read = .text:0x80347A88; // type:function size:0x110 scope:local align:4 +SeekTwiceBeforeRead = .text:0x80347B98; // type:function size:0x80 scope:local align:4 DVDLowRead = .text:0x80347C18; // type:function size:0x298 scope:global align:4 DVDLowSeek = .text:0x80347EB0; // type:function size:0x94 scope:global align:4 DVDLowWaitCoverClose = .text:0x80347F44; // type:function size:0x2C scope:global align:4 @@ -15675,47 +15675,47 @@ DVDConvertPathToEntrynum = .text:0x80348528; // type:function size:0x2F4 scope:g DVDFastOpen = .text:0x8034881C; // type:function size:0x74 scope:global align:4 DVDOpen = .text:0x80348890; // type:function size:0xC8 scope:global align:4 DVDClose = .text:0x80348958; // type:function size:0x24 scope:global align:4 -entryToPath = .text:0x8034897C; // type:function size:0x160 scope:global align:4 -DVDConvertEntrynumToPath = .text:0x80348ADC; // type:function size:0x154 scope:global align:4 +entryToPath = .text:0x8034897C; // type:function size:0x160 scope:local align:4 +DVDConvertEntrynumToPath = .text:0x80348ADC; // type:function size:0x154 scope:local align:4 DVDGetCurrentDir = .text:0x80348C30; // type:function size:0xC4 scope:global align:4 DVDChangeDir = .text:0x80348CF4; // type:function size:0x60 scope:global align:4 DVDReadAsyncPrio = .text:0x80348D54; // type:function size:0xC0 scope:global align:4 -cbForReadAsync = .text:0x80348E14; // type:function size:0x30 scope:global align:4 +cbForReadAsync = .text:0x80348E14; // type:function size:0x30 scope:local align:4 DVDReadPrio = .text:0x80348E44; // type:function size:0x118 scope:global align:4 -cbForReadSync = .text:0x80348F5C; // type:function size:0x24 scope:global align:4 +cbForReadSync = .text:0x80348F5C; // type:function size:0x24 scope:local align:4 DVDOpenDir = .text:0x80348F80; // type:function size:0xC0 scope:global align:4 DVDReadDir = .text:0x80349040; // type:function size:0xA4 scope:global align:4 DVDCloseDir = .text:0x803490E4; // type:function size:0x8 scope:global align:4 -defaultOptionalCommandChecker = .text:0x803490EC; // type:function size:0x4 scope:global align:4 +defaultOptionalCommandChecker = .text:0x803490EC; // type:function size:0x4 scope:local align:4 DVDInit = .text:0x803490F0; // type:function size:0xD8 scope:global align:4 -stateReadingFST = .text:0x803491C8; // type:function size:0x94 scope:global align:4 -cbForStateReadingFST = .text:0x8034925C; // type:function size:0x80 scope:global align:4 -cbForStateError = .text:0x803492DC; // type:function size:0xAC scope:global align:4 -stateTimeout = .text:0x80349388; // type:function size:0x34 scope:global align:4 -stateGettingError = .text:0x803493BC; // type:function size:0x28 scope:global align:4 -CategorizeError = .text:0x803493E4; // type:function size:0xB4 scope:global align:4 -cbForStateGettingError = .text:0x80349498; // type:function size:0x264 scope:global align:4 -cbForUnrecoveredError = .text:0x803496FC; // type:function size:0x5C scope:global align:4 -cbForUnrecoveredErrorRetry = .text:0x80349758; // type:function size:0x80 scope:global align:4 -stateGoToRetry = .text:0x803497D8; // type:function size:0x28 scope:global align:4 -cbForStateGoToRetry = .text:0x80349800; // type:function size:0x140 scope:global align:4 -stateCheckID = .text:0x80349940; // type:function size:0xE0 scope:global align:4 -stateCheckID3 = .text:0x80349A20; // type:function size:0x34 scope:global align:4 -stateCheckID2a = .text:0x80349A54; // type:function size:0x34 scope:global align:4 -cbForStateCheckID2a = .text:0x80349A88; // type:function size:0x68 scope:global align:4 -stateCheckID2 = .text:0x80349AF0; // type:function size:0x38 scope:global align:4 -cbForStateCheckID1 = .text:0x80349B28; // type:function size:0xFC scope:global align:4 -cbForStateCheckID2 = .text:0x80349C24; // type:function size:0xD8 scope:global align:4 -cbForStateCheckID3 = .text:0x80349CFC; // type:function size:0xF0 scope:global align:4 +stateReadingFST = .text:0x803491C8; // type:function size:0x94 scope:local align:4 +cbForStateReadingFST = .text:0x8034925C; // type:function size:0x80 scope:local align:4 +cbForStateError = .text:0x803492DC; // type:function size:0xAC scope:local align:4 +stateTimeout = .text:0x80349388; // type:function size:0x34 scope:local align:4 +stateGettingError = .text:0x803493BC; // type:function size:0x28 scope:local align:4 +CategorizeError = .text:0x803493E4; // type:function size:0xB4 scope:local align:4 +cbForStateGettingError = .text:0x80349498; // type:function size:0x264 scope:local align:4 +cbForUnrecoveredError = .text:0x803496FC; // type:function size:0x5C scope:local align:4 +cbForUnrecoveredErrorRetry = .text:0x80349758; // type:function size:0x80 scope:local align:4 +stateGoToRetry = .text:0x803497D8; // type:function size:0x28 scope:local align:4 +cbForStateGoToRetry = .text:0x80349800; // type:function size:0x140 scope:local align:4 +stateCheckID = .text:0x80349940; // type:function size:0xE0 scope:local align:4 +stateCheckID3 = .text:0x80349A20; // type:function size:0x34 scope:local align:4 +stateCheckID2a = .text:0x80349A54; // type:function size:0x34 scope:local align:4 +cbForStateCheckID2a = .text:0x80349A88; // type:function size:0x68 scope:local align:4 +stateCheckID2 = .text:0x80349AF0; // type:function size:0x38 scope:local align:4 +cbForStateCheckID1 = .text:0x80349B28; // type:function size:0xFC scope:local align:4 +cbForStateCheckID2 = .text:0x80349C24; // type:function size:0xD8 scope:local align:4 +cbForStateCheckID3 = .text:0x80349CFC; // type:function size:0xF0 scope:local align:4 AlarmHandler = .text:0x80349DEC; // type:function size:0x44 scope:local align:4 -stateCoverClosed = .text:0x80349E30; // type:function size:0xD4 scope:global align:4 -stateCoverClosed_CMD = .text:0x80349F04; // type:function size:0x30 scope:global align:4 -cbForStateCoverClosed = .text:0x80349F34; // type:function size:0x64 scope:global align:4 -stateMotorStopped = .text:0x80349F98; // type:function size:0x28 scope:global align:4 -cbForStateMotorStopped = .text:0x80349FC0; // type:function size:0xEC scope:global align:4 -stateReady = .text:0x8034A0AC; // type:function size:0x2E8 scope:global align:4 -stateBusy = .text:0x8034A394; // type:function size:0x340 scope:global align:4 -cbForStateBusy = .text:0x8034A6D4; // type:function size:0x658 scope:global align:4 +stateCoverClosed = .text:0x80349E30; // type:function size:0xD4 scope:local align:4 +stateCoverClosed_CMD = .text:0x80349F04; // type:function size:0x30 scope:local align:4 +cbForStateCoverClosed = .text:0x80349F34; // type:function size:0x64 scope:local align:4 +stateMotorStopped = .text:0x80349F98; // type:function size:0x28 scope:local align:4 +cbForStateMotorStopped = .text:0x80349FC0; // type:function size:0xEC scope:local align:4 +stateReady = .text:0x8034A0AC; // type:function size:0x2E8 scope:local align:4 +stateBusy = .text:0x8034A394; // type:function size:0x340 scope:local align:4 +cbForStateBusy = .text:0x8034A6D4; // type:function size:0x658 scope:local align:4 DVDReadAbsAsyncPrio = .text:0x8034AD2C; // type:function size:0xDC scope:global align:4 DVDReadAbsAsyncForBS = .text:0x8034AE08; // type:function size:0xD0 scope:global align:4 DVDReadDiskID = .text:0x8034AED8; // type:function size:0xD4 scope:global align:4 @@ -15728,7 +15728,7 @@ DVDSetAutoInvalidation = .text:0x8034B274; // type:function size:0x10 scope:glob DVDResume = .text:0x8034B284; // type:function size:0x50 scope:global align:4 DVDCancelAsync = .text:0x8034B2D4; // type:function size:0x27C scope:global align:4 DVDCancel = .text:0x8034B550; // type:function size:0xAC scope:global align:4 -cbForCancelSync = .text:0x8034B5FC; // type:function size:0x24 scope:global align:4 +cbForCancelSync = .text:0x8034B5FC; // type:function size:0x24 scope:local align:4 DVDGetCurrentDiskID = .text:0x8034B620; // type:function size:0x8 scope:global align:4 DVDCheckDisk = .text:0x8034B628; // type:function size:0xF8 scope:global align:4 __DVDPrepareResetAsync = .text:0x8034B720; // type:function size:0x11C scope:global align:4 @@ -15738,21 +15738,21 @@ __DVDPushWaitingQueue = .text:0x8034B8AC; // type:function size:0x68 scope:globa __DVDPopWaitingQueue = .text:0x8034B914; // type:function size:0xA0 scope:global align:4 __DVDCheckWaitingQueue = .text:0x8034B9B4; // type:function size:0x58 scope:global align:4 __DVDDequeueWaitingQueue = .text:0x8034BA0C; // type:function size:0x60 scope:global align:4 -ErrorCode2Num = .text:0x8034BA6C; // type:function size:0x11C scope:global align:4 +ErrorCode2Num = .text:0x8034BA6C; // type:function size:0x11C scope:local align:4 __DVDStoreErrorCode = .text:0x8034BB88; // type:function size:0x7C scope:global align:4 DVDCompareDiskID = .text:0x8034BC04; // type:function size:0xF8 scope:global align:4 __DVDPrintFatalMessage = .text:0x8034BCFC; // type:function size:0x30 scope:global align:4 -cb = .text:0x8034BD2C; // type:function size:0xD8 scope:global align:4 +cb = .text:0x8034BD2C; // type:function size:0xD8 scope:local align:4 __fstLoad = .text:0x8034BE04; // type:function size:0x168 scope:global align:4 -__VIRetraceHandler = .text:0x8034BF6C; // type:function size:0x274 scope:global align:4 +__VIRetraceHandler = .text:0x8034BF6C; // type:function size:0x274 scope:local align:4 VISetPreRetraceCallback = .text:0x8034C1E0; // type:function size:0x44 scope:global align:4 VISetPostRetraceCallback = .text:0x8034C224; // type:function size:0x44 scope:global align:4 -getTiming = .text:0x8034C268; // type:function size:0xA8 scope:global align:4 +getTiming = .text:0x8034C268; // type:function size:0xA8 scope:local align:4 __VIInit = .text:0x8034C310; // type:function size:0x204 scope:global align:4 VIInit = .text:0x8034C514; // type:function size:0x4B0 scope:global align:4 VIWaitForRetrace = .text:0x8034C9C4; // type:function size:0x54 scope:global align:4 -setFbbRegs = .text:0x8034CA18; // type:function size:0x2D4 scope:global align:4 -setVerticalRegs = .text:0x8034CCEC; // type:function size:0x1A0 scope:global align:4 +setFbbRegs = .text:0x8034CA18; // type:function size:0x2D4 scope:local align:4 +setVerticalRegs = .text:0x8034CCEC; // type:function size:0x1A0 scope:local align:4 VIConfigure = .text:0x8034CE8C; // type:function size:0x808 scope:global align:4 VIFlush = .text:0x8034D694; // type:function size:0x130 scope:global align:4 VISetNextFrameBuffer = .text:0x8034D7C4; // type:function size:0x6C scope:global align:4 @@ -15760,36 +15760,36 @@ VIGetNextFrameBuffer = .text:0x8034D830; // type:function size:0x8 scope:global VIGetCurrentFrameBuffer = .text:0x8034D838; // type:function size:0x8 scope:global align:4 VISetBlack = .text:0x8034D840; // type:function size:0x7C scope:global align:4 VIGetRetraceCount = .text:0x8034D8BC; // type:function size:0x8 scope:global align:4 -GetCurrentDisplayPosition = .text:0x8034D8C4; // type:function size:0x3C scope:global align:4 -getCurrentFieldEvenOdd = .text:0x8034D900; // type:function size:0x68 scope:global align:4 +GetCurrentDisplayPosition = .text:0x8034D8C4; // type:function size:0x3C scope:local align:4 +getCurrentFieldEvenOdd = .text:0x8034D900; // type:function size:0x68 scope:local align:4 VIGetNextField = .text:0x8034D968; // type:function size:0x9C scope:global align:4 VIGetCurrentLine = .text:0x8034DA04; // type:function size:0x98 scope:global align:4 VIGetTvFormat = .text:0x8034DA9C; // type:function size:0x68 scope:global align:4 VIGetDTVStatus = .text:0x8034DB04; // type:function size:0x3C scope:global align:4 __VIDisplayPositionToXY = .text:0x8034DB40; // type:function size:0x21C scope:global align:4 __VIGetCurrentPosition = .text:0x8034DD5C; // type:function size:0x60 scope:global align:4 -ClampStick = .text:0x8034DDBC; // type:function size:0x130 scope:global align:4 -ClampCircle = .text:0x8034DEEC; // type:function size:0x1A8 scope:global align:4 +ClampStick = .text:0x8034DDBC; // type:function size:0x130 scope:local align:4 +ClampCircle = .text:0x8034DEEC; // type:function size:0x1A8 scope:local align:4 PADClamp = .text:0x8034E094; // type:function size:0x114 scope:global align:4 PADClampCircle = .text:0x8034E1A8; // type:function size:0x10C scope:global align:4 -UpdateOrigin = .text:0x8034E2B4; // type:function size:0x1A4 scope:global align:4 -PADOriginCallback = .text:0x8034E458; // type:function size:0xC4 scope:global align:4 -PADOriginUpdateCallback = .text:0x8034E51C; // type:function size:0xCC scope:global align:4 -PADProbeCallback = .text:0x8034E5E8; // type:function size:0xD8 scope:global align:4 -PADTypeAndStatusCallback = .text:0x8034E6C0; // type:function size:0x32C scope:global align:4 -PADReceiveCheckCallback = .text:0x8034E9EC; // type:function size:0x140 scope:global align:4 +UpdateOrigin = .text:0x8034E2B4; // type:function size:0x1A4 scope:local align:4 +PADOriginCallback = .text:0x8034E458; // type:function size:0xC4 scope:local align:4 +PADOriginUpdateCallback = .text:0x8034E51C; // type:function size:0xCC scope:local align:4 +PADProbeCallback = .text:0x8034E5E8; // type:function size:0xD8 scope:local align:4 +PADTypeAndStatusCallback = .text:0x8034E6C0; // type:function size:0x32C scope:local align:4 +PADReceiveCheckCallback = .text:0x8034E9EC; // type:function size:0x140 scope:local align:4 PADReset = .text:0x8034EB2C; // type:function size:0x110 scope:global align:4 PADRecalibrate = .text:0x8034EC3C; // type:function size:0x114 scope:global align:4 PADInit = .text:0x8034ED50; // type:function size:0x150 scope:global align:4 PADRead = .text:0x8034EEA0; // type:function size:0x300 scope:global align:4 PADControlMotor = .text:0x8034F1A0; // type:function size:0xB8 scope:global align:4 PADSetSpec = .text:0x8034F258; // type:function size:0x60 scope:global align:4 -SPEC0_MakeStatus = .text:0x8034F2B8; // type:function size:0x174 scope:global align:4 -SPEC1_MakeStatus = .text:0x8034F42C; // type:function size:0x174 scope:global align:4 -SPEC2_MakeStatus = .text:0x8034F5A0; // type:function size:0x470 scope:global align:4 +SPEC0_MakeStatus = .text:0x8034F2B8; // type:function size:0x174 scope:local align:4 +SPEC1_MakeStatus = .text:0x8034F42C; // type:function size:0x174 scope:local align:4 +SPEC2_MakeStatus = .text:0x8034F5A0; // type:function size:0x470 scope:local align:4 PADSetAnalogMode = .text:0x8034FA10; // type:function size:0x74 scope:global align:4 OnReset = .text:0x8034FA84; // type:function size:0xBC scope:local align:4 -SamplingHandler = .text:0x8034FB40; // type:function size:0x60 scope:global align:4 +SamplingHandler = .text:0x8034FB40; // type:function size:0x60 scope:local align:4 PADSetSamplingCallback = .text:0x8034FBA0; // type:function size:0x54 scope:global align:4 __PADDisableRecalibration = .text:0x8034FBF4; // type:function size:0x7C scope:global align:4 AIRegisterDMACallback = .text:0x8034FC70; // type:function size:0x44 scope:global align:4 @@ -15800,27 +15800,27 @@ AISetStreamPlayState = .text:0x8034FD6C; // type:function size:0xD8 scope:global AIGetStreamPlayState = .text:0x8034FE44; // type:function size:0x10 scope:global align:4 AISetDSPSampleRate = .text:0x8034FE54; // type:function size:0xE0 scope:global align:4 AIGetDSPSampleRate = .text:0x8034FF34; // type:function size:0x14 scope:global align:4 -__AI_set_stream_sample_rate = .text:0x8034FF48; // type:function size:0xD4 scope:global align:4 +__AI_set_stream_sample_rate = .text:0x8034FF48; // type:function size:0xD4 scope:local align:4 AIGetStreamSampleRate = .text:0x8035001C; // type:function size:0x10 scope:global align:4 AISetStreamVolLeft = .text:0x8035002C; // type:function size:0x1C scope:global align:4 AIGetStreamVolLeft = .text:0x80350048; // type:function size:0x10 scope:global align:4 AISetStreamVolRight = .text:0x80350058; // type:function size:0x1C scope:global align:4 AIGetStreamVolRight = .text:0x80350074; // type:function size:0x10 scope:global align:4 AIInit = .text:0x80350084; // type:function size:0x16C scope:global align:4 -__AISHandler = .text:0x803501F0; // type:function size:0x7C scope:global align:4 -__AIDHandler = .text:0x8035026C; // type:function size:0xAC scope:global align:4 -__AICallbackStackSwitch = .text:0x80350318; // type:function size:0x58 scope:global align:4 -__AI_SRC_INIT = .text:0x80350370; // type:function size:0x1E4 scope:global align:4 +__AISHandler = .text:0x803501F0; // type:function size:0x7C scope:local align:4 +__AIDHandler = .text:0x8035026C; // type:function size:0xAC scope:local align:4 +__AICallbackStackSwitch = .text:0x80350318; // type:function size:0x58 scope:local align:4 +__AI_SRC_INIT = .text:0x80350370; // type:function size:0x1E4 scope:local align:4 ARRegisterDMACallback = .text:0x80350554; // type:function size:0x44 scope:global align:4 ARGetDMAStatus = .text:0x80350598; // type:function size:0x3C scope:global align:4 ARStartDMA = .text:0x803505D4; // type:function size:0xF0 scope:global align:4 ARAlloc = .text:0x803506C4; // type:function size:0x68 scope:global align:4 ARInit = .text:0x8035072C; // type:function size:0xC4 scope:global align:4 ARGetSize = .text:0x803507F0; // type:function size:0x8 scope:global align:4 -__ARHandler = .text:0x803507F8; // type:function size:0x78 scope:global align:4 +__ARHandler = .text:0x803507F8; // type:function size:0x78 scope:local align:4 __ARClearInterrupt = .text:0x80350870; // type:function size:0x20 scope:global align:4 __ARGetInterruptStatus = .text:0x80350890; // type:function size:0x10 scope:global align:4 -__ARChecksize = .text:0x803508A0; // type:function size:0x17F4 scope:global align:4 +__ARChecksize = .text:0x803508A0; // type:function size:0x17F4 scope:local align:4 __ARQServiceQueueLo = .text:0x80352094; // type:function size:0x100 scope:global align:4 __ARQCallbackHack = .text:0x80352194; // type:function size:0x4 scope:global align:4 __ARQInterruptServiceRoutine = .text:0x80352198; // type:function size:0xCC scope:global align:4 @@ -15847,10 +15847,10 @@ __CARDEnableInterrupt = .text:0x80352D84; // type:function size:0xC0 scope:globa __CARDReadStatus = .text:0x80352E44; // type:function size:0xF0 scope:global align:4 __CARDReadVendorID = .text:0x80352F34; // type:function size:0xF0 scope:global align:4 __CARDClearStatus = .text:0x80353024; // type:function size:0xAC scope:global align:4 -TimeoutHandler = .text:0x803530D0; // type:function size:0xA4 scope:global align:4 -Retry = .text:0x80353174; // type:function size:0x2A0 scope:global align:4 -UnlockedCallback = .text:0x80353414; // type:function size:0x110 scope:global align:4 -__CARDStart = .text:0x80353524; // type:function size:0x224 scope:global align:4 +TimeoutHandler = .text:0x803530D0; // type:function size:0xA4 scope:local align:4 +Retry = .text:0x80353174; // type:function size:0x2A0 scope:local align:4 +UnlockedCallback = .text:0x80353414; // type:function size:0x110 scope:local align:4 +__CARDStart = .text:0x80353524; // type:function size:0x224 scope:local align:4 __CARDReadSegment = .text:0x80353748; // type:function size:0x134 scope:global align:4 __CARDWritePage = .text:0x8035387C; // type:function size:0x13C scope:global align:4 __CARDEraseSector = .text:0x803539B8; // type:function size:0x110 scope:global align:4 @@ -15863,15 +15863,15 @@ CARDFreeBlocks = .text:0x80353CD0; // type:function size:0x150 scope:global alig __CARDSync = .text:0x80353E20; // type:function size:0x98 scope:global align:4 OnReset = .text:0x80353EB8; // type:function size:0x50 scope:local align:4 CARDGetFastMode = .text:0x80353F08; // type:function size:0x1C scope:global align:4 -bitrev = .text:0x80353F24; // type:function size:0x16C scope:global align:4 -ReadArrayUnlock = .text:0x80354090; // type:function size:0x144 scope:global align:4 -DummyLen = .text:0x803541D4; // type:function size:0xC4 scope:global align:4 +bitrev = .text:0x80353F24; // type:function size:0x16C scope:local align:4 +ReadArrayUnlock = .text:0x80354090; // type:function size:0x144 scope:local align:4 +DummyLen = .text:0x803541D4; // type:function size:0xC4 scope:local align:4 __CARDUnlock = .text:0x80354298; // type:function size:0xB58 scope:global align:4 -InitCallback = .text:0x80354DF0; // type:function size:0x70 scope:global align:4 -DoneCallback = .text:0x80354E60; // type:function size:0x324 scope:global align:4 -BlockReadCallback = .text:0x80355184; // type:function size:0xDC scope:global align:4 +InitCallback = .text:0x80354DF0; // type:function size:0x70 scope:local align:4 +DoneCallback = .text:0x80354E60; // type:function size:0x324 scope:local align:4 +BlockReadCallback = .text:0x80355184; // type:function size:0xDC scope:local align:4 __CARDRead = .text:0x80355260; // type:function size:0x64 scope:global align:4 -BlockWriteCallback = .text:0x803552C4; // type:function size:0xE8 scope:global align:4 +BlockWriteCallback = .text:0x803552C4; // type:function size:0xE8 scope:local align:4 __CARDWrite = .text:0x803553AC; // type:function size:0x68 scope:global align:4 __CARDGetFatBlock = .text:0x80355414; // type:function size:0x8 scope:global align:4 WriteCallback = .text:0x8035541C; // type:function size:0xD4 scope:local align:4 @@ -15883,22 +15883,22 @@ WriteCallback = .text:0x80355784; // type:function size:0xD0 scope:local align:4 EraseCallback = .text:0x80355854; // type:function size:0xC8 scope:local align:4 __CARDUpdateDir = .text:0x8035591C; // type:function size:0xC4 scope:global align:4 __CARDCheckSum = .text:0x803559E0; // type:function size:0x1B0 scope:global align:4 -VerifyID = .text:0x80355B90; // type:function size:0x284 scope:global align:4 -VerifyDir = .text:0x80355E14; // type:function size:0x240 scope:global align:4 -VerifyFAT = .text:0x80356054; // type:function size:0x284 scope:global align:4 +VerifyID = .text:0x80355B90; // type:function size:0x284 scope:local align:4 +VerifyDir = .text:0x80355E14; // type:function size:0x240 scope:local align:4 +VerifyFAT = .text:0x80356054; // type:function size:0x284 scope:local align:4 __CARDVerify = .text:0x803562D8; // type:function size:0x8C scope:global align:4 CARDCheckExAsync = .text:0x80356364; // type:function size:0x590 scope:global align:4 CARDCheck = .text:0x803568F4; // type:function size:0x54 scope:global align:4 -IsCard = .text:0x80356948; // type:function size:0xCC scope:global align:4 +IsCard = .text:0x80356948; // type:function size:0xCC scope:local align:4 CARDProbe = .text:0x80356A14; // type:function size:0x38 scope:global align:4 CARDProbeEx = .text:0x80356A4C; // type:function size:0x17C scope:global align:4 -DoMount = .text:0x80356BC8; // type:function size:0x454 scope:global align:4 +DoMount = .text:0x80356BC8; // type:function size:0x454 scope:local align:4 __CARDMountCallback = .text:0x8035701C; // type:function size:0x138 scope:global align:4 CARDMountAsync = .text:0x80357154; // type:function size:0x1A0 scope:global align:4 CARDMount = .text:0x803572F4; // type:function size:0x48 scope:global align:4 -DoUnmount = .text:0x8035733C; // type:function size:0x9C scope:global align:4 +DoUnmount = .text:0x8035733C; // type:function size:0x9C scope:local align:4 CARDUnmount = .text:0x803573D8; // type:function size:0xAC scope:global align:4 -FormatCallback = .text:0x80357484; // type:function size:0x144 scope:global align:4 +FormatCallback = .text:0x80357484; // type:function size:0x144 scope:local align:4 __CARDFormatRegionAsync = .text:0x803575C8; // type:function size:0x658 scope:global align:4 CARDFormat = .text:0x80357C20; // type:function size:0x54 scope:global align:4 __CARDCompareFileName = .text:0x80357C74; // type:function size:0x68 scope:global align:4 @@ -15907,29 +15907,29 @@ __CARDIsWritable = .text:0x80357D70; // type:function size:0x134 scope:global al __CARDIsReadable = .text:0x80357EA4; // type:function size:0xF4 scope:global align:4 CARDOpen = .text:0x80357F98; // type:function size:0x11C scope:global align:4 CARDClose = .text:0x803580B4; // type:function size:0x54 scope:global align:4 -CreateCallbackFat = .text:0x80358108; // type:function size:0x130 scope:global align:4 +CreateCallbackFat = .text:0x80358108; // type:function size:0x130 scope:local align:4 CARDCreateAsync = .text:0x80358238; // type:function size:0x220 scope:global align:4 CARDCreate = .text:0x80358458; // type:function size:0x48 scope:global align:4 __CARDSeek = .text:0x803584A0; // type:function size:0x1B8 scope:global align:4 -ReadCallback = .text:0x80358658; // type:function size:0x130 scope:global align:4 +ReadCallback = .text:0x80358658; // type:function size:0x130 scope:local align:4 CARDReadAsync = .text:0x80358788; // type:function size:0x144 scope:global align:4 CARDRead = .text:0x803588CC; // type:function size:0x48 scope:global align:4 WriteCallback = .text:0x80358914; // type:function size:0x170 scope:local align:4 EraseCallback = .text:0x80358A84; // type:function size:0xB0 scope:local align:4 CARDWriteAsync = .text:0x80358B34; // type:function size:0x114 scope:global align:4 CARDWrite = .text:0x80358C48; // type:function size:0x48 scope:global align:4 -UpdateIconOffsets = .text:0x80358C90; // type:function size:0x1F8 scope:global align:4 +UpdateIconOffsets = .text:0x80358C90; // type:function size:0x1F8 scope:local align:4 CARDGetStatus = .text:0x80358E88; // type:function size:0x114 scope:global align:4 CARDSetStatusAsync = .text:0x80358F9C; // type:function size:0x174 scope:global align:4 CARDSetStatus = .text:0x80359110; // type:function size:0x48 scope:global align:4 CARDGetSerialNo = .text:0x80359158; // type:function size:0xC4 scope:global align:4 -__GXDefaultTexRegionCallback = .text:0x8035921C; // type:function size:0xFC scope:global align:4 -__GXDefaultTlutRegionCallback = .text:0x80359318; // type:function size:0x24 scope:global align:4 -__GXShutdown = .text:0x8035933C; // type:function size:0x190 scope:global align:4 +__GXDefaultTexRegionCallback = .text:0x8035921C; // type:function size:0xFC scope:local align:4 +__GXDefaultTlutRegionCallback = .text:0x80359318; // type:function size:0x24 scope:local align:4 +__GXShutdown = .text:0x8035933C; // type:function size:0x190 scope:local align:4 __GXInitRevisionBits = .text:0x803594CC; // type:function size:0x1A4 scope:global align:4 GXInit = .text:0x80359670; // type:function size:0x600 scope:global align:4 __GXInitGX = .text:0x80359C70; // type:function size:0x938 scope:global align:4 -GXCPInterruptHandler = .text:0x8035A5A8; // type:function size:0x134 scope:global align:4 +GXCPInterruptHandler = .text:0x8035A5A8; // type:function size:0x134 scope:local align:4 GXInitFifoBase = .text:0x8035A6DC; // type:function size:0x6C scope:global align:4 GXInitFifoPtrs = .text:0x8035A748; // type:function size:0x70 scope:global align:4 GXInitFifoLimits = .text:0x8035A7B8; // type:function size:0xC scope:global align:4 @@ -15942,11 +15942,11 @@ GXGetFifoBase = .text:0x8035ABD8; // type:function size:0x8 scope:global align:4 GXGetFifoSize = .text:0x8035ABE0; // type:function size:0x8 scope:global align:4 GXSetBreakPtCallback = .text:0x8035ABE8; // type:function size:0x44 scope:global align:4 __GXFifoInit = .text:0x8035AC2C; // type:function size:0x4C scope:global align:4 -__GXFifoReadEnable = .text:0x8035AC78; // type:function size:0x24 scope:global align:4 -__GXFifoReadDisable = .text:0x8035AC9C; // type:function size:0x24 scope:global align:4 -__GXFifoLink = .text:0x8035ACC0; // type:function size:0x34 scope:global align:4 -__GXWriteFifoIntEnable = .text:0x8035ACF4; // type:function size:0x30 scope:global align:4 -__GXWriteFifoIntReset = .text:0x8035AD24; // type:function size:0x30 scope:global align:4 +__GXFifoReadEnable = .text:0x8035AC78; // type:function size:0x24 scope:local align:4 +__GXFifoReadDisable = .text:0x8035AC9C; // type:function size:0x24 scope:local align:4 +__GXFifoLink = .text:0x8035ACC0; // type:function size:0x34 scope:local align:4 +__GXWriteFifoIntEnable = .text:0x8035ACF4; // type:function size:0x30 scope:local align:4 +__GXWriteFifoIntReset = .text:0x8035AD24; // type:function size:0x30 scope:local align:4 __GXCleanGPFifo = .text:0x8035AD54; // type:function size:0x100 scope:global align:4 GXSetCurrentGXThread = .text:0x8035AE54; // type:function size:0x4C scope:global align:4 GXGetCurrentGXThread = .text:0x8035AEA0; // type:function size:0x8 scope:global align:4 @@ -15981,9 +15981,9 @@ GXPokeDither = .text:0x8035C484; // type:function size:0x18 scope:global align:4 GXPokeZMode = .text:0x8035C49C; // type:function size:0x20 scope:global align:4 GXPeekZ = .text:0x8035C4BC; // type:function size:0x24 scope:global align:4 GXSetDrawSyncCallback = .text:0x8035C4E0; // type:function size:0x44 scope:global align:4 -GXTokenInterruptHandler = .text:0x8035C524; // type:function size:0x88 scope:global align:4 +GXTokenInterruptHandler = .text:0x8035C524; // type:function size:0x88 scope:local align:4 GXSetDrawDoneCallback = .text:0x8035C5AC; // type:function size:0x44 scope:global align:4 -GXFinishInterruptHandler = .text:0x8035C5F0; // type:function size:0x80 scope:global align:4 +GXFinishInterruptHandler = .text:0x8035C5F0; // type:function size:0x80 scope:local align:4 __GXPEInit = .text:0x8035C670; // type:function size:0x74 scope:global align:4 __GXSetDirtyState = .text:0x8035C6E4; // type:function size:0x80 scope:global align:4 GXBegin = .text:0x8035C764; // type:function size:0xD0 scope:global align:4 @@ -16042,7 +16042,7 @@ GXInvalidateTexAll = .text:0x8035E664; // type:function size:0x48 scope:global a GXSetTexRegionCallback = .text:0x8035E6AC; // type:function size:0x14 scope:global align:4 GXSetTlutRegionCallback = .text:0x8035E6C0; // type:function size:0x14 scope:global align:4 GXSetTexCoordScaleManually = .text:0x8035E6D4; // type:function size:0x7C scope:global align:4 -__SetSURegs = .text:0x8035E750; // type:function size:0xA0 scope:global align:4 +__SetSURegs = .text:0x8035E750; // type:function size:0xA0 scope:local align:4 __GXSetSUTexRegs = .text:0x8035E7F0; // type:function size:0x17C scope:global align:4 __GXSetTmemConfig = .text:0x8035E96C; // type:function size:0x354 scope:global align:4 GXSetTevIndirect = .text:0x8035ECC0; // type:function size:0x6C scope:global align:4 @@ -16116,13 +16116,13 @@ __copy = .text:0x80361C3C; // type:function size:0x30 scope:global align:4 __destroy_new_array = .text:0x80361C6C; // type:function size:0x7C scope:global align:4 __destroy_arr = .text:0x80361CE8; // type:function size:0x78 scope:global align:4 __construct_array = .text:0x80361D60; // type:function size:0xFC scope:global align:4 -__dt__26__partial_array_destructorFv = .text:0x80361E5C; // type:function size:0xB8 scope:global align:4 +__dt__26__partial_array_destructorFv = .text:0x80361E5C; // type:function size:0xB8 scope:weak align:4 __construct_new_array = .text:0x80361F14; // type:function size:0x104 scope:global align:4 __ptmf_test = .text:0x80362018; // type:function size:0x30 scope:global align:4 __ptmf_cmpr = .text:0x80362048; // type:function size:0x3C scope:global align:4 __ptmf_scall = .text:0x80362084; // type:function size:0x28 scope:global align:4 __cvt_fp2unsigned = .text:0x803620AC; // type:function size:0x5C scope:global align:4 -__save_fpr = .text:0x80362108; // type:function size:0x4C scope:global align:4 +__save_fpr = .text:0x80362108; // type:function size:0x4C scope:local align:4 _savefpr_14 = .text:0x80362108; // type:label scope:global _savefpr_15 = .text:0x8036210C; // type:label scope:global _savefpr_16 = .text:0x80362110; // type:label scope:global @@ -16141,7 +16141,7 @@ _savefpr_28 = .text:0x80362140; // type:label scope:global _savefpr_29 = .text:0x80362144; // type:label scope:global _savefpr_30 = .text:0x80362148; // type:label scope:global _savefpr_31 = .text:0x8036214C; // type:label scope:global -__restore_fpr = .text:0x80362154; // type:function size:0x4C scope:global align:4 +__restore_fpr = .text:0x80362154; // type:function size:0x4C scope:local align:4 _restfpr_14 = .text:0x80362154; // type:label scope:global _restfpr_15 = .text:0x80362158; // type:label scope:global _restfpr_16 = .text:0x8036215C; // type:label scope:global @@ -16160,7 +16160,7 @@ _restfpr_28 = .text:0x8036218C; // type:label scope:global _restfpr_29 = .text:0x80362190; // type:label scope:global _restfpr_30 = .text:0x80362194; // type:label scope:global _restfpr_31 = .text:0x80362198; // type:label scope:global -__save_gpr = .text:0x803621A0; // type:function size:0x4C scope:global align:4 +__save_gpr = .text:0x803621A0; // type:function size:0x4C scope:local align:4 _savegpr_14 = .text:0x803621A0; // type:label scope:global _savegpr_15 = .text:0x803621A4; // type:label scope:global _savegpr_16 = .text:0x803621A8; // type:label scope:global @@ -16179,7 +16179,7 @@ _savegpr_28 = .text:0x803621D8; // type:label scope:global _savegpr_29 = .text:0x803621DC; // type:label scope:global _savegpr_30 = .text:0x803621E0; // type:label scope:global _savegpr_31 = .text:0x803621E4; // type:label scope:global -__restore_gpr = .text:0x803621EC; // type:function size:0x4C scope:global align:4 +__restore_gpr = .text:0x803621EC; // type:function size:0x4C scope:local align:4 _restgpr_14 = .text:0x803621EC; // type:label scope:global _restgpr_15 = .text:0x803621F0; // type:label scope:global _restgpr_16 = .text:0x803621F4; // type:label scope:global @@ -16217,7 +16217,7 @@ abort = .text:0x80362ABC; // type:function size:0x9C scope:global align:4 free = .text:0x80362B58; // type:function size:0x70 scope:global align:4 __pool_free = .text:0x80362BC8; // type:function size:0x58 scope:global align:4 deallocate_from_fixed_pools = .text:0x80362C20; // type:function size:0x158 scope:global align:4 -deallocate_from_var_pools = .text:0x80362D78; // type:function size:0x294 scope:global align:4 +deallocate_from_var_pools = .text:0x80362D78; // type:function size:0x294 scope:local align:4 __flush_all = .text:0x8036300C; // type:function size:0x70 scope:global align:4 __close_all = .text:0x8036307C; // type:function size:0xA8 scope:global align:4 __num2dec = .text:0x80363124; // type:function size:0x1A4 scope:global align:4 @@ -16258,15 +16258,15 @@ vsnprintf = .text:0x80366690; // type:function size:0x74 scope:global align:4 vprintf = .text:0x80366704; // type:function size:0x98 scope:global align:4 fprintf = .text:0x8036679C; // type:function size:0xE0 scope:global align:4 printf = .text:0x8036687C; // type:function size:0xE8 scope:global align:4 -__StringWrite = .text:0x80366964; // type:function size:0x6C scope:global align:4 -__FileWrite = .text:0x803669D0; // type:function size:0x58 scope:global align:4 -__pformatter = .text:0x80366A28; // type:function size:0x774 scope:global align:4 -float2str = .text:0x8036719C; // type:function size:0x71C scope:global align:4 -round_decimal = .text:0x803678B8; // type:function size:0x12C scope:global align:4 -double2hex = .text:0x803679E4; // type:function size:0x338 scope:global align:4 -longlong2str = .text:0x80367D1C; // type:function size:0x314 scope:global align:4 -long2str = .text:0x80368030; // type:function size:0x258 scope:global align:4 -parse_format = .text:0x80368288; // type:function size:0x504 scope:global align:4 +__StringWrite = .text:0x80366964; // type:function size:0x6C scope:local align:4 +__FileWrite = .text:0x803669D0; // type:function size:0x58 scope:local align:4 +__pformatter = .text:0x80366A28; // type:function size:0x774 scope:local align:4 +float2str = .text:0x8036719C; // type:function size:0x71C scope:local align:4 +round_decimal = .text:0x803678B8; // type:function size:0x12C scope:local align:4 +double2hex = .text:0x803679E4; // type:function size:0x338 scope:local align:4 +longlong2str = .text:0x80367D1C; // type:function size:0x314 scope:local align:4 +long2str = .text:0x80368030; // type:function size:0x258 scope:local align:4 +parse_format = .text:0x80368288; // type:function size:0x504 scope:local align:4 __StringRead = .text:0x8036878C; // type:function size:0x90 scope:global align:4 raise = .text:0x8036881C; // type:function size:0xC0 scope:global align:4 strrchr = .text:0x803688DC; // type:function size:0x48 scope:global align:4 @@ -16311,10 +16311,10 @@ exp = .text:0x8036C740; // type:function size:0x20 scope:global align:4 fmod = .text:0x8036C760; // type:function size:0x20 scope:global align:4 pow = .text:0x8036C780; // type:function size:0x20 scope:global align:4 __ieee754_sqrt = .text:0x8036C7A0; // type:function size:0x224 scope:global align:4 -tanf = .text:0x8036C9C4; // type:function size:0x24 scope:global align:4 -sinf = .text:0x8036C9E8; // type:function size:0x24 scope:global align:4 -cosf = .text:0x8036CA0C; // type:function size:0x24 scope:global align:4 -acosf = .text:0x8036CA30; // type:function size:0x24 scope:global align:4 +tanf = .text:0x8036C9C4; // type:function size:0x24 scope:weak align:4 +sinf = .text:0x8036C9E8; // type:function size:0x24 scope:weak align:4 +cosf = .text:0x8036CA0C; // type:function size:0x24 scope:weak align:4 +acosf = .text:0x8036CA30; // type:function size:0x24 scope:weak align:4 sqrt = .text:0x8036CA54; // type:function size:0x20 scope:global align:4 strnicmp = .text:0x8036CA74; // type:function size:0x20 scope:global align:4 stricmp = .text:0x8036CA94; // type:function size:0x8C scope:global align:4 @@ -16381,9 +16381,9 @@ TRK_flush_cache = .text:0x8036F548; // type:function size:0x38 scope:global alig TRK_fill_mem = .text:0x8036F580; // type:function size:0xB8 scope:global align:4 __TRK_get_MSR = .text:0x8036F638; // type:function size:0x8 scope:global align:4 __TRK_set_MSR = .text:0x8036F640; // type:function size:0x8 scope:global align:4 -TRK_ppc_memcpy = .text:0x8036F648; // type:function size:0x3C scope:global align:4 +TRK_ppc_memcpy = .text:0x8036F648; // type:function size:0x3C scope:local align:4 TRKInterruptHandler = .text:0x8036F684; // type:function size:0x194 scope:global align:4 -TRKExceptionHandler = .text:0x8036F818; // type:function size:0x9C scope:global align:4 +TRKExceptionHandler = .text:0x8036F818; // type:function size:0x9C scope:local align:4 TRKSwapAndGo = .text:0x8036F8B4; // type:function size:0xC4 scope:global align:4 TRKInterruptHandlerEnableInterrupts = .text:0x8036F978; // type:function size:0x54 scope:global align:4 ReadFPSCR = .text:0x8036F9CC; // type:function size:0x24 scope:global align:4 @@ -16441,15 +16441,15 @@ GetUseSerialIO = .text:0x80372180; // type:function size:0x10 scope:global align SetUseSerialIO = .text:0x80372190; // type:function size:0xC scope:global align:4 __TRK_write_console = .text:0x8037219C; // type:function size:0xBC scope:global align:4 __read_console = .text:0x80372258; // type:function size:0xBC scope:global align:4 -udp_cc_post_stop = .text:0x80372314; // type:function size:0x8 scope:global align:4 -udp_cc_pre_continue = .text:0x8037231C; // type:function size:0x8 scope:global align:4 -udp_cc_peek = .text:0x80372324; // type:function size:0x8 scope:global align:4 -udp_cc_write = .text:0x8037232C; // type:function size:0x8 scope:global align:4 -udp_cc_read = .text:0x80372334; // type:function size:0x8 scope:global align:4 -udp_cc_close = .text:0x8037233C; // type:function size:0x8 scope:global align:4 -udp_cc_open = .text:0x80372344; // type:function size:0x8 scope:global align:4 -udp_cc_shutdown = .text:0x8037234C; // type:function size:0x8 scope:global align:4 -udp_cc_initialize = .text:0x80372354; // type:function size:0x8 scope:global align:4 +udp_cc_post_stop = .text:0x80372314; // type:function size:0x8 scope:weak align:4 +udp_cc_pre_continue = .text:0x8037231C; // type:function size:0x8 scope:weak align:4 +udp_cc_peek = .text:0x80372324; // type:function size:0x8 scope:weak align:4 +udp_cc_write = .text:0x8037232C; // type:function size:0x8 scope:weak align:4 +udp_cc_read = .text:0x80372334; // type:function size:0x8 scope:weak align:4 +udp_cc_close = .text:0x8037233C; // type:function size:0x8 scope:weak align:4 +udp_cc_open = .text:0x80372344; // type:function size:0x8 scope:weak align:4 +udp_cc_shutdown = .text:0x8037234C; // type:function size:0x8 scope:weak align:4 +udp_cc_initialize = .text:0x80372354; // type:function size:0x8 scope:weak align:4 ddh_cc_initinterrupts = .text:0x8037235C; // type:function size:0x24 scope:global align:4 ddh_cc_peek = .text:0x80372380; // type:function size:0x70 scope:global align:4 ddh_cc_post_stop = .text:0x803723F0; // type:function size:0x24 scope:global align:4 @@ -16493,13 +16493,13 @@ DBRead = .text:0x80372F94; // type:function size:0x8C scope:global align:4 DBQueryData = .text:0x80373020; // type:function size:0x9C scope:global align:4 DBInitInterrupts = .text:0x803730BC; // type:function size:0x54 scope:global align:4 DBInitComm = .text:0x80373110; // type:function size:0x78 scope:global align:4 -DBGHandler = .text:0x80373188; // type:function size:0x40 scope:global align:4 -MWCallback = .text:0x803731C8; // type:function size:0x3C scope:global align:4 -DBGReadStatus = .text:0x80373204; // type:function size:0xAC scope:global align:4 -DBGWrite = .text:0x803732B0; // type:function size:0xDC scope:global align:4 -DBGRead = .text:0x8037338C; // type:function size:0xDC scope:global align:4 -DBGReadMailbox = .text:0x80373468; // type:function size:0xAC scope:global align:4 -DBGEXIImm = .text:0x80373514; // type:function size:0x298 scope:global align:4 +DBGHandler = .text:0x80373188; // type:function size:0x40 scope:local align:4 +MWCallback = .text:0x803731C8; // type:function size:0x3C scope:local align:4 +DBGReadStatus = .text:0x80373204; // type:function size:0xAC scope:local align:4 +DBGWrite = .text:0x803732B0; // type:function size:0xDC scope:local align:4 +DBGRead = .text:0x8037338C; // type:function size:0xDC scope:local align:4 +DBGReadMailbox = .text:0x80373468; // type:function size:0xAC scope:local align:4 +DBGEXIImm = .text:0x80373514; // type:function size:0x298 scope:local align:4 Hu_IsStub = .text:0x803737AC; // type:function size:0x8 scope:global align:4 _ctors = .ctors:0x803737C0; // type:label scope:global data:4byte __init_cpp_exceptions_reference = .ctors:0x803737C0; // type:object size:0x4 scope:global align:4 @@ -16520,7 +16520,7 @@ fontdata$8287 = .rodata:0x803740E8; // type:object size:0x14 scope:local align:4 @stringBase0 = .rodata:0x803743F8; // type:object size:0x9 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80374408; // type:object size:0x51 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80374460; // type:object size:0x1DF scope:local align:4 data:string_table -DynamicNameTable = .rodata:0x80374640; // type:object size:0x17A8 scope:global align:4 data:2byte +DynamicNameTable = .rodata:0x80374640; // type:object size:0x17A8 scope:local align:4 data:2byte @stringBase0 = .rodata:0x80375DE8; // type:object size:0x2A8F scope:local align:4 data:string_table @stringBase0 = .rodata:0x80378878; // type:object size:0x6 scope:local align:4 data:string_table @4932 = .rodata:0x80378880; // type:object size:0xC scope:local align:4 data:4byte @@ -16546,26 +16546,26 @@ m_data__12daItemBase_c = .rodata:0x803792B0; // type:object size:0x38 scope:glob mData__12daShopItem_c = .rodata:0x803792E8; // type:object size:0x450 scope:global align:4 @stringBase0 = .rodata:0x80379738; // type:object size:0xBF scope:local align:4 data:string_table @stringBase0 = .rodata:0x803797F8; // type:object size:0x46 scope:local align:4 data:string_table -l_texMtxInfo = .rodata:0x80379840; // type:object size:0x64 scope:global align:4 +l_texMtxInfo = .rodata:0x80379840; // type:object size:0x64 scope:local align:4 l_tevStageInfo$3774 = .rodata:0x803798A4; // type:object size:0x14 scope:local align:4 @stringBase0 = .rodata:0x803798B8; // type:object size:0x373 scope:local align:4 data:string_table data$3644 = .rodata:0x80379C30; // type:object size:0x1C scope:local align:4 @stringBase0 = .rodata:0x80379C4C; // type:object size:0x7 scope:local align:4 data:string_table -l_100x100BoxVertexList = .rodata:0x80379C58; // type:object size:0x30 scope:global align:4 +l_100x100BoxVertexList = .rodata:0x80379C58; // type:object size:0x30 scope:local align:4 l_treasureDispList$4524 = .rodata:0x80379C88; // type:object size:0x30 scope:local align:4 data:byte l_treasureDispList$4606 = .rodata:0x80379CB8; // type:object size:0x84 scope:local align:4 data:byte l_iconPosData$4686 = .rodata:0x80379D3C; // type:object size:0x20 scope:local align:4 data:float l_offset$4703 = .rodata:0x80379D5C; // type:object size:0x24 scope:local align:4 @stringBase0 = .rodata:0x80379D80; // type:object size:0x4E scope:local align:4 data:string_table @stringBase0 = .rodata:0x80379DD0; // type:object size:0x17E scope:local align:4 data:string_table -DataFileName__29@unnamed@d_event_manager_cpp@ = .rodata:0x80379F50; // type:object size:0xF scope:global align:4 data:string +DataFileName__29@unnamed@d_event_manager_cpp@ = .rodata:0x80379F50; // type:object size:0xF scope:local align:4 data:string @stringBase0 = .rodata:0x80379F60; // type:object size:0x1A4 scope:local align:4 data:string_table @4065 = .rodata:0x8037A108; // type:object size:0xC scope:local align:4 data:4byte @5691 = .rodata:0x8037A114; // type:object size:0xC scope:local align:4 data:4byte @6363 = .rodata:0x8037A120; // type:object size:0xC scope:local align:4 data:4byte @stringBase0 = .rodata:0x8037A12C; // type:object size:0x4B scope:local align:4 data:string_table -l_drawlistSize$5656 = .rodata:0x8037A178; // type:object size:0x2A scope:local align:4 data:2byte -l_nonSortId$5662 = .rodata:0x8037A1A4; // type:object size:0x9 scope:local align:4 data:byte +l_drawlistSize = .rodata:0x8037A178; // type:object size:0x2A scope:local align:4 data:2byte +l_nonSortId = .rodata:0x8037A1A4; // type:object size:0x9 scope:local align:4 data:byte @stringBase0 = .rodata:0x8037A1B0; // type:object size:0xC scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037A1C0; // type:object size:0x1A4 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037A368; // type:object size:0x153 scope:local align:4 data:string_table @@ -16603,13 +16603,14 @@ m_hitSeID__12dCcD_GObjInf = .rodata:0x8037A780; // type:object size:0x60 scope:g @stringBase0 = .rodata:0x8037B0D0; // type:object size:0x7 scope:local align:4 data:string_table typeToTypeGroup__7dTres_c = .rodata:0x8037B0D8; // type:object size:0x22 scope:global align:4 @stringBase0 = .rodata:0x8037B100; // type:object size:0x2A scope:local align:4 data:string_table -black_tex = .rodata:0x8037B140; // type:object size:0x40 scope:global align:32 -msg_data = .rodata:0x8037B180; // type:object size:0x260 scope:global align:4 -font_data = .rodata:0x8037B3E0; // type:object size:0x12260 scope:global align:4 noreloc +black_tex = .rodata:0x8037B140; // type:object size:0x40 scope:local align:32 +msg_data = .rodata:0x8037B180; // type:object size:0x260 scope:local align:4 +font_data = .rodata:0x8037B3E0; // type:object size:0x12260 scope:local align:4 noreloc @stringBase0 = .rodata:0x8038D640; // type:object size:0x13 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8038D658; // type:label scope:local @3757 = .rodata:0x8038D658; // type:object size:0xC scope:local m__19daAlinkHIO_basic_c0 = .rodata:0x8038D664; // type:object size:0x58 scope:global align:4 +...rodata.0 = .rodata:0x8038D664; // type:label scope:local m__18daAlinkHIO_move_c0 = .rodata:0x8038D6BC; // type:object size:0x58 scope:global align:4 m__21daAlinkHIO_atnMove_c0 = .rodata:0x8038D714; // type:object size:0x54 scope:global align:4 data:2byte m__26daAlinkHIO_noActAtnMove_c0 = .rodata:0x8038D768; // type:object size:0x54 scope:global align:4 data:2byte @@ -16890,6 +16891,7 @@ localBoomCatchPos$74910 = .rodata:0x80392088; // type:object size:0xC scope:loca ...rodata.0 = .rodata:0x80392680; // type:label scope:local mCcDObjData__8daNpcT_c = .rodata:0x80392680; // type:object size:0x30 scope:global align:4 data:4byte mCcDObj__11daBaseNpc_c = .rodata:0x803926B0; // type:object size:0x30 scope:global align:4 +...rodata.0 = .rodata:0x803926B0; // type:label scope:local mCcDObjInfo__8daNpcF_c = .rodata:0x803926E0; // type:object size:0x30 scope:global align:4 @stringBase0 = .rodata:0x80392710; // type:object size:0x302 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80392A18; // type:label scope:local @@ -16934,6 +16936,7 @@ a_jntNumTbl$4463 = .rodata:0x80392FC4; // type:object size:0x24 scope:local alig ...rodata.0 = .rodata:0x80393250; // type:label scope:local l_resMANa = .rodata:0x80393250; // type:object size:0x18 scope:local align:4 data:4byte l_resMADa = .rodata:0x80393268; // type:object size:0x18 scope:local align:4 data:4byte +...rodata.0 = .rodata:0x80393268; // type:label scope:local l_resMCNa = .rodata:0x80393280; // type:object size:0x18 scope:local align:4 data:4byte l_resMONa = .rodata:0x80393298; // type:object size:0x18 scope:local align:4 data:4byte l_resMANb = .rodata:0x803932B0; // type:object size:0x18 scope:local align:4 data:4byte @@ -16997,9 +17000,9 @@ txTVhide$3752 = .rodata:0x803949B0; // type:object size:0x28 scope:local align:8 @stringBase0 = .rodata:0x803949D8; // type:object size:0x18 scope:local align:4 data:string_table @stringBase0 = .rodata:0x803949F0; // type:object size:0x1C scope:local align:4 data:string_table corner_tag$3707 = .rodata:0x80394A10; // type:object size:0x20 scope:local align:8 data:4byte -tag$4181 = .rodata:0x80394A30; // type:object size:0x20 scope:local align:8 data:4byte -tag$4197 = .rodata:0x80394A50; // type:object size:0x40 scope:local align:8 data:4byte -tag$4204 = .rodata:0x80394A90; // type:object size:0x10 scope:local align:8 data:4byte +tag_4181$2161 = .rodata:0x80394A30; // type:object size:0x20 scope:local align:8 data:4byte +tag_4197$2177 = .rodata:0x80394A50; // type:object size:0x40 scope:local align:8 data:4byte +tag_4204$2184 = .rodata:0x80394A90; // type:object size:0x10 scope:local align:8 data:4byte @stringBase0 = .rodata:0x80394AA0; // type:object size:0x16D scope:local align:4 data:string_table @stringBase0 = .rodata:0x80394C10; // type:object size:0x16 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80394C28; // type:object size:0x32 scope:local align:4 data:string_table @@ -17011,6 +17014,7 @@ tag$4204 = .rodata:0x80394A90; // type:object size:0x10 scope:local align:8 data @stringBase0 = .rodata:0x80394F70; // type:object size:0x1 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80394F78; // type:label scope:local @3778 = .rodata:0x80394F78; // type:object size:0xC scope:local align:4 +...rodata.0 = .rodata:0x80394F84; // type:label scope:local text_sv$4768 = .rodata:0x80394F88; // type:object size:0x18 scope:local align:8 text_op$4769 = .rodata:0x80394FA0; // type:object size:0x18 scope:local align:8 ftext_sv$4770 = .rodata:0x80394FB8; // type:object size:0x18 scope:local align:8 @@ -17054,7 +17058,7 @@ key_tag$5002 = .rodata:0x80395730; // type:object size:0x18 scope:local align:8 item_tag$5040 = .rodata:0x80395748; // type:object size:0x18 scope:local align:8 @stringBase0 = .rodata:0x80395760; // type:object size:0xEB scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80395860; // type:label scope:local -l_paletteDmap_m = .rodata:0x80395860; // type:object size:0xF0 scope:global align:4 noreloc +l_paletteDmap_m = .rodata:0x80395860; // type:object size:0xF0 scope:local align:4 noreloc l_dungeon_offColor$3841 = .rodata:0x80395950; // type:object size:0x24 scope:local align:4 l_dungeon_onColor$3842 = .rodata:0x80395974; // type:object size:0x24 scope:local align:4 l_dungeon_stayColor$3843 = .rodata:0x80395998; // type:object size:0x24 scope:local align:4 @@ -17141,7 +17145,7 @@ text_a_tag$5024 = .rodata:0x80396D70; // type:object size:0x28 scope:local align text_b_tag$5025 = .rodata:0x80396D98; // type:object size:0x28 scope:local align:8 data:4byte @stringBase0 = .rodata:0x80396DC0; // type:object size:0xE8 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80396EA8; // type:label scope:local -dMo_soundMode = .rodata:0x80396EA8; // type:object size:0xC scope:global align:4 +dMo_soundMode = .rodata:0x80396EA8; // type:object size:0xC scope:local align:4 text_a_tag$3904 = .rodata:0x80396EB8; // type:object size:0x28 scope:local align:8 data:string text_b_tag$3905 = .rodata:0x80396EE0; // type:object size:0x28 scope:local align:8 data:string l_tagName012$3918 = .rodata:0x80396F08; // type:object size:0x10 scope:local align:8 @@ -17281,7 +17285,7 @@ juji_m_tag$5270 = .rodata:0x80398850; // type:object size:0x28 scope:local align tag_bigh$5851 = .rodata:0x80398878; // type:object size:0x20 scope:local align:8 data:4byte tag_du$5852 = .rodata:0x80398898; // type:object size:0x10 scope:local align:8 data:4byte tag$7361 = .rodata:0x803988A8; // type:object size:0x10 scope:local align:8 data:string -tag$7759 = .rodata:0x803988B8; // type:object size:0x18 scope:local align:8 data:string +tag_7759 = .rodata:0x803988B8; // type:object size:0x18 scope:local align:8 data:string @stringBase0 = .rodata:0x803988D0; // type:object size:0x1A7 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80398A78; // type:label scope:local black_color$4634 = .rodata:0x80398A78; // type:object size:0x94 scope:local @@ -17325,28 +17329,28 @@ t_tag$3763 = .rodata:0x80399C18; // type:object size:0x18 scope:local align:8 da @stringBase0 = .rodata:0x80399C98; // type:object size:0x13 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80399CB0; // type:object size:0x18 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80399CC8; // type:object size:0x314 scope:local align:4 data:string_table -l_preLoad_dylKeyTbl = .rodata:0x80399FE0; // type:object size:0x1C scope:global align:4 +l_preLoad_dylKeyTbl = .rodata:0x80399FE0; // type:object size:0x1C scope:local align:4 @stringBase0 = .rodata:0x80399FFC; // type:object size:0x2AA scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039A2A8; // type:object size:0x1D scope:local align:4 data:string_table -PreLoadInfoT = .rodata:0x8039A2C8; // type:object size:0x10 scope:global align:4 data:4byte +PreLoadInfoT = .rodata:0x8039A2C8; // type:object size:0x10 scope:local align:4 data:4byte @stringBase0 = .rodata:0x8039A2D8; // type:object size:0xA9 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039A388; // type:object size:0x4B scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039A3D8; // type:object size:0xAC scope:local align:4 data:string_table -kColor$localstatic3$draw__9dkWmark_cFv = .rodata:0x8039A488; // type:object size:0xC scope:local align:4 +kColor$localstatic3$draw__9dkWmark_cFv = .rodata:0x8039A488; // type:object size:0xC scope:weak align:4 @stringBase0 = .rodata:0x8039A494; // type:object size:0x6 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039A4A0; // type:object size:0x344 scope:local align:4 data:string_table -l_base = .rodata:0x8039A7E8; // type:object size:0x80 scope:global align:4 +l_base = .rodata:0x8039A7E8; // type:object size:0x80 scope:local align:4 @2299 = .rodata:0x8039A868; // type:object size:0xC scope:local align:4 data:4byte @stringBase0 = .rodata:0x8039A878; // type:object size:0xD0 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8039A948; // type:label scope:local -@898 = .rodata:0x8039A948; // type:object size:0xC scope:local +unused$285 = .rodata:0x8039A948; // type:object size:0xC scope:local @899 = .rodata:0x8039A954; // type:object size:0xC scope:local align:4 @900 = .rodata:0x8039A960; // type:object size:0xC scope:local align:4 @901 = .rodata:0x8039A96C; // type:object size:0xC scope:local align:4 @902 = .rodata:0x8039A978; // type:object size:0xC scope:local align:4 @stringBase0 = .rodata:0x8039A984; // type:object size:0x65 scope:local align:4 data:string_table -gapfnExtrapolateParameter___Q27JStudio27@unnamed@functionvalue_cpp@ = .rodata:0x8039A9F0; // type:object size:0x10 scope:global align:4 data:4byte -saCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@ = .rodata:0x8039AA00; // type:object size:0x40 scope:global align:4 +gapfnExtrapolateParameter___Q27JStudio27@unnamed@functionvalue_cpp@ = .rodata:0x8039A9F0; // type:object size:0x10 scope:local align:4 data:4byte +saCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@ = .rodata:0x8039AA00; // type:object size:0x40 scope:local align:4 @745 = .rodata:0x8039AA40; // type:object size:0xC scope:local align:4 data:4byte @838 = .rodata:0x8039AA4C; // type:object size:0xC scope:local align:4 data:4byte @1138 = .rodata:0x8039AA58; // type:object size:0xC scope:local align:4 data:4byte @@ -17380,10 +17384,11 @@ __two_to_x$982 = .rodata:0x8039AFB8; // type:object size:0x18 scope:local align: ...rodata.0 = .rodata:0x8039AFD0; // type:label scope:local sAdsTable__8JASTrack = .rodata:0x8039AFD0; // type:object size:0x18 scope:global align:4 data:2byte sEnvOsc__8JASTrack = .rodata:0x8039AFE8; // type:object size:0x18 scope:global align:4 data:float +...rodata.0 = .rodata:0x8039AFE8; // type:label scope:local sPitchEnvOsc__8JASTrack = .rodata:0x8039B000; // type:object size:0x18 scope:global align:4 @stringBase0 = .rodata:0x8039B018; // type:object size:0x14A scope:local align:4 data:string_table -OSC_RELEASE_TABLE = .rodata:0x8039B168; // type:object size:0xC scope:global align:4 -OSC_ENV = .rodata:0x8039B174; // type:object size:0x18 scope:global align:4 +OSC_RELEASE_TABLE = .rodata:0x8039B168; // type:object size:0xC scope:local align:4 +OSC_ENV = .rodata:0x8039B174; // type:object size:0x18 scope:local align:4 OSC_RELEASE_TABLE$260 = .rodata:0x8039B190; // type:object size:0xC scope:local align:4 OSC_ENV$261 = .rodata:0x8039B19C; // type:object size:0x18 scope:local align:4 sOscData__12JASVoiceBank = .rodata:0x8039B1B8; // type:object size:0x18 scope:global align:4 @@ -17402,7 +17407,7 @@ connect_table$463 = .rodata:0x8039B8A0; // type:object size:0x18 scope:local ali @stringBase0 = .rodata:0x8039B8F8; // type:object size:0x14 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039B910; // type:object size:0x3A scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039B950; // type:object size:0x69 scope:local align:4 data:string_table -cResetFilterTable = .rodata:0x8039B9C0; // type:object size:0x10 scope:global align:4 +cResetFilterTable = .rodata:0x8039B9C0; // type:object size:0x10 scope:local align:4 @stringBase0 = .rodata:0x8039B9D0; // type:object size:0x1D scope:local align:4 data:string_table @5054 = .rodata:0x8039B9F0; // type:object size:0xC scope:local align:4 data:4byte @5100 = .rodata:0x8039B9FC; // type:object size:0xC scope:local align:4 data:4byte @@ -17457,7 +17462,7 @@ sPrm__8Z2MdnPrm = .rodata:0x8039C98C; // type:object size:0xCC scope:global alig @stringBase0 = .rodata:0x8039D2F0; // type:object size:0x70 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039D360; // type:object size:0x29 scope:local align:4 data:string_table saoAboutEncoding___10JUTResFont = .rodata:0x8039D390; // type:object size:0xC scope:global align:4 -halftofull$726 = .rodata:0x8039D39C; // type:object size:0xBE scope:local align:4 +halftofull = .rodata:0x8039D39C; // type:object size:0xBE scope:local align:4 @stringBase0 = .rodata:0x8039D45C; // type:object size:0x34 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039D490; // type:object size:0x50E scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039D9A0; // type:object size:0x3 scope:local align:4 data:string_table @@ -17476,14 +17481,14 @@ j2dDefaultIndTevStageInfo = .rodata:0x803A1BF4; // type:object size:0xC scope:gl @stringBase0 = .rodata:0x803A1C58; // type:object size:0x3 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x803A1C60; // type:label scope:local @1508 = .rodata:0x803A1C60; // type:object size:0x10 scope:local align:4 data:4byte -@1557 = .rodata:0x803A1C70; // type:object size:0x10 scope:local align:4 -@1566 = .rodata:0x803A1C80; // type:object size:0x10 scope:local align:4 -@1575 = .rodata:0x803A1C90; // type:object size:0x10 scope:local align:4 -@1581 = .rodata:0x803A1CA0; // type:object size:0x10 scope:local align:4 -@1587 = .rodata:0x803A1CB0; // type:object size:0x10 scope:local align:4 -@1596 = .rodata:0x803A1CC0; // type:object size:0x10 scope:local align:4 -@1605 = .rodata:0x803A1CD0; // type:object size:0x10 scope:local align:4 -@1612 = .rodata:0x803A1CE0; // type:object size:0x10 scope:local align:4 +lit_1557 = .rodata:0x803A1C70; // type:object size:0x10 scope:local align:4 +lit_1566 = .rodata:0x803A1C80; // type:object size:0x10 scope:local align:4 +lit_1575 = .rodata:0x803A1C90; // type:object size:0x10 scope:local align:4 +lit_1581 = .rodata:0x803A1CA0; // type:object size:0x10 scope:local align:4 +lit_1587 = .rodata:0x803A1CB0; // type:object size:0x10 scope:local align:4 +lit_1596 = .rodata:0x803A1CC0; // type:object size:0x10 scope:local align:4 +lit_1605 = .rodata:0x803A1CD0; // type:object size:0x10 scope:local align:4 +lit_1612 = .rodata:0x803A1CE0; // type:object size:0x10 scope:local align:4 @2530 = .rodata:0x803A1CF0; // type:object size:0x18 scope:local align:4 @2531 = .rodata:0x803A1D08; // type:object size:0x18 scope:local align:4 @2532 = .rodata:0x803A1D20; // type:object size:0x1E scope:local align:4 @@ -17529,32 +17534,32 @@ j3dDefaultNBTScaleInfo = .rodata:0x803A1FE8; // type:object size:0x10 scope:glob @stringBase0 = .rodata:0x803A2100; // type:object size:0x2C scope:local align:4 data:string_table @stringBase0 = .rodata:0x803A2130; // type:object size:0x3D scope:local align:4 data:string_table ...rodata.0 = .rodata:0x803A2170; // type:label scope:local -ClampRegion = .rodata:0x803A2170; // type:object size:0xA scope:global align:4 data:byte +ClampRegion = .rodata:0x803A2170; // type:object size:0xA scope:local align:4 data:byte __ptmf_null = .rodata:0x803A2180; // type:object size:0xC scope:global align:4 data:4byte -__constants = .rodata:0x803A2190; // type:object size:0x18 scope:global align:4 data:double +__constants = .rodata:0x803A2190; // type:object size:0x18 scope:local align:4 data:double @55 = .rodata:0x803A21A8; // type:object size:0x36 scope:local align:4 data:string @56 = .rodata:0x803A21E0; // type:object size:0x39 scope:local align:4 data:string -fix_pool_sizes = .rodata:0x803A2220; // type:object size:0x18 scope:global align:4 data:4byte +fix_pool_sizes = .rodata:0x803A2220; // type:object size:0x18 scope:local align:4 data:4byte @stringBase0 = .rodata:0x803A2238; // type:object size:0xDD scope:local align:4 data:string_table @stringBase0 = .rodata:0x803A2318; // type:object size:0x25 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x803A2340; // type:label scope:local -halF = .rodata:0x803A2340; // type:object size:0x10 scope:global align:8 -ln2HI = .rodata:0x803A2350; // type:object size:0x10 scope:global align:8 -ln2LO = .rodata:0x803A2360; // type:object size:0x10 scope:global align:8 -Zero = .rodata:0x803A2370; // type:object size:0x10 scope:global align:8 +halF = .rodata:0x803A2340; // type:object size:0x10 scope:local align:8 +ln2HI = .rodata:0x803A2350; // type:object size:0x10 scope:local align:8 +ln2LO = .rodata:0x803A2360; // type:object size:0x10 scope:local align:8 +Zero = .rodata:0x803A2370; // type:object size:0x10 scope:local align:8 ...rodata.0 = .rodata:0x803A2380; // type:label scope:local -bp = .rodata:0x803A2380; // type:object size:0x10 scope:global align:8 -dp_h = .rodata:0x803A2390; // type:object size:0x10 scope:global align:8 -dp_l = .rodata:0x803A23A0; // type:object size:0x10 scope:global align:8 -two_over_pi = .rodata:0x803A23B0; // type:object size:0x108 scope:global align:4 -npio2_hw = .rodata:0x803A24B8; // type:object size:0x80 scope:global align:4 -init_jk = .rodata:0x803A2538; // type:object size:0x10 scope:global align:4 -PIo2 = .rodata:0x803A2548; // type:object size:0x40 scope:global align:8 data:double -T = .rodata:0x803A2588; // type:object size:0x68 scope:global align:8 data:double +bp = .rodata:0x803A2380; // type:object size:0x10 scope:local align:8 +dp_h = .rodata:0x803A2390; // type:object size:0x10 scope:local align:8 +dp_l = .rodata:0x803A23A0; // type:object size:0x10 scope:local align:8 +two_over_pi = .rodata:0x803A23B0; // type:object size:0x108 scope:local align:4 +npio2_hw = .rodata:0x803A24B8; // type:object size:0x80 scope:local align:4 +init_jk = .rodata:0x803A2538; // type:object size:0x10 scope:local align:4 +PIo2 = .rodata:0x803A2548; // type:object size:0x40 scope:local align:8 data:double +T = .rodata:0x803A2588; // type:object size:0x68 scope:local align:8 data:double ...rodata.0 = .rodata:0x803A25F0; // type:label scope:local -atanhi = .rodata:0x803A25F0; // type:object size:0x20 scope:global align:8 -atanlo = .rodata:0x803A2610; // type:object size:0x20 scope:global align:8 -aT = .rodata:0x803A2630; // type:object size:0x58 scope:global align:8 +atanhi = .rodata:0x803A25F0; // type:object size:0x20 scope:local align:8 +atanlo = .rodata:0x803A2610; // type:object size:0x20 scope:local align:8 +aT = .rodata:0x803A2630; // type:object size:0x58 scope:local align:8 @133 = .rodata:0x803A2688; // type:object size:0x1B scope:local align:4 data:string @154 = .rodata:0x803A26A4; // type:object size:0x10 scope:local align:4 data:string @98 = .rodata:0x803A26B8; // type:object size:0x25 scope:local align:4 data:string @@ -17629,11 +17634,11 @@ EndofProgramInstruction$162 = .rodata:0x803A2C08; // type:object size:0x4 scope: @349 = .rodata:0x803A2EB8; // type:object size:0x18 scope:local align:4 data:string ...data.0 = .data:0x803A2EE0; // type:label scope:local COPYDATE_STRING__7mDoMain = .data:0x803A2EE0; // type:object size:0x12 scope:global align:4 data:string -HeapCheckTable = .data:0x803A2EF4; // type:object size:0x20 scope:global align:4 +HeapCheckTable = .data:0x803A2EF4; // type:object size:0x20 scope:local align:4 desc1$3717 = .data:0x803A2F14; // type:object size:0x14 scope:local align:4 desc2$3718 = .data:0x803A2F28; // type:object size:0x14 scope:local align:4 -__vt__17mDoAud_zelAudio_c = .data:0x803A2F40; // type:object size:0xC scope:global align:4 -__vt__12JAUSoundInfo = .data:0x803A2F4C; // type:object size:0x10 scope:global align:4 +__vt__17mDoAud_zelAudio_c = .data:0x803A2F40; // type:object size:0xC scope:weak align:4 +__vt__12JAUSoundInfo = .data:0x803A2F4C; // type:object size:0x10 scope:weak align:4 g_ntscZeldaIntDf = .data:0x803A2F60; // type:object size:0x3C scope:global align:4 g_ntscZeldaProg = .data:0x803A2F9C; // type:object size:0x3C scope:global align:4 g_mDoMtx_identity = .data:0x803A2FD8; // type:object size:0x30 scope:global align:4 @@ -17658,7 +17663,7 @@ __vt__25mDoExt_MtxCalcAnmBlendTbl = .data:0x803A33E4; // type:object size:0x2C s __vt__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya> = .data:0x803A3410; // type:object size:0x2C scope:global align:4 __vt__17J3DMtxCalcAnmBase = .data:0x803A343C; // type:object size:0x2C scope:global align:4 __vt__10J3DMtxCalc = .data:0x803A3468; // type:object size:0x2C scope:global align:4 -__vt__11J3DUClipper = .data:0x803A3498; // type:object size:0xC scope:global align:4 +__vt__11J3DUClipper = .data:0x803A3498; // type:object size:0xC scope:weak align:4 __vt__21mDoDvdThd_toMainRam_c = .data:0x803A34A8; // type:object size:0x10 scope:global align:4 __vt__25mDoDvdThd_mountXArchive_c = .data:0x803A34B8; // type:object size:0x10 scope:global align:4 __vt__24mDoDvdThd_mountArchive_c = .data:0x803A34C8; // type:object size:0x10 scope:global align:4 @@ -17667,18 +17672,18 @@ __vt__19mDoDvdThd_command_c = .data:0x803A34E8; // type:object size:0x10 scope:g @3770 = .data:0x803A34F8; // type:object size:0x38 scope:local align:4 @3850 = .data:0x803A3530; // type:object size:0x38 scope:local align:4 __vt__24JPTraceParticleCallBack4 = .data:0x803A3568; // type:object size:0x14 scope:global align:4 -__vt__19JPAParticleCallBack = .data:0x803A357C; // type:object size:0x14 scope:global align:4 +__vt__19JPAParticleCallBack = .data:0x803A357C; // type:object size:0x14 scope:weak align:4 l_method$3807 = .data:0x803A3590; // type:object size:0xC scope:local align:4 __vt__11fapGm_HIO_c = .data:0x803A35A0; // type:object size:0xC scope:global align:4 g_fopAc_Method = .data:0x803A35B0; // type:object size:0x20 scope:global align:4 -__vt__11dEvt_info_c = .data:0x803A35D0; // type:object size:0xC scope:global align:4 +__vt__11dEvt_info_c = .data:0x803A35D0; // type:object size:0xC scope:weak align:4 g_fopAcTg_Queue = .data:0x803A35E0; // type:object size:0xC scope:global align:4 -l_cullSizeBox = .data:0x803A35F0; // type:object size:0x150 scope:global align:4 -l_cullSizeSphere = .data:0x803A3740; // type:object size:0x80 scope:global align:4 -__vt__8cM3dGPla = .data:0x803A37C0; // type:object size:0xC scope:global align:4 -__vt__15dBgS_ObjRoofChk = .data:0x803A37CC; // type:object size:0x30 scope:global align:4 -__vt__11dBgS_WtrChk = .data:0x803A37FC; // type:object size:0x30 scope:global align:4 -__vt__14dBgS_ObjGndChk = .data:0x803A382C; // type:object size:0x30 scope:global align:4 +l_cullSizeBox = .data:0x803A35F0; // type:object size:0x150 scope:local align:4 +l_cullSizeSphere = .data:0x803A3740; // type:object size:0x80 scope:local align:4 +__vt__8cM3dGPla = .data:0x803A37C0; // type:object size:0xC scope:weak align:4 +__vt__15dBgS_ObjRoofChk = .data:0x803A37CC; // type:object size:0x30 scope:weak align:4 +__vt__11dBgS_WtrChk = .data:0x803A37FC; // type:object size:0x30 scope:weak align:4 +__vt__14dBgS_ObjGndChk = .data:0x803A382C; // type:object size:0x30 scope:weak align:4 g_fopCam_Method = .data:0x803A3860; // type:object size:0x14 scope:global align:4 g_fopOvlp_Method = .data:0x803A3878; // type:object size:0x14 scope:global align:4 phaseMethod$2260 = .data:0x803A3890; // type:object size:0x20 scope:local align:4 @@ -17695,11 +17700,11 @@ g_fopMsg_Method = .data:0x803A3958; // type:object size:0x14 scope:global align: g_fpcCtTg_Queue = .data:0x803A3990; // type:object size:0xC scope:global align:4 g_fpcDtTg_Queue = .data:0x803A39A0; // type:object size:0xC scope:global align:4 l_fpcLy_Crear = .data:0x803A39B0; // type:object size:0x2C scope:global align:4 data:4byte -l_fpcLy_LayerList = .data:0x803A39DC; // type:object size:0xC scope:global align:4 data:4byte +l_fpcLy_LayerList = .data:0x803A39DC; // type:object size:0xC scope:local align:4 data:4byte g_fpcLf_Method = .data:0x803A39E8; // type:object size:0x14 scope:global align:4 crear$2239 = .data:0x803A3A00; // type:object size:0x1C scope:local align:4 data:4byte g_fpcNd_Method = .data:0x803A3A20; // type:object size:0x14 scope:global align:4 -l_fpcNdRq_Queue = .data:0x803A3A38; // type:object size:0xC scope:global align:4 data:4byte +l_fpcNdRq_Queue = .data:0x803A3A38; // type:object size:0xC scope:local align:4 data:4byte clear$2359 = .data:0x803A3A44; // type:object size:0x64 scope:local align:4 data:4byte methods$2376 = .data:0x803A3AA8; // type:object size:0x18 scope:local align:4 methods$2386 = .data:0x803A3AC0; // type:object size:0x10 scope:local align:4 @@ -17707,7 +17712,7 @@ methods$2397 = .data:0x803A3AD0; // type:object size:0xC scope:local align:4 submethod$2214 = .data:0x803A3AE0; // type:object size:0xC scope:local align:4 submethod$2261 = .data:0x803A3AF0; // type:object size:0xC scope:local align:4 method$2262 = .data:0x803A3AFC; // type:object size:0x1C scope:local align:4 -l_objectName = .data:0x803A3B18; // type:object size:0x2AB4 scope:global align:4 +l_objectName = .data:0x803A3B18; // type:object size:0x2AB4 scope:local align:4 l_roomFuncTable$5052 = .data:0x803A65CC; // type:object size:0x30 scope:local align:4 l_layerFuncTable$5053 = .data:0x803A65FC; // type:object size:0x24 scope:local align:4 l_layerFuncTable$5131 = .data:0x803A6620; // type:object size:0x18 scope:local align:4 @@ -17723,50 +17728,50 @@ mMemoryBlock__20dStage_roomControl_c = .data:0x803A6920; // type:object size:0x4 mArcBank__20dStage_roomControl_c = .data:0x803A696C; // type:object size:0x140 scope:global align:4 __vt__15dStage_roomDt_c = .data:0x803A6AAC; // type:object size:0x174 scope:global align:4 __vt__16dStage_stageDt_c = .data:0x803A6C20; // type:object size:0x174 scope:global align:4 -__vt__11dStage_dt_c = .data:0x803A6D94; // type:object size:0x174 scope:global align:4 +__vt__11dStage_dt_c = .data:0x803A6D94; // type:object size:0x174 scope:weak align:4 @3806 = .data:0x803A6F08; // type:object size:0x20 scope:local align:4 @4259 = .data:0x803A6F28; // type:object size:0x44 scope:local align:4 @4694 = .data:0x803A6F6C; // type:object size:0x1C scope:local align:4 -__vt__12dDlst_base_c = .data:0x803A6F88; // type:object size:0xC scope:global align:4 -__vt__28dDrawPathWithNormalPattern_c = .data:0x803A6F94; // type:object size:0x40 scope:global align:4 -__vt__15dRenderingMap_c = .data:0x803A6FD4; // type:object size:0x5C scope:global align:4 +__vt__12dDlst_base_c = .data:0x803A6F88; // type:object size:0xC scope:weak align:4 +__vt__28dDrawPathWithNormalPattern_c = .data:0x803A6F94; // type:object size:0x40 scope:weak align:4 +__vt__15dRenderingMap_c = .data:0x803A6FD4; // type:object size:0x5C scope:weak align:4 __vt__6dMap_c = .data:0x803A7030; // type:object size:0xC4 scope:global align:4 __vt__15renderingAmap_c = .data:0x803A70F4; // type:object size:0xC4 scope:global align:4 l_method$5017 = .data:0x803A71B8; // type:object size:0xC scope:local align:4 l_method$5051 = .data:0x803A71C4; // type:object size:0xC scope:local align:4 l_itemno$6402 = .data:0x803A71D0; // type:object size:0x18 scope:local align:4 data:byte -__vt__25mDoExt_McaMorfCallBack1_c = .data:0x803A71E8; // type:object size:0xC scope:global align:4 -__vt__12dCcMassS_Obj = .data:0x803A71F4; // type:object size:0xC scope:global align:4 -__vt__15cCcD_DivideArea = .data:0x803A7200; // type:object size:0xC scope:global align:4 -__vt__8cM3dGCyl = .data:0x803A720C; // type:object size:0xC scope:global align:4 -__vt__8cM3dGAab = .data:0x803A7218; // type:object size:0xC scope:global align:4 -__vt__15cCcD_DivideInfo = .data:0x803A7224; // type:object size:0xC scope:global align:4 -__vt__12dCcMassS_Mng = .data:0x803A7230; // type:object size:0xC scope:global align:4 +__vt__25mDoExt_McaMorfCallBack1_c = .data:0x803A71E8; // type:object size:0xC scope:weak align:4 +__vt__12dCcMassS_Obj = .data:0x803A71F4; // type:object size:0xC scope:weak align:4 +__vt__15cCcD_DivideArea = .data:0x803A7200; // type:object size:0xC scope:weak align:4 +__vt__8cM3dGCyl = .data:0x803A720C; // type:object size:0xC scope:weak align:4 +__vt__8cM3dGAab = .data:0x803A7218; // type:object size:0xC scope:weak align:4 +__vt__15cCcD_DivideInfo = .data:0x803A7224; // type:object size:0xC scope:weak align:4 +__vt__12dCcMassS_Mng = .data:0x803A7230; // type:object size:0xC scope:weak align:4 ZeroQuat = .data:0x803A7240; // type:object size:0x10 scope:global align:4 __vt__10CSTControl = .data:0x803A7250; // type:object size:0x10 scope:global align:4 __vt__9STControl = .data:0x803A7260; // type:object size:0x10 scope:global align:4 i_item_lst$4006 = .data:0x803A7270; // type:object size:0x17 scope:local align:4 data:byte saveBitLabels__16dSv_event_flag_c = .data:0x803A7288; // type:object size:0x66C scope:global align:4 -__vt__8cM3dGLin = .data:0x803A78F8; // type:object size:0xC scope:global align:4 -__vt__8cM3dGSph = .data:0x803A7904; // type:object size:0xC scope:global align:4 +__vt__8cM3dGLin = .data:0x803A78F8; // type:object size:0xC scope:weak align:4 +__vt__8cM3dGSph = .data:0x803A7904; // type:object size:0xC scope:weak align:4 __vt__16dDemo_particle_c = .data:0x803A7910; // type:object size:0x18 scope:global align:4 __vt__17jmessage_tControl = .data:0x803A7928; // type:object size:0xC scope:global align:4 -__vt__Q27JStudio13TCreateObject = .data:0x803A7934; // type:object size:0x10 scope:global align:4 +__vt__Q27JStudio13TCreateObject = .data:0x803A7934; // type:object size:0x10 scope:weak align:4 __vt__14dDemo_system_c = .data:0x803A7944; // type:object size:0x50 scope:global align:4 __vt__11dDemo_fog_c = .data:0x803A7994; // type:object size:0x5C scope:global align:4 __vt__13dDemo_light_c = .data:0x803A79F0; // type:object size:0x6C scope:global align:4 __vt__15dDemo_ambient_c = .data:0x803A7A5C; // type:object size:0x44 scope:global align:4 __vt__14dDemo_camera_c = .data:0x803A7AA0; // type:object size:0x94 scope:global align:4 __vt__13dDemo_actor_c = .data:0x803A7B34; // type:object size:0x8C scope:global align:4 -__vt__Q27JStudio16TAdaptor_message = .data:0x803A7BC0; // type:object size:0x24 scope:global align:4 -__vt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_message = .data:0x803A7BE4; // type:object size:0x10 scope:global align:4 -__vt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_message = .data:0x803A7BF4; // type:object size:0x24 scope:global align:4 +__vt__Q27JStudio16TAdaptor_message = .data:0x803A7BC0; // type:object size:0x24 scope:weak align:4 +__vt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_message = .data:0x803A7BE4; // type:object size:0x10 scope:local align:4 +__vt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_message = .data:0x803A7BF4; // type:object size:0x24 scope:local align:4 @4017 = .data:0x803A7C18; // type:object size:0x20 scope:local align:4 -__vt__10J3DAnmBase = .data:0x803A7C38; // type:object size:0x10 scope:global align:4 -__vt__15J3DAnmTransform = .data:0x803A7C48; // type:object size:0x14 scope:global align:4 -__vt__18mDoExt_transAnmBas = .data:0x803A7C5C; // type:object size:0x14 scope:global align:4 -__vt__18J3DAnmTransformKey = .data:0x803A7C70; // type:object size:0x14 scope:global align:4 -__vt__11J3DTexNoAnm = .data:0x803A7C84; // type:object size:0xC scope:global align:4 +__vt__10J3DAnmBase = .data:0x803A7C38; // type:object size:0x10 scope:weak align:4 +__vt__15J3DAnmTransform = .data:0x803A7C48; // type:object size:0x14 scope:weak align:4 +__vt__18mDoExt_transAnmBas = .data:0x803A7C5C; // type:object size:0x14 scope:weak align:4 +__vt__18J3DAnmTransformKey = .data:0x803A7C70; // type:object size:0x14 scope:weak align:4 +__vt__11J3DTexNoAnm = .data:0x803A7C84; // type:object size:0xC scope:weak align:4 __vt__18dRenderingFDAmap_c = .data:0x803A7C90; // type:object size:0x68 scope:global align:4 __vt__11dDrawPath_c = .data:0x803A7CF8; // type:object size:0x40 scope:global align:4 @4467 = .data:0x803A7D38; // type:object size:0x3C scope:local align:4 @@ -17775,7 +17780,7 @@ __vt__19renderingPlusDoor_c = .data:0x803A7D80; // type:object size:0xA4 scope:g __vt__28renderingPlusDoorAndCursor_c = .data:0x803A7E24; // type:object size:0xBC scope:global align:4 __vt__16renderingDAmap_c = .data:0x803A7EE0; // type:object size:0x98 scope:global align:4 @4719 = .data:0x803A7F78; // type:object size:0x38 scope:local align:4 -TelopData = .data:0x803A7FB0; // type:object size:0x288 scope:global align:4 data:4byte +TelopData = .data:0x803A7FB0; // type:object size:0x288 scope:local align:4 data:4byte @4398 = .data:0x803A8238; // type:object size:0x34 scope:local align:4 soecial_names$3966 = .data:0x803A8270; // type:object size:0x38 scope:local align:4 action_table$5100 = .data:0x803A82A8; // type:object size:0xC scope:local align:4 @@ -17789,6 +17794,7 @@ __vt__15dSmplMdl_draw_c = .data:0x803A82F8; // type:object size:0xC scope:global ...data.0 = .data:0x803A8308; // type:label scope:local l_lifeBallColor = .data:0x803A8308; // type:object size:0xC scope:global align:4 data:byte effectIDTable$5499 = .data:0x803A8314; // type:object size:0x18 scope:local align:4 +...data.0 = .data:0x803A8314; // type:label scope:local ringID$5531 = .data:0x803A832C; // type:object size:0x30 scope:local align:4 normalID$5532 = .data:0x803A835C; // type:object size:0x30 scope:local align:4 __vt__28dPa_particleTracePcallBack_c = .data:0x803A838C; // type:object size:0x14 scope:global align:4 data:2byte @@ -17836,29 +17842,29 @@ m_typeFourData__8dPaPoF_c = .data:0x803A86D0; // type:object size:0x3C scope:glo m_emitterFourData__8dPaPoF_c = .data:0x803A8748; // type:object size:0x3C scope:global align:4 data:4byte ...data.0 = .data:0x803A87A0; // type:label scope:local cNullVec__6Z2Calc = .data:0x803A87A0; // type:object size:0xC scope:local align:4 -l_frontZMat = .data:0x803A87C0; // type:object size:0x3C scope:global align:32 -l_frontNoZSubMat = .data:0x803A8800; // type:object size:0x2A scope:global align:32 -l_shadowVolPos = .data:0x803A882C; // type:object size:0x60 scope:global align:4 -l_shadowVolDL = .data:0x803A88A0; // type:object size:0x3B scope:global align:32 -l_shadowProjMat = .data:0x803A88E0; // type:object size:0x5A scope:global align:32 -l_shadowVolMat = .data:0x803A8940; // type:object size:0x5A scope:global align:32 noreloc -l_clearMat = .data:0x803A89A0; // type:object size:0x55 scope:global align:32 -l_frontMat = .data:0x803A8A00; // type:object size:0x55 scope:global align:32 -l_backSubMat = .data:0x803A8A60; // type:object size:0x3C scope:global align:32 -l_simpleShadowPos = .data:0x803A8A9C; // type:object size:0xA8 scope:global align:4 -l_shadowVolumeDL = .data:0x803A8B60; // type:object size:0x58 scope:global align:32 -l_shadowSealTexDL = .data:0x803A8BC0; // type:object size:0x55 scope:global align:32 -l_shadowSealTex2DL = .data:0x803A8C20; // type:object size:0x55 scope:global align:32 -l_shadowSealDL = .data:0x803A8C80; // type:object size:0x69 scope:global align:32 +l_frontZMat = .data:0x803A87C0; // type:object size:0x3C scope:local align:32 +l_frontNoZSubMat = .data:0x803A8800; // type:object size:0x2A scope:local align:32 +l_shadowVolPos = .data:0x803A882C; // type:object size:0x60 scope:local align:4 +l_shadowVolDL = .data:0x803A88A0; // type:object size:0x3B scope:local align:32 +l_shadowProjMat = .data:0x803A88E0; // type:object size:0x5A scope:local align:32 +l_shadowVolMat = .data:0x803A8940; // type:object size:0x5A scope:local align:32 noreloc +l_clearMat = .data:0x803A89A0; // type:object size:0x55 scope:local align:32 +l_frontMat = .data:0x803A8A00; // type:object size:0x55 scope:local align:32 +l_backSubMat = .data:0x803A8A60; // type:object size:0x3C scope:local align:32 +l_simpleShadowPos = .data:0x803A8A9C; // type:object size:0xA8 scope:local align:4 +l_shadowVolumeDL = .data:0x803A8B60; // type:object size:0x58 scope:local align:32 +l_shadowSealTexDL = .data:0x803A8BC0; // type:object size:0x55 scope:local align:32 +l_shadowSealTex2DL = .data:0x803A8C20; // type:object size:0x55 scope:local align:32 +l_shadowSealDL = .data:0x803A8C80; // type:object size:0x69 scope:local align:32 l_matDL$5404 = .data:0x803A8D00; // type:object size:0x7B scope:local align:32 l_imageDrawColor$5405 = .data:0x803A8D7C; // type:object size:0x10 scope:local align:4 l_tevColorChan$5438 = .data:0x803A8D8C; // type:object size:0x10 scope:local align:4 mtx_adj$5842 = .data:0x803A8D9C; // type:object size:0x30 scope:local align:4 -__vt__18dDlst_shadowPoly_c = .data:0x803A8DCC; // type:object size:0x10 scope:global align:4 -__vt__22dDlst_shadowRealPoly_c = .data:0x803A8DDC; // type:object size:0x10 scope:global align:4 -__vt__14ShdwDrawPoly_c = .data:0x803A8DEC; // type:object size:0xC scope:global align:4 +__vt__18dDlst_shadowPoly_c = .data:0x803A8DCC; // type:object size:0x10 scope:weak align:4 +__vt__22dDlst_shadowRealPoly_c = .data:0x803A8DDC; // type:object size:0x10 scope:weak align:4 +__vt__14ShdwDrawPoly_c = .data:0x803A8DEC; // type:object size:0xC scope:weak align:4 __vt__18dDlst_effectLine_c = .data:0x803A8DF8; // type:object size:0xC scope:global align:4 -__vt__10J2DAnmBase = .data:0x803A8E04; // type:object size:0x10 scope:global align:4 +__vt__10J2DAnmBase = .data:0x803A8E04; // type:object size:0x10 scope:weak align:4 __vt__11dDlst_blo_c = .data:0x803A8E14; // type:object size:0xC scope:global align:4 __vt__10dDlst_2D_c = .data:0x803A8E20; // type:object size:0xC scope:global align:4 __vt__12dDlst_2DMt_c = .data:0x803A8E2C; // type:object size:0xC scope:global align:4 @@ -17869,18 +17875,18 @@ __vt__11dDlst_2DT_c = .data:0x803A8E68; // type:object size:0xC scope:global ali __vt__15dDlst_2DPoint_c = .data:0x803A8E74; // type:object size:0xC scope:global align:4 __vt__14dDlst_2DQuad_c = .data:0x803A8E80; // type:object size:0xC scope:global align:4 __vt__13dDlst_2DTri_c = .data:0x803A8E8C; // type:object size:0xC scope:global align:4 -l_kydata_BloomInf_tbl = .data:0x803A8E98; // type:object size:0x300 scope:global align:4 -l_darkworld_tbl = .data:0x803A9198; // type:object size:0x110 scope:global align:4 -l_light_size_tbl = .data:0x803A92A8; // type:object size:0x120 scope:global align:4 -l_light_size_tbl_tw = .data:0x803A93C8; // type:object size:0x48 scope:global align:4 -l_maple_col = .data:0x803A9410; // type:object size:0x24 scope:global align:4 -l_time_attribute = .data:0x803A9434; // type:object size:0x84 scope:global align:4 -l_time_attribute_boss = .data:0x803A94B8; // type:object size:0x84 scope:global align:4 -l_field_data = .data:0x803A953C; // type:object size:0x340 scope:global align:4 -l_pselect_default = .data:0x803A987C; // type:object size:0x18 scope:global align:4 -l_envr_default = .data:0x803A9894; // type:object size:0x82 scope:global align:4 -l_vr_box_data = .data:0x803A9918; // type:object size:0x17A scope:global align:4 -S_xfog_table_data = .data:0x803A9A94; // type:object size:0x28 scope:global align:4 +l_kydata_BloomInf_tbl = .data:0x803A8E98; // type:object size:0x300 scope:local align:4 +l_darkworld_tbl = .data:0x803A9198; // type:object size:0x110 scope:local align:4 +l_light_size_tbl = .data:0x803A92A8; // type:object size:0x120 scope:local align:4 +l_light_size_tbl_tw = .data:0x803A93C8; // type:object size:0x48 scope:local align:4 +l_maple_col = .data:0x803A9410; // type:object size:0x24 scope:local align:4 +l_time_attribute = .data:0x803A9434; // type:object size:0x84 scope:local align:4 +l_time_attribute_boss = .data:0x803A94B8; // type:object size:0x84 scope:local align:4 +l_field_data = .data:0x803A953C; // type:object size:0x340 scope:local align:4 +l_pselect_default = .data:0x803A987C; // type:object size:0x18 scope:local align:4 +l_envr_default = .data:0x803A9894; // type:object size:0x82 scope:local align:4 +l_vr_box_data = .data:0x803A9918; // type:object size:0x17A scope:local align:4 +S_xfog_table_data = .data:0x803A9A94; // type:object size:0x28 scope:local align:4 __vt__19dKankyo_evil_Packet = .data:0x803A9AC0; // type:object size:0x14 scope:global align:4 __vt__18dKankyo_mud_Packet = .data:0x803A9AD4; // type:object size:0x14 scope:global align:4 __vt__20dKankyo_odour_Packet = .data:0x803A9AE8; // type:object size:0x14 scope:global align:4 @@ -17901,14 +17907,14 @@ act_type_tbl__12dAttention_c = .data:0x803A9C04; // type:object size:0x14 scope: ftp_table$4417 = .data:0x803A9C18; // type:object size:0x24 scope:local align:4 ang_table2$4419 = .data:0x803A9C3C; // type:object size:0xC scope:local align:4 __vt__19dAttDraw_CallBack_c = .data:0x803A9C48; // type:object size:0xC scope:global align:4 -__vt__15dAttDrawParam_c = .data:0x803A9C54; // type:object size:0xC scope:global align:4 +__vt__15dAttDrawParam_c = .data:0x803A9C54; // type:object size:0xC scope:weak align:4 __vt__11dAttParam_c = .data:0x803A9C60; // type:object size:0xC scope:global align:4 dist_table__12dAttention_c = .data:0x803A9C70; // type:object size:0x1998 scope:global align:4 __vt__4dBgS = .data:0x803AB608; // type:object size:0x14 scope:global align:4 __vt__4cBgS = .data:0x803AB61C; // type:object size:0x14 scope:global align:4 __vt__11cBgS_ChkElm = .data:0x803AB630; // type:object size:0x10 scope:global align:4 __vt__9dBgS_Acch = .data:0x803AB640; // type:object size:0x24 scope:global align:4 -__vt__12dBgS_AcchCir = .data:0x803AB664; // type:object size:0xC scope:global align:4 +__vt__12dBgS_AcchCir = .data:0x803AB664; // type:object size:0xC scope:weak align:4 __vt__8dBgS_Chk = .data:0x803AB670; // type:object size:0x18 scope:global align:4 __vt__18dBgS_CamGndChk_Wtr = .data:0x803AB688; // type:object size:0x30 scope:global align:4 __vt__14dBgS_CamGndChk = .data:0x803AB6B8; // type:object size:0x30 scope:global align:4 @@ -17917,7 +17923,7 @@ __vt__18dBgS_ObjGndChk_Spl = .data:0x803AB718; // type:object size:0x30 scope:gl __vt__18dBgS_ObjGndChk_Wtr = .data:0x803AB748; // type:object size:0x30 scope:global align:4 __vt__11dBgS_GndChk = .data:0x803AB778; // type:object size:0x30 scope:global align:4 __vt__15dBgS_GrpPassChk = .data:0x803AB7A8; // type:object size:0xC scope:global align:4 -__vt__15cBgS_GrpPassChk = .data:0x803AB7B4; // type:object size:0xC scope:global align:4 +__vt__15cBgS_GrpPassChk = .data:0x803AB7B4; // type:object size:0xC scope:weak align:4 __vt__16dBgS_HorseLinChk = .data:0x803AB7C0; // type:object size:0x30 scope:global align:4 __vt__15dBgS_RopeLinChk = .data:0x803AB7F0; // type:object size:0x30 scope:global align:4 __vt__20dBgS_BoomerangLinChk = .data:0x803AB820; // type:object size:0x30 scope:global align:4 @@ -17932,17 +17938,17 @@ __vt__16dBgS_MoveBgActor = .data:0x803AB9A0; // type:object size:0x28 scope:glob __vt__11dBgS_SphChk = .data:0x803AB9C8; // type:object size:0x3C scope:global align:4 __vt__14dBgS_SplGrpChk = .data:0x803ABA08; // type:object size:0x30 scope:global align:4 __vt__16dBgS_PolyPassChk = .data:0x803ABA38; // type:object size:0xC scope:global align:4 -__vt__16cBgS_PolyPassChk = .data:0x803ABA44; // type:object size:0xC scope:global align:4 +__vt__16cBgS_PolyPassChk = .data:0x803ABA44; // type:object size:0xC scope:weak align:4 __vt__12dBgS_RoofChk = .data:0x803ABA50; // type:object size:0x30 scope:global align:4 __vt__4dBgW = .data:0x803ABA80; // type:object size:0x104 scope:global align:4 -__vt__8cM3dGTri = .data:0x803ABB84; // type:object size:0xC scope:global align:4 +__vt__8cM3dGTri = .data:0x803ABB84; // type:object size:0xC scope:weak align:4 __vt__11cBgW_GrpElm = .data:0x803ABB90; // type:object size:0xC scope:global align:4 __vt__11cBgW_TriElm = .data:0x803ABB9C; // type:object size:0xC scope:global align:4 __vt__4cBgW = .data:0x803ABBA8; // type:object size:0x104 scope:global align:4 __vt__13cBgW_NodeTree = .data:0x803ABCAC; // type:object size:0xC scope:global align:4 __vt__11cBgW_RwgElm = .data:0x803ABCB8; // type:object size:0xC scope:global align:4 __vt__9dBgW_Base = .data:0x803ABCC8; // type:object size:0xF0 scope:global align:4 -__vt__9cBgW_BgId = .data:0x803ABDB8; // type:object size:0xC scope:global align:4 +__vt__9cBgW_BgId = .data:0x803ABDB8; // type:object size:0xC scope:weak align:4 __vt__8dBgWKCol = .data:0x803ABDC8; // type:object size:0xF0 scope:global align:4 __vt__6dBgWSv = .data:0x803ABEB8; // type:object size:0x104 scope:global align:4 __vt__8dCcD_Sph = .data:0x803ABFC0; // type:object size:0x90 scope:global align:4 @@ -17964,23 +17970,24 @@ __vt__14cCcD_ObjHitInf = .data:0x803AC2D8; // type:object size:0xC scope:global __vt__9dCcD_Stts = .data:0x803AC2E4; // type:object size:0x2C scope:global align:4 __vt__10dCcD_GStts = .data:0x803AC310; // type:object size:0xC scope:global align:4 __vt__10cCcD_GStts = .data:0x803AC31C; // type:object size:0xC scope:global align:4 -rank_tbl = .data:0x803AC328; // type:object size:0x79 scope:global align:4 +rank_tbl = .data:0x803AC328; // type:object size:0x79 scope:local align:4 m_mtrl_hit_tbl__4dCcS = .data:0x803AC3A4; // type:object size:0x40 scope:global align:4 __vt__4dCcS = .data:0x803AC3E4; // type:object size:0x34 scope:global align:4 -plCutLRC = .data:0x803AC418; // type:object size:0xE8 scope:global align:4 +plCutLRC = .data:0x803AC418; // type:object size:0xE8 scope:local align:4 __vt__11dCamSetup_c = .data:0x803AC500; // type:object size:0xC scope:global align:4 __vt__11dCamParam_c = .data:0x803AC50C; // type:object size:0xC scope:global align:4 -__vt__9dCstick_c = .data:0x803AC518; // type:object size:0xC scope:global align:4 +__vt__9dCstick_c = .data:0x803AC518; // type:object size:0xC scope:weak align:4 @8754 = .data:0x803AC528; // type:object size:0x78 scope:local align:4 item_resource__10dItem_data = .data:0x803AC5A0; // type:object size:0x17E8 scope:global align:4 field_item_res__10dItem_data = .data:0x803ADD88; // type:object size:0xFF0 scope:global align:4 item_info__10dItem_data = .data:0x803AED78; // type:object size:0x3FC scope:global align:4 -item_func_ptr = .data:0x803AF178; // type:object size:0x400 scope:global align:4 -item_getcheck_func_ptr = .data:0x803AF578; // type:object size:0x400 scope:global align:4 +item_func_ptr = .data:0x803AF178; // type:object size:0x400 scope:local align:4 +item_getcheck_func_ptr = .data:0x803AF578; // type:object size:0x400 scope:local align:4 __vt__6dMdl_c = .data:0x803AF978; // type:object size:0x14 scope:global align:4 ...data.0 = .data:0x803AF990; // type:label scope:local cNullVec__6Z2Calc = .data:0x803AF990; // type:object size:0xC scope:local align:4 l_peepEventName = .data:0x803AF99C; // type:object size:0xA scope:global align:4 data:string +...data.0 = .data:0x803AF99C; // type:label scope:local @4422 = .data:0x803AF9A8; // type:object size:0xC scope:local align:4 @4423 = .data:0x803AF9B4; // type:object size:0xC scope:local align:4 @4424 = .data:0x803AF9C0; // type:object size:0xC scope:local align:4 @@ -18461,11 +18468,12 @@ __vt__29dAlink_bottleWaterPcallBack_c = .data:0x803B35B4; // type:object size:0x __vt__12dBgS_ObjAcch = .data:0x803B35C8; // type:object size:0x24 scope:global align:4 __vt__Q29daAlink_c14hsChainShape_c = .data:0x803B35EC; // type:object size:0x14 scope:global align:4 __vt__12daItemBase_c = .data:0x803B3610; // type:object size:0x44 scope:global align:4 -daNocrm_METHODS = .data:0x803B3658; // type:object size:0x20 scope:global align:4 +daNocrm_METHODS = .data:0x803B3658; // type:object size:0x20 scope:local align:4 g_profile_NO_CHG_ROOM = .data:0x803B3678; // type:object size:0x30 scope:global align:4 ...data.0 = .data:0x803B36A8; // type:label scope:local cNullVec__6Z2Calc = .data:0x803B36A8; // type:object size:0xC scope:local align:4 @5258 = .data:0x803B36B4; // type:object size:0x24 scope:local align:4 +...data.0 = .data:0x803B36B4; // type:label scope:local mCcDCyl__8daNpcT_c = .data:0x803B36D8; // type:object size:0x44 scope:global align:4 mCcDSph__8daNpcT_c = .data:0x803B371C; // type:object size:0x40 scope:global align:4 mCcDCyl__11daBaseNpc_c = .data:0x803B375C; // type:object size:0x44 scope:global align:4 @@ -18494,17 +18502,19 @@ l_resNameTbl = .data:0x803B3B8C; // type:object size:0x78 scope:local align:4 l_bmdTbl = .data:0x803B3C04; // type:object size:0xF0 scope:local align:4 data:4byte l_bmdTWTbl = .data:0x803B3CF4; // type:object size:0xF0 scope:local align:4 data:4byte a_jntTbl_M$3905 = .data:0x803B3DE4; // type:object size:0xF00 scope:local align:4 +...data.0 = .data:0x803B42CC; // type:label scope:local a_prmTbl_M$3906 = .data:0x803B4CE4; // type:object size:0x400 scope:local align:4 a_jntTbl_W$3907 = .data:0x803B50E4; // type:object size:0xD20 scope:local align:4 a_prmTbl_W$3908 = .data:0x803B5E04; // type:object size:0x380 scope:local align:4 -__vt__17daNpcCd_HIO_Jnt_c = .data:0x803B6184; // type:object size:0xC scope:global align:4 -__vt__19daNpcCd_HIO_Child_c = .data:0x803B6190; // type:object size:0xC scope:global align:4 -__vt__13daNpcCd_HIO_c = .data:0x803B619C; // type:object size:0xC scope:global align:4 -__vt__18fOpAcm_HIO_entry_c = .data:0x803B61A8; // type:object size:0xC scope:global align:4 -__vt__14mDoHIO_entry_c = .data:0x803B61B4; // type:object size:0xC scope:global align:4 +__vt__17daNpcCd_HIO_Jnt_c = .data:0x803B6184; // type:object size:0xC scope:weak align:4 +__vt__19daNpcCd_HIO_Child_c = .data:0x803B6190; // type:object size:0xC scope:weak align:4 +__vt__13daNpcCd_HIO_c = .data:0x803B619C; // type:object size:0xC scope:weak align:4 +__vt__18fOpAcm_HIO_entry_c = .data:0x803B61A8; // type:object size:0xC scope:weak align:4 +__vt__14mDoHIO_entry_c = .data:0x803B61B4; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803B61C0; // type:label scope:local cNullVec__6Z2Calc = .data:0x803B61C0; // type:object size:0xC scope:local align:4 l_resNameTbl = .data:0x803B61CC; // type:object size:0x78 scope:local align:4 +...data.0 = .data:0x803B61CC; // type:label scope:local l_bmdTbl = .data:0x803B6244; // type:object size:0xF0 scope:local align:4 data:4byte l_bmdTWTbl = .data:0x803B6334; // type:object size:0xF0 scope:local align:4 data:4byte l_btpTbl = .data:0x803B6424; // type:object size:0xF0 scope:global align:4 data:4byte @@ -18537,17 +18547,18 @@ mode_proc$4678 = .data:0x803B9DC4; // type:object size:0x18 scope:local align:4 @5248 = .data:0x803B9E8C; // type:object size:0xC scope:local align:4 mFuncPtr__8daItem_c = .data:0x803B9E98; // type:object size:0x78 scope:global align:4 data:4byte m_cyl_src__8daItem_c = .data:0x803B9F10; // type:object size:0x44 scope:global align:4 -l_daItem_Method = .data:0x803B9F54; // type:object size:0x20 scope:global align:4 +l_daItem_Method = .data:0x803B9F54; // type:object size:0x20 scope:local align:4 g_profile_ITEM = .data:0x803B9F74; // type:object size:0x30 scope:global align:4 __vt__8daItem_c = .data:0x803B9FA4; // type:object size:0x44 scope:global align:4 -__vt__9dInsect_c = .data:0x803BA078; // type:object size:0xC scope:global align:4 +__vt__9dInsect_c = .data:0x803BA078; // type:object size:0xC scope:weak align:4 __vt__14daObj_SSBase_c = .data:0x803BA088; // type:object size:0x14 scope:global align:4 arcName$4622 = .data:0x803BA0A0; // type:object size:0x20 scope:local align:4 -l_sightDL = .data:0x803BA0C0; // type:object size:0x89 scope:global align:4 noreloc +l_sightDL = .data:0x803BA0C0; // type:object size:0x89 scope:local align:4 noreloc __vt__18daPy_sightPacket_c = .data:0x803BA14C; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BA160; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BA160; // type:object size:0xC scope:local align:4 @4478 = .data:0x803BA16C; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803BA16C; // type:label scope:local @4479 = .data:0x803BA178; // type:object size:0xC scope:local align:4 @4480 = .data:0x803BA184; // type:object size:0xC scope:local align:4 @4481 = .data:0x803BA190; // type:object size:0xC scope:local align:4 @@ -18613,7 +18624,7 @@ g_profile_CAMERA = .data:0x803BA6F8; // type:object size:0x44 scope:global align g_profile_CAMERA2 = .data:0x803BA73C; // type:object size:0x44 scope:global align:4 __vt__14dBgS_CamSphChk = .data:0x803BA798; // type:object size:0x3C scope:global align:4 __vt__14d2DBSplinePath = .data:0x803BA7EC; // type:object size:0xC scope:global align:4 -l_dEnvSe_Method = .data:0x803BA808; // type:object size:0x14 scope:global align:4 +l_dEnvSe_Method = .data:0x803BA808; // type:object size:0x14 scope:local align:4 g_profile_ENVSE = .data:0x803BA81C; // type:object size:0x28 scope:global align:4 ...data.0 = .data:0x803BA848; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BA848; // type:object size:0xC scope:local align:4 @@ -18621,9 +18632,9 @@ SelStartFrameTbl = .data:0x803BA854; // type:object size:0xC scope:local align:4 SelEndFrameTbl = .data:0x803BA860; // type:object size:0xC scope:local align:4 SelOpenStartFrameTbl = .data:0x803BA86C; // type:object size:0xC scope:local align:4 SelOpenEndFrameTbl = .data:0x803BA878; // type:object size:0xC scope:local align:4 -MenuSelStartFrameTbl = .data:0x803BA884; // type:object size:0xC scope:global align:4 -MenuSelEndFrameTbl = .data:0x803BA890; // type:object size:0xC scope:global align:4 -l_tagName13 = .data:0x803BA8A0; // type:object size:0x18 scope:global align:8 data:string +MenuSelStartFrameTbl = .data:0x803BA884; // type:object size:0xC scope:local align:4 +MenuSelEndFrameTbl = .data:0x803BA890; // type:object size:0xC scope:local align:4 +l_tagName13 = .data:0x803BA8A0; // type:object size:0x18 scope:local align:8 data:string @4167 = .data:0x803BA8B8; // type:object size:0xC scope:local align:4 @4168 = .data:0x803BA8C4; // type:object size:0xC scope:local align:4 @4169 = .data:0x803BA8D0; // type:object size:0xC scope:local align:4 @@ -18671,7 +18682,7 @@ l_tagName13 = .data:0x803BA8A0; // type:object size:0x18 scope:global align:8 da @4211 = .data:0x803BAAC8; // type:object size:0xC scope:local align:4 @4212 = .data:0x803BAAD4; // type:object size:0xC scope:local align:4 @4213 = .data:0x803BAAE0; // type:object size:0xC scope:local align:4 -DataSelProc = .data:0x803BAAEC; // type:object size:0x234 scope:global align:4 data:4byte +DataSelProc = .data:0x803BAAEC; // type:object size:0x234 scope:local align:4 data:4byte l_tagName101$5620 = .data:0x803BAD20; // type:object size:0x10 scope:local align:8 data:4byte l_numTex$5621 = .data:0x803BAD30; // type:object size:0xC scope:local align:4 l_tagName0$6517 = .data:0x803BAD40; // type:object size:0x18 scope:local align:8 data:string @@ -18730,7 +18741,7 @@ l_tagName011U$7081 = .data:0x803BAFD0; // type:object size:0x18 scope:local alig @7783 = .data:0x803BB108; // type:object size:0xC scope:local align:4 @7784 = .data:0x803BB114; // type:object size:0xC scope:local align:4 @7785 = .data:0x803BB120; // type:object size:0xC scope:local align:4 -MemCardCheckProc = .data:0x803BB12C; // type:object size:0x144 scope:global align:4 data:4byte +MemCardCheckProc = .data:0x803BB12C; // type:object size:0x144 scope:local align:4 data:4byte @7797 = .data:0x803BB270; // type:object size:0xC scope:local align:4 @7799 = .data:0x803BB27C; // type:object size:0xC scope:local align:4 @7801 = .data:0x803BB288; // type:object size:0xC scope:local align:4 @@ -18750,10 +18761,10 @@ __vt__17dDlst_FileSelYn_c = .data:0x803BB378; // type:object size:0x10 scope:glo __vt__17dDlst_FileSelCp_c = .data:0x803BB388; // type:object size:0x10 scope:global align:4 __vt__17dDlst_FileSelDt_c = .data:0x803BB398; // type:object size:0x10 scope:global align:4 __vt__15dDlst_FileSel_c = .data:0x803BB3A8; // type:object size:0x10 scope:global align:4 -__vt__15J2DAnmTransform = .data:0x803BB3B8; // type:object size:0x14 scope:global align:4 -__vt__10JUTNameTab = .data:0x803BB3DC; // type:object size:0xC scope:global align:4 +__vt__15J2DAnmTransform = .data:0x803BB3B8; // type:object size:0x14 scope:weak align:4 +__vt__10JUTNameTab = .data:0x803BB3DC; // type:object size:0xC scope:weak align:4 __vt__14dFile_select_c = .data:0x803BB3E8; // type:object size:0xC scope:global align:4 -__vt__9dFs_HIO_c = .data:0x803BB400; // type:object size:0xC scope:global align:4 +__vt__9dFs_HIO_c = .data:0x803BB400; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803BB410; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BB410; // type:object size:0xC scope:local align:4 @3805 = .data:0x803BB41C; // type:object size:0xC scope:local align:4 @@ -18774,7 +18785,7 @@ __vt__12dFile_info_c = .data:0x803BB598; // type:object size:0xC scope:global al cNullVec__6Z2Calc = .data:0x803BB5B0; // type:object size:0xC scope:local align:4 @3797 = .data:0x803BB5BC; // type:object size:0xC scope:local align:4 @3798 = .data:0x803BB5C8; // type:object size:0xC scope:local align:4 -brightChackProc = .data:0x803BB5D4; // type:object size:0x18 scope:global align:4 data:4byte +brightChackProc = .data:0x803BB5D4; // type:object size:0x18 scope:local align:4 data:4byte __vt__19dDlst_BrightCheck_c = .data:0x803BB5EC; // type:object size:0x10 scope:global align:4 __vt__14dBrightCheck_c = .data:0x803BB5FC; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803BB618; // type:label scope:local @@ -18782,13 +18793,13 @@ cNullVec__6Z2Calc = .data:0x803BB618; // type:object size:0xC scope:local align: @3693 = .data:0x803BB624; // type:object size:0xC scope:local align:4 @3694 = .data:0x803BB630; // type:object size:0xC scope:local align:4 @3695 = .data:0x803BB63C; // type:object size:0xC scope:local align:4 -init_process = .data:0x803BB648; // type:object size:0x24 scope:local align:4 data:4byte +init_process = .data:0x803BB648; // type:object size:0x24 scope:global align:4 data:4byte @3696 = .data:0x803BB66C; // type:object size:0xC scope:local align:4 @3697 = .data:0x803BB678; // type:object size:0xC scope:local align:4 @3698 = .data:0x803BB684; // type:object size:0xC scope:local align:4 -move_process = .data:0x803BB690; // type:object size:0x24 scope:local align:4 data:4byte +move_process = .data:0x803BB690; // type:object size:0x24 scope:global align:4 data:4byte __vt__8dScope_c = .data:0x803BB6B4; // type:object size:0x20 scope:global align:4 -__vt__11dMeterSub_c = .data:0x803BB6D4; // type:object size:0x20 scope:global align:4 +__vt__11dMeterSub_c = .data:0x803BB6D4; // type:object size:0x20 scope:weak align:4 ...data.0 = .data:0x803BB700; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BB700; // type:object size:0xC scope:local align:4 blo_name$3684 = .data:0x803BB70C; // type:object size:0x10 scope:local align:4 @@ -18797,18 +18808,18 @@ bpk_name$3686 = .data:0x803BB72C; // type:object size:0x10 scope:local align:4 btk_name$3687 = .data:0x803BB73C; // type:object size:0x10 scope:local align:4 btk2_name$3688 = .data:0x803BB74C; // type:object size:0x10 scope:local align:4 __vt__16dSelect_cursor_c = .data:0x803BB78C; // type:object size:0x10 scope:global align:4 -__vt__19dSelect_cursorHIO_c = .data:0x803BB7A8; // type:object size:0xC scope:global align:4 -__vt__9dSi_HIO_c = .data:0x803BB7B8; // type:object size:0xC scope:global align:4 -cam_seira_shop = .data:0x803BB7C8; // type:object size:0x38 scope:global align:4 -cam_seira_evnt_before = .data:0x803BB800; // type:object size:0x38 scope:global align:4 -cam_seira_evnt_after = .data:0x803BB838; // type:object size:0x38 scope:global align:4 -shop_cam_data_tbl = .data:0x803BB870; // type:object size:0xC scope:global align:4 +__vt__19dSelect_cursorHIO_c = .data:0x803BB7A8; // type:object size:0xC scope:weak align:4 +__vt__9dSi_HIO_c = .data:0x803BB7B8; // type:object size:0xC scope:weak align:4 +cam_seira_shop = .data:0x803BB7C8; // type:object size:0x38 scope:local align:4 +cam_seira_evnt_before = .data:0x803BB800; // type:object size:0x38 scope:local align:4 +cam_seira_evnt_after = .data:0x803BB838; // type:object size:0x38 scope:local align:4 +shop_cam_data_tbl = .data:0x803BB870; // type:object size:0xC scope:local align:4 @3771 = .data:0x803BB87C; // type:object size:0xC scope:local align:4 data:4byte __vt__15dShopItemCtrl_c = .data:0x803BB888; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803BB898; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BB898; // type:object size:0xC scope:local align:4 -dShopSystem_itemActor = .data:0x803BB8A4; // type:object size:0x1C scope:global align:4 data:4byte -item_seira_shop = .data:0x803BB8C0; // type:object size:0x24 scope:global align:4 +dShopSystem_itemActor = .data:0x803BB8A4; // type:object size:0x1C scope:local align:4 data:4byte +item_seira_shop = .data:0x803BB8C0; // type:object size:0x24 scope:local align:4 @4056 = .data:0x803BB8E4; // type:object size:0xC scope:local align:4 @4057 = .data:0x803BB8F0; // type:object size:0xC scope:local align:4 @4058 = .data:0x803BB8FC; // type:object size:0xC scope:local align:4 @@ -18846,16 +18857,16 @@ init_process = .data:0x803BBBC8; // type:object size:0x6C scope:local align:4 da @3900 = .data:0x803BBC94; // type:object size:0xC scope:local align:4 move_process = .data:0x803BBCA0; // type:object size:0x6C scope:local align:4 data:4byte offset$4331 = .data:0x803BBD0C; // type:object size:0x20 scope:local align:4 -l_dGameover_Method = .data:0x803BBD2C; // type:object size:0x14 scope:global align:4 +l_dGameover_Method = .data:0x803BBD2C; // type:object size:0x14 scope:local align:4 g_profile_GAMEOVER = .data:0x803BBD40; // type:object size:0x28 scope:global align:4 __vt__24dDlst_GameOverScrnDraw_c = .data:0x803BBD68; // type:object size:0x10 scope:global align:4 -__vt__12dMenu_save_c = .data:0x803BBD78; // type:object size:0xC scope:global align:4 -__vt__10dGov_HIO_c = .data:0x803BBD90; // type:object size:0xC scope:global align:4 +__vt__12dMenu_save_c = .data:0x803BBD78; // type:object size:0xC scope:weak align:4 +__vt__10dGov_HIO_c = .data:0x803BBD90; // type:object size:0xC scope:weak align:4 __vt__24dDlst_Gameover_CAPTURE_c = .data:0x803BBDA8; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BBDB8; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BBDB8; // type:object size:0xC scope:local align:4 -lightStatusBase = .data:0x803BBDC4; // type:object size:0xE8 scope:global align:4 data:4byte -lightMaskData = .data:0x803BBEAC; // type:object size:0x10 scope:global align:4 data:2byte +lightStatusBase = .data:0x803BBDC4; // type:object size:0xE8 scope:local align:4 data:4byte +lightMaskData = .data:0x803BBEAC; // type:object size:0x10 scope:local align:4 data:2byte @4322 = .data:0x803BBEBC; // type:object size:0x40 scope:local align:4 @4364 = .data:0x803BBEFC; // type:object size:0x40 scope:local align:4 @4511 = .data:0x803BBF3C; // type:object size:0x1C scope:local align:4 @@ -18869,15 +18880,16 @@ now_shadow_alpha$5927 = .data:0x803BC010; // type:object size:0x18 scope:local a flush_col$7304 = .data:0x803BC070; // type:object size:0x10 scope:local align:4 flush_col2$7305 = .data:0x803BC080; // type:object size:0x10 scope:local align:4 flush_col3$7306 = .data:0x803BC090; // type:object size:0x10 scope:local align:4 -l_dKy_Method = .data:0x803BC0A0; // type:object size:0x14 scope:global align:4 +l_dKy_Method = .data:0x803BC0A0; // type:object size:0x14 scope:local align:4 g_profile_KANKYO = .data:0x803BC0B4; // type:object size:0x28 scope:global align:4 parcent_tabel$9036 = .data:0x803BC0DC; // type:object size:0x30 scope:local align:4 -__vt__18dScnKy_env_light_c = .data:0x803BC13C; // type:object size:0xC scope:global align:4 -l_dKyeff_Method = .data:0x803BC158; // type:object size:0x14 scope:global align:4 +dummy_padding_data_0x354 = .data:0x803BC10C; // type:object size:0x30 scope:local +__vt__18dScnKy_env_light_c = .data:0x803BC13C; // type:object size:0xC scope:weak align:4 +l_dKyeff_Method = .data:0x803BC158; // type:object size:0x14 scope:local align:4 g_profile_KYEFF = .data:0x803BC16C; // type:object size:0x28 scope:global align:4 -l_dKyeff2_Method = .data:0x803BC198; // type:object size:0x14 scope:global align:4 +l_dKyeff2_Method = .data:0x803BC198; // type:object size:0x14 scope:local align:4 g_profile_KYEFF2 = .data:0x803BC1AC; // type:object size:0x28 scope:global align:4 -l_dThunder_Method = .data:0x803BC1D8; // type:object size:0x14 scope:global align:4 +l_dThunder_Method = .data:0x803BC1D8; // type:object size:0x14 scope:local align:4 g_profile_KY_THUNDER = .data:0x803BC1EC; // type:object size:0x28 scope:global align:4 __vt__19dDlst_KanteraIcon_c = .data:0x803BC218; // type:object size:0x10 scope:global align:4 __vt__15dKantera_icon_c = .data:0x803BC228; // type:object size:0xC scope:global align:4 @@ -18898,9 +18910,11 @@ map_init_process = .data:0x803BC28C; // type:object size:0x48 scope:local align: @3810 = .data:0x803BC310; // type:object size:0xC scope:local align:4 map_move_process = .data:0x803BC31C; // type:object size:0x48 scope:local align:4 data:4byte __vt__19dMenu_Calibration_c = .data:0x803BC364; // type:object size:0x10 scope:global align:4 +__vt__20dummy_abstract_class = .data:0x803BC374; // type:object size:0xC scope:weak ...data.0 = .data:0x803BC380; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BC380; // type:object size:0xC scope:local align:4 @4422 = .data:0x803BC38C; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803BC38C; // type:label scope:local @4423 = .data:0x803BC398; // type:object size:0xC scope:local align:4 @4424 = .data:0x803BC3A4; // type:object size:0xC scope:local align:4 @4425 = .data:0x803BC3B0; // type:object size:0xC scope:local align:4 @@ -18967,13 +18981,13 @@ move_process = .data:0x803BC8A0; // type:object size:0x3C scope:local align:4 da @4873 = .data:0x803BC8F4; // type:object size:0xC scope:local align:4 @4874 = .data:0x803BC900; // type:object size:0xC scope:local align:4 @4875 = .data:0x803BC90C; // type:object size:0xC scope:local align:4 -itemInfo_subProcess = .data:0x803BC918; // type:object size:0x3C scope:global align:4 data:4byte +itemInfo_subProcess = .data:0x803BC918; // type:object size:0x3C scope:local align:4 data:4byte @4876 = .data:0x803BC954; // type:object size:0xC scope:local align:4 @4877 = .data:0x803BC960; // type:object size:0xC scope:local align:4 -floor_init_process = .data:0x803BC96C; // type:object size:0x18 scope:global align:4 data:4byte +floor_init_process = .data:0x803BC96C; // type:object size:0x18 scope:local align:4 data:4byte @4878 = .data:0x803BC984; // type:object size:0xC scope:local align:4 @4879 = .data:0x803BC990; // type:object size:0xC scope:local align:4 -floor_move_process = .data:0x803BC99C; // type:object size:0x18 scope:global align:4 data:4byte +floor_move_process = .data:0x803BC99C; // type:object size:0x18 scope:local align:4 data:4byte @4880 = .data:0x803BC9B4; // type:object size:0xC scope:local align:4 @4881 = .data:0x803BC9C0; // type:object size:0xC scope:local align:4 @4882 = .data:0x803BC9CC; // type:object size:0xC scope:local align:4 @@ -18982,14 +18996,14 @@ map_init_process = .data:0x803BC9D8; // type:object size:0x24 scope:local align: @4884 = .data:0x803BCA08; // type:object size:0xC scope:local align:4 @4885 = .data:0x803BCA14; // type:object size:0xC scope:local align:4 map_move_process = .data:0x803BCA20; // type:object size:0x24 scope:local align:4 data:4byte -__vt__15dMenu_DmapMap_c = .data:0x803BCAE0; // type:object size:0xC scope:global align:4 -__vt__20dMenu_StageMapCtrl_c = .data:0x803BCAEC; // type:object size:0x24 scope:global align:4 +__vt__15dMenu_DmapMap_c = .data:0x803BCAE0; // type:object size:0xC scope:weak align:4 +__vt__20dMenu_StageMapCtrl_c = .data:0x803BCAEC; // type:object size:0x24 scope:weak align:4 __vt__12dMenu_Dmap_c = .data:0x803BCB10; // type:object size:0xC scope:global align:4 __vt__14dMenu_DmapBg_c = .data:0x803BCB38; // type:object size:0x1C scope:global align:4 ...data.0 = .data:0x803BCB60; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BCB60; // type:object size:0xC scope:local align:4 @3798 = .data:0x803BCB6C; // type:object size:0x44 scope:local align:4 -l_data = .data:0x803BCBC0; // type:object size:0xF4 scope:global align:4 noreloc +l_data = .data:0x803BCBC0; // type:object size:0xF4 scope:local align:4 noreloc @3922 = .data:0x803BCCB4; // type:object size:0xC scope:local align:4 @3923 = .data:0x803BCCC0; // type:object size:0xC scope:local align:4 @3924 = .data:0x803BCCCC; // type:object size:0xC scope:local align:4 @@ -19002,14 +19016,14 @@ init_process = .data:0x803BCCE4; // type:object size:0x30 scope:local align:4 da move_process = .data:0x803BCD44; // type:object size:0x30 scope:local align:4 data:4byte __vt__19dMenu_DmapMapCtrl_c = .data:0x803BCD74; // type:object size:0x28 scope:global align:4 __vt__15renderingDmap_c = .data:0x803BCE68; // type:object size:0xAC scope:global align:4 -map_icon_size = .data:0x803BCF18; // type:object size:0x114 scope:global align:4 data:float +map_icon_size = .data:0x803BCF18; // type:object size:0x114 scope:local align:4 data:float __vt__16dMenuMapCommon_c = .data:0x803BD02C; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803BD038; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BD038; // type:object size:0xC scope:local align:4 @3790 = .data:0x803BD044; // type:object size:0xC scope:local align:4 -map_init_process = .data:0x803BD050; // type:object size:0xC scope:local align:4 data:4byte +map_init_process = .data:0x803BD050; // type:object size:0xC scope:global align:4 data:4byte @3791 = .data:0x803BD05C; // type:object size:0xC scope:local align:4 -map_move_process = .data:0x803BD068; // type:object size:0xC scope:local align:4 data:4byte +map_move_process = .data:0x803BD068; // type:object size:0xC scope:global align:4 data:4byte __vt__15dMenu_Fishing_c = .data:0x803BD074; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BD090; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BD090; // type:object size:0xC scope:local align:4 @@ -19078,7 +19092,7 @@ move_process = .data:0x803BD4D4; // type:object size:0x168 scope:local align:4 d stage_name$7304 = .data:0x803BD63C; // type:object size:0x10 scope:local align:4 stage_name$7361 = .data:0x803BD64C; // type:object size:0x18 scope:local align:4 __vt__12dMenu_Fmap_c = .data:0x803BD664; // type:object size:0xC scope:global align:4 -__vt__9dMf_HIO_c = .data:0x803BD670; // type:object size:0xC scope:global align:4 +__vt__9dMf_HIO_c = .data:0x803BD670; // type:object size:0xC scope:weak align:4 __vt__15dMenu_FmapMap_c = .data:0x803BD680; // type:object size:0x68 scope:global align:4 __vt__15renderingFmap_c = .data:0x803BD6E8; // type:object size:0x68 scope:global align:4 __vt__17dMenu_Fmap2DTop_c = .data:0x803BD750; // type:object size:0x10 scope:global align:4 @@ -19163,13 +19177,13 @@ process = .data:0x803BDCD4; // type:object size:0x60 scope:local align:4 data:4b @3856 = .data:0x803BDD4C; // type:object size:0xC scope:local align:4 @3857 = .data:0x803BDD58; // type:object size:0xC scope:local align:4 @3858 = .data:0x803BDD64; // type:object size:0xC scope:local align:4 -tv_process = .data:0x803BDD70; // type:object size:0x3C scope:global align:4 data:4byte +tv_process = .data:0x803BDD70; // type:object size:0x3C scope:local align:4 data:4byte @3859 = .data:0x803BDDAC; // type:object size:0xC scope:local align:4 @3860 = .data:0x803BDDB8; // type:object size:0xC scope:local align:4 @3861 = .data:0x803BDDC4; // type:object size:0xC scope:local align:4 @3862 = .data:0x803BDDD0; // type:object size:0xC scope:local align:4 @3863 = .data:0x803BDDDC; // type:object size:0xC scope:local align:4 -calibration_process = .data:0x803BDDE8; // type:object size:0x3C scope:global align:4 +calibration_process = .data:0x803BDDE8; // type:object size:0x3C scope:local align:4 __vt__14dMenu_Option_c = .data:0x803BDE54; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BDE70; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BDE70; // type:object size:0xC scope:local align:4 @@ -19177,12 +19191,12 @@ cNullVec__6Z2Calc = .data:0x803BDE70; // type:object size:0xC scope:local align: @3863 = .data:0x803BDE88; // type:object size:0xC scope:local align:4 @3864 = .data:0x803BDE94; // type:object size:0xC scope:local align:4 @3865 = .data:0x803BDEA0; // type:object size:0xC scope:local align:4 -stick_init = .data:0x803BDEAC; // type:object size:0x30 scope:global align:4 data:4byte +stick_init = .data:0x803BDEAC; // type:object size:0x30 scope:local align:4 data:4byte @3866 = .data:0x803BDEDC; // type:object size:0xC scope:local align:4 @3867 = .data:0x803BDEE8; // type:object size:0xC scope:local align:4 @3868 = .data:0x803BDEF4; // type:object size:0xC scope:local align:4 @3869 = .data:0x803BDF00; // type:object size:0xC scope:local align:4 -stick_proc = .data:0x803BDF0C; // type:object size:0x30 scope:global align:4 data:4byte +stick_proc = .data:0x803BDF0C; // type:object size:0x30 scope:local align:4 data:4byte @4795 = .data:0x803BDF3C; // type:object size:0x20 scope:local align:4 __vt__12dMenu_Ring_c = .data:0x803BDF5C; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BDF78; // type:label scope:local @@ -19277,7 +19291,7 @@ MenuSaveProc = .data:0x803BE424; // type:object size:0x2E8 scope:global align:4 @4901 = .data:0x803BE758; // type:object size:0xC scope:local align:4 data:4byte __vt__16dDlst_MenuSave_c = .data:0x803BE764; // type:object size:0x10 scope:global align:4 __vt__23dDlst_MenuSaveExplain_c = .data:0x803BE774; // type:object size:0x10 scope:global align:4 -__vt__9dMs_HIO_c = .data:0x803BE7CC; // type:object size:0xC scope:global align:4 +__vt__9dMs_HIO_c = .data:0x803BE7CC; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803BE7D8; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BE7D8; // type:object size:0xC scope:local align:4 @3795 = .data:0x803BE7E4; // type:object size:0xC scope:local align:4 @@ -19292,11 +19306,12 @@ map_init_process = .data:0x803BE814; // type:object size:0x30 scope:local align: map_move_process = .data:0x803BE874; // type:object size:0x30 scope:local align:4 data:4byte evt_id$4557 = .data:0x803BE8A4; // type:object size:0x1C scope:local align:4 __vt__13dMenu_Skill_c = .data:0x803BE8C0; // type:object size:0x10 scope:global align:4 -__vt__10dMw_DHIO_c = .data:0x803BE8E0; // type:object size:0xC scope:global align:4 -__vt__9dMw_HIO_c = .data:0x803BE8EC; // type:object size:0xC scope:global align:4 +__vt__10dMw_DHIO_c = .data:0x803BE8E0; // type:object size:0xC scope:weak align:4 +__vt__9dMw_HIO_c = .data:0x803BE8EC; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803BE8F8; // type:label scope:local cNullVec__6Z2Calc = .data:0x803BE8F8; // type:object size:0xC scope:local align:4 @4276 = .data:0x803BE904; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803BE904; // type:label scope:local @4277 = .data:0x803BE910; // type:object size:0xC scope:local align:4 @4278 = .data:0x803BE91C; // type:object size:0xC scope:local align:4 @4279 = .data:0x803BE928; // type:object size:0xC scope:local align:4 @@ -19373,22 +19388,22 @@ move_proc = .data:0x803BEDF0; // type:object size:0x1A4 scope:global align:4 dat l_dMw_Method = .data:0x803BF080; // type:object size:0x14 scope:global align:4 g_profile_MENUWINDOW = .data:0x803BF094; // type:object size:0x28 scope:global align:4 __vt__20dDlst_MENU_CAPTURE_c = .data:0x803BF0D4; // type:object size:0x10 scope:global align:4 -__vt__18dMeter_cursorHIO_c = .data:0x803BF0E8; // type:object size:0xC scope:global align:4 +__vt__18dMeter_cursorHIO_c = .data:0x803BF0E8; // type:object size:0xC scope:weak align:4 __vt__16dMeter_fmapHIO_c = .data:0x803BF0F4; // type:object size:0xC scope:global align:4 -__vt__19dMeter_mapIconHIO_c = .data:0x803BF100; // type:object size:0xC scope:global align:4 -__vt__16dMeter_ringHIO_c = .data:0x803BF10C; // type:object size:0xC scope:global align:4 -__vt__16dMeter_drawHIO_c = .data:0x803BF118; // type:object size:0xC scope:global align:4 -__vt__25dMeter_drawLightDropHIO_c = .data:0x803BF124; // type:object size:0xC scope:global align:4 -__vt__24dMeter_drawMiniGameHIO_c = .data:0x803BF130; // type:object size:0xC scope:global align:4 -__vt__25dMeter_drawEmpButtonHIO_c = .data:0x803BF13C; // type:object size:0xC scope:global align:4 -__vt__21dMeter_drawSkillHIO_c = .data:0x803BF148; // type:object size:0xC scope:global align:4 -__vt__27dMeter_drawCalibrationHIO_c = .data:0x803BF154; // type:object size:0xC scope:global align:4 -__vt__22dMeter_drawInsectHIO_c = .data:0x803BF160; // type:object size:0xC scope:global align:4 -__vt__23dMeter_drawFishingHIO_c = .data:0x803BF16C; // type:object size:0xC scope:global align:4 -__vt__22dMeter_drawLetterHIO_c = .data:0x803BF178; // type:object size:0xC scope:global align:4 -__vt__22dMeter_drawOptionHIO_c = .data:0x803BF184; // type:object size:0xC scope:global align:4 -__vt__23dMeter_drawCollectHIO_c = .data:0x803BF190; // type:object size:0xC scope:global align:4 -__vt__16dMeter_menuHIO_c = .data:0x803BF19C; // type:object size:0xC scope:global align:4 +__vt__19dMeter_mapIconHIO_c = .data:0x803BF100; // type:object size:0xC scope:weak align:4 +__vt__16dMeter_ringHIO_c = .data:0x803BF10C; // type:object size:0xC scope:weak align:4 +__vt__16dMeter_drawHIO_c = .data:0x803BF118; // type:object size:0xC scope:weak align:4 +__vt__25dMeter_drawLightDropHIO_c = .data:0x803BF124; // type:object size:0xC scope:weak align:4 +__vt__24dMeter_drawMiniGameHIO_c = .data:0x803BF130; // type:object size:0xC scope:weak align:4 +__vt__25dMeter_drawEmpButtonHIO_c = .data:0x803BF13C; // type:object size:0xC scope:weak align:4 +__vt__21dMeter_drawSkillHIO_c = .data:0x803BF148; // type:object size:0xC scope:weak align:4 +__vt__27dMeter_drawCalibrationHIO_c = .data:0x803BF154; // type:object size:0xC scope:weak align:4 +__vt__22dMeter_drawInsectHIO_c = .data:0x803BF160; // type:object size:0xC scope:weak align:4 +__vt__23dMeter_drawFishingHIO_c = .data:0x803BF16C; // type:object size:0xC scope:weak align:4 +__vt__22dMeter_drawLetterHIO_c = .data:0x803BF178; // type:object size:0xC scope:weak align:4 +__vt__22dMeter_drawOptionHIO_c = .data:0x803BF184; // type:object size:0xC scope:weak align:4 +__vt__23dMeter_drawCollectHIO_c = .data:0x803BF190; // type:object size:0xC scope:weak align:4 +__vt__16dMeter_menuHIO_c = .data:0x803BF19C; // type:object size:0xC scope:weak align:4 @7807 = .data:0x803BF1A8; // type:object size:0x58 scope:local align:4 @7858 = .data:0x803BF200; // type:object size:0x58 scope:local align:4 __vt__14dMeterButton_c = .data:0x803BF258; // type:object size:0x10 scope:global align:4 @@ -19410,7 +19425,7 @@ tex_name$5183 = .data:0x803BF7F4; // type:object size:0x28 scope:local align:4 letter_data__12dMenu_Letter = .data:0x803BF81C; // type:object size:0x200 scope:global align:4 data:2byte __vt__13dMeter2Info_c = .data:0x803BFA1C; // type:object size:0xC scope:global align:4 @5038 = .data:0x803BFA28; // type:object size:0x2C scope:local align:4 -l_dMeter2_Method = .data:0x803BFA54; // type:object size:0x14 scope:global align:4 +l_dMeter2_Method = .data:0x803BFA54; // type:object size:0x14 scope:local align:4 g_profile_METER2 = .data:0x803BFA68; // type:object size:0x28 scope:global align:4 @4395 = .data:0x803BFA90; // type:object size:0x118 scope:local align:4 @5000 = .data:0x803BFBA8; // type:object size:0x104 scope:local align:4 @@ -19443,7 +19458,7 @@ char_table$3795 = .data:0x803BFDF8; // type:object size:0x80 scope:local align:4 __vt__35jmessage_string_tRenderingProcessor = .data:0x803C0908; // type:object size:0x40 scope:global align:4 __vt__34jmessage_string_tSequenceProcessor = .data:0x803C0948; // type:object size:0x58 scope:global align:4 __vt__33jmessage_string_tMeasureProcessor = .data:0x803C09A0; // type:object size:0x40 scope:global align:4 -__vt__24jmessage_string_tControl = .data:0x803C09E0; // type:object size:0xC scope:global align:4 +__vt__24jmessage_string_tControl = .data:0x803C09E0; // type:object size:0xC scope:weak align:4 __vt__26jmessage_string_tReference = .data:0x803C09EC; // type:object size:0x10 scope:global align:4 __vt__28jmessage_tRenderingProcessor = .data:0x803C09FC; // type:object size:0x40 scope:global align:4 __vt__27jmessage_tSequenceProcessor = .data:0x803C0A3C; // type:object size:0x58 scope:global align:4 @@ -19464,7 +19479,7 @@ cNullVec__6Z2Calc = .data:0x803C0C00; // type:object size:0xC scope:local align: @3757 = .data:0x803C0C30; // type:object size:0xC scope:local align:4 @3758 = .data:0x803C0C3C; // type:object size:0xC scope:local align:4 @3759 = .data:0x803C0C48; // type:object size:0xC scope:local align:4 -process = .data:0x803C0C54; // type:object size:0x48 scope:local align:4 data:4byte +process = .data:0x803C0C54; // type:object size:0x48 scope:global align:4 data:4byte tag_n$4921 = .data:0x803C0CA0; // type:object size:0x18 scope:local align:8 __vt__17dMsgScrn3Select_c = .data:0x803C0CE8; // type:object size:0xC scope:global align:4 __vt__15dMsgScrnArrow_c = .data:0x803C0CF8; // type:object size:0xC scope:global align:4 @@ -19512,7 +19527,7 @@ __vt__14dMsgScrnHowl_c = .data:0x803C1190; // type:object size:0x58 scope:global __vt__16dMsgScrnJimaku_c = .data:0x803C11E8; // type:object size:0x58 scope:global align:4 __vt__16dMsgScrnKanban_c = .data:0x803C1240; // type:object size:0x58 scope:global align:4 __vt__15dMsgScrnLight_c = .data:0x803C1298; // type:object size:0xC scope:global align:4 -__vt__19dMsgScrnLight_HIO_c = .data:0x803C12A4; // type:object size:0xC scope:global align:4 +__vt__19dMsgScrnLight_HIO_c = .data:0x803C12A4; // type:object size:0xC scope:weak align:4 t_tag$3877 = .data:0x803C12B0; // type:object size:0x38 scope:local align:8 data:4byte __vt__15dMsgScrnPlace_c = .data:0x803C12E8; // type:object size:0x58 scope:global align:4 t_tag$3752 = .data:0x803C1340; // type:object size:0x30 scope:local align:8 data:4byte @@ -19630,13 +19645,13 @@ mEventList__10dMsgFlow_c = .data:0x803C1CCC; // type:object size:0x204 scope:glo __vt__10dMsgFlow_c = .data:0x803C1F40; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803C1F50; // type:label scope:local cNullVec__6Z2Calc = .data:0x803C1F50; // type:object size:0xC scope:local align:4 -l_mojiHira = .data:0x803C1F5C; // type:object size:0x104 scope:global align:4 -l_mojiHira2 = .data:0x803C2060; // type:object size:0x104 scope:global align:4 -l_mojiHira3 = .data:0x803C2164; // type:object size:0x104 scope:global align:4 -l_mojikata = .data:0x803C2268; // type:object size:0x104 scope:global align:4 -l_mojikata2 = .data:0x803C236C; // type:object size:0x104 scope:global align:4 -l_mojikata3 = .data:0x803C2470; // type:object size:0x104 scope:global align:4 -l_mojiEisu = .data:0x803C2574; // type:object size:0x104 scope:global align:4 +l_mojiHira = .data:0x803C1F5C; // type:object size:0x104 scope:local align:4 +l_mojiHira2 = .data:0x803C2060; // type:object size:0x104 scope:local align:4 +l_mojiHira3 = .data:0x803C2164; // type:object size:0x104 scope:local align:4 +l_mojikata = .data:0x803C2268; // type:object size:0x104 scope:local align:4 +l_mojikata2 = .data:0x803C236C; // type:object size:0x104 scope:local align:4 +l_mojikata3 = .data:0x803C2470; // type:object size:0x104 scope:local align:4 +l_mojiEisu = .data:0x803C2574; // type:object size:0x104 scope:local align:4 @3825 = .data:0x803C2678; // type:object size:0xC scope:local align:4 @3826 = .data:0x803C2684; // type:object size:0xC scope:local align:4 @3827 = .data:0x803C2690; // type:object size:0xC scope:local align:4 @@ -19646,7 +19661,7 @@ l_mojiEisu = .data:0x803C2574; // type:object size:0x104 scope:global align:4 @3831 = .data:0x803C26C0; // type:object size:0xC scope:local align:4 @3832 = .data:0x803C26CC; // type:object size:0xC scope:local align:4 @3833 = .data:0x803C26D8; // type:object size:0xC scope:local align:4 -SelProc = .data:0x803C26E4; // type:object size:0x6C scope:global align:4 data:4byte +SelProc = .data:0x803C26E4; // type:object size:0x6C scope:local align:4 data:4byte @4121 = .data:0x803C2750; // type:object size:0x34 scope:local align:4 l_cur0TagName$4610 = .data:0x803C2788; // type:object size:0x40 scope:local align:8 l_cur1TagName$4611 = .data:0x803C27C8; // type:object size:0x40 scope:local align:8 @@ -19658,9 +19673,9 @@ l_nameTagName$4642 = .data:0x803C2AB8; // type:object size:0x40 scope:local alig l_nameCurTagName$4643 = .data:0x803C2AF8; // type:object size:0x40 scope:local align:8 __vt__14dDlst_NameIN_c = .data:0x803C2B38; // type:object size:0x10 scope:global align:4 __vt__7dName_c = .data:0x803C2B64; // type:object size:0xC scope:global align:4 -__vt__9dNm_HIO_c = .data:0x803C2B7C; // type:object size:0xC scope:global align:4 -__vt__16dNpcLib_lookat_c = .data:0x803C2B88; // type:object size:0xC scope:global align:4 -l_dOvlpFd_Method = .data:0x803C2B98; // type:object size:0x14 scope:global align:4 +__vt__9dNm_HIO_c = .data:0x803C2B7C; // type:object size:0xC scope:weak align:4 +__vt__16dNpcLib_lookat_c = .data:0x803C2B88; // type:object size:0xC scope:weak align:4 +l_dOvlpFd_Method = .data:0x803C2B98; // type:object size:0x14 scope:local align:4 g_profile_OVERLAP0 = .data:0x803C2BAC; // type:object size:0x28 scope:global align:4 g_profile_OVERLAP1 = .data:0x803C2BD4; // type:object size:0x28 scope:global align:4 g_profile_OVERLAP6 = .data:0x803C2BFC; // type:object size:0x28 scope:global align:4 @@ -19673,18 +19688,18 @@ g_profile_OVERLAP11 = .data:0x803C2CC4; // type:object size:0x28 scope:global al @3721 = .data:0x803C2CFC; // type:object size:0xC scope:local align:4 data:4byte @3736 = .data:0x803C2D08; // type:object size:0xC scope:local align:4 data:4byte @3765 = .data:0x803C2D14; // type:object size:0xC scope:local align:4 data:4byte -l_dOvlpFd2_Method = .data:0x803C2D20; // type:object size:0x14 scope:global align:4 +l_dOvlpFd2_Method = .data:0x803C2D20; // type:object size:0x14 scope:local align:4 g_profile_OVERLAP2 = .data:0x803C2D34; // type:object size:0x28 scope:global align:4 __vt__15dOvlpFd2_dlst_c = .data:0x803C2D5C; // type:object size:0x10 scope:global align:4 @3812 = .data:0x803C2D70; // type:object size:0xC scope:local align:4 data:4byte @3857 = .data:0x803C2D7C; // type:object size:0xC scope:local align:4 data:4byte @3871 = .data:0x803C2D88; // type:object size:0xC scope:local align:4 data:4byte @3898 = .data:0x803C2D94; // type:object size:0xC scope:local align:4 data:4byte -l_dOvlpFd3_Method = .data:0x803C2DA0; // type:object size:0x14 scope:global align:4 +l_dOvlpFd3_Method = .data:0x803C2DA0; // type:object size:0x14 scope:local align:4 g_profile_OVERLAP3 = .data:0x803C2DB4; // type:object size:0x28 scope:global align:4 __vt__15dOvlpFd3_dlst_c = .data:0x803C2DDC; // type:object size:0x10 scope:global align:4 __vt__16dDlst_snapShot_c = .data:0x803C2DEC; // type:object size:0xC scope:global align:4 -__vt__10JSUIosBase = .data:0x803C2DF8; // type:object size:0xC scope:global align:4 +__vt__10JSUIosBase = .data:0x803C2DF8; // type:object size:0xC scope:weak align:4 __vt__8CPaneMgr = .data:0x803C2E04; // type:object size:0x10 scope:global align:4 __vt__17CPaneMgrAlphaMorf = .data:0x803C2E18; // type:object size:0x10 scope:global align:4 __vt__13CPaneMgrAlpha = .data:0x803C2E28; // type:object size:0x10 scope:global align:4 @@ -19706,9 +19721,9 @@ cNullVec__6Z2Calc = .data:0x803C2E38; // type:object size:0xC scope:local align: @3750 = .data:0x803C2EE0; // type:object size:0xC scope:local align:4 @3751 = .data:0x803C2EEC; // type:object size:0xC scope:local align:4 @3752 = .data:0x803C2EF8; // type:object size:0xC scope:local align:4 -l_execFunc = .data:0x803C2F04; // type:object size:0xC0 scope:global align:4 data:4byte +l_execFunc = .data:0x803C2F04; // type:object size:0xC0 scope:local align:4 data:4byte l_method$4611 = .data:0x803C2FC4; // type:object size:0xC scope:local align:4 -l_dScnLogo_Method = .data:0x803C2FD0; // type:object size:0x14 scope:global align:4 +l_dScnLogo_Method = .data:0x803C2FD0; // type:object size:0x14 scope:local align:4 g_profile_LOGO_SCENE = .data:0x803C2FE4; // type:object size:0x28 scope:global align:4 __vt__10dLog_HIO_c = .data:0x803C300C; // type:object size:0xC scope:global align:4 g_profile_MENU_SCENE = .data:0x803C3018; // type:object size:0x28 scope:global align:4 @@ -19720,51 +19735,51 @@ cNullVec__6Z2Calc = .data:0x803C3040; // type:object size:0xC scope:local align: @3945 = .data:0x803C3070; // type:object size:0xC scope:local align:4 @3946 = .data:0x803C307C; // type:object size:0xC scope:local align:4 @3947 = .data:0x803C3088; // type:object size:0xC scope:local align:4 -MainProc = .data:0x803C3094; // type:object size:0x48 scope:global align:4 data:4byte -l_dScnName_Method = .data:0x803C30DC; // type:object size:0x14 scope:global align:4 +MainProc = .data:0x803C3094; // type:object size:0x48 scope:local align:4 data:4byte +l_dScnName_Method = .data:0x803C30DC; // type:object size:0x14 scope:local align:4 g_profile_NAME_SCENE = .data:0x803C30F0; // type:object size:0x28 scope:global align:4 g_profile_NAMEEX_SCENE = .data:0x803C3118; // type:object size:0x28 scope:global align:4 -__vt__17dScnName_camera_c = .data:0x803C3140; // type:object size:0xC scope:global align:4 -__vt__9dSn_HIO_c = .data:0x803C314C; // type:object size:0xC scope:global align:4 +__vt__17dScnName_camera_c = .data:0x803C3140; // type:object size:0xC scope:weak align:4 +__vt__9dSn_HIO_c = .data:0x803C314C; // type:object size:0xC scope:weak align:4 l_wipeType$4081 = .data:0x803C3158; // type:object size:0x2E scope:local align:4 camparamarc$4608 = .data:0x803C3188; // type:object size:0xA scope:local align:4 l_method$4860 = .data:0x803C3194; // type:object size:0x2C scope:local align:4 -l_dScnPly_Method = .data:0x803C31C0; // type:object size:0x14 scope:global align:4 +l_dScnPly_Method = .data:0x803C31C0; // type:object size:0x14 scope:local align:4 g_profile_PLAY_SCENE = .data:0x803C31D4; // type:object size:0x28 scope:global align:4 g_profile_OPENING_SCENE = .data:0x803C31FC; // type:object size:0x28 scope:global align:4 -__vt__22dScnPly_env_debugHIO_c = .data:0x803C3224; // type:object size:0xC scope:global align:4 -__vt__22dScnPly_env_otherHIO_c = .data:0x803C3230; // type:object size:0xC scope:global align:4 -__vt__17dScnPly_env_HIO_c = .data:0x803C323C; // type:object size:0xC scope:global align:4 -__vt__17dScnPly_reg_HIO_c = .data:0x803C3248; // type:object size:0xC scope:global align:4 -__vt__21dScnPly_preLoad_HIO_c = .data:0x803C3254; // type:object size:0xC scope:global align:4 +__vt__22dScnPly_env_debugHIO_c = .data:0x803C3224; // type:object size:0xC scope:weak align:4 +__vt__22dScnPly_env_otherHIO_c = .data:0x803C3230; // type:object size:0xC scope:weak align:4 +__vt__17dScnPly_env_HIO_c = .data:0x803C323C; // type:object size:0xC scope:weak align:4 +__vt__17dScnPly_reg_HIO_c = .data:0x803C3248; // type:object size:0xC scope:weak align:4 +__vt__21dScnPly_preLoad_HIO_c = .data:0x803C3254; // type:object size:0xC scope:weak align:4 l_method$4056 = .data:0x803C3260; // type:object size:0x14 scope:local align:4 -l_dScnRoom_Method = .data:0x803C3274; // type:object size:0x14 scope:global align:4 +l_dScnRoom_Method = .data:0x803C3274; // type:object size:0x14 scope:local align:4 g_profile_ROOM_SCENE = .data:0x803C3288; // type:object size:0x28 scope:global align:4 g_profile_WARNING_SCENE = .data:0x803C32B0; // type:object size:0x28 scope:global align:4 g_profile_WARNING2_SCENE = .data:0x803C32D8; // type:object size:0x28 scope:global align:4 -__vt__22dSvBit_childOtherHIO_c = .data:0x803C3300; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childTransformHIO_c = .data:0x803C330C; // type:object size:0xC scope:global align:4 -__vt__25dSvBit_childDarknessHIO_c = .data:0x803C3318; // type:object size:0xC scope:global align:4 -__vt__29dSvBit_childTbPerfectionHIO_c = .data:0x803C3324; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childItOneZoneHIO_c = .data:0x803C3330; // type:object size:0xC scope:global align:4 -__vt__23dSvBit_childItZoneHIO_c = .data:0x803C333C; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childItDungeonHIO_c = .data:0x803C3348; // type:object size:0xC scope:global align:4 -__vt__29dSvBit_childItPerfectionHIO_c = .data:0x803C3354; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childSwOneZoneHIO_c = .data:0x803C3360; // type:object size:0xC scope:global align:4 -__vt__23dSvBit_childSwZoneHIO_c = .data:0x803C336C; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childSwDungeonHIO_c = .data:0x803C3378; // type:object size:0xC scope:global align:4 -__vt__29dSvBit_childSwPerfectionHIO_c = .data:0x803C3384; // type:object size:0xC scope:global align:4 -__vt__25dSvBit_childTreasureHIO_c = .data:0x803C3390; // type:object size:0xC scope:global align:4 -__vt__21dSvBit_childItemHIO_c = .data:0x803C339C; // type:object size:0xC scope:global align:4 -__vt__23dSvBit_childSwitchHIO_c = .data:0x803C33A8; // type:object size:0xC scope:global align:4 -__vt__12dSvBit_HIO_c = .data:0x803C33B4; // type:object size:0xC scope:global align:4 +__vt__22dSvBit_childOtherHIO_c = .data:0x803C3300; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childTransformHIO_c = .data:0x803C330C; // type:object size:0xC scope:weak align:4 +__vt__25dSvBit_childDarknessHIO_c = .data:0x803C3318; // type:object size:0xC scope:weak align:4 +__vt__29dSvBit_childTbPerfectionHIO_c = .data:0x803C3324; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childItOneZoneHIO_c = .data:0x803C3330; // type:object size:0xC scope:weak align:4 +__vt__23dSvBit_childItZoneHIO_c = .data:0x803C333C; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childItDungeonHIO_c = .data:0x803C3348; // type:object size:0xC scope:weak align:4 +__vt__29dSvBit_childItPerfectionHIO_c = .data:0x803C3354; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childSwOneZoneHIO_c = .data:0x803C3360; // type:object size:0xC scope:weak align:4 +__vt__23dSvBit_childSwZoneHIO_c = .data:0x803C336C; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childSwDungeonHIO_c = .data:0x803C3378; // type:object size:0xC scope:weak align:4 +__vt__29dSvBit_childSwPerfectionHIO_c = .data:0x803C3384; // type:object size:0xC scope:weak align:4 +__vt__25dSvBit_childTreasureHIO_c = .data:0x803C3390; // type:object size:0xC scope:weak align:4 +__vt__21dSvBit_childItemHIO_c = .data:0x803C339C; // type:object size:0xC scope:weak align:4 +__vt__23dSvBit_childSwitchHIO_c = .data:0x803C33A8; // type:object size:0xC scope:weak align:4 +__vt__12dSvBit_HIO_c = .data:0x803C33B4; // type:object size:0xC scope:weak align:4 @5239 = .data:0x803C33C0; // type:object size:0x24 scope:local align:4 -l_dTimer_Method = .data:0x803C33E4; // type:object size:0x14 scope:global align:4 +l_dTimer_Method = .data:0x803C33E4; // type:object size:0x14 scope:local align:4 g_profile_TIMER = .data:0x803C33F8; // type:object size:0x28 scope:global align:4 __vt__21dDlst_TimerScrnDraw_c = .data:0x803C3420; // type:object size:0x10 scope:global align:4 -l_dkWmark_Method = .data:0x803C3430; // type:object size:0x14 scope:global align:4 +l_dkWmark_Method = .data:0x803C3430; // type:object size:0x14 scope:local align:4 g_profile_WMARK = .data:0x803C3444; // type:object size:0x28 scope:global align:4 -l_dkWpillar_Method = .data:0x803C3470; // type:object size:0x14 scope:global align:4 +l_dkWpillar_Method = .data:0x803C3470; // type:object size:0x14 scope:local align:4 g_profile_WPILLAR = .data:0x803C3484; // type:object size:0x28 scope:global align:4 strings$4165 = .data:0x803C34B0; // type:object size:0x10 scope:local align:4 __vt__20DynamicModuleControl = .data:0x803C34C0; // type:object size:0x34 scope:global align:4 @@ -19777,30 +19792,31 @@ __vt__12cCcD_TriAttr = .data:0x803C366C; // type:object size:0x64 scope:global a __vt__14cCcD_ShapeAttr = .data:0x803C36D0; // type:object size:0x58 scope:global align:4 __vt__9cCcD_Stts = .data:0x803C3728; // type:object size:0x20 scope:global align:4 __vt__4cCcS = .data:0x803C3748; // type:object size:0x30 scope:global align:4 -atntable = .data:0x803C3778; // type:object size:0x802 scope:global align:4 +atntable = .data:0x803C3778; // type:object size:0x802 scope:local align:4 __vt__8cBgS_Chk = .data:0x803C3F80; // type:object size:0xC scope:global align:4 __vt__11cBgS_GndChk = .data:0x803C3F90; // type:object size:0x18 scope:global align:4 __vt__11cBgS_LinChk = .data:0x803C3FA8; // type:object size:0x18 scope:global align:4 __vt__13cBgS_ShdwDraw = .data:0x803C3FC0; // type:object size:0xC scope:global align:4 __vt__13cBgS_PolyInfo = .data:0x803C3FD0; // type:object size:0xC scope:global align:4 __vt__8cM3dGCir = .data:0x803C3FE0; // type:object size:0xC scope:global align:4 -__vt__8cM2dGCir = .data:0x803C3FEC; // type:object size:0xC scope:global align:4 +__vt__8cM2dGCir = .data:0x803C3FEC; // type:object size:0xC scope:weak align:4 __vt__8cM3dGCps = .data:0x803C3FF8; // type:object size:0xC scope:global align:4 -e_mtx = .data:0x803C4020; // type:object size:0x30 scope:global align:32 -clear_z_TX = .data:0x803C4060; // type:object size:0x40 scope:global align:32 +e_mtx = .data:0x803C4020; // type:object size:0x30 scope:local align:32 +clear_z_TX = .data:0x803C4060; // type:object size:0x40 scope:local align:32 __vt__10JFWDisplay = .data:0x803C40A0; // type:object size:0x18 scope:global align:4 -jpa_pos = .data:0x803C40C0; // type:object size:0x144 scope:global align:32 -jpa_crd = .data:0x803C4220; // type:object size:0x20 scope:global align:4 +jpa_pos = .data:0x803C40C0; // type:object size:0x144 scope:local align:32 +jpa_crd = .data:0x803C4220; // type:object size:0x20 scope:local align:4 @2829 = .data:0x803C4240; // type:object size:0x2C scope:local align:4 @2828 = .data:0x803C426C; // type:object size:0x2C scope:local align:4 @3454 = .data:0x803C4298; // type:object size:0x2C scope:local align:4 +jpa_resource_padding = .data:0x803C42C4; // type:object size:0x1C scope:local ...data.0 = .data:0x803C42E0; // type:label scope:local -jpa_dl = .data:0x803C42E0; // type:object size:0x20 scope:global align:4 -jpa_dl_x = .data:0x803C4300; // type:object size:0x20 scope:global align:4 -p_prj = .data:0x803C4320; // type:object size:0xC scope:global align:4 -p_direction = .data:0x803C432C; // type:object size:0x14 scope:global align:4 -p_rot = .data:0x803C4340; // type:object size:0x14 scope:global align:4 -p_plane = .data:0x803C4354; // type:object size:0xC scope:global align:4 +jpa_dl = .data:0x803C42E0; // type:object size:0x20 scope:local align:4 +jpa_dl_x = .data:0x803C4300; // type:object size:0x20 scope:local align:4 +p_prj = .data:0x803C4320; // type:object size:0xC scope:local align:4 +p_direction = .data:0x803C432C; // type:object size:0x14 scope:local align:4 +p_rot = .data:0x803C4340; // type:object size:0x14 scope:local align:4 +p_plane = .data:0x803C4354; // type:object size:0xC scope:local align:4 st_bm__12JPABaseShape = .data:0x803C4360; // type:object size:0xC scope:global align:4 st_bf__12JPABaseShape = .data:0x803C436C; // type:object size:0x28 scope:global align:4 st_lo__12JPABaseShape = .data:0x803C4394; // type:object size:0x40 scope:global align:4 @@ -19810,7 +19826,7 @@ st_ca__12JPABaseShape = .data:0x803C4404; // type:object size:0x60 scope:global st_aa__12JPABaseShape = .data:0x803C4464; // type:object size:0x20 scope:global align:4 @2631 = .data:0x803C4488; // type:object size:0x1C scope:local align:4 @3259 = .data:0x803C44A8; // type:object size:0x24 scope:local align:4 -__vt__12JPAFieldBase = .data:0x803C44CC; // type:object size:0x14 scope:global align:4 +__vt__12JPAFieldBase = .data:0x803C44CC; // type:object size:0x14 scope:weak align:4 __vt__12JPAFieldSpin = .data:0x803C44E0; // type:object size:0x14 scope:global align:4 __vt__12JPAFieldDrag = .data:0x803C44F4; // type:object size:0x14 scope:global align:4 __vt__14JPAFieldRandom = .data:0x803C4508; // type:object size:0x14 scope:global align:4 @@ -19829,18 +19845,18 @@ __vt__Q26JStage6TLight = .data:0x803C4778; // type:object size:0x6C scope:global __vt__Q26JStage7TObject = .data:0x803C47E8; // type:object size:0x3C scope:global align:4 __vt__Q26JStage7TSystem = .data:0x803C4828; // type:object size:0x50 scope:global align:4 __vt__Q37JStudio3ctb6TParse = .data:0x803C4878; // type:object size:0x14 scope:global align:4 -__vt__Q37JGadget6binary19TParse_header_block = .data:0x803C488C; // type:object size:0x14 scope:global align:4 +__vt__Q37JGadget6binary19TParse_header_block = .data:0x803C488C; // type:object size:0x14 scope:weak align:4 __vt__Q37JStudio3ctb8TFactory = .data:0x803C48A0; // type:object size:0x14 scope:global align:4 __vt__Q37JStudio3ctb8TControl = .data:0x803C48B4; // type:object size:0xC scope:global align:4 __vt__Q37JStudio3ctb14TObject_TxyzRy = .data:0x803C48C0; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio3ctb7TObject = .data:0x803C48D0; // type:object size:0x10 scope:global align:4 +__vt__Q37JStudio3ctb7TObject = .data:0x803C48D0; // type:object size:0x10 scope:weak align:4 __vt__Q27JStudio22TFunctionValue_hermite = .data:0x803C48E0; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio29TFunctionValue_list_parameter = .data:0x803C4900; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio19TFunctionValue_list = .data:0x803C4920; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio25TFunctionValue_transition = .data:0x803C4940; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio23TFunctionValue_constant = .data:0x803C4960; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio24TFunctionValue_composite = .data:0x803C4980; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TFunctionValue = .data:0x803C49A0; // type:object size:0x20 scope:global align:4 +__vt__Q27JStudio14TFunctionValue = .data:0x803C49A0; // type:object size:0x20 scope:weak align:4 @838 = .data:0x803C49C0; // type:object size:0x5C scope:local align:4 __vt__Q37JStudio3fvb6TParse = .data:0x803C4A1C; // type:object size:0x14 scope:global align:4 __vt__Q37JStudio3fvb8TFactory = .data:0x803C4A30; // type:object size:0x14 scope:global align:4 @@ -19851,7 +19867,7 @@ __vt__Q37JStudio3fvb12TObject_list = .data:0x803C4A70; // type:object size:0x10 __vt__Q37JStudio3fvb18TObject_transition = .data:0x803C4A80; // type:object size:0x10 scope:global align:4 __vt__Q37JStudio3fvb16TObject_constant = .data:0x803C4A90; // type:object size:0x10 scope:global align:4 __vt__Q37JStudio3fvb17TObject_composite = .data:0x803C4AA0; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio3fvb7TObject = .data:0x803C4AB0; // type:object size:0x10 scope:global align:4 +__vt__Q37JStudio3fvb7TObject = .data:0x803C4AB0; // type:object size:0x10 scope:weak align:4 __vt__Q27JStudio6TParse = .data:0x803C4AC0; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio8TFactory = .data:0x803C4AE0; // type:object size:0x14 scope:global align:4 __vt__Q27JStudio8TControl = .data:0x803C4AF4; // type:object size:0xC scope:global align:4 @@ -19922,33 +19938,33 @@ __vt__Q27JStudio8TControl = .data:0x803C4AF4; // type:object size:0xC scope:glob @1800 = .data:0x803C5224; // type:object size:0xC scope:local align:4 @1831 = .data:0x803C5230; // type:object size:0x10C scope:local align:4 __vt__Q27JStudio13TObject_sound = .data:0x803C533C; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TAdaptor_sound = .data:0x803C535C; // type:object size:0x50 scope:global align:4 +__vt__Q27JStudio14TAdaptor_sound = .data:0x803C535C; // type:object size:0x50 scope:weak align:4 __vt__Q27JStudio16TObject_particle = .data:0x803C53AC; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio17TAdaptor_particle = .data:0x803C53CC; // type:object size:0x4C scope:global align:4 +__vt__Q27JStudio17TAdaptor_particle = .data:0x803C53CC; // type:object size:0x4C scope:weak align:4 __vt__Q27JStudio15TObject_message = .data:0x803C5418; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio13TObject_light = .data:0x803C545C; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TAdaptor_light = .data:0x803C547C; // type:object size:0x28 scope:global align:4 +__vt__Q27JStudio14TAdaptor_light = .data:0x803C547C; // type:object size:0x28 scope:weak align:4 __vt__Q27JStudio11TObject_fog = .data:0x803C54A4; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio12TAdaptor_fog = .data:0x803C54C4; // type:object size:0x20 scope:global align:4 +__vt__Q27JStudio12TAdaptor_fog = .data:0x803C54C4; // type:object size:0x20 scope:weak align:4 __vt__Q27JStudio14TObject_camera = .data:0x803C54E4; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio15TAdaptor_camera = .data:0x803C5504; // type:object size:0x3C scope:global align:4 +__vt__Q27JStudio15TAdaptor_camera = .data:0x803C5504; // type:object size:0x3C scope:weak align:4 __vt__Q27JStudio20TObject_ambientLight = .data:0x803C5540; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio21TAdaptor_ambientLight = .data:0x803C5560; // type:object size:0x20 scope:global align:4 +__vt__Q27JStudio21TAdaptor_ambientLight = .data:0x803C5560; // type:object size:0x20 scope:weak align:4 __vt__Q27JStudio13TObject_actor = .data:0x803C5580; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TAdaptor_actor = .data:0x803C55A0; // type:object size:0x50 scope:global align:4 +__vt__Q27JStudio14TAdaptor_actor = .data:0x803C55A0; // type:object size:0x50 scope:weak align:4 __vt__Q27JStudio7TObject = .data:0x803C55F0; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio8TAdaptor = .data:0x803C5610; // type:object size:0x20 scope:global align:4 __vt__Q37JStudio14TVariableValue13TOutput_none_ = .data:0x803C5630; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio14TVariableValue7TOutput = .data:0x803C5640; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C5650; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_ = .data:0x803C5660; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C5670; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_ = .data:0x803C5680; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C5690; // type:object size:0x10 scope:global align:4 +__vt__Q37JStudio14TVariableValue7TOutput = .data:0x803C5640; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C5650; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_ = .data:0x803C5660; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C5670; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_ = .data:0x803C5680; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C5690; // type:object size:0x10 scope:weak align:4 __vt__Q37JStudio3stb6TParse = .data:0x803C56A0; // type:object size:0x20 scope:global align:4 __vt__Q37JStudio3stb8TFactory = .data:0x803C56C0; // type:object size:0x14 scope:global align:4 __vt__Q37JStudio3stb8TControl = .data:0x803C56D4; // type:object size:0xC scope:global align:4 -__vt__Q37JStudio3stb15TObject_control = .data:0x803C56E0; // type:object size:0x20 scope:global align:4 +__vt__Q37JStudio3stb15TObject_control = .data:0x803C56E0; // type:object size:0x20 scope:weak align:4 __vt__Q37JStudio3stb7TObject = .data:0x803C5700; // type:object size:0x20 scope:global align:4 __vt__Q214JStudio_JStage13TCreateObject = .data:0x803C5720; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803C5730; // type:label scope:local @@ -19965,7 +19981,7 @@ __vt__Q214JStudio_JStage13TCreateObject = .data:0x803C5720; // type:object size: @1098 = .data:0x803C57A8; // type:object size:0xC scope:local align:4 __vt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_ = .data:0x803C57B4; // type:object size:0x10 scope:global align:4 __vt__Q214JStudio_JStage14TAdaptor_actor = .data:0x803C57C4; // type:object size:0x50 scope:global align:4 -__vt__Q214JStudio_JStage81TVariableValueOutput_object_ = .data:0x803C5864; // type:object size:0x10 scope:global align:4 +__vt__Q214JStudio_JStage81TVariableValueOutput_object_ = .data:0x803C5864; // type:object size:0x10 scope:weak align:4 __vt__Q214JStudio_JStage21TAdaptor_ambientLight = .data:0x803C5888; // type:object size:0x20 scope:global align:4 ...data.0 = .data:0x803C58A8; // type:label scope:local @1014 = .data:0x803C58A8; // type:object size:0xC scope:local data:4byte @@ -19977,14 +19993,14 @@ __vt__Q214JStudio_JStage21TAdaptor_ambientLight = .data:0x803C5888; // type:obje @1029 = .data:0x803C58F0; // type:object size:0xC scope:local align:4 @1030 = .data:0x803C58FC; // type:object size:0xC scope:local align:4 __vt__Q214JStudio_JStage15TAdaptor_camera = .data:0x803C5908; // type:object size:0x3C scope:global align:4 -__vt__Q214JStudio_JStage83TVariableValueOutput_object_ = .data:0x803C5980; // type:object size:0x10 scope:global align:4 +__vt__Q214JStudio_JStage83TVariableValueOutput_object_ = .data:0x803C5980; // type:object size:0x10 scope:weak align:4 ...data.0 = .data:0x803C59A0; // type:label scope:local @844 = .data:0x803C59A0; // type:object size:0xC scope:local data:4byte @845 = .data:0x803C59AC; // type:object size:0xC scope:local align:4 @849 = .data:0x803C59B8; // type:object size:0xC scope:local align:4 @850 = .data:0x803C59C4; // type:object size:0xC scope:local align:4 __vt__Q214JStudio_JStage12TAdaptor_fog = .data:0x803C59D0; // type:object size:0x20 scope:global align:4 -__vt__Q214JStudio_JStage77TVariableValueOutput_object_ = .data:0x803C5A10; // type:object size:0x10 scope:global align:4 +__vt__Q214JStudio_JStage77TVariableValueOutput_object_ = .data:0x803C5A10; // type:object size:0x10 scope:weak align:4 __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_ = .data:0x803C5A30; // type:object size:0x10 scope:global align:4 __vt__Q214JStudio_JStage14TAdaptor_light = .data:0x803C5A40; // type:object size:0x28 scope:global align:4 __vt__Q215JStudio_JAudio213TCreateObject = .data:0x803C5A68; // type:object size:0x10 scope:global align:4 @@ -20065,29 +20081,29 @@ sExtCmdInfo__12JASSeqParser = .data:0x803C648C; // type:object size:0xFF0 scope: __vt__12JASSeqParser = .data:0x803C7650; // type:object size:0x20 scope:global align:4 @613 = .data:0x803C7670; // type:object size:0x34 scope:local align:4 __vt__12JASBasicBank = .data:0x803C76A8; // type:object size:0x14 scope:global align:4 -__vt__7JASBank = .data:0x803C76BC; // type:object size:0x14 scope:global align:4 +__vt__7JASBank = .data:0x803C76BC; // type:object size:0x14 scope:weak align:4 __vt__12JASVoiceBank = .data:0x803C76D0; // type:object size:0x14 scope:global align:4 __vt__12JASBasicInst = .data:0x803C76E8; // type:object size:0x14 scope:global align:4 -__vt__7JASInst = .data:0x803C76FC; // type:object size:0x14 scope:global align:4 +__vt__7JASInst = .data:0x803C76FC; // type:object size:0x14 scope:weak align:4 __vt__10JASDrumSet = .data:0x803C7710; // type:object size:0x14 scope:global align:4 __vt__Q216JASBasicWaveBank11TWaveHandle = .data:0x803C7728; // type:object size:0x14 scope:global align:4 __vt__Q216JASBasicWaveBank10TWaveGroup = .data:0x803C773C; // type:object size:0x18 scope:global align:4 -__vt__13JASWaveHandle = .data:0x803C7754; // type:object size:0x14 scope:global align:4 +__vt__13JASWaveHandle = .data:0x803C7754; // type:object size:0x14 scope:weak align:4 __vt__16JASBasicWaveBank = .data:0x803C7768; // type:object size:0x18 scope:global align:4 -__vt__11JASWaveBank = .data:0x803C7780; // type:object size:0x18 scope:global align:4 +__vt__11JASWaveBank = .data:0x803C7780; // type:object size:0x18 scope:weak align:4 __vt__Q217JASSimpleWaveBank11TWaveHandle = .data:0x803C7798; // type:object size:0x14 scope:global align:4 __vt__17JASSimpleWaveBank = .data:0x803C77AC; // type:object size:0x30 scope:global align:4 sCurrentDir__16JASWaveArcLoader = .data:0x803C77E0; // type:object size:0x40 scope:global align:4 __vt__10JASWaveArc = .data:0x803C7820; // type:object size:0x18 scope:global align:4 -__vt__11JASDisposer = .data:0x803C7838; // type:object size:0x10 scope:global align:4 +__vt__11JASDisposer = .data:0x803C7838; // type:object size:0x10 scope:weak align:4 @662 = .data:0x803C7848; // type:object size:0x1C scope:local align:4 @977 = .data:0x803C7864; // type:object size:0x20 scope:local align:4 @974 = .data:0x803C7884; // type:object size:0x20 scope:local align:4 -table_list$151 = .data:0x803C78A8; // type:object size:0x10 scope:local align:4 +table_list = .data:0x803C78A8; // type:object size:0x10 scope:local align:4 history$267 = .data:0x803C78B8; // type:object size:0x28 scope:local align:4 data:4byte __vt__14JASAudioThread = .data:0x803C78E0; // type:object size:0x10 scope:global align:4 SEND_TABLE__6JASDsp = .data:0x803C78F0; // type:object size:0x18 scope:global align:4 -jdsp = .data:0x803C7920; // type:object size:0x1F00 scope:global align:32 noreloc +jdsp = .data:0x803C7920; // type:object size:0x1F00 scope:local align:32 noreloc __vt__10JAIAudible = .data:0x803C9820; // type:object size:0x14 scope:global align:4 __vt__11JAIAudience = .data:0x803C9838; // type:object size:0x20 scope:global align:4 __vt__5JAISe = .data:0x803C9858; // type:object size:0x58 scope:global align:4 @@ -20107,9 +20123,9 @@ __vt__16JAIStreamDataMgr = .data:0x803C9A1C; // type:object size:0x10 scope:glob __vt__22JAUAudioArcInterpreter = .data:0x803C9A30; // type:object size:0x44 scope:global align:4 __vt__17JAUAudioArcLoader = .data:0x803C9A78; // type:object size:0x44 scope:global align:4 __vt__14JAUSectionHeap = .data:0x803C9AC0; // type:object size:0x34 scope:global align:4 -__vt__16JAUBankTableLink = .data:0x803C9AF4; // type:object size:0x14 scope:global align:4 -__vt__12JAUBankTable = .data:0x803C9B08; // type:object size:0xC scope:global align:4 -__vt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgr = .data:0x803C9B14; // type:object size:0x10 scope:global align:4 +__vt__16JAUBankTableLink = .data:0x803C9AF4; // type:object size:0x14 scope:weak align:4 +__vt__12JAUBankTable = .data:0x803C9B08; // type:object size:0xC scope:weak align:4 +__vt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgr = .data:0x803C9B14; // type:object size:0x10 scope:weak align:4 __vt__10JAUSection = .data:0x803C9B24; // type:object size:0x10 scope:global align:4 __vt__27JAUSeqDataMgr_SeqCollection = .data:0x803C9B38; // type:object size:0x18 scope:global align:4 __vt__32JAUStreamDataMgr_StreamFileTable = .data:0x803C9B50; // type:object size:0x10 scope:global align:4 @@ -20122,7 +20138,7 @@ __vt__Q28JMessage10TReference = .data:0x803C9C6C; // type:object size:0x10 scope sapfnParseCharacter___Q28JMessage18TResourceContainer = .data:0x803C9C80; // type:object size:0x14 scope:global align:4 __vt__Q28JMessage6TParse = .data:0x803C9C94; // type:object size:0x14 scope:global align:4 __vt__Q38JMessage18TResourceContainer10TCResource = .data:0x803C9CA8; // type:object size:0x14 scope:global align:4 -__vt__Q27JGadget42TLinkList_factory = .data:0x803C9CBC; // type:object size:0x14 scope:global align:4 +__vt__Q27JGadget42TLinkList_factory = .data:0x803C9CBC; // type:object size:0x14 scope:weak align:4 __vt__16Z2AudioArcLoader = .data:0x803C9CD0; // type:object size:0x44 scope:global align:4 @3690 = .data:0x803C9D18; // type:object size:0x58 scope:local align:4 __vt__10Z2SoundMgr = .data:0x803C9D70; // type:object size:0xC scope:global align:4 @@ -20182,15 +20198,15 @@ __vt__14Z2CreatureLink = .data:0x803CB980; // type:object size:0x48 scope:global @5074 = .data:0x803CBBC8; // type:object size:0x28 scope:local align:4 @5259 = .data:0x803CBBF0; // type:object size:0x38 scope:local align:4 @5258 = .data:0x803CBC28; // type:object size:0x28 scope:local align:4 -sHowlUmakusa = .data:0x803CBC50; // type:object size:0xC scope:global align:4 -sHowlZeldaSong = .data:0x803CBC5C; // type:object size:0xC scope:global align:4 -sHowlLightPrelude = .data:0x803CBC68; // type:object size:0xC scope:global align:4 -sHowlSoulRequiem = .data:0x803CBC74; // type:object size:0xC scope:global align:4 -sHealingSong = .data:0x803CBC80; // type:object size:0xC scope:global align:4 -sNewSong1 = .data:0x803CBC8C; // type:object size:0xE scope:global align:4 -sNewSong2 = .data:0x803CBC9C; // type:object size:0x10 scope:global align:4 -sNewSong3 = .data:0x803CBCAC; // type:object size:0x12 scope:global align:4 -sGuideData = .data:0x803CBCC0; // type:object size:0x48 scope:global align:4 +sHowlUmakusa = .data:0x803CBC50; // type:object size:0xC scope:local align:4 +sHowlZeldaSong = .data:0x803CBC5C; // type:object size:0xC scope:local align:4 +sHowlLightPrelude = .data:0x803CBC68; // type:object size:0xC scope:local align:4 +sHowlSoulRequiem = .data:0x803CBC74; // type:object size:0xC scope:local align:4 +sHealingSong = .data:0x803CBC80; // type:object size:0xC scope:local align:4 +sNewSong1 = .data:0x803CBC8C; // type:object size:0xE scope:local align:4 +sNewSong2 = .data:0x803CBC9C; // type:object size:0x10 scope:local align:4 +sNewSong3 = .data:0x803CBCAC; // type:object size:0x12 scope:local align:4 +sGuideData = .data:0x803CBCC0; // type:object size:0x48 scope:local align:4 @3729 = .data:0x803CBD08; // type:object size:0x1C8 scope:local align:4 @3839 = .data:0x803CBED0; // type:object size:0x54 scope:local align:4 __vt__15Z2SpeechStarter = .data:0x803CBF24; // type:object size:0x14 scope:global align:4 @@ -20215,11 +20231,11 @@ __vt__13JKRAramStream = .data:0x803CC1B8; // type:object size:0x10 scope:global __vt__13JKRFileLoader = .data:0x803CC1C8; // type:object size:0x3C scope:global align:4 __vt__12JKRDvdFinder = .data:0x803CC208; // type:object size:0x10 scope:global align:4 __vt__12JKRArcFinder = .data:0x803CC218; // type:object size:0x10 scope:global align:4 -__vt__13JKRFileFinder = .data:0x803CC228; // type:object size:0x10 scope:global align:4 +__vt__13JKRFileFinder = .data:0x803CC228; // type:object size:0x10 scope:weak align:4 __vt__12JKRFileCache = .data:0x803CC238; // type:object size:0x4C scope:global align:4 __vt__10JKRArchive = .data:0x803CC288; // type:object size:0x50 scope:global align:4 __vt__13JKRMemArchive = .data:0x803CC2D8; // type:object size:0x50 scope:global align:4 -__vt__7JKRFile = .data:0x803CC328; // type:object size:0x20 scope:global align:4 +__vt__7JKRFile = .data:0x803CC328; // type:object size:0x20 scope:weak align:4 __vt__14JKRAramArchive = .data:0x803CC348; // type:object size:0x50 scope:global align:4 __vt__13JKRDvdArchive = .data:0x803CC398; // type:object size:0x50 scope:global align:4 __vt__14JKRCompArchive = .data:0x803CC3E8; // type:object size:0x50 scope:global align:4 @@ -20235,17 +20251,17 @@ __vt__12JUTCacheFont = .data:0x803CC540; // type:object size:0x4C scope:global a __vt__12JUTGraphFifo = .data:0x803CC590; // type:object size:0xC scope:global align:4 __vt__10JUTResFont = .data:0x803CC5A0; // type:object size:0x4C scope:global align:4 sChannelMask__Q210JUTGamePad7CRumble = .data:0x803CC5F0; // type:object size:0x10 scope:global align:4 -channel_mask = .data:0x803CC600; // type:object size:0x10 scope:global align:4 +channel_mask = .data:0x803CC600; // type:object size:0x10 scope:local align:4 __vt__10JUTGamePad = .data:0x803CC610; // type:object size:0xC scope:global align:4 sMessageQueue__12JUTException = .data:0x803CC620; // type:object size:0x20 scope:global align:4 -c3bcnt = .data:0x803CC640; // type:object size:0x20 scope:global align:8 data:4byte +c3bcnt = .data:0x803CC640; // type:object size:0x20 scope:local align:8 data:4byte sCpuExpName__12JUTException = .data:0x803CC660; // type:object size:0x44 scope:global align:4 __vt__12JUTException = .data:0x803CC6A4; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803CC6B8; // type:label scope:local sAsciiTable__14JUTDirectPrint = .data:0x803CC6B8; // type:object size:0x80 scope:global align:4 sFontData__14JUTDirectPrint = .data:0x803CC738; // type:object size:0x100 scope:global align:4 noreloc sFontData2__14JUTDirectPrint = .data:0x803CC838; // type:object size:0x134 scope:global align:4 noreloc -twiceBit$371 = .data:0x803CC96C; // type:object size:0x10 scope:local align:4 +twiceBit = .data:0x803CC96C; // type:object size:0x10 scope:local align:4 __vt__8JUTVideo = .data:0x803CC980; // type:object size:0xC scope:global align:4 __vt__8JUTFader = .data:0x803CC990; // type:object size:0x18 scope:global align:4 __vt__10JUTConsole = .data:0x803CC9A8; // type:object size:0xC scope:global align:4 @@ -20276,9 +20292,9 @@ __vt__12J2DPictureEx = .data:0x803CD4B8; // type:object size:0x14C scope:global __vt__12J2DTextBoxEx = .data:0x803CD608; // type:object size:0xBC scope:global align:4 __vt__20J2DAnmFullLoader_v15 = .data:0x803CD6C8; // type:object size:0x14 scope:global align:4 __vt__19J2DAnmKeyLoader_v15 = .data:0x803CD6DC; // type:object size:0x14 scope:global align:4 -__vt__12J2DAnmLoader = .data:0x803CD6F0; // type:object size:0x14 scope:global align:4 -__vt__20J2DAnmVisibilityFull = .data:0x803CD704; // type:object size:0x10 scope:global align:4 -__vt__14J2DAnmVtxColor = .data:0x803CD714; // type:object size:0x14 scope:global align:4 +__vt__12J2DAnmLoader = .data:0x803CD6F0; // type:object size:0x14 scope:weak align:4 +__vt__20J2DAnmVisibilityFull = .data:0x803CD704; // type:object size:0x10 scope:weak align:4 +__vt__14J2DAnmVtxColor = .data:0x803CD714; // type:object size:0x14 scope:weak align:4 __vt__15J2DAnmTevRegKey = .data:0x803CD728; // type:object size:0x10 scope:global align:4 __vt__16J2DAnmTexPattern = .data:0x803CD738; // type:object size:0x10 scope:global align:4 __vt__19J2DAnmTextureSRTKey = .data:0x803CD748; // type:object size:0x10 scope:global align:4 @@ -20292,12 +20308,12 @@ __vt__19J2DAnmTransformFull = .data:0x803CD7D4; // type:object size:0x14 scope:g @899 = .data:0x803CD7E8; // type:object size:0x44 scope:local align:4 @951 = .data:0x803CD82C; // type:object size:0x54 scope:local align:4 c2r$1302 = .data:0x803CD880; // type:object size:0x10 scope:local align:4 -NullTexData = .data:0x803CD8A0; // type:object size:0x10 scope:global align:4 -j3dIdentityMtx = .data:0x803CD8B0; // type:object size:0x30 scope:global align:4 -IndMtx = .data:0x803CD8E0; // type:object size:0x18 scope:global align:4 +NullTexData = .data:0x803CD8A0; // type:object size:0x10 scope:local align:4 +j3dIdentityMtx = .data:0x803CD8B0; // type:object size:0x30 scope:local align:4 +IndMtx = .data:0x803CD8E0; // type:object size:0x18 scope:local align:4 PSMulUnit01 = .data:0x803CD8F8; // type:object size:0x8 scope:global align:4 -sDifferedRegister = .data:0x803CD900; // type:object size:0x20 scope:global align:4 -sSizeOfDiffered = .data:0x803CD920; // type:object size:0x20 scope:global align:4 +sDifferedRegister = .data:0x803CD900; // type:object size:0x20 scope:local align:4 +sSizeOfDiffered = .data:0x803CD920; // type:object size:0x20 scope:local align:4 __vt__14J3DShapePacket = .data:0x803CD940; // type:object size:0x14 scope:global align:4 __vt__12J3DMatPacket = .data:0x803CD954; // type:object size:0x14 scope:global align:4 __vt__13J3DDrawPacket = .data:0x803CD968; // type:object size:0x14 scope:global align:4 @@ -20334,11 +20350,11 @@ __vt__8J3DShape = .data:0x803CDC78; // type:object size:0x18 scope:global align: __vt__17J3DLockedMaterial = .data:0x803CDC90; // type:object size:0x30 scope:global align:4 __vt__18J3DPatchedMaterial = .data:0x803CDCC0; // type:object size:0x30 scope:global align:4 __vt__11J3DMaterial = .data:0x803CDCF0; // type:object size:0x30 scope:global align:4 -__vt__10J3DPEBlock = .data:0x803CDD20; // type:object size:0x7C scope:global align:4 -__vt__15J3DIndBlockNull = .data:0x803CDD9C; // type:object size:0x4C scope:global align:4 -__vt__11J3DIndBlock = .data:0x803CDDE8; // type:object size:0x4C scope:global align:4 -__vt__14J3DTexGenBlock = .data:0x803CDE34; // type:object size:0x6C scope:global align:4 -__vt__13J3DColorBlock = .data:0x803CDEA0; // type:object size:0x90 scope:global align:4 +__vt__10J3DPEBlock = .data:0x803CDD20; // type:object size:0x7C scope:weak align:4 +__vt__15J3DIndBlockNull = .data:0x803CDD9C; // type:object size:0x4C scope:weak align:4 +__vt__11J3DIndBlock = .data:0x803CDDE8; // type:object size:0x4C scope:weak align:4 +__vt__14J3DTexGenBlock = .data:0x803CDE34; // type:object size:0x6C scope:weak align:4 +__vt__13J3DColorBlock = .data:0x803CDEA0; // type:object size:0x90 scope:weak align:4 @5062 = .data:0x803CDF30; // type:object size:0x30 scope:local align:4 @5110 = .data:0x803CDF60; // type:object size:0x30 scope:local align:4 @5150 = .data:0x803CDF90; // type:object size:0x30 scope:local align:4 @@ -20380,43 +20396,43 @@ sortFuncTable__13J3DDrawBuffer = .data:0x803CEC30; // type:object size:0x48 scop drawFuncTable__13J3DDrawBuffer = .data:0x803CEC90; // type:object size:0x18 scope:global align:4 data:4byte @871 = .data:0x803CECA8; // type:object size:0x4C scope:local align:4 __vt__12J3DJointTree = .data:0x803CECF4; // type:object size:0x10 scope:global align:4 -__vt__13J3DShapeTable = .data:0x803CED08; // type:object size:0xC scope:global align:4 -__vt__12J3DModelData = .data:0x803CED14; // type:object size:0xC scope:global align:4 +__vt__13J3DShapeTable = .data:0x803CED08; // type:object size:0xC scope:weak align:4 +__vt__12J3DModelData = .data:0x803CED14; // type:object size:0xC scope:weak align:4 __vt__8J3DModel = .data:0x803CED20; // type:object size:0x24 scope:global align:4 -__vt__12J3DMtxBuffer = .data:0x803CED44; // type:object size:0xC scope:global align:4 -__vt__16J3DAnmTexPattern = .data:0x803CED50; // type:object size:0x10 scope:global align:4 -__vt__15J3DAnmTevRegKey = .data:0x803CED60; // type:object size:0x10 scope:global align:4 +__vt__12J3DMtxBuffer = .data:0x803CED44; // type:object size:0xC scope:weak align:4 +__vt__16J3DAnmTexPattern = .data:0x803CED50; // type:object size:0x10 scope:weak align:4 +__vt__15J3DAnmTevRegKey = .data:0x803CED60; // type:object size:0x10 scope:weak align:4 __vt__14J3DAnmColorKey = .data:0x803CED70; // type:object size:0x14 scope:global align:4 __vt__15J3DAnmColorFull = .data:0x803CED84; // type:object size:0x14 scope:global align:4 -__vt__11J3DAnmColor = .data:0x803CED98; // type:object size:0x14 scope:global align:4 +__vt__11J3DAnmColor = .data:0x803CED98; // type:object size:0x14 scope:weak align:4 __vt__17J3DAnmVtxColorKey = .data:0x803CEDAC; // type:object size:0x14 scope:global align:4 __vt__18J3DAnmVtxColorFull = .data:0x803CEDC0; // type:object size:0x14 scope:global align:4 -__vt__14J3DAnmVtxColor = .data:0x803CEDD4; // type:object size:0x14 scope:global align:4 +__vt__14J3DAnmVtxColor = .data:0x803CEDD4; // type:object size:0x14 scope:weak align:4 __vt__16J3DAnmClusterKey = .data:0x803CEDE8; // type:object size:0x14 scope:global align:4 -__vt__13J3DAnmCluster = .data:0x803CEDFC; // type:object size:0x14 scope:global align:4 +__vt__13J3DAnmCluster = .data:0x803CEDFC; // type:object size:0x14 scope:weak align:4 __vt__17J3DAnmClusterFull = .data:0x803CEE10; // type:object size:0x14 scope:global align:4 -__vt__19J3DAnmTextureSRTKey = .data:0x803CEE24; // type:object size:0x10 scope:global align:4 +__vt__19J3DAnmTextureSRTKey = .data:0x803CEE24; // type:object size:0x10 scope:weak align:4 __vt__27J3DAnmTransformFullWithLerp = .data:0x803CEE34; // type:object size:0x14 scope:global align:4 __vt__19J3DAnmTransformFull = .data:0x803CEE48; // type:object size:0x14 scope:global align:4 __vt__14J3DMaterialAnm = .data:0x803CEE60; // type:object size:0x10 scope:global align:4 __vt__13J3DSkinDeform = .data:0x803CEE70; // type:object size:0x10 scope:global align:4 __vt__16J3DMaterialTable = .data:0x803CEE80; // type:object size:0xC scope:global align:4 -__vt__14J3DPEBlockNull = .data:0x803CEE90; // type:object size:0x7C scope:global align:4 -__vt__15J3DTevBlockNull = .data:0x803CEF0C; // type:object size:0xDC scope:global align:4 -__vt__18J3DTexGenBlockNull = .data:0x803CEFE8; // type:object size:0x6C scope:global align:4 -__vt__17J3DColorBlockNull = .data:0x803CF054; // type:object size:0x90 scope:global align:4 +__vt__14J3DPEBlockNull = .data:0x803CEE90; // type:object size:0x7C scope:weak align:4 +__vt__15J3DTevBlockNull = .data:0x803CEF0C; // type:object size:0xDC scope:weak align:4 +__vt__18J3DTexGenBlockNull = .data:0x803CEFE8; // type:object size:0x6C scope:weak align:4 +__vt__17J3DColorBlockNull = .data:0x803CF054; // type:object size:0x90 scope:weak align:4 __vt__20J3DClusterLoader_v15 = .data:0x803CF0E8; // type:object size:0x10 scope:global align:4 -__vt__16J3DClusterLoader = .data:0x803CF0F8; // type:object size:0x10 scope:global align:4 +__vt__16J3DClusterLoader = .data:0x803CF0F8; // type:object size:0x10 scope:weak align:4 __vt__18J3DModelLoader_v21 = .data:0x803CF108; // type:object size:0x44 scope:global align:4 __vt__18J3DModelLoader_v26 = .data:0x803CF14C; // type:object size:0x44 scope:global align:4 -__vt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage> = .data:0x803CF190; // type:object size:0x2C scope:global align:4 -__vt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic> = .data:0x803CF1BC; // type:object size:0x2C scope:global align:4 -__vt__10J3DTexture = .data:0x803CF1E8; // type:object size:0xC scope:global align:4 +__vt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage> = .data:0x803CF190; // type:object size:0x2C scope:weak align:4 +__vt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic> = .data:0x803CF1BC; // type:object size:0x2C scope:weak align:4 +__vt__10J3DTexture = .data:0x803CF1E8; // type:object size:0xC scope:weak align:4 __vt__14J3DModelLoader = .data:0x803CF1F4; // type:object size:0x44 scope:global align:4 __vt__19J3DAnmKeyLoader_v15 = .data:0x803CF238; // type:object size:0x14 scope:global align:4 __vt__20J3DAnmFullLoader_v15 = .data:0x803CF24C; // type:object size:0x14 scope:global align:4 -__vt__12J3DAnmLoader = .data:0x803CF260; // type:object size:0x14 scope:global align:4 -__vt__20J3DAnmVisibilityFull = .data:0x803CF274; // type:object size:0x10 scope:global align:4 +__vt__12J3DAnmLoader = .data:0x803CF260; // type:object size:0x14 scope:weak align:4 +__vt__20J3DAnmVisibilityFull = .data:0x803CF274; // type:object size:0x10 scope:weak align:4 ...data.0 = .data:0x803CF288; // type:label scope:local @1 = .data:0x803CF288; // type:object size:0x44 scope:local data:string @105 = .data:0x803CF2CC; // type:object size:0xD scope:local align:4 data:string @@ -20432,13 +20448,13 @@ __vt__20J3DAnmVisibilityFull = .data:0x803CF274; // type:object size:0x10 scope: @115 = .data:0x803CF368; // type:object size:0x19 scope:local align:4 data:string @117 = .data:0x803CF384; // type:object size:0xE scope:local align:4 data:string @118 = .data:0x803CF394; // type:object size:0x15 scope:local align:4 data:string -__OSExceptionLocations = .data:0x803CF3AC; // type:object size:0x3C scope:global align:4 +__OSExceptionLocations = .data:0x803CF3AC; // type:object size:0x3C scope:local align:4 @152 = .data:0x803CF3E8; // type:object size:0x1B scope:local align:4 data:string @153 = .data:0x803CF404; // type:object size:0x2E scope:local align:4 data:string @154 = .data:0x803CF434; // type:object size:0x2F scope:local align:4 data:string @155 = .data:0x803CF464; // type:object size:0x1B scope:local align:4 data:string ResetFunctionInfo = .data:0x803CF480; // type:object size:0x10 scope:local align:4 -DSPInitCode = .data:0x803CF490; // type:object size:0x80 scope:global align:4 +DSPInitCode = .data:0x803CF490; // type:object size:0x80 scope:local align:4 ...data.0 = .data:0x803CF510; // type:label scope:local @63 = .data:0x803CF510; // type:object size:0x29 scope:local data:string @84 = .data:0x803CF53C; // type:object size:0x18 scope:local align:4 data:string @@ -20486,9 +20502,9 @@ DSPInitCode = .data:0x803CF490; // type:object size:0x80 scope:global align:4 @86 = .data:0x803CFBBC; // type:object size:0x35 scope:local align:4 data:string @87 = .data:0x803CFBF4; // type:object size:0x40 scope:local align:4 @115 = .data:0x803CFC38; // type:object size:0xB scope:local align:4 data:string -HankakuToCode = .data:0x803CFC48; // type:object size:0x180 scope:global align:4 -Zenkaku2Code = .data:0x803CFDC8; // type:object size:0x98A scope:global align:4 -InterruptPrioTable = .data:0x803D0758; // type:object size:0x2C scope:global align:4 data:4byte +HankakuToCode = .data:0x803CFC48; // type:object size:0x180 scope:local align:4 +Zenkaku2Code = .data:0x803CFDC8; // type:object size:0x98A scope:local align:4 +InterruptPrioTable = .data:0x803D0758; // type:object size:0x2C scope:local align:4 data:4byte @62 = .data:0x803D0788; // type:object size:0x25 scope:local align:4 data:string @189 = .data:0x803D07B0; // type:object size:0x27 scope:local align:4 data:string ResetFunctionInfo = .data:0x803D07D8; // type:object size:0x10 scope:local align:4 @@ -20519,8 +20535,8 @@ ResetFunctionInfo = .data:0x803D07D8; // type:object size:0x10 scope:local align @854 = .data:0x803D0F58; // type:object size:0x67 scope:local align:4 data:string @855 = .data:0x803D0FC0; // type:object size:0x45 scope:local align:4 data:string @856 = .data:0x803D1008; // type:object size:0x3D scope:local align:4 data:string -YearDays = .data:0x803D1048; // type:object size:0x30 scope:global align:4 -LeapYearDays = .data:0x803D1078; // type:object size:0x30 scope:global align:4 +YearDays = .data:0x803D1048; // type:object size:0x30 scope:local align:4 +LeapYearDays = .data:0x803D1078; // type:object size:0x30 scope:local align:4 ...data.0 = .data:0x803D10A8; // type:label scope:local @1 = .data:0x803D10A8; // type:object size:0x45 scope:local data:string @473 = .data:0x803D10F0; // type:object size:0xF scope:local align:4 data:string @@ -20537,7 +20553,7 @@ LeapYearDays = .data:0x803D1078; // type:object size:0x30 scope:global align:4 @490 = .data:0x803D11A4; // type:object size:0xE scope:local align:4 data:string ...data.0 = .data:0x803D11B8; // type:label scope:local @1 = .data:0x803D11B8; // type:object size:0x44 scope:local data:string -Si = .data:0x803D11FC; // type:object size:0x14 scope:global align:4 data:4byte +Si = .data:0x803D11FC; // type:object size:0x14 scope:local align:4 data:4byte Type = .data:0x803D1210; // type:object size:0x10 scope:local align:4 @457 = .data:0x803D1220; // type:object size:0xC scope:local align:4 data:string @459 = .data:0x803D122C; // type:object size:0xF scope:local align:4 data:string @@ -20551,8 +20567,8 @@ Type = .data:0x803D1210; // type:object size:0x10 scope:local align:4 @467 = .data:0x803D12B4; // type:object size:0x9 scope:local align:4 data:string @468 = .data:0x803D12C0; // type:object size:0x9 scope:local align:4 data:string ...data.0 = .data:0x803D12D0; // type:label scope:local -XYNTSC = .data:0x803D12D0; // type:object size:0x30 scope:global align:4 -XYPAL = .data:0x803D1300; // type:object size:0x30 scope:global align:4 +XYNTSC = .data:0x803D12D0; // type:object size:0x30 scope:local align:4 +XYPAL = .data:0x803D1300; // type:object size:0x30 scope:local align:4 @16 = .data:0x803D1330; // type:object size:0x33 scope:local align:4 data:string @9 = .data:0x803D1368; // type:object size:0x18 scope:local align:4 data:string @119 = .data:0x803D1380; // type:object size:0xC8 scope:local align:4 data:string @@ -20565,11 +20581,11 @@ XYPAL = .data:0x803D1300; // type:object size:0x30 scope:global align:4 @18 = .data:0x803D1568; // type:object size:0xA scope:local align:4 data:string @24 = .data:0x803D1574; // type:object size:0x34 scope:local align:4 data:string @359 = .data:0x803D15A8; // type:object size:0x44 scope:local align:4 -ImmCommand = .data:0x803D15EC; // type:object size:0xC scope:global align:4 data:4byte +ImmCommand = .data:0x803D15EC; // type:object size:0xC scope:local align:4 data:4byte @789 = .data:0x803D15F8; // type:object size:0x41 scope:local align:4 data:string @956 = .data:0x803D163C; // type:object size:0x34 scope:local align:4 @1060 = .data:0x803D1670; // type:object size:0x34 scope:local align:4 -ErrorTable = .data:0x803D16A8; // type:object size:0x48 scope:global align:4 data:4byte +ErrorTable = .data:0x803D16A8; // type:object size:0x48 scope:local align:4 data:4byte ...data.0 = .data:0x803D16F0; // type:label scope:local @38 = .data:0x803D16F0; // type:object size:0x1A scope:local data:string @39 = .data:0x803D170C; // type:object size:0x16 scope:local align:4 data:string @@ -20578,8 +20594,8 @@ ErrorTable = .data:0x803D16A8; // type:object size:0x48 scope:global align:4 dat @44 = .data:0x803D174C; // type:object size:0x14 scope:local align:4 data:string ...data.0 = .data:0x803D1760; // type:label scope:local @1 = .data:0x803D1760; // type:object size:0x44 scope:local data:string -timing = .data:0x803D17A4; // type:object size:0x17C scope:global align:4 -taps = .data:0x803D1920; // type:object size:0x32 scope:global align:4 +timing = .data:0x803D17A4; // type:object size:0x17C scope:local align:4 +taps = .data:0x803D1920; // type:object size:0x32 scope:local align:4 @101 = .data:0x803D1954; // type:object size:0x7C scope:local align:4 @355 = .data:0x803D19D0; // type:object size:0x29 scope:local align:4 data:string @356 = .data:0x803D19FC; // type:object size:0x29 scope:local align:4 data:string @@ -20614,16 +20630,16 @@ ResetFunctionInfo = .data:0x803D1B90; // type:object size:0x10 scope:local align ...data.0 = .data:0x803D1E38; // type:label scope:local @1 = .data:0x803D1E38; // type:object size:0x46 scope:local data:string ResetFunctionInfo = .data:0x803D1E80; // type:object size:0x10 scope:local align:4 -CardData = .data:0x803D1EA0; // type:object size:0x160 scope:global align:32 -SectorSizeTable = .data:0x803D2000; // type:object size:0x20 scope:global align:4 -LatencyTable = .data:0x803D2020; // type:object size:0x20 scope:global align:4 +CardData = .data:0x803D1EA0; // type:object size:0x160 scope:local align:32 +SectorSizeTable = .data:0x803D2000; // type:object size:0x20 scope:local align:4 +LatencyTable = .data:0x803D2020; // type:object size:0x20 scope:local align:4 ...data.0 = .data:0x803D2040; // type:label scope:local @1 = .data:0x803D2040; // type:object size:0x44 scope:local data:string -DefaultTexData = .data:0x803D20A0; // type:object size:0x20 scope:global align:32 -GXDefaultVATList = .data:0x803D20C0; // type:object size:0xD0 scope:global align:4 -GXDefaultProjData = .data:0x803D2190; // type:object size:0x1C scope:global align:4 -GXTexRegionAddrTable = .data:0x803D21AC; // type:object size:0xC0 scope:global align:4 data:4byte -GXResetFuncInfo = .data:0x803D226C; // type:object size:0x10 scope:global align:4 +DefaultTexData = .data:0x803D20A0; // type:object size:0x20 scope:local align:32 +GXDefaultVATList = .data:0x803D20C0; // type:object size:0xD0 scope:local align:4 +GXDefaultProjData = .data:0x803D2190; // type:object size:0x1C scope:local align:4 +GXTexRegionAddrTable = .data:0x803D21AC; // type:object size:0xC0 scope:local align:4 data:4byte +GXResetFuncInfo = .data:0x803D226C; // type:object size:0x10 scope:local align:4 @176 = .data:0x803D2280; // type:object size:0x68 scope:local align:4 @223 = .data:0x803D22E8; // type:object size:0x68 scope:local align:4 @476 = .data:0x803D2350; // type:object size:0x44 scope:local align:4 @@ -20640,10 +20656,10 @@ GXEurgb60Hz480IntDf = .data:0x803D2538; // type:object size:0x3C scope:global al @145 = .data:0x803D268C; // type:object size:0xF4 scope:local align:4 @224 = .data:0x803D2780; // type:object size:0x3C scope:local align:4 ...data.0 = .data:0x803D27C0; // type:label scope:local -TEVCOpTableST0 = .data:0x803D27C0; // type:object size:0x14 scope:global align:4 -TEVCOpTableST1 = .data:0x803D27D4; // type:object size:0x14 scope:global align:4 -TEVAOpTableST0 = .data:0x803D27E8; // type:object size:0x14 scope:global align:4 -TEVAOpTableST1 = .data:0x803D27FC; // type:object size:0x14 scope:global align:4 +TEVCOpTableST0 = .data:0x803D27C0; // type:object size:0x14 scope:local align:4 +TEVCOpTableST1 = .data:0x803D27D4; // type:object size:0x14 scope:local align:4 +TEVAOpTableST0 = .data:0x803D27E8; // type:object size:0x14 scope:local align:4 +TEVAOpTableST1 = .data:0x803D27FC; // type:object size:0x14 scope:local align:4 c2r$334 = .data:0x803D2810; // type:object size:0x24 scope:local align:4 p2f$358 = .data:0x803D2838; // type:object size:0x20 scope:local align:4 @182 = .data:0x803D2858; // type:object size:0x5C scope:local align:4 @@ -20663,24 +20679,24 @@ __upper_map = .data:0x803D2E18; // type:object size:0x100 scope:global align:4 @499 = .data:0x803D3200; // type:object size:0x1C scope:local align:4 @536 = .data:0x803D321C; // type:object size:0x1C scope:local align:4 gTRKRestoreFlags = .data:0x803D3238; // type:object size:0x9 scope:global align:4 data:byte -gTRKExceptionStatus = .data:0x803D3244; // type:object size:0x10 scope:global align:4 data:4byte -gTRKStepStatus = .data:0x803D3254; // type:object size:0x14 scope:global align:4 data:4byte -TRK_ISR_OFFSETS = .data:0x803D3268; // type:object size:0x3C scope:global align:4 data:4byte +gTRKExceptionStatus = .data:0x803D3244; // type:object size:0x10 scope:local align:4 data:4byte +gTRKStepStatus = .data:0x803D3254; // type:object size:0x14 scope:local align:4 data:4byte +TRK_ISR_OFFSETS = .data:0x803D3268; // type:object size:0x3C scope:local align:4 data:4byte gDBCommTable = .data:0x803D32A8; // type:object size:0x28 scope:global align:4 data:4byte ...bss.0 = .bss:0x803D32E0; // type:label scope:local -RootHeapCheck = .bss:0x803D32E0; // type:object size:0x28 scope:global align:4 data:4byte -SystemHeapCheck = .bss:0x803D3308; // type:object size:0x28 scope:global align:4 data:4byte -ZeldaHeapCheck = .bss:0x803D3330; // type:object size:0x28 scope:global align:4 data:4byte -GameHeapCheck = .bss:0x803D3358; // type:object size:0x28 scope:global align:4 data:4byte -ArchiveHeapCheck = .bss:0x803D3380; // type:object size:0x28 scope:global align:4 data:4byte -J2dHeapCheck = .bss:0x803D33A8; // type:object size:0x28 scope:global align:4 data:4byte -HostioHeapCheck = .bss:0x803D33D0; // type:object size:0x28 scope:global align:4 data:4byte -CommandHeapCheck = .bss:0x803D33F8; // type:object size:0x28 scope:global align:4 data:4byte -mainThreadStack = .bss:0x803D3420; // type:object size:0x8000 scope:global align:4 -mainThread = .bss:0x803DB420; // type:object size:0x318 scope:global align:8 -mDoPrintf_FiberStack = .bss:0x803DB740; // type:object size:0x800 scope:global align:32 +RootHeapCheck = .bss:0x803D32E0; // type:object size:0x28 scope:local align:4 data:4byte +SystemHeapCheck = .bss:0x803D3308; // type:object size:0x28 scope:local align:4 data:4byte +ZeldaHeapCheck = .bss:0x803D3330; // type:object size:0x28 scope:local align:4 data:4byte +GameHeapCheck = .bss:0x803D3358; // type:object size:0x28 scope:local align:4 data:4byte +ArchiveHeapCheck = .bss:0x803D3380; // type:object size:0x28 scope:local align:4 data:4byte +J2dHeapCheck = .bss:0x803D33A8; // type:object size:0x28 scope:local align:4 data:4byte +HostioHeapCheck = .bss:0x803D33D0; // type:object size:0x28 scope:local align:4 data:4byte +CommandHeapCheck = .bss:0x803D33F8; // type:object size:0x28 scope:local align:4 data:4byte +mainThreadStack = .bss:0x803D3420; // type:object size:0x8000 scope:local align:4 +mainThread = .bss:0x803DB420; // type:object size:0x318 scope:local align:8 +mDoPrintf_FiberStack = .bss:0x803DB740; // type:object size:0x800 scope:local align:32 @3620 = .bss:0x803DBF40; // type:object size:0xC scope:local align:4 -g_mDoAud_zelAudio = .bss:0x803DBF4C; // type:object size:0x138C scope:global align:4 +g_mDoAud_zelAudio = .bss:0x803DBF4C; // type:object size:0x138C scope:local align:4 m_gamePad__8mDoCPd_c = .bss:0x803DD2D8; // type:object size:0x10 scope:global align:4 data:4byte m_cpadInfo__8mDoCPd_c = .bss:0x803DD2E8; // type:object size:0x100 scope:global align:4 data:float mFrameBufferTexObj__13mDoGph_gInf_c = .bss:0x803DD3E8; // type:object size:0x20 scope:global align:4 @@ -20692,24 +20708,25 @@ now__14mDoMtx_stack_c = .bss:0x803DD470; // type:object size:0x30 scope:global a buffer__14mDoMtx_stack_c = .bss:0x803DD4A0; // type:object size:0x300 scope:global align:4 @4048 = .bss:0x803DD7A0; // type:object size:0xC scope:local align:4 @4078 = .bss:0x803DD7AC; // type:object size:0xC scope:local align:4 -mDoMtx_quatStack = .bss:0x803DD7B8; // type:object size:0x11C scope:global align:4 +mDoMtx_quatStack = .bss:0x803DD7B8; // type:object size:0x11C scope:local align:4 @3727 = .bss:0x803DD8D8; // type:object size:0xC scope:local align:4 mClipper__14mDoLib_clipper = .bss:0x803DD8E4; // type:object size:0x5C scope:global align:4 data:4byte ...bss.0 = .bss:0x803DD940; // type:label scope:local l_thread__9mDoDvdThd = .bss:0x803DD940; // type:object size:0x318 scope:global align:8 l_threadStack__9mDoDvdThd = .bss:0x803DDC60; // type:object size:0x1000 scope:global align:16 l_param__9mDoDvdThd = .bss:0x803DEC60; // type:object size:0x48 scope:global align:4 +padding = .bss:0x803DECA8; // type:object size:0x18 scope:local ...bss.0 = .bss:0x803DECC0; // type:label scope:local -DvdErr_thread = .bss:0x803DECC0; // type:object size:0x318 scope:global align:8 -DvdErr_stack = .bss:0x803DEFE0; // type:object size:0xC00 scope:global align:16 +DvdErr_thread = .bss:0x803DECC0; // type:object size:0x318 scope:local align:8 +DvdErr_stack = .bss:0x803DEFE0; // type:object size:0xC00 scope:local align:16 Alarm = .bss:0x803DFBE0; // type:object size:0x28 scope:local align:8 -MemCardStack = .bss:0x803DFC20; // type:object size:0x1000 scope:global align:4 -MemCardThread = .bss:0x803E0C20; // type:object size:0x318 scope:global align:8 -MemCardWorkArea0 = .bss:0x803E0F40; // type:object size:0xA000 scope:global align:32 +MemCardStack = .bss:0x803DFC20; // type:object size:0x1000 scope:local align:4 +MemCardThread = .bss:0x803E0C20; // type:object size:0x318 scope:local align:8 +MemCardWorkArea0 = .bss:0x803E0F40; // type:object size:0xA000 scope:local align:32 g_mDoMemCd_control = .bss:0x803EAF40; // type:object size:0x2000 scope:global align:8 -sTmpBuf = .bss:0x803ECF40; // type:object size:0x4000 scope:global align:4 data:4byte +sTmpBuf = .bss:0x803ECF40; // type:object size:0x4000 scope:local align:4 data:4byte @3741 = .bss:0x803F0F40; // type:object size:0xC scope:local align:4 -DMC = .bss:0x803F0F50; // type:object size:0xC60 scope:global align:4 +DMC = .bss:0x803F0F50; // type:object size:0xC60 scope:local align:4 @3691 = .bss:0x803F1BB0; // type:object size:0xC scope:local align:4 g_HIO = .bss:0x803F1BBC; // type:object size:0x40 scope:global align:4 ...bss.0 = .bss:0x803F1C00; // type:label scope:local @@ -20726,22 +20743,22 @@ mGndCheck__11fopAcM_gc_c = .bss:0x803F1CC4; // type:object size:0x54 scope:globa mRoofCheck__11fopAcM_rc_c = .bss:0x803F1D24; // type:object size:0x50 scope:global align:4 @6519 = .bss:0x803F1D74; // type:object size:0xC scope:local align:4 mWaterCheck__11fopAcM_wt_c = .bss:0x803F1D80; // type:object size:0x54 scope:global align:4 -l_fopCamM_id = .bss:0x803F1DD8; // type:object size:0x10 scope:global align:4 -l_fopOvlpM_Request = .bss:0x803F1DE8; // type:object size:0x28 scope:global align:4 +l_fopCamM_id = .bss:0x803F1DD8; // type:object size:0x10 scope:local align:4 +l_fopOvlpM_Request = .bss:0x803F1DE8; // type:object size:0x28 scope:local align:4 lists$2216 = .bss:0x803F1E10; // type:object size:0x2EE0 scope:local align:4 -l_fpcLn_Line = .bss:0x803F4CF0; // type:object size:0xC0 scope:global align:4 +l_fpcLn_Line = .bss:0x803F4CF0; // type:object size:0xC0 scope:local align:4 rootlayer$3716 = .bss:0x803F4DB0; // type:object size:0x2C scope:local align:4 queue$3717 = .bss:0x803F4DDC; // type:object size:0x78 scope:local align:4 -l_fpcPi_Queue = .bss:0x803F4E58; // type:object size:0xC scope:global align:4 +l_fpcPi_Queue = .bss:0x803F4E58; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x803F4E68; // type:label scope:local @3926 = .bss:0x803F4E68; // type:object size:0xC scope:local -DoorInfo = .bss:0x803F4E74; // type:object size:0x904 scope:global align:4 data:4byte +DoorInfo = .bss:0x803F4E74; // type:object size:0x904 scope:local align:4 data:4byte @3981 = .bss:0x803F5778; // type:object size:0xC scope:local align:4 -l_RoomKeepDoorInfo = .bss:0x803F5784; // type:object size:0x904 scope:global align:4 data:4byte +l_RoomKeepDoorInfo = .bss:0x803F5784; // type:object size:0x904 scope:local align:4 data:4byte @5376 = .bss:0x803F6088; // type:object size:0xC scope:local align:4 mStatus__20dStage_roomControl_c = .bss:0x803F6094; // type:object size:0x10100 scope:global align:4 data:4byte mDemoArcName__20dStage_roomControl_c = .bss:0x80406194; // type:object size:0xA scope:global align:4 data:byte -dComIfG_mTimerInfo = .bss:0x804061A0; // type:object size:0x14 scope:global align:4 data:4byte +dComIfG_mTimerInfo = .bss:0x804061A0; // type:object size:0x14 scope:local align:4 data:4byte @5065 = .bss:0x804061B4; // type:object size:0xC scope:local align:4 g_dComIfG_gameInfo = .bss:0x804061C0; // type:object size:0x1DE10 scope:global align:8 data:2byte buf$7371 = .bss:0x80423FD0; // type:object size:0x20 scope:local align:4 @@ -20770,11 +20787,12 @@ m_texObjAgg__8dMpath_n = .bss:0x80424684; // type:object size:0x1C scope:global map_tool_name$4449 = .bss:0x804246A0; // type:object size:0x11 scope:local align:4 map_tool_name$4498 = .bss:0x804246B4; // type:object size:0x11 scope:local align:4 map_tool_name$4511 = .bss:0x804246C8; // type:object size:0x11 scope:local align:4 -l_startAction = .bss:0x804246E0; // type:object size:0x18 scope:global align:4 data:4byte -l_runAction = .bss:0x804246F8; // type:object size:0x18 scope:global align:4 data:4byte +l_startAction = .bss:0x804246E0; // type:object size:0x18 scope:local align:4 data:4byte +l_runAction = .bss:0x804246F8; // type:object size:0x18 scope:local align:4 data:4byte ...bss.0 = .bss:0x80424710; // type:label scope:local @4053 = .bss:0x80424710; // type:object size:0xC scope:local align:4 @4054 = .bss:0x8042471C; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x8042471C; // type:label scope:local pos$4424 = .bss:0x80424728; // type:object size:0xC scope:local align:4 data:float @4723 = .bss:0x80424734; // type:object size:0xC scope:local align:4 @4724 = .bss:0x80424740; // type:object size:0xC scope:local align:4 @@ -20839,9 +20857,9 @@ l_wcsbuf = .bss:0x80424F94; // type:object size:0x3F0 scope:local align:4 data:f vtx_tbl$5950 = .bss:0x80425384; // type:object size:0x24 scope:local align:4 data:float ...bss.0 = .bss:0x804253A8; // type:label scope:local @4202 = .bss:0x804253A8; // type:object size:0xC scope:local align:4 -WolfAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x804253B4; // type:object size:0xC scope:global align:4 data:float +WolfAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x804253B4; // type:object size:0xC scope:local align:4 data:float @4203 = .bss:0x804253C0; // type:object size:0xC scope:local align:4 -MidnaAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x804253CC; // type:object size:0xC scope:global align:4 data:float +MidnaAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x804253CC; // type:object size:0xC scope:local align:4 data:float @5852 = .bss:0x804253D8; // type:object size:0xC scope:local align:4 DefaultGap$5851 = .bss:0x804253E4; // type:object size:0xC scope:local align:4 data:float @6756 = .bss:0x804253F0; // type:object size:0xC scope:local align:4 @@ -20854,6 +20872,7 @@ mTypeGroupListAll__7dTres_c = .bss:0x80425438; // type:object size:0xCC scope:gl ...bss.0 = .bss:0x80425508; // type:label scope:local @4409 = .bss:0x80425508; // type:object size:0xC scope:local l_waitBaseAnime = .bss:0x80425514; // type:object size:0xC scope:global align:4 data:float +...bss.0 = .bss:0x80425514; // type:label scope:local @4410 = .bss:0x80425520; // type:object size:0xC scope:local align:4 l_ironBallBaseAnime = .bss:0x8042552C; // type:object size:0xC scope:global align:4 data:float @4411 = .bss:0x80425538; // type:object size:0xC scope:local align:4 @@ -20933,6 +20952,7 @@ a_eyeOfsTbl$4079 = .bss:0x804284A8; // type:object size:0x168 scope:local align: ...bss.0 = .bss:0x80428610; // type:label scope:local @3982 = .bss:0x80428610; // type:object size:0xC scope:local align:4 l_Cd2_HIO = .bss:0x8042861C; // type:object size:0x400C scope:global align:4 +...bss.0 = .bss:0x8042861C; // type:label scope:local @4290 = .bss:0x8042C628; // type:object size:0xC scope:local align:4 @4293 = .bss:0x8042C634; // type:object size:0xC scope:local align:4 @4294 = .bss:0x8042C640; // type:object size:0xC scope:local align:4 @@ -20967,33 +20987,34 @@ a_eyeOfsTbl$4289 = .bss:0x8042C790; // type:object size:0x168 scope:local align: ...bss.0 = .bss:0x8042C8F8; // type:label scope:local specialType__22@unnamed@d_camera_cpp@ = .bss:0x8042C8F8; // type:object size:0xA8 scope:global align:4 data:4byte @9808 = .bss:0x8042C9A0; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x8042C9A0; // type:label scope:local @14159 = .bss:0x8042C9AC; // type:object size:0xC scope:local align:4 @14615 = .bss:0x8042C9B8; // type:object size:0xC scope:local align:4 @14964 = .bss:0x8042C9C4; // type:object size:0xC scope:local align:4 @14968 = .bss:0x8042C9D0; // type:object size:0xC scope:local align:4 @3807 = .bss:0x8042C9E0; // type:object size:0xC scope:local align:4 -g_fsHIO = .bss:0x8042C9EC; // type:object size:0x24 scope:global align:4 +g_fsHIO = .bss:0x8042C9EC; // type:object size:0x24 scope:local align:4 @3648 = .bss:0x8042CA10; // type:object size:0xC scope:local align:4 @3882 = .bss:0x8042CA20; // type:object size:0xC scope:local align:4 -l_HIO = .bss:0x8042CA2C; // type:object size:0x1C scope:global align:4 +l_HIO = .bss:0x8042CA2C; // type:object size:0x1C scope:local align:4 ...bss.0 = .bss:0x8042CA48; // type:label scope:local @4112 = .bss:0x8042CA48; // type:object size:0xC scope:local g_env_light = .bss:0x8042CA54; // type:object size:0x1310 scope:global align:4 @4113 = .bss:0x8042DD64; // type:object size:0xC scope:local align:4 g_mEnvSeMgr = .bss:0x8042DD70; // type:object size:0x30C scope:global align:4 -lightStatusData = .bss:0x8042E07C; // type:object size:0x740 scope:global align:4 data:float +lightStatusData = .bss:0x8042E07C; // type:object size:0x740 scope:local align:4 data:float @7485 = .bss:0x8042E7BC; // type:object size:0xC scope:local align:4 S_old_cameye$7484 = .bss:0x8042E7C8; // type:object size:0xC scope:local align:4 @7489 = .bss:0x8042E7D4; // type:object size:0xC scope:local align:4 S_old_camctr$7488 = .bss:0x8042E7E0; // type:object size:0xC scope:local align:4 @3816 = .bss:0x8042E7F0; // type:object size:0xC scope:local align:4 @3818 = .bss:0x8042E7FC; // type:object size:0xC scope:local align:4 -l_offsetPos$localstatic3$draw__10dThunder_cFv = .bss:0x8042E808; // type:object size:0xC scope:local align:4 data:float -l_scale$localstatic5$draw__10dThunder_cFv = .bss:0x8042E814; // type:object size:0xC scope:local align:4 data:float +l_offsetPos$localstatic3$draw__10dThunder_cFv = .bss:0x8042E808; // type:object size:0xC scope:weak align:4 data:float +l_scale$localstatic5$draw__10dThunder_cFv = .bss:0x8042E814; // type:object size:0xC scope:weak align:4 data:float @3989 = .bss:0x8042E820; // type:object size:0xC scope:local align:4 -g_fmHIO = .bss:0x8042E82C; // type:object size:0x14 scope:global align:4 +g_fmHIO = .bss:0x8042E82C; // type:object size:0x14 scope:local align:4 @3785 = .bss:0x8042E840; // type:object size:0xC scope:local align:4 -g_msHIO = .bss:0x8042E84C; // type:object size:0x10 scope:global align:4 +g_msHIO = .bss:0x8042E84C; // type:object size:0x10 scope:local align:4 ...bss.0 = .bss:0x8042E860; // type:label scope:local @3773 = .bss:0x8042E860; // type:object size:0xC scope:local g_mwHIO = .bss:0x8042E86C; // type:object size:0x130 scope:global align:4 @@ -21017,10 +21038,10 @@ g_MsgObject_HIO_c = .bss:0x8043028C; // type:object size:0x410 scope:global alig arcName$6106 = .bss:0x8043069C; // type:object size:0x16 scope:local align:4 @3640 = .bss:0x804306B8; // type:object size:0xC scope:local align:4 @3735 = .bss:0x804306C8; // type:object size:0xC scope:local align:4 -g_MsgScrnLight_HIO_c = .bss:0x804306D4; // type:object size:0x50 scope:global align:4 +g_MsgScrnLight_HIO_c = .bss:0x804306D4; // type:object size:0x50 scope:local align:4 @3660 = .bss:0x80430728; // type:object size:0xC scope:local align:4 -g_nmHIO = .bss:0x80430734; // type:object size:0x14 scope:global align:4 -static_mBounds = .bss:0x80430748; // type:object size:0x10 scope:global align:4 data:float +g_nmHIO = .bss:0x80430734; // type:object size:0x14 scope:local align:4 +static_mBounds = .bss:0x80430748; // type:object size:0x10 scope:local align:4 data:float @3702 = .bss:0x80430758; // type:object size:0xC scope:local align:4 @3822 = .bss:0x80430768; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x80430778; // type:label scope:local @@ -21031,7 +21052,7 @@ g_envHIO = .bss:0x8043079C; // type:object size:0x44 scope:global align:4 data:4 @3659 = .bss:0x804307E0; // type:object size:0xC scope:local align:4 g_save_bit_HIO = .bss:0x804307EC; // type:object size:0x4A0 scope:global align:4 data:4byte @3644 = .bss:0x80430C90; // type:object size:0xC scope:local align:4 -wolfFootScale$localstatic3$create__9dkWmark_cFv = .bss:0x80430C9C; // type:object size:0xC scope:local align:4 data:float +wolfFootScale$localstatic3$create__9dkWmark_cFv = .bss:0x80430C9C; // type:object size:0xC scope:weak align:4 data:float @2414 = .bss:0x80430CA8; // type:object size:0xC scope:local align:4 m_virtual_center__14cCcD_ShapeAttr = .bss:0x80430CB4; // type:object size:0xC scope:global align:4 data:float @2492 = .bss:0x80430CC0; // type:object size:0xC scope:local align:4 @@ -21055,7 +21076,7 @@ BaseYZ__4cXyz = .bss:0x80430D84; // type:object size:0xC scope:global align:4 @2457 = .bss:0x80430D90; // type:object size:0xC scope:local align:4 BaseXYZ__4cXyz = .bss:0x80430D9C; // type:object size:0xC scope:global align:4 @262 = .bss:0x80430DA8; // type:object size:0xC scope:local align:4 -mtx = .bss:0x80430DB8; // type:object size:0x1E0 scope:global align:4 +mtx = .bss:0x80430DB8; // type:object size:0x1E0 scope:local align:4 ...bss.0 = .bss:0x80430F98; // type:label scope:local @2401 = .bss:0x80430F98; // type:object size:0xC scope:local @2402 = .bss:0x80430FA4; // type:object size:0xC scope:local align:4 @@ -21064,34 +21085,34 @@ mtx = .bss:0x80430DB8; // type:object size:0x1E0 scope:global align:4 @2405 = .bss:0x80430FC8; // type:object size:0xC scope:local align:4 @2184 = .bss:0x80430FD8; // type:object size:0xC scope:local align:4 sList__8JFWAlarm = .bss:0x80430FE4; // type:object size:0xC scope:global align:4 -clear_z_tobj = .bss:0x80430FF0; // type:object size:0x20 scope:global align:4 +clear_z_tobj = .bss:0x80430FF0; // type:object size:0x20 scope:local align:4 ...bss.0 = .bss:0x80431010; // type:label scope:local @744 = .bss:0x80431010; // type:object size:0xC scope:local align:4 -soovv_actor_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8043101C; // type:object size:0x10 scope:global align:4 data:4byte +soovv_actor_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8043101C; // type:object size:0x10 scope:local align:4 data:4byte @747 = .bss:0x8043102C; // type:object size:0xC scope:local align:4 -soovv_actor_RELATION_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431038; // type:object size:0x10 scope:global align:4 data:4byte +soovv_actor_RELATION_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431038; // type:object size:0x10 scope:local align:4 data:4byte @750 = .bss:0x80431048; // type:object size:0xC scope:local align:4 -soovv_camera_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431054; // type:object size:0x10 scope:global align:4 data:4byte +soovv_camera_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431054; // type:object size:0x10 scope:local align:4 data:4byte @753 = .bss:0x80431064; // type:object size:0xC scope:local align:4 -soovv_camera_TARGET_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431070; // type:object size:0x10 scope:global align:4 data:4byte +soovv_camera_TARGET_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431070; // type:object size:0x10 scope:local align:4 data:4byte @756 = .bss:0x80431080; // type:object size:0xC scope:local align:4 -soovv_light_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8043108C; // type:object size:0x10 scope:global align:4 data:4byte +soovv_light_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8043108C; // type:object size:0x10 scope:local align:4 data:4byte @759 = .bss:0x8043109C; // type:object size:0xC scope:local align:4 -soovv_particle_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804310A8; // type:object size:0x10 scope:global align:4 +soovv_particle_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804310A8; // type:object size:0x10 scope:local align:4 @762 = .bss:0x804310B8; // type:object size:0xC scope:local align:4 -soovv_particle_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804310C4; // type:object size:0x10 scope:global align:4 +soovv_particle_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804310C4; // type:object size:0x10 scope:local align:4 @765 = .bss:0x804310D4; // type:object size:0xC scope:local align:4 -soovv_particle_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804310E0; // type:object size:0x10 scope:global align:4 +soovv_particle_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804310E0; // type:object size:0x10 scope:local align:4 @768 = .bss:0x804310F0; // type:object size:0xC scope:local align:4 -soovv_sound_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804310FC; // type:object size:0x10 scope:global align:4 +soovv_sound_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804310FC; // type:object size:0x10 scope:local align:4 @771 = .bss:0x8043110C; // type:object size:0xC scope:local align:4 -soovv_sound_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431118; // type:object size:0x10 scope:global align:4 +soovv_sound_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431118; // type:object size:0x10 scope:local align:4 @774 = .bss:0x80431128; // type:object size:0xC scope:local align:4 -soovv_sound_CONTINUOUS___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431134; // type:object size:0x10 scope:global align:4 +soovv_sound_CONTINUOUS___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431134; // type:object size:0x10 scope:local align:4 @777 = .bss:0x80431144; // type:object size:0xC scope:local align:4 -soovv_sound_LOCATED___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431150; // type:object size:0x10 scope:global align:4 +soovv_sound_LOCATED___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80431150; // type:object size:0x10 scope:local align:4 @780 = .bss:0x80431160; // type:object size:0xC scope:local align:4 -soovv_sound_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8043116C; // type:object size:0x10 scope:global align:4 +soovv_sound_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8043116C; // type:object size:0x10 scope:local align:4 @819 = .bss:0x8043117C; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x80431188; // type:label scope:local @1087 = .bss:0x80431188; // type:object size:0xC scope:local align:4 @@ -21134,7 +21155,7 @@ aoData$1265 = .bss:0x80431540; // type:object size:0x90 scope:local align:4 data @313 = .bss:0x804315D0; // type:object size:0xC scope:local align:4 audioAramHeap__9JASKernel = .bss:0x804315DC; // type:object size:0x44 scope:global align:4 sProbeTable__8JASProbe = .bss:0x80431620; // type:object size:0x40 scope:global align:4 -sMutex = .bss:0x80431660; // type:object size:0x18 scope:global align:4 +sMutex = .bss:0x80431660; // type:object size:0x18 scope:local align:4 ...bss.0 = .bss:0x80431678; // type:label scope:local @80 = .bss:0x80431678; // type:object size:0xC scope:local sCommandListOnce__10JASPortCmd = .bss:0x80431684; // type:object size:0xC scope:global align:4 @@ -21143,6 +21164,7 @@ sCommandListStay__10JASPortCmd = .bss:0x8043169C; // type:object size:0xC scope: ...bss.0 = .bss:0x804316A8; // type:label scope:local @431 = .bss:0x804316A8; // type:object size:0xC scope:local align:4 sDefaultBankTable__8JASTrack = .bss:0x804316B4; // type:object size:0x40C scope:global align:4 data:4byte +...bss.0 = .bss:0x804316B4; // type:label scope:local @433 = .bss:0x80431AC0; // type:object size:0xC scope:local align:4 sTrackList__8JASTrack = .bss:0x80431ACC; // type:object size:0x10 scope:global align:4 data:4byte @470 = .bss:0x80431ADC; // type:object size:0xC scope:local align:4 @@ -21167,10 +21189,10 @@ sDmaDacBuffer__9JASDriver = .bss:0x80431C58; // type:object size:0xC scope:globa sDspSyncCallback__9JASDriver = .bss:0x80431C78; // type:object size:0x100 scope:global align:4 sSubFrameCallback__9JASDriver = .bss:0x80431D78; // type:object size:0x100 scope:global align:4 sUpdateDacCallback__9JASDriver = .bss:0x80431E78; // type:object size:0x100 scope:global align:4 -audio_task = .bss:0x80431F80; // type:object size:0x50 scope:global align:32 -AUDIO_YIELD_BUFFER = .bss:0x80431FE0; // type:object size:0x2000 scope:global align:32 -taskwork = .bss:0x80433FE0; // type:object size:0x80 scope:global align:4 -sync_stack = .bss:0x80434060; // type:object size:0x14 scope:global align:4 data:4byte +audio_task = .bss:0x80431F80; // type:object size:0x50 scope:local align:32 +AUDIO_YIELD_BUFFER = .bss:0x80431FE0; // type:object size:0x2000 scope:local align:32 +taskwork = .bss:0x80433FE0; // type:object size:0x80 scope:local align:4 +sync_stack = .bss:0x80434060; // type:object size:0x14 scope:local align:4 data:4byte @744 = .bss:0x80434078; // type:object size:0xC scope:local align:4 memPool_$localstatic3$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .bss:0x80434084; // type:object size:0x10 scope:weak align:4 @716 = .bss:0x80434098; // type:object size:0xC scope:local align:4 @@ -21193,9 +21215,9 @@ memPool_$localstatic3$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = @1539 = .bss:0x804341D8; // type:object size:0xC scope:local align:4 memPool_$localstatic3$getMemPool___30JASPoolAllocObject<9Z2Audible>Fv = .bss:0x804341E4; // type:object size:0x10 scope:weak align:4 ...bss.0 = .bss:0x804341F8; // type:label scope:local -sCorrectPhrase = .bss:0x804341F8; // type:object size:0x24 scope:global align:4 data:4byte -sWindStoneSound = .bss:0x8043421C; // type:object size:0x24 scope:global align:4 data:4byte -sCorrectDuo = .bss:0x80434240; // type:object size:0x24 scope:global align:4 data:4byte +sCorrectPhrase = .bss:0x804341F8; // type:object size:0x24 scope:local align:4 data:4byte +sWindStoneSound = .bss:0x8043421C; // type:object size:0x24 scope:local align:4 data:4byte +sCorrectDuo = .bss:0x80434240; // type:object size:0x24 scope:local align:4 data:4byte @3779 = .bss:0x80434268; // type:object size:0xC scope:local align:4 @3783 = .bss:0x80434274; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x80434280; // type:label scope:local @@ -21231,12 +21253,12 @@ mPadMStick__10JUTGamePad = .bss:0x804344E0; // type:object size:0x40 scope:globa mPadSStick__10JUTGamePad = .bss:0x80434520; // type:object size:0x40 scope:global align:4 @1373 = .bss:0x80434560; // type:object size:0xC scope:local align:4 sPatternList__19JUTGamePadLongPress = .bss:0x8043456C; // type:object size:0xC scope:global align:4 data:4byte -exCallbackObject = .bss:0x80434578; // type:object size:0x14 scope:global align:4 data:4byte +exCallbackObject = .bss:0x80434578; // type:object size:0x14 scope:local align:4 data:4byte @2182 = .bss:0x8043458C; // type:object size:0xC scope:local align:4 sMapFileList__12JUTException = .bss:0x80434598; // type:object size:0xC scope:global align:4 data:4byte context$2230 = .bss:0x804345A8; // type:object size:0x2C8 scope:local align:8 -sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x80434870; // type:object size:0x40 scope:global align:4 -sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804348B0; // type:object size:0x100 scope:global align:4 +sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x80434870; // type:object size:0x40 scope:local align:4 +sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x804348B0; // type:object size:0x100 scope:local align:4 static_mBounds__7J2DPane = .bss:0x804349B0; // type:object size:0x10 scope:global align:4 data:float p_name$494 = .bss:0x804349C0; // type:object size:0x101 scope:local align:4 data:byte j3dSys = .bss:0x80434AC8; // type:object size:0x11C scope:global align:4 @@ -21246,7 +21268,7 @@ mParentS__6J3DSys = .bss:0x80434C20; // type:object size:0xC scope:global align: sTexCoordScaleTable__6J3DSys = .bss:0x80434C2C; // type:object size:0x40 scope:global align:4 data:2byte sGDLObj__17J3DDisplayListObj = .bss:0x80434C70; // type:object size:0x10 scope:global align:4 data:4byte sMtxLoadCache__11J3DShapeMtx = .bss:0x80434C80; // type:object size:0x14 scope:global align:4 data:2byte -j3dTexCoordTable = .bss:0x80434C98; // type:object size:0x1DC7 scope:global align:4 +j3dTexCoordTable = .bss:0x80434C98; // type:object size:0x1DC7 scope:local align:4 j3dTevSwapTableTable = .bss:0x80436A60; // type:object size:0x400 scope:global align:4 data:byte j3dAlphaCmpTable = .bss:0x80436E60; // type:object size:0x300 scope:global align:4 j3dZModeTable = .bss:0x80437160; // type:object size:0x60 scope:global align:4 @@ -21259,79 +21281,79 @@ sincosTable___5JMath = .bss:0x80439A20; // type:object size:0x10000 scope:global atanTable___5JMath = .bss:0x80449A20; // type:object size:0x1020 scope:global align:4 data:float asinAcosTable___5JMath = .bss:0x8044AA40; // type:object size:0x1020 scope:global align:4 data:float ...bss.0 = .bss:0x8044BA60; // type:label scope:local -DriveInfo = .bss:0x8044BA60; // type:object size:0x20 scope:global align:4 -DriveBlock = .bss:0x8044BA80; // type:object size:0x30 scope:global align:4 +DriveInfo = .bss:0x8044BA60; // type:object size:0x20 scope:local align:4 +DriveBlock = .bss:0x8044BA80; // type:object size:0x30 scope:local align:4 __OSRebootParams = .bss:0x8044BAB0; // type:object size:0x1C scope:global align:4 data:4byte ...bss.0 = .bss:0x8044BAD0; // type:label scope:local __OSErrorTable = .bss:0x8044BAD0; // type:object size:0x44 scope:global align:4 data:4byte ...bss.0 = .bss:0x8044BB20; // type:label scope:local -Scb = .bss:0x8044BB20; // type:object size:0x54 scope:global align:32 data:4byte +Scb = .bss:0x8044BB20; // type:object size:0x54 scope:local align:32 data:4byte ...bss.0 = .bss:0x8044BB78; // type:label scope:local -RunQueue = .bss:0x8044BB78; // type:object size:0x100 scope:global align:4 data:4byte -IdleThread = .bss:0x8044BC78; // type:object size:0x318 scope:global align:8 -DefaultThread = .bss:0x8044BF90; // type:object size:0x318 scope:global align:8 -IdleContext = .bss:0x8044C2A8; // type:object size:0x2C8 scope:global align:8 -Ecb = .bss:0x8044C570; // type:object size:0xC0 scope:global align:4 data:4byte +RunQueue = .bss:0x8044BB78; // type:object size:0x100 scope:local align:4 data:4byte +IdleThread = .bss:0x8044BC78; // type:object size:0x318 scope:local align:8 +DefaultThread = .bss:0x8044BF90; // type:object size:0x318 scope:local align:8 +IdleContext = .bss:0x8044C2A8; // type:object size:0x2C8 scope:local align:8 +Ecb = .bss:0x8044C570; // type:object size:0xC0 scope:local align:4 data:4byte ...bss.0 = .bss:0x8044C630; // type:label scope:local -Packet = .bss:0x8044C630; // type:object size:0x80 scope:global align:8 data:4byte +Packet = .bss:0x8044C630; // type:object size:0x80 scope:local align:8 data:4byte Alarm = .bss:0x8044C6B0; // type:object size:0xA0 scope:local align:8 -TypeTime = .bss:0x8044C750; // type:object size:0x20 scope:global align:8 -XferTime = .bss:0x8044C770; // type:object size:0x20 scope:global align:8 -TypeCallback = .bss:0x8044C790; // type:object size:0x40 scope:global align:4 -RDSTHandler = .bss:0x8044C7D0; // type:object size:0x10 scope:global align:4 data:4byte -InputBufferValid = .bss:0x8044C7E0; // type:object size:0x10 scope:global align:4 -InputBuffer = .bss:0x8044C7F0; // type:object size:0x20 scope:global align:4 -InputBufferVcount = .bss:0x8044C810; // type:object size:0x10 scope:global align:4 +TypeTime = .bss:0x8044C750; // type:object size:0x20 scope:local align:8 +XferTime = .bss:0x8044C770; // type:object size:0x20 scope:local align:8 +TypeCallback = .bss:0x8044C790; // type:object size:0x40 scope:local align:4 +RDSTHandler = .bss:0x8044C7D0; // type:object size:0x10 scope:local align:4 data:4byte +InputBufferValid = .bss:0x8044C7E0; // type:object size:0x10 scope:local align:4 +InputBuffer = .bss:0x8044C7F0; // type:object size:0x20 scope:local align:4 +InputBufferVcount = .bss:0x8044C810; // type:object size:0x10 scope:local align:4 cmdFixDevice$327 = .bss:0x8044C820; // type:object size:0x10 scope:local align:4 ...bss.0 = .bss:0x8044C830; // type:label scope:local -CommandList = .bss:0x8044C830; // type:object size:0x3C scope:global align:4 data:4byte -AlarmForWA = .bss:0x8044C870; // type:object size:0x28 scope:global align:8 -AlarmForTimeout = .bss:0x8044C898; // type:object size:0x28 scope:global align:8 -AlarmForBreak = .bss:0x8044C8C0; // type:object size:0x28 scope:global align:8 -Prev = .bss:0x8044C8E8; // type:object size:0xC scope:global align:4 -Curr = .bss:0x8044C8F4; // type:object size:0xC scope:global align:4 +CommandList = .bss:0x8044C830; // type:object size:0x3C scope:local align:4 data:4byte +AlarmForWA = .bss:0x8044C870; // type:object size:0x28 scope:local align:8 +AlarmForTimeout = .bss:0x8044C898; // type:object size:0x28 scope:local align:8 +AlarmForBreak = .bss:0x8044C8C0; // type:object size:0x28 scope:local align:8 +Prev = .bss:0x8044C8E8; // type:object size:0xC scope:local align:4 +Curr = .bss:0x8044C8F4; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x8044C900; // type:label scope:local -BB2 = .bss:0x8044C900; // type:object size:0x20 scope:global align:32 -CurrDiskID = .bss:0x8044C920; // type:object size:0x20 scope:global align:32 -DummyCommandBlock = .bss:0x8044C940; // type:object size:0x30 scope:global align:4 -ResetAlarm = .bss:0x8044C970; // type:object size:0x28 scope:global align:8 +BB2 = .bss:0x8044C900; // type:object size:0x20 scope:local align:32 +CurrDiskID = .bss:0x8044C920; // type:object size:0x20 scope:local align:32 +DummyCommandBlock = .bss:0x8044C940; // type:object size:0x30 scope:local align:4 +ResetAlarm = .bss:0x8044C970; // type:object size:0x28 scope:local align:8 ...bss.0 = .bss:0x8044C998; // type:label scope:local -WaitingQueue = .bss:0x8044C998; // type:object size:0x20 scope:global align:4 data:4byte -bb2Buf = .bss:0x8044C9B8; // type:object size:0x3F scope:global align:4 +WaitingQueue = .bss:0x8044C998; // type:object size:0x20 scope:local align:4 data:4byte +bb2Buf = .bss:0x8044C9B8; // type:object size:0x3F scope:local align:4 block$18 = .bss:0x8044C9F8; // type:object size:0x30 scope:local align:4 ...bss.0 = .bss:0x8044CA28; // type:label scope:local -regs = .bss:0x8044CA28; // type:object size:0x76 scope:global align:4 data:2byte -shdwRegs = .bss:0x8044CAA0; // type:object size:0x76 scope:global align:4 -HorVer = .bss:0x8044CB18; // type:object size:0x58 scope:global align:4 data:2byte +regs = .bss:0x8044CA28; // type:object size:0x76 scope:local align:4 data:2byte +shdwRegs = .bss:0x8044CAA0; // type:object size:0x76 scope:local align:4 +HorVer = .bss:0x8044CB18; // type:object size:0x58 scope:local align:4 data:2byte ...bss.0 = .bss:0x8044CB70; // type:label scope:local Type = .bss:0x8044CB70; // type:object size:0x10 scope:local align:4 -Origin = .bss:0x8044CB80; // type:object size:0x30 scope:global align:4 -CmdProbeDevice = .bss:0x8044CBB0; // type:object size:0x10 scope:global align:4 +Origin = .bss:0x8044CB80; // type:object size:0x30 scope:local align:4 +CmdProbeDevice = .bss:0x8044CBB0; // type:object size:0x10 scope:local align:4 ...bss.0 = .bss:0x8044CBC0; // type:label scope:local __CARDBlock = .bss:0x8044CBC0; // type:object size:0x220 scope:global align:8 data:4byte __CARDDiskNone = .bss:0x8044CDE0; // type:object size:0x20 scope:global align:4 ...bss.0 = .bss:0x8044CE00; // type:label scope:local -FifoObj = .bss:0x8044CE00; // type:object size:0x80 scope:global align:4 -gxData = .bss:0x8044CE80; // type:object size:0x5B0 scope:global align:4 -fragmentinfo = .bss:0x8044D430; // type:object size:0xC scope:global align:4 data:4byte -__atexit_funcs = .bss:0x8044D440; // type:object size:0x100 scope:global align:4 +FifoObj = .bss:0x8044CE00; // type:object size:0x80 scope:local align:4 +gxData = .bss:0x8044CE80; // type:object size:0x5B0 scope:local align:4 +fragmentinfo = .bss:0x8044D430; // type:object size:0xC scope:local align:4 data:4byte +__atexit_funcs = .bss:0x8044D440; // type:object size:0x100 scope:local align:4 protopool$192 = .bss:0x8044D540; // type:object size:0x38 scope:local align:4 -stderr_buff = .bss:0x8044D578; // type:object size:0x100 scope:global align:4 -stdout_buff = .bss:0x8044D678; // type:object size:0x100 scope:global align:4 -stdin_buff = .bss:0x8044D778; // type:object size:0x100 scope:global align:4 +stderr_buff = .bss:0x8044D578; // type:object size:0x100 scope:local align:4 +stdout_buff = .bss:0x8044D678; // type:object size:0x100 scope:local align:4 +stdin_buff = .bss:0x8044D778; // type:object size:0x100 scope:local align:4 signal_funcs = .bss:0x8044D878; // type:object size:0x18 scope:global align:4 gTRKEventQueue = .bss:0x8044D890; // type:object size:0x28 scope:global align:4 gTRKBigEndian = .bss:0x8044D8B8; // type:object size:0x4 scope:global align:4 data:4byte gTRKMsgBufs = .bss:0x8044D8C0; // type:object size:0x19B0 scope:global align:4 -gTRKFramingState = .bss:0x8044F270; // type:object size:0x14 scope:global align:4 data:4byte -IsTRKConnected = .bss:0x8044F288; // type:object size:0x4 scope:global align:4 data:4byte -TRK_saved_exceptionID = .bss:0x8044F290; // type:object size:0x2 scope:global align:2 data:2byte +gTRKFramingState = .bss:0x8044F270; // type:object size:0x14 scope:local align:4 data:4byte +IsTRKConnected = .bss:0x8044F288; // type:object size:0x4 scope:local align:4 data:4byte +TRK_saved_exceptionID = .bss:0x8044F290; // type:object size:0x2 scope:local align:2 data:2byte gTRKState = .bss:0x8044F294; // type:object size:0xA4 scope:global align:4 data:4byte gTRKCPUState = .bss:0x8044F338; // type:object size:0x430 scope:global align:8 gTRKSaveState = .bss:0x8044F768; // type:object size:0x94 scope:global align:4 data:4byte TRKvalue128_temp = .bss:0x8044F7FC; // type:object size:0x10 scope:global align:4 -lc_base = .bss:0x8044F810; // type:object size:0x4 scope:global align:4 data:4byte -TRK_mainError = .bss:0x8044F818; // type:object size:0x4 scope:global align:4 data:4byte +lc_base = .bss:0x8044F810; // type:object size:0x4 scope:local align:4 data:4byte +TRK_mainError = .bss:0x8044F818; // type:object size:0x4 scope:local align:4 data:4byte TRK_Use_BBA = .bss:0x8044F820; // type:object size:0x1 scope:global align:1 data:byte _MetroTRK_Has_Framing = .bss:0x8044F824; // type:object size:0x4 scope:global align:4 useSerialIO = .bss:0x8044F828; // type:object size:0x1 scope:local align:1 data:byte @@ -21341,17 +21363,17 @@ gRecvBuf = .bss:0x80450050; // type:object size:0x500 scope:local align:4 gRecvCB = .bss:0x80450550; // type:object size:0x1C scope:local align:4 developmentMode__7mDoMain = .sdata:0x80450580; // type:object size:0x1 scope:global align:1 data:byte memMargin__7mDoMain = .sdata:0x80450584; // type:object size:0x4 scope:global align:4 data:4byte -mHeapBriefType__7mDoMain = .sdata:0x80450588; // type:object size:0x1 scope:global align:1 data:byte +mHeapBriefType = .sdata:0x80450588; // type:object size:0x1 scope:global align:1 data:byte mBackColor__13mDoGph_gInf_c = .sdata:0x80450590; // type:object size:0x4 scope:global align:4 data:byte mFadeColor__13mDoGph_gInf_c = .sdata:0x80450594; // type:object size:0x4 scope:global align:4 data:4byte l_tevColor0$4208 = .sdata:0x80450598; // type:object size:0x8 scope:local align:4 data:4byte mRenderModeObj__15mDoMch_render_c = .sdata:0x804505A0; // type:object size:0x4 scope:global align:4 data:4byte next__14mDoMtx_stack_c = .sdata:0x804505A8; // type:object size:0x4 scope:global align:4 data:4byte end__14mDoMtx_stack_c = .sdata:0x804505AC; // type:object size:0x4 scope:global align:4 data:4byte -l_fopOvlpM_overlap = .sdata:0x804505B0; // type:object size:0x4 scope:global align:4 data:4byte -l_scnRqID = .sdata:0x804505B8; // type:object size:0x4 scope:global align:4 data:4byte +l_fopOvlpM_overlap = .sdata:0x804505B0; // type:object size:0x4 scope:local align:4 data:4byte +l_scnRqID = .sdata:0x804505B8; // type:object size:0x4 scope:local align:4 data:4byte m_name$3788 = .sdata:0x804505C0; // type:object size:0x4 scope:local align:4 -i_msgID = .sdata:0x804505C8; // type:object size:0x4 scope:global align:4 data:4byte +i_msgID = .sdata:0x804505C8; // type:object size:0x4 scope:local align:4 data:4byte g_fopDwTg_Queue = .sdata:0x804505D0; // type:object size:0x8 scope:global align:4 data:4byte g_fpcLn_Queue = .sdata:0x804505D8; // type:object size:0x8 scope:global align:4 g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x804505E0; // type:object size:0x4 scope:global align:4 data:4byte @@ -21372,7 +21394,7 @@ mBottomFloorNo__8dMpath_c = .sdata:0x80450634; // type:object size:0x1 scope:glo mTopFloorNo__8dMpath_c = .sdata:0x80450635; // type:object size:0x1 scope:global align:1 data:byte data_80450636 = .sdata:0x80450636; // type:object size:0x1 scope:local align:1 data:byte l_cursorColor$4709 = .sdata:0x80450638; // type:object size:0x4 scope:local align:4 data:4byte -numTelopData = .sdata:0x80450640; // type:object size:0x4 scope:global align:4 data:4byte +numTelopData = .sdata:0x80450640; // type:object size:0x4 scope:local align:4 data:4byte l_color$4033 = .sdata:0x80450648; // type:object size:0x4 scope:local align:4 data:4byte l_color$5004 = .sdata:0x8045064C; // type:object size:0x4 scope:local align:4 data:4byte l_color$5326 = .sdata:0x80450650; // type:object size:0x4 scope:local align:4 data:4byte @@ -21386,7 +21408,7 @@ chk_type_num__12dAttention_c = .sdata:0x8045066C; // type:object size:0x4 scope: attn_opt_hold = .sdata:0x80450670; // type:object size:0x1 scope:local align:1 data:byte ang_table$4418 = .sdata:0x80450674; // type:object size:0x6 scope:local align:4 data_80450680 = .sdata:0x80450680; // type:object size:0x1 scope:global align:4 data:byte -l_captureAlpha = .sdata:0x80450688; // type:object size:0x1 scope:global align:4 data:byte +l_captureAlpha = .sdata:0x80450688; // type:object size:0x1 scope:local align:4 data:byte l_autoUpHeight = .sdata:0x80450690; // type:object size:0x4 scope:global align:4 data:float l_autoDownHeight = .sdata:0x80450694; // type:object size:0x4 scope:global align:4 data:float l_ladderAnmBaseTransY = .sdata:0x80450698; // type:object size:0x4 scope:global align:4 data:float @@ -21395,32 +21417,32 @@ nColor0$42525 = .sdata:0x804506A4; // type:object size:0x4 scope:local align:4 d m_timer_max__8daItem_c = .sdata:0x804506A8; // type:object size:0x4 scope:global align:4 data:4byte YnSelStartFrameTbl = .sdata:0x804506B0; // type:object size:0x8 scope:local align:4 YnSelEndFrameTbl = .sdata:0x804506B8; // type:object size:0x8 scope:local align:4 -msgTbl = .sdata:0x804506C0; // type:object size:0x6 scope:global align:4 +msgTbl = .sdata:0x804506C0; // type:object size:0x6 scope:local align:4 l_msgNum2$7002 = .sdata:0x804506C8; // type:object size:0x2 scope:local align:4 l_msgNum$7082 = .sdata:0x804506CC; // type:object size:0x3 scope:local align:4 data:string fontsize$7230 = .sdata:0x804506D0; // type:object size:0x8 scope:local align:4 linespace$7231 = .sdata:0x804506D8; // type:object size:0x8 scope:local align:4 charspace$7232 = .sdata:0x804506E0; // type:object size:0x8 scope:local align:4 -dShopSystem_itemNo = .sdata:0x804506E8; // type:object size:0x7 scope:global align:4 data:byte -dShopSystem_cameraActor = .sdata:0x804506F0; // type:object size:0x8 scope:global align:4 data:4byte -shop_item_pos_data_tbl = .sdata:0x804506F8; // type:object size:0x4 scope:global align:4 data:4byte -lightMask = .sdata:0x80450700; // type:object size:0x2 scope:global align:2 data:2byte -lightStatusPt = .sdata:0x80450704; // type:object size:0x4 scope:global align:4 data:4byte -l_zmodeUpEnable = .sdata:0x80450708; // type:object size:0x4 scope:global align:4 data:byte -l_zmodeUpDisable = .sdata:0x8045070C; // type:object size:0x4 scope:global align:4 data:byte -l_alphaCompInfoOPA = .sdata:0x80450710; // type:object size:0x8 scope:global align:4 data:byte -l_alphaCompInfo = .sdata:0x80450718; // type:object size:0x8 scope:global align:4 data:byte +dShopSystem_itemNo = .sdata:0x804506E8; // type:object size:0x7 scope:local align:4 data:byte +dShopSystem_cameraActor = .sdata:0x804506F0; // type:object size:0x8 scope:local align:4 data:4byte +shop_item_pos_data_tbl = .sdata:0x804506F8; // type:object size:0x4 scope:local align:4 data:4byte +lightMask = .sdata:0x80450700; // type:object size:0x2 scope:local align:2 data:2byte +lightStatusPt = .sdata:0x80450704; // type:object size:0x4 scope:local align:4 data:4byte +l_zmodeUpEnable = .sdata:0x80450708; // type:object size:0x4 scope:local align:4 data:byte +l_zmodeUpDisable = .sdata:0x8045070C; // type:object size:0x4 scope:local align:4 data:byte +l_alphaCompInfoOPA = .sdata:0x80450710; // type:object size:0x8 scope:local align:4 data:byte +l_alphaCompInfo = .sdata:0x80450718; // type:object size:0x8 scope:local align:4 data:byte mViewOffsetY__17dMenu_Collect3D_c = .sdata:0x80450720; // type:object size:0x4 scope:global align:4 data:float black$4166 = .sdata:0x80450728; // type:object size:0x4 scope:local align:4 data:byte -OptYnSelStartFrameTbl = .sdata:0x80450730; // type:object size:0x8 scope:global align:4 -OptYnSelEndFrameTbl = .sdata:0x80450738; // type:object size:0x8 scope:global align:4 +OptYnSelStartFrameTbl = .sdata:0x80450730; // type:object size:0x8 scope:local align:4 +OptYnSelEndFrameTbl = .sdata:0x80450738; // type:object size:0x8 scope:local align:4 l_msgNum0$3868 = .sdata:0x80450740; // type:object size:0x2 scope:local align:4 l_msgNum$3881 = .sdata:0x80450744; // type:object size:0x2 scope:local align:4 data:string m_cloth_item$3797 = .sdata:0x80450748; // type:object size:0x3 scope:local align:4 data:byte m_sword_item$3798 = .sdata:0x8045074C; // type:object size:0x4 scope:local align:4 data:byte m_shield_item$3799 = .sdata:0x80450750; // type:object size:0x3 scope:local align:4 data:byte l_method$3851 = .sdata:0x80450758; // type:object size:0x8 scope:local align:4 -T_JOINT_resName = .sdata:0x80450760; // type:object size:0x4 scope:global align:4 +T_JOINT_resName = .sdata:0x80450760; // type:object size:0x4 scope:local align:4 preLoadNo = .sdata:0x80450764; // type:object size:0x1 scope:local align:1 data:byte doPreLoad = .sdata:0x80450765; // type:object size:0x1 scope:local align:1 data:byte calc_mtx = .sdata:0x80450768; // type:object size:0x4 scope:global align:4 data:4byte @@ -21435,7 +21457,7 @@ aPiecePriority__Q29JFWSystem11CSetUpParam = .sdata:0x8045078C; // type:object si systemFontRes__Q29JFWSystem11CSetUpParam = .sdata:0x80450790; // type:object size:0x4 scope:global align:4 data:4byte renderMode__Q29JFWSystem11CSetUpParam = .sdata:0x80450794; // type:object size:0x4 scope:global align:4 data:4byte exConsoleBufferSize__Q29JFWSystem11CSetUpParam = .sdata:0x80450798; // type:object size:0x4 scope:global align:4 data:4byte -p_dl = .sdata:0x804507A0; // type:object size:0x8 scope:global align:4 +p_dl = .sdata:0x804507A0; // type:object size:0x8 scope:local align:4 data_804507A8 = .sdata:0x804507A8; // type:object size:0x1 scope:local align:1 data:byte sMixMode__9JASDriver = .sdata:0x804507AC; // type:object size:0x4 scope:global align:4 data:4byte sDacRate__9JASDriver = .sdata:0x804507B0; // type:object size:0x4 scope:global align:4 data:float @@ -21443,7 +21465,7 @@ sSubFrames__9JASDriver = .sdata:0x804507B4; // type:object size:0x4 scope:global one__11JASWaveInfo = .sdata:0x804507B8; // type:object size:0x4 scope:global align:4 MAX_MIXERLEVEL__9JASDriver = .sdata:0x804507C0; // type:object size:0x2 scope:global align:2 data:2byte JAS_SYSTEM_OUTPUT_MODE__9JASDriver = .sdata:0x804507C4; // type:object size:0x4 scope:global align:4 data:4byte -DSP_MIXERLEVEL = .sdata:0x804507C8; // type:object size:0x2 scope:global align:2 data:2byte +DSP_MIXERLEVEL = .sdata:0x804507C8; // type:object size:0x2 scope:local align:2 data:2byte @2588 = .sdata:0x804507D0; // type:object size:0x4 scope:local align:4 data:4byte DISTANCE_MAX__7Z2Param = .sdata:0x804507D8; // type:object size:0x4 scope:global align:4 data:float MAX_VOLUME_DISTANCE__7Z2Param = .sdata:0x804507DC; // type:object size:0x4 scope:global align:4 data:float @@ -21492,25 +21514,25 @@ ENDING_BLOW_VOL_LOWER_TIME__7Z2Param = .sdata:0x80450869; // type:object size:0x ENDING_BLOW_VOL_LOWER_RECOVER_TIME__7Z2Param = .sdata:0x8045086A; // type:object size:0x1 scope:global align:1 data:byte ENDING_BLOW_MIN_FINISH_TIME__7Z2Param = .sdata:0x8045086B; // type:object size:0x1 scope:global align:1 data:byte data_8045086C = .sdata:0x8045086C; // type:object size:0x1 scope:global align:1 data:byte -sDeathMtBottom = .sdata:0x80450870; // type:object size:0x4 scope:global align:4 data:float -sDeathMtTop = .sdata:0x80450874; // type:object size:0x4 scope:global align:4 data:float -sUnderWaterDepthMax = .sdata:0x80450878; // type:object size:0x4 scope:global align:4 data:float -cPitchDown = .sdata:0x80450880; // type:object size:0x4 scope:global align:4 data:float -cPitchCenter = .sdata:0x80450884; // type:object size:0x4 scope:global align:4 data:float -cPitchUp = .sdata:0x80450888; // type:object size:0x4 scope:global align:4 data:float +sDeathMtBottom = .sdata:0x80450870; // type:object size:0x4 scope:local align:4 data:float +sDeathMtTop = .sdata:0x80450874; // type:object size:0x4 scope:local align:4 data:float +sUnderWaterDepthMax = .sdata:0x80450878; // type:object size:0x4 scope:local align:4 data:float +cPitchDown = .sdata:0x80450880; // type:object size:0x4 scope:local align:4 data:float +cPitchCenter = .sdata:0x80450884; // type:object size:0x4 scope:local align:4 data:float +cPitchUp = .sdata:0x80450888; // type:object size:0x4 scope:local align:4 data:float struct_8045088C = .sdata:0x8045088C; // type:object size:0x1 scope:local align:1 data:byte struct_8045088D = .sdata:0x8045088D; // type:object size:0x1 scope:local align:1 data:byte -data_8045088E = .sdata:0x8045088E; // type:object size:0x1 scope:local align:1 data:byte +cBeginHowlTime = .sdata:0x8045088E; // type:object size:0x1 scope:local align:1 data:byte cR_FlatWidth = .sdata:0x80450890; // type:object size:0x4 scope:local align:4 data:float struct_80450894 = .sdata:0x80450894; // type:object size:0x1 scope:local align:1 data:byte struct_80450895 = .sdata:0x80450895; // type:object size:0x1 scope:local align:1 data:byte -sStickHigh = .sdata:0x80450898; // type:object size:0x4 scope:global align:4 data:float -sStickCenter = .sdata:0x8045089C; // type:object size:0x4 scope:global align:4 data:float -sHowlTobikusa = .sdata:0x804508A0; // type:object size:0x8 scope:global align:4 +sStickHigh = .sdata:0x80450898; // type:object size:0x4 scope:local align:4 data:float +sStickCenter = .sdata:0x8045089C; // type:object size:0x4 scope:local align:4 data:float +sHowlTobikusa = .sdata:0x804508A0; // type:object size:0x8 scope:local align:4 cm2hw$539 = .sdata:0x804508A8; // type:object size:0x4 scope:local align:4 data_804508B0 = .sdata:0x804508B0; // type:object size:0x1 scope:global align:4 data:byte sSZSBufferSize__7JKRAram = .sdata:0x804508B8; // type:object size:0x4 scope:global align:4 data:4byte -rootPath$2498 = .sdata:0x804508C0; // type:object size:0x2 scope:local align:4 data:string +rootPath = .sdata:0x804508C0; // type:object size:0x2 scope:local align:4 data:string errorRetry = .sdata:0x804508C8; // type:object size:0x1 scope:local align:1 data:byte sSZSBufferSize__12JKRDvdRipper = .sdata:0x804508CC; // type:object size:0x4 scope:global align:4 data:4byte errorRetry__16JKRDvdAramRipper = .sdata:0x804508D0; // type:object size:0x1 scope:global align:1 data:byte @@ -21523,66 +21545,66 @@ sResetPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804508E8; // type:object sResetMaskPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804508EC; // type:object size:0x4 scope:global align:4 data:4byte sMessageBuffer__12JUTException = .sdata:0x804508F0; // type:object size:0x4 scope:global align:4 sAssertVisible = .sdata:0x804508F8; // type:object size:0x1 scope:global align:1 data:byte -oneFrameRate = .sdata:0x80450900; // type:object size:0x4 scope:global align:4 data:float -oneFrameRateUser = .sdata:0x80450904; // type:object size:0x4 scope:global align:4 data:float +oneFrameRate = .sdata:0x80450900; // type:object size:0x4 scope:local align:4 data:float +oneFrameRateUser = .sdata:0x80450904; // type:object size:0x4 scope:local align:4 data:float cm2hw$552 = .sdata:0x80450908; // type:object size:0x4 scope:local align:4 -J3DGDTexMode0Ids = .sdata:0x8045090C; // type:object size:0x8 scope:global align:4 -J3DGDTexMode1Ids = .sdata:0x80450914; // type:object size:0x8 scope:global align:4 -J3DGDTexImage0Ids = .sdata:0x8045091C; // type:object size:0x8 scope:global align:4 -J3DGDTexImage3Ids = .sdata:0x80450924; // type:object size:0x8 scope:global align:4 -J3DGDTexTlutIds = .sdata:0x8045092C; // type:object size:0x8 scope:global align:4 +J3DGDTexMode0Ids = .sdata:0x8045090C; // type:object size:0x8 scope:local align:4 +J3DGDTexMode1Ids = .sdata:0x80450914; // type:object size:0x8 scope:local align:4 +J3DGDTexImage0Ids = .sdata:0x8045091C; // type:object size:0x8 scope:local align:4 +J3DGDTexImage3Ids = .sdata:0x80450924; // type:object size:0x8 scope:local align:4 +J3DGDTexTlutIds = .sdata:0x8045092C; // type:object size:0x8 scope:local align:4 GX2HWFiltConv = .sdata:0x80450934; // type:object size:0x6 scope:local align:4 -J3DTexImage1Ids = .sdata:0x8045093C; // type:object size:0x8 scope:global align:4 -J3DTexImage2Ids = .sdata:0x80450944; // type:object size:0x8 scope:global align:4 -ColorBlack = .sdata:0x80450950; // type:object size:0x4 scope:global align:4 data:4byte -ColorWhite = .sdata:0x80450954; // type:object size:0x4 scope:global align:4 data:4byte +J3DTexImage1Ids = .sdata:0x8045093C; // type:object size:0x8 scope:local align:4 +J3DTexImage2Ids = .sdata:0x80450944; // type:object size:0x8 scope:local align:4 +ColorBlack = .sdata:0x80450950; // type:object size:0x4 scope:local align:4 data:4byte +ColorWhite = .sdata:0x80450954; // type:object size:0x4 scope:local align:4 data:4byte Unit01 = .sdata:0x80450958; // type:object size:0x8 scope:local align:4 SizeOfLoadMatColors = .sdata:0x80450960; // type:object size:0x4 scope:global align:4 data:4byte SizeOfLoadAmbColors = .sdata:0x80450964; // type:object size:0x4 scope:global align:4 data:4byte SizeOfLoadColorChans = .sdata:0x80450968; // type:object size:0x4 scope:global align:4 data:4byte sNoUseDrawMtxPtr__12J3DMtxBuffer = .sdata:0x80450970; // type:object size:0x4 scope:global align:4 sNoUseNrmMtxPtr__12J3DMtxBuffer = .sdata:0x80450974; // type:object size:0x4 scope:global align:4 -J3DUnit01 = .sdata:0x80450978; // type:object size:0x8 scope:global align:4 +J3DUnit01 = .sdata:0x80450978; // type:object size:0x8 scope:local align:4 __OSVersion = .sdata:0x80450980; // type:object size:0x4 scope:global align:4 data:4byte @116 = .sdata:0x80450984; // type:object size:0x6 scope:local align:4 data:string @163 = .sdata:0x8045098C; // type:object size:0x4 scope:local align:4 data:string __OSCurrHeap = .sdata:0x80450990; // type:object size:0x4 scope:global align:4 data:4byte -__OSArenaLo = .sdata:0x80450998; // type:object size:0x4 scope:global align:4 data:4byte +__OSArenaLo = .sdata:0x80450998; // type:object size:0x4 scope:local align:4 data:4byte __OSFpscrEnableBits = .sdata:0x804509A0; // type:object size:0x4 scope:global align:4 data:4byte @76 = .sdata:0x804509A4; // type:object size:0x2 scope:local align:4 data:string @213 = .sdata:0x804509A8; // type:object size:0x3 scope:local align:4 data:string -FontEncode = .sdata:0x804509B0; // type:object size:0x2 scope:global align:2 data:2byte -SwitchThreadCallback = .sdata:0x804509B8; // type:object size:0x4 scope:global align:4 data:4byte +FontEncode = .sdata:0x804509B0; // type:object size:0x2 scope:local align:2 data:2byte +SwitchThreadCallback = .sdata:0x804509B8; // type:object size:0x4 scope:local align:4 data:4byte @833 = .sdata:0x804509BC; // type:object size:0x1 scope:local align:4 __EXIVersion = .sdata:0x804509C0; // type:object size:0x4 scope:global align:4 data:4byte __SIVersion = .sdata:0x804509C8; // type:object size:0x4 scope:global align:4 data:4byte Unit01 = .sdata:0x804509D0; // type:object size:0x8 scope:local align:4 -FirstRead = .sdata:0x804509D8; // type:object size:0x4 scope:global align:4 data:4byte +FirstRead = .sdata:0x804509D8; // type:object size:0x4 scope:local align:4 data:4byte @118 = .sdata:0x804509E0; // type:object size:0x8 scope:local align:4 data:string __DVDVersion = .sdata:0x804509E8; // type:object size:0x4 scope:global align:4 data:4byte -autoInvalidation = .sdata:0x804509EC; // type:object size:0x4 scope:global align:4 data:4byte -checkOptionalCommand = .sdata:0x804509F0; // type:object size:0x4 scope:global align:4 data:4byte +autoInvalidation = .sdata:0x804509EC; // type:object size:0x4 scope:local align:4 data:4byte +checkOptionalCommand = .sdata:0x804509F0; // type:object size:0x4 scope:local align:4 data:4byte @23 = .sdata:0x804509F4; // type:object size:0x6 scope:local align:4 data:string -DmaCommand = .sdata:0x804509FC; // type:object size:0x4 scope:global align:4 data:4byte +DmaCommand = .sdata:0x804509FC; // type:object size:0x4 scope:local align:4 data:4byte @37 = .sdata:0x80450A00; // type:object size:0x2 scope:local align:4 data:string @42 = .sdata:0x80450A04; // type:object size:0x4 scope:local align:4 data:string @43 = .sdata:0x80450A08; // type:object size:0x3 scope:local align:4 data:string __VIVersion = .sdata:0x80450A10; // type:object size:0x4 scope:global align:4 data:4byte @537 = .sdata:0x80450A14; // type:object size:0x5 scope:local align:4 data:string __PADVersion = .sdata:0x80450A20; // type:object size:0x4 scope:global align:4 data:4byte -ResettingChan = .sdata:0x80450A24; // type:object size:0x4 scope:global align:4 data:4byte -XPatchBits = .sdata:0x80450A28; // type:object size:0x4 scope:global align:4 data:4byte -AnalogMode = .sdata:0x80450A2C; // type:object size:0x4 scope:global align:4 data:4byte -Spec = .sdata:0x80450A30; // type:object size:0x4 scope:global align:4 data:4byte -MakeStatus = .sdata:0x80450A34; // type:object size:0x4 scope:global align:4 data:4byte -CmdReadOrigin = .sdata:0x80450A38; // type:object size:0x4 scope:global align:4 -CmdCalibrate = .sdata:0x80450A3C; // type:object size:0x4 scope:global align:4 +ResettingChan = .sdata:0x80450A24; // type:object size:0x4 scope:local align:4 data:4byte +XPatchBits = .sdata:0x80450A28; // type:object size:0x4 scope:local align:4 data:4byte +AnalogMode = .sdata:0x80450A2C; // type:object size:0x4 scope:local align:4 data:4byte +Spec = .sdata:0x80450A30; // type:object size:0x4 scope:local align:4 data:4byte +MakeStatus = .sdata:0x80450A34; // type:object size:0x4 scope:local align:4 data:4byte +CmdReadOrigin = .sdata:0x80450A38; // type:object size:0x4 scope:local align:4 +CmdCalibrate = .sdata:0x80450A3C; // type:object size:0x4 scope:local align:4 __AIVersion = .sdata:0x80450A40; // type:object size:0x4 scope:global align:4 data:4byte __ARVersion = .sdata:0x80450A48; // type:object size:0x4 scope:global align:4 data:4byte __ARQVersion = .sdata:0x80450A50; // type:object size:0x4 scope:global align:4 data:4byte __DSPVersion = .sdata:0x80450A58; // type:object size:0x4 scope:global align:4 data:4byte __CARDVersion = .sdata:0x80450A60; // type:object size:0x4 scope:global align:4 data:4byte -next = .sdata:0x80450A68; // type:object size:0x4 scope:global align:4 data:4byte +next = .sdata:0x80450A68; // type:object size:0x4 scope:local align:4 data:4byte __CARDVendorID = .sdata:0x80450A70; // type:object size:0x2 scope:global align:2 data:2byte __CARDPermMask = .sdata:0x80450A72; // type:object size:0x1 scope:global align:1 data:byte __GXVersion = .sdata:0x80450A78; // type:object size:0x4 scope:global align:4 data:4byte @@ -21597,7 +21619,7 @@ GXTexImage2Ids = .sdata:0x80450AB0; // type:object size:0x8 scope:global align:4 GXTexImage3Ids = .sdata:0x80450AB8; // type:object size:0x8 scope:global align:4 GXTexTlutIds = .sdata:0x80450AC0; // type:object size:0x8 scope:global align:4 GX2HWFiltConv = .sdata:0x80450AC8; // type:object size:0x6 scope:local align:4 -fragmentID = .sdata:0x80450AD0; // type:object size:0x4 scope:global align:4 data:4byte +fragmentID = .sdata:0x80450AD0; // type:object size:0x4 scope:local align:4 data:4byte @wstringBase0 = .sdata:0x80450AD8; // type:object size:0x2 scope:local align:4 __float_nan = .sdata:0x80450AE0; // type:object size:0x4 scope:global align:4 data:float __float_huge = .sdata:0x80450AE4; // type:object size:0x4 scope:global align:4 data:float @@ -21611,11 +21633,11 @@ mDisplayHeapSize = .sbss:0x80450B18; // type:object size:0x1 scope:local align:1 mSelectHeapBar = .sbss:0x80450B19; // type:object size:0x1 scope:local align:1 data:byte mCheckHeap = .sbss:0x80450B1A; // type:object size:0x1 scope:local align:1 data:byte console_position_x$3776 = .sbss:0x80450B1C; // type:object size:0x4 scope:local align:4 data:float -console_x_init$1077 = .sbss:0x80450B20; // type:object size:0x1 scope:local align:1 data:byte +init$1677 = .sbss:0x80450B20; // type:object size:0x1 scope:local align:1 data:byte console_position_y$3779 = .sbss:0x80450B24; // type:object size:0x4 scope:local align:4 data:float -console_y_init$1079 = .sbss:0x80450B28; // type:object size:0x1 scope:local align:1 data:byte +init$1680 = .sbss:0x80450B28; // type:object size:0x1 scope:local align:1 data:byte console_scroll$3782 = .sbss:0x80450B2C; // type:object size:0x4 scope:local align:4 data:float -console_scroll_init$1081 = .sbss:0x80450B30; // type:object size:0x1 scope:local align:1 data:byte +init$1683 = .sbss:0x80450B30; // type:object size:0x1 scope:local align:1 data:byte frame$3939 = .sbss:0x80450B34; // type:object size:0x4 scope:local align:4 data:4byte sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .sbss:0x80450B38; // type:object size:0x4 scope:global align:4 data:4byte sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .sbss:0x80450B3C; // type:object size:0x4 scope:global align:4 data:4byte @@ -21650,14 +21672,14 @@ print_counts = .sbss:0x80450BA4; // type:object size:0x4 scope:global align:4 da print_errors = .sbss:0x80450BA8; // type:object size:0x4 scope:global align:4 data:4byte print_warings = .sbss:0x80450BAC; // type:object size:0x4 scope:global align:4 data:4byte print_systems = .sbss:0x80450BB0; // type:object size:0x4 scope:global align:4 data:4byte -print_initialized = .sbss:0x80450BB4; // type:object size:0x1 scope:local align:1 data:byte +print_initialized = .sbss:0x80450BB4; // type:object size:0x1 scope:global align:1 data:byte data_80450BB5 = .sbss:0x80450BB5; // type:object size:0x1 scope:local align:1 data:byte mInitFlag__17mDoAud_zelAudio_c = .sbss:0x80450BB8; // type:object size:0x1 scope:global align:1 data:byte mResetFlag__17mDoAud_zelAudio_c = .sbss:0x80450BB9; // type:object size:0x1 scope:global align:1 data:byte mBgmSet__17mDoAud_zelAudio_c = .sbss:0x80450BBA; // type:object size:0x1 scope:global align:1 data:byte g_mDoAud_audioHeap = .sbss:0x80450BBC; // type:object size:0x4 scope:global align:4 data:4byte -l_affCommand = .sbss:0x80450BC0; // type:object size:0x4 scope:global align:4 data:4byte -l_arcCommand = .sbss:0x80450BC4; // type:object size:0x4 scope:global align:4 data:4byte +l_affCommand = .sbss:0x80450BC0; // type:object size:0x4 scope:local align:4 data:4byte +l_arcCommand = .sbss:0x80450BC4; // type:object size:0x4 scope:local align:4 data:4byte mFader__13mDoGph_gInf_c = .sbss:0x80450BC8; // type:object size:0x4 scope:global align:4 data:4byte mFrameBufferTimg__13mDoGph_gInf_c = .sbss:0x80450BCC; // type:object size:0x4 scope:global align:4 data:4byte mFrameBufferTex__13mDoGph_gInf_c = .sbss:0x80450BD0; // type:object size:0x4 scope:global align:4 data:4byte @@ -21670,19 +21692,19 @@ mBlureRate__13mDoGph_gInf_c = .sbss:0x80450BE5; // type:object size:0x1 scope:gl mFade__13mDoGph_gInf_c = .sbss:0x80450BE6; // type:object size:0x1 scope:global align:1 data:byte mAutoForcus__13mDoGph_gInf_c = .sbss:0x80450BE7; // type:object size:0x1 scope:global align:1 data:byte data_80450BE8 = .sbss:0x80450BE8; // type:object size:0x1 scope:local align:1 data:byte -mDebugFill__6mDoMch = .sbss:0x80450BF0; // type:object size:0x1 scope:local align:1 data:byte -solidHeapErrors = .sbss:0x80450BF4; // type:object size:0x4 scope:global align:4 data:4byte -gameHeapErrors = .sbss:0x80450BF8; // type:object size:0x4 scope:global align:4 data:4byte -zeldaHeapErrors = .sbss:0x80450BFC; // type:object size:0x4 scope:global align:4 data:4byte -commandHeapErrors = .sbss:0x80450C00; // type:object size:0x4 scope:global align:4 data:4byte -archiveHeapErrors = .sbss:0x80450C04; // type:object size:0x4 scope:global align:4 data:4byte -unknownHeapErrors = .sbss:0x80450C08; // type:object size:0x4 scope:global align:4 data:4byte -heapErrors = .sbss:0x80450C0C; // type:object size:0x4 scope:global align:4 data:4byte +mDebugFill__6mDoMch = .sbss:0x80450BF0; // type:object size:0x1 scope:global align:1 data:byte +solidHeapErrors = .sbss:0x80450BF4; // type:object size:0x4 scope:local align:4 data:4byte +gameHeapErrors = .sbss:0x80450BF8; // type:object size:0x4 scope:local align:4 data:4byte +zeldaHeapErrors = .sbss:0x80450BFC; // type:object size:0x4 scope:local align:4 data:4byte +commandHeapErrors = .sbss:0x80450C00; // type:object size:0x4 scope:local align:4 data:4byte +archiveHeapErrors = .sbss:0x80450C04; // type:object size:0x4 scope:local align:4 data:4byte +unknownHeapErrors = .sbss:0x80450C08; // type:object size:0x4 scope:local align:4 data:4byte +heapErrors = .sbss:0x80450C0C; // type:object size:0x4 scope:local align:4 data:4byte tmpString$3651 = .sbss:0x80450C10; // type:object size:0x5 scope:local align:4 data:byte key_link$698 = .sbss:0x80450C15; // type:object size:0x1 scope:local align:1 data:byte key_ganon$699 = .sbss:0x80450C16; // type:object size:0x1 scope:local align:1 data:byte key_zelda$700 = .sbss:0x80450C17; // type:object size:0x1 scope:local align:1 data:byte -mDoMtx_stack = .sbss:0x80450C18; // type:object size:0x1 scope:global align:4 +mDoMtx_stack = .sbss:0x80450C18; // type:object size:0x1 scope:local align:4 AssertHeap = .sbss:0x80450C20; // type:object size:0x4 scope:global align:4 data:4byte DbPrintHeap = .sbss:0x80450C24; // type:object size:0x4 scope:global align:4 data:4byte gameHeap = .sbss:0x80450C28; // type:object size:0x4 scope:global align:4 data:4byte @@ -21717,30 +21739,30 @@ data_80450C9C = .sbss:0x80450C9C; // type:object size:0x1 scope:global align:1 data_80450C9D = .sbss:0x80450C9D; // type:object size:0x1 data_80450C9E = .sbss:0x80450C9E; // type:object size:0x1 cDmr_FishingWether = .sbss:0x80450C9F; // type:object size:0x1 -data_80450CA0 = .sbss:0x80450CA0; // type:object size:0x4 scope:global align:4 +data_80450CA0 = .sbss:0x80450CA0; // type:object size:0x1 scope:global align:1 data:byte JPTracePCB4 = .sbss:0x80450CA4; // type:object size:0x4 scope:global align:4 data:4byte DMC_initialized = .sbss:0x80450CA8; // type:object size:0x1 scope:local align:1 data:byte cDyl_Initialized = .sbss:0x80450CAC; // type:object size:0x4 scope:local align:4 data:4byte -cDyl_DVD = .sbss:0x80450CB0; // type:object size:0x4 scope:global align:4 data:4byte +cDyl_DVD = .sbss:0x80450CB0; // type:object size:0x4 scope:local align:4 data:4byte g_fopAc_type = .sbss:0x80450CB8; // type:object size:0x4 scope:global align:4 data:4byte stopStatus__10fopAc_ac_c = .sbss:0x80450CBC; // type:object size:0x4 scope:global align:4 data:4byte sInstance__35JASGlobalInstance<14JAUSectionHeap> = .sbss:0x80450CC0; // type:object size:0x4 scope:global align:4 data:4byte HeapAdjustEntry__6fopAcM = .sbss:0x80450CC8; // type:object size:0x1 scope:global align:1 data:byte -HeapAdjustVerbose__6fopAcM = .sbss:0x80450CC9; // type:object size:0x1 scope:global align:1 data:byte -l_hio = .sbss:0x80450CCC; // type:object size:0x1 scope:global align:4 +HeapAdjustUnk__6fopAcM = .sbss:0x80450CC9; // type:object size:0x1 scope:global align:1 data:byte +l_hio = .sbss:0x80450CCC; // type:object size:0x1 scope:local align:4 mGroundY__11fopAcM_gc_c = .sbss:0x80450CD0; // type:object size:0x4 scope:global align:4 data:float mRoofY__11fopAcM_rc_c = .sbss:0x80450CD4; // type:object size:0x4 scope:global align:4 data:float mWaterY__11fopAcM_wt_c = .sbss:0x80450CD8; // type:object size:0x4 scope:global align:4 data:float -l_fopScnRq_IsUsingOfOverlap = .sbss:0x80450CE0; // type:object size:0x4 scope:global align:4 data:4byte -fopKy_KANKYO_TYPE = .sbss:0x80450CE8; // type:object size:0x4 scope:global align:4 -fopMsg_MSG_TYPE = .sbss:0x80450CF0; // type:object size:0x4 scope:global align:4 -l_fopDwTg_id = .sbss:0x80450CF8; // type:object size:0x4 scope:global align:4 data:4byte +l_fopScnRq_IsUsingOfOverlap = .sbss:0x80450CE0; // type:object size:0x4 scope:local align:4 data:4byte +fopKy_KANKYO_TYPE = .sbss:0x80450CE8; // type:object size:0x4 scope:local align:4 +fopMsg_MSG_TYPE = .sbss:0x80450CF0; // type:object size:0x4 scope:local align:4 +l_fopDwTg_id = .sbss:0x80450CF8; // type:object size:0x4 scope:local align:4 data:4byte g_fpcBs_type = .sbss:0x80450D00; // type:object size:0x4 scope:global align:4 t_type$2207 = .sbss:0x80450D04; // type:object size:0x4 scope:local align:4 data:4byte init$13 = .sbss:0x80450D08; // type:object size:0x1 scope:local align:1 data:byte process_id$2216 = .sbss:0x80450D0C; // type:object size:0x4 scope:local align:4 data:4byte init$22 = .sbss:0x80450D10; // type:object size:0x1 scope:local align:1 data:byte -l_fpcLy_CurrLayer_p = .sbss:0x80450D18; // type:object size:0x4 scope:global align:4 data:4byte +l_fpcLy_CurrLayer_p = .sbss:0x80450D18; // type:object size:0x4 scope:local align:4 data:4byte IsInitOfLayerList$2308 = .sbss:0x80450D1C; // type:object size:0x4 scope:local align:4 data:4byte init$113 = .sbss:0x80450D20; // type:object size:0x1 scope:local align:1 data:byte layer_id$2311 = .sbss:0x80450D24; // type:object size:0x4 scope:local align:4 data:4byte @@ -21811,7 +21833,7 @@ m_branchType__7dDemo_c = .sbss:0x80450E40; // type:object size:0x2 scope:global m_branchData__7dDemo_c = .sbss:0x80450E44; // type:object size:0x4 scope:global align:4 data:4byte init$1867 = .sbss:0x80450E48; // type:object size:0x1 scope:local align:1 data:byte init$1870 = .sbss:0x80450E49; // type:object size:0x1 scope:local align:1 data:byte -it = .sbss:0x80450E4C; // type:object size:0x4 scope:local align:4 data:4byte +it$4206 = .sbss:0x80450E4C; // type:object size:0x4 scope:local align:4 data:4byte init$1672 = .sbss:0x80450E50; // type:object size:0x1 scope:local align:1 data:byte mNowStayFloorNo__10dMapInfo_c = .sbss:0x80450E58; // type:object size:0x1 scope:global align:1 data:byte mNowStayRoomNo__10dMapInfo_c = .sbss:0x80450E5C; // type:object size:0x4 scope:global align:4 data:4byte @@ -21855,17 +21877,17 @@ S_rot_work2$7557 = .sbss:0x80450EF2; // type:object size:0x2 scope:local data:2b init$7558 = .sbss:0x80450EF4; // type:object size:0x1 scope:local align:4 data:byte rot$7919 = .sbss:0x80450EF8; // type:object size:0x4 scope:local align:4 data:4byte init$7920 = .sbss:0x80450EFC; // type:object size:0x1 scope:local align:4 data:byte -init$7942 = .sbss:0x80450EFD; // type:object size:0x1 data:byte +init$5641 = .sbss:0x80450EFD; // type:object size:0x1 scope:local data:byte rot$8366 = .sbss:0x80450F00; // type:object size:0x4 scope:local align:4 data:float init$8367 = .sbss:0x80450F04; // type:object size:0x1 scope:local align:4 data:byte rot$8936 = .sbss:0x80450F08; // type:object size:0x4 scope:local align:4 data:float init$8937 = .sbss:0x80450F0C; // type:object size:0x1 scope:local align:4 data:byte -init$8943 = .sbss:0x80450F0D; // type:object size:0x1 data:byte +init$6542 = .sbss:0x80450F0D; // type:object size:0x1 scope:local data:byte S_fubuki_ratio$8948 = .sbss:0x80450F10; // type:object size:0x4 scope:local align:4 data:float init$8949 = .sbss:0x80450F14; // type:object size:0x1 scope:local align:4 data:byte rot$9421 = .sbss:0x80450F18; // type:object size:0x4 scope:local align:4 data:float init$9422 = .sbss:0x80450F1C; // type:object size:0x1 scope:local align:4 data:byte -init$9426 = .sbss:0x80450F1D; // type:object size:0x1 data:byte +init$6985 = .sbss:0x80450F1D; // type:object size:0x1 scope:local data:byte rot$9847 = .sbss:0x80450F20; // type:object size:0x4 scope:local align:4 data:float init$9848 = .sbss:0x80450F24; // type:object size:0x1 scope:local align:4 data:byte howa_loop_cnt$10108 = .sbss:0x80450F28; // type:object size:0x4 scope:local align:4 data:float @@ -21879,26 +21901,26 @@ init$11587 = .sbss:0x80450F44; // type:object size:0x1 scope:local align:4 data: rot$11958 = .sbss:0x80450F48; // type:object size:0x4 scope:local align:4 data:float init$11959 = .sbss:0x80450F4C; // type:object size:0x1 scope:local align:4 data:byte data$3831 = .sbss:0x80450F50; // type:object size:0x8 scope:local align:4 -on_final_boss_stg = .sbss:0x80450F58; // type:object size:0x1 scope:global align:1 data:byte +l_isFinalBossStg = .sbss:0x80450F58; // type:object size:0x1 scope:local align:1 data:byte l_SetCounter = .sbss:0x80450F60; // type:object size:0x4 scope:local align:4 data:4byte init$1055 = .sbss:0x80450F68; // type:object size:0x1 scope:local align:1 data:byte m_name__16dBgS_MoveBgActor = .sbss:0x80450F70; // type:object size:0x4 scope:global align:4 data:4byte m_dzb_id__16dBgS_MoveBgActor = .sbss:0x80450F74; // type:object size:0x4 scope:global align:4 data:4byte m_set_func__16dBgS_MoveBgActor = .sbss:0x80450F78; // type:object size:0x4 scope:global align:4 data:4byte -l_start = .sbss:0x80450F80; // type:object size:0x4 scope:global align:4 data:4byte -l_wcsbuf_num = .sbss:0x80450F84; // type:object size:0x4 scope:global align:4 data:4byte -init$3207 = .sbss:0x80450F88; // type:object size:0x1 data:byte -init$4121 = .sbss:0x80450F89; // type:object size:0x1 data:byte +l_start = .sbss:0x80450F80; // type:object size:0x4 scope:local align:4 data:4byte +l_wcsbuf_num = .sbss:0x80450F84; // type:object size:0x4 scope:local align:4 data:4byte +init$3387 = .sbss:0x80450F88; // type:object size:0x1 scope:local data:byte +init$4295 = .sbss:0x80450F89; // type:object size:0x1 scope:local data:byte init$4717 = .sbss:0x80450F8A; // type:object size:0x1 scope:local align:1 data:byte -init$7803 = .sbss:0x80450F8B; // type:object size:0x1 data:byte +init$8022 = .sbss:0x80450F8B; // type:object size:0x1 scope:local data:byte mData__12dEnemyItem_c = .sbss:0x80450F90; // type:object size:0x4 scope:global align:4 data:4byte mTypeGroupData__7dTres_c = .sbss:0x80450F98; // type:object size:0x4 scope:global align:4 data:4byte mNum__7dTres_c = .sbss:0x80450F9C; // type:object size:0x2 scope:global align:2 data:2byte m_myObj__10dMdl_mng_c = .sbss:0x80450FA0; // type:object size:0x4 scope:global align:4 data:4byte m_obj__12dEyeHL_mng_c = .sbss:0x80450FA8; // type:object size:0x4 scope:global align:4 data:4byte -l_dvdError$1875 = .sbss:0x80450FB0; // type:object size:0x1 data:byte -l_texCopied$1898 = .sbss:0x80450FB1; // type:object size:0x1 data:byte -init$1899 = .sbss:0x80450FB2; // type:object size:0x1 data:byte +l_dvdError$1906 = .sbss:0x80450FB0; // type:object size:0x1 scope:local data:byte +l_texCopied$1929 = .sbss:0x80450FB1; // type:object size:0x1 scope:local data:byte +init$1930 = .sbss:0x80450FB2; // type:object size:0x1 scope:local data:byte init$11203 = .sbss:0x80450FB8; // type:object size:0x1 scope:global align:1 data:byte init$11207 = .sbss:0x80450FB9; // type:object size:0x1 scope:global align:1 data:byte init$11211 = .sbss:0x80450FBA; // type:object size:0x1 scope:global align:1 data:byte @@ -21923,7 +21945,7 @@ m_set_func__23daBaseNpc_moveBgActor_c = .sbss:0x80450FE8; // type:object size:0x init$7237 = .sbss:0x80450FEC; // type:object size:0x1 scope:local align:4 data:byte mFindCount__8daNpcF_c = .sbss:0x80450FF0; // type:object size:0x4 scope:global align:4 data:4byte mSrchActorName__8daNpcF_c = .sbss:0x80450FF4; // type:object size:0x2 scope:global align:2 data:2byte -init$1719 = .sbss:0x80450FF8; // type:object size:0x1 scope:global align:1 data:byte +init$2005 = .sbss:0x80450FF8; // type:object size:0x1 scope:local align:1 data:byte init$1834 = .sbss:0x80451000; // type:object size:0x1 scope:local align:1 data:byte target = .sbss:0x80451004; // type:object size:0x4 scope:global align:4 data:4byte targetWay = .sbss:0x80451008; // type:object size:0x4 scope:global align:4 data:float @@ -21949,18 +21971,18 @@ init$12264 = .sbss:0x80451046; // type:object size:0x1 data:byte LatMin$14963 = .sbss:0x80451048; // type:object size:0x2 scope:local align:4 data:2byte init$12268 = .sbss:0x8045104A; // type:object size:0x1 data:byte LatMax$14967 = .sbss:0x8045104C; // type:object size:0x2 scope:local align:4 data:2byte -g_siHIO = .sbss:0x80451050; // type:object size:0x8 scope:global align:4 +g_siHIO = .sbss:0x80451050; // type:object size:0x8 scope:local align:4 dShopSystem_sellItemMax = .sbss:0x80451058; // type:object size:0x1 scope:local align:1 data:byte -dShopSystem_item_count = .sbss:0x8045105C; // type:object size:0x4 scope:global align:4 data:4byte +dShopSystem_item_count = .sbss:0x8045105C; // type:object size:0x4 scope:local align:4 data:4byte data_80451060 = .sbss:0x80451060; // type:object size:0x1 scope:local align:1 data:byte -dShopSystem_camera_count = .sbss:0x80451064; // type:object size:0x4 scope:global align:4 data:4byte +dShopSystem_camera_count = .sbss:0x80451064; // type:object size:0x4 scope:local align:4 data:4byte S_fuwan_sin$5904 = .sbss:0x80451068; // type:object size:0x2 scope:local align:4 data:2byte -init$4995 = .sbss:0x8045106A; // type:object size:0x1 data:byte -init$4999 = .sbss:0x8045106B; // type:object size:0x1 data:byte +init$5117 = .sbss:0x8045106A; // type:object size:0x1 scope:local data:byte +init$5121 = .sbss:0x8045106B; // type:object size:0x1 scope:local data:byte init$localstatic4$draw__10dThunder_cFv = .sbss:0x80451070; // type:object size:0x1 scope:weak align:1 data:byte init$localstatic6$draw__10dThunder_cFv = .sbss:0x80451071; // type:object size:0x1 scope:weak align:1 data:byte -player_px = .sbss:0x80451078; // type:object size:0x4 scope:global align:4 data:float -player_py = .sbss:0x8045107C; // type:object size:0x4 scope:global align:4 data:float +player_px = .sbss:0x80451078; // type:object size:0x4 scope:local align:4 data:float +player_py = .sbss:0x8045107C; // type:object size:0x4 scope:local align:4 data:float myclass__12dMenu_Dmap_c = .sbss:0x80451080; // type:object size:0x4 scope:global align:4 data:4byte m_res__22dMdm_HIO_prm_res_dst_s = .sbss:0x80451088; // type:object size:0x4 scope:global align:4 data:4byte m_zoomCenterMinX__20dMenu_StageMapCtrl_c = .sbss:0x8045108C; // type:object size:0x4 scope:global align:4 data:float @@ -21977,18 +21999,18 @@ mMoji$3770 = .sbss:0x804510C0; // type:object size:0x3 scope:local align:4 data: s_groupID = .sbss:0x804510C8; // type:object size:0x2 scope:global align:2 data:2byte g_msg_unit = .sbss:0x804510D0; // type:object size:0x4 scope:global align:4 l_lightCount = .sbss:0x804510D8; // type:object size:0x1 scope:local align:1 data:byte -dOvlpFd_execute_f = .sbss:0x804510E0; // type:object size:0x4 scope:global align:4 data:4byte -g_LogHIO = .sbss:0x804510E8; // type:object size:0x8 scope:global align:4 -g_snHIO = .sbss:0x804510F0; // type:object size:0x8 scope:global align:4 -resPhase = .sbss:0x804510F8; // type:object size:0x8 scope:global align:4 -dylPhase = .sbss:0x80451100; // type:object size:0x8 scope:global align:4 -dylPreLoadTime1 = .sbss:0x80451108; // type:object size:0x8 scope:global align:8 data:4byte -resPreLoadTime0 = .sbss:0x80451110; // type:object size:0x8 scope:global align:8 data:4byte -resPreLoadTime1 = .sbss:0x80451118; // type:object size:0x8 scope:global align:8 data:4byte -g_preLoadHIO = .sbss:0x80451120; // type:object size:0x4 scope:global align:4 data:4byte +dOvlpFd_execute_f = .sbss:0x804510E0; // type:object size:0x4 scope:local align:4 data:4byte +g_LogHIO = .sbss:0x804510E8; // type:object size:0x8 scope:local align:4 +g_snHIO = .sbss:0x804510F0; // type:object size:0x8 scope:local align:4 +resPhase = .sbss:0x804510F8; // type:object size:0x8 scope:local align:4 +dylPhase = .sbss:0x80451100; // type:object size:0x8 scope:local align:4 +dylPreLoadTime1 = .sbss:0x80451108; // type:object size:0x8 scope:local align:8 data:4byte +resPreLoadTime0 = .sbss:0x80451110; // type:object size:0x8 scope:local align:8 data:4byte +resPreLoadTime1 = .sbss:0x80451118; // type:object size:0x8 scope:local align:8 data:4byte +g_preLoadHIO = .sbss:0x80451120; // type:object size:0x4 scope:local align:4 data:4byte pauseTimer__9dScnPly_c = .sbss:0x80451124; // type:object size:0x1 scope:global align:1 data:byte nextPauseTimer__9dScnPly_c = .sbss:0x80451125; // type:object size:0x1 scope:global align:1 data:byte -g_regHIO = .sbss:0x80451128; // type:object size:0x4 scope:global align:4 data:4byte +g_regHIO = .sbss:0x80451128; // type:object size:0x8 scope:global align:4 data:4byte m_nowID__9dkWmark_c = .sbss:0x80451130; // type:object size:0x4 scope:global align:4 data:4byte init$localstatic4$create__9dkWmark_cFv = .sbss:0x80451134; // type:object size:0x1 scope:weak align:1 data:byte mFirst__24DynamicModuleControlBase = .sbss:0x80451138; // type:object size:0x4 scope:global align:4 data:4byte @@ -21999,12 +22021,12 @@ sFileCache__20DynamicModuleControl = .sbss:0x80451148; // type:object size:0x4 s Heap__3cMl = .sbss:0x80451150; // type:object size:0x4 scope:global align:4 data:4byte init$296 = .sbss:0x80451158; // type:object size:0x1 scope:local align:1 data:byte Zero__5csXyz = .sbss:0x80451160; // type:object size:0x6 scope:global align:4 -r0 = .sbss:0x80451168; // type:object size:0x4 scope:global align:4 data:4byte -r1 = .sbss:0x8045116C; // type:object size:0x4 scope:global align:4 data:4byte -r2 = .sbss:0x80451170; // type:object size:0x4 scope:global align:4 data:4byte -r02 = .sbss:0x80451174; // type:object size:0x4 scope:global align:4 data:4byte -r12 = .sbss:0x80451178; // type:object size:0x4 scope:global align:4 data:4byte -r22 = .sbss:0x8045117C; // type:object size:0x4 scope:global align:4 data:4byte +r0 = .sbss:0x80451168; // type:object size:0x4 scope:local align:4 data:4byte +r1 = .sbss:0x8045116C; // type:object size:0x4 scope:local align:4 data:4byte +r2 = .sbss:0x80451170; // type:object size:0x4 scope:local align:4 data:4byte +r02 = .sbss:0x80451174; // type:object size:0x4 scope:local align:4 data:4byte +r12 = .sbss:0x80451178; // type:object size:0x4 scope:local align:4 data:4byte +r22 = .sbss:0x8045117C; // type:object size:0x4 scope:local align:4 data:4byte G_CM3D_F_ABS_MIN = .sbss:0x80451180; // type:object size:0x4 scope:global align:4 data:float _0__7cSAngle = .sbss:0x80451188; // type:object size:0x2 scope:global align:4 data:2byte _1__7cSAngle = .sbss:0x8045118C; // type:object size:0x2 scope:global align:4 @@ -22021,7 +22043,7 @@ systemConsole__9JFWSystem = .sbss:0x804511B8; // type:object size:0x4 scope:glob sInitCalled__9JFWSystem = .sbss:0x804511BC; // type:object size:0x1 scope:global align:1 data:byte sManager__10JFWDisplay = .sbss:0x804511C0; // type:object size:0x4 scope:global align:4 data:4byte prevFrame$2597 = .sbss:0x804511C4; // type:object size:0x4 scope:local align:4 data:4byte -data_804511C8 = .sbss:0x804511C8; // type:object size:0x1 scope:local align:1 data:byte +init$741 = .sbss:0x804511C8; // type:object size:0x1 scope:local align:1 data:byte nextTick$2642 = .sbss:0x804511D0; // type:object size:0x8 scope:local align:8 data:4byte init$579 = .sbss:0x804511D8; // type:object size:0x1 scope:local align:1 data:byte nextCount$2650 = .sbss:0x804511DC; // type:object size:0x4 scope:local align:4 data:4byte @@ -22035,10 +22057,10 @@ JASDram = .sbss:0x80451210; // type:object size:0x4 scope:global align:4 data:4b sAramBase__9JASKernel = .sbss:0x80451214; // type:object size:0x4 scope:global align:4 data:4byte sSystemHeap__9JASKernel = .sbss:0x80451218; // type:object size:0x4 scope:global align:4 data:4byte sCommandHeap__9JASKernel = .sbss:0x8045121C; // type:object size:0x4 scope:global align:4 data:4byte -sBuffer = .sbss:0x80451220; // type:object size:0x4 scope:global align:4 data:4byte -sLineMax = .sbss:0x80451224; // type:object size:0x4 scope:global align:4 data:4byte -sLineCount = .sbss:0x80451228; // type:object size:0x4 scope:global align:4 data:4byte -sTop = .sbss:0x8045122C; // type:object size:0x4 scope:global align:4 data:4byte +sBuffer = .sbss:0x80451220; // type:object size:0x4 scope:local align:4 data:4byte +sLineMax = .sbss:0x80451224; // type:object size:0x4 scope:local align:4 data:4byte +sLineCount = .sbss:0x80451228; // type:object size:0x4 scope:local align:4 data:4byte +sTop = .sbss:0x8045122C; // type:object size:0x4 scope:local align:4 data:4byte init$localstatic4$getMemPool__58JASPoolAllocObject_MultiThreadedFv = .sbss:0x80451230; // type:object size:0x1 scope:global data:byte init$localstatic4$getMemPool__43JASPoolAllocObject_MultiThreaded<8JASTrack>Fv = .sbss:0x80451231; // type:object size:0x1 scope:global align:1 data:byte sDefaultParser__10JASSeqCtrl = .sbss:0x80451238; // type:object size:0x4 scope:global align:4 data:4byte @@ -22049,16 +22071,16 @@ sLoadThread__13JASAramStream = .sbss:0x80451250; // type:object size:0x4 scope:g sReadBuffer__13JASAramStream = .sbss:0x80451254; // type:object size:0x4 scope:global align:4 data:4byte sBlockSize__13JASAramStream = .sbss:0x80451258; // type:object size:0x4 scope:global align:4 data:4byte sChannelMax__13JASAramStream = .sbss:0x8045125C; // type:object size:0x4 scope:global align:4 data:4byte -data_80451260 = .sbss:0x80451260; // type:object size:0x1 scope:global align:1 data:byte -data_80451261 = .sbss:0x80451261; // type:object size:0x1 scope:global align:1 data:byte -init$localstatic4$getMemPool__46JASPoolAllocObject_MultiThreaded<10JASChannel>Fv = .sbss:0x80451262; // type:object size:0x1 scope:global align:1 data:byte +struct_80451260 = .sbss:0x80451260; // type:object size:0x1 scope:global align:1 data:byte +struct_80451261 = .sbss:0x80451261; // type:object size:0x1 scope:global align:1 data:byte +init$localstatic4$getMemPool__46JASPoolAllocObject_MultiThreaded<10JASChannel>Fv = .sbss:0x80451262; // type:object size:0x1 scope:weak align:1 data:byte sOscTable__12JASVoiceBank = .sbss:0x80451268; // type:object size:0x4 scope:global align:4 data:4byte oscp$214 = .sbss:0x80451270; // type:object size:0x4 scope:local align:4 data:4byte -data_80451274 = .sbss:0x80451274; // type:object size:0x1 scope:local align:4 data:byte +data_80451274$0 = .sbss:0x80451274; // type:object size:0x1 scope:local align:4 data:byte mNoLoad__16JASBasicWaveBank = .sbss:0x80451278; // type:object size:0x4 scope:global align:4 sUsedHeapSize__11JASWSParser = .sbss:0x80451280; // type:object size:0x4 scope:global align:4 data:4byte sUsedHeapSize__12JASBNKParser = .sbss:0x80451288; // type:object size:0x4 scope:global align:4 data:4byte -__init__memPool___46JASPoolAllocObject_MultiThreaded<10JASChannel> = .sbss:0x8045128C; // type:object size:0x1 scope:local align:4 data:byte +__init__memPool___46JASPoolAllocObject_MultiThreaded<10JASChannel> = .sbss:0x8045128C; // type:object size:0x1 scope:weak align:4 data:byte sAramHeap__16JASWaveArcLoader = .sbss:0x80451290; // type:object size:0x4 scope:global align:4 data:4byte sBankDisposeListSize__10JASChannel = .sbss:0x80451298; // type:object size:0x4 scope:global align:4 data:4byte sDspDacBuffer__9JASDriver = .sbss:0x804512A0; // type:object size:0x4 scope:global align:4 data:4byte @@ -22074,7 +22096,7 @@ sSubFrameCounter__9JASDriver = .sbss:0x804512C4; // type:object size:0x4 scope:g dacp$239 = .sbss:0x804512C8; // type:object size:0x4 scope:local align:4 data:4byte init$58 = .sbss:0x804512CC; // type:object size:0x1 scope:local align:1 data:byte old_time$264 = .sbss:0x804512D0; // type:object size:0x4 scope:local align:4 data:4byte -data_804512D4 = .sbss:0x804512D4; // type:object size:0x4 scope:local align:4 data:byte +init$374 = .sbss:0x804512D4; // type:object size:0x1 scope:local align:1 data:byte snIntCount__14JASAudioThread = .sbss:0x804512D8; // type:object size:0x4 scope:global align:4 data:4byte sDspChannels__13JASDSPChannel = .sbss:0x804512E0; // type:object size:0x4 scope:global align:4 data:4byte CH_BUF__6JASDsp = .sbss:0x804512E8; // type:object size:0x4 scope:global align:4 data:4byte @@ -22082,16 +22104,16 @@ FX_BUF__6JASDsp = .sbss:0x804512EC; // type:object size:0x4 scope:global align:4 sDSPVolume__6JASDsp = .sbss:0x804512F0; // type:object size:0x4 scope:global align:4 data:float data_804512F4$25 = .sbss:0x804512F4; // type:object size:0x1 scope:local align:1 data:byte init$26 = .sbss:0x804512F5; // type:object size:0x1 scope:local align:1 data:byte -flag = .sbss:0x804512F8; // type:object size:0x4 scope:global align:4 data:4byte -taskreadp = .sbss:0x80451300; // type:object size:0x4 scope:global align:4 data:4byte -taskwritep = .sbss:0x80451304; // type:object size:0x4 scope:global align:4 data:4byte +flag = .sbss:0x804512F8; // type:object size:0x4 scope:local align:4 data:4byte +taskreadp = .sbss:0x80451300; // type:object size:0x4 scope:local align:4 data:4byte +taskwritep = .sbss:0x80451304; // type:object size:0x4 scope:local align:4 data:4byte struct_80451308 = .sbss:0x80451308; // type:object size:0x1 scope:local align:1 data:byte struct_80451309 = .sbss:0x80451309; // type:object size:0x1 scope:local align:1 data:byte DSP_prior_task = .sbss:0x8045130C; // type:object size:0x4 scope:global align:4 data:4byte -init$localstatic4$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .sbss:0x80451310; // type:object size:0x1 scope:global align:1 data:byte -init$localstatic4$getMemPool___35JASPoolAllocObject<13JAISoundChild>Fv = .sbss:0x80451318; // type:object size:0x1 scope:global align:1 data:byte -init$localstatic4$getMemPool___27JASPoolAllocObject<6JAISeq>Fv = .sbss:0x80451320; // type:object size:0x1 scope:global align:1 data:byte -init$localstatic4$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .sbss:0x80451328; // type:object size:0x1 scope:global align:1 data:byte +init$localstatic4$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .sbss:0x80451310; // type:object size:0x1 scope:weak align:1 data:byte +init$localstatic4$getMemPool___35JASPoolAllocObject<13JAISoundChild>Fv = .sbss:0x80451318; // type:object size:0x1 scope:weak align:1 data:byte +init$localstatic4$getMemPool___27JASPoolAllocObject<6JAISeq>Fv = .sbss:0x80451320; // type:object size:0x1 scope:weak align:1 data:byte +init$localstatic4$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .sbss:0x80451328; // type:object size:0x1 scope:weak align:1 data:byte init$80 = .sbss:0x80451330; // type:object size:0x1 scope:local align:1 data:byte oRandom$401 = .sbss:0x80451334; // type:object size:0x4 scope:local align:4 data:4byte MIN_DISTANCE_VOLUME__7Z2Param = .sbss:0x80451338; // type:object size:0x4 scope:global align:4 data:float @@ -22099,9 +22121,9 @@ ENEMY_LASTHIT_MUTE_VOLUME__7Z2Param = .sbss:0x8045133C; // type:object size:0x4 DARK_SE_FILTER_ON__7Z2Param = .sbss:0x80451340; // type:object size:0x1 scope:global align:1 data:byte DARK_SE_LOW_PASS_FILTER_SETTING__7Z2Param = .sbss:0x80451341; // type:object size:0x1 scope:global align:1 data:byte SYSTEM_SE_USE_DARK_SE_SETTING__7Z2Param = .sbss:0x80451342; // type:object size:0x1 scope:global align:1 data:byte -init$localstatic4$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = .sbss:0x80451348; // type:object size:0x1 scope:global align:1 data:byte +init$localstatic4$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = .sbss:0x80451348; // type:object size:0x1 scope:weak align:1 data:byte cNearFarRatio = .sbss:0x80451350; // type:object size:0x4 scope:local align:4 data:float -init$localstatic4$getMemPool___30JASPoolAllocObject<9Z2Audible>Fv = .sbss:0x80451354; // type:object size:0x1 scope:global align:1 data:byte +init$localstatic4$getMemPool___30JASPoolAllocObject<9Z2Audible>Fv = .sbss:0x80451354; // type:object size:0x1 scope:weak align:1 data:byte data_80451358 = .sbss:0x80451358; // type:object size:0x1 scope:global align:1 data:byte data_80451359 = .sbss:0x80451359; // type:object size:0x1 scope:global align:1 data:byte mLinkPtr__14Z2CreatureLink = .sbss:0x80451360; // type:object size:0x4 scope:global align:4 data:4byte @@ -22116,14 +22138,15 @@ mCodeEnd__7JKRHeap = .sbss:0x80451388; // type:object size:0x4 scope:global alig mUserRamStart__7JKRHeap = .sbss:0x8045138C; // type:object size:0x4 scope:global align:4 data:4byte mUserRamEnd__7JKRHeap = .sbss:0x80451390; // type:object size:0x4 scope:global align:4 data:4byte mMemorySize__7JKRHeap = .sbss:0x80451394; // type:object size:0x4 scope:global align:4 data:4byte -DBfoundSize = .sbss:0x80451398; // type:object size:0x4 scope:global align:4 data:4byte -DBfoundOffset = .sbss:0x8045139C; // type:object size:0x4 scope:global align:4 data:4byte -DBfoundBlock = .sbss:0x804513A0; // type:object size:0x4 scope:global align:4 data:4byte -DBnewFreeBlock = .sbss:0x804513A4; // type:object size:0x4 scope:global align:4 data:4byte -DBnewUsedBlock = .sbss:0x804513A8; // type:object size:0x4 scope:global align:4 data:4byte +DBfoundSize = .sbss:0x80451398; // type:object size:0x4 scope:local align:4 data:4byte +DBfoundOffset = .sbss:0x8045139C; // type:object size:0x4 scope:local align:4 data:4byte +DBfoundBlock = .sbss:0x804513A0; // type:object size:0x4 scope:local align:4 data:4byte +DBnewFreeBlock = .sbss:0x804513A4; // type:object size:0x4 scope:local align:4 data:4byte +DBnewUsedBlock = .sbss:0x804513A8; // type:object size:0x4 scope:local align:4 data:4byte sManager__15JKRThreadSwitch = .sbss:0x804513B0; // type:object size:0x4 scope:global align:4 data:4byte sTotalCount__15JKRThreadSwitch = .sbss:0x804513B4; // type:object size:0x4 scope:global align:4 data:4byte -sTotalStart__15JKRThreadSwitch = .sbss:0x804513B8; // type:object size:0x8 scope:global align:4 data:4byte +sTotalStart__15JKRThreadSwitch = .sbss:0x804513B8; // type:object size:0x4 scope:global align:4 data:4byte +data_804513BC = .sbss:0x804513BC; // type:object size:0x4 scope:global align:4 data:4byte mUserPreCallback__15JKRThreadSwitch = .sbss:0x804513C0; // type:object size:0x4 scope:global align:4 data:4byte mUserPostCallback__15JKRThreadSwitch = .sbss:0x804513C4; // type:object size:0x4 scope:global align:4 data:4byte sAramObject__7JKRAram = .sbss:0x804513C8; // type:object size:0x4 scope:global align:4 data:4byte @@ -22135,7 +22158,7 @@ refCurrent = .sbss:0x804513DC; // type:object size:0x4 scope:local align:4 data: srcOffset = .sbss:0x804513E0; // type:object size:0x4 scope:local align:4 data:4byte transLeft = .sbss:0x804513E4; // type:object size:0x4 scope:local align:4 data:4byte srcLimit = .sbss:0x804513E8; // type:object size:0x4 scope:local align:4 data:4byte -srcAddress = .sbss:0x804513EC; // type:object size:0x4 scope:global align:4 data:4byte +srcAddress = .sbss:0x804513EC; // type:object size:0x4 scope:local align:4 data:4byte fileOffset = .sbss:0x804513F0; // type:object size:0x4 scope:local align:4 data:4byte readCount = .sbss:0x804513F4; // type:object size:0x4 scope:local align:4 data:4byte maxDest = .sbss:0x804513F8; // type:object size:0x4 scope:local align:4 data:4byte @@ -22168,9 +22191,9 @@ szpEnd = .sbss:0x8045146C; // type:object size:0x4 scope:local align:4 data:4byt refBuf = .sbss:0x80451470; // type:object size:0x4 scope:local align:4 data:4byte refEnd = .sbss:0x80451474; // type:object size:0x4 scope:local align:4 data:4byte refCurrent = .sbss:0x80451478; // type:object size:0x4 scope:local align:4 data:4byte -dmaBuf = .sbss:0x8045147C; // type:object size:0x4 scope:global align:4 data:4byte -dmaEnd = .sbss:0x80451480; // type:object size:0x4 scope:global align:4 data:4byte -dmaCurrent = .sbss:0x80451484; // type:object size:0x4 scope:global align:4 data:4byte +dmaBuf = .sbss:0x8045147C; // type:object size:0x4 scope:local align:4 data:4byte +dmaEnd = .sbss:0x80451480; // type:object size:0x4 scope:local align:4 data:4byte +dmaCurrent = .sbss:0x80451484; // type:object size:0x4 scope:local align:4 data:4byte srcOffset = .sbss:0x80451488; // type:object size:0x4 scope:local align:4 data:4byte transLeft = .sbss:0x8045148C; // type:object size:0x4 scope:local align:4 data:4byte srcLimit = .sbss:0x80451490; // type:object size:0x4 scope:local align:4 data:4byte @@ -22208,7 +22231,7 @@ sConsole__12JUTException = .sbss:0x8045151C; // type:object size:0x4 scope:globa msr__12JUTException = .sbss:0x80451520; // type:object size:0x4 scope:global align:4 data:4byte fpscr__12JUTException = .sbss:0x80451524; // type:object size:0x4 scope:global align:4 data:4byte sDirectPrint__14JUTDirectPrint = .sbss:0x80451528; // type:object size:0x4 scope:global align:4 data:4byte -sMessageLife__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x80451530; // type:object size:0x4 scope:global align:4 data:4byte +sMessageLife__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x80451530; // type:object size:0x4 scope:local align:4 data:4byte sManager__8JUTVideo = .sbss:0x80451538; // type:object size:0x4 scope:global align:4 data:4byte sVideoLastTick__8JUTVideo = .sbss:0x8045153C; // type:object size:0x4 scope:global align:4 data:4byte sVideoInterval__8JUTVideo = .sbss:0x80451540; // type:object size:0x4 scope:global align:4 data:4byte @@ -22222,8 +22245,8 @@ init$231 = .sbss:0x80451560; // type:object size:0x1 scope:local align:1 data:by cntUser$2379 = .sbss:0x80451564; // type:object size:0x4 scope:local align:4 data:4byte init$280 = .sbss:0x80451568; // type:object size:0x1 scope:local align:1 data:byte sManager__17JUTConsoleManager = .sbss:0x80451570; // type:object size:0x4 scope:global align:4 data:4byte -sReportConsole = .sbss:0x80451574; // type:object size:0x4 scope:global align:4 data:4byte -sWarningConsole = .sbss:0x80451578; // type:object size:0x4 scope:global align:4 data:4byte +sReportConsole = .sbss:0x80451574; // type:object size:0x4 scope:local align:4 data:4byte +sWarningConsole = .sbss:0x80451578; // type:object size:0x4 scope:local align:4 data:4byte mStrBuff__8J2DPrint = .sbss:0x80451580; // type:object size:0x4 scope:global align:4 data:4byte sStrBufInitialized = .sbss:0x80451584; // type:object size:0x1 scope:local align:1 data:byte mStrBuffSize__8J2DPrint = .sbss:0x80451588; // type:object size:0x4 scope:global align:4 data:4byte @@ -22242,213 +22265,213 @@ sTexMtxObj__17J3DDifferedTexMtx = .sbss:0x804515C4; // type:object size:0x4 scop sInterruptFlag$903 = .sbss:0x804515C8; // type:object size:0x4 scope:local align:4 data:4byte init$465 = .sbss:0x804515CC; // type:object size:0x1 scope:local align:1 data:byte sOldVcdVatCmd__8J3DShape = .sbss:0x804515D0; // type:object size:0x4 scope:global align:4 data:4byte -sEnvelopeFlag__8J3DShape = .sbss:0x804515D4; // type:object size:0x1 scope:local align:1 data:byte +sEnvelopeFlag__8J3DShape = .sbss:0x804515D4; // type:object size:0x1 scope:global align:1 data:byte SizeOfJ3DColorBlockLightOffLoad = .sbss:0x804515D8; // type:object size:0x4 scope:global align:4 data:4byte SizeOfJ3DColorBlockAmbientOnLoad = .sbss:0x804515DC; // type:object size:0x4 scope:global align:4 data:4byte entryNum__13J3DDrawBuffer = .sbss:0x804515E0; // type:object size:0x4 scope:global align:4 data:4byte sInterruptFlag$965 = .sbss:0x804515E8; // type:object size:0x4 scope:local align:4 data:4byte -sInitInterruptFlag = .sbss:0x804515EC; // type:object size:0x1 scope:local align:1 data:byte +init$461 = .sbss:0x804515EC; // type:object size:0x1 scope:local align:1 data:byte mMtxBuffer__10J3DMtxCalc = .sbss:0x804515F0; // type:object size:0x4 scope:global align:4 data:4byte mJoint__10J3DMtxCalc = .sbss:0x804515F4; // type:object size:0x4 scope:global align:4 data:4byte mCurrentMtxCalc__8J3DJoint = .sbss:0x804515F8; // type:object size:0x4 scope:global align:4 data:4byte BootInfo = .sbss:0x80451600; // type:object size:0x4 scope:local align:4 data:4byte -BI2DebugFlag = .sbss:0x80451604; // type:object size:0x4 scope:global align:4 data:4byte -BI2DebugFlagHolder = .sbss:0x80451608; // type:object size:0x4 scope:global align:4 data:4byte -__OSIsGcam = .sbss:0x8045160C; // type:object size:0x4 scope:global align:4 data:4byte +BI2DebugFlag = .sbss:0x80451604; // type:object size:0x4 scope:local align:4 data:4byte +BI2DebugFlagHolder = .sbss:0x80451608; // type:object size:0x4 scope:local align:4 data:4byte +__OSIsGcam = .sbss:0x8045160C; // type:object size:0x4 scope:weak align:4 data:4byte ZeroF = .sbss:0x80451610; // type:object size:0x8 scope:global align:8 data:double ZeroPS = .sbss:0x80451618; // type:object size:0x8 scope:global align:8 AreWeInitialized = .sbss:0x80451620; // type:object size:0x4 scope:global align:4 data:4byte OSExceptionTable = .sbss:0x80451624; // type:object size:0x4 scope:global align:4 data:4byte __OSInIPL = .sbss:0x80451628; // type:object size:0x4 scope:global align:4 data:4byte __OSStartTime = .sbss:0x80451630; // type:object size:0x8 scope:global align:8 data:4byte -AlarmQueue = .sbss:0x80451638; // type:object size:0x8 scope:global align:4 data:4byte -HeapArray = .sbss:0x80451640; // type:object size:0x4 scope:global align:4 data:4byte -NumHeaps = .sbss:0x80451644; // type:object size:0x4 scope:global align:4 data:4byte -ArenaStart = .sbss:0x80451648; // type:object size:0x4 scope:global align:4 data:4byte -ArenaEnd = .sbss:0x8045164C; // type:object size:0x4 scope:global align:4 data:4byte -__OSArenaHi = .sbss:0x80451650; // type:object size:0x4 scope:global align:4 data:4byte -Prepared = .sbss:0x80451658; // type:object size:0x4 scope:global align:4 data:4byte +AlarmQueue = .sbss:0x80451638; // type:object size:0x8 scope:local align:4 data:4byte +HeapArray = .sbss:0x80451640; // type:object size:0x4 scope:local align:4 data:4byte +NumHeaps = .sbss:0x80451644; // type:object size:0x4 scope:local align:4 data:4byte +ArenaStart = .sbss:0x80451648; // type:object size:0x4 scope:local align:4 data:4byte +ArenaEnd = .sbss:0x8045164C; // type:object size:0x4 scope:local align:4 data:4byte +__OSArenaHi = .sbss:0x80451650; // type:object size:0x4 scope:local align:4 data:4byte +Prepared = .sbss:0x80451658; // type:object size:0x4 scope:local align:4 data:4byte apploaderPosition$69 = .sbss:0x8045165C; // type:object size:0x4 scope:local align:4 data:4byte -FontDataAnsi = .sbss:0x80451660; // type:object size:0x4 scope:global align:4 data:4byte -FontDataSjis = .sbss:0x80451664; // type:object size:0x4 scope:global align:4 data:4byte -ParseString = .sbss:0x80451668; // type:object size:0x4 scope:global align:4 data:4byte -InterruptHandlerTable = .sbss:0x80451670; // type:object size:0x4 scope:global align:4 data:4byte +FontDataAnsi = .sbss:0x80451660; // type:object size:0x4 scope:local align:4 data:4byte +FontDataSjis = .sbss:0x80451664; // type:object size:0x4 scope:local align:4 data:4byte +ParseString = .sbss:0x80451668; // type:object size:0x4 scope:local align:4 data:4byte +InterruptHandlerTable = .sbss:0x80451670; // type:object size:0x4 scope:local align:4 data:4byte __OSLastInterruptSrr0 = .sbss:0x80451674; // type:object size:0x4 scope:global align:4 data:4byte __OSLastInterrupt = .sbss:0x80451678; // type:object size:0x2 scope:global align:2 data:2byte __OSLastInterruptTime = .sbss:0x80451680; // type:object size:0x8 scope:global align:8 data:4byte -SaveStart = .sbss:0x80451688; // type:object size:0x4 scope:global align:4 data:4byte -SaveEnd = .sbss:0x8045168C; // type:object size:0x4 scope:global align:4 data:4byte -ResetFunctionQueue = .sbss:0x80451690; // type:object size:0x8 scope:global align:4 data:4byte -bootThisDol = .sbss:0x80451698; // type:object size:0x4 scope:global align:4 data:4byte -ResetCallback = .sbss:0x804516A0; // type:object size:0x4 scope:global align:4 data:4byte -Down = .sbss:0x804516A4; // type:object size:0x4 scope:global align:4 data:4byte +SaveStart = .sbss:0x80451688; // type:object size:0x4 scope:local align:4 data:4byte +SaveEnd = .sbss:0x8045168C; // type:object size:0x4 scope:local align:4 data:4byte +ResetFunctionQueue = .sbss:0x80451690; // type:object size:0x8 scope:local align:4 data:4byte +bootThisDol = .sbss:0x80451698; // type:object size:0x4 scope:local align:4 data:4byte +ResetCallback = .sbss:0x804516A0; // type:object size:0x4 scope:local align:4 data:4byte +Down = .sbss:0x804516A4; // type:object size:0x4 scope:local align:4 data:4byte LastState = .sbss:0x804516A8; // type:object size:0x4 scope:local align:4 data:4byte -HoldUp = .sbss:0x804516B0; // type:object size:0x8 scope:global align:8 data:4byte -HoldDown = .sbss:0x804516B8; // type:object size:0x8 scope:global align:8 data:4byte -RunQueueBits = .sbss:0x804516C0; // type:object size:0x4 scope:global align:4 data:4byte -RunQueueHint = .sbss:0x804516C4; // type:object size:0x4 scope:global align:4 data:4byte -Reschedule = .sbss:0x804516C8; // type:object size:0x4 scope:global align:4 data:4byte +HoldUp = .sbss:0x804516B0; // type:object size:0x8 scope:local align:8 data:4byte +HoldDown = .sbss:0x804516B8; // type:object size:0x8 scope:local align:8 data:4byte +RunQueueBits = .sbss:0x804516C0; // type:object size:0x4 scope:local align:4 data:4byte +RunQueueHint = .sbss:0x804516C4; // type:object size:0x4 scope:local align:4 data:4byte +Reschedule = .sbss:0x804516C8; // type:object size:0x4 scope:local align:4 data:4byte Debug_BBA = .sbss:0x804516D0; // type:object size:0x1 scope:global align:8 data:byte -IDSerialPort1 = .sbss:0x804516D8; // type:object size:0x4 scope:global align:4 data:4byte -Chan = .sbss:0x804516E0; // type:object size:0x4 scope:global align:4 data:4byte -Dev = .sbss:0x804516E4; // type:object size:0x4 scope:global align:4 data:4byte -Enabled = .sbss:0x804516E8; // type:object size:0x4 scope:global align:4 data:4byte -BarnacleEnabled = .sbss:0x804516EC; // type:object size:0x4 scope:global align:4 data:4byte +IDSerialPort1 = .sbss:0x804516D8; // type:object size:0x4 scope:local align:4 data:4byte +Chan = .sbss:0x804516E0; // type:object size:0x4 scope:local align:4 data:4byte +Dev = .sbss:0x804516E4; // type:object size:0x4 scope:local align:4 data:4byte +Enabled = .sbss:0x804516E8; // type:object size:0x4 scope:local align:4 data:4byte +BarnacleEnabled = .sbss:0x804516EC; // type:object size:0x4 scope:local align:4 data:4byte cmdTypeAndStatus$78 = .sbss:0x804516F0; // type:object size:0x4 scope:local align:4 cmdTypeAndStatus$372 = .sbss:0x804516F4; // type:object size:0x4 scope:local align:4 __PADFixBits = .sbss:0x804516F8; // type:object size:0x4 scope:global align:4 data:4byte -SamplingRate = .sbss:0x80451700; // type:object size:0x4 scope:global align:4 data:4byte +SamplingRate = .sbss:0x80451700; // type:object size:0x4 scope:local align:4 data:4byte __DBInterface = .sbss:0x80451708; // type:object size:0x4 scope:global align:4 data:4byte DBVerbose = .sbss:0x8045170C; // type:object size:0x4 scope:global align:4 data:4byte -StopAtNextInt = .sbss:0x80451710; // type:object size:0x4 scope:global align:4 data:4byte -LastLength = .sbss:0x80451714; // type:object size:0x4 scope:global align:4 data:4byte +StopAtNextInt = .sbss:0x80451710; // type:object size:0x4 scope:local align:4 data:4byte +LastLength = .sbss:0x80451714; // type:object size:0x4 scope:local align:4 data:4byte Callback = .sbss:0x80451718; // type:object size:0x4 scope:local align:4 data:4byte -ResetCoverCallback = .sbss:0x8045171C; // type:object size:0x4 scope:global align:4 data:4byte -LastResetEnd = .sbss:0x80451720; // type:object size:0x8 scope:global align:8 data:4byte -ResetOccurred = .sbss:0x80451728; // type:object size:0x4 scope:global align:4 data:4byte -WaitingCoverClose = .sbss:0x8045172C; // type:object size:0x4 scope:global align:4 data:4byte -Breaking = .sbss:0x80451730; // type:object size:0x4 scope:global align:4 data:4byte -WorkAroundType = .sbss:0x80451734; // type:object size:0x4 scope:global align:4 data:4byte -WorkAroundSeekLocation = .sbss:0x80451738; // type:object size:0x4 scope:global align:4 data:4byte -LastReadFinished = .sbss:0x80451740; // type:object size:0x8 scope:global align:8 data:4byte -LastReadIssued = .sbss:0x80451748; // type:object size:0x8 scope:global align:8 data:4byte -LastCommandWasRead = .sbss:0x80451750; // type:object size:0x4 scope:global align:4 data:4byte -NextCommandNumber = .sbss:0x80451754; // type:object size:0x4 scope:global align:4 data:4byte +ResetCoverCallback = .sbss:0x8045171C; // type:object size:0x4 scope:local align:4 data:4byte +LastResetEnd = .sbss:0x80451720; // type:object size:0x8 scope:local align:8 data:4byte +ResetOccurred = .sbss:0x80451728; // type:object size:0x4 scope:local align:4 data:4byte +WaitingCoverClose = .sbss:0x8045172C; // type:object size:0x4 scope:local align:4 data:4byte +Breaking = .sbss:0x80451730; // type:object size:0x4 scope:local align:4 data:4byte +WorkAroundType = .sbss:0x80451734; // type:object size:0x4 scope:local align:4 data:4byte +WorkAroundSeekLocation = .sbss:0x80451738; // type:object size:0x4 scope:local align:4 data:4byte +LastReadFinished = .sbss:0x80451740; // type:object size:0x8 scope:local align:8 data:4byte +LastReadIssued = .sbss:0x80451748; // type:object size:0x8 scope:local align:8 data:4byte +LastCommandWasRead = .sbss:0x80451750; // type:object size:0x4 scope:local align:4 data:4byte +NextCommandNumber = .sbss:0x80451754; // type:object size:0x4 scope:local align:4 data:4byte BootInfo = .sbss:0x80451758; // type:object size:0x4 scope:local align:4 data:4byte -FstStart = .sbss:0x8045175C; // type:object size:0x4 scope:global align:4 data:4byte -FstStringStart = .sbss:0x80451760; // type:object size:0x4 scope:global align:4 data:4byte -MaxEntryNum = .sbss:0x80451764; // type:object size:0x4 scope:global align:4 data:4byte -currentDirectory = .sbss:0x80451768; // type:object size:0x4 scope:global align:4 data:4byte +FstStart = .sbss:0x8045175C; // type:object size:0x4 scope:local align:4 data:4byte +FstStringStart = .sbss:0x80451760; // type:object size:0x4 scope:local align:4 data:4byte +MaxEntryNum = .sbss:0x80451764; // type:object size:0x4 scope:local align:4 data:4byte +currentDirectory = .sbss:0x80451768; // type:object size:0x4 scope:local align:4 data:4byte __DVDLongFileNameFlag = .sbss:0x8045176C; // type:object size:0x4 scope:global align:4 data:4byte __DVDThreadQueue = .sbss:0x80451770; // type:object size:0x8 scope:global align:4 -executing = .sbss:0x80451778; // type:object size:0x4 scope:global align:4 data:4byte -IDShouldBe = .sbss:0x8045177C; // type:object size:0x4 scope:global align:4 data:4byte -bootInfo = .sbss:0x80451780; // type:object size:0x4 scope:global align:4 data:4byte -PauseFlag = .sbss:0x80451784; // type:object size:0x4 scope:global align:4 data:4byte -PausingFlag = .sbss:0x80451788; // type:object size:0x4 scope:global align:4 data:4byte -AutoFinishing = .sbss:0x8045178C; // type:object size:0x4 scope:global align:4 data:4byte -FatalErrorFlag = .sbss:0x80451790; // type:object size:0x4 scope:global align:4 data:4byte -CurrCommand = .sbss:0x80451794; // type:object size:0x4 scope:global align:4 data:4byte -Canceling = .sbss:0x80451798; // type:object size:0x4 scope:global align:4 data:4byte -CancelCallback = .sbss:0x8045179C; // type:object size:0x4 scope:global align:4 data:4byte -ResumeFromHere = .sbss:0x804517A0; // type:object size:0x4 scope:global align:4 data:4byte -CancelLastError = .sbss:0x804517A4; // type:object size:0x4 scope:global align:4 data:4byte -LastError = .sbss:0x804517A8; // type:object size:0x4 scope:global align:4 data:4byte -NumInternalRetry = .sbss:0x804517AC; // type:object size:0x4 scope:global align:4 data:4byte -ResetRequired = .sbss:0x804517B0; // type:object size:0x4 scope:global align:4 data:4byte -FirstTimeInBootrom = .sbss:0x804517B4; // type:object size:0x4 scope:global align:4 data:4byte -MotorState = .sbss:0x804517B8; // type:object size:0x4 scope:global align:4 data:4byte -DVDInitialized = .sbss:0x804517BC; // type:object size:0x4 scope:global align:4 data:4byte -LastState = .sbss:0x804517C0; // type:object size:0x4 scope:local align:4 data:4byte -FatalFunc = .sbss:0x804517C8; // type:object size:0x4 scope:global align:4 data:4byte -status = .sbss:0x804517D0; // type:object size:0x4 scope:global align:4 data:4byte -bb2 = .sbss:0x804517D4; // type:object size:0x4 scope:global align:4 data:4byte -idTmp = .sbss:0x804517D8; // type:object size:0x4 scope:global align:4 data:4byte -IsInitialized = .sbss:0x804517E0; // type:object size:0x4 scope:global align:4 data:4byte -retraceCount = .sbss:0x804517E4; // type:object size:0x4 scope:global align:4 data:4byte -flushFlag = .sbss:0x804517E8; // type:object size:0x4 scope:global align:4 data:4byte -retraceQueue = .sbss:0x804517EC; // type:object size:0x8 scope:global align:4 -PreCB = .sbss:0x804517F4; // type:object size:0x4 scope:global align:4 data:4byte -PostCB = .sbss:0x804517F8; // type:object size:0x4 scope:global align:4 data:4byte -PositionCallback = .sbss:0x804517FC; // type:object size:0x4 scope:global align:4 data:4byte -encoderType = .sbss:0x80451800; // type:object size:0x4 scope:global align:4 data:4byte -displayOffsetH = .sbss:0x80451804; // type:object size:0x2 scope:global align:2 data:2byte -displayOffsetV = .sbss:0x80451806; // type:object size:0x2 scope:global align:2 data:2byte -changeMode = .sbss:0x80451808; // type:object size:0x4 scope:global align:4 data:4byte -changed = .sbss:0x80451810; // type:object size:0x8 scope:global align:8 data:4byte -shdwChangeMode = .sbss:0x80451818; // type:object size:0x4 scope:global align:4 data:4byte -shdwChanged = .sbss:0x80451820; // type:object size:0x8 scope:global align:8 data:4byte -CurrTiming = .sbss:0x80451828; // type:object size:0x4 scope:global align:4 data:4byte -CurrTvMode = .sbss:0x8045182C; // type:object size:0x4 scope:global align:4 data:4byte -NextBufAddr = .sbss:0x80451830; // type:object size:0x4 scope:global align:4 data:4byte -CurrBufAddr = .sbss:0x80451834; // type:object size:0x4 scope:global align:4 data:4byte -FBSet = .sbss:0x80451838; // type:object size:0x4 scope:global align:4 data:4byte -timingExtra = .sbss:0x8045183C; // type:object size:0x4 scope:global align:4 data:4byte +executing = .sbss:0x80451778; // type:object size:0x4 scope:local align:4 data:4byte +IDShouldBe = .sbss:0x8045177C; // type:object size:0x4 scope:local align:4 data:4byte +bootInfo = .sbss:0x80451780; // type:object size:0x4 scope:local align:4 data:4byte +PauseFlag = .sbss:0x80451784; // type:object size:0x4 scope:local align:4 data:4byte +PausingFlag = .sbss:0x80451788; // type:object size:0x4 scope:local align:4 data:4byte +AutoFinishing = .sbss:0x8045178C; // type:object size:0x4 scope:local align:4 data:4byte +FatalErrorFlag = .sbss:0x80451790; // type:object size:0x4 scope:local align:4 data:4byte +CurrCommand = .sbss:0x80451794; // type:object size:0x4 scope:local align:4 data:4byte +Canceling = .sbss:0x80451798; // type:object size:0x4 scope:local align:4 data:4byte +CancelCallback = .sbss:0x8045179C; // type:object size:0x4 scope:local align:4 data:4byte +ResumeFromHere = .sbss:0x804517A0; // type:object size:0x4 scope:local align:4 data:4byte +CancelLastError = .sbss:0x804517A4; // type:object size:0x4 scope:local align:4 data:4byte +LastError = .sbss:0x804517A8; // type:object size:0x4 scope:local align:4 data:4byte +NumInternalRetry = .sbss:0x804517AC; // type:object size:0x4 scope:local align:4 data:4byte +ResetRequired = .sbss:0x804517B0; // type:object size:0x4 scope:local align:4 data:4byte +FirstTimeInBootrom = .sbss:0x804517B4; // type:object size:0x4 scope:local align:4 data:4byte +MotorState = .sbss:0x804517B8; // type:object size:0x4 scope:local align:4 data:4byte +DVDInitialized = .sbss:0x804517BC; // type:object size:0x4 scope:local align:4 data:4byte +LastState = .sbss:0x804517C0; // type:object size:0x4 scope:global align:4 data:4byte +FatalFunc = .sbss:0x804517C8; // type:object size:0x4 scope:local align:4 data:4byte +status = .sbss:0x804517D0; // type:object size:0x4 scope:local align:4 data:4byte +bb2 = .sbss:0x804517D4; // type:object size:0x4 scope:local align:4 data:4byte +idTmp = .sbss:0x804517D8; // type:object size:0x4 scope:local align:4 data:4byte +IsInitialized = .sbss:0x804517E0; // type:object size:0x4 scope:local align:4 data:4byte +retraceCount = .sbss:0x804517E4; // type:object size:0x4 scope:local align:4 data:4byte +flushFlag = .sbss:0x804517E8; // type:object size:0x4 scope:local align:4 data:4byte +retraceQueue = .sbss:0x804517EC; // type:object size:0x8 scope:local align:4 +PreCB = .sbss:0x804517F4; // type:object size:0x4 scope:local align:4 data:4byte +PostCB = .sbss:0x804517F8; // type:object size:0x4 scope:local align:4 data:4byte +PositionCallback = .sbss:0x804517FC; // type:object size:0x4 scope:local align:4 data:4byte +encoderType = .sbss:0x80451800; // type:object size:0x4 scope:local align:4 data:4byte +displayOffsetH = .sbss:0x80451804; // type:object size:0x2 scope:local align:2 data:2byte +displayOffsetV = .sbss:0x80451806; // type:object size:0x2 scope:local align:2 data:2byte +changeMode = .sbss:0x80451808; // type:object size:0x4 scope:local align:4 data:4byte +changed = .sbss:0x80451810; // type:object size:0x8 scope:local align:8 data:4byte +shdwChangeMode = .sbss:0x80451818; // type:object size:0x4 scope:local align:4 data:4byte +shdwChanged = .sbss:0x80451820; // type:object size:0x8 scope:local align:8 data:4byte +CurrTiming = .sbss:0x80451828; // type:object size:0x4 scope:local align:4 data:4byte +CurrTvMode = .sbss:0x8045182C; // type:object size:0x4 scope:local align:4 data:4byte +NextBufAddr = .sbss:0x80451830; // type:object size:0x4 scope:local align:4 data:4byte +CurrBufAddr = .sbss:0x80451834; // type:object size:0x4 scope:local align:4 data:4byte +FBSet = .sbss:0x80451838; // type:object size:0x4 scope:local align:4 data:4byte +timingExtra = .sbss:0x8045183C; // type:object size:0x4 scope:local align:4 data:4byte message$351 = .sbss:0x80451840; // type:object size:0x4 scope:local align:4 data:4byte -Initialized = .sbss:0x80451848; // type:object size:0x4 scope:global align:4 data:4byte -EnabledBits = .sbss:0x8045184C; // type:object size:0x4 scope:global align:4 data:4byte -ResettingBits = .sbss:0x80451850; // type:object size:0x4 scope:global align:4 data:4byte -RecalibrateBits = .sbss:0x80451854; // type:object size:0x4 scope:global align:4 data:4byte -WaitingBits = .sbss:0x80451858; // type:object size:0x4 scope:global align:4 data:4byte -CheckingBits = .sbss:0x8045185C; // type:object size:0x4 scope:global align:4 data:4byte -PendingBits = .sbss:0x80451860; // type:object size:0x4 scope:global align:4 data:4byte -BarrelBits = .sbss:0x80451864; // type:object size:0x4 scope:global align:4 data:4byte -SamplingCallback = .sbss:0x80451868; // type:object size:0x4 scope:global align:4 data:4byte +Initialized = .sbss:0x80451848; // type:object size:0x4 scope:local align:4 data:4byte +EnabledBits = .sbss:0x8045184C; // type:object size:0x4 scope:local align:4 data:4byte +ResettingBits = .sbss:0x80451850; // type:object size:0x4 scope:local align:4 data:4byte +RecalibrateBits = .sbss:0x80451854; // type:object size:0x4 scope:local align:4 data:4byte +WaitingBits = .sbss:0x80451858; // type:object size:0x4 scope:local align:4 data:4byte +CheckingBits = .sbss:0x8045185C; // type:object size:0x4 scope:local align:4 data:4byte +PendingBits = .sbss:0x80451860; // type:object size:0x4 scope:local align:4 data:4byte +BarrelBits = .sbss:0x80451864; // type:object size:0x4 scope:local align:4 data:4byte +SamplingCallback = .sbss:0x80451868; // type:object size:0x4 scope:local align:4 data:4byte recalibrated$388 = .sbss:0x8045186C; // type:object size:0x4 scope:local align:4 data:4byte __PADSpec = .sbss:0x80451870; // type:object size:0x4 scope:global align:4 data:4byte -__AIS_Callback = .sbss:0x80451878; // type:object size:0x4 scope:global align:4 data:4byte -__AID_Callback = .sbss:0x8045187C; // type:object size:0x4 scope:global align:4 data:4byte -__CallbackStack = .sbss:0x80451880; // type:object size:0x4 scope:global align:4 data:4byte -__OldStack = .sbss:0x80451884; // type:object size:0x4 scope:global align:4 data:4byte -__AI_init_flag = .sbss:0x80451888; // type:object size:0x4 scope:global align:4 data:4byte -__AID_Active = .sbss:0x8045188C; // type:object size:0x4 scope:global align:4 data:4byte -bound_32KHz = .sbss:0x80451890; // type:object size:0x8 scope:global align:8 data:4byte -bound_48KHz = .sbss:0x80451898; // type:object size:0x8 scope:global align:8 data:4byte -min_wait = .sbss:0x804518A0; // type:object size:0x8 scope:global align:8 data:4byte -max_wait = .sbss:0x804518A8; // type:object size:0x8 scope:global align:8 data:4byte -buffer = .sbss:0x804518B0; // type:object size:0x8 scope:global align:8 data:4byte -__AR_Callback = .sbss:0x804518B8; // type:object size:0x4 scope:global align:4 data:4byte -__AR_Size = .sbss:0x804518BC; // type:object size:0x4 scope:global align:4 data:4byte -__AR_InternalSize = .sbss:0x804518C0; // type:object size:0x4 scope:global align:4 data:4byte -__AR_ExpansionSize = .sbss:0x804518C4; // type:object size:0x4 scope:global align:4 data:4byte -__AR_StackPointer = .sbss:0x804518C8; // type:object size:0x4 scope:global align:4 data:4byte -__AR_FreeBlocks = .sbss:0x804518CC; // type:object size:0x4 scope:global align:4 data:4byte -__AR_BlockLength = .sbss:0x804518D0; // type:object size:0x4 scope:global align:4 data:4byte -__AR_init_flag = .sbss:0x804518D4; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestQueueHi = .sbss:0x804518D8; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestTailHi = .sbss:0x804518DC; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestQueueLo = .sbss:0x804518E0; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestTailLo = .sbss:0x804518E4; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestPendingHi = .sbss:0x804518E8; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestPendingLo = .sbss:0x804518EC; // type:object size:0x4 scope:global align:4 data:4byte -__ARQCallbackHi = .sbss:0x804518F0; // type:object size:0x4 scope:global align:4 data:4byte -__ARQCallbackLo = .sbss:0x804518F4; // type:object size:0x4 scope:global align:4 data:4byte -__ARQChunkSize = .sbss:0x804518F8; // type:object size:0x4 scope:global align:4 data:4byte -__ARQ_init_flag = .sbss:0x804518FC; // type:object size:0x4 scope:global align:4 data:4byte -__DSP_init_flag = .sbss:0x80451900; // type:object size:0x4 scope:global align:4 data:4byte +__AIS_Callback = .sbss:0x80451878; // type:object size:0x4 scope:local align:4 data:4byte +__AID_Callback = .sbss:0x8045187C; // type:object size:0x4 scope:local align:4 data:4byte +__CallbackStack = .sbss:0x80451880; // type:object size:0x4 scope:local align:4 data:4byte +__OldStack = .sbss:0x80451884; // type:object size:0x4 scope:local align:4 data:4byte +__AI_init_flag = .sbss:0x80451888; // type:object size:0x4 scope:local align:4 data:4byte +__AID_Active = .sbss:0x8045188C; // type:object size:0x4 scope:local align:4 data:4byte +bound_32KHz = .sbss:0x80451890; // type:object size:0x8 scope:local align:8 data:4byte +bound_48KHz = .sbss:0x80451898; // type:object size:0x8 scope:local align:8 data:4byte +min_wait = .sbss:0x804518A0; // type:object size:0x8 scope:local align:8 data:4byte +max_wait = .sbss:0x804518A8; // type:object size:0x8 scope:local align:8 data:4byte +buffer = .sbss:0x804518B0; // type:object size:0x8 scope:local align:8 data:4byte +__AR_Callback = .sbss:0x804518B8; // type:object size:0x4 scope:local align:4 data:4byte +__AR_Size = .sbss:0x804518BC; // type:object size:0x4 scope:local align:4 data:4byte +__AR_InternalSize = .sbss:0x804518C0; // type:object size:0x4 scope:local align:4 data:4byte +__AR_ExpansionSize = .sbss:0x804518C4; // type:object size:0x4 scope:local align:4 data:4byte +__AR_StackPointer = .sbss:0x804518C8; // type:object size:0x4 scope:local align:4 data:4byte +__AR_FreeBlocks = .sbss:0x804518CC; // type:object size:0x4 scope:local align:4 data:4byte +__AR_BlockLength = .sbss:0x804518D0; // type:object size:0x4 scope:local align:4 data:4byte +__AR_init_flag = .sbss:0x804518D4; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestQueueHi = .sbss:0x804518D8; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestTailHi = .sbss:0x804518DC; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestQueueLo = .sbss:0x804518E0; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestTailLo = .sbss:0x804518E4; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestPendingHi = .sbss:0x804518E8; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestPendingLo = .sbss:0x804518EC; // type:object size:0x4 scope:local align:4 data:4byte +__ARQCallbackHi = .sbss:0x804518F0; // type:object size:0x4 scope:local align:4 data:4byte +__ARQCallbackLo = .sbss:0x804518F4; // type:object size:0x4 scope:local align:4 data:4byte +__ARQChunkSize = .sbss:0x804518F8; // type:object size:0x4 scope:local align:4 data:4byte +__ARQ_init_flag = .sbss:0x804518FC; // type:object size:0x4 scope:local align:4 data:4byte +__DSP_init_flag = .sbss:0x80451900; // type:object size:0x4 scope:local align:4 data:4byte __DSP_tmp_task = .sbss:0x80451908; // type:object size:0x4 scope:global align:4 data:4byte __DSP_last_task = .sbss:0x8045190C; // type:object size:0x4 scope:global align:4 data:4byte __DSP_first_task = .sbss:0x80451910; // type:object size:0x4 scope:global align:4 data:4byte __DSP_curr_task = .sbss:0x80451914; // type:object size:0x4 scope:global align:4 data:4byte -__CARDEncode = .sbss:0x80451918; // type:object size:0x2 scope:global align:2 data:2byte -__CARDFastMode = .sbss:0x8045191A; // type:object size:0x2 scope:global align:2 data:2byte +__CARDEncode = .sbss:0x80451918; // type:object size:0x2 scope:local align:2 data:2byte +__CARDFastMode = .sbss:0x8045191A; // type:object size:0x2 scope:local align:2 data:2byte __piReg = .sbss:0x80451920; // type:object size:0x4 scope:global align:4 data:4byte __cpReg = .sbss:0x80451924; // type:object size:0x4 scope:global align:4 data:4byte __peReg = .sbss:0x80451928; // type:object size:0x4 scope:global align:4 data:4byte __memReg = .sbss:0x8045192C; // type:object size:0x4 scope:global align:4 data:4byte -peCount$35 = .sbss:0x80451930; // type:object size:0x4 scope:local align:4 data:4byte -time$36 = .sbss:0x80451938; // type:object size:0x8 scope:local align:8 data:4byte -calledOnce$37 = .sbss:0x80451940; // type:object size:0x4 scope:local align:4 data:4byte -resetFuncRegistered$145 = .sbss:0x80451944; // type:object size:0x4 scope:local align:4 data:4byte -CPUFifo = .sbss:0x80451948; // type:object size:0x4 scope:global align:4 data:4byte -GPFifo = .sbss:0x8045194C; // type:object size:0x4 scope:global align:4 data:4byte -__GXCurrentThread = .sbss:0x80451950; // type:object size:0x4 scope:global align:4 data:4byte +peCount = .sbss:0x80451930; // type:object size:0x4 scope:global align:4 data:4byte +time = .sbss:0x80451938; // type:object size:0x8 scope:global align:8 data:4byte +calledOnce = .sbss:0x80451940; // type:object size:0x4 scope:global align:4 data:4byte +resetFuncRegistered = .sbss:0x80451944; // type:object size:0x4 scope:global align:4 data:4byte +CPUFifo = .sbss:0x80451948; // type:object size:0x4 scope:local align:4 data:4byte +GPFifo = .sbss:0x8045194C; // type:object size:0x4 scope:local align:4 data:4byte +__GXCurrentThread = .sbss:0x80451950; // type:object size:0x4 scope:local align:4 data:4byte CPGPLinked = .sbss:0x80451954; // type:object size:0x1 scope:local align:1 data:byte -GXOverflowSuspendInProgress = .sbss:0x80451958; // type:object size:0x4 scope:global align:4 data:4byte -BreakPointCB = .sbss:0x8045195C; // type:object size:0x4 scope:global align:4 data:4byte -__GXOverflowCount = .sbss:0x80451960; // type:object size:0x4 scope:global align:4 data:4byte -TokenCB = .sbss:0x80451968; // type:object size:0x4 scope:global align:4 data:4byte -DrawDoneCB = .sbss:0x8045196C; // type:object size:0x4 scope:global align:4 data:4byte +GXOverflowSuspendInProgress = .sbss:0x80451958; // type:object size:0x4 scope:local align:4 data:4byte +BreakPointCB = .sbss:0x8045195C; // type:object size:0x4 scope:local align:4 data:4byte +__GXOverflowCount = .sbss:0x80451960; // type:object size:0x4 scope:local align:4 data:4byte +TokenCB = .sbss:0x80451968; // type:object size:0x4 scope:local align:4 data:4byte +DrawDoneCB = .sbss:0x8045196C; // type:object size:0x4 scope:local align:4 data:4byte DrawDone = .sbss:0x80451970; // type:object size:0x1 scope:local align:1 data:byte -FinishQueue = .sbss:0x80451974; // type:object size:0x8 scope:global align:4 +FinishQueue = .sbss:0x80451974; // type:object size:0x8 scope:local align:4 __GDCurrentDL = .sbss:0x80451980; // type:object size:0x4 scope:global align:4 data:4byte -overflowcb = .sbss:0x80451984; // type:object size:0x4 scope:global align:4 data:4byte +overflowcb = .sbss:0x80451984; // type:object size:0x4 scope:local align:4 data:4byte __global_destructor_chain = .sbss:0x80451988; // type:object size:0x4 scope:global align:4 data:4byte -__aborting = .sbss:0x80451990; // type:object size:0x4 scope:global align:4 data:4byte -__atexit_curr_func = .sbss:0x80451994; // type:object size:0x4 scope:global align:4 data:4byte +__aborting = .sbss:0x80451990; // type:object size:0x4 scope:local align:4 data:4byte +__atexit_curr_func = .sbss:0x80451994; // type:object size:0x4 scope:local align:4 data:4byte __stdio_exit = .sbss:0x80451998; // type:object size:0x4 scope:global align:4 data:4byte -__console_exit = .sbss:0x8045199C; // type:object size:0x4 scope:global align:4 data:4byte +__console_exit = .sbss:0x8045199C; // type:object size:0x4 scope:local align:4 data:4byte init$49 = .sbss:0x804519A0; // type:object size:0x1 scope:local align:1 data:byte errno = .sbss:0x804519A8; // type:object size:0x4 scope:global align:4 data:4byte initialized$60 = .sbss:0x804519B0; // type:object size:0x4 scope:local align:4 data:4byte gTRKInputPendingPtr = .sbss:0x804519B8; // type:object size:0x4 scope:global align:4 data:4byte gIsInitialized = .sbss:0x804519C0; // type:object size:0x4 scope:local align:4 data:4byte gIsInitialized = .sbss:0x804519C8; // type:object size:0x4 scope:local align:4 data:4byte -MTRCallback = .sbss:0x804519D0; // type:object size:0x4 scope:global align:4 data:4byte -DBGCallback = .sbss:0x804519D4; // type:object size:0x4 scope:global align:4 data:4byte -SendMailData = .sbss:0x804519D8; // type:object size:0x4 scope:global align:4 data:4byte -RecvDataLeng = .sbss:0x804519DC; // type:object size:0x4 scope:global align:4 data:4byte -pEXIInputFlag = .sbss:0x804519E0; // type:object size:0x4 scope:global align:4 data:4byte +MTRCallback = .sbss:0x804519D0; // type:object size:0x4 scope:local align:4 data:4byte +DBGCallback = .sbss:0x804519D4; // type:object size:0x4 scope:local align:4 data:4byte +SendMailData = .sbss:0x804519D8; // type:object size:0x4 scope:local align:4 data:4byte +RecvDataLeng = .sbss:0x804519DC; // type:object size:0x4 scope:local align:4 data:4byte +pEXIInputFlag = .sbss:0x804519E0; // type:object size:0x4 scope:local align:4 data:4byte EXIInputFlag = .sbss:0x804519E4; // type:object size:0x1 scope:local align:1 data:byte @3884 = .sdata2:0x80451A00; // type:object size:0x4 scope:local align:4 data:float @3885 = .sdata2:0x80451A04; // type:object size:0x4 scope:local align:4 data:float @@ -22668,22 +22691,22 @@ l_mapBaseColor$4239 = .sdata2:0x80451E48; // type:object size:0x4 scope:local al @4264 = .sdata2:0x80451E4C; // type:object size:0x4 scope:local align:4 data:float @4265 = .sdata2:0x80451E50; // type:object size:0x4 scope:local align:4 data:float @4266 = .sdata2:0x80451E54; // type:object size:0x4 scope:local align:4 data:float -l_doorWhite = .sdata2:0x80451E58; // type:object size:0x4 scope:global align:4 data:4byte -l_doorWhiteNoStay = .sdata2:0x80451E5C; // type:object size:0x4 scope:global align:4 data:4byte -l_doorWhite2 = .sdata2:0x80451E60; // type:object size:0x4 scope:global align:4 data:4byte -l_doorWhiteNoStay2 = .sdata2:0x80451E64; // type:object size:0x4 scope:global align:4 data:4byte +l_doorWhite = .sdata2:0x80451E58; // type:object size:0x4 scope:local align:4 data:4byte +l_doorWhiteNoStay = .sdata2:0x80451E5C; // type:object size:0x4 scope:local align:4 data:4byte +l_doorWhite2 = .sdata2:0x80451E60; // type:object size:0x4 scope:local align:4 data:4byte +l_doorWhiteNoStay2 = .sdata2:0x80451E64; // type:object size:0x4 scope:local align:4 data:4byte l_tex0$4406 = .sdata2:0x80451E68; // type:object size:0x8 scope:local align:4 @4484 = .sdata2:0x80451E70; // type:object size:0x4 scope:local align:4 data:float -l_entranceStartColor = .sdata2:0x80451E74; // type:object size:0x4 scope:global align:4 -l_entranceLv8StartColor = .sdata2:0x80451E78; // type:object size:0x4 scope:global align:4 -l_treasureStartColor = .sdata2:0x80451E7C; // type:object size:0x4 scope:global align:4 data:byte -l_smallKeyStartColor = .sdata2:0x80451E80; // type:object size:0x4 scope:global align:4 -l_bossStartColor = .sdata2:0x80451E84; // type:object size:0x4 scope:global align:4 -l_npc0StartColor = .sdata2:0x80451E88; // type:object size:0x4 scope:global align:4 -l_destinationStartColor = .sdata2:0x80451E8C; // type:object size:0x4 scope:global align:4 -l_npcYkmStartColor = .sdata2:0x80451E90; // type:object size:0x4 scope:global align:4 -l_npcYkwStartColor = .sdata2:0x80451E94; // type:object size:0x4 scope:global align:4 -l_tksStartColor = .sdata2:0x80451E98; // type:object size:0x4 scope:global align:4 +l_entranceStartColor = .sdata2:0x80451E74; // type:object size:0x4 scope:local align:4 +l_entranceLv8StartColor = .sdata2:0x80451E78; // type:object size:0x4 scope:local align:4 +l_treasureStartColor = .sdata2:0x80451E7C; // type:object size:0x4 scope:local align:4 data:byte +l_smallKeyStartColor = .sdata2:0x80451E80; // type:object size:0x4 scope:local align:4 +l_bossStartColor = .sdata2:0x80451E84; // type:object size:0x4 scope:local align:4 +l_npc0StartColor = .sdata2:0x80451E88; // type:object size:0x4 scope:local align:4 +l_destinationStartColor = .sdata2:0x80451E8C; // type:object size:0x4 scope:local align:4 +l_npcYkmStartColor = .sdata2:0x80451E90; // type:object size:0x4 scope:local align:4 +l_npcYkwStartColor = .sdata2:0x80451E94; // type:object size:0x4 scope:local align:4 +l_tksStartColor = .sdata2:0x80451E98; // type:object size:0x4 scope:local align:4 l_iconTex0$4523 = .sdata2:0x80451E9C; // type:object size:0x8 scope:local align:4 tboxNotStayColor$4542 = .sdata2:0x80451EA4; // type:object size:0x4 scope:local align:4 data:byte @4600 = .sdata2:0x80451EA8; // type:object size:0x4 scope:local align:4 data:float @@ -22795,7 +22818,7 @@ particleID$5076 = .sdata2:0x80451F90; // type:object size:0x4 scope:local align: @5551 = .sdata2:0x804520B8; // type:object size:0x4 scope:local align:4 data:float @5552 = .sdata2:0x804520BC; // type:object size:0x4 scope:local align:4 data:float @5553 = .sdata2:0x804520C0; // type:object size:0x4 scope:local align:4 data:float -l_zSortId$5668 = .sdata2:0x804520C4; // type:object size:0x6 scope:local align:4 data:byte +l_zSortId = .sdata2:0x804520C4; // type:object size:0x6 scope:local align:4 data:byte @5747 = .sdata2:0x804520CC; // type:object size:0x4 scope:local align:4 data:float @5809 = .sdata2:0x804520D0; // type:object size:0x4 scope:local align:4 data:float @5810 = .sdata2:0x804520D4; // type:object size:0x4 scope:local align:4 data:float @@ -25420,7 +25443,7 @@ i_expID$6473 = .sdata2:0x8045442C; // type:object size:0x8 scope:local align:4 @3927 = .sdata2:0x80454F08; // type:object size:0x4 scope:local align:4 data:float @3928 = .sdata2:0x80454F0C; // type:object size:0x4 scope:local align:4 data:float @3930 = .sdata2:0x80454F10; // type:object size:0x8 scope:local align:8 data:double -T_JOINT_dylKeyTbl = .sdata2:0x80454F18; // type:object size:0x2 scope:global align:4 +T_JOINT_dylKeyTbl = .sdata2:0x80454F18; // type:object size:0x2 scope:local align:4 @4055 = .sdata2:0x80454F1C; // type:object size:0x4 scope:local align:4 data:float @4066 = .sdata2:0x80454F20; // type:object size:0x4 scope:local align:4 data:float @4067 = .sdata2:0x80454F24; // type:object size:0x4 scope:local align:4 data:float @@ -25523,32 +25546,32 @@ l_arcName = .sdata2:0x80454FF0; // type:object size:0x7 scope:local align:4 data @2259 = .sdata2:0x80455130; // type:object size:0x8 scope:local align:4 data:double @2273 = .sdata2:0x80455138; // type:object size:0x4 scope:local align:4 data:float @2346 = .sdata2:0x8045513C; // type:object size:0x4 scope:local align:4 data:float -BPCP_OUTCODE0 = .sdata2:0x80455140; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE1 = .sdata2:0x80455144; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE4 = .sdata2:0x80455148; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE5 = .sdata2:0x8045514C; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE2 = .sdata2:0x80455150; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE3 = .sdata2:0x80455154; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE0 = .sdata2:0x80455158; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE1 = .sdata2:0x8045515C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE2 = .sdata2:0x80455160; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE3 = .sdata2:0x80455164; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE4 = .sdata2:0x80455168; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE5 = .sdata2:0x8045516C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE6 = .sdata2:0x80455170; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE7 = .sdata2:0x80455174; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE8 = .sdata2:0x80455178; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE9 = .sdata2:0x8045517C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE10 = .sdata2:0x80455180; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE11 = .sdata2:0x80455184; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE0 = .sdata2:0x80455188; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE1 = .sdata2:0x8045518C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE2 = .sdata2:0x80455190; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE3 = .sdata2:0x80455194; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE4 = .sdata2:0x80455198; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE5 = .sdata2:0x8045519C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE6 = .sdata2:0x804551A0; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE7 = .sdata2:0x804551A4; // type:object size:0x4 scope:global align:4 data:4byte +BPCP_OUTCODE0 = .sdata2:0x80455140; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE1 = .sdata2:0x80455144; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE4 = .sdata2:0x80455148; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE5 = .sdata2:0x8045514C; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE2 = .sdata2:0x80455150; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE3 = .sdata2:0x80455154; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE0 = .sdata2:0x80455158; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE1 = .sdata2:0x8045515C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE2 = .sdata2:0x80455160; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE3 = .sdata2:0x80455164; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE4 = .sdata2:0x80455168; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE5 = .sdata2:0x8045516C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE6 = .sdata2:0x80455170; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE7 = .sdata2:0x80455174; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE8 = .sdata2:0x80455178; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE9 = .sdata2:0x8045517C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE10 = .sdata2:0x80455180; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE11 = .sdata2:0x80455184; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE0 = .sdata2:0x80455188; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE1 = .sdata2:0x8045518C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE2 = .sdata2:0x80455190; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE3 = .sdata2:0x80455194; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE4 = .sdata2:0x80455198; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE5 = .sdata2:0x8045519C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE6 = .sdata2:0x804551A0; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE7 = .sdata2:0x804551A4; // type:object size:0x4 scope:local align:4 data:4byte @3082 = .sdata2:0x804551A8; // type:object size:0x4 scope:local align:4 data:float @3205 = .sdata2:0x804551AC; // type:object size:0x4 scope:local align:4 data:float @3229 = .sdata2:0x804551B0; // type:object size:0x4 scope:local align:4 data:float @@ -25689,7 +25712,7 @@ sauVariableValue_2_DISTANCE_NEAR_FAR__Q27JStudio15TAdaptor_camera = .sdata2:0x80 sauVariableValue_2_RANGE_BEGIN_END__Q27JStudio12TAdaptor_fog = .sdata2:0x804554B8; // type:object size:0x8 scope:global align:4 sauVariableValue_2_DIRECTION_THETA_PHI__Q27JStudio14TAdaptor_light = .sdata2:0x804554C0; // type:object size:0x8 scope:global align:4 @1967 = .sdata2:0x804554C8; // type:object size:0x4 scope:local align:4 data:float -gu32Mask_TSequence_value_signExpansion__Q37JStudio3stb4data = .sdata2:0x804554D0; // type:object size:0x4 scope:global align:4 data:4byte +gu32Mask_TSequence_value_signExpansion__Q37JStudio3stb4data = .sdata2:0x804554D0; // type:object size:0x4 scope:local align:4 data:4byte ga4cSignature__Q37JStudio3stb4data = .sdata2:0x804554D8; // type:object size:0x4 scope:global align:4 data:string @1081 = .sdata2:0x804554E0; // type:object size:0x4 scope:local align:4 data:float @846 = .sdata2:0x804554E8; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZ2J01/config.yml b/config/GZ2J01/config.yml index 3268a47e9c..19815f0433 100644 --- a/config/GZ2J01/config.yml +++ b/config/GZ2J01/config.yml @@ -14,6 +14,12 @@ force_active: [ block_relocations: - source: .sdata:0x8044a6ec add_relocations: +- source: extab:0x80005624 + type: abs + target: __dt__26__partial_array_destructorFv +- source: extab:0x80005644 + type: abs + target: __dt__26__partial_array_destructorFv - source: .sdata:0x8044a6ec type: abs target: buffer__14mDoMtx_stack_c diff --git a/config/GZ2J01/rels/d_a_arrow/splits.txt b/config/GZ2J01/rels/d_a_arrow/splits.txt index 5066c91f19..7c1a6042c3 100644 --- a/config/GZ2J01/rels/d_a_arrow/splits.txt +++ b/config/GZ2J01/rels/d_a_arrow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_arrow.cpp: diff --git a/config/GZ2J01/rels/d_a_arrow/symbols.txt b/config/GZ2J01/rels/d_a_arrow/symbols.txt index b96d85fd30..230295cded 100644 --- a/config/GZ2J01/rels/d_a_arrow/symbols.txt +++ b/config/GZ2J01/rels/d_a_arrow/symbols.txt @@ -59,7 +59,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3768 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3768 = .rodata:0x00000000; // type:object size:0xC scope:local l_atCpsSrc = .rodata:0x0000000C; // type:object size:0x4C scope:global l_coSphSrc = .rodata:0x00000058; // type:object size:0x40 scope:global @4130 = .rodata:0x00000098; // type:object size:0x4 scope:local align:4 data:float @@ -111,7 +111,8 @@ tmpColor$5589 = .rodata:0x00000164; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000180; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_45_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4777 = .data:0x00000020; // type:object size:0xC scope:local data:4byte @4874 = .data:0x0000002C; // type:object size:0xC scope:local @4974 = .data:0x00000038; // type:object size:0xC scope:local @@ -148,6 +149,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @4612 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte localOffset$4611 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_b_bh/splits.txt b/config/GZ2J01/rels/d_a_b_bh/splits.txt index afc6dbfe7e..55331d74cd 100644 --- a/config/GZ2J01/rels/d_a_b_bh/splits.txt +++ b/config/GZ2J01/rels/d_a_b_bh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_bh.cpp: diff --git a/config/GZ2J01/rels/d_a_b_bh/symbols.txt b/config/GZ2J01/rels/d_a_b_bh/symbols.txt index fe1e9e4029..414a56ece1 100644 --- a/config/GZ2J01/rels/d_a_b_bh/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_bh/symbols.txt @@ -128,7 +128,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_138_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3759 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte bh = .bss:0x0000006C; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_b_bq/splits.txt b/config/GZ2J01/rels/d_a_b_bq/splits.txt index bcc48ab376..5c0f9c5a63 100644 --- a/config/GZ2J01/rels/d_a_b_bq/splits.txt +++ b/config/GZ2J01/rels/d_a_b_bq/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_bq.cpp: diff --git a/config/GZ2J01/rels/d_a_b_bq/symbols.txt b/config/GZ2J01/rels/d_a_b_bq/symbols.txt index 838f24ce50..da5dfcbfbe 100644 --- a/config/GZ2J01/rels/d_a_b_bq/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_bq/symbols.txt @@ -260,7 +260,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000002E4; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_139_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4431 = .data:0x00000020; // type:object size:0xA8 scope:local fireno$4463 = .data:0x000000C8; // type:object size:0x8 scope:local fireno$4473 = .data:0x000000D0; // type:object size:0x4 scope:local @@ -291,7 +292,7 @@ __vt__8cM3dGAab = .data:0x000004AC; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000004B8; // type:object size:0xC scope:global __vt__12daB_BQ_HIO_c = .data:0x000004C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_139_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_805BAD50 = .bss:0x00000008; // type:object size:0x1 data:byte @3811 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte -lbl_139_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +data_805BAD70 = .bss:0x00000028; // type:object size:0x1 data:byte diff --git a/config/GZ2J01/rels/d_a_b_dr/splits.txt b/config/GZ2J01/rels/d_a_b_dr/splits.txt index 6bfa586d0a..0ecd3a4dcc 100644 --- a/config/GZ2J01/rels/d_a_b_dr/splits.txt +++ b/config/GZ2J01/rels/d_a_b_dr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_dr.cpp: diff --git a/config/GZ2J01/rels/d_a_b_dr/symbols.txt b/config/GZ2J01/rels/d_a_b_dr/symbols.txt index 62243b220e..25960313cb 100644 --- a/config/GZ2J01/rels/d_a_b_dr/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_dr/symbols.txt @@ -225,7 +225,8 @@ DOWN_SPH_DT$8062 = .rodata:0x000004FC; // type:object size:0xB4 scope:local alig @stringBase0 = .rodata:0x000005CC; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_140_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_dr_week_src__22@unnamed@d_a_b_dr_cpp@ = .data:0x00000020; // type:object size:0x44 scope:global cc_dr_tail_src__22@unnamed@d_a_b_dr_cpp@ = .data:0x00000064; // type:object size:0x40 scope:global cc_dr_breath_at_src__22@unnamed@d_a_b_dr_cpp@ = .data:0x000000A4; // type:object size:0x40 scope:global @@ -278,10 +279,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_140_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3795 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x68 scope:global data:byte -lbl_140_bss_BC = .bss:0x000000BC; // type:object size:0x1 data:byte +data_805C7974 = .bss:0x000000BC; // type:object size:0x1 scope:local data:byte @6782 = .bss:0x000000C0; // type:object size:0xC scope:local @6785 = .bss:0x000000D0; // type:object size:0xC scope:local @6786 = .bss:0x000000DC; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_b_dre/splits.txt b/config/GZ2J01/rels/d_a_b_dre/splits.txt index 31c56cd8e5..f7a33f0d9e 100644 --- a/config/GZ2J01/rels/d_a_b_dre/splits.txt +++ b/config/GZ2J01/rels/d_a_b_dre/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_dre.cpp: diff --git a/config/GZ2J01/rels/d_a_b_dre/symbols.txt b/config/GZ2J01/rels/d_a_b_dre/symbols.txt index ea01563666..40a45c3c9f 100644 --- a/config/GZ2J01/rels/d_a_b_dre/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_dre/symbols.txt @@ -166,7 +166,7 @@ s_HeadPos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000060; // type:object size:0xC s_BodyPos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000078; // type:object size:0xC scope:global @3770 = .bss:0x00000084; // type:object size:0xC scope:local s_TalePos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000090; // type:object size:0xC scope:global -lbl_141_bss_9C = .bss:0x0000009C; // type:object size:0x1 data:byte +data_805CB0D4 = .bss:0x0000009C; // type:object size:0x1 scope:local data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000A8; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_b_ds/splits.txt b/config/GZ2J01/rels/d_a_b_ds/splits.txt index 8dd0cb3279..f2729a483b 100644 --- a/config/GZ2J01/rels/d_a_b_ds/splits.txt +++ b/config/GZ2J01/rels/d_a_b_ds/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_ds.cpp: diff --git a/config/GZ2J01/rels/d_a_b_ds/symbols.txt b/config/GZ2J01/rels/d_a_b_ds/symbols.txt index 6e0793c957..c29f2ba7f5 100644 --- a/config/GZ2J01/rels/d_a_b_ds/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_ds/symbols.txt @@ -449,7 +449,8 @@ B2_ETC_CC_DT$10792 = .rodata:0x0000078C; // type:object size:0x28 scope:local al @stringBase0 = .rodata:0x000007D8; // type:object size:0x1B scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_142_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3811 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3812 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3820 = .data:0x00000030; // type:object size:0x6 scope:local @@ -521,18 +522,20 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_142_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3948 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x50 scope:global data:byte handL_ang = .bss:0x000000A4; // type:object size:0x2 scope:global handR_ang = .bss:0x000000A6; // type:object size:0x2 scope:global handX_ang = .bss:0x000000A8; // type:object size:0x2 scope:global -lbl_142_bss_AA = .bss:0x000000AA; // type:object size:0x1 data:byte +breathTimerBase = .bss:0x000000AA; // type:object size:0x1 scope:local data:byte @5249 = .bss:0x000000AC; // type:object size:0xC scope:local +init$0000 = .bss:0x000000B8; // type:object size:0x1 scope:local align:1 data:byte @5252 = .bss:0x000000BC; // type:object size:0xC scope:local @5253 = .bss:0x000000C8; // type:object size:0xC scope:local mOpPlayerDt$5248 = .bss:0x000000D4; // type:object size:0x24 scope:local @5255 = .bss:0x000000F8; // type:object size:0xC scope:local +init$0001 = .bss:0x00000104; // type:object size:0x1 scope:local align:1 data:byte @5258 = .bss:0x00000108; // type:object size:0xC scope:local @5259 = .bss:0x00000114; // type:object size:0xC scope:local @5260 = .bss:0x00000120; // type:object size:0xC scope:local @@ -549,9 +552,11 @@ mOpPlayerDt$5248 = .bss:0x000000D4; // type:object size:0x24 scope:local @5271 = .bss:0x000001A4; // type:object size:0xC scope:local mOpCenterDt$5254 = .bss:0x000001B0; // type:object size:0xB4 scope:local @5273 = .bss:0x00000264; // type:object size:0xC scope:local +init$0002 = .bss:0x00000270; // type:object size:0x1 scope:local align:1 data:byte @5276 = .bss:0x00000274; // type:object size:0xC scope:local mOpCenterBodyDt$5272 = .bss:0x00000280; // type:object size:0x18 scope:local @5278 = .bss:0x00000298; // type:object size:0xC scope:local +init$0003 = .bss:0x000002A4; // type:object size:0x1 scope:local align:1 data:byte @5281 = .bss:0x000002A8; // type:object size:0xC scope:local @5282 = .bss:0x000002B4; // type:object size:0xC scope:local @5283 = .bss:0x000002C0; // type:object size:0xC scope:local @@ -568,25 +573,30 @@ mOpCenterBodyDt$5272 = .bss:0x00000280; // type:object size:0x18 scope:local @5294 = .bss:0x00000344; // type:object size:0xC scope:local mOpEyeDt$5277 = .bss:0x00000350; // type:object size:0xB4 scope:local @5296 = .bss:0x00000404; // type:object size:0xC scope:local +init$0004 = .bss:0x00000410; // type:object size:0x1 scope:local align:1 data:byte @5299 = .bss:0x00000414; // type:object size:0xC scope:local mOpEyeBodyDt$5295 = .bss:0x00000420; // type:object size:0x18 scope:local @6354 = .bss:0x00000438; // type:object size:0xC scope:local +init$0005 = .bss:0x00000444; // type:object size:0x1 scope:local align:1 data:byte @6357 = .bss:0x00000448; // type:object size:0xC scope:local @6358 = .bss:0x00000454; // type:object size:0xC scope:local @6359 = .bss:0x00000460; // type:object size:0xC scope:local @6360 = .bss:0x0000046C; // type:object size:0xC scope:local down_center_dt$6353 = .bss:0x00000478; // type:object size:0x3C scope:local @6362 = .bss:0x000004B4; // type:object size:0xC scope:local +init$0006 = .bss:0x000004C0; // type:object size:0x1 scope:local align:1 data:byte @6365 = .bss:0x000004C4; // type:object size:0xC scope:local @6366 = .bss:0x000004D0; // type:object size:0xC scope:local @6367 = .bss:0x000004DC; // type:object size:0xC scope:local @6368 = .bss:0x000004E8; // type:object size:0xC scope:local down_eye_dt$6361 = .bss:0x000004F4; // type:object size:0x3C scope:local @7447 = .bss:0x00000530; // type:object size:0xC scope:local +init$0007 = .bss:0x0000053C; // type:object size:0x1 scope:local align:1 data:byte @7450 = .bss:0x00000540; // type:object size:0xC scope:local @7451 = .bss:0x0000054C; // type:object size:0xC scope:local mOp2PlayerDt$7446 = .bss:0x00000558; // type:object size:0x24 scope:local @7453 = .bss:0x0000057C; // type:object size:0xC scope:local +init$0008 = .bss:0x00000588; // type:object size:0x1 scope:local align:1 data:byte @7456 = .bss:0x0000058C; // type:object size:0xC scope:local @7457 = .bss:0x00000598; // type:object size:0xC scope:local @7458 = .bss:0x000005A4; // type:object size:0xC scope:local @@ -595,6 +605,7 @@ mOp2PlayerDt$7446 = .bss:0x00000558; // type:object size:0x24 scope:local @7461 = .bss:0x000005C8; // type:object size:0xC scope:local mOp2CenterDt$7452 = .bss:0x000005D4; // type:object size:0x54 scope:local @7463 = .bss:0x00000628; // type:object size:0xC scope:local +init$0009 = .bss:0x00000634; // type:object size:0x1 scope:local align:1 data:byte @7466 = .bss:0x00000638; // type:object size:0xC scope:local @7467 = .bss:0x00000644; // type:object size:0xC scope:local @7468 = .bss:0x00000650; // type:object size:0xC scope:local @@ -603,20 +614,24 @@ mOp2CenterDt$7452 = .bss:0x000005D4; // type:object size:0x54 scope:local @7471 = .bss:0x00000674; // type:object size:0xC scope:local mOp2EyeDt$7462 = .bss:0x00000680; // type:object size:0x54 scope:local @9091 = .bss:0x000006D4; // type:object size:0xC scope:local +init$0010 = .bss:0x000006E0; // type:object size:0x1 scope:local align:1 data:byte @9094 = .bss:0x000006E4; // type:object size:0xC scope:local mEd2CenterDt$9090 = .bss:0x000006F0; // type:object size:0x18 scope:local @9096 = .bss:0x00000708; // type:object size:0xC scope:local +init$0011 = .bss:0x00000714; // type:object size:0x1 scope:local align:1 data:byte @9099 = .bss:0x00000718; // type:object size:0xC scope:local mEd22EyeDt$9095 = .bss:0x00000724; // type:object size:0x18 scope:local -lbl_142_bss_73C = .bss:0x0000073C; // type:object size:0x1 data:byte +init$0012 = .bss:0x0000073C; // type:object size:0x1 scope:local align:1 data:byte mWaitDt$9733 = .bss:0x00000740; // type:object size:0xC scope:local data:4byte @10210 = .bss:0x0000074C; // type:object size:0xC scope:local +init$0013 = .bss:0x00000758; // type:object size:0x1 scope:local align:1 data:byte @10213 = .bss:0x0000075C; // type:object size:0xC scope:local @10214 = .bss:0x00000768; // type:object size:0xC scope:local @10215 = .bss:0x00000774; // type:object size:0xC scope:local @10216 = .bss:0x00000780; // type:object size:0xC scope:local head_cc_dt$10209 = .bss:0x0000078C; // type:object size:0x3C scope:local @10829 = .bss:0x000007C8; // type:object size:0xC scope:local +init$0014 = .bss:0x000007D4; // type:object size:0x1 scope:local align:1 data:byte @10832 = .bss:0x000007D8; // type:object size:0xC scope:local @10833 = .bss:0x000007E4; // type:object size:0xC scope:local @10834 = .bss:0x000007F0; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_b_gg/splits.txt b/config/GZ2J01/rels/d_a_b_gg/splits.txt index 76df93067a..37bbd10322 100644 --- a/config/GZ2J01/rels/d_a_b_gg/splits.txt +++ b/config/GZ2J01/rels/d_a_b_gg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gg.cpp: diff --git a/config/GZ2J01/rels/d_a_b_gg/symbols.txt b/config/GZ2J01/rels/d_a_b_gg/symbols.txt index 2dc408dd6b..124e8530c3 100644 --- a/config/GZ2J01/rels/d_a_b_gg/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_gg/symbols.txt @@ -266,7 +266,8 @@ ccSphSrc$3982 = .rodata:0x00000100; // type:object size:0x40 scope:local @stringBase0 = .rodata:0x00000374; // type:object size:0x19 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_143_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3790 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3791 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3799 = .data:0x00000030; // type:object size:0x6 scope:local @@ -305,7 +306,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_143_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3927 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte s_dis__22@unnamed@d_a_b_gg_cpp@ = .bss:0x00000070; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_b_gm/splits.txt b/config/GZ2J01/rels/d_a_b_gm/splits.txt index 6fe68269de..caea243977 100644 --- a/config/GZ2J01/rels/d_a_b_gm/splits.txt +++ b/config/GZ2J01/rels/d_a_b_gm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gm.cpp: diff --git a/config/GZ2J01/rels/d_a_b_gm/symbols.txt b/config/GZ2J01/rels/d_a_b_gm/symbols.txt index 85cbfc9193..a661807322 100644 --- a/config/GZ2J01/rels/d_a_b_gm/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_gm/symbols.txt @@ -183,7 +183,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000200; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_144_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double name$4019 = .data:0x00000020; // type:object size:0x6 scope:local name$4042 = .data:0x00000028; // type:object size:0x8 scope:local @4354 = .data:0x00000030; // type:object size:0x2C scope:local @@ -226,7 +227,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_144_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4C scope:global data:byte ko_ct = .bss:0x000000A0; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_b_gnd/splits.txt b/config/GZ2J01/rels/d_a_b_gnd/splits.txt index c7e4552796..f369fe0fd7 100644 --- a/config/GZ2J01/rels/d_a_b_gnd/splits.txt +++ b/config/GZ2J01/rels/d_a_b_gnd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gnd.cpp: diff --git a/config/GZ2J01/rels/d_a_b_gnd/symbols.txt b/config/GZ2J01/rels/d_a_b_gnd/symbols.txt index f051720f8b..a5c1e56b12 100644 --- a/config/GZ2J01/rels/d_a_b_gnd/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_gnd/symbols.txt @@ -306,7 +306,8 @@ blur_model$8822 = .rodata:0x00000340; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000348; // type:object size:0x21 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_145_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_color$3983 = .data:0x00000020; // type:object size:0x4 scope:local chk_x$4163 = .data:0x00000024; // type:object size:0x10 scope:local chk_z$4164 = .data:0x00000034; // type:object size:0x10 scope:local @@ -361,13 +362,15 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_145_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3810 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte @4187 = .bss:0x00000070; // type:object size:0xC scope:local +init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte k_pos$4186 = .bss:0x00000080; // type:object size:0xC scope:local @4509 = .bss:0x0000008C; // type:object size:0xC scope:local b_path = .bss:0x00000098; // type:object size:0x60 scope:global align:4 data:float +unk_bss_0xF0 = .bss:0x000000F8; // type:object size:0x4 scope:local data:4byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000FC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000100; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000104; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_b_go/splits.txt b/config/GZ2J01/rels/d_a_b_go/splits.txt index 6ef11f39b6..b7954231f5 100644 --- a/config/GZ2J01/rels/d_a_b_go/splits.txt +++ b/config/GZ2J01/rels/d_a_b_go/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_go.cpp: diff --git a/config/GZ2J01/rels/d_a_b_go/symbols.txt b/config/GZ2J01/rels/d_a_b_go/symbols.txt index e83df13316..ee92e3724a 100644 --- a/config/GZ2J01/rels/d_a_b_go/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_go/symbols.txt @@ -56,6 +56,6 @@ __vt__8cM3dGAab = .data:0x00000068; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000074; // type:object size:0x24 scope:global __vt__12daB_GO_HIO_c = .data:0x00000098; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_146_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_80604140 = .bss:0x00000008; // type:object size:0x1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_b_gos/splits.txt b/config/GZ2J01/rels/d_a_b_gos/splits.txt index 6ce1eba36b..ebd4ea4c44 100644 --- a/config/GZ2J01/rels/d_a_b_gos/splits.txt +++ b/config/GZ2J01/rels/d_a_b_gos/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gos.cpp: diff --git a/config/GZ2J01/rels/d_a_b_gos/symbols.txt b/config/GZ2J01/rels/d_a_b_gos/symbols.txt index 9ee77a54dd..4f41bf693e 100644 --- a/config/GZ2J01/rels/d_a_b_gos/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_gos/symbols.txt @@ -61,6 +61,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B0; // type:object size:0x24 scope:global __vt__13daB_GOS_HIO_c = .data:0x000001D4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global boss = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte -lbl_147_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +data_8060560C = .bss:0x0000000C; // type:object size:0x1 scope:local data:byte @3641 = .bss:0x00000010; // type:object size:0xC scope:local l_HIO = .bss:0x0000001C; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_b_mgn/splits.txt b/config/GZ2J01/rels/d_a_b_mgn/splits.txt index 13e6c0c18c..76998b0b2e 100644 --- a/config/GZ2J01/rels/d_a_b_mgn/splits.txt +++ b/config/GZ2J01/rels/d_a_b_mgn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_mgn.cpp: diff --git a/config/GZ2J01/rels/d_a_b_mgn/symbols.txt b/config/GZ2J01/rels/d_a_b_mgn/symbols.txt index 2b634541ff..ed79f4ca0e 100644 --- a/config/GZ2J01/rels/d_a_b_mgn/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_mgn/symbols.txt @@ -223,7 +223,8 @@ cc_set_jnt$7875 = .rodata:0x00000258; // type:object size:0x3C scope:local @stringBase0 = .rodata:0x000002A4; // type:object size:0xD scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_148_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3807 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3808 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3816 = .data:0x00000030; // type:object size:0x6 scope:local @@ -254,6 +255,6 @@ __vt__12J3DFrameCtrl = .data:0x00000380; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x0000038C; // type:object size:0xC scope:global __vt__13daB_MGN_HIO_c = .data:0x00000398; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_148_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3944 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_b_ob/splits.txt b/config/GZ2J01/rels/d_a_b_ob/splits.txt index 453f3327f9..fcbb33befc 100644 --- a/config/GZ2J01/rels/d_a_b_ob/splits.txt +++ b/config/GZ2J01/rels/d_a_b_ob/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_ob.cpp: diff --git a/config/GZ2J01/rels/d_a_b_ob/symbols.txt b/config/GZ2J01/rels/d_a_b_ob/symbols.txt index 37d3e9f2c8..4539d3b380 100644 --- a/config/GZ2J01/rels/d_a_b_ob/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_ob/symbols.txt @@ -297,7 +297,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000318; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_149_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double iso_eff$5401 = .data:0x00000020; // type:object size:0xA scope:local buf_p = .data:0x0000002C; // type:object size:0x4C scope:global size_p = .data:0x00000078; // type:object size:0x4C scope:global @@ -341,7 +342,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_149_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +data_8061B4FD = .bss:0x00000045; // type:object size:0x1 scope:local data:byte moveSW = .bss:0x00000048; // type:object size:0x4 scope:global moveSW2 = .bss:0x0000004C; // type:object size:0x4 scope:global data:4byte @3767 = .bss:0x00000050; // type:object size:0xC scope:local @@ -350,6 +351,7 @@ pno = .bss:0x0000007C; // type:object size:0x4 scope:global data:4byte fin = .bss:0x00000080; // type:object size:0x4 scope:global data:4byte bf_ct = .bss:0x00000084; // type:object size:0x4 scope:global data:4byte @5008 = .bss:0x00000088; // type:object size:0xC scope:local +init$0000 = .bss:0x00000094; // type:object size:0x1 scope:local align:1 data:byte @5011 = .bss:0x00000098; // type:object size:0xC scope:local @5012 = .bss:0x000000A4; // type:object size:0xC scope:local @5013 = .bss:0x000000B0; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_b_oh/splits.txt b/config/GZ2J01/rels/d_a_b_oh/splits.txt index 63c656903c..1707d87f7a 100644 --- a/config/GZ2J01/rels/d_a_b_oh/splits.txt +++ b/config/GZ2J01/rels/d_a_b_oh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_oh.cpp: diff --git a/config/GZ2J01/rels/d_a_b_oh/symbols.txt b/config/GZ2J01/rels/d_a_b_oh/symbols.txt index fac7433e0a..acd8008ea8 100644 --- a/config/GZ2J01/rels/d_a_b_oh/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_oh/symbols.txt @@ -100,7 +100,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_150_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +data_8061DBB5 = .bss:0x00000045; // type:object size:0x1 data:byte @3645 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte boss = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_b_tn/splits.txt b/config/GZ2J01/rels/d_a_b_tn/splits.txt index c90af169cd..7345bf245e 100644 --- a/config/GZ2J01/rels/d_a_b_tn/splits.txt +++ b/config/GZ2J01/rels/d_a_b_tn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_tn.cpp: diff --git a/config/GZ2J01/rels/d_a_b_tn/symbols.txt b/config/GZ2J01/rels/d_a_b_tn/symbols.txt index 8afe071729..09682538c9 100644 --- a/config/GZ2J01/rels/d_a_b_tn/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_tn/symbols.txt @@ -269,7 +269,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000002B4; // type:object size:0x19 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_152_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3799 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3800 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3808 = .data:0x00000030; // type:object size:0x6 scope:local @@ -326,7 +327,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_152_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3936 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x30 scope:global data:byte @3949 = .bss:0x00000084; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_b_yo/splits.txt b/config/GZ2J01/rels/d_a_b_yo/splits.txt index 639db0fa1a..1bfd860136 100644 --- a/config/GZ2J01/rels/d_a_b_yo/splits.txt +++ b/config/GZ2J01/rels/d_a_b_yo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_yo.cpp: diff --git a/config/GZ2J01/rels/d_a_b_yo/symbols.txt b/config/GZ2J01/rels/d_a_b_yo/symbols.txt index e0b000f008..fae6a702da 100644 --- a/config/GZ2J01/rels/d_a_b_yo/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_yo/symbols.txt @@ -221,7 +221,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000240; // type:object size:0x2B scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_153_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_yo_src__22@unnamed@d_a_b_yo_cpp@ = .data:0x00000020; // type:object size:0x44 scope:global cc_yo_tg_src__22@unnamed@d_a_b_yo_cpp@ = .data:0x00000064; // type:object size:0x40 scope:global cc_yo_iron_src__22@unnamed@d_a_b_yo_cpp@ = .data:0x000000A4; // type:object size:0x40 scope:global @@ -279,7 +280,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_153_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3783 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x5C scope:global data:byte @3802 = .bss:0x000000B0; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_b_yo_ice/splits.txt b/config/GZ2J01/rels/d_a_b_yo_ice/splits.txt index 8349ae09b3..baa4f2e91c 100644 --- a/config/GZ2J01/rels/d_a_b_yo_ice/splits.txt +++ b/config/GZ2J01/rels/d_a_b_yo_ice/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_yo_ice.cpp: diff --git a/config/GZ2J01/rels/d_a_b_yo_ice/symbols.txt b/config/GZ2J01/rels/d_a_b_yo_ice/symbols.txt index 9db7229042..d57b91025f 100644 --- a/config/GZ2J01/rels/d_a_b_yo_ice/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_yo_ice/symbols.txt @@ -109,7 +109,8 @@ yoi_fall_timer = .rodata:0x0000002C; // type:object size:0x28 scope:global @stringBase0 = .rodata:0x00000118; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_154_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_yo_src__26@unnamed@d_a_b_yo_ice_cpp@ = .data:0x00000020; // type:object size:0x44 scope:global cc_yo_iron_src__26@unnamed@d_a_b_yo_ice_cpp@ = .data:0x00000064; // type:object size:0x44 scope:global cc_yo_cam_src__26@unnamed@d_a_b_yo_ice_cpp@ = .data:0x000000A8; // type:object size:0x44 scope:global @@ -129,6 +130,6 @@ __vt__8cM3dGCyl = .data:0x00000214; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000220; // type:object size:0xC scope:global __vt__13daB_YOI_HIO_c = .data:0x0000022C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_154_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3771 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_b_zant/splits.txt b/config/GZ2J01/rels/d_a_b_zant/splits.txt index 89293dbc7f..2954410a88 100644 --- a/config/GZ2J01/rels/d_a_b_zant/splits.txt +++ b/config/GZ2J01/rels/d_a_b_zant/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_zant.cpp: diff --git a/config/GZ2J01/rels/d_a_b_zant/symbols.txt b/config/GZ2J01/rels/d_a_b_zant/symbols.txt index 12b31895c6..66d61f2185 100644 --- a/config/GZ2J01/rels/d_a_b_zant/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_zant/symbols.txt @@ -288,7 +288,8 @@ damage_jump_speed$7712 = .rodata:0x0000024C; // type:object size:0x2C scope:loca @stringBase0 = .rodata:0x00000344; // type:object size:0x2B scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_155_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_zant_src__24@unnamed@d_a_b_zant_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_zant_sword_src__24@unnamed@d_a_b_zant_cpp@ = .data:0x00000060; // type:object size:0x40 scope:global cc_zant_roll_src__24@unnamed@d_a_b_zant_cpp@ = .data:0x000000A0; // type:object size:0x44 scope:global @@ -344,7 +345,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_155_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4164 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x44 scope:global data:byte @4182 = .bss:0x00000098; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_b_zant_magic/symbols.txt b/config/GZ2J01/rels/d_a_b_zant_magic/symbols.txt index 4436630984..97ce19d3ad 100644 --- a/config/GZ2J01/rels/d_a_b_zant_magic/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_zant_magic/symbols.txt @@ -45,7 +45,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3940 = .rodata:0x00000048; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_156_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_zant_src__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x00000020; // type:object size:0x4C scope:global cc_zant_src2__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x0000006C; // type:object size:0x40 scope:global cc_zant_src3__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x000000AC; // type:object size:0x40 scope:global diff --git a/config/GZ2J01/rels/d_a_b_zant_mobile/splits.txt b/config/GZ2J01/rels/d_a_b_zant_mobile/splits.txt index 80ce04e0f1..48fb27a5d2 100644 --- a/config/GZ2J01/rels/d_a_b_zant_mobile/splits.txt +++ b/config/GZ2J01/rels/d_a_b_zant_mobile/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_zant_mobile.cpp: diff --git a/config/GZ2J01/rels/d_a_b_zant_mobile/symbols.txt b/config/GZ2J01/rels/d_a_b_zant_mobile/symbols.txt index 3c965d209f..b291b25704 100644 --- a/config/GZ2J01/rels/d_a_b_zant_mobile/symbols.txt +++ b/config/GZ2J01/rels/d_a_b_zant_mobile/symbols.txt @@ -88,6 +88,6 @@ __vt__12J3DFrameCtrl = .data:0x000000F8; // type:object size:0xC scope:global __vt__14dBgS_ObjGndChk = .data:0x00000104; // type:object size:0x30 scope:global __vt__15daB_ZANTZ_HIO_c = .data:0x00000134; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_157_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_balloon_2D/splits.txt b/config/GZ2J01/rels/d_a_balloon_2D/splits.txt index 9180d9a115..be330b7a5c 100644 --- a/config/GZ2J01/rels/d_a_balloon_2D/splits.txt +++ b/config/GZ2J01/rels/d_a_balloon_2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_balloon_2D.cpp: diff --git a/config/GZ2J01/rels/d_a_bd/splits.txt b/config/GZ2J01/rels/d_a_bd/splits.txt index c01e402d7c..0c5664cb56 100644 --- a/config/GZ2J01/rels/d_a_bd/splits.txt +++ b/config/GZ2J01/rels/d_a_bd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_bd.cpp: diff --git a/config/GZ2J01/rels/d_a_bd/symbols.txt b/config/GZ2J01/rels/d_a_bd/symbols.txt index 50537f86c5..0c0a76c15e 100644 --- a/config/GZ2J01/rels/d_a_bd/symbols.txt +++ b/config/GZ2J01/rels/d_a_bd/symbols.txt @@ -131,7 +131,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_60_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3937 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3946 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_bg_obj/symbols.txt b/config/GZ2J01/rels/d_a_bg_obj/symbols.txt index 4ac4ffc810..31e6bf940e 100644 --- a/config/GZ2J01/rels/d_a_bg_obj/symbols.txt +++ b/config/GZ2J01/rels/d_a_bg_obj/symbols.txt @@ -79,7 +79,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @stringBase0 = .rodata:0x00000068; // type:object size:0xA2 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_4_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_tri_src = .data:0x00000020; // type:object size:0x54 scope:global l_specName = .data:0x00000074; // type:object size:0x4 scope:global data:4byte @3761 = .data:0x00000078; // type:object size:0xC scope:local @@ -122,4 +123,4 @@ l_bmdName$3644 = .bss:0x00000000; // type:object size:0x10 scope:local l_btkName$3652 = .bss:0x00000010; // type:object size:0x10 scope:local l_brkName$3660 = .bss:0x00000020; // type:object size:0x10 scope:local l_dzbName$3668 = .bss:0x00000030; // type:object size:0x10 scope:local -lbl_4_bss_40 = .bss:0x00000040; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000040; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_boomerang/symbols.txt b/config/GZ2J01/rels/d_a_boomerang/symbols.txt index ad70b0f0a3..12a14138c2 100644 --- a/config/GZ2J01/rels/d_a_boomerang/symbols.txt +++ b/config/GZ2J01/rels/d_a_boomerang/symbols.txt @@ -124,7 +124,8 @@ l_lockSeFlg = .rodata:0x00000040; // type:object size:0x14 scope:global @stringBase0 = .rodata:0x00000140; // type:object size:0x14A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_46_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @5412 = .data:0x00000020; // type:object size:0xC scope:local data:4byte @5579 = .data:0x0000002C; // type:object size:0xC scope:local data:4byte l_atCpsSrc = .data:0x00000038; // type:object size:0x4C scope:global diff --git a/config/GZ2J01/rels/d_a_bullet/splits.txt b/config/GZ2J01/rels/d_a_bullet/splits.txt index 580fde4232..a68bf22432 100644 --- a/config/GZ2J01/rels/d_a_bullet/splits.txt +++ b/config/GZ2J01/rels/d_a_bullet/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_bullet.cpp: diff --git a/config/GZ2J01/rels/d_a_canoe/splits.txt b/config/GZ2J01/rels/d_a_canoe/splits.txt index c45ab13f2f..a4ad8e394c 100644 --- a/config/GZ2J01/rels/d_a_canoe/splits.txt +++ b/config/GZ2J01/rels/d_a_canoe/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_canoe.cpp: diff --git a/config/GZ2J01/rels/d_a_canoe/symbols.txt b/config/GZ2J01/rels/d_a_canoe/symbols.txt index 2d70658869..c1eea38106 100644 --- a/config/GZ2J01/rels/d_a_canoe/symbols.txt +++ b/config/GZ2J01/rels/d_a_canoe/symbols.txt @@ -40,7 +40,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3766 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3766 = .rodata:0x00000000; // type:object size:0xC scope:local l_arcName = .rodata:0x0000000C; // type:object size:0x6 scope:global data:string l_arcName2 = .rodata:0x00000014; // type:object size:0x7 scope:global data:string l_arcName3 = .rodata:0x0000001C; // type:object size:0x8 scope:global data:string @@ -124,8 +124,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @5103 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte paddleRippleScale$5102 = .bss:0x00000058; // type:object size:0xC scope:local @5356 = .bss:0x00000064; // type:object size:0xC scope:local +init$0001 = .bss:0x00000070; // type:object size:0x1 scope:local align:1 data:byte bodyRippleScale$5355 = .bss:0x00000074; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_coach_2D/splits.txt b/config/GZ2J01/rels/d_a_coach_2D/splits.txt index 1f225391f5..6d1128a89f 100644 --- a/config/GZ2J01/rels/d_a_coach_2D/splits.txt +++ b/config/GZ2J01/rels/d_a_coach_2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_coach_2D.cpp: diff --git a/config/GZ2J01/rels/d_a_cow/splits.txt b/config/GZ2J01/rels/d_a_cow/splits.txt index 38d3de1d06..35666f2bdc 100644 --- a/config/GZ2J01/rels/d_a_cow/splits.txt +++ b/config/GZ2J01/rels/d_a_cow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_cow.cpp: diff --git a/config/GZ2J01/rels/d_a_cow/symbols.txt b/config/GZ2J01/rels/d_a_cow/symbols.txt index 7974b9ba87..a039ab1331 100644 --- a/config/GZ2J01/rels/d_a_cow/symbols.txt +++ b/config/GZ2J01/rels/d_a_cow/symbols.txt @@ -200,7 +200,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000168; // type:object size:0x3E scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_163_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__21@unnamed@d_a_cow_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global pen_dir__21@unnamed@d_a_cow_cpp@ = .data:0x00000060; // type:object size:0x2 scope:global data:2byte gate_dir__21@unnamed@d_a_cow_cpp@ = .data:0x00000062; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2J01/rels/d_a_crod/symbols.txt b/config/GZ2J01/rels/d_a_crod/symbols.txt index f4f6486578..3110023bf4 100644 --- a/config/GZ2J01/rels/d_a_crod/symbols.txt +++ b/config/GZ2J01/rels/d_a_crod/symbols.txt @@ -44,4 +44,4 @@ __vt__10cCcD_GStts = .data:0x000000A8; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x000000B4; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000C0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000CC; // type:object size:0xC scope:global -lbl_47_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_cstatue/splits.txt b/config/GZ2J01/rels/d_a_cstatue/splits.txt index e80e577aa1..ea8ebe0f7e 100644 --- a/config/GZ2J01/rels/d_a_cstatue/splits.txt +++ b/config/GZ2J01/rels/d_a_cstatue/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_cstatue.cpp: diff --git a/config/GZ2J01/rels/d_a_cstatue/symbols.txt b/config/GZ2J01/rels/d_a_cstatue/symbols.txt index 50fc49cbc5..1593aa886f 100644 --- a/config/GZ2J01/rels/d_a_cstatue/symbols.txt +++ b/config/GZ2J01/rels/d_a_cstatue/symbols.txt @@ -130,7 +130,8 @@ brkIdx$6115 = .rodata:0x00000308; // type:object size:0xA scope:local @6396 = .rodata:0x00000314; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_164_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_atCpsSrc = .data:0x00000020; // type:object size:0x4C scope:global l_cylSrc = .data:0x0000006C; // type:object size:0x44 scope:global l_sphSrc = .data:0x000000B0; // type:object size:0x40 scope:global diff --git a/config/GZ2J01/rels/d_a_demo00/splits.txt b/config/GZ2J01/rels/d_a_demo00/splits.txt index 480c9e0411..a59a8f3eac 100644 --- a/config/GZ2J01/rels/d_a_demo00/splits.txt +++ b/config/GZ2J01/rels/d_a_demo00/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_demo00.cpp: diff --git a/config/GZ2J01/rels/d_a_demo00/symbols.txt b/config/GZ2J01/rels/d_a_demo00/symbols.txt index 9946a10262..616da0d0dc 100644 --- a/config/GZ2J01/rels/d_a_demo00/symbols.txt +++ b/config/GZ2J01/rels/d_a_demo00/symbols.txt @@ -42,7 +42,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3727 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3727 = .rodata:0x00000000; // type:object size:0xC scope:local @4004 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @4122 = .rodata:0x00000010; // type:object size:0x4 scope:local @4123 = .rodata:0x00000014; // type:object size:0x4 scope:local align:4 data:float @@ -116,7 +116,8 @@ l_itemNo$localstatic3$execute__10daDemo00_cFv = .rodata:0x0000006C; // type:obje @stringBase0 = .rodata:0x00000138; // type:object size:0x28 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_48_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_lightData = .data:0x00000020; // type:object size:0x18 scope:global @4662 = .data:0x00000038; // type:object size:0xC scope:local data:4byte @4676 = .data:0x00000044; // type:object size:0xC scope:local data:4byte diff --git a/config/GZ2J01/rels/d_a_demo_item/splits.txt b/config/GZ2J01/rels/d_a_demo_item/splits.txt index 8f26b5f468..6009d922bf 100644 --- a/config/GZ2J01/rels/d_a_demo_item/splits.txt +++ b/config/GZ2J01/rels/d_a_demo_item/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_demo_item.cpp: diff --git a/config/GZ2J01/rels/d_a_demo_item/symbols.txt b/config/GZ2J01/rels/d_a_demo_item/symbols.txt index 6b18be8eb5..50792b822e 100644 --- a/config/GZ2J01/rels/d_a_demo_item/symbols.txt +++ b/config/GZ2J01/rels/d_a_demo_item/symbols.txt @@ -96,6 +96,7 @@ l_wolf_offset = .bss:0x0000006C; // type:object size:0xC scope:global @3760 = .bss:0x00000078; // type:object size:0xC scope:local l_horse_offset = .bss:0x00000084; // type:object size:0xC scope:global @4275 = .bss:0x00000090; // type:object size:0xC scope:local +init$0000 = .bss:0x0000009C; // type:object size:0x1 scope:local align:1 data:byte @4278 = .bss:0x000000A0; // type:object size:0xC scope:local @4279 = .bss:0x000000AC; // type:object size:0xC scope:local offset_tbl$4274 = .bss:0x000000B8; // type:object size:0x24 scope:local diff --git a/config/GZ2J01/rels/d_a_do/splits.txt b/config/GZ2J01/rels/d_a_do/splits.txt index 4048a749bb..bcd5ed0814 100644 --- a/config/GZ2J01/rels/d_a_do/splits.txt +++ b/config/GZ2J01/rels/d_a_do/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_do.cpp: diff --git a/config/GZ2J01/rels/d_a_do/symbols.txt b/config/GZ2J01/rels/d_a_do/symbols.txt index 93efa62619..3547a91977 100644 --- a/config/GZ2J01/rels/d_a_do/symbols.txt +++ b/config/GZ2J01/rels/d_a_do/symbols.txt @@ -200,13 +200,15 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_165_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte +noFallCheck = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte target_info = .bss:0x00000074; // type:object size:0x14 scope:global target_info_count = .bss:0x00000088; // type:object size:0x4 scope:global data:4byte target_bgc = .bss:0x0000008C; // type:object size:0x14 scope:global @5578 = .bss:0x000000A0; // type:object size:0xC scope:local +init$0000 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte scc$5577 = .bss:0x000000B0; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000BC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000C0; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_door_boss/symbols.txt b/config/GZ2J01/rels/d_a_door_boss/symbols.txt index 5854691dc0..de7c4701a4 100644 --- a/config/GZ2J01/rels/d_a_door_boss/symbols.txt +++ b/config/GZ2J01/rels/d_a_door_boss/symbols.txt @@ -59,7 +59,8 @@ l_staff_name = .rodata:0x00000058; // type:object size:0xD scope:global data:str @stringBase0 = .rodata:0x00000070; // type:object size:0x9C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_166_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double action_table$3817 = .data:0x00000020; // type:object size:0x2C scope:local @3939 = .data:0x0000004C; // type:object size:0x2C scope:local @3938 = .data:0x00000078; // type:object size:0x2C scope:local @@ -73,4 +74,4 @@ g_profile_BOSS_DOOR = .data:0x00000124; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global -lbl_166_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_door_bossL1/symbols.txt b/config/GZ2J01/rels/d_a_door_bossL1/symbols.txt index 07d58a1768..457df5aa81 100644 --- a/config/GZ2J01/rels/d_a_door_bossL1/symbols.txt +++ b/config/GZ2J01/rels/d_a_door_bossL1/symbols.txt @@ -92,7 +92,8 @@ l_lv6_eff_b$4257 = .rodata:0x00000074; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000C8; // type:object size:0x31A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_64_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_stageName$3673 = .data:0x00000020; // type:object size:0x50 scope:local @3700 = .data:0x00000070; // type:object size:0x28 scope:local @3713 = .data:0x00000098; // type:object size:0x28 scope:local @@ -110,4 +111,4 @@ g_profile_L1BOSS_DOOR = .data:0x00000240; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000270; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000027C; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000002A0; // type:object size:0xC scope:global -lbl_64_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_door_bossL5/symbols.txt b/config/GZ2J01/rels/d_a_door_bossL5/symbols.txt index 4e5f4f1f5b..e693aa1d4d 100644 --- a/config/GZ2J01/rels/d_a_door_bossL5/symbols.txt +++ b/config/GZ2J01/rels/d_a_door_bossL5/symbols.txt @@ -69,7 +69,8 @@ l_staff_name = .rodata:0x00000034; // type:object size:0xD scope:global data:str @stringBase0 = .rodata:0x00000080; // type:object size:0xAA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_167_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double action_table$3861 = .data:0x00000020; // type:object size:0x38 scope:local @3952 = .data:0x00000058; // type:object size:0x2C scope:local @3951 = .data:0x00000084; // type:object size:0x38 scope:local @@ -83,4 +84,4 @@ g_profile_L5BOSS_DOOR = .data:0x0000013C; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x0000016C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000178; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x0000019C; // type:object size:0xC scope:global -lbl_167_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_door_dbdoor00/symbols.txt b/config/GZ2J01/rels/d_a_door_dbdoor00/symbols.txt index 9739e8626d..16ad902a8b 100644 --- a/config/GZ2J01/rels/d_a_door_dbdoor00/symbols.txt +++ b/config/GZ2J01/rels/d_a_door_dbdoor00/symbols.txt @@ -52,7 +52,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000038; // type:object size:0xF6 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_6_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmd_base_name = .data:0x00000020; // type:object size:0x4 scope:global data:4byte action_table$3865 = .data:0x00000024; // type:object size:0x24 scope:local @3957 = .data:0x00000048; // type:object size:0x24 scope:local @@ -66,4 +67,4 @@ l_action$4091 = .data:0x000000B4; // type:object size:0x48 scope:local l_daDbdoor00_Method = .data:0x000000FC; // type:object size:0x20 scope:global g_profile_DBDOOR = .data:0x0000011C; // type:object size:0x30 scope:global l_bmdName$3699 = .bss:0x00000000; // type:object size:0x20 scope:local -lbl_6_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_door_knob00/symbols.txt b/config/GZ2J01/rels/d_a_door_knob00/symbols.txt index 522a4478c5..f7a5fa75d2 100644 --- a/config/GZ2J01/rels/d_a_door_knob00/symbols.txt +++ b/config/GZ2J01/rels/d_a_door_knob00/symbols.txt @@ -75,7 +75,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000005C; // type:object size:0x1B0 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_7_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmd_base_name = .data:0x00000020; // type:object size:0x4 scope:global data:4byte ev_name_table$4009 = .data:0x00000024; // type:object size:0x1C scope:local action_table$4177 = .data:0x00000040; // type:object size:0x40 scope:local @@ -95,4 +96,4 @@ l_daKnob20_Method = .data:0x000001C4; // type:object size:0x20 scope:global g_profile_KNOB20 = .data:0x000001E4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000214; // type:object size:0xC scope:global l_bmdName$3809 = .bss:0x00000000; // type:object size:0x20 scope:local -lbl_7_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_door_mbossL1/symbols.txt b/config/GZ2J01/rels/d_a_door_mbossL1/symbols.txt index 23cf9cafa1..bb30c89b06 100644 --- a/config/GZ2J01/rels/d_a_door_mbossL1/symbols.txt +++ b/config/GZ2J01/rels/d_a_door_mbossL1/symbols.txt @@ -142,7 +142,8 @@ l_eff_id_lv4$4706 = .rodata:0x00000094; // type:object size:0xA scope:local @stringBase0 = .rodata:0x00000108; // type:object size:0x310 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_168_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_door_open_demo = .data:0x00000020; // type:object size:0x2C scope:global l_door_open_demoB = .data:0x0000004C; // type:object size:0x2C scope:global l_door_open_demoLv5 = .data:0x00000078; // type:object size:0x10 scope:global @@ -167,4 +168,4 @@ __vt__14dBgS_ObjGndChk = .data:0x00000358; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000388; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000394; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000003B8; // type:object size:0xC scope:global -lbl_168_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_door_push/symbols.txt b/config/GZ2J01/rels/d_a_door_push/symbols.txt index fa0829dece..b6c44fa00a 100644 --- a/config/GZ2J01/rels/d_a_door_push/symbols.txt +++ b/config/GZ2J01/rels/d_a_door_push/symbols.txt @@ -51,7 +51,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000004C; // type:object size:0x36 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_169_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float @3792 = .data:0x0000003C; // type:object size:0xC scope:local data:4byte @@ -64,5 +65,5 @@ action_table$3910 = .data:0x0000009C; // type:object size:0xC scope:local daDoorPush_METHODS = .data:0x000000A8; // type:object size:0x20 scope:global g_profile_PushDoor = .data:0x000000C8; // type:object size:0x30 scope:global __vt__12daDoorPush_c = .data:0x000000F8; // type:object size:0x28 scope:global -lbl_169_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_169_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_door_shutter/symbols.txt b/config/GZ2J01/rels/d_a_door_shutter/symbols.txt index 746a9c1869..74d9bd8e64 100644 --- a/config/GZ2J01/rels/d_a_door_shutter/symbols.txt +++ b/config/GZ2J01/rels/d_a_door_shutter/symbols.txt @@ -138,7 +138,8 @@ l_eff_id$4449 = .rodata:0x00000044; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000B8; // type:object size:0x5A3 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_8_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3980 = .data:0x00000020; // type:object size:0x34 scope:local @4126 = .data:0x00000054; // type:object size:0x34 scope:local @4496 = .data:0x00000088; // type:object size:0x34 scope:local diff --git a/config/GZ2J01/rels/d_a_dshutter/symbols.txt b/config/GZ2J01/rels/d_a_dshutter/symbols.txt index 77fdc33f3d..8884706b26 100644 --- a/config/GZ2J01/rels/d_a_dshutter/symbols.txt +++ b/config/GZ2J01/rels/d_a_dshutter/symbols.txt @@ -39,7 +39,8 @@ l_heap_size = .rodata:0x00000018; // type:object size:0xC scope:global @stringBase0 = .rodata:0x0000003C; // type:object size:0x1C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_10_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0xC scope:global @3631 = .data:0x0000002C; // type:object size:0xC scope:local @3632 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_ai/splits.txt b/config/GZ2J01/rels/d_a_e_ai/splits.txt index baa5914f6b..8effc34a59 100644 --- a/config/GZ2J01/rels/d_a_e_ai/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ai/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ai.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ai/symbols.txt b/config/GZ2J01/rels/d_a_e_ai/symbols.txt index 6ab2257461..5a6632ebda 100644 --- a/config/GZ2J01/rels/d_a_e_ai/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ai/symbols.txt @@ -95,7 +95,8 @@ shield_sph_src$3818 = .rodata:0x0000007C; // type:object size:0x40 scope:local @stringBase0 = .rodata:0x0000013C; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_170_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -112,6 +113,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000114; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000138; // type:object size:0xC scope:global __vt__12daE_AI_HIO_c = .data:0x00000144; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_170_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_arrow/splits.txt b/config/GZ2J01/rels/d_a_e_arrow/splits.txt index 13f6223baa..706fc8f133 100644 --- a/config/GZ2J01/rels/d_a_e_arrow/splits.txt +++ b/config/GZ2J01/rels/d_a_e_arrow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_arrow.cpp: diff --git a/config/GZ2J01/rels/d_a_e_arrow/symbols.txt b/config/GZ2J01/rels/d_a_e_arrow/symbols.txt index 77743d7284..7eedab5b3f 100644 --- a/config/GZ2J01/rels/d_a_e_arrow/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_arrow/symbols.txt @@ -87,7 +87,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000EC; // type:object size:0xB scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_171_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double fire_name$4663 = .data:0x00000020; // type:object size:0x8 scope:local at_sph_src$5035 = .data:0x00000028; // type:object size:0x40 scope:local tg_sph_src$5036 = .data:0x00000068; // type:object size:0x40 scope:local diff --git a/config/GZ2J01/rels/d_a_e_ba/splits.txt b/config/GZ2J01/rels/d_a_e_ba/splits.txt index 6e14363e38..5b53c9a3b1 100644 --- a/config/GZ2J01/rels/d_a_e_ba/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ba/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ba.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ba/symbols.txt b/config/GZ2J01/rels/d_a_e_ba/symbols.txt index e50c2b6ee3..ffb8db7a24 100644 --- a/config/GZ2J01/rels/d_a_e_ba/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ba/symbols.txt @@ -94,7 +94,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000D0; // type:object size:0xF scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_172_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3826 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3827 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3835 = .data:0x00000030; // type:object size:0x6 scope:local @@ -113,7 +114,7 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12daE_BA_HIO_c = .data:0x00000184; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_172_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3963 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte check_index$4162 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_e_bee/splits.txt b/config/GZ2J01/rels/d_a_e_bee/splits.txt index 07fbd9ead7..24515fbaeb 100644 --- a/config/GZ2J01/rels/d_a_e_bee/splits.txt +++ b/config/GZ2J01/rels/d_a_e_bee/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bee.cpp: diff --git a/config/GZ2J01/rels/d_a_e_bee/symbols.txt b/config/GZ2J01/rels/d_a_e_bee/symbols.txt index a3385370eb..0e3b5a180f 100644 --- a/config/GZ2J01/rels/d_a_e_bee/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_bee/symbols.txt @@ -106,11 +106,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_173_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3765 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte -lbl_173_bss_64 = .bss:0x00000064; // type:object size:0x1 data:byte +ccCylSet = .bss:0x00000064; // type:object size:0x1 data:byte @4455 = .bss:0x00000068; // type:object size:0xC scope:local +init$0000 = .bss:0x00000074; // type:object size:0x1 scope:local align:1 data:byte non$4454 = .bss:0x00000078; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000088; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_bg/splits.txt b/config/GZ2J01/rels/d_a_e_bg/splits.txt index 3dfd48865c..ef7b3fe271 100644 --- a/config/GZ2J01/rels/d_a_e_bg/splits.txt +++ b/config/GZ2J01/rels/d_a_e_bg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bg.cpp: diff --git a/config/GZ2J01/rels/d_a_e_bg/symbols.txt b/config/GZ2J01/rels/d_a_e_bg/symbols.txt index cc3fcbdef7..dbc6558b68 100644 --- a/config/GZ2J01/rels/d_a_e_bg/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_bg/symbols.txt @@ -105,6 +105,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global __vt__12daE_BG_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_174_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_bi/splits.txt b/config/GZ2J01/rels/d_a_e_bi/splits.txt index 58283d77c8..653298655a 100644 --- a/config/GZ2J01/rels/d_a_e_bi/splits.txt +++ b/config/GZ2J01/rels/d_a_e_bi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bi.cpp: diff --git a/config/GZ2J01/rels/d_a_e_bi/symbols.txt b/config/GZ2J01/rels/d_a_e_bi/symbols.txt index 9767922c87..e3499dba63 100644 --- a/config/GZ2J01/rels/d_a_e_bi/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_bi/symbols.txt @@ -101,7 +101,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000EC; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_175_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -139,10 +140,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_175_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte @4522 = .bss:0x00000070; // type:object size:0xC scope:local +init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte sc$4521 = .bss:0x00000080; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000008C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000090; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_bs/splits.txt b/config/GZ2J01/rels/d_a_e_bs/splits.txt index 52104b5bdc..4683bf1c88 100644 --- a/config/GZ2J01/rels/d_a_e_bs/splits.txt +++ b/config/GZ2J01/rels/d_a_e_bs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bs.cpp: diff --git a/config/GZ2J01/rels/d_a_e_bs/symbols.txt b/config/GZ2J01/rels/d_a_e_bs/symbols.txt index 9cdadcfd58..c1fdf1eb21 100644 --- a/config/GZ2J01/rels/d_a_e_bs/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_bs/symbols.txt @@ -96,7 +96,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000E0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_177_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -115,6 +116,6 @@ __vt__8cM3dGAab = .data:0x00000184; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000190; // type:object size:0x24 scope:global __vt__12daE_BS_HIO_c = .data:0x000001B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_177_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_bu/splits.txt b/config/GZ2J01/rels/d_a_e_bu/splits.txt index d099d0c2a5..cb43e2362d 100644 --- a/config/GZ2J01/rels/d_a_e_bu/splits.txt +++ b/config/GZ2J01/rels/d_a_e_bu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bu.cpp: diff --git a/config/GZ2J01/rels/d_a_e_bu/symbols.txt b/config/GZ2J01/rels/d_a_e_bu/symbols.txt index 3570c1e7ee..a79afabe0a 100644 --- a/config/GZ2J01/rels/d_a_e_bu/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_bu/symbols.txt @@ -95,7 +95,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000E0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_178_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -114,7 +115,7 @@ __vt__8cM3dGAab = .data:0x00000194; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001A0; // type:object size:0x24 scope:global __vt__12daE_BU_HIO_c = .data:0x000001C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_178_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte check_index$4007 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_e_bug/splits.txt b/config/GZ2J01/rels/d_a_e_bug/splits.txt index ab9630a930..4327da7562 100644 --- a/config/GZ2J01/rels/d_a_e_bug/splits.txt +++ b/config/GZ2J01/rels/d_a_e_bug/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bug.cpp: diff --git a/config/GZ2J01/rels/d_a_e_bug/symbols.txt b/config/GZ2J01/rels/d_a_e_bug/symbols.txt index fb1cfb392a..a2af9f75b5 100644 --- a/config/GZ2J01/rels/d_a_e_bug/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_bug/symbols.txt @@ -113,15 +113,15 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_179_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3824 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte -lbl_179_bss_64 = .bss:0x00000064; // type:object size:0x1 data:byte -lbl_179_bss_65 = .bss:0x00000065; // type:object size:0x1 data:byte +l_roomNo = .bss:0x00000064; // type:object size:0x1 scope:local data:byte +data_80697E8D = .bss:0x00000065; // type:object size:0x1 scope:local data:byte @3831 = .bss:0x00000068; // type:object size:0xC scope:local at_pos = .bss:0x00000074; // type:object size:0xC scope:global align:4 data:float at_size = .bss:0x00000080; // type:object size:0x4 scope:global -lbl_179_bss_84 = .bss:0x00000084; // type:object size:0x1 data:byte +data_80697EAC = .bss:0x00000084; // type:object size:0x1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000088; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000008C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000090; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_cr/splits.txt b/config/GZ2J01/rels/d_a_e_cr/splits.txt index 1e0c62a5d5..84d4c3ce75 100644 --- a/config/GZ2J01/rels/d_a_e_cr/splits.txt +++ b/config/GZ2J01/rels/d_a_e_cr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_cr.cpp: diff --git a/config/GZ2J01/rels/d_a_e_cr/symbols.txt b/config/GZ2J01/rels/d_a_e_cr/symbols.txt index d1e5c1742d..43cf6affb0 100644 --- a/config/GZ2J01/rels/d_a_e_cr/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_cr/symbols.txt @@ -70,7 +70,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000090; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_180_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -85,6 +86,6 @@ __vt__8cM3dGAab = .data:0x000000F8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000104; // type:object size:0x24 scope:global __vt__12daE_CR_HIO_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_180_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_db/splits.txt b/config/GZ2J01/rels/d_a_e_db/splits.txt index 04791bb43c..ae0869a6ab 100644 --- a/config/GZ2J01/rels/d_a_e_db/splits.txt +++ b/config/GZ2J01/rels/d_a_e_db/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_db.cpp: diff --git a/config/GZ2J01/rels/d_a_e_db/symbols.txt b/config/GZ2J01/rels/d_a_e_db/symbols.txt index 7d1133e426..c8338106c1 100644 --- a/config/GZ2J01/rels/d_a_e_db/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_db/symbols.txt @@ -139,7 +139,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000160; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_182_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local @@ -163,6 +164,6 @@ __vt__8cM3dGAab = .data:0x000002F0; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:global __vt__12daE_DB_HIO_c = .data:0x00000310; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_182_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_dd/splits.txt b/config/GZ2J01/rels/d_a_e_dd/splits.txt index 31e1c647ec..5fb2c94238 100644 --- a/config/GZ2J01/rels/d_a_e_dd/splits.txt +++ b/config/GZ2J01/rels/d_a_e_dd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dd.cpp: diff --git a/config/GZ2J01/rels/d_a_e_dd/symbols.txt b/config/GZ2J01/rels/d_a_e_dd/symbols.txt index b25e9888b7..f32494aabc 100644 --- a/config/GZ2J01/rels/d_a_e_dd/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_dd/symbols.txt @@ -109,7 +109,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000F0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_184_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -133,7 +134,7 @@ __vt__12dBgS_ObjAcch = .data:0x000001B0; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001D4; // type:object size:0xC scope:global __vt__12daE_DD_HIO_c = .data:0x000001E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_184_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x28 scope:global data:byte check_index$4196 = .bss:0x00000040; // type:object size:0xFF scope:local diff --git a/config/GZ2J01/rels/d_a_e_df/splits.txt b/config/GZ2J01/rels/d_a_e_df/splits.txt index c29b8e5455..0c09a27f69 100644 --- a/config/GZ2J01/rels/d_a_e_df/splits.txt +++ b/config/GZ2J01/rels/d_a_e_df/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_df.cpp: diff --git a/config/GZ2J01/rels/d_a_e_df/symbols.txt b/config/GZ2J01/rels/d_a_e_df/symbols.txt index b36c3a5a78..da9e8d0dc7 100644 --- a/config/GZ2J01/rels/d_a_e_df/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_df/symbols.txt @@ -82,9 +82,11 @@ ccCylSrc$3961 = .rodata:0x0000002C; // type:object size:0x44 scope:local @4627 = .rodata:0x000000C4; // type:object size:0x4 scope:local align:4 data:float @4811 = .rodata:0x000000C8; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000CC; // type:object size:0x5 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_185_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3795 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3796 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3804 = .data:0x00000030; // type:object size:0x6 scope:local @@ -96,6 +98,6 @@ __vt__8cM3dGCyl = .data:0x000000A0; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000AC; // type:object size:0xC scope:global __vt__12daE_DF_HIO_c = .data:0x000000B8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_185_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3932 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_dk/splits.txt b/config/GZ2J01/rels/d_a_e_dk/splits.txt index d180106753..440de014bc 100644 --- a/config/GZ2J01/rels/d_a_e_dk/splits.txt +++ b/config/GZ2J01/rels/d_a_e_dk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dk.cpp: diff --git a/config/GZ2J01/rels/d_a_e_dk/symbols.txt b/config/GZ2J01/rels/d_a_e_dk/symbols.txt index 7dfe9681f6..780a1d1ab5 100644 --- a/config/GZ2J01/rels/d_a_e_dk/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_dk/symbols.txt @@ -105,7 +105,8 @@ dk_btk_name__22@unnamed@d_a_e_dk_cpp@ = .rodata:0x00000014; // type:object size: @stringBase0 = .rodata:0x000000F0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_186_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_dk_src__22@unnamed@d_a_e_dk_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_dk_at_src__22@unnamed@d_a_e_dk_cpp@ = .data:0x00000060; // type:object size:0x40 scope:global cc_dk_core_src__22@unnamed@d_a_e_dk_cpp@ = .data:0x000000A0; // type:object size:0x40 scope:global @@ -122,6 +123,6 @@ __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001A0; // type:object size:0xC scope:global __vt__12daE_DK_HIO_c = .data:0x000001AC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_186_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_806AD7F8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3759 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_dn/splits.txt b/config/GZ2J01/rels/d_a_e_dn/splits.txt index 3dec0f57eb..091f7de8b8 100644 --- a/config/GZ2J01/rels/d_a_e_dn/splits.txt +++ b/config/GZ2J01/rels/d_a_e_dn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dn.cpp: diff --git a/config/GZ2J01/rels/d_a_e_dn/symbols.txt b/config/GZ2J01/rels/d_a_e_dn/symbols.txt index 74cb291a64..82bee14c8b 100644 --- a/config/GZ2J01/rels/d_a_e_dn/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_dn/symbols.txt @@ -172,7 +172,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000188; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_65_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -218,7 +219,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_65_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte target_info = .bss:0x0000007C; // type:object size:0x28 scope:global diff --git a/config/GZ2J01/rels/d_a_e_dt/splits.txt b/config/GZ2J01/rels/d_a_e_dt/splits.txt index b0863c0ccd..2bde2c4c57 100644 --- a/config/GZ2J01/rels/d_a_e_dt/splits.txt +++ b/config/GZ2J01/rels/d_a_e_dt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dt.cpp: diff --git a/config/GZ2J01/rels/d_a_e_dt/symbols.txt b/config/GZ2J01/rels/d_a_e_dt/symbols.txt index 7830955398..3832bccc63 100644 --- a/config/GZ2J01/rels/d_a_e_dt/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_dt/symbols.txt @@ -255,9 +255,9 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_187_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3787 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0x30 scope:global data:byte +l_HIO = .bss:0x00000054; // type:object size:0x30 scope:local data:byte mDt_OtamaNum__6E_DT_n = .bss:0x00000084; // type:object size:0x4 scope:global data:4byte mDt_OtamaNo__6E_DT_n = .bss:0x00000088; // type:object size:0x50 scope:global m_fall_no__6E_DT_n = .bss:0x000000D8; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_e_fb/splits.txt b/config/GZ2J01/rels/d_a_e_fb/splits.txt index 764e18f891..b043402c97 100644 --- a/config/GZ2J01/rels/d_a_e_fb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_fb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fb.cpp: diff --git a/config/GZ2J01/rels/d_a_e_fb/symbols.txt b/config/GZ2J01/rels/d_a_e_fb/symbols.txt index b13581c498..7e54c462a8 100644 --- a/config/GZ2J01/rels/d_a_e_fb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_fb/symbols.txt @@ -114,7 +114,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000078; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_e_fk/splits.txt b/config/GZ2J01/rels/d_a_e_fk/splits.txt index 6bda4f5c6b..50a0f28b85 100644 --- a/config/GZ2J01/rels/d_a_e_fk/splits.txt +++ b/config/GZ2J01/rels/d_a_e_fk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fk.cpp: diff --git a/config/GZ2J01/rels/d_a_e_fk/symbols.txt b/config/GZ2J01/rels/d_a_e_fk/symbols.txt index e86f8cc383..2826afbdf2 100644 --- a/config/GZ2J01/rels/d_a_e_fk/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_fk/symbols.txt @@ -132,7 +132,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_189_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3843 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:global data:byte s_dis__22@unnamed@d_a_e_fk_cpp@ = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_fm/splits.txt b/config/GZ2J01/rels/d_a_e_fm/splits.txt index 4694668680..56f30c0aa8 100644 --- a/config/GZ2J01/rels/d_a_e_fm/splits.txt +++ b/config/GZ2J01/rels/d_a_e_fm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fm.cpp: diff --git a/config/GZ2J01/rels/d_a_e_fm/symbols.txt b/config/GZ2J01/rels/d_a_e_fm/symbols.txt index 0e2314ec8c..dc78104dee 100644 --- a/config/GZ2J01/rels/d_a_e_fm/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_fm/symbols.txt @@ -240,7 +240,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000028C; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_66_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double h_id$3853 = .data:0x00000020; // type:object size:0x6 scope:local chain_z = .data:0x00000028; // type:object size:0x64 scope:global tame_name$4558 = .data:0x0000008C; // type:object size:0x4 scope:local @@ -302,7 +303,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_66_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3772 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xB0 scope:global data:byte @3819 = .bss:0x00000104; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_fs/splits.txt b/config/GZ2J01/rels/d_a_e_fs/splits.txt index 4c707c74c0..0ad263ab26 100644 --- a/config/GZ2J01/rels/d_a_e_fs/splits.txt +++ b/config/GZ2J01/rels/d_a_e_fs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fs.cpp: diff --git a/config/GZ2J01/rels/d_a_e_fs/symbols.txt b/config/GZ2J01/rels/d_a_e_fs/symbols.txt index 62c2e3ce3e..95c52af595 100644 --- a/config/GZ2J01/rels/d_a_e_fs/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_fs/symbols.txt @@ -90,7 +90,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000D8; // type:object size:0x1A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_190_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3796 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3797 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3805 = .data:0x00000030; // type:object size:0x6 scope:local @@ -128,7 +129,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local s_AtCount__22@unnamed@d_a_e_fs_cpp@ = .bss:0x00000046; // type:object size:0x2 scope:global data:2byte -hio_set = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte @3933 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x1C scope:global data:byte @4275 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_fz/splits.txt b/config/GZ2J01/rels/d_a_e_fz/splits.txt index c4e0d9a5e5..c475968316 100644 --- a/config/GZ2J01/rels/d_a_e_fz/splits.txt +++ b/config/GZ2J01/rels/d_a_e_fz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fz.cpp: diff --git a/config/GZ2J01/rels/d_a_e_fz/symbols.txt b/config/GZ2J01/rels/d_a_e_fz/symbols.txt index fb704bf0fc..f17325b624 100644 --- a/config/GZ2J01/rels/d_a_e_fz/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_fz/symbols.txt @@ -92,7 +92,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000BC; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_191_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3682 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3683 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3691 = .data:0x00000030; // type:object size:0x6 scope:local @@ -110,6 +111,6 @@ __vt__8cM3dGAab = .data:0x0000015C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000168; // type:object size:0x24 scope:global __vt__12daE_FZ_HIO_c = .data:0x0000018C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_191_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_806C1BA0 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3819 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x38 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_ga/splits.txt b/config/GZ2J01/rels/d_a_e_ga/splits.txt index 9eedebfb9b..a593112a61 100644 --- a/config/GZ2J01/rels/d_a_e_ga/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ga/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ga.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ga/symbols.txt b/config/GZ2J01/rels/d_a_e_ga/symbols.txt index c0e1315d30..ea080e9058 100644 --- a/config/GZ2J01/rels/d_a_e_ga/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ga/symbols.txt @@ -41,6 +41,6 @@ l_daE_Ga_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_E_GA = .data:0x00000020; // type:object size:0x30 scope:global __vt__12daE_Ga_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_67_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_gb/splits.txt b/config/GZ2J01/rels/d_a_e_gb/splits.txt index d6d78508ea..edd944731f 100644 --- a/config/GZ2J01/rels/d_a_e_gb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_gb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gb.cpp: diff --git a/config/GZ2J01/rels/d_a_e_gb/symbols.txt b/config/GZ2J01/rels/d_a_e_gb/symbols.txt index 1d50e80adb..6d64fa8b0c 100644 --- a/config/GZ2J01/rels/d_a_e_gb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_gb/symbols.txt @@ -166,7 +166,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001D0; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_192_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local @@ -179,7 +180,7 @@ eno$4864 = .data:0x000000F4; // type:object size:0xA scope:local key_eno$5459 = .data:0x00000100; // type:object size:0x4 scope:local head_cc_sph_src$5811 = .data:0x00000104; // type:object size:0x40 scope:local body_cyl_src$5812 = .data:0x00000144; // type:object size:0x44 scope:local -l_daE_GB_Method = .data:0x00000188; // type:object size:0x20 scope:global +l_daE_GB_Method = .data:0x00000188; // type:object size:0x20 scope:local g_profile_E_GB = .data:0x000001A8; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x000001D8; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x000001E4; // type:object size:0xC scope:global @@ -191,6 +192,6 @@ __vt__8cM3dGAab = .data:0x00000238; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000244; // type:object size:0xC scope:global __vt__12daE_GB_HIO_c = .data:0x00000250; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_192_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_806C7928 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3922 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0x20 scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_e_ge/splits.txt b/config/GZ2J01/rels/d_a_e_ge/splits.txt index 60894697a0..38aa83d186 100644 --- a/config/GZ2J01/rels/d_a_e_ge/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ge/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ge.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ge/symbols.txt b/config/GZ2J01/rels/d_a_e_ge/symbols.txt index d8d6efa9f8..9c56f935e0 100644 --- a/config/GZ2J01/rels/d_a_e_ge/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ge/symbols.txt @@ -126,7 +126,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000010C; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_193_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3783 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3784 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3792 = .data:0x00000030; // type:object size:0x6 scope:local @@ -152,7 +153,7 @@ __vt__8cM3dGAab = .data:0x000001FC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000208; // type:object size:0x24 scope:global __vt__12daE_GE_HIO_c = .data:0x0000022C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_193_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3920 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x34 scope:global data:byte target_count = .bss:0x0000004C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_e_gi/splits.txt b/config/GZ2J01/rels/d_a_e_gi/splits.txt index 2d4d4d7c9f..7b4b9d46bf 100644 --- a/config/GZ2J01/rels/d_a_e_gi/splits.txt +++ b/config/GZ2J01/rels/d_a_e_gi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gi.cpp: diff --git a/config/GZ2J01/rels/d_a_e_gi/symbols.txt b/config/GZ2J01/rels/d_a_e_gi/symbols.txt index c5de07846c..d08a8efc50 100644 --- a/config/GZ2J01/rels/d_a_e_gi/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_gi/symbols.txt @@ -123,7 +123,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000118; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_194_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3786 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3787 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3795 = .data:0x00000030; // type:object size:0x6 scope:local @@ -141,7 +142,7 @@ __vt__8cM3dGSph = .data:0x00000160; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000016C; // type:object size:0x24 scope:global __vt__12daE_GI_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_194_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3923 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte m_cry_gi = .bss:0x00000044; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_e_gm/splits.txt b/config/GZ2J01/rels/d_a_e_gm/splits.txt index a7a62ae9bc..2a940ae23c 100644 --- a/config/GZ2J01/rels/d_a_e_gm/splits.txt +++ b/config/GZ2J01/rels/d_a_e_gm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gm.cpp: diff --git a/config/GZ2J01/rels/d_a_e_gm/symbols.txt b/config/GZ2J01/rels/d_a_e_gm/symbols.txt index 88c7b7eb8c..ffab898c51 100644 --- a/config/GZ2J01/rels/d_a_e_gm/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_gm/symbols.txt @@ -134,7 +134,8 @@ l_heapsize = .rodata:0x00000140; // type:object size:0x8 scope:global @stringBase0 = .rodata:0x00000150; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_195_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2J01/rels/d_a_e_gob/splits.txt b/config/GZ2J01/rels/d_a_e_gob/splits.txt index 479e8b6be6..d1648abdbc 100644 --- a/config/GZ2J01/rels/d_a_e_gob/splits.txt +++ b/config/GZ2J01/rels/d_a_e_gob/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gob.cpp: diff --git a/config/GZ2J01/rels/d_a_e_gob/symbols.txt b/config/GZ2J01/rels/d_a_e_gob/symbols.txt index 951027439b..23ea9f23e3 100644 --- a/config/GZ2J01/rels/d_a_e_gob/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_gob/symbols.txt @@ -207,7 +207,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_196_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3758 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte ms = .bss:0x00000074; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_e_gs/splits.txt b/config/GZ2J01/rels/d_a_e_gs/splits.txt index 1119561263..479ee51db3 100644 --- a/config/GZ2J01/rels/d_a_e_gs/splits.txt +++ b/config/GZ2J01/rels/d_a_e_gs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gs.cpp: diff --git a/config/GZ2J01/rels/d_a_e_gs/symbols.txt b/config/GZ2J01/rels/d_a_e_gs/symbols.txt index f373b81623..761f1a11e7 100644 --- a/config/GZ2J01/rels/d_a_e_gs/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_gs/symbols.txt @@ -38,6 +38,6 @@ l_daE_GS_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_E_GS = .data:0x00000020; // type:object size:0x30 scope:global __vt__12daE_GS_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_197_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_hb/splits.txt b/config/GZ2J01/rels/d_a_e_hb/splits.txt index 9f53805739..ef28826270 100644 --- a/config/GZ2J01/rels/d_a_e_hb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_hb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hb.cpp: diff --git a/config/GZ2J01/rels/d_a_e_hb/symbols.txt b/config/GZ2J01/rels/d_a_e_hb/symbols.txt index bbd29ee018..3aa96db52f 100644 --- a/config/GZ2J01/rels/d_a_e_hb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_hb/symbols.txt @@ -121,7 +121,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000130; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_68_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -144,6 +145,6 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000001FC; // type:object size:0x14 scope:global __vt__12daE_HB_HIO_c = .data:0x00000210; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_68_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_hm/splits.txt b/config/GZ2J01/rels/d_a_e_hm/splits.txt index 74d7a16ae5..422c8424ba 100644 --- a/config/GZ2J01/rels/d_a_e_hm/splits.txt +++ b/config/GZ2J01/rels/d_a_e_hm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hm.cpp: diff --git a/config/GZ2J01/rels/d_a_e_hm/symbols.txt b/config/GZ2J01/rels/d_a_e_hm/symbols.txt index fe75134251..3d933e81de 100644 --- a/config/GZ2J01/rels/d_a_e_hm/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_hm/symbols.txt @@ -145,7 +145,8 @@ ccShpSrc$3893 = .rodata:0x00000040; // type:object size:0x40 scope:local @stringBase0 = .rodata:0x00000154; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_199_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3670 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3671 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3679 = .data:0x00000030; // type:object size:0x6 scope:local @@ -180,7 +181,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3807 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_e_hp/splits.txt b/config/GZ2J01/rels/d_a_e_hp/splits.txt index 5d40f97ca1..1c44f1d8cc 100644 --- a/config/GZ2J01/rels/d_a_e_hp/splits.txt +++ b/config/GZ2J01/rels/d_a_e_hp/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hp.cpp: diff --git a/config/GZ2J01/rels/d_a_e_hp/symbols.txt b/config/GZ2J01/rels/d_a_e_hp/symbols.txt index c6012fdf7d..bb63f95ad3 100644 --- a/config/GZ2J01/rels/d_a_e_hp/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_hp/symbols.txt @@ -100,7 +100,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000D8; // type:object size:0x1A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_200_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3784 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3785 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3793 = .data:0x00000030; // type:object size:0x6 scope:local @@ -121,6 +122,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global __vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3921 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_hz/splits.txt b/config/GZ2J01/rels/d_a_e_hz/splits.txt index ee33ab3807..2265bcd5bb 100644 --- a/config/GZ2J01/rels/d_a_e_hz/splits.txt +++ b/config/GZ2J01/rels/d_a_e_hz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hz.cpp: diff --git a/config/GZ2J01/rels/d_a_e_hz/symbols.txt b/config/GZ2J01/rels/d_a_e_hz/symbols.txt index aed3e56382..07260d5d09 100644 --- a/config/GZ2J01/rels/d_a_e_hz/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_hz/symbols.txt @@ -133,7 +133,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000FC; // type:object size:0x17 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_201_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3845 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3846 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3854 = .data:0x00000030; // type:object size:0x6 scope:local @@ -169,13 +170,14 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_201_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3982 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global data:byte m_near_bomb = .bss:0x00000090; // type:object size:0x4 scope:global m_near_carry = .bss:0x00000094; // type:object size:0x4 scope:global m_near_weapon = .bss:0x00000098; // type:object size:0x4 scope:global @5585 = .bss:0x0000009C; // type:object size:0xC scope:local +init$0000 = .bss:0x000000A8; // type:object size:0x1 scope:local align:1 data:byte sc$5584 = .bss:0x000000AC; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B8; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000BC; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_hzelda/splits.txt b/config/GZ2J01/rels/d_a_e_hzelda/splits.txt index 4ea18ee7f1..cc06bc408a 100644 --- a/config/GZ2J01/rels/d_a_e_hzelda/splits.txt +++ b/config/GZ2J01/rels/d_a_e_hzelda/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hzelda.cpp: diff --git a/config/GZ2J01/rels/d_a_e_hzelda/symbols.txt b/config/GZ2J01/rels/d_a_e_hzelda/symbols.txt index 3bdcbafaa7..a9a73530dd 100644 --- a/config/GZ2J01/rels/d_a_e_hzelda/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_hzelda/symbols.txt @@ -119,7 +119,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000140; // type:object size:0x7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_202_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double b_id$4252 = .data:0x00000020; // type:object size:0x6 scope:local @4500 = .data:0x00000028; // type:object size:0x30 scope:local b_id$4879 = .data:0x00000058; // type:object size:0x6 scope:local @@ -131,7 +132,7 @@ ball_at_sph_src$5569 = .data:0x000000F8; // type:object size:0x40 scope:local ball_tg_sph_src$5570 = .data:0x00000138; // type:object size:0x40 scope:local tri_at_sph_src$5571 = .data:0x00000178; // type:object size:0x40 scope:local pl_at_sph_src$5572 = .data:0x000001B8; // type:object size:0x40 scope:local -l_daE_HZELDA_Method = .data:0x000001F8; // type:object size:0x20 scope:global +l_daE_HZELDA_Method = .data:0x000001F8; // type:object size:0x20 scope:local g_profile_E_HZELDA = .data:0x00000218; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000248; // type:object size:0xC scope:global __vt__10cCcD_GStts = .data:0x00000254; // type:object size:0xC scope:global @@ -142,6 +143,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000284; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000002A8; // type:object size:0xC scope:global __vt__16daE_HZELDA_HIO_c = .data:0x000002B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_202_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3762 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0xC scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_e_is/splits.txt b/config/GZ2J01/rels/d_a_e_is/splits.txt index ed3b485b0e..dd431b766a 100644 --- a/config/GZ2J01/rels/d_a_e_is/splits.txt +++ b/config/GZ2J01/rels/d_a_e_is/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_is.cpp: diff --git a/config/GZ2J01/rels/d_a_e_is/symbols.txt b/config/GZ2J01/rels/d_a_e_is/symbols.txt index 0781094b6d..bc9421757a 100644 --- a/config/GZ2J01/rels/d_a_e_is/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_is/symbols.txt @@ -85,7 +85,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000A8; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_203_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double at_sph_src$4258 = .data:0x00000020; // type:object size:0x40 scope:local cc_cyl_src$4259 = .data:0x00000060; // type:object size:0x44 scope:local core_sph_src$4260 = .data:0x000000A4; // type:object size:0x40 scope:local @@ -100,6 +101,6 @@ __vt__8cM3dGAab = .data:0x00000170; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12daE_IS_HIO_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_203_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_kg/splits.txt b/config/GZ2J01/rels/d_a_e_kg/splits.txt index 32fc575c97..269805d8f1 100644 --- a/config/GZ2J01/rels/d_a_e_kg/splits.txt +++ b/config/GZ2J01/rels/d_a_e_kg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kg.cpp: diff --git a/config/GZ2J01/rels/d_a_e_kg/symbols.txt b/config/GZ2J01/rels/d_a_e_kg/symbols.txt index bee6095c31..0e8b9cbbbe 100644 --- a/config/GZ2J01/rels/d_a_e_kg/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_kg/symbols.txt @@ -87,7 +87,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000C8; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_204_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2J01/rels/d_a_e_kk/splits.txt b/config/GZ2J01/rels/d_a_e_kk/splits.txt index 78b412d9ef..685d22cf7f 100644 --- a/config/GZ2J01/rels/d_a_e_kk/splits.txt +++ b/config/GZ2J01/rels/d_a_e_kk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kk.cpp: diff --git a/config/GZ2J01/rels/d_a_e_kk/symbols.txt b/config/GZ2J01/rels/d_a_e_kk/symbols.txt index f787a18fb7..b46485473e 100644 --- a/config/GZ2J01/rels/d_a_e_kk/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_kk/symbols.txt @@ -108,7 +108,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000D0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_205_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3671 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3672 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3680 = .data:0x00000030; // type:object size:0x6 scope:local @@ -126,6 +127,6 @@ __vt__8cM3dGAab = .data:0x00000174; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000180; // type:object size:0x24 scope:global __vt__12daE_KK_HIO_c = .data:0x000001A4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_205_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3808 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_kr/splits.txt b/config/GZ2J01/rels/d_a_e_kr/splits.txt index 38a744babe..42848809b2 100644 --- a/config/GZ2J01/rels/d_a_e_kr/splits.txt +++ b/config/GZ2J01/rels/d_a_e_kr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kr.cpp: diff --git a/config/GZ2J01/rels/d_a_e_kr/symbols.txt b/config/GZ2J01/rels/d_a_e_kr/symbols.txt index 1fa7ae9b07..f1a10df2ce 100644 --- a/config/GZ2J01/rels/d_a_e_kr/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_kr/symbols.txt @@ -132,7 +132,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000154; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_206_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2J01/rels/d_a_e_mb/splits.txt b/config/GZ2J01/rels/d_a_e_mb/splits.txt index a359d07601..91f3010614 100644 --- a/config/GZ2J01/rels/d_a_e_mb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_mb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mb.cpp: diff --git a/config/GZ2J01/rels/d_a_e_mb/symbols.txt b/config/GZ2J01/rels/d_a_e_mb/symbols.txt index 4a36801bd3..cc6094c8f4 100644 --- a/config/GZ2J01/rels/d_a_e_mb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_mb/symbols.txt @@ -107,23 +107,23 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_207_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3759 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte +l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte @3824 = .bss:0x00000070; // type:object size:0xC scope:local -L_pos1 = .bss:0x0000007C; // type:object size:0xC scope:global +L_pos1 = .bss:0x0000007C; // type:object size:0xC scope:local @3825 = .bss:0x00000088; // type:object size:0xC scope:local -L_pos2 = .bss:0x00000094; // type:object size:0xC scope:global align:4 data:float +L_pos2 = .bss:0x00000094; // type:object size:0xC scope:local align:4 data:float @3826 = .bss:0x000000A0; // type:object size:0xC scope:local -L_Hpos = .bss:0x000000AC; // type:object size:0xC scope:global +L_Hpos = .bss:0x000000AC; // type:object size:0xC scope:local @3827 = .bss:0x000000B8; // type:object size:0xC scope:local -R_pos1 = .bss:0x000000C4; // type:object size:0xC scope:global +R_pos1 = .bss:0x000000C4; // type:object size:0xC scope:local @3828 = .bss:0x000000D0; // type:object size:0xC scope:local -R_pos2 = .bss:0x000000DC; // type:object size:0xC scope:global align:4 data:float +R_pos2 = .bss:0x000000DC; // type:object size:0xC scope:local align:4 data:float @3829 = .bss:0x000000E8; // type:object size:0xC scope:local -R_Hpos = .bss:0x000000F4; // type:object size:0xC scope:global +R_Hpos = .bss:0x000000F4; // type:object size:0xC scope:local @3830 = .bss:0x00000100; // type:object size:0xC scope:local -c_pos = .bss:0x0000010C; // type:object size:0xC scope:global +c_pos = .bss:0x0000010C; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000118; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000011C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000120; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_mf/splits.txt b/config/GZ2J01/rels/d_a_e_mf/splits.txt index 58906b79fe..f17172d89e 100644 --- a/config/GZ2J01/rels/d_a_e_mf/splits.txt +++ b/config/GZ2J01/rels/d_a_e_mf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mf.cpp: diff --git a/config/GZ2J01/rels/d_a_e_mf/symbols.txt b/config/GZ2J01/rels/d_a_e_mf/symbols.txt index f432e117bc..a81fd2a033 100644 --- a/config/GZ2J01/rels/d_a_e_mf/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_mf/symbols.txt @@ -169,7 +169,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000180; // type:object size:0x13 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_209_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3707 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3708 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3716 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2J01/rels/d_a_e_mk/splits.txt b/config/GZ2J01/rels/d_a_e_mk/splits.txt index 7a8f96f668..e8001c6b9c 100644 --- a/config/GZ2J01/rels/d_a_e_mk/splits.txt +++ b/config/GZ2J01/rels/d_a_e_mk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mk.cpp: diff --git a/config/GZ2J01/rels/d_a_e_mk/symbols.txt b/config/GZ2J01/rels/d_a_e_mk/symbols.txt index f5624ad908..d3a7347e7c 100644 --- a/config/GZ2J01/rels/d_a_e_mk/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_mk/symbols.txt @@ -258,12 +258,12 @@ demo_jump_pos_3 = .bss:0x00000084; // type:object size:0xC scope:global @3769 = .bss:0x00000090; // type:object size:0xC scope:local STAGE_CENTER_POS = .bss:0x0000009C; // type:object size:0xC scope:global align:4 data:float STAGE_ANGLE_Y = .bss:0x000000A8; // type:object size:0x2 scope:global data:2byte -lbl_210_bss_AA = .bss:0x000000AA; // type:object size:0x1 data:byte +hio_set = .bss:0x000000AA; // type:object size:0x1 scope:local align:1 data:byte @3772 = .bss:0x000000AC; // type:object size:0xC scope:local l_HIO = .bss:0x000000B8; // type:object size:0x24 scope:global data:byte target_info = .bss:0x000000DC; // type:object size:0x50 scope:global data:4byte target_info_count = .bss:0x0000012C; // type:object size:0x4 scope:global data:4byte -lbl_210_bss_130 = .bss:0x00000130; // type:object size:0x1 data:byte +lbl_210_bss_130 = .bss:0x00000130; // type:object size:0x1 scope:local data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000134; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000138; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000013C; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_mk_bo/splits.txt b/config/GZ2J01/rels/d_a_e_mk_bo/splits.txt index 0401fc7d34..d921e67eb0 100644 --- a/config/GZ2J01/rels/d_a_e_mk_bo/splits.txt +++ b/config/GZ2J01/rels/d_a_e_mk_bo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mk_bo.cpp: diff --git a/config/GZ2J01/rels/d_a_e_mk_bo/symbols.txt b/config/GZ2J01/rels/d_a_e_mk_bo/symbols.txt index 2fc1dbd719..1063ccbfe3 100644 --- a/config/GZ2J01/rels/d_a_e_mk_bo/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_mk_bo/symbols.txt @@ -67,7 +67,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000098; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_211_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double bo_eno_1$4378 = .data:0x00000020; // type:object size:0x8 scope:local bo_eno_2$4379 = .data:0x00000028; // type:object size:0x8 scope:local bo_eno_12$4402 = .data:0x00000030; // type:object size:0x4 scope:local diff --git a/config/GZ2J01/rels/d_a_e_mm/splits.txt b/config/GZ2J01/rels/d_a_e_mm/splits.txt index 6f15426eb2..c6f4ae2d2d 100644 --- a/config/GZ2J01/rels/d_a_e_mm/splits.txt +++ b/config/GZ2J01/rels/d_a_e_mm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mm.cpp: diff --git a/config/GZ2J01/rels/d_a_e_mm/symbols.txt b/config/GZ2J01/rels/d_a_e_mm/symbols.txt index 1357828c73..c69e567c6c 100644 --- a/config/GZ2J01/rels/d_a_e_mm/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_mm/symbols.txt @@ -80,7 +80,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000AC; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_212_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -99,6 +100,6 @@ __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12daE_MM_HIO_c = .data:0x000001A8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_212_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x34 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_mm_mt/symbols.txt b/config/GZ2J01/rels/d_a_e_mm_mt/symbols.txt index 1002ed2259..18315d24a0 100644 --- a/config/GZ2J01/rels/d_a_e_mm_mt/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_mm_mt/symbols.txt @@ -77,7 +77,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000D4; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_213_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2J01/rels/d_a_e_ms/splits.txt b/config/GZ2J01/rels/d_a_e_ms/splits.txt index 2941c2ee33..8a93758f63 100644 --- a/config/GZ2J01/rels/d_a_e_ms/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ms/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ms.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ms/symbols.txt b/config/GZ2J01/rels/d_a_e_ms/symbols.txt index 1fb48bb131..28c82bbe16 100644 --- a/config/GZ2J01/rels/d_a_e_ms/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ms/symbols.txt @@ -106,7 +106,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000F8; // type:object size:0x11 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_214_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3679 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3680 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3688 = .data:0x00000030; // type:object size:0x6 scope:local @@ -141,7 +142,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_214_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3816 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte target_info = .bss:0x00000070; // type:object size:0x50 scope:global diff --git a/config/GZ2J01/rels/d_a_e_nest/splits.txt b/config/GZ2J01/rels/d_a_e_nest/splits.txt index 8ad0484758..e12dca12d4 100644 --- a/config/GZ2J01/rels/d_a_e_nest/splits.txt +++ b/config/GZ2J01/rels/d_a_e_nest/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_nest.cpp: diff --git a/config/GZ2J01/rels/d_a_e_nest/symbols.txt b/config/GZ2J01/rels/d_a_e_nest/symbols.txt index e974e7b788..0103015e20 100644 --- a/config/GZ2J01/rels/d_a_e_nest/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_nest/symbols.txt @@ -118,6 +118,6 @@ __vt__8cM3dGAab = .data:0x00000110; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000011C; // type:object size:0x24 scope:global __vt__14daE_Nest_HIO_c = .data:0x00000140; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_69_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3994 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_nz/splits.txt b/config/GZ2J01/rels/d_a_e_nz/splits.txt index a781156b2e..6bac93cb42 100644 --- a/config/GZ2J01/rels/d_a_e_nz/splits.txt +++ b/config/GZ2J01/rels/d_a_e_nz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_nz.cpp: diff --git a/config/GZ2J01/rels/d_a_e_nz/symbols.txt b/config/GZ2J01/rels/d_a_e_nz/symbols.txt index 077d1abc5a..ebe944621c 100644 --- a/config/GZ2J01/rels/d_a_e_nz/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_nz/symbols.txt @@ -80,7 +80,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000C0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_215_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -115,11 +116,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte -lbl_215_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte +data_8072C454 = .bss:0x00000074; // type:object size:0x4 data:4byte @4220 = .bss:0x00000078; // type:object size:0xC scope:local +init$0000 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte sc$4219 = .bss:0x00000088; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000094; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000098; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_oc/splits.txt b/config/GZ2J01/rels/d_a_e_oc/splits.txt index 783af67c8f..4f15d581c2 100644 --- a/config/GZ2J01/rels/d_a_e_oc/splits.txt +++ b/config/GZ2J01/rels/d_a_e_oc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_oc.cpp: diff --git a/config/GZ2J01/rels/d_a_e_oc/symbols.txt b/config/GZ2J01/rels/d_a_e_oc/symbols.txt index 6496470a1b..8e41485d59 100644 --- a/config/GZ2J01/rels/d_a_e_oc/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_oc/symbols.txt @@ -191,7 +191,8 @@ oc_attackc_trans__6E_OC_n = .rodata:0x00000054; // type:object size:0x28 scope:g @stringBase0 = .rodata:0x000001E4; // type:object size:0x1D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_216_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3790 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3791 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3799 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2J01/rels/d_a_e_oct_bg/splits.txt b/config/GZ2J01/rels/d_a_e_oct_bg/splits.txt index fd7fd9801f..a9c2c451fb 100644 --- a/config/GZ2J01/rels/d_a_e_oct_bg/splits.txt +++ b/config/GZ2J01/rels/d_a_e_oct_bg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_oct_bg.cpp: diff --git a/config/GZ2J01/rels/d_a_e_oct_bg/symbols.txt b/config/GZ2J01/rels/d_a_e_oct_bg/symbols.txt index 7fbb7791fa..a773bdc65c 100644 --- a/config/GZ2J01/rels/d_a_e_oct_bg/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_oct_bg/symbols.txt @@ -107,7 +107,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000E4; // type:object size:0xD scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_217_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3618 = .data:0x00000020; // type:object size:0xC scope:local data:4byte cc_obg_src__26@unnamed@d_a_e_oct_bg_cpp@ = .data:0x0000002C; // type:object size:0x40 scope:global cc_obg_at_src__26@unnamed@d_a_e_oct_bg_cpp@ = .data:0x0000006C; // type:object size:0x40 scope:global @@ -164,11 +165,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_217_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +struct_8073A13D = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3763 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte -lbl_217_bss_79 = .bss:0x00000079; // type:object size:0x1 data:byte -lbl_217_bss_7A = .bss:0x0000007A; // type:object size:0x1 data:byte +unk_bss_78 = .bss:0x00000078; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_79 = .bss:0x00000079; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_7A = .bss:0x0000007A; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_7B = .bss:0x0000007B; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_ot/splits.txt b/config/GZ2J01/rels/d_a_e_ot/splits.txt index 7e4baaea3c..754e31e143 100644 --- a/config/GZ2J01/rels/d_a_e_ot/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ot/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ot.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ot/symbols.txt b/config/GZ2J01/rels/d_a_e_ot/symbols.txt index 57227ad144..34c68f02eb 100644 --- a/config/GZ2J01/rels/d_a_e_ot/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ot/symbols.txt @@ -94,7 +94,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000C4; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_218_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3789 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3790 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3798 = .data:0x00000030; // type:object size:0x6 scope:local @@ -137,12 +138,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_218_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3926 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte -lbl_218_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte -lbl_218_bss_75 = .bss:0x00000075; // type:object size:0x1 data:byte +data_8073D2DC = .bss:0x00000074; // type:object size:0x1 scope:local data:byte +data_8073D2DD = .bss:0x00000075; // type:object size:0x1 scope:local data:byte @4086 = .bss:0x00000078; // type:object size:0xC scope:local +init$0000 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte sc$4085 = .bss:0x00000088; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000094; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000098; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_ph/splits.txt b/config/GZ2J01/rels/d_a_e_ph/splits.txt index 98f255d16e..48eb4106b1 100644 --- a/config/GZ2J01/rels/d_a_e_ph/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ph/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ph.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ph/symbols.txt b/config/GZ2J01/rels/d_a_e_ph/symbols.txt index 8a06998f23..d349fcd73e 100644 --- a/config/GZ2J01/rels/d_a_e_ph/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ph/symbols.txt @@ -120,6 +120,6 @@ __vt__8cM3dGAab = .data:0x0000005C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000068; // type:object size:0x24 scope:global __vt__12daE_PH_HIO_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_219_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +initialized = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3762 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_pm/splits.txt b/config/GZ2J01/rels/d_a_e_pm/splits.txt index 4bee4fb382..1724905533 100644 --- a/config/GZ2J01/rels/d_a_e_pm/splits.txt +++ b/config/GZ2J01/rels/d_a_e_pm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_pm.cpp: diff --git a/config/GZ2J01/rels/d_a_e_pm/symbols.txt b/config/GZ2J01/rels/d_a_e_pm/symbols.txt index 2e79c13d1b..4f93a215b3 100644 --- a/config/GZ2J01/rels/d_a_e_pm/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_pm/symbols.txt @@ -204,7 +204,8 @@ ccCylSrc$4052 = .rodata:0x00000050; // type:object size:0x44 scope:local @stringBase0 = .rodata:0x0000020C; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_220_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3789 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3790 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3798 = .data:0x00000030; // type:object size:0x6 scope:local @@ -245,7 +246,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_220_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3928 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4C scope:global data:byte s_dis__22@unnamed@d_a_e_pm_cpp@ = .bss:0x000000A0; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_e_po/splits.txt b/config/GZ2J01/rels/d_a_e_po/splits.txt index ca4de81d74..fe8c87b3c7 100644 --- a/config/GZ2J01/rels/d_a_e_po/splits.txt +++ b/config/GZ2J01/rels/d_a_e_po/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_po.cpp: diff --git a/config/GZ2J01/rels/d_a_e_po/symbols.txt b/config/GZ2J01/rels/d_a_e_po/symbols.txt index a515c05f4d..e8ab6fe1d8 100644 --- a/config/GZ2J01/rels/d_a_e_po/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_po/symbols.txt @@ -312,7 +312,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000038C; // type:object size:0x1A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_221_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3796 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3797 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3805 = .data:0x00000030; // type:object size:0x6 scope:local @@ -362,7 +363,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3933 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global align:4 data:float mRollCount = .bss:0x00000090; // type:object size:0x2 scope:global diff --git a/config/GZ2J01/rels/d_a_e_pz/splits.txt b/config/GZ2J01/rels/d_a_e_pz/splits.txt index 1a3b9f60c7..d7f10891c5 100644 --- a/config/GZ2J01/rels/d_a_e_pz/splits.txt +++ b/config/GZ2J01/rels/d_a_e_pz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_pz.cpp: diff --git a/config/GZ2J01/rels/d_a_e_pz/symbols.txt b/config/GZ2J01/rels/d_a_e_pz/symbols.txt index a488d9dfb3..9953619656 100644 --- a/config/GZ2J01/rels/d_a_e_pz/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_pz/symbols.txt @@ -217,7 +217,8 @@ mDBaBa_birthHani_dt = .rodata:0x00000264; // type:object size:0x30 scope:global @stringBase0 = .rodata:0x000002B8; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_222_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local @@ -267,13 +268,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3922 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global align:4 data:float lbl_222_bss_70 = .bss:0x00000070; // type:object size:0x1 data:byte lbl_222_bss_71 = .bss:0x00000071; // type:object size:0x1 data:byte @4339 = .bss:0x00000074; // type:object size:0xC scope:local -init$4340 = .bss:0x00000080; // type:object size:0x1 scope:local +init$4340 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 data:byte @4342 = .bss:0x00000084; // type:object size:0xC scope:local @4343 = .bss:0x00000090; // type:object size:0xC scope:local @4344 = .bss:0x0000009C; // type:object size:0xC scope:local @@ -293,7 +294,7 @@ init$4340 = .bss:0x00000080; // type:object size:0x1 scope:local @4358 = .bss:0x00000144; // type:object size:0xC scope:local mPzCenterInit_dt$4338 = .bss:0x00000150; // type:object size:0xD8 scope:local @4360 = .bss:0x00000228; // type:object size:0xC scope:local -init$4361 = .bss:0x00000234; // type:object size:0x1 scope:local +init$4361 = .bss:0x00000234; // type:object size:0x1 scope:local align:1 data:byte @4363 = .bss:0x00000238; // type:object size:0xC scope:local @4364 = .bss:0x00000244; // type:object size:0xC scope:local @4365 = .bss:0x00000250; // type:object size:0xC scope:local @@ -313,12 +314,12 @@ init$4361 = .bss:0x00000234; // type:object size:0x1 scope:local @4379 = .bss:0x000002F8; // type:object size:0xC scope:local mPzEyeInit_dt$4359 = .bss:0x00000304; // type:object size:0xD8 scope:local @5677 = .bss:0x000003DC; // type:object size:0xC scope:local -init$5678 = .bss:0x000003E8; // type:object size:0x1 scope:local +init$5678 = .bss:0x000003E8; // type:object size:0x1 scope:local align:1 data:byte @5680 = .bss:0x000003EC; // type:object size:0xC scope:local @5681 = .bss:0x000003F8; // type:object size:0xC scope:local mPzDeadDemo_mCenter_dt$5676 = .bss:0x00000404; // type:object size:0x24 scope:local @5683 = .bss:0x00000428; // type:object size:0xC scope:local -init$5684 = .bss:0x00000434; // type:object size:0x1 scope:local +init$5684 = .bss:0x00000434; // type:object size:0x1 scope:local align:1 data:byte @5686 = .bss:0x00000438; // type:object size:0xC scope:local @5687 = .bss:0x00000444; // type:object size:0xC scope:local mPzDeadDemo_mEye_dt$5682 = .bss:0x00000450; // type:object size:0x24 scope:local diff --git a/config/GZ2J01/rels/d_a_e_rb/splits.txt b/config/GZ2J01/rels/d_a_e_rb/splits.txt index 4869ba857e..eca44bdd6f 100644 --- a/config/GZ2J01/rels/d_a_e_rb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_rb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rb.cpp: diff --git a/config/GZ2J01/rels/d_a_e_rb/symbols.txt b/config/GZ2J01/rels/d_a_e_rb/symbols.txt index 4ab3d0ad25..d9f9cd74fa 100644 --- a/config/GZ2J01/rels/d_a_e_rb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_rb/symbols.txt @@ -88,7 +88,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000C8; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_223_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -106,7 +107,7 @@ __vt__8cM3dGPla = .data:0x00000154; // type:object size:0xC scope:global __vt__14dBgS_ObjGndChk = .data:0x00000160; // type:object size:0x30 scope:global __vt__12daE_RB_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_223_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte child = .bss:0x00000028; // type:object size:0x28 scope:global diff --git a/config/GZ2J01/rels/d_a_e_rd/splits.txt b/config/GZ2J01/rels/d_a_e_rd/splits.txt index 1ca151ccc3..60a5b045bb 100644 --- a/config/GZ2J01/rels/d_a_e_rd/splits.txt +++ b/config/GZ2J01/rels/d_a_e_rd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rd.cpp: diff --git a/config/GZ2J01/rels/d_a_e_rd/symbols.txt b/config/GZ2J01/rels/d_a_e_rd/symbols.txt index f17caf19f1..3c83698aaa 100644 --- a/config/GZ2J01/rels/d_a_e_rd/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_rd/symbols.txt @@ -378,7 +378,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000003E4; // type:object size:0x40 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_70_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$4087 = .data:0x00000020; // type:object size:0x8 scope:local e_env$4088 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$4096 = .data:0x00000030; // type:object size:0x6 scope:local @@ -437,21 +438,24 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local boss = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -lbl_70_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @4224 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x50 scope:global data:byte S_find = .bss:0x000000AC; // type:object size:0x2 scope:global data:2byte lbl_70_bss_AE = .bss:0x000000AE; // type:object size:0x1 data:byte @4242 = .bss:0x000000B0; // type:object size:0xC scope:local S_find_pos = .bss:0x000000BC; // type:object size:0xC scope:global align:4 data:float -lbl_70_bss_C8 = .bss:0x000000C8; // type:object size:0x1 data:byte +data_80519200 = .bss:0x000000C8; // type:object size:0x1 data:byte +data_80519201 = .bss:0x000000C9; // type:object size:0x1 data:byte target_info = .bss:0x000000CC; // type:object size:0x28 scope:global data:4byte target_info_count = .bss:0x000000F4; // type:object size:0x4 scope:global data:4byte +data_80519230 = .bss:0x000000F8; // type:object size:0x1 scope:local data:byte check_index$5284 = .bss:0x000000FC; // type:object size:0xFF scope:local rd_count = .bss:0x000001FC; // type:object size:0x4 scope:global data:4byte -lbl_70_bss_200 = .bss:0x00000200; // type:object size:0x1 data:byte +data_80519338 = .bss:0x00000200; // type:object size:0x1 scope:local align:1 data:byte c_start = .bss:0x00000204; // type:object size:0x4 scope:global @11269 = .bss:0x00000208; // type:object size:0xC scope:local +init$0000 = .bss:0x00000214; // type:object size:0x1 scope:local align:1 data:byte @11272 = .bss:0x00000218; // type:object size:0xC scope:local @11273 = .bss:0x00000224; // type:object size:0xC scope:local @11274 = .bss:0x00000230; // type:object size:0xC scope:local @@ -459,9 +463,11 @@ c_start = .bss:0x00000204; // type:object size:0x4 scope:global @11276 = .bss:0x00000248; // type:object size:0xC scope:local set_pos$11268 = .bss:0x00000254; // type:object size:0x48 scope:local @11412 = .bss:0x0000029C; // type:object size:0xC scope:local +init$0001 = .bss:0x000002A8; // type:object size:0x1 scope:local align:1 data:byte @11415 = .bss:0x000002AC; // type:object size:0xC scope:local @11416 = .bss:0x000002B8; // type:object size:0xC scope:local set_pos$11411 = .bss:0x000002C4; // type:object size:0x24 scope:local +instanceCount = .bss:0x000002E8; // type:object size:0x1 scope:local data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000002EC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000002F0; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000002F4; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_rdb/splits.txt b/config/GZ2J01/rels/d_a_e_rdb/splits.txt index 2da6925dd4..7ebbf7142d 100644 --- a/config/GZ2J01/rels/d_a_e_rdb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_rdb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rdb.cpp: diff --git a/config/GZ2J01/rels/d_a_e_rdb/symbols.txt b/config/GZ2J01/rels/d_a_e_rdb/symbols.txt index 755110a7f9..e423fba4d8 100644 --- a/config/GZ2J01/rels/d_a_e_rdb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_rdb/symbols.txt @@ -201,7 +201,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000268; // type:object size:0x33 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_224_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3886 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3887 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3895 = .data:0x00000030; // type:object size:0x6 scope:local @@ -242,10 +243,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_224_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4023 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @5932 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local @5935 = .bss:0x00000070; // type:object size:0xC scope:local @5936 = .bss:0x0000007C; // type:object size:0xC scope:local @5937 = .bss:0x00000088; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_rdy/splits.txt b/config/GZ2J01/rels/d_a_e_rdy/splits.txt index 14adc48ce3..283e3b7f93 100644 --- a/config/GZ2J01/rels/d_a_e_rdy/splits.txt +++ b/config/GZ2J01/rels/d_a_e_rdy/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rdy.cpp: diff --git a/config/GZ2J01/rels/d_a_e_rdy/symbols.txt b/config/GZ2J01/rels/d_a_e_rdy/symbols.txt index a7dca54576..c398d8ed8a 100644 --- a/config/GZ2J01/rels/d_a_e_rdy/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_rdy/symbols.txt @@ -265,7 +265,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000002C0; // type:object size:0x1D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_225_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3897 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3898 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3906 = .data:0x00000030; // type:object size:0x6 scope:local @@ -317,7 +318,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local boss = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -lbl_225_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @4034 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x50 scope:global data:byte S_find = .bss:0x000000AC; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2J01/rels/d_a_e_s1/splits.txt b/config/GZ2J01/rels/d_a_e_s1/splits.txt index 5a762f1348..d3ca26d184 100644 --- a/config/GZ2J01/rels/d_a_e_s1/splits.txt +++ b/config/GZ2J01/rels/d_a_e_s1/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_s1.cpp: diff --git a/config/GZ2J01/rels/d_a_e_s1/symbols.txt b/config/GZ2J01/rels/d_a_e_s1/symbols.txt index 433d246aaa..303db167f3 100644 --- a/config/GZ2J01/rels/d_a_e_s1/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_s1/symbols.txt @@ -169,7 +169,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001B0; // type:object size:0x31 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_226_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -211,8 +212,8 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_226_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte -lbl_226_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte +l_no_fail = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x2C scope:global data:byte check_index$4023 = .bss:0x00000080; // type:object size:0xFF scope:local diff --git a/config/GZ2J01/rels/d_a_e_sb/splits.txt b/config/GZ2J01/rels/d_a_e_sb/splits.txt index 2cb921f87b..aaaf974979 100644 --- a/config/GZ2J01/rels/d_a_e_sb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_sb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sb.cpp: diff --git a/config/GZ2J01/rels/d_a_e_sb/symbols.txt b/config/GZ2J01/rels/d_a_e_sb/symbols.txt index 2e3a678cf7..1f098a8158 100644 --- a/config/GZ2J01/rels/d_a_e_sb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_sb/symbols.txt @@ -136,12 +136,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_227_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3653 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0x40 scope:global data:byte -s_Bomb__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000094; // type:object size:0x4 scope:global data:4byte -s_TargetAngle__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000098; // type:object size:0x2 scope:global data:2byte -s_LinkPos__22@unnamed@d_a_e_sb_cpp@ = .bss:0x0000009C; // type:object size:0x4 scope:global data:4byte +l_HIO = .bss:0x00000054; // type:object size:0x40 scope:local data:byte +s_Bomb__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000094; // type:object size:0x4 scope:local data:4byte +s_TargetAngle__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000098; // type:object size:0x2 scope:local data:2byte +s_LinkPos__22@unnamed@d_a_e_sb_cpp@ = .bss:0x0000009C; // type:object size:0x4 scope:local data:4byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000A8; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_sf/splits.txt b/config/GZ2J01/rels/d_a_e_sf/splits.txt index 270eba4def..d7984ce3e8 100644 --- a/config/GZ2J01/rels/d_a_e_sf/splits.txt +++ b/config/GZ2J01/rels/d_a_e_sf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sf.cpp: diff --git a/config/GZ2J01/rels/d_a_e_sf/symbols.txt b/config/GZ2J01/rels/d_a_e_sf/symbols.txt index f7342ab7d3..0a0240aa5c 100644 --- a/config/GZ2J01/rels/d_a_e_sf/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_sf/symbols.txt @@ -129,7 +129,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000014C; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_228_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3787 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3788 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3796 = .data:0x00000030; // type:object size:0x6 scope:local @@ -170,7 +171,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_228_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3924 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte target_info = .bss:0x0000007C; // type:object size:0x28 scope:global diff --git a/config/GZ2J01/rels/d_a_e_sg/splits.txt b/config/GZ2J01/rels/d_a_e_sg/splits.txt index e6a36a6d30..64f3eea100 100644 --- a/config/GZ2J01/rels/d_a_e_sg/splits.txt +++ b/config/GZ2J01/rels/d_a_e_sg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sg.cpp: diff --git a/config/GZ2J01/rels/d_a_e_sg/symbols.txt b/config/GZ2J01/rels/d_a_e_sg/symbols.txt index 5a848f01cf..2a7bc877ff 100644 --- a/config/GZ2J01/rels/d_a_e_sg/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_sg/symbols.txt @@ -127,7 +127,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_229_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3762 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte stick_pt = .bss:0x0000006C; // type:object size:0x4 scope:global data:4byte @@ -137,6 +137,7 @@ bg_on = .bss:0x00000098; // type:object size:0xA scope:global bg_cross = .bss:0x000000B0; // type:object size:0x78 scope:global target_info_count = .bss:0x00000128; // type:object size:0x4 scope:global data:4byte @4849 = .bss:0x0000012C; // type:object size:0xC scope:local +init$0000 = .bss:0x00000138; // type:object size:0x1 scope:local align:1 data:byte sc$4848 = .bss:0x0000013C; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000148; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000014C; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_sh/splits.txt b/config/GZ2J01/rels/d_a_e_sh/splits.txt index 209a4f3e61..6825b26511 100644 --- a/config/GZ2J01/rels/d_a_e_sh/splits.txt +++ b/config/GZ2J01/rels/d_a_e_sh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sh.cpp: diff --git a/config/GZ2J01/rels/d_a_e_sh/symbols.txt b/config/GZ2J01/rels/d_a_e_sh/symbols.txt index d0fbea44b7..fd559d08ac 100644 --- a/config/GZ2J01/rels/d_a_e_sh/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_sh/symbols.txt @@ -121,7 +121,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000150; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_230_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local @@ -143,6 +144,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_sm/splits.txt b/config/GZ2J01/rels/d_a_e_sm/splits.txt index e4721f6ea5..c5a1c25381 100644 --- a/config/GZ2J01/rels/d_a_e_sm/splits.txt +++ b/config/GZ2J01/rels/d_a_e_sm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sm.cpp: diff --git a/config/GZ2J01/rels/d_a_e_sm/symbols.txt b/config/GZ2J01/rels/d_a_e_sm/symbols.txt index 5981498f55..f2232cf88e 100644 --- a/config/GZ2J01/rels/d_a_e_sm/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_sm/symbols.txt @@ -170,7 +170,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001A0; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_231_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3799 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3800 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3808 = .data:0x00000030; // type:object size:0x6 scope:local @@ -205,7 +206,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_231_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3936 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:global data:byte s_Dis__22@unnamed@d_a_e_sm_cpp@ = .bss:0x00000068; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_e_sm2/splits.txt b/config/GZ2J01/rels/d_a_e_sm2/splits.txt index c9c06b9044..4d8f456d71 100644 --- a/config/GZ2J01/rels/d_a_e_sm2/splits.txt +++ b/config/GZ2J01/rels/d_a_e_sm2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sm2.cpp: diff --git a/config/GZ2J01/rels/d_a_e_sm2/symbols.txt b/config/GZ2J01/rels/d_a_e_sm2/symbols.txt index ae1e28e422..9b60afc2ae 100644 --- a/config/GZ2J01/rels/d_a_e_sm2/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_sm2/symbols.txt @@ -141,7 +141,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000168; // type:object size:0x1C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_232_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3669 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3670 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3678 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2J01/rels/d_a_e_st/splits.txt b/config/GZ2J01/rels/d_a_e_st/splits.txt index 1baa0316a0..054aadbcba 100644 --- a/config/GZ2J01/rels/d_a_e_st/splits.txt +++ b/config/GZ2J01/rels/d_a_e_st/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_st.cpp: diff --git a/config/GZ2J01/rels/d_a_e_st/symbols.txt b/config/GZ2J01/rels/d_a_e_st/symbols.txt index 21084d5e47..172309efe5 100644 --- a/config/GZ2J01/rels/d_a_e_st/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_st/symbols.txt @@ -188,7 +188,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001BC; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_233_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -234,7 +235,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local small = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -lbl_233_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x24 scope:global data:byte @6303 = .bss:0x00000080; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_sw/splits.txt b/config/GZ2J01/rels/d_a_e_sw/splits.txt index b75966e443..7df766053f 100644 --- a/config/GZ2J01/rels/d_a_e_sw/splits.txt +++ b/config/GZ2J01/rels/d_a_e_sw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sw.cpp: diff --git a/config/GZ2J01/rels/d_a_e_sw/symbols.txt b/config/GZ2J01/rels/d_a_e_sw/symbols.txt index 0b999523a2..df01685880 100644 --- a/config/GZ2J01/rels/d_a_e_sw/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_sw/symbols.txt @@ -161,7 +161,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000144; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_235_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3788 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3789 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3797 = .data:0x00000030; // type:object size:0x6 scope:local @@ -232,10 +233,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local target_info__22@unnamed@d_a_e_sw_cpp@ = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte target_dist__22@unnamed@d_a_e_sw_cpp@ = .bss:0x0000004C; // type:object size:0x4 scope:global align:4 data:float -lbl_235_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte -lbl_235_bss_51 = .bss:0x00000051; // type:object size:0x1 data:byte -lbl_235_bss_52 = .bss:0x00000052; // type:object size:0x1 data:byte -lbl_235_bss_53 = .bss:0x00000053; // type:object size:0x1 data:byte +data_807B0200 = .bss:0x00000050; // type:object size:0x1 scope:local data:byte +data_807B0201 = .bss:0x00000051; // type:object size:0x1 scope:local data:byte +data_807B0202 = .bss:0x00000052; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000053; // type:object size:0x1 scope:local align:1 data:byte @3925 = .bss:0x00000054; // type:object size:0xC scope:local l_HIO = .bss:0x00000060; // type:object size:0x24 scope:global align:4 data:float sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_th/splits.txt b/config/GZ2J01/rels/d_a_e_th/splits.txt index aa251c7a89..59e500d184 100644 --- a/config/GZ2J01/rels/d_a_e_th/splits.txt +++ b/config/GZ2J01/rels/d_a_e_th/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_th.cpp: diff --git a/config/GZ2J01/rels/d_a_e_th/symbols.txt b/config/GZ2J01/rels/d_a_e_th/symbols.txt index 72e79a94b2..46bf325e3b 100644 --- a/config/GZ2J01/rels/d_a_e_th/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_th/symbols.txt @@ -156,7 +156,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001A8; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_236_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local @@ -176,6 +177,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000001D4; // type:object size:0x14 scope:gl __vt__12dBgS_ObjAcch = .data:0x000001E8; // type:object size:0x24 scope:global __vt__12daE_TH_HIO_c = .data:0x0000020C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_236_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3922 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_tk/splits.txt b/config/GZ2J01/rels/d_a_e_tk/splits.txt index 8bdea734c5..3de29d9a96 100644 --- a/config/GZ2J01/rels/d_a_e_tk/splits.txt +++ b/config/GZ2J01/rels/d_a_e_tk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tk.cpp: diff --git a/config/GZ2J01/rels/d_a_e_tk/symbols.txt b/config/GZ2J01/rels/d_a_e_tk/symbols.txt index 81e295557a..532d7bd5c2 100644 --- a/config/GZ2J01/rels/d_a_e_tk/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_tk/symbols.txt @@ -78,6 +78,6 @@ __vt__8cM3dGAab = .data:0x000000FC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000108; // type:object size:0x24 scope:global __vt__12daE_TK_HIO_c = .data:0x0000012C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_238_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_tk2/splits.txt b/config/GZ2J01/rels/d_a_e_tk2/splits.txt index c66e709551..ef62327e76 100644 --- a/config/GZ2J01/rels/d_a_e_tk2/splits.txt +++ b/config/GZ2J01/rels/d_a_e_tk2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tk2.cpp: diff --git a/config/GZ2J01/rels/d_a_e_tk2/symbols.txt b/config/GZ2J01/rels/d_a_e_tk2/symbols.txt index f26389f8b1..4190e8dcad 100644 --- a/config/GZ2J01/rels/d_a_e_tk2/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_tk2/symbols.txt @@ -71,6 +71,6 @@ __vt__8cM3dGAab = .data:0x000000D0; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000DC; // type:object size:0x24 scope:global __vt__13daE_TK2_HIO_c = .data:0x00000100; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_239_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_tt/splits.txt b/config/GZ2J01/rels/d_a_e_tt/splits.txt index e485f25f41..8046205c30 100644 --- a/config/GZ2J01/rels/d_a_e_tt/splits.txt +++ b/config/GZ2J01/rels/d_a_e_tt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tt.cpp: diff --git a/config/GZ2J01/rels/d_a_e_tt/symbols.txt b/config/GZ2J01/rels/d_a_e_tt/symbols.txt index 7ac76d11e9..060928c13a 100644 --- a/config/GZ2J01/rels/d_a_e_tt/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_tt/symbols.txt @@ -117,7 +117,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000F8; // type:object size:0x16 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_241_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3787 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3788 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3796 = .data:0x00000030; // type:object size:0x6 scope:local @@ -161,19 +162,24 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_241_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3924 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte m_attack_tt = .bss:0x0000006C; // type:object size:0x4 scope:global data:4byte @4154 = .bss:0x00000070; // type:object size:0xC scope:local +init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte sc$4153 = .bss:0x00000080; // type:object size:0xC scope:local @4269 = .bss:0x0000008C; // type:object size:0xC scope:local +init$0001 = .bss:0x00000098; // type:object size:0x1 scope:local align:1 data:byte sc$4268 = .bss:0x0000009C; // type:object size:0xC scope:local @4302 = .bss:0x000000A8; // type:object size:0xC scope:local +init$0002 = .bss:0x000000B4; // type:object size:0x1 scope:local align:1 data:byte sc$4301 = .bss:0x000000B8; // type:object size:0xC scope:local @4400 = .bss:0x000000C4; // type:object size:0xC scope:local +init$0003 = .bss:0x000000D0; // type:object size:0x1 scope:local align:1 data:byte sc$4399 = .bss:0x000000D4; // type:object size:0xC scope:local @4489 = .bss:0x000000E0; // type:object size:0xC scope:local +init$0004 = .bss:0x000000EC; // type:object size:0x1 scope:local align:1 data:byte sc$4488 = .bss:0x000000F0; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000FC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000100; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_vt/splits.txt b/config/GZ2J01/rels/d_a_e_vt/splits.txt index 859828df19..5c0a91de09 100644 --- a/config/GZ2J01/rels/d_a_e_vt/splits.txt +++ b/config/GZ2J01/rels/d_a_e_vt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_vt.cpp: diff --git a/config/GZ2J01/rels/d_a_e_vt/symbols.txt b/config/GZ2J01/rels/d_a_e_vt/symbols.txt index 2eadf069ea..c39038c769 100644 --- a/config/GZ2J01/rels/d_a_e_vt/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_vt/symbols.txt @@ -246,7 +246,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000254; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_242_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3786 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3787 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3795 = .data:0x00000030; // type:object size:0x6 scope:local @@ -305,7 +306,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_242_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3923 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x40 scope:global data:byte @5409 = .bss:0x00000094; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_wb/splits.txt b/config/GZ2J01/rels/d_a_e_wb/splits.txt index 95cd6f7d43..df396c14c2 100644 --- a/config/GZ2J01/rels/d_a_e_wb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_wb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_wb.cpp: diff --git a/config/GZ2J01/rels/d_a_e_wb/symbols.txt b/config/GZ2J01/rels/d_a_e_wb/symbols.txt index 6dbac9ae6e..01fb3c8788 100644 --- a/config/GZ2J01/rels/d_a_e_wb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_wb/symbols.txt @@ -484,7 +484,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000580; // type:object size:0x49 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_244_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_color$4786 = .data:0x00000020; // type:object size:0x4 scope:local chk_x$5015 = .data:0x00000024; // type:object size:0x10 scope:local chk_z$5016 = .data:0x00000034; // type:object size:0x10 scope:local @@ -538,10 +539,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_244_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte -lbl_244_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte -lbl_244_bss_47 = .bss:0x00000047; // type:object size:0x1 data:byte -lbl_244_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte +lbl_244_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +lbl_244_bss_46 = .bss:0x00000046; // type:object size:0x1 scope:local data:byte +lbl_244_bss_47 = .bss:0x00000047; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte @4435 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x5C scope:global data:byte @4746 = .bss:0x000000B4; // type:object size:0xC scope:local @@ -549,28 +550,35 @@ b_path = .bss:0x000000C0; // type:object size:0x60 scope:global align:4 data:flo @5743 = .bss:0x00000120; // type:object size:0xC scope:local b_path2 = .bss:0x0000012C; // type:object size:0x60 scope:global align:4 data:float @6258 = .bss:0x0000018C; // type:object size:0xC scope:local +init$0000 = .bss:0x00000198; // type:object size:0x1 scope:local align:1 data:byte arrow_rd_pos$6257 = .bss:0x0000019C; // type:object size:0xC scope:local @6279 = .bss:0x000001A8; // type:object size:0xC scope:local saku_p = .bss:0x000001B4; // type:object size:0xC scope:global @6280 = .bss:0x000001C0; // type:object size:0xC scope:local saku_p2 = .bss:0x000001CC; // type:object size:0xC scope:global @6285 = .bss:0x000001D8; // type:object size:0xC scope:local +init$0001 = .bss:0x000001E4; // type:object size:0x1 scope:local align:1 data:byte @6288 = .bss:0x000001E8; // type:object size:0xC scope:local ikki_pos$6284 = .bss:0x000001F4; // type:object size:0x18 scope:local @6400 = .bss:0x0000020C; // type:object size:0xC scope:local +init$0002 = .bss:0x00000218; // type:object size:0x1 scope:local align:1 data:byte @6403 = .bss:0x0000021C; // type:object size:0xC scope:local f_pos$6399 = .bss:0x00000228; // type:object size:0x18 scope:local @6612 = .bss:0x00000240; // type:object size:0xC scope:local +init$0003 = .bss:0x0000024C; // type:object size:0x1 scope:local align:1 data:byte @6615 = .bss:0x00000250; // type:object size:0xC scope:local ikki2_pos$6611 = .bss:0x0000025C; // type:object size:0x18 scope:local @7515 = .bss:0x00000274; // type:object size:0xC scope:local +init$0004 = .bss:0x00000280; // type:object size:0x1 scope:local align:1 data:byte sc$7514 = .bss:0x00000284; // type:object size:0xC scope:local rd_count = .bss:0x00000290; // type:object size:0x4 scope:global data:4byte @7814 = .bss:0x00000294; // type:object size:0xC scope:local +init$0005 = .bss:0x000002A0; // type:object size:0x1 scope:local align:1 data:byte @7817 = .bss:0x000002A4; // type:object size:0xC scope:local @7818 = .bss:0x000002B0; // type:object size:0xC scope:local sh_pos$7813 = .bss:0x000002BC; // type:object size:0x24 scope:local @7820 = .bss:0x000002E0; // type:object size:0xC scope:local +init$0006 = .bss:0x000002EC; // type:object size:0x1 scope:local align:1 data:byte @7823 = .bss:0x000002F0; // type:object size:0xC scope:local @7824 = .bss:0x000002FC; // type:object size:0xC scope:local sh_posH$7819 = .bss:0x00000308; // type:object size:0x24 scope:local diff --git a/config/GZ2J01/rels/d_a_e_ws/splits.txt b/config/GZ2J01/rels/d_a_e_ws/splits.txt index f71158b422..f37746f346 100644 --- a/config/GZ2J01/rels/d_a_e_ws/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ws/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ws.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ws/symbols.txt b/config/GZ2J01/rels/d_a_e_ws/symbols.txt index 5aa61f46dc..5b34d233df 100644 --- a/config/GZ2J01/rels/d_a_e_ws/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ws/symbols.txt @@ -110,9 +110,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4989 = .rodata:0x000000FC; // type:object size:0x4 scope:local @5154 = .rodata:0x00000100; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000104; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_245_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3681 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3682 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3690 = .data:0x00000030; // type:object size:0x6 scope:local @@ -130,6 +132,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000184; // type:object size:0xC scope:global __vt__12daE_WS_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_245_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3818 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x28 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_ww/splits.txt b/config/GZ2J01/rels/d_a_e_ww/splits.txt index ef80bf3cbf..5ae499a796 100644 --- a/config/GZ2J01/rels/d_a_e_ww/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ww/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ww.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ww/symbols.txt b/config/GZ2J01/rels/d_a_e_ww/symbols.txt index 3f59d9941f..83036f4cd5 100644 --- a/config/GZ2J01/rels/d_a_e_ww/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ww/symbols.txt @@ -152,7 +152,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000148; // type:object size:0x11 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_246_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3784 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3785 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3793 = .data:0x00000030; // type:object size:0x6 scope:local @@ -190,10 +191,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_246_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3921 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte -lbl_246_bss_7C = .bss:0x0000007C; // type:object size:0x1 data:byte +lbl_237_bss_30 = .bss:0x0000007C; // type:object size:0x1 scope:local data:byte @4585 = .bss:0x00000080; // type:object size:0xC scope:local @4586 = .bss:0x0000008C; // type:object size:0xC scope:local @4587 = .bss:0x00000098; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_yc/splits.txt b/config/GZ2J01/rels/d_a_e_yc/splits.txt index 7fad049fed..8d356c7a5c 100644 --- a/config/GZ2J01/rels/d_a_e_yc/splits.txt +++ b/config/GZ2J01/rels/d_a_e_yc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yc.cpp: diff --git a/config/GZ2J01/rels/d_a_e_yc/symbols.txt b/config/GZ2J01/rels/d_a_e_yc/symbols.txt index a13545877b..1e93b74912 100644 --- a/config/GZ2J01/rels/d_a_e_yc/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_yc/symbols.txt @@ -100,6 +100,6 @@ __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12daE_YC_HIO_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global S_area_dis = .bss:0x00000008; // type:object size:0x4 scope:global align:4 data:float -lbl_247_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte @3710 = .bss:0x00000010; // type:object size:0xC scope:local l_HIO = .bss:0x0000001C; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_yd/splits.txt b/config/GZ2J01/rels/d_a_e_yd/splits.txt index 7939bb0da7..773dc5f0c8 100644 --- a/config/GZ2J01/rels/d_a_e_yd/splits.txt +++ b/config/GZ2J01/rels/d_a_e_yd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yd.cpp: diff --git a/config/GZ2J01/rels/d_a_e_yd/symbols.txt b/config/GZ2J01/rels/d_a_e_yd/symbols.txt index ab81c0c354..c3858fc68b 100644 --- a/config/GZ2J01/rels/d_a_e_yd/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_yd/symbols.txt @@ -122,9 +122,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @5472 = .rodata:0x00000120; // type:object size:0x4 scope:local @5474 = .rodata:0x00000128; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000130; // type:object size:0x5 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_248_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -148,6 +150,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000001FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000210; // type:object size:0xC scope:global __vt__12daE_YD_HIO_c = .data:0x0000021C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_248_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_yg/splits.txt b/config/GZ2J01/rels/d_a_e_yg/splits.txt index f2340e27d2..426a57515c 100644 --- a/config/GZ2J01/rels/d_a_e_yg/splits.txt +++ b/config/GZ2J01/rels/d_a_e_yg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yg.cpp: diff --git a/config/GZ2J01/rels/d_a_e_yg/symbols.txt b/config/GZ2J01/rels/d_a_e_yg/symbols.txt index efbda178bb..0b30b6d97a 100644 --- a/config/GZ2J01/rels/d_a_e_yg/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_yg/symbols.txt @@ -127,7 +127,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000013C; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_250_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3680 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3681 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3689 = .data:0x00000030; // type:object size:0x6 scope:local @@ -164,10 +165,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_250_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3817 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte @3917 = .bss:0x00000070; // type:object size:0xC scope:local +init$1863 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte @3920 = .bss:0x00000080; // type:object size:0xC scope:local @3921 = .bss:0x0000008C; // type:object size:0xC scope:local e_pos$3916 = .bss:0x00000098; // type:object size:0x24 scope:local @@ -202,6 +204,7 @@ ke_p = .bss:0x000001AC; // type:object size:0x9C scope:global align:4 data:float @4714 = .bss:0x000002D8; // type:object size:0xC scope:local ke_a = .bss:0x000002E4; // type:object size:0x4E scope:global data:2byte @5031 = .bss:0x00000334; // type:object size:0xC scope:local +init$2973 = .bss:0x00000340; // type:object size:0x1 scope:local align:1 data:byte sc$5030 = .bss:0x00000344; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000350; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000354; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_e_yh/splits.txt b/config/GZ2J01/rels/d_a_e_yh/splits.txt index aa325aec54..cd016865d1 100644 --- a/config/GZ2J01/rels/d_a_e_yh/splits.txt +++ b/config/GZ2J01/rels/d_a_e_yh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yh.cpp: diff --git a/config/GZ2J01/rels/d_a_e_yh/symbols.txt b/config/GZ2J01/rels/d_a_e_yh/symbols.txt index b5a33970db..9d2a4f0113 100644 --- a/config/GZ2J01/rels/d_a_e_yh/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_yh/symbols.txt @@ -141,7 +141,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000160; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_251_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local @@ -166,6 +167,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global __vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_yk/splits.txt b/config/GZ2J01/rels/d_a_e_yk/splits.txt index 13da412364..92ff20ea9f 100644 --- a/config/GZ2J01/rels/d_a_e_yk/splits.txt +++ b/config/GZ2J01/rels/d_a_e_yk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yk.cpp: diff --git a/config/GZ2J01/rels/d_a_e_yk/symbols.txt b/config/GZ2J01/rels/d_a_e_yk/symbols.txt index 0a9d7295b7..56a392b6f6 100644 --- a/config/GZ2J01/rels/d_a_e_yk/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_yk/symbols.txt @@ -90,9 +90,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @5029 = .rodata:0x000000BC; // type:object size:0x4 scope:local @5031 = .rodata:0x000000C0; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000000C8; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_252_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3820 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3821 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3829 = .data:0x00000030; // type:object size:0x6 scope:local @@ -110,7 +112,7 @@ __vt__8cM3dGAab = .data:0x00000140; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000014C; // type:object size:0x24 scope:global __vt__12daE_YK_HIO_c = .data:0x00000170; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_252_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3957 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte check_index$4191 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_e_ym/splits.txt b/config/GZ2J01/rels/d_a_e_ym/splits.txt index 4d2dd8ee29..e9631d3c46 100644 --- a/config/GZ2J01/rels/d_a_e_ym/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ym/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ym.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ym/symbols.txt b/config/GZ2J01/rels/d_a_e_ym/symbols.txt index a4944afa9f..2cb3e71de8 100644 --- a/config/GZ2J01/rels/d_a_e_ym/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ym/symbols.txt @@ -181,7 +181,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000158; // type:object size:0x17 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_253_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3804 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3805 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3813 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2J01/rels/d_a_e_ymb/splits.txt b/config/GZ2J01/rels/d_a_e_ymb/splits.txt index c1864cfec7..e9bd5fd369 100644 --- a/config/GZ2J01/rels/d_a_e_ymb/splits.txt +++ b/config/GZ2J01/rels/d_a_e_ymb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ymb.cpp: diff --git a/config/GZ2J01/rels/d_a_e_ymb/symbols.txt b/config/GZ2J01/rels/d_a_e_ymb/symbols.txt index 3112600a0b..eed3ca9eb0 100644 --- a/config/GZ2J01/rels/d_a_e_ymb/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_ymb/symbols.txt @@ -236,7 +236,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000258; // type:object size:0xB scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_255_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_ymb_src__23@unnamed@d_a_e_ymb_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_ymb_at_src__23@unnamed@d_a_e_ymb_cpp@ = .data:0x00000060; // type:object size:0x40 scope:global cc_ymb_eye_src__23@unnamed@d_a_e_ymb_cpp@ = .data:0x000000A0; // type:object size:0x40 scope:global @@ -287,7 +288,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_255_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3786 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3797 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_yr/splits.txt b/config/GZ2J01/rels/d_a_e_yr/splits.txt index 632a763104..584302b521 100644 --- a/config/GZ2J01/rels/d_a_e_yr/splits.txt +++ b/config/GZ2J01/rels/d_a_e_yr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yr.cpp: diff --git a/config/GZ2J01/rels/d_a_e_yr/symbols.txt b/config/GZ2J01/rels/d_a_e_yr/symbols.txt index 22f7201f73..4dcffdbada 100644 --- a/config/GZ2J01/rels/d_a_e_yr/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_yr/symbols.txt @@ -130,7 +130,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000158; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_256_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2J01/rels/d_a_e_zh/splits.txt b/config/GZ2J01/rels/d_a_e_zh/splits.txt index 21ab275493..21948d2db6 100644 --- a/config/GZ2J01/rels/d_a_e_zh/splits.txt +++ b/config/GZ2J01/rels/d_a_e_zh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zh.cpp: diff --git a/config/GZ2J01/rels/d_a_e_zh/symbols.txt b/config/GZ2J01/rels/d_a_e_zh/symbols.txt index 8d3ec6193f..05e9a75553 100644 --- a/config/GZ2J01/rels/d_a_e_zh/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_zh/symbols.txt @@ -171,7 +171,8 @@ START_EFF_DT$4324 = .rodata:0x00000080; // type:object size:0x58 scope:local @stringBase0 = .rodata:0x00000208; // type:object size:0xD scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_257_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_zhSph_src__22@unnamed@d_a_e_zh_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_zhCyl_src__22@unnamed@d_a_e_zh_cpp@ = .data:0x00000060; // type:object size:0x44 scope:global cc_zhCyl_at_src__22@unnamed@d_a_e_zh_cpp@ = .data:0x000000A4; // type:object size:0x44 scope:global @@ -209,11 +210,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_257_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3773 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte -mStartFlag = .bss:0x00000070; // type:object size:0x4 scope:global data:4byte +l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte +mStartFlag = .bss:0x00000070; // type:object size:0x4 scope:local data:4byte @4079 = .bss:0x00000074; // type:object size:0xC scope:local +init$0000 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 data:byte @4082 = .bss:0x00000084; // type:object size:0xC scope:local @4083 = .bss:0x00000090; // type:object size:0xC scope:local @4084 = .bss:0x0000009C; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_e_zm/splits.txt b/config/GZ2J01/rels/d_a_e_zm/splits.txt index 7bc8d7cd26..710ff47c1c 100644 --- a/config/GZ2J01/rels/d_a_e_zm/splits.txt +++ b/config/GZ2J01/rels/d_a_e_zm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zm.cpp: diff --git a/config/GZ2J01/rels/d_a_e_zm/symbols.txt b/config/GZ2J01/rels/d_a_e_zm/symbols.txt index 8cee400277..69444edab6 100644 --- a/config/GZ2J01/rels/d_a_e_zm/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_zm/symbols.txt @@ -90,9 +90,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @5031 = .rodata:0x000000B8; // type:object size:0x4 scope:local @5032 = .rodata:0x000000BC; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000C0; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_258_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -113,6 +115,6 @@ __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12daE_ZM_HIO_c = .data:0x000001A8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_258_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_e_zs/splits.txt b/config/GZ2J01/rels/d_a_e_zs/splits.txt index aeb1314d0a..e6da379b4c 100644 --- a/config/GZ2J01/rels/d_a_e_zs/splits.txt +++ b/config/GZ2J01/rels/d_a_e_zs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zs.cpp: diff --git a/config/GZ2J01/rels/d_a_e_zs/symbols.txt b/config/GZ2J01/rels/d_a_e_zs/symbols.txt index 0a13268c92..1a1a566b8a 100644 --- a/config/GZ2J01/rels/d_a_e_zs/symbols.txt +++ b/config/GZ2J01/rels/d_a_e_zs/symbols.txt @@ -72,7 +72,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000074; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_259_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3788 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3789 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3797 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2J01/rels/d_a_econt/symbols.txt b/config/GZ2J01/rels/d_a_econt/symbols.txt index 8ecf694dad..a7c5dde6cb 100644 --- a/config/GZ2J01/rels/d_a_econt/symbols.txt +++ b/config/GZ2J01/rels/d_a_econt/symbols.txt @@ -17,4 +17,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3873 = .rodata:0x0000000C; // type:object size:0x4 scope:local l_daEcont_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_ECONT = .data:0x00000020; // type:object size:0x30 scope:global -lbl_71_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +data_805197E0 = .bss:0x00000000; // type:object size:0x4 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_ep/symbols.txt b/config/GZ2J01/rels/d_a_ep/symbols.txt index d328d16263..19cf506bf0 100644 --- a/config/GZ2J01/rels/d_a_ep/symbols.txt +++ b/config/GZ2J01/rels/d_a_ep/symbols.txt @@ -102,7 +102,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000010C; // type:object size:0x26 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_11_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double w_eff_id$3717 = .data:0x00000020; // type:object size:0x8 scope:local actions$4245 = .data:0x00000028; // type:object size:0x8 scope:local l_particle_fire_A$4270 = .data:0x00000030; // type:object size:0x4 scope:local diff --git a/config/GZ2J01/rels/d_a_formation_mng/symbols.txt b/config/GZ2J01/rels/d_a_formation_mng/symbols.txt index 660b0dec4d..898599ab2e 100644 --- a/config/GZ2J01/rels/d_a_formation_mng/symbols.txt +++ b/config/GZ2J01/rels/d_a_formation_mng/symbols.txt @@ -53,7 +53,8 @@ M_attr__10daFmtMng_c = .rodata:0x00000000; // type:object size:0x18 scope:global @4802 = .rodata:0x00000080; // type:object size:0x4 scope:local align:4 data:float cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_260_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3861 = .data:0x00000020; // type:object size:0xC scope:local @3862 = .data:0x0000002C; // type:object size:0xC scope:local @3863 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_fr/splits.txt b/config/GZ2J01/rels/d_a_fr/splits.txt index 62ca034015..8c00ffee96 100644 --- a/config/GZ2J01/rels/d_a_fr/splits.txt +++ b/config/GZ2J01/rels/d_a_fr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_fr.cpp: diff --git a/config/GZ2J01/rels/d_a_fr/symbols.txt b/config/GZ2J01/rels/d_a_fr/symbols.txt index e956629048..26a7e4749b 100644 --- a/config/GZ2J01/rels/d_a_fr/symbols.txt +++ b/config/GZ2J01/rels/d_a_fr/symbols.txt @@ -91,6 +91,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000134; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000158; // type:object size:0xC scope:global __vt__10daFr_HIO_c = .data:0x00000164; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_72_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_grass/splits.txt b/config/GZ2J01/rels/d_a_grass/splits.txt index 7e31bb82bb..92903b2d26 100644 --- a/config/GZ2J01/rels/d_a_grass/splits.txt +++ b/config/GZ2J01/rels/d_a_grass/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_grass.cpp: diff --git a/config/GZ2J01/rels/d_a_horse/splits.txt b/config/GZ2J01/rels/d_a_horse/splits.txt index c0f908f9c2..3d4856ee98 100644 --- a/config/GZ2J01/rels/d_a_horse/splits.txt +++ b/config/GZ2J01/rels/d_a_horse/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_horse.cpp: diff --git a/config/GZ2J01/rels/d_a_horse/symbols.txt b/config/GZ2J01/rels/d_a_horse/symbols.txt index 2509533703..69cf13a843 100644 --- a/config/GZ2J01/rels/d_a_horse/symbols.txt +++ b/config/GZ2J01/rels/d_a_horse/symbols.txt @@ -262,7 +262,8 @@ stopStandFootEffectFrame$9721 = .rodata:0x00000344; // type:object size:0x30 sco @stringBase0 = .rodata:0x000003B0; // type:object size:0x75 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_262_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_autoUpHeight = .data:0x00000020; // type:object size:0x4 scope:global align:4 data:float l_cylSrc = .data:0x00000024; // type:object size:0x44 scope:global l_sphSrc = .data:0x00000068; // type:object size:0x40 scope:global @@ -321,32 +322,46 @@ l_frontFootOffset = .bss:0x00000054; // type:object size:0xC scope:global align: @4180 = .bss:0x00000060; // type:object size:0xC scope:local l_backFootOffset = .bss:0x0000006C; // type:object size:0xC scope:global align:4 data:float @7279 = .bss:0x00000078; // type:object size:0xC scope:local +init$4891 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte localEyePos$7278 = .bss:0x00000088; // type:object size:0xC scope:local @7469 = .bss:0x00000094; // type:object size:0xC scope:local +init$5140 = .bss:0x000000A0; // type:object size:0x1 scope:local align:1 data:byte runScale$7468 = .bss:0x000000A4; // type:object size:0xC scope:local @7473 = .bss:0x000000B0; // type:object size:0xC scope:local +init$5144 = .bss:0x000000BC; // type:object size:0x1 scope:local align:1 data:byte landScale$7472 = .bss:0x000000C0; // type:object size:0xC scope:local @7477 = .bss:0x000000CC; // type:object size:0xC scope:local +init$5083 = .bss:0x000000D8; // type:object size:0x1 scope:local align:1 data:byte grassRunScale$7476 = .bss:0x000000DC; // type:object size:0xC scope:local @7481 = .bss:0x000000E8; // type:object size:0xC scope:local +init$5091 = .bss:0x000000F4; // type:object size:0x1 scope:local align:1 data:byte waterDirection$7480 = .bss:0x000000F8; // type:object size:0xC scope:local @8516 = .bss:0x00000104; // type:object size:0xC scope:local +init$6089 = .bss:0x00000110; // type:object size:0x1 scope:local align:1 data:byte reinLeftStart$8515 = .bss:0x00000114; // type:object size:0xC scope:local @8520 = .bss:0x00000120; // type:object size:0xC scope:local +init$6093 = .bss:0x0000012C; // type:object size:0x1 scope:local align:1 data:byte reinRightStart$8519 = .bss:0x00000130; // type:object size:0xC scope:local @8524 = .bss:0x0000013C; // type:object size:0xC scope:local +init$6097 = .bss:0x00000148; // type:object size:0x1 scope:local align:1 data:byte localNeckLeft$8523 = .bss:0x0000014C; // type:object size:0xC scope:local @8528 = .bss:0x00000158; // type:object size:0xC scope:local +init$6101 = .bss:0x00000164; // type:object size:0x1 scope:local align:1 data:byte localNeckRight$8527 = .bss:0x00000168; // type:object size:0xC scope:local @8753 = .bss:0x00000174; // type:object size:0xC scope:local +init$6311 = .bss:0x00000180; // type:object size:0x1 scope:local align:1 data:byte saddleLeft$8752 = .bss:0x00000184; // type:object size:0xC scope:local @8757 = .bss:0x00000190; // type:object size:0xC scope:local +init$6315 = .bss:0x0000019C; // type:object size:0x1 scope:local align:1 data:byte saddleRight$8756 = .bss:0x000001A0; // type:object size:0xC scope:local @8813 = .bss:0x000001AC; // type:object size:0xC scope:local +init$6374 = .bss:0x000001B8; // type:object size:0x1 scope:local align:1 data:byte localCenterPos$8812 = .bss:0x000001BC; // type:object size:0xC scope:local @8817 = .bss:0x000001C8; // type:object size:0xC scope:local +init$6378 = .bss:0x000001D4; // type:object size:0x1 scope:local align:1 data:byte localFrontPos$8816 = .bss:0x000001D8; // type:object size:0xC scope:local @8821 = .bss:0x000001E4; // type:object size:0xC scope:local +init$6382 = .bss:0x000001F0; // type:object size:0x1 scope:local align:1 data:byte localBackPos$8820 = .bss:0x000001F4; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000200; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000204; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_hozelda/splits.txt b/config/GZ2J01/rels/d_a_hozelda/splits.txt index 498dcf3971..b283de947d 100644 --- a/config/GZ2J01/rels/d_a_hozelda/splits.txt +++ b/config/GZ2J01/rels/d_a_hozelda/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_hozelda.cpp: .text start:0x00000078 end:0x00003014 .rodata start:0x00000000 end:0x000000C8 .data start:0x00000000 end:0x00000108 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2J01/rels/d_a_kago/splits.txt b/config/GZ2J01/rels/d_a_kago/splits.txt index 60a4519ae8..187e17317b 100644 --- a/config/GZ2J01/rels/d_a_kago/splits.txt +++ b/config/GZ2J01/rels/d_a_kago/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kago.cpp: diff --git a/config/GZ2J01/rels/d_a_kago/symbols.txt b/config/GZ2J01/rels/d_a_kago/symbols.txt index 0b84959ecd..ac2d8c9f12 100644 --- a/config/GZ2J01/rels/d_a_kago/symbols.txt +++ b/config/GZ2J01/rels/d_a_kago/symbols.txt @@ -246,6 +246,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001D8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001FC; // type:object size:0xC scope:global __vt__12daKago_HIO_c = .data:0x00000208; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_265_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3924 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x5C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_kytag03/symbols.txt b/config/GZ2J01/rels/d_a_kytag03/symbols.txt index 9d5a0f354c..ebdf5d367c 100644 --- a/config/GZ2J01/rels/d_a_kytag03/symbols.txt +++ b/config/GZ2J01/rels/d_a_kytag03/symbols.txt @@ -60,4 +60,4 @@ l_daKytag03_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_KYTAG03 = .data:0x00000020; // type:object size:0x30 scope:global __vt__8cM3dGLin = .data:0x00000050; // type:object size:0xC scope:global S_ang_y_work$4270 = .bss:0x00000000; // type:object size:0x2 scope:local -lbl_268_bss_2 = .bss:0x00000002; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000002; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_kytag06/splits.txt b/config/GZ2J01/rels/d_a_kytag06/splits.txt index e9f6e13722..dcf1d65e9f 100644 --- a/config/GZ2J01/rels/d_a_kytag06/splits.txt +++ b/config/GZ2J01/rels/d_a_kytag06/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kytag06.cpp: diff --git a/config/GZ2J01/rels/d_a_kytag06/symbols.txt b/config/GZ2J01/rels/d_a_kytag06/symbols.txt index e1134cee2d..ecf2786249 100644 --- a/config/GZ2J01/rels/d_a_kytag06/symbols.txt +++ b/config/GZ2J01/rels/d_a_kytag06/symbols.txt @@ -103,7 +103,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000118; // type:object size:0x10 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_269_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double S_time_table$3766 = .data:0x00000020; // type:object size:0x20 scope:local S_wether_table$3767 = .data:0x00000040; // type:object size:0x8 scope:local S_wether_mode_pat01$3768 = .data:0x00000048; // type:object size:0x4 scope:local diff --git a/config/GZ2J01/rels/d_a_mant/symbols.txt b/config/GZ2J01/rels/d_a_mant/symbols.txt index 66a0159ff7..dff1763162 100644 --- a/config/GZ2J01/rels/d_a_mant/symbols.txt +++ b/config/GZ2J01/rels/d_a_mant/symbols.txt @@ -68,7 +68,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4539 = .rodata:0x000000D0; // type:object size:0x4 scope:local data:string cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_277_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_Egnd_mantTEX = .data:0x00000020; // type:object size:0x4000 scope:global l_Egnd_mantTEX_U = .data:0x00004020; // type:object size:0x4000 scope:global data:byte l_Egnd_mantPAL = .data:0x00008020; // type:object size:0x60 scope:global diff --git a/config/GZ2J01/rels/d_a_mg_fish/splits.txt b/config/GZ2J01/rels/d_a_mg_fish/splits.txt index 1aad3eae82..ba17f4658e 100644 --- a/config/GZ2J01/rels/d_a_mg_fish/splits.txt +++ b/config/GZ2J01/rels/d_a_mg_fish/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_mg_fish.cpp: diff --git a/config/GZ2J01/rels/d_a_mg_fish/symbols.txt b/config/GZ2J01/rels/d_a_mg_fish/symbols.txt index 5f70f29dbc..d225b68e20 100644 --- a/config/GZ2J01/rels/d_a_mg_fish/symbols.txt +++ b/config/GZ2J01/rels/d_a_mg_fish/symbols.txt @@ -253,7 +253,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000002D0; // type:object size:0x6A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_78_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double check_kind = .data:0x00000020; // type:object size:0x8 scope:global vib_p$3694 = .data:0x00000028; // type:object size:0x10 scope:local learn_d$3913 = .data:0x00000038; // type:object size:0x5 scope:local @@ -303,11 +304,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_78_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte +lit_1008 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +lit_1007 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3674 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte s_fish_ct = .bss:0x00000070; // type:object size:0x4 scope:global data:4byte @7455 = .bss:0x00000074; // type:object size:0xC scope:local +init$0000 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 data:byte @7458 = .bss:0x00000084; // type:object size:0xC scope:local @7459 = .bss:0x00000090; // type:object size:0xC scope:local @7460 = .bss:0x0000009C; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_mg_fshop/splits.txt b/config/GZ2J01/rels/d_a_mg_fshop/splits.txt index 31483228cd..c6928269be 100644 --- a/config/GZ2J01/rels/d_a_mg_fshop/splits.txt +++ b/config/GZ2J01/rels/d_a_mg_fshop/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_mg_fshop.cpp: diff --git a/config/GZ2J01/rels/d_a_mg_fshop/symbols.txt b/config/GZ2J01/rels/d_a_mg_fshop/symbols.txt index 8280dbb141..e2a59c6d42 100644 --- a/config/GZ2J01/rels/d_a_mg_fshop/symbols.txt +++ b/config/GZ2J01/rels/d_a_mg_fshop/symbols.txt @@ -156,7 +156,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001DC; // type:object size:0x6 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_278_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double koro2_map_LV1 = .data:0x00000020; // type:object size:0x87 scope:global koro2_map_LV2 = .data:0x000000A8; // type:object size:0x87 scope:global koro2_map_LV3 = .data:0x00000130; // type:object size:0x87 scope:global @@ -223,7 +224,7 @@ ArcIX_A_crcurve_a_model = .bss:0x00000100; // type:object size:0x40 scope:global ArcIX_A_crcurve_b_model = .bss:0x00000140; // type:object size:0x10 scope:global ArcIX_A_crsaka_model = .bss:0x00000150; // type:object size:0x20 scope:global old_stick_x$4410 = .bss:0x00000170; // type:object size:0x4 scope:local align:4 data:float -lbl_278_bss_174 = .bss:0x00000174; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000174; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000178; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000017C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000180; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_mg_rod/splits.txt b/config/GZ2J01/rels/d_a_mg_rod/splits.txt index 394a33fa23..5554500b0a 100644 --- a/config/GZ2J01/rels/d_a_mg_rod/splits.txt +++ b/config/GZ2J01/rels/d_a_mg_rod/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_mg_rod.cpp: diff --git a/config/GZ2J01/rels/d_a_mg_rod/symbols.txt b/config/GZ2J01/rels/d_a_mg_rod/symbols.txt index c2ade85265..f0913c830a 100644 --- a/config/GZ2J01/rels/d_a_mg_rod/symbols.txt +++ b/config/GZ2J01/rels/d_a_mg_rod/symbols.txt @@ -108,7 +108,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3879 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3879 = .rodata:0x00000000; // type:object size:0xC scope:local @4285 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @4286 = .rodata:0x00000010; // type:object size:0x4 scope:local @4287 = .rodata:0x00000014; // type:object size:0x4 scope:local data:string @@ -296,7 +296,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_50_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double check_kind = .data:0x00000020; // type:object size:0x8 scope:global l_color$4439 = .data:0x00000028; // type:object size:0x4 scope:local l_color$4445 = .data:0x0000002C; // type:object size:0x4 scope:local @@ -363,22 +364,22 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local henna = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte data_804BBBD4 = .bss:0x0000004C; // type:object size:0x1 data:byte -hio_set = .bss:0x0000004D; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004D; // type:object size:0x1 scope:local align:1 data:byte @4280 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x28 scope:global data:byte @4921 = .bss:0x00000084; // type:object size:0xC scope:local old_line_pos = .bss:0x00000090; // type:object size:0x4B0 scope:global @5446 = .bss:0x00000540; // type:object size:0xC scope:local -init$5447 = .bss:0x0000054C; // type:object size:0x1 scope:local data:byte +init$5447 = .bss:0x0000054C; // type:object size:0x1 scope:local align:1 data:byte sc$5445 = .bss:0x00000550; // type:object size:0xC scope:local @8906 = .bss:0x0000055C; // type:object size:0xC scope:local -init$8907 = .bss:0x00000568; // type:object size:0x1 scope:local data:byte +init$8907 = .bss:0x00000568; // type:object size:0x1 scope:local align:1 data:byte @8909 = .bss:0x0000056C; // type:object size:0xC scope:local sp_pos$8905 = .bss:0x00000578; // type:object size:0x18 scope:local old_stick_x$9448 = .bss:0x00000590; // type:object size:0x4 scope:local -init$9449 = .bss:0x00000594; // type:object size:0x1 scope:local data:byte +init$9449 = .bss:0x00000594; // type:object size:0x1 scope:local align:1 data:byte old_stick_sx$9451 = .bss:0x00000598; // type:object size:0x4 scope:local -init$9452 = .bss:0x0000059C; // type:object size:0x1 scope:local data:byte +init$9452 = .bss:0x0000059C; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000005A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000005A4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000005A8; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_myna/splits.txt b/config/GZ2J01/rels/d_a_myna/splits.txt index c0186af5c6..a8a798c952 100644 --- a/config/GZ2J01/rels/d_a_myna/splits.txt +++ b/config/GZ2J01/rels/d_a_myna/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_myna.cpp: diff --git a/config/GZ2J01/rels/d_a_myna/symbols.txt b/config/GZ2J01/rels/d_a_myna/symbols.txt index 8131aebaf9..38aa0c366b 100644 --- a/config/GZ2J01/rels/d_a_myna/symbols.txt +++ b/config/GZ2J01/rels/d_a_myna/symbols.txt @@ -138,7 +138,8 @@ mCcDSph__8daMyna_c = .rodata:0x00000000; // type:object size:0x40 scope:global @stringBase0 = .rodata:0x0000009C; // type:object size:0x112 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_281_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3800 = .data:0x00000020; // type:object size:0xC scope:local @3801 = .data:0x0000002C; // type:object size:0xC scope:local @3802 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_nbomb/splits.txt b/config/GZ2J01/rels/d_a_nbomb/splits.txt index 2629644480..320058d8d3 100644 --- a/config/GZ2J01/rels/d_a_nbomb/splits.txt +++ b/config/GZ2J01/rels/d_a_nbomb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_nbomb.cpp: diff --git a/config/GZ2J01/rels/d_a_nbomb/symbols.txt b/config/GZ2J01/rels/d_a_nbomb/symbols.txt index f873820527..2bcd278d60 100644 --- a/config/GZ2J01/rels/d_a_nbomb/symbols.txt +++ b/config/GZ2J01/rels/d_a_nbomb/symbols.txt @@ -64,7 +64,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3767 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3767 = .rodata:0x00000000; // type:object size:0xC scope:local l_localCenterOffset = .rodata:0x0000000C; // type:object size:0xC scope:global l_arcNameBombF = .rodata:0x00000018; // type:object size:0x6 scope:global data:string l_arcNameBombE = .rodata:0x00000020; // type:object size:0x5 scope:global data:string @@ -174,6 +174,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @5069 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte effectScale$5068 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_ni/splits.txt b/config/GZ2J01/rels/d_a_ni/splits.txt index 3886f5dde4..049eb272ce 100644 --- a/config/GZ2J01/rels/d_a_ni/splits.txt +++ b/config/GZ2J01/rels/d_a_ni/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_ni.cpp: diff --git a/config/GZ2J01/rels/d_a_ni/symbols.txt b/config/GZ2J01/rels/d_a_ni/symbols.txt index 15ebef8e5b..6fb5386928 100644 --- a/config/GZ2J01/rels/d_a_ni/symbols.txt +++ b/config/GZ2J01/rels/d_a_ni/symbols.txt @@ -137,7 +137,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000015C; // type:object size:0x13 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_282_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double hane_id$3986 = .data:0x00000020; // type:object size:0x8 scope:local @5125 = .data:0x00000028; // type:object size:0x7C scope:local j_w$5390 = .data:0x000000A4; // type:object size:0x10 scope:local @@ -174,11 +175,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_282_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +data_8095158d = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3953 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global data:byte -target_info = .bss:0x00000090; // type:object size:0x28 scope:global -target_info_count = .bss:0x000000B8; // type:object size:0x4 scope:global data:4byte +l_HIO = .bss:0x00000054; // type:object size:0x3C scope:local data:byte +target_info = .bss:0x00000090; // type:object size:0x28 scope:local +target_info_count = .bss:0x000000B8; // type:object size:0x4 scope:local data:4byte @5415 = .bss:0x000000BC; // type:object size:0xC scope:local sc$5414 = .bss:0x000000CC; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000D8; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_aru/splits.txt b/config/GZ2J01/rels/d_a_npc_aru/splits.txt index d1b15daa93..9176d9c9a3 100644 --- a/config/GZ2J01/rels/d_a_npc_aru/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_aru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_aru.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_aru/symbols.txt b/config/GZ2J01/rels/d_a_npc_aru/symbols.txt index 654cc5e9e2..9fcaa7bdaa 100644 --- a/config/GZ2J01/rels/d_a_npc_aru/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_aru/symbols.txt @@ -161,7 +161,8 @@ heapSize$4024 = .rodata:0x000000A0; // type:object size:0x18 scope:local @stringBase0 = .rodata:0x0000014C; // type:object size:0xCC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_283_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x60 scope:global l_resNameList = .data:0x00000088; // type:object size:0xC scope:global diff --git a/config/GZ2J01/rels/d_a_npc_ash/splits.txt b/config/GZ2J01/rels/d_a_npc_ash/splits.txt index 3d076d9682..5a51cf1673 100644 --- a/config/GZ2J01/rels/d_a_npc_ash/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_ash/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ash.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_ash/symbols.txt b/config/GZ2J01/rels/d_a_npc_ash/symbols.txt index 9f6f16612e..69dd300282 100644 --- a/config/GZ2J01/rels/d_a_npc_ash/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_ash/symbols.txt @@ -163,7 +163,8 @@ m__16daNpcAsh_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:globa @stringBase0 = .rodata:0x000002D0; // type:object size:0x7F scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_284_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xD8 scope:global l_btpGetParamList = .data:0x000000F8; // type:object size:0xC scope:global l_btkGetParamList = .data:0x00000104; // type:object size:0xC scope:global diff --git a/config/GZ2J01/rels/d_a_npc_ashB/splits.txt b/config/GZ2J01/rels/d_a_npc_ashB/splits.txt index b3323a0527..2e9e1fdfd6 100644 --- a/config/GZ2J01/rels/d_a_npc_ashB/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_ashB/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ashB.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_ashB/symbols.txt b/config/GZ2J01/rels/d_a_npc_ashB/symbols.txt index e7a919025d..14ccacb080 100644 --- a/config/GZ2J01/rels/d_a_npc_ashB/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_ashB/symbols.txt @@ -151,7 +151,8 @@ m__17daNpcAshB_Param_c = .rodata:0x00000000; // type:object size:0x70 scope:glob @stringBase0 = .rodata:0x00000304; // type:object size:0x2D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_285_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xFC scope:global l_btpGetParamList = .data:0x0000011C; // type:object size:0x30 scope:global l_btkGetParamList = .data:0x0000014C; // type:object size:0x30 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_bans/splits.txt b/config/GZ2J01/rels/d_a_npc_bans/splits.txt index 409489c74c..ba8af2b74e 100644 --- a/config/GZ2J01/rels/d_a_npc_bans/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_bans/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bans.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_bans/symbols.txt b/config/GZ2J01/rels/d_a_npc_bans/symbols.txt index 90c3fb683a..df6d34ff4b 100644 --- a/config/GZ2J01/rels/d_a_npc_bans/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_bans/symbols.txt @@ -156,7 +156,8 @@ id$5349 = .rodata:0x00000138; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x0000014C; // type:object size:0x94 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_286_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global data:4byte l_evtList = .data:0x00000040; // type:object size:0x48 scope:global l_resNameList = .data:0x00000088; // type:object size:0x18 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_besu/splits.txt b/config/GZ2J01/rels/d_a_npc_besu/splits.txt index 81d7a73a58..039e493173 100644 --- a/config/GZ2J01/rels/d_a_npc_besu/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_besu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_besu.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_besu/symbols.txt b/config/GZ2J01/rels/d_a_npc_besu/symbols.txt index 2e27a981f6..532e52a445 100644 --- a/config/GZ2J01/rels/d_a_npc_besu/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_besu/symbols.txt @@ -170,7 +170,8 @@ jointNo$5355 = .rodata:0x00000174; // type:object size:0x4 scope:local data:4byt @stringBase0 = .rodata:0x000001B4; // type:object size:0x252 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_79_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x30 scope:global data:4byte l_evtList = .data:0x00000050; // type:object size:0x68 scope:global l_resNameList = .data:0x000000B8; // type:object size:0x30 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_blue_ns/splits.txt b/config/GZ2J01/rels/d_a_npc_blue_ns/splits.txt index 4851562802..443044817f 100644 --- a/config/GZ2J01/rels/d_a_npc_blue_ns/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_blue_ns/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_blue_ns.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_blue_ns/symbols.txt b/config/GZ2J01/rels/d_a_npc_blue_ns/symbols.txt index 3f30aa77c0..0f55d62e0b 100644 --- a/config/GZ2J01/rels/d_a_npc_blue_ns/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_blue_ns/symbols.txt @@ -150,7 +150,8 @@ ptclOffsetY$5218 = .rodata:0x00000220; // type:object size:0xC scope:local @stringBase0 = .rodata:0x0000022C; // type:object size:0x51 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_287_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x6C scope:global l_arcNames = .data:0x0000008C; // type:object size:0x4 scope:global data:4byte l_evtNames = .data:0x00000090; // type:object size:0x1C scope:global diff --git a/config/GZ2J01/rels/d_a_npc_bou/splits.txt b/config/GZ2J01/rels/d_a_npc_bou/splits.txt index a6fb5dd13c..3573b6f10f 100644 --- a/config/GZ2J01/rels/d_a_npc_bou/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_bou/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bou.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_bou/symbols.txt b/config/GZ2J01/rels/d_a_npc_bou/symbols.txt index e4aaf0cb6b..d0d6f62c3d 100644 --- a/config/GZ2J01/rels/d_a_npc_bou/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_bou/symbols.txt @@ -144,7 +144,8 @@ heapSize$4096 = .rodata:0x0000009C; // type:object size:0x18 scope:local @stringBase0 = .rodata:0x0000013C; // type:object size:0xF1 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_288_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x58 scope:global l_resNameList = .data:0x00000080; // type:object size:0x1C scope:global diff --git a/config/GZ2J01/rels/d_a_npc_bouS/splits.txt b/config/GZ2J01/rels/d_a_npc_bouS/splits.txt index 9469997a33..bb08fe9cd1 100644 --- a/config/GZ2J01/rels/d_a_npc_bouS/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_bouS/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bouS.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_bouS/symbols.txt b/config/GZ2J01/rels/d_a_npc_bouS/symbols.txt index 5a58300cfc..2fe6c1237a 100644 --- a/config/GZ2J01/rels/d_a_npc_bouS/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_bouS/symbols.txt @@ -162,7 +162,8 @@ m__17daNpcBouS_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob @stringBase0 = .rodata:0x00000348; // type:object size:0x4C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_289_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x114 scope:global l_btpGetParamList = .data:0x00000134; // type:object size:0x3C scope:global l_btkGetParamList = .data:0x00000170; // type:object size:0xC scope:global data:4byte @@ -248,5 +249,5 @@ sInstance__32JASGlobalInstance<11Z2FxLineMgr> = .bss:0x000000D0; // type:object sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .bss:0x000000D4; // type:object size:0x4 scope:global sInstance__32JASGlobalInstance<11Z2SpeechMgr> = .bss:0x000000D8; // type:object size:0x4 scope:global sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .bss:0x000000DC; // type:object size:0x4 scope:global -lbl_289_bss_E0 = .bss:0x000000E0; // type:object size:0x1 data:byte +init$localstatic4$setAttnPos__11daNpcBouS_cFv = .bss:0x000000E0; // type:object size:0x1 data:byte eyeOffset$localstatic3$setAttnPos__11daNpcBouS_cFv = .bss:0x000000E4; // type:object size:0xC scope:local align:4 data:float diff --git a/config/GZ2J01/rels/d_a_npc_cdn3/symbols.txt b/config/GZ2J01/rels/d_a_npc_cdn3/symbols.txt index 4b2a2a5ca3..ae903985b1 100644 --- a/config/GZ2J01/rels/d_a_npc_cdn3/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_cdn3/symbols.txt @@ -121,7 +121,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000006C; // type:object size:0xFC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_290_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3940 = .data:0x00000020; // type:object size:0xC scope:local @3941 = .data:0x0000002C; // type:object size:0xC scope:local @3942 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_npc_chat/splits.txt b/config/GZ2J01/rels/d_a_npc_chat/splits.txt index eac5f9fb3a..27a480b479 100644 --- a/config/GZ2J01/rels/d_a_npc_chat/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_chat/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_chat.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_chat/symbols.txt b/config/GZ2J01/rels/d_a_npc_chat/symbols.txt index 7b345bdb70..b1375b9d83 100644 --- a/config/GZ2J01/rels/d_a_npc_chat/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_chat/symbols.txt @@ -289,7 +289,8 @@ a_jntNumTbl$5570 = .rodata:0x000005C8; // type:object size:0x68 scope:local @stringBase0 = .rodata:0x00000DA4; // type:object size:0x219 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_291_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameTbl = .data:0x00000020; // type:object size:0x78 scope:global l_bmdTbl = .data:0x00000098; // type:object size:0xF0 scope:global data:4byte l_bmdTWTbl = .data:0x00000188; // type:object size:0xF0 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_chin/splits.txt b/config/GZ2J01/rels/d_a_npc_chin/splits.txt index 6879f55230..940f849f8e 100644 --- a/config/GZ2J01/rels/d_a_npc_chin/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_chin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_chin.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_chin/symbols.txt b/config/GZ2J01/rels/d_a_npc_chin/symbols.txt index f266c67a55..9d57f37bdf 100644 --- a/config/GZ2J01/rels/d_a_npc_chin/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_chin/symbols.txt @@ -224,7 +224,8 @@ m__17daNpcChin_Param_c = .rodata:0x00000014; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x00000448; // type:object size:0x9A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_292_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x18C scope:global l_btpGetParamList = .data:0x000001AC; // type:object size:0xB4 scope:global l_btkGetParamList = .data:0x00000260; // type:object size:0x6C scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_clerka/splits.txt b/config/GZ2J01/rels/d_a_npc_clerka/splits.txt index 8a24e56b31..4c215a3cb0 100644 --- a/config/GZ2J01/rels/d_a_npc_clerka/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_clerka/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerka.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_clerka/symbols.txt b/config/GZ2J01/rels/d_a_npc_clerka/symbols.txt index c81114a07f..f6b677e954 100644 --- a/config/GZ2J01/rels/d_a_npc_clerka/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_clerka/symbols.txt @@ -134,7 +134,8 @@ m__20daNpc_clerkA_Param_c = .rodata:0x00000000; // type:object size:0x90 scope:g @stringBase0 = .rodata:0x00000100; // type:object size:0x24 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_293_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_clerkb/splits.txt b/config/GZ2J01/rels/d_a_npc_clerkb/splits.txt index bf1e54d934..3275bd53cb 100644 --- a/config/GZ2J01/rels/d_a_npc_clerkb/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_clerkb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerkb.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_clerkb/symbols.txt b/config/GZ2J01/rels/d_a_npc_clerkb/symbols.txt index c884f2c304..c76d267afb 100644 --- a/config/GZ2J01/rels/d_a_npc_clerkb/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_clerkb/symbols.txt @@ -137,7 +137,8 @@ m__20daNpc_clerkB_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:g @stringBase0 = .rodata:0x00000114; // type:object size:0x24 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_294_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_clerkt/splits.txt b/config/GZ2J01/rels/d_a_npc_clerkt/splits.txt index 6cfa914495..62e30d2ada 100644 --- a/config/GZ2J01/rels/d_a_npc_clerkt/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_clerkt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerkt.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_clerkt/symbols.txt b/config/GZ2J01/rels/d_a_npc_clerkt/symbols.txt index 6670c1b696..6f780f8d1e 100644 --- a/config/GZ2J01/rels/d_a_npc_clerkt/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_clerkt/symbols.txt @@ -130,7 +130,8 @@ m__19daNpcClerkt_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x000000F8; // type:object size:0x1C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_295_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_df/splits.txt b/config/GZ2J01/rels/d_a_npc_df/splits.txt index 4a1bc8869c..361302ea7c 100644 --- a/config/GZ2J01/rels/d_a_npc_df/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_df/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_df.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_doc/splits.txt b/config/GZ2J01/rels/d_a_npc_doc/splits.txt index faec1c0187..705d650271 100644 --- a/config/GZ2J01/rels/d_a_npc_doc/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_doc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_doc.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_doc/symbols.txt b/config/GZ2J01/rels/d_a_npc_doc/symbols.txt index 1247872390..5b5b5cfc49 100644 --- a/config/GZ2J01/rels/d_a_npc_doc/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_doc/symbols.txt @@ -128,7 +128,8 @@ heapSize$3968 = .rodata:0x00000090; // type:object size:0xC scope:local @stringBase0 = .rodata:0x0000010C; // type:object size:0x16 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_298_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0xC scope:global diff --git a/config/GZ2J01/rels/d_a_npc_doorboy/splits.txt b/config/GZ2J01/rels/d_a_npc_doorboy/splits.txt index 17f7c28a81..77332a5fd2 100644 --- a/config/GZ2J01/rels/d_a_npc_doorboy/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_doorboy/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_doorboy.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_doorboy/symbols.txt b/config/GZ2J01/rels/d_a_npc_doorboy/symbols.txt index 5b62d5015e..73909606ae 100644 --- a/config/GZ2J01/rels/d_a_npc_doorboy/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_doorboy/symbols.txt @@ -98,7 +98,8 @@ m__20daNpcDoorBoy_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:g @stringBase0 = .rodata:0x0000015C; // type:object size:0x21 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_299_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x48 scope:global l_btpGetParamList = .data:0x00000068; // type:object size:0xC scope:global l_arcNames = .data:0x00000074; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_drainSol/splits.txt b/config/GZ2J01/rels/d_a_npc_drainSol/splits.txt index 2cf697f780..3bb08a07cc 100644 --- a/config/GZ2J01/rels/d_a_npc_drainSol/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_drainSol/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_drainSol.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_du/splits.txt b/config/GZ2J01/rels/d_a_npc_du/splits.txt index 28773a55db..cb4a20abd8 100644 --- a/config/GZ2J01/rels/d_a_npc_du/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_du/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_du.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_du/symbols.txt b/config/GZ2J01/rels/d_a_npc_du/symbols.txt index fc428c5a35..1c2324cbb6 100644 --- a/config/GZ2J01/rels/d_a_npc_du/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_du/symbols.txt @@ -78,6 +78,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000B8; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000000DC; // type:object size:0xC scope:global __vt__14daNpc_Du_HIO_c = .data:0x000000E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_301_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_npc_fairy/splits.txt b/config/GZ2J01/rels/d_a_npc_fairy/splits.txt index 27fbb571b1..d20ffe84b7 100644 --- a/config/GZ2J01/rels/d_a_npc_fairy/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_fairy/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_fairy.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_fairy/symbols.txt b/config/GZ2J01/rels/d_a_npc_fairy/symbols.txt index bcae5cd3f9..373c3688e5 100644 --- a/config/GZ2J01/rels/d_a_npc_fairy/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_fairy/symbols.txt @@ -213,7 +213,8 @@ sEvtBitNo$5358 = .rodata:0x00000190; // type:object size:0xA scope:local @stringBase0 = .rodata:0x000001E8; // type:object size:0x10A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_302_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_loadResPtrn0 = .data:0x00000028; // type:object size:0x2 scope:global l_loadResPtrnList = .data:0x0000002C; // type:object size:0x14 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_fairy_seirei/splits.txt b/config/GZ2J01/rels/d_a_npc_fairy_seirei/splits.txt index 7d1251d591..53c3ab2401 100644 --- a/config/GZ2J01/rels/d_a_npc_fairy_seirei/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_fairy_seirei/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_fairy_seirei.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_fairy_seirei/symbols.txt b/config/GZ2J01/rels/d_a_npc_fairy_seirei/symbols.txt index 3a0a13217d..1a0e3f9762 100644 --- a/config/GZ2J01/rels/d_a_npc_fairy_seirei/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_fairy_seirei/symbols.txt @@ -98,7 +98,8 @@ sTempBit$4575 = .rodata:0x000000BC; // type:object size:0x10 scope:local @stringBase0 = .rodata:0x000000CC; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_80_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_evtList = .data:0x00000020; // type:object size:0x8 scope:global l_resNameList = .data:0x00000028; // type:object size:0x8 scope:global l_loadResPtrn0 = .data:0x00000030; // type:object size:0x2 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_fish/symbols.txt b/config/GZ2J01/rels/d_a_npc_fish/symbols.txt index dd9041385f..1e7f407413 100644 --- a/config/GZ2J01/rels/d_a_npc_fish/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_fish/symbols.txt @@ -20,7 +20,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000001C; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_81_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double fish_d127_S = .data:0x00000020; // type:object size:0x3D4 scope:global fish_d127 = .data:0x000003F4; // type:object size:0x460 scope:global lf_pos = .data:0x00000854; // type:object size:0x90 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_gnd/splits.txt b/config/GZ2J01/rels/d_a_npc_gnd/splits.txt index 504644c041..b136cd9de7 100644 --- a/config/GZ2J01/rels/d_a_npc_gnd/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_gnd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gnd.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_gnd/symbols.txt b/config/GZ2J01/rels/d_a_npc_gnd/symbols.txt index 2eaa50ac07..e4e2a5cacd 100644 --- a/config/GZ2J01/rels/d_a_npc_gnd/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_gnd/symbols.txt @@ -123,7 +123,8 @@ m__17daNpc_Gnd_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob @stringBase0 = .rodata:0x000000E8; // type:object size:0x11 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_304_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_gra/splits.txt b/config/GZ2J01/rels/d_a_npc_gra/splits.txt index 2ec441a606..5204f31b61 100644 --- a/config/GZ2J01/rels/d_a_npc_gra/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_gra/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gra.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_gra/symbols.txt b/config/GZ2J01/rels/d_a_npc_gra/symbols.txt index 11e14e87a7..75c54efae6 100644 --- a/config/GZ2J01/rels/d_a_npc_gra/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_gra/symbols.txt @@ -313,7 +313,8 @@ l_prticles_id$6368 = .rodata:0x00000694; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000720; // type:object size:0x15A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_305_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x28 scope:global data:4byte l_bckGetParamList = .data:0x00000048; // type:object size:0x198 scope:global l_btpGetParamList = .data:0x000001E0; // type:object size:0x80 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_grc/splits.txt b/config/GZ2J01/rels/d_a_npc_grc/splits.txt index 32077a261b..5421ecbe9c 100644 --- a/config/GZ2J01/rels/d_a_npc_grc/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_grc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grc.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_grc/symbols.txt b/config/GZ2J01/rels/d_a_npc_grc/symbols.txt index 5ac20c0f74..ee4ec723b5 100644 --- a/config/GZ2J01/rels/d_a_npc_grc/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_grc/symbols.txt @@ -145,7 +145,8 @@ m__17daNpc_grC_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x000002D4; // type:object size:0x2C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_306_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x98 scope:global l_btpGetParamList = .data:0x000000C8; // type:object size:0x30 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_grd/splits.txt b/config/GZ2J01/rels/d_a_npc_grd/splits.txt index 2ac90e7e25..49e082901e 100644 --- a/config/GZ2J01/rels/d_a_npc_grd/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_grd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grd.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_grd/symbols.txt b/config/GZ2J01/rels/d_a_npc_grd/symbols.txt index b4ed89b682..567764b26e 100644 --- a/config/GZ2J01/rels/d_a_npc_grd/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_grd/symbols.txt @@ -137,7 +137,8 @@ m__17daNpc_Grd_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x000001F0; // type:object size:0x1F scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_307_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x60 scope:global l_btpGetParamList = .data:0x00000088; // type:object size:0x20 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_grm/splits.txt b/config/GZ2J01/rels/d_a_npc_grm/splits.txt index 4a5fe1ac5f..79a9e8515b 100644 --- a/config/GZ2J01/rels/d_a_npc_grm/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_grm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grm.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_grm/symbols.txt b/config/GZ2J01/rels/d_a_npc_grm/symbols.txt index 6fd8627845..958e7f400e 100644 --- a/config/GZ2J01/rels/d_a_npc_grm/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_grm/symbols.txt @@ -121,7 +121,8 @@ m__17daNpc_grM_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob @stringBase0 = .rodata:0x000000F0; // type:object size:0x33 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_308_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0xC scope:global diff --git a/config/GZ2J01/rels/d_a_npc_grmc/splits.txt b/config/GZ2J01/rels/d_a_npc_grmc/splits.txt index 21ee0e831e..e02b25c3ce 100644 --- a/config/GZ2J01/rels/d_a_npc_grmc/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_grmc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grmc.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_grmc/symbols.txt b/config/GZ2J01/rels/d_a_npc_grmc/symbols.txt index 40bd42acac..f67d655c46 100644 --- a/config/GZ2J01/rels/d_a_npc_grmc/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_grmc/symbols.txt @@ -121,7 +121,8 @@ m__18daNpc_grMC_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000F8; // type:object size:0x22 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_309_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0xC scope:global diff --git a/config/GZ2J01/rels/d_a_npc_gro/splits.txt b/config/GZ2J01/rels/d_a_npc_gro/splits.txt index e2d96b0ebf..bace7d2e35 100644 --- a/config/GZ2J01/rels/d_a_npc_gro/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_gro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gro.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_gro/symbols.txt b/config/GZ2J01/rels/d_a_npc_gro/symbols.txt index 562918f8e2..7600db2553 100644 --- a/config/GZ2J01/rels/d_a_npc_gro/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_gro/symbols.txt @@ -168,7 +168,8 @@ heapSize$4387 = .rodata:0x0000006C; // type:object size:0x10 scope:local @stringBase0 = .rodata:0x0000033C; // type:object size:0x40 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_310_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4083 = .data:0x00000020; // type:object size:0xC scope:local l_bmdGetParamList = .data:0x0000002C; // type:object size:0x18 scope:global l_bckGetParamList = .data:0x00000044; // type:object size:0xB8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_grr/splits.txt b/config/GZ2J01/rels/d_a_npc_grr/splits.txt index ba92d3e917..037f7ff4b9 100644 --- a/config/GZ2J01/rels/d_a_npc_grr/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_grr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grr.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_grr/symbols.txt b/config/GZ2J01/rels/d_a_npc_grr/symbols.txt index 8fcbb74f27..0c9400d51e 100644 --- a/config/GZ2J01/rels/d_a_npc_grr/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_grr/symbols.txt @@ -157,7 +157,8 @@ heapSize$4308 = .rodata:0x0000006C; // type:object size:0x10 scope:local @stringBase0 = .rodata:0x000002F4; // type:object size:0x21 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_311_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x98 scope:global l_btpGetParamList = .data:0x000000C0; // type:object size:0x30 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_grs/splits.txt b/config/GZ2J01/rels/d_a_npc_grs/splits.txt index d87b3a701a..34574a7d50 100644 --- a/config/GZ2J01/rels/d_a_npc_grs/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_grs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grs.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_grs/symbols.txt b/config/GZ2J01/rels/d_a_npc_grs/symbols.txt index 4887edfe32..23cbba0596 100644 --- a/config/GZ2J01/rels/d_a_npc_grs/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_grs/symbols.txt @@ -132,7 +132,8 @@ jointNo$5517 = .rodata:0x000001B4; // type:object size:0x18 scope:local @stringBase0 = .rodata:0x000001D0; // type:object size:0x28 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_312_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x40 scope:global l_btpGetParamList = .data:0x00000070; // type:object size:0x18 scope:global @@ -187,7 +188,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4050 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4752 = .bss:0x00000058; // type:object size:0xC scope:local -init$4753 = .bss:0x00000064; // type:object size:0x1 scope:local +init$4753 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$4751 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_grz/splits.txt b/config/GZ2J01/rels/d_a_npc_grz/splits.txt index cc54401f18..c51a768db1 100644 --- a/config/GZ2J01/rels/d_a_npc_grz/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_grz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grz.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_grz/symbols.txt b/config/GZ2J01/rels/d_a_npc_grz/symbols.txt index b8b8a8a5b7..a310d813a3 100644 --- a/config/GZ2J01/rels/d_a_npc_grz/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_grz/symbols.txt @@ -229,7 +229,8 @@ l_prticles_id$6299 = .rodata:0x00000428; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000444; // type:object size:0x66 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_313_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x110 scope:global l_btpGetParamList = .data:0x00000138; // type:object size:0x50 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_guard/symbols.txt b/config/GZ2J01/rels/d_a_npc_guard/symbols.txt index 8fe330d58d..f0aca48b64 100644 --- a/config/GZ2J01/rels/d_a_npc_guard/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_guard/symbols.txt @@ -99,7 +99,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000F8; // type:object size:0x7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_314_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3824 = .data:0x00000020; // type:object size:0xC scope:local @3825 = .data:0x0000002C; // type:object size:0xC scope:local @3826 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_npc_gwolf/splits.txt b/config/GZ2J01/rels/d_a_npc_gwolf/splits.txt index 42883f6ff7..c17a45cb67 100644 --- a/config/GZ2J01/rels/d_a_npc_gwolf/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_gwolf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gwolf.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_gwolf/symbols.txt b/config/GZ2J01/rels/d_a_npc_gwolf/symbols.txt index 3f89f16189..3ccead7ccd 100644 --- a/config/GZ2J01/rels/d_a_npc_gwolf/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_gwolf/symbols.txt @@ -156,7 +156,8 @@ m__19daNpc_GWolf_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x00000228; // type:object size:0xD7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_315_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x60 scope:global l_btkGetParamList = .data:0x00000088; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_hanjo/splits.txt b/config/GZ2J01/rels/d_a_npc_hanjo/splits.txt index bc6918cd37..c736549d52 100644 --- a/config/GZ2J01/rels/d_a_npc_hanjo/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_hanjo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_hanjo.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_hanjo/symbols.txt b/config/GZ2J01/rels/d_a_npc_hanjo/symbols.txt index f3a4bc3e25..939f2a8f16 100644 --- a/config/GZ2J01/rels/d_a_npc_hanjo/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_hanjo/symbols.txt @@ -189,7 +189,8 @@ bmdTypeList$4495 = .rodata:0x00000110; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000001F8; // type:object size:0x146 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_316_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global data:4byte l_evtList = .data:0x00000040; // type:object size:0x58 scope:global data:4byte l_resNameList = .data:0x00000098; // type:object size:0x18 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_henna/splits.txt b/config/GZ2J01/rels/d_a_npc_henna/splits.txt index e6393bbd2a..1a347004d1 100644 --- a/config/GZ2J01/rels/d_a_npc_henna/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_henna/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_henna.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_henna/symbols.txt b/config/GZ2J01/rels/d_a_npc_henna/symbols.txt index 247cd65789..1666488530 100644 --- a/config/GZ2J01/rels/d_a_npc_henna/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_henna/symbols.txt @@ -270,7 +270,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000030C; // type:object size:0x16 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_82_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double check_kind = .data:0x00000020; // type:object size:0x8 scope:global data:2byte @4437 = .data:0x00000028; // type:object size:0x34 scope:local @4753 = .data:0x0000005C; // type:object size:0x30 scope:local @@ -303,7 +304,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3900 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_hoz/splits.txt b/config/GZ2J01/rels/d_a_npc_hoz/splits.txt index da0da0f2cb..9b67dfd4f1 100644 --- a/config/GZ2J01/rels/d_a_npc_hoz/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_hoz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_hoz.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_hoz/symbols.txt b/config/GZ2J01/rels/d_a_npc_hoz/symbols.txt index 4434fe3686..6e054ad27d 100644 --- a/config/GZ2J01/rels/d_a_npc_hoz/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_hoz/symbols.txt @@ -145,7 +145,8 @@ heapSize$4117 = .rodata:0x00000090; // type:object size:0x1C scope:local @stringBase0 = .rodata:0x00000114; // type:object size:0xA0 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_318_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x48 scope:global l_resNameList = .data:0x00000078; // type:object size:0x1C scope:global diff --git a/config/GZ2J01/rels/d_a_npc_impal/splits.txt b/config/GZ2J01/rels/d_a_npc_impal/splits.txt index 15d6699d8c..05a4157c3e 100644 --- a/config/GZ2J01/rels/d_a_npc_impal/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_impal/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_impal.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_impal/symbols.txt b/config/GZ2J01/rels/d_a_npc_impal/symbols.txt index a3da253e30..9bd4619723 100644 --- a/config/GZ2J01/rels/d_a_npc_impal/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_impal/symbols.txt @@ -142,7 +142,8 @@ m__18daNpcImpal_Param_c = .rodata:0x00000000; // type:object size:0x70 scope:glo @stringBase0 = .rodata:0x00000258; // type:object size:0x5C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_319_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xD8 scope:global l_btpGetParamList = .data:0x000000F8; // type:object size:0x78 scope:global l_btkGetParamList = .data:0x00000170; // type:object size:0x30 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_ins/splits.txt b/config/GZ2J01/rels/d_a_npc_ins/splits.txt index e7e21d357f..2d98d7204d 100644 --- a/config/GZ2J01/rels/d_a_npc_ins/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_ins/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ins.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_ins/symbols.txt b/config/GZ2J01/rels/d_a_npc_ins/symbols.txt index 47987a2078..5bf375c28d 100644 --- a/config/GZ2J01/rels/d_a_npc_ins/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_ins/symbols.txt @@ -169,7 +169,8 @@ m__16daNpcIns_Param_c = .rodata:0x000000C0; // type:object size:0x70 scope:globa @stringBase0 = .rodata:0x000003BC; // type:object size:0x32 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_321_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x120 scope:global l_btpGetParamList = .data:0x00000140; // type:object size:0x60 scope:global l_btkGetParamList = .data:0x000001A0; // type:object size:0x18 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_jagar/splits.txt b/config/GZ2J01/rels/d_a_npc_jagar/splits.txt index 5de90e7bb2..8b9a2c5f73 100644 --- a/config/GZ2J01/rels/d_a_npc_jagar/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_jagar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_jagar.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_jagar/symbols.txt b/config/GZ2J01/rels/d_a_npc_jagar/symbols.txt index decfb15385..9533bfb6f9 100644 --- a/config/GZ2J01/rels/d_a_npc_jagar/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_jagar/symbols.txt @@ -155,7 +155,8 @@ heapSize$4099 = .rodata:0x000000A0; // type:object size:0x10 scope:local @stringBase0 = .rodata:0x0000016C; // type:object size:0xAA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_322_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x48 scope:global l_resNameList = .data:0x00000070; // type:object size:0x14 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_kakashi/splits.txt b/config/GZ2J01/rels/d_a_npc_kakashi/splits.txt index 0ce59dbfc3..e27d65f5d1 100644 --- a/config/GZ2J01/rels/d_a_npc_kakashi/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_kakashi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kakashi.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_kakashi/symbols.txt b/config/GZ2J01/rels/d_a_npc_kakashi/symbols.txt index 8c037c50d2..076146cf41 100644 --- a/config/GZ2J01/rels/d_a_npc_kakashi/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_kakashi/symbols.txt @@ -128,7 +128,8 @@ id$5174 = .rodata:0x00000108; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000010C; // type:object size:0x1CA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_83_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte l_evtList = .data:0x00000038; // type:object size:0xA8 scope:global l_resNameList = .data:0x000000E0; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_kasi_hana/splits.txt b/config/GZ2J01/rels/d_a_npc_kasi_hana/splits.txt index e8b02ace71..f69d6af5fa 100644 --- a/config/GZ2J01/rels/d_a_npc_kasi_hana/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_kasi_hana/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_hana.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_kasi_hana/symbols.txt b/config/GZ2J01/rels/d_a_npc_kasi_hana/symbols.txt index e00b263efb..51a23a67bc 100644 --- a/config/GZ2J01/rels/d_a_npc_kasi_hana/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_kasi_hana/symbols.txt @@ -196,7 +196,8 @@ m__21daNpcKasiHana_Param_c = .rodata:0x00000048; // type:object size:0x7C scope: @stringBase0 = .rodata:0x000002D8; // type:object size:0x79 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_323_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xB4 scope:global l_btpGetParamList = .data:0x000000D4; // type:object size:0xC scope:global l_arcNames = .data:0x000000E0; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_kasi_kyu/splits.txt b/config/GZ2J01/rels/d_a_npc_kasi_kyu/splits.txt index b92316ec8d..220ccfb44c 100644 --- a/config/GZ2J01/rels/d_a_npc_kasi_kyu/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_kasi_kyu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_kyu.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_kasi_kyu/symbols.txt b/config/GZ2J01/rels/d_a_npc_kasi_kyu/symbols.txt index fdaa973a5f..69f189d22e 100644 --- a/config/GZ2J01/rels/d_a_npc_kasi_kyu/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_kasi_kyu/symbols.txt @@ -152,7 +152,8 @@ m__20daNpcKasiKyu_Param_c = .rodata:0x00000000; // type:object size:0x74 scope:g @stringBase0 = .rodata:0x00000254; // type:object size:0x18 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_324_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xC0 scope:global l_btpGetParamList = .data:0x000000E0; // type:object size:0xC scope:global l_arcNames = .data:0x000000EC; // type:object size:0xC scope:global data:4byte @@ -233,7 +234,7 @@ l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte mTargetTag__14daNpcKasiKyu_c = .bss:0x00000058; // type:object size:0x4 scope:global data:4byte mTargetTagDist__14daNpcKasiKyu_c = .bss:0x0000005C; // type:object size:0x4 scope:global mWolfAngle__14daNpcKasiKyu_c = .bss:0x00000060; // type:object size:0x2 scope:global data:2byte -lbl_324_bss_62 = .bss:0x00000062; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000062; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000006C; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_kasi_mich/splits.txt b/config/GZ2J01/rels/d_a_npc_kasi_mich/splits.txt index caef80f2c4..3d9458405b 100644 --- a/config/GZ2J01/rels/d_a_npc_kasi_mich/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_kasi_mich/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_mich.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_kasi_mich/symbols.txt b/config/GZ2J01/rels/d_a_npc_kasi_mich/symbols.txt index d80ee64131..f5be599a9e 100644 --- a/config/GZ2J01/rels/d_a_npc_kasi_mich/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_kasi_mich/symbols.txt @@ -150,7 +150,8 @@ m__21daNpcKasiMich_Param_c = .rodata:0x00000000; // type:object size:0x74 scope: @stringBase0 = .rodata:0x0000024C; // type:object size:0x19 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_325_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xC0 scope:global l_btpGetParamList = .data:0x000000E0; // type:object size:0xC scope:global l_arcNames = .data:0x000000EC; // type:object size:0xC scope:global data:4byte @@ -231,7 +232,7 @@ l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte mTargetTag__15daNpcKasiMich_c = .bss:0x00000058; // type:object size:0x4 scope:global data:4byte mTargetTagDist__15daNpcKasiMich_c = .bss:0x0000005C; // type:object size:0x4 scope:global mWolfAngle__15daNpcKasiMich_c = .bss:0x00000060; // type:object size:0x2 scope:global data:2byte -lbl_325_bss_62 = .bss:0x00000062; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000062; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000006C; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_kkri/splits.txt b/config/GZ2J01/rels/d_a_npc_kkri/splits.txt index 62166bee72..bdea450be0 100644 --- a/config/GZ2J01/rels/d_a_npc_kkri/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_kkri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kkri.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_kkri/symbols.txt b/config/GZ2J01/rels/d_a_npc_kkri/symbols.txt index a1fcd9d1ac..a81825a60f 100644 --- a/config/GZ2J01/rels/d_a_npc_kkri/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_kkri/symbols.txt @@ -140,7 +140,8 @@ heapSize$4005 = .rodata:0x0000008C; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000114; // type:object size:0x54 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_84_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x28 scope:global l_resNameList = .data:0x00000058; // type:object size:0xC scope:global diff --git a/config/GZ2J01/rels/d_a_npc_kn/splits.txt b/config/GZ2J01/rels/d_a_npc_kn/splits.txt index a970c3d3d4..7acb87c62b 100644 --- a/config/GZ2J01/rels/d_a_npc_kn/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_kn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kn.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_kn/symbols.txt b/config/GZ2J01/rels/d_a_npc_kn/symbols.txt index c5a18b385a..ed331890b6 100644 --- a/config/GZ2J01/rels/d_a_npc_kn/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_kn/symbols.txt @@ -299,7 +299,8 @@ heapSize$6094 = .rodata:0x0000015C; // type:object size:0x20 scope:local @stringBase0 = .rodata:0x00000230; // type:object size:0x239 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_327_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daNpc_Kn_c = .data:0x00000020; // type:object size:0x44 scope:global mCcDSph__10daNpc_Kn_c = .data:0x00000064; // type:object size:0x40 scope:global l_bmdData = .data:0x000000A4; // type:object size:0x18 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_knj/splits.txt b/config/GZ2J01/rels/d_a_npc_knj/splits.txt index 62eac259b2..9344b72d55 100644 --- a/config/GZ2J01/rels/d_a_npc_knj/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_knj/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_knj.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_knj/symbols.txt b/config/GZ2J01/rels/d_a_npc_knj/symbols.txt index 5aed0ea98a..f34ade164a 100644 --- a/config/GZ2J01/rels/d_a_npc_knj/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_knj/symbols.txt @@ -94,7 +94,8 @@ m__17daNpc_Knj_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob @stringBase0 = .rodata:0x000000AC; // type:object size:0x11 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_328_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_kolin/splits.txt b/config/GZ2J01/rels/d_a_npc_kolin/splits.txt index ce50229f88..c8f93513d6 100644 --- a/config/GZ2J01/rels/d_a_npc_kolin/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_kolin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kolin.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_kolin/symbols.txt b/config/GZ2J01/rels/d_a_npc_kolin/symbols.txt index f0c0aedbc1..7313144bae 100644 --- a/config/GZ2J01/rels/d_a_npc_kolin/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_kolin/symbols.txt @@ -173,7 +173,8 @@ jointNo$5054 = .rodata:0x00000150; // type:object size:0x4 scope:local data:4byt @stringBase0 = .rodata:0x000001C8; // type:object size:0x149 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_85_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte l_evtList = .data:0x00000038; // type:object size:0x48 scope:global l_resNameList = .data:0x00000080; // type:object size:0x20 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_kolinb/splits.txt b/config/GZ2J01/rels/d_a_npc_kolinb/splits.txt index 917e244263..c7e2bf4b20 100644 --- a/config/GZ2J01/rels/d_a_npc_kolinb/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_kolinb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kolinb.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_kolinb/symbols.txt b/config/GZ2J01/rels/d_a_npc_kolinb/symbols.txt index 2321372ec6..bbb6eab0e4 100644 --- a/config/GZ2J01/rels/d_a_npc_kolinb/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_kolinb/symbols.txt @@ -111,7 +111,8 @@ heapSize$3973 = .rodata:0x0000008C; // type:object size:0x10 scope:local @stringBase0 = .rodata:0x000000CC; // type:object size:0x75 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_329_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x10 scope:global l_resNameList = .data:0x00000040; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_ks/splits.txt b/config/GZ2J01/rels/d_a_npc_ks/splits.txt index b774877f84..6a4ac28794 100644 --- a/config/GZ2J01/rels/d_a_npc_ks/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_ks/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ks.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_ks/symbols.txt b/config/GZ2J01/rels/d_a_npc_ks/symbols.txt index ce210db0b2..0158e6e6f0 100644 --- a/config/GZ2J01/rels/d_a_npc_ks/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_ks/symbols.txt @@ -458,7 +458,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000053C; // type:object size:0x20 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_330_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double saru_p = .data:0x00000020; // type:object size:0x20 scope:global data:4byte @4808 = .data:0x00000040; // type:object size:0x38 scope:local guide_path_04 = .data:0x00000078; // type:object size:0x16C scope:global @@ -521,14 +522,16 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa obj_pos = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float leader = .bss:0x00000060; // type:object size:0x4 scope:global data:4byte call_pt = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte -lbl_330_bss_68 = .bss:0x00000068; // type:object size:0x1 data:byte +hio_set = .bss:0x00000068; // type:object size:0x1 scope:local align:1 data:byte @4025 = .bss:0x0000006C; // type:object size:0xC scope:local l_HIO = .bss:0x00000078; // type:object size:0x38 scope:global data:byte target_info = .bss:0x000000B0; // type:object size:0x28 scope:global target_info_count = .bss:0x000000D8; // type:object size:0x4 scope:global data:4byte target_bgc = .bss:0x000000DC; // type:object size:0x28 scope:global start_pya$6091 = .bss:0x00000104; // type:object size:0x2 scope:local +init$3911 = .bss:0x00000106; // type:object size:0x1 scope:local align:1 data:byte @7870 = .bss:0x00000108; // type:object size:0xC scope:local +init$5647 = .bss:0x00000114; // type:object size:0x1 scope:local align:1 data:byte sc$7869 = .bss:0x00000118; // type:object size:0xC scope:local c_start = .bss:0x00000124; // type:object size:0x4 scope:global sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000128; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_kyury/splits.txt b/config/GZ2J01/rels/d_a_npc_kyury/splits.txt index 890ea4f9c6..05452c7d1d 100644 --- a/config/GZ2J01/rels/d_a_npc_kyury/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_kyury/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kyury.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_len/splits.txt b/config/GZ2J01/rels/d_a_npc_len/splits.txt index ea206a79f3..4b15da9176 100644 --- a/config/GZ2J01/rels/d_a_npc_len/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_len/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_len.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_len/symbols.txt b/config/GZ2J01/rels/d_a_npc_len/symbols.txt index 080956b071..581ca3e7a8 100644 --- a/config/GZ2J01/rels/d_a_npc_len/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_len/symbols.txt @@ -138,7 +138,8 @@ heapSize$4002 = .rodata:0x00000094; // type:object size:0x28 scope:local @stringBase0 = .rodata:0x00000138; // type:object size:0xAA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_332_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x38 scope:global l_resNameList = .data:0x00000068; // type:object size:0x10 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_lf/splits.txt b/config/GZ2J01/rels/d_a_npc_lf/splits.txt index 62c53eb27e..d6b4e82ab3 100644 --- a/config/GZ2J01/rels/d_a_npc_lf/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_lf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_lf.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_lf/symbols.txt b/config/GZ2J01/rels/d_a_npc_lf/symbols.txt index 8f15b67f1f..2ae3a8a0c5 100644 --- a/config/GZ2J01/rels/d_a_npc_lf/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_lf/symbols.txt @@ -56,10 +56,10 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4176 = .rodata:0x00000094; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000098; // type:object size:0x7 scope:local data:string_table wp$3976 = .data:0x00000000; // type:object size:0xC scope:local -l_daNPC_LF_Method = .data:0x0000000C; // type:object size:0x20 scope:global +l_daNPC_LF_Method = .data:0x0000000C; // type:object size:0x20 scope:local g_profile_NPC_LF = .data:0x0000002C; // type:object size:0x30 scope:global __vt__14daNPC_LF_HIO_c = .data:0x0000005C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_333_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0x1C scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_npc_lud/splits.txt b/config/GZ2J01/rels/d_a_npc_lud/splits.txt index 5eda121326..63ee988277 100644 --- a/config/GZ2J01/rels/d_a_npc_lud/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_lud/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_lud.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_lud/symbols.txt b/config/GZ2J01/rels/d_a_npc_lud/symbols.txt index a5d281a33c..c3411c7295 100644 --- a/config/GZ2J01/rels/d_a_npc_lud/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_lud/symbols.txt @@ -147,7 +147,8 @@ jointNo$5056 = .rodata:0x0000012C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000150; // type:object size:0xFD scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_334_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x28 scope:global data:4byte l_evtList = .data:0x00000048; // type:object size:0x30 scope:global l_resNameList = .data:0x00000078; // type:object size:0x18 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_maro/splits.txt b/config/GZ2J01/rels/d_a_npc_maro/splits.txt index ba8135bb4c..5d28bb8b3f 100644 --- a/config/GZ2J01/rels/d_a_npc_maro/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_maro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_maro.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_maro/symbols.txt b/config/GZ2J01/rels/d_a_npc_maro/symbols.txt index 3af5cc0cd9..5776842019 100644 --- a/config/GZ2J01/rels/d_a_npc_maro/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_maro/symbols.txt @@ -183,7 +183,8 @@ heapSize$4152 = .rodata:0x00000090; // type:object size:0x44 scope:local @stringBase0 = .rodata:0x000001AC; // type:object size:0x237 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_86_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4085 = .data:0x00000020; // type:object size:0xC scope:local l_bmdData = .data:0x0000002C; // type:object size:0x10 scope:global l_evtList = .data:0x0000003C; // type:object size:0x78 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_midp/splits.txt b/config/GZ2J01/rels/d_a_npc_midp/splits.txt index 08a2a0000f..ba2d9fce2e 100644 --- a/config/GZ2J01/rels/d_a_npc_midp/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_midp/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_midp.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_midp/symbols.txt b/config/GZ2J01/rels/d_a_npc_midp/symbols.txt index 544e2a96ad..c41a078f88 100644 --- a/config/GZ2J01/rels/d_a_npc_midp/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_midp/symbols.txt @@ -121,7 +121,8 @@ m__18daNpc_midP_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000E0; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_335_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_moi/splits.txt b/config/GZ2J01/rels/d_a_npc_moi/splits.txt index c582fd1167..b0e43d984e 100644 --- a/config/GZ2J01/rels/d_a_npc_moi/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_moi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_moi.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_moi/symbols.txt b/config/GZ2J01/rels/d_a_npc_moi/symbols.txt index 929881f21f..2e2a7c8328 100644 --- a/config/GZ2J01/rels/d_a_npc_moi/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_moi/symbols.txt @@ -183,7 +183,8 @@ jointNo$5214 = .rodata:0x00000178; // type:object size:0x18 scope:local @stringBase0 = .rodata:0x000001E8; // type:object size:0x83 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_337_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x40 scope:global data:4byte l_evtList = .data:0x00000060; // type:object size:0x20 scope:global l_resNameList = .data:0x00000080; // type:object size:0x18 scope:global @@ -252,7 +253,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3839 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @5529 = .bss:0x00000058; // type:object size:0xC scope:local -init$5530 = .bss:0x00000064; // type:object size:0x1 scope:local +init$5530 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte lightOffset$5528 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_moir/splits.txt b/config/GZ2J01/rels/d_a_npc_moir/splits.txt index e8e9e22828..001fc8bad9 100644 --- a/config/GZ2J01/rels/d_a_npc_moir/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_moir/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_moir.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_moir/symbols.txt b/config/GZ2J01/rels/d_a_npc_moir/symbols.txt index ddef1585c7..ef82f9b326 100644 --- a/config/GZ2J01/rels/d_a_npc_moir/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_moir/symbols.txt @@ -223,7 +223,8 @@ m__17daNpcMoiR_Param_c = .rodata:0x00000000; // type:object size:0x74 scope:glob @stringBase0 = .rodata:0x00000594; // type:object size:0x6D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_338_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x1D4 scope:global data:4byte l_btpGetParamList = .data:0x000001F4; // type:object size:0x18 scope:global l_btkGetParamList = .data:0x0000020C; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_myna2/splits.txt b/config/GZ2J01/rels/d_a_npc_myna2/splits.txt index 77202a83fa..d080d4d9e3 100644 --- a/config/GZ2J01/rels/d_a_npc_myna2/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_myna2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_myna2.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_myna2/symbols.txt b/config/GZ2J01/rels/d_a_npc_myna2/symbols.txt index cf3f508b85..1bc0786288 100644 --- a/config/GZ2J01/rels/d_a_npc_myna2/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_myna2/symbols.txt @@ -146,7 +146,8 @@ heapSize$4340 = .rodata:0x00000074; // type:object size:0x14 scope:local @stringBase0 = .rodata:0x00000220; // type:object size:0x60 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_339_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x78 scope:global l_btpGetParamList = .data:0x000000A0; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_ne/splits.txt b/config/GZ2J01/rels/d_a_npc_ne/splits.txt index 3792d29dc1..b9b54ed0c4 100644 --- a/config/GZ2J01/rels/d_a_npc_ne/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_ne/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ne.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_ne/symbols.txt b/config/GZ2J01/rels/d_a_npc_ne/symbols.txt index cd69a5a955..3cf6e09b96 100644 --- a/config/GZ2J01/rels/d_a_npc_ne/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_ne/symbols.txt @@ -205,7 +205,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_340_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3985 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte target_info = .bss:0x00000070; // type:object size:0x14 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_pachi_besu/splits.txt b/config/GZ2J01/rels/d_a_npc_pachi_besu/splits.txt index b2918b0a86..efa7371efc 100644 --- a/config/GZ2J01/rels/d_a_npc_pachi_besu/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_pachi_besu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_besu.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_pachi_besu/symbols.txt b/config/GZ2J01/rels/d_a_npc_pachi_besu/symbols.txt index 786d52609e..f695f9bc12 100644 --- a/config/GZ2J01/rels/d_a_npc_pachi_besu/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_pachi_besu/symbols.txt @@ -158,7 +158,8 @@ m__24daNpc_Pachi_Besu_Param_c = .rodata:0x00000000; // type:object size:0x8C sco @stringBase0 = .rodata:0x000000F4; // type:object size:0xDE scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_342_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x30 scope:global data:4byte l_evtList = .data:0x00000050; // type:object size:0x10 scope:global l_resNameList = .data:0x00000060; // type:object size:0x20 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_pachi_maro/splits.txt b/config/GZ2J01/rels/d_a_npc_pachi_maro/splits.txt index f73b896535..1dbce106b5 100644 --- a/config/GZ2J01/rels/d_a_npc_pachi_maro/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_pachi_maro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_maro.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_pachi_maro/symbols.txt b/config/GZ2J01/rels/d_a_npc_pachi_maro/symbols.txt index a437a43a58..62868f42fb 100644 --- a/config/GZ2J01/rels/d_a_npc_pachi_maro/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_pachi_maro/symbols.txt @@ -159,7 +159,8 @@ m__24daNpc_Pachi_Maro_Param_c = .rodata:0x00000000; // type:object size:0x90 sco @stringBase0 = .rodata:0x000000FC; // type:object size:0xEF scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_343_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x10 scope:global l_resNameList = .data:0x00000040; // type:object size:0x2C scope:global diff --git a/config/GZ2J01/rels/d_a_npc_pachi_taro/splits.txt b/config/GZ2J01/rels/d_a_npc_pachi_taro/splits.txt index da9fa3003b..c42248e020 100644 --- a/config/GZ2J01/rels/d_a_npc_pachi_taro/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_pachi_taro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_taro.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_pachi_taro/symbols.txt b/config/GZ2J01/rels/d_a_npc_pachi_taro/symbols.txt index 410f8fbc02..b624270921 100644 --- a/config/GZ2J01/rels/d_a_npc_pachi_taro/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_pachi_taro/symbols.txt @@ -205,7 +205,8 @@ sHitMsg$5762 = .rodata:0x000001C8; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000210; // type:object size:0x118 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_344_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x28 scope:global data:4byte l_evtList = .data:0x00000048; // type:object size:0x58 scope:global l_resNameList = .data:0x000000A0; // type:object size:0x30 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_passer/symbols.txt b/config/GZ2J01/rels/d_a_npc_passer/symbols.txt index ea628252bc..3dba572a3e 100644 --- a/config/GZ2J01/rels/d_a_npc_passer/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_passer/symbols.txt @@ -105,7 +105,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4975 = .rodata:0x00000070; // type:object size:0x8 scope:local align:8 data:double cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_345_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3829 = .data:0x00000020; // type:object size:0xC scope:local @3830 = .data:0x0000002C; // type:object size:0xC scope:local @3831 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_npc_passer2/symbols.txt b/config/GZ2J01/rels/d_a_npc_passer2/symbols.txt index 891e762ffb..32d515cb56 100644 --- a/config/GZ2J01/rels/d_a_npc_passer2/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_passer2/symbols.txt @@ -52,7 +52,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4481 = .rodata:0x00000048; // type:object size:0x8 scope:local align:8 data:double cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_346_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3845 = .data:0x00000020; // type:object size:0xC scope:local @3846 = .data:0x0000002C; // type:object size:0xC scope:local ActionTable__14daNpcPasser2_c = .data:0x00000038; // type:object size:0x18 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_post/splits.txt b/config/GZ2J01/rels/d_a_npc_post/splits.txt index 80c6bc51a7..f0d7ba3a4a 100644 --- a/config/GZ2J01/rels/d_a_npc_post/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_post/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_post.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_post/symbols.txt b/config/GZ2J01/rels/d_a_npc_post/symbols.txt index c0123faf9e..bcf288bcad 100644 --- a/config/GZ2J01/rels/d_a_npc_post/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_post/symbols.txt @@ -152,7 +152,8 @@ jointNo$4959 = .rodata:0x0000012C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000160; // type:object size:0x5E scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_347_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global data:4byte l_evtList = .data:0x00000040; // type:object size:0x28 scope:global l_resNameList = .data:0x00000068; // type:object size:0x10 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_pouya/splits.txt b/config/GZ2J01/rels/d_a_npc_pouya/splits.txt index 72ca6c813d..0a07fee93b 100644 --- a/config/GZ2J01/rels/d_a_npc_pouya/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_pouya/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pouya.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_prayer/splits.txt b/config/GZ2J01/rels/d_a_npc_prayer/splits.txt index 900921e858..2b8c0f686b 100644 --- a/config/GZ2J01/rels/d_a_npc_prayer/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_prayer/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_prayer.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_prayer/symbols.txt b/config/GZ2J01/rels/d_a_npc_prayer/symbols.txt index d214af0972..90c6f22fd2 100644 --- a/config/GZ2J01/rels/d_a_npc_prayer/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_prayer/symbols.txt @@ -111,7 +111,8 @@ m__17daNpcPray_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x0000015C; // type:object size:0x20 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_349_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x48 scope:global l_arcNames = .data:0x00000068; // type:object size:0x8 scope:global data:4byte l_evtNames = .data:0x00000070; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_raca/splits.txt b/config/GZ2J01/rels/d_a_npc_raca/splits.txt index e53162b79b..3b4879897b 100644 --- a/config/GZ2J01/rels/d_a_npc_raca/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_raca/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_raca.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_raca/symbols.txt b/config/GZ2J01/rels/d_a_npc_raca/symbols.txt index 8f4c7cfe19..d36b85f30a 100644 --- a/config/GZ2J01/rels/d_a_npc_raca/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_raca/symbols.txt @@ -126,7 +126,8 @@ m__18daNpc_Raca_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000E0; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_350_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_rafrel/splits.txt b/config/GZ2J01/rels/d_a_npc_rafrel/splits.txt index 4da058c3ca..380c17f07b 100644 --- a/config/GZ2J01/rels/d_a_npc_rafrel/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_rafrel/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_rafrel.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_rafrel/symbols.txt b/config/GZ2J01/rels/d_a_npc_rafrel/symbols.txt index 443fb4163b..09ab138465 100644 --- a/config/GZ2J01/rels/d_a_npc_rafrel/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_rafrel/symbols.txt @@ -185,7 +185,8 @@ m__19daNpcRafrel_Param_c = .rodata:0x00000000; // type:object size:0x74 scope:gl @stringBase0 = .rodata:0x000003DC; // type:object size:0xC2 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_351_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x15C scope:global l_btpGetParamList = .data:0x0000017C; // type:object size:0x30 scope:global l_btkGetParamList = .data:0x000001AC; // type:object size:0x3C scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_saru/splits.txt b/config/GZ2J01/rels/d_a_npc_saru/splits.txt index 38f46e186f..4053dd1f49 100644 --- a/config/GZ2J01/rels/d_a_npc_saru/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_saru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_saru.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_saru/symbols.txt b/config/GZ2J01/rels/d_a_npc_saru/symbols.txt index 70dc8ed7c6..d264927e78 100644 --- a/config/GZ2J01/rels/d_a_npc_saru/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_saru/symbols.txt @@ -141,7 +141,8 @@ jointNo$4884 = .rodata:0x00000114; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x0000015C; // type:object size:0x4E scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_352_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global l_evtList = .data:0x00000040; // type:object size:0x18 scope:global data:4byte l_resNameList = .data:0x00000058; // type:object size:0x10 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_seib/splits.txt b/config/GZ2J01/rels/d_a_npc_seib/splits.txt index fe60c75324..6674273a27 100644 --- a/config/GZ2J01/rels/d_a_npc_seib/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_seib/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seib.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_seib/symbols.txt b/config/GZ2J01/rels/d_a_npc_seib/symbols.txt index f1ed3323dd..22be200da4 100644 --- a/config/GZ2J01/rels/d_a_npc_seib/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_seib/symbols.txt @@ -96,7 +96,8 @@ m__18daNpc_seiB_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:glo @stringBase0 = .rodata:0x000000AC; // type:object size:0x27 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_353_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_seic/splits.txt b/config/GZ2J01/rels/d_a_npc_seic/splits.txt index a9fce8ef65..afd500af28 100644 --- a/config/GZ2J01/rels/d_a_npc_seic/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_seic/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seic.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_seic/symbols.txt b/config/GZ2J01/rels/d_a_npc_seic/symbols.txt index d69e2fd183..da838b7533 100644 --- a/config/GZ2J01/rels/d_a_npc_seic/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_seic/symbols.txt @@ -96,7 +96,8 @@ m__18daNpc_seiC_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:glo @stringBase0 = .rodata:0x000000AC; // type:object size:0x27 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_354_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_seid/splits.txt b/config/GZ2J01/rels/d_a_npc_seid/splits.txt index 571bdf0ce5..15cb8b939b 100644 --- a/config/GZ2J01/rels/d_a_npc_seid/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_seid/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seid.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_seid/symbols.txt b/config/GZ2J01/rels/d_a_npc_seid/symbols.txt index 8d4bbf270c..3168ad4d37 100644 --- a/config/GZ2J01/rels/d_a_npc_seid/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_seid/symbols.txt @@ -96,7 +96,8 @@ m__18daNpc_seiD_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:glo @stringBase0 = .rodata:0x000000AC; // type:object size:0x27 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_355_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_seira/splits.txt b/config/GZ2J01/rels/d_a_npc_seira/splits.txt index 6f9580eece..360d26d4f7 100644 --- a/config/GZ2J01/rels/d_a_npc_seira/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_seira/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seira.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_seira/symbols.txt b/config/GZ2J01/rels/d_a_npc_seira/symbols.txt index cce75d655b..0f5f040b3f 100644 --- a/config/GZ2J01/rels/d_a_npc_seira/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_seira/symbols.txt @@ -150,7 +150,8 @@ m__19daNpc_Seira_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x00000114; // type:object size:0x8A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_356_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_evtList = .data:0x00000030; // type:object size:0x20 scope:global l_resNameList = .data:0x00000050; // type:object size:0x14 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_seira2/splits.txt b/config/GZ2J01/rels/d_a_npc_seira2/splits.txt index 1e3cf84c59..c31bda4213 100644 --- a/config/GZ2J01/rels/d_a_npc_seira2/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_seira2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seira2.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_seira2/symbols.txt b/config/GZ2J01/rels/d_a_npc_seira2/symbols.txt index cdd272d024..4d1fe23352 100644 --- a/config/GZ2J01/rels/d_a_npc_seira2/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_seira2/symbols.txt @@ -145,7 +145,8 @@ m__20daNpc_Seira2_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:g @stringBase0 = .rodata:0x000000FC; // type:object size:0x32 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_357_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_evtList = .data:0x00000030; // type:object size:0x10 scope:global l_resNameList = .data:0x00000040; // type:object size:0x10 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_seirei/splits.txt b/config/GZ2J01/rels/d_a_npc_seirei/splits.txt index 5524c64304..1a85f3eea2 100644 --- a/config/GZ2J01/rels/d_a_npc_seirei/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_seirei/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seirei.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_seirei/symbols.txt b/config/GZ2J01/rels/d_a_npc_seirei/symbols.txt index 76f1f904fd..4ee9fd95a4 100644 --- a/config/GZ2J01/rels/d_a_npc_seirei/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_seirei/symbols.txt @@ -106,7 +106,8 @@ id2$4628 = .rodata:0x000000D0; // type:object size:0xE scope:local @stringBase0 = .rodata:0x000000E0; // type:object size:0x59 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_358_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x20 scope:global l_resNameList = .data:0x00000048; // type:object size:0xC scope:global diff --git a/config/GZ2J01/rels/d_a_npc_shad/splits.txt b/config/GZ2J01/rels/d_a_npc_shad/splits.txt index 9a40f41420..eca80600c7 100644 --- a/config/GZ2J01/rels/d_a_npc_shad/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_shad/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shad.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_shad/symbols.txt b/config/GZ2J01/rels/d_a_npc_shad/symbols.txt index 21d3f1aef1..32fde27b74 100644 --- a/config/GZ2J01/rels/d_a_npc_shad/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_shad/symbols.txt @@ -227,7 +227,8 @@ m__17daNpcShad_Param_c = .rodata:0x00000000; // type:object size:0x70 scope:glob @stringBase0 = .rodata:0x000004E8; // type:object size:0x15C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_359_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x1B0 scope:global l_btpGetParamList = .data:0x000001D0; // type:object size:0x84 scope:global l_btkGetParamList = .data:0x00000254; // type:object size:0x3C scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_shaman/splits.txt b/config/GZ2J01/rels/d_a_npc_shaman/splits.txt index d3038040b4..302e760cbf 100644 --- a/config/GZ2J01/rels/d_a_npc_shaman/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_shaman/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shaman.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_shaman/symbols.txt b/config/GZ2J01/rels/d_a_npc_shaman/symbols.txt index 4bb50d678f..3b5cabe0e3 100644 --- a/config/GZ2J01/rels/d_a_npc_shaman/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_shaman/symbols.txt @@ -141,7 +141,8 @@ heapSize$3961 = .rodata:0x0000008C; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000104; // type:object size:0x4C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_360_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x30 scope:global l_resNameList = .data:0x00000058; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_shoe/splits.txt b/config/GZ2J01/rels/d_a_npc_shoe/splits.txt index f8ee3e5ae4..8d043bcfb6 100644 --- a/config/GZ2J01/rels/d_a_npc_shoe/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_shoe/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shoe.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_shoe/symbols.txt b/config/GZ2J01/rels/d_a_npc_shoe/symbols.txt index 54b90c584a..7d37b90bdb 100644 --- a/config/GZ2J01/rels/d_a_npc_shoe/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_shoe/symbols.txt @@ -98,7 +98,8 @@ m__17daNpcShoe_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x0000016C; // type:object size:0x1A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_361_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x3C scope:global l_btpGetParamList = .data:0x0000005C; // type:object size:0xC scope:global l_arcNames = .data:0x00000068; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_sola/splits.txt b/config/GZ2J01/rels/d_a_npc_sola/splits.txt index 54258a8bbd..216e2cab50 100644 --- a/config/GZ2J01/rels/d_a_npc_sola/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_sola/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_sola.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_sola/symbols.txt b/config/GZ2J01/rels/d_a_npc_sola/symbols.txt index 7de30f60fb..46b9b2a3c4 100644 --- a/config/GZ2J01/rels/d_a_npc_sola/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_sola/symbols.txt @@ -109,7 +109,8 @@ m__18daNpc_solA_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000E0; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_364_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_soldierA/splits.txt b/config/GZ2J01/rels/d_a_npc_soldierA/splits.txt index a507647d91..3636817a07 100644 --- a/config/GZ2J01/rels/d_a_npc_soldierA/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_soldierA/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_soldierA.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_soldierA/symbols.txt b/config/GZ2J01/rels/d_a_npc_soldierA/symbols.txt index 37a967b614..fb094127b7 100644 --- a/config/GZ2J01/rels/d_a_npc_soldierA/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_soldierA/symbols.txt @@ -109,7 +109,8 @@ m__22daNpc_SoldierA_Param_c = .rodata:0x00000000; // type:object size:0x6C scope @stringBase0 = .rodata:0x0000017C; // type:object size:0x23 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_365_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x38 scope:global l_evtGetParamList = .data:0x00000068; // type:object size:0x10 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_soldierB/splits.txt b/config/GZ2J01/rels/d_a_npc_soldierB/splits.txt index b95d52395c..828f7aff8e 100644 --- a/config/GZ2J01/rels/d_a_npc_soldierB/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_soldierB/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_soldierB.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_soldierB/symbols.txt b/config/GZ2J01/rels/d_a_npc_soldierB/symbols.txt index d03832d019..8eaf98701c 100644 --- a/config/GZ2J01/rels/d_a_npc_soldierB/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_soldierB/symbols.txt @@ -101,7 +101,8 @@ m__22daNpc_SoldierB_Param_c = .rodata:0x00000000; // type:object size:0x6C scope @stringBase0 = .rodata:0x00000120; // type:object size:0x19 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_366_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x20 scope:global l_evtGetParamList = .data:0x00000050; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_sq/splits.txt b/config/GZ2J01/rels/d_a_npc_sq/splits.txt index 7efa26d57f..37fe155ab8 100644 --- a/config/GZ2J01/rels/d_a_npc_sq/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_sq/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_sq.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_sq/symbols.txt b/config/GZ2J01/rels/d_a_npc_sq/symbols.txt index 57e6ba0cf5..99c99be8b4 100644 --- a/config/GZ2J01/rels/d_a_npc_sq/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_sq/symbols.txt @@ -72,6 +72,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000D0; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000000F4; // type:object size:0xC scope:global __vt__14daNpc_Sq_HIO_c = .data:0x00000100; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_367_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_npc_taro/splits.txt b/config/GZ2J01/rels/d_a_npc_taro/splits.txt index 619e79a536..4c7a8ca5fd 100644 --- a/config/GZ2J01/rels/d_a_npc_taro/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_taro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_taro.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_taro/symbols.txt b/config/GZ2J01/rels/d_a_npc_taro/symbols.txt index a6338a184d..c377133ebd 100644 --- a/config/GZ2J01/rels/d_a_npc_taro/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_taro/symbols.txt @@ -194,7 +194,8 @@ jointNo$5646 = .rodata:0x0000014C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000240; // type:object size:0x2C0 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_87_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3931 = .data:0x00000020; // type:object size:0xC scope:local l_bmdData = .data:0x0000002C; // type:object size:0x28 scope:global data:4byte l_evtList = .data:0x00000054; // type:object size:0xD8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_the/splits.txt b/config/GZ2J01/rels/d_a_npc_the/splits.txt index 2671f4c863..d4943eaf12 100644 --- a/config/GZ2J01/rels/d_a_npc_the/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_the/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_the.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_the/symbols.txt b/config/GZ2J01/rels/d_a_npc_the/symbols.txt index 56a8937ec7..7e4b1288ba 100644 --- a/config/GZ2J01/rels/d_a_npc_the/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_the/symbols.txt @@ -151,7 +151,8 @@ m__16daNpcThe_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:globa @stringBase0 = .rodata:0x0000034C; // type:object size:0x78 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_368_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global l_bckGetParamList = .data:0x00000030; // type:object size:0xD8 scope:global data:4byte l_btpGetParamList = .data:0x00000108; // type:object size:0x70 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_theB/splits.txt b/config/GZ2J01/rels/d_a_npc_theB/splits.txt index 79afbbf067..48817a6f5e 100644 --- a/config/GZ2J01/rels/d_a_npc_theB/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_theB/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_theB.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_theB/symbols.txt b/config/GZ2J01/rels/d_a_npc_theB/symbols.txt index e23ed238f2..0b345d1b5a 100644 --- a/config/GZ2J01/rels/d_a_npc_theB/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_theB/symbols.txt @@ -140,7 +140,8 @@ m__17daNpcTheB_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x00000234; // type:object size:0x88 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_369_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x4 scope:global l_bckGetParamList = .data:0x00000024; // type:object size:0x70 scope:global data:4byte l_btpGetParamList = .data:0x00000094; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_tk/splits.txt b/config/GZ2J01/rels/d_a_npc_tk/splits.txt index 96b50cacee..4491eb8d0d 100644 --- a/config/GZ2J01/rels/d_a_npc_tk/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_tk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tk.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_tk/symbols.txt b/config/GZ2J01/rels/d_a_npc_tk/symbols.txt index d973504ba0..13d30db8af 100644 --- a/config/GZ2J01/rels/d_a_npc_tk/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_tk/symbols.txt @@ -226,10 +226,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local m_near_angle = .bss:0x00000046; // type:object size:0x2 scope:global m_near_actor = .bss:0x00000048; // type:object size:0x4 scope:global -lbl_370_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @3994 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x40 scope:global data:byte @5011 = .bss:0x0000009C; // type:object size:0xC scope:local +init$0000 = .bss:0x000000A8; // type:object size:0x1 scope:local align:1 data:byte sc$5010 = .bss:0x000000AC; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B8; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000BC; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_tkc/splits.txt b/config/GZ2J01/rels/d_a_npc_tkc/splits.txt index 4233f137a5..30572bf897 100644 --- a/config/GZ2J01/rels/d_a_npc_tkc/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_tkc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkc.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_tkc/symbols.txt b/config/GZ2J01/rels/d_a_npc_tkc/symbols.txt index a7334c8287..a8637a2a11 100644 --- a/config/GZ2J01/rels/d_a_npc_tkc/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_tkc/symbols.txt @@ -126,7 +126,8 @@ m_cameraItemNum$4552 = .rodata:0x000000B4; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000178; // type:object size:0x32 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_371_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x18 scope:global l_btpGetParamList = .data:0x00000038; // type:object size:0x8 scope:global l_btkGetParamList = .data:0x00000040; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_tkj/splits.txt b/config/GZ2J01/rels/d_a_npc_tkj/splits.txt index 71d468cee5..f1a6c89309 100644 --- a/config/GZ2J01/rels/d_a_npc_tkj/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_tkj/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkj.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_tkj/symbols.txt b/config/GZ2J01/rels/d_a_npc_tkj/symbols.txt index 1726524056..23059401d6 100644 --- a/config/GZ2J01/rels/d_a_npc_tkj/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_tkj/symbols.txt @@ -126,7 +126,8 @@ m__17daNpc_Tkj_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob @stringBase0 = .rodata:0x000000F4; // type:object size:0x25 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_88_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_tkj2/splits.txt b/config/GZ2J01/rels/d_a_npc_tkj2/splits.txt index 85c1b46230..c785c234c9 100644 --- a/config/GZ2J01/rels/d_a_npc_tkj2/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_tkj2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkj2.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_tkj2/symbols.txt b/config/GZ2J01/rels/d_a_npc_tkj2/symbols.txt index 91e862d1ad..80f9f74909 100644 --- a/config/GZ2J01/rels/d_a_npc_tkj2/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_tkj2/symbols.txt @@ -105,6 +105,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000F4; // type:object size:0x30 scope:global __vt__8cM3dGPla = .data:0x00000124; // type:object size:0xC scope:global __vt__16daNpc_Tkj2_HIO_c = .data:0x00000130; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_372_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_npc_tks/splits.txt b/config/GZ2J01/rels/d_a_npc_tks/splits.txt index 2a20f200a9..b3946b9fa9 100644 --- a/config/GZ2J01/rels/d_a_npc_tks/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_tks/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tks.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_tks/symbols.txt b/config/GZ2J01/rels/d_a_npc_tks/symbols.txt index 0e3e32d538..ff2291df42 100644 --- a/config/GZ2J01/rels/d_a_npc_tks/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_tks/symbols.txt @@ -204,7 +204,8 @@ m__16daNpcTks_Param_c = .rodata:0x00000000; // type:object size:0x98 scope:globa @stringBase0 = .rodata:0x000002F0; // type:object size:0x99 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_373_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xB0 scope:global data:4byte l_btpGetParamList = .data:0x000000D0; // type:object size:0x8 scope:global l_btkGetParamList = .data:0x000000D8; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_npc_toby/splits.txt b/config/GZ2J01/rels/d_a_npc_toby/splits.txt index a7a571dd23..f600125f41 100644 --- a/config/GZ2J01/rels/d_a_npc_toby/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_toby/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_toby.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_toby/symbols.txt b/config/GZ2J01/rels/d_a_npc_toby/symbols.txt index 67529ffa29..23abc8dd7b 100644 --- a/config/GZ2J01/rels/d_a_npc_toby/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_toby/symbols.txt @@ -165,7 +165,8 @@ jointNo$5107 = .rodata:0x00000138; // type:object size:0x4 scope:local data:4byt @stringBase0 = .rodata:0x000001A8; // type:object size:0xBB scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_374_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global l_evtList = .data:0x00000038; // type:object size:0x38 scope:global l_resNameList = .data:0x00000070; // type:object size:0x24 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_tr/splits.txt b/config/GZ2J01/rels/d_a_npc_tr/splits.txt index 59b845f265..13215f94b7 100644 --- a/config/GZ2J01/rels/d_a_npc_tr/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_tr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tr.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_tr/symbols.txt b/config/GZ2J01/rels/d_a_npc_tr/symbols.txt index 483c52bcba..faa32dbe0a 100644 --- a/config/GZ2J01/rels/d_a_npc_tr/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_tr/symbols.txt @@ -52,6 +52,6 @@ l_daNPC_TR_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_NPC_TR = .data:0x00000020; // type:object size:0x30 scope:global __vt__14daNPC_TR_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_375_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_npc_uri/splits.txt b/config/GZ2J01/rels/d_a_npc_uri/splits.txt index 6078d6002d..bb119068a8 100644 --- a/config/GZ2J01/rels/d_a_npc_uri/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_uri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_uri.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_uri/symbols.txt b/config/GZ2J01/rels/d_a_npc_uri/symbols.txt index 104fcb6262..799e0279c4 100644 --- a/config/GZ2J01/rels/d_a_npc_uri/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_uri/symbols.txt @@ -152,7 +152,8 @@ jointNo$5001 = .rodata:0x00000130; // type:object size:0x4 scope:local data:4byt @stringBase0 = .rodata:0x00000160; // type:object size:0xD4 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_376_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_evtList = .data:0x00000030; // type:object size:0x58 scope:global l_resNameList = .data:0x00000088; // type:object size:0x18 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_wrestler/splits.txt b/config/GZ2J01/rels/d_a_npc_wrestler/splits.txt index eaccbb31a9..934a28d841 100644 --- a/config/GZ2J01/rels/d_a_npc_wrestler/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_wrestler/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_wrestler.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_wrestler/symbols.txt b/config/GZ2J01/rels/d_a_npc_wrestler/symbols.txt index bf7efbd2db..af8a280fa7 100644 --- a/config/GZ2J01/rels/d_a_npc_wrestler/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_wrestler/symbols.txt @@ -289,7 +289,8 @@ m__21daNpcWrestler_Param_c = .rodata:0x00000000; // type:object size:0x194 scope @stringBase0 = .rodata:0x000006A0; // type:object size:0x7A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_378_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resALink = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_resName = .data:0x00000024; // type:object size:0x14 scope:global l_bmdGetParamList = .data:0x00000038; // type:object size:0x14 scope:global @@ -445,5 +446,5 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3974 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x4 scope:global data:4byte @4628 = .bss:0x00000018; // type:object size:0xC scope:local -lbl_378_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$localstatic4$setAttnPos__15daNpcWrestler_cFv = .bss:0x00000024; // type:object size:0x1 scope:local data:byte eyeOffset$localstatic3$setAttnPos__15daNpcWrestler_cFv = .bss:0x00000028; // type:object size:0xC scope:local align:4 data:float diff --git a/config/GZ2J01/rels/d_a_npc_yamid/splits.txt b/config/GZ2J01/rels/d_a_npc_yamid/splits.txt index 4e5b6053ef..8d95996c47 100644 --- a/config/GZ2J01/rels/d_a_npc_yamid/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_yamid/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamid.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_yamid/symbols.txt b/config/GZ2J01/rels/d_a_npc_yamid/symbols.txt index 3fab92fd97..0c15160e16 100644 --- a/config/GZ2J01/rels/d_a_npc_yamid/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_yamid/symbols.txt @@ -125,7 +125,8 @@ m__19daNpc_yamiD_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x000000E0; // type:object size:0x15 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_379_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_yamis/splits.txt b/config/GZ2J01/rels/d_a_npc_yamis/splits.txt index b7b99cc049..a91265e7ed 100644 --- a/config/GZ2J01/rels/d_a_npc_yamis/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_yamis/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamis.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_yamis/symbols.txt b/config/GZ2J01/rels/d_a_npc_yamis/symbols.txt index 48a0677aec..dc7f38c95e 100644 --- a/config/GZ2J01/rels/d_a_npc_yamis/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_yamis/symbols.txt @@ -125,7 +125,8 @@ m__19daNpc_yamiS_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x000000E0; // type:object size:0x15 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_380_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_yamit/splits.txt b/config/GZ2J01/rels/d_a_npc_yamit/splits.txt index 5123a528b9..10e3caa091 100644 --- a/config/GZ2J01/rels/d_a_npc_yamit/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_yamit/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamit.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_yamit/symbols.txt b/config/GZ2J01/rels/d_a_npc_yamit/symbols.txt index 7cd5d2e2b6..595b8c8a5d 100644 --- a/config/GZ2J01/rels/d_a_npc_yamit/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_yamit/symbols.txt @@ -126,7 +126,8 @@ m__19daNpc_yamiT_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x000000E0; // type:object size:0x15 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_381_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_yelia/splits.txt b/config/GZ2J01/rels/d_a_npc_yelia/splits.txt index 659821fce1..ed090e1617 100644 --- a/config/GZ2J01/rels/d_a_npc_yelia/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_yelia/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yelia.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_yelia/symbols.txt b/config/GZ2J01/rels/d_a_npc_yelia/symbols.txt index f1d776a12f..43eb77b10b 100644 --- a/config/GZ2J01/rels/d_a_npc_yelia/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_yelia/symbols.txt @@ -144,7 +144,8 @@ heapSize$4085 = .rodata:0x0000008C; // type:object size:0x28 scope:local @stringBase0 = .rodata:0x00000154; // type:object size:0xD2 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_382_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte l_evtList = .data:0x00000038; // type:object size:0x30 scope:global data:4byte l_resNameList = .data:0x00000068; // type:object size:0x20 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_ykm/splits.txt b/config/GZ2J01/rels/d_a_npc_ykm/splits.txt index 455aafa992..7a0ad09b1e 100644 --- a/config/GZ2J01/rels/d_a_npc_ykm/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_ykm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ykm.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_ykm/symbols.txt b/config/GZ2J01/rels/d_a_npc_ykm/symbols.txt index 3bbcb77aa6..f5c62d87f0 100644 --- a/config/GZ2J01/rels/d_a_npc_ykm/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_ykm/symbols.txt @@ -222,7 +222,8 @@ motionTbl1$7524 = .rodata:0x0000027C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000002AC; // type:object size:0xA7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_383_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x30 scope:global data:4byte l_evtList = .data:0x00000050; // type:object size:0x50 scope:global l_resNameList = .data:0x000000A0; // type:object size:0x14 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_ykw/splits.txt b/config/GZ2J01/rels/d_a_npc_ykw/splits.txt index 152024a144..3ae68555b8 100644 --- a/config/GZ2J01/rels/d_a_npc_ykw/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_ykw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ykw.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_ykw/symbols.txt b/config/GZ2J01/rels/d_a_npc_ykw/symbols.txt index d1ab7e6a9c..ccd73ad89b 100644 --- a/config/GZ2J01/rels/d_a_npc_ykw/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_ykw/symbols.txt @@ -204,7 +204,8 @@ motionTbl2$6949 = .rodata:0x00000200; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000230; // type:object size:0xD8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_384_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x50 scope:global data:4byte l_resNameList = .data:0x00000078; // type:object size:0x14 scope:global @@ -281,7 +282,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4126 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @5372 = .bss:0x00000058; // type:object size:0xC scope:local -init$5373 = .bss:0x00000064; // type:object size:0x1 scope:local +init$5373 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte prtclScl$5371 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_zanb/splits.txt b/config/GZ2J01/rels/d_a_npc_zanb/splits.txt index 0158ee265e..7a1d0a3734 100644 --- a/config/GZ2J01/rels/d_a_npc_zanb/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_zanb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zanb.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_zanb/symbols.txt b/config/GZ2J01/rels/d_a_npc_zanb/symbols.txt index 33a203a39c..ad1e6b098f 100644 --- a/config/GZ2J01/rels/d_a_npc_zanb/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_zanb/symbols.txt @@ -125,7 +125,8 @@ heapSize$3959 = .rodata:0x0000008C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000000F8; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_385_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_zant/splits.txt b/config/GZ2J01/rels/d_a_npc_zant/splits.txt index c45ca889d4..305bb39828 100644 --- a/config/GZ2J01/rels/d_a_npc_zant/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_zant/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zant.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_zant/symbols.txt b/config/GZ2J01/rels/d_a_npc_zant/symbols.txt index 3f03681e04..c86dde375d 100644 --- a/config/GZ2J01/rels/d_a_npc_zant/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_zant/symbols.txt @@ -108,7 +108,8 @@ m__18daNpc_Zant_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000D8; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_386_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_zelR/splits.txt b/config/GZ2J01/rels/d_a_npc_zelR/splits.txt index 74d2758af7..1524fdf90e 100644 --- a/config/GZ2J01/rels/d_a_npc_zelR/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_zelR/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelR.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_zelR/symbols.txt b/config/GZ2J01/rels/d_a_npc_zelR/symbols.txt index cef9d392f0..ce8694c590 100644 --- a/config/GZ2J01/rels/d_a_npc_zelR/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_zelR/symbols.txt @@ -124,7 +124,8 @@ m__18daNpc_ZelR_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000E0; // type:object size:0x18 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_387_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_zelRo/splits.txt b/config/GZ2J01/rels/d_a_npc_zelRo/splits.txt index 15253cc4f3..16deca4e7c 100644 --- a/config/GZ2J01/rels/d_a_npc_zelRo/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_zelRo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelRo.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_zelRo/symbols.txt b/config/GZ2J01/rels/d_a_npc_zelRo/symbols.txt index df2474dbcd..01677cab73 100644 --- a/config/GZ2J01/rels/d_a_npc_zelRo/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_zelRo/symbols.txt @@ -124,7 +124,8 @@ m__19daNpc_ZelRo_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x000000E0; // type:object size:0x19 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_388_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_zelda/splits.txt b/config/GZ2J01/rels/d_a_npc_zelda/splits.txt index cd55e99530..8631652295 100644 --- a/config/GZ2J01/rels/d_a_npc_zelda/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_zelda/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelda.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_zelda/symbols.txt b/config/GZ2J01/rels/d_a_npc_zelda/symbols.txt index 69e3731176..43de19c8d0 100644 --- a/config/GZ2J01/rels/d_a_npc_zelda/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_zelda/symbols.txt @@ -127,7 +127,8 @@ heapSize$3959 = .rodata:0x0000008C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000000FC; // type:object size:0x13 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_389_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_zra/splits.txt b/config/GZ2J01/rels/d_a_npc_zra/splits.txt index fdd0db056d..78b8667de2 100644 --- a/config/GZ2J01/rels/d_a_npc_zra/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_zra/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zra.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_zra/symbols.txt b/config/GZ2J01/rels/d_a_npc_zra/symbols.txt index 3e0c10dd62..32e08d95a8 100644 --- a/config/GZ2J01/rels/d_a_npc_zra/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_zra/symbols.txt @@ -557,7 +557,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3887 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @5533 = .bss:0x00000058; // type:object size:0xC scope:local -init$5534 = .bss:0x00000064; // type:object size:0x1 scope:local +init$5534 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$5532 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_zrc/splits.txt b/config/GZ2J01/rels/d_a_npc_zrc/splits.txt index 13d61ed3c3..b8a63e20be 100644 --- a/config/GZ2J01/rels/d_a_npc_zrc/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_zrc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zrc.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_zrc/symbols.txt b/config/GZ2J01/rels/d_a_npc_zrc/symbols.txt index 48f4f03165..76e384253c 100644 --- a/config/GZ2J01/rels/d_a_npc_zrc/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_zrc/symbols.txt @@ -202,7 +202,8 @@ heapSize$4316 = .rodata:0x00000074; // type:object size:0x14 scope:local @stringBase0 = .rodata:0x000004A0; // type:object size:0x4B scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_391_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x100 scope:global l_btpGetParamList = .data:0x00000130; // type:object size:0x78 scope:global @@ -267,7 +268,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4021 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4773 = .bss:0x00000058; // type:object size:0xC scope:local -init$4774 = .bss:0x00000064; // type:object size:0x1 scope:local +init$4774 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$4772 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_npc_zrz/splits.txt b/config/GZ2J01/rels/d_a_npc_zrz/splits.txt index d9247f5178..3b956ad03c 100644 --- a/config/GZ2J01/rels/d_a_npc_zrz/splits.txt +++ b/config/GZ2J01/rels/d_a_npc_zrz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zrz.cpp: diff --git a/config/GZ2J01/rels/d_a_npc_zrz/symbols.txt b/config/GZ2J01/rels/d_a_npc_zrz/symbols.txt index 64701cb3a7..b2f727c9b5 100644 --- a/config/GZ2J01/rels/d_a_npc_zrz/symbols.txt +++ b/config/GZ2J01/rels/d_a_npc_zrz/symbols.txt @@ -178,7 +178,8 @@ key_color$5707 = .rodata:0x000001AC; // type:object size:0x20 scope:local @stringBase0 = .rodata:0x00000234; // type:object size:0x64 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_392_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global l_bmdGTGetParamList = .data:0x00000028; // type:object size:0x8 scope:global l_bckGetParamList = .data:0x00000030; // type:object size:0x28 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_Turara/splits.txt b/config/GZ2J01/rels/d_a_obj_Turara/splits.txt index ad92ea8424..1f59be5f26 100644 --- a/config/GZ2J01/rels/d_a_obj_Turara/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_Turara/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_Turara.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_Turara/symbols.txt b/config/GZ2J01/rels/d_a_obj_Turara/symbols.txt index 86f1546963..583772d956 100644 --- a/config/GZ2J01/rels/d_a_obj_Turara/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_Turara/symbols.txt @@ -71,9 +71,11 @@ l_bmdIdx = .rodata:0x00000044; // type:object size:0x8 scope:global @4263 = .rodata:0x00000074; // type:object size:0x4 scope:local @4264 = .rodata:0x00000078; // type:object size:0x4 scope:local data:string @stringBase0 = .rodata:0x0000007C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_394_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daTurara_c = .data:0x00000020; // type:object size:0x44 scope:global @3924 = .data:0x00000064; // type:object size:0xC scope:local @3925 = .data:0x00000070; // type:object size:0xC scope:local @@ -97,4 +99,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000204; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3653 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:global data:byte -lbl_394_bss_34 = .bss:0x00000034; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_TvCdlst/splits.txt b/config/GZ2J01/rels/d_a_obj_TvCdlst/splits.txt index da4e6e0592..b93be766fb 100644 --- a/config/GZ2J01/rels/d_a_obj_TvCdlst/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_TvCdlst/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_TvCdlst.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_Y_taihou/splits.txt b/config/GZ2J01/rels/d_a_obj_Y_taihou/splits.txt index 4750cdf588..a12617a1fa 100644 --- a/config/GZ2J01/rels/d_a_obj_Y_taihou/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_Y_taihou/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_Y_taihou.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_Y_taihou/symbols.txt b/config/GZ2J01/rels/d_a_obj_Y_taihou/symbols.txt index d0c1bb0a05..e65b5ef27e 100644 --- a/config/GZ2J01/rels/d_a_obj_Y_taihou/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_Y_taihou/symbols.txt @@ -95,8 +95,9 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local l_wheelMinR$3836 = .bss:0x00000048; // type:object size:0x4 scope:local align:4 data:float -lbl_396_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +lbl_396_bss_4C$0000 = .bss:0x0000004C; // type:object size:0x1 scope:local data:byte @3951 = .bss:0x00000050; // type:object size:0xC scope:local +init$0000 = .bss:0x0000005C; // type:object size:0x1 scope:local align:1 data:byte l_effectScale$3950 = .bss:0x00000060; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000006C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000070; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_amiShutter/splits.txt b/config/GZ2J01/rels/d_a_obj_amiShutter/splits.txt index d7e169e10b..71b4e6d012 100644 --- a/config/GZ2J01/rels/d_a_obj_amiShutter/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_amiShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_amiShutter.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_amiShutter/symbols.txt b/config/GZ2J01/rels/d_a_obj_amiShutter/symbols.txt index 6dd46449f1..71186b1acb 100644 --- a/config/GZ2J01/rels/d_a_obj_amiShutter/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_amiShutter/symbols.txt @@ -57,9 +57,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3900 = .rodata:0x0000003C; // type:object size:0x4 scope:local @3919 = .rodata:0x00000040; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_397_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3759 = .data:0x00000020; // type:object size:0xC scope:local @3760 = .data:0x0000002C; // type:object size:0xC scope:local @3761 = .data:0x00000038; // type:object size:0xC scope:local @@ -76,4 +78,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000016C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3649 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global align:4 data:float -lbl_397_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_ari/splits.txt b/config/GZ2J01/rels/d_a_obj_ari/splits.txt index 47d0b4945c..cdd94232c9 100644 --- a/config/GZ2J01/rels/d_a_obj_ari/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ari/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ari.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_ari/symbols.txt b/config/GZ2J01/rels/d_a_obj_ari/symbols.txt index 3cbe730333..03be6aaea1 100644 --- a/config/GZ2J01/rels/d_a_obj_ari/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_ari/symbols.txt @@ -98,6 +98,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_AriHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_398_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3771 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_automata/splits.txt b/config/GZ2J01/rels/d_a_obj_automata/splits.txt index 5219aac973..5e25b728d7 100644 --- a/config/GZ2J01/rels/d_a_obj_automata/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_automata/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_automata.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_automata/symbols.txt b/config/GZ2J01/rels/d_a_obj_automata/symbols.txt index f9c8536d1a..5229bfc388 100644 --- a/config/GZ2J01/rels/d_a_obj_automata/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_automata/symbols.txt @@ -61,7 +61,8 @@ playMode$4222 = .rodata:0x00000078; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000094; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_399_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global l_resNameList = .data:0x00000028; // type:object size:0x8 scope:global l_ccDCyl = .data:0x00000030; // type:object size:0x44 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_avalanche/symbols.txt b/config/GZ2J01/rels/d_a_obj_avalanche/symbols.txt index 18500bf572..c4fafc2f5b 100644 --- a/config/GZ2J01/rels/d_a_obj_avalanche/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_avalanche/symbols.txt @@ -37,9 +37,11 @@ l_check_pos = .rodata:0x00000008; // type:object size:0x18 scope:global align:4 @3846 = .rodata:0x00000038; // type:object size:0x4 scope:local align:4 data:float @3964 = .rodata:0x0000003C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000040; // type:object size:0x31 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_400_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte @@ -54,4 +56,4 @@ daObjAvalanche_METHODS = .data:0x000000AC; // type:object size:0x20 scope:global g_profile_Obj_Avalanche = .data:0x000000CC; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000FC; // type:object size:0xC scope:global __vt__16daObjAvalanche_c = .data:0x00000108; // type:object size:0x28 scope:global -lbl_400_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_balloon/splits.txt b/config/GZ2J01/rels/d_a_obj_balloon/splits.txt index cb6f8049b2..0ffb55264c 100644 --- a/config/GZ2J01/rels/d_a_obj_balloon/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_balloon/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_balloon.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_balloon/symbols.txt b/config/GZ2J01/rels/d_a_obj_balloon/symbols.txt index c4dee35518..835e73240f 100644 --- a/config/GZ2J01/rels/d_a_obj_balloon/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_balloon/symbols.txt @@ -54,7 +54,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000048; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_401_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double m_combo_type__29@unnamed@d_a_obj_balloon_cpp@ = .data:0x00000020; // type:object size:0x4 scope:global balloon_radius$3706 = .data:0x00000024; // type:object size:0xC scope:local kago_wall_hit_id$3736 = .data:0x00000030; // type:object size:0x4 scope:local @@ -91,7 +92,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa m_combo_count__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x00000048; // type:object size:0x4 scope:global m_combo_next_score__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x0000004C; // type:object size:0x4 scope:global m_balloon_score__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x00000050; // type:object size:0x4 scope:global data:4byte -lbl_401_bss_54 = .bss:0x00000054; // type:object size:0x1 data:byte +hio_set = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3651 = .bss:0x00000058; // type:object size:0xC scope:local l_HIO = .bss:0x00000064; // type:object size:0x20 scope:global data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_barDesk/splits.txt b/config/GZ2J01/rels/d_a_obj_barDesk/splits.txt index 9550ce4bbd..35cf1e837d 100644 --- a/config/GZ2J01/rels/d_a_obj_barDesk/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_barDesk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_barDesk.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_barDesk/symbols.txt b/config/GZ2J01/rels/d_a_obj_barDesk/symbols.txt index b2469889e9..d93e026832 100644 --- a/config/GZ2J01/rels/d_a_obj_barDesk/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_barDesk/symbols.txt @@ -38,9 +38,11 @@ mCcDObjInfo__11daBarDesk_c = .rodata:0x00000000; // type:object size:0x30 scope: @3863 = .rodata:0x0000003C; // type:object size:0x4 scope:local particle_id$3871 = .rodata:0x00000040; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_402_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daBarDesk_c = .data:0x00000020; // type:object size:0x44 scope:global @3821 = .data:0x00000064; // type:object size:0xC scope:local @3822 = .data:0x00000070; // type:object size:0xC scope:local @@ -57,4 +59,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000148; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:byte -lbl_402_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_batta/splits.txt b/config/GZ2J01/rels/d_a_obj_batta/splits.txt index d77e6ade50..9a6a91870e 100644 --- a/config/GZ2J01/rels/d_a_obj_batta/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_batta/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_batta.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_batta/symbols.txt b/config/GZ2J01/rels/d_a_obj_batta/symbols.txt index a3acf1ce9a..bbda4e7a2f 100644 --- a/config/GZ2J01/rels/d_a_obj_batta/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_batta/symbols.txt @@ -97,7 +97,8 @@ l_musiya_num = .rodata:0x000000EC; // type:object size:0x4 scope:global @stringBase0 = .rodata:0x000000F4; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_403_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__27@unnamed@d_a_obj_batta_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global @3903 = .data:0x00000060; // type:object size:0xC scope:local data:4byte @3907 = .data:0x0000006C; // type:object size:0xC scope:local data:4byte @@ -129,6 +130,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_bed/splits.txt b/config/GZ2J01/rels/d_a_obj_bed/splits.txt index 562ad25411..a598360305 100644 --- a/config/GZ2J01/rels/d_a_obj_bed/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_bed/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bed.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_bemos/splits.txt b/config/GZ2J01/rels/d_a_obj_bemos/splits.txt index 0e8d243f29..1094792c45 100644 --- a/config/GZ2J01/rels/d_a_obj_bemos/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_bemos/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bemos.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_bemos/symbols.txt b/config/GZ2J01/rels/d_a_obj_bemos/symbols.txt index d29d7230ff..fedaac7eb2 100644 --- a/config/GZ2J01/rels/d_a_obj_bemos/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_bemos/symbols.txt @@ -204,11 +204,12 @@ lit_1014 = .bss:0x00000038; // type:object size:0x1 scope:local lit_1012 = .bss:0x0000003C; // type:object size:0x1 scope:local lit_1010 = .bss:0x00000040; // type:object size:0x1 scope:local lit_1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$2123 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte -init$2180 = .bss:0x00000046; // type:object size:0x1 scope:local data:byte -init$2232 = .bss:0x00000047; // type:object size:0x1 scope:local data:byte -init$2548 = .bss:0x00000048; // type:object size:0x1 scope:local data:byte +init$2123 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +init$2180 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte +init$2232 = .bss:0x00000047; // type:object size:0x1 scope:local align:1 data:byte +init$2548 = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte @4973 = .bss:0x0000004C; // type:object size:0xC scope:local +init$0000 = .bss:0x00000058; // type:object size:0x1 scope:local align:1 data:byte @4976 = .bss:0x0000005C; // type:object size:0xC scope:local @4977 = .bss:0x00000068; // type:object size:0xC scope:local @4978 = .bss:0x00000074; // type:object size:0xC scope:local @@ -220,6 +221,7 @@ M_wrt_work__Q29daObjBm_c5Bgc_c = .bss:0x00000854; // type:object size:0x54 scope @5104 = .bss:0x000008A8; // type:object size:0xC scope:local M_wall_work__Q29daObjBm_c5Bgc_c = .bss:0x000008B4; // type:object size:0xA10 scope:global align:4 data:float @5249 = .bss:0x000012C4; // type:object size:0xC scope:local +init$0001 = .bss:0x000012D0; // type:object size:0x1 scope:local align:1 data:byte touch_work$5248 = .bss:0x000012D4; // type:object size:0x70 scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00001344; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00001348; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_bk_leaf/symbols.txt b/config/GZ2J01/rels/d_a_obj_bk_leaf/symbols.txt index 16df1fe578..aae710280a 100644 --- a/config/GZ2J01/rels/d_a_obj_bk_leaf/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_bk_leaf/symbols.txt @@ -23,7 +23,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000008; // type:object size:0x1D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_408_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_bmdName = .data:0x00000024; // type:object size:0x4 scope:global l_bckName = .data:0x00000028; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_bky_rock/symbols.txt b/config/GZ2J01/rels/d_a_obj_bky_rock/symbols.txt index aa8817eaff..f84f77543e 100644 --- a/config/GZ2J01/rels/d_a_obj_bky_rock/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_bky_rock/symbols.txt @@ -76,7 +76,8 @@ PIECE_SCALE_BASE$4100 = .rodata:0x00000148; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000164; // type:object size:0x7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_409_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3933 = .data:0x00000024; // type:object size:0xC scope:local @3934 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_bmWindow/splits.txt b/config/GZ2J01/rels/d_a_obj_bmWindow/splits.txt index d1029e8604..d219cb3d61 100644 --- a/config/GZ2J01/rels/d_a_obj_bmWindow/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_bmWindow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bmWindow.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_bmWindow/symbols.txt b/config/GZ2J01/rels/d_a_obj_bmWindow/symbols.txt index 4179e97a27..3db57c5389 100644 --- a/config/GZ2J01/rels/d_a_obj_bmWindow/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_bmWindow/symbols.txt @@ -61,9 +61,11 @@ l_check_area = .rodata:0x00000054; // type:object size:0x30 scope:global @4007 = .rodata:0x000000B0; // type:object size:0x8 scope:local particle_id$4102 = .rodata:0x000000B8; // type:object size:0xC scope:local @stringBase0 = .rodata:0x000000C4; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_410_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daBmWindow_c = .data:0x00000020; // type:object size:0x44 scope:global @3865 = .data:0x00000064; // type:object size:0xC scope:local @3866 = .data:0x00000070; // type:object size:0xC scope:local @@ -82,4 +84,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000016C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x3C scope:global data:byte -lbl_410_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_bmshutter/symbols.txt b/config/GZ2J01/rels/d_a_obj_bmshutter/symbols.txt index 3efa4494dd..d8881dbed6 100644 --- a/config/GZ2J01/rels/d_a_obj_bmshutter/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_bmshutter/symbols.txt @@ -41,9 +41,11 @@ l_check_area = .rodata:0x00000018; // type:object size:0x30 scope:global @3973 = .rodata:0x00000068; // type:object size:0x4 scope:local @3981 = .rodata:0x0000006C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000070; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_411_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3852 = .data:0x00000024; // type:object size:0xC scope:local @3853 = .data:0x00000030; // type:object size:0xC scope:local @@ -57,5 +59,5 @@ l_func$3894 = .data:0x000000A8; // type:object size:0x24 scope:local l_daObjBmSh_Method = .data:0x000000CC; // type:object size:0x20 scope:global g_profile_Obj_BoomShutter = .data:0x000000EC; // type:object size:0x30 scope:global __vt__11daObjBmSh_c = .data:0x0000011C; // type:object size:0x28 scope:global -lbl_411_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_411_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_bosswarp/symbols.txt b/config/GZ2J01/rels/d_a_obj_bosswarp/symbols.txt index 147ac385e5..2be7dadaa3 100644 --- a/config/GZ2J01/rels/d_a_obj_bosswarp/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_bosswarp/symbols.txt @@ -78,7 +78,8 @@ l_dangeon_clr_bitNo$4282 = .rodata:0x00000130; // type:object size:0x24 scope:lo @stringBase0 = .rodata:0x0000018C; // type:object size:0x169 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_91_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_clearEvName = .data:0x00000024; // type:object size:0x24 scope:global l_warp_check_evName = .data:0x00000048; // type:object size:0x4 scope:global @@ -102,4 +103,4 @@ action_table$4273 = .data:0x00000158; // type:object size:0x3C scope:local l_daObjBossWarp_Method = .data:0x00000218; // type:object size:0x20 scope:global g_profile_Obj_BossWarp = .data:0x00000238; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000268; // type:object size:0xC scope:global -lbl_91_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_boumato/splits.txt b/config/GZ2J01/rels/d_a_obj_boumato/splits.txt index 34ec9e6528..c5e1a6e159 100644 --- a/config/GZ2J01/rels/d_a_obj_boumato/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_boumato/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_boumato.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_brg/splits.txt b/config/GZ2J01/rels/d_a_obj_brg/splits.txt index 54a4e56398..19b12eecaa 100644 --- a/config/GZ2J01/rels/d_a_obj_brg/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_brg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_brg.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_bsGate/splits.txt b/config/GZ2J01/rels/d_a_obj_bsGate/splits.txt index 6a36cbb38a..78db365ff0 100644 --- a/config/GZ2J01/rels/d_a_obj_bsGate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_bsGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bsGate.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_bsGate/symbols.txt b/config/GZ2J01/rels/d_a_obj_bsGate/symbols.txt index b40a0f7381..266dd02cd5 100644 --- a/config/GZ2J01/rels/d_a_obj_bsGate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_bsGate/symbols.txt @@ -38,9 +38,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3786 = .rodata:0x0000001C; // type:object size:0x4 scope:local @3820 = .rodata:0x00000020; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000024; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_415_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3724 = .data:0x00000020; // type:object size:0xC scope:local @3725 = .data:0x0000002C; // type:object size:0xC scope:local @3726 = .data:0x00000038; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_415_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_bubblePilar/splits.txt b/config/GZ2J01/rels/d_a_obj_bubblePilar/splits.txt index cddb6bae12..8b593ec5a6 100644 --- a/config/GZ2J01/rels/d_a_obj_bubblePilar/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_bubblePilar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bubblePilar.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_bubblePilar/symbols.txt b/config/GZ2J01/rels/d_a_obj_bubblePilar/symbols.txt index 941ec4205a..adebc009ac 100644 --- a/config/GZ2J01/rels/d_a_obj_bubblePilar/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_bubblePilar/symbols.txt @@ -35,9 +35,11 @@ mCcDObjInfo__13daBubbPilar_c = .rodata:0x00000000; // type:object size:0x30 scop @3940 = .rodata:0x00000038; // type:object size:0x4 scope:local particle_id$3953 = .rodata:0x0000003C; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_416_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__13daBubbPilar_c = .data:0x00000020; // type:object size:0x44 scope:global @3843 = .data:0x00000064; // type:object size:0xC scope:local @3844 = .data:0x00000070; // type:object size:0xC scope:local @@ -54,4 +56,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000148; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3623 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global -lbl_416_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$1367 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_carry/symbols.txt b/config/GZ2J01/rels/d_a_obj_carry/symbols.txt index 8a4248b400..db62cad5c3 100644 --- a/config/GZ2J01/rels/d_a_obj_carry/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_carry/symbols.txt @@ -262,7 +262,8 @@ particle_id$7914 = .rodata:0x00000BA0; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000BB0; // type:object size:0x191 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_18_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x38 scope:global l_bmdName = .data:0x00000058; // type:object size:0x38 scope:global kibako_jv_offset = .data:0x00000090; // type:object size:0x18 scope:global @@ -390,10 +391,10 @@ __vt__8cM3dGAab = .data:0x00000B4C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000B58; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000B7C; // type:object size:0xC scope:global l_sw_id = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_18_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte -lbl_18_bss_5 = .bss:0x00000005; // type:object size:0x1 data:byte -lbl_18_bss_6 = .bss:0x00000006; // type:object size:0x1 data:byte -lbl_18_bss_7 = .bss:0x00000007; // type:object size:0x1 data:byte -lbl_18_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte -lbl_18_bss_9 = .bss:0x00000009; // type:object size:0x1 data:byte -lbl_18_bss_A = .bss:0x0000000A; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000005; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x00000006; // type:object size:0x1 scope:local align:1 data:byte +init$0003 = .bss:0x00000007; // type:object size:0x1 scope:local align:1 data:byte +init$0004 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +init$0005 = .bss:0x00000009; // type:object size:0x1 scope:local align:1 data:byte +init$0006 = .bss:0x0000000A; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_cb/splits.txt b/config/GZ2J01/rels/d_a_obj_cb/splits.txt index a0b87e2f7a..af71e3063b 100644 --- a/config/GZ2J01/rels/d_a_obj_cb/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_cb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cb.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_cb/symbols.txt b/config/GZ2J01/rels/d_a_obj_cb/symbols.txt index 47e595e280..2687b4d656 100644 --- a/config/GZ2J01/rels/d_a_obj_cb/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_cb/symbols.txt @@ -53,6 +53,6 @@ __vt__8cM3dGAab = .data:0x0000005C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000068; // type:object size:0x24 scope:global __vt__14daObj_Cb_HIO_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_418_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_cblock/splits.txt b/config/GZ2J01/rels/d_a_obj_cblock/splits.txt index ca395a0774..2cfb7b4906 100644 --- a/config/GZ2J01/rels/d_a_obj_cblock/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_cblock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cblock.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_cblock/symbols.txt b/config/GZ2J01/rels/d_a_obj_cblock/symbols.txt index e7910b43f4..96cc78473c 100644 --- a/config/GZ2J01/rels/d_a_obj_cblock/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_cblock/symbols.txt @@ -67,7 +67,8 @@ l_cull_box = .rodata:0x00000000; // type:object size:0x18 scope:global @stringBase0 = .rodata:0x00000090; // type:object size:0x9 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_419_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_side_co_offset = .data:0x00000024; // type:object size:0x30 scope:global l_cyl_src = .data:0x00000054; // type:object size:0x44 scope:global @@ -103,6 +104,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_chainOffset = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3645 = .bss:0x00000060; // type:object size:0xC scope:local l_smokeSetOffset = .bss:0x0000006C; // type:object size:0xC scope:global +init$0000 = .bss:0x00000078; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_cdoor/symbols.txt b/config/GZ2J01/rels/d_a_obj_cdoor/symbols.txt index 1862827aa2..4417b2c606 100644 --- a/config/GZ2J01/rels/d_a_obj_cdoor/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_cdoor/symbols.txt @@ -37,9 +37,11 @@ l_attentionOffsetY = .rodata:0x00000010; // type:object size:0x8 scope:global @4014 = .rodata:0x00000028; // type:object size:0x4 scope:local align:4 data:float @4015 = .rodata:0x0000002C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000030; // type:object size:0xF scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_420_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_moveOffsetY = .data:0x00000028; // type:object size:0x8 scope:global @4020 = .data:0x00000030; // type:object size:0xC scope:local @@ -55,5 +57,5 @@ l_daObjCdoor_Method = .data:0x000000D8; // type:object size:0x20 scope:global g_profile_Obj_Cdoor = .data:0x000000F8; // type:object size:0x30 scope:global __vt__12daObjCdoor_c = .data:0x00000128; // type:object size:0x2C scope:global __vt__12J3DFrameCtrl = .data:0x00000154; // type:object size:0xC scope:global -lbl_420_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_420_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_chandelier/symbols.txt b/config/GZ2J01/rels/d_a_obj_chandelier/symbols.txt index a73101fe98..847790f03b 100644 --- a/config/GZ2J01/rels/d_a_obj_chandelier/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_chandelier/symbols.txt @@ -52,7 +52,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000060; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_421_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3715 = .data:0x00000024; // type:object size:0xC scope:local @3716 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_chest/symbols.txt b/config/GZ2J01/rels/d_a_obj_chest/symbols.txt index 023c76b148..4797c67276 100644 --- a/config/GZ2J01/rels/d_a_obj_chest/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_chest/symbols.txt @@ -57,9 +57,11 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @4072 = .rodata:0x000000AC; // type:object size:0x4 scope:local @4073 = .rodata:0x000000B0; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000B4; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_422_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3876 = .data:0x00000024; // type:object size:0xC scope:local @3877 = .data:0x00000030; // type:object size:0xC scope:local @@ -74,4 +76,4 @@ __vt__8cM3dGAab = .data:0x000000E0; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__12daObjChest_c = .data:0x0000011C; // type:object size:0x28 scope:global -lbl_422_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_cho/splits.txt b/config/GZ2J01/rels/d_a_obj_cho/splits.txt index bc07dfd3e9..fb9fefedb8 100644 --- a/config/GZ2J01/rels/d_a_obj_cho/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_cho/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cho.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_cho/symbols.txt b/config/GZ2J01/rels/d_a_obj_cho/symbols.txt index 2390e68b5e..1e23062966 100644 --- a/config/GZ2J01/rels/d_a_obj_cho/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_cho/symbols.txt @@ -96,6 +96,6 @@ __vt__10daObjCHO_c = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_ChoHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_423_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_cwall/splits.txt b/config/GZ2J01/rels/d_a_obj_cwall/splits.txt index f093cbb230..c54f8ce49c 100644 --- a/config/GZ2J01/rels/d_a_obj_cwall/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_cwall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cwall.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_cwall/symbols.txt b/config/GZ2J01/rels/d_a_obj_cwall/symbols.txt index 39b1ee845c..0fb9404e39 100644 --- a/config/GZ2J01/rels/d_a_obj_cwall/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_cwall/symbols.txt @@ -99,7 +99,8 @@ l_check_max_wolf = .rodata:0x00000058; // type:object size:0xC scope:global @stringBase0 = .rodata:0x00000108; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_433_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_cull_box = .data:0x00000028; // type:object size:0x18 scope:global l_side_co_offset = .data:0x00000040; // type:object size:0x30 scope:global align:4 data:float @@ -140,7 +141,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_chainOffset = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3760 = .bss:0x00000060; // type:object size:0xC scope:local l_smokeSetOffset = .bss:0x0000006C; // type:object size:0xC scope:global -lbl_433_bss_78 = .bss:0x00000078; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000078; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_dan/splits.txt b/config/GZ2J01/rels/d_a_obj_dan/splits.txt index df7be832f3..3cdee62db3 100644 --- a/config/GZ2J01/rels/d_a_obj_dan/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_dan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_dan.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_dan/symbols.txt b/config/GZ2J01/rels/d_a_obj_dan/symbols.txt index cc85422ce2..fdb9192547 100644 --- a/config/GZ2J01/rels/d_a_obj_dan/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_dan/symbols.txt @@ -86,6 +86,6 @@ __vt__10daObjDAN_c = .data:0x000000BC; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000C8; // type:object size:0xC scope:global __vt__14daObj_DanHIO_c = .data:0x000000D4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_435_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_digsnow/symbols.txt b/config/GZ2J01/rels/d_a_obj_digsnow/symbols.txt index fda35eb59f..3fb2a69dfa 100644 --- a/config/GZ2J01/rels/d_a_obj_digsnow/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_digsnow/symbols.txt @@ -41,9 +41,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3763 = .rodata:0x0000000C; // type:object size:0x4 scope:local @3764 = .rodata:0x00000010; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000014; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_437_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3713 = .data:0x00000024; // type:object size:0xC scope:local @3714 = .data:0x00000030; // type:object size:0xC scope:local @@ -59,4 +61,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__14dBgS_ObjGndChk = .data:0x0000011C; // type:object size:0x30 scope:global __vt__14daObjDigSnow_c = .data:0x0000014C; // type:object size:0x28 scope:global -lbl_437_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_dmelevator/splits.txt b/config/GZ2J01/rels/d_a_obj_dmelevator/splits.txt index d4cf3d408f..ae33f5fd67 100644 --- a/config/GZ2J01/rels/d_a_obj_dmelevator/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_dmelevator/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_dmelevator.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_dmelevator/symbols.txt b/config/GZ2J01/rels/d_a_obj_dmelevator/symbols.txt index 1537eb4800..74a6bd7b0b 100644 --- a/config/GZ2J01/rels/d_a_obj_dmelevator/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_dmelevator/symbols.txt @@ -81,7 +81,8 @@ l_swOffset = .rodata:0x00000000; // type:object size:0xC scope:global @stringBase0 = .rodata:0x0000007C; // type:object size:0x56 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_438_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_el_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_sw_arcName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000028; // type:object size:0x4 scope:global @@ -126,13 +127,14 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3654 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000058; // type:object size:0xC scope:local @3658 = .bss:0x00000064; // type:object size:0xC scope:local @3659 = .bss:0x00000070; // type:object size:0xC scope:local l_push_check_pos$3653 = .bss:0x0000007C; // type:object size:0x30 scope:local -lbl_438_bss_AC = .bss:0x000000AC; // type:object size:0x1 data:byte -lbl_438_bss_AD = .bss:0x000000AD; // type:object size:0x1 data:byte -lbl_438_bss_AE = .bss:0x000000AE; // type:object size:0x1 data:byte +init$0001 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte +init$0003 = .bss:0x000000AE; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_drop/symbols.txt b/config/GZ2J01/rels/d_a_obj_drop/symbols.txt index 290ac9467b..f95a35d596 100644 --- a/config/GZ2J01/rels/d_a_obj_drop/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_drop/symbols.txt @@ -77,9 +77,11 @@ target_angle_x$4297 = .rodata:0x00000090; // type:object size:0x6 scope:local @4730 = .rodata:0x000000B8; // type:object size:0x4 scope:local @4787 = .rodata:0x000000BC; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000C0; // type:object size:0x18 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_439_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4815 = .data:0x00000020; // type:object size:0xC scope:local @4816 = .data:0x0000002C; // type:object size:0xC scope:local @4817 = .data:0x00000038; // type:object size:0xC scope:local @@ -101,5 +103,5 @@ __vt__10dCcD_GStts = .data:0x00000190; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001B4; // type:object size:0x24 scope:global -lbl_439_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_439_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_fireWood/splits.txt b/config/GZ2J01/rels/d_a_obj_fireWood/splits.txt index ed5962a1db..9e72d60d5a 100644 --- a/config/GZ2J01/rels/d_a_obj_fireWood/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_fireWood/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fireWood.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_fireWood2/splits.txt b/config/GZ2J01/rels/d_a_obj_fireWood2/splits.txt index 8aeaef0582..c0e1563474 100644 --- a/config/GZ2J01/rels/d_a_obj_fireWood2/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_fireWood2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fireWood2.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_firepillar/symbols.txt b/config/GZ2J01/rels/d_a_obj_firepillar/symbols.txt index 637bc097df..101004f90a 100644 --- a/config/GZ2J01/rels/d_a_obj_firepillar/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_firepillar/symbols.txt @@ -37,9 +37,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3784 = .rodata:0x00000010; // type:object size:0x4 scope:local align:4 data:float @3853 = .rodata:0x00000014; // type:object size:0x4 scope:local align:4 data:float @3895 = .rodata:0x00000018; // type:object size:0x4 scope:local +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_447_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global align:4 data:float l_cps_src = .data:0x00000038; // type:object size:0x4C scope:global @3789 = .data:0x00000084; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ __vt__10cCcD_GStts = .data:0x00000128; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x00000134; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000140; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000014C; // type:object size:0x24 scope:global -lbl_447_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_firepillar2/symbols.txt b/config/GZ2J01/rels/d_a_obj_firepillar2/symbols.txt index 4ffb93d009..85e05a089c 100644 --- a/config/GZ2J01/rels/d_a_obj_firepillar2/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_firepillar2/symbols.txt @@ -56,9 +56,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4294 = .rodata:0x00000050; // type:object size:0x4 scope:local @4295 = .rodata:0x00000054; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000058; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_448_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cps_src = .data:0x0000003C; // type:object size:0x4C scope:global @@ -80,4 +82,4 @@ __vt__10dCcD_GStts = .data:0x0000016C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001A8; // type:object size:0xC scope:global -lbl_448_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_food/splits.txt b/config/GZ2J01/rels/d_a_obj_food/splits.txt index 00ffb11a11..397338c68c 100644 --- a/config/GZ2J01/rels/d_a_obj_food/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_food/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_food.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_food/symbols.txt b/config/GZ2J01/rels/d_a_obj_food/symbols.txt index 6b3171c27f..495e38aa46 100644 --- a/config/GZ2J01/rels/d_a_obj_food/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_food/symbols.txt @@ -70,6 +70,6 @@ __vt__8cM3dGAab = .data:0x000000E4; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F0; // type:object size:0x24 scope:global __vt__16daObj_Food_HIO_c = .data:0x00000114; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_452_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3642 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_fw/splits.txt b/config/GZ2J01/rels/d_a_obj_fw/splits.txt index b07e9ec321..39b7b0be41 100644 --- a/config/GZ2J01/rels/d_a_obj_fw/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_fw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fw.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_fw/symbols.txt b/config/GZ2J01/rels/d_a_obj_fw/symbols.txt index 9f88b36990..bb5a3adf18 100644 --- a/config/GZ2J01/rels/d_a_obj_fw/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_fw/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Fw_Method = .data:0x00000010; // type:object size:0x20 scope:global g_profile_OBJ_FW = .data:0x00000030; // type:object size:0x30 scope:global __vt__14daObj_Fw_HIO_c = .data:0x00000060; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_453_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3642 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_gadget/splits.txt b/config/GZ2J01/rels/d_a_obj_gadget/splits.txt index 73f2637801..e67e4a0030 100644 --- a/config/GZ2J01/rels/d_a_obj_gadget/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_gadget/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gadget.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_gadget/symbols.txt b/config/GZ2J01/rels/d_a_obj_gadget/symbols.txt index e58c0bc36c..c14608a647 100644 --- a/config/GZ2J01/rels/d_a_obj_gadget/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_gadget/symbols.txt @@ -78,7 +78,8 @@ l_ccDObjData = .rodata:0x0000002C; // type:object size:0x30 scope:global @stringBase0 = .rodata:0x000000E0; // type:object size:0x6 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_454_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global l_ccDCyl = .data:0x00000038; // type:object size:0x44 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_gb/symbols.txt b/config/GZ2J01/rels/d_a_obj_gb/symbols.txt index 52759b74f6..e14b85f310 100644 --- a/config/GZ2J01/rels/d_a_obj_gb/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_gb/symbols.txt @@ -27,7 +27,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000030; // type:object size:0xF scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_457_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double bmd$3914 = .data:0x00000020; // type:object size:0x8 scope:local brk$3915 = .data:0x00000028; // type:object size:0x8 scope:local btk$3916 = .data:0x00000030; // type:object size:0x8 scope:local diff --git a/config/GZ2J01/rels/d_a_obj_geyser/symbols.txt b/config/GZ2J01/rels/d_a_obj_geyser/symbols.txt index b638d89b41..ff23b18df7 100644 --- a/config/GZ2J01/rels/d_a_obj_geyser/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_geyser/symbols.txt @@ -71,9 +71,11 @@ l_scale = .rodata:0x00000008; // type:object size:0x18 scope:global @4280 = .rodata:0x0000006C; // type:object size:0x4 scope:local @4281 = .rodata:0x00000070; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000074; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_458_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cps_src = .data:0x0000003C; // type:object size:0x4C scope:global @@ -93,5 +95,5 @@ __vt__10dCcD_GStts = .data:0x0000018C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000198; // type:object size:0xC scope:global __vt__8cM3dGLin = .data:0x000001A4; // type:object size:0xC scope:global __vt__13daObjGeyser_c = .data:0x000001B0; // type:object size:0x28 scope:global -lbl_458_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_458_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_glowSphere/splits.txt b/config/GZ2J01/rels/d_a_obj_glowSphere/splits.txt index 7a32f7c9c4..bfeaf6a9fb 100644 --- a/config/GZ2J01/rels/d_a_obj_glowSphere/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_glowSphere/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_glowSphere.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_glowSphere/symbols.txt b/config/GZ2J01/rels/d_a_obj_glowSphere/symbols.txt index 8cbaff6045..e638ed79cd 100644 --- a/config/GZ2J01/rels/d_a_obj_glowSphere/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_glowSphere/symbols.txt @@ -66,9 +66,11 @@ mCcDObjInfo__10daGlwSph_c = .rodata:0x00000008; // type:object size:0x30 scope:g @4031 = .rodata:0x0000004C; // type:object size:0x4 scope:local align:4 data:float @4103 = .rodata:0x00000050; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000054; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_459_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global align:4 data:float mCcDSph__10daGlwSph_c = .data:0x00000038; // type:object size:0x40 scope:global l_prmColor = .data:0x00000078; // type:object size:0x4 scope:global @@ -118,8 +120,8 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_HIO = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3673 = .bss:0x00000060; // type:object size:0xC scope:local mSphMng__10daGlwSph_c = .bss:0x0000006C; // type:object size:0x3C4 scope:global -lbl_459_bss_430 = .bss:0x00000430; // type:object size:0x1 data:byte -lbl_459_bss_431 = .bss:0x00000431; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000430; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000431; // type:object size:0x1 scope:local align:1 data:byte sSeId$4016 = .bss:0x00000434; // type:object size:0x14 scope:local data:4byte mSphSe__12_GlSph_Mng_c = .bss:0x00000448; // type:object size:0x2 scope:global data:2byte mSeClrTmr__12_GlSph_Mng_c = .bss:0x0000044A; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2J01/rels/d_a_obj_gm/splits.txt b/config/GZ2J01/rels/d_a_obj_gm/splits.txt index 5a84ec5cc0..f07956488e 100644 --- a/config/GZ2J01/rels/d_a_obj_gm/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_gm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gm.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_gm/symbols.txt b/config/GZ2J01/rels/d_a_obj_gm/symbols.txt index 9e9187abb1..56f6602a9f 100644 --- a/config/GZ2J01/rels/d_a_obj_gm/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_gm/symbols.txt @@ -67,9 +67,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4425 = .rodata:0x0000008C; // type:object size:0x4 scope:local @4426 = .rodata:0x00000090; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000094; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_460_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double obj_size = .data:0x00000020; // type:object size:0x1C scope:global weg = .data:0x0000003C; // type:object size:0x1C scope:global tim = .data:0x00000058; // type:object size:0xE scope:global @@ -88,6 +90,6 @@ __vt__8cM3dGAab = .data:0x0000018C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000198; // type:object size:0x24 scope:global __vt__14daObj_Gm_HIO_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_460_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3661 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_goGate/splits.txt b/config/GZ2J01/rels/d_a_obj_goGate/splits.txt index 354717688c..0d2a15792b 100644 --- a/config/GZ2J01/rels/d_a_obj_goGate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_goGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_goGate.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_goGate/symbols.txt b/config/GZ2J01/rels/d_a_obj_goGate/symbols.txt index bd5856b56c..a2505cd7f8 100644 --- a/config/GZ2J01/rels/d_a_obj_goGate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_goGate/symbols.txt @@ -38,9 +38,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3782 = .rodata:0x00000018; // type:object size:0x4 scope:local @3783 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_461_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3727 = .data:0x00000020; // type:object size:0xC scope:local @3728 = .data:0x0000002C; // type:object size:0xC scope:local @3729 = .data:0x00000038; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:byte -lbl_461_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_gomikabe/splits.txt b/config/GZ2J01/rels/d_a_obj_gomikabe/splits.txt index e2b75e2cd5..f807654679 100644 --- a/config/GZ2J01/rels/d_a_obj_gomikabe/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_gomikabe/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gomikabe.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt index c20eccffca..36576e5791 100644 --- a/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_gomikabe/symbols.txt @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3761 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_obj_gpTaru/splits.txt b/config/GZ2J01/rels/d_a_obj_gpTaru/splits.txt index e824a86e22..dc3917df81 100644 --- a/config/GZ2J01/rels/d_a_obj_gpTaru/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_gpTaru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gpTaru.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_gpTaru/symbols.txt b/config/GZ2J01/rels/d_a_obj_gpTaru/symbols.txt index 4b12314a4d..c51ae460b8 100644 --- a/config/GZ2J01/rels/d_a_obj_gpTaru/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_gpTaru/symbols.txt @@ -106,7 +106,8 @@ mCcDObjInfo__10daGpTaru_c = .rodata:0x00000014; // type:object size:0x30 scope:g @stringBase0 = .rodata:0x000000F4; // type:object size:0x21 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_96_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daGpTaru_c = .data:0x00000020; // type:object size:0x44 scope:global @4338 = .data:0x00000064; // type:object size:0xC scope:local @4339 = .data:0x00000070; // type:object size:0xC scope:local @@ -134,4 +135,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000238; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x3C scope:global align:4 data:float -lbl_96_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_gra2/splits.txt b/config/GZ2J01/rels/d_a_obj_gra2/splits.txt index 5b6e332a9a..863e63fc7e 100644 --- a/config/GZ2J01/rels/d_a_obj_gra2/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_gra2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gra2.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_gra2/symbols.txt b/config/GZ2J01/rels/d_a_obj_gra2/symbols.txt index 0be368e779..7c7ccc918f 100644 --- a/config/GZ2J01/rels/d_a_obj_gra2/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_gra2/symbols.txt @@ -326,7 +326,8 @@ l_prticles_id$6229 = .rodata:0x00000254; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000398; // type:object size:0x54 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_463_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resFileNameList = .data:0x00000020; // type:object size:0x10 scope:global l_exLoadRes_GRAa = .data:0x00000030; // type:object size:0x10 scope:global l_exLoadRes_GRA_jump = .data:0x00000040; // type:object size:0x10 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_groundwater/splits.txt b/config/GZ2J01/rels/d_a_obj_groundwater/splits.txt index d8ef2670d5..080dbe02cc 100644 --- a/config/GZ2J01/rels/d_a_obj_groundwater/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_groundwater/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_groundwater.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_groundwater/symbols.txt b/config/GZ2J01/rels/d_a_obj_groundwater/symbols.txt index c2a1426c62..6aa2773cee 100644 --- a/config/GZ2J01/rels/d_a_obj_groundwater/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_groundwater/symbols.txt @@ -40,7 +40,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000014; // type:object size:0x6 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_467_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3993 = .data:0x00000020; // type:object size:0xC scope:local @3994 = .data:0x0000002C; // type:object size:0xC scope:local @3995 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_h_saku/splits.txt b/config/GZ2J01/rels/d_a_obj_h_saku/splits.txt index 183f8e88a3..73a1dbdfd5 100644 --- a/config/GZ2J01/rels/d_a_obj_h_saku/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_h_saku/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_h_saku.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_heavySw/splits.txt b/config/GZ2J01/rels/d_a_obj_heavySw/splits.txt index fdbfff035e..7c3c1ca60d 100644 --- a/config/GZ2J01/rels/d_a_obj_heavySw/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_heavySw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_heavySw.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_heavySw/symbols.txt b/config/GZ2J01/rels/d_a_obj_heavySw/symbols.txt index 1e0a3d809b..6ba64ae3b8 100644 --- a/config/GZ2J01/rels/d_a_obj_heavySw/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_heavySw/symbols.txt @@ -57,9 +57,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3998 = .rodata:0x00000044; // type:object size:0x4 scope:local @3999 = .rodata:0x00000048; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000004C; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_476_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3770 = .data:0x00000020; // type:object size:0xC scope:local @3771 = .data:0x0000002C; // type:object size:0xC scope:local @3772 = .data:0x00000038; // type:object size:0xC scope:local @@ -76,4 +78,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000014C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3641 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x38 scope:global data:byte -lbl_476_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_hfuta/splits.txt b/config/GZ2J01/rels/d_a_obj_hfuta/splits.txt index 489dc0a1ba..e160aa45c9 100644 --- a/config/GZ2J01/rels/d_a_obj_hfuta/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_hfuta/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_hfuta.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_hfuta/symbols.txt b/config/GZ2J01/rels/d_a_obj_hfuta/symbols.txt index 5cb0f1d61d..82c8ed0758 100644 --- a/config/GZ2J01/rels/d_a_obj_hfuta/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_hfuta/symbols.txt @@ -33,6 +33,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3997 = .rodata:0x00000018; // type:object size:0x4 scope:local @3998 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @@ -62,6 +63,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3687 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3690 = .bss:0x00000058; // type:object size:0xC scope:local @3691 = .bss:0x00000064; // type:object size:0xC scope:local @3692 = .bss:0x00000070; // type:object size:0xC scope:local @@ -105,7 +107,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3730 = .bss:0x00000238; // type:object size:0xC scope:local @3731 = .bss:0x00000244; // type:object size:0xC scope:local l_rot_data$3686 = .bss:0x00000250; // type:object size:0x102 scope:local -lbl_477_bss_352 = .bss:0x00000352; // type:object size:0x1 data:byte +init$0001 = .bss:0x00000352; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000354; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000358; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000035C; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_hsTarget/splits.txt b/config/GZ2J01/rels/d_a_obj_hsTarget/splits.txt index 159497784a..b4b384c34e 100644 --- a/config/GZ2J01/rels/d_a_obj_hsTarget/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_hsTarget/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_hsTarget.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_ice_s/splits.txt b/config/GZ2J01/rels/d_a_obj_ice_s/splits.txt index 5a1b8599f3..1fe95ce4db 100644 --- a/config/GZ2J01/rels/d_a_obj_ice_s/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ice_s/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ice_s.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt index 23c57b9e6f..2d6551c178 100644 --- a/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_ice_s/symbols.txt @@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3639 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_iceblock/symbols.txt b/config/GZ2J01/rels/d_a_obj_iceblock/symbols.txt index dbb8fb91a8..e2aa9afc5e 100644 --- a/config/GZ2J01/rels/d_a_obj_iceblock/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_iceblock/symbols.txt @@ -86,9 +86,11 @@ l_check_offsetXZ$4577 = .rodata:0x00000124; // type:object size:0x3C scope:local l_check_offsetXZ$4641 = .rodata:0x00000168; // type:object size:0x3C scope:local @4696 = .rodata:0x000001A4; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000001A8; // type:object size:0x34 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_481_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @4231 = .data:0x00000024; // type:object size:0xC scope:local @4232 = .data:0x00000030; // type:object size:0xC scope:local @@ -109,5 +111,5 @@ __vt__8cM3dGAab = .data:0x00000164; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000170; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000194; // type:object size:0xC scope:global __vt__13daObjIceBlk_c = .data:0x000001A0; // type:object size:0x28 scope:global -lbl_481_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_481_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_iceleaf/symbols.txt b/config/GZ2J01/rels/d_a_obj_iceleaf/symbols.txt index 4e26d78eba..968ddd7b96 100644 --- a/config/GZ2J01/rels/d_a_obj_iceleaf/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_iceleaf/symbols.txt @@ -55,7 +55,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_482_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000024; // type:object size:0x44 scope:global @3975 = .data:0x00000068; // type:object size:0xC scope:local @@ -77,5 +78,5 @@ __vt__8cM3dGCyl = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001B4; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001D8; // type:object size:0xC scope:global -init$1997 = .bss:0x00000000; // type:object size:0x1 data:byte -init$2129 = .bss:0x00000001; // type:object size:0x1 data:byte +init$1997 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$2129 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_ita/splits.txt b/config/GZ2J01/rels/d_a_obj_ita/splits.txt index 596b188993..86d91f3f61 100644 --- a/config/GZ2J01/rels/d_a_obj_ita/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ita/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ita.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_itamato/splits.txt b/config/GZ2J01/rels/d_a_obj_itamato/splits.txt index 978d110e95..7e960f0232 100644 --- a/config/GZ2J01/rels/d_a_obj_itamato/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_itamato/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_itamato.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_ito/splits.txt b/config/GZ2J01/rels/d_a_obj_ito/splits.txt index 57e4daea3e..07bfd8fd4c 100644 --- a/config/GZ2J01/rels/d_a_obj_ito/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ito/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ito.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_ito/symbols.txt b/config/GZ2J01/rels/d_a_obj_ito/symbols.txt index 0e78432374..a548ca3657 100644 --- a/config/GZ2J01/rels/d_a_obj_ito/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_ito/symbols.txt @@ -80,6 +80,6 @@ __vt__8cM3dGSph = .data:0x000000B8; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000000C4; // type:object size:0x14 scope:global __vt__15daObj_Ito_HIO_c = .data:0x000000D8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_19_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3765 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_kabuto/splits.txt b/config/GZ2J01/rels/d_a_obj_kabuto/splits.txt index ede0d65156..906b589a51 100644 --- a/config/GZ2J01/rels/d_a_obj_kabuto/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kabuto/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kabuto.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kabuto/symbols.txt b/config/GZ2J01/rels/d_a_obj_kabuto/symbols.txt index f6e756713c..e380990650 100644 --- a/config/GZ2J01/rels/d_a_obj_kabuto/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kabuto/symbols.txt @@ -101,6 +101,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KabHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_488_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_kag/splits.txt b/config/GZ2J01/rels/d_a_obj_kag/splits.txt index 0f89dce71b..a3d02bfa53 100644 --- a/config/GZ2J01/rels/d_a_obj_kag/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kag.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kag/symbols.txt b/config/GZ2J01/rels/d_a_obj_kag/symbols.txt index a350b5aff7..6eefbd8374 100644 --- a/config/GZ2J01/rels/d_a_obj_kag/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kag/symbols.txt @@ -98,9 +98,11 @@ l_kag_itemno = .rodata:0x000000E8; // type:object size:0x2 scope:global l_musiya_num = .rodata:0x0000010C; // type:object size:0x4 scope:global @4994 = .rodata:0x00000110; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000114; // type:object size:0xE scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_489_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__25@unnamed@d_a_obj_kag_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global @3980 = .data:0x00000060; // type:object size:0xC scope:local data:4byte @4341 = .data:0x0000006C; // type:object size:0xC scope:local data:4byte @@ -127,6 +129,6 @@ __vt__8cM3dGPla = .data:0x00000194; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001A0; // type:object size:0xC scope:global __vt__14daObj_KagHIO_c = .data:0x000001AC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_489_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_kago/splits.txt b/config/GZ2J01/rels/d_a_obj_kago/splits.txt index 6083fbd40d..14dd82a7fa 100644 --- a/config/GZ2J01/rels/d_a_obj_kago/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kago/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kago.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kago/symbols.txt b/config/GZ2J01/rels/d_a_obj_kago/symbols.txt index 0c8307372d..5f6d454cf0 100644 --- a/config/GZ2J01/rels/d_a_obj_kago/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kago/symbols.txt @@ -89,7 +89,8 @@ heapSize$3870 = .rodata:0x0000005C; // type:object size:0x14 scope:local @stringBase0 = .rodata:0x00000114; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_491_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global l_ccDCyl = .data:0x00000038; // type:object size:0x44 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_kamakiri/splits.txt b/config/GZ2J01/rels/d_a_obj_kamakiri/splits.txt index 0f4ccae4fd..a54be4fbf7 100644 --- a/config/GZ2J01/rels/d_a_obj_kamakiri/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kamakiri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kamakiri.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kamakiri/symbols.txt b/config/GZ2J01/rels/d_a_obj_kamakiri/symbols.txt index 6e060164da..0b5d0c4ebc 100644 --- a/config/GZ2J01/rels/d_a_obj_kamakiri/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kamakiri/symbols.txt @@ -98,6 +98,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KamHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_493_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_kanban2/splits.txt b/config/GZ2J01/rels/d_a_obj_kanban2/splits.txt index 61180c71f8..28418b62ab 100644 --- a/config/GZ2J01/rels/d_a_obj_kanban2/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kanban2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kanban2.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kanban2/symbols.txt b/config/GZ2J01/rels/d_a_obj_kanban2/symbols.txt index 3b5ddc92ea..44efad4b61 100644 --- a/config/GZ2J01/rels/d_a_obj_kanban2/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kanban2/symbols.txt @@ -147,10 +147,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_98_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3965 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @4561 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte sc$4560 = .bss:0x00000070; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_kantera/symbols.txt b/config/GZ2J01/rels/d_a_obj_kantera/symbols.txt index 8a42aaf1e9..c346ba9d66 100644 --- a/config/GZ2J01/rels/d_a_obj_kantera/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kantera/symbols.txt @@ -47,9 +47,11 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @4079 = .rodata:0x0000007C; // type:object size:0x4 scope:local @4145 = .rodata:0x00000080; // type:object size:0x4 scope:local data:string @stringBase0 = .rodata:0x00000084; // type:object size:0x10 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_494_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4184 = .data:0x00000020; // type:object size:0xC scope:local @4185 = .data:0x0000002C; // type:object size:0xC scope:local @4186 = .data:0x00000038; // type:object size:0xC scope:local @@ -65,4 +67,4 @@ __vt__8cM3dGAab = .data:0x00000100; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000010C; // type:object size:0x24 scope:global __vt__15daItemKantera_c = .data:0x00000130; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x00000174; // type:object size:0xC scope:global -lbl_494_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_katatsumuri/splits.txt b/config/GZ2J01/rels/d_a_obj_katatsumuri/splits.txt index a445b88e2d..4fb5fc047f 100644 --- a/config/GZ2J01/rels/d_a_obj_katatsumuri/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_katatsumuri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_katatsumuri.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_katatsumuri/symbols.txt b/config/GZ2J01/rels/d_a_obj_katatsumuri/symbols.txt index f609dc9b92..4dac95e845 100644 --- a/config/GZ2J01/rels/d_a_obj_katatsumuri/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_katatsumuri/symbols.txt @@ -94,6 +94,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KatHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_495_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_kbacket/splits.txt b/config/GZ2J01/rels/d_a_obj_kbacket/splits.txt index 10d5a8fb94..99aea992f8 100644 --- a/config/GZ2J01/rels/d_a_obj_kbacket/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kbacket/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kbacket.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kbacket/symbols.txt b/config/GZ2J01/rels/d_a_obj_kbacket/symbols.txt index ed40e5bb60..b7b0414fe9 100644 --- a/config/GZ2J01/rels/d_a_obj_kbacket/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kbacket/symbols.txt @@ -80,7 +80,8 @@ l_ccDObjData = .rodata:0x0000002C; // type:object size:0x30 scope:global @stringBase0 = .rodata:0x000000EC; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_99_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_resNameList = .data:0x00000030; // type:object size:0x4 scope:global data:4byte l_ccDCyl = .data:0x00000034; // type:object size:0x44 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_kbox/splits.txt b/config/GZ2J01/rels/d_a_obj_kbox/splits.txt index 517449ef35..dcb92fa326 100644 --- a/config/GZ2J01/rels/d_a_obj_kbox/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kbox.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kbox/symbols.txt b/config/GZ2J01/rels/d_a_obj_kbox/symbols.txt index 20e516dad6..f4f2b7d9ea 100644 --- a/config/GZ2J01/rels/d_a_obj_kbox/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kbox/symbols.txt @@ -105,10 +105,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_497_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @3976 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte sc$3975 = .bss:0x00000070; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_key/splits.txt b/config/GZ2J01/rels/d_a_obj_key/splits.txt index f0e95d6771..c38900b510 100644 --- a/config/GZ2J01/rels/d_a_obj_key/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_key/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_key.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_key/symbols.txt b/config/GZ2J01/rels/d_a_obj_key/symbols.txt index 30995d3d75..1be44badfd 100644 --- a/config/GZ2J01/rels/d_a_obj_key/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_key/symbols.txt @@ -74,7 +74,7 @@ __vt__8cM3dGAab = .data:0x00000060; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000006C; // type:object size:0x24 scope:global __vt__15daObj_Key_HIO_c = .data:0x00000090; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_498_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3773 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte target_info_count = .bss:0x00000028; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2J01/rels/d_a_obj_keyhole/splits.txt b/config/GZ2J01/rels/d_a_obj_keyhole/splits.txt index 93c8d55660..718783fd0a 100644 --- a/config/GZ2J01/rels/d_a_obj_keyhole/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_keyhole/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_keyhole.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_keyhole/symbols.txt b/config/GZ2J01/rels/d_a_obj_keyhole/symbols.txt index 7c6539e61b..e7d459bd54 100644 --- a/config/GZ2J01/rels/d_a_obj_keyhole/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_keyhole/symbols.txt @@ -88,7 +88,8 @@ estimateSizeTbl$4475 = .rodata:0x000000B0; // type:object size:0x14 scope:local @stringBase0 = .rodata:0x000000D8; // type:object size:0x30 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_499_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double bmd_d$4377 = .data:0x00000020; // type:object size:0x28 scope:local mdl_f$4378 = .data:0x00000048; // type:object size:0x28 scope:local bck_d$4396 = .data:0x00000070; // type:object size:0x28 scope:local @@ -120,10 +121,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_499_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3650 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @3934 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte @3937 = .bss:0x00000070; // type:object size:0xC scope:local @3938 = .bss:0x0000007C; // type:object size:0xC scope:local @3939 = .bss:0x00000088; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_kgate/symbols.txt b/config/GZ2J01/rels/d_a_obj_kgate/symbols.txt index 9f4d290a5f..b6a1fc6e07 100644 --- a/config/GZ2J01/rels/d_a_obj_kgate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kgate/symbols.txt @@ -95,7 +95,8 @@ l_tg_offset$4833 = .rodata:0x00000158; // type:object size:0x30 scope:local @stringBase0 = .rodata:0x00000188; // type:object size:0x6A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_100_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0xC scope:global l_evName$4056 = .data:0x0000002C; // type:object size:0xC scope:local @4582 = .data:0x00000038; // type:object size:0xC scope:local @@ -114,5 +115,5 @@ __vt__10dCcD_GStts = .data:0x00000134; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000140; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x0000014C; // type:object size:0xC scope:global __vt__12daObjKGate_c = .data:0x00000158; // type:object size:0x28 scope:global -lbl_100_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_100_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_ki/splits.txt b/config/GZ2J01/rels/d_a_obj_ki/splits.txt index a220f5d6da..0274050b1b 100644 --- a/config/GZ2J01/rels/d_a_obj_ki/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ki/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ki.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_ki/symbols.txt b/config/GZ2J01/rels/d_a_obj_ki/symbols.txt index 513c684e92..be0b46d673 100644 --- a/config/GZ2J01/rels/d_a_obj_ki/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_ki/symbols.txt @@ -47,6 +47,6 @@ l_daObj_Ki_Method = .data:0x00000010; // type:object size:0x20 scope:global g_profile_OBJ_KI = .data:0x00000030; // type:object size:0x30 scope:global __vt__14daObj_Ki_HIO_c = .data:0x00000060; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_500_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_kiPot/splits.txt b/config/GZ2J01/rels/d_a_obj_kiPot/splits.txt index 212bdb7626..938fc2db32 100644 --- a/config/GZ2J01/rels/d_a_obj_kiPot/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kiPot/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kiPot.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kiPot/symbols.txt b/config/GZ2J01/rels/d_a_obj_kiPot/symbols.txt index 82107971f1..172c8bca9f 100644 --- a/config/GZ2J01/rels/d_a_obj_kiPot/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kiPot/symbols.txt @@ -38,4 +38,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3620 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global -lbl_501_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_kita/splits.txt b/config/GZ2J01/rels/d_a_obj_kita/splits.txt index 332b298e53..c5fa02f337 100644 --- a/config/GZ2J01/rels/d_a_obj_kita/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kita/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kita.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kita/symbols.txt b/config/GZ2J01/rels/d_a_obj_kita/symbols.txt index bac9b5db57..3934771498 100644 --- a/config/GZ2J01/rels/d_a_obj_kita/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kita/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global __vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_obj_kshutter/symbols.txt b/config/GZ2J01/rels/d_a_obj_kshutter/symbols.txt index 64180b8200..4a78c2963c 100644 --- a/config/GZ2J01/rels/d_a_obj_kshutter/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kshutter/symbols.txt @@ -70,9 +70,11 @@ l_eff_id$4307 = .rodata:0x00000084; // type:object size:0xA scope:local @4357 = .rodata:0x00000094; // type:object size:0x4 scope:local @4358 = .rodata:0x00000098; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000009C; // type:object size:0x119 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_506_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x14 scope:global l_anmName = .data:0x00000034; // type:object size:0x28 scope:global l_eventName = .data:0x0000005C; // type:object size:0x28 scope:global @@ -101,8 +103,8 @@ daObjKshtr_METHODS = .data:0x00000200; // type:object size:0x20 scope:global g_profile_Obj_Kshutter = .data:0x00000220; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000250; // type:object size:0xC scope:global __vt__12daObjKshtr_c = .data:0x0000025C; // type:object size:0x28 scope:global -lbl_506_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_506_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte -lbl_506_bss_2 = .bss:0x00000002; // type:object size:0x1 data:byte -lbl_506_bss_3 = .bss:0x00000003; // type:object size:0x1 data:byte -lbl_506_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x00000002; // type:object size:0x1 scope:local align:1 data:byte +init$0003 = .bss:0x00000003; // type:object size:0x1 scope:local align:1 data:byte +init$0004 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_ktOnFire/splits.txt b/config/GZ2J01/rels/d_a_obj_ktOnFire/splits.txt index 7c63735e8c..03141eab1b 100644 --- a/config/GZ2J01/rels/d_a_obj_ktOnFire/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ktOnFire/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ktOnFire.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kuwagata/splits.txt b/config/GZ2J01/rels/d_a_obj_kuwagata/splits.txt index c9ede69e1b..e3532a60e6 100644 --- a/config/GZ2J01/rels/d_a_obj_kuwagata/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_kuwagata/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kuwagata.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt b/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt index 6b58a43d16..fef3b93622 100644 --- a/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kuwagata/symbols.txt @@ -99,6 +99,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KuwHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_kznkarm/symbols.txt b/config/GZ2J01/rels/d_a_obj_kznkarm/symbols.txt index c129d736a5..8e4f359a18 100644 --- a/config/GZ2J01/rels/d_a_obj_kznkarm/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_kznkarm/symbols.txt @@ -51,7 +51,8 @@ M_attr__14daObjKznkarm_c = .rodata:0x00000000; // type:object size:0x38 scope:gl @stringBase0 = .rodata:0x00000088; // type:object size:0x11 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_510_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte @3641 = .data:0x00000024; // type:object size:0xC scope:local @3642 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_ladder/symbols.txt b/config/GZ2J01/rels/d_a_obj_ladder/symbols.txt index 68c44877b7..3f13114c64 100644 --- a/config/GZ2J01/rels/d_a_obj_ladder/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_ladder/symbols.txt @@ -48,9 +48,11 @@ M_arcname__Q211daObjLadder5Act_c = .rodata:0x00000024; // type:object size:0x5 s @3838 = .rodata:0x00000050; // type:object size:0x4 scope:local @3839 = .rodata:0x00000054; // type:object size:0x4 scope:local @3840 = .rodata:0x00000058; // type:object size:0x4 scope:local +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_103_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double L_attr_type__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@ = .data:0x00000020; // type:object size:0x30 scope:global @3878 = .data:0x00000050; // type:object size:0xC scope:local @3879 = .data:0x0000005C; // type:object size:0xC scope:local @@ -63,4 +65,4 @@ g_profile_Obj_Ladder = .data:0x000000E8; // type:object size:0x30 scope:global __vt__14dBgS_ObjGndChk = .data:0x00000118; // type:object size:0x30 scope:global __vt__Q211daObjLadder5Act_c = .data:0x00000148; // type:object size:0x28 scope:global M_tmp_mtx__Q211daObjLadder5Act_c = .bss:0x00000000; // type:object size:0x30 scope:global -lbl_103_bss_30 = .bss:0x00000030; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000030; // type:object size:0x1 align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lbox/splits.txt b/config/GZ2J01/rels/d_a_obj_lbox/splits.txt index 3fff317a32..8c2427e5c2 100644 --- a/config/GZ2J01/rels/d_a_obj_lbox/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lbox.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lbox/symbols.txt b/config/GZ2J01/rels/d_a_obj_lbox/symbols.txt index 9184ad9efe..b6f5b49362 100644 --- a/config/GZ2J01/rels/d_a_obj_lbox/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lbox/symbols.txt @@ -47,6 +47,6 @@ __vt__8cM3dGAab = .data:0x0000009C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000A8; // type:object size:0x24 scope:global __vt__16daObj_Lbox_HIO_c = .data:0x000000CC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_513_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_life_container/symbols.txt b/config/GZ2J01/rels/d_a_obj_life_container/symbols.txt index 7a72c933dd..2b33b0a2a1 100644 --- a/config/GZ2J01/rels/d_a_obj_life_container/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_life_container/symbols.txt @@ -77,7 +77,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @stringBase0 = .rodata:0x000000B0; // type:object size:0x28 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_53_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4479 = .data:0x00000020; // type:object size:0xC scope:local @4480 = .data:0x0000002C; // type:object size:0xC scope:local @4481 = .data:0x00000038; // type:object size:0xC scope:local @@ -96,4 +97,4 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__11daObjLife_c = .data:0x00000184; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001C8; // type:object size:0xC scope:global -lbl_53_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv1Candle00/splits.txt b/config/GZ2J01/rels/d_a_obj_lv1Candle00/splits.txt index 0ea456e188..ed188e11ad 100644 --- a/config/GZ2J01/rels/d_a_obj_lv1Candle00/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv1Candle00/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv1Candle00.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv1Candle01/splits.txt b/config/GZ2J01/rels/d_a_obj_lv1Candle01/splits.txt index 68a546f9e6..e4fb138496 100644 --- a/config/GZ2J01/rels/d_a_obj_lv1Candle01/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv1Candle01/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv1Candle01.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv2Candle/splits.txt b/config/GZ2J01/rels/d_a_obj_lv2Candle/splits.txt index 62f91bb2ed..b618332442 100644 --- a/config/GZ2J01/rels/d_a_obj_lv2Candle/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv2Candle/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv2Candle.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv3Candle/splits.txt b/config/GZ2J01/rels/d_a_obj_lv3Candle/splits.txt index dd14a358b4..ebe5dd296f 100644 --- a/config/GZ2J01/rels/d_a_obj_lv3Candle/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv3Candle/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Candle.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv3Water/splits.txt b/config/GZ2J01/rels/d_a_obj_lv3Water/splits.txt index ce388d462c..47234d64fd 100644 --- a/config/GZ2J01/rels/d_a_obj_lv3Water/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv3Water/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Water.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv3Water/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv3Water/symbols.txt index ca126b217c..e0d91a5cdb 100644 --- a/config/GZ2J01/rels/d_a_obj_lv3Water/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv3Water/symbols.txt @@ -49,7 +49,8 @@ estimateSizeTbl$3746 = .rodata:0x000001A8; // type:object size:0x2A scope:local @stringBase0 = .rodata:0x000001F8; // type:object size:0xD2 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_518_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x54 scope:global @3830 = .data:0x00000074; // type:object size:0xC scope:local @3831 = .data:0x00000080; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_lv3Water2/splits.txt b/config/GZ2J01/rels/d_a_obj_lv3Water2/splits.txt index b224967d11..844154d523 100644 --- a/config/GZ2J01/rels/d_a_obj_lv3Water2/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv3Water2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Water2.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv3Water2/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv3Water2/symbols.txt index 4d1c47c38c..04f443591f 100644 --- a/config/GZ2J01/rels/d_a_obj_lv3Water2/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv3Water2/symbols.txt @@ -46,7 +46,8 @@ l_btkIdx = .rodata:0x00000008; // type:object size:0x4 scope:global @stringBase0 = .rodata:0x00000034; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_519_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x4 scope:global @3767 = .data:0x00000024; // type:object size:0xC scope:local @3768 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/splits.txt b/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/splits.txt index 212da12114..bd0f1f032b 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/splits.txt @@ -10,7 +10,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4CandleDemoTag.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt index 85a76a8196..fc76308d7d 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt @@ -37,6 +37,7 @@ __dt__20dalv4CandleDemoTag_cFv = .text:0x00000884; // type:function size:0x80 sc _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local @3702 = .data:0x00000020; // type:object size:0xC scope:local @@ -53,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3632 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte -hio_set = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv4CandleTag/splits.txt b/config/GZ2J01/rels/d_a_obj_lv4CandleTag/splits.txt index 1482725f04..41a6e44e77 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4CandleTag/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4CandleTag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4CandleTag.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv4CandleTag/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4CandleTag/symbols.txt index 796f6e1ff7..f3eccbf113 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4CandleTag/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4CandleTag/symbols.txt @@ -38,9 +38,11 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc _dtors = .dtors:0x00000000; // type:label scope:global @3727 = .rodata:0x00000000; // type:object size:0x4 scope:local @3728 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_524_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3686 = .data:0x00000020; // type:object size:0xC scope:local @3687 = .data:0x0000002C; // type:object size:0xC scope:local @3688 = .data:0x00000038; // type:object size:0xC scope:local @@ -55,4 +57,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3624 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:byte -lbl_524_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv4EdShutter/splits.txt b/config/GZ2J01/rels/d_a_obj_lv4EdShutter/splits.txt index 83fbb12549..0473970533 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4EdShutter/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4EdShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4EdShutter.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv4EdShutter/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4EdShutter/symbols.txt index b71e4104db..0044f39bcb 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4EdShutter/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4EdShutter/symbols.txt @@ -47,9 +47,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3817 = .rodata:0x00000018; // type:object size:0x4 scope:local @3818 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_525_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3721 = .data:0x00000020; // type:object size:0xC scope:local @3722 = .data:0x0000002C; // type:object size:0xC scope:local @3723 = .data:0x00000038; // type:object size:0xC scope:local @@ -64,4 +66,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000013C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3628 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_525_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv4Gate/splits.txt b/config/GZ2J01/rels/d_a_obj_lv4Gate/splits.txt index c303a6c3b5..d140489c9b 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4Gate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4Gate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4Gate.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv4Gate/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4Gate/symbols.txt index 33cc67ee8c..332f096bca 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4Gate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4Gate/symbols.txt @@ -37,9 +37,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3777 = .rodata:0x00000018; // type:object size:0x4 scope:local @3778 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_526_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3725 = .data:0x00000020; // type:object size:0xC scope:local @3726 = .data:0x0000002C; // type:object size:0xC scope:local @3727 = .data:0x00000038; // type:object size:0xC scope:local @@ -52,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:byte -lbl_526_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv4HsTarget/splits.txt b/config/GZ2J01/rels/d_a_obj_lv4HsTarget/splits.txt index 6f82fdbe60..84dc0254c9 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4HsTarget/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4HsTarget/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4HsTarget.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv4PoGate/splits.txt b/config/GZ2J01/rels/d_a_obj_lv4PoGate/splits.txt index eebf3bbd28..cfe3d115f5 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4PoGate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4PoGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4PoGate.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv4PoGate/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4PoGate/symbols.txt index 7d0eb573bc..dd0c2116d2 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4PoGate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4PoGate/symbols.txt @@ -52,9 +52,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3853 = .rodata:0x0000002C; // type:object size:0x4 scope:local particle_id$3866 = .rodata:0x00000030; // type:object size:0x14 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_528_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3727 = .data:0x00000020; // type:object size:0xC scope:local @3728 = .data:0x0000002C; // type:object size:0xC scope:local @3729 = .data:0x00000038; // type:object size:0xC scope:local @@ -71,4 +73,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000014C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3623 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x28 scope:global data:byte -lbl_528_bss_3C = .bss:0x0000003C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000003C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv4RailWall/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4RailWall/symbols.txt index 24e3e17ff4..44e1d3607c 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4RailWall/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4RailWall/symbols.txt @@ -53,9 +53,11 @@ l_spd_tbl$3801 = .rodata:0x00000020; // type:object size:0x44 scope:local @3884 = .rodata:0x00000070; // type:object size:0x4 scope:local @3885 = .rodata:0x00000074; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000078; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_529_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3758 = .data:0x00000024; // type:object size:0xC scope:local @3759 = .data:0x00000030; // type:object size:0xC scope:local @@ -71,4 +73,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__17dEvLib_callback_c = .data:0x0000011C; // type:object size:0x18 scope:global __vt__14daObjLv4Wall_c = .data:0x00000134; // type:object size:0x48 scope:global -lbl_529_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv4SlideWall/splits.txt b/config/GZ2J01/rels/d_a_obj_lv4SlideWall/splits.txt index 0013f2b984..8fc8c7c869 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4SlideWall/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4SlideWall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4SlideWall.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv4SlideWall/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4SlideWall/symbols.txt index a8f1dba7b0..b0b70d2087 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4SlideWall/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4SlideWall/symbols.txt @@ -37,9 +37,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3765 = .rodata:0x00000014; // type:object size:0x4 scope:local @3766 = .rodata:0x00000018; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000001C; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_530_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3720 = .data:0x00000020; // type:object size:0xC scope:local @3721 = .data:0x0000002C; // type:object size:0xC scope:local @3722 = .data:0x00000038; // type:object size:0xC scope:local @@ -52,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_530_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv4bridge/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4bridge/symbols.txt index 9d66c1e6b4..2ebfbb2174 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4bridge/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4bridge/symbols.txt @@ -40,9 +40,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3767 = .rodata:0x00000018; // type:object size:0x4 scope:local @3768 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_531_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3702 = .data:0x00000024; // type:object size:0xC scope:local @3703 = .data:0x00000030; // type:object size:0xC scope:local @@ -52,4 +54,4 @@ daObjLv4Brg_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global g_profile_Obj_Lv4Bridge = .data:0x0000008C; // type:object size:0x30 scope:global __vt__17dEvLib_callback_c = .data:0x000000BC; // type:object size:0x18 scope:global __vt__13daObjLv4Brg_c = .data:0x000000D4; // type:object size:0x48 scope:global -lbl_531_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv4digsand/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4digsand/symbols.txt index f474102bc8..e122bd76a2 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4digsand/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4digsand/symbols.txt @@ -41,9 +41,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3766 = .rodata:0x00000008; // type:object size:0x4 scope:local @3767 = .rodata:0x0000000C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000010; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_533_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3715 = .data:0x00000024; // type:object size:0xC scope:local @3716 = .data:0x00000030; // type:object size:0xC scope:local @@ -59,4 +61,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__14dBgS_ObjGndChk = .data:0x0000011C; // type:object size:0x30 scope:global __vt__16daObjL4DigSand_c = .data:0x0000014C; // type:object size:0x28 scope:global -lbl_533_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv4floor/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4floor/symbols.txt index 3cdd218349..0c2ab206d2 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4floor/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4floor/symbols.txt @@ -27,9 +27,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3712 = .rodata:0x00000008; // type:object size:0x4 scope:local @3713 = .rodata:0x0000000C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000010; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_534_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3678 = .data:0x00000024; // type:object size:0xC scope:local @3679 = .data:0x00000030; // type:object size:0xC scope:local @@ -38,4 +40,4 @@ l_func$3677 = .data:0x00000048; // type:object size:0x24 scope:local daObjLv4Floor_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global g_profile_Obj_Lv4Floor = .data:0x0000008C; // type:object size:0x30 scope:global __vt__15daObjLv4Floor_c = .data:0x000000BC; // type:object size:0x28 scope:global -lbl_534_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv4sand/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv4sand/symbols.txt index 367c4d3f1f..287ee026ce 100644 --- a/config/GZ2J01/rels/d_a_obj_lv4sand/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv4sand/symbols.txt @@ -40,9 +40,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3786 = .rodata:0x00000014; // type:object size:0x4 scope:local @3787 = .rodata:0x00000018; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000001C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_538_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3754 = .data:0x00000024; // type:object size:0xC scope:local @3755 = .data:0x00000030; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ g_profile_Obj_Lv4Sand = .data:0x0000008C; // type:object size:0x30 scope:global __vt__17dEvLib_callback_c = .data:0x000000BC; // type:object size:0x18 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObjLv4Sand_c = .data:0x000000E0; // type:object size:0x48 scope:global -lbl_538_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv5FloorBoard/splits.txt b/config/GZ2J01/rels/d_a_obj_lv5FloorBoard/splits.txt index 03c8eb538f..cadd4c57b6 100644 --- a/config/GZ2J01/rels/d_a_obj_lv5FloorBoard/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv5FloorBoard/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5FloorBoard.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv5FloorBoard/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv5FloorBoard/symbols.txt index 8a4af9357a..bc8cd5383d 100644 --- a/config/GZ2J01/rels/d_a_obj_lv5FloorBoard/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv5FloorBoard/symbols.txt @@ -38,9 +38,11 @@ mCcDObjInfo__12daFlorBoad_c = .rodata:0x00000004; // type:object size:0x30 scope @3872 = .rodata:0x0000003C; // type:object size:0x4 scope:local @3891 = .rodata:0x00000040; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000044; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_539_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daFlorBoad_c = .data:0x00000020; // type:object size:0x44 scope:global @3839 = .data:0x00000064; // type:object size:0xC scope:local @3840 = .data:0x00000070; // type:object size:0xC scope:local @@ -58,4 +60,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000154; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_539_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv5IceWall/splits.txt b/config/GZ2J01/rels/d_a_obj_lv5IceWall/splits.txt index 723c8fa8f9..53d5edc56b 100644 --- a/config/GZ2J01/rels/d_a_obj_lv5IceWall/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv5IceWall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5IceWall.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv5IceWall/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv5IceWall/symbols.txt index 18ec506e4a..c3a5d6c460 100644 --- a/config/GZ2J01/rels/d_a_obj_lv5IceWall/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv5IceWall/symbols.txt @@ -52,9 +52,11 @@ l_eff_b$3933 = .rodata:0x00000048; // type:object size:0x4 scope:local @4060 = .rodata:0x00000074; // type:object size:0x4 scope:local l_eff_break_b$4077 = .rodata:0x00000078; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000007C; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_540_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daIceWall_c = .data:0x00000020; // type:object size:0x44 scope:global @3891 = .data:0x00000064; // type:object size:0xC scope:local @3892 = .data:0x00000070; // type:object size:0xC scope:local @@ -72,4 +74,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000154; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_540_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv5SwIce/splits.txt b/config/GZ2J01/rels/d_a_obj_lv5SwIce/splits.txt index d874b76741..63f82db0cf 100644 --- a/config/GZ2J01/rels/d_a_obj_lv5SwIce/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv5SwIce/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5SwIce.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv5SwIce/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv5SwIce/symbols.txt index b4688100ba..d7126438ad 100644 --- a/config/GZ2J01/rels/d_a_obj_lv5SwIce/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv5SwIce/symbols.txt @@ -41,9 +41,11 @@ l_eff_r$3861 = .rodata:0x00000030; // type:object size:0x4 scope:local l_eff_break$3922 = .rodata:0x00000048; // type:object size:0x4 scope:local @3948 = .rodata:0x0000004C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000050; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_541_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daLv5SwIce_c = .data:0x00000020; // type:object size:0x44 scope:global @3837 = .data:0x00000064; // type:object size:0xC scope:local @3838 = .data:0x00000070; // type:object size:0xC scope:local @@ -61,4 +63,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000154; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:byte -lbl_541_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6ChangeGate/splits.txt b/config/GZ2J01/rels/d_a_obj_lv6ChangeGate/splits.txt index 1f51bcecf7..96725b61e7 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6ChangeGate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6ChangeGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6ChangeGate.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv6ChangeGate/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6ChangeGate/symbols.txt index 1349001aa4..c46a180e8d 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6ChangeGate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6ChangeGate/symbols.txt @@ -58,9 +58,11 @@ mCcDObjInfo__17daLv6ChangeGate_c = .rodata:0x00000008; // type:object size:0x30 @3923 = .rodata:0x00000050; // type:object size:0x4 scope:local align:4 data:float @3953 = .rodata:0x00000054; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000058; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_544_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__17daLv6ChangeGate_c = .data:0x00000020; // type:object size:0x44 scope:global @3874 = .data:0x00000064; // type:object size:0xC scope:local @3875 = .data:0x00000070; // type:object size:0xC scope:local @@ -81,4 +83,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3631 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_544_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6FurikoTrap/splits.txt b/config/GZ2J01/rels/d_a_obj_lv6FurikoTrap/splits.txt index 9f6a1bccd7..2147daf592 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6FurikoTrap/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6FurikoTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6FurikoTrap.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv6FurikoTrap/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6FurikoTrap/symbols.txt index 130de8a12b..92ce683dd0 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6FurikoTrap/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6FurikoTrap/symbols.txt @@ -58,4 +58,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000010C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_545_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6Lblock/splits.txt b/config/GZ2J01/rels/d_a_obj_lv6Lblock/splits.txt index c457136059..ac127f1004 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6Lblock/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6Lblock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6Lblock.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv6Lblock/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6Lblock/symbols.txt index fb281239cc..14d4bc67e2 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6Lblock/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6Lblock/symbols.txt @@ -37,9 +37,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3780 = .rodata:0x00000014; // type:object size:0x4 scope:local @3781 = .rodata:0x00000018; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000001C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_546_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_liftUpMax = .data:0x00000020; // type:object size:0x8 scope:global @3734 = .data:0x00000028; // type:object size:0xC scope:local @3735 = .data:0x00000034; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000F4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_546_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6SwGate/splits.txt b/config/GZ2J01/rels/d_a_obj_lv6SwGate/splits.txt index feefe6f370..5b6673926d 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6SwGate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6SwGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6SwGate.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv6SwGate/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6SwGate/symbols.txt index 6a11fd17e5..d8b5fe5be2 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6SwGate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6SwGate/symbols.txt @@ -53,9 +53,11 @@ mCcDObjInfo__13daLv6SwGate_c = .rodata:0x0000000C; // type:object size:0x30 scop @3994 = .rodata:0x00000060; // type:object size:0x4 scope:local align:4 data:float @3995 = .rodata:0x00000064; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000068; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_547_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__13daLv6SwGate_c = .data:0x00000020; // type:object size:0x44 scope:global l_cull_box = .data:0x00000064; // type:object size:0x18 scope:global align:4 data:float @3948 = .data:0x0000007C; // type:object size:0xC scope:local @@ -76,4 +78,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000019C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3625 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global align:4 data:float -lbl_547_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6SzGate/splits.txt b/config/GZ2J01/rels/d_a_obj_lv6SzGate/splits.txt index 48d480013a..11a87ce927 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6SzGate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6SzGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6SzGate.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv6SzGate/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6SzGate/symbols.txt index 9f5792b853..c913f65210 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6SzGate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6SzGate/symbols.txt @@ -46,9 +46,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3880 = .rodata:0x00000024; // type:object size:0x4 scope:local @3901 = .rodata:0x00000028; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000002C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_548_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global align:4 data:float @3799 = .data:0x00000038; // type:object size:0xC scope:local @3800 = .data:0x00000044; // type:object size:0xC scope:local @@ -66,4 +68,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000158; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global align:4 data:float -lbl_548_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6Tenbin/splits.txt b/config/GZ2J01/rels/d_a_obj_lv6Tenbin/splits.txt index 474b2d7989..ba47f9d24c 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6Tenbin/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6Tenbin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6Tenbin.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv6Tenbin/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6Tenbin/symbols.txt index f7cb5cb832..e371647a92 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6Tenbin/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6Tenbin/symbols.txt @@ -58,4 +58,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3662 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x44 scope:global align:4 data:float -lbl_549_bss_58 = .bss:0x00000058; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000058; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6TogeRoll/splits.txt b/config/GZ2J01/rels/d_a_obj_lv6TogeRoll/splits.txt index 407a59b7f6..250d23638c 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6TogeRoll/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6TogeRoll/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6TogeRoll.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv6TogeRoll/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6TogeRoll/symbols.txt index e86f8ff01b..970a3281ad 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6TogeRoll/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6TogeRoll/symbols.txt @@ -70,9 +70,11 @@ mSpeed__12daTogeRoll_c = .rodata:0x0000006C; // type:object size:0x40 scope:glob @4239 = .rodata:0x000000F8; // type:object size:0x4 scope:local @4285 = .rodata:0x000000FC; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000100; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_550_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__12daTogeRoll_c = .data:0x00000020; // type:object size:0x40 scope:global mCcDCps__12daTogeRoll_c = .data:0x00000060; // type:object size:0x4C scope:global @3971 = .data:0x000000AC; // type:object size:0xC scope:local @@ -97,4 +99,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000238; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global align:4 data:float -lbl_550_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6TogeTrap/splits.txt b/config/GZ2J01/rels/d_a_obj_lv6TogeTrap/splits.txt index 12d78e691e..a5b238b4e7 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6TogeTrap/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6TogeTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6TogeTrap.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv6TogeTrap/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6TogeTrap/symbols.txt index 1e8da65f10..303c8d3f6d 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6TogeTrap/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6TogeTrap/symbols.txt @@ -93,9 +93,11 @@ estimateSizeTbl$3689 = .rodata:0x000000D4; // type:object size:0x6 scope:local @4534 = .rodata:0x0000013C; // type:object size:0x4 scope:local @4535 = .rodata:0x00000140; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000144; // type:object size:0x19 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_551_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__15daLv6TogeTrap_c = .data:0x00000020; // type:object size:0x40 scope:global mCcDCyl__15daLv6TogeTrap_c = .data:0x00000060; // type:object size:0x44 scope:global l_resNameIdx = .data:0x000000A4; // type:object size:0xC scope:global @@ -128,4 +130,4 @@ __vt__14mDoHIO_entry_c = .data:0x000002CC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3625 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x28 scope:global align:4 data:float -lbl_551_bss_3C = .bss:0x0000003C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000003C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6bemos/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6bemos/symbols.txt index 408b103a22..1fa03a00f1 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6bemos/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6bemos/symbols.txt @@ -50,9 +50,11 @@ l_particle_id$3914 = .rodata:0x00000078; // type:object size:0xC scope:local @4160 = .rodata:0x00000098; // type:object size:0x4 scope:local @4161 = .rodata:0x0000009C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000A0; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_552_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cps_src = .data:0x0000003C; // type:object size:0x4C scope:global @@ -70,4 +72,4 @@ __vt__8cM3dGAab = .data:0x00000174; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x00000180; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x0000018C; // type:object size:0xC scope:global __vt__11daObjL6Bm_c = .data:0x00000198; // type:object size:0x28 scope:global -lbl_552_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6bemos2/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6bemos2/symbols.txt index b152d10d1c..09cb9c38f4 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6bemos2/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6bemos2/symbols.txt @@ -81,7 +81,8 @@ l_eff_id$4949 = .rodata:0x00000090; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000A0; // type:object size:0x35 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_553_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_eye_matName = .data:0x00000024; // type:object size:0x4 scope:global l_head_joint = .data:0x00000028; // type:object size:0x4 scope:global @@ -115,5 +116,5 @@ __vt__8cM3dGAab = .data:0x00000294; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x000002A0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000002AC; // type:object size:0xC scope:global __vt__12daObjLv6Bm_c = .data:0x000002B8; // type:object size:0x28 scope:global -init$2007 = .bss:0x00000000; // type:object size:0x1 data:byte -init$2384 = .bss:0x00000001; // type:object size:0x1 data:byte +init$2007 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$2384 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv6swturn/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv6swturn/symbols.txt index 6ef431c562..b615b905cb 100644 --- a/config/GZ2J01/rels/d_a_obj_lv6swturn/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv6swturn/symbols.txt @@ -30,9 +30,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4069 = .rodata:0x00000018; // type:object size:0x4 scope:local @4070 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_556_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3777 = .data:0x00000024; // type:object size:0xC scope:local @3778 = .data:0x00000030; // type:object size:0xC scope:local @@ -40,4 +42,4 @@ l_func$3776 = .data:0x0000003C; // type:object size:0x18 scope:local daObjLv6SwTurn_METHODS = .data:0x00000054; // type:object size:0x20 scope:global g_profile_Obj_Lv6SwTurn = .data:0x00000074; // type:object size:0x30 scope:global __vt__16daObjLv6SwTurn_c = .data:0x000000A4; // type:object size:0x28 scope:global -lbl_556_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv7BsGate/splits.txt b/config/GZ2J01/rels/d_a_obj_lv7BsGate/splits.txt index 48e060cb8c..9caacfae4b 100644 --- a/config/GZ2J01/rels/d_a_obj_lv7BsGate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv7BsGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv7BsGate.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv7BsGate/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv7BsGate/symbols.txt index 15eba8eb56..1161f16444 100644 --- a/config/GZ2J01/rels/d_a_obj_lv7BsGate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv7BsGate/symbols.txt @@ -38,9 +38,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3799 = .rodata:0x0000001C; // type:object size:0x4 scope:local @3833 = .rodata:0x00000020; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000024; // type:object size:0xF scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_557_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x8 scope:global l_bmdIdx = .data:0x00000028; // type:object size:0x8 scope:global l_dzbIdx = .data:0x00000030; // type:object size:0x8 scope:global @@ -56,4 +58,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000104; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3622 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_557_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv7PropellerY/splits.txt b/config/GZ2J01/rels/d_a_obj_lv7PropellerY/splits.txt index b44e37500d..d9cac35233 100644 --- a/config/GZ2J01/rels/d_a_obj_lv7PropellerY/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv7PropellerY/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv7PropellerY.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv7PropellerY/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv7PropellerY/symbols.txt index 1699b91b55..e7c571648a 100644 --- a/config/GZ2J01/rels/d_a_obj_lv7PropellerY/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv7PropellerY/symbols.txt @@ -44,9 +44,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3849 = .rodata:0x00000024; // type:object size:0x4 scope:local @3913 = .rodata:0x00000028; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000030; // type:object size:0x14 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_558_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x8 scope:global l_bmdIdx = .data:0x00000028; // type:object size:0x8 scope:global l_dzbIdx = .data:0x00000030; // type:object size:0x8 scope:global @@ -64,4 +66,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000134; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3644 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:global align:4 data:float -lbl_558_bss_34 = .bss:0x00000034; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv7bridge/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv7bridge/symbols.txt index 88be6bba83..4f8fbd89cf 100644 --- a/config/GZ2J01/rels/d_a_obj_lv7bridge/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv7bridge/symbols.txt @@ -59,7 +59,8 @@ l_bck$3780 = .rodata:0x00000040; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000080; // type:object size:0x13 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_559_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_cyl_src = .data:0x00000028; // type:object size:0x44 scope:global @3941 = .data:0x0000006C; // type:object size:0xC scope:local @@ -75,4 +76,4 @@ __vt__8cM3dGCyl = .data:0x0000011C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000128; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x0000014C; // type:object size:0xC scope:global __vt__13daObjLv7Brg_c = .data:0x00000158; // type:object size:0x28 scope:global -init$3943 = .bss:0x00000000; // type:object size:0x1 data:byte +init$3943 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv8KekkaiTrap/splits.txt b/config/GZ2J01/rels/d_a_obj_lv8KekkaiTrap/splits.txt index c238d6e60b..9fd8a3621c 100644 --- a/config/GZ2J01/rels/d_a_obj_lv8KekkaiTrap/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv8KekkaiTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8KekkaiTrap.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt index 0bfdeff2f9..90f5408339 100644 --- a/config/GZ2J01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt @@ -34,9 +34,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3803 = .rodata:0x0000000C; // type:object size:0x4 scope:local @3804 = .rodata:0x00000010; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000014; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_560_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x4 scope:global l_bmdIdx = .data:0x00000024; // type:object size:0x4 scope:global l_dzbIdx = .data:0x00000028; // type:object size:0x4 scope:global @@ -52,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000F8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x1C scope:global align:4 data:float -lbl_560_bss_30 = .bss:0x00000030; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000030; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv8Lift/splits.txt b/config/GZ2J01/rels/d_a_obj_lv8Lift/splits.txt index 42da1a289d..b010fad4da 100644 --- a/config/GZ2J01/rels/d_a_obj_lv8Lift/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv8Lift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8Lift.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv8Lift/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv8Lift/symbols.txt index 8666a935ea..5ad9bcd61f 100644 --- a/config/GZ2J01/rels/d_a_obj_lv8Lift/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv8Lift/symbols.txt @@ -69,9 +69,11 @@ mSpeed__10daL8Lift_c = .rodata:0x00000004; // type:object size:0x40 scope:global @4110 = .rodata:0x00000094; // type:object size:0x4 scope:local align:4 data:float @4213 = .rodata:0x00000098; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000009C; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_561_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3822 = .data:0x00000020; // type:object size:0xC scope:local @3823 = .data:0x0000002C; // type:object size:0xC scope:local @3824 = .data:0x00000038; // type:object size:0xC scope:local @@ -94,4 +96,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001D0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_561_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv8OptiLift/splits.txt b/config/GZ2J01/rels/d_a_obj_lv8OptiLift/splits.txt index 3f0e9d6446..c16aadb3a1 100644 --- a/config/GZ2J01/rels/d_a_obj_lv8OptiLift/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv8OptiLift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8OptiLift.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv8OptiLift/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv8OptiLift/symbols.txt index aa3d8de7e1..66af4b8baa 100644 --- a/config/GZ2J01/rels/d_a_obj_lv8OptiLift/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv8OptiLift/symbols.txt @@ -63,9 +63,11 @@ mSpeed__12daOptiLift_c = .rodata:0x00000004; // type:object size:0x40 scope:glob @4231 = .rodata:0x00000088; // type:object size:0x4 scope:local @4232 = .rodata:0x0000008C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000090; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_562_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3826 = .data:0x00000020; // type:object size:0xC scope:local @3827 = .data:0x0000002C; // type:object size:0xC scope:local @3828 = .data:0x00000038; // type:object size:0xC scope:local @@ -85,4 +87,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000188; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3655 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_562_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv8UdFloor/splits.txt b/config/GZ2J01/rels/d_a_obj_lv8UdFloor/splits.txt index cd46526bd9..0ba2d8c00a 100644 --- a/config/GZ2J01/rels/d_a_obj_lv8UdFloor/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv8UdFloor/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8UdFloor.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv8UdFloor/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv8UdFloor/symbols.txt index 6d4663c673..37fffe52e9 100644 --- a/config/GZ2J01/rels/d_a_obj_lv8UdFloor/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv8UdFloor/symbols.txt @@ -46,9 +46,11 @@ l_heap_size = .rodata:0x00000014; // type:object size:0x8 scope:global @3857 = .rodata:0x0000003C; // type:object size:0x4 scope:local @3892 = .rodata:0x00000040; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0xF scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_563_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x8 scope:global @3736 = .data:0x00000028; // type:object size:0xC scope:local @3737 = .data:0x00000034; // type:object size:0xC scope:local @@ -64,4 +66,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000124; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3622 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global data:byte -lbl_563_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_lv9SwShutter/splits.txt b/config/GZ2J01/rels/d_a_obj_lv9SwShutter/splits.txt index 4c797f16d5..55b103d011 100644 --- a/config/GZ2J01/rels/d_a_obj_lv9SwShutter/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_lv9SwShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv9SwShutter.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_lv9SwShutter/symbols.txt b/config/GZ2J01/rels/d_a_obj_lv9SwShutter/symbols.txt index d6ac681745..6b5cc29c1d 100644 --- a/config/GZ2J01/rels/d_a_obj_lv9SwShutter/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_lv9SwShutter/symbols.txt @@ -38,9 +38,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3784 = .rodata:0x0000001C; // type:object size:0x4 scope:local @3785 = .rodata:0x00000020; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000024; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_564_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3722 = .data:0x00000020; // type:object size:0xC scope:local @3723 = .data:0x0000002C; // type:object size:0xC scope:local @3724 = .data:0x00000038; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global align:4 data:float -lbl_564_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_magLift/splits.txt b/config/GZ2J01/rels/d_a_obj_magLift/splits.txt index dbc092c03c..e7e0ec08dc 100644 --- a/config/GZ2J01/rels/d_a_obj_magLift/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_magLift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_magLift.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_magLift/symbols.txt b/config/GZ2J01/rels/d_a_obj_magLift/symbols.txt index 51f0bb74cb..454bf63ef3 100644 --- a/config/GZ2J01/rels/d_a_obj_magLift/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_magLift/symbols.txt @@ -47,9 +47,11 @@ mSpeed__11daMagLift_c = .rodata:0x00000000; // type:object size:0x40 scope:globa @3838 = .rodata:0x0000006C; // type:object size:0x4 scope:local @3852 = .rodata:0x00000070; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000074; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_565_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3736 = .data:0x00000020; // type:object size:0xC scope:local @3737 = .data:0x0000002C; // type:object size:0xC scope:local @3738 = .data:0x00000038; // type:object size:0xC scope:local @@ -66,4 +68,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000158; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global -lbl_565_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_magLiftRot/splits.txt b/config/GZ2J01/rels/d_a_obj_magLiftRot/splits.txt index d2be67dce9..8478afda34 100644 --- a/config/GZ2J01/rels/d_a_obj_magLiftRot/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_magLiftRot/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_magLiftRot.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_magLiftRot/symbols.txt b/config/GZ2J01/rels/d_a_obj_magLiftRot/symbols.txt index 9559cba3cf..92e2978583 100644 --- a/config/GZ2J01/rels/d_a_obj_magLiftRot/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_magLiftRot/symbols.txt @@ -53,9 +53,11 @@ l_brkIdx = .rodata:0x00000054; // type:object size:0xC scope:global @3950 = .rodata:0x00000084; // type:object size:0x4 scope:local @3951 = .rodata:0x00000088; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000008C; // type:object size:0x1B scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_566_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0xC scope:global @3856 = .data:0x0000002C; // type:object size:0xC scope:local @3857 = .data:0x00000038; // type:object size:0xC scope:local @@ -72,4 +74,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x40 scope:global align:4 data:float -lbl_566_bss_54 = .bss:0x00000054; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_magne_arm/symbols.txt b/config/GZ2J01/rels/d_a_obj_magne_arm/symbols.txt index cb9b5622ff..b91895cc61 100644 --- a/config/GZ2J01/rels/d_a_obj_magne_arm/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_magne_arm/symbols.txt @@ -134,7 +134,8 @@ l_offsetF$3738 = .rodata:0x000000AC; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000128; // type:object size:0xE scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_105_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cull_box2 = .data:0x0000003C; // type:object size:0x18 scope:global align:4 data:float @@ -202,7 +203,11 @@ __vt__11daObjMarm_c = .data:0x000003BC; // type:object size:0x28 scope:global @1012 = .bss:0x00000034; // type:object size:0x1 scope:local @1010 = .bss:0x00000038; // type:object size:0x1 scope:local @1009 = .bss:0x0000003C; // type:object size:0x1 scope:local -lbl_105_bss_3D = .bss:0x0000003D; // type:object size:0x7 data:byte +init$0000 = .bss:0x0000003D; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x0000003E; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x0000003F; // type:object size:0x1 scope:local align:1 data:byte +init$0003 = .bss:0x00000040; // type:object size:0x1 scope:local align:1 data:byte +init$0004 = .bss:0x00000041; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000044; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000048; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000004C; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_maki/splits.txt b/config/GZ2J01/rels/d_a_obj_maki/splits.txt index 231f501a3c..bc0ce90e20 100644 --- a/config/GZ2J01/rels/d_a_obj_maki/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_maki/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_maki.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_master_sword/symbols.txt b/config/GZ2J01/rels/d_a_obj_master_sword/symbols.txt index a90bcd8720..d307117c1e 100644 --- a/config/GZ2J01/rels/d_a_obj_master_sword/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_master_sword/symbols.txt @@ -37,9 +37,11 @@ mAttr__18daObjMasterSword_c = .rodata:0x00000000; // type:object size:0x4 scope: @4091 = .rodata:0x00000028; // type:object size:0x4 scope:local @4092 = .rodata:0x0000002C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000030; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_568_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3655 = .data:0x00000024; // type:object size:0xC scope:local @3656 = .data:0x00000030; // type:object size:0xC scope:local @@ -54,4 +56,4 @@ __vt__12dBgS_ObjAcch = .data:0x0000010C; // type:object size:0x24 scope:global __vt__8cM3dGCyl = .data:0x00000130; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x0000013C; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000148; // type:object size:0xC scope:global -lbl_568_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$localstatic4$initCollision__18daObjMasterSword_cFv = .bss:0x00000000; // type:object size:0x1 scope:local data:byte diff --git a/config/GZ2J01/rels/d_a_obj_mgate/symbols.txt b/config/GZ2J01/rels/d_a_obj_mgate/symbols.txt index a2dc56b7af..0b7ddfe898 100644 --- a/config/GZ2J01/rels/d_a_obj_mgate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_mgate/symbols.txt @@ -33,7 +33,8 @@ l_roll_crash_check_areaL2 = .rodata:0x0000005C; // type:object size:0x30 scope:g @stringBase0 = .rodata:0x000000B4; // type:object size:0x69 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_107_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_bmdName = .data:0x00000028; // type:object size:0x8 scope:global l_dzbName = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_mie/splits.txt b/config/GZ2J01/rels/d_a_obj_mie/splits.txt index e998395be8..8749728261 100644 --- a/config/GZ2J01/rels/d_a_obj_mie/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_mie/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_mie.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_mirror_6pole/symbols.txt b/config/GZ2J01/rels/d_a_obj_mirror_6pole/symbols.txt index a3ad3be13e..2d31a2aefb 100644 --- a/config/GZ2J01/rels/d_a_obj_mirror_6pole/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_mirror_6pole/symbols.txt @@ -23,7 +23,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000010; // type:object size:0x9 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_572_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3617 = .data:0x00000024; // type:object size:0xC scope:local @3618 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_mirror_screw/symbols.txt b/config/GZ2J01/rels/d_a_obj_mirror_screw/symbols.txt index 0356f58738..3f9b086649 100644 --- a/config/GZ2J01/rels/d_a_obj_mirror_screw/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_mirror_screw/symbols.txt @@ -29,7 +29,8 @@ M_attr__18daObjMirrorScrew_c = .rodata:0x00000000; // type:object size:0x18 scop @stringBase0 = .rodata:0x00000038; // type:object size:0x9 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_575_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3648 = .data:0x00000024; // type:object size:0xC scope:local @3649 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_movebox/splits.txt b/config/GZ2J01/rels/d_a_obj_movebox/splits.txt index 440e7adb31..4d3883bd3b 100644 --- a/config/GZ2J01/rels/d_a_obj_movebox/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_movebox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_movebox.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_movebox/symbols.txt b/config/GZ2J01/rels/d_a_obj_movebox/symbols.txt index ea9efbb201..d8253bc172 100644 --- a/config/GZ2J01/rels/d_a_obj_movebox/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_movebox/symbols.txt @@ -98,7 +98,8 @@ particle_id$4913 = .rodata:0x00000770; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x0000077C; // type:object size:0x5E scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_20_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4747 = .data:0x00000020; // type:object size:0xC scope:local @4748 = .data:0x0000002C; // type:object size:0xC scope:local @4749 = .data:0x00000038; // type:object size:0xC scope:local @@ -138,19 +139,19 @@ M_wrt_work__Q212daObjMovebox5Bgc_c = .bss:0x000007EC; // type:object size:0x54 s @3672 = .bss:0x00000840; // type:object size:0xC scope:local M_wall_work__Q212daObjMovebox5Bgc_c = .bss:0x0000084C; // type:object size:0xA10 scope:global align:4 data:float @3909 = .bss:0x0000125C; // type:object size:0xC scope:local -init$3910 = .bss:0x00001268; // type:object size:0x1 scope:local +init$3910 = .bss:0x00001268; // type:object size:0x1 scope:local align:1 data:byte touch_work$3908 = .bss:0x0000126C; // type:object size:0x70 scope:local @4501 = .bss:0x000012DC; // type:object size:0xC scope:local -init$4502 = .bss:0x000012E8; // type:object size:0x1 scope:local +init$4502 = .bss:0x000012E8; // type:object size:0x1 scope:local align:1 data:byte scl$4500 = .bss:0x000012EC; // type:object size:0xC scope:local @4574 = .bss:0x000012F8; // type:object size:0xC scope:local -init$4575 = .bss:0x00001304; // type:object size:0x1 scope:local +init$4575 = .bss:0x00001304; // type:object size:0x1 scope:local align:1 data:byte @4577 = .bss:0x00001308; // type:object size:0xC scope:local @4578 = .bss:0x00001314; // type:object size:0xC scope:local @4579 = .bss:0x00001320; // type:object size:0xC scope:local dir_vec$4573 = .bss:0x0000132C; // type:object size:0x30 scope:local @4762 = .bss:0x0000135C; // type:object size:0xC scope:local -init$4763 = .bss:0x00001368; // type:object size:0x1 scope:local +init$4763 = .bss:0x00001368; // type:object size:0x1 scope:local align:1 data:byte particle_scale$4761 = .bss:0x0000136C; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00001378; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000137C; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_msima/splits.txt b/config/GZ2J01/rels/d_a_obj_msima/splits.txt index 8991846e80..fabed8f8e3 100644 --- a/config/GZ2J01/rels/d_a_obj_msima/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_msima/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_msima.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_msima/symbols.txt b/config/GZ2J01/rels/d_a_obj_msima/symbols.txt index 38370071a8..be5beff62b 100644 --- a/config/GZ2J01/rels/d_a_obj_msima/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_msima/symbols.txt @@ -88,7 +88,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3858 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte @3958 = .bss:0x00000068; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_mvstair/symbols.txt b/config/GZ2J01/rels/d_a_obj_mvstair/symbols.txt index 2062852306..46b0b823fc 100644 --- a/config/GZ2J01/rels/d_a_obj_mvstair/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_mvstair/symbols.txt @@ -59,9 +59,11 @@ l_heap_size = .rodata:0x00000028; // type:object size:0x8 scope:global @4064 = .rodata:0x00000058; // type:object size:0x4 scope:local @4065 = .rodata:0x0000005C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000060; // type:object size:0x14 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_578_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global @3754 = .data:0x00000028; // type:object size:0xC scope:local @3755 = .data:0x00000034; // type:object size:0xC scope:local @@ -77,5 +79,5 @@ daObjStair_METHODS = .data:0x000000E8; // type:object size:0x20 scope:global g_profile_Obj_MvStair = .data:0x00000108; // type:object size:0x30 scope:global __vt__18dPa_levelEcallBack = .data:0x00000138; // type:object size:0x24 scope:global __vt__12daObjStair_c = .data:0x0000015C; // type:object size:0x28 scope:global -lbl_578_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_578_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_myogan/splits.txt b/config/GZ2J01/rels/d_a_obj_myogan/splits.txt index 7be77c73e5..5c659cc14b 100644 --- a/config/GZ2J01/rels/d_a_obj_myogan/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_myogan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_myogan.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_myogan/symbols.txt b/config/GZ2J01/rels/d_a_obj_myogan/symbols.txt index 1057d7e7e5..e686fb3bce 100644 --- a/config/GZ2J01/rels/d_a_obj_myogan/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_myogan/symbols.txt @@ -29,6 +29,6 @@ g_profile_OBJ_MYOGAN = .data:0x00000020; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000050; // type:object size:0xC scope:global __vt__18daObj_Myogan_HIO_c = .data:0x0000005C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_579_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_nameplate/symbols.txt b/config/GZ2J01/rels/d_a_obj_nameplate/symbols.txt index a2e77a79dc..8ce4a38d5f 100644 --- a/config/GZ2J01/rels/d_a_obj_nameplate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_nameplate/symbols.txt @@ -38,7 +38,7 @@ ccSphSrc$3700 = .rodata:0x00000040; // type:object size:0x40 scope:local @3769 = .rodata:0x00000088; // type:object size:0x4 scope:local @3791 = .rodata:0x00000090; // type:object size:0x8 scope:local align:8 data:double @stringBase0 = .rodata:0x00000098; // type:object size:0x19 scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global +l_arcName__16daObjNameplate_c = .data:0x00000000; // type:object size:0x4 scope:global l_daObjNameplate_Method = .data:0x00000004; // type:object size:0x20 scope:global g_profile_Obj_NamePlate = .data:0x00000024; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x00000054; // type:object size:0xC scope:global diff --git a/config/GZ2J01/rels/d_a_obj_nan/splits.txt b/config/GZ2J01/rels/d_a_obj_nan/splits.txt index 52a0243278..09b90966dd 100644 --- a/config/GZ2J01/rels/d_a_obj_nan/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_nan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_nan.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_nan/symbols.txt b/config/GZ2J01/rels/d_a_obj_nan/symbols.txt index c605154cfd..6103b51eb9 100644 --- a/config/GZ2J01/rels/d_a_obj_nan/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_nan/symbols.txt @@ -89,9 +89,11 @@ l_musiya_num = .rodata:0x000000D8; // type:object size:0x4 scope:global l_heapsize = .rodata:0x000000DC; // type:object size:0x4 scope:global @5034 = .rodata:0x000000E0; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000E4; // type:object size:0xE scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_581_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__25@unnamed@d_a_obj_nan_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global @3924 = .data:0x00000060; // type:object size:0xC scope:local data:4byte @4034 = .data:0x0000006C; // type:object size:0xC scope:local data:4byte @@ -121,6 +123,6 @@ __vt__8cM3dGPla = .data:0x000001B8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001C4; // type:object size:0xC scope:global __vt__14daObj_NanHIO_c = .data:0x000001D0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_581_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_nougu/splits.txt b/config/GZ2J01/rels/d_a_obj_nougu/splits.txt index 1a55b7b10a..84941b9b11 100644 --- a/config/GZ2J01/rels/d_a_obj_nougu/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_nougu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_nougu.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_octhashi/symbols.txt b/config/GZ2J01/rels/d_a_obj_octhashi/symbols.txt index 1f3cd5c56f..6bc38d728f 100644 --- a/config/GZ2J01/rels/d_a_obj_octhashi/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_octhashi/symbols.txt @@ -72,9 +72,9 @@ ccSphSrc$3655 = .rodata:0x00000000; // type:object size:0x40 scope:local @4166 = .rodata:0x000000C8; // type:object size:0x4 scope:local @4167 = .rodata:0x000000CC; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000D0; // type:object size:0x33 scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local ccCylSrc$3656 = .data:0x00000004; // type:object size:0x44 scope:local align:4 data:float -l_daObjOCTHASHI_Method = .data:0x00000048; // type:object size:0x20 scope:global +l_daObjOCTHASHI_Method = .data:0x00000048; // type:object size:0x20 scope:local g_profile_OCTHASHI = .data:0x00000068; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x00000098; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x000000A4; // type:object size:0xC scope:global @@ -82,4 +82,4 @@ __vt__8cM3dGSph = .data:0x000000B0; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x000000BC; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000C8; // type:object size:0xC scope:global __vt__15daObjOCTHASHI_c = .data:0x000000D4; // type:object size:0x28 scope:global -lbl_584_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +l_cyl_height_init = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_oiltubo/symbols.txt b/config/GZ2J01/rels/d_a_obj_oiltubo/symbols.txt index 74863e882f..270023daf0 100644 --- a/config/GZ2J01/rels/d_a_obj_oiltubo/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_oiltubo/symbols.txt @@ -50,7 +50,8 @@ mCcDObjInfo__15daObj_Oiltubo_c = .rodata:0x00000000; // type:object size:0x30 sc @stringBase0 = .rodata:0x00000054; // type:object size:0x3F scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_585_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resFileName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_bmdFileName = .data:0x00000024; // type:object size:0x4 scope:global l_bbmdFileName = .data:0x00000028; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_onsenTaru/splits.txt b/config/GZ2J01/rels/d_a_obj_onsenTaru/splits.txt index 83f9bc9133..c482a16aea 100644 --- a/config/GZ2J01/rels/d_a_obj_onsenTaru/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_onsenTaru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_onsenTaru.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_onsenTaru/symbols.txt b/config/GZ2J01/rels/d_a_obj_onsenTaru/symbols.txt index f8704d22a2..944803c561 100644 --- a/config/GZ2J01/rels/d_a_obj_onsenTaru/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_onsenTaru/symbols.txt @@ -67,9 +67,11 @@ mCcDObjInfo__11daOnsTaru_c = .rodata:0x00000008; // type:object size:0x30 scope: @4136 = .rodata:0x00000074; // type:object size:0x4 scope:local @4186 = .rodata:0x00000078; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x0000007C; // type:object size:0x21 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_588_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daOnsTaru_c = .data:0x00000020; // type:object size:0x44 scope:global @4002 = .data:0x00000064; // type:object size:0xC scope:local @4003 = .data:0x00000070; // type:object size:0xC scope:local @@ -92,4 +94,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_588_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$1920 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_pdoor/symbols.txt b/config/GZ2J01/rels/d_a_obj_pdoor/symbols.txt index 08eca93f6e..de3bc86d29 100644 --- a/config/GZ2J01/rels/d_a_obj_pdoor/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_pdoor/symbols.txt @@ -30,9 +30,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4053 = .rodata:0x00000018; // type:object size:0x4 scope:local @4054 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_589_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float @3781 = .data:0x0000003C; // type:object size:0xC scope:local @@ -41,4 +43,4 @@ l_func$3780 = .data:0x00000054; // type:object size:0x18 scope:local daObjPDoor_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global g_profile_Obj_PushDoor = .data:0x0000008C; // type:object size:0x30 scope:global __vt__12daObjPDoor_c = .data:0x000000BC; // type:object size:0x28 scope:global -lbl_589_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_pdtile/symbols.txt b/config/GZ2J01/rels/d_a_obj_pdtile/symbols.txt index fa49c99206..bca19f1104 100644 --- a/config/GZ2J01/rels/d_a_obj_pdtile/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_pdtile/symbols.txt @@ -57,7 +57,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000074; // type:object size:0x1C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_590_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName4 = .data:0x00000020; // type:object size:0x4 scope:global l_dzbidx4 = .data:0x00000024; // type:object size:0x8 scope:global l_bmdidx4 = .data:0x0000002C; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_pillar/splits.txt b/config/GZ2J01/rels/d_a_obj_pillar/splits.txt index f220bcb15f..f1c6137890 100644 --- a/config/GZ2J01/rels/d_a_obj_pillar/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_pillar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pillar.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_pillar/symbols.txt b/config/GZ2J01/rels/d_a_obj_pillar/symbols.txt index ac85343b1b..65d6d41b0f 100644 --- a/config/GZ2J01/rels/d_a_obj_pillar/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_pillar/symbols.txt @@ -63,9 +63,11 @@ l_shake_data = .rodata:0x00000064; // type:object size:0x30 scope:global data:2b @4266 = .rodata:0x000000F0; // type:object size:0x4 scope:local @4267 = .rodata:0x000000F4; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000F8; // type:object size:0x1B scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_593_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global @4193 = .data:0x00000028; // type:object size:0xC scope:local @4194 = .data:0x00000034; // type:object size:0xC scope:local @@ -83,4 +85,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000124; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3657 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x28 scope:global align:4 data:float -lbl_593_bss_3C = .bss:0x0000003C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000003C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_pleaf/splits.txt b/config/GZ2J01/rels/d_a_obj_pleaf/splits.txt index b40bc20f27..504fb1b960 100644 --- a/config/GZ2J01/rels/d_a_obj_pleaf/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_pleaf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pleaf.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_poCandle/splits.txt b/config/GZ2J01/rels/d_a_obj_poCandle/splits.txt index 4df1a366a5..cc39941536 100644 --- a/config/GZ2J01/rels/d_a_obj_poCandle/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_poCandle/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poCandle.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_poCandle/symbols.txt b/config/GZ2J01/rels/d_a_obj_poCandle/symbols.txt index f7071915c8..85a06cf1d9 100644 --- a/config/GZ2J01/rels/d_a_obj_poCandle/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_poCandle/symbols.txt @@ -53,9 +53,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3769 = .rodata:0x00000028; // type:object size:0x4 scope:local @3814 = .rodata:0x0000002C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000030; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_595_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3774 = .data:0x00000020; // type:object size:0xC scope:local @3775 = .data:0x0000002C; // type:object size:0xC scope:local @3776 = .data:0x00000038; // type:object size:0xC scope:local @@ -70,4 +72,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000013C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3629 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global align:4 data:float -lbl_595_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_poFire/splits.txt b/config/GZ2J01/rels/d_a_obj_poFire/splits.txt index 94cfbd0ed4..f88811c765 100644 --- a/config/GZ2J01/rels/d_a_obj_poFire/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_poFire/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poFire.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_poFire/symbols.txt b/config/GZ2J01/rels/d_a_obj_poFire/symbols.txt index 95b6bb9923..cec1e34cf9 100644 --- a/config/GZ2J01/rels/d_a_obj_poFire/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_poFire/symbols.txt @@ -74,9 +74,11 @@ itemNo = .rodata:0x0000001C; // type:object size:0x4 scope:global @4107 = .rodata:0x00000048; // type:object size:0x4 scope:local @4134 = .rodata:0x0000004C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000050; // type:object size:0x17 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_596_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3740 = .data:0x00000020; // type:object size:0xC scope:local @3741 = .data:0x0000002C; // type:object size:0xC scope:local @3742 = .data:0x00000038; // type:object size:0xC scope:local @@ -97,4 +99,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3656 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x34 scope:global data:byte -lbl_596_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_poTbox/splits.txt b/config/GZ2J01/rels/d_a_obj_poTbox/splits.txt index 1d8f74ec86..0fa2b1ca2d 100644 --- a/config/GZ2J01/rels/d_a_obj_poTbox/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_poTbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poTbox.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_poTbox/symbols.txt b/config/GZ2J01/rels/d_a_obj_poTbox/symbols.txt index ff97e58d8b..877008ed62 100644 --- a/config/GZ2J01/rels/d_a_obj_poTbox/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_poTbox/symbols.txt @@ -35,9 +35,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3835 = .rodata:0x00000010; // type:object size:0x8 scope:local align:8 data:double @3926 = .rodata:0x00000018; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x0000001C; // type:object size:0x10 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_597_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x8 scope:global l_bmdIdx = .data:0x00000028; // type:object size:0x8 scope:global l_dzbIdx = .data:0x00000030; // type:object size:0x8 scope:global @@ -55,4 +57,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3622 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global -lbl_597_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_pumpkin/splits.txt b/config/GZ2J01/rels/d_a_obj_pumpkin/splits.txt index f1acf4b648..a4a83c5585 100644 --- a/config/GZ2J01/rels/d_a_obj_pumpkin/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_pumpkin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pumpkin.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_pumpkin/symbols.txt b/config/GZ2J01/rels/d_a_obj_pumpkin/symbols.txt index dd7dee69f2..65f1270502 100644 --- a/config/GZ2J01/rels/d_a_obj_pumpkin/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_pumpkin/symbols.txt @@ -82,7 +82,8 @@ l_ccDObjData = .rodata:0x00000034; // type:object size:0x30 scope:global @stringBase0 = .rodata:0x000000F0; // type:object size:0x9 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_599_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_resNameList = .data:0x00000028; // type:object size:0x8 scope:global l_ccDCyl = .data:0x00000030; // type:object size:0x44 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_rfHole/splits.txt b/config/GZ2J01/rels/d_a_obj_rfHole/splits.txt index b7bae7bc58..dd169c4040 100644 --- a/config/GZ2J01/rels/d_a_obj_rfHole/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_rfHole/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rfHole.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_rfHole/symbols.txt b/config/GZ2J01/rels/d_a_obj_rfHole/symbols.txt index c5c9d81845..f0ae86a723 100644 --- a/config/GZ2J01/rels/d_a_obj_rfHole/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_rfHole/symbols.txt @@ -43,9 +43,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3821 = .rodata:0x0000002C; // type:object size:0x4 scope:local particle_id$3917 = .rodata:0x00000030; // type:object size:0xA scope:local @stringBase0 = .rodata:0x0000003C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_601_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3835 = .data:0x00000020; // type:object size:0xC scope:local @3836 = .data:0x0000002C; // type:object size:0xC scope:local @3837 = .data:0x00000038; // type:object size:0xC scope:local @@ -59,4 +61,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000104; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global align:4 data:float -lbl_601_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_rgate/symbols.txt b/config/GZ2J01/rels/d_a_obj_rgate/symbols.txt index b14810af68..a46e9b9292 100644 --- a/config/GZ2J01/rels/d_a_obj_rgate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_rgate/symbols.txt @@ -79,9 +79,11 @@ l_cyl_src = .rodata:0x00000018; // type:object size:0x44 scope:global @4742 = .rodata:0x000000E4; // type:object size:0x4 scope:local data:string @4744 = .rodata:0x000000E8; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000000F0; // type:object size:0x45 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_602_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @4797 = .data:0x00000024; // type:object size:0xC scope:local @4798 = .data:0x00000030; // type:object size:0xC scope:local @@ -96,5 +98,5 @@ __vt__8cM3dGAab = .data:0x000000E4; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x000000F0; // type:object size:0xC scope:global __vt__12daObjRgate_c = .data:0x000000FC; // type:object size:0x28 scope:global l_evName$4049 = .bss:0x00000000; // type:object size:0x4 scope:local -lbl_602_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte -lbl_602_bss_5 = .bss:0x00000005; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000005; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_riverrock/splits.txt b/config/GZ2J01/rels/d_a_obj_riverrock/splits.txt index ecd6bae4b0..5ee30642ca 100644 --- a/config/GZ2J01/rels/d_a_obj_riverrock/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_riverrock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_riverrock.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_riverrock/symbols.txt b/config/GZ2J01/rels/d_a_obj_riverrock/symbols.txt index 16232a3684..5637c4cf0c 100644 --- a/config/GZ2J01/rels/d_a_obj_riverrock/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_riverrock/symbols.txt @@ -70,6 +70,6 @@ __vt__8cM3dGAab = .data:0x00000060; // type:object size:0xC scope:global __vt__16daObjRIVERROCK_c = .data:0x0000006C; // type:object size:0x28 scope:global __vt__20daObjRIVERROCK_HIO_c = .data:0x00000094; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_603_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3626 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_rope_bridge/symbols.txt b/config/GZ2J01/rels/d_a_obj_rope_bridge/symbols.txt index a075e6fcdb..cebf2fa75b 100644 --- a/config/GZ2J01/rels/d_a_obj_rope_bridge/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_rope_bridge/symbols.txt @@ -68,7 +68,8 @@ l_rope_cullbox = .rodata:0x00000048; // type:object size:0x18 scope:global align @stringBase0 = .rodata:0x000000C4; // type:object size:0x24 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_110_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_ropeArcName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte l_rope_offsetL = .data:0x0000002C; // type:object size:0x18 scope:global @@ -97,4 +98,4 @@ __vt__8cM3dGSph = .data:0x00000240; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x0000024C; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x00000258; // type:object size:0x14 scope:global __vt__14daObjRBridge_c = .data:0x0000026C; // type:object size:0x28 scope:global -lbl_110_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_rotBridge/splits.txt b/config/GZ2J01/rels/d_a_obj_rotBridge/splits.txt index ca839421bc..fb53325064 100644 --- a/config/GZ2J01/rels/d_a_obj_rotBridge/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_rotBridge/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rotBridge.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_rotTrap/splits.txt b/config/GZ2J01/rels/d_a_obj_rotTrap/splits.txt index 22f0c2ec29..bb3bd8b87b 100644 --- a/config/GZ2J01/rels/d_a_obj_rotTrap/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_rotTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rotTrap.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_rotTrap/symbols.txt b/config/GZ2J01/rels/d_a_obj_rotTrap/symbols.txt index 8f3911c1b5..5ef2d7bec9 100644 --- a/config/GZ2J01/rels/d_a_obj_rotTrap/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_rotTrap/symbols.txt @@ -45,9 +45,11 @@ mCcDObjInfo__11daRotTrap_c = .rodata:0x00000004; // type:object size:0x30 scope: @3925 = .rodata:0x00000048; // type:object size:0x4 scope:local @3940 = .rodata:0x0000004C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000050; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_606_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daRotTrap_c = .data:0x00000020; // type:object size:0x44 scope:global atPos = .data:0x00000064; // type:object size:0xA8 scope:global atR = .data:0x0000010C; // type:object size:0x38 scope:global @@ -67,4 +69,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000240; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_606_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_rstair/symbols.txt b/config/GZ2J01/rels/d_a_obj_rstair/symbols.txt index 8476affb70..f11a67e70d 100644 --- a/config/GZ2J01/rels/d_a_obj_rstair/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_rstair/symbols.txt @@ -39,9 +39,11 @@ l_target_angleY = .rodata:0x00000010; // type:object size:0x10 scope:global @3912 = .rodata:0x00000028; // type:object size:0x4 scope:local @4107 = .rodata:0x0000002C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000030; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_608_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_water_check_offset = .data:0x00000024; // type:object size:0xC scope:global @3811 = .data:0x00000030; // type:object size:0xC scope:local @@ -56,5 +58,5 @@ daObjRotStair_METHODS = .data:0x000000C0; // type:object size:0x20 scope:global g_profile_Obj_RotStair = .data:0x000000E0; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000110; // type:object size:0xC scope:global __vt__15daObjRotStair_c = .data:0x0000011C; // type:object size:0x28 scope:global -lbl_608_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_608_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_rw/splits.txt b/config/GZ2J01/rels/d_a_obj_rw/splits.txt index 512cc1b3b7..35df00ee56 100644 --- a/config/GZ2J01/rels/d_a_obj_rw/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_rw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rw.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_rw/symbols.txt b/config/GZ2J01/rels/d_a_obj_rw/symbols.txt index 6f81469e6c..8cbf2eb9a2 100644 --- a/config/GZ2J01/rels/d_a_obj_rw/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_rw/symbols.txt @@ -60,6 +60,6 @@ __vt__8cM3dGAab = .data:0x00000100; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x0000010C; // type:object size:0xC scope:global __vt__14daOBJ_RW_HIO_c = .data:0x00000118; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_609_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_sWallShutter/splits.txt b/config/GZ2J01/rels/d_a_obj_sWallShutter/splits.txt index 954037f834..ebdb2c2f98 100644 --- a/config/GZ2J01/rels/d_a_obj_sWallShutter/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_sWallShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sWallShutter.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_sWallShutter/symbols.txt b/config/GZ2J01/rels/d_a_obj_sWallShutter/symbols.txt index 1948099b9e..495f590b1f 100644 --- a/config/GZ2J01/rels/d_a_obj_sWallShutter/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_sWallShutter/symbols.txt @@ -47,7 +47,8 @@ l_dzbIdx = .rodata:0x00000028; // type:object size:0x8 scope:global @stringBase0 = .rodata:0x00000040; // type:object size:0xF scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_111_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x8 scope:global @3746 = .data:0x00000028; // type:object size:0xC scope:local @3747 = .data:0x00000034; // type:object size:0xC scope:local @@ -62,4 +63,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000010C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3624 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x2C scope:global data:byte -lbl_111_bss_40 = .bss:0x00000040; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000040; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_saidan/splits.txt b/config/GZ2J01/rels/d_a_obj_saidan/splits.txt index e2d85e7f2b..29bfc7d674 100644 --- a/config/GZ2J01/rels/d_a_obj_saidan/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_saidan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_saidan.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_saidan/symbols.txt b/config/GZ2J01/rels/d_a_obj_saidan/symbols.txt index b7561d1a4c..e8edbe0233 100644 --- a/config/GZ2J01/rels/d_a_obj_saidan/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_saidan/symbols.txt @@ -36,9 +36,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3761 = .rodata:0x00000014; // type:object size:0x4 scope:local align:4 data:float @3762 = .rodata:0x00000018; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000001C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_610_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3718 = .data:0x00000020; // type:object size:0xC scope:local @3719 = .data:0x0000002C; // type:object size:0xC scope:local @3720 = .data:0x00000038; // type:object size:0xC scope:local @@ -51,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global align:4 data:float -lbl_610_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_scannon/symbols.txt b/config/GZ2J01/rels/d_a_obj_scannon/symbols.txt index 2ab59e7aea..b42f479c30 100644 --- a/config/GZ2J01/rels/d_a_obj_scannon/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_scannon/symbols.txt @@ -83,7 +83,8 @@ s_demoTable__11daSCannon_c = .rodata:0x0000003C; // type:object size:0x30 scope: @stringBase0 = .rodata:0x0000009C; // type:object size:0xE0 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_613_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName_Comp = .data:0x00000020; // type:object size:0x4 scope:global l_arcName_Crash = .data:0x00000024; // type:object size:0x4 scope:global l_arcName_Zev = .data:0x00000028; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_obj_scannon_crs/symbols.txt b/config/GZ2J01/rels/d_a_obj_scannon_crs/symbols.txt index b06332c345..fd90f41e32 100644 --- a/config/GZ2J01/rels/d_a_obj_scannon_crs/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_scannon_crs/symbols.txt @@ -62,7 +62,8 @@ MIDNA_BEAM_OFFSET$4360 = .rodata:0x00000080; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000094; // type:object size:0x45 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_614_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_obj_scannon_ten/symbols.txt b/config/GZ2J01/rels/d_a_obj_scannon_ten/symbols.txt index e8e80a51b0..1b15313a46 100644 --- a/config/GZ2J01/rels/d_a_obj_scannon_ten/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_scannon_ten/symbols.txt @@ -71,7 +71,8 @@ PARTICLE_NAME$4297 = .rodata:0x00000040; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000048; // type:object size:0x4D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_615_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_obj_sekidoor/splits.txt b/config/GZ2J01/rels/d_a_obj_sekidoor/splits.txt index 540e8a3867..561aaf3ff7 100644 --- a/config/GZ2J01/rels/d_a_obj_sekidoor/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_sekidoor/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekidoor.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_sekidoor/symbols.txt b/config/GZ2J01/rels/d_a_obj_sekidoor/symbols.txt index 0573ef98df..13f42e4941 100644 --- a/config/GZ2J01/rels/d_a_obj_sekidoor/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_sekidoor/symbols.txt @@ -36,7 +36,8 @@ id$4006 = .rodata:0x00000020; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000028; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_616_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global l_dzbData = .data:0x00000028; // type:object size:0x8 scope:global l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_sekizo/splits.txt b/config/GZ2J01/rels/d_a_obj_sekizo/splits.txt index 8e5032b6ec..cb711953d2 100644 --- a/config/GZ2J01/rels/d_a_obj_sekizo/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_sekizo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekizo.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_sekizo/symbols.txt b/config/GZ2J01/rels/d_a_obj_sekizo/symbols.txt index 923fc6608a..9b3ad28267 100644 --- a/config/GZ2J01/rels/d_a_obj_sekizo/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_sekizo/symbols.txt @@ -24,7 +24,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000000; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_617_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global l_dzbData = .data:0x00000028; // type:object size:0x8 scope:global l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_sekizoa/splits.txt b/config/GZ2J01/rels/d_a_obj_sekizoa/splits.txt index 9b3d30fcbd..6e652aa808 100644 --- a/config/GZ2J01/rels/d_a_obj_sekizoa/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_sekizoa/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekizoa.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_sekizoa/symbols.txt b/config/GZ2J01/rels/d_a_obj_sekizoa/symbols.txt index b14a5f1bfd..8ca0bc9934 100644 --- a/config/GZ2J01/rels/d_a_obj_sekizoa/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_sekizoa/symbols.txt @@ -153,7 +153,8 @@ heapSize$4093 = .rodata:0x0000009C; // type:object size:0x20 scope:local @stringBase0 = .rodata:0x00000168; // type:object size:0x71 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_618_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x48 scope:global l_evtList = .data:0x00000068; // type:object size:0x50 scope:global data:4byte l_resNameList = .data:0x000000B8; // type:object size:0xC scope:global diff --git a/config/GZ2J01/rels/d_a_obj_shield/symbols.txt b/config/GZ2J01/rels/d_a_obj_shield/symbols.txt index f81f43b099..2cd3abc00a 100644 --- a/config/GZ2J01/rels/d_a_obj_shield/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_shield/symbols.txt @@ -64,9 +64,11 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @4336 = .rodata:0x000000B0; // type:object size:0x4 scope:local @4337 = .rodata:0x000000B4; // type:object size:0x4 scope:local data:string @stringBase0 = .rodata:0x000000B8; // type:object size:0x10 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_619_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4189 = .data:0x00000020; // type:object size:0xC scope:local @4190 = .data:0x0000002C; // type:object size:0xC scope:local @4191 = .data:0x00000038; // type:object size:0xC scope:local @@ -87,5 +89,5 @@ __vt__8cM3dGAab = .data:0x00000160; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000016C; // type:object size:0x24 scope:global __vt__14daItemShield_c = .data:0x00000190; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001D4; // type:object size:0xC scope:global -lbl_619_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_619_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_smallkey/symbols.txt b/config/GZ2J01/rels/d_a_obj_smallkey/symbols.txt index 22fd8ada7a..af9c1794d8 100644 --- a/config/GZ2J01/rels/d_a_obj_smallkey/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_smallkey/symbols.txt @@ -78,9 +78,11 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @4503 = .rodata:0x00000094; // type:object size:0x4 scope:local align:4 data:float @4618 = .rodata:0x00000098; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000009C; // type:object size:0x18 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_621_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4652 = .data:0x00000020; // type:object size:0xC scope:local @4653 = .data:0x0000002C; // type:object size:0xC scope:local @4654 = .data:0x00000038; // type:object size:0xC scope:local @@ -101,4 +103,4 @@ __vt__8cM3dGAab = .data:0x00000184; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000190; // type:object size:0x24 scope:global __vt__7daKey_c = .data:0x000001B4; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001F8; // type:object size:0xC scope:global -lbl_621_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_smgdoor/symbols.txt b/config/GZ2J01/rels/d_a_obj_smgdoor/symbols.txt index 40ac5fd5f9..e4a30d1076 100644 --- a/config/GZ2J01/rels/d_a_obj_smgdoor/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_smgdoor/symbols.txt @@ -61,4 +61,4 @@ l_func$3923 = .data:0x00000094; // type:object size:0x24 scope:local daObjSmgDoor_METHODS = .data:0x000000B8; // type:object size:0x20 scope:global g_profile_Obj_SmgDoor = .data:0x000000D8; // type:object size:0x30 scope:global __vt__14daObjSmgDoor_c = .data:0x00000108; // type:object size:0x28 scope:global -init$1847 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1847 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_smtile/splits.txt b/config/GZ2J01/rels/d_a_obj_smtile/splits.txt index 0d2f9be9c3..5d1eb3043a 100644 --- a/config/GZ2J01/rels/d_a_obj_smtile/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_smtile/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_smtile.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_snowEffTag/splits.txt b/config/GZ2J01/rels/d_a_obj_snowEffTag/splits.txt index f429528250..b52be28dd5 100644 --- a/config/GZ2J01/rels/d_a_obj_snowEffTag/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_snowEffTag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_snowEffTag.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_so/splits.txt b/config/GZ2J01/rels/d_a_obj_so/splits.txt index 866abd824a..73d7243a3f 100644 --- a/config/GZ2J01/rels/d_a_obj_so/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_so/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_so.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_so/symbols.txt b/config/GZ2J01/rels/d_a_obj_so/symbols.txt index edc721f1bc..805466faa3 100644 --- a/config/GZ2J01/rels/d_a_obj_so/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_so/symbols.txt @@ -141,6 +141,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000B4; // type:object size:0x24 scope:global __vt__14dBgS_ObjGndChk = .data:0x000000D8; // type:object size:0x30 scope:global __vt__14daObj_So_HIO_c = .data:0x00000108; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_628_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3774 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_spinLift/splits.txt b/config/GZ2J01/rels/d_a_obj_spinLift/splits.txt index 4e398c4423..8dddbc306e 100644 --- a/config/GZ2J01/rels/d_a_obj_spinLift/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_spinLift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_spinLift.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_spinLift/symbols.txt b/config/GZ2J01/rels/d_a_obj_spinLift/symbols.txt index e6ef9cf494..742a89a2f6 100644 --- a/config/GZ2J01/rels/d_a_obj_spinLift/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_spinLift/symbols.txt @@ -61,4 +61,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3631 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -init$1678 = .bss:0x00000024; // type:object size:0x1 data:byte +init$1678 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_ss_drink/symbols.txt b/config/GZ2J01/rels/d_a_obj_ss_drink/symbols.txt index 1e8f43055b..e3c36517a5 100644 --- a/config/GZ2J01/rels/d_a_obj_ss_drink/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_ss_drink/symbols.txt @@ -66,7 +66,8 @@ mCcDObjInfo__15daObj_SSDrink_c = .rodata:0x00000000; // type:object size:0x30 sc @stringBase0 = .rodata:0x00000060; // type:object size:0x32 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_630_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resFileName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_bmdName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte mCcDCyl__15daObj_SSDrink_c = .data:0x00000028; // type:object size:0x44 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_stairBlock/splits.txt b/config/GZ2J01/rels/d_a_obj_stairBlock/splits.txt index 7f0ca5486d..0a98b4691c 100644 --- a/config/GZ2J01/rels/d_a_obj_stairBlock/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_stairBlock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stairBlock.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_stick/splits.txt b/config/GZ2J01/rels/d_a_obj_stick/splits.txt index 75e845f3f0..8d108c032c 100644 --- a/config/GZ2J01/rels/d_a_obj_stick/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_stick/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stick.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_stone/symbols.txt b/config/GZ2J01/rels/d_a_obj_stone/symbols.txt index 3f9e9ef8a5..8855ecc528 100644 --- a/config/GZ2J01/rels/d_a_obj_stone/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_stone/symbols.txt @@ -111,9 +111,11 @@ l_eff_id$5089 = .rodata:0x0000016C; // type:object size:0x6 scope:local @5256 = .rodata:0x00000178; // type:object size:0x8 scope:local l_carry_eff_id$5307 = .rodata:0x00000180; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000188; // type:object size:0x17 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_633_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global @4015 = .data:0x00000028; // type:object size:0xC scope:local @4016 = .data:0x00000034; // type:object size:0xC scope:local @@ -133,4 +135,4 @@ __vt__8cM3dGSph = .data:0x00000174; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000180; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000018C; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001B0; // type:object size:0xC scope:global -lbl_633_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_stopper/splits.txt b/config/GZ2J01/rels/d_a_obj_stopper/splits.txt index 439634cbe9..5d445edd08 100644 --- a/config/GZ2J01/rels/d_a_obj_stopper/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_stopper/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stopper.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_stopper/symbols.txt b/config/GZ2J01/rels/d_a_obj_stopper/symbols.txt index 57f9c5bfc5..f26c6bb968 100644 --- a/config/GZ2J01/rels/d_a_obj_stopper/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_stopper/symbols.txt @@ -70,9 +70,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4311 = .rodata:0x00000048; // type:object size:0x4 scope:local @4312 = .rodata:0x0000004C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000050; // type:object size:0xE scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_634_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3843 = .data:0x00000020; // type:object size:0xC scope:local @3844 = .data:0x0000002C; // type:object size:0xC scope:local @3845 = .data:0x00000038; // type:object size:0xC scope:local @@ -111,8 +113,9 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3627 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte l_offset$3626 = .bss:0x00000058; // type:object size:0xC scope:local -lbl_634_bss_64 = .bss:0x00000064; // type:object size:0x1 data:byte +init$0001 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000068; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000006C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000070; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_stopper2/symbols.txt b/config/GZ2J01/rels/d_a_obj_stopper2/symbols.txt index 23d17ac1f6..fb53cdc87d 100644 --- a/config/GZ2J01/rels/d_a_obj_stopper2/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_stopper2/symbols.txt @@ -36,9 +36,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3925 = .rodata:0x00000018; // type:object size:0x4 scope:local @3926 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0x52 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_635_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x10 scope:global l_staffName = .data:0x00000034; // type:object size:0x4 scope:global data:4byte @@ -50,4 +52,4 @@ l_func$3768 = .data:0x00000068; // type:object size:0x30 scope:local action_table$3859 = .data:0x00000098; // type:object size:0xC scope:local l_daObjStopper2_Method = .data:0x000000A4; // type:object size:0x20 scope:global g_profile_Obj_Stopper2 = .data:0x000000C4; // type:object size:0x30 scope:global -lbl_635_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_swBallA/symbols.txt b/config/GZ2J01/rels/d_a_obj_swBallA/symbols.txt index acee329b1f..6b28dd457d 100644 --- a/config/GZ2J01/rels/d_a_obj_swBallA/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_swBallA/symbols.txt @@ -40,9 +40,11 @@ l_color = .rodata:0x00000000; // type:object size:0x4 scope:global @4032 = .rodata:0x00000024; // type:object size:0x4 scope:local align:4 data:float @4122 = .rodata:0x00000028; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000002C; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_638_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3956 = .data:0x00000024; // type:object size:0xC scope:local @3957 = .data:0x00000030; // type:object size:0xC scope:local @@ -54,4 +56,4 @@ __vt__17dEvLib_callback_c = .data:0x000000C8; // type:object size:0x18 scope:glo __vt__12J3DFrameCtrl = .data:0x000000E0; // type:object size:0xC scope:global l_target_info = .bss:0x00000000; // type:object size:0x20 scope:global l_target_info_count = .bss:0x00000020; // type:object size:0x4 scope:global data:4byte -lbl_638_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_swBallB/symbols.txt b/config/GZ2J01/rels/d_a_obj_swBallB/symbols.txt index 8fa82dc145..dd68bf1a94 100644 --- a/config/GZ2J01/rels/d_a_obj_swBallB/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_swBallB/symbols.txt @@ -42,9 +42,11 @@ l_event_bitB = .rodata:0x00000010; // type:object size:0xC scope:global @4178 = .rodata:0x0000003C; // type:object size:0x4 scope:local @4276 = .rodata:0x00000040; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_639_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @4007 = .data:0x00000024; // type:object size:0xC scope:local @4008 = .data:0x00000030; // type:object size:0xC scope:local @@ -56,4 +58,4 @@ __vt__17dEvLib_callback_c = .data:0x000000C8; // type:object size:0x18 scope:glo __vt__12J3DFrameCtrl = .data:0x000000E0; // type:object size:0xC scope:global l_target_info = .bss:0x00000000; // type:object size:0x8 scope:global l_target_info_count = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte -lbl_639_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_swBallC/symbols.txt b/config/GZ2J01/rels/d_a_obj_swBallC/symbols.txt index 55d09580cb..d2096a75a9 100644 --- a/config/GZ2J01/rels/d_a_obj_swBallC/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_swBallC/symbols.txt @@ -46,9 +46,11 @@ l_color = .rodata:0x00000000; // type:object size:0x4 scope:global @4252 = .rodata:0x0000002C; // type:object size:0x4 scope:local @4253 = .rodata:0x00000030; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000034; // type:object size:0x87 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_640_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte @@ -63,4 +65,4 @@ action_table$3966 = .data:0x0000008C; // type:object size:0x34 scope:local l_daObjSwBallC_Method = .data:0x00000128; // type:object size:0x20 scope:global g_profile_Obj_SwBallC = .data:0x00000148; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000178; // type:object size:0xC scope:global -lbl_640_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_swLight/symbols.txt b/config/GZ2J01/rels/d_a_obj_swLight/symbols.txt index 93be2d29e9..674716218d 100644 --- a/config/GZ2J01/rels/d_a_obj_swLight/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_swLight/symbols.txt @@ -77,4 +77,4 @@ __vt__8cM3dGSph = .data:0x00000154; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000160; // type:object size:0xC scope:global __vt__17dEvLib_callback_c = .data:0x0000016C; // type:object size:0x18 scope:global __vt__14daObjSwLight_c = .data:0x00000184; // type:object size:0x44 scope:global -lbl_641_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_swhang/symbols.txt b/config/GZ2J01/rels/d_a_obj_swhang/symbols.txt index a98652a9d0..cc32bbcb5c 100644 --- a/config/GZ2J01/rels/d_a_obj_swhang/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_swhang/symbols.txt @@ -58,9 +58,11 @@ l_heap_size = .rodata:0x00000050; // type:object size:0x14 scope:global @4229 = .rodata:0x0000008C; // type:object size:0x4 scope:local @4232 = .rodata:0x00000090; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000098; // type:object size:0x42 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_643_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x14 scope:global l_pull_jnt = .data:0x00000034; // type:object size:0x14 scope:global l_hang_offset = .data:0x00000048; // type:object size:0x3C scope:global @@ -77,4 +79,4 @@ __vt__8cM3dGSph = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__17dEvLib_callback_c = .data:0x000001B4; // type:object size:0x18 scope:global __vt__13daObjSwHang_c = .data:0x000001CC; // type:object size:0x48 scope:global -lbl_643_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_sword/symbols.txt b/config/GZ2J01/rels/d_a_obj_sword/symbols.txt index 28d66e8281..b6e7016a48 100644 --- a/config/GZ2J01/rels/d_a_obj_sword/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_sword/symbols.txt @@ -27,9 +27,11 @@ __dt__10cCcD_GSttsFv = .text:0x00000944; // type:function size:0x48 scope:global _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000000; // type:object size:0x10 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_644_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global align:4 data:float @3900 = .data:0x00000038; // type:object size:0xC scope:local @3901 = .data:0x00000044; // type:object size:0xC scope:local @@ -44,4 +46,4 @@ __vt__12daObjSword_c = .data:0x000000F4; // type:object size:0x44 scope:global __vt__8cM3dGCyl = .data:0x00000138; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000150; // type:object size:0x24 scope:global -lbl_644_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_swpush/splits.txt b/config/GZ2J01/rels/d_a_obj_swpush/splits.txt index 53f6db86bf..0fa179e99c 100644 --- a/config/GZ2J01/rels/d_a_obj_swpush/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_swpush/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swpush.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_swpush/symbols.txt b/config/GZ2J01/rels/d_a_obj_swpush/symbols.txt index 597903801c..8a7353a8df 100644 --- a/config/GZ2J01/rels/d_a_obj_swpush/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_swpush/symbols.txt @@ -77,7 +77,8 @@ tri_id$3921 = .rodata:0x00000124; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x0000013C; // type:object size:0x38 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_21_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double M_arcname__Q211daObjSwpush5Act_c = .data:0x00000020; // type:object size:0xC scope:global @4518 = .data:0x0000002C; // type:object size:0xC scope:local @4519 = .data:0x00000038; // type:object size:0xC scope:local @@ -113,12 +114,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3915 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x00000058; // type:object size:0xC scope:local @3919 = .bss:0x00000064; // type:object size:0xC scope:local @3920 = .bss:0x00000070; // type:object size:0xC scope:local no_push_vec$3914 = .bss:0x0000007C; // type:object size:0x30 scope:local -lbl_21_bss_AC = .bss:0x000000AC; // type:object size:0x1 data:byte -lbl_21_bss_AD = .bss:0x000000AD; // type:object size:0x1 data:byte +init$0001 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_swpush2/symbols.txt b/config/GZ2J01/rels/d_a_obj_swpush2/symbols.txt index 221cc24017..a75ba0052f 100644 --- a/config/GZ2J01/rels/d_a_obj_swpush2/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_swpush2/symbols.txt @@ -69,9 +69,11 @@ M_attr__Q212daObjSwpush25Act_c = .rodata:0x0000000C; // type:object size:0xE0 sc @4396 = .rodata:0x00000120; // type:object size:0x8 scope:local @4397 = .rodata:0x00000128; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000130; // type:object size:0x7C scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_645_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4336 = .data:0x00000020; // type:object size:0xC scope:local @4337 = .data:0x0000002C; // type:object size:0xC scope:local @4338 = .data:0x00000038; // type:object size:0xC scope:local @@ -86,5 +88,5 @@ mode_proc$4343 = .data:0x000000C8; // type:object size:0x30 scope:local Mthd_Table__Q212daObjSwpush229@unnamed@d_a_obj_swpush2_cpp@ = .data:0x000000F8; // type:object size:0x20 scope:global g_profile_Obj_Swpush2 = .data:0x00000118; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000148; // type:object size:0xC scope:global -lbl_645_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_645_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_swpush5/splits.txt b/config/GZ2J01/rels/d_a_obj_swpush5/splits.txt index 7e9bde187b..a87bc61af8 100644 --- a/config/GZ2J01/rels/d_a_obj_swpush5/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_swpush5/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swpush5.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_swpush5/symbols.txt b/config/GZ2J01/rels/d_a_obj_swpush5/symbols.txt index 1e43a1a499..af703b8158 100644 --- a/config/GZ2J01/rels/d_a_obj_swpush5/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_swpush5/symbols.txt @@ -57,7 +57,8 @@ l_dzbIdx = .rodata:0x00000000; // type:object size:0x8 scope:global @stringBase0 = .rodata:0x0000002C; // type:object size:0x9 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_115_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3907 = .data:0x00000024; // type:object size:0xC scope:local @3908 = .data:0x00000030; // type:object size:0xC scope:local @@ -93,12 +94,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3654 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000058; // type:object size:0xC scope:local @3658 = .bss:0x00000064; // type:object size:0xC scope:local @3659 = .bss:0x00000070; // type:object size:0xC scope:local l_push_check_pos$3653 = .bss:0x0000007C; // type:object size:0x30 scope:local -lbl_115_bss_AC = .bss:0x000000AC; // type:object size:0x1 data:byte -lbl_115_bss_AD = .bss:0x000000AD; // type:object size:0x1 data:byte +init$0001 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_swturn/symbols.txt b/config/GZ2J01/rels/d_a_obj_swturn/symbols.txt index 000fb04318..5bb87db7ed 100644 --- a/config/GZ2J01/rels/d_a_obj_swturn/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_swturn/symbols.txt @@ -39,9 +39,11 @@ l_tame_time_cnt = .rodata:0x00000020; // type:object size:0x2 scope:global data: @4189 = .rodata:0x00000044; // type:object size:0x4 scope:local @4304 = .rodata:0x00000048; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000004C; // type:object size:0x13 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_647_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global @3813 = .data:0x00000028; // type:object size:0xC scope:local @3814 = .data:0x00000034; // type:object size:0xC scope:local @@ -49,4 +51,4 @@ l_func$3812 = .data:0x00000040; // type:object size:0x18 scope:local daObjSwTurn_METHODS = .data:0x00000058; // type:object size:0x20 scope:global g_profile_Obj_SwTurn = .data:0x00000078; // type:object size:0x30 scope:global __vt__13daObjSwTurn_c = .data:0x000000A8; // type:object size:0x28 scope:global -lbl_647_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_syRock/splits.txt b/config/GZ2J01/rels/d_a_obj_syRock/splits.txt index 98115bf46b..25c9737f3f 100644 --- a/config/GZ2J01/rels/d_a_obj_syRock/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_syRock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_syRock.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_syRock/symbols.txt b/config/GZ2J01/rels/d_a_obj_syRock/symbols.txt index bbd2b18a11..8c145bcb77 100644 --- a/config/GZ2J01/rels/d_a_obj_syRock/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_syRock/symbols.txt @@ -82,9 +82,11 @@ mCcDObjInfo__10daSyRock_c = .rodata:0x00000028; // type:object size:0x30 scope:g @4197 = .rodata:0x00000098; // type:object size:0x4 scope:local align:4 data:float @4275 = .rodata:0x0000009C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000A0; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_648_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daSyRock_c = .data:0x00000020; // type:object size:0x44 scope:global @3922 = .data:0x00000064; // type:object size:0xC scope:local @3923 = .data:0x00000070; // type:object size:0xC scope:local @@ -108,4 +110,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000210; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3656 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x34 scope:global data:byte -lbl_648_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_taFence/splits.txt b/config/GZ2J01/rels/d_a_obj_taFence/splits.txt index 9100cabbfd..fb142af441 100644 --- a/config/GZ2J01/rels/d_a_obj_taFence/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_taFence/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_taFence.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_taFence/symbols.txt b/config/GZ2J01/rels/d_a_obj_taFence/symbols.txt index 83384ee213..32ea092875 100644 --- a/config/GZ2J01/rels/d_a_obj_taFence/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_taFence/symbols.txt @@ -60,9 +60,11 @@ l_check_area = .rodata:0x00000064; // type:object size:0x30 scope:global @3981 = .rodata:0x000000B0; // type:object size:0x4 scope:local align:4 data:float @4028 = .rodata:0x000000B4; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000B8; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_650_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daTaFence_c = .data:0x00000020; // type:object size:0x44 scope:global @3870 = .data:0x00000064; // type:object size:0xC scope:local @3871 = .data:0x00000070; // type:object size:0xC scope:local @@ -81,4 +83,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000178; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x74 scope:global data:byte -lbl_650_bss_88 = .bss:0x00000088; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000088; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_takaraDai/splits.txt b/config/GZ2J01/rels/d_a_obj_takaraDai/splits.txt index c34759ac2b..0495e417cb 100644 --- a/config/GZ2J01/rels/d_a_obj_takaraDai/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_takaraDai/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_takaraDai.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_takaraDai/symbols.txt b/config/GZ2J01/rels/d_a_obj_takaraDai/symbols.txt index 2a6f816fe3..14a79d3164 100644 --- a/config/GZ2J01/rels/d_a_obj_takaraDai/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_takaraDai/symbols.txt @@ -54,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000009C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x3C scope:global align:4 data:float -lbl_652_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_ten/splits.txt b/config/GZ2J01/rels/d_a_obj_ten/splits.txt index 2df8d2c33b..a8d1a89795 100644 --- a/config/GZ2J01/rels/d_a_obj_ten/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_ten/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ten.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_ten/symbols.txt b/config/GZ2J01/rels/d_a_obj_ten/symbols.txt index 9bb8e9b4ac..e99c7c124a 100644 --- a/config/GZ2J01/rels/d_a_obj_ten/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_ten/symbols.txt @@ -96,6 +96,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_TenHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_654_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_thdoor/symbols.txt b/config/GZ2J01/rels/d_a_obj_thdoor/symbols.txt index e101ef7787..b61c61230b 100644 --- a/config/GZ2J01/rels/d_a_obj_thdoor/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_thdoor/symbols.txt @@ -64,4 +64,4 @@ __vt__10dCcD_GStts = .data:0x00000138; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x00000150; // type:object size:0xC scope:global __vt__13daObjThDoor_c = .data:0x0000015C; // type:object size:0x28 scope:global -init$1622 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$1622 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_timeFire/splits.txt b/config/GZ2J01/rels/d_a_obj_timeFire/splits.txt index 209705648c..d62d887178 100644 --- a/config/GZ2J01/rels/d_a_obj_timeFire/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_timeFire/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_timeFire.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_timer/symbols.txt b/config/GZ2J01/rels/d_a_obj_timer/symbols.txt index 2f54c95c24..3b43318673 100644 --- a/config/GZ2J01/rels/d_a_obj_timer/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_timer/symbols.txt @@ -20,10 +20,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3721 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_22_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3726 = .data:0x00000020; // type:object size:0xC scope:local @3727 = .data:0x0000002C; // type:object size:0xC scope:local mode_proc$3725 = .data:0x00000038; // type:object size:0x18 scope:local Mthd_Table__Q210daObjTimer27@unnamed@d_a_obj_timer_cpp@ = .data:0x00000050; // type:object size:0x20 scope:global g_profile_Obj_Timer = .data:0x00000070; // type:object size:0x30 scope:global -lbl_22_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_tks/splits.txt b/config/GZ2J01/rels/d_a_obj_tks/splits.txt index 44d257f0e5..1029e9ea60 100644 --- a/config/GZ2J01/rels/d_a_obj_tks/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_tks/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tks.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_tks/symbols.txt b/config/GZ2J01/rels/d_a_obj_tks/symbols.txt index 3baa65a273..0ad479815a 100644 --- a/config/GZ2J01/rels/d_a_obj_tks/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_tks/symbols.txt @@ -117,7 +117,8 @@ m_cameraItemNum$4211 = .rodata:0x00000080; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000018C; // type:object size:0x25 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_660_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x30 scope:global l_btpGetParamList = .data:0x00000050; // type:object size:0x8 scope:global l_btkGetParamList = .data:0x00000058; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2J01/rels/d_a_obj_toby/splits.txt b/config/GZ2J01/rels/d_a_obj_toby/splits.txt index 001ef71e37..811b4206de 100644 --- a/config/GZ2J01/rels/d_a_obj_toby/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_toby/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_toby.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_toby/symbols.txt b/config/GZ2J01/rels/d_a_obj_toby/symbols.txt index b0a0be5011..3aed68d940 100644 --- a/config/GZ2J01/rels/d_a_obj_toby/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_toby/symbols.txt @@ -98,16 +98,16 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3801 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float hz_check_pos_z = .bss:0x00000064; // type:object size:0x4 scope:local align:4 data:float @3946 = .bss:0x00000068; // type:object size:0xC scope:local -init$3947 = .bss:0x00000074; // type:object size:0x1 scope:local +init$3947 = .bss:0x00000074; // type:object size:0x1 scope:local align:1 data:byte sc$3945 = .bss:0x00000078; // type:object size:0xC scope:local @4167 = .bss:0x00000084; // type:object size:0xC scope:local -init$4168 = .bss:0x00000090; // type:object size:0x1 scope:local +init$4168 = .bss:0x00000090; // type:object size:0x1 scope:local align:1 data:byte sc$4166 = .bss:0x00000094; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A4; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_tobyhouse/splits.txt b/config/GZ2J01/rels/d_a_obj_tobyhouse/splits.txt index dadb6ac0d5..a544cc1029 100644 --- a/config/GZ2J01/rels/d_a_obj_tobyhouse/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_tobyhouse/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tobyhouse.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_tobyhouse/symbols.txt b/config/GZ2J01/rels/d_a_obj_tobyhouse/symbols.txt index 73a2e017df..e6f3c141f9 100644 --- a/config/GZ2J01/rels/d_a_obj_tobyhouse/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_tobyhouse/symbols.txt @@ -89,7 +89,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$1832 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +init$1832 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4351 = .bss:0x00000048; // type:object size:0xC scope:local l_shotSmokeScale$4350 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_togeTrap/splits.txt b/config/GZ2J01/rels/d_a_obj_togeTrap/splits.txt index de025bfe8e..1abacdd127 100644 --- a/config/GZ2J01/rels/d_a_obj_togeTrap/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_togeTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_togeTrap.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_togeTrap/symbols.txt b/config/GZ2J01/rels/d_a_obj_togeTrap/symbols.txt index 19351ce637..e10da2ffee 100644 --- a/config/GZ2J01/rels/d_a_obj_togeTrap/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_togeTrap/symbols.txt @@ -58,7 +58,8 @@ mCcDObjInfo__12daTogeTrap_c = .rodata:0x00000014; // type:object size:0x30 scope @stringBase0 = .rodata:0x00000070; // type:object size:0x7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_665_data_10 = .data:0x00000010; // type:object size:0x10 scope:local +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daTogeTrap_c = .data:0x00000020; // type:object size:0x44 scope:global @3883 = .data:0x00000064; // type:object size:0xC scope:local @3884 = .data:0x00000070; // type:object size:0xC scope:local @@ -78,4 +79,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000184; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:local align:4 data:float -init$1675 = .bss:0x00000034; // type:object size:0x1 scope:local data:byte +init$1675 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_tombo/splits.txt b/config/GZ2J01/rels/d_a_obj_tombo/splits.txt index 94e308ea4c..328d05f7a0 100644 --- a/config/GZ2J01/rels/d_a_obj_tombo/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_tombo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tombo.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt b/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt index f90429ab44..437b88320e 100644 --- a/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_tombo/symbols.txt @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float diff --git a/config/GZ2J01/rels/d_a_obj_tp/symbols.txt b/config/GZ2J01/rels/d_a_obj_tp/symbols.txt index 608b62cabb..f960fce909 100644 --- a/config/GZ2J01/rels/d_a_obj_tp/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_tp/symbols.txt @@ -44,7 +44,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000006C; // type:object size:0x7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_669_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4263 = .data:0x00000020; // type:object size:0x20 scope:local bmd$4283 = .data:0x00000040; // type:object size:0x8 scope:local brk$4284 = .data:0x00000048; // type:object size:0x8 scope:local diff --git a/config/GZ2J01/rels/d_a_obj_treesh/splits.txt b/config/GZ2J01/rels/d_a_obj_treesh/splits.txt index 7114495ecf..dfdb10d330 100644 --- a/config/GZ2J01/rels/d_a_obj_treesh/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_treesh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_treesh.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_twGate/splits.txt b/config/GZ2J01/rels/d_a_obj_twGate/splits.txt index f12d5051ef..e1861ecbfd 100644 --- a/config/GZ2J01/rels/d_a_obj_twGate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_twGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_twGate.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_volcball/symbols.txt b/config/GZ2J01/rels/d_a_obj_volcball/symbols.txt index 1c55f4891a..1848acb05f 100644 --- a/config/GZ2J01/rels/d_a_obj_volcball/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_volcball/symbols.txt @@ -87,9 +87,11 @@ l_fall_effect_id$4173 = .rodata:0x0000007C; // type:object size:0x8 scope:local @4411 = .rodata:0x000000A8; // type:object size:0x8 scope:local @4447 = .rodata:0x000000B0; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000B4; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_675_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_param = .data:0x00000024; // type:object size:0xA8 scope:global @3929 = .data:0x000000CC; // type:object size:0xC scope:local @@ -110,4 +112,4 @@ __vt__12dBgS_ObjAcch = .data:0x0000021C; // type:object size:0x24 scope:global __vt__8cM3dGAab = .data:0x00000240; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x0000024C; // type:object size:0xC scope:global __vt__17dEvLib_callback_c = .data:0x00000258; // type:object size:0x18 scope:global -lbl_675_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1953 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_volcbom/symbols.txt b/config/GZ2J01/rels/d_a_obj_volcbom/symbols.txt index 39a023a402..3f27d6a29d 100644 --- a/config/GZ2J01/rels/d_a_obj_volcbom/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_volcbom/symbols.txt @@ -94,7 +94,8 @@ l_effect_id$4032 = .rodata:0x00000054; // type:object size:0xE scope:local @stringBase0 = .rodata:0x000000B0; // type:object size:0x48 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_676_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:local l_staff_name = .data:0x00000028; // type:object size:0x4 scope:local data:4byte @@ -122,5 +123,5 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global __vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global -init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte -init$2146 = .bss:0x00000001; // type:object size:0x1 scope:local data:byte +init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$2146 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_warp_kbrg/symbols.txt b/config/GZ2J01/rels/d_a_obj_warp_kbrg/symbols.txt index 5936c83b4b..c0cdeb667b 100644 --- a/config/GZ2J01/rels/d_a_obj_warp_kbrg/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_warp_kbrg/symbols.txt @@ -78,9 +78,11 @@ l_midna_wait_offset = .rodata:0x00000054; // type:object size:0xC scope:global a @4579 = .rodata:0x000000C8; // type:object size:0x8 scope:local align:8 data:double @4590 = .rodata:0x000000D0; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000D4; // type:object size:0x85 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_677_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_evArcName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte l_portal_warp_name = .data:0x0000002C; // type:object size:0x8 scope:global @@ -104,4 +106,4 @@ daObjWarpKBrg_METHODS = .data:0x00000194; // type:object size:0x20 scope:global g_profile_Obj_KakarikoBrg = .data:0x000001B4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000001E4; // type:object size:0xC scope:global __vt__15daObjWarpKBrg_c = .data:0x000001F0; // type:object size:0x28 scope:global -lbl_677_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_warp_obrg/symbols.txt b/config/GZ2J01/rels/d_a_obj_warp_obrg/symbols.txt index 1a3386758e..eb807a9701 100644 --- a/config/GZ2J01/rels/d_a_obj_warp_obrg/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_warp_obrg/symbols.txt @@ -59,9 +59,11 @@ l_midna_wait_offset = .rodata:0x00000040; // type:object size:0xC scope:global a @4607 = .rodata:0x000000AC; // type:object size:0x4 scope:local @4666 = .rodata:0x000000B0; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000B4; // type:object size:0x68 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_678_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_portal_warp_name = .data:0x00000024; // type:object size:0x8 scope:global l_staff_name = .data:0x0000002C; // type:object size:0x8 scope:global @@ -78,4 +80,4 @@ daObjWarpOBrg_METHODS = .data:0x000000EC; // type:object size:0x20 scope:global g_profile_Obj_OrdinBrg = .data:0x0000010C; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x0000013C; // type:object size:0xC scope:global __vt__15daObjWarpOBrg_c = .data:0x00000148; // type:object size:0x28 scope:global -lbl_678_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_waterGate/splits.txt b/config/GZ2J01/rels/d_a_obj_waterGate/splits.txt index eaa5cc3564..4c25b796bc 100644 --- a/config/GZ2J01/rels/d_a_obj_waterGate/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_waterGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_waterGate.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_waterGate/symbols.txt b/config/GZ2J01/rels/d_a_obj_waterGate/symbols.txt index e163601f62..3136149814 100644 --- a/config/GZ2J01/rels/d_a_obj_waterGate/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_waterGate/symbols.txt @@ -38,9 +38,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3783 = .rodata:0x00000018; // type:object size:0x4 scope:local @3784 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_679_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3728 = .data:0x00000020; // type:object size:0xC scope:local @3729 = .data:0x0000002C; // type:object size:0xC scope:local @3730 = .data:0x00000038; // type:object size:0xC scope:local @@ -54,4 +56,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000104; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global align:4 data:float -lbl_679_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_waterPillar/splits.txt b/config/GZ2J01/rels/d_a_obj_waterPillar/splits.txt index dc39edf04a..f393d68cbc 100644 --- a/config/GZ2J01/rels/d_a_obj_waterPillar/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_waterPillar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_waterPillar.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_waterPillar/symbols.txt b/config/GZ2J01/rels/d_a_obj_waterPillar/symbols.txt index b3d3d34c41..ff46abbb10 100644 --- a/config/GZ2J01/rels/d_a_obj_waterPillar/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_waterPillar/symbols.txt @@ -94,9 +94,11 @@ mCcDObjCoInfo__12daWtPillar_c = .rodata:0x00000050; // type:object size:0x30 sco @4272 = .rodata:0x000000CC; // type:object size:0x4 scope:local @4273 = .rodata:0x000000D0; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000D4; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_680_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global mCcDCps__12daWtPillar_c = .data:0x00000038; // type:object size:0x4C scope:global mCcDCyl__12daWtPillar_c = .data:0x00000084; // type:object size:0x44 scope:global @@ -128,4 +130,4 @@ __vt__14mDoHIO_entry_c = .data:0x000002D0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3635 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x58 scope:global align:4 data:float -lbl_680_bss_6C = .bss:0x0000006C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_wdStick/splits.txt b/config/GZ2J01/rels/d_a_obj_wdStick/splits.txt index 9b0de2fc3d..a1be6e322b 100644 --- a/config/GZ2J01/rels/d_a_obj_wdStick/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_wdStick/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_wdStick.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_wdStick/symbols.txt b/config/GZ2J01/rels/d_a_obj_wdStick/symbols.txt index 4ca8235fcd..a5c6dd3195 100644 --- a/config/GZ2J01/rels/d_a_obj_wdStick/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_wdStick/symbols.txt @@ -93,9 +93,11 @@ mCcDObjInfo__11daWdStick_c = .rodata:0x00000000; // type:object size:0x30 scope: @4779 = .rodata:0x000000D0; // type:object size:0x4 scope:local @4780 = .rodata:0x000000D4; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000D8; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_683_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__11daWdStick_c = .data:0x00000020; // type:object size:0x40 scope:global @4470 = .data:0x00000060; // type:object size:0xC scope:local @4471 = .data:0x0000006C; // type:object size:0xC scope:local @@ -119,4 +121,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:2byte -lbl_683_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_web0/splits.txt b/config/GZ2J01/rels/d_a_obj_web0/splits.txt index 9a26cfe380..c8a5052714 100644 --- a/config/GZ2J01/rels/d_a_obj_web0/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_web0/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_web0.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_web0/symbols.txt b/config/GZ2J01/rels/d_a_obj_web0/symbols.txt index f004aa2850..54e81d608c 100644 --- a/config/GZ2J01/rels/d_a_obj_web0/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_web0/symbols.txt @@ -41,6 +41,6 @@ __vt__8cM3dGAab = .data:0x0000009C; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A8; // type:object size:0xC scope:global __vt__16daObj_Web0_HIO_c = .data:0x000000B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_684_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_web1/splits.txt b/config/GZ2J01/rels/d_a_obj_web1/splits.txt index bcd1efd14d..dcf156365f 100644 --- a/config/GZ2J01/rels/d_a_obj_web1/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_web1/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_web1.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_web1/symbols.txt b/config/GZ2J01/rels/d_a_obj_web1/symbols.txt index a218599b44..b69a2e19bb 100644 --- a/config/GZ2J01/rels/d_a_obj_web1/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_web1/symbols.txt @@ -51,6 +51,6 @@ __vt__8cM3dGAab = .data:0x000000A0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000AC; // type:object size:0xC scope:global __vt__16daObj_Web1_HIO_c = .data:0x000000B8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_685_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_obj_well_cover/symbols.txt b/config/GZ2J01/rels/d_a_obj_well_cover/symbols.txt index 33c7ea9672..61384ffa4d 100644 --- a/config/GZ2J01/rels/d_a_obj_well_cover/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_well_cover/symbols.txt @@ -30,9 +30,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global particle_id$3806 = .rodata:0x00000028; // type:object size:0x6 scope:local @3833 = .rodata:0x00000030; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000034; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_686_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3731 = .data:0x00000024; // type:object size:0xC scope:local @3732 = .data:0x00000030; // type:object size:0xC scope:local @@ -40,4 +42,4 @@ l_func$3730 = .data:0x0000003C; // type:object size:0x18 scope:local l_daObjWCover_Method = .data:0x00000054; // type:object size:0x20 scope:global g_profile_Obj_WellCover = .data:0x00000074; // type:object size:0x30 scope:global __vt__13daObjWCover_c = .data:0x000000A4; // type:object size:0x28 scope:global -lbl_686_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_wood_statue/symbols.txt b/config/GZ2J01/rels/d_a_obj_wood_statue/symbols.txt index 328c69c652..1f8c84cfca 100644 --- a/config/GZ2J01/rels/d_a_obj_wood_statue/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_wood_statue/symbols.txt @@ -74,7 +74,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @stringBase0 = .rodata:0x0000009C; // type:object size:0x45 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_691_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte action_table$4273 = .data:0x00000028; // type:object size:0x10 scope:local @@ -95,4 +96,4 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__14daObjWStatue_c = .data:0x00000184; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001C8; // type:object size:0xC scope:global -init$2078 = .bss:0x00000000; // type:object size:0x1 data:byte +init$2078 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_yel_bag/splits.txt b/config/GZ2J01/rels/d_a_obj_yel_bag/splits.txt index b346ff5bf5..b3de7d6524 100644 --- a/config/GZ2J01/rels/d_a_obj_yel_bag/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_yel_bag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_yel_bag.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_yel_bag/symbols.txt b/config/GZ2J01/rels/d_a_obj_yel_bag/symbols.txt index 9eca0372ca..f0e13175ab 100644 --- a/config/GZ2J01/rels/d_a_obj_yel_bag/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_yel_bag/symbols.txt @@ -80,7 +80,8 @@ m__18daObj_YBag_Param_c = .rodata:0x00000030; // type:object size:0x2C scope:glo @stringBase0 = .rodata:0x000000E0; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_693_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_loadRes_YBAG0 = .data:0x00000028; // type:object size:0xC scope:global l_loadRes_list = .data:0x00000034; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_obj_yobikusa/symbols.txt b/config/GZ2J01/rels/d_a_obj_yobikusa/symbols.txt index c39e50ea2c..111f86dd3a 100644 --- a/config/GZ2J01/rels/d_a_obj_yobikusa/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_yobikusa/symbols.txt @@ -54,7 +54,8 @@ ccCylSrc$3880 = .rodata:0x00000064; // type:object size:0x44 scope:local @stringBase0 = .rodata:0x000000A8; // type:object size:0x44 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_116_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName1 = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_arcName2 = .data:0x00000024; // type:object size:0x4 scope:global data:4byte @3641 = .data:0x00000028; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_obj_zrTurara/splits.txt b/config/GZ2J01/rels/d_a_obj_zrTurara/splits.txt index ad9e149c7a..61516da5d9 100644 --- a/config/GZ2J01/rels/d_a_obj_zrTurara/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_zrTurara/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zrTurara.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_zrTurara/symbols.txt b/config/GZ2J01/rels/d_a_obj_zrTurara/symbols.txt index 8caee4b36e..897a47191c 100644 --- a/config/GZ2J01/rels/d_a_obj_zrTurara/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_zrTurara/symbols.txt @@ -62,4 +62,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000160; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3651 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:byte -init$1683 = .bss:0x00000020; // type:object size:0x1 data:byte +init$1683 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_zrTuraraRock/splits.txt b/config/GZ2J01/rels/d_a_obj_zrTuraraRock/splits.txt index ee108a21c3..135f45df92 100644 --- a/config/GZ2J01/rels/d_a_obj_zrTuraraRock/splits.txt +++ b/config/GZ2J01/rels/d_a_obj_zrTuraraRock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zrTuraraRock.cpp: diff --git a/config/GZ2J01/rels/d_a_obj_zrTuraraRock/symbols.txt b/config/GZ2J01/rels/d_a_obj_zrTuraraRock/symbols.txt index ba9f525834..6ddd25e442 100644 --- a/config/GZ2J01/rels/d_a_obj_zrTuraraRock/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_zrTuraraRock/symbols.txt @@ -53,9 +53,11 @@ mCcDObjInfo__12daZrTuraRc_c = .rodata:0x00000014; // type:object size:0x30 scope @3782 = .rodata:0x00000068; // type:object size:0x8 scope:local @3885 = .rodata:0x00000070; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000074; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_698_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__12daZrTuraRc_c = .data:0x00000020; // type:object size:0x40 scope:global @3871 = .data:0x00000060; // type:object size:0xC scope:local @3872 = .data:0x0000006C; // type:object size:0xC scope:local @@ -73,4 +75,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000014C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:global align:4 data:float -lbl_698_bss_34 = .bss:0x00000034; // type:object size:0x1 data:byte +init$1850 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_obj_zraMark/symbols.txt b/config/GZ2J01/rels/d_a_obj_zraMark/symbols.txt index 8b20f4b576..686096b256 100644 --- a/config/GZ2J01/rels/d_a_obj_zraMark/symbols.txt +++ b/config/GZ2J01/rels/d_a_obj_zraMark/symbols.txt @@ -68,7 +68,7 @@ sRoot$4500 = .rodata:0x00000104; // type:object size:0xE0 scope:local @4571 = .rodata:0x00000204; // type:object size:0x4 scope:local align:4 data:float @4658 = .rodata:0x00000208; // type:object size:0x8 scope:local align:8 data:double @stringBase0 = .rodata:0x00000210; // type:object size:0x5 scope:local data:string_table -lbl_699_data_0 = .data:0x00000000; // type:object size:0x1 data:byte +@1738 = .data:0x00000000; // type:object size:0x1 data:byte l_arcName = .data:0x00000004; // type:object size:0x4 scope:global data:4byte l_daObjZraMark_Method = .data:0x00000008; // type:object size:0x20 scope:global g_profile_ZRA_MARK = .data:0x00000028; // type:object size:0x30 scope:global @@ -76,4 +76,4 @@ __vt__18daNpcF_ActorMngr_c = .data:0x00000058; // type:object size:0xC scope:glo __vt__8cM3dGCyl = .data:0x00000064; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000070; // type:object size:0xC scope:global roottype$4501 = .bss:0x00000000; // type:object size:0x4 scope:local -lbl_699_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte +init$2350 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_peru/splits.txt b/config/GZ2J01/rels/d_a_peru/splits.txt index 1714f683e7..71725d20e9 100644 --- a/config/GZ2J01/rels/d_a_peru/splits.txt +++ b/config/GZ2J01/rels/d_a_peru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_peru.cpp: diff --git a/config/GZ2J01/rels/d_a_peru/symbols.txt b/config/GZ2J01/rels/d_a_peru/symbols.txt index e18114993f..84feeec37c 100644 --- a/config/GZ2J01/rels/d_a_peru/symbols.txt +++ b/config/GZ2J01/rels/d_a_peru/symbols.txt @@ -166,7 +166,8 @@ m__14daPeru_Param_c = .rodata:0x00000000; // type:object size:0x98 scope:global @stringBase0 = .rodata:0x00000150; // type:object size:0x2A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_703_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2J01/rels/d_a_ppolamp/symbols.txt b/config/GZ2J01/rels/d_a_ppolamp/symbols.txt index 65e95cbb01..999840bd88 100644 --- a/config/GZ2J01/rels/d_a_ppolamp/symbols.txt +++ b/config/GZ2J01/rels/d_a_ppolamp/symbols.txt @@ -55,9 +55,9 @@ __vt__11daPPolamp_c = .data:0x00000060; // type:object size:0xC scope:global @1012 = .bss:0x00000034; // type:object size:0x1 scope:local @1010 = .bss:0x00000038; // type:object size:0x1 scope:local @1009 = .bss:0x0000003C; // type:object size:0x1 scope:local -init$1515 = .bss:0x0000003D; // type:object size:0x1 scope:local +init$1515 = .bss:0x0000003D; // type:object size:0x1 scope:local align:1 data:byte TEV_COLOR_1$3795 = .bss:0x00000040; // type:object size:0x8 scope:local -init$1520 = .bss:0x00000049; // type:object size:0x1 scope:local +init$1520 = .bss:0x00000049; // type:object size:0x1 scope:local align:1 data:byte TEV_COLOR_2$3800 = .bss:0x0000004C; // type:object size:0x8 scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000054; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000058; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_scene_exit2/symbols.txt b/config/GZ2J01/rels/d_a_scene_exit2/symbols.txt index 0cec89805d..20ae657a5d 100644 --- a/config/GZ2J01/rels/d_a_scene_exit2/symbols.txt +++ b/config/GZ2J01/rels/d_a_scene_exit2/symbols.txt @@ -31,7 +31,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000014; // type:object size:0x30 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_117_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte @3699 = .data:0x00000028; // type:object size:0xC scope:local @@ -42,4 +43,4 @@ l_func$3698 = .data:0x00000058; // type:object size:0x30 scope:local action_table$3745 = .data:0x00000088; // type:object size:0xC scope:local l_daScExit_Method = .data:0x00000094; // type:object size:0x20 scope:global g_profile_SCENE_EXIT2 = .data:0x000000B4; // type:object size:0x30 scope:global -lbl_117_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_spinner/splits.txt b/config/GZ2J01/rels/d_a_spinner/splits.txt index 6daada460c..428e044482 100644 --- a/config/GZ2J01/rels/d_a_spinner/splits.txt +++ b/config/GZ2J01/rels/d_a_spinner/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_spinner.cpp: diff --git a/config/GZ2J01/rels/d_a_spinner/symbols.txt b/config/GZ2J01/rels/d_a_spinner/symbols.txt index 01cb55a8f8..e097125119 100644 --- a/config/GZ2J01/rels/d_a_spinner/symbols.txt +++ b/config/GZ2J01/rels/d_a_spinner/symbols.txt @@ -42,7 +42,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3768 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3768 = .rodata:0x00000000; // type:object size:0xC scope:local @4168 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @4241 = .rodata:0x00000010; // type:object size:0x4 scope:local @4242 = .rodata:0x00000014; // type:object size:0x4 scope:local data:string @@ -120,8 +120,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte effDirection$4433 = .bss:0x00000048; // type:object size:0xC scope:local @4437 = .bss:0x00000054; // type:object size:0xC scope:local +init$0000 = .bss:0x00000060; // type:object size:0x1 scope:local align:1 data:byte particleScale$4436 = .bss:0x00000064; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000070; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000074; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_sq/splits.txt b/config/GZ2J01/rels/d_a_sq/splits.txt index 88422c0ac5..5d9a75a943 100644 --- a/config/GZ2J01/rels/d_a_sq/splits.txt +++ b/config/GZ2J01/rels/d_a_sq/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_sq.cpp: diff --git a/config/GZ2J01/rels/d_a_sq/symbols.txt b/config/GZ2J01/rels/d_a_sq/symbols.txt index 8f6b26420b..475085d670 100644 --- a/config/GZ2J01/rels/d_a_sq/symbols.txt +++ b/config/GZ2J01/rels/d_a_sq/symbols.txt @@ -78,6 +78,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000104; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000128; // type:object size:0xC scope:global __vt__10daSq_HIO_c = .data:0x00000134; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_119_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x30 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_swBall/symbols.txt b/config/GZ2J01/rels/d_a_swBall/symbols.txt index 64589c80ee..86bd6915a4 100644 --- a/config/GZ2J01/rels/d_a_swBall/symbols.txt +++ b/config/GZ2J01/rels/d_a_swBall/symbols.txt @@ -24,9 +24,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3720 = .rodata:0x00000008; // type:object size:0x4 scope:local @3721 = .rodata:0x0000000C; // type:object size:0x4 scope:local @3994 = .rodata:0x00000010; // type:object size:0x4 scope:local +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_707_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3847 = .data:0x00000020; // type:object size:0xC scope:local @3848 = .data:0x0000002C; // type:object size:0xC scope:local l_func$3846 = .data:0x00000038; // type:object size:0x18 scope:local @@ -34,4 +36,4 @@ l_daSwBall_Method = .data:0x00000050; // type:object size:0x20 scope:global g_profile_SwBall = .data:0x00000070; // type:object size:0x30 scope:global l_target_info = .bss:0x00000000; // type:object size:0x20 scope:global l_target_info_count = .bss:0x00000020; // type:object size:0x4 scope:global data:4byte -lbl_707_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_swLBall/symbols.txt b/config/GZ2J01/rels/d_a_swLBall/symbols.txt index 80a79d5e65..f70f108ed9 100644 --- a/config/GZ2J01/rels/d_a_swLBall/symbols.txt +++ b/config/GZ2J01/rels/d_a_swLBall/symbols.txt @@ -25,9 +25,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3725 = .rodata:0x00000008; // type:object size:0x4 scope:local @3726 = .rodata:0x0000000C; // type:object size:0x4 scope:local @4000 = .rodata:0x00000010; // type:object size:0x4 scope:local +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_708_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3835 = .data:0x00000020; // type:object size:0xC scope:local @3836 = .data:0x0000002C; // type:object size:0xC scope:local @3837 = .data:0x00000038; // type:object size:0xC scope:local @@ -36,4 +38,4 @@ l_daSwLBall_Method = .data:0x00000068; // type:object size:0x20 scope:global g_profile_SwLBall = .data:0x00000088; // type:object size:0x30 scope:global l_target_info = .bss:0x00000000; // type:object size:0x8 scope:global l_target_info_count = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte -lbl_708_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_swc00/symbols.txt b/config/GZ2J01/rels/d_a_swc00/symbols.txt index f64db49efa..8b73f61406 100644 --- a/config/GZ2J01/rels/d_a_swc00/symbols.txt +++ b/config/GZ2J01/rels/d_a_swc00/symbols.txt @@ -24,7 +24,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000018; // type:object size:0x26 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_120_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3812 = .data:0x00000020; // type:object size:0x40 scope:local @3820 = .data:0x00000060; // type:object size:0xC scope:local @3821 = .data:0x0000006C; // type:object size:0xC scope:local @@ -34,4 +35,4 @@ l_func$3819 = .data:0x00000090; // type:object size:0x30 scope:local @3996 = .data:0x000000C0; // type:object size:0x40 scope:local l_daSwc00_Method = .data:0x00000100; // type:object size:0x20 scope:global g_profile_SWC00 = .data:0x00000120; // type:object size:0x30 scope:global -lbl_120_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_tag_CstaSw/splits.txt b/config/GZ2J01/rels/d_a_tag_CstaSw/splits.txt index cc92263021..fab27d3113 100644 --- a/config/GZ2J01/rels/d_a_tag_CstaSw/splits.txt +++ b/config/GZ2J01/rels/d_a_tag_CstaSw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_CstaSw.cpp: diff --git a/config/GZ2J01/rels/d_a_tag_TWgate/symbols.txt b/config/GZ2J01/rels/d_a_tag_TWgate/symbols.txt index 1b4d859a2a..1f3fc596cd 100644 --- a/config/GZ2J01/rels/d_a_tag_TWgate/symbols.txt +++ b/config/GZ2J01/rels/d_a_tag_TWgate/symbols.txt @@ -56,7 +56,8 @@ l_zevParamTbl = .rodata:0x00000004; // type:object size:0x70 scope:global @stringBase0 = .rodata:0x0000009C; // type:object size:0x129 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_713_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_myName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3744 = .data:0x00000024; // type:object size:0xC scope:local @3745 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_tag_csw/symbols.txt b/config/GZ2J01/rels/d_a_tag_csw/symbols.txt index ca0116f93f..2e869ea91c 100644 --- a/config/GZ2J01/rels/d_a_tag_csw/symbols.txt +++ b/config/GZ2J01/rels/d_a_tag_csw/symbols.txt @@ -49,7 +49,8 @@ l_dbz_idx = .rodata:0x00000010; // type:object size:0x8 scope:global @stringBase0 = .rodata:0x00000068; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_718_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000024; // type:object size:0x44 scope:global l_tg_src = .data:0x00000068; // type:object size:0x44 scope:global diff --git a/config/GZ2J01/rels/d_a_tag_evtmsg/symbols.txt b/config/GZ2J01/rels/d_a_tag_evtmsg/symbols.txt index 5e672717cd..7803ac229c 100644 --- a/config/GZ2J01/rels/d_a_tag_evtmsg/symbols.txt +++ b/config/GZ2J01/rels/d_a_tag_evtmsg/symbols.txt @@ -28,7 +28,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000004; // type:object size:0x29 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_33_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mEvtCutNameList__14daTag_EvtMsg_c = .data:0x00000020; // type:object size:0xC scope:global @3802 = .data:0x0000002C; // type:object size:0xC scope:local @3803 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_tag_firewall/symbols.txt b/config/GZ2J01/rels/d_a_tag_firewall/symbols.txt index eb287a2173..ed735cd4ba 100644 --- a/config/GZ2J01/rels/d_a_tag_firewall/symbols.txt +++ b/config/GZ2J01/rels/d_a_tag_firewall/symbols.txt @@ -34,4 +34,4 @@ g_profile_Tag_FWall = .data:0x00000068; // type:object size:0x30 scope:global __vt__8cM3dGAab = .data:0x00000098; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x000000A4; // type:object size:0xC scope:global fire_leader = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_720_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte +fire_num = .bss:0x00000004; // type:object size:0x1 data:byte diff --git a/config/GZ2J01/rels/d_a_tag_hstop/splits.txt b/config/GZ2J01/rels/d_a_tag_hstop/splits.txt index cbd78c8d11..701b189842 100644 --- a/config/GZ2J01/rels/d_a_tag_hstop/splits.txt +++ b/config/GZ2J01/rels/d_a_tag_hstop/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_hstop.cpp: diff --git a/config/GZ2J01/rels/d_a_tag_lantern/splits.txt b/config/GZ2J01/rels/d_a_tag_lantern/splits.txt index 2a71e6d3db..7af2bf0b37 100644 --- a/config/GZ2J01/rels/d_a_tag_lantern/splits.txt +++ b/config/GZ2J01/rels/d_a_tag_lantern/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_lantern.cpp: diff --git a/config/GZ2J01/rels/d_a_tag_lv2prchk/symbols.txt b/config/GZ2J01/rels/d_a_tag_lv2prchk/symbols.txt index 8157656193..b56b0d22ef 100644 --- a/config/GZ2J01/rels/d_a_tag_lv2prchk/symbols.txt +++ b/config/GZ2J01/rels/d_a_tag_lv2prchk/symbols.txt @@ -16,12 +16,14 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global @3844 = .rodata:0x00000000; // type:object size:0x4 scope:local @3845 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_128_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3667 = .data:0x00000020; // type:object size:0xC scope:local @3668 = .data:0x0000002C; // type:object size:0xC scope:local l_func$3666 = .data:0x00000038; // type:object size:0x18 scope:local l_daTagLv2PrChk_Method = .data:0x00000050; // type:object size:0x20 scope:global g_profile_Tag_Lv2PrChk = .data:0x00000070; // type:object size:0x30 scope:global -lbl_128_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_tag_lv6CstaSw/splits.txt b/config/GZ2J01/rels/d_a_tag_lv6CstaSw/splits.txt index 00e0980c33..21926072bd 100644 --- a/config/GZ2J01/rels/d_a_tag_lv6CstaSw/splits.txt +++ b/config/GZ2J01/rels/d_a_tag_lv6CstaSw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_lv6CstaSw.cpp: diff --git a/config/GZ2J01/rels/d_a_tag_poFire/splits.txt b/config/GZ2J01/rels/d_a_tag_poFire/splits.txt index d792935823..d468cdd6e9 100644 --- a/config/GZ2J01/rels/d_a_tag_poFire/splits.txt +++ b/config/GZ2J01/rels/d_a_tag_poFire/splits.txt @@ -10,7 +10,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_poFire.cpp: diff --git a/config/GZ2J01/rels/d_a_tag_river_back/symbols.txt b/config/GZ2J01/rels/d_a_tag_river_back/symbols.txt index c550dcdf34..58c8200336 100644 --- a/config/GZ2J01/rels/d_a_tag_river_back/symbols.txt +++ b/config/GZ2J01/rels/d_a_tag_river_back/symbols.txt @@ -22,9 +22,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3814 = .rodata:0x00000004; // type:object size:0x4 scope:local @3815 = .rodata:0x00000008; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000000C; // type:object size:0x2E scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_736_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte @@ -36,4 +38,4 @@ l_func$3711 = .data:0x0000005C; // type:object size:0x30 scope:local action_table$3769 = .data:0x0000008C; // type:object size:0x8 scope:local l_daTagRiverBack_Method = .data:0x00000094; // type:object size:0x20 scope:global g_profile_Tag_RiverBack = .data:0x000000B4; // type:object size:0x30 scope:global -lbl_736_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_tag_statue_evt/symbols.txt b/config/GZ2J01/rels/d_a_tag_statue_evt/symbols.txt index 89636eb2cf..fcfd5ab910 100644 --- a/config/GZ2J01/rels/d_a_tag_statue_evt/symbols.txt +++ b/config/GZ2J01/rels/d_a_tag_statue_evt/symbols.txt @@ -45,7 +45,8 @@ l_event_bit = .rodata:0x00000000; // type:object size:0xC scope:global @stringBase0 = .rodata:0x00000050; // type:object size:0xA8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_133_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_eff_id = .data:0x00000024; // type:object size:0x6 scope:global l_eventName = .data:0x0000002C; // type:object size:0x18 scope:global @@ -62,4 +63,4 @@ l_statue_ang$3944 = .data:0x00000128; // type:object size:0xC scope:local l_daTagStatue_Method = .data:0x00000134; // type:object size:0x20 scope:global g_profile_Tag_Statue = .data:0x00000154; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global -lbl_133_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_tag_waterfall/splits.txt b/config/GZ2J01/rels/d_a_tag_waterfall/splits.txt index 5b17cf97a0..b3d0072010 100644 --- a/config/GZ2J01/rels/d_a_tag_waterfall/splits.txt +++ b/config/GZ2J01/rels/d_a_tag_waterfall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_waterfall.cpp: diff --git a/config/GZ2J01/rels/d_a_tag_waterfall/symbols.txt b/config/GZ2J01/rels/d_a_tag_waterfall/symbols.txt index cb23cee4d2..80b04578d0 100644 --- a/config/GZ2J01/rels/d_a_tag_waterfall/symbols.txt +++ b/config/GZ2J01/rels/d_a_tag_waterfall/symbols.txt @@ -34,6 +34,6 @@ l_daTagWaterFall_Method = .data:0x00000004; // type:object size:0x20 scope:globa g_profile_Tag_WaterFall = .data:0x00000024; // type:object size:0x30 scope:global __vt__20daTagWaterFall_HIO_c = .data:0x00000054; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_751_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +masterWaterfallTagExists = .bss:0x00000008; // type:object size:0x1 data:byte @3753 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte diff --git a/config/GZ2J01/rels/d_a_tbox/splits.txt b/config/GZ2J01/rels/d_a_tbox/splits.txt index fd0c1fb717..78c5420e61 100644 --- a/config/GZ2J01/rels/d_a_tbox/splits.txt +++ b/config/GZ2J01/rels/d_a_tbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tbox.cpp: diff --git a/config/GZ2J01/rels/d_a_tbox/symbols.txt b/config/GZ2J01/rels/d_a_tbox/symbols.txt index 1dea0fdbb5..aefcebe675 100644 --- a/config/GZ2J01/rels/d_a_tbox/symbols.txt +++ b/config/GZ2J01/rels/d_a_tbox/symbols.txt @@ -140,7 +140,8 @@ eff_id$4956 = .rodata:0x00000128; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000160; // type:object size:0x15D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_41_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_staff_name = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000024; // type:object size:0x44 scope:global l_modelInfo = .data:0x00000068; // type:object size:0x54 scope:global @@ -211,7 +212,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_light_offset = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3824 = .bss:0x00000060; // type:object size:0xC scope:local l_HIO = .bss:0x0000006C; // type:object size:0x34 scope:global -lbl_41_bss_A0 = .bss:0x000000A0; // type:object size:0x1 data:byte +init$0000 = .bss:0x000000A0; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A4; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A8; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000AC; // type:object size:0x4 scope:global diff --git a/config/GZ2J01/rels/d_a_tbox2/symbols.txt b/config/GZ2J01/rels/d_a_tbox2/symbols.txt index f9cad807c8..ccdda8007f 100644 --- a/config/GZ2J01/rels/d_a_tbox2/symbols.txt +++ b/config/GZ2J01/rels/d_a_tbox2/symbols.txt @@ -56,7 +56,8 @@ l_cyl_info = .rodata:0x00000020; // type:object size:0x3C scope:global @stringBase0 = .rodata:0x00000080; // type:object size:0x7B scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_42_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_staff_name = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000028; // type:object size:0x44 scope:global @@ -80,5 +81,5 @@ __vt__8cM3dGAab = .data:0x000001B0; // type:object size:0xC scope:global __vt__12daTboxBase_c = .data:0x000001BC; // type:object size:0x2C scope:global __vt__12J3DFrameCtrl = .data:0x000001E8; // type:object size:0xC scope:global __vt__9daTbox2_c = .data:0x000001F4; // type:object size:0x2C scope:global -lbl_42_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_42_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2J01/rels/d_a_title/splits.txt b/config/GZ2J01/rels/d_a_title/splits.txt index 32c1100f78..9f93927b3a 100644 --- a/config/GZ2J01/rels/d_a_title/splits.txt +++ b/config/GZ2J01/rels/d_a_title/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_title.cpp: diff --git a/config/GZ2J01/rels/d_a_title/symbols.txt b/config/GZ2J01/rels/d_a_title/symbols.txt index 27d8b26fdf..3a30d8ba29 100644 --- a/config/GZ2J01/rels/d_a_title/symbols.txt +++ b/config/GZ2J01/rels/d_a_title/symbols.txt @@ -51,7 +51,8 @@ l_arcName = .rodata:0x0000000C; // type:object size:0x6 scope:global data:string @stringBase0 = .rodata:0x0000003C; // type:object size:0x2F scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_756_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4030 = .data:0x00000020; // type:object size:0xC scope:local @4031 = .data:0x0000002C; // type:object size:0xC scope:local @4032 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2J01/rels/d_a_ykgr/splits.txt b/config/GZ2J01/rels/d_a_ykgr/splits.txt index 124324536a..1b63dedc27 100644 --- a/config/GZ2J01/rels/d_a_ykgr/splits.txt +++ b/config/GZ2J01/rels/d_a_ykgr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_ykgr.cpp: diff --git a/config/GZ2J01/splits.txt b/config/GZ2J01/splits.txt index 071c93433a..757dcccb4a 100644 --- a/config/GZ2J01/splits.txt +++ b/config/GZ2J01/splits.txt @@ -567,7 +567,7 @@ d/d_vib_pattern.cpp: d/d_vibration.cpp: .text start:0x8006F1A8 end:0x80070058 - .sbss start:0x8044B090 end:0x8044B0A0 + .sbss start:0x8044B090 end:0x8044B098 .sdata2 start:0x8044C760 end:0x8044C768 d/d_attention.cpp: @@ -577,6 +577,7 @@ d/d_attention.cpp: .data start:0x803A3D58 end:0x803A3DD0 .bss start:0x8041EC40 end:0x8041EC60 .sdata start:0x8044A7A0 end:0x8044A7C0 + .sbss start:0x8044B098 end:0x8044B0A0 .sdata2 start:0x8044C768 end:0x8044C7F8 d/d_att_dist.cpp: @@ -1839,6 +1840,7 @@ JSystem/JAudio2/JASTrack.cpp: .rodata start:0x80395138 end:0x80395180 .data start:0x803BFCA8 end:0x803BFCD0 .bss start:0x8042B7E8 end:0x8042BC58 + .sbss start:0x8044B370 end:0x8044B378 .sdata2 start:0x8044F6C0 end:0x8044F6F8 JSystem/JAudio2/JASTrackPort.cpp: @@ -2026,12 +2028,14 @@ JSystem/JAudio2/JAISeMgr.cpp: .rodata start:0x80395A58 end:0x80395A70 .data start:0x803C39F0 end:0x803C3A18 .bss start:0x8042E1B8 end:0x8042E1D8 + .sbss start:0x8044B450 end:0x8044B458 .sdata2 start:0x8044F8A8 end:0x8044F8B8 JSystem/JAudio2/JAISeq.cpp: .text start:0x802A2EAC end:0x802A3BB4 .data start:0x803C3A18 end:0x803C3A68 .bss start:0x8042E1D8 end:0x8042E200 + .sbss start:0x8044B458 end:0x8044B460 .sdata2 start:0x8044F8B8 end:0x8044F8C8 JSystem/JAudio2/JAISeqDataMgr.cpp: @@ -2042,6 +2046,7 @@ JSystem/JAudio2/JAISeqMgr.cpp: .text start:0x802A3C44 end:0x802A45C4 .data start:0x803C3A98 end:0x803C3AB0 .bss start:0x8042E200 end:0x8042E220 + .sbss start:0x8044B460 end:0x8044B468 .sdata2 start:0x8044F8C8 end:0x8044F8D8 JSystem/JAudio2/JAISound.cpp: @@ -2082,6 +2087,7 @@ JSystem/JAudio2/JAIStreamDataMgr.cpp: JSystem/JAudio2/JAIStreamMgr.cpp: .text start:0x802A5FA8 end:0x802A6684 .bss start:0x8042E230 end:0x8042E250 + .sbss start:0x8044B468 end:0x8044B470 .sdata2 start:0x8044F920 end:0x8044F930 JSystem/JAudio2/JAUAudioArcInterpreter.cpp: @@ -2510,7 +2516,7 @@ JSystem/JUtility/JUTException.cpp: .rodata start:0x803975F0 end:0x80397B00 .data start:0x803C6760 end:0x803C67F8 .bss start:0x8042E6B8 end:0x8042E9B0 - .sdata start:0x8044AA30 end:0x8044AA40 + .sdata start:0x8044AA30 end:0x8044AA34 .sbss start:0x8044B648 end:0x8044B668 .sdata2 start:0x80450170 end:0x80450180 @@ -2524,6 +2530,7 @@ JSystem/JUtility/JUTDirectPrint.cpp: JSystem/JUtility/JUTAssert.cpp: .text start:0x802E6DF8 end:0x802E70F0 .bss start:0x8042E9B0 end:0x8042EAF0 + .sdata start:0x8044AA38 end:0x8044AA40 .sbss start:0x8044B670 end:0x8044B678 .sdata2 start:0x804501D8 end:0x804501F0 diff --git a/config/GZ2J01/symbols.txt b/config/GZ2J01/symbols.txt index 5de8e756b2..ccae3db9ec 100644 --- a/config/GZ2J01/symbols.txt +++ b/config/GZ2J01/symbols.txt @@ -1,9 +1,9 @@ -__check_pad3 = .init:0x80003100; // type:function size:0x40 scope:local -__set_debug_bba = .init:0x80003140; // type:function size:0xC scope:local -__get_debug_bba = .init:0x8000314C; // type:function size:0x8 scope:local -__start = .init:0x80003154; // type:function size:0x15C scope:weak -__init_registers = .init:0x800032B0; // type:function size:0x90 scope:local -__init_data = .init:0x80003340; // type:function size:0xC0 scope:local +__check_pad3 = .init:0x80003100; // type:function size:0x40 scope:global +__set_debug_bba = .init:0x80003140; // type:function size:0xC scope:global +__get_debug_bba = .init:0x8000314C; // type:function size:0x8 scope:global +__start = .init:0x80003154; // type:function size:0x15C scope:global +__init_registers = .init:0x800032B0; // type:function size:0x90 scope:global +__init_data = .init:0x80003340; // type:function size:0xC0 scope:global __init_hardware = .init:0x80003400; // type:function size:0x24 scope:global __flush_cache = .init:0x80003424; // type:function size:0x34 scope:global memset = .init:0x80003458; // type:function size:0x30 scope:global @@ -12,17 +12,15 @@ memcpy = .init:0x80003540; // type:function size:0x50 scope:global TRK_memset = .init:0x80003590; // type:function size:0x30 TRK_memcpy = .init:0x800035C0; // type:function size:0x24 gTRKInterruptVectorTable = .init:0x800035E4; // type:label scope:global -lbl_80004600 = .init:0x80004600; // type:label -lbl_80005400 = .init:0x80005400; // type:label __TRK_reset = .init:0x80005518; // type:function size:0x2C gTRKInterruptVectorTableEnd = .init:0x80005518; // type:label scope:global _rom_copy_info = .init:0x80005544; // type:object size:0x84 scope:global data:4byte _bss_init_info = .init:0x800055C8; // type:object size:0x20 scope:global data:4byte -@etb_80005600 = extab:0x80005600; // type:object size:0x8 scope:local hidden -@etb_80005608 = extab:0x80005608; // type:object size:0x8 scope:local hidden -@etb_80005610 = extab:0x80005610; // type:object size:0x18 scope:local hidden -@etb_80005628 = extab:0x80005628; // type:object size:0x8 scope:local hidden -@etb_80005630 = extab:0x80005630; // type:object size:0x18 scope:local hidden +@154 = extab:0x80005600; // type:object size:0x8 scope:local hidden +@159 = extab:0x80005608; // type:object size:0x8 scope:local hidden +@180 = extab:0x80005610; // type:object size:0x18 scope:local hidden +@188 = extab:0x80005628; // type:object size:0x8 scope:local hidden +@211 = extab:0x80005630; // type:object size:0x18 scope:local hidden @206 = extabindex:0x80005660; // type:object size:0xC scope:local align:4 @211 = extabindex:0x8000566C; // type:object size:0xC scope:local align:4 @232 = extabindex:0x80005678; // type:object size:0xC scope:local align:4 @@ -32,13 +30,13 @@ _eti_init_info = extabindex:0x8000569C; // type:object size:0x20 scope:global version_check__Fv = .text:0x800056C0; // type:function size:0x68 scope:global align:4 CheckHeap1__9HeapCheckFv = .text:0x80005728; // type:function size:0x64 scope:global align:4 CheckHeap__FUl = .text:0x8000578C; // type:function size:0xBC scope:global align:4 -countUsed__FP10JKRExpHeap = .text:0x80005848; // type:function size:0x58 scope:global align:4 +countUsed__FP10JKRExpHeap = .text:0x80005848; // type:function size:0x58 scope:local align:4 getUsedCount__9HeapCheckCFv = .text:0x800058A0; // type:function size:0x24 scope:global align:4 heapDisplay__9HeapCheckCFv = .text:0x800058C4; // type:function size:0x214 scope:global align:4 debugDisplay__Fv = .text:0x80005AD8; // type:function size:0x274 scope:global align:4 Debug_console__FUl = .text:0x80005D4C; // type:function size:0x400 scope:global align:4 LOAD_COPYDATE__FPv = .text:0x8000614C; // type:function size:0x7C scope:global align:4 -debug__Fv = .text:0x800061C8; // type:function size:0xC4 scope:global align:4 +debug__Fv = .text:0x800061C8; // type:function size:0xC4 scope:local align:4 main01__Fv = .text:0x8000628C; // type:function size:0x1C8 scope:global align:4 main = .text:0x80006454; // type:function size:0x184 scope:global align:4 dump_sort__7JKRHeapFv = .text:0x800065D8; // type:function size:0x8 scope:global align:4 @@ -46,25 +44,25 @@ __sinit_m_Do_main_cpp = .text:0x800065E0; // type:function size:0x1B8 scope:loca OSSwitchFiberEx__FUlUlUlUlUlUl = .text:0x80006798; // type:function size:0x30 scope:global align:4 my_PutString__FPCc = .text:0x800067C8; // type:function size:0x2C scope:global align:4 OSVAttention__FPCcP16__va_list_struct = .text:0x800067F4; // type:function size:0x20 scope:global align:4 -OSAttention = .text:0x80006814; // type:function size:0x80 scope:global align:4 -OSReportDisable = .text:0x80006894; // type:function size:0xC scope:global align:4 -OSReportEnable = .text:0x800068A0; // type:function size:0xC scope:global align:4 -OSReportForceEnableOn = .text:0x800068AC; // type:function size:0xC scope:global align:4 -OSReportForceEnableOff = .text:0x800068B8; // type:function size:0xC scope:global align:4 +OSAttention = .text:0x80006814; // type:function size:0x80 scope:weak align:4 +OSReportDisable = .text:0x80006894; // type:function size:0xC scope:weak align:4 +OSReportEnable = .text:0x800068A0; // type:function size:0xC scope:weak align:4 +OSReportForceEnableOn = .text:0x800068AC; // type:function size:0xC scope:weak align:4 +OSReportForceEnableOff = .text:0x800068B8; // type:function size:0xC scope:weak align:4 OSReportInit__Fv = .text:0x800068C4; // type:function size:0x18 scope:global align:4 mDoPrintf_vprintf_Interrupt__FPCcP16__va_list_struct = .text:0x800068DC; // type:function size:0x88 scope:global align:4 mDoPrintf_vprintf_Thread__FPCcP16__va_list_struct = .text:0x80006964; // type:function size:0x20 scope:global align:4 mDoPrintf_vprintf__FPCcP16__va_list_struct = .text:0x80006984; // type:function size:0x8C scope:global align:4 mDoPrintf_VReport = .text:0x80006A10; // type:function size:0x8C scope:global align:4 -OSVReport = .text:0x80006A9C; // type:function size:0x20 scope:global align:4 -OSReport = .text:0x80006ABC; // type:function size:0x80 scope:global align:4 -OSReport_FatalError = .text:0x80006B3C; // type:function size:0xD0 scope:global align:4 -OSReport_Error = .text:0x80006C0C; // type:function size:0xE0 scope:global align:4 -OSReport_Warning = .text:0x80006CEC; // type:function size:0xE0 scope:global align:4 -OSReport_System = .text:0x80006DCC; // type:function size:0xB0 scope:global align:4 -OSPanic = .text:0x80006E7C; // type:function size:0x138 scope:global align:4 +OSVReport = .text:0x80006A9C; // type:function size:0x20 scope:weak align:4 +OSReport = .text:0x80006ABC; // type:function size:0x80 scope:weak align:4 +OSReport_FatalError = .text:0x80006B3C; // type:function size:0xD0 scope:weak align:4 +OSReport_Error = .text:0x80006C0C; // type:function size:0xE0 scope:weak align:4 +OSReport_Warning = .text:0x80006CEC; // type:function size:0xE0 scope:weak align:4 +OSReport_System = .text:0x80006DCC; // type:function size:0xB0 scope:weak align:4 +OSPanic = .text:0x80006E7C; // type:function size:0x138 scope:weak align:4 reset__17mDoAud_zelAudio_cFv = .text:0x80006FB4; // type:function size:0xC scope:global align:4 -mDoAud_Create__Fv = .text:0x80006FC0; // type:function size:0x1A4 scope:global align:4 +mDoAud_Create__Fv = .text:0x80006FC0; // type:function size:0x1A4 scope:local align:4 mDoAud_Execute__Fv = .text:0x80007164; // type:function size:0x58 scope:global align:4 mDoAud_setSceneName__FPCcll = .text:0x800071BC; // type:function size:0x3C scope:global align:4 mDoAud_load1stDynamicWave__Fv = .text:0x800071F8; // type:function size:0x2C scope:global align:4 @@ -73,17 +71,17 @@ mDoAud_setFadeInStart__FUc = .text:0x80007254; // type:function size:0x30 scope: mDoAud_resetProcess__Fv = .text:0x80007284; // type:function size:0x40 scope:global align:4 mDoAud_resetRecover__Fv = .text:0x800072C4; // type:function size:0x54 scope:global align:4 __sinit_m_Do_audio_cpp = .text:0x80007318; // type:function size:0x50 scope:local align:4 -__dt__17mDoAud_zelAudio_cFv = .text:0x80007368; // type:function size:0x60 scope:global align:4 -__dt__10Z2AudioMgrFv = .text:0x800073C8; // type:function size:0x470 scope:global align:4 -__dt__14JAISoundHandleFv = .text:0x80007838; // type:function size:0x50 scope:global align:4 -__dt__12Z2MultiSeObjFv = .text:0x80007888; // type:function size:0x54 scope:global align:4 -__dt__16JAISeCategoryMgrFv = .text:0x800078DC; // type:function size:0x78 scope:global align:4 +__dt__17mDoAud_zelAudio_cFv = .text:0x80007368; // type:function size:0x60 scope:weak align:4 +__dt__10Z2AudioMgrFv = .text:0x800073C8; // type:function size:0x470 scope:weak align:4 +__dt__14JAISoundHandleFv = .text:0x80007838; // type:function size:0x50 scope:weak align:4 +__dt__12Z2MultiSeObjFv = .text:0x80007888; // type:function size:0x54 scope:weak align:4 +__dt__16JAISeCategoryMgrFv = .text:0x800078DC; // type:function size:0x78 scope:weak align:4 create__8mDoCPd_cFv = .text:0x80007954; // type:function size:0x140 scope:global align:4 read__8mDoCPd_cFv = .text:0x80007A94; // type:function size:0xE8 scope:global align:4 convert__8mDoCPd_cFP27interface_of_controller_padP10JUTGamePad = .text:0x80007B7C; // type:function size:0x154 scope:global align:4 LRlockCheck__8mDoCPd_cFP27interface_of_controller_pad = .text:0x80007CD0; // type:function size:0xA4 scope:global align:4 recalibrate__8mDoCPd_cFv = .text:0x80007D74; // type:function size:0x28 scope:global align:4 -createTimg__FUsUsUl = .text:0x80007D9C; // type:function size:0xA8 scope:global align:4 +createTimg__FUsUsUl = .text:0x80007D9C; // type:function size:0xA8 scope:local align:4 create__13mDoGph_gInf_cFv = .text:0x80007E44; // type:function size:0x14C scope:global align:4 beginRender__13mDoGph_gInf_cFv = .text:0x80007F90; // type:function size:0x48 scope:global align:4 fadeOut__13mDoGph_gInf_cFfR8_GXColor = .text:0x80007FD8; // type:function size:0x50 scope:global align:4 @@ -95,36 +93,36 @@ darwFilter__F8_GXColor = .text:0x800080F4; // type:function size:0x23C scope:glo calcFade__13mDoGph_gInf_cFv = .text:0x80008330; // type:function size:0xEC scope:global align:4 mDoGph_BlankingON__Fv = .text:0x8000841C; // type:function size:0x4 scope:global align:4 mDoGph_BlankingOFF__Fv = .text:0x80008420; // type:function size:0x4 scope:global align:4 -dScnPly_BeforeOfPaint__Fv = .text:0x80008424; // type:function size:0x2C scope:global align:4 +dScnPly_BeforeOfPaint__Fv = .text:0x80008424; // type:function size:0x2C scope:local align:4 mDoGph_BeforeOfDraw__Fv = .text:0x80008450; // type:function size:0x24 scope:global align:4 mDoGph_AfterOfDraw__Fv = .text:0x80008474; // type:function size:0x1BC scope:global align:4 -drawDepth2__FP10view_classP15view_port_classi = .text:0x80008630; // type:function size:0xB54 scope:global align:4 -__dt__4cXyzFv = .text:0x80009184; // type:function size:0x3C scope:global align:4 -trimming__FP10view_classP15view_port_class = .text:0x800091C0; // type:function size:0x2F4 scope:global align:4 +drawDepth2__FP10view_classP15view_port_classi = .text:0x80008630; // type:function size:0xB54 scope:local align:4 +__dt__4cXyzFv = .text:0x80009184; // type:function size:0x3C scope:weak align:4 +trimming__FP10view_classP15view_port_class = .text:0x800091C0; // type:function size:0x2F4 scope:local align:4 mDoGph_drawFilterQuad__FScSc = .text:0x800094B4; // type:function size:0x90 scope:global align:4 create__Q213mDoGph_gInf_c7bloom_cFv = .text:0x80009544; // type:function size:0xB4 scope:global align:4 remove__Q213mDoGph_gInf_c7bloom_cFv = .text:0x800095F8; // type:function size:0x58 scope:global align:4 draw__Q213mDoGph_gInf_c7bloom_cFv = .text:0x80009650; // type:function size:0xB10 scope:global align:4 -retry_captue_frame__FP10view_classP15view_port_classi = .text:0x8000A160; // type:function size:0x130 scope:global align:4 -motionBlure__FP10view_class = .text:0x8000A290; // type:function size:0x274 scope:global align:4 -setLight__Fv = .text:0x8000A504; // type:function size:0x88 scope:global align:4 -drawItem3D__Fv = .text:0x8000A58C; // type:function size:0x78 scope:global align:4 +retry_captue_frame__FP10view_classP15view_port_classi = .text:0x8000A160; // type:function size:0x130 scope:local align:4 +motionBlure__FP10view_class = .text:0x8000A290; // type:function size:0x274 scope:local align:4 +setLight__Fv = .text:0x8000A504; // type:function size:0x88 scope:local align:4 +drawItem3D__Fv = .text:0x8000A58C; // type:function size:0x78 scope:local align:4 mDoGph_Painter__Fv = .text:0x8000A604; // type:function size:0xB14 scope:global align:4 -__dt__13J2DOrthoGraphFv = .text:0x8000B118; // type:function size:0x5C scope:global align:4 +__dt__13J2DOrthoGraphFv = .text:0x8000B118; // type:function size:0x5C scope:weak align:4 mDoGph_Create__Fv = .text:0x8000B174; // type:function size:0x5C scope:global align:4 __sinit_m_Do_graphic_cpp = .text:0x8000B1D0; // type:function size:0x14 scope:local align:4 -getAtnActorID__9daPy_py_cCFv = .text:0x8000B1E4; // type:function size:0x8 scope:global align:4 -myGetHeapTypeByString__FP7JKRHeap = .text:0x8000B1EC; // type:function size:0x200 scope:global align:4 -myMemoryErrorRoutine__FPvUli = .text:0x8000B3EC; // type:function size:0x1DC scope:global align:4 +getAtnActorID__9daPy_py_cCFv = .text:0x8000B1E4; // type:function size:0x8 scope:weak align:4 +myGetHeapTypeByString__FP7JKRHeap = .text:0x8000B1EC; // type:function size:0x200 scope:local align:4 +myMemoryErrorRoutine__FPvUli = .text:0x8000B3EC; // type:function size:0x1DC scope:local align:4 myHeapCheckRecursive__FP7JKRHeap = .text:0x8000B5C8; // type:function size:0xA0 scope:global align:4 mDoMch_HeapCheckAll__Fv = .text:0x8000B668; // type:function size:0x24 scope:global align:4 -developKeyCheck__FUlUl = .text:0x8000B68C; // type:function size:0xB0 scope:global align:4 +developKeyCheck__FUlUl = .text:0x8000B68C; // type:function size:0xB0 scope:local align:4 mDoMch_IsProgressiveMode__Fv = .text:0x8000B73C; // type:function size:0x2C scope:global align:4 exceptionReadPad__FPUlPUl = .text:0x8000B768; // type:function size:0x30 scope:global align:4 exceptionRestart__Fv = .text:0x8000B798; // type:function size:0x30 scope:global align:4 myExceptionCallback__FUsP9OSContextUlUl = .text:0x8000B7C8; // type:function size:0x194 scope:global align:4 -fault_callback_scroll__FUsP9OSContextUlUl = .text:0x8000B95C; // type:function size:0x398 scope:global align:4 -my_PrintHeap__FPCcUl = .text:0x8000BCF4; // type:function size:0x4 scope:global align:4 +fault_callback_scroll__FUsP9OSContextUlUl = .text:0x8000B95C; // type:function size:0x398 scope:local align:4 +my_PrintHeap__FPCcUl = .text:0x8000BCF4; // type:function size:0x4 scope:local align:4 my_SysPrintHeap__FPCcPvUl = .text:0x8000BCF8; // type:function size:0x4C scope:global align:4 mDoMch_Create__Fv = .text:0x8000BD44; // type:function size:0x388 scope:global align:4 mDoMtx_XYZrotS__FPA4_fsss = .text:0x8000C0CC; // type:function size:0x98 scope:global align:4 @@ -157,8 +155,8 @@ ZXYrotS__14mDoMtx_stack_cFRC5csXyz = .text:0x8000CF0C; // type:function size:0x3 ZXYrotM__14mDoMtx_stack_cFRC5csXyz = .text:0x8000CF44; // type:function size:0x38 scope:global align:4 quatM__14mDoMtx_stack_cFPC10Quaternion = .text:0x8000CF7C; // type:function size:0x3C scope:global align:4 __sinit_m_Do_mtx_cpp = .text:0x8000CFB8; // type:function size:0x7C scope:local align:4 -__dt__18mDoMtx_quatStack_cFv = .text:0x8000D034; // type:function size:0x3C scope:global align:4 -__dt__14mDoMtx_stack_cFv = .text:0x8000D070; // type:function size:0x3C scope:global align:4 +__dt__18mDoMtx_quatStack_cFv = .text:0x8000D034; // type:function size:0x3C scope:weak align:4 +__dt__14mDoMtx_stack_cFv = .text:0x8000D070; // type:function size:0x3C scope:weak align:4 mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs = .text:0x8000D0AC; // type:function size:0x274 scope:global align:4 initPlay__14mDoExt_baseAnmFsifss = .text:0x8000D320; // type:function size:0x108 scope:global align:4 play__14mDoExt_baseAnmFv = .text:0x8000D428; // type:function size:0x54 scope:global align:4 @@ -389,16 +387,16 @@ setup__14mDoLib_clipperFffff = .text:0x8001528C; // type:function size:0x84 scop mDoLib_project__FP3VecP3Vec = .text:0x80015310; // type:function size:0x1DC scope:global align:4 mDoLib_pos2camera__FP3VecP3Vec = .text:0x800154EC; // type:function size:0x58 scope:global align:4 __sinit_m_Do_lib_cpp = .text:0x80015544; // type:function size:0x4C scope:local align:4 -__dt__11J3DUClipperFv = .text:0x80015590; // type:function size:0x48 scope:global align:4 -my_OSCancelAlarmAll__Fv = .text:0x800155D8; // type:function size:0x4 scope:global align:4 -destroyVideo__Fv = .text:0x800155DC; // type:function size:0x38 scope:global align:4 +__dt__11J3DUClipperFv = .text:0x80015590; // type:function size:0x48 scope:weak align:4 +my_OSCancelAlarmAll__Fv = .text:0x800155D8; // type:function size:0x4 scope:local align:4 +destroyVideo__Fv = .text:0x800155DC; // type:function size:0x38 scope:local align:4 mDoRst_reset__FiUli = .text:0x80015614; // type:function size:0x138 scope:global align:4 mDoRst_resetCallBack__FiPv = .text:0x8001574C; // type:function size:0xA8 scope:global align:4 -getResetData__6mDoRstFv = .text:0x800157F4; // type:function size:0x8 scope:global align:4 +getResetData__6mDoRstFv = .text:0x800157F4; // type:function size:0x8 scope:weak align:4 main__9mDoDvdThdFPv = .text:0x800157FC; // type:function size:0x5C scope:global align:4 create__9mDoDvdThdFl = .text:0x80015858; // type:function size:0x5C scope:global align:4 suspend__9mDoDvdThdFv = .text:0x800158B4; // type:function size:0x28 scope:global align:4 -my_DVDConvertPathToEntrynum__FPCc = .text:0x800158DC; // type:function size:0x20 scope:global align:4 +my_DVDConvertPathToEntrynum__FPCc = .text:0x800158DC; // type:function size:0x20 scope:local align:4 __dt__19mDoDvdThd_command_cFv = .text:0x800158FC; // type:function size:0x48 scope:global align:4 __ct__17mDoDvdThd_param_cFv = .text:0x80015944; // type:function size:0x48 scope:global align:4 kick__17mDoDvdThd_param_cFv = .text:0x8001598C; // type:function size:0x28 scope:global align:4 @@ -406,7 +404,7 @@ waitForKick__17mDoDvdThd_param_cFv = .text:0x800159B4; // type:function size:0x2 getFirstCommand__17mDoDvdThd_param_cFv = .text:0x800159DC; // type:function size:0x8 scope:global align:4 addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c = .text:0x800159E4; // type:function size:0x58 scope:global align:4 cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c = .text:0x80015A3C; // type:function size:0x54 scope:global align:4 -cb__FPv = .text:0x80015A90; // type:function size:0x48 scope:global align:4 +cb__FPv = .text:0x80015A90; // type:function size:0x48 scope:local align:4 mainLoop__17mDoDvdThd_param_cFv = .text:0x80015AD8; // type:function size:0x9C scope:global align:4 __ct__19mDoDvdThd_command_cFv = .text:0x80015B74; // type:function size:0x44 scope:global align:4 __dt__20mDoDvdThd_callback_cFv = .text:0x80015BB8; // type:function size:0x60 scope:global align:4 @@ -428,8 +426,8 @@ execute__21mDoDvdThd_toMainRam_cFv = .text:0x800164BC; // type:function size:0xB __sinit_m_Do_dvd_thread_cpp = .text:0x80016574; // type:function size:0x28 scope:local align:4 mDoDvdErr_ThdInit__Fv = .text:0x8001659C; // type:function size:0xC0 scope:global align:4 mDoDvdErr_ThdCleanup__Fv = .text:0x8001665C; // type:function size:0x48 scope:global align:4 -mDoDvdErr_Watch__FPv = .text:0x800166A4; // type:function size:0x60 scope:global align:4 -AlarmHandler__FP7OSAlarmP9OSContext = .text:0x80016704; // type:function size:0x28 scope:global align:4 +mDoDvdErr_Watch__FPv = .text:0x800166A4; // type:function size:0x60 scope:local align:4 +AlarmHandler__FP7OSAlarmP9OSContext = .text:0x80016704; // type:function size:0x28 scope:local align:4 __ct__15mDoMemCd_Ctrl_cFv = .text:0x8001672C; // type:function size:0x4 scope:global align:4 ThdInit__15mDoMemCd_Ctrl_cFv = .text:0x80016730; // type:function size:0xA0 scope:global align:4 main__15mDoMemCd_Ctrl_cFv = .text:0x800167D0; // type:function size:0xC4 scope:global align:4 @@ -451,15 +449,15 @@ mount__15mDoMemCd_Ctrl_cFv = .text:0x80017148; // type:function size:0x12C scope loadfile__15mDoMemCd_Ctrl_cFv = .text:0x80017274; // type:function size:0x60 scope:global align:4 checkspace__15mDoMemCd_Ctrl_cFv = .text:0x800172D4; // type:function size:0x8C scope:global align:4 setCardState__15mDoMemCd_Ctrl_cFl = .text:0x80017360; // type:function size:0xBC scope:global align:4 -mDoMemCd_main__FPv = .text:0x8001741C; // type:function size:0x54 scope:global align:4 +mDoMemCd_main__FPv = .text:0x8001741C; // type:function size:0x54 scope:local align:4 __sinit_m_Do_MemCard_cpp = .text:0x80017470; // type:function size:0x28 scope:local align:4 mDoMemCdRWm_Store__FP12CARDFileInfoPvUl = .text:0x80017498; // type:function size:0x204 scope:global align:4 mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl = .text:0x8001769C; // type:function size:0x1E0 scope:global align:4 -mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData = .text:0x8001787C; // type:function size:0x168 scope:global align:4 -mDoMemCdRWm_SetCardStat__FP12CARDFileInfo = .text:0x800179E4; // type:function size:0x168 scope:global align:4 -mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo = .text:0x80017B4C; // type:function size:0x128 scope:global align:4 -mDoMemCdRWm_CalcCheckSum__FPvUl = .text:0x80017C74; // type:function size:0x40 scope:global align:4 -mDoMemCdRWm_CalcCheckSumGameData__FPvUl = .text:0x80017CB4; // type:function size:0x38 scope:global align:4 +mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData = .text:0x8001787C; // type:function size:0x168 scope:local align:4 +mDoMemCdRWm_SetCardStat__FP12CARDFileInfo = .text:0x800179E4; // type:function size:0x168 scope:local align:4 +mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo = .text:0x80017B4C; // type:function size:0x128 scope:local align:4 +mDoMemCdRWm_CalcCheckSum__FPvUl = .text:0x80017C74; // type:function size:0x40 scope:local align:4 +mDoMemCdRWm_CalcCheckSumGameData__FPvUl = .text:0x80017CB4; // type:function size:0x38 scope:local align:4 mDoMemCdRWm_TestCheckSumGameData__FPv = .text:0x80017CEC; // type:function size:0x4C scope:global align:4 mDoMemCdRWm_SetCheckSumGameData__FPUcUc = .text:0x80017D38; // type:function size:0x44 scope:global align:4 print_f__FPCce = .text:0x80017D7C; // type:function size:0x8C scope:global align:4 @@ -472,15 +470,15 @@ exception_addition__FP10JUTConsole = .text:0x8001814C; // type:function size:0x3 execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle = .text:0x8001817C; // type:function size:0x128 scope:global align:4 draw__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle = .text:0x800182A4; // type:function size:0x4 scope:global align:4 cDmrNowMidnaTalk__Fv = .text:0x800182A8; // type:function size:0x80 scope:global align:4 -__dt__24JPTraceParticleCallBack4Fv = .text:0x80018328; // type:function size:0x60 scope:global align:4 +__dt__24JPTraceParticleCallBack4Fv = .text:0x80018328; // type:function size:0x60 scope:weak align:4 __sinit_c_damagereaction_cpp = .text:0x80018388; // type:function size:0x4C scope:local align:4 -execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x800183D4; // type:function size:0x4 scope:global align:4 -draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x800183D8; // type:function size:0x4 scope:global align:4 +execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x800183D4; // type:function size:0x4 scope:weak align:4 +draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x800183D8; // type:function size:0x4 scope:weak align:4 cCc_Init__Fv = .text:0x800183DC; // type:function size:0x168 scope:global align:4 cDyl_IsLinked__Fs = .text:0x80018544; // type:function size:0x38 scope:global align:4 cDyl_Unlink__Fs = .text:0x8001857C; // type:function size:0x44 scope:global align:4 cDyl_LinkASync__Fs = .text:0x800185C0; // type:function size:0xC8 scope:global align:4 -cDyl_InitCallback__FPv = .text:0x80018688; // type:function size:0xDC scope:global align:4 +cDyl_InitCallback__FPv = .text:0x80018688; // type:function size:0xDC scope:local align:4 cDyl_InitAsync__Fv = .text:0x80018764; // type:function size:0x34 scope:global align:4 cDyl_InitAsyncIsDone__Fv = .text:0x80018798; // type:function size:0x6C scope:global align:4 phase_01__7cDylPhsFPv = .text:0x80018804; // type:function size:0x8 scope:global align:4 @@ -488,8 +486,8 @@ phase_02__7cDylPhsFPs = .text:0x8001880C; // type:function size:0x38 scope:globa phase_03__7cDylPhsFPv = .text:0x80018844; // type:function size:0x8 scope:global align:4 Link__7cDylPhsFP30request_of_phase_process_classs = .text:0x8001884C; // type:function size:0x44 scope:global align:4 Unlink__7cDylPhsFP30request_of_phase_process_classs = .text:0x80018890; // type:function size:0x4C scope:global align:4 -getModuleName__24DynamicModuleControlBaseCFv = .text:0x800188DC; // type:function size:0x8 scope:global align:4 -__dt__20DynamicModuleControlFv = .text:0x800188E4; // type:function size:0x60 scope:global align:4 +getModuleName__24DynamicModuleControlBaseCFv = .text:0x800188DC; // type:function size:0x8 scope:weak align:4 +__dt__20DynamicModuleControlFv = .text:0x800188E4; // type:function size:0x60 scope:weak align:4 __ct__11fapGm_HIO_cFv = .text:0x80018944; // type:function size:0x100 scope:global align:4 fapGm_After__Fv = .text:0x80018A44; // type:function size:0x28 scope:global align:4 fapGm_Execute__Fv = .text:0x80018A6C; // type:function size:0x34 scope:global align:4 @@ -497,17 +495,17 @@ fapGm_Create__Fv = .text:0x80018AA0; // type:function size:0x40 scope:global ali __dt__11fapGm_HIO_cFv = .text:0x80018AE0; // type:function size:0x48 scope:global align:4 __sinit_f_ap_game_cpp = .text:0x80018B28; // type:function size:0x3C scope:local align:4 __ct__10fopAc_ac_cFv = .text:0x80018B64; // type:function size:0x6C scope:global align:4 -__dt__5csXyzFv = .text:0x80018BD0; // type:function size:0x3C scope:global align:4 -__ct__11J3DLightObjFv = .text:0x80018C0C; // type:function size:0x38 scope:global align:4 -__dt__11dEvt_info_cFv = .text:0x80018C44; // type:function size:0x48 scope:global align:4 +__dt__5csXyzFv = .text:0x80018BD0; // type:function size:0x3C scope:weak align:4 +__ct__11J3DLightObjFv = .text:0x80018C0C; // type:function size:0x38 scope:weak align:4 +__dt__11dEvt_info_cFv = .text:0x80018C44; // type:function size:0x48 scope:weak align:4 __dt__10fopAc_ac_cFv = .text:0x80018C8C; // type:function size:0x54 scope:global align:4 fopAc_IsActor__FPv = .text:0x80018CE0; // type:function size:0x2C scope:global align:4 -fopAc_Draw__FPv = .text:0x80018D0C; // type:function size:0xCC scope:global align:4 -fopAc_Execute__FPv = .text:0x80018DD8; // type:function size:0x1A0 scope:global align:4 -fopAc_IsDelete__FPv = .text:0x80018F78; // type:function size:0x54 scope:global align:4 -fopAc_Delete__FPv = .text:0x80018FCC; // type:function size:0x80 scope:global align:4 -fopAc_Create__FPv = .text:0x8001904C; // type:function size:0x3B0 scope:global align:4 -getFileListInfo__15dStage_roomDt_cCFv = .text:0x800193FC; // type:function size:0x8 scope:global align:4 +fopAc_Draw__FPv = .text:0x80018D0C; // type:function size:0xCC scope:local align:4 +fopAc_Execute__FPv = .text:0x80018DD8; // type:function size:0x1A0 scope:local align:4 +fopAc_IsDelete__FPv = .text:0x80018F78; // type:function size:0x54 scope:local align:4 +fopAc_Delete__FPv = .text:0x80018FCC; // type:function size:0x80 scope:local align:4 +fopAc_Create__FPv = .text:0x8001904C; // type:function size:0x3B0 scope:local align:4 +getFileListInfo__15dStage_roomDt_cCFv = .text:0x800193FC; // type:function size:0x8 scope:weak align:4 initBallModel__13fopEn_enemy_cFv = .text:0x80019404; // type:function size:0xF8 scope:global align:4 checkBallModelDraw__13fopEn_enemy_cFv = .text:0x800194FC; // type:function size:0x24 scope:global align:4 setBallModelEffect__13fopEn_enemy_cFP12dKy_tevstr_c = .text:0x80019520; // type:function size:0x180 scope:global align:4 @@ -602,11 +600,11 @@ fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci = .text:0x8001D020 fopAcM_effHamonSet__FPUlPC4cXyzff = .text:0x8001D10C; // type:function size:0xE8 scope:global align:4 fopAcM_riverStream__FP4cXyzPsPff = .text:0x8001D1F4; // type:function size:0x8 scope:global align:4 fopAcM_carryOffRevise__FP10fopAc_ac_c = .text:0x8001D1FC; // type:function size:0x130 scope:global align:4 -vectle_calc__FPC10DOUBLE_POSP4cXyz = .text:0x8001D32C; // type:function size:0xA8 scope:global align:4 -get_vectle_calc__FPC4cXyzPC4cXyzP4cXyz = .text:0x8001D3D4; // type:function size:0x58 scope:global align:4 +vectle_calc__FPC10DOUBLE_POSP4cXyz = .text:0x8001D32C; // type:function size:0xA8 scope:local align:4 +get_vectle_calc__FPC4cXyzPC4cXyzP4cXyz = .text:0x8001D3D4; // type:function size:0x58 scope:local align:4 fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData = .text:0x8001D42C; // type:function size:0x178 scope:global align:4 fopAcM_getProcNameString__FPC10fopAc_ac_c = .text:0x8001D5A4; // type:function size:0x48 scope:global align:4 -fopAcM_findObjectCB__FPC10fopAc_ac_cPv = .text:0x8001D5EC; // type:function size:0xAC scope:global align:4 +fopAcM_findObjectCB__FPC10fopAc_ac_cPv = .text:0x8001D5EC; // type:function size:0xAC scope:local align:4 fopAcM_searchFromName__FPCcUlUl = .text:0x8001D698; // type:function size:0x58 scope:global align:4 fopAcM_findObject4EventCB__FP10fopAc_ac_cPv = .text:0x8001D6F0; // type:function size:0xB0 scope:global align:4 fopAcM_searchFromName4Event__FPCcs = .text:0x8001D7A0; // type:function size:0xF0 scope:global align:4 @@ -614,7 +612,7 @@ fopAcM_getWaterY__FPC4cXyzPf = .text:0x8001D890; // type:function size:0x70 scop fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz = .text:0x8001D900; // type:function size:0xA8 scope:global align:4 fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii = .text:0x8001D9A8; // type:function size:0x13C scope:global align:4 fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos = .text:0x8001DAE4; // type:function size:0xAC scope:global align:4 -__dt__8cM3dGPlaFv = .text:0x8001DB90; // type:function size:0x48 scope:global align:4 +__dt__8cM3dGPlaFv = .text:0x8001DB90; // type:function size:0x48 scope:weak align:4 fopAcM_getPolygonAngle__FPC8cM3dGPlas = .text:0x8001DBD8; // type:function size:0x90 scope:global align:4 lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c = .text:0x8001DC68; // type:function size:0x54 scope:global align:4 gndCheck__11fopAcM_gc_cFPC4cXyz = .text:0x8001DCBC; // type:function size:0x60 scope:global align:4 @@ -622,38 +620,38 @@ roofCheck__11fopAcM_rc_cFPC4cXyz = .text:0x8001DD1C; // type:function size:0x68 waterCheck__11fopAcM_wt_cFPC4cXyz = .text:0x8001DD84; // type:function size:0x8C scope:global align:4 fopAcM_initManager__Fv = .text:0x8001DE10; // type:function size:0x4 scope:global align:4 __sinit_f_op_actor_mng_cpp = .text:0x8001DE14; // type:function size:0x11C scope:local align:4 -__dt__11dBgS_WtrChkFv = .text:0x8001DF30; // type:function size:0x78 scope:global align:4 -__dt__15dBgS_ObjRoofChkFv = .text:0x8001DFA8; // type:function size:0x78 scope:global align:4 -__dt__14dBgS_ObjGndChkFv = .text:0x8001E020; // type:function size:0x78 scope:global align:4 -__dt__5l_HIOFv = .text:0x8001E098; // type:function size:0x3C scope:global align:4 -@20@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0D4; // type:function size:0x8 scope:local align:4 -@76@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0DC; // type:function size:0x8 scope:local align:4 -@60@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0E4; // type:function size:0x8 scope:local align:4 -@16@__dt__11dBgS_WtrChkFv = .text:0x8001E0EC; // type:function size:0x8 scope:local align:4 -@52@__dt__11dBgS_WtrChkFv = .text:0x8001E0F4; // type:function size:0x8 scope:local align:4 -@36@__dt__11dBgS_WtrChkFv = .text:0x8001E0FC; // type:function size:0x8 scope:local align:4 -@16@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E104; // type:function size:0x8 scope:local align:4 -@52@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E10C; // type:function size:0x8 scope:local align:4 -@36@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E114; // type:function size:0x8 scope:local align:4 -onFrollCrashFlg__9daPy_py_cFUci = .text:0x8001E11C; // type:function size:0x4 scope:global align:4 -checkWolfDash__9daPy_py_cCFv = .text:0x8001E120; // type:function size:0x8 scope:global align:4 -checkFrontRoll__9daPy_py_cCFv = .text:0x8001E128; // type:function size:0x8 scope:global align:4 -checkHorseRide__9daPy_py_cCFv = .text:0x8001E130; // type:function size:0x8 scope:global align:4 -getGrabActorID__9daPy_py_cCFv = .text:0x8001E138; // type:function size:0x8 scope:global align:4 -fopCam_Draw__FP12camera_class = .text:0x8001E140; // type:function size:0x40 scope:global align:4 -fopCam_Execute__FP12camera_class = .text:0x8001E180; // type:function size:0x48 scope:global align:4 +__dt__11dBgS_WtrChkFv = .text:0x8001DF30; // type:function size:0x78 scope:weak align:4 +__dt__15dBgS_ObjRoofChkFv = .text:0x8001DFA8; // type:function size:0x78 scope:weak align:4 +__dt__14dBgS_ObjGndChkFv = .text:0x8001E020; // type:function size:0x78 scope:weak align:4 +__dt__5l_HIOFv = .text:0x8001E098; // type:function size:0x3C scope:weak align:4 +@20@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0D4; // type:function size:0x8 scope:weak align:4 +@76@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0DC; // type:function size:0x8 scope:weak align:4 +@60@__dt__14dBgS_ObjGndChkFv = .text:0x8001E0E4; // type:function size:0x8 scope:weak align:4 +@16@__dt__11dBgS_WtrChkFv = .text:0x8001E0EC; // type:function size:0x8 scope:weak align:4 +@52@__dt__11dBgS_WtrChkFv = .text:0x8001E0F4; // type:function size:0x8 scope:weak align:4 +@36@__dt__11dBgS_WtrChkFv = .text:0x8001E0FC; // type:function size:0x8 scope:weak align:4 +@16@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E104; // type:function size:0x8 scope:weak align:4 +@52@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E10C; // type:function size:0x8 scope:weak align:4 +@36@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E114; // type:function size:0x8 scope:weak align:4 +onFrollCrashFlg__9daPy_py_cFUci = .text:0x8001E11C; // type:function size:0x4 scope:weak align:4 +checkWolfDash__9daPy_py_cCFv = .text:0x8001E120; // type:function size:0x8 scope:weak align:4 +checkFrontRoll__9daPy_py_cCFv = .text:0x8001E128; // type:function size:0x8 scope:weak align:4 +checkHorseRide__9daPy_py_cCFv = .text:0x8001E130; // type:function size:0x8 scope:weak align:4 +getGrabActorID__9daPy_py_cCFv = .text:0x8001E138; // type:function size:0x8 scope:weak align:4 +fopCam_Draw__FP12camera_class = .text:0x8001E140; // type:function size:0x40 scope:local align:4 +fopCam_Execute__FP12camera_class = .text:0x8001E180; // type:function size:0x48 scope:local align:4 fopCam_IsDelete__FP12camera_class = .text:0x8001E1C8; // type:function size:0x54 scope:global align:4 fopCam_Delete__FP12camera_class = .text:0x8001E21C; // type:function size:0x54 scope:global align:4 -fopCam_Create__FPv = .text:0x8001E270; // type:function size:0x98 scope:global align:4 +fopCam_Create__FPv = .text:0x8001E270; // type:function size:0x98 scope:local align:4 fopCamM_GetParam__FP12camera_class = .text:0x8001E308; // type:function size:0x8 scope:global align:4 fopCamM_Create__FisPv = .text:0x8001E310; // type:function size:0x64 scope:global align:4 fopCamM_Management__Fv = .text:0x8001E374; // type:function size:0x4 scope:global align:4 fopCamM_Init__Fv = .text:0x8001E378; // type:function size:0x4 scope:global align:4 -fopOvlp_Draw__FPv = .text:0x8001E37C; // type:function size:0x28 scope:global align:4 -fopOvlp_Execute__FPv = .text:0x8001E3A4; // type:function size:0x28 scope:global align:4 -fopOvlp_IsDelete__FPv = .text:0x8001E3CC; // type:function size:0x28 scope:global align:4 -fopOvlp_Delete__FPv = .text:0x8001E3F4; // type:function size:0x28 scope:global align:4 -fopOvlp_Create__FPv = .text:0x8001E41C; // type:function size:0x68 scope:global align:4 +fopOvlp_Draw__FPv = .text:0x8001E37C; // type:function size:0x28 scope:local align:4 +fopOvlp_Execute__FPv = .text:0x8001E3A4; // type:function size:0x28 scope:local align:4 +fopOvlp_IsDelete__FPv = .text:0x8001E3CC; // type:function size:0x28 scope:local align:4 +fopOvlp_Delete__FPv = .text:0x8001E3F4; // type:function size:0x28 scope:local align:4 +fopOvlp_Create__FPv = .text:0x8001E41C; // type:function size:0x68 scope:local align:4 fopOvlpM_SceneIsStop__Fv = .text:0x8001E484; // type:function size:0x40 scope:global align:4 fopOvlpM_SceneIsStart__Fv = .text:0x8001E4C4; // type:function size:0x40 scope:global align:4 fopOvlpM_IsOutReq__FP18overlap_task_class = .text:0x8001E504; // type:function size:0x18 scope:global align:4 @@ -667,24 +665,24 @@ fopOvlpM_Request__FsUs = .text:0x8001E604; // type:function size:0x4C scope:glob fopOvlpM_Management__Fv = .text:0x8001E650; // type:function size:0x48 scope:global align:4 fopOvlpM_Cancel__Fv = .text:0x8001E698; // type:function size:0x50 scope:global align:4 fopOvlpM_Init__Fv = .text:0x8001E6E8; // type:function size:0x4 scope:global align:4 -fopOvlpReq_phase_Done__FP21overlap_request_class = .text:0x8001E6EC; // type:function size:0x5C scope:global align:4 -fopOvlpReq_phase_IsDone__FP21overlap_request_class = .text:0x8001E748; // type:function size:0x4C scope:global align:4 -fopOvlpReq_phase_IsWaitOfFadeout__FP21overlap_request_class = .text:0x8001E794; // type:function size:0x50 scope:global align:4 -fopOvlpReq_phase_WaitOfFadeout__FP21overlap_request_class = .text:0x8001E7E4; // type:function size:0x70 scope:global align:4 -fopOvlpReq_phase_IsComplete__FP21overlap_request_class = .text:0x8001E854; // type:function size:0x50 scope:global align:4 -fopOvlpReq_phase_IsCreated__FP21overlap_request_class = .text:0x8001E8A4; // type:function size:0x60 scope:global align:4 -fopOvlpReq_phase_Create__FP21overlap_request_class = .text:0x8001E904; // type:function size:0x50 scope:global align:4 +fopOvlpReq_phase_Done__FP21overlap_request_class = .text:0x8001E6EC; // type:function size:0x5C scope:local align:4 +fopOvlpReq_phase_IsDone__FP21overlap_request_class = .text:0x8001E748; // type:function size:0x4C scope:local align:4 +fopOvlpReq_phase_IsWaitOfFadeout__FP21overlap_request_class = .text:0x8001E794; // type:function size:0x50 scope:local align:4 +fopOvlpReq_phase_WaitOfFadeout__FP21overlap_request_class = .text:0x8001E7E4; // type:function size:0x70 scope:local align:4 +fopOvlpReq_phase_IsComplete__FP21overlap_request_class = .text:0x8001E854; // type:function size:0x50 scope:local align:4 +fopOvlpReq_phase_IsCreated__FP21overlap_request_class = .text:0x8001E8A4; // type:function size:0x60 scope:local align:4 +fopOvlpReq_phase_Create__FP21overlap_request_class = .text:0x8001E904; // type:function size:0x50 scope:local align:4 fopOvlpReq_Request__FP21overlap_request_classsUs = .text:0x8001E954; // type:function size:0x9C scope:global align:4 fopOvlpReq_Handler__FP21overlap_request_class = .text:0x8001E9F0; // type:function size:0x98 scope:global align:4 fopOvlpReq_Cancel__FP21overlap_request_class = .text:0x8001EA88; // type:function size:0x2C scope:global align:4 fopOvlpReq_Is_PeektimeLimit__FP21overlap_request_class = .text:0x8001EAB4; // type:function size:0x10 scope:global align:4 fopOvlpReq_SetPeektime__FP21overlap_request_classUs = .text:0x8001EAC4; // type:function size:0x14 scope:global align:4 fopOvlpReq_OverlapClr__FP21overlap_request_class = .text:0x8001EAD8; // type:function size:0x5C scope:global align:4 -fopScn_Draw__FP11scene_class = .text:0x8001EB34; // type:function size:0x28 scope:global align:4 -fopScn_Execute__FP11scene_class = .text:0x8001EB5C; // type:function size:0x28 scope:global align:4 -fopScn_IsDelete__FPv = .text:0x8001EB84; // type:function size:0x28 scope:global align:4 -fopScn_Delete__FPv = .text:0x8001EBAC; // type:function size:0x54 scope:global align:4 -fopScn_Create__FPv = .text:0x8001EC00; // type:function size:0x74 scope:global align:4 +fopScn_Draw__FP11scene_class = .text:0x8001EB34; // type:function size:0x28 scope:local align:4 +fopScn_Execute__FP11scene_class = .text:0x8001EB5C; // type:function size:0x28 scope:local align:4 +fopScn_IsDelete__FPv = .text:0x8001EB84; // type:function size:0x28 scope:local align:4 +fopScn_Delete__FPv = .text:0x8001EBAC; // type:function size:0x54 scope:local align:4 +fopScn_Create__FPv = .text:0x8001EC00; // type:function size:0x74 scope:local align:4 fopScnIt_Judge__FPFPvPv_PvPv = .text:0x8001EC74; // type:function size:0x3C scope:global align:4 fopScnM_SearchByID__FUi = .text:0x8001ECB0; // type:function size:0x30 scope:global align:4 fopScnM_ChangeReq__FP11scene_classssUs = .text:0x8001ECE0; // type:function size:0x5C scope:global align:4 @@ -693,15 +691,15 @@ fopScnM_CreateReq__FssUsUl = .text:0x8001ED84; // type:function size:0x48 scope: fopScnM_ReRequest__FsUl = .text:0x8001EDCC; // type:function size:0x44 scope:global align:4 fopScnM_Management__Fv = .text:0x8001EE10; // type:function size:0x20 scope:global align:4 fopScnM_Init__Fv = .text:0x8001EE30; // type:function size:0x4 scope:global align:4 -fopScnRq_phase_ClearOverlap__FP19scene_request_class = .text:0x8001EE34; // type:function size:0x30 scope:global align:4 -fopScnRq_phase_Execute__FP19scene_request_class = .text:0x8001EE64; // type:function size:0x20 scope:global align:4 -fopScnRq_phase_IsDoingOverlap__FP19scene_request_class = .text:0x8001EE84; // type:function size:0x30 scope:global align:4 -fopScnRq_phase_IsDoneOverlap__FP19scene_request_class = .text:0x8001EEB4; // type:function size:0x30 scope:global align:4 -fopScnRq_phase_Done__FP19scene_request_class = .text:0x8001EEE4; // type:function size:0x40 scope:global align:4 -fopScnRq_Execute__FP19scene_request_class = .text:0x8001EF24; // type:function size:0x48 scope:global align:4 -fopScnRq_PostMethod__FPvP19scene_request_class = .text:0x8001EF6C; // type:function size:0x44 scope:global align:4 -fopScnRq_Cancel__FP19scene_request_class = .text:0x8001EFB0; // type:function size:0x40 scope:global align:4 -fopScnRq_FadeRequest__FsUs = .text:0x8001EFF0; // type:function size:0x44 scope:global align:4 +fopScnRq_phase_ClearOverlap__FP19scene_request_class = .text:0x8001EE34; // type:function size:0x30 scope:local align:4 +fopScnRq_phase_Execute__FP19scene_request_class = .text:0x8001EE64; // type:function size:0x20 scope:local align:4 +fopScnRq_phase_IsDoingOverlap__FP19scene_request_class = .text:0x8001EE84; // type:function size:0x30 scope:local align:4 +fopScnRq_phase_IsDoneOverlap__FP19scene_request_class = .text:0x8001EEB4; // type:function size:0x30 scope:local align:4 +fopScnRq_phase_Done__FP19scene_request_class = .text:0x8001EEE4; // type:function size:0x40 scope:local align:4 +fopScnRq_Execute__FP19scene_request_class = .text:0x8001EF24; // type:function size:0x48 scope:local align:4 +fopScnRq_PostMethod__FPvP19scene_request_class = .text:0x8001EF6C; // type:function size:0x44 scope:local align:4 +fopScnRq_Cancel__FP19scene_request_class = .text:0x8001EFB0; // type:function size:0x40 scope:local align:4 +fopScnRq_FadeRequest__FsUs = .text:0x8001EFF0; // type:function size:0x44 scope:local align:4 fopScnRq_Request__FiP11scene_classsPvsUs = .text:0x8001F034; // type:function size:0xC8 scope:global align:4 fopScnRq_ReRequest__FUisPv = .text:0x8001F0FC; // type:function size:0x20 scope:global align:4 fopScnRq_Handler__Fv = .text:0x8001F11C; // type:function size:0x20 scope:global align:4 @@ -713,18 +711,18 @@ fopVw_Execute__FP10view_class = .text:0x8001F1D0; // type:function size:0x28 sco fopVw_IsDelete__FPv = .text:0x8001F1F8; // type:function size:0x28 scope:global align:4 fopVw_Delete__FP10view_class = .text:0x8001F220; // type:function size:0x28 scope:global align:4 fopVw_Create__FPv = .text:0x8001F248; // type:function size:0x3C scope:global align:4 -fopKy_Draw__FPv = .text:0x8001F284; // type:function size:0x3C scope:global align:4 -fopKy_Execute__FPv = .text:0x8001F2C0; // type:function size:0x54 scope:global align:4 -fopKy_IsDelete__FPv = .text:0x8001F314; // type:function size:0x54 scope:global align:4 -fopKy_Delete__FPv = .text:0x8001F368; // type:function size:0x4C scope:global align:4 -fopKy_Create__FPv = .text:0x8001F3B4; // type:function size:0xD4 scope:global align:4 -fopMsg_Draw__FPv = .text:0x8001F488; // type:function size:0x28 scope:global align:4 -fopMsg_Execute__FPv = .text:0x8001F4B0; // type:function size:0x38 scope:global align:4 -fopMsg_IsDelete__FPv = .text:0x8001F4E8; // type:function size:0x54 scope:global align:4 -fopMsg_Delete__FPv = .text:0x8001F53C; // type:function size:0x4C scope:global align:4 +fopKy_Draw__FPv = .text:0x8001F284; // type:function size:0x3C scope:local align:4 +fopKy_Execute__FPv = .text:0x8001F2C0; // type:function size:0x54 scope:local align:4 +fopKy_IsDelete__FPv = .text:0x8001F314; // type:function size:0x54 scope:local align:4 +fopKy_Delete__FPv = .text:0x8001F368; // type:function size:0x4C scope:local align:4 +fopKy_Create__FPv = .text:0x8001F3B4; // type:function size:0xD4 scope:local align:4 +fopMsg_Draw__FPv = .text:0x8001F488; // type:function size:0x28 scope:local align:4 +fopMsg_Execute__FPv = .text:0x8001F4B0; // type:function size:0x38 scope:local align:4 +fopMsg_IsDelete__FPv = .text:0x8001F4E8; // type:function size:0x54 scope:local align:4 +fopMsg_Delete__FPv = .text:0x8001F53C; // type:function size:0x4C scope:local align:4 fopMsg_Create__FPv = .text:0x8001F588; // type:function size:0xD8 scope:global align:4 fopKyM_CreateAppend__Fv = .text:0x8001F660; // type:function size:0x58 scope:global align:4 -createAppend__FiP4cXyzP4cXyz = .text:0x8001F6B8; // type:function size:0x90 scope:global align:4 +createAppend__FiP4cXyzP4cXyz = .text:0x8001F6B8; // type:function size:0x90 scope:local align:4 fopKyM_Delete__FPv = .text:0x8001F748; // type:function size:0x20 scope:global align:4 fopKyM_Create__FsPFPv_iPv = .text:0x8001F768; // type:function size:0x50 scope:global align:4 fopKyM_create__FsiP4cXyzP4cXyzPFPv_i = .text:0x8001F7B8; // type:function size:0x60 scope:global align:4 @@ -735,8 +733,8 @@ fopMsgM_setStageLayer__FPv = .text:0x8001F9B4; // type:function size:0x70 scope: fopMsgM_SearchByID__FUi = .text:0x8001FA24; // type:function size:0x20 scope:global align:4 fopMsgM_GetAppend__FPv = .text:0x8001FA44; // type:function size:0x8 scope:global align:4 fopMsgM_Delete__FPv = .text:0x8001FA4C; // type:function size:0x20 scope:global align:4 -createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi = .text:0x8001FA6C; // type:function size:0xE4 scope:global align:4 -createTimerAppend__FiUlUcUcffffUi = .text:0x8001FB50; // type:function size:0xFC scope:global align:4 +createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi = .text:0x8001FA6C; // type:function size:0xE4 scope:local align:4 +createTimerAppend__FiUlUcUcffffUi = .text:0x8001FB50; // type:function size:0xFC scope:local align:4 fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i = .text:0x8001FC4C; // type:function size:0x74 scope:global align:4 fop_Timer_create__FsUcUlUcUcffffPFPv_i = .text:0x8001FCC0; // type:function size:0x74 scope:global align:4 fopMsgM_messageSet__FUlP10fopAc_ac_cUl = .text:0x8001FD34; // type:function size:0x150 scope:global align:4 @@ -747,9 +745,9 @@ fopMsgM_setMessageID__FUi = .text:0x80020100; // type:function size:0x8 scope:gl fopMsgM_Create__FsPFPv_iPv = .text:0x80020108; // type:function size:0x50 scope:global align:4 setAlpha__7J2DPaneFUc = .text:0x80020158; // type:function size:0x8 scope:global align:4 fopMsgM_valueIncrease__FiiUc = .text:0x80020160; // type:function size:0x16C scope:global align:4 -setBlendRatio__10J2DPictureFff = .text:0x800202CC; // type:function size:0x6C scope:global align:4 -append__10J2DPictureFPCcf = .text:0x80020338; // type:function size:0x30 scope:global align:4 -insert__10J2DPictureFPCcUcf = .text:0x80020368; // type:function size:0x34 scope:global align:4 +setBlendRatio__10J2DPictureFff = .text:0x800202CC; // type:function size:0x6C scope:weak align:4 +append__10J2DPictureFPCcf = .text:0x80020338; // type:function size:0x30 scope:weak align:4 +insert__10J2DPictureFPCcUcf = .text:0x80020368; // type:function size:0x34 scope:weak align:4 fopMsgM_createExpHeap__FUlP7JKRHeap = .text:0x8002039C; // type:function size:0x44 scope:global align:4 fopMsgM_destroyExpHeap__FP10JKRExpHeap = .text:0x800203E0; // type:function size:0x20 scope:global align:4 fopDwIt_GetTag__Fv = .text:0x80020400; // type:function size:0x44 scope:global align:4 @@ -916,7 +914,7 @@ fpcLnTg_Move__FP8line_tagi = .text:0x800235A8; // type:function size:0x58 scope: fpcLnTg_QueueTo__FP8line_tag = .text:0x80023600; // type:function size:0x34 scope:global align:4 fpcLnTg_ToQueue__FP8line_tagi = .text:0x80023634; // type:function size:0x58 scope:global align:4 fpcLnTg_Init__FP8line_tagPv = .text:0x8002368C; // type:function size:0x34 scope:global align:4 -fpcLnIt_MethodCall__FP16create_tag_classP13method_filter = .text:0x800236C0; // type:function size:0x68 scope:global align:4 +fpcLnIt_MethodCall__FP16create_tag_classP13method_filter = .text:0x800236C0; // type:function size:0x68 scope:local align:4 fpcLnIt_Queue__FPFPvPv_i = .text:0x80023728; // type:function size:0x3C scope:global align:4 fpcMtdIt_Method__FP15node_list_classPFPv_i = .text:0x80023764; // type:function size:0x24 scope:global align:4 fpcMtdTg_Do__FP24process_method_tag_class = .text:0x80023788; // type:function size:0x30 scope:global align:4 @@ -946,13 +944,13 @@ set__18dStage_nextStage_cFPCcScsScScUc = .text:0x80023E28; // type:function size dStage_SetErrorRoom__Fv = .text:0x80023E94; // type:function size:0x30 scope:global align:4 dStage_SetErrorStage__Fv = .text:0x80023EC4; // type:function size:0x30 scope:global align:4 dStage_GetKeepDoorInfo__Fv = .text:0x80023EF4; // type:function size:0xC scope:global align:4 -dStage_isBossStage__FP11dStage_dt_c = .text:0x80023F00; // type:function size:0x50 scope:global align:4 -dStage_KeepDoorInfoInit__FP11dStage_dt_c = .text:0x80023F50; // type:function size:0x34 scope:global align:4 -dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x80023F84; // type:function size:0xD8 scope:global align:4 +dStage_isBossStage__FP11dStage_dt_c = .text:0x80023F00; // type:function size:0x50 scope:local align:4 +dStage_KeepDoorInfoInit__FP11dStage_dt_c = .text:0x80023F50; // type:function size:0x34 scope:local align:4 +dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x80023F84; // type:function size:0xD8 scope:local align:4 dStage_GetRoomKeepDoorInfo__Fv = .text:0x8002405C; // type:function size:0xC scope:global align:4 -dStage_initRoomKeepDoorInfo__Fv = .text:0x80024068; // type:function size:0x10 scope:global align:4 -dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x80024078; // type:function size:0xFC scope:global align:4 -dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv = .text:0x80024174; // type:function size:0x28 scope:global align:4 +dStage_initRoomKeepDoorInfo__Fv = .text:0x80024068; // type:function size:0x10 scope:local align:4 +dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x80024078; // type:function size:0xFC scope:local align:4 +dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv = .text:0x80024174; // type:function size:0x28 scope:local align:4 set__19dStage_startStage_cFPCcScsSc = .text:0x8002419C; // type:function size:0x4C scope:global align:4 init__20dStage_roomControl_cFv = .text:0x800241E8; // type:function size:0x150 scope:global align:4 initZone__20dStage_roomControl_cFv = .text:0x80024338; // type:function size:0x4C scope:global align:4 @@ -960,12 +958,12 @@ getStatusRoomDt__20dStage_roomControl_cFi = .text:0x80024384; // type:function s getMemoryBlock__20dStage_roomControl_cFi = .text:0x800243B0; // type:function size:0x38 scope:global align:4 setStayNo__20dStage_roomControl_cFi = .text:0x800243E8; // type:function size:0x3C scope:global align:4 setNextStayNo__20dStage_roomControl_cFi = .text:0x80024424; // type:function size:0x8 scope:global align:4 -stayRoomCheck__FiPUci = .text:0x8002442C; // type:function size:0x34 scope:global align:4 -createRoomScene__Fi = .text:0x80024460; // type:function size:0x88 scope:global align:4 +stayRoomCheck__FiPUci = .text:0x8002442C; // type:function size:0x34 scope:local align:4 +createRoomScene__Fi = .text:0x80024460; // type:function size:0x88 scope:local align:4 checkRoomDisp__20dStage_roomControl_cCFi = .text:0x800244E8; // type:function size:0x34 scope:global align:4 loadRoom__20dStage_roomControl_cFiPUcb = .text:0x8002451C; // type:function size:0x200 scope:global align:4 zoneCountCheck__20dStage_roomControl_cCFi = .text:0x8002471C; // type:function size:0x120 scope:global align:4 -getStagInfo__16dStage_stageDt_cCFv = .text:0x8002483C; // type:function size:0x8 scope:global align:4 +getStagInfo__16dStage_stageDt_cCFv = .text:0x8002483C; // type:function size:0x8 scope:weak align:4 createMemoryBlock__20dStage_roomControl_cFiUl = .text:0x80024844; // type:function size:0x64 scope:global align:4 destroyMemoryBlock__20dStage_roomControl_cFv = .text:0x800248A8; // type:function size:0x64 scope:global align:4 setArcBank__20dStage_roomControl_cFiPCc = .text:0x8002490C; // type:function size:0x34 scope:global align:4 @@ -977,81 +975,81 @@ add__Q220dStage_roomControl_c9roomDzs_cFUcUc = .text:0x80024B44; // type:functio init__16dStage_stageDt_cFv = .text:0x80024C1C; // type:function size:0x8C scope:global align:4 initFileList2__15dStage_roomDt_cFv = .text:0x80024CA8; // type:function size:0xC scope:global align:4 init__15dStage_roomDt_cFv = .text:0x80024CB4; // type:function size:0x5C scope:global align:4 -dStage_roomInit__Fi = .text:0x80024D10; // type:function size:0xA0 scope:global align:4 -SetTimePass__20dStage_roomControl_cFi = .text:0x80024DB0; // type:function size:0x8 scope:global align:4 -getRoom__16dStage_stageDt_cCFv = .text:0x80024DB8; // type:function size:0x8 scope:global align:4 +dStage_roomInit__Fi = .text:0x80024D10; // type:function size:0xA0 scope:local align:4 +SetTimePass__20dStage_roomControl_cFi = .text:0x80024DB0; // type:function size:0x8 scope:weak align:4 +getRoom__16dStage_stageDt_cCFv = .text:0x80024DB8; // type:function size:0x8 scope:weak align:4 dStage_searchName__FPCc = .text:0x80024DC0; // type:function size:0x70 scope:global align:4 dStage_getName__FsSc = .text:0x80024E30; // type:function size:0xAC scope:global align:4 dStage_getName2__FsSc = .text:0x80024EDC; // type:function size:0x20 scope:global align:4 -dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class = .text:0x80024EFC; // type:function size:0x9C scope:global align:4 -dStage_cameraCreate__FP24stage_camera2_data_classii = .text:0x80024F98; // type:function size:0x6C scope:global align:4 -getPlayer__15dStage_roomDt_cCFv = .text:0x80025004; // type:function size:0x8 scope:global align:4 -getPlayer__16dStage_stageDt_cCFv = .text:0x8002500C; // type:function size:0x8 scope:global align:4 -dStage_playerInit__FP11dStage_dt_cPviPv = .text:0x80025014; // type:function size:0x2A4 scope:global align:4 -dStage_cameraInit__FP11dStage_dt_cPviPv = .text:0x800252B8; // type:function size:0x50 scope:global align:4 -dStage_RoomCameraInit__FP11dStage_dt_cPviPv = .text:0x80025308; // type:function size:0x34 scope:global align:4 -dStage_arrowInit__FP11dStage_dt_cPviPv = .text:0x8002533C; // type:function size:0x34 scope:global align:4 +dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class = .text:0x80024EFC; // type:function size:0x9C scope:local align:4 +dStage_cameraCreate__FP24stage_camera2_data_classii = .text:0x80024F98; // type:function size:0x6C scope:local align:4 +getPlayer__15dStage_roomDt_cCFv = .text:0x80025004; // type:function size:0x8 scope:weak align:4 +getPlayer__16dStage_stageDt_cCFv = .text:0x8002500C; // type:function size:0x8 scope:weak align:4 +dStage_playerInit__FP11dStage_dt_cPviPv = .text:0x80025014; // type:function size:0x2A4 scope:local align:4 +dStage_cameraInit__FP11dStage_dt_cPviPv = .text:0x800252B8; // type:function size:0x50 scope:local align:4 +dStage_RoomCameraInit__FP11dStage_dt_cPviPv = .text:0x80025308; // type:function size:0x34 scope:local align:4 +dStage_arrowInit__FP11dStage_dt_cPviPv = .text:0x8002533C; // type:function size:0x34 scope:local align:4 getMapInfo2__15dStage_roomDt_cCFi = .text:0x80025370; // type:function size:0x8C scope:global align:4 -getMapInfoBase__15dStage_roomDt_cCFv = .text:0x800253FC; // type:function size:0x8 scope:global align:4 +getMapInfoBase__15dStage_roomDt_cCFv = .text:0x800253FC; // type:function size:0x8 scope:weak align:4 getMapInfo2__16dStage_stageDt_cCFi = .text:0x80025404; // type:function size:0x8C scope:global align:4 -getMapInfoBase__16dStage_stageDt_cCFv = .text:0x80025490; // type:function size:0x8 scope:global align:4 -dStage_paletteInfoInit__FP11dStage_dt_cPviPv = .text:0x80025498; // type:function size:0x34 scope:global align:4 -dStage_pselectInfoInit__FP11dStage_dt_cPviPv = .text:0x800254CC; // type:function size:0x34 scope:global align:4 -dStage_envrInfoInit__FP11dStage_dt_cPviPv = .text:0x80025500; // type:function size:0x34 scope:global align:4 -dStage_filiInfo2Init__FP11dStage_dt_cPviPv = .text:0x80025534; // type:function size:0x38 scope:global align:4 -dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv = .text:0x8002556C; // type:function size:0x20 scope:global align:4 -dStage_filiInfoInit__FP11dStage_dt_cPviPv = .text:0x8002558C; // type:function size:0x54 scope:global align:4 -dStage_vrboxInfoInit__FP11dStage_dt_cPviPv = .text:0x800255E0; // type:function size:0x34 scope:global align:4 -dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv = .text:0x80025614; // type:function size:0x34 scope:global align:4 -dStage_plightInfoInit__FP11dStage_dt_cPviPv = .text:0x80025648; // type:function size:0x64 scope:global align:4 -dStage_lgtvInfoInit__FP11dStage_dt_cPviPv = .text:0x800256AC; // type:function size:0x8C scope:global align:4 +getMapInfoBase__16dStage_stageDt_cCFv = .text:0x80025490; // type:function size:0x8 scope:weak align:4 +dStage_paletteInfoInit__FP11dStage_dt_cPviPv = .text:0x80025498; // type:function size:0x34 scope:local align:4 +dStage_pselectInfoInit__FP11dStage_dt_cPviPv = .text:0x800254CC; // type:function size:0x34 scope:local align:4 +dStage_envrInfoInit__FP11dStage_dt_cPviPv = .text:0x80025500; // type:function size:0x34 scope:local align:4 +dStage_filiInfo2Init__FP11dStage_dt_cPviPv = .text:0x80025534; // type:function size:0x38 scope:local align:4 +dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv = .text:0x8002556C; // type:function size:0x20 scope:local align:4 +dStage_filiInfoInit__FP11dStage_dt_cPviPv = .text:0x8002558C; // type:function size:0x54 scope:local align:4 +dStage_vrboxInfoInit__FP11dStage_dt_cPviPv = .text:0x800255E0; // type:function size:0x34 scope:local align:4 +dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv = .text:0x80025614; // type:function size:0x34 scope:local align:4 +dStage_plightInfoInit__FP11dStage_dt_cPviPv = .text:0x80025648; // type:function size:0x64 scope:local align:4 +dStage_lgtvInfoInit__FP11dStage_dt_cPviPv = .text:0x800256AC; // type:function size:0x8C scope:local align:4 dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi = .text:0x80025738; // type:function size:0xC scope:global align:4 -dStage_stagInfoInit__FP11dStage_dt_cPviPv = .text:0x80025744; // type:function size:0xE8 scope:global align:4 +dStage_stagInfoInit__FP11dStage_dt_cPviPv = .text:0x80025744; // type:function size:0xE8 scope:local align:4 resetOldMulti__16dStage_stageDt_cFv = .text:0x8002582C; // type:function size:0xC scope:global align:4 -dStage_sclsInfoInit__FP11dStage_dt_cPviPv = .text:0x80025838; // type:function size:0x34 scope:global align:4 -dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x8002586C; // type:function size:0xEC scope:global align:4 -dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x80025958; // type:function size:0xE0 scope:global align:4 -dStage_actorInit__FP11dStage_dt_cPviPv = .text:0x80025A38; // type:function size:0xEC scope:global align:4 -dStage_actorInit_always__FP11dStage_dt_cPviPv = .text:0x80025B24; // type:function size:0xD8 scope:global align:4 -dStage_tgscInfoInit__FP11dStage_dt_cPviPv = .text:0x80025BFC; // type:function size:0xE0 scope:global align:4 -dStage_doorInfoInit__FP11dStage_dt_cPviPv = .text:0x80025CDC; // type:function size:0xCC scope:global align:4 -dStage_roomReadInit__FP11dStage_dt_cPviPv = .text:0x80025DA8; // type:function size:0x98 scope:global align:4 +dStage_sclsInfoInit__FP11dStage_dt_cPviPv = .text:0x80025838; // type:function size:0x34 scope:local align:4 +dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x8002586C; // type:function size:0xEC scope:local align:4 +dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x80025958; // type:function size:0xE0 scope:local align:4 +dStage_actorInit__FP11dStage_dt_cPviPv = .text:0x80025A38; // type:function size:0xEC scope:local align:4 +dStage_actorInit_always__FP11dStage_dt_cPviPv = .text:0x80025B24; // type:function size:0xD8 scope:local align:4 +dStage_tgscInfoInit__FP11dStage_dt_cPviPv = .text:0x80025BFC; // type:function size:0xE0 scope:local align:4 +dStage_doorInfoInit__FP11dStage_dt_cPviPv = .text:0x80025CDC; // type:function size:0xCC scope:local align:4 +dStage_roomReadInit__FP11dStage_dt_cPviPv = .text:0x80025DA8; // type:function size:0x98 scope:local align:4 dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi = .text:0x80025E40; // type:function size:0x30 scope:global align:4 -dStage_ppntInfoInit__FP11dStage_dt_cPviPv = .text:0x80025E70; // type:function size:0x34 scope:global align:4 -dStage_pathInfoInit__FP11dStage_dt_cPviPv = .text:0x80025EA4; // type:function size:0xA0 scope:global align:4 -dStage_rppnInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F44; // type:function size:0x34 scope:global align:4 -dStage_rpatInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F78; // type:function size:0xA0 scope:global align:4 -dStage_soundInfoInit__FP11dStage_dt_cPviPv = .text:0x80026018; // type:function size:0x34 scope:global align:4 -dStage_soundInfoInitCL__FP11dStage_dt_cPviPv = .text:0x8002604C; // type:function size:0x34 scope:global align:4 -dStage_setLayerTagName__FP9FuncTableii = .text:0x80026080; // type:function size:0x34 scope:global align:4 -dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei = .text:0x800260B4; // type:function size:0xC8 scope:global align:4 -dStage_stEventInfoInit__FP11dStage_dt_cPviPv = .text:0x8002617C; // type:function size:0x34 scope:global align:4 -dStage_mapEventInfoInit__FP11dStage_dt_cPviPv = .text:0x800261B0; // type:function size:0x34 scope:global align:4 -dStage_floorInfoInit__FP11dStage_dt_cPviPv = .text:0x800261E4; // type:function size:0x34 scope:global align:4 -dStage_memaInfoInit__FP11dStage_dt_cPviPv = .text:0x80026218; // type:function size:0x80 scope:global align:4 -dStage_mecoInfoInit__FP11dStage_dt_cPviPv = .text:0x80026298; // type:function size:0x84 scope:global align:4 -dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv = .text:0x8002631C; // type:function size:0x30 scope:global align:4 -dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv = .text:0x8002634C; // type:function size:0x10 scope:global align:4 -dStage_dt_c_offsetToPtr__FPv = .text:0x8002635C; // type:function size:0x44 scope:global align:4 -dStage_mapPathInit__FP11dStage_dt_cPviPv = .text:0x800263A0; // type:function size:0x30 scope:global align:4 -dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv = .text:0x800263D0; // type:function size:0x30 scope:global align:4 -dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv = .text:0x80026400; // type:function size:0x5C scope:global align:4 -readMult__FP11dStage_dt_cP14dStage_Multi_cb = .text:0x8002645C; // type:function size:0x180 scope:global align:4 -dStage_multInfoInit__FP11dStage_dt_cPviPv = .text:0x800265DC; // type:function size:0x94 scope:global align:4 -dStage_lbnkInfoInit__FP11dStage_dt_cPviPv = .text:0x80026670; // type:function size:0x34 scope:global align:4 -dStage_roomTresureInit__FP11dStage_dt_cPviPv = .text:0x800266A4; // type:function size:0x68 scope:global align:4 -dStage_layerTresureInit__FP11dStage_dt_cPviPv = .text:0x8002670C; // type:function size:0x24 scope:global align:4 -dStage_dmapInfoInit__FP11dStage_dt_cPviPv = .text:0x80026730; // type:function size:0x34 scope:global align:4 -dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x80026764; // type:function size:0x78 scope:global align:4 -dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x800267DC; // type:function size:0x68 scope:global align:4 -dStage_elstInfoInit__FP11dStage_dt_cPviPv = .text:0x80026844; // type:function size:0x54 scope:global align:4 -dKankyo_create__Fv = .text:0x80026898; // type:function size:0x7C scope:global align:4 -layerMemoryInfoLoader__FPvP11dStage_dt_ci = .text:0x80026914; // type:function size:0x2C scope:global align:4 -dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c = .text:0x80026940; // type:function size:0x74 scope:global align:4 -layerTableLoader__FPvP11dStage_dt_ci = .text:0x800269B4; // type:function size:0x134 scope:global align:4 +dStage_ppntInfoInit__FP11dStage_dt_cPviPv = .text:0x80025E70; // type:function size:0x34 scope:local align:4 +dStage_pathInfoInit__FP11dStage_dt_cPviPv = .text:0x80025EA4; // type:function size:0xA0 scope:local align:4 +dStage_rppnInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F44; // type:function size:0x34 scope:local align:4 +dStage_rpatInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F78; // type:function size:0xA0 scope:local align:4 +dStage_soundInfoInit__FP11dStage_dt_cPviPv = .text:0x80026018; // type:function size:0x34 scope:local align:4 +dStage_soundInfoInitCL__FP11dStage_dt_cPviPv = .text:0x8002604C; // type:function size:0x34 scope:local align:4 +dStage_setLayerTagName__FP9FuncTableii = .text:0x80026080; // type:function size:0x34 scope:local align:4 +dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei = .text:0x800260B4; // type:function size:0xC8 scope:local align:4 +dStage_stEventInfoInit__FP11dStage_dt_cPviPv = .text:0x8002617C; // type:function size:0x34 scope:local align:4 +dStage_mapEventInfoInit__FP11dStage_dt_cPviPv = .text:0x800261B0; // type:function size:0x34 scope:local align:4 +dStage_floorInfoInit__FP11dStage_dt_cPviPv = .text:0x800261E4; // type:function size:0x34 scope:local align:4 +dStage_memaInfoInit__FP11dStage_dt_cPviPv = .text:0x80026218; // type:function size:0x80 scope:local align:4 +dStage_mecoInfoInit__FP11dStage_dt_cPviPv = .text:0x80026298; // type:function size:0x84 scope:local align:4 +dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv = .text:0x8002631C; // type:function size:0x30 scope:local align:4 +dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv = .text:0x8002634C; // type:function size:0x10 scope:local align:4 +dStage_dt_c_offsetToPtr__FPv = .text:0x8002635C; // type:function size:0x44 scope:local align:4 +dStage_mapPathInit__FP11dStage_dt_cPviPv = .text:0x800263A0; // type:function size:0x30 scope:local align:4 +dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv = .text:0x800263D0; // type:function size:0x30 scope:local align:4 +dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv = .text:0x80026400; // type:function size:0x5C scope:local align:4 +readMult__FP11dStage_dt_cP14dStage_Multi_cb = .text:0x8002645C; // type:function size:0x180 scope:local align:4 +dStage_multInfoInit__FP11dStage_dt_cPviPv = .text:0x800265DC; // type:function size:0x94 scope:local align:4 +dStage_lbnkInfoInit__FP11dStage_dt_cPviPv = .text:0x80026670; // type:function size:0x34 scope:local align:4 +dStage_roomTresureInit__FP11dStage_dt_cPviPv = .text:0x800266A4; // type:function size:0x68 scope:local align:4 +dStage_layerTresureInit__FP11dStage_dt_cPviPv = .text:0x8002670C; // type:function size:0x24 scope:local align:4 +dStage_dmapInfoInit__FP11dStage_dt_cPviPv = .text:0x80026730; // type:function size:0x34 scope:local align:4 +dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x80026764; // type:function size:0x78 scope:local align:4 +dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x800267DC; // type:function size:0x68 scope:local align:4 +dStage_elstInfoInit__FP11dStage_dt_cPviPv = .text:0x80026844; // type:function size:0x54 scope:local align:4 +dKankyo_create__Fv = .text:0x80026898; // type:function size:0x7C scope:local align:4 +layerMemoryInfoLoader__FPvP11dStage_dt_ci = .text:0x80026914; // type:function size:0x2C scope:local align:4 +dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c = .text:0x80026940; // type:function size:0x74 scope:local align:4 +layerTableLoader__FPvP11dStage_dt_ci = .text:0x800269B4; // type:function size:0x134 scope:local align:4 getElst__16dStage_stageDt_cFv = .text:0x80026AE8; // type:function size:0x8 scope:global align:4 -layerActorLoader__FPvP11dStage_dt_ci = .text:0x80026AF0; // type:function size:0x68 scope:global align:4 -dStage_dt_c_stageLoader__FPvP11dStage_dt_c = .text:0x80026B58; // type:function size:0x64 scope:global align:4 +layerActorLoader__FPvP11dStage_dt_ci = .text:0x80026AF0; // type:function size:0x68 scope:local align:4 +dStage_dt_c_stageLoader__FPvP11dStage_dt_c = .text:0x80026B58; // type:function size:0x64 scope:local align:4 dStage_dt_c_roomLoader__FPvP11dStage_dt_ci = .text:0x80026BBC; // type:function size:0x78 scope:global align:4 dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci = .text:0x80026C34; // type:function size:0x58 scope:global align:4 dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c = .text:0x80026C8C; // type:function size:0x50 scope:global align:4 @@ -1062,183 +1060,183 @@ setOldMulti__16dStage_stageDt_cFv = .text:0x80026FDC; // type:function size:0xC dStage_RoomCheck__FP11cBgS_GndChk = .text:0x80026FE8; // type:function size:0x114 scope:global align:4 dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs = .text:0x800270FC; // type:function size:0x74 scope:global align:4 dStage_changeScene__FifUlScsi = .text:0x80027170; // type:function size:0x170 scope:global align:4 -getSclsInfo__15dStage_roomDt_cCFv = .text:0x800272E0; // type:function size:0x8 scope:global align:4 -getSclsInfo__16dStage_stageDt_cCFv = .text:0x800272E8; // type:function size:0x8 scope:global align:4 +getSclsInfo__15dStage_roomDt_cCFv = .text:0x800272E0; // type:function size:0x8 scope:weak align:4 +getSclsInfo__16dStage_stageDt_cCFv = .text:0x800272E8; // type:function size:0x8 scope:weak align:4 dStage_changeScene4Event__FiScibfUlsi = .text:0x800272F0; // type:function size:0x1C0 scope:global align:4 dStage_restartRoom__FUlUli = .text:0x800274B0; // type:function size:0x74 scope:global align:4 -setCamera__15dStage_roomDt_cFP18stage_camera_class = .text:0x80027524; // type:function size:0x8 scope:global align:4 -getCamera__15dStage_roomDt_cCFv = .text:0x8002752C; // type:function size:0x8 scope:global align:4 -setArrow__15dStage_roomDt_cFP17stage_arrow_class = .text:0x80027534; // type:function size:0x8 scope:global align:4 -getArrow__15dStage_roomDt_cCFv = .text:0x8002753C; // type:function size:0x8 scope:global align:4 -setPlayer__15dStage_roomDt_cFP17stage_actor_class = .text:0x80027544; // type:function size:0x8 scope:global align:4 -setPlayerNum__15dStage_roomDt_cFUs = .text:0x8002754C; // type:function size:0x8 scope:global align:4 -getPlayerNum__15dStage_roomDt_cCFv = .text:0x80027554; // type:function size:0x8 scope:global align:4 -setRoom__15dStage_roomDt_cFP14roomRead_class = .text:0x8002755C; // type:function size:0x34 scope:global align:4 -getRoom__15dStage_roomDt_cCFv = .text:0x80027590; // type:function size:0x34 scope:global align:4 -setMapInfo__15dStage_roomDt_cFP20stage_map_info_class = .text:0x800275C4; // type:function size:0x8 scope:global align:4 -getMapInfo__15dStage_roomDt_cCFv = .text:0x800275CC; // type:function size:0x8 scope:global align:4 -setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class = .text:0x800275D4; // type:function size:0x8 scope:global align:4 -setPaletteInfo__15dStage_roomDt_cFP24stage_palette_info_class = .text:0x800275DC; // type:function size:0x34 scope:global align:4 -getPaletteInfo__15dStage_roomDt_cCFv = .text:0x80027610; // type:function size:0x34 scope:global align:4 -setPselectInfo__15dStage_roomDt_cFP24stage_pselect_info_class = .text:0x80027644; // type:function size:0x34 scope:global align:4 -getPselectInfo__15dStage_roomDt_cCFv = .text:0x80027678; // type:function size:0x34 scope:global align:4 -setEnvrInfo__15dStage_roomDt_cFP21stage_envr_info_class = .text:0x800276AC; // type:function size:0x34 scope:global align:4 -getEnvrInfo__15dStage_roomDt_cCFv = .text:0x800276E0; // type:function size:0x34 scope:global align:4 -setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class = .text:0x80027714; // type:function size:0x8 scope:global align:4 -getVrboxInfo__15dStage_roomDt_cCFv = .text:0x8002771C; // type:function size:0x8 scope:global align:4 -setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class = .text:0x80027724; // type:function size:0x8 scope:global align:4 -getVrboxcolInfo__15dStage_roomDt_cCFv = .text:0x8002772C; // type:function size:0x8 scope:global align:4 -setPlightInfo__15dStage_roomDt_cFP23stage_plight_info_class = .text:0x80027734; // type:function size:0x34 scope:global align:4 -getPlightInfo__15dStage_roomDt_cCFv = .text:0x80027768; // type:function size:0x34 scope:global align:4 -setPaletteNumInfo__15dStage_roomDt_cFi = .text:0x8002779C; // type:function size:0x34 scope:global align:4 -getPaletteNumInfo__15dStage_roomDt_cCFv = .text:0x800277D0; // type:function size:0x34 scope:global align:4 -setPselectNumInfo__15dStage_roomDt_cFi = .text:0x80027804; // type:function size:0x34 scope:global align:4 -getPselectNumInfo__15dStage_roomDt_cCFv = .text:0x80027838; // type:function size:0x34 scope:global align:4 -setEnvrNumInfo__15dStage_roomDt_cFi = .text:0x8002786C; // type:function size:0x34 scope:global align:4 -getEnvrNumInfo__15dStage_roomDt_cCFv = .text:0x800278A0; // type:function size:0x34 scope:global align:4 -setVrboxNumInfo__15dStage_roomDt_cFi = .text:0x800278D4; // type:function size:0x8 scope:global align:4 -getVrboxNumInfo__15dStage_roomDt_cCFv = .text:0x800278DC; // type:function size:0x8 scope:global align:4 -setVrboxcolNumInfo__15dStage_roomDt_cFi = .text:0x800278E4; // type:function size:0x8 scope:global align:4 -getVrboxcolNumInfo__15dStage_roomDt_cCFv = .text:0x800278EC; // type:function size:0x8 scope:global align:4 -setPlightNumInfo__15dStage_roomDt_cFi = .text:0x800278F4; // type:function size:0x34 scope:global align:4 -getPlightNumInfo__15dStage_roomDt_cCFv = .text:0x80027928; // type:function size:0x34 scope:global align:4 -setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class = .text:0x8002795C; // type:function size:0x8 scope:global align:4 -getLightVecInfo__15dStage_roomDt_cCFv = .text:0x80027964; // type:function size:0x8 scope:global align:4 -setLightVecInfoNum__15dStage_roomDt_cFi = .text:0x8002796C; // type:function size:0x8 scope:global align:4 -getLightVecInfoNum__15dStage_roomDt_cCFv = .text:0x80027974; // type:function size:0x8 scope:global align:4 -setStagInfo__15dStage_roomDt_cFP21stage_stag_info_class = .text:0x8002797C; // type:function size:0x34 scope:global align:4 -getStagInfo__15dStage_roomDt_cCFv = .text:0x800279B0; // type:function size:0x34 scope:global align:4 -setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class = .text:0x800279E4; // type:function size:0x8 scope:global align:4 -setPntInfo__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x800279EC; // type:function size:0x34 scope:global align:4 -getPntInf__15dStage_roomDt_cCFv = .text:0x80027A20; // type:function size:0x34 scope:global align:4 -setPathInfo__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027A54; // type:function size:0x34 scope:global align:4 -getPathInf__15dStage_roomDt_cCFv = .text:0x80027A88; // type:function size:0x34 scope:global align:4 -setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x80027ABC; // type:function size:0x8 scope:global align:4 -getPnt2Inf__15dStage_roomDt_cCFv = .text:0x80027AC4; // type:function size:0x8 scope:global align:4 -setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027ACC; // type:function size:0x8 scope:global align:4 -getPath2Inf__15dStage_roomDt_cCFv = .text:0x80027AD4; // type:function size:0x8 scope:global align:4 -setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027ADC; // type:function size:0x8 scope:global align:4 -getSoundInf__15dStage_roomDt_cCFv = .text:0x80027AE4; // type:function size:0x8 scope:global align:4 -setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027AEC; // type:function size:0x8 scope:global align:4 -getSoundInfCL__15dStage_roomDt_cCFv = .text:0x80027AF4; // type:function size:0x8 scope:global align:4 -setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c = .text:0x80027AFC; // type:function size:0x8 scope:global align:4 -getMapEventInfo__15dStage_roomDt_cCFv = .text:0x80027B04; // type:function size:0x8 scope:global align:4 -setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c = .text:0x80027B0C; // type:function size:0x8 scope:global align:4 -getFileList2Info__15dStage_roomDt_cCFv = .text:0x80027B14; // type:function size:0x8 scope:global align:4 -setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c = .text:0x80027B1C; // type:function size:0x8 scope:global align:4 -setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c = .text:0x80027B24; // type:function size:0x8 scope:global align:4 -getFloorInfo__15dStage_roomDt_cCFv = .text:0x80027B2C; // type:function size:0x8 scope:global align:4 -setMemoryConfig__15dStage_roomDt_cFP21dStage_MemoryConfig_c = .text:0x80027B34; // type:function size:0x30 scope:global align:4 -getMemoryConfig__15dStage_roomDt_cCFv = .text:0x80027B64; // type:function size:0x34 scope:global align:4 -setMemoryMap__15dStage_roomDt_cFP18dStage_MemoryMap_c = .text:0x80027B98; // type:function size:0x30 scope:global align:4 -getMemoryMap__15dStage_roomDt_cCFv = .text:0x80027BC8; // type:function size:0x34 scope:global align:4 -setMulti__15dStage_roomDt_cFP14dStage_Multi_c = .text:0x80027BFC; // type:function size:0x30 scope:global align:4 -getMulti__15dStage_roomDt_cCFv = .text:0x80027C2C; // type:function size:0x34 scope:global align:4 -setOldMulti__15dStage_roomDt_cFv = .text:0x80027C60; // type:function size:0x30 scope:global align:4 -resetOldMulti__15dStage_roomDt_cFv = .text:0x80027C90; // type:function size:0x30 scope:global align:4 -getOldMulti__15dStage_roomDt_cCFv = .text:0x80027CC0; // type:function size:0x34 scope:global align:4 -setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c = .text:0x80027CF4; // type:function size:0x8 scope:global align:4 -getLbnk__15dStage_roomDt_cCFv = .text:0x80027CFC; // type:function size:0x8 scope:global align:4 -setTresure__15dStage_roomDt_cFP19stage_tresure_class = .text:0x80027D04; // type:function size:0x8 scope:global align:4 -getTresure__15dStage_roomDt_cCFv = .text:0x80027D0C; // type:function size:0x8 scope:global align:4 -setDMap__15dStage_roomDt_cFP13dStage_DMap_c = .text:0x80027D14; // type:function size:0x4 scope:global align:4 -getDMap__15dStage_roomDt_cCFv = .text:0x80027D18; // type:function size:0x8 scope:global align:4 -setDrTg__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027D20; // type:function size:0x8 scope:global align:4 -getDrTg__15dStage_roomDt_cCFv = .text:0x80027D28; // type:function size:0x8 scope:global align:4 -setDoor__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027D30; // type:function size:0x8 scope:global align:4 -getDoor__15dStage_roomDt_cCFv = .text:0x80027D38; // type:function size:0x8 scope:global align:4 -setMapPath__15dStage_roomDt_cFPv = .text:0x80027D40; // type:function size:0x30 scope:global align:4 -getMapPath__15dStage_roomDt_cFv = .text:0x80027D70; // type:function size:0x34 scope:global align:4 -setElst__15dStage_roomDt_cFP13dStage_Elst_c = .text:0x80027DA4; // type:function size:0x34 scope:global align:4 -getElst__15dStage_roomDt_cFv = .text:0x80027DD8; // type:function size:0x38 scope:global align:4 -setCamera__16dStage_stageDt_cFP18stage_camera_class = .text:0x80027E10; // type:function size:0x8 scope:global align:4 -getCamera__16dStage_stageDt_cCFv = .text:0x80027E18; // type:function size:0x8 scope:global align:4 -setArrow__16dStage_stageDt_cFP17stage_arrow_class = .text:0x80027E20; // type:function size:0x8 scope:global align:4 -getArrow__16dStage_stageDt_cCFv = .text:0x80027E28; // type:function size:0x8 scope:global align:4 -setPlayer__16dStage_stageDt_cFP17stage_actor_class = .text:0x80027E30; // type:function size:0x8 scope:global align:4 -setPlayerNum__16dStage_stageDt_cFUs = .text:0x80027E38; // type:function size:0x8 scope:global align:4 -getPlayerNum__16dStage_stageDt_cCFv = .text:0x80027E40; // type:function size:0x8 scope:global align:4 -setRoom__16dStage_stageDt_cFP14roomRead_class = .text:0x80027E48; // type:function size:0x8 scope:global align:4 -setMapInfo__16dStage_stageDt_cFP20stage_map_info_class = .text:0x80027E50; // type:function size:0x8 scope:global align:4 -getMapInfo__16dStage_stageDt_cCFv = .text:0x80027E58; // type:function size:0x8 scope:global align:4 -setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class = .text:0x80027E60; // type:function size:0x8 scope:global align:4 -setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class = .text:0x80027E68; // type:function size:0x8 scope:global align:4 -getPaletteInfo__16dStage_stageDt_cCFv = .text:0x80027E70; // type:function size:0x8 scope:global align:4 -setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class = .text:0x80027E78; // type:function size:0x8 scope:global align:4 -getPselectInfo__16dStage_stageDt_cCFv = .text:0x80027E80; // type:function size:0x8 scope:global align:4 -setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class = .text:0x80027E88; // type:function size:0x8 scope:global align:4 -getEnvrInfo__16dStage_stageDt_cCFv = .text:0x80027E90; // type:function size:0x8 scope:global align:4 -setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class = .text:0x80027E98; // type:function size:0x8 scope:global align:4 -getVrboxInfo__16dStage_stageDt_cCFv = .text:0x80027EA0; // type:function size:0x8 scope:global align:4 -setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class = .text:0x80027EA8; // type:function size:0x8 scope:global align:4 -getVrboxcolInfo__16dStage_stageDt_cCFv = .text:0x80027EB0; // type:function size:0x8 scope:global align:4 -setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class = .text:0x80027EB8; // type:function size:0x8 scope:global align:4 -getPlightInfo__16dStage_stageDt_cCFv = .text:0x80027EC0; // type:function size:0x8 scope:global align:4 -setPaletteNumInfo__16dStage_stageDt_cFi = .text:0x80027EC8; // type:function size:0x8 scope:global align:4 -getPaletteNumInfo__16dStage_stageDt_cCFv = .text:0x80027ED0; // type:function size:0x8 scope:global align:4 -setPselectNumInfo__16dStage_stageDt_cFi = .text:0x80027ED8; // type:function size:0x8 scope:global align:4 -getPselectNumInfo__16dStage_stageDt_cCFv = .text:0x80027EE0; // type:function size:0x8 scope:global align:4 -setEnvrNumInfo__16dStage_stageDt_cFi = .text:0x80027EE8; // type:function size:0x8 scope:global align:4 -getEnvrNumInfo__16dStage_stageDt_cCFv = .text:0x80027EF0; // type:function size:0x8 scope:global align:4 -setVrboxNumInfo__16dStage_stageDt_cFi = .text:0x80027EF8; // type:function size:0x8 scope:global align:4 -getVrboxNumInfo__16dStage_stageDt_cCFv = .text:0x80027F00; // type:function size:0x8 scope:global align:4 -setVrboxcolNumInfo__16dStage_stageDt_cFi = .text:0x80027F08; // type:function size:0x8 scope:global align:4 -getVrboxcolNumInfo__16dStage_stageDt_cCFv = .text:0x80027F10; // type:function size:0x8 scope:global align:4 -setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class = .text:0x80027F18; // type:function size:0x34 scope:global align:4 -getLightVecInfo__16dStage_stageDt_cCFv = .text:0x80027F4C; // type:function size:0x34 scope:global align:4 -setLightVecInfoNum__16dStage_stageDt_cFi = .text:0x80027F80; // type:function size:0x34 scope:global align:4 -getLightVecInfoNum__16dStage_stageDt_cCFv = .text:0x80027FB4; // type:function size:0x34 scope:global align:4 -setPlightNumInfo__16dStage_stageDt_cFi = .text:0x80027FE8; // type:function size:0x8 scope:global align:4 -getPlightNumInfo__16dStage_stageDt_cCFv = .text:0x80027FF0; // type:function size:0x8 scope:global align:4 -setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class = .text:0x80027FF8; // type:function size:0x8 scope:global align:4 -setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class = .text:0x80028000; // type:function size:0x8 scope:global align:4 -setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x80028008; // type:function size:0x8 scope:global align:4 -getPntInf__16dStage_stageDt_cCFv = .text:0x80028010; // type:function size:0x8 scope:global align:4 -setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x80028018; // type:function size:0x8 scope:global align:4 -getPathInf__16dStage_stageDt_cCFv = .text:0x80028020; // type:function size:0x8 scope:global align:4 -setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x80028028; // type:function size:0x8 scope:global align:4 -getPnt2Inf__16dStage_stageDt_cCFv = .text:0x80028030; // type:function size:0x8 scope:global align:4 -setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x80028038; // type:function size:0x8 scope:global align:4 -getPath2Inf__16dStage_stageDt_cCFv = .text:0x80028040; // type:function size:0x8 scope:global align:4 -setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x80028048; // type:function size:0x8 scope:global align:4 -getSoundInf__16dStage_stageDt_cCFv = .text:0x80028050; // type:function size:0x8 scope:global align:4 -setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x80028058; // type:function size:0x8 scope:global align:4 -getSoundInfCL__16dStage_stageDt_cCFv = .text:0x80028060; // type:function size:0x8 scope:global align:4 -setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c = .text:0x80028068; // type:function size:0x8 scope:global align:4 -getMapEventInfo__16dStage_stageDt_cCFv = .text:0x80028070; // type:function size:0x8 scope:global align:4 -setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c = .text:0x80028078; // type:function size:0x34 scope:global align:4 -getFileList2Info__16dStage_stageDt_cCFv = .text:0x800280AC; // type:function size:0x34 scope:global align:4 -setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c = .text:0x800280E0; // type:function size:0x34 scope:global align:4 -getFileListInfo__16dStage_stageDt_cCFv = .text:0x80028114; // type:function size:0x34 scope:global align:4 -setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c = .text:0x80028148; // type:function size:0x8 scope:global align:4 -getFloorInfo__16dStage_stageDt_cCFv = .text:0x80028150; // type:function size:0x8 scope:global align:4 -setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c = .text:0x80028158; // type:function size:0x8 scope:global align:4 -getMemoryConfig__16dStage_stageDt_cCFv = .text:0x80028160; // type:function size:0x8 scope:global align:4 -setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c = .text:0x80028168; // type:function size:0x8 scope:global align:4 -getMemoryMap__16dStage_stageDt_cCFv = .text:0x80028170; // type:function size:0x8 scope:global align:4 -setMulti__16dStage_stageDt_cFP14dStage_Multi_c = .text:0x80028178; // type:function size:0x8 scope:global align:4 -getMulti__16dStage_stageDt_cCFv = .text:0x80028180; // type:function size:0x8 scope:global align:4 -getOldMulti__16dStage_stageDt_cCFv = .text:0x80028188; // type:function size:0x8 scope:global align:4 -setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c = .text:0x80028190; // type:function size:0x34 scope:global align:4 -getLbnk__16dStage_stageDt_cCFv = .text:0x800281C4; // type:function size:0x34 scope:global align:4 -setTresure__16dStage_stageDt_cFP19stage_tresure_class = .text:0x800281F8; // type:function size:0x8 scope:global align:4 -getTresure__16dStage_stageDt_cCFv = .text:0x80028200; // type:function size:0x8 scope:global align:4 -setDMap__16dStage_stageDt_cFP13dStage_DMap_c = .text:0x80028208; // type:function size:0x8 scope:global align:4 -getDMap__16dStage_stageDt_cCFv = .text:0x80028210; // type:function size:0x8 scope:global align:4 -setDrTg__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x80028218; // type:function size:0x8 scope:global align:4 -getDrTg__16dStage_stageDt_cCFv = .text:0x80028220; // type:function size:0x8 scope:global align:4 -setDoor__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x80028228; // type:function size:0x8 scope:global align:4 -getDoor__16dStage_stageDt_cCFv = .text:0x80028230; // type:function size:0x8 scope:global align:4 -setMapPath__16dStage_stageDt_cFPv = .text:0x80028238; // type:function size:0x4 scope:global align:4 -getMapPath__16dStage_stageDt_cFv = .text:0x8002823C; // type:function size:0x8 scope:global align:4 -setElst__16dStage_stageDt_cFP13dStage_Elst_c = .text:0x80028244; // type:function size:0x8 scope:global align:4 +setCamera__15dStage_roomDt_cFP18stage_camera_class = .text:0x80027524; // type:function size:0x8 scope:weak align:4 +getCamera__15dStage_roomDt_cCFv = .text:0x8002752C; // type:function size:0x8 scope:weak align:4 +setArrow__15dStage_roomDt_cFP17stage_arrow_class = .text:0x80027534; // type:function size:0x8 scope:weak align:4 +getArrow__15dStage_roomDt_cCFv = .text:0x8002753C; // type:function size:0x8 scope:weak align:4 +setPlayer__15dStage_roomDt_cFP17stage_actor_class = .text:0x80027544; // type:function size:0x8 scope:weak align:4 +setPlayerNum__15dStage_roomDt_cFUs = .text:0x8002754C; // type:function size:0x8 scope:weak align:4 +getPlayerNum__15dStage_roomDt_cCFv = .text:0x80027554; // type:function size:0x8 scope:weak align:4 +setRoom__15dStage_roomDt_cFP14roomRead_class = .text:0x8002755C; // type:function size:0x34 scope:weak align:4 +getRoom__15dStage_roomDt_cCFv = .text:0x80027590; // type:function size:0x34 scope:weak align:4 +setMapInfo__15dStage_roomDt_cFP20stage_map_info_class = .text:0x800275C4; // type:function size:0x8 scope:weak align:4 +getMapInfo__15dStage_roomDt_cCFv = .text:0x800275CC; // type:function size:0x8 scope:weak align:4 +setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class = .text:0x800275D4; // type:function size:0x8 scope:weak align:4 +setPaletteInfo__15dStage_roomDt_cFP24stage_palette_info_class = .text:0x800275DC; // type:function size:0x34 scope:weak align:4 +getPaletteInfo__15dStage_roomDt_cCFv = .text:0x80027610; // type:function size:0x34 scope:weak align:4 +setPselectInfo__15dStage_roomDt_cFP24stage_pselect_info_class = .text:0x80027644; // type:function size:0x34 scope:weak align:4 +getPselectInfo__15dStage_roomDt_cCFv = .text:0x80027678; // type:function size:0x34 scope:weak align:4 +setEnvrInfo__15dStage_roomDt_cFP21stage_envr_info_class = .text:0x800276AC; // type:function size:0x34 scope:weak align:4 +getEnvrInfo__15dStage_roomDt_cCFv = .text:0x800276E0; // type:function size:0x34 scope:weak align:4 +setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class = .text:0x80027714; // type:function size:0x8 scope:weak align:4 +getVrboxInfo__15dStage_roomDt_cCFv = .text:0x8002771C; // type:function size:0x8 scope:weak align:4 +setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class = .text:0x80027724; // type:function size:0x8 scope:weak align:4 +getVrboxcolInfo__15dStage_roomDt_cCFv = .text:0x8002772C; // type:function size:0x8 scope:weak align:4 +setPlightInfo__15dStage_roomDt_cFP23stage_plight_info_class = .text:0x80027734; // type:function size:0x34 scope:weak align:4 +getPlightInfo__15dStage_roomDt_cCFv = .text:0x80027768; // type:function size:0x34 scope:weak align:4 +setPaletteNumInfo__15dStage_roomDt_cFi = .text:0x8002779C; // type:function size:0x34 scope:weak align:4 +getPaletteNumInfo__15dStage_roomDt_cCFv = .text:0x800277D0; // type:function size:0x34 scope:weak align:4 +setPselectNumInfo__15dStage_roomDt_cFi = .text:0x80027804; // type:function size:0x34 scope:weak align:4 +getPselectNumInfo__15dStage_roomDt_cCFv = .text:0x80027838; // type:function size:0x34 scope:weak align:4 +setEnvrNumInfo__15dStage_roomDt_cFi = .text:0x8002786C; // type:function size:0x34 scope:weak align:4 +getEnvrNumInfo__15dStage_roomDt_cCFv = .text:0x800278A0; // type:function size:0x34 scope:weak align:4 +setVrboxNumInfo__15dStage_roomDt_cFi = .text:0x800278D4; // type:function size:0x8 scope:weak align:4 +getVrboxNumInfo__15dStage_roomDt_cCFv = .text:0x800278DC; // type:function size:0x8 scope:weak align:4 +setVrboxcolNumInfo__15dStage_roomDt_cFi = .text:0x800278E4; // type:function size:0x8 scope:weak align:4 +getVrboxcolNumInfo__15dStage_roomDt_cCFv = .text:0x800278EC; // type:function size:0x8 scope:weak align:4 +setPlightNumInfo__15dStage_roomDt_cFi = .text:0x800278F4; // type:function size:0x34 scope:weak align:4 +getPlightNumInfo__15dStage_roomDt_cCFv = .text:0x80027928; // type:function size:0x34 scope:weak align:4 +setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class = .text:0x8002795C; // type:function size:0x8 scope:weak align:4 +getLightVecInfo__15dStage_roomDt_cCFv = .text:0x80027964; // type:function size:0x8 scope:weak align:4 +setLightVecInfoNum__15dStage_roomDt_cFi = .text:0x8002796C; // type:function size:0x8 scope:weak align:4 +getLightVecInfoNum__15dStage_roomDt_cCFv = .text:0x80027974; // type:function size:0x8 scope:weak align:4 +setStagInfo__15dStage_roomDt_cFP21stage_stag_info_class = .text:0x8002797C; // type:function size:0x34 scope:weak align:4 +getStagInfo__15dStage_roomDt_cCFv = .text:0x800279B0; // type:function size:0x34 scope:weak align:4 +setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class = .text:0x800279E4; // type:function size:0x8 scope:weak align:4 +setPntInfo__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x800279EC; // type:function size:0x34 scope:weak align:4 +getPntInf__15dStage_roomDt_cCFv = .text:0x80027A20; // type:function size:0x34 scope:weak align:4 +setPathInfo__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027A54; // type:function size:0x34 scope:weak align:4 +getPathInf__15dStage_roomDt_cCFv = .text:0x80027A88; // type:function size:0x34 scope:weak align:4 +setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x80027ABC; // type:function size:0x8 scope:weak align:4 +getPnt2Inf__15dStage_roomDt_cCFv = .text:0x80027AC4; // type:function size:0x8 scope:weak align:4 +setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027ACC; // type:function size:0x8 scope:weak align:4 +getPath2Inf__15dStage_roomDt_cCFv = .text:0x80027AD4; // type:function size:0x8 scope:weak align:4 +setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027ADC; // type:function size:0x8 scope:weak align:4 +getSoundInf__15dStage_roomDt_cCFv = .text:0x80027AE4; // type:function size:0x8 scope:weak align:4 +setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027AEC; // type:function size:0x8 scope:weak align:4 +getSoundInfCL__15dStage_roomDt_cCFv = .text:0x80027AF4; // type:function size:0x8 scope:weak align:4 +setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c = .text:0x80027AFC; // type:function size:0x8 scope:weak align:4 +getMapEventInfo__15dStage_roomDt_cCFv = .text:0x80027B04; // type:function size:0x8 scope:weak align:4 +setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c = .text:0x80027B0C; // type:function size:0x8 scope:weak align:4 +getFileList2Info__15dStage_roomDt_cCFv = .text:0x80027B14; // type:function size:0x8 scope:weak align:4 +setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c = .text:0x80027B1C; // type:function size:0x8 scope:weak align:4 +setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c = .text:0x80027B24; // type:function size:0x8 scope:weak align:4 +getFloorInfo__15dStage_roomDt_cCFv = .text:0x80027B2C; // type:function size:0x8 scope:weak align:4 +setMemoryConfig__15dStage_roomDt_cFP21dStage_MemoryConfig_c = .text:0x80027B34; // type:function size:0x30 scope:weak align:4 +getMemoryConfig__15dStage_roomDt_cCFv = .text:0x80027B64; // type:function size:0x34 scope:weak align:4 +setMemoryMap__15dStage_roomDt_cFP18dStage_MemoryMap_c = .text:0x80027B98; // type:function size:0x30 scope:weak align:4 +getMemoryMap__15dStage_roomDt_cCFv = .text:0x80027BC8; // type:function size:0x34 scope:weak align:4 +setMulti__15dStage_roomDt_cFP14dStage_Multi_c = .text:0x80027BFC; // type:function size:0x30 scope:weak align:4 +getMulti__15dStage_roomDt_cCFv = .text:0x80027C2C; // type:function size:0x34 scope:weak align:4 +setOldMulti__15dStage_roomDt_cFv = .text:0x80027C60; // type:function size:0x30 scope:weak align:4 +resetOldMulti__15dStage_roomDt_cFv = .text:0x80027C90; // type:function size:0x30 scope:weak align:4 +getOldMulti__15dStage_roomDt_cCFv = .text:0x80027CC0; // type:function size:0x34 scope:weak align:4 +setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c = .text:0x80027CF4; // type:function size:0x8 scope:weak align:4 +getLbnk__15dStage_roomDt_cCFv = .text:0x80027CFC; // type:function size:0x8 scope:weak align:4 +setTresure__15dStage_roomDt_cFP19stage_tresure_class = .text:0x80027D04; // type:function size:0x8 scope:weak align:4 +getTresure__15dStage_roomDt_cCFv = .text:0x80027D0C; // type:function size:0x8 scope:weak align:4 +setDMap__15dStage_roomDt_cFP13dStage_DMap_c = .text:0x80027D14; // type:function size:0x4 scope:weak align:4 +getDMap__15dStage_roomDt_cCFv = .text:0x80027D18; // type:function size:0x8 scope:weak align:4 +setDrTg__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027D20; // type:function size:0x8 scope:weak align:4 +getDrTg__15dStage_roomDt_cCFv = .text:0x80027D28; // type:function size:0x8 scope:weak align:4 +setDoor__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027D30; // type:function size:0x8 scope:weak align:4 +getDoor__15dStage_roomDt_cCFv = .text:0x80027D38; // type:function size:0x8 scope:weak align:4 +setMapPath__15dStage_roomDt_cFPv = .text:0x80027D40; // type:function size:0x30 scope:weak align:4 +getMapPath__15dStage_roomDt_cFv = .text:0x80027D70; // type:function size:0x34 scope:weak align:4 +setElst__15dStage_roomDt_cFP13dStage_Elst_c = .text:0x80027DA4; // type:function size:0x34 scope:weak align:4 +getElst__15dStage_roomDt_cFv = .text:0x80027DD8; // type:function size:0x38 scope:weak align:4 +setCamera__16dStage_stageDt_cFP18stage_camera_class = .text:0x80027E10; // type:function size:0x8 scope:weak align:4 +getCamera__16dStage_stageDt_cCFv = .text:0x80027E18; // type:function size:0x8 scope:weak align:4 +setArrow__16dStage_stageDt_cFP17stage_arrow_class = .text:0x80027E20; // type:function size:0x8 scope:weak align:4 +getArrow__16dStage_stageDt_cCFv = .text:0x80027E28; // type:function size:0x8 scope:weak align:4 +setPlayer__16dStage_stageDt_cFP17stage_actor_class = .text:0x80027E30; // type:function size:0x8 scope:weak align:4 +setPlayerNum__16dStage_stageDt_cFUs = .text:0x80027E38; // type:function size:0x8 scope:weak align:4 +getPlayerNum__16dStage_stageDt_cCFv = .text:0x80027E40; // type:function size:0x8 scope:weak align:4 +setRoom__16dStage_stageDt_cFP14roomRead_class = .text:0x80027E48; // type:function size:0x8 scope:weak align:4 +setMapInfo__16dStage_stageDt_cFP20stage_map_info_class = .text:0x80027E50; // type:function size:0x8 scope:weak align:4 +getMapInfo__16dStage_stageDt_cCFv = .text:0x80027E58; // type:function size:0x8 scope:weak align:4 +setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class = .text:0x80027E60; // type:function size:0x8 scope:weak align:4 +setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class = .text:0x80027E68; // type:function size:0x8 scope:weak align:4 +getPaletteInfo__16dStage_stageDt_cCFv = .text:0x80027E70; // type:function size:0x8 scope:weak align:4 +setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class = .text:0x80027E78; // type:function size:0x8 scope:weak align:4 +getPselectInfo__16dStage_stageDt_cCFv = .text:0x80027E80; // type:function size:0x8 scope:weak align:4 +setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class = .text:0x80027E88; // type:function size:0x8 scope:weak align:4 +getEnvrInfo__16dStage_stageDt_cCFv = .text:0x80027E90; // type:function size:0x8 scope:weak align:4 +setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class = .text:0x80027E98; // type:function size:0x8 scope:weak align:4 +getVrboxInfo__16dStage_stageDt_cCFv = .text:0x80027EA0; // type:function size:0x8 scope:weak align:4 +setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class = .text:0x80027EA8; // type:function size:0x8 scope:weak align:4 +getVrboxcolInfo__16dStage_stageDt_cCFv = .text:0x80027EB0; // type:function size:0x8 scope:weak align:4 +setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class = .text:0x80027EB8; // type:function size:0x8 scope:weak align:4 +getPlightInfo__16dStage_stageDt_cCFv = .text:0x80027EC0; // type:function size:0x8 scope:weak align:4 +setPaletteNumInfo__16dStage_stageDt_cFi = .text:0x80027EC8; // type:function size:0x8 scope:weak align:4 +getPaletteNumInfo__16dStage_stageDt_cCFv = .text:0x80027ED0; // type:function size:0x8 scope:weak align:4 +setPselectNumInfo__16dStage_stageDt_cFi = .text:0x80027ED8; // type:function size:0x8 scope:weak align:4 +getPselectNumInfo__16dStage_stageDt_cCFv = .text:0x80027EE0; // type:function size:0x8 scope:weak align:4 +setEnvrNumInfo__16dStage_stageDt_cFi = .text:0x80027EE8; // type:function size:0x8 scope:weak align:4 +getEnvrNumInfo__16dStage_stageDt_cCFv = .text:0x80027EF0; // type:function size:0x8 scope:weak align:4 +setVrboxNumInfo__16dStage_stageDt_cFi = .text:0x80027EF8; // type:function size:0x8 scope:weak align:4 +getVrboxNumInfo__16dStage_stageDt_cCFv = .text:0x80027F00; // type:function size:0x8 scope:weak align:4 +setVrboxcolNumInfo__16dStage_stageDt_cFi = .text:0x80027F08; // type:function size:0x8 scope:weak align:4 +getVrboxcolNumInfo__16dStage_stageDt_cCFv = .text:0x80027F10; // type:function size:0x8 scope:weak align:4 +setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class = .text:0x80027F18; // type:function size:0x34 scope:weak align:4 +getLightVecInfo__16dStage_stageDt_cCFv = .text:0x80027F4C; // type:function size:0x34 scope:weak align:4 +setLightVecInfoNum__16dStage_stageDt_cFi = .text:0x80027F80; // type:function size:0x34 scope:weak align:4 +getLightVecInfoNum__16dStage_stageDt_cCFv = .text:0x80027FB4; // type:function size:0x34 scope:weak align:4 +setPlightNumInfo__16dStage_stageDt_cFi = .text:0x80027FE8; // type:function size:0x8 scope:weak align:4 +getPlightNumInfo__16dStage_stageDt_cCFv = .text:0x80027FF0; // type:function size:0x8 scope:weak align:4 +setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class = .text:0x80027FF8; // type:function size:0x8 scope:weak align:4 +setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class = .text:0x80028000; // type:function size:0x8 scope:weak align:4 +setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x80028008; // type:function size:0x8 scope:weak align:4 +getPntInf__16dStage_stageDt_cCFv = .text:0x80028010; // type:function size:0x8 scope:weak align:4 +setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x80028018; // type:function size:0x8 scope:weak align:4 +getPathInf__16dStage_stageDt_cCFv = .text:0x80028020; // type:function size:0x8 scope:weak align:4 +setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x80028028; // type:function size:0x8 scope:weak align:4 +getPnt2Inf__16dStage_stageDt_cCFv = .text:0x80028030; // type:function size:0x8 scope:weak align:4 +setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x80028038; // type:function size:0x8 scope:weak align:4 +getPath2Inf__16dStage_stageDt_cCFv = .text:0x80028040; // type:function size:0x8 scope:weak align:4 +setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x80028048; // type:function size:0x8 scope:weak align:4 +getSoundInf__16dStage_stageDt_cCFv = .text:0x80028050; // type:function size:0x8 scope:weak align:4 +setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x80028058; // type:function size:0x8 scope:weak align:4 +getSoundInfCL__16dStage_stageDt_cCFv = .text:0x80028060; // type:function size:0x8 scope:weak align:4 +setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c = .text:0x80028068; // type:function size:0x8 scope:weak align:4 +getMapEventInfo__16dStage_stageDt_cCFv = .text:0x80028070; // type:function size:0x8 scope:weak align:4 +setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c = .text:0x80028078; // type:function size:0x34 scope:weak align:4 +getFileList2Info__16dStage_stageDt_cCFv = .text:0x800280AC; // type:function size:0x34 scope:weak align:4 +setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c = .text:0x800280E0; // type:function size:0x34 scope:weak align:4 +getFileListInfo__16dStage_stageDt_cCFv = .text:0x80028114; // type:function size:0x34 scope:weak align:4 +setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c = .text:0x80028148; // type:function size:0x8 scope:weak align:4 +getFloorInfo__16dStage_stageDt_cCFv = .text:0x80028150; // type:function size:0x8 scope:weak align:4 +setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c = .text:0x80028158; // type:function size:0x8 scope:weak align:4 +getMemoryConfig__16dStage_stageDt_cCFv = .text:0x80028160; // type:function size:0x8 scope:weak align:4 +setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c = .text:0x80028168; // type:function size:0x8 scope:weak align:4 +getMemoryMap__16dStage_stageDt_cCFv = .text:0x80028170; // type:function size:0x8 scope:weak align:4 +setMulti__16dStage_stageDt_cFP14dStage_Multi_c = .text:0x80028178; // type:function size:0x8 scope:weak align:4 +getMulti__16dStage_stageDt_cCFv = .text:0x80028180; // type:function size:0x8 scope:weak align:4 +getOldMulti__16dStage_stageDt_cCFv = .text:0x80028188; // type:function size:0x8 scope:weak align:4 +setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c = .text:0x80028190; // type:function size:0x34 scope:weak align:4 +getLbnk__16dStage_stageDt_cCFv = .text:0x800281C4; // type:function size:0x34 scope:weak align:4 +setTresure__16dStage_stageDt_cFP19stage_tresure_class = .text:0x800281F8; // type:function size:0x8 scope:weak align:4 +getTresure__16dStage_stageDt_cCFv = .text:0x80028200; // type:function size:0x8 scope:weak align:4 +setDMap__16dStage_stageDt_cFP13dStage_DMap_c = .text:0x80028208; // type:function size:0x8 scope:weak align:4 +getDMap__16dStage_stageDt_cCFv = .text:0x80028210; // type:function size:0x8 scope:weak align:4 +setDrTg__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x80028218; // type:function size:0x8 scope:weak align:4 +getDrTg__16dStage_stageDt_cCFv = .text:0x80028220; // type:function size:0x8 scope:weak align:4 +setDoor__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x80028228; // type:function size:0x8 scope:weak align:4 +getDoor__16dStage_stageDt_cCFv = .text:0x80028230; // type:function size:0x8 scope:weak align:4 +setMapPath__16dStage_stageDt_cFPv = .text:0x80028238; // type:function size:0x4 scope:weak align:4 +getMapPath__16dStage_stageDt_cFv = .text:0x8002823C; // type:function size:0x8 scope:weak align:4 +setElst__16dStage_stageDt_cFP13dStage_Elst_c = .text:0x80028244; // type:function size:0x8 scope:weak align:4 __sinit_d_stage_cpp = .text:0x8002824C; // type:function size:0xDC scope:local align:4 __arraydtor$5375 = .text:0x80028328; // type:function size:0x38 scope:local align:4 -__dt__19dStage_roomStatus_cFv = .text:0x80028360; // type:function size:0x3C scope:global align:4 -__ct__19dStage_roomStatus_cFv = .text:0x8002839C; // type:function size:0x7C scope:global align:4 -__dt__19dStage_KeepDoorInfoFv = .text:0x80028418; // type:function size:0x64 scope:global align:4 -__dt__21stage_tgsc_data_classFv = .text:0x8002847C; // type:function size:0x3C scope:global align:4 -__ct__21stage_tgsc_data_classFv = .text:0x800284B8; // type:function size:0x4 scope:global align:4 +__dt__19dStage_roomStatus_cFv = .text:0x80028360; // type:function size:0x3C scope:weak align:4 +__ct__19dStage_roomStatus_cFv = .text:0x8002839C; // type:function size:0x7C scope:weak align:4 +__dt__19dStage_KeepDoorInfoFv = .text:0x80028418; // type:function size:0x64 scope:weak align:4 +__dt__21stage_tgsc_data_classFv = .text:0x8002847C; // type:function size:0x3C scope:weak align:4 +__ct__21stage_tgsc_data_classFv = .text:0x800284B8; // type:function size:0x4 scope:weak align:4 getIconSize__15renderingAmap_cCFUc = .text:0x800284BC; // type:function size:0x14 scope:global align:4 draw__15renderingAmap_cFv = .text:0x800284D0; // type:function size:0x3F4 scope:global align:4 getDispType__15renderingAmap_cCFv = .text:0x800288C4; // type:function size:0x9C scope:global align:4 @@ -1292,20 +1290,20 @@ _move__6dMap_cFffif = .text:0x8002A32C; // type:function size:0x828 scope:global _draw__6dMap_cFv = .text:0x8002AB54; // type:function size:0x58 scope:global align:4 getFirstData__6dMap_cFUc = .text:0x8002ABAC; // type:function size:0x20 scope:global align:4 getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c = .text:0x8002ABCC; // type:function size:0x20 scope:global align:4 -draw__12dDlst_base_cFv = .text:0x8002ABEC; // type:function size:0x4 scope:global align:4 -isDrawType__11dDrawPath_cFi = .text:0x8002ABF0; // type:function size:0x8 scope:global align:4 -__dt__18dRenderingFDAmap_cFv = .text:0x8002ABF8; // type:function size:0x7C scope:global align:4 -__dt__15dRenderingMap_cFv = .text:0x8002AC74; // type:function size:0x6C scope:global align:4 -__dt__28dDrawPathWithNormalPattern_cFv = .text:0x8002ACE0; // type:function size:0x5C scope:global align:4 -__dt__11dDrawPath_cFv = .text:0x8002AD3C; // type:function size:0x48 scope:global align:4 -getLineColor__11dDrawPath_cFii = .text:0x8002AD84; // type:function size:0x2C scope:global align:4 -__dt__15renderingAmap_cFv = .text:0x8002ADB0; // type:function size:0xBC scope:global align:4 -__ct__15renderingAmap_cFv = .text:0x8002AE6C; // type:function size:0xB4 scope:global align:4 -__dt__6dMap_cFv = .text:0x8002AF20; // type:function size:0xE0 scope:global align:4 -isRendIcon__15renderingAmap_cCFv = .text:0x8002B000; // type:function size:0x8 scope:global align:4 -__dt__28renderingPlusDoorAndCursor_cFv = .text:0x8002B008; // type:function size:0xAC scope:global align:4 -__dt__19renderingPlusDoor_cFv = .text:0x8002B0B4; // type:function size:0x9C scope:global align:4 -__dt__16renderingDAmap_cFv = .text:0x8002B150; // type:function size:0x8C scope:global align:4 +draw__12dDlst_base_cFv = .text:0x8002ABEC; // type:function size:0x4 scope:weak align:4 +isDrawType__11dDrawPath_cFi = .text:0x8002ABF0; // type:function size:0x8 scope:weak align:4 +__dt__18dRenderingFDAmap_cFv = .text:0x8002ABF8; // type:function size:0x7C scope:weak align:4 +__dt__15dRenderingMap_cFv = .text:0x8002AC74; // type:function size:0x6C scope:weak align:4 +__dt__28dDrawPathWithNormalPattern_cFv = .text:0x8002ACE0; // type:function size:0x5C scope:weak align:4 +__dt__11dDrawPath_cFv = .text:0x8002AD3C; // type:function size:0x48 scope:weak align:4 +getLineColor__11dDrawPath_cFii = .text:0x8002AD84; // type:function size:0x2C scope:weak align:4 +__dt__15renderingAmap_cFv = .text:0x8002ADB0; // type:function size:0xBC scope:weak align:4 +__ct__15renderingAmap_cFv = .text:0x8002AE6C; // type:function size:0xB4 scope:weak align:4 +__dt__6dMap_cFv = .text:0x8002AF20; // type:function size:0xE0 scope:weak align:4 +isRendIcon__15renderingAmap_cCFv = .text:0x8002B000; // type:function size:0x8 scope:weak align:4 +__dt__28renderingPlusDoorAndCursor_cFv = .text:0x8002B008; // type:function size:0xAC scope:weak align:4 +__dt__19renderingPlusDoor_cFv = .text:0x8002B0B4; // type:function size:0x9C scope:weak align:4 +__dt__16renderingDAmap_cFv = .text:0x8002B150; // type:function size:0x8C scope:weak align:4 ct__14dComIfG_play_cFv = .text:0x8002B1DC; // type:function size:0x50 scope:global align:4 init__14dComIfG_play_cFv = .text:0x8002B22C; // type:function size:0x7C scope:global align:4 dComIfGp_checkItemGet__FUci = .text:0x8002B2A8; // type:function size:0x20 scope:global align:4 @@ -1342,11 +1340,11 @@ dComIfG_changeOpeningScene__FP11scene_classs = .text:0x8002CC54; // type:functio dComIfG_resetToOpening__FP11scene_class = .text:0x8002CD44; // type:function size:0x74 scope:global align:4 phase_1__FPc = .text:0x8002CDB8; // type:function size:0x80 scope:local align:4 phase_2__FPc = .text:0x8002CE38; // type:function size:0x7C scope:local align:4 -phase_3__FPc = .text:0x8002CEB4; // type:function size:0x8 scope:global align:4 +phase_3__FPc = .text:0x8002CEB4; // type:function size:0x8 scope:local align:4 dComIfG_resLoad__FP30request_of_phase_process_classPCc = .text:0x8002CEBC; // type:function size:0x40 scope:global align:4 -phase_01__FP12phaseParam_c = .text:0x8002CEFC; // type:function size:0x60 scope:global align:4 -phase_02__FP12phaseParam_c = .text:0x8002CF5C; // type:function size:0x5C scope:global align:4 -phase_03__FP12phaseParam_c = .text:0x8002CFB8; // type:function size:0x8 scope:global align:4 +phase_01__FP12phaseParam_c = .text:0x8002CEFC; // type:function size:0x60 scope:local align:4 +phase_02__FP12phaseParam_c = .text:0x8002CF5C; // type:function size:0x5C scope:local align:4 +phase_03__FP12phaseParam_c = .text:0x8002CFB8; // type:function size:0x8 scope:local align:4 dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap = .text:0x8002CFC0; // type:function size:0x48 scope:global align:4 dComIfG_resDelete__FP30request_of_phase_process_classPCc = .text:0x8002D008; // type:function size:0x64 scope:global align:4 dComIfGp_getReverb__Fi = .text:0x8002D06C; // type:function size:0x48 scope:global align:4 @@ -1367,7 +1365,7 @@ dComIfGs_BossLife_public_Get__Fv = .text:0x8002D910; // type:function size:0x14 dComIfGs_sense_type_change_Set__FSc = .text:0x8002D924; // type:function size:0x14 scope:global align:4 dComIfGs_sense_type_change_Get__Fv = .text:0x8002D938; // type:function size:0x14 scope:global align:4 dComIfGs_onZoneSwitch__Fii = .text:0x8002D94C; // type:function size:0x64 scope:global align:4 -getZoneNo__20dStage_roomControl_cFi = .text:0x8002D9B0; // type:function size:0x1C scope:global align:4 +getZoneNo__20dStage_roomControl_cFi = .text:0x8002D9B0; // type:function size:0x1C scope:weak align:4 dComIfGs_offZoneSwitch__Fii = .text:0x8002D9CC; // type:function size:0x64 scope:global align:4 dComIfGs_isZoneSwitch__Fii = .text:0x8002DA30; // type:function size:0x6C scope:global align:4 dComIfGs_onOneZoneSwitch__Fii = .text:0x8002DA9C; // type:function size:0x64 scope:global align:4 @@ -1410,7 +1408,7 @@ dComIfGs_setSelectEquipClothes__FUc = .text:0x8002EEB0; // type:function size:0x dComIfGs_setSelectEquipSword__FUc = .text:0x8002EEC0; // type:function size:0xD4 scope:global align:4 dComIfGs_setSelectEquipShield__FUc = .text:0x8002EF94; // type:function size:0xAC scope:global align:4 dComIfGs_setKeyNum__FiUc = .text:0x8002F040; // type:function size:0xA0 scope:global align:4 -dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc = .text:0x8002F0E0; // type:function size:0x48 scope:global align:4 +dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc = .text:0x8002F0E0; // type:function size:0x48 scope:local align:4 setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc = .text:0x8002F128; // type:function size:0x74 scope:global align:4 dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc = .text:0x8002F19C; // type:function size:0xB0 scope:global align:4 dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc = .text:0x8002F24C; // type:function size:0x60 scope:global align:4 @@ -1454,43 +1452,43 @@ dComIfGs_isVisitedRoom__Fi = .text:0x8002FC98; // type:function size:0x5C scope: dComIfGs_staffroll_next_go__Fv = .text:0x8002FCF4; // type:function size:0x14 scope:global align:4 dComIfGs_staffroll_next_go_check__Fv = .text:0x8002FD08; // type:function size:0x10 scope:global align:4 __sinit_d_com_inf_game_cpp = .text:0x8002FD18; // type:function size:0x5C scope:local align:4 -__dt__13dComIfG_inf_cFv = .text:0x8002FD74; // type:function size:0x74 scope:global align:4 -__dt__14dComIfG_play_cFv = .text:0x8002FDE8; // type:function size:0x110 scope:global align:4 -__dt__11cBgS_ChkElmFv = .text:0x8002FEF8; // type:function size:0x48 scope:global align:4 -__dt__4dCcSFv = .text:0x8002FF40; // type:function size:0x1B4 scope:global align:4 -__dt__12dCcMassS_ObjFv = .text:0x800300F4; // type:function size:0x60 scope:global align:4 -__dt__12dEvt_order_cFv = .text:0x80030154; // type:function size:0x3C scope:global align:4 -__dt__11dEvDtBase_cFv = .text:0x80030190; // type:function size:0x3C scope:global align:4 -__dt__14dDlst_window_cFv = .text:0x800301CC; // type:function size:0x3C scope:global align:4 -__dt__25dComIfG_camera_info_classFv = .text:0x80030208; // type:function size:0x3C scope:global align:4 -__ct__13dComIfG_inf_cFv = .text:0x80030244; // type:function size:0x284 scope:global align:4 -__ct__25dComIfG_camera_info_classFv = .text:0x800304C8; // type:function size:0x4 scope:global align:4 -__ct__14dDlst_window_cFv = .text:0x800304CC; // type:function size:0x4 scope:global align:4 -__dt__10dAttList_cFv = .text:0x800304D0; // type:function size:0x3C scope:global align:4 -__ct__10dAttList_cFv = .text:0x8003050C; // type:function size:0x4 scope:global align:4 -__dt__7cSAngleFv = .text:0x80030510; // type:function size:0x3C scope:global align:4 -__dt__10dAttDraw_cFv = .text:0x8003054C; // type:function size:0x154 scope:global align:4 -__dt__13mDoExt_bckAnmFv = .text:0x800306A0; // type:function size:0x54 scope:global align:4 -__dt__13mDoExt_bpkAnmFv = .text:0x800306F4; // type:function size:0x54 scope:global align:4 -__dt__13mDoExt_brkAnmFv = .text:0x80030748; // type:function size:0x54 scope:global align:4 -__dt__13mDoExt_btkAnmFv = .text:0x8003079C; // type:function size:0x54 scope:global align:4 -__ct__10dAttDraw_cFv = .text:0x800307F0; // type:function size:0x164 scope:global align:4 -__ct__13mDoExt_btkAnmFv = .text:0x80030954; // type:function size:0x48 scope:global align:4 -__ct__13mDoExt_brkAnmFv = .text:0x8003099C; // type:function size:0x48 scope:global align:4 -__ct__13mDoExt_bpkAnmFv = .text:0x800309E4; // type:function size:0x48 scope:global align:4 -__ct__13mDoExt_bckAnmFv = .text:0x80030A2C; // type:function size:0x48 scope:global align:4 -__dt__12dCcMassS_MngFv = .text:0x80030A74; // type:function size:0x168 scope:global align:4 -__dt__4cCcSFv = .text:0x80030BDC; // type:function size:0x74 scope:global align:4 -__dt__4dBgSFv = .text:0x80030C50; // type:function size:0x7C scope:global align:4 -__dt__4cBgSFv = .text:0x80030CCC; // type:function size:0x6C scope:global align:4 -__ct__11cBgS_ChkElmFv = .text:0x80030D38; // type:function size:0x3C scope:global align:4 -__ct__10dSv_zone_cFv = .text:0x80030D74; // type:function size:0xC scope:global align:4 -__ct__13dSv_memory2_cFv = .text:0x80030D80; // type:function size:0x30 scope:global align:4 -__ct__12dSv_memory_cFv = .text:0x80030DB0; // type:function size:0x30 scope:global align:4 -__dt__15cCcD_DivideAreaFv = .text:0x80030DE0; // type:function size:0x5C scope:global align:4 -__dt__8cM3dGCylFv = .text:0x80030E3C; // type:function size:0x48 scope:global align:4 -__dt__8cM3dGAabFv = .text:0x80030E84; // type:function size:0x48 scope:global align:4 -__dt__15cCcD_DivideInfoFv = .text:0x80030ECC; // type:function size:0x48 scope:global align:4 +__dt__13dComIfG_inf_cFv = .text:0x8002FD74; // type:function size:0x74 scope:weak align:4 +__dt__14dComIfG_play_cFv = .text:0x8002FDE8; // type:function size:0x110 scope:weak align:4 +__dt__11cBgS_ChkElmFv = .text:0x8002FEF8; // type:function size:0x48 scope:weak align:4 +__dt__4dCcSFv = .text:0x8002FF40; // type:function size:0x1B4 scope:weak align:4 +__dt__12dCcMassS_ObjFv = .text:0x800300F4; // type:function size:0x60 scope:weak align:4 +__dt__12dEvt_order_cFv = .text:0x80030154; // type:function size:0x3C scope:weak align:4 +__dt__11dEvDtBase_cFv = .text:0x80030190; // type:function size:0x3C scope:weak align:4 +__dt__14dDlst_window_cFv = .text:0x800301CC; // type:function size:0x3C scope:weak align:4 +__dt__25dComIfG_camera_info_classFv = .text:0x80030208; // type:function size:0x3C scope:weak align:4 +__ct__13dComIfG_inf_cFv = .text:0x80030244; // type:function size:0x284 scope:weak align:4 +__ct__25dComIfG_camera_info_classFv = .text:0x800304C8; // type:function size:0x4 scope:weak align:4 +__ct__14dDlst_window_cFv = .text:0x800304CC; // type:function size:0x4 scope:weak align:4 +__dt__10dAttList_cFv = .text:0x800304D0; // type:function size:0x3C scope:weak align:4 +__ct__10dAttList_cFv = .text:0x8003050C; // type:function size:0x4 scope:weak align:4 +__dt__7cSAngleFv = .text:0x80030510; // type:function size:0x3C scope:weak align:4 +__dt__10dAttDraw_cFv = .text:0x8003054C; // type:function size:0x154 scope:weak align:4 +__dt__13mDoExt_bckAnmFv = .text:0x800306A0; // type:function size:0x54 scope:weak align:4 +__dt__13mDoExt_bpkAnmFv = .text:0x800306F4; // type:function size:0x54 scope:weak align:4 +__dt__13mDoExt_brkAnmFv = .text:0x80030748; // type:function size:0x54 scope:weak align:4 +__dt__13mDoExt_btkAnmFv = .text:0x8003079C; // type:function size:0x54 scope:weak align:4 +__ct__10dAttDraw_cFv = .text:0x800307F0; // type:function size:0x164 scope:weak align:4 +__ct__13mDoExt_btkAnmFv = .text:0x80030954; // type:function size:0x48 scope:weak align:4 +__ct__13mDoExt_brkAnmFv = .text:0x8003099C; // type:function size:0x48 scope:weak align:4 +__ct__13mDoExt_bpkAnmFv = .text:0x800309E4; // type:function size:0x48 scope:weak align:4 +__ct__13mDoExt_bckAnmFv = .text:0x80030A2C; // type:function size:0x48 scope:weak align:4 +__dt__12dCcMassS_MngFv = .text:0x80030A74; // type:function size:0x168 scope:weak align:4 +__dt__4cCcSFv = .text:0x80030BDC; // type:function size:0x74 scope:weak align:4 +__dt__4dBgSFv = .text:0x80030C50; // type:function size:0x7C scope:weak align:4 +__dt__4cBgSFv = .text:0x80030CCC; // type:function size:0x6C scope:weak align:4 +__ct__11cBgS_ChkElmFv = .text:0x80030D38; // type:function size:0x3C scope:weak align:4 +__ct__10dSv_zone_cFv = .text:0x80030D74; // type:function size:0xC scope:weak align:4 +__ct__13dSv_memory2_cFv = .text:0x80030D80; // type:function size:0x30 scope:weak align:4 +__ct__12dSv_memory_cFv = .text:0x80030DB0; // type:function size:0x30 scope:weak align:4 +__dt__15cCcD_DivideAreaFv = .text:0x80030DE0; // type:function size:0x5C scope:weak align:4 +__dt__8cM3dGCylFv = .text:0x80030E3C; // type:function size:0x48 scope:weak align:4 +__dt__8cM3dGAabFv = .text:0x80030E84; // type:function size:0x48 scope:weak align:4 +__dt__15cCcD_DivideInfoFv = .text:0x80030ECC; // type:function size:0x48 scope:weak align:4 set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc = .text:0x80030F14; // type:function size:0xA8 scope:global align:4 reset__Q27daSus_c6data_cFv = .text:0x80030FBC; // type:function size:0x10 scope:global align:4 isSwitch__Q27daSus_c6data_cFv = .text:0x80030FCC; // type:function size:0x6C scope:global align:4 @@ -1540,10 +1538,10 @@ setRoomNo__12daObjCarry_cFiSc = .text:0x80031DAC; // type:function size:0xC scop getRoomNo__12daObjCarry_cFi = .text:0x80031DB8; // type:function size:0xC scope:global align:4 __sinit_d_com_static_cpp = .text:0x80031DC4; // type:function size:0xE8 scope:local align:4 __arraydtor$4479 = .text:0x80031EAC; // type:function size:0x38 scope:local align:4 -__ct__Q27daSus_c6room_cFv = .text:0x80031EE4; // type:function size:0xC scope:global align:4 +__ct__Q27daSus_c6room_cFv = .text:0x80031EE4; // type:function size:0xC scope:weak align:4 __arraydtor$3839 = .text:0x80031EF0; // type:function size:0x38 scope:local align:4 -__dt__Q27daSus_c6data_cFv = .text:0x80031F28; // type:function size:0x3C scope:global align:4 -__ct__Q27daSus_c6data_cFv = .text:0x80031F64; // type:function size:0x30 scope:global align:4 +__dt__Q27daSus_c6data_cFv = .text:0x80031F28; // type:function size:0x3C scope:weak align:4 +__ct__Q27daSus_c6data_cFv = .text:0x80031F64; // type:function size:0x30 scope:weak align:4 checkStateCarry__7dBomb_cFv = .text:0x80031F94; // type:function size:0x38 scope:global align:4 checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c = .text:0x80031FCC; // type:function size:0x28 scope:global align:4 checkWaterBomb__7dBomb_cFP10fopAc_ac_c = .text:0x80031FF4; // type:function size:0x28 scope:global align:4 @@ -1568,7 +1566,7 @@ dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc = .text:0x80032738; // getTime__11dLib_time_cFv = .text:0x80032804; // type:function size:0x7C scope:global align:4 stopTime__11dLib_time_cFv = .text:0x80032880; // type:function size:0x3C scope:global align:4 startTime__11dLib_time_cFv = .text:0x800328BC; // type:function size:0x5C scope:global align:4 -dSv_item_rename__FUc = .text:0x80032918; // type:function size:0x40 scope:global align:4 +dSv_item_rename__FUc = .text:0x80032918; // type:function size:0x40 scope:local align:4 init__21dSv_player_status_a_cFv = .text:0x80032958; // type:function size:0xF0 scope:global align:4 setSelectItemIndex__21dSv_player_status_a_cFiUc = .text:0x80032A48; // type:function size:0x14 scope:global align:4 getSelectItemIndex__21dSv_player_status_a_cCFi = .text:0x80032A5C; // type:function size:0x1C scope:global align:4 @@ -1733,8 +1731,8 @@ __ct__9dJntCol_cFv = .text:0x80035C8C; // type:function size:0x14 scope:global a init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli = .text:0x80035CA0; // type:function size:0x28 scope:global align:4 setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz = .text:0x80035CC8; // type:function size:0x100 scope:global align:4 searchNearPos__9dJntCol_cCFPC8cM3dGLinPC4cXyzP4cXyzi = .text:0x80035DC8; // type:function size:0xC94 scope:global align:4 -__dt__8cM3dGLinFv = .text:0x80036A5C; // type:function size:0x48 scope:global align:4 -__dt__8cM3dGSphFv = .text:0x80036AA4; // type:function size:0x48 scope:global align:4 +__dt__8cM3dGLinFv = .text:0x80036A5C; // type:function size:0x48 scope:weak align:4 +__dt__8cM3dGSphFv = .text:0x80036AA4; // type:function size:0x48 scope:weak align:4 getArrowOffsetPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz = .text:0x80036AEC; // type:function size:0x158 scope:global align:4 getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi = .text:0x80036C44; // type:function size:0x364 scope:global align:4 setArrowPosAndAngle__9dJntCol_cFPC4cXyzPC4cXyziP4cXyzP5csXyz = .text:0x80036FA8; // type:function size:0x90 scope:global align:4 @@ -1744,13 +1742,13 @@ make_eff_break_kotubo2__5daObjFP10fopAc_ac_c = .text:0x80037210; // type:functio make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c = .text:0x800372A0; // type:function size:0x90 scope:global align:4 make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c = .text:0x80037330; // type:function size:0x90 scope:global align:4 posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff = .text:0x800373C0; // type:function size:0x30 scope:global align:4 -posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff = .text:0x800373F0; // type:function size:0xFC scope:global align:4 -posMoveF_grade_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzffPC4cXyzPC4cXyz = .text:0x800374EC; // type:function size:0x134 scope:global align:4 +posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff = .text:0x800373F0; // type:function size:0xFC scope:local align:4 +posMoveF_grade_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzffPC4cXyzPC4cXyz = .text:0x800374EC; // type:function size:0x134 scope:local align:4 posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz = .text:0x80037620; // type:function size:0x168 scope:global align:4 quat_rotBaseY__5daObjFP10QuaternionRC4cXyz = .text:0x80037788; // type:function size:0x178 scope:global align:4 HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl = .text:0x80037900; // type:function size:0x14C scope:global align:4 -GetCoCP__12cCcD_CylAttrFv = .text:0x80037A4C; // type:function size:0x8 scope:global align:4 -GetCoCP__12cCcD_SphAttrFv = .text:0x80037A54; // type:function size:0x8 scope:global align:4 +GetCoCP__12cCcD_CylAttrFv = .text:0x80037A4C; // type:function size:0x8 scope:weak align:4 +GetCoCP__12cCcD_SphAttrFv = .text:0x80037A54; // type:function size:0x8 scope:weak align:4 getItemNo__12daItemBase_cFv = .text:0x80037A5C; // type:function size:0x8 scope:global align:4 hide__12daItemBase_cFv = .text:0x80037A64; // type:function size:0x10 scope:global align:4 show__12daItemBase_cFv = .text:0x80037A74; // type:function size:0x10 scope:global align:4 @@ -1773,19 +1771,19 @@ getOff__10e_wb_classFv = .text:0x80037CF4; // type:function size:0x74 scope:glob checkDownDamage__10e_wb_classFv = .text:0x80037D68; // type:function size:0x2C scope:global align:4 checkNormalRideMode__10e_wb_classCFv = .text:0x80037D94; // type:function size:0x28 scope:global align:4 setRunRideMode__10e_wb_classFv = .text:0x80037DBC; // type:function size:0x28 scope:global align:4 -__dt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFv = .text:0x80037DE4; // type:function size:0x60 scope:global align:4 -adaptor_do_MESSAGE__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFQ37JStudio4data15TEOperationDataPCvUl = .text:0x80037E44; // type:function size:0x30 scope:global align:4 -__dt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFv = .text:0x80037E74; // type:function size:0x60 scope:global align:4 -create__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x80037ED4; // type:function size:0x14C scope:global align:4 +__dt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFv = .text:0x80037DE4; // type:function size:0x60 scope:local align:4 +adaptor_do_MESSAGE__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFQ37JStudio4data15TEOperationDataPCvUl = .text:0x80037E44; // type:function size:0x30 scope:local align:4 +__dt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFv = .text:0x80037E74; // type:function size:0x60 scope:local align:4 +create__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x80037ED4; // type:function size:0x14C scope:local align:4 __ct__13dDemo_actor_cFv = .text:0x80038020; // type:function size:0x78 scope:global align:4 __dt__13dDemo_actor_cFv = .text:0x80038098; // type:function size:0x90 scope:global align:4 getActor__13dDemo_actor_cFv = .text:0x80038128; // type:function size:0x34 scope:global align:4 setActor__13dDemo_actor_cFP10fopAc_ac_c = .text:0x8003815C; // type:function size:0x40 scope:global align:4 getPrm_Morf__13dDemo_actor_cFv = .text:0x8003819C; // type:function size:0x19C scope:global align:4 getDemoIDData__13dDemo_actor_cFPiPiPiPUsPUc = .text:0x80038338; // type:function size:0x158 scope:global align:4 -dDemo_getJaiPointer__FPCcUliPUs = .text:0x80038490; // type:function size:0x88 scope:global align:4 +dDemo_getJaiPointer__FPCcUliPUs = .text:0x80038490; // type:function size:0x88 scope:local align:4 dDemo_setDemoData__FP10fopAc_ac_cUcP14mDoExt_McaMorfPCciPUsUlSc = .text:0x80038518; // type:function size:0x290 scope:global align:4 -branchFile__FPCc = .text:0x800387A8; // type:function size:0x44 scope:global align:4 +branchFile__FPCc = .text:0x800387A8; // type:function size:0x44 scope:local align:4 JSGSetData__13dDemo_actor_cFUlPCvUl = .text:0x800387EC; // type:function size:0x134 scope:global align:4 JSGSetTranslation__13dDemo_actor_cFRC3Vec = .text:0x80038920; // type:function size:0x60 scope:global align:4 JSGSetScaling__13dDemo_actor_cFRC3Vec = .text:0x80038980; // type:function size:0x28 scope:global align:4 @@ -1796,7 +1794,7 @@ JSGSetAnimationFrame__13dDemo_actor_cFf = .text:0x80038A40; // type:function siz JSGSetAnimationTransition__13dDemo_actor_cFf = .text:0x80038A54; // type:function size:0x14 scope:global align:4 JSGSetTextureAnimation__13dDemo_actor_cFUl = .text:0x80038A68; // type:function size:0x14 scope:global align:4 JSGSetTextureAnimationFrame__13dDemo_actor_cFf = .text:0x80038A7C; // type:function size:0x14 scope:global align:4 -getView__Fv = .text:0x80038A90; // type:function size:0x34 scope:global align:4 +getView__Fv = .text:0x80038A90; // type:function size:0x34 scope:local align:4 JSGGetProjectionNear__14dDemo_camera_cCFv = .text:0x80038AC4; // type:function size:0x34 scope:global align:4 JSGSetProjectionNear__14dDemo_camera_cFf = .text:0x80038AF8; // type:function size:0x14 scope:global align:4 JSGGetProjectionFar__14dDemo_camera_cCFv = .text:0x80038B0C; // type:function size:0x34 scope:global align:4 @@ -1852,13 +1850,13 @@ reset__7dDemo_cFv = .text:0x80039F04; // type:function size:0x18 scope:global al emitter_create__16dDemo_particle_cFUl = .text:0x80039F1C; // type:function size:0x80 scope:global align:4 __dt__16dDemo_particle_cFv = .text:0x80039F9C; // type:function size:0x60 scope:global align:4 __dt__14dDemo_camera_cFv = .text:0x80039FFC; // type:function size:0x60 scope:global align:4 -JSGFindNodeID__13dDemo_actor_cCFPCc = .text:0x8003A05C; // type:function size:0x2C scope:global align:4 -JSGGetNodeTransformation__13dDemo_actor_cCFUlPA4_f = .text:0x8003A088; // type:function size:0x40 scope:global align:4 -JSGGetAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A0C8; // type:function size:0x8 scope:global align:4 -JSGGetTextureAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A0D0; // type:function size:0x8 scope:global align:4 -JSGGetTranslation__13dDemo_actor_cCFP3Vec = .text:0x8003A0D8; // type:function size:0x1C scope:global align:4 -JSGGetScaling__13dDemo_actor_cCFP3Vec = .text:0x8003A0F4; // type:function size:0x1C scope:global align:4 -JSGGetRotation__13dDemo_actor_cCFP3Vec = .text:0x8003A110; // type:function size:0x78 scope:global align:4 +JSGFindNodeID__13dDemo_actor_cCFPCc = .text:0x8003A05C; // type:function size:0x2C scope:weak align:4 +JSGGetNodeTransformation__13dDemo_actor_cCFUlPA4_f = .text:0x8003A088; // type:function size:0x40 scope:weak align:4 +JSGGetAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A0C8; // type:function size:0x8 scope:weak align:4 +JSGGetTextureAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A0D0; // type:function size:0x8 scope:weak align:4 +JSGGetTranslation__13dDemo_actor_cCFP3Vec = .text:0x8003A0D8; // type:function size:0x1C scope:weak align:4 +JSGGetScaling__13dDemo_actor_cCFP3Vec = .text:0x8003A0F4; // type:function size:0x1C scope:weak align:4 +JSGGetRotation__13dDemo_actor_cCFP3Vec = .text:0x8003A110; // type:function size:0x78 scope:weak align:4 getKind__13door_param2_cFP10fopAc_ac_c = .text:0x8003A188; // type:function size:0xC scope:global align:4 getDoorModel__13door_param2_cFP10fopAc_ac_c = .text:0x8003A194; // type:function size:0xC scope:global align:4 getFrontOption__13door_param2_cFP10fopAc_ac_c = .text:0x8003A1A0; // type:function size:0xC scope:global align:4 @@ -1880,35 +1878,35 @@ getMBLightInf__13door_param2_cFP10fopAc_ac_c = .text:0x8003A254; // type:functio __ct__11dRes_info_cFv = .text:0x8003A260; // type:function size:0x20 scope:global align:4 __dt__11dRes_info_cFv = .text:0x8003A280; // type:function size:0xC8 scope:global align:4 set__11dRes_info_cFPCcPCcUcP7JKRHeap = .text:0x8003A348; // type:function size:0xA8 scope:global align:4 -setAlpha__FP16J3DMaterialTable = .text:0x8003A3F0; // type:function size:0xA0 scope:global align:4 -setIndirectTex__FP12J3DModelData = .text:0x8003A490; // type:function size:0x38C scope:global align:4 -setAlpha__FP12J3DModelData = .text:0x8003A81C; // type:function size:0x24 scope:global align:4 -addWarpMaterial__FP12J3DModelData = .text:0x8003A840; // type:function size:0x28C scope:global align:4 -__ct__11J3DTevStageFRC15J3DTevStageInfo = .text:0x8003AACC; // type:function size:0x60 scope:global align:4 -setTexMtx__14J3DTexGenBlockFUlP9J3DTexMtx = .text:0x8003AB2C; // type:function size:0x4 scope:global align:4 +setAlpha__FP16J3DMaterialTable = .text:0x8003A3F0; // type:function size:0xA0 scope:local align:4 +setIndirectTex__FP12J3DModelData = .text:0x8003A490; // type:function size:0x38C scope:local align:4 +setAlpha__FP12J3DModelData = .text:0x8003A81C; // type:function size:0x24 scope:local align:4 +addWarpMaterial__FP12J3DModelData = .text:0x8003A840; // type:function size:0x28C scope:local align:4 +__ct__11J3DTevStageFRC15J3DTevStageInfo = .text:0x8003AACC; // type:function size:0x60 scope:weak align:4 +setTexMtx__14J3DTexGenBlockFUlP9J3DTexMtx = .text:0x8003AB2C; // type:function size:0x4 scope:weak align:4 onWarpMaterial__11dRes_info_cFP12J3DModelData = .text:0x8003AB30; // type:function size:0xEC scope:global align:4 offWarpMaterial__11dRes_info_cFP12J3DModelData = .text:0x8003AC1C; // type:function size:0xEC scope:global align:4 setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff = .text:0x8003AD08; // type:function size:0x10C scope:global align:4 loaderBasicBmd__11dRes_info_cFUlPv = .text:0x8003AE14; // type:function size:0x33C scope:global align:4 -__dt__15J3DTevKColorAnmFv = .text:0x8003B150; // type:function size:0x3C scope:global align:4 -__ct__15J3DTevKColorAnmFv = .text:0x8003B18C; // type:function size:0x18 scope:global align:4 -__dt__14J3DTevColorAnmFv = .text:0x8003B1A4; // type:function size:0x3C scope:global align:4 -__ct__14J3DTevColorAnmFv = .text:0x8003B1E0; // type:function size:0x18 scope:global align:4 -__dt__11J3DTexNoAnmFv = .text:0x8003B1F8; // type:function size:0x48 scope:global align:4 -__ct__11J3DTexNoAnmFv = .text:0x8003B240; // type:function size:0x24 scope:global align:4 -__dt__12J3DTexMtxAnmFv = .text:0x8003B264; // type:function size:0x3C scope:global align:4 -__ct__12J3DTexMtxAnmFv = .text:0x8003B2A0; // type:function size:0x18 scope:global align:4 -__dt__14J3DMatColorAnmFv = .text:0x8003B2B8; // type:function size:0x3C scope:global align:4 -__ct__14J3DMatColorAnmFv = .text:0x8003B2F4; // type:function size:0x18 scope:global align:4 +__dt__15J3DTevKColorAnmFv = .text:0x8003B150; // type:function size:0x3C scope:weak align:4 +__ct__15J3DTevKColorAnmFv = .text:0x8003B18C; // type:function size:0x18 scope:weak align:4 +__dt__14J3DTevColorAnmFv = .text:0x8003B1A4; // type:function size:0x3C scope:weak align:4 +__ct__14J3DTevColorAnmFv = .text:0x8003B1E0; // type:function size:0x18 scope:weak align:4 +__dt__11J3DTexNoAnmFv = .text:0x8003B1F8; // type:function size:0x48 scope:weak align:4 +__ct__11J3DTexNoAnmFv = .text:0x8003B240; // type:function size:0x24 scope:weak align:4 +__dt__12J3DTexMtxAnmFv = .text:0x8003B264; // type:function size:0x3C scope:weak align:4 +__ct__12J3DTexMtxAnmFv = .text:0x8003B2A0; // type:function size:0x18 scope:weak align:4 +__dt__14J3DMatColorAnmFv = .text:0x8003B2B8; // type:function size:0x3C scope:weak align:4 +__ct__14J3DMatColorAnmFv = .text:0x8003B2F4; // type:function size:0x18 scope:weak align:4 loadResource__11dRes_info_cFv = .text:0x8003B30C; // type:function size:0x5C4 scope:global align:4 -__dt__18J3DAnmTransformKeyFv = .text:0x8003B8D0; // type:function size:0x6C scope:global align:4 -__dt__15J3DAnmTransformFv = .text:0x8003B93C; // type:function size:0x5C scope:global align:4 +__dt__18J3DAnmTransformKeyFv = .text:0x8003B8D0; // type:function size:0x6C scope:weak align:4 +__dt__15J3DAnmTransformFv = .text:0x8003B93C; // type:function size:0x5C scope:weak align:4 deleteArchiveRes__11dRes_info_cFv = .text:0x8003B998; // type:function size:0x104 scope:global align:4 -getArcHeader__FP10JKRArchive = .text:0x8003BA9C; // type:function size:0x28 scope:global align:4 +getArcHeader__FP10JKRArchive = .text:0x8003BA9C; // type:function size:0x28 scope:local align:4 setRes__11dRes_info_cFP10JKRArchiveP7JKRHeap = .text:0x8003BAC4; // type:function size:0x34 scope:global align:4 setRes__11dRes_info_cFv = .text:0x8003BAF8; // type:function size:0x1A0 scope:global align:4 -myGetMemBlockSize__FPv = .text:0x8003BC98; // type:function size:0x68 scope:global align:4 -myGetMemBlockSize0__FPv = .text:0x8003BD00; // type:function size:0x2C scope:global align:4 +myGetMemBlockSize__FPv = .text:0x8003BC98; // type:function size:0x68 scope:local align:4 +myGetMemBlockSize0__FPv = .text:0x8003BD00; // type:function size:0x2C scope:local align:4 dump_long__11dRes_info_cFP11dRes_info_ci = .text:0x8003BD2C; // type:function size:0x10C scope:global align:4 dump__11dRes_info_cFP11dRes_info_ci = .text:0x8003BE38; // type:function size:0x178 scope:global align:4 __dt__14dRes_control_cFv = .text:0x8003BFB0; // type:function size:0xC8 scope:global align:4 @@ -1926,12 +1924,12 @@ setObjectRes__14dRes_control_cFPCcPvUlP7JKRHeap = .text:0x8003C4E4; // type:func setStageRes__14dRes_control_cFPCcP7JKRHeap = .text:0x8003C5BC; // type:function size:0x7C scope:global align:4 dump__14dRes_control_cFv = .text:0x8003C638; // type:function size:0x80 scope:global align:4 getObjectResName2Index__14dRes_control_cFPCcPCc = .text:0x8003C6B8; // type:function size:0x7C scope:global align:4 -__dt__10J3DAnmBaseFv = .text:0x8003C734; // type:function size:0x48 scope:global align:4 -getKind__15J3DAnmTransformCFv = .text:0x8003C77C; // type:function size:0x8 scope:global align:4 -__dt__18mDoExt_transAnmBasFv = .text:0x8003C784; // type:function size:0x7C scope:global align:4 -getKind__18J3DAnmTransformKeyCFv = .text:0x8003C800; // type:function size:0x8 scope:global align:4 -getTransform__18J3DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8003C808; // type:function size:0x24 scope:global align:4 -calc__11J3DTexNoAnmCFPUs = .text:0x8003C82C; // type:function size:0x30 scope:global align:4 +__dt__10J3DAnmBaseFv = .text:0x8003C734; // type:function size:0x48 scope:weak align:4 +getKind__15J3DAnmTransformCFv = .text:0x8003C77C; // type:function size:0x8 scope:weak align:4 +__dt__18mDoExt_transAnmBasFv = .text:0x8003C784; // type:function size:0x7C scope:weak align:4 +getKind__18J3DAnmTransformKeyCFv = .text:0x8003C800; // type:function size:0x8 scope:weak align:4 +getTransform__18J3DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8003C808; // type:function size:0x24 scope:weak align:4 +calc__11J3DTexNoAnmCFPUs = .text:0x8003C82C; // type:function size:0x30 scope:weak align:4 create__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003C85C; // type:function size:0x98 scope:global align:4 remove__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003C8F4; // type:function size:0x58 scope:global align:4 rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class = .text:0x8003C94C; // type:function size:0xF4 scope:global align:4 @@ -1951,7 +1949,7 @@ renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class = .text: getDecoLineColor__18dRenderingFDAmap_cFii = .text:0x8003D68C; // type:function size:0x2C scope:global align:4 getDecorationLineWidth__18dRenderingFDAmap_cFi = .text:0x8003D6B8; // type:function size:0x2C scope:global align:4 __sinit_d_map_path_cpp = .text:0x8003D6E4; // type:function size:0x5C scope:local align:4 -__dt__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003D740; // type:function size:0x50 scope:global align:4 +__dt__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003D740; // type:function size:0x50 scope:weak align:4 addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s = .text:0x8003D790; // type:function size:0x88 scope:global align:4 isArrival__22dMenu_Fmap_room_data_cFv = .text:0x8003D818; // type:function size:0x50 scope:global align:4 buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii = .text:0x8003D868; // type:function size:0xC4 scope:global align:4 @@ -1974,9 +1972,9 @@ nextData__22dMenuFmapIconPointer_cFv = .text:0x8003E490; // type:function size:0 getValidData__22dMenuFmapIconPointer_cFv = .text:0x8003E510; // type:function size:0x68 scope:global align:4 getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s = .text:0x8003E578; // type:function size:0x170 scope:global align:4 isDrawDisp__19dMenuFmapIconDisp_cFv = .text:0x8003E6E8; // type:function size:0x428 scope:global align:4 -__dt__26fmpTresTypeGroupDataList_cFv = .text:0x8003EB10; // type:function size:0x60 scope:global align:4 -__dt__22fmpTresTypeGroupData_cFv = .text:0x8003EB70; // type:function size:0x120 scope:global align:4 -__ct__26fmpTresTypeGroupDataList_cFv = .text:0x8003EC90; // type:function size:0x10 scope:global align:4 +__dt__26fmpTresTypeGroupDataList_cFv = .text:0x8003EB10; // type:function size:0x60 scope:weak align:4 +__dt__22fmpTresTypeGroupData_cFv = .text:0x8003EB70; // type:function size:0x120 scope:weak align:4 +__ct__26fmpTresTypeGroupDataList_cFv = .text:0x8003EC90; // type:function size:0x10 scope:weak align:4 chkGetCompass__10dMapInfo_nFv = .text:0x8003ECA0; // type:function size:0x38 scope:global align:4 chkGetMap__10dMapInfo_nFv = .text:0x8003ECD8; // type:function size:0x38 scope:global align:4 isVisitedRoom__10dMapInfo_nFi = .text:0x8003ED10; // type:function size:0x50 scope:global align:4 @@ -2044,8 +2042,8 @@ drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff = .text:0x80041208; // t drawCursor__28renderingPlusDoorAndCursor_cFRC3Vecsif = .text:0x800412C0; // type:function size:0x19C scope:global align:4 beforeDrawPath__19renderingPlusDoor_cFv = .text:0x8004145C; // type:function size:0x4 scope:global align:4 __sinit_d_map_path_dmap_cpp = .text:0x80041460; // type:function size:0x20 scope:local align:4 -event_debug_evnt__21@unnamed@d_event_cpp@Fv = .text:0x80041480; // type:function size:0x8 scope:global align:4 -clear_tmpflag_for_message__21@unnamed@d_event_cpp@Fv = .text:0x80041488; // type:function size:0xF8 scope:global align:4 +event_debug_evnt__21@unnamed@d_event_cpp@Fv = .text:0x80041480; // type:function size:0x8 scope:local align:4 +clear_tmpflag_for_message__21@unnamed@d_event_cpp@Fv = .text:0x80041488; // type:function size:0xF8 scope:local align:4 __ct__14dEvt_control_cFv = .text:0x80041580; // type:function size:0x54 scope:global align:4 __ct__12dEvt_order_cFv = .text:0x800415D4; // type:function size:0x4 scope:global align:4 orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv = .text:0x800415D8; // type:function size:0x90 scope:global align:4 @@ -2102,10 +2100,10 @@ setPtI__14dEvt_control_cFPv = .text:0x800436BC; // type:function size:0x30 scope setPtI_Id__14dEvt_control_cFUi = .text:0x800436EC; // type:function size:0x8 scope:global align:4 setPtD__14dEvt_control_cFPv = .text:0x800436F4; // type:function size:0x30 scope:global align:4 setGtItm__14dEvt_control_cFUc = .text:0x80043724; // type:function size:0x8 scope:global align:4 -getTelopNo__FPCc = .text:0x8004372C; // type:function size:0x98 scope:global align:4 -getTelopNo__Fv = .text:0x800437C4; // type:function size:0x2C scope:global align:4 -getStartTelopNo__Fv = .text:0x800437F0; // type:function size:0x224 scope:global align:4 -dEvDt_Next_Stage__Fii = .text:0x80043A14; // type:function size:0x34C scope:global align:4 +getTelopNo__FPCc = .text:0x8004372C; // type:function size:0x98 scope:local align:4 +getTelopNo__Fv = .text:0x800437C4; // type:function size:0x2C scope:local align:4 +getStartTelopNo__Fv = .text:0x800437F0; // type:function size:0x224 scope:local align:4 +dEvDt_Next_Stage__Fii = .text:0x80043A14; // type:function size:0x34C scope:local align:4 flagCheck__11dEvDtFlag_cFi = .text:0x80043D60; // type:function size:0x68 scope:global align:4 flagSet__11dEvDtFlag_cFi = .text:0x80043DC8; // type:function size:0x68 scope:global align:4 flagMaxCheck__11dEvDtFlag_cFi = .text:0x80043E30; // type:function size:0x28 scope:global align:4 @@ -2136,7 +2134,7 @@ setStartDemo__18dEvent_exception_cFi = .text:0x800463F0; // type:function size:0 getEventName__18dEvent_exception_cFv = .text:0x80046480; // type:function size:0x168 scope:global align:4 getSubstance__16dEvent_manager_cFP11dEvDtData_ci = .text:0x800465E8; // type:function size:0xA0 scope:global align:4 __ct__16dEvent_manager_cFv = .text:0x80046688; // type:function size:0x58 scope:global align:4 -__ct__11dEvDtBase_cFv = .text:0x800466E0; // type:function size:0x30 scope:global align:4 +__ct__11dEvDtBase_cFv = .text:0x800466E0; // type:function size:0x30 scope:weak align:4 create__16dEvent_manager_cFv = .text:0x80046710; // type:function size:0xF0 scope:global align:4 setObjectArchive__16dEvent_manager_cFPc = .text:0x80046800; // type:function size:0x88 scope:global align:4 demoInit__16dEvent_manager_cFv = .text:0x80046888; // type:function size:0x7C scope:global align:4 @@ -2144,9 +2142,9 @@ roomInit__16dEvent_manager_cFi = .text:0x80046904; // type:function size:0xE8 sc roomFinish__16dEvent_manager_cFi = .text:0x800469EC; // type:function size:0x6C scope:global align:4 orderStartDemo__16dEvent_manager_cFv = .text:0x80046A58; // type:function size:0x1B4 scope:global align:4 remove__16dEvent_manager_cFv = .text:0x80046C0C; // type:function size:0x68 scope:global align:4 -extraOnObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C74; // type:function size:0x14 scope:global align:4 -extraOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C88; // type:function size:0x14 scope:global align:4 -allOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C9C; // type:function size:0x1C scope:global align:4 +extraOnObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C74; // type:function size:0x14 scope:local align:4 +extraOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C88; // type:function size:0x14 scope:local align:4 +allOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046C9C; // type:function size:0x1C scope:local align:4 startProc__16dEvent_manager_cFP12dEvDtEvent_c = .text:0x80046CB8; // type:function size:0xE8 scope:global align:4 closeProc__16dEvent_manager_cFP12dEvDtEvent_c = .text:0x80046DA0; // type:function size:0xC scope:global align:4 endProc__16dEvent_manager_cFsi = .text:0x80046DAC; // type:function size:0xB8 scope:global align:4 @@ -2165,7 +2163,7 @@ endCheck__16dEvent_manager_cFs = .text:0x80047A78; // type:function size:0x64 sc endCheckOld__16dEvent_manager_cFPCc = .text:0x80047ADC; // type:function size:0x40 scope:global align:4 getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci = .text:0x80047B1C; // type:function size:0x230 scope:global align:4 getIsAddvance__16dEvent_manager_cFi = .text:0x80047D4C; // type:function size:0x60 scope:global align:4 -dEvmng_strcmp__FPCcPc = .text:0x80047DAC; // type:function size:0x64 scope:global align:4 +dEvmng_strcmp__FPCcPc = .text:0x80047DAC; // type:function size:0x64 scope:local align:4 getMyActIdx__16dEvent_manager_cFiPCPCciii = .text:0x80047E10; // type:function size:0x14C scope:global align:4 getMyNowCutName__16dEvent_manager_cFi = .text:0x80047F5C; // type:function size:0x6C scope:global align:4 getMyDataP__16dEvent_manager_cFiPCci = .text:0x80047FC8; // type:function size:0x124 scope:global align:4 @@ -2178,10 +2176,10 @@ cancelStaff__16dEvent_manager_cFPCc = .text:0x80048348; // type:function size:0x setGoal__16dEvent_manager_cFP4cXyz = .text:0x800483C4; // type:function size:0x1C scope:global align:4 getGoal__16dEvent_manager_cFv = .text:0x800483E0; // type:function size:0x8 scope:global align:4 getRunEventName__16dEvent_manager_cFv = .text:0x800483E8; // type:function size:0x84 scope:global align:4 -findShutterCallBack__FP10fopAc_ac_cPv = .text:0x8004846C; // type:function size:0xB4 scope:global align:4 +findShutterCallBack__FP10fopAc_ac_cPv = .text:0x8004846C; // type:function size:0xB4 scope:local align:4 specialCast_Shutter__16dEvent_manager_cFsi = .text:0x80048520; // type:function size:0xF8 scope:global align:4 specialCast__16dEvent_manager_cFPCci = .text:0x80048618; // type:function size:0x130 scope:global align:4 -dEv_talkman_get_action__Fi = .text:0x80048748; // type:function size:0xA8 scope:global align:4 +dEv_talkman_get_action__Fi = .text:0x80048748; // type:function size:0xA8 scope:local align:4 ChkPresentEnd__16dEvent_manager_cFv = .text:0x800487F0; // type:function size:0x3C scope:global align:4 checkStartDemo__16dEvent_manager_cFv = .text:0x8004882C; // type:function size:0x40 scope:global align:4 eventUpdate__17dEvLib_callback_cFv = .text:0x8004886C; // type:function size:0x38 scope:global align:4 @@ -2195,7 +2193,7 @@ executeStart__17dEvLib_callback_cFv = .text:0x80048A70; // type:function size:0x initRun__17dEvLib_callback_cFv = .text:0x80048B1C; // type:function size:0x2C scope:global align:4 executeRun__17dEvLib_callback_cFv = .text:0x80048B48; // type:function size:0x90 scope:global align:4 __sinit_d_event_lib_cpp = .text:0x80048BD8; // type:function size:0x7C scope:local align:4 -dSmplMdl_modelUpdateDL__FP8J3DModel = .text:0x80048C54; // type:function size:0x60 scope:global align:4 +dSmplMdl_modelUpdateDL__FP8J3DModel = .text:0x80048C54; // type:function size:0x60 scope:local align:4 __ct__15dSmplMdl_draw_cFv = .text:0x80048CB4; // type:function size:0xAC scope:global align:4 __ct__12diff_model_cFv = .text:0x80048D60; // type:function size:0x20 scope:global align:4 __dt__15dSmplMdl_draw_cFv = .text:0x80048D80; // type:function size:0x8C scope:global align:4 @@ -2358,16 +2356,16 @@ setEffectTwo__8dPaPoT_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC5csXyz clearTwoAllID__8dPaPoT_cFv = .text:0x80051294; // type:function size:0x54 scope:global align:4 setEffectFour__8dPaPoF_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff = .text:0x800512E8; // type:function size:0x13C scope:global align:4 clearFourAllID__8dPaPoF_cFv = .text:0x80051424; // type:function size:0x4C scope:global align:4 -getRightEffType__8dPaPoT_cCFi = .text:0x80051470; // type:function size:0xC scope:global align:4 -getLeftEffType__8dPaPoT_cCFi = .text:0x8005147C; // type:function size:0xC scope:global align:4 -getCenterEffType__7dPaPo_cCFi = .text:0x80051488; // type:function size:0xC scope:global align:4 -getRightEmitter__8dPaPoT_cFii = .text:0x80051494; // type:function size:0x48 scope:global align:4 -getLeftEmitter__8dPaPoT_cFii = .text:0x800514DC; // type:function size:0x48 scope:global align:4 -getCenterEmitter__7dPaPo_cFii = .text:0x80051524; // type:function size:0x48 scope:global align:4 -getBackRightEffType__8dPaPoF_cCFi = .text:0x8005156C; // type:function size:0xC scope:global align:4 -getBackLeftEffType__8dPaPoF_cCFi = .text:0x80051578; // type:function size:0xC scope:global align:4 -getBackRightEmitter__8dPaPoF_cFii = .text:0x80051584; // type:function size:0x48 scope:global align:4 -getBackLeftEmitter__8dPaPoF_cFii = .text:0x800515CC; // type:function size:0x48 scope:global align:4 +getRightEffType__8dPaPoT_cCFi = .text:0x80051470; // type:function size:0xC scope:weak align:4 +getLeftEffType__8dPaPoT_cCFi = .text:0x8005147C; // type:function size:0xC scope:weak align:4 +getCenterEffType__7dPaPo_cCFi = .text:0x80051488; // type:function size:0xC scope:weak align:4 +getRightEmitter__8dPaPoT_cFii = .text:0x80051494; // type:function size:0x48 scope:weak align:4 +getLeftEmitter__8dPaPoT_cFii = .text:0x800514DC; // type:function size:0x48 scope:weak align:4 +getCenterEmitter__7dPaPo_cFii = .text:0x80051524; // type:function size:0x48 scope:weak align:4 +getBackRightEffType__8dPaPoF_cCFi = .text:0x8005156C; // type:function size:0xC scope:weak align:4 +getBackLeftEffType__8dPaPoF_cCFi = .text:0x80051578; // type:function size:0xC scope:weak align:4 +getBackRightEmitter__8dPaPoF_cFii = .text:0x80051584; // type:function size:0x48 scope:weak align:4 +getBackLeftEmitter__8dPaPoF_cFii = .text:0x800515CC; // type:function size:0x48 scope:weak align:4 __sinit_d_particle_copoly_cpp = .text:0x80051614; // type:function size:0x19C scope:local align:4 dPath_GetPnt__FPC5dPathi = .text:0x800517B0; // type:function size:0x3C scope:global align:4 dPath_GetRoomPath__Fii = .text:0x800517EC; // type:function size:0xAC scope:global align:4 @@ -2385,17 +2383,17 @@ init__12dDlst_2DT2_cFP7ResTIMGffffUcUcUcff = .text:0x80052B4C; // type:function draw__11dDlst_2DM_cFv = .text:0x80052C58; // type:function size:0x4D4 scope:global align:4 draw__11dDlst_2Dm_cFv = .text:0x8005312C; // type:function size:0x520 scope:global align:4 draw__12dDlst_2DMt_cFv = .text:0x8005364C; // type:function size:0x390 scope:global align:4 -getTexture__10J2DPictureCFUc = .text:0x800539DC; // type:function size:0x24 scope:global align:4 +getTexture__10J2DPictureCFUc = .text:0x800539DC; // type:function size:0x24 scope:weak align:4 __ct__10dDlst_2D_cFP7ResTIMGssssUc = .text:0x80053A00; // type:function size:0x9C scope:global align:4 draw__10dDlst_2D_cFv = .text:0x80053A9C; // type:function size:0xC8 scope:global align:4 draw__11dDlst_blo_cFv = .text:0x80053B64; // type:function size:0x3C scope:global align:4 -clearAnmTransform__9J2DScreenFv = .text:0x80053BA0; // type:function size:0x20 scope:global align:4 -calcMtx__7J2DPaneFv = .text:0x80053BC0; // type:function size:0x40 scope:global align:4 -makeMatrix__7J2DPaneFff = .text:0x80053C00; // type:function size:0x3C scope:global align:4 -getTypeID__7J2DPaneCFv = .text:0x80053C3C; // type:function size:0x8 scope:global align:4 -setWhite__10J2DPictureFQ28JUtility6TColor = .text:0x80053C44; // type:function size:0x28 scope:global align:4 -setBlack__10J2DPictureFQ28JUtility6TColor = .text:0x80053C6C; // type:function size:0x28 scope:global align:4 -__dt__10J2DAnmBaseFv = .text:0x80053C94; // type:function size:0x48 scope:global align:4 +clearAnmTransform__9J2DScreenFv = .text:0x80053BA0; // type:function size:0x20 scope:weak align:4 +calcMtx__7J2DPaneFv = .text:0x80053BC0; // type:function size:0x40 scope:weak align:4 +makeMatrix__7J2DPaneFff = .text:0x80053C00; // type:function size:0x3C scope:weak align:4 +getTypeID__7J2DPaneCFv = .text:0x80053C3C; // type:function size:0x8 scope:weak align:4 +setWhite__10J2DPictureFQ28JUtility6TColor = .text:0x80053C44; // type:function size:0x28 scope:weak align:4 +setBlack__10J2DPictureFQ28JUtility6TColor = .text:0x80053C6C; // type:function size:0x28 scope:weak align:4 +__dt__10J2DAnmBaseFv = .text:0x80053C94; // type:function size:0x48 scope:weak align:4 init__8cM_rnd_cFiii = .text:0x80053CDC; // type:function size:0x10 scope:global align:4 get__8cM_rnd_cFv = .text:0x80053CEC; // type:function size:0xF4 scope:global align:4 getF__8cM_rnd_cFf = .text:0x80053DE0; // type:function size:0x38 scope:global align:4 @@ -2405,14 +2403,14 @@ draw__18dDlst_effectLine_cFv = .text:0x80053E9C; // type:function size:0x358 sco update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff = .text:0x800541F4; // type:function size:0x94 scope:global align:4 set__18dDlst_shadowPoly_cFP10cBgD_Vtx_tUsUsUsP8cM3dGPla = .text:0x80054288; // type:function size:0x12C scope:global align:4 draw__18dDlst_shadowPoly_cFv = .text:0x800543B4; // type:function size:0xC4 scope:global align:4 -J3DDrawBuffer__create__FUl = .text:0x80054478; // type:function size:0x78 scope:global align:4 +J3DDrawBuffer__create__FUl = .text:0x80054478; // type:function size:0x78 scope:local align:4 reset__18dDlst_shadowReal_cFv = .text:0x800544F0; // type:function size:0x10 scope:global align:4 imageDraw__18dDlst_shadowReal_cFPA4_f = .text:0x80054500; // type:function size:0xD4 scope:global align:4 draw__18dDlst_shadowReal_cFv = .text:0x800545D4; // type:function size:0xB4 scope:global align:4 -psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla = .text:0x80054688; // type:function size:0x1CC scope:global align:4 -realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c = .text:0x80054854; // type:function size:0x218 scope:global align:4 -__dt__14ShdwDrawPoly_cFv = .text:0x80054A6C; // type:function size:0x60 scope:global align:4 -setkankyoShadow__FP12dKy_tevstr_cPf = .text:0x80054ACC; // type:function size:0x104 scope:global align:4 +psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla = .text:0x80054688; // type:function size:0x1CC scope:local align:4 +realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c = .text:0x80054854; // type:function size:0x218 scope:local align:4 +__dt__14ShdwDrawPoly_cFv = .text:0x80054A6C; // type:function size:0x60 scope:weak align:4 +setkankyoShadow__FP12dKy_tevstr_cPf = .text:0x80054ACC; // type:function size:0x104 scope:local align:4 setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c = .text:0x80054BD0; // type:function size:0x458 scope:global align:4 set__18dDlst_shadowReal_cFUlP8J3DModelP4cXyzffP12dKy_tevstr_cff = .text:0x80055028; // type:function size:0x1AC scope:global align:4 add__18dDlst_shadowReal_cFP8J3DModel = .text:0x800551D4; // type:function size:0x38 scope:global align:4 @@ -2429,11 +2427,11 @@ setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG = .text:0x80055FE8; // type:fun newData__13dDlst_peekZ_cFssPUl = .text:0x80056018; // type:function size:0x68 scope:global align:4 peekData__13dDlst_peekZ_cFv = .text:0x80056080; // type:function size:0x70 scope:global align:4 __ct__12dDlst_list_cFv = .text:0x800560F0; // type:function size:0xD8 scope:global align:4 -__ct__26mDoExt_3DlineMatSortPacketFv = .text:0x800561C8; // type:function size:0x30 scope:global align:4 -__dt__18dDlst_shadowReal_cFv = .text:0x800561F8; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_shadowTri_cFv = .text:0x80056270; // type:function size:0x60 scope:global align:4 -__ct__18dDlst_shadowReal_cFv = .text:0x800562D0; // type:function size:0x74 scope:global align:4 -__ct__17dDlst_shadowTri_cFv = .text:0x80056344; // type:function size:0x48 scope:global align:4 +__ct__26mDoExt_3DlineMatSortPacketFv = .text:0x800561C8; // type:function size:0x30 scope:weak align:4 +__dt__18dDlst_shadowReal_cFv = .text:0x800561F8; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_shadowTri_cFv = .text:0x80056270; // type:function size:0x60 scope:weak align:4 +__ct__18dDlst_shadowReal_cFv = .text:0x800562D0; // type:function size:0x74 scope:weak align:4 +__ct__17dDlst_shadowTri_cFv = .text:0x80056344; // type:function size:0x48 scope:weak align:4 __ct__20dDlst_shadowSimple_cFv = .text:0x8005638C; // type:function size:0x4 scope:global align:4 init__12dDlst_list_cFv = .text:0x80056390; // type:function size:0xFC scope:global align:4 __dt__12dDlst_list_cFv = .text:0x8005648C; // type:function size:0xAC scope:global align:4 @@ -2448,9 +2446,9 @@ draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c = .text:0x800567C4; // typ wipeIn__12dDlst_list_cFfR8_GXColor = .text:0x8005681C; // type:function size:0xBC scope:global align:4 wipeIn__12dDlst_list_cFf = .text:0x800568D8; // type:function size:0x28 scope:global align:4 calcWipe__12dDlst_list_cFv = .text:0x80056900; // type:function size:0xA0 scope:global align:4 -getTri__22dDlst_shadowRealPoly_cFv = .text:0x800569A0; // type:function size:0x8 scope:global align:4 -getTriMax__22dDlst_shadowRealPoly_cFv = .text:0x800569A8; // type:function size:0x8 scope:global align:4 -searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen = .text:0x800569B0; // type:function size:0x4 scope:global align:4 +getTri__22dDlst_shadowRealPoly_cFv = .text:0x800569A0; // type:function size:0x8 scope:weak align:4 +getTriMax__22dDlst_shadowRealPoly_cFv = .text:0x800569A8; // type:function size:0x8 scope:weak align:4 +searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen = .text:0x800569B0; // type:function size:0x4 scope:weak align:4 __sinit_d_drawlist_cpp = .text:0x800569B4; // type:function size:0x28 scope:local align:4 dKyd_dmpalet_getp__Fv = .text:0x800569DC; // type:function size:0xC scope:global align:4 dKyd_dmpselect_getp__Fv = .text:0x800569E8; // type:function size:0xC scope:global align:4 @@ -2464,10 +2462,10 @@ dKyd_darkworld_tbl_getp__Fv = .text:0x80056A70; // type:function size:0xC scope: dKyd_light_size_tbl_getp__Fv = .text:0x80056A7C; // type:function size:0xC scope:global align:4 dKyd_light_tw_size_tbl_getp__Fv = .text:0x80056A88; // type:function size:0xC scope:global align:4 dKyd_BloomInf_tbl_getp__Fi = .text:0x80056A94; // type:function size:0x14 scope:global align:4 -dKyw_setDrawPacketList__FP9J3DPacketi = .text:0x80056AA8; // type:function size:0x50 scope:global align:4 -dKyw_setDrawPacketListIndScreen__FP9J3DPacketi = .text:0x80056AF8; // type:function size:0x50 scope:global align:4 -dKyw_setDrawPacketListSky__FP9J3DPacketi = .text:0x80056B48; // type:function size:0x90 scope:global align:4 -dKyw_setDrawPacketListXluBg__FP9J3DPacketi = .text:0x80056BD8; // type:function size:0x88 scope:global align:4 +dKyw_setDrawPacketList__FP9J3DPacketi = .text:0x80056AA8; // type:function size:0x50 scope:local align:4 +dKyw_setDrawPacketListIndScreen__FP9J3DPacketi = .text:0x80056AF8; // type:function size:0x50 scope:local align:4 +dKyw_setDrawPacketListSky__FP9J3DPacketi = .text:0x80056B48; // type:function size:0x90 scope:local align:4 +dKyw_setDrawPacketListXluBg__FP9J3DPacketi = .text:0x80056BD8; // type:function size:0x88 scope:local align:4 draw__18dKankyo_sun_PacketFv = .text:0x80056C60; // type:function size:0x38 scope:global align:4 draw__22dKankyo_sunlenz_PacketFv = .text:0x80056C98; // type:function size:0x38 scope:global align:4 __dt__8RAIN_EFFFv = .text:0x80056CD0; // type:function size:0x3C scope:global align:4 @@ -2497,30 +2495,30 @@ draw__18dKankyo_mud_PacketFv = .text:0x8005703C; // type:function size:0x30 scop __dt__11EF_EVIL_EFFFv = .text:0x8005706C; // type:function size:0x3C scope:global align:4 __ct__11EF_EVIL_EFFFv = .text:0x800570A8; // type:function size:0x4 scope:global align:4 draw__19dKankyo_evil_PacketFv = .text:0x800570AC; // type:function size:0x30 scope:global align:4 -dKyw_drawSun__Fi = .text:0x800570DC; // type:function size:0x30 scope:global align:4 -dKyw_Sun_Draw__Fv = .text:0x8005710C; // type:function size:0x24 scope:global align:4 -dKyw_drawSunlenz__Fi = .text:0x80057130; // type:function size:0x44 scope:global align:4 -dKyw_Sunlenz_Draw__Fv = .text:0x80057174; // type:function size:0x24 scope:global align:4 -dKyw_drawRain__Fi = .text:0x80057198; // type:function size:0x30 scope:global align:4 -dKyw_Rain_Draw__Fv = .text:0x800571C8; // type:function size:0x24 scope:global align:4 -dKyw_drawSnow__Fi = .text:0x800571EC; // type:function size:0x30 scope:global align:4 -dKyw_Snow_Draw__Fv = .text:0x8005721C; // type:function size:0x24 scope:global align:4 -dKyw_drawStar__Fi = .text:0x80057240; // type:function size:0x30 scope:global align:4 -dKyw_Star_Draw__Fv = .text:0x80057270; // type:function size:0x24 scope:global align:4 -dKyw_drawHousi__Fi = .text:0x80057294; // type:function size:0x30 scope:global align:4 -dKyw_Housi_Draw__Fv = .text:0x800572C4; // type:function size:0x24 scope:global align:4 -dKyw_drawCloud__Fi = .text:0x800572E8; // type:function size:0x30 scope:global align:4 -dKyw_Cloud_Draw__Fv = .text:0x80057318; // type:function size:0x24 scope:global align:4 -dKyw_drawVrkumo__Fi = .text:0x8005733C; // type:function size:0x30 scope:global align:4 -dKyw_Vrkumo_Draw__Fv = .text:0x8005736C; // type:function size:0x24 scope:global align:4 -dKyw_shstar_packet__Fi = .text:0x80057390; // type:function size:0x30 scope:global align:4 -dKyw_shstar_Draw__Fv = .text:0x800573C0; // type:function size:0x24 scope:global align:4 -dKyw_odour_packet__Fi = .text:0x800573E4; // type:function size:0x30 scope:global align:4 -dKyw_Odour_Draw__Fv = .text:0x80057414; // type:function size:0x24 scope:global align:4 -dKyw_mud_packet__Fi = .text:0x80057438; // type:function size:0x30 scope:global align:4 -dKyw_mud_Draw__Fv = .text:0x80057468; // type:function size:0x24 scope:global align:4 -dKyw_evil_packet__Fi = .text:0x8005748C; // type:function size:0x30 scope:global align:4 -dKyw_evil_Draw__Fv = .text:0x800574BC; // type:function size:0x24 scope:global align:4 +dKyw_drawSun__Fi = .text:0x800570DC; // type:function size:0x30 scope:local align:4 +dKyw_Sun_Draw__Fv = .text:0x8005710C; // type:function size:0x24 scope:local align:4 +dKyw_drawSunlenz__Fi = .text:0x80057130; // type:function size:0x44 scope:local align:4 +dKyw_Sunlenz_Draw__Fv = .text:0x80057174; // type:function size:0x24 scope:local align:4 +dKyw_drawRain__Fi = .text:0x80057198; // type:function size:0x30 scope:local align:4 +dKyw_Rain_Draw__Fv = .text:0x800571C8; // type:function size:0x24 scope:local align:4 +dKyw_drawSnow__Fi = .text:0x800571EC; // type:function size:0x30 scope:local align:4 +dKyw_Snow_Draw__Fv = .text:0x8005721C; // type:function size:0x24 scope:local align:4 +dKyw_drawStar__Fi = .text:0x80057240; // type:function size:0x30 scope:local align:4 +dKyw_Star_Draw__Fv = .text:0x80057270; // type:function size:0x24 scope:local align:4 +dKyw_drawHousi__Fi = .text:0x80057294; // type:function size:0x30 scope:local align:4 +dKyw_Housi_Draw__Fv = .text:0x800572C4; // type:function size:0x24 scope:local align:4 +dKyw_drawCloud__Fi = .text:0x800572E8; // type:function size:0x30 scope:local align:4 +dKyw_Cloud_Draw__Fv = .text:0x80057318; // type:function size:0x24 scope:local align:4 +dKyw_drawVrkumo__Fi = .text:0x8005733C; // type:function size:0x30 scope:local align:4 +dKyw_Vrkumo_Draw__Fv = .text:0x8005736C; // type:function size:0x24 scope:local align:4 +dKyw_shstar_packet__Fi = .text:0x80057390; // type:function size:0x30 scope:local align:4 +dKyw_shstar_Draw__Fv = .text:0x800573C0; // type:function size:0x24 scope:local align:4 +dKyw_odour_packet__Fi = .text:0x800573E4; // type:function size:0x30 scope:local align:4 +dKyw_Odour_Draw__Fv = .text:0x80057414; // type:function size:0x24 scope:local align:4 +dKyw_mud_packet__Fi = .text:0x80057438; // type:function size:0x30 scope:local align:4 +dKyw_mud_Draw__Fv = .text:0x80057468; // type:function size:0x24 scope:local align:4 +dKyw_evil_packet__Fi = .text:0x8005748C; // type:function size:0x30 scope:local align:4 +dKyw_evil_Draw__Fv = .text:0x800574BC; // type:function size:0x24 scope:local align:4 dKyw_wether_init__Fv = .text:0x800574E0; // type:function size:0x50C scope:global align:4 dKyw_wether_init2__Fv = .text:0x800579EC; // type:function size:0x18 scope:global align:4 dKyw_wether_delete__Fv = .text:0x80057A04; // type:function size:0x280 scope:global align:4 @@ -2536,37 +2534,37 @@ __dt__22dKankyo_sunlenz_PacketFv = .text:0x800580A4; // type:function size:0x84 __dt__18dKankyo_sun_PacketFv = .text:0x80058128; // type:function size:0x84 scope:global align:4 dKyw_wether_delete2__Fv = .text:0x800581AC; // type:function size:0x60 scope:global align:4 __dt__21dKankyo_vrkumo_PacketFv = .text:0x8005820C; // type:function size:0x84 scope:global align:4 -wether_move_thunder__Fv = .text:0x80058290; // type:function size:0x68 scope:global align:4 +wether_move_thunder__Fv = .text:0x80058290; // type:function size:0x68 scope:local align:4 dKyw_wether_move__Fv = .text:0x800582F8; // type:function size:0x20 scope:global align:4 -wether_move_sun__Fv = .text:0x80058318; // type:function size:0x57C scope:global align:4 -wether_move_rain__Fv = .text:0x80058894; // type:function size:0x26C scope:global align:4 -wether_move_snow__Fv = .text:0x80058B00; // type:function size:0x8C scope:global align:4 -wether_move_star__Fv = .text:0x80058B8C; // type:function size:0x38C scope:global align:4 -wether_move_housi__Fv = .text:0x80058F18; // type:function size:0x4C4 scope:global align:4 -wether_move_odour__Fv = .text:0x800593DC; // type:function size:0x1A4 scope:global align:4 -wether_move_moya__Fv = .text:0x80059580; // type:function size:0x1A8 scope:global align:4 -wether_move_vrkumo__Fv = .text:0x80059728; // type:function size:0x710 scope:global align:4 -wether_move_mud__Fv = .text:0x80059E38; // type:function size:0x13C scope:global align:4 -wether_move_evil__Fv = .text:0x80059F74; // type:function size:0x144 scope:global align:4 +wether_move_sun__Fv = .text:0x80058318; // type:function size:0x57C scope:local align:4 +wether_move_rain__Fv = .text:0x80058894; // type:function size:0x26C scope:local align:4 +wether_move_snow__Fv = .text:0x80058B00; // type:function size:0x8C scope:local align:4 +wether_move_star__Fv = .text:0x80058B8C; // type:function size:0x38C scope:local align:4 +wether_move_housi__Fv = .text:0x80058F18; // type:function size:0x4C4 scope:local align:4 +wether_move_odour__Fv = .text:0x800593DC; // type:function size:0x1A4 scope:local align:4 +wether_move_moya__Fv = .text:0x80059580; // type:function size:0x1A8 scope:local align:4 +wether_move_vrkumo__Fv = .text:0x80059728; // type:function size:0x710 scope:local align:4 +wether_move_mud__Fv = .text:0x80059E38; // type:function size:0x13C scope:local align:4 +wether_move_evil__Fv = .text:0x80059F74; // type:function size:0x144 scope:local align:4 dKyw_wether_move_draw__Fv = .text:0x8005A0B8; // type:function size:0x9C scope:global align:4 dKyw_wether_move_draw2__Fv = .text:0x8005A154; // type:function size:0x20 scope:global align:4 dKyw_wether_draw__Fv = .text:0x8005A174; // type:function size:0x190 scope:global align:4 dKyw_wether_draw2__Fv = .text:0x8005A304; // type:function size:0x3C scope:global align:4 dKyw_wether_proc__Fv = .text:0x8005A340; // type:function size:0x23C scope:global align:4 -dKyw_wind_init__Fv = .text:0x8005A57C; // type:function size:0x44 scope:global align:4 +dKyw_wind_init__Fv = .text:0x8005A57C; // type:function size:0x44 scope:local align:4 dKyw_wind_set__Fv = .text:0x8005A5C0; // type:function size:0x520 scope:global align:4 dKyw_get_wind_vec__Fv = .text:0x8005AAE0; // type:function size:0x10 scope:global align:4 dKyw_get_wind_pow__Fv = .text:0x8005AAF0; // type:function size:0x10 scope:global align:4 dKyw_get_wind_vecpow__Fv = .text:0x8005AB00; // type:function size:0x64 scope:global align:4 dKyw_plight_collision_set__FP4cXyzssfffff = .text:0x8005AB64; // type:function size:0xCC scope:global align:4 -squal_proc__Fv = .text:0x8005AC30; // type:function size:0x114 scope:global align:4 -dKyw_pntwind_init__Fv = .text:0x8005AD44; // type:function size:0x54 scope:global align:4 -pntwind_set__FP14WIND_INFLUENCE = .text:0x8005AD98; // type:function size:0x64 scope:global align:4 +squal_proc__Fv = .text:0x8005AC30; // type:function size:0x114 scope:local align:4 +dKyw_pntwind_init__Fv = .text:0x8005AD44; // type:function size:0x54 scope:local align:4 +pntwind_set__FP14WIND_INFLUENCE = .text:0x8005AD98; // type:function size:0x64 scope:local align:4 dKyw_pntwind_set__FP14WIND_INFLUENCE = .text:0x8005ADFC; // type:function size:0x2C scope:global align:4 -dKyw_pntlight_set__FP14WIND_INFLUENCE = .text:0x8005AE28; // type:function size:0x30 scope:global align:4 +dKyw_pntlight_set__FP14WIND_INFLUENCE = .text:0x8005AE28; // type:function size:0x30 scope:local align:4 dKyw_pntwind_cut__FP14WIND_INFLUENCE = .text:0x8005AE58; // type:function size:0x38 scope:global align:4 -pntwind_get_info__FP4cXyzP4cXyzPfUc = .text:0x8005AE90; // type:function size:0x3AC scope:global align:4 -dKyw_pntwind_get_info__FP4cXyzP4cXyzPf = .text:0x8005B23C; // type:function size:0x24 scope:global align:4 +pntwind_get_info__FP4cXyzP4cXyzPfUc = .text:0x8005AE90; // type:function size:0x3AC scope:local align:4 +dKyw_pntwind_get_info__FP4cXyzP4cXyzPf = .text:0x8005B23C; // type:function size:0x24 scope:local align:4 dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf = .text:0x8005B260; // type:function size:0x24 scope:global align:4 dKyw_pntwind_get_vecpow__FP4cXyz = .text:0x8005B284; // type:function size:0x74 scope:global align:4 dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf = .text:0x8005B2F8; // type:function size:0x238 scope:global align:4 @@ -2575,22 +2573,22 @@ dKyw_custom_windpower__Ff = .text:0x8005B60C; // type:function size:0x10 scope:g dKyw_evt_wind_set__Fss = .text:0x8005B61C; // type:function size:0x1C scope:global align:4 dKyw_evt_wind_set_go__Fv = .text:0x8005B638; // type:function size:0x14 scope:global align:4 dKyw_rain_set__Fi = .text:0x8005B64C; // type:function size:0x14 scope:global align:4 -vectle_calc__FP10DOUBLE_POSP4cXyz = .text:0x8005B660; // type:function size:0xA8 scope:global align:4 -get_vectle_calc__FP4cXyzP4cXyzP4cXyz = .text:0x8005B708; // type:function size:0x58 scope:global align:4 +vectle_calc__FP10DOUBLE_POSP4cXyz = .text:0x8005B660; // type:function size:0xA8 scope:local align:4 +get_vectle_calc__FP4cXyzP4cXyzP4cXyz = .text:0x8005B708; // type:function size:0x58 scope:local align:4 dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz = .text:0x8005B760; // type:function size:0x20 scope:global align:4 -dKy_set_eyevect_calc__FP12camera_classP3Vecff = .text:0x8005B780; // type:function size:0xB0 scope:global align:4 +dKy_set_eyevect_calc__FP12camera_classP3Vecff = .text:0x8005B780; // type:function size:0xB0 scope:local align:4 dKy_set_eyevect_calc2__FP12camera_classP3Vecff = .text:0x8005B830; // type:function size:0xFC scope:global align:4 -dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID = .text:0x8005B92C; // type:function size:0xF8 scope:global align:4 -dKyr_set_btitex__FP9_GXTexObjP7ResTIMG = .text:0x8005BA24; // type:function size:0x24 scope:global align:4 +dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID = .text:0x8005B92C; // type:function size:0xF8 scope:local align:4 +dKyr_set_btitex__FP9_GXTexObjP7ResTIMG = .text:0x8005BA24; // type:function size:0x24 scope:local align:4 dKyr_lenzflare_move__Fv = .text:0x8005BA48; // type:function size:0x490 scope:global align:4 -dKyr_moon_arrival_check__Fv = .text:0x8005BED8; // type:function size:0x30 scope:global align:4 +dKyr_moon_arrival_check__Fv = .text:0x8005BED8; // type:function size:0x30 scope:local align:4 dKyr_sun_move__Fv = .text:0x8005BF08; // type:function size:0xD54 scope:global align:4 dKyr_rain_init__Fv = .text:0x8005CC5C; // type:function size:0x14C scope:global align:4 -rain_bg_chk__FP19dKankyo_rain_Packeti = .text:0x8005CDA8; // type:function size:0x28 scope:global align:4 -overhead_bg_chk__Fv = .text:0x8005CDD0; // type:function size:0x1A8 scope:global align:4 -forward_overhead_bg_chk__FP4cXyzf = .text:0x8005CF78; // type:function size:0x214 scope:global align:4 +rain_bg_chk__FP19dKankyo_rain_Packeti = .text:0x8005CDA8; // type:function size:0x28 scope:local align:4 +overhead_bg_chk__Fv = .text:0x8005CDD0; // type:function size:0x1A8 scope:local align:4 +forward_overhead_bg_chk__FP4cXyzf = .text:0x8005CF78; // type:function size:0x214 scope:local align:4 dKyr_rain_move__Fv = .text:0x8005D18C; // type:function size:0x1724 scope:global align:4 -d_krain_cut_turn_check__Fv = .text:0x8005E8B0; // type:function size:0x48 scope:global align:4 +d_krain_cut_turn_check__Fv = .text:0x8005E8B0; // type:function size:0x48 scope:local align:4 dKyr_housi_move__Fv = .text:0x8005E8F8; // type:function size:0x12E4 scope:global align:4 dKyr_snow_init__Fv = .text:0x8005FBDC; // type:function size:0x16C scope:global align:4 dKyr_snow_move__Fv = .text:0x8005FD48; // type:function size:0x15DC scope:global align:4 @@ -2598,8 +2596,8 @@ dKyr_star_init__Fv = .text:0x80061324; // type:function size:0xE8 scope:global a dKyr_star_move__Fv = .text:0x8006140C; // type:function size:0x2C scope:global align:4 cloud_shadow_move__Fv = .text:0x80061438; // type:function size:0xC74 scope:global align:4 vrkumo_move__Fv = .text:0x800620AC; // type:function size:0xA30 scope:global align:4 -dKr_cullVtx_Set__Fv = .text:0x80062ADC; // type:function size:0x70 scope:global align:4 -dKyr_draw_rev_moon__FPA4_fPPUc = .text:0x80062B4C; // type:function size:0xB24 scope:global align:4 +dKr_cullVtx_Set__Fv = .text:0x80062ADC; // type:function size:0x70 scope:local align:4 +dKyr_draw_rev_moon__FPA4_fPPUc = .text:0x80062B4C; // type:function size:0xB24 scope:local align:4 dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc = .text:0x80063670; // type:function size:0xDE8 scope:global align:4 dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc = .text:0x80064458; // type:function size:0x11F4 scope:global align:4 dKyr_drawRain__FPA4_fPPUc = .text:0x8006564C; // type:function size:0xA1C scope:global align:4 @@ -2621,14 +2619,14 @@ dKyr_mud_move__Fv = .text:0x8006C89C; // type:function size:0x7C0 scope:global a dKyr_mud_draw__FPA4_fPPUc = .text:0x8006D05C; // type:function size:0x8F8 scope:global align:4 dKyr_evil_init__Fv = .text:0x8006D954; // type:function size:0xF0 scope:global align:4 dKyr_evil_move__Fv = .text:0x8006DA44; // type:function size:0x78 scope:global align:4 -dKyr_evil_draw2__FPA4_fPPUc = .text:0x8006DABC; // type:function size:0x9CC scope:global align:4 -dKyr_near_bosslight_check__F4cXyz = .text:0x8006E488; // type:function size:0x268 scope:global align:4 +dKyr_evil_draw2__FPA4_fPPUc = .text:0x8006DABC; // type:function size:0x9CC scope:local align:4 +dKyr_near_bosslight_check__F4cXyz = .text:0x8006E488; // type:function size:0x268 scope:local align:4 dKyr_evil_draw__FPA4_fPPUc = .text:0x8006E6F0; // type:function size:0xAB0 scope:global align:4 -getKandelaarFlamePos__9daPy_py_cFv = .text:0x8006F1A0; // type:function size:0x8 scope:global align:4 -makedata__25@unnamed@d_vibration_cpp@FPUsUll = .text:0x8006F1A8; // type:function size:0x1C scope:global align:4 -rollshift__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F1C4; // type:function size:0x20 scope:global align:4 -makebits__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F1E4; // type:function size:0x34 scope:global align:4 -randombit__25@unnamed@d_vibration_cpp@Fll = .text:0x8006F218; // type:function size:0x90 scope:global align:4 +getKandelaarFlamePos__9daPy_py_cFv = .text:0x8006F1A0; // type:function size:0x8 scope:weak align:4 +makedata__25@unnamed@d_vibration_cpp@FPUsUll = .text:0x8006F1A8; // type:function size:0x1C scope:local align:4 +rollshift__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F1C4; // type:function size:0x20 scope:local align:4 +makebits__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F1E4; // type:function size:0x34 scope:local align:4 +randombit__25@unnamed@d_vibration_cpp@Fll = .text:0x8006F218; // type:function size:0x90 scope:local align:4 Run__12dVibration_cFv = .text:0x8006F2A8; // type:function size:0x7BC scope:global align:4 StartShock__12dVibration_cFii4cXyz = .text:0x8006FA64; // type:function size:0xEC scope:global align:4 StartQuake__12dVibration_cFii4cXyz = .text:0x8006FB50; // type:function size:0xFC scope:global align:4 @@ -2640,7 +2638,7 @@ setDefault__12dVibration_cFv = .text:0x8006FEC4; // type:function size:0x80 scop Init__12dVibration_cFv = .text:0x8006FF44; // type:function size:0x34 scope:global align:4 Pause__12dVibration_cFv = .text:0x8006FF78; // type:function size:0xC0 scope:global align:4 Remove__12dVibration_cFv = .text:0x80070038; // type:function size:0x20 scope:global align:4 -padLockButton__25@unnamed@d_attention_cpp@Fl = .text:0x80070058; // type:function size:0x20 scope:global align:4 +padLockButton__25@unnamed@d_attention_cpp@Fl = .text:0x80070058; // type:function size:0x20 scope:local align:4 __ct__11dAttParam_cFl = .text:0x80070078; // type:function size:0xD8 scope:global align:4 __dt__11dAttParam_cFv = .text:0x80070150; // type:function size:0x48 scope:global align:4 __ct__15dAttDrawParam_cFv = .text:0x80070198; // type:function size:0x20 scope:global align:4 @@ -2651,26 +2649,26 @@ GetLockonList__12dAttention_cFl = .text:0x80070884; // type:function size:0x3C s getActionBtnB__12dAttention_cFv = .text:0x800708C0; // type:function size:0xF4 scope:global align:4 getActionBtnXY__12dAttention_cFv = .text:0x800709B4; // type:function size:0xFC scope:global align:4 chkAttMask__12dAttention_cFUlUl = .text:0x80070AB0; // type:function size:0x50 scope:global align:4 -check_event_condition__FUlUs = .text:0x80070B00; // type:function size:0x6C scope:global align:4 -check_flontofplayer__FUlss = .text:0x80070B6C; // type:function size:0xC8 scope:global align:4 -distace_weight__Ffsf = .text:0x80070C34; // type:function size:0x4C scope:global align:4 -distace_angle_adjust__Ffsf = .text:0x80070C80; // type:function size:0x60 scope:global align:4 -check_distace__FP4cXyzsP4cXyzffff = .text:0x80070CE0; // type:function size:0x1F0 scope:global align:4 +check_event_condition__FUlUs = .text:0x80070B00; // type:function size:0x6C scope:local align:4 +check_flontofplayer__FUlss = .text:0x80070B6C; // type:function size:0xC8 scope:local align:4 +distace_weight__Ffsf = .text:0x80070C34; // type:function size:0x4C scope:local align:4 +distace_angle_adjust__Ffsf = .text:0x80070C80; // type:function size:0x60 scope:local align:4 +check_distace__FP4cXyzsP4cXyzffff = .text:0x80070CE0; // type:function size:0x1F0 scope:local align:4 calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl = .text:0x80070ED0; // type:function size:0x230 scope:global align:4 setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl = .text:0x80071100; // type:function size:0x180 scope:global align:4 initList__12dAttention_cFUl = .text:0x80071280; // type:function size:0x14C scope:global align:4 -select_attention__FP10fopAc_ac_cPv = .text:0x800713CC; // type:function size:0x40 scope:global align:4 +select_attention__FP10fopAc_ac_cPv = .text:0x800713CC; // type:function size:0x40 scope:local align:4 makeList__12dAttention_cFv = .text:0x8007140C; // type:function size:0x58 scope:global align:4 setOwnerAttentionPos__12dAttention_cFv = .text:0x80071464; // type:function size:0x64 scope:global align:4 SelectAttention__12dAttention_cFP10fopAc_ac_c = .text:0x800714C8; // type:function size:0x1F4 scope:global align:4 -__dt__7cSGlobeFv = .text:0x800716BC; // type:function size:0x3C scope:global align:4 +__dt__7cSGlobeFv = .text:0x800716BC; // type:function size:0x3C scope:weak align:4 sortList__12dAttention_cFv = .text:0x800716F8; // type:function size:0x1EC scope:global align:4 stockAttention__12dAttention_cFv = .text:0x800718E4; // type:function size:0xBC scope:global align:4 nextAttention__12dAttention_cFv = .text:0x800719A0; // type:function size:0x108 scope:global align:4 freeAttention__12dAttention_cFv = .text:0x80071AA8; // type:function size:0x30 scope:global align:4 chaseAttention__12dAttention_cFv = .text:0x80071AD8; // type:function size:0x228 scope:global align:4 EnemyDistance__12dAttention_cFP10fopAc_ac_c = .text:0x80071D00; // type:function size:0xAC scope:global align:4 -sound_attention__FP10fopAc_ac_cPv = .text:0x80071DAC; // type:function size:0x80 scope:global align:4 +sound_attention__FP10fopAc_ac_cPv = .text:0x80071DAC; // type:function size:0x80 scope:local align:4 runSoundProc__12dAttention_cFv = .text:0x80071E2C; // type:function size:0x98 scope:global align:4 runDrawProc__12dAttention_cFv = .text:0x80071EC4; // type:function size:0x270 scope:global align:4 runDebugDisp__12dAttention_cFv = .text:0x80072134; // type:function size:0x4 scope:global align:4 @@ -2685,7 +2683,7 @@ lockSoundStart__12dAttention_cFUl = .text:0x80072DC0; // type:function size:0x58 setAnm__10dAttDraw_cFUcf = .text:0x80072E18; // type:function size:0x210 scope:global align:4 setAlphaAnm__10dAttDraw_cFUcUc = .text:0x80073028; // type:function size:0x1C scope:global align:4 alphaAnm__10dAttDraw_cFv = .text:0x80073044; // type:function size:0x2A8 scope:global align:4 -setTevKColor__11J3DTevBlockFUlPC10J3DGXColor = .text:0x800732EC; // type:function size:0x4 scope:global align:4 +setTevKColor__11J3DTevBlockFUlPC10J3DGXColor = .text:0x800732EC; // type:function size:0x4 scope:weak align:4 draw__10dAttDraw_cFR4cXyzPA4_f = .text:0x800732F0; // type:function size:0x28C scope:global align:4 LockonTarget__12dAttention_cFl = .text:0x8007357C; // type:function size:0xA0 scope:global align:4 LockonReleaseDistanse__12dAttention_cFv = .text:0x8007361C; // type:function size:0xF0 scope:global align:4 @@ -2709,7 +2707,7 @@ convPId__10dAttLook_cFUi = .text:0x80073CE4; // type:function size:0x30 scope:gl init__10dAttLook_cFv = .text:0x80073D14; // type:function size:0x18 scope:global align:4 proc__10dAttLook_cFv = .text:0x80073D2C; // type:function size:0x1C scope:global align:4 request__10dAttLook_cFP10fopAc_ac_cfffsi = .text:0x80073D48; // type:function size:0x2BC scope:global align:4 -__dt__15dAttDrawParam_cFv = .text:0x80074004; // type:function size:0x48 scope:global align:4 +__dt__15dAttDrawParam_cFv = .text:0x80074004; // type:function size:0x48 scope:weak align:4 __sinit_d_attention_cpp = .text:0x8007404C; // type:function size:0x3C scope:local align:4 setCode__5dBgPcFR5sBgPc = .text:0x80074088; // type:function size:0x2C scope:global align:4 __ct__6dBgPlcFv = .text:0x800740B4; // type:function size:0xC scope:global align:4 @@ -2772,7 +2770,7 @@ MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb = .text:0x800757B4; MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x800758C0; // type:function size:0xDC scope:global align:4 MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x8007599C; // type:function size:0xC8 scope:global align:4 dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075A64; // type:function size:0x80 scope:global align:4 -dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075AE4; // type:function size:0x34 scope:global align:4 +dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075AE4; // type:function size:0x34 scope:local align:4 dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075B18; // type:function size:0x6C scope:global align:4 dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075B84; // type:function size:0x40 scope:global align:4 RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c = .text:0x80075BC4; // type:function size:0x70 scope:global align:4 @@ -2818,15 +2816,15 @@ ChkGndThinCellingOff__9dBgS_AcchFv = .text:0x80077420; // type:function size:0xC OnWallSort__9dBgS_AcchFv = .text:0x8007742C; // type:function size:0x10 scope:global align:4 ChkWallSort__9dBgS_AcchFv = .text:0x8007743C; // type:function size:0xC scope:global align:4 ChkLineDown__9dBgS_AcchFv = .text:0x80077448; // type:function size:0xC scope:global align:4 -__dt__12dBgS_AcchCirFv = .text:0x80077454; // type:function size:0x70 scope:global align:4 -@36@__dt__9dBgS_AcchFv = .text:0x800774C4; // type:function size:0x8 scope:local align:4 -@20@__dt__9dBgS_AcchFv = .text:0x800774CC; // type:function size:0x8 scope:local align:4 -checkPlayerFly__9daPy_py_cCFv = .text:0x800774D4; // type:function size:0x8 scope:global align:4 +__dt__12dBgS_AcchCirFv = .text:0x80077454; // type:function size:0x70 scope:weak align:4 +@36@__dt__9dBgS_AcchFv = .text:0x800774C4; // type:function size:0x8 scope:weak align:4 +@20@__dt__9dBgS_AcchFv = .text:0x800774CC; // type:function size:0x8 scope:weak align:4 +checkPlayerFly__9daPy_py_cCFv = .text:0x800774D4; // type:function size:0x8 scope:weak align:4 __ct__8dBgS_ChkFv = .text:0x800774DC; // type:function size:0x4C scope:global align:4 __dt__8dBgS_ChkFv = .text:0x80077528; // type:function size:0x78 scope:global align:4 GetPolyPassChkInfo__8dBgS_ChkFv = .text:0x800775A0; // type:function size:0x4 scope:global align:4 GetGrpPassChkInfo__8dBgS_ChkFv = .text:0x800775A4; // type:function size:0x10 scope:global align:4 -@16@__dt__8dBgS_ChkFv = .text:0x800775B4; // type:function size:0x8 scope:local align:4 +@16@__dt__8dBgS_ChkFv = .text:0x800775B4; // type:function size:0x8 scope:weak align:4 __ct__11dBgS_GndChkFv = .text:0x800775BC; // type:function size:0x74 scope:global align:4 __dt__11dBgS_GndChkFv = .text:0x80077630; // type:function size:0x88 scope:global align:4 __ct__18dBgS_ObjGndChk_WtrFv = .text:0x800776B8; // type:function size:0x98 scope:global align:4 @@ -2837,27 +2835,27 @@ __dt__18dBgS_ObjGndChk_AllFv = .text:0x80077928; // type:function size:0xA0 scop __dt__14dBgS_CamGndChkFv = .text:0x800779C8; // type:function size:0x78 scope:global align:4 __ct__18dBgS_CamGndChk_WtrFv = .text:0x80077A40; // type:function size:0x98 scope:global align:4 __dt__18dBgS_CamGndChk_WtrFv = .text:0x80077AD8; // type:function size:0x78 scope:global align:4 -@20@__dt__11dBgS_GndChkFv = .text:0x80077B50; // type:function size:0x8 scope:local align:4 -@76@__dt__11dBgS_GndChkFv = .text:0x80077B58; // type:function size:0x8 scope:local align:4 -@60@__dt__11dBgS_GndChkFv = .text:0x80077B60; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B68; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B70; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B78; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B80; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B88; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B90; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077B98; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077BA0; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077BA8; // type:function size:0x8 scope:local align:4 -@20@__dt__14dBgS_CamGndChkFv = .text:0x80077BB0; // type:function size:0x8 scope:local align:4 -@76@__dt__14dBgS_CamGndChkFv = .text:0x80077BB8; // type:function size:0x8 scope:local align:4 -@60@__dt__14dBgS_CamGndChkFv = .text:0x80077BC0; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077BC8; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077BD0; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077BD8; // type:function size:0x8 scope:local align:4 +@20@__dt__11dBgS_GndChkFv = .text:0x80077B50; // type:function size:0x8 scope:weak align:4 +@76@__dt__11dBgS_GndChkFv = .text:0x80077B58; // type:function size:0x8 scope:weak align:4 +@60@__dt__11dBgS_GndChkFv = .text:0x80077B60; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B68; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B70; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077B78; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B80; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B88; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077B90; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077B98; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077BA0; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077BA8; // type:function size:0x8 scope:weak align:4 +@20@__dt__14dBgS_CamGndChkFv = .text:0x80077BB0; // type:function size:0x8 scope:weak align:4 +@76@__dt__14dBgS_CamGndChkFv = .text:0x80077BB8; // type:function size:0x8 scope:weak align:4 +@60@__dt__14dBgS_CamGndChkFv = .text:0x80077BC0; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077BC8; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077BD0; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077BD8; // type:function size:0x8 scope:weak align:4 __ct__15dBgS_GrpPassChkFv = .text:0x80077BE0; // type:function size:0x24 scope:global align:4 __dt__15dBgS_GrpPassChkFv = .text:0x80077C04; // type:function size:0x5C scope:global align:4 -__dt__15cBgS_GrpPassChkFv = .text:0x80077C60; // type:function size:0x48 scope:global align:4 +__dt__15cBgS_GrpPassChkFv = .text:0x80077C60; // type:function size:0x48 scope:weak align:4 __ct__11dBgS_LinChkFv = .text:0x80077CA8; // type:function size:0x74 scope:global align:4 __dt__11dBgS_LinChkFv = .text:0x80077D1C; // type:function size:0x88 scope:global align:4 Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c = .text:0x80077DA4; // type:function size:0x40 scope:global align:4 @@ -2879,36 +2877,36 @@ __ct__15dBgS_RopeLinChkFv = .text:0x800783CC; // type:function size:0x5C scope:g __dt__15dBgS_RopeLinChkFv = .text:0x80078428; // type:function size:0x78 scope:global align:4 __ct__16dBgS_HorseLinChkFv = .text:0x800784A0; // type:function size:0x5C scope:global align:4 __dt__16dBgS_HorseLinChkFv = .text:0x800784FC; // type:function size:0x78 scope:global align:4 -@20@__dt__11dBgS_LinChkFv = .text:0x80078574; // type:function size:0x8 scope:local align:4 -@104@__dt__11dBgS_LinChkFv = .text:0x8007857C; // type:function size:0x8 scope:local align:4 -@88@__dt__11dBgS_LinChkFv = .text:0x80078584; // type:function size:0x8 scope:local align:4 -@20@__dt__14dBgS_CamLinChkFv = .text:0x8007858C; // type:function size:0x8 scope:local align:4 -@104@__dt__14dBgS_CamLinChkFv = .text:0x80078594; // type:function size:0x8 scope:local align:4 -@88@__dt__14dBgS_CamLinChkFv = .text:0x8007859C; // type:function size:0x8 scope:local align:4 -@20@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x800785A4; // type:function size:0x8 scope:local align:4 -@104@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x800785AC; // type:function size:0x8 scope:local align:4 -@88@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x800785B4; // type:function size:0x8 scope:local align:4 -@20@__dt__14dBgS_ObjLinChkFv = .text:0x800785BC; // type:function size:0x8 scope:local align:4 -@104@__dt__14dBgS_ObjLinChkFv = .text:0x800785C4; // type:function size:0x8 scope:local align:4 -@88@__dt__14dBgS_ObjLinChkFv = .text:0x800785CC; // type:function size:0x8 scope:local align:4 -@20@__dt__15dBgS_LinkLinChkFv = .text:0x800785D4; // type:function size:0x8 scope:local align:4 -@104@__dt__15dBgS_LinkLinChkFv = .text:0x800785DC; // type:function size:0x8 scope:local align:4 -@88@__dt__15dBgS_LinkLinChkFv = .text:0x800785E4; // type:function size:0x8 scope:local align:4 -@20@__dt__15dBgS_BombLinChkFv = .text:0x800785EC; // type:function size:0x8 scope:local align:4 -@104@__dt__15dBgS_BombLinChkFv = .text:0x800785F4; // type:function size:0x8 scope:local align:4 -@88@__dt__15dBgS_BombLinChkFv = .text:0x800785FC; // type:function size:0x8 scope:local align:4 -@20@__dt__16dBgS_ArrowLinChkFv = .text:0x80078604; // type:function size:0x8 scope:local align:4 -@104@__dt__16dBgS_ArrowLinChkFv = .text:0x8007860C; // type:function size:0x8 scope:local align:4 -@88@__dt__16dBgS_ArrowLinChkFv = .text:0x80078614; // type:function size:0x8 scope:local align:4 -@20@__dt__20dBgS_BoomerangLinChkFv = .text:0x8007861C; // type:function size:0x8 scope:local align:4 -@104@__dt__20dBgS_BoomerangLinChkFv = .text:0x80078624; // type:function size:0x8 scope:local align:4 -@88@__dt__20dBgS_BoomerangLinChkFv = .text:0x8007862C; // type:function size:0x8 scope:local align:4 -@20@__dt__15dBgS_RopeLinChkFv = .text:0x80078634; // type:function size:0x8 scope:local align:4 -@104@__dt__15dBgS_RopeLinChkFv = .text:0x8007863C; // type:function size:0x8 scope:local align:4 -@88@__dt__15dBgS_RopeLinChkFv = .text:0x80078644; // type:function size:0x8 scope:local align:4 -@20@__dt__16dBgS_HorseLinChkFv = .text:0x8007864C; // type:function size:0x8 scope:local align:4 -@104@__dt__16dBgS_HorseLinChkFv = .text:0x80078654; // type:function size:0x8 scope:local align:4 -@88@__dt__16dBgS_HorseLinChkFv = .text:0x8007865C; // type:function size:0x8 scope:local align:4 +@20@__dt__11dBgS_LinChkFv = .text:0x80078574; // type:function size:0x8 scope:weak align:4 +@104@__dt__11dBgS_LinChkFv = .text:0x8007857C; // type:function size:0x8 scope:weak align:4 +@88@__dt__11dBgS_LinChkFv = .text:0x80078584; // type:function size:0x8 scope:weak align:4 +@20@__dt__14dBgS_CamLinChkFv = .text:0x8007858C; // type:function size:0x8 scope:weak align:4 +@104@__dt__14dBgS_CamLinChkFv = .text:0x80078594; // type:function size:0x8 scope:weak align:4 +@88@__dt__14dBgS_CamLinChkFv = .text:0x8007859C; // type:function size:0x8 scope:weak align:4 +@20@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x800785A4; // type:function size:0x8 scope:weak align:4 +@104@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x800785AC; // type:function size:0x8 scope:weak align:4 +@88@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x800785B4; // type:function size:0x8 scope:weak align:4 +@20@__dt__14dBgS_ObjLinChkFv = .text:0x800785BC; // type:function size:0x8 scope:weak align:4 +@104@__dt__14dBgS_ObjLinChkFv = .text:0x800785C4; // type:function size:0x8 scope:weak align:4 +@88@__dt__14dBgS_ObjLinChkFv = .text:0x800785CC; // type:function size:0x8 scope:weak align:4 +@20@__dt__15dBgS_LinkLinChkFv = .text:0x800785D4; // type:function size:0x8 scope:weak align:4 +@104@__dt__15dBgS_LinkLinChkFv = .text:0x800785DC; // type:function size:0x8 scope:weak align:4 +@88@__dt__15dBgS_LinkLinChkFv = .text:0x800785E4; // type:function size:0x8 scope:weak align:4 +@20@__dt__15dBgS_BombLinChkFv = .text:0x800785EC; // type:function size:0x8 scope:weak align:4 +@104@__dt__15dBgS_BombLinChkFv = .text:0x800785F4; // type:function size:0x8 scope:weak align:4 +@88@__dt__15dBgS_BombLinChkFv = .text:0x800785FC; // type:function size:0x8 scope:weak align:4 +@20@__dt__16dBgS_ArrowLinChkFv = .text:0x80078604; // type:function size:0x8 scope:weak align:4 +@104@__dt__16dBgS_ArrowLinChkFv = .text:0x8007860C; // type:function size:0x8 scope:weak align:4 +@88@__dt__16dBgS_ArrowLinChkFv = .text:0x80078614; // type:function size:0x8 scope:weak align:4 +@20@__dt__20dBgS_BoomerangLinChkFv = .text:0x8007861C; // type:function size:0x8 scope:weak align:4 +@104@__dt__20dBgS_BoomerangLinChkFv = .text:0x80078624; // type:function size:0x8 scope:weak align:4 +@88@__dt__20dBgS_BoomerangLinChkFv = .text:0x8007862C; // type:function size:0x8 scope:weak align:4 +@20@__dt__15dBgS_RopeLinChkFv = .text:0x80078634; // type:function size:0x8 scope:weak align:4 +@104@__dt__15dBgS_RopeLinChkFv = .text:0x8007863C; // type:function size:0x8 scope:weak align:4 +@88@__dt__15dBgS_RopeLinChkFv = .text:0x80078644; // type:function size:0x8 scope:weak align:4 +@20@__dt__16dBgS_HorseLinChkFv = .text:0x8007864C; // type:function size:0x8 scope:weak align:4 +@104@__dt__16dBgS_HorseLinChkFv = .text:0x80078654; // type:function size:0x8 scope:weak align:4 +@88@__dt__16dBgS_HorseLinChkFv = .text:0x8007865C; // type:function size:0x8 scope:weak align:4 __ct__16dBgS_MoveBgActorFv = .text:0x80078664; // type:function size:0x44 scope:global align:4 CheckCreateHeap__FP10fopAc_ac_c = .text:0x800786A8; // type:function size:0x20 scope:local align:4 CreateHeap__16dBgS_MoveBgActorFv = .text:0x800786C8; // type:function size:0x8 scope:global align:4 @@ -2925,17 +2923,17 @@ MoveBGDelete__16dBgS_MoveBgActorFv = .text:0x8007891C; // type:function size:0x7 MoveBGExecute__16dBgS_MoveBgActorFv = .text:0x80078990; // type:function size:0xC4 scope:global align:4 __ct__11dBgS_SphChkFv = .text:0x80078A54; // type:function size:0xAC scope:global align:4 __dt__11dBgS_SphChkFv = .text:0x80078B00; // type:function size:0xB0 scope:global align:4 -@20@__dt__11dBgS_SphChkFv = .text:0x80078BB0; // type:function size:0x8 scope:local align:4 -@36@__dt__11dBgS_SphChkFv = .text:0x80078BB8; // type:function size:0x8 scope:local align:4 -@72@__dt__11dBgS_SphChkFv = .text:0x80078BC0; // type:function size:0x8 scope:local align:4 -@56@__dt__11dBgS_SphChkFv = .text:0x80078BC8; // type:function size:0x8 scope:local align:4 +@20@__dt__11dBgS_SphChkFv = .text:0x80078BB0; // type:function size:0x8 scope:weak align:4 +@36@__dt__11dBgS_SphChkFv = .text:0x80078BB8; // type:function size:0x8 scope:weak align:4 +@72@__dt__11dBgS_SphChkFv = .text:0x80078BC0; // type:function size:0x8 scope:weak align:4 +@56@__dt__11dBgS_SphChkFv = .text:0x80078BC8; // type:function size:0x8 scope:weak align:4 Set__14dBgS_SplGrpChkFR4cXyzf = .text:0x80078BD0; // type:function size:0x20 scope:global align:4 __ct__14dBgS_SplGrpChkFv = .text:0x80078BF0; // type:function size:0xC8 scope:global align:4 __dt__14dBgS_SplGrpChkFv = .text:0x80078CB8; // type:function size:0x94 scope:global align:4 Init__14dBgS_SplGrpChkFv = .text:0x80078D4C; // type:function size:0x40 scope:global align:4 -@16@__dt__14dBgS_SplGrpChkFv = .text:0x80078D8C; // type:function size:0x8 scope:local align:4 -@52@__dt__14dBgS_SplGrpChkFv = .text:0x80078D94; // type:function size:0x8 scope:local align:4 -@36@__dt__14dBgS_SplGrpChkFv = .text:0x80078D9C; // type:function size:0x8 scope:local align:4 +@16@__dt__14dBgS_SplGrpChkFv = .text:0x80078D8C; // type:function size:0x8 scope:weak align:4 +@52@__dt__14dBgS_SplGrpChkFv = .text:0x80078D94; // type:function size:0x8 scope:weak align:4 +@36@__dt__14dBgS_SplGrpChkFv = .text:0x80078D9C; // type:function size:0x8 scope:weak align:4 __ct__16dBgS_PolyPassChkFv = .text:0x80078DA4; // type:function size:0x4C scope:global align:4 __dt__16dBgS_PolyPassChkFv = .text:0x80078DF0; // type:function size:0x5C scope:global align:4 SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk = .text:0x80078E4C; // type:function size:0x5C scope:global align:4 @@ -2957,13 +2955,13 @@ SetStatue__16dBgS_PolyPassChkFv = .text:0x80078FBC; // type:function size:0xC sc ClrStatue__16dBgS_PolyPassChkFv = .text:0x80078FC8; // type:function size:0xC scope:global align:4 SetIronBall__16dBgS_PolyPassChkFv = .text:0x80078FD4; // type:function size:0xC scope:global align:4 ClrIronBall__16dBgS_PolyPassChkFv = .text:0x80078FE0; // type:function size:0xC scope:global align:4 -__dt__16cBgS_PolyPassChkFv = .text:0x80078FEC; // type:function size:0x48 scope:global align:4 +__dt__16cBgS_PolyPassChkFv = .text:0x80078FEC; // type:function size:0x48 scope:weak align:4 __ct__12dBgS_RoofChkFv = .text:0x80079034; // type:function size:0x9C scope:global align:4 __dt__12dBgS_RoofChkFv = .text:0x800790D0; // type:function size:0x94 scope:global align:4 Init__12dBgS_RoofChkFv = .text:0x80079164; // type:function size:0x28 scope:global align:4 -@16@__dt__12dBgS_RoofChkFv = .text:0x8007918C; // type:function size:0x8 scope:local align:4 -@52@__dt__12dBgS_RoofChkFv = .text:0x80079194; // type:function size:0x8 scope:local align:4 -@36@__dt__12dBgS_RoofChkFv = .text:0x8007919C; // type:function size:0x8 scope:local align:4 +@16@__dt__12dBgS_RoofChkFv = .text:0x8007918C; // type:function size:0x8 scope:weak align:4 +@52@__dt__12dBgS_RoofChkFv = .text:0x80079194; // type:function size:0x8 scope:weak align:4 +@36@__dt__12dBgS_RoofChkFv = .text:0x8007919C; // type:function size:0x8 scope:weak align:4 __ct__11dBgS_WtrChkFv = .text:0x800791A4; // type:function size:0x60 scope:global align:4 __ct__11cBgW_RwgElmFv = .text:0x80079204; // type:function size:0x10 scope:global align:4 __dt__11cBgW_RwgElmFv = .text:0x80079214; // type:function size:0x48 scope:global align:4 @@ -2991,7 +2989,7 @@ Set__4cBgWFP6cBgD_tUlPA3_A4_f = .text:0x80079F78; // type:function size:0x24C sc __dt__11cBgW_GrpElmFv = .text:0x8007A1C4; // type:function size:0x60 scope:global align:4 __ct__11cBgW_GrpElmFv = .text:0x8007A224; // type:function size:0x1C scope:global align:4 RwgLineCheck__4cBgWFUsP11cBgS_LinChk = .text:0x8007A240; // type:function size:0x144 scope:global align:4 -__dt__8cM3dGTriFv = .text:0x8007A384; // type:function size:0x5C scope:global align:4 +__dt__8cM3dGTriFv = .text:0x8007A384; // type:function size:0x5C scope:weak align:4 LineCheckRp__4cBgWFP11cBgS_LinChki = .text:0x8007A3E0; // type:function size:0x18C scope:global align:4 LineCheckGrpRp__4cBgWFP11cBgS_LinChkii = .text:0x8007A56C; // type:function size:0x12C scope:global align:4 LineCheck__4cBgWFP11cBgS_LinChk = .text:0x8007A698; // type:function size:0x28 scope:global align:4 @@ -3095,9 +3093,9 @@ CallArrowStickCallBack__4dBgWFP10fopAc_ac_cP10fopAc_ac_cR4cXyz = .text:0x8007E4B OffMoveFlag__4dBgWFv = .text:0x8007E4E4; // type:function size:0x10 scope:global align:4 ChkMoveFlag__4dBgWCFv = .text:0x8007E4F4; // type:function size:0xC scope:global align:4 dBgW_NewSet__FP6cBgD_tUlPA3_A4_f = .text:0x8007E500; // type:function size:0x88 scope:global align:4 -__dt__4dBgWFv = .text:0x8007E588; // type:function size:0x60 scope:global align:4 +__dt__4dBgWFv = .text:0x8007E588; // type:function size:0x60 scope:weak align:4 __ct__9dBgW_BaseFv = .text:0x8007E5E8; // type:function size:0x50 scope:global align:4 -__dt__9cBgW_BgIdFv = .text:0x8007E638; // type:function size:0x48 scope:global align:4 +__dt__9cBgW_BgIdFv = .text:0x8007E638; // type:function size:0x48 scope:weak align:4 __dt__9dBgW_BaseFv = .text:0x8007E680; // type:function size:0x5C scope:global align:4 ClrDBgWBase__9dBgW_BaseFv = .text:0x8007E6DC; // type:function size:0x34 scope:global align:4 ChkMemoryError__9dBgW_BaseFv = .text:0x8007E710; // type:function size:0x8 scope:global align:4 @@ -3175,7 +3173,7 @@ CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz = .text:0x80083284; // TransPosWork__6dBgWSvFP4cXyziii = .text:0x80083340; // type:function size:0x21C scope:global align:4 TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz = .text:0x8008355C; // type:function size:0xBC scope:global align:4 MatrixCrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz = .text:0x80083618; // type:function size:0x4 scope:global align:4 -__dt__6dBgWSvFv = .text:0x8008361C; // type:function size:0x70 scope:global align:4 +__dt__6dBgWSvFv = .text:0x8008361C; // type:function size:0x70 scope:weak align:4 ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv = .text:0x8008368C; // type:function size:0x14 scope:global align:4 ct__22dCcD_GAtTgCoCommonBaseFv = .text:0x800836A0; // type:function size:0x18 scope:global align:4 SetHitApid__22dCcD_GAtTgCoCommonBaseFUi = .text:0x800836B8; // type:function size:0x10 scope:global align:4 @@ -3307,9 +3305,9 @@ Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v = .text:0x80085320; // Clear__12dCcMassS_ObjFv = .text:0x80085330; // type:function size:0x44 scope:global align:4 ClearPointer__15dCcMassS_HitInfFv = .text:0x80085374; // type:function size:0x1C scope:global align:4 __ct__12dCcMassS_MngFv = .text:0x80085390; // type:function size:0x100 scope:global align:4 -__dt__12cCcD_CpsAttrFv = .text:0x80085490; // type:function size:0x90 scope:global align:4 -__dt__12cCcD_CylAttrFv = .text:0x80085520; // type:function size:0x8C scope:global align:4 -__dt__14cCcD_ShapeAttrFv = .text:0x800855AC; // type:function size:0x5C scope:global align:4 +__dt__12cCcD_CpsAttrFv = .text:0x80085490; // type:function size:0x90 scope:weak align:4 +__dt__12cCcD_CylAttrFv = .text:0x80085520; // type:function size:0x8C scope:weak align:4 +__dt__14cCcD_ShapeAttrFv = .text:0x800855AC; // type:function size:0x5C scope:weak align:4 __ct__12dCcMassS_ObjFv = .text:0x80085608; // type:function size:0x1C scope:global align:4 Ct__12dCcMassS_MngFv = .text:0x80085624; // type:function size:0x4C scope:global align:4 SetAttr__12dCcMassS_MngFffUcUc = .text:0x80085670; // type:function size:0x60 scope:global align:4 @@ -3335,7 +3333,7 @@ ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCc SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz = .text:0x80086B00; // type:function size:0x2CC scope:global align:4 ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c = .text:0x80086DCC; // type:function size:0x230 scope:global align:4 chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c = .text:0x80086FFC; // type:function size:0x260 scope:global align:4 -__dt__12cCcD_SphAttrFv = .text:0x8008725C; // type:function size:0x8C scope:global align:4 +__dt__12cCcD_SphAttrFv = .text:0x8008725C; // type:function size:0x8C scope:weak align:4 MoveAfterCheck__4dCcSFv = .text:0x800872E8; // type:function size:0x4 scope:global align:4 DrawAfter__4dCcSFv = .text:0x800872EC; // type:function size:0x4 scope:global align:4 Move__4dCcSFv = .text:0x800872F0; // type:function size:0x20 scope:global align:4 @@ -3345,16 +3343,16 @@ ChkAtTgMtrlHit__4dCcSFUcUc = .text:0x80087370; // type:function size:0x1C scope: ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts = .text:0x8008738C; // type:function size:0x64 scope:global align:4 pl_cut_LRC__Fi = .text:0x800873F0; // type:function size:0x24 scope:global align:4 cc_pl_cut_bit_get__Fv = .text:0x80087414; // type:function size:0xF0 scope:global align:4 -getMapInfo__FSc = .text:0x80087504; // type:function size:0x2C scope:global align:4 -getHitId__FP8cCcD_Obji = .text:0x80087530; // type:function size:0x24 scope:global align:4 +getMapInfo__FSc = .text:0x80087504; // type:function size:0x2C scope:local align:4 +getHitId__FP8cCcD_Obji = .text:0x80087530; // type:function size:0x24 scope:local align:4 def_se_set__FP10Z2CreatureP8cCcD_ObjUlP10fopAc_ac_c = .text:0x80087554; // type:function size:0x80 scope:global align:4 -at_power_get__FP11dCcU_AtInfo = .text:0x800875D4; // type:function size:0x4C4 scope:global align:4 +at_power_get__FP11dCcU_AtInfo = .text:0x800875D4; // type:function size:0x4C4 scope:local align:4 at_power_check__FP11dCcU_AtInfo = .text:0x80087A98; // type:function size:0x1AC scope:global align:4 cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo = .text:0x80087C44; // type:function size:0x530 scope:global align:4 -checkCutJumpCancelTurn__9daPy_py_cCFv = .text:0x80088174; // type:function size:0x8 scope:global align:4 +checkCutJumpCancelTurn__9daPy_py_cCFv = .text:0x80088174; // type:function size:0x8 scope:weak align:4 rationalBezierRatio__8dCamMathFff = .text:0x8008817C; // type:function size:0x148 scope:global align:4 zoomFovy__8dCamMathFff = .text:0x800882C4; // type:function size:0x5C scope:global align:4 -__dt__7cDegreeFv = .text:0x80088320; // type:function size:0x3C scope:global align:4 +__dt__7cDegreeFv = .text:0x80088320; // type:function size:0x3C scope:weak align:4 xyzRotateX__8dCamMathFR4cXyz7cSAngle = .text:0x8008835C; // type:function size:0x68 scope:global align:4 xyzRotateY__8dCamMathFR4cXyz7cSAngle = .text:0x800883C4; // type:function size:0x68 scope:global align:4 xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz = .text:0x8008842C; // type:function size:0x48 scope:global align:4 @@ -3369,8 +3367,8 @@ __ct__11dCamSetup_cFv = .text:0x800886A8; // type:function size:0x250 scope:glob __dt__11dCamSetup_cFv = .text:0x800888F8; // type:function size:0x60 scope:global align:4 CheckLatitudeRange__11dCamSetup_cFPs = .text:0x80088958; // type:function size:0x70 scope:global align:4 PlayerHideDist__11dCamSetup_cFv = .text:0x800889C8; // type:function size:0x28 scope:global align:4 -__dt__9dCstick_cFv = .text:0x800889F0; // type:function size:0x48 scope:global align:4 -isStageEvent__25@unnamed@d_ev_camera_cpp@Fi = .text:0x80088A38; // type:function size:0x84 scope:global align:4 +__dt__9dCstick_cFv = .text:0x800889F0; // type:function size:0x48 scope:weak align:4 +isStageEvent__25@unnamed@d_ev_camera_cpp@Fi = .text:0x80088A38; // type:function size:0x84 scope:local align:4 StartEventCamera__9dCamera_cFiie = .text:0x80088ABC; // type:function size:0x140 scope:global align:4 EndEventCamera__9dCamera_cFi = .text:0x80088BFC; // type:function size:0x68 scope:global align:4 searchEventArgData__9dCamera_cFPc = .text:0x80088C64; // type:function size:0x8C scope:global align:4 @@ -3395,22 +3393,22 @@ uniformTransEvCamera__9dCamera_cFv = .text:0x8008BE6C; // type:function size:0x2 uniformBrakeEvCamera__9dCamera_cFv = .text:0x8008BE90; // type:function size:0x24 scope:global align:4 uniformAcceleEvCamera__9dCamera_cFv = .text:0x8008BEB4; // type:function size:0x24 scope:global align:4 transEvCamera__9dCamera_cFi = .text:0x8008BED8; // type:function size:0x28B8 scope:global align:4 -isRelChar__25@unnamed@d_ev_camera_cpp@Fc = .text:0x8008E790; // type:function size:0x24 scope:global align:4 -__as__7cSGlobeFRC7cSGlobe = .text:0x8008E7B4; // type:function size:0x1C scope:global align:4 -abs__4cXyzCFv = .text:0x8008E7D0; // type:function size:0x104 scope:global align:4 -U__7cSGlobeFRC7cSAngle = .text:0x8008E8D4; // type:function size:0x3C scope:global align:4 -__ami__4cXyzFRC3Vec = .text:0x8008E910; // type:function size:0x34 scope:global align:4 -__apl__4cXyzFRC3Vec = .text:0x8008E944; // type:function size:0x34 scope:global align:4 +isRelChar__25@unnamed@d_ev_camera_cpp@Fc = .text:0x8008E790; // type:function size:0x24 scope:local align:4 +__as__7cSGlobeFRC7cSGlobe = .text:0x8008E7B4; // type:function size:0x1C scope:weak align:4 +abs__4cXyzCFv = .text:0x8008E7D0; // type:function size:0x104 scope:weak align:4 +U__7cSGlobeFRC7cSAngle = .text:0x8008E8D4; // type:function size:0x3C scope:weak align:4 +__ami__4cXyzFRC3Vec = .text:0x8008E910; // type:function size:0x34 scope:weak align:4 +__apl__4cXyzFRC3Vec = .text:0x8008E944; // type:function size:0x34 scope:weak align:4 watchActorEvCamera__9dCamera_cFv = .text:0x8008E978; // type:function size:0x1120 scope:global align:4 -V__7cSGlobeFRC7cSAngle = .text:0x8008FA98; // type:function size:0x3C scope:global align:4 -lineCollisionCheck__25@unnamed@d_ev_camera_cpp@F4cXyz4cXyzP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c = .text:0x8008FAD4; // type:function size:0x54 scope:global align:4 +V__7cSGlobeFRC7cSAngle = .text:0x8008FA98; // type:function size:0x3C scope:weak align:4 +lineCollisionCheck__25@unnamed@d_ev_camera_cpp@F4cXyz4cXyzP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c = .text:0x8008FAD4; // type:function size:0x54 scope:local align:4 restorePosEvCamera__9dCamera_cFv = .text:0x8008FB28; // type:function size:0x68C scope:global align:4 talktoEvCamera__9dCamera_cFv = .text:0x800901B4; // type:function size:0xBC scope:global align:4 maptoolIdEvCamera__9dCamera_cFv = .text:0x80090270; // type:function size:0x248 scope:global align:4 styleEvCamera__9dCamera_cFv = .text:0x800904B8; // type:function size:0x9C scope:global align:4 gameOverEvCamera__9dCamera_cFv = .text:0x80090554; // type:function size:0xF54 scope:global align:4 tactEvCamera__9dCamera_cFv = .text:0x800914A8; // type:function size:0xF04 scope:global align:4 -dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs = .text:0x800923AC; // type:function size:0x4C scope:global align:4 +dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs = .text:0x800923AC; // type:function size:0x4C scope:weak align:4 turnToActorEvCamera__9dCamera_cFv = .text:0x800923F8; // type:function size:0x8 scope:global align:4 stbWaitEvCamera__9dCamera_cFv = .text:0x80092400; // type:function size:0x110 scope:global align:4 saveEvCamera__9dCamera_cFv = .text:0x80092510; // type:function size:0xBC scope:global align:4 @@ -3428,23 +3426,23 @@ hintTalkEvCamera__9dCamera_cFv = .text:0x800965EC; // type:function size:0x930 s bspTransEvCamera__9dCamera_cFv = .text:0x80096F1C; // type:function size:0x7B8 scope:global align:4 portalWarpEvCamera__9dCamera_cFv = .text:0x800976D4; // type:function size:0x8 scope:global align:4 __sinit_d_ev_camera_cpp = .text:0x800976DC; // type:function size:0x80 scope:local align:4 -attentionPos__9dCamera_cFP10fopAc_ac_c = .text:0x8009775C; // type:function size:0x1C scope:global align:4 -directionOf__9dCamera_cFP10fopAc_ac_c = .text:0x80097778; // type:function size:0x24 scope:global align:4 -positionOf__9dCamera_cFP10fopAc_ac_c = .text:0x8009779C; // type:function size:0x1C scope:global align:4 -setFlag__9dCamera_cFUl = .text:0x800977B8; // type:function size:0x14 scope:global align:4 -eyePos__9dCamera_cFP10fopAc_ac_c = .text:0x800977CC; // type:function size:0x1C scope:global align:4 -checkNoDraw__9daMidna_cCFv = .text:0x800977E8; // type:function size:0xC scope:global align:4 -checkMidnaRide__9daPy_py_cCFv = .text:0x800977F4; // type:function size:0xC scope:global align:4 -fopAcM_GetID__FPCv = .text:0x80097800; // type:function size:0x18 scope:global align:4 -__as__4cXyzFRC4cXyz = .text:0x80097818; // type:function size:0x1C scope:global align:4 -__ct__4cXyzFRC4cXyz = .text:0x80097834; // type:function size:0x1C scope:global align:4 -__dt__Q29dCamera_c26@class$5983d_ev_camera_cppFv = .text:0x80097850; // type:function size:0x3C scope:local align:4 -__ct__Q29dCamera_c26@class$5983d_ev_camera_cppFv = .text:0x8009788C; // type:function size:0x4 scope:local align:4 -checkCanoeRide__9daPy_py_cCFv = .text:0x80097890; // type:function size:0x8 scope:global align:4 -checkBoardRide__9daPy_py_cCFv = .text:0x80097898; // type:function size:0x8 scope:global align:4 -checkSpinnerRide__9daPy_py_cCFv = .text:0x800978A0; // type:function size:0x8 scope:global align:4 -checkBoarRide__9daPy_py_cCFv = .text:0x800978A8; // type:function size:0x8 scope:global align:4 -getShadowTalkAtnPos__9daAlink_cFv = .text:0x800978B0; // type:function size:0x8 scope:global align:4 +attentionPos__9dCamera_cFP10fopAc_ac_c = .text:0x8009775C; // type:function size:0x1C scope:weak align:4 +directionOf__9dCamera_cFP10fopAc_ac_c = .text:0x80097778; // type:function size:0x24 scope:weak align:4 +positionOf__9dCamera_cFP10fopAc_ac_c = .text:0x8009779C; // type:function size:0x1C scope:weak align:4 +setFlag__9dCamera_cFUl = .text:0x800977B8; // type:function size:0x14 scope:weak align:4 +eyePos__9dCamera_cFP10fopAc_ac_c = .text:0x800977CC; // type:function size:0x1C scope:weak align:4 +checkNoDraw__9daMidna_cCFv = .text:0x800977E8; // type:function size:0xC scope:weak align:4 +checkMidnaRide__9daPy_py_cCFv = .text:0x800977F4; // type:function size:0xC scope:weak align:4 +fopAcM_GetID__FPCv = .text:0x80097800; // type:function size:0x18 scope:weak align:4 +__as__4cXyzFRC4cXyz = .text:0x80097818; // type:function size:0x1C scope:weak align:4 +__ct__4cXyzFRC4cXyz = .text:0x80097834; // type:function size:0x1C scope:weak align:4 +__dt__Q29dCamera_c26@class$3517d_ev_camera_cppFv = .text:0x80097850; // type:function size:0x3C scope:weak align:4 +__ct__Q29dCamera_c26@class$3517d_ev_camera_cppFv = .text:0x8009788C; // type:function size:0x4 scope:weak align:4 +checkCanoeRide__9daPy_py_cCFv = .text:0x80097890; // type:function size:0x8 scope:weak align:4 +checkBoardRide__9daPy_py_cCFv = .text:0x80097898; // type:function size:0x8 scope:weak align:4 +checkSpinnerRide__9daPy_py_cCFv = .text:0x800978A0; // type:function size:0x8 scope:weak align:4 +checkBoarRide__9daPy_py_cCFv = .text:0x800978A8; // type:function size:0x8 scope:weak align:4 +getShadowTalkAtnPos__9daAlink_cFv = .text:0x800978B0; // type:function size:0x8 scope:weak align:4 Init__14d2DBSplinePathFll = .text:0x800978B8; // type:function size:0x8C scope:global align:4 Step__14d2DBSplinePathFv = .text:0x80097944; // type:function size:0x168 scope:global align:4 Calc__14d2DBSplinePathFP4cXyz = .text:0x80097AAC; // type:function size:0xB4 scope:global align:4 @@ -3862,16 +3860,16 @@ __dt__6dMdl_cFv = .text:0x8009C848; // type:function size:0x5C scope:global alig remove__10dMdl_mng_cFv = .text:0x8009C8A4; // type:function size:0x5C scope:global align:4 reset__10dMdl_mng_cFv = .text:0x8009C900; // type:function size:0x18 scope:global align:4 entry__10dMdl_mng_cFP12J3DModelDataUsi = .text:0x8009C918; // type:function size:0x58 scope:global align:4 -__ct__6dMdl_cFv = .text:0x8009C970; // type:function size:0x34 scope:global align:4 +__ct__6dMdl_cFv = .text:0x8009C970; // type:function size:0x34 scope:weak align:4 entry__8dEyeHL_cFP12J3DModelDataPCc = .text:0x8009C9A4; // type:function size:0xC4 scope:global align:4 remove__8dEyeHL_cFv = .text:0x8009CA68; // type:function size:0x20 scope:global align:4 update__12dEyeHL_mng_cFv = .text:0x8009CA88; // type:function size:0xCC scope:global align:4 entry__12dEyeHL_mng_cFP8dEyeHL_c = .text:0x8009CB54; // type:function size:0x20 scope:global align:4 remove__12dEyeHL_mng_cFP8dEyeHL_c = .text:0x8009CB74; // type:function size:0x54 scope:global align:4 -messageSet__FUlb = .text:0x8009CBC8; // type:function size:0x604 scope:global align:4 +messageSet__FUlb = .text:0x8009CBC8; // type:function size:0x604 scope:local align:4 draw__14dDvdErrorMsg_cFl = .text:0x8009D1CC; // type:function size:0x1C0 scope:global align:4 execute__14dDvdErrorMsg_cFv = .text:0x8009D38C; // type:function size:0xBC scope:global align:4 -drawCapture__FUc = .text:0x8009D448; // type:function size:0x380 scope:global align:4 +drawCapture__FUc = .text:0x8009D448; // type:function size:0x380 scope:local align:4 execute__19dShutdownErrorMsg_cFv = .text:0x8009D7C8; // type:function size:0xEC scope:global align:4 getE3Zhint__9daAlink_cFv = .text:0x8009D8B4; // type:function size:0x8 scope:global align:4 getAlinkArcName__9daAlink_cFv = .text:0x8009D8BC; // type:function size:0x8 scope:global align:4 @@ -6078,13 +6076,13 @@ getBtpFrm__12daItemBase_cFv = .text:0x801451CC; // type:function size:0x1C scope getShadowSize__12daItemBase_cFv = .text:0x801451E8; // type:function size:0x18 scope:global align:4 getCollisionH__12daItemBase_cFv = .text:0x80145200; // type:function size:0x1C scope:global align:4 getCollisionR__12daItemBase_cFv = .text:0x8014521C; // type:function size:0x1C scope:global align:4 -isLoadRoom__Fi = .text:0x80145238; // type:function size:0xF0 scope:global align:4 +isLoadRoom__Fi = .text:0x80145238; // type:function size:0xF0 scope:local align:4 execute__9daNocrm_cFv = .text:0x80145328; // type:function size:0x22C scope:global align:4 getRoomNo__9daNocrm_cFi = .text:0x80145554; // type:function size:0xA0 scope:global align:4 -daNocrm_create__FP9daNocrm_c = .text:0x801455F4; // type:function size:0xFC scope:global align:4 -daNocrm_Delete__FP9daNocrm_c = .text:0x801456F0; // type:function size:0x8 scope:global align:4 -daNocrm_execute__FP9daNocrm_c = .text:0x801456F8; // type:function size:0x20 scope:global align:4 -daNocrm_draw__FP9daNocrm_c = .text:0x80145718; // type:function size:0x8 scope:global align:4 +daNocrm_create__FP9daNocrm_c = .text:0x801455F4; // type:function size:0xFC scope:local align:4 +daNocrm_Delete__FP9daNocrm_c = .text:0x801456F0; // type:function size:0x8 scope:local align:4 +daNocrm_execute__FP9daNocrm_c = .text:0x801456F8; // type:function size:0x20 scope:local align:4 +daNocrm_draw__FP9daNocrm_c = .text:0x80145718; // type:function size:0x8 scope:local align:4 initialize__18daNpcT_ActorMngr_cFv = .text:0x80145720; // type:function size:0xC scope:global align:4 entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c = .text:0x8014572C; // type:function size:0x1C scope:global align:4 remove__18daNpcT_ActorMngr_cFv = .text:0x80145748; // type:function size:0xC scope:global align:4 @@ -6448,13 +6446,13 @@ setHitodamaParticle__9daNpcCd_cFv = .text:0x801573B8; // type:function size:0x1B getNpcMdlDataP__9daNpcCd_cFi = .text:0x80157570; // type:function size:0x64 scope:global align:4 getObjMdlDataP__9daNpcCd_cFi = .text:0x801575D4; // type:function size:0x78 scope:global align:4 __ct__13daNpcCd_HIO_cFv = .text:0x8015764C; // type:function size:0x1A0 scope:global align:4 -__dt__19daNpcCd_HIO_Child_cFv = .text:0x801577EC; // type:function size:0x70 scope:global align:4 -__dt__17daNpcCd_HIO_Jnt_cFv = .text:0x8015785C; // type:function size:0x48 scope:global align:4 -__ct__19daNpcCd_HIO_Child_cFv = .text:0x801578A4; // type:function size:0x58 scope:global align:4 -__ct__17daNpcCd_HIO_Jnt_cFv = .text:0x801578FC; // type:function size:0x10 scope:global align:4 -__dt__18fOpAcm_HIO_entry_cFv = .text:0x8015790C; // type:function size:0x5C scope:global align:4 -__dt__14mDoHIO_entry_cFv = .text:0x80157968; // type:function size:0x48 scope:global align:4 -__dt__13daNpcCd_HIO_cFv = .text:0x801579B0; // type:function size:0xAC scope:global align:4 +__dt__19daNpcCd_HIO_Child_cFv = .text:0x801577EC; // type:function size:0x70 scope:weak align:4 +__dt__17daNpcCd_HIO_Jnt_cFv = .text:0x8015785C; // type:function size:0x48 scope:weak align:4 +__ct__19daNpcCd_HIO_Child_cFv = .text:0x801578A4; // type:function size:0x58 scope:weak align:4 +__ct__17daNpcCd_HIO_Jnt_cFv = .text:0x801578FC; // type:function size:0x10 scope:weak align:4 +__dt__18fOpAcm_HIO_entry_cFv = .text:0x8015790C; // type:function size:0x5C scope:weak align:4 +__dt__14mDoHIO_entry_cFv = .text:0x80157968; // type:function size:0x48 scope:weak align:4 +__dt__13daNpcCd_HIO_cFv = .text:0x801579B0; // type:function size:0xAC scope:weak align:4 __sinit_d_a_npc_cd_cpp = .text:0x80157A5C; // type:function size:0x2A4 scope:local align:4 jntNodeCallBack__FP8J3DJointi = .text:0x80157D00; // type:function size:0x4C scope:local align:4 NpcCreate__10daNpcCd2_cFi = .text:0x80157D4C; // type:function size:0x228 scope:global align:4 @@ -6501,18 +6499,18 @@ __dt__21daNpcCd2_HIO_MChild_cFv = .text:0x8015A7E4; // type:function size:0x70 s __ct__21daNpcCd2_HIO_MChild_cFv = .text:0x8015A854; // type:function size:0x58 scope:global align:4 __dt__14daNpcCd2_HIO_cFv = .text:0x8015A8AC; // type:function size:0xAC scope:global align:4 __sinit_d_a_npc_cd2_cpp = .text:0x8015A958; // type:function size:0x4C0 scope:local align:4 -Reflect__FP4cXyzRC13cBgS_PolyInfof = .text:0x8015AE18; // type:function size:0x2EC scope:global align:4 +Reflect__FP4cXyzRC13cBgS_PolyInfof = .text:0x8015AE18; // type:function size:0x2EC scope:local align:4 getData__12daItemBase_cFv = .text:0x8015B104; // type:function size:0xC scope:global align:4 initBaseMtx__8daItem_cFv = .text:0x8015B110; // type:function size:0x44 scope:global align:4 setBaseMtx__8daItem_cFv = .text:0x8015B154; // type:function size:0x88 scope:global align:4 setBaseMtx_0__8daItem_cFv = .text:0x8015B1DC; // type:function size:0x38 scope:global align:4 setBaseMtx_1__8daItem_cFv = .text:0x8015B214; // type:function size:0x8C scope:global align:4 -itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B2A0; // type:function size:0xCC scope:global align:4 -itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B36C; // type:function size:0xB8 scope:global align:4 +itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B2A0; // type:function size:0xCC scope:local align:4 +itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B36C; // type:function size:0xB8 scope:local align:4 CreateInit__8daItem_cFv = .text:0x8015B424; // type:function size:0x3E4 scope:global align:4 setCullInfo__8daItem_cFv = .text:0x8015B808; // type:function size:0x18 scope:global align:4 _daItem_create__8daItem_cFv = .text:0x8015B820; // type:function size:0x268 scope:global align:4 -__dt__16Z2SoundObjSimpleFv = .text:0x8015BA88; // type:function size:0x60 scope:global align:4 +__dt__16Z2SoundObjSimpleFv = .text:0x8015BA88; // type:function size:0x60 scope:weak align:4 _daItem_execute__8daItem_cFv = .text:0x8015BAE8; // type:function size:0x2E8 scope:global align:4 _daItem_draw__8daItem_cFv = .text:0x8015BDD0; // type:function size:0x64 scope:global align:4 _daItem_delete__8daItem_cFv = .text:0x8015BE34; // type:function size:0x78 scope:global align:4 @@ -6556,13 +6554,13 @@ initFlag__8daItem_cFv = .text:0x8015DAF8; // type:function size:0x144 scope:glob initScale__8daItem_cFv = .text:0x8015DC3C; // type:function size:0x50 scope:global align:4 initSpeed__8daItem_cFi = .text:0x8015DC8C; // type:function size:0x1F8 scope:global align:4 initAngle__8daItem_cFv = .text:0x8015DE84; // type:function size:0x18 scope:global align:4 -daItem_Draw__FP8daItem_c = .text:0x8015DE9C; // type:function size:0x20 scope:global align:4 -daItem_Execute__FP8daItem_c = .text:0x8015DEBC; // type:function size:0x20 scope:global align:4 -daItem_Delete__FP8daItem_c = .text:0x8015DEDC; // type:function size:0x20 scope:global align:4 -daItem_Create__FP10fopAc_ac_c = .text:0x8015DEFC; // type:function size:0x20 scope:global align:4 +daItem_Draw__FP8daItem_c = .text:0x8015DE9C; // type:function size:0x20 scope:local align:4 +daItem_Execute__FP8daItem_c = .text:0x8015DEBC; // type:function size:0x20 scope:local align:4 +daItem_Delete__FP8daItem_c = .text:0x8015DEDC; // type:function size:0x20 scope:local align:4 +daItem_Create__FP10fopAc_ac_c = .text:0x8015DEFC; // type:function size:0x20 scope:local align:4 __sinit_d_a_obj_item_cpp = .text:0x8015DF1C; // type:function size:0x108 scope:local align:4 -getItemPos__9daPy_py_cCFv = .text:0x8015E024; // type:function size:0x1C scope:global align:4 -getLeftHandPos__9daPy_py_cCFv = .text:0x8015E040; // type:function size:0x1C scope:global align:4 +getItemPos__9daPy_py_cCFv = .text:0x8015E024; // type:function size:0x1C scope:weak align:4 +getLeftHandPos__9daPy_py_cCFv = .text:0x8015E040; // type:function size:0x1C scope:weak align:4 __ct__9dInsect_cFv = .text:0x8015E05C; // type:function size:0x68 scope:global align:4 Insect_GetDemoMain__9dInsect_cFv = .text:0x8015E0C4; // type:function size:0x1F4 scope:global align:4 CalcZBuffer__9dInsect_cFf = .text:0x8015E2B8; // type:function size:0x18C scope:global align:4 @@ -6865,21 +6863,21 @@ checkNoAttention__12daTagMstop_cCFv = .text:0x80182DB0; // type:function size:0x checkNoAttention__12daTagMhint_cCFv = .text:0x80182DC4; // type:function size:0x14 scope:global align:4 set__4cXyzFfff = .text:0x80182DD8; // type:function size:0x10 scope:global align:4 checkEndMessage__12daTagMwait_cFv = .text:0x80182DE8; // type:function size:0x38 scope:global align:4 -dEnvSe_Draw__FP8dEnvSe_c = .text:0x80182E20; // type:function size:0x8 scope:global align:4 -dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath = .text:0x80182E28; // type:function size:0x1FC scope:global align:4 +dEnvSe_Draw__FP8dEnvSe_c = .text:0x80182E20; // type:function size:0x8 scope:local align:4 +dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath = .text:0x80182E28; // type:function size:0x1FC scope:local align:4 execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc = .text:0x80183024; // type:function size:0x4A8 scope:global align:4 execute__8dEnvSe_cFv = .text:0x801834CC; // type:function size:0x120 scope:global align:4 -dEnvSe_Execute__FP8dEnvSe_c = .text:0x801835EC; // type:function size:0x20 scope:global align:4 -dEnvSe_IsDelete__FP8dEnvSe_c = .text:0x8018360C; // type:function size:0x8 scope:global align:4 -dEnvSe_Delete__FP8dEnvSe_c = .text:0x80183614; // type:function size:0x8 scope:global align:4 -dEnvSe_Create__FP8dEnvSe_c = .text:0x8018361C; // type:function size:0x28 scope:global align:4 +dEnvSe_Execute__FP8dEnvSe_c = .text:0x801835EC; // type:function size:0x20 scope:local align:4 +dEnvSe_IsDelete__FP8dEnvSe_c = .text:0x8018360C; // type:function size:0x8 scope:local align:4 +dEnvSe_Delete__FP8dEnvSe_c = .text:0x80183614; // type:function size:0x8 scope:local align:4 +dEnvSe_Create__FP8dEnvSe_c = .text:0x8018361C; // type:function size:0x28 scope:local align:4 __ct__9dFs_HIO_cFv = .text:0x80183644; // type:function size:0x74 scope:global align:4 __ct__14dFile_select_cFP10JKRArchive = .text:0x801836B8; // type:function size:0xF0 scope:global align:4 __dt__14dFile_select_cFv = .text:0x801837A8; // type:function size:0xA90 scope:global align:4 -__dt__15J2DAnmTevRegKeyFv = .text:0x80184238; // type:function size:0x88 scope:global align:4 -__dt__19J2DAnmTextureSRTKeyFv = .text:0x801842C0; // type:function size:0x88 scope:global align:4 -__dt__11J2DAnmColorFv = .text:0x80184348; // type:function size:0x74 scope:global align:4 -__dt__15J2DAnmTransformFv = .text:0x801843BC; // type:function size:0x5C scope:global align:4 +__dt__15J2DAnmTevRegKeyFv = .text:0x80184238; // type:function size:0x88 scope:weak align:4 +__dt__19J2DAnmTextureSRTKeyFv = .text:0x801842C0; // type:function size:0x88 scope:weak align:4 +__dt__11J2DAnmColorFv = .text:0x80184348; // type:function size:0x74 scope:weak align:4 +__dt__15J2DAnmTransformFv = .text:0x801843BC; // type:function size:0x5C scope:weak align:4 _create__14dFile_select_cFv = .text:0x80184418; // type:function size:0x130 scope:global align:4 _move__14dFile_select_cFv = .text:0x80184548; // type:function size:0x168 scope:global align:4 selFileWakuAnm__14dFile_select_cFv = .text:0x801846B0; // type:function size:0x23C scope:global align:4 @@ -6907,7 +6905,7 @@ menuSelect__14dFile_select_cFv = .text:0x801867C0; // type:function size:0x178 s menuSelectStart__14dFile_select_cFv = .text:0x80186938; // type:function size:0x194 scope:global align:4 menuSelectCansel__14dFile_select_cFv = .text:0x80186ACC; // type:function size:0xC8 scope:global align:4 menuMoveAnmInitSet__14dFile_select_cFii = .text:0x80186B94; // type:function size:0x13C scope:global align:4 -setWhite__10J2DTextBoxFQ28JUtility6TColor = .text:0x80186CD0; // type:function size:0x28 scope:global align:4 +setWhite__10J2DTextBoxFQ28JUtility6TColor = .text:0x80186CD0; // type:function size:0x28 scope:weak align:4 menuMoveAnm__14dFile_select_cFv = .text:0x80186CF8; // type:function size:0x168 scope:global align:4 menuSelectAnmSet__14dFile_select_cFv = .text:0x80186E60; // type:function size:0x184 scope:global align:4 menuSelectMoveAnm__14dFile_select_cFv = .text:0x80186FE4; // type:function size:0x284 scope:global align:4 @@ -6964,8 +6962,8 @@ backDatSelWait__14dFile_select_cFv = .text:0x8018AC88; // type:function size:0xF backDatSelWait2__14dFile_select_cFv = .text:0x8018AD84; // type:function size:0x64 scope:global align:4 nextModeWait__14dFile_select_cFv = .text:0x8018ADE8; // type:function size:0x4 scope:global align:4 screenSet__14dFile_select_cFv = .text:0x8018ADEC; // type:function size:0x10CC scope:global align:4 -setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor = .text:0x8018BEB8; // type:function size:0x48 scope:global align:4 -setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey = .text:0x8018BF00; // type:function size:0x4 scope:global align:4 +setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor = .text:0x8018BEB8; // type:function size:0x48 scope:weak align:4 +setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey = .text:0x8018BF00; // type:function size:0x4 scope:weak align:4 screenSetCopySel__14dFile_select_cFv = .text:0x8018BF04; // type:function size:0x5F8 scope:global align:4 screenSetYesNo__14dFile_select_cFv = .text:0x8018C4FC; // type:function size:0x3D0 scope:global align:4 screenSet3Menu__14dFile_select_cFv = .text:0x8018C8CC; // type:function size:0x3DC scope:global align:4 @@ -7058,16 +7056,16 @@ createMaskModel__16dFile_select3D_cFv = .text:0x80190B80; // type:function size: createMirrorModel__16dFile_select3D_cFv = .text:0x80190D40; // type:function size:0x280 scope:global align:4 toItem3Dpos__16dFile_select3D_cFfffP4cXyz = .text:0x80190FC0; // type:function size:0xEC scope:global align:4 calcViewMtx__16dFile_select3D_cFPA4_f = .text:0x801910AC; // type:function size:0x5C scope:global align:4 -getTransform__15J2DAnmTransformCFUsP16J3DTransformInfo = .text:0x80191108; // type:function size:0x4 scope:global align:4 -__dt__10JUTNameTabFv = .text:0x8019110C; // type:function size:0x48 scope:global align:4 -__dt__17dDlst_FileSel3m_cFv = .text:0x80191154; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_FileSelYn_cFv = .text:0x801911CC; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_FileSelCp_cFv = .text:0x80191244; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_FileSelDt_cFv = .text:0x801912BC; // type:function size:0x78 scope:global align:4 -__dt__15dDlst_FileSel_cFv = .text:0x80191334; // type:function size:0x84 scope:global align:4 -__dt__9dFs_HIO_cFv = .text:0x801913B8; // type:function size:0x48 scope:global align:4 +getTransform__15J2DAnmTransformCFUsP16J3DTransformInfo = .text:0x80191108; // type:function size:0x4 scope:weak align:4 +__dt__10JUTNameTabFv = .text:0x8019110C; // type:function size:0x48 scope:weak align:4 +__dt__17dDlst_FileSel3m_cFv = .text:0x80191154; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_FileSelYn_cFv = .text:0x801911CC; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_FileSelCp_cFv = .text:0x80191244; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_FileSelDt_cFv = .text:0x801912BC; // type:function size:0x78 scope:weak align:4 +__dt__15dDlst_FileSel_cFv = .text:0x80191334; // type:function size:0x84 scope:weak align:4 +__dt__9dFs_HIO_cFv = .text:0x801913B8; // type:function size:0x48 scope:weak align:4 __sinit_d_file_select_cpp = .text:0x80191400; // type:function size:0x744 scope:local align:4 -getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x80191B44; // type:function size:0x40 scope:global align:4 +getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x80191B44; // type:function size:0x40 scope:weak align:4 __ct__15dFile_warning_cFP10JKRArchiveUc = .text:0x80191B84; // type:function size:0x6C scope:global align:4 __dt__15dFile_warning_cFv = .text:0x80191BF0; // type:function size:0xDC scope:global align:4 screenSet__15dFile_warning_cFv = .text:0x80191CCC; // type:function size:0x224 scope:global align:4 @@ -7082,11 +7080,11 @@ _draw__15dFile_warning_cFv = .text:0x80192168; // type:function size:0x3C scope: drawSelf__15dFile_warning_cFv = .text:0x801921A4; // type:function size:0x2C scope:global align:4 setText__15dFile_warning_cFUl = .text:0x801921D0; // type:function size:0x48 scope:global align:4 setFontColor__15dFile_warning_cFQ28JUtility6TColorQ28JUtility6TColor = .text:0x80192218; // type:function size:0xCC scope:global align:4 -setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor = .text:0x801922E4; // type:function size:0x48 scope:global align:4 +setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor = .text:0x801922E4; // type:function size:0x48 scope:weak align:4 draw__16dDlst_FileWarn_cFv = .text:0x8019232C; // type:function size:0x38 scope:global align:4 __sinit_d_file_sel_warning_cpp = .text:0x80192364; // type:function size:0x40 scope:local align:4 -__dt__16dDlst_FileWarn_cFv = .text:0x801923A4; // type:function size:0x48 scope:global align:4 -setAnimation__9J2DScreenFP15J2DAnmTransform = .text:0x801923EC; // type:function size:0x20 scope:global align:4 +__dt__16dDlst_FileWarn_cFv = .text:0x801923A4; // type:function size:0x48 scope:weak align:4 +setAnimation__9J2DScreenFP15J2DAnmTransform = .text:0x801923EC; // type:function size:0x20 scope:weak align:4 __ct__12dFile_info_cFP10JKRArchiveUc = .text:0x8019240C; // type:function size:0x6C scope:global align:4 __dt__12dFile_info_cFv = .text:0x80192478; // type:function size:0xD0 scope:global align:4 screenSet__12dFile_info_cFv = .text:0x80192548; // type:function size:0x3E4 scope:global align:4 @@ -7099,7 +7097,7 @@ modeMove__12dFile_info_cFv = .text:0x80192D34; // type:function size:0x4 scope:g _draw__12dFile_info_cFv = .text:0x80192D38; // type:function size:0x3C scope:global align:4 draw__16dDlst_FileInfo_cFv = .text:0x80192D74; // type:function size:0xEC scope:global align:4 __sinit_d_file_sel_info_cpp = .text:0x80192E60; // type:function size:0x40 scope:local align:4 -__dt__16dDlst_FileInfo_cFv = .text:0x80192EA0; // type:function size:0x48 scope:global align:4 +__dt__16dDlst_FileInfo_cFv = .text:0x80192EA0; // type:function size:0x48 scope:weak align:4 __ct__14dBrightCheck_cFP10JKRArchive = .text:0x80192EE8; // type:function size:0x88 scope:global align:4 __dt__14dBrightCheck_cFv = .text:0x80192F70; // type:function size:0x98 scope:global align:4 screenSet__14dBrightCheck_cFv = .text:0x80193008; // type:function size:0x488 scope:global align:4 @@ -7109,9 +7107,9 @@ modeMove__14dBrightCheck_cFv = .text:0x801934CC; // type:function size:0x88 scop _draw__14dBrightCheck_cFv = .text:0x80193554; // type:function size:0x3C scope:global align:4 draw__19dDlst_BrightCheck_cFv = .text:0x80193590; // type:function size:0x38 scope:global align:4 __sinit_d_bright_check_cpp = .text:0x801935C8; // type:function size:0x40 scope:local align:4 -__dt__19dDlst_BrightCheck_cFv = .text:0x80193608; // type:function size:0x48 scope:global align:4 +__dt__19dDlst_BrightCheck_cFv = .text:0x80193608; // type:function size:0x48 scope:weak align:4 __ct__8dScope_cFUc = .text:0x80193650; // type:function size:0x2D0 scope:global align:4 -__ct__Q28JUtility6TColorFv = .text:0x80193920; // type:function size:0xC scope:global align:4 +__ct__Q28JUtility6TColorFv = .text:0x80193920; // type:function size:0xC scope:weak align:4 __dt__8dScope_cFv = .text:0x8019392C; // type:function size:0x224 scope:global align:4 _execute__8dScope_cFUl = .text:0x80193B50; // type:function size:0xD8 scope:global align:4 draw__8dScope_cFv = .text:0x80193C28; // type:function size:0x338 scope:global align:4 @@ -7122,12 +7120,12 @@ move_init__8dScope_cFv = .text:0x80194008; // type:function size:0x4 scope:globa move_proc__8dScope_cFv = .text:0x8019400C; // type:function size:0x4 scope:global align:4 close_init__8dScope_cFv = .text:0x80194010; // type:function size:0x4 scope:global align:4 close_proc__8dScope_cFv = .text:0x80194014; // type:function size:0x80 scope:global align:4 -__dt__11dMeterSub_cFv = .text:0x80194094; // type:function size:0x48 scope:global align:4 -_create__11dMeterSub_cFv = .text:0x801940DC; // type:function size:0x8 scope:global align:4 -_delete__11dMeterSub_cFv = .text:0x801940E4; // type:function size:0x8 scope:global align:4 -draw__11dMeterSub_cFv = .text:0x801940EC; // type:function size:0x4 scope:global align:4 -_execute__11dMeterSub_cFUl = .text:0x801940F0; // type:function size:0x8 scope:global align:4 -isDead__11dMeterSub_cFv = .text:0x801940F8; // type:function size:0x8 scope:global align:4 +__dt__11dMeterSub_cFv = .text:0x80194094; // type:function size:0x48 scope:weak align:4 +_create__11dMeterSub_cFv = .text:0x801940DC; // type:function size:0x8 scope:weak align:4 +_delete__11dMeterSub_cFv = .text:0x801940E4; // type:function size:0x8 scope:weak align:4 +draw__11dMeterSub_cFv = .text:0x801940EC; // type:function size:0x4 scope:weak align:4 +_execute__11dMeterSub_cFUl = .text:0x801940F0; // type:function size:0x8 scope:weak align:4 +isDead__11dMeterSub_cFv = .text:0x801940F8; // type:function size:0x8 scope:weak align:4 __sinit_d_scope_cpp = .text:0x80194100; // type:function size:0xA4 scope:local align:4 __ct__19dSelect_cursorHIO_cFv = .text:0x801941A4; // type:function size:0x3C scope:global align:4 __ct__16dSelect_cursor_cFUcfP10JKRArchive = .text:0x801941E0; // type:function size:0x7CC scope:global align:4 @@ -7145,13 +7143,13 @@ setBtk0Animation__16dSelect_cursor_cFP19J2DAnmTextureSRTKey = .text:0x801955B0; setCursorAnimation__16dSelect_cursor_cFv = .text:0x801956E4; // type:function size:0x1BC scope:global align:4 setBckAnimation__16dSelect_cursor_cFP18J2DAnmTransformKey = .text:0x801958A0; // type:function size:0x60 scope:global align:4 moveCenter__16dSelect_cursor_cFP7J2DPaneff = .text:0x80195900; // type:function size:0x38 scope:global align:4 -__dt__19dSelect_cursorHIO_cFv = .text:0x80195938; // type:function size:0x48 scope:global align:4 -__dt__18J2DAnmTransformKeyFv = .text:0x80195980; // type:function size:0x6C scope:global align:4 +__dt__19dSelect_cursorHIO_cFv = .text:0x80195938; // type:function size:0x48 scope:weak align:4 +__dt__18J2DAnmTransformKeyFv = .text:0x80195980; // type:function size:0x6C scope:weak align:4 __ct__9dSi_HIO_cFv = .text:0x801959EC; // type:function size:0x10 scope:global align:4 animation__14dSelect_icon_cFv = .text:0x801959FC; // type:function size:0x104 scope:global align:4 setAlpha__14dSelect_icon_cFUc = .text:0x80195B00; // type:function size:0x30 scope:global align:4 setPos__14dSelect_icon_cFP7J2DPaneff = .text:0x80195B30; // type:function size:0xAC scope:global align:4 -__dt__9dSi_HIO_cFv = .text:0x80195BDC; // type:function size:0x48 scope:global align:4 +__dt__9dSi_HIO_cFv = .text:0x80195BDC; // type:function size:0x48 scope:weak align:4 __sinit_d_select_icon_cpp = .text:0x80195C24; // type:function size:0x38 scope:local align:4 shop_cam_action_init__16ShopCam_action_cFv = .text:0x80195C5C; // type:function size:0x17C scope:global align:4 shop_cam_action__16ShopCam_action_cFv = .text:0x80195DD8; // type:function size:0x4F4 scope:global align:4 @@ -7169,8 +7167,8 @@ getCurrentPos__15dShopItemCtrl_cFi = .text:0x80196960; // type:function size:0x9 isHomePos__15dShopItemCtrl_cFi = .text:0x801969FC; // type:function size:0xB4 scope:global align:4 setRotateAnime__15dShopItemCtrl_cFi = .text:0x80196AB0; // type:function size:0xB4 scope:global align:4 setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb = .text:0x80196B64; // type:function size:0x4F4 scope:global align:4 -dShopSystem_searchItemActor__FPvPv = .text:0x80197058; // type:function size:0x1D8 scope:global align:4 -dShopSystem_searchCameraActor__FPvPv = .text:0x80197230; // type:function size:0xC8 scope:global align:4 +dShopSystem_searchItemActor__FPvPv = .text:0x80197058; // type:function size:0x1D8 scope:local align:4 +dShopSystem_searchCameraActor__FPvPv = .text:0x80197230; // type:function size:0xC8 scope:local align:4 initShopSystem__13dShopSystem_cFv = .text:0x801972F8; // type:function size:0x1AC scope:global align:4 __dt__13dShopSystem_cFv = .text:0x801974A4; // type:function size:0xDC scope:global align:4 onFlag__13dShopSystem_cFi = .text:0x80197580; // type:function size:0x1C scope:global align:4 @@ -7217,9 +7215,9 @@ checkLeftTrigger__13dShopSystem_cFP9STControl = .text:0x8019AB20; // type:functi checkRightTrigger__13dShopSystem_cFP9STControl = .text:0x8019AB44; // type:function size:0x24 scope:global align:4 dpdMove__13dShopSystem_cFv = .text:0x8019AB68; // type:function size:0x8 scope:global align:4 __sinit_d_shop_system_cpp = .text:0x8019AB70; // type:function size:0x130 scope:local align:4 -beforeStartSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019ACA0; // type:function size:0x8 scope:global align:4 -beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019ACA8; // type:function size:0x8 scope:global align:4 -getResName2__13dShopSystem_cFi = .text:0x8019ACB0; // type:function size:0x8 scope:global align:4 +beforeStartSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019ACA0; // type:function size:0x8 scope:weak align:4 +beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019ACA8; // type:function size:0x8 scope:weak align:4 +getResName2__13dShopSystem_cFi = .text:0x8019ACB0; // type:function size:0x8 scope:weak align:4 draw__24dDlst_Gameover_CAPTURE_cFv = .text:0x8019ACB8; // type:function size:0x2E8 scope:global align:4 __ct__10dGov_HIO_cFv = .text:0x8019AFA0; // type:function size:0x64 scope:global align:4 _create__11dGameover_cFv = .text:0x8019B004; // type:function size:0x2B0 scope:global align:4 @@ -7248,17 +7246,17 @@ __ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive = .text:0x8019B900; // type:funct __dt__24dDlst_GameOverScrnDraw_cFv = .text:0x8019BBBC; // type:function size:0xB4 scope:global align:4 setBackAlpha__24dDlst_GameOverScrnDraw_cFf = .text:0x8019BC70; // type:function size:0x44 scope:global align:4 draw__24dDlst_GameOverScrnDraw_cFv = .text:0x8019BCB4; // type:function size:0x248 scope:global align:4 -dGameover_Draw__FP11dGameover_c = .text:0x8019BEFC; // type:function size:0x20 scope:global align:4 -dGameover_Execute__FP11dGameover_c = .text:0x8019BF1C; // type:function size:0x20 scope:global align:4 -dGameover_IsDelete__FP11dGameover_c = .text:0x8019BF3C; // type:function size:0x8 scope:global align:4 -dGameover_Delete__FP11dGameover_c = .text:0x8019BF44; // type:function size:0x20 scope:global align:4 -dGameover_Create__FP9msg_class = .text:0x8019BF64; // type:function size:0x20 scope:global align:4 +dGameover_Draw__FP11dGameover_c = .text:0x8019BEFC; // type:function size:0x20 scope:local align:4 +dGameover_Execute__FP11dGameover_c = .text:0x8019BF1C; // type:function size:0x20 scope:local align:4 +dGameover_IsDelete__FP11dGameover_c = .text:0x8019BF3C; // type:function size:0x8 scope:local align:4 +dGameover_Delete__FP11dGameover_c = .text:0x8019BF44; // type:function size:0x20 scope:local align:4 +dGameover_Create__FP9msg_class = .text:0x8019BF64; // type:function size:0x20 scope:local align:4 d_GameOver_Create__FUc = .text:0x8019BF84; // type:function size:0x44 scope:global align:4 d_GameOver_Delete__FRUi = .text:0x8019BFC8; // type:function size:0x64 scope:global align:4 -__dt__10dGov_HIO_cFv = .text:0x8019C02C; // type:function size:0x5C scope:global align:4 +__dt__10dGov_HIO_cFv = .text:0x8019C02C; // type:function size:0x5C scope:weak align:4 __sinit_d_gameover_cpp = .text:0x8019C088; // type:function size:0x204 scope:local align:4 -__dt__24dDlst_Gameover_CAPTURE_cFv = .text:0x8019C28C; // type:function size:0x48 scope:global align:4 -__dt__12dMenu_save_cFv = .text:0x8019C2D4; // type:function size:0x74 scope:global align:4 +__dt__24dDlst_Gameover_CAPTURE_cFv = .text:0x8019C28C; // type:function size:0x48 scope:weak align:4 +__dt__12dMenu_save_cFv = .text:0x8019C2D4; // type:function size:0x74 scope:weak align:4 dKy_WolfPowerup_AmbCol__FP11_GXColorS10 = .text:0x8019C348; // type:function size:0x1C scope:global align:4 dKy_sense_pat_get__Fv = .text:0x8019C364; // type:function size:0x768 scope:global align:4 dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10 = .text:0x8019CACC; // type:function size:0x1D0 scope:global align:4 @@ -7268,16 +7266,16 @@ dKy_twi_wolflight_set__Fi = .text:0x8019CFA4; // type:function size:0x1BC scope: dKy_lightdir_set__FffP3Vec = .text:0x8019D160; // type:function size:0x124 scope:global align:4 dKy_GXInitLightSpot__FP12J3DLightInfofUc = .text:0x8019D284; // type:function size:0x188 scope:global align:4 dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc = .text:0x8019D40C; // type:function size:0xD4 scope:global align:4 -u8_data_ratio_set__FUcUcf = .text:0x8019D4E0; // type:function size:0x4C scope:global align:4 -s16_data_ratio_set__Fssf = .text:0x8019D52C; // type:function size:0x50 scope:global align:4 -kankyo_color_ratio_calc_common__Fsf = .text:0x8019D57C; // type:function size:0x60 scope:global align:4 -kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f = .text:0x8019D5DC; // type:function size:0x70 scope:global align:4 -kankyo_color_ratio_set__FUcUcfUcUcfsf = .text:0x8019D64C; // type:function size:0x104 scope:global align:4 -fl_data_ratio_set__Ffff = .text:0x8019D750; // type:function size:0x10 scope:global align:4 -float_kankyo_color_ratio_set__Fffffffff = .text:0x8019D760; // type:function size:0xD8 scope:global align:4 -get_parcent__Ffff = .text:0x8019D838; // type:function size:0x34 scope:global align:4 +u8_data_ratio_set__FUcUcf = .text:0x8019D4E0; // type:function size:0x4C scope:local align:4 +s16_data_ratio_set__Fssf = .text:0x8019D52C; // type:function size:0x50 scope:local align:4 +kankyo_color_ratio_calc_common__Fsf = .text:0x8019D57C; // type:function size:0x60 scope:local align:4 +kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f = .text:0x8019D5DC; // type:function size:0x70 scope:local align:4 +kankyo_color_ratio_set__FUcUcfUcUcfsf = .text:0x8019D64C; // type:function size:0x104 scope:local align:4 +fl_data_ratio_set__Ffff = .text:0x8019D750; // type:function size:0x10 scope:local align:4 +float_kankyo_color_ratio_set__Fffffffff = .text:0x8019D760; // type:function size:0xD8 scope:local align:4 +get_parcent__Ffff = .text:0x8019D838; // type:function size:0x34 scope:local align:4 dKy_get_parcent__Ffff = .text:0x8019D86C; // type:function size:0x20 scope:global align:4 -dKy_FiveSenses_fullthrottle_dark_static1__Fv = .text:0x8019D88C; // type:function size:0x480 scope:global align:4 +dKy_FiveSenses_fullthrottle_dark_static1__Fv = .text:0x8019D88C; // type:function size:0x480 scope:local align:4 dKy_FiveSenses_fullthrottle_dark__Fv = .text:0x8019DD0C; // type:function size:0x20 scope:global align:4 dKy_light_influence_id__F4cXyzi = .text:0x8019DD2C; // type:function size:0x3D0 scope:global align:4 dKy_eflight_influence_id__F4cXyzi = .text:0x8019E0FC; // type:function size:0x2C8 scope:global align:4 @@ -7286,26 +7284,26 @@ dKy_light_influence_col__FP8_GXColorf = .text:0x8019E3F0; // type:function size: dKy_light_influence_power__Fi = .text:0x8019E4E0; // type:function size:0x28 scope:global align:4 dKy_light_influence_yuragi__Fi = .text:0x8019E508; // type:function size:0x28 scope:global align:4 dKy_light_influence_distance__F4cXyzi = .text:0x8019E530; // type:function size:0x124 scope:global align:4 -plight_init__Fv = .text:0x8019E654; // type:function size:0x74 scope:global align:4 -darkmist_init__Fv = .text:0x8019E6C8; // type:function size:0x2C scope:global align:4 -plight_set__Fv = .text:0x8019E6F4; // type:function size:0x120 scope:global align:4 -bgparts_activelight_init__Fv = .text:0x8019E814; // type:function size:0x20 scope:global align:4 -dungeonlight_init__Fv = .text:0x8019E834; // type:function size:0x22C scope:global align:4 -undwater_init__Fv = .text:0x8019EA60; // type:function size:0x130 scope:global align:4 +plight_init__Fv = .text:0x8019E654; // type:function size:0x74 scope:local align:4 +darkmist_init__Fv = .text:0x8019E6C8; // type:function size:0x2C scope:local align:4 +plight_set__Fv = .text:0x8019E6F4; // type:function size:0x120 scope:local align:4 +bgparts_activelight_init__Fv = .text:0x8019E814; // type:function size:0x20 scope:local align:4 +dungeonlight_init__Fv = .text:0x8019E834; // type:function size:0x22C scope:local align:4 +undwater_init__Fv = .text:0x8019EA60; // type:function size:0x130 scope:local align:4 dKy_light_size_get__FPCc = .text:0x8019EB90; // type:function size:0xC8 scope:global align:4 -envcolor_init__Fv = .text:0x8019EC58; // type:function size:0x5CC scope:global align:4 +envcolor_init__Fv = .text:0x8019EC58; // type:function size:0x5CC scope:local align:4 dKy_clear_game_init__Fv = .text:0x8019F224; // type:function size:0x84 scope:global align:4 __ct__18dScnKy_env_light_cFv = .text:0x8019F2A8; // type:function size:0x118 scope:global align:4 -__ct__19GB_MAPLE_COL_CHANGEFv = .text:0x8019F3C0; // type:function size:0x38 scope:global align:4 -__dt__10BOSS_LIGHTFv = .text:0x8019F3F8; // type:function size:0x3C scope:global align:4 -__ct__10BOSS_LIGHTFv = .text:0x8019F434; // type:function size:0x4 scope:global align:4 -__dt__13DUNGEON_LIGHTFv = .text:0x8019F438; // type:function size:0x3C scope:global align:4 -__ct__13DUNGEON_LIGHTFv = .text:0x8019F474; // type:function size:0x4 scope:global align:4 -__dt__15WIND_INF_ENTITYFv = .text:0x8019F478; // type:function size:0x3C scope:global align:4 -__ct__15WIND_INF_ENTITYFv = .text:0x8019F4B4; // type:function size:0x4 scope:global align:4 -__ct__15LIGHT_INFLUENCEFv = .text:0x8019F4B8; // type:function size:0x4 scope:global align:4 +__ct__19GB_MAPLE_COL_CHANGEFv = .text:0x8019F3C0; // type:function size:0x38 scope:weak align:4 +__dt__10BOSS_LIGHTFv = .text:0x8019F3F8; // type:function size:0x3C scope:weak align:4 +__ct__10BOSS_LIGHTFv = .text:0x8019F434; // type:function size:0x4 scope:weak align:4 +__dt__13DUNGEON_LIGHTFv = .text:0x8019F438; // type:function size:0x3C scope:weak align:4 +__ct__13DUNGEON_LIGHTFv = .text:0x8019F474; // type:function size:0x4 scope:weak align:4 +__dt__15WIND_INF_ENTITYFv = .text:0x8019F478; // type:function size:0x3C scope:weak align:4 +__ct__15WIND_INF_ENTITYFv = .text:0x8019F4B4; // type:function size:0x4 scope:weak align:4 +__ct__15LIGHT_INFLUENCEFv = .text:0x8019F4B8; // type:function size:0x4 scope:weak align:4 setDaytime__18dScnKy_env_light_cFv = .text:0x8019F4BC; // type:function size:0x284 scope:global align:4 -GetTimePass__20dStage_roomControl_cFv = .text:0x8019F740; // type:function size:0x8 scope:global align:4 +GetTimePass__20dStage_roomControl_cFv = .text:0x8019F740; // type:function size:0x8 scope:weak align:4 setSunpos__18dScnKy_env_light_cFv = .text:0x8019F748; // type:function size:0x280 scope:global align:4 getDaytime__18dScnKy_env_light_cFv = .text:0x8019F9C8; // type:function size:0x8 scope:global align:4 dKy_getdaytime_hour__Fv = .text:0x8019F9D0; // type:function size:0x2C scope:global align:4 @@ -7322,13 +7320,13 @@ setLight_bg__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfP setLight_actor__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10PfPf = .text:0x801A1680; // type:function size:0x6A4 scope:global align:4 settingTevStruct_colget_actor__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf = .text:0x801A1D24; // type:function size:0x1F4 scope:global align:4 settingTevStruct_colget_player__18dScnKy_env_light_cFP12dKy_tevstr_c = .text:0x801A1F18; // type:function size:0x138 scope:global align:4 -cLib_addCalcU8__FPUcUcss = .text:0x801A2050; // type:function size:0x98 scope:global align:4 +cLib_addCalcU8__FPUcUcss = .text:0x801A2050; // type:function size:0x98 scope:local align:4 settingTevStruct_plightcol_plus__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_c11_GXColorS1011_GXColorS10Uc = .text:0x801A20E8; // type:function size:0x169C scope:global align:4 settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c = .text:0x801A3784; // type:function size:0xC58 scope:global align:4 setLightTevColorType__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c = .text:0x801A43DC; // type:function size:0x4 scope:global align:4 -setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci = .text:0x801A43E0; // type:function size:0x7E8 scope:global align:4 -setLight__13J3DColorBlockFUlP11J3DLightObj = .text:0x801A4BC8; // type:function size:0x4 scope:global align:4 -setAmbColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x801A4BCC; // type:function size:0x4 scope:global align:4 +setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci = .text:0x801A43E0; // type:function size:0x7E8 scope:local align:4 +setLight__13J3DColorBlockFUlP11J3DLightObj = .text:0x801A4BC8; // type:function size:0x4 scope:weak align:4 +setAmbColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x801A4BCC; // type:function size:0x4 scope:weak align:4 dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci = .text:0x801A4BD0; // type:function size:0x190 scope:global align:4 setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c = .text:0x801A4D60; // type:function size:0xF0 scope:global align:4 CalcTevColor__18dScnKy_env_light_cFv = .text:0x801A4E50; // type:function size:0x94 scope:global align:4 @@ -7338,11 +7336,11 @@ SetBaseLight__18dScnKy_env_light_cFv = .text:0x801A512C; // type:function size:0 exeKankyo__18dScnKy_env_light_cFv = .text:0x801A5248; // type:function size:0x454 scope:global align:4 drawKankyo__18dScnKy_env_light_cFv = .text:0x801A569C; // type:function size:0x50 scope:global align:4 dKy_undwater_filter_draw__Fv = .text:0x801A56EC; // type:function size:0x440 scope:global align:4 -dKy_Draw__FP17sub_kankyo__class = .text:0x801A5B2C; // type:function size:0x2C scope:global align:4 -dKy_Execute__FP17sub_kankyo__class = .text:0x801A5B58; // type:function size:0x34 scope:global align:4 -dKy_IsDelete__FP17sub_kankyo__class = .text:0x801A5B8C; // type:function size:0x8 scope:global align:4 -dKy_Delete__FP17sub_kankyo__class = .text:0x801A5B94; // type:function size:0x48 scope:global align:4 -dKy_Create__FPv = .text:0x801A5BDC; // type:function size:0x238 scope:global align:4 +dKy_Draw__FP17sub_kankyo__class = .text:0x801A5B2C; // type:function size:0x2C scope:local align:4 +dKy_Execute__FP17sub_kankyo__class = .text:0x801A5B58; // type:function size:0x34 scope:local align:4 +dKy_IsDelete__FP17sub_kankyo__class = .text:0x801A5B8C; // type:function size:0x8 scope:local align:4 +dKy_Delete__FP17sub_kankyo__class = .text:0x801A5B94; // type:function size:0x48 scope:local align:4 +dKy_Create__FPv = .text:0x801A5BDC; // type:function size:0x238 scope:local align:4 dKy_setLight_init__Fv = .text:0x801A5E14; // type:function size:0x268 scope:global align:4 dKy_setLight__Fv = .text:0x801A607C; // type:function size:0x24 scope:global align:4 dKy_GlobalLight_set__Fv = .text:0x801A60A0; // type:function size:0x114 scope:global align:4 @@ -7382,12 +7380,12 @@ dKy_Sound_init__Fv = .text:0x801A8150; // type:function size:0x30 scope:global a dKy_Sound_set__F4cXyziUii = .text:0x801A8180; // type:function size:0x2B4 scope:global align:4 dKy_Sound_get__Fv = .text:0x801A8434; // type:function size:0x10 scope:global align:4 dKy_SordFlush_set__F4cXyzi = .text:0x801A8444; // type:function size:0xB4 scope:global align:4 -GxFogSet_Sub__FP8_GXColor = .text:0x801A84F8; // type:function size:0xB0 scope:global align:4 -GxFog_set__Fv = .text:0x801A85A8; // type:function size:0x44 scope:global align:4 +GxFogSet_Sub__FP8_GXColor = .text:0x801A84F8; // type:function size:0xB0 scope:local align:4 +GxFog_set__Fv = .text:0x801A85A8; // type:function size:0x44 scope:local align:4 dKy_GxFog_set__Fv = .text:0x801A85EC; // type:function size:0x24 scope:global align:4 dKy_GxFog_tevstr_set__FP12dKy_tevstr_c = .text:0x801A8610; // type:function size:0xA8 scope:global align:4 dKy_GfFog_tevstr_set__FP12dKy_tevstr_c = .text:0x801A86B8; // type:function size:0xA8 scope:global align:4 -GxXFog_set__Fv = .text:0x801A8760; // type:function size:0x44 scope:global align:4 +GxXFog_set__Fv = .text:0x801A8760; // type:function size:0x44 scope:local align:4 dKy_change_colpat__FUc = .text:0x801A87A4; // type:function size:0x28 scope:global align:4 dKy_custom_colset__FUcUcf = .text:0x801A87CC; // type:function size:0x48 scope:global align:4 dKy_setLight_mine__FP12dKy_tevstr_c = .text:0x801A8814; // type:function size:0x98 scope:global align:4 @@ -7405,7 +7403,7 @@ dKy_get_dayofweek__Fv = .text:0x801A8AF8; // type:function size:0x20 scope:globa dKy_set_nexttime__Ff = .text:0x801A8B18; // type:function size:0x10 scope:global align:4 dKy_instant_timechg__Ff = .text:0x801A8B28; // type:function size:0x60 scope:global align:4 dKy_instant_rainchg__Fv = .text:0x801A8B88; // type:function size:0x3C scope:global align:4 -NewAmbColGet__FP11_GXColorS10 = .text:0x801A8BC4; // type:function size:0x21C scope:global align:4 +NewAmbColGet__FP11_GXColorS10 = .text:0x801A8BC4; // type:function size:0x21C scope:local align:4 dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf = .text:0x801A8DE0; // type:function size:0xDC4 scope:global align:4 dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf = .text:0x801A9BA4; // type:function size:0xD8 scope:global align:4 dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf = .text:0x801A9C7C; // type:function size:0xA4 scope:global align:4 @@ -7444,28 +7442,28 @@ dKy_shadow_mode_set__FUc = .text:0x801ACC9C; // type:function size:0x18 scope:gl dKy_shadow_mode_reset__FUc = .text:0x801ACCB4; // type:function size:0x18 scope:global align:4 dKy_shadow_mode_check__FUc = .text:0x801ACCCC; // type:function size:0x18 scope:global align:4 dKy_bg_MAxx_proc__FPv = .text:0x801ACCE4; // type:function size:0xE98 scope:global align:4 -__dt__18dScnKy_env_light_cFv = .text:0x801ADB7C; // type:function size:0xE8 scope:global align:4 +__dt__18dScnKy_env_light_cFv = .text:0x801ADB7C; // type:function size:0xE8 scope:weak align:4 __sinit_d_kankyo_cpp = .text:0x801ADC64; // type:function size:0x5C scope:local align:4 -dKankyo_DayProc__Fv = .text:0x801ADCC0; // type:function size:0x38 scope:global align:4 -dKyeff_Draw__FP8dKyeff_c = .text:0x801ADCF8; // type:function size:0x24 scope:global align:4 +dKankyo_DayProc__Fv = .text:0x801ADCC0; // type:function size:0x38 scope:local align:4 +dKyeff_Draw__FP8dKyeff_c = .text:0x801ADCF8; // type:function size:0x24 scope:local align:4 execute__8dKyeff_cFv = .text:0x801ADD1C; // type:function size:0x58 scope:global align:4 -dKyeff_Execute__FP8dKyeff_c = .text:0x801ADD74; // type:function size:0x20 scope:global align:4 -dKyeff_IsDelete__FP8dKyeff_c = .text:0x801ADD94; // type:function size:0x8 scope:global align:4 -dKyeff_Delete__FP8dKyeff_c = .text:0x801ADD9C; // type:function size:0x24 scope:global align:4 -dKyeff_Create__FP12kankyo_class = .text:0x801ADDC0; // type:function size:0xA0 scope:global align:4 -dKyeff2_Draw__FP9dKyeff2_c = .text:0x801ADE60; // type:function size:0x24 scope:global align:4 +dKyeff_Execute__FP8dKyeff_c = .text:0x801ADD74; // type:function size:0x20 scope:local align:4 +dKyeff_IsDelete__FP8dKyeff_c = .text:0x801ADD94; // type:function size:0x8 scope:local align:4 +dKyeff_Delete__FP8dKyeff_c = .text:0x801ADD9C; // type:function size:0x24 scope:local align:4 +dKyeff_Create__FP12kankyo_class = .text:0x801ADDC0; // type:function size:0xA0 scope:local align:4 +dKyeff2_Draw__FP9dKyeff2_c = .text:0x801ADE60; // type:function size:0x24 scope:local align:4 execute__9dKyeff2_cFv = .text:0x801ADE84; // type:function size:0x24 scope:global align:4 -dKyeff2_Execute__FP9dKyeff2_c = .text:0x801ADEA8; // type:function size:0x20 scope:global align:4 -dKyeff2_IsDelete__FP9dKyeff2_c = .text:0x801ADEC8; // type:function size:0x8 scope:global align:4 -dKyeff2_Delete__FP9dKyeff2_c = .text:0x801ADED0; // type:function size:0x24 scope:global align:4 -dKyeff2_Create__FP12kankyo_class = .text:0x801ADEF4; // type:function size:0x24 scope:global align:4 +dKyeff2_Execute__FP9dKyeff2_c = .text:0x801ADEA8; // type:function size:0x20 scope:local align:4 +dKyeff2_IsDelete__FP9dKyeff2_c = .text:0x801ADEC8; // type:function size:0x8 scope:local align:4 +dKyeff2_Delete__FP9dKyeff2_c = .text:0x801ADED0; // type:function size:0x24 scope:local align:4 +dKyeff2_Create__FP12kankyo_class = .text:0x801ADEF4; // type:function size:0x24 scope:local align:4 createHeap__10dThunder_cFv = .text:0x801ADF18; // type:function size:0x5C scope:global align:4 adjustHeap__10dThunder_cFv = .text:0x801ADF74; // type:function size:0x4C scope:global align:4 -dThunder_Draw__FP10dThunder_c = .text:0x801ADFC0; // type:function size:0x19C scope:global align:4 -dThunder_Execute__FP10dThunder_c = .text:0x801AE15C; // type:function size:0x1D8 scope:global align:4 -dThunder_IsDelete__FP10dThunder_c = .text:0x801AE334; // type:function size:0x8 scope:global align:4 -dThunder_Delete__FP10dThunder_c = .text:0x801AE33C; // type:function size:0x80 scope:global align:4 -dThunder_Create__FP12kankyo_class = .text:0x801AE3BC; // type:function size:0x5C scope:global align:4 +dThunder_Draw__FP10dThunder_c = .text:0x801ADFC0; // type:function size:0x19C scope:local align:4 +dThunder_Execute__FP10dThunder_c = .text:0x801AE15C; // type:function size:0x1D8 scope:local align:4 +dThunder_IsDelete__FP10dThunder_c = .text:0x801AE334; // type:function size:0x8 scope:local align:4 +dThunder_Delete__FP10dThunder_c = .text:0x801AE33C; // type:function size:0x80 scope:local align:4 +dThunder_Create__FP12kankyo_class = .text:0x801AE3BC; // type:function size:0x5C scope:local align:4 create__10dThunder_cFv = .text:0x801AE418; // type:function size:0x4E0 scope:global align:4 __ct__15dKantera_icon_cFv = .text:0x801AE8F8; // type:function size:0x3C scope:global align:4 __dt__15dKantera_icon_cFv = .text:0x801AE934; // type:function size:0xF4 scope:global align:4 @@ -7632,7 +7630,7 @@ screenInit__12dMenu_Dmap_cFv = .text:0x801BB5F4; // type:function size:0x1154 sc getPlayerIconPos__12dMenu_Dmap_cFScf = .text:0x801BC748; // type:function size:0xC0 scope:global align:4 getIconPos__12dMenu_Dmap_cFScf = .text:0x801BC808; // type:function size:0x5AC scope:global align:4 __dt__12dMenu_Dmap_cFv = .text:0x801BCDB4; // type:function size:0x350 scope:global align:4 -__dt__19dMenu_DmapMapCtrl_cFv = .text:0x801BD104; // type:function size:0x90 scope:global align:4 +__dt__19dMenu_DmapMapCtrl_cFv = .text:0x801BD104; // type:function size:0x90 scope:weak align:4 getCurFloorPos__12dMenu_Dmap_cFv = .text:0x801BD194; // type:function size:0x14 scope:global align:4 getDefaultCurFloorPos__12dMenu_Dmap_cFv = .text:0x801BD1A8; // type:function size:0x20 scope:global align:4 iconMoveCalc__12dMenu_Dmap_cFv = .text:0x801BD1C8; // type:function size:0x1B0 scope:global align:4 @@ -7641,8 +7639,8 @@ drawFloorScreenTop__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph = .text:0x801BD isMapMoveState__12dMenu_Dmap_cFv = .text:0x801BD650; // type:function size:0x34 scope:global align:4 floorChangeMode__12dMenu_Dmap_cFv = .text:0x801BD684; // type:function size:0xFC scope:global align:4 _create__12dMenu_Dmap_cFv = .text:0x801BD780; // type:function size:0x580 scope:global align:4 -append__10J2DPictureFPC7ResTIMGf = .text:0x801BDD00; // type:function size:0x30 scope:global align:4 -insert__10J2DPictureFPC7ResTIMGUcf = .text:0x801BDD30; // type:function size:0x34 scope:global align:4 +append__10J2DPictureFPC7ResTIMGf = .text:0x801BDD00; // type:function size:0x30 scope:weak align:4 +insert__10J2DPictureFPC7ResTIMGUcf = .text:0x801BDD30; // type:function size:0x34 scope:weak align:4 _move__12dMenu_Dmap_cFv = .text:0x801BDD64; // type:function size:0x154 scope:global align:4 setMapTexture__12dMenu_Dmap_cFv = .text:0x801BDEB8; // type:function size:0x50 scope:global align:4 mapBgAnime__12dMenu_Dmap_cFv = .text:0x801BDF08; // type:function size:0x24 scope:global align:4 @@ -7681,12 +7679,12 @@ zoomIn_init_proc__12dMenu_Dmap_cFv = .text:0x801C004C; // type:function size:0x1 zoomIn_proc__12dMenu_Dmap_cFv = .text:0x801C0160; // type:function size:0x9C scope:global align:4 zoomOut_init_proc__12dMenu_Dmap_cFv = .text:0x801C01FC; // type:function size:0xB4 scope:global align:4 zoomOut_proc__12dMenu_Dmap_cFv = .text:0x801C02B0; // type:function size:0x90 scope:global align:4 -__dt__15renderingDmap_cFv = .text:0x801C0340; // type:function size:0xAC scope:global align:4 -__dt__20dMenu_StageMapCtrl_cFv = .text:0x801C03EC; // type:function size:0x80 scope:global align:4 -__dt__15dMenu_DmapMap_cFv = .text:0x801C046C; // type:function size:0x70 scope:global align:4 -__ct__15renderingDmap_cFv = .text:0x801C04DC; // type:function size:0xA8 scope:global align:4 +__dt__15renderingDmap_cFv = .text:0x801C0340; // type:function size:0xAC scope:weak align:4 +__dt__20dMenu_StageMapCtrl_cFv = .text:0x801C03EC; // type:function size:0x80 scope:weak align:4 +__dt__15dMenu_DmapMap_cFv = .text:0x801C046C; // type:function size:0x70 scope:weak align:4 +__ct__15renderingDmap_cFv = .text:0x801C04DC; // type:function size:0xA8 scope:weak align:4 __sinit_d_menu_dmap_cpp = .text:0x801C0584; // type:function size:0x280 scope:local align:4 -@4@__dt__14dMenu_DmapBg_cFv = .text:0x801C0804; // type:function size:0x8 scope:local align:4 +@4@__dt__14dMenu_DmapBg_cFv = .text:0x801C0804; // type:function size:0x8 scope:weak align:4 hasMap__15renderingDmap_cCFv = .text:0x801C080C; // type:function size:0x20 scope:global align:4 isDrawIconSingle2__15renderingDmap_cCFPCQ27dTres_c6data_sbbi = .text:0x801C082C; // type:function size:0x2D4 scope:global align:4 getPlayerCursorSize__15renderingDmap_cFv = .text:0x801C0B00; // type:function size:0x8 scope:global align:4 @@ -7781,7 +7779,7 @@ setBButtonString__15dMenu_Fishing_cFUs = .text:0x801C5F28; // type:function size getFigure__15dMenu_Fishing_cFi = .text:0x801C5FD8; // type:function size:0x44 scope:global align:4 setFishParam__15dMenu_Fishing_cFiUsUc = .text:0x801C601C; // type:function size:0x1B4 scope:global align:4 setHIO__15dMenu_Fishing_cFb = .text:0x801C61D0; // type:function size:0x38C scope:global align:4 -draw__15dMenu_Fishing_cFv = .text:0x801C655C; // type:function size:0x20 scope:global align:4 +draw__15dMenu_Fishing_cFv = .text:0x801C655C; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_fishing_cpp = .text:0x801C657C; // type:function size:0x3C scope:local align:4 __ct__9dMf_HIO_cFv = .text:0x801C65B8; // type:function size:0x34 scope:global align:4 dMenuFmap_getStartStageName__FPv = .text:0x801C65EC; // type:function size:0xB8 scope:global align:4 @@ -7869,7 +7867,7 @@ readWorldData__12dMenu_Fmap_cFUc = .text:0x801CB7E4; // type:function size:0x1C8 readAreaData__12dMenu_Fmap_cFUcb = .text:0x801CB9AC; // type:function size:0x5CC scope:global align:4 readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc = .text:0x801CBF78; // type:function size:0x190 scope:global align:4 readFieldMapData__12dMenu_Fmap_cFPPvPCcbb = .text:0x801CC108; // type:function size:0x1F0 scope:global align:4 -getExpandedResSize__10JKRArchiveCFPCv = .text:0x801CC2F8; // type:function size:0x2C scope:global align:4 +getExpandedResSize__10JKRArchiveCFPCv = .text:0x801CC2F8; // type:function size:0x2C scope:weak align:4 decodeFieldMapData__12dMenu_Fmap_cFv = .text:0x801CC324; // type:function size:0x23C scope:global align:4 decodePortalData__12dMenu_Fmap_cFv = .text:0x801CC560; // type:function size:0x30 scope:global align:4 readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc = .text:0x801CC590; // type:function size:0x100 scope:global align:4 @@ -7906,10 +7904,10 @@ howlArrowPosInit__12dMenu_Fmap_cFv = .text:0x801CD888; // type:function size:0xA getHowlRegionID__12dMenu_Fmap_cFv = .text:0x801CD928; // type:function size:0x78 scope:global align:4 isLightVesselGet__12dMenu_Fmap_cFv = .text:0x801CD9A0; // type:function size:0x30 scope:global align:4 getPlayerPos2D__12dMenu_Fmap_cFv = .text:0x801CD9D0; // type:function size:0xD0 scope:global align:4 -__dt__9dMf_HIO_cFv = .text:0x801CDAA0; // type:function size:0x48 scope:global align:4 +__dt__9dMf_HIO_cFv = .text:0x801CDAA0; // type:function size:0x48 scope:weak align:4 __sinit_d_menu_fmap_cpp = .text:0x801CDAE8; // type:function size:0x5F4 scope:local align:4 -twoValueLineInterpolation__FUcUcf = .text:0x801CE0DC; // type:function size:0x64 scope:global align:4 -twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor = .text:0x801CE140; // type:function size:0x90 scope:global align:4 +twoValueLineInterpolation__FUcUcf = .text:0x801CE0DC; // type:function size:0x64 scope:local align:4 +twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor = .text:0x801CE140; // type:function size:0x90 scope:local align:4 init__15renderingFmap_cFPUcUsUsUsUs = .text:0x801CE1D0; // type:function size:0x2C scope:global align:4 entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff = .text:0x801CE1FC; // type:function size:0x9C scope:global align:4 isSwitchSpecialOff__15renderingFmap_cFi = .text:0x801CE298; // type:function size:0x64 scope:global align:4 @@ -7947,10 +7945,10 @@ getBackColor__15dMenu_FmapMap_cCFv = .text:0x801CF30C; // type:function size:0x8 getColor__15dMenu_FmapMap_cFi = .text:0x801CF314; // type:function size:0xF4 scope:global align:4 setTexture__15dMenu_FmapMap_cFUsUsUsUs = .text:0x801CF408; // type:function size:0xBC scope:global align:4 setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff = .text:0x801CF4C4; // type:function size:0x80 scope:global align:4 -__dt__15renderingFmap_cFv = .text:0x801CF544; // type:function size:0x8C scope:global align:4 -isRenderingFloor__15renderingFmap_cFi = .text:0x801CF5D0; // type:function size:0x8 scope:global align:4 -beforeDrawPath__15renderingFmap_cFv = .text:0x801CF5D8; // type:function size:0x4 scope:global align:4 -afterDrawPath__15renderingFmap_cFv = .text:0x801CF5DC; // type:function size:0x4 scope:global align:4 +__dt__15renderingFmap_cFv = .text:0x801CF544; // type:function size:0x8C scope:weak align:4 +isRenderingFloor__15renderingFmap_cFi = .text:0x801CF5D0; // type:function size:0x8 scope:weak align:4 +beforeDrawPath__15renderingFmap_cFv = .text:0x801CF5D8; // type:function size:0x4 scope:weak align:4 +afterDrawPath__15renderingFmap_cFv = .text:0x801CF5DC; // type:function size:0x4 scope:weak align:4 __ct__18dMenu_Fmap2DBack_cFv = .text:0x801CF5E0; // type:function size:0x770 scope:global align:4 __dt__18dMenu_Fmap2DBack_cFv = .text:0x801CFD50; // type:function size:0x258 scope:global align:4 draw__18dMenu_Fmap2DBack_cFv = .text:0x801CFFA8; // type:function size:0x8D0 scope:global align:4 @@ -8044,7 +8042,7 @@ checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv = .text:0x801D7B28; // type:functi checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv = .text:0x801D7BCC; // type:function size:0x74 scope:global align:4 setHIO__17dMenu_Fmap2DTop_cFb = .text:0x801D7C40; // type:function size:0x4BC scope:global align:4 isWarpAccept__17dMenu_Fmap2DTop_cFv = .text:0x801D80FC; // type:function size:0x84 scope:global align:4 -@4@__dt__18dMenu_Fmap2DBack_cFv = .text:0x801D8180; // type:function size:0x8 scope:local align:4 +@4@__dt__18dMenu_Fmap2DBack_cFv = .text:0x801D8180; // type:function size:0x8 scope:weak align:4 __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc = .text:0x801D8188; // type:function size:0x1E0 scope:global align:4 __dt__14dMenu_Insect_cFv = .text:0x801D8368; // type:function size:0x364 scope:global align:4 _create__14dMenu_Insect_cFv = .text:0x801D86CC; // type:function size:0x70 scope:global align:4 @@ -8080,7 +8078,7 @@ dpdMove__14dMenu_Insect_cFv = .text:0x801DA370; // type:function size:0x8 scope: setAButtonString__14dMenu_Insect_cFUs = .text:0x801DA378; // type:function size:0xB0 scope:global align:4 setBButtonString__14dMenu_Insect_cFUs = .text:0x801DA428; // type:function size:0xB0 scope:global align:4 setHIO__14dMenu_Insect_cFb = .text:0x801DA4D8; // type:function size:0x1CC scope:global align:4 -draw__14dMenu_Insect_cFv = .text:0x801DA6A4; // type:function size:0x20 scope:global align:4 +draw__14dMenu_Insect_cFv = .text:0x801DA6A4; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_insect_cpp = .text:0x801DA6C4; // type:function size:0x104 scope:local align:4 __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb = .text:0x801DA7C8; // type:function size:0x89C scope:global align:4 __dt__19dMenu_ItemExplain_cFv = .text:0x801DB064; // type:function size:0x480 scope:global align:4 @@ -8134,10 +8132,10 @@ read_next_fadein_move__14dMenu_Letter_cFv = .text:0x801DED78; // type:function s read_close_init__14dMenu_Letter_cFv = .text:0x801DEE94; // type:function size:0x4C scope:global align:4 read_close_move__14dMenu_Letter_cFv = .text:0x801DEEE0; // type:function size:0x1A4 scope:global align:4 screenSetMenu__14dMenu_Letter_cFv = .text:0x801DF084; // type:function size:0xA18 scope:global align:4 -getWhite__10J2DTextBoxCFv = .text:0x801DFA9C; // type:function size:0xC scope:global align:4 -getBlack__10J2DTextBoxCFv = .text:0x801DFAA8; // type:function size:0xC scope:global align:4 -getWhite__10J2DPictureCFv = .text:0x801DFAB4; // type:function size:0xC scope:global align:4 -getBlack__10J2DPictureCFv = .text:0x801DFAC0; // type:function size:0xC scope:global align:4 +getWhite__10J2DTextBoxCFv = .text:0x801DFA9C; // type:function size:0xC scope:weak align:4 +getBlack__10J2DTextBoxCFv = .text:0x801DFAA8; // type:function size:0xC scope:weak align:4 +getWhite__10J2DPictureCFv = .text:0x801DFAB4; // type:function size:0xC scope:weak align:4 +getBlack__10J2DPictureCFv = .text:0x801DFAC0; // type:function size:0xC scope:weak align:4 screenSetBase__14dMenu_Letter_cFv = .text:0x801DFACC; // type:function size:0x8D8 scope:global align:4 screenSetShadow__14dMenu_Letter_cFv = .text:0x801E03A4; // type:function size:0xA8 scope:global align:4 screenSetLetter__14dMenu_Letter_cFv = .text:0x801E044C; // type:function size:0x890 scope:global align:4 @@ -8152,8 +8150,8 @@ setAButtonString__14dMenu_Letter_cFUs = .text:0x801E184C; // type:function size: setBButtonString__14dMenu_Letter_cFUs = .text:0x801E18FC; // type:function size:0xB0 scope:global align:4 getLetterNum__14dMenu_Letter_cFv = .text:0x801E19AC; // type:function size:0xD0 scope:global align:4 setHIO__14dMenu_Letter_cFb = .text:0x801E1A7C; // type:function size:0x5C8 scope:global align:4 -getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x801E2044; // type:function size:0x4C scope:global align:4 -draw__14dMenu_Letter_cFv = .text:0x801E2090; // type:function size:0x20 scope:global align:4 +getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x801E2044; // type:function size:0x4C scope:weak align:4 +draw__14dMenu_Letter_cFv = .text:0x801E2090; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_letter_cpp = .text:0x801E20B0; // type:function size:0x194 scope:local align:4 __ct__14dMenu_Option_cFP10JKRArchiveP9STControl = .text:0x801E2244; // type:function size:0x104 scope:global align:4 __dt__14dMenu_Option_cFv = .text:0x801E2348; // type:function size:0x48 scope:global align:4 @@ -8228,7 +8226,7 @@ yesnoSelectAnmSet__14dMenu_Option_cFv = .text:0x801E91D4; // type:function size: yesnoCancelAnmSet__14dMenu_Option_cFv = .text:0x801E9344; // type:function size:0x78 scope:global align:4 yesnoWakuAlpahAnmInit__14dMenu_Option_cFUcUcUcUc = .text:0x801E93BC; // type:function size:0x4C scope:global align:4 yesnoWakuAlpahAnm__14dMenu_Option_cFUc = .text:0x801E9408; // type:function size:0x170 scope:global align:4 -draw__14dMenu_Option_cFv = .text:0x801E9578; // type:function size:0x20 scope:global align:4 +draw__14dMenu_Option_cFv = .text:0x801E9578; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_option_cpp = .text:0x801E9598; // type:function size:0x2BC scope:local align:4 __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc = .text:0x801E9854; // type:function size:0x1610 scope:global align:4 __dt__12dMenu_Ring_cFv = .text:0x801EAE64; // type:function size:0x474 scope:global align:4 @@ -8283,7 +8281,7 @@ calcDistance__12dMenu_Ring_cFffff = .text:0x801EF8D0; // type:function size:0x2C clacEllipsePlotAverage__12dMenu_Ring_cFiff = .text:0x801EF8FC; // type:function size:0x2E4 scope:global align:4 dpdMove__12dMenu_Ring_cFv = .text:0x801EFBE0; // type:function size:0x8 scope:global align:4 openExplain__12dMenu_Ring_cFUc = .text:0x801EFBE8; // type:function size:0xD4 scope:global align:4 -draw__12dMenu_Ring_cFv = .text:0x801EFCBC; // type:function size:0x20 scope:global align:4 +draw__12dMenu_Ring_cFv = .text:0x801EFCBC; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_ring_cpp = .text:0x801EFCDC; // type:function size:0xD4 scope:local align:4 __ct__9dMs_HIO_cFv = .text:0x801EFDB0; // type:function size:0x4C scope:global align:4 __ct__12dMenu_save_cFv = .text:0x801EFDFC; // type:function size:0x10C scope:global align:4 @@ -8410,9 +8408,9 @@ _draw__12dMenu_save_cFv = .text:0x801F70B0; // type:function size:0x44 scope:glo _draw2__12dMenu_save_cFv = .text:0x801F70F4; // type:function size:0xE0 scope:global align:4 draw__23dDlst_MenuSaveExplain_cFv = .text:0x801F71D4; // type:function size:0x30 scope:global align:4 draw__16dDlst_MenuSave_cFv = .text:0x801F7204; // type:function size:0x38 scope:global align:4 -__dt__16dDlst_MenuSave_cFv = .text:0x801F723C; // type:function size:0x48 scope:global align:4 -__dt__23dDlst_MenuSaveExplain_cFv = .text:0x801F7284; // type:function size:0x48 scope:global align:4 -__dt__9dMs_HIO_cFv = .text:0x801F72CC; // type:function size:0x48 scope:global align:4 +__dt__16dDlst_MenuSave_cFv = .text:0x801F723C; // type:function size:0x48 scope:weak align:4 +__dt__23dDlst_MenuSaveExplain_cFv = .text:0x801F7284; // type:function size:0x48 scope:weak align:4 +__dt__9dMs_HIO_cFv = .text:0x801F72CC; // type:function size:0x48 scope:weak align:4 __sinit_d_menu_save_cpp = .text:0x801F7314; // type:function size:0x608 scope:local align:4 __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl = .text:0x801F791C; // type:function size:0x124 scope:global align:4 __dt__13dMenu_Skill_cFv = .text:0x801F7A40; // type:function size:0x2F4 scope:global align:4 @@ -8443,7 +8441,7 @@ setBButtonString__13dMenu_Skill_cFUs = .text:0x801F9A08; // type:function size:0 setNameString__13dMenu_Skill_cFUs = .text:0x801F9AB8; // type:function size:0xB0 scope:global align:4 getSkillNum__13dMenu_Skill_cFv = .text:0x801F9B68; // type:function size:0x90 scope:global align:4 setHIO__13dMenu_Skill_cFb = .text:0x801F9BF8; // type:function size:0x508 scope:global align:4 -draw__13dMenu_Skill_cFv = .text:0x801FA100; // type:function size:0x20 scope:global align:4 +draw__13dMenu_Skill_cFv = .text:0x801FA100; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_skill_cpp = .text:0x801FA120; // type:function size:0xD4 scope:local align:4 __ct__9dMw_HIO_cFv = .text:0x801FA1F4; // type:function size:0x3C scope:global align:4 init__9dMw_HIO_cFv = .text:0x801FA230; // type:function size:0x2DC scope:global align:4 @@ -8451,8 +8449,8 @@ getBombFlag__9dMw_HIO_cFv = .text:0x801FA50C; // type:function size:0x8 scope:gl getArrowFlag__9dMw_HIO_cFv = .text:0x801FA514; // type:function size:0x8 scope:global align:4 getPachinkoFlag__9dMw_HIO_cFv = .text:0x801FA51C; // type:function size:0x8 scope:global align:4 __ct__10dMw_DHIO_cFv = .text:0x801FA524; // type:function size:0x6C scope:global align:4 -__dt__10dMw_DHIO_cFv = .text:0x801FA590; // type:function size:0x48 scope:global align:4 -__dt__9dMw_HIO_cFv = .text:0x801FA5D8; // type:function size:0x48 scope:global align:4 +__dt__10dMw_DHIO_cFv = .text:0x801FA590; // type:function size:0x48 scope:weak align:4 +__dt__9dMw_HIO_cFv = .text:0x801FA5D8; // type:function size:0x48 scope:weak align:4 __sinit_d_menu_window_HIO_cpp = .text:0x801FA620; // type:function size:0x5C scope:local align:4 dMw_UP_TRIGGER__Fv = .text:0x801FA67C; // type:function size:0x14 scope:global align:4 dMw_DOWN_TRIGGER__Fv = .text:0x801FA690; // type:function size:0x14 scope:global align:4 @@ -8599,22 +8597,22 @@ __ct__19dMeter_mapIconHIO_cFv = .text:0x80200BB0; // type:function size:0x214 sc __ct__16dMeter_fmapHIO_cFv = .text:0x80200DC4; // type:function size:0x504 scope:global align:4 __dt__16dMeter_fmapHIO_cFv = .text:0x802012C8; // type:function size:0x108 scope:global align:4 __ct__18dMeter_cursorHIO_cFv = .text:0x802013D0; // type:function size:0x84 scope:global align:4 -__dt__25dMeter_drawLightDropHIO_cFv = .text:0x80201454; // type:function size:0x48 scope:global align:4 -__dt__25dMeter_drawEmpButtonHIO_cFv = .text:0x8020149C; // type:function size:0x48 scope:global align:4 -__dt__24dMeter_drawMiniGameHIO_cFv = .text:0x802014E4; // type:function size:0x48 scope:global align:4 -__dt__21dMeter_drawSkillHIO_cFv = .text:0x8020152C; // type:function size:0x48 scope:global align:4 -__dt__27dMeter_drawCalibrationHIO_cFv = .text:0x80201574; // type:function size:0x48 scope:global align:4 -__dt__22dMeter_drawInsectHIO_cFv = .text:0x802015BC; // type:function size:0x48 scope:global align:4 -__dt__23dMeter_drawFishingHIO_cFv = .text:0x80201604; // type:function size:0x48 scope:global align:4 -__dt__22dMeter_drawLetterHIO_cFv = .text:0x8020164C; // type:function size:0x48 scope:global align:4 -__dt__22dMeter_drawOptionHIO_cFv = .text:0x80201694; // type:function size:0x48 scope:global align:4 -__dt__23dMeter_drawCollectHIO_cFv = .text:0x802016DC; // type:function size:0x48 scope:global align:4 -__dt__19dMeter_mapIconHIO_cFv = .text:0x80201724; // type:function size:0x48 scope:global align:4 -__ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv = .text:0x8020176C; // type:function size:0x28 scope:global align:4 -__dt__18dMeter_cursorHIO_cFv = .text:0x80201794; // type:function size:0x48 scope:global align:4 -__dt__16dMeter_ringHIO_cFv = .text:0x802017DC; // type:function size:0x48 scope:global align:4 -__dt__16dMeter_drawHIO_cFv = .text:0x80201824; // type:function size:0x114 scope:global align:4 -__dt__16dMeter_menuHIO_cFv = .text:0x80201938; // type:function size:0x48 scope:global align:4 +__dt__25dMeter_drawLightDropHIO_cFv = .text:0x80201454; // type:function size:0x48 scope:weak align:4 +__dt__25dMeter_drawEmpButtonHIO_cFv = .text:0x8020149C; // type:function size:0x48 scope:weak align:4 +__dt__24dMeter_drawMiniGameHIO_cFv = .text:0x802014E4; // type:function size:0x48 scope:weak align:4 +__dt__21dMeter_drawSkillHIO_cFv = .text:0x8020152C; // type:function size:0x48 scope:weak align:4 +__dt__27dMeter_drawCalibrationHIO_cFv = .text:0x80201574; // type:function size:0x48 scope:weak align:4 +__dt__22dMeter_drawInsectHIO_cFv = .text:0x802015BC; // type:function size:0x48 scope:weak align:4 +__dt__23dMeter_drawFishingHIO_cFv = .text:0x80201604; // type:function size:0x48 scope:weak align:4 +__dt__22dMeter_drawLetterHIO_cFv = .text:0x8020164C; // type:function size:0x48 scope:weak align:4 +__dt__22dMeter_drawOptionHIO_cFv = .text:0x80201694; // type:function size:0x48 scope:weak align:4 +__dt__23dMeter_drawCollectHIO_cFv = .text:0x802016DC; // type:function size:0x48 scope:weak align:4 +__dt__19dMeter_mapIconHIO_cFv = .text:0x80201724; // type:function size:0x48 scope:weak align:4 +__ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv = .text:0x8020176C; // type:function size:0x28 scope:weak align:4 +__dt__18dMeter_cursorHIO_cFv = .text:0x80201794; // type:function size:0x48 scope:weak align:4 +__dt__16dMeter_ringHIO_cFv = .text:0x802017DC; // type:function size:0x48 scope:weak align:4 +__dt__16dMeter_drawHIO_cFv = .text:0x80201824; // type:function size:0x114 scope:weak align:4 +__dt__16dMeter_menuHIO_cFv = .text:0x80201938; // type:function size:0x48 scope:weak align:4 __sinit_d_meter_HIO_cpp = .text:0x80201980; // type:function size:0xA4 scope:local align:4 __ct__14dMeterButton_cFv = .text:0x80201A24; // type:function size:0x48 scope:global align:4 __dt__14dMeterButton_cFv = .text:0x80201A6C; // type:function size:0x5C scope:global align:4 @@ -8884,7 +8882,7 @@ getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c = .text:0x8021C920; // type:fun getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c = .text:0x8021CA40; // type:function size:0x1D4 scope:global align:4 getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c = .text:0x8021CC14; // type:function size:0x160 scope:global align:4 getStringLength__13dMeter2Info_cFP10J2DTextBoxPc = .text:0x8021CD74; // type:function size:0x194 scope:global align:4 -getFont__10J2DTextBoxCFv = .text:0x8021CF08; // type:function size:0x8 scope:global align:4 +getFont__10J2DTextBoxCFv = .text:0x8021CF08; // type:function size:0x8 scope:weak align:4 getStringLength__13dMeter2Info_cFP7JUTFontffPc = .text:0x8021CF10; // type:function size:0x17C scope:global align:4 onDirectUseItem__13dMeter2Info_cFi = .text:0x8021D08C; // type:function size:0x1C scope:global align:4 isDirectUseItem__13dMeter2Info_cFi = .text:0x8021D0A8; // type:function size:0x20 scope:global align:4 @@ -8972,11 +8970,11 @@ killSubContents__9dMeter2_cFUc = .text:0x80225FF8; // type:function size:0xC0 sc isKeyVisible__9dMeter2_cFv = .text:0x802260B8; // type:function size:0x98 scope:global align:4 isArrowEquip__9dMeter2_cFv = .text:0x80226150; // type:function size:0x6C scope:global align:4 isPachinkoEquip__9dMeter2_cFv = .text:0x802261BC; // type:function size:0x3C scope:global align:4 -dMeter2_Draw__FP9dMeter2_c = .text:0x802261F8; // type:function size:0x20 scope:global align:4 -dMeter2_Execute__FP9dMeter2_c = .text:0x80226218; // type:function size:0x20 scope:global align:4 -dMeter2_IsDelete__FP9dMeter2_c = .text:0x80226238; // type:function size:0x8 scope:global align:4 -dMeter2_Delete__FP9dMeter2_c = .text:0x80226240; // type:function size:0x20 scope:global align:4 -dMeter2_Create__FP9msg_class = .text:0x80226260; // type:function size:0xB0 scope:global align:4 +dMeter2_Draw__FP9dMeter2_c = .text:0x802261F8; // type:function size:0x20 scope:local align:4 +dMeter2_Execute__FP9dMeter2_c = .text:0x80226218; // type:function size:0x20 scope:local align:4 +dMeter2_IsDelete__FP9dMeter2_c = .text:0x80226238; // type:function size:0x8 scope:local align:4 +dMeter2_Delete__FP9dMeter2_c = .text:0x80226240; // type:function size:0x20 scope:local align:4 +dMeter2_Create__FP9msg_class = .text:0x80226260; // type:function size:0xB0 scope:local align:4 __ct__13COutFontSet_cFv = .text:0x80226310; // type:function size:0x3C scope:global align:4 __dt__13COutFontSet_cFv = .text:0x8022634C; // type:function size:0x48 scope:global align:4 initialize__13COutFontSet_cFv = .text:0x80226394; // type:function size:0x34 scope:global align:4 @@ -8992,15 +8990,15 @@ draw__10COutFont_cFP10J2DTextBoxfff = .text:0x80227500; // type:function size:0x reset__10COutFont_cFP10J2DTextBox = .text:0x80228B94; // type:function size:0x48 scope:global align:4 setBlendAnime__10COutFont_cFP10J2DPictures = .text:0x80228BDC; // type:function size:0xA0 scope:global align:4 getBtiName__10COutFont_cFi = .text:0x80228C7C; // type:function size:0x48 scope:global align:4 -checkCharInfoCharactor__Fi = .text:0x80228CC4; // type:function size:0x54 scope:global align:4 -changeCodeToChar__FUs = .text:0x80228D18; // type:function size:0x3C scope:global align:4 -change1ByteTo2Bytes__Fi = .text:0x80228D54; // type:function size:0x230 scope:global align:4 -changeKataToHira__Fi = .text:0x80228F84; // type:function size:0x70 scope:global align:4 -isOutfontKanjiCode__Fi = .text:0x80228FF4; // type:function size:0x54 scope:global align:4 -getFontCCColorTable__FUcUc = .text:0x80229048; // type:function size:0xAC scope:global align:4 -getFontGCColorTable__FUcUc = .text:0x802290F4; // type:function size:0xAC scope:global align:4 -getOutFontNumberType__Fi = .text:0x802291A0; // type:function size:0x78 scope:global align:4 -getPohNum__Fv = .text:0x80229218; // type:function size:0x38 scope:global align:4 +checkCharInfoCharactor__Fi = .text:0x80228CC4; // type:function size:0x54 scope:local align:4 +changeCodeToChar__FUs = .text:0x80228D18; // type:function size:0x3C scope:local align:4 +change1ByteTo2Bytes__Fi = .text:0x80228D54; // type:function size:0x230 scope:local align:4 +changeKataToHira__Fi = .text:0x80228F84; // type:function size:0x70 scope:local align:4 +isOutfontKanjiCode__Fi = .text:0x80228FF4; // type:function size:0x54 scope:local align:4 +getFontCCColorTable__FUcUc = .text:0x80229048; // type:function size:0xAC scope:local align:4 +getFontGCColorTable__FUcUc = .text:0x802290F4; // type:function size:0xAC scope:local align:4 +getOutFontNumberType__Fi = .text:0x802291A0; // type:function size:0x78 scope:local align:4 +getPohNum__Fv = .text:0x80229218; // type:function size:0x38 scope:local align:4 __ct__19jmessage_tReferenceFv = .text:0x80229250; // type:function size:0x1B0 scope:global align:4 __dt__19jmessage_tReferenceFv = .text:0x80229400; // type:function size:0x74 scope:global align:4 calcDistance__19jmessage_tReferenceFv = .text:0x80229474; // type:function size:0xB8 scope:global align:4 @@ -9042,7 +9040,7 @@ do_name1__26jmessage_tMeasureProcessorFv = .text:0x8022BB6C; // type:function si do_rubyset__26jmessage_tMeasureProcessorFPCvUl = .text:0x8022BBFC; // type:function size:0x88 scope:global align:4 push_word__26jmessage_tMeasureProcessorFPc = .text:0x8022BC84; // type:function size:0x78 scope:global align:4 __ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl = .text:0x8022BCFC; // type:function size:0x9C scope:global align:4 -__dt__26jmessage_tMeasureProcessorFv = .text:0x8022BD98; // type:function size:0x60 scope:global align:4 +__dt__26jmessage_tMeasureProcessorFv = .text:0x8022BD98; // type:function size:0x60 scope:weak align:4 do_reset__27jmessage_tSequenceProcessorFv = .text:0x8022BDF8; // type:function size:0x4 scope:global align:4 do_begin__27jmessage_tSequenceProcessorFPCvPCc = .text:0x8022BDFC; // type:function size:0x3E4 scope:global align:4 do_end__27jmessage_tSequenceProcessorFv = .text:0x8022C1E0; // type:function size:0x140 scope:global align:4 @@ -9101,7 +9099,7 @@ do_character__33jmessage_string_tMeasureProcessorFi = .text:0x80230500; // type: do_tag__33jmessage_string_tMeasureProcessorFUlPCvUl = .text:0x802306C8; // type:function size:0xBBC scope:global align:4 do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl = .text:0x80231284; // type:function size:0x7C scope:global align:4 __ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl = .text:0x80231300; // type:function size:0x54 scope:global align:4 -__dt__33jmessage_string_tMeasureProcessorFv = .text:0x80231354; // type:function size:0x60 scope:global align:4 +__dt__33jmessage_string_tMeasureProcessorFv = .text:0x80231354; // type:function size:0x60 scope:weak align:4 do_reset__34jmessage_string_tSequenceProcessorFv = .text:0x802313B4; // type:function size:0x4 scope:global align:4 do_begin__34jmessage_string_tSequenceProcessorFPCvPCc = .text:0x802313B8; // type:function size:0xBC scope:global align:4 do_end__34jmessage_string_tSequenceProcessorFv = .text:0x80231474; // type:function size:0x4 scope:global align:4 @@ -9128,12 +9126,12 @@ do_scale__35jmessage_string_tRenderingProcessorFf = .text:0x80232F18; // type:fu do_linedown__35jmessage_string_tRenderingProcessorFs = .text:0x80232FA8; // type:function size:0x54 scope:global align:4 do_numset__35jmessage_string_tRenderingProcessorFs = .text:0x80232FFC; // type:function size:0xD8 scope:global align:4 push_word__35jmessage_string_tRenderingProcessorFPCc = .text:0x802330D4; // type:function size:0x3C scope:global align:4 -__dt__35jmessage_string_tRenderingProcessorFv = .text:0x80233110; // type:function size:0x60 scope:global align:4 -__dt__34jmessage_string_tSequenceProcessorFv = .text:0x80233170; // type:function size:0x84 scope:global align:4 -__dt__24jmessage_string_tControlFv = .text:0x802331F4; // type:function size:0x60 scope:global align:4 -__dt__28jmessage_tRenderingProcessorFv = .text:0x80233254; // type:function size:0x60 scope:global align:4 -__dt__27jmessage_tSequenceProcessorFv = .text:0x802332B4; // type:function size:0x84 scope:global align:4 -getActorPos__19jmessage_tReferenceFv = .text:0x80233338; // type:function size:0x1C scope:global align:4 +__dt__35jmessage_string_tRenderingProcessorFv = .text:0x80233110; // type:function size:0x60 scope:weak align:4 +__dt__34jmessage_string_tSequenceProcessorFv = .text:0x80233170; // type:function size:0x84 scope:weak align:4 +__dt__24jmessage_string_tControlFv = .text:0x802331F4; // type:function size:0x60 scope:weak align:4 +__dt__28jmessage_tRenderingProcessorFv = .text:0x80233254; // type:function size:0x60 scope:weak align:4 +__dt__27jmessage_tSequenceProcessorFv = .text:0x802332B4; // type:function size:0x84 scope:weak align:4 +getActorPos__19jmessage_tReferenceFv = .text:0x80233338; // type:function size:0x1C scope:weak align:4 dMsgObject_getGroupID__Fv = .text:0x80233354; // type:function size:0x8 scope:global align:4 dMsgObject_searchSSItem__FPvPv = .text:0x8023335C; // type:function size:0xA8 scope:global align:4 __ct__20dMsgObject_HowlHIO_cFv = .text:0x80233404; // type:function size:0x280 scope:global align:4 @@ -9313,7 +9311,7 @@ setTag__10dMsgUnit_cFiiPcb = .text:0x80239600; // type:function size:0x50C scope __sinit_d_msg_unit_cpp = .text:0x80239B0C; // type:function size:0x38 scope:local align:4 __ct__17dMsgScrn3Select_cFv = .text:0x80239B44; // type:function size:0xBE4 scope:global align:4 __dt__17dMsgScrn3Select_cFv = .text:0x8023A728; // type:function size:0x314 scope:global align:4 -__dt__14J2DAnmColorKeyFv = .text:0x8023AA3C; // type:function size:0x84 scope:global align:4 +__dt__14J2DAnmColorKeyFv = .text:0x8023AA3C; // type:function size:0x84 scope:weak align:4 isSelect__17dMsgScrn3Select_cFv = .text:0x8023AAC0; // type:function size:0x14 scope:global align:4 setString__17dMsgScrn3Select_cFPcPcPc = .text:0x8023AAD4; // type:function size:0x90 scope:global align:4 setRubyString__17dMsgScrn3Select_cFPcPcPc = .text:0x8023AB64; // type:function size:0x90 scope:global align:4 @@ -9472,7 +9470,7 @@ __dt__15dMsgScrnLight_cFv = .text:0x80247004; // type:function size:0x104 scope: draw__15dMsgScrnLight_cFPffffffUc = .text:0x80247108; // type:function size:0x38C scope:global align:4 draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor = .text:0x80247494; // type:function size:0x14C scope:global align:4 drawCommon__15dMsgScrnLight_cFfffff = .text:0x802475E0; // type:function size:0x26C scope:global align:4 -__dt__19dMsgScrnLight_HIO_cFv = .text:0x8024784C; // type:function size:0x48 scope:global align:4 +__dt__19dMsgScrnLight_HIO_cFv = .text:0x8024784C; // type:function size:0x48 scope:weak align:4 __sinit_d_msg_scrn_light_cpp = .text:0x80247894; // type:function size:0x3C scope:local align:4 __ct__15dMsgScrnPlace_cFv = .text:0x802478D0; // type:function size:0x3E4 scope:global align:4 __dt__15dMsgScrnPlace_cFv = .text:0x80247CB4; // type:function size:0x160 scope:global align:4 @@ -9655,7 +9653,7 @@ event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024F2A4; event040__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024F2D8; // type:function size:0x108 scope:global align:4 event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024F3E0; // type:function size:0x30 scope:global align:4 event042__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024F410; // type:function size:0x8 scope:global align:4 -cLib_calcTimer__FPl = .text:0x8024F418; // type:function size:0x1C scope:global align:4 +cLib_calcTimer__FPl = .text:0x8024F418; // type:function size:0x1C scope:weak align:4 __sinit_d_msg_flow_cpp = .text:0x8024F434; // type:function size:0x914 scope:local align:4 __ct__9dNm_HIO_cFv = .text:0x8024FD48; // type:function size:0x28 scope:global align:4 __ct__7dName_cFP7J2DPane = .text:0x8024FD70; // type:function size:0x60 scope:global align:4 @@ -9701,8 +9699,8 @@ displayInit__7dName_cFv = .text:0x80253060; // type:function size:0x16C scope:gl NameStrSet__7dName_cFv = .text:0x802531CC; // type:function size:0x1F4 scope:global align:4 getMenuPosIdx__7dName_cFUc = .text:0x802533C0; // type:function size:0x4C scope:global align:4 draw__14dDlst_NameIN_cFv = .text:0x8025340C; // type:function size:0xC8 scope:global align:4 -__dt__14dDlst_NameIN_cFv = .text:0x802534D4; // type:function size:0x48 scope:global align:4 -__dt__9dNm_HIO_cFv = .text:0x8025351C; // type:function size:0x48 scope:global align:4 +__dt__14dDlst_NameIN_cFv = .text:0x802534D4; // type:function size:0x48 scope:weak align:4 +__dt__9dNm_HIO_cFv = .text:0x8025351C; // type:function size:0x48 scope:weak align:4 __sinit_d_name_cpp = .text:0x80253564; // type:function size:0x128 scope:local align:4 __ct__16dNpcLib_lookat_cFv = .text:0x8025368C; // type:function size:0xF8 scope:global align:4 init__16dNpcLib_lookat_cFP8J3DModelPiP5csXyzP5csXyz = .text:0x80253784; // type:function size:0x128 scope:global align:4 @@ -9711,29 +9709,29 @@ dbView__16dNpcLib_lookat_cFv = .text:0x80253ED8; // type:function size:0x4 scope setPrm__16dNpcLib_lookat_cFv = .text:0x80253EDC; // type:function size:0x394 scope:global align:4 update__16dNpcLib_lookat_cFv = .text:0x80254270; // type:function size:0x120 scope:global align:4 limitter__16dNpcLib_lookat_cFPssss = .text:0x80254390; // type:function size:0x7C scope:global align:4 -__dt__16dNpcLib_lookat_cFv = .text:0x8025440C; // type:function size:0xE8 scope:global align:4 -dOvlpFd_Draw__FP14overlap1_class = .text:0x802544F4; // type:function size:0x8 scope:global align:4 -dOvlpFd_startFadeIn__Fi = .text:0x802544FC; // type:function size:0x70 scope:global align:4 -dOvlpFd_FadeOut__FP14overlap1_class = .text:0x8025456C; // type:function size:0xD4 scope:global align:4 -dOvlpFd_Wait__FP14overlap1_class = .text:0x80254640; // type:function size:0x38 scope:global align:4 -dOvlpFd_FadeIn__FP14overlap1_class = .text:0x80254678; // type:function size:0x12C scope:global align:4 -dOvlpFd_Execute__FP14overlap1_class = .text:0x802547A4; // type:function size:0x2C scope:global align:4 -dOvlpFd_IsDelete__FP14overlap1_class = .text:0x802547D0; // type:function size:0x8 scope:global align:4 -dOvlpFd_Delete__FP14overlap1_class = .text:0x802547D8; // type:function size:0x8 scope:global align:4 -dOvlpFd_Create__FPv = .text:0x802547E0; // type:function size:0x14 scope:global align:4 +__dt__16dNpcLib_lookat_cFv = .text:0x8025440C; // type:function size:0xE8 scope:weak align:4 +dOvlpFd_Draw__FP14overlap1_class = .text:0x802544F4; // type:function size:0x8 scope:local align:4 +dOvlpFd_startFadeIn__Fi = .text:0x802544FC; // type:function size:0x70 scope:local align:4 +dOvlpFd_FadeOut__FP14overlap1_class = .text:0x8025456C; // type:function size:0xD4 scope:local align:4 +dOvlpFd_Wait__FP14overlap1_class = .text:0x80254640; // type:function size:0x38 scope:local align:4 +dOvlpFd_FadeIn__FP14overlap1_class = .text:0x80254678; // type:function size:0x12C scope:local align:4 +dOvlpFd_Execute__FP14overlap1_class = .text:0x802547A4; // type:function size:0x2C scope:local align:4 +dOvlpFd_IsDelete__FP14overlap1_class = .text:0x802547D0; // type:function size:0x8 scope:local align:4 +dOvlpFd_Delete__FP14overlap1_class = .text:0x802547D8; // type:function size:0x8 scope:local align:4 +dOvlpFd_Create__FPv = .text:0x802547E0; // type:function size:0x14 scope:local align:4 draw__15dOvlpFd2_dlst_cFv = .text:0x802547F4; // type:function size:0x514 scope:global align:4 __ct__10dOvlpFd2_cFv = .text:0x80254D08; // type:function size:0x64 scope:global align:4 execFirstSnap__10dOvlpFd2_cFv = .text:0x80254D6C; // type:function size:0x84 scope:global align:4 execFadeOut__10dOvlpFd2_cFv = .text:0x80254DF0; // type:function size:0x148 scope:global align:4 execNextSnap__10dOvlpFd2_cFv = .text:0x80254F38; // type:function size:0xA8 scope:global align:4 execFadeIn__10dOvlpFd2_cFv = .text:0x80254FE0; // type:function size:0xA4 scope:global align:4 -dOvlpFd2_Draw__FP10dOvlpFd2_c = .text:0x80255084; // type:function size:0xFC scope:global align:4 -dOvlpFd2_Execute__FP10dOvlpFd2_c = .text:0x80255180; // type:function size:0x2C scope:global align:4 -dOvlpFd2_IsDelete__FP10dOvlpFd2_c = .text:0x802551AC; // type:function size:0x8 scope:global align:4 -dOvlpFd2_Delete__FP10dOvlpFd2_c = .text:0x802551B4; // type:function size:0x8 scope:global align:4 -dOvlpFd2_Create__FPv = .text:0x802551BC; // type:function size:0x2C scope:global align:4 -cLib_calcTimer__FPSc = .text:0x802551E8; // type:function size:0x1C scope:global align:4 -__dt__15dOvlpFd2_dlst_cFv = .text:0x80255204; // type:function size:0x48 scope:global align:4 +dOvlpFd2_Draw__FP10dOvlpFd2_c = .text:0x80255084; // type:function size:0xFC scope:local align:4 +dOvlpFd2_Execute__FP10dOvlpFd2_c = .text:0x80255180; // type:function size:0x2C scope:local align:4 +dOvlpFd2_IsDelete__FP10dOvlpFd2_c = .text:0x802551AC; // type:function size:0x8 scope:local align:4 +dOvlpFd2_Delete__FP10dOvlpFd2_c = .text:0x802551B4; // type:function size:0x8 scope:local align:4 +dOvlpFd2_Create__FPv = .text:0x802551BC; // type:function size:0x2C scope:local align:4 +cLib_calcTimer__FPSc = .text:0x802551E8; // type:function size:0x1C scope:weak align:4 +__dt__15dOvlpFd2_dlst_cFv = .text:0x80255204; // type:function size:0x48 scope:weak align:4 draw__16dDlst_snapShot_cFv = .text:0x8025524C; // type:function size:0x54 scope:global align:4 draw__15dOvlpFd3_dlst_cFv = .text:0x802552A0; // type:function size:0x514 scope:global align:4 __ct__10dOvlpFd3_cFv = .text:0x802557B4; // type:function size:0xDC scope:global align:4 @@ -9741,12 +9739,12 @@ execFirstSnap__10dOvlpFd3_cFv = .text:0x80255890; // type:function size:0x94 sco execFadeOut__10dOvlpFd3_cFv = .text:0x80255924; // type:function size:0xE0 scope:global align:4 execNextSnap__10dOvlpFd3_cFv = .text:0x80255A04; // type:function size:0xA4 scope:global align:4 execFadeIn__10dOvlpFd3_cFv = .text:0x80255AA8; // type:function size:0x7C scope:global align:4 -dOvlpFd3_Draw__FP10dOvlpFd3_c = .text:0x80255B24; // type:function size:0xD4 scope:global align:4 -dOvlpFd3_Execute__FP10dOvlpFd3_c = .text:0x80255BF8; // type:function size:0x2C scope:global align:4 -dOvlpFd3_IsDelete__FP10dOvlpFd3_c = .text:0x80255C24; // type:function size:0x8 scope:global align:4 -dOvlpFd3_Delete__FP10dOvlpFd3_c = .text:0x80255C2C; // type:function size:0x8 scope:global align:4 -dOvlpFd3_Create__FPv = .text:0x80255C34; // type:function size:0x2C scope:global align:4 -__dt__15dOvlpFd3_dlst_cFv = .text:0x80255C60; // type:function size:0x48 scope:global align:4 +dOvlpFd3_Draw__FP10dOvlpFd3_c = .text:0x80255B24; // type:function size:0xD4 scope:local align:4 +dOvlpFd3_Execute__FP10dOvlpFd3_c = .text:0x80255BF8; // type:function size:0x2C scope:local align:4 +dOvlpFd3_IsDelete__FP10dOvlpFd3_c = .text:0x80255C24; // type:function size:0x8 scope:local align:4 +dOvlpFd3_Delete__FP10dOvlpFd3_c = .text:0x80255C2C; // type:function size:0x8 scope:local align:4 +dOvlpFd3_Create__FPv = .text:0x80255C34; // type:function size:0x2C scope:local align:4 +__dt__15dOvlpFd3_dlst_cFv = .text:0x80255C60; // type:function size:0x48 scope:weak align:4 __ct__8CPaneMgrFv = .text:0x80255CA8; // type:function size:0x54 scope:global align:4 __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap = .text:0x80255CFC; // type:function size:0x94 scope:global align:4 __dt__8CPaneMgrFv = .text:0x80255D90; // type:function size:0x9C scope:global align:4 @@ -9774,9 +9772,9 @@ getBounds__8CPaneMgrFP7J2DPane = .text:0x80257330; // type:function size:0x130 s dPaneClass_showNullPane__FP9J2DScreen = .text:0x80257460; // type:function size:0x44 scope:global align:4 dPaneClass_showNullPane__FP7J2DPane = .text:0x802574A4; // type:function size:0x58 scope:global align:4 dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive = .text:0x802574FC; // type:function size:0x134 scope:global align:4 -__dt__20JSUMemoryInputStreamFv = .text:0x80257630; // type:function size:0x70 scope:global align:4 -__dt__20JSURandomInputStreamFv = .text:0x802576A0; // type:function size:0x60 scope:global align:4 -__dt__10JSUIosBaseFv = .text:0x80257700; // type:function size:0x48 scope:global align:4 +__dt__20JSUMemoryInputStreamFv = .text:0x80257630; // type:function size:0x70 scope:weak align:4 +__dt__20JSURandomInputStreamFv = .text:0x802576A0; // type:function size:0x60 scope:weak align:4 +__dt__10JSUIosBaseFv = .text:0x80257700; // type:function size:0x48 scope:weak align:4 __sinit_d_pane_class_cpp = .text:0x80257748; // type:function size:0x1C scope:local align:4 __ct__13CPaneMgrAlphaFv = .text:0x80257764; // type:function size:0x10 scope:global align:4 __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap = .text:0x80257774; // type:function size:0x70 scope:global align:4 @@ -9801,16 +9799,16 @@ setBackupAlpha__17CPaneMgrAlphaMorfFv = .text:0x80258148; // type:function size: setAlphaMorfRate__17CPaneMgrAlphaMorfFf = .text:0x802581A0; // type:function size:0x70 scope:global align:4 childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane = .text:0x80258210; // type:function size:0x90 scope:global align:4 childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef = .text:0x802582A0; // type:function size:0xF0 scope:global align:4 -setAnimation__7J2DPaneFP14J2DAnmVtxColor = .text:0x80258390; // type:function size:0x4 scope:global align:4 -setAnimation__7J2DPaneFP20J2DAnmVisibilityFull = .text:0x80258394; // type:function size:0x4 scope:global align:4 -setAnimation__7J2DPaneFP16J2DAnmTexPattern = .text:0x80258398; // type:function size:0x4 scope:global align:4 -getMaterial__12J2DTextBoxExCFv = .text:0x8025839C; // type:function size:0x8 scope:global align:4 -getMaterial__10J2DTextBoxCFv = .text:0x802583A4; // type:function size:0x8 scope:global align:4 -getMaterial__12J2DPictureExCFv = .text:0x802583AC; // type:function size:0x8 scope:global align:4 -getMaterial__10J2DPictureCFv = .text:0x802583B4; // type:function size:0x8 scope:global align:4 -setAnimation__12J2DTextBoxExFP15J2DAnmTransform = .text:0x802583BC; // type:function size:0x20 scope:global align:4 -setAnimation__12J2DPictureExFP15J2DAnmTransform = .text:0x802583DC; // type:function size:0x20 scope:global align:4 -setAnimation__11J2DWindowExFP15J2DAnmTransform = .text:0x802583FC; // type:function size:0x20 scope:global align:4 +setAnimation__7J2DPaneFP14J2DAnmVtxColor = .text:0x80258390; // type:function size:0x4 scope:weak align:4 +setAnimation__7J2DPaneFP20J2DAnmVisibilityFull = .text:0x80258394; // type:function size:0x4 scope:weak align:4 +setAnimation__7J2DPaneFP16J2DAnmTexPattern = .text:0x80258398; // type:function size:0x4 scope:weak align:4 +getMaterial__12J2DTextBoxExCFv = .text:0x8025839C; // type:function size:0x8 scope:weak align:4 +getMaterial__10J2DTextBoxCFv = .text:0x802583A4; // type:function size:0x8 scope:weak align:4 +getMaterial__12J2DPictureExCFv = .text:0x802583AC; // type:function size:0x8 scope:weak align:4 +getMaterial__10J2DPictureCFv = .text:0x802583B4; // type:function size:0x8 scope:weak align:4 +setAnimation__12J2DTextBoxExFP15J2DAnmTransform = .text:0x802583BC; // type:function size:0x20 scope:weak align:4 +setAnimation__12J2DPictureExFP15J2DAnmTransform = .text:0x802583DC; // type:function size:0x20 scope:weak align:4 +setAnimation__11J2DWindowExFP15J2DAnmTransform = .text:0x802583FC; // type:function size:0x20 scope:weak align:4 __ct__10dLog_HIO_cFv = .text:0x8025841C; // type:function size:0x10 scope:global align:4 preLoad_dyl_create__10dScnLogo_cFv = .text:0x8025842C; // type:function size:0x44 scope:global align:4 preLoad_dyl_remove__10dScnLogo_cFv = .text:0x80258470; // type:function size:0x24 scope:global align:4 @@ -9834,29 +9832,29 @@ dolbyOutDraw2__10dScnLogo_cFv = .text:0x802593D0; // type:function size:0x18 sco dvdWaitDraw__10dScnLogo_cFv = .text:0x802593E8; // type:function size:0x214 scope:global align:4 nextSceneChange__10dScnLogo_cFv = .text:0x802595FC; // type:function size:0x34 scope:global align:4 __dt__10dScnLogo_cFv = .text:0x80259630; // type:function size:0x67C scope:global align:4 -phase_0__FP10dScnLogo_c = .text:0x80259CAC; // type:function size:0xAC scope:global align:4 -phase_1__FP10dScnLogo_c = .text:0x80259D58; // type:function size:0xB4 scope:global align:4 -phase_2__FP10dScnLogo_c = .text:0x80259E0C; // type:function size:0x44 scope:global align:4 -resLoad__FP30request_of_phase_process_classP10dScnLogo_c = .text:0x80259E50; // type:function size:0x2C scope:global align:4 +phase_0__FP10dScnLogo_c = .text:0x80259CAC; // type:function size:0xAC scope:local align:4 +phase_1__FP10dScnLogo_c = .text:0x80259D58; // type:function size:0xB4 scope:local align:4 +phase_2__FP10dScnLogo_c = .text:0x80259E0C; // type:function size:0x44 scope:local align:4 +resLoad__FP30request_of_phase_process_classP10dScnLogo_c = .text:0x80259E50; // type:function size:0x2C scope:local align:4 create__10dScnLogo_cFv = .text:0x80259E7C; // type:function size:0x184 scope:global align:4 logoInitGC__10dScnLogo_cFv = .text:0x8025A000; // type:function size:0x388 scope:global align:4 dvdDataLoad__10dScnLogo_cFv = .text:0x8025A388; // type:function size:0x434 scope:global align:4 -dScnLogo_Create__FP11scene_class = .text:0x8025A7BC; // type:function size:0x24 scope:global align:4 -dScnLogo_Execute__FP10dScnLogo_c = .text:0x8025A7E0; // type:function size:0x40 scope:global align:4 -dScnLogo_Draw__FP10dScnLogo_c = .text:0x8025A820; // type:function size:0x24 scope:global align:4 -dScnLogo_Delete__FP10dScnLogo_c = .text:0x8025A844; // type:function size:0x28 scope:global align:4 -dScnLogo_IsDelete__FP10dScnLogo_c = .text:0x8025A86C; // type:function size:0x8 scope:global align:4 +dScnLogo_Create__FP11scene_class = .text:0x8025A7BC; // type:function size:0x24 scope:local align:4 +dScnLogo_Execute__FP10dScnLogo_c = .text:0x8025A7E0; // type:function size:0x40 scope:local align:4 +dScnLogo_Draw__FP10dScnLogo_c = .text:0x8025A820; // type:function size:0x24 scope:local align:4 +dScnLogo_Delete__FP10dScnLogo_c = .text:0x8025A844; // type:function size:0x28 scope:local align:4 +dScnLogo_IsDelete__FP10dScnLogo_c = .text:0x8025A86C; // type:function size:0x8 scope:local align:4 setProgressiveMode__10dScnLogo_cFUc = .text:0x8025A874; // type:function size:0x24 scope:global align:4 getProgressiveMode__10dScnLogo_cFv = .text:0x8025A898; // type:function size:0x24 scope:global align:4 isProgressiveMode__10dScnLogo_cFv = .text:0x8025A8BC; // type:function size:0x2C scope:global align:4 setRenderMode__10dScnLogo_cFv = .text:0x8025A8E8; // type:function size:0x10 scope:global align:4 __dt__10dLog_HIO_cFv = .text:0x8025A8F8; // type:function size:0x48 scope:global align:4 -cLib_calcTimer__FPUs = .text:0x8025A940; // type:function size:0x1C scope:global align:4 +cLib_calcTimer__FPUs = .text:0x8025A940; // type:function size:0x1C scope:weak align:4 __sinit_d_s_logo_cpp = .text:0x8025A95C; // type:function size:0x1CC scope:local align:4 __ct__9dSn_HIO_cFv = .text:0x8025AB28; // type:function size:0x18 scope:global align:4 phase_1__FPc = .text:0x8025AB40; // type:function size:0x7C scope:local align:4 phase_2__FPc = .text:0x8025ABBC; // type:function size:0x58 scope:local align:4 -resLoad__FP30request_of_phase_process_classPc = .text:0x8025AC14; // type:function size:0x28 scope:global align:4 +resLoad__FP30request_of_phase_process_classPc = .text:0x8025AC14; // type:function size:0x28 scope:local align:4 create__10dScnName_cFv = .text:0x8025AC3C; // type:function size:0x28C scope:global align:4 setView__10dScnName_cFv = .text:0x8025AEC8; // type:function size:0x9C scope:global align:4 execute__10dScnName_cFv = .text:0x8025AF64; // type:function size:0x94 scope:global align:4 @@ -9869,62 +9867,62 @@ FileSelectClose__10dScnName_cFv = .text:0x8025B2BC; // type:function size:0xB4 s brightCheckOpen__10dScnName_cFv = .text:0x8025B370; // type:function size:0x34 scope:global align:4 brightCheck__10dScnName_cFv = .text:0x8025B3A4; // type:function size:0xF0 scope:global align:4 changeGameScene__10dScnName_cFv = .text:0x8025B494; // type:function size:0xC8 scope:global align:4 -dScnName_Draw__FP10dScnName_c = .text:0x8025B55C; // type:function size:0x20 scope:global align:4 -dScnName_Execute__FP10dScnName_c = .text:0x8025B57C; // type:function size:0x20 scope:global align:4 -dScnName_IsDelete__FP10dScnName_c = .text:0x8025B59C; // type:function size:0x30 scope:global align:4 -dScnName_Delete__FP10dScnName_c = .text:0x8025B5CC; // type:function size:0x28 scope:global align:4 -dScnName_Create__FP11scene_class = .text:0x8025B5F4; // type:function size:0x3C scope:global align:4 -__dt__17dScnName_camera_cFv = .text:0x8025B630; // type:function size:0x48 scope:global align:4 -__dt__9dSn_HIO_cFv = .text:0x8025B678; // type:function size:0x48 scope:global align:4 +dScnName_Draw__FP10dScnName_c = .text:0x8025B55C; // type:function size:0x20 scope:local align:4 +dScnName_Execute__FP10dScnName_c = .text:0x8025B57C; // type:function size:0x20 scope:local align:4 +dScnName_IsDelete__FP10dScnName_c = .text:0x8025B59C; // type:function size:0x30 scope:local align:4 +dScnName_Delete__FP10dScnName_c = .text:0x8025B5CC; // type:function size:0x28 scope:local align:4 +dScnName_Create__FP11scene_class = .text:0x8025B5F4; // type:function size:0x3C scope:local align:4 +__dt__17dScnName_camera_cFv = .text:0x8025B630; // type:function size:0x48 scope:weak align:4 +__dt__9dSn_HIO_cFv = .text:0x8025B678; // type:function size:0x48 scope:weak align:4 __sinit_d_s_name_cpp = .text:0x8025B6C0; // type:function size:0xDC scope:local align:4 calcPauseTimer__9dScnPly_cFv = .text:0x8025B79C; // type:function size:0x40 scope:global align:4 __ct__22dScnPly_env_otherHIO_cFv = .text:0x8025B7DC; // type:function size:0x28 scope:global align:4 __ct__22dScnPly_env_debugHIO_cFv = .text:0x8025B804; // type:function size:0x44 scope:global align:4 -dScnPly_Draw__FP9dScnPly_c = .text:0x8025B848; // type:function size:0x30C scope:global align:4 -dScnPly_Execute__FP9dScnPly_c = .text:0x8025BB54; // type:function size:0xC4 scope:global align:4 -dScnPly_IsDelete__F9dScnPly_c = .text:0x8025BC18; // type:function size:0x30 scope:global align:4 -dScnPly_Delete__FP9dScnPly_c = .text:0x8025BC48; // type:function size:0x218 scope:global align:4 +dScnPly_Draw__FP9dScnPly_c = .text:0x8025B848; // type:function size:0x30C scope:local align:4 +dScnPly_Execute__FP9dScnPly_c = .text:0x8025BB54; // type:function size:0xC4 scope:local align:4 +dScnPly_IsDelete__F9dScnPly_c = .text:0x8025BC18; // type:function size:0x30 scope:local align:4 +dScnPly_Delete__FP9dScnPly_c = .text:0x8025BC48; // type:function size:0x218 scope:local align:4 resetGame__9dScnPly_cFv = .text:0x8025BE60; // type:function size:0x138 scope:global align:4 offReset__9dScnPly_cFv = .text:0x8025BF98; // type:function size:0x74 scope:global align:4 -phase_00__FP9dScnPly_c = .text:0x8025C00C; // type:function size:0x3C scope:global align:4 -phase_01__FP9dScnPly_c = .text:0x8025C048; // type:function size:0xD0 scope:global align:4 -phase_0__FP9dScnPly_c = .text:0x8025C118; // type:function size:0x8 scope:global align:4 -phase_1__FP9dScnPly_c = .text:0x8025C120; // type:function size:0x6B4 scope:global align:4 -phase_1_0__FP9dScnPly_c = .text:0x8025C7D4; // type:function size:0xC0 scope:global align:4 -phase_2__FP9dScnPly_c = .text:0x8025C894; // type:function size:0xDC scope:global align:4 -phase_3__FP9dScnPly_c = .text:0x8025C970; // type:function size:0x80 scope:global align:4 -phase_4__FP9dScnPly_c = .text:0x8025C9F0; // type:function size:0x3A0 scope:global align:4 -phase_5__FP9dScnPly_c = .text:0x8025CD90; // type:function size:0xCC scope:global align:4 -phase_6__FP9dScnPly_c = .text:0x8025CE5C; // type:function size:0xCC scope:global align:4 -phase_compleate__FPv = .text:0x8025CF28; // type:function size:0x8 scope:global align:4 -dScnPly_Create__FP11scene_class = .text:0x8025CF30; // type:function size:0x30 scope:global align:4 -__dt__22dScnPly_env_debugHIO_cFv = .text:0x8025CF60; // type:function size:0x48 scope:global align:4 -__dt__22dScnPly_env_otherHIO_cFv = .text:0x8025CFA8; // type:function size:0x48 scope:global align:4 +phase_00__FP9dScnPly_c = .text:0x8025C00C; // type:function size:0x3C scope:local align:4 +phase_01__FP9dScnPly_c = .text:0x8025C048; // type:function size:0xD0 scope:local align:4 +phase_0__FP9dScnPly_c = .text:0x8025C118; // type:function size:0x8 scope:local align:4 +phase_1__FP9dScnPly_c = .text:0x8025C120; // type:function size:0x6B4 scope:local align:4 +phase_1_0__FP9dScnPly_c = .text:0x8025C7D4; // type:function size:0xC0 scope:local align:4 +phase_2__FP9dScnPly_c = .text:0x8025C894; // type:function size:0xDC scope:local align:4 +phase_3__FP9dScnPly_c = .text:0x8025C970; // type:function size:0x80 scope:local align:4 +phase_4__FP9dScnPly_c = .text:0x8025C9F0; // type:function size:0x3A0 scope:local align:4 +phase_5__FP9dScnPly_c = .text:0x8025CD90; // type:function size:0xCC scope:local align:4 +phase_6__FP9dScnPly_c = .text:0x8025CE5C; // type:function size:0xCC scope:local align:4 +phase_compleate__FPv = .text:0x8025CF28; // type:function size:0x8 scope:local align:4 +dScnPly_Create__FP11scene_class = .text:0x8025CF30; // type:function size:0x30 scope:local align:4 +__dt__22dScnPly_env_debugHIO_cFv = .text:0x8025CF60; // type:function size:0x48 scope:weak align:4 +__dt__22dScnPly_env_otherHIO_cFv = .text:0x8025CFA8; // type:function size:0x48 scope:weak align:4 __sinit_d_s_play_cpp = .text:0x8025CFF0; // type:function size:0xB0 scope:local align:4 -__dt__17dScnPly_env_HIO_cFv = .text:0x8025D0A0; // type:function size:0x74 scope:global align:4 -__dt__17dScnPly_reg_HIO_cFv = .text:0x8025D114; // type:function size:0x48 scope:global align:4 -__dt__21dScnPly_preLoad_HIO_cFv = .text:0x8025D15C; // type:function size:0x5C scope:global align:4 -dScnRoom_Draw__FP19room_of_scene_class = .text:0x8025D1B8; // type:function size:0x8 scope:global align:4 -getResetArchiveBank__FiPPCUc = .text:0x8025D1C0; // type:function size:0x100 scope:global align:4 -resetArchiveBank__Fi = .text:0x8025D2C0; // type:function size:0x28 scope:global align:4 -setArchiveBank__Fi = .text:0x8025D2E8; // type:function size:0x1A4 scope:global align:4 -objectDeleteJugge__FPvPv = .text:0x8025D48C; // type:function size:0x60 scope:global align:4 -deleteJugge__FPvPv = .text:0x8025D4EC; // type:function size:0x24 scope:global align:4 -isCreatingCallback__FP10create_tagPUi = .text:0x8025D510; // type:function size:0x20 scope:global align:4 -isCreating__FUi = .text:0x8025D530; // type:function size:0x3C scope:global align:4 -loadDemoArchive__Fi = .text:0x8025D56C; // type:function size:0x11C scope:global align:4 -objectSetCheck__FP19room_of_scene_class = .text:0x8025D688; // type:function size:0x278 scope:global align:4 -dScnRoom_Execute__FP19room_of_scene_class = .text:0x8025D900; // type:function size:0x110 scope:global align:4 -dScnRoom_IsDelete__FP19room_of_scene_class = .text:0x8025DA10; // type:function size:0x8 scope:global align:4 -isReadRoom__Fi = .text:0x8025DA18; // type:function size:0xC0 scope:global align:4 -dScnRoom_Delete__FP19room_of_scene_class = .text:0x8025DAD8; // type:function size:0x134 scope:global align:4 -phase_0__FP19room_of_scene_class = .text:0x8025DC0C; // type:function size:0x34 scope:global align:4 -phase_1__FP19room_of_scene_class = .text:0x8025DC40; // type:function size:0xDC scope:global align:4 -phase_2__FP19room_of_scene_class = .text:0x8025DD1C; // type:function size:0x12C scope:global align:4 +__dt__17dScnPly_env_HIO_cFv = .text:0x8025D0A0; // type:function size:0x74 scope:weak align:4 +__dt__17dScnPly_reg_HIO_cFv = .text:0x8025D114; // type:function size:0x48 scope:weak align:4 +__dt__21dScnPly_preLoad_HIO_cFv = .text:0x8025D15C; // type:function size:0x5C scope:weak align:4 +dScnRoom_Draw__FP19room_of_scene_class = .text:0x8025D1B8; // type:function size:0x8 scope:local align:4 +getResetArchiveBank__FiPPCUc = .text:0x8025D1C0; // type:function size:0x100 scope:local align:4 +resetArchiveBank__Fi = .text:0x8025D2C0; // type:function size:0x28 scope:local align:4 +setArchiveBank__Fi = .text:0x8025D2E8; // type:function size:0x1A4 scope:local align:4 +objectDeleteJugge__FPvPv = .text:0x8025D48C; // type:function size:0x60 scope:local align:4 +deleteJugge__FPvPv = .text:0x8025D4EC; // type:function size:0x24 scope:local align:4 +isCreatingCallback__FP10create_tagPUi = .text:0x8025D510; // type:function size:0x20 scope:local align:4 +isCreating__FUi = .text:0x8025D530; // type:function size:0x3C scope:local align:4 +loadDemoArchive__Fi = .text:0x8025D56C; // type:function size:0x11C scope:local align:4 +objectSetCheck__FP19room_of_scene_class = .text:0x8025D688; // type:function size:0x278 scope:local align:4 +dScnRoom_Execute__FP19room_of_scene_class = .text:0x8025D900; // type:function size:0x110 scope:local align:4 +dScnRoom_IsDelete__FP19room_of_scene_class = .text:0x8025DA10; // type:function size:0x8 scope:local align:4 +isReadRoom__Fi = .text:0x8025DA18; // type:function size:0xC0 scope:local align:4 +dScnRoom_Delete__FP19room_of_scene_class = .text:0x8025DAD8; // type:function size:0x134 scope:local align:4 +phase_0__FP19room_of_scene_class = .text:0x8025DC0C; // type:function size:0x34 scope:local align:4 +phase_1__FP19room_of_scene_class = .text:0x8025DC40; // type:function size:0xDC scope:local align:4 +phase_2__FP19room_of_scene_class = .text:0x8025DD1C; // type:function size:0x12C scope:local align:4 setZoneNo__20dStage_roomControl_cFii = .text:0x8025DE48; // type:function size:0x18 scope:global align:4 -phase_3__FP19room_of_scene_class = .text:0x8025DE60; // type:function size:0x34 scope:global align:4 -phase_4__FP19room_of_scene_class = .text:0x8025DE94; // type:function size:0x50 scope:global align:4 -dScnRoom_Create__FP11scene_class = .text:0x8025DEE4; // type:function size:0x30 scope:global align:4 +phase_3__FP19room_of_scene_class = .text:0x8025DE60; // type:function size:0x34 scope:local align:4 +phase_4__FP19room_of_scene_class = .text:0x8025DE94; // type:function size:0x50 scope:local align:4 +dScnRoom_Create__FP11scene_class = .text:0x8025DEE4; // type:function size:0x30 scope:local align:4 __ct__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025DF14; // type:function size:0x34 scope:global align:4 init__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025DF48; // type:function size:0x68 scope:global align:4 __ct__26dSvBit_childSwDungeonHIO_cFv = .text:0x8025DFB0; // type:function size:0x34 scope:global align:4 @@ -9950,23 +9948,23 @@ init__26dSvBit_childTransformHIO_cFv = .text:0x8025E470; // type:function size:0 __ct__22dSvBit_childOtherHIO_cFv = .text:0x8025E4D8; // type:function size:0x3C scope:global align:4 init__22dSvBit_childOtherHIO_cFv = .text:0x8025E514; // type:function size:0x80 scope:global align:4 init__12dSvBit_HIO_cFv = .text:0x8025E594; // type:function size:0xA4 scope:global align:4 -__dt__22dSvBit_childOtherHIO_cFv = .text:0x8025E638; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childTransformHIO_cFv = .text:0x8025E680; // type:function size:0x48 scope:global align:4 -__dt__25dSvBit_childDarknessHIO_cFv = .text:0x8025E6C8; // type:function size:0x48 scope:global align:4 -__dt__29dSvBit_childTbPerfectionHIO_cFv = .text:0x8025E710; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childItOneZoneHIO_cFv = .text:0x8025E758; // type:function size:0x48 scope:global align:4 -__dt__23dSvBit_childItZoneHIO_cFv = .text:0x8025E7A0; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childItDungeonHIO_cFv = .text:0x8025E7E8; // type:function size:0x48 scope:global align:4 -__dt__29dSvBit_childItPerfectionHIO_cFv = .text:0x8025E830; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childSwOneZoneHIO_cFv = .text:0x8025E878; // type:function size:0x48 scope:global align:4 -__dt__23dSvBit_childSwZoneHIO_cFv = .text:0x8025E8C0; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childSwDungeonHIO_cFv = .text:0x8025E908; // type:function size:0x48 scope:global align:4 -__dt__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025E950; // type:function size:0x48 scope:global align:4 +__dt__22dSvBit_childOtherHIO_cFv = .text:0x8025E638; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childTransformHIO_cFv = .text:0x8025E680; // type:function size:0x48 scope:weak align:4 +__dt__25dSvBit_childDarknessHIO_cFv = .text:0x8025E6C8; // type:function size:0x48 scope:weak align:4 +__dt__29dSvBit_childTbPerfectionHIO_cFv = .text:0x8025E710; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childItOneZoneHIO_cFv = .text:0x8025E758; // type:function size:0x48 scope:weak align:4 +__dt__23dSvBit_childItZoneHIO_cFv = .text:0x8025E7A0; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childItDungeonHIO_cFv = .text:0x8025E7E8; // type:function size:0x48 scope:weak align:4 +__dt__29dSvBit_childItPerfectionHIO_cFv = .text:0x8025E830; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childSwOneZoneHIO_cFv = .text:0x8025E878; // type:function size:0x48 scope:weak align:4 +__dt__23dSvBit_childSwZoneHIO_cFv = .text:0x8025E8C0; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childSwDungeonHIO_cFv = .text:0x8025E908; // type:function size:0x48 scope:weak align:4 +__dt__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025E950; // type:function size:0x48 scope:weak align:4 __sinit_d_save_HIO_cpp = .text:0x8025E998; // type:function size:0x100 scope:local align:4 -__dt__12dSvBit_HIO_cFv = .text:0x8025EA98; // type:function size:0x178 scope:global align:4 -__dt__25dSvBit_childTreasureHIO_cFv = .text:0x8025EC10; // type:function size:0x60 scope:global align:4 -__dt__21dSvBit_childItemHIO_cFv = .text:0x8025EC70; // type:function size:0x9C scope:global align:4 -__dt__23dSvBit_childSwitchHIO_cFv = .text:0x8025ED0C; // type:function size:0x9C scope:global align:4 +__dt__12dSvBit_HIO_cFv = .text:0x8025EA98; // type:function size:0x178 scope:weak align:4 +__dt__25dSvBit_childTreasureHIO_cFv = .text:0x8025EC10; // type:function size:0x60 scope:weak align:4 +__dt__21dSvBit_childItemHIO_cFv = .text:0x8025EC70; // type:function size:0x9C scope:weak align:4 +__dt__23dSvBit_childSwitchHIO_cFv = .text:0x8025ED0C; // type:function size:0x9C scope:weak align:4 _create__8dTimer_cFv = .text:0x8025EDA8; // type:function size:0x4F8 scope:global align:4 _execute__8dTimer_cFv = .text:0x8025F2A0; // type:function size:0x438 scope:global align:4 _draw__8dTimer_cFv = .text:0x8025F6D8; // type:function size:0x80 scope:global align:4 @@ -10010,15 +10008,15 @@ checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv = .text:0x80262E44; // type:functi playBckAnimation__21dDlst_TimerScrnDraw_cFf = .text:0x80262E70; // type:function size:0x80 scope:global align:4 isLeadByte__21dDlst_TimerScrnDraw_cFi = .text:0x80262EF0; // type:function size:0x2C scope:global align:4 drawPikari__21dDlst_TimerScrnDraw_cFi = .text:0x80262F1C; // type:function size:0x418 scope:global align:4 -dTimer_Draw__FP8dTimer_c = .text:0x80263334; // type:function size:0x20 scope:global align:4 -dTimer_Execute__FP8dTimer_c = .text:0x80263354; // type:function size:0x20 scope:global align:4 -dTimer_IsDelete__FP8dTimer_c = .text:0x80263374; // type:function size:0x8 scope:global align:4 -dTimer_Delete__FP8dTimer_c = .text:0x8026337C; // type:function size:0x20 scope:global align:4 -dTimer_Create__FP9msg_class = .text:0x8026339C; // type:function size:0x20 scope:global align:4 +dTimer_Draw__FP8dTimer_c = .text:0x80263334; // type:function size:0x20 scope:local align:4 +dTimer_Execute__FP8dTimer_c = .text:0x80263354; // type:function size:0x20 scope:local align:4 +dTimer_IsDelete__FP8dTimer_c = .text:0x80263374; // type:function size:0x8 scope:local align:4 +dTimer_Delete__FP8dTimer_c = .text:0x8026337C; // type:function size:0x20 scope:local align:4 +dTimer_Create__FP9msg_class = .text:0x8026339C; // type:function size:0x20 scope:local align:4 dTimer_createTimer__FlUlUcUcffff = .text:0x802633BC; // type:function size:0xA8 scope:global align:4 dTimer_createStockTimer__Fv = .text:0x80263464; // type:function size:0xCC scope:global align:4 dTimer_createGetIn2D__Fl4cXyz = .text:0x80263530; // type:function size:0x88 scope:global align:4 -dTimer_createStart2D__FlUs = .text:0x802635B8; // type:function size:0x68 scope:global align:4 +dTimer_createStart2D__FlUs = .text:0x802635B8; // type:function size:0x68 scope:local align:4 dTimer_isStart__Fv = .text:0x80263620; // type:function size:0x54 scope:global align:4 dTimer_getRestTimeMs__Fv = .text:0x80263674; // type:function size:0x54 scope:global align:4 dTimer_show__Fv = .text:0x802636C8; // type:function size:0x54 scope:global align:4 @@ -10026,20 +10024,20 @@ dTimer_hide__Fv = .text:0x8026371C; // type:function size:0x54 scope:global alig dTimer_isReadyFlag__Fv = .text:0x80263770; // type:function size:0x54 scope:global align:4 __dt__21dDlst_TimerScrnDraw_cFv = .text:0x802637C4; // type:function size:0x48 scope:global align:4 createGetIn__8dTimer_cF4cXyz = .text:0x8026380C; // type:function size:0x40 scope:global align:4 -dkWmark_Create__FP12kankyo_class = .text:0x8026384C; // type:function size:0x224 scope:global align:4 +dkWmark_Create__FP12kankyo_class = .text:0x8026384C; // type:function size:0x224 scope:local align:4 __dt__9dkWmark_cFv = .text:0x80263A70; // type:function size:0x5C scope:global align:4 -dkWmark_Delete__FP9dkWmark_c = .text:0x80263ACC; // type:function size:0x28 scope:global align:4 +dkWmark_Delete__FP9dkWmark_c = .text:0x80263ACC; // type:function size:0x28 scope:local align:4 setMatrix__9dkWmark_cFv = .text:0x80263AF4; // type:function size:0x2A0 scope:global align:4 -dkWmark_Execute__FP9dkWmark_c = .text:0x80263D94; // type:function size:0xB4 scope:global align:4 -dkWmark_Draw__FP9dkWmark_c = .text:0x80263E48; // type:function size:0x13C scope:global align:4 +dkWmark_Execute__FP9dkWmark_c = .text:0x80263D94; // type:function size:0xB4 scope:local align:4 +dkWmark_Draw__FP9dkWmark_c = .text:0x80263E48; // type:function size:0x13C scope:local align:4 create__11dkWpillar_cFv = .text:0x80263F84; // type:function size:0x3B0 scope:global align:4 -dkWpillar_Create__FP12kankyo_class = .text:0x80264334; // type:function size:0x20 scope:global align:4 +dkWpillar_Create__FP12kankyo_class = .text:0x80264334; // type:function size:0x20 scope:local align:4 __dt__11dkWpillar_cFv = .text:0x80264354; // type:function size:0xC8 scope:global align:4 -dkWpillar_Delete__FP11dkWpillar_c = .text:0x8026441C; // type:function size:0x28 scope:global align:4 +dkWpillar_Delete__FP11dkWpillar_c = .text:0x8026441C; // type:function size:0x28 scope:local align:4 execute__11dkWpillar_cFv = .text:0x80264444; // type:function size:0x94 scope:global align:4 -dkWpillar_Execute__FP11dkWpillar_c = .text:0x802644D8; // type:function size:0x20 scope:global align:4 +dkWpillar_Execute__FP11dkWpillar_c = .text:0x802644D8; // type:function size:0x20 scope:local align:4 draw__11dkWpillar_cFv = .text:0x802644F8; // type:function size:0xE4 scope:global align:4 -dkWpillar_Draw__FP11dkWpillar_c = .text:0x802645DC; // type:function size:0x20 scope:global align:4 +dkWpillar_Draw__FP11dkWpillar_c = .text:0x802645DC; // type:function size:0x20 scope:local align:4 __dt__24DynamicModuleControlBaseFv = .text:0x802645FC; // type:function size:0xB8 scope:global align:4 __ct__24DynamicModuleControlBaseFv = .text:0x802646B4; // type:function size:0x4C scope:global align:4 link__24DynamicModuleControlBaseFv = .text:0x80264700; // type:function size:0x94 scope:global align:4 @@ -10051,7 +10049,7 @@ __ct__20DynamicModuleControlFPCc = .text:0x80264A90; // type:function size:0x70 mountCallback__20DynamicModuleControlFPv = .text:0x80264B00; // type:function size:0x8C scope:global align:4 initialize__20DynamicModuleControlFv = .text:0x80264B8C; // type:function size:0x38 scope:global align:4 callback__20DynamicModuleControlFPv = .text:0x80264BC4; // type:function size:0x2C scope:global align:4 -calcSum2__FPCUsUl = .text:0x80264BF0; // type:function size:0x28 scope:global align:4 +calcSum2__FPCUsUl = .text:0x80264BF0; // type:function size:0x28 scope:local align:4 do_load__20DynamicModuleControlFv = .text:0x80264C18; // type:function size:0x314 scope:global align:4 do_load_async__20DynamicModuleControlFv = .text:0x80264F2C; // type:function size:0xC8 scope:global align:4 do_unload__20DynamicModuleControlFv = .text:0x80264FF4; // type:function size:0x48 scope:global align:4 @@ -10065,15 +10063,15 @@ ModuleEpilog = .text:0x802654BC; // type:function size:0x4 scope:global align:4 ModuleUnresolved = .text:0x802654C0; // type:function size:0xBC scope:global align:4 ModuleConstructorsX = .text:0x8026557C; // type:function size:0x44 scope:global align:4 ModuleDestructorsX = .text:0x802655C0; // type:function size:0x44 scope:global align:4 -do_link__24DynamicModuleControlBaseFv = .text:0x80265604; // type:function size:0x8 scope:global align:4 -do_load__24DynamicModuleControlBaseFv = .text:0x8026560C; // type:function size:0x8 scope:global align:4 -do_unload__24DynamicModuleControlBaseFv = .text:0x80265614; // type:function size:0x8 scope:global align:4 -do_unlink__24DynamicModuleControlBaseFv = .text:0x8026561C; // type:function size:0x8 scope:global align:4 -do_load_async__24DynamicModuleControlBaseFv = .text:0x80265624; // type:function size:0x8 scope:global align:4 -dump2__24DynamicModuleControlBaseFv = .text:0x8026562C; // type:function size:0x4 scope:global align:4 -getModuleTypeString__24DynamicModuleControlBaseCFv = .text:0x80265630; // type:function size:0x10 scope:global align:4 -getModuleSize__24DynamicModuleControlBaseCFv = .text:0x80265640; // type:function size:0x8 scope:global align:4 -getModuleName__20DynamicModuleControlCFv = .text:0x80265648; // type:function size:0x8 scope:global align:4 +do_link__24DynamicModuleControlBaseFv = .text:0x80265604; // type:function size:0x8 scope:weak align:4 +do_load__24DynamicModuleControlBaseFv = .text:0x8026560C; // type:function size:0x8 scope:weak align:4 +do_unload__24DynamicModuleControlBaseFv = .text:0x80265614; // type:function size:0x8 scope:weak align:4 +do_unlink__24DynamicModuleControlBaseFv = .text:0x8026561C; // type:function size:0x8 scope:weak align:4 +do_load_async__24DynamicModuleControlBaseFv = .text:0x80265624; // type:function size:0x8 scope:weak align:4 +dump2__24DynamicModuleControlBaseFv = .text:0x8026562C; // type:function size:0x4 scope:weak align:4 +getModuleTypeString__24DynamicModuleControlBaseCFv = .text:0x80265630; // type:function size:0x10 scope:weak align:4 +getModuleSize__24DynamicModuleControlBaseCFv = .text:0x80265640; // type:function size:0x8 scope:weak align:4 +getModuleName__20DynamicModuleControlCFv = .text:0x80265648; // type:function size:0x8 scope:weak align:4 init__3cMlFP7JKRHeap = .text:0x80265650; // type:function size:0x8 scope:global align:4 memalignB__3cMlFiUl = .text:0x80265658; // type:function size:0x38 scope:global align:4 free__3cMlFPv = .text:0x80265690; // type:function size:0x2C scope:global align:4 @@ -10147,16 +10145,16 @@ SetHit__10cCcD_ObjCoFP8cCcD_Obj = .text:0x80266D08; // type:function size:0x10 s ClrHit__10cCcD_ObjCoFv = .text:0x80266D18; // type:function size:0x18 scope:global align:4 SetIGrp__10cCcD_ObjCoFUl = .text:0x80266D30; // type:function size:0x1C scope:global align:4 SetVsGrp__10cCcD_ObjCoFUl = .text:0x80266D4C; // type:function size:0x1C scope:global align:4 -__dt__12cCcD_TriAttrFv = .text:0x80266D68; // type:function size:0xA0 scope:global align:4 -CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz = .text:0x80266E08; // type:function size:0x8 scope:global align:4 -CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf = .text:0x80266E10; // type:function size:0x8 scope:global align:4 -ClrAt__9cCcD_SttsFv = .text:0x80266E18; // type:function size:0x4 scope:global align:4 -ClrTg__9cCcD_SttsFv = .text:0x80266E1C; // type:function size:0xC scope:global align:4 +__dt__12cCcD_TriAttrFv = .text:0x80266D68; // type:function size:0xA0 scope:weak align:4 +CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz = .text:0x80266E08; // type:function size:0x8 scope:weak align:4 +CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf = .text:0x80266E10; // type:function size:0x8 scope:weak align:4 +ClrAt__9cCcD_SttsFv = .text:0x80266E18; // type:function size:0x4 scope:weak align:4 +ClrTg__9cCcD_SttsFv = .text:0x80266E1C; // type:function size:0xC scope:weak align:4 __sinit_c_cc_d_cpp = .text:0x80266E28; // type:function size:0x54 scope:local align:4 -@32@__dt__12cCcD_TriAttrFv = .text:0x80266E7C; // type:function size:0x8 scope:local align:4 -@32@__dt__12cCcD_CpsAttrFv = .text:0x80266E84; // type:function size:0x8 scope:local align:4 -@32@__dt__12cCcD_CylAttrFv = .text:0x80266E8C; // type:function size:0x8 scope:local align:4 -@32@__dt__12cCcD_SphAttrFv = .text:0x80266E94; // type:function size:0x8 scope:local align:4 +@32@__dt__12cCcD_TriAttrFv = .text:0x80266E7C; // type:function size:0x8 scope:weak align:4 +@32@__dt__12cCcD_CpsAttrFv = .text:0x80266E84; // type:function size:0x8 scope:weak align:4 +@32@__dt__12cCcD_CylAttrFv = .text:0x80266E8C; // type:function size:0x8 scope:weak align:4 +@32@__dt__12cCcD_SphAttrFv = .text:0x80266E94; // type:function size:0x8 scope:weak align:4 __ct__4cCcSFv = .text:0x80266E9C; // type:function size:0x28 scope:global align:4 Ct__4cCcSFv = .text:0x80266EC4; // type:function size:0xCC scope:global align:4 Dt__4cCcSFv = .text:0x80266F90; // type:function size:0x20 scope:global align:4 @@ -10280,13 +10278,13 @@ __dt__11cBgS_GndChkFv = .text:0x8026A0C4; // type:function size:0x78 scope:globa SetPos__11cBgS_GndChkFPC3Vec = .text:0x8026A13C; // type:function size:0x1C scope:global align:4 SetPos__11cBgS_GndChkFPC4cXyz = .text:0x8026A158; // type:function size:0x1C scope:global align:4 PreCheck__11cBgS_GndChkFv = .text:0x8026A174; // type:function size:0x10 scope:global align:4 -@20@__dt__11cBgS_GndChkFv = .text:0x8026A184; // type:function size:0x8 scope:local align:4 +@20@__dt__11cBgS_GndChkFv = .text:0x8026A184; // type:function size:0x8 scope:weak align:4 __ct__11cBgS_LinChkFv = .text:0x8026A18C; // type:function size:0x60 scope:global align:4 __dt__11cBgS_LinChkFv = .text:0x8026A1EC; // type:function size:0x8C scope:global align:4 ct__11cBgS_LinChkFv = .text:0x8026A278; // type:function size:0x88 scope:global align:4 Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi = .text:0x8026A300; // type:function size:0x70 scope:global align:4 PreCalc__11cBgS_LinChkFv = .text:0x8026A370; // type:function size:0x40 scope:global align:4 -@20@__dt__11cBgS_LinChkFv = .text:0x8026A3B0; // type:function size:0x8 scope:local align:4 +@20@__dt__11cBgS_LinChkFv = .text:0x8026A3B0; // type:function size:0x8 scope:weak align:4 __ct__13cBgS_ShdwDrawFv = .text:0x8026A3B8; // type:function size:0x48 scope:global align:4 __dt__13cBgS_ShdwDrawFv = .text:0x8026A400; // type:function size:0x78 scope:global align:4 Set__13cBgS_ShdwDrawFR4cXyzR4cXyz = .text:0x8026A478; // type:function size:0x24 scope:global align:4 @@ -10307,7 +10305,7 @@ cBgW_CheckBGround__Ff = .text:0x8026A614; // type:function size:0x18 scope:globa cBgW_CheckBRoof__Ff = .text:0x8026A62C; // type:function size:0x14 scope:global align:4 cBgW_CheckBWall__Ff = .text:0x8026A640; // type:function size:0x50 scope:global align:4 cM2d_CrossCirLin__FR8cM2dGCirffffPfPf = .text:0x8026A690; // type:function size:0x300 scope:global align:4 -cM3d_InDivPos1__FPC3VecPC3VecfP3Vec = .text:0x8026A990; // type:function size:0x50 scope:global align:4 +cM3d_InDivPos1__FPC3VecPC3VecfP3Vec = .text:0x8026A990; // type:function size:0x50 scope:local align:4 cM3d_InDivPos2__FPC3VecPC3VecfP3Vec = .text:0x8026A9E0; // type:function size:0x64 scope:global align:4 cM3d_Len2dSq__Fffff = .text:0x8026AA44; // type:function size:0x18 scope:global align:4 cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf = .text:0x8026AA5C; // type:function size:0xE4 scope:global align:4 @@ -10319,53 +10317,53 @@ cM3d_CalcPla__FPC3VecPC3VecPC3VecP3VecPf = .text:0x8026AD4C; // type:function si cM3d_Cross_AabAab__FPC8cM3dGAabPC8cM3dGAab = .text:0x8026AE18; // type:function size:0x124 scope:global align:4 cM3d_Cross_AabCyl__FPC8cM3dGAabPC8cM3dGCyl = .text:0x8026AF3C; // type:function size:0xA8 scope:global align:4 cM3d_Cross_AabSph__FPC8cM3dGAabPC8cM3dGSph = .text:0x8026AFE4; // type:function size:0xA8 scope:global align:4 -cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf = .text:0x8026B08C; // type:function size:0x278 scope:global align:4 -cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec = .text:0x8026B304; // type:function size:0x60 scope:global align:4 +cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf = .text:0x8026B08C; // type:function size:0x278 scope:local align:4 +cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec = .text:0x8026B304; // type:function size:0x60 scope:local align:4 cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb = .text:0x8026B364; // type:function size:0x11C scope:global align:4 cM3d_Cross_MinMaxBoxLine__FPC3VecPC3VecPC3VecPC3Vec = .text:0x8026B480; // type:function size:0xBDC scope:global align:4 -cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf = .text:0x8026C05C; // type:function size:0x138 scope:global align:4 -cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff = .text:0x8026C194; // type:function size:0xB4 scope:global align:4 -cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026C248; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026C3EC; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026C590; // type:function size:0x184 scope:global align:4 +cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf = .text:0x8026C05C; // type:function size:0x138 scope:local align:4 +cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff = .text:0x8026C194; // type:function size:0xB4 scope:local align:4 +cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026C248; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026C3EC; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026C590; // type:function size:0x184 scope:local align:4 cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026C714; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026C8B8; // type:function size:0x184 scope:global align:4 +cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026C8B8; // type:function size:0x184 scope:local align:4 cM3d_CrossY_Tri__FRC3VecRC3VecRC3VecRC8cM3dGPlaPC3Vec = .text:0x8026CA3C; // type:function size:0x1AC scope:global align:4 cM3d_CrossY_Tri_Front__FRC3VecRC3VecRC3VecPC3Vec = .text:0x8026CBE8; // type:function size:0x108 scope:global align:4 -cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf = .text:0x8026CCF0; // type:function size:0x84 scope:global align:4 -cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026CD74; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf = .text:0x8026CF18; // type:function size:0xF0 scope:global align:4 -cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026D008; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026D1AC; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026D350; // type:function size:0x184 scope:global align:4 +cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf = .text:0x8026CCF0; // type:function size:0x84 scope:local align:4 +cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026CD74; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf = .text:0x8026CF18; // type:function size:0xF0 scope:local align:4 +cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026D008; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026D1AC; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026D350; // type:function size:0x184 scope:local align:4 cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb = .text:0x8026D4D4; // type:function size:0xD8 scope:global align:4 -cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec = .text:0x8026D5AC; // type:function size:0xBC scope:global align:4 -cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec = .text:0x8026D668; // type:function size:0x48 scope:global align:4 +cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec = .text:0x8026D5AC; // type:function size:0xBC scope:local align:4 +cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec = .text:0x8026D668; // type:function size:0x48 scope:local align:4 cM3d_Cross_LinSph__FPC8cM3dGLinPC8cM3dGSphP3Vec = .text:0x8026D6B0; // type:function size:0x268 scope:global align:4 cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec = .text:0x8026D918; // type:function size:0x3BC scope:global align:4 cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf = .text:0x8026DCD4; // type:function size:0x1A4 scope:global align:4 cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf = .text:0x8026DE78; // type:function size:0x234 scope:global align:4 cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf = .text:0x8026E0AC; // type:function size:0x80 scope:global align:4 -cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf = .text:0x8026E12C; // type:function size:0x8C scope:global align:4 +cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf = .text:0x8026E12C; // type:function size:0x8C scope:local align:4 cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphP3Vec = .text:0x8026E1B8; // type:function size:0xD4 scope:global align:4 -cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec = .text:0x8026E28C; // type:function size:0xA8 scope:global align:4 +cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec = .text:0x8026E28C; // type:function size:0xA8 scope:local align:4 cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec = .text:0x8026E334; // type:function size:0x328 scope:global align:4 cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf = .text:0x8026E65C; // type:function size:0x188 scope:global align:4 cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylP3Vec = .text:0x8026E7E4; // type:function size:0x21C scope:global align:4 cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec = .text:0x8026EA00; // type:function size:0x374 scope:global align:4 cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec = .text:0x8026ED74; // type:function size:0x700 scope:global align:4 -cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec = .text:0x8026F474; // type:function size:0x6C scope:global align:4 -cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec = .text:0x8026F4E0; // type:function size:0x64 scope:global align:4 +cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec = .text:0x8026F474; // type:function size:0x6C scope:local align:4 +cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec = .text:0x8026F4E0; // type:function size:0x64 scope:local align:4 cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec = .text:0x8026F544; // type:function size:0x2C0 scope:global align:4 cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec = .text:0x8026F804; // type:function size:0x70C scope:global align:4 -cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec = .text:0x8026FF10; // type:function size:0x15C scope:global align:4 +cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec = .text:0x8026FF10; // type:function size:0x15C scope:local align:4 cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec = .text:0x8027006C; // type:function size:0x1F0 scope:global align:4 cM3d_Cross_TriTri__FRC8cM3dGTriRC8cM3dGTriP3Vec = .text:0x8027025C; // type:function size:0x300 scope:global align:4 cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec = .text:0x8027055C; // type:function size:0x3D0 scope:global align:4 cM3d_CalcVecAngle__FRC3VecPsPs = .text:0x8027092C; // type:function size:0x74 scope:global align:4 cM3d_CalcVecZAngle__FRC3VecP5csXyz = .text:0x802709A0; // type:function size:0x154 scope:global align:4 -cM3d_PlaneCrossLineProcWork__FfffffffPfPf = .text:0x80270AF4; // type:function size:0x2C scope:global align:4 -cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin = .text:0x80270B20; // type:function size:0x1B0 scope:global align:4 +cM3d_PlaneCrossLineProcWork__FfffffffPfPf = .text:0x80270AF4; // type:function size:0x2C scope:local align:4 +cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin = .text:0x80270B20; // type:function size:0x1B0 scope:local align:4 cM3d_3PlaneCrossPos__FRC8cM3dGPlaRC8cM3dGPlaRC8cM3dGPlaP3Vec = .text:0x80270CD0; // type:function size:0xE0 scope:global align:4 cM3d_lineVsPosSuisenCross__FPC8cM3dGLinPC3VecP3Vec = .text:0x80270DB0; // type:function size:0xDC scope:global align:4 cM3d_lineVsPosSuisenCross__FRC3VecRC3VecRC3VecP3Vec = .text:0x80270E8C; // type:function size:0xDC scope:global align:4 @@ -10384,7 +10382,7 @@ SetMax__8cM3dGAabFRC4cXyz = .text:0x80271214; // type:function size:0x40 scope:g CalcCenter__8cM3dGAabCFP4cXyz = .text:0x80271254; // type:function size:0x44 scope:global align:4 PlusR__8cM3dGAabFf = .text:0x80271298; // type:function size:0x4C scope:global align:4 __ct__8cM3dGCirFv = .text:0x802712E4; // type:function size:0x1C scope:global align:4 -__dt__8cM2dGCirFv = .text:0x80271300; // type:function size:0x48 scope:global align:4 +__dt__8cM2dGCirFv = .text:0x80271300; // type:function size:0x48 scope:weak align:4 __dt__8cM3dGCirFv = .text:0x80271348; // type:function size:0x5C scope:global align:4 Set__8cM3dGCirFffff = .text:0x802713A4; // type:function size:0x14 scope:global align:4 __ct__8cM3dGCpsFv = .text:0x802713B8; // type:function size:0x1C scope:global align:4 @@ -10503,7 +10501,7 @@ Xyz__7cSGlobeCFv = .text:0x80273EE4; // type:function size:0x40 scope:global ali Polar__7cSGlobeCFP7cSPolar = .text:0x80273F24; // type:function size:0x3C scope:global align:4 Norm__7cSGlobeCFv = .text:0x80273F60; // type:function size:0x4C scope:global align:4 Invert__7cSGlobeFv = .text:0x80273FAC; // type:function size:0x2C scope:global align:4 -Adjust__6cAngleFfff = .text:0x80273FD8; // type:function size:0x2C scope:global align:4 +Adjust__6cAngleFfff = .text:0x80273FD8; // type:function size:0x2C scope:weak align:4 __sinit_c_angle_cpp = .text:0x80274004; // type:function size:0xB8 scope:local align:4 sBs_FillArea_s__FPvUls = .text:0x802740BC; // type:function size:0x20 scope:global align:4 sBs_ClearArea__FPvUl = .text:0x802740DC; // type:function size:0x24 scope:global align:4 @@ -10513,7 +10511,7 @@ ctor_subroutine__10JFWDisplayFb = .text:0x80274470; // type:function size:0xB8 s __ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb = .text:0x80274528; // type:function size:0x68 scope:global align:4 __dt__10JFWDisplayFv = .text:0x80274590; // type:function size:0x7C scope:global align:4 createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb = .text:0x8027460C; // type:function size:0x84 scope:global align:4 -callDirectDraw__Fv = .text:0x80274690; // type:function size:0x58 scope:global align:4 +callDirectDraw__Fv = .text:0x80274690; // type:function size:0x58 scope:local align:4 prepareCopyDisp__10JFWDisplayFv = .text:0x802746E8; // type:function size:0xF4 scope:global align:4 drawendXfb_single__10JFWDisplayFv = .text:0x802747DC; // type:function size:0x48 scope:global align:4 exchangeXfb_double__10JFWDisplayFv = .text:0x80274824; // type:function size:0x108 scope:global align:4 @@ -10525,24 +10523,24 @@ beginRender__10JFWDisplayFv = .text:0x80274BC8; // type:function size:0x26C scop endRender__10JFWDisplayFv = .text:0x80274E34; // type:function size:0xAC scope:global align:4 endFrame__10JFWDisplayFv = .text:0x80274EE0; // type:function size:0x1B0 scope:global align:4 waitBlanking__10JFWDisplayFi = .text:0x80275090; // type:function size:0x50 scope:global align:4 -waitForTick__FUlUs = .text:0x802750E0; // type:function size:0x120 scope:global align:4 -JFWThreadAlarmHandler__FP7OSAlarmP9OSContext = .text:0x80275200; // type:function size:0x40 scope:global align:4 +waitForTick__FUlUs = .text:0x802750E0; // type:function size:0x120 scope:local align:4 +JFWThreadAlarmHandler__FP7OSAlarmP9OSContext = .text:0x80275200; // type:function size:0x40 scope:local align:4 threadSleep__10JFWDisplayFx = .text:0x80275240; // type:function size:0xA8 scope:global align:4 clearEfb_init__10JFWDisplayFv = .text:0x802752E8; // type:function size:0x74 scope:global align:4 clearEfb__10JFWDisplayFv = .text:0x8027535C; // type:function size:0x2C scope:global align:4 clearEfb__10JFWDisplayF8_GXColor = .text:0x80275388; // type:function size:0x44 scope:global align:4 clearEfb__10JFWDisplayFiiii8_GXColor = .text:0x802753CC; // type:function size:0x380 scope:global align:4 calcCombinationRatio__10JFWDisplayFv = .text:0x8027574C; // type:function size:0x8C scope:global align:4 -JFWDrawDoneAlarm__Fv = .text:0x802757D8; // type:function size:0xDC scope:global align:4 -JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext = .text:0x802758B4; // type:function size:0x78 scope:global align:4 -diagnoseGpHang__Fv = .text:0x8027592C; // type:function size:0x1E0 scope:global align:4 +JFWDrawDoneAlarm__Fv = .text:0x802757D8; // type:function size:0xDC scope:local align:4 +JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext = .text:0x802758B4; // type:function size:0x78 scope:local align:4 +diagnoseGpHang__Fv = .text:0x8027592C; // type:function size:0x1E0 scope:local align:4 __sinit_JFWDisplay_cpp = .text:0x80275B0C; // type:function size:0x48 scope:local align:4 -__dt__18JSUList<8JFWAlarm>Fv = .text:0x80275B54; // type:function size:0x54 scope:global align:4 +__dt__18JSUList<8JFWAlarm>Fv = .text:0x80275B54; // type:function size:0x54 scope:weak align:4 init__11J3DUClipperFv = .text:0x80275BA8; // type:function size:0x14 scope:global align:4 calcViewFrustum__11J3DUClipperFv = .text:0x80275BBC; // type:function size:0x170 scope:global align:4 clip__11J3DUClipperCFPA4_Cf3Vecf = .text:0x80275D2C; // type:function size:0x148 scope:global align:4 clip__11J3DUClipperCFPA4_CfP3VecP3Vec = .text:0x80275E74; // type:function size:0x3C4 scope:global align:4 -getUseMtxNum__11J3DShapeMtxCFv = .text:0x80276238; // type:function size:0x8 scope:global align:4 +getUseMtxNum__11J3DShapeMtxCFv = .text:0x80276238; // type:function size:0x8 scope:weak align:4 __ct__18JPAResourceManagerFPCvP7JKRHeap = .text:0x80276240; // type:function size:0x58 scope:global align:4 getResource__18JPAResourceManagerCFUs = .text:0x80276298; // type:function size:0x40 scope:global align:4 checkUserIndexDuplication__18JPAResourceManagerCFUs = .text:0x802762D8; // type:function size:0x44 scope:global align:4 @@ -10564,7 +10562,7 @@ calcField__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80278 calcKey__11JPAResourceFP18JPAEmitterWorkData = .text:0x80278B30; // type:function size:0x140 scope:global align:4 calcWorkData_c__11JPAResourceFP18JPAEmitterWorkData = .text:0x80278C70; // type:function size:0x1CC scope:global align:4 calcWorkData_d__11JPAResourceFP18JPAEmitterWorkData = .text:0x80278E3C; // type:function size:0x80 scope:global align:4 -prepare__12JPAFieldBaseFP18JPAEmitterWorkDataP13JPAFieldBlock = .text:0x80278EBC; // type:function size:0x4 scope:global align:4 +prepare__12JPAFieldBaseFP18JPAEmitterWorkDataP13JPAFieldBlock = .text:0x80278EBC; // type:function size:0x4 scope:weak align:4 JPASetPointSize__FP18JPAEmitterWorkData = .text:0x80278EC0; // type:function size:0x3C scope:global align:4 JPASetLineWidth__FP18JPAEmitterWorkData = .text:0x80278EFC; // type:function size:0x3C scope:global align:4 JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80278F38; // type:function size:0x44 scope:global align:4 @@ -10611,9 +10609,9 @@ JPACalcTexIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80279FC4; JPACalcTexIdxRandom__FP18JPAEmitterWorkData = .text:0x8027A03C; // type:function size:0x1C scope:global align:4 JPACalcTexIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027A058; // type:function size:0x3C scope:global align:4 JPALoadPosMtxCam__FP18JPAEmitterWorkData = .text:0x8027A094; // type:function size:0x28 scope:global align:4 -noLoadPrj__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x8027A0BC; // type:function size:0x4 scope:global align:4 +noLoadPrj__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x8027A0BC; // type:function size:0x4 scope:local align:4 loadPrj__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x8027A0C0; // type:function size:0x38 scope:global align:4 -loadPrjAnm__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x8027A0F8; // type:function size:0x1C0 scope:global align:4 +loadPrjAnm__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x8027A0F8; // type:function size:0x1C0 scope:local align:4 JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027A2B8; // type:function size:0xE8 scope:global align:4 JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027A3A0; // type:function size:0x118 scope:global align:4 JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027A4B8; // type:function size:0xFC scope:global align:4 @@ -10623,13 +10621,13 @@ dirTypePos__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = . dirTypePosInv__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = .text:0x8027A71C; // type:function size:0x34 scope:global align:4 dirTypeEmtrDir__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = .text:0x8027A750; // type:function size:0x1C scope:global align:4 dirTypePrevPtcl__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = .text:0x8027A76C; // type:function size:0x98 scope:global align:4 -rotTypeY__FffRA3_A4_f = .text:0x8027A804; // type:function size:0x40 scope:global align:4 -rotTypeX__FffRA3_A4_f = .text:0x8027A844; // type:function size:0x40 scope:global align:4 -rotTypeZ__FffRA3_A4_f = .text:0x8027A884; // type:function size:0x40 scope:global align:4 -rotTypeXYZ__FffRA3_A4_f = .text:0x8027A8C4; // type:function size:0x5C scope:global align:4 -basePlaneTypeXY__FPA4_fff = .text:0x8027A920; // type:function size:0x4C scope:global align:4 -basePlaneTypeXZ__FPA4_fff = .text:0x8027A96C; // type:function size:0x4C scope:global align:4 -basePlaneTypeX__FPA4_fff = .text:0x8027A9B8; // type:function size:0x70 scope:global align:4 +rotTypeY__FffRA3_A4_f = .text:0x8027A804; // type:function size:0x40 scope:local align:4 +rotTypeX__FffRA3_A4_f = .text:0x8027A844; // type:function size:0x40 scope:local align:4 +rotTypeZ__FffRA3_A4_f = .text:0x8027A884; // type:function size:0x40 scope:local align:4 +rotTypeXYZ__FffRA3_A4_f = .text:0x8027A8C4; // type:function size:0x5C scope:local align:4 +basePlaneTypeXY__FPA4_fff = .text:0x8027A920; // type:function size:0x4C scope:local align:4 +basePlaneTypeXZ__FPA4_fff = .text:0x8027A96C; // type:function size:0x4C scope:local align:4 +basePlaneTypeX__FPA4_fff = .text:0x8027A9B8; // type:function size:0x70 scope:local align:4 JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027AA28; // type:function size:0x39C scope:global align:4 JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027ADC4; // type:function size:0x414 scope:global align:4 JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027B1D8; // type:function size:0x220 scope:global align:4 @@ -10642,7 +10640,7 @@ JPADrawStripe__FP18JPAEmitterWorkData = .text:0x8027B7A4; // type:function size: JPADrawStripeX__FP18JPAEmitterWorkData = .text:0x8027BD9C; // type:function size:0xA6C scope:global align:4 JPADrawEmitterCallBackB__FP18JPAEmitterWorkData = .text:0x8027C808; // type:function size:0x3C scope:global align:4 JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027C844; // type:function size:0x40 scope:global align:4 -makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap = .text:0x8027C884; // type:function size:0x288 scope:global align:4 +makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap = .text:0x8027C884; // type:function size:0x288 scope:local align:4 __ct__12JPABaseShapeFPCUcP7JKRHeap = .text:0x8027CB0C; // type:function size:0x10C scope:global align:4 setGX__12JPABaseShapeCFP18JPAEmitterWorkData = .text:0x8027CC18; // type:function size:0x130 scope:global align:4 JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027CD48; // type:function size:0x78 scope:global align:4 @@ -10667,9 +10665,9 @@ JPAVolumePoint__FP18JPAEmitterWorkData = .text:0x8027D574; // type:function size JPAVolumeLine__FP18JPAEmitterWorkData = .text:0x8027D650; // type:function size:0x11C scope:global align:4 JPAVolumeCircle__FP18JPAEmitterWorkData = .text:0x8027D76C; // type:function size:0x1AC scope:global align:4 JPAVolumeCube__FP18JPAEmitterWorkData = .text:0x8027D918; // type:function size:0x108 scope:global align:4 -JPAVolumeSphere__FP18JPAEmitterWorkData = .text:0x8027DA20; // type:function size:0x28C scope:global align:4 -JPAVolumeCylinder__FP18JPAEmitterWorkData = .text:0x8027DCAC; // type:function size:0x17C scope:global align:4 -JPAVolumeTorus__FP18JPAEmitterWorkData = .text:0x8027DE28; // type:function size:0x120 scope:global align:4 +JPAVolumeSphere__FP18JPAEmitterWorkData = .text:0x8027DA20; // type:function size:0x28C scope:local align:4 +JPAVolumeCylinder__FP18JPAEmitterWorkData = .text:0x8027DCAC; // type:function size:0x17C scope:local align:4 +JPAVolumeTorus__FP18JPAEmitterWorkData = .text:0x8027DE28; // type:function size:0x120 scope:local align:4 __ct__16JPADynamicsBlockFPCUc = .text:0x8027DF48; // type:function size:0x34 scope:global align:4 init__16JPADynamicsBlockFv = .text:0x8027DF7C; // type:function size:0x9C scope:global align:4 create__16JPADynamicsBlockFP18JPAEmitterWorkData = .text:0x8027E018; // type:function size:0x204 scope:global align:4 @@ -10693,16 +10691,16 @@ prepare__12JPAFieldSpinFP18JPAEmitterWorkDataP13JPAFieldBlock = .text:0x8027F294 calc__12JPAFieldSpinFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle = .text:0x8027F3D8; // type:function size:0xE0 scope:global align:4 __ct__13JPAFieldBlockFPCUcP7JKRHeap = .text:0x8027F4B8; // type:function size:0x38 scope:global align:4 init__13JPAFieldBlockFP7JKRHeap = .text:0x8027F4F0; // type:function size:0x2EC scope:global align:4 -__dt__12JPAFieldBaseFv = .text:0x8027F7DC; // type:function size:0x48 scope:global align:4 -__dt__12JPAFieldSpinFv = .text:0x8027F824; // type:function size:0x5C scope:global align:4 -__dt__12JPAFieldDragFv = .text:0x8027F880; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldRandomFv = .text:0x8027F8DC; // type:function size:0x5C scope:global align:4 -__dt__18JPAFieldConvectionFv = .text:0x8027F938; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldVortexFv = .text:0x8027F994; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldNewtonFv = .text:0x8027F9F0; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldMagnetFv = .text:0x8027FA4C; // type:function size:0x5C scope:global align:4 -__dt__11JPAFieldAirFv = .text:0x8027FAA8; // type:function size:0x5C scope:global align:4 -__dt__15JPAFieldGravityFv = .text:0x8027FB04; // type:function size:0x5C scope:global align:4 +__dt__12JPAFieldBaseFv = .text:0x8027F7DC; // type:function size:0x48 scope:weak align:4 +__dt__12JPAFieldSpinFv = .text:0x8027F824; // type:function size:0x5C scope:weak align:4 +__dt__12JPAFieldDragFv = .text:0x8027F880; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldRandomFv = .text:0x8027F8DC; // type:function size:0x5C scope:weak align:4 +__dt__18JPAFieldConvectionFv = .text:0x8027F938; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldVortexFv = .text:0x8027F994; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldNewtonFv = .text:0x8027F9F0; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldMagnetFv = .text:0x8027FA4C; // type:function size:0x5C scope:weak align:4 +__dt__11JPAFieldAirFv = .text:0x8027FAA8; // type:function size:0x5C scope:weak align:4 +__dt__15JPAFieldGravityFv = .text:0x8027FB04; // type:function size:0x5C scope:weak align:4 __ct__11JPAKeyBlockFPCUc = .text:0x8027FB60; // type:function size:0x10 scope:global align:4 calc__11JPAKeyBlockFf = .text:0x8027FB70; // type:function size:0x94 scope:global align:4 __ct__10JPATextureFPCUc = .text:0x8027FC04; // type:function size:0x68 scope:global align:4 @@ -10719,12 +10717,12 @@ forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter = .text:0x80280708; // entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc = .text:0x80280774; // type:function size:0x10 scope:global align:4 clearResourceManager__17JPAEmitterManagerFUc = .text:0x80280784; // type:function size:0xA0 scope:global align:4 calcYBBCam__17JPAEmitterManagerFv = .text:0x80280824; // type:function size:0x128 scope:global align:4 -__ct__25JSUList<14JPABaseEmitter>Fv = .text:0x8028094C; // type:function size:0x30 scope:global align:4 -__dt__26JPANode<15JPABaseParticle>Fv = .text:0x8028097C; // type:function size:0x3C scope:global align:4 -__ct__26JPANode<15JPABaseParticle>Fv = .text:0x802809B8; // type:function size:0x10 scope:global align:4 -__dt__25JSUList<14JPABaseEmitter>Fv = .text:0x802809C8; // type:function size:0x54 scope:global align:4 -__dt__14JPABaseEmitterFv = .text:0x80280A1C; // type:function size:0x60 scope:global align:4 -__ct__14JPABaseEmitterFv = .text:0x80280A7C; // type:function size:0x58 scope:global align:4 +__ct__25JSUList<14JPABaseEmitter>Fv = .text:0x8028094C; // type:function size:0x30 scope:weak align:4 +__dt__26JPANode<15JPABaseParticle>Fv = .text:0x8028097C; // type:function size:0x3C scope:weak align:4 +__ct__26JPANode<15JPABaseParticle>Fv = .text:0x802809B8; // type:function size:0x10 scope:weak align:4 +__dt__25JSUList<14JPABaseEmitter>Fv = .text:0x802809C8; // type:function size:0x54 scope:weak align:4 +__dt__14JPABaseEmitterFv = .text:0x80280A1C; // type:function size:0x60 scope:weak align:4 +__ct__14JPABaseEmitterFv = .text:0x80280A7C; // type:function size:0x58 scope:weak align:4 __dt__18JPAEmitterCallBackFv = .text:0x80280AD4; // type:function size:0x48 scope:global align:4 init__14JPABaseEmitterFP17JPAEmitterManagerP11JPAResource = .text:0x80280B1C; // type:function size:0x354 scope:global align:4 createParticle__14JPABaseEmitterFv = .text:0x80280E70; // type:function size:0x120 scope:global align:4 @@ -10861,8 +10859,8 @@ __ct__Q37JStudio3ctb6TParseFPQ37JStudio3ctb8TControl = .text:0x8028378C; // type __dt__Q37JStudio3ctb6TParseFv = .text:0x802837AC; // type:function size:0x60 scope:global align:4 parseHeader_next__Q37JStudio3ctb6TParseFPPCvPUlUl = .text:0x8028380C; // type:function size:0x94 scope:global align:4 parseBlock_next__Q37JStudio3ctb6TParseFPPCvPUlUl = .text:0x802838A0; // type:function size:0xE4 scope:global align:4 -__dt__Q37JStudio3ctb14TObject_TxyzRyFv = .text:0x80283984; // type:function size:0x60 scope:global align:4 -find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x802839E4; // type:function size:0x94 scope:global align:4 +__dt__Q37JStudio3ctb14TObject_TxyzRyFv = .text:0x80283984; // type:function size:0x60 scope:weak align:4 +find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x802839E4; // type:function size:0x94 scope:weak align:4 toFunction_outside__Q27JStudio14TFunctionValueFi = .text:0x80283A78; // type:function size:0x48 scope:global align:4 __ct__Q27JStudio14TFunctionValueFv = .text:0x80283AC0; // type:function size:0x10 scope:global align:4 __dt__Q27JStudio14TFunctionValueFv = .text:0x80283AD0; // type:function size:0x48 scope:global align:4 @@ -10929,31 +10927,31 @@ data_set__Q27JStudio22TFunctionValue_hermiteFPCfUlUl = .text:0x8028579C; // type initialize__Q27JStudio22TFunctionValue_hermiteFv = .text:0x802857EC; // type:function size:0x6C scope:global align:4 prepare__Q27JStudio22TFunctionValue_hermiteFv = .text:0x80285858; // type:function size:0x24 scope:global align:4 getValue__Q27JStudio22TFunctionValue_hermiteFd = .text:0x8028587C; // type:function size:0x124 scope:global align:4 -extrapolateParameter_raw__Q27JStudio13functionvalueFdd = .text:0x802859A0; // type:function size:0x4 scope:global align:4 -extrapolateParameter_repeat__Q27JStudio13functionvalueFdd = .text:0x802859A4; // type:function size:0x3C scope:global align:4 -extrapolateParameter_clamp__Q27JStudio13functionvalueFdd = .text:0x802859E0; // type:function size:0x2C scope:global align:4 -findUpperBound_binary_current__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCd = .text:0x80285A0C; // type:function size:0x58 scope:global align:4 -findUpperBound_binary_current>__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80285A64; // type:function size:0x224 scope:global align:4 -findUpperBound_binary_current__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCd = .text:0x80285C88; // type:function size:0x70 scope:global align:4 -findUpperBound_binary_current>__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x80285CF8; // type:function size:0x2FC scope:global align:4 -__dt__Q27JStudio22TFunctionValue_hermiteFv = .text:0x80285FF4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio29TFunctionValue_list_parameterFv = .text:0x80286054; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio19TFunctionValue_listFv = .text:0x802860B4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio25TFunctionValue_transitionFv = .text:0x80286114; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio23TFunctionValue_constantFv = .text:0x80286174; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio24TFunctionValue_compositeFv = .text:0x802861D4; // type:function size:0x80 scope:global align:4 -upper_bound>__3stdFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80286254; // type:function size:0x94 scope:global align:4 -upper_bound>__3stdFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x802862E8; // type:function size:0xC8 scope:global align:4 +extrapolateParameter_raw__Q27JStudio13functionvalueFdd = .text:0x802859A0; // type:function size:0x4 scope:weak align:4 +extrapolateParameter_repeat__Q27JStudio13functionvalueFdd = .text:0x802859A4; // type:function size:0x3C scope:weak align:4 +extrapolateParameter_clamp__Q27JStudio13functionvalueFdd = .text:0x802859E0; // type:function size:0x2C scope:weak align:4 +findUpperBound_binary_current__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCd = .text:0x80285A0C; // type:function size:0x58 scope:local align:4 +findUpperBound_binary_current>__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80285A64; // type:function size:0x224 scope:local align:4 +findUpperBound_binary_current__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCd = .text:0x80285C88; // type:function size:0x70 scope:local align:4 +findUpperBound_binary_current>__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x80285CF8; // type:function size:0x2FC scope:local align:4 +__dt__Q27JStudio22TFunctionValue_hermiteFv = .text:0x80285FF4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio29TFunctionValue_list_parameterFv = .text:0x80286054; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio19TFunctionValue_listFv = .text:0x802860B4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio25TFunctionValue_transitionFv = .text:0x80286114; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio23TFunctionValue_constantFv = .text:0x80286174; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio24TFunctionValue_compositeFv = .text:0x802861D4; // type:function size:0x80 scope:weak align:4 +upper_bound>__3stdFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80286254; // type:function size:0x94 scope:weak align:4 +upper_bound>__3stdFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x802862E8; // type:function size:0xC8 scope:weak align:4 __dt__Q37JStudio3fvb7TObjectFv = .text:0x802863B0; // type:function size:0x48 scope:global align:4 prepare__Q37JStudio3fvb7TObjectFRCQ47JStudio3fvb4data13TParse_TBlockPQ37JStudio3fvb8TControl = .text:0x802863F8; // type:function size:0x224 scope:global align:4 -getCompositeData_raw___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x8028661C; // type:function size:0xC scope:global align:4 -getCompositeData_index___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80286628; // type:function size:0xC scope:global align:4 -getCompositeData_parameter___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80286634; // type:function size:0xC scope:global align:4 -getCompositeData_add___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80286640; // type:function size:0xC scope:global align:4 -getCompositeData_subtract___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x8028664C; // type:function size:0xC scope:global align:4 -getCompositeData_multiply___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80286658; // type:function size:0xC scope:global align:4 -getCompositeData_divide___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80286664; // type:function size:0xC scope:global align:4 -getCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@FQ47JStudio3fvb4data11TEComposite = .text:0x80286670; // type:function size:0x14 scope:global align:4 +getCompositeData_raw___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x8028661C; // type:function size:0xC scope:local align:4 +getCompositeData_index___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80286628; // type:function size:0xC scope:local align:4 +getCompositeData_parameter___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80286634; // type:function size:0xC scope:local align:4 +getCompositeData_add___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80286640; // type:function size:0xC scope:local align:4 +getCompositeData_subtract___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x8028664C; // type:function size:0xC scope:local align:4 +getCompositeData_multiply___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80286658; // type:function size:0xC scope:local align:4 +getCompositeData_divide___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80286664; // type:function size:0xC scope:local align:4 +getCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@FQ47JStudio3fvb4data11TEComposite = .text:0x80286670; // type:function size:0x14 scope:local align:4 __ct__Q37JStudio3fvb17TObject_compositeFRCQ47JStudio3fvb4data13TParse_TBlock = .text:0x80286684; // type:function size:0x80 scope:global align:4 prepare_data___Q37JStudio3fvb17TObject_compositeFRCQ57JStudio3fvb4data17TParse_TParagraph5TDataPQ37JStudio3fvb8TControl = .text:0x80286704; // type:function size:0x64 scope:global align:4 __ct__Q37JStudio3fvb16TObject_constantFRCQ47JStudio3fvb4data13TParse_TBlock = .text:0x80286768; // type:function size:0x80 scope:global align:4 @@ -10981,13 +10979,13 @@ __ct__Q37JStudio3fvb6TParseFPQ37JStudio3fvb8TControl = .text:0x80286F0C; // type __dt__Q37JStudio3fvb6TParseFv = .text:0x80286F2C; // type:function size:0x60 scope:global align:4 parseHeader_next__Q37JStudio3fvb6TParseFPPCvPUlUl = .text:0x80286F8C; // type:function size:0x94 scope:global align:4 parseBlock_next__Q37JStudio3fvb6TParseFPPCvPUlUl = .text:0x80287020; // type:function size:0xF4 scope:global align:4 -__dt__Q37JStudio3fvb15TObject_hermiteFv = .text:0x80287114; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb22TObject_list_parameterFv = .text:0x80287198; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb12TObject_listFv = .text:0x8028721C; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb18TObject_transitionFv = .text:0x802872A0; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb16TObject_constantFv = .text:0x80287324; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb17TObject_compositeFv = .text:0x802873A8; // type:function size:0xA0 scope:global align:4 -find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x80287448; // type:function size:0x94 scope:global align:4 +__dt__Q37JStudio3fvb15TObject_hermiteFv = .text:0x80287114; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb22TObject_list_parameterFv = .text:0x80287198; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb12TObject_listFv = .text:0x8028721C; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb18TObject_transitionFv = .text:0x802872A0; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb16TObject_constantFv = .text:0x80287324; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb17TObject_compositeFv = .text:0x802873A8; // type:function size:0xA0 scope:weak align:4 +find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x80287448; // type:function size:0x94 scope:weak align:4 getData__Q47JStudio3fvb4data17TParse_TParagraphCFPQ57JStudio3fvb4data17TParse_TParagraph5TData = .text:0x802874DC; // type:function size:0x68 scope:global align:4 __ct__Q27JStudio8TControlFv = .text:0x80287544; // type:function size:0x98 scope:global align:4 __dt__Q27JStudio8TControlFv = .text:0x802875DC; // type:function size:0x7C scope:global align:4 @@ -11066,25 +11064,25 @@ do_paragraph__Q27JStudio16TObject_particleFUlPCvUl = .text:0x80289BD8; // type:f __dt__Q27JStudio14TAdaptor_soundFv = .text:0x80289F6C; // type:function size:0x60 scope:global align:4 __ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound = .text:0x80289FCC; // type:function size:0x3C scope:global align:4 do_paragraph__Q27JStudio13TObject_soundFUlPCvUl = .text:0x8028A008; // type:function size:0x32C scope:global align:4 -__dt__Q27JStudio13TObject_soundFv = .text:0x8028A334; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio16TObject_particleFv = .text:0x8028A394; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio15TObject_messageFv = .text:0x8028A3F4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio13TObject_lightFv = .text:0x8028A454; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio11TObject_fogFv = .text:0x8028A4B4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio14TObject_cameraFv = .text:0x8028A514; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio20TObject_ambientLightFv = .text:0x8028A574; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio13TObject_actorFv = .text:0x8028A5D4; // type:function size:0x60 scope:global align:4 +__dt__Q27JStudio13TObject_soundFv = .text:0x8028A334; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio16TObject_particleFv = .text:0x8028A394; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio15TObject_messageFv = .text:0x8028A3F4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio13TObject_lightFv = .text:0x8028A454; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio11TObject_fogFv = .text:0x8028A4B4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio14TObject_cameraFv = .text:0x8028A514; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio20TObject_ambientLightFv = .text:0x8028A574; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio13TObject_actorFv = .text:0x8028A5D4; // type:function size:0x60 scope:weak align:4 __sinit_jstudio-object_cpp = .text:0x8028A634; // type:function size:0x3D8 scope:local align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028AA0C; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_Fv = .text:0x8028AA6C; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028AACC; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_Fv = .text:0x8028AB2C; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028AB8C; // type:function size:0x60 scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028ABEC; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028AC48; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028ACA4; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028AD00; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028AD5C; // type:function size:0x5C scope:global align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028AA0C; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_Fv = .text:0x8028AA6C; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028AACC; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_Fv = .text:0x8028AB2C; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028AB8C; // type:function size:0x60 scope:local align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028ABEC; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028AC48; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028ACA4; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028AD00; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028AD5C; // type:function size:0x5C scope:weak align:4 isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData = .text:0x8028ADB8; // type:function size:0xF0 scope:global align:4 __ct__Q37JStudio3stb7TObjectFUlPCvUl = .text:0x8028AEA8; // type:function size:0x48 scope:global align:4 __ct__Q37JStudio3stb7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x8028AEF0; // type:function size:0x70 scope:global align:4 @@ -11101,7 +11099,7 @@ process_sequence___Q37JStudio3stb7TObjectFv = .text:0x8028B25C; // type:function process_paragraph_reserved___Q37JStudio3stb7TObjectFUlPCvUl = .text:0x8028B3B0; // type:function size:0xE8 scope:global align:4 __ct__Q37JStudio3stb15TObject_controlFPCvUl = .text:0x8028B498; // type:function size:0x4C scope:global align:4 __ct__Q37JStudio3stb8TControlFv = .text:0x8028B4E4; // type:function size:0x80 scope:global align:4 -__dt__Q37JStudio3stb15TObject_controlFv = .text:0x8028B564; // type:function size:0x60 scope:global align:4 +__dt__Q37JStudio3stb15TObject_controlFv = .text:0x8028B564; // type:function size:0x60 scope:weak align:4 __dt__Q37JStudio3stb8TControlFv = .text:0x8028B5C4; // type:function size:0x94 scope:global align:4 appendObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject = .text:0x8028B658; // type:function size:0x50 scope:global align:4 removeObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject = .text:0x8028B6A8; // type:function size:0x38 scope:global align:4 @@ -11120,17 +11118,17 @@ parseBlock_next__Q37JStudio3stb6TParseFPPCvPUlUl = .text:0x8028BBBC; // type:fun parseHeader__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data14TParse_THeaderUl = .text:0x8028BC10; // type:function size:0x8 scope:global align:4 parseBlock_block__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl = .text:0x8028BC18; // type:function size:0x38 scope:global align:4 parseBlock_object__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data20TParse_TBlock_objectUl = .text:0x8028BC50; // type:function size:0x108 scope:global align:4 -find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x8028BD58; // type:function size:0x94 scope:global align:4 +find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x8028BD58; // type:function size:0x94 scope:weak align:4 getData__Q47JStudio3stb4data16TParse_TSequenceCFPQ57JStudio3stb4data16TParse_TSequence5TData = .text:0x8028BDEC; // type:function size:0x4C scope:global align:4 getData__Q47JStudio3stb4data17TParse_TParagraphCFPQ57JStudio3stb4data17TParse_TParagraph5TData = .text:0x8028BE38; // type:function size:0x78 scope:global align:4 getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData = .text:0x8028BEB0; // type:function size:0x80 scope:global align:4 __dt__Q214JStudio_JStage13TCreateObjectFv = .text:0x8028BF30; // type:function size:0x60 scope:global align:4 create__Q214JStudio_JStage13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x8028BF90; // type:function size:0x184 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028C114; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028C218; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028C31C; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028C420; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028C524; // type:function size:0x104 scope:global align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028C114; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028C218; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028C31C; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028C420; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028C524; // type:function size:0x104 scope:weak align:4 transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl = .text:0x8028C628; // type:function size:0x98 scope:global align:4 transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl = .text:0x8028C6C0; // type:function size:0x98 scope:global align:4 transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl = .text:0x8028C758; // type:function size:0xA4 scope:global align:4 @@ -11162,11 +11160,11 @@ setJSG_ID___Q214JStudio_JStage14TAdaptor_actorFMQ26JStage6TActorFPCvPvUl_vQ37JSt setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl = .text:0x8028D168; // type:function size:0x194 scope:global align:4 getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl = .text:0x8028D2FC; // type:function size:0x198 scope:global align:4 __cl__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_CFfPQ27JStudio8TAdaptor = .text:0x8028D494; // type:function size:0xD4 scope:global align:4 -__dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv = .text:0x8028D568; // type:function size:0x60 scope:global align:4 +__dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv = .text:0x8028D568; // type:function size:0x60 scope:weak align:4 __sinit_object-actor_cpp = .text:0x8028D5C8; // type:function size:0x3D0 scope:local align:4 -__ct__Q27JStudio14TVariableValueFv = .text:0x8028D998; // type:function size:0x18 scope:global align:4 -__dt__Q214JStudio_JStage81TVariableValueOutput_object_Fv = .text:0x8028D9B0; // type:function size:0x60 scope:global align:4 -__cl__Q214JStudio_JStage81TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028DA10; // type:function size:0x30 scope:global align:4 +__ct__Q27JStudio14TVariableValueFv = .text:0x8028D998; // type:function size:0x18 scope:weak align:4 +__dt__Q214JStudio_JStage81TVariableValueOutput_object_Fv = .text:0x8028D9B0; // type:function size:0x60 scope:weak align:4 +__cl__Q214JStudio_JStage81TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028DA10; // type:function size:0x30 scope:weak align:4 __ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight = .text:0x8028DA40; // type:function size:0x9C scope:global align:4 __dt__Q214JStudio_JStage21TAdaptor_ambientLightFv = .text:0x8028DADC; // type:function size:0x74 scope:global align:4 adaptor_do_prepare__Q214JStudio_JStage21TAdaptor_ambientLightFv = .text:0x8028DB50; // type:function size:0x4 scope:global align:4 @@ -11193,8 +11191,8 @@ getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl = .t setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl = .text:0x8028E3EC; // type:function size:0xE0 scope:global align:4 getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl = .text:0x8028E4CC; // type:function size:0xE4 scope:global align:4 __sinit_object-camera_cpp = .text:0x8028E5B0; // type:function size:0x364 scope:local align:4 -__dt__Q214JStudio_JStage83TVariableValueOutput_object_Fv = .text:0x8028E914; // type:function size:0x60 scope:global align:4 -__cl__Q214JStudio_JStage83TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028E974; // type:function size:0x30 scope:global align:4 +__dt__Q214JStudio_JStage83TVariableValueOutput_object_Fv = .text:0x8028E914; // type:function size:0x60 scope:weak align:4 +__cl__Q214JStudio_JStage83TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028E974; // type:function size:0x30 scope:weak align:4 __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog = .text:0x8028E9A4; // type:function size:0x9C scope:global align:4 __dt__Q214JStudio_JStage12TAdaptor_fogFv = .text:0x8028EA40; // type:function size:0x74 scope:global align:4 adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv = .text:0x8028EAB4; // type:function size:0x48 scope:global align:4 @@ -11203,8 +11201,8 @@ adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv = .text:0x8028EBE4; // type:f adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl = .text:0x8028EC38; // type:function size:0x78 scope:global align:4 adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl = .text:0x8028ECB0; // type:function size:0x24 scope:global align:4 __sinit_object-fog_cpp = .text:0x8028ECD4; // type:function size:0x21C scope:local align:4 -__dt__Q214JStudio_JStage77TVariableValueOutput_object_Fv = .text:0x8028EEF0; // type:function size:0x60 scope:global align:4 -__cl__Q214JStudio_JStage77TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028EF50; // type:function size:0x30 scope:global align:4 +__dt__Q214JStudio_JStage77TVariableValueOutput_object_Fv = .text:0x8028EEF0; // type:function size:0x60 scope:weak align:4 +__cl__Q214JStudio_JStage77TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028EF50; // type:function size:0x30 scope:weak align:4 __ct__Q214JStudio_JStage14TAdaptor_lightFPCQ26JStage7TSystemPQ26JStage6TLight = .text:0x8028EF80; // type:function size:0xA4 scope:global align:4 __dt__Q214JStudio_JStage14TAdaptor_lightFv = .text:0x8028F024; // type:function size:0x74 scope:global align:4 adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv = .text:0x8028F098; // type:function size:0x48 scope:global align:4 @@ -11215,16 +11213,16 @@ adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl = .text:0x8028F5B adaptor_do_FACULTY__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl = .text:0x8028F5E0; // type:function size:0x78 scope:global align:4 adaptor_do_ENABLE__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl = .text:0x8028F658; // type:function size:0x24 scope:global align:4 __cl__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_CFfPQ27JStudio8TAdaptor = .text:0x8028F67C; // type:function size:0xC scope:global align:4 -__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv = .text:0x8028F688; // type:function size:0x60 scope:global align:4 +__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv = .text:0x8028F688; // type:function size:0x60 scope:weak align:4 __sinit_object-light_cpp = .text:0x8028F6E8; // type:function size:0x298 scope:local align:4 __dt__Q215JStudio_JAudio213TCreateObjectFv = .text:0x8028F980; // type:function size:0x60 scope:global align:4 create__Q215JStudio_JAudio213TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x8028F9E0; // type:function size:0x74 scope:global align:4 createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject = .text:0x8028FA54; // type:function size:0x104 scope:global align:4 -setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028FB58; // type:function size:0x28 scope:global align:4 -setValue_PAN___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028FB80; // type:function size:0x28 scope:global align:4 -setValue_PITCH___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028FBA8; // type:function size:0x28 scope:global align:4 -setValue_TEMPO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028FBD0; // type:function size:0x60 scope:global align:4 -setValue_ECHO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028FC30; // type:function size:0x28 scope:global align:4 +setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028FB58; // type:function size:0x28 scope:local align:4 +setValue_PAN___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028FB80; // type:function size:0x28 scope:local align:4 +setValue_PITCH___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028FBA8; // type:function size:0x28 scope:local align:4 +setValue_TEMPO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028FBD0; // type:function size:0x60 scope:local align:4 +setValue_ECHO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028FC30; // type:function size:0x28 scope:local align:4 __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject = .text:0x8028FC58; // type:function size:0xCC scope:global align:4 __dt__Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x8028FD24; // type:function size:0xB0 scope:global align:4 adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x8028FDD4; // type:function size:0xD0 scope:global align:4 @@ -11246,7 +11244,7 @@ __cl__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x80290334; // type:function size:0xA0 scope:global align:4 beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x802903D4; // type:function size:0xB0 scope:global align:4 endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl = .text:0x80290484; // type:function size:0x40 scope:global align:4 -__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv = .text:0x802904C4; // type:function size:0x60 scope:global align:4 +__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv = .text:0x802904C4; // type:function size:0x60 scope:weak align:4 __sinit_object-sound_cpp = .text:0x80290524; // type:function size:0x2AC scope:local align:4 __dt__Q217JStudio_JParticle13TCreateObjectFv = .text:0x802907D0; // type:function size:0x60 scope:global align:4 create__Q217JStudio_JParticle13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x80290830; // type:function size:0x74 scope:global align:4 @@ -11254,7 +11252,7 @@ emitter_create__Q217JStudio_JParticle13TCreateObjectFUl = .text:0x802908A4; // t emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter = .text:0x80290914; // type:function size:0x24 scope:global align:4 createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject = .text:0x80290938; // type:function size:0x104 scope:global align:4 __ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject = .text:0x80290A3C; // type:function size:0xF4 scope:global align:4 -__dt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_Fv = .text:0x80290B30; // type:function size:0x60 scope:global align:4 +__dt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_Fv = .text:0x80290B30; // type:function size:0x60 scope:weak align:4 __dt__Q217JStudio_JParticle17TAdaptor_particleFv = .text:0x80290B90; // type:function size:0xF0 scope:global align:4 adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv = .text:0x80290C80; // type:function size:0x12C scope:global align:4 adaptor_do_end__Q217JStudio_JParticle17TAdaptor_particleFv = .text:0x80290DAC; // type:function size:0x4 scope:global align:4 @@ -11316,11 +11314,11 @@ getCommandHeap__9JASKernelFv = .text:0x80292EF8; // type:function size:0x8 scope setupAramHeap__9JASKernelFUlUl = .text:0x80292F00; // type:function size:0x38 scope:global align:4 getAramHeap__9JASKernelFv = .text:0x80292F38; // type:function size:0xC scope:global align:4 __sinit_JASHeapCtrl_cpp = .text:0x80292F44; // type:function size:0x40 scope:local align:4 -__dt__7JASHeapFv = .text:0x80292F84; // type:function size:0x78 scope:global align:4 -onDispose__11JASDisposerFv = .text:0x80292FFC; // type:function size:0x4 scope:global align:4 +__dt__7JASHeapFv = .text:0x80292F84; // type:function size:0x78 scope:weak align:4 +onDispose__11JASDisposerFv = .text:0x80292FFC; // type:function size:0x4 scope:weak align:4 getResSize__15JASResArcLoaderFPC10JKRArchiveUs = .text:0x80293000; // type:function size:0x34 scope:global align:4 getResMaxSize__15JASResArcLoaderFPC10JKRArchive = .text:0x80293034; // type:function size:0x78 scope:global align:4 -loadResourceCallback__15JASResArcLoaderFPv = .text:0x802930AC; // type:function size:0x9C scope:global align:4 +loadResourceCallback__15JASResArcLoaderFPv = .text:0x802930AC; // type:function size:0x9C scope:local align:4 loadResourceAsync__15JASResArcLoaderFP10JKRArchiveUsPUcUlPFUlUl_vUl = .text:0x80293148; // type:function size:0x5C scope:global align:4 start__8JASProbeFPCc = .text:0x802931A4; // type:function size:0x50 scope:global align:4 stop__8JASProbeFv = .text:0x802931F4; // type:function size:0x120 scope:global align:4 @@ -11331,7 +11329,7 @@ execAllCommand__10JASPortCmdFv = .text:0x80293490; // type:function size:0x34 sc execCommandOnce__Q210JASPortCmd9TPortHeadFv = .text:0x802934C4; // type:function size:0x78 scope:global align:4 execCommandStay__Q210JASPortCmd9TPortHeadFv = .text:0x8029353C; // type:function size:0x60 scope:global align:4 __sinit_JASCmdStack_cpp = .text:0x8029359C; // type:function size:0x64 scope:local align:4 -__dt__Q210JASPortCmd9TPortHeadFv = .text:0x80293600; // type:function size:0x58 scope:global align:4 +__dt__Q210JASPortCmd9TPortHeadFv = .text:0x80293600; // type:function size:0x58 scope:weak align:4 __ct__8JASTrackFv = .text:0x80293658; // type:function size:0xF4 scope:global align:4 __dt__8JASTrackFv = .text:0x8029374C; // type:function size:0x128 scope:global align:4 setChannelMgrCount__8JASTrackFUl = .text:0x80293874; // type:function size:0x190 scope:global align:4 @@ -11422,7 +11420,7 @@ findIntr__10JASSeqCtrlFv = .text:0x80295F58; // type:function size:0x50 scope:gl checkIntr__10JASSeqCtrlFv = .text:0x80295FA8; // type:function size:0x70 scope:global align:4 timerProcess__10JASSeqCtrlFv = .text:0x80296018; // type:function size:0x84 scope:global align:4 __sinit_JASSeqCtrl_cpp = .text:0x8029609C; // type:function size:0x40 scope:local align:4 -__dt__12JASSeqParserFv = .text:0x802960DC; // type:function size:0x48 scope:global align:4 +__dt__12JASSeqParserFv = .text:0x802960DC; // type:function size:0x48 scope:weak align:4 conditionCheck__12JASSeqParserFP8JASTrackQ212JASSeqParser15BranchCondition = .text:0x80296124; // type:function size:0xD0 scope:global align:4 writeReg__12JASSeqParserFP8JASTrackUlUl = .text:0x802961F4; // type:function size:0x204 scope:global align:4 readReg__12JASSeqParserCFP8JASTrackUl = .text:0x802963F8; // type:function size:0x1C0 scope:global align:4 @@ -11522,7 +11520,7 @@ updateChannel__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannel = .text:0x8029 channelProc__13JASAramStreamFv = .text:0x802998DC; // type:function size:0x1AC scope:global align:4 channelStart__13JASAramStreamFv = .text:0x80299A88; // type:function size:0x218 scope:global align:4 channelStop__13JASAramStreamFUs = .text:0x80299CA0; // type:function size:0x6C scope:global align:4 -__dt__38JASMemPool_MultiThreaded<10JASChannel>Fv = .text:0x80299D0C; // type:function size:0x54 scope:global align:4 +__dt__38JASMemPool_MultiThreaded<10JASChannel>Fv = .text:0x80299D0C; // type:function size:0x54 scope:weak align:4 noteOn__7JASBankFPC7JASBankiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv = .text:0x80299D60; // type:function size:0x310 scope:global align:4 noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv = .text:0x8029A070; // type:function size:0x138 scope:global align:4 __ct__12JASBasicBankFv = .text:0x8029A1A8; // type:function size:0x2C scope:global align:4 @@ -11530,9 +11528,9 @@ newInstTable__12JASBasicBankFUcP7JKRHeap = .text:0x8029A1D4; // type:function si getInstParam__12JASBasicBankCFiiiP12JASInstParam = .text:0x8029A230; // type:function size:0x68 scope:global align:4 setInst__12JASBasicBankFiP7JASInst = .text:0x8029A298; // type:function size:0x18 scope:global align:4 getInst__12JASBasicBankCFi = .text:0x8029A2B0; // type:function size:0x44 scope:global align:4 -__dt__7JASBankFv = .text:0x8029A2F4; // type:function size:0x48 scope:global align:4 -__dt__12JASBasicBankFv = .text:0x8029A33C; // type:function size:0x5C scope:global align:4 -getType__12JASBasicBankCFv = .text:0x8029A398; // type:function size:0xC scope:global align:4 +__dt__7JASBankFv = .text:0x8029A2F4; // type:function size:0x48 scope:weak align:4 +__dt__12JASBasicBankFv = .text:0x8029A33C; // type:function size:0x5C scope:weak align:4 +getType__12JASBasicBankCFv = .text:0x8029A398; // type:function size:0xC scope:weak align:4 getInstParam__12JASVoiceBankCFiiiP12JASInstParam = .text:0x8029A3A4; // type:function size:0x38 scope:global align:4 __dt__12JASVoiceBankFv = .text:0x8029A3DC; // type:function size:0x5C scope:global align:4 getType__12JASVoiceBankCFv = .text:0x8029A438; // type:function size:0xC scope:global align:4 @@ -11543,9 +11541,9 @@ setKeyRegionCount__12JASBasicInstFUlP7JKRHeap = .text:0x8029A5CC; // type:functi setOsc__12JASBasicInstFiPCQ213JASOscillator4Data = .text:0x8029A64C; // type:function size:0x10 scope:global align:4 getKeyRegion__12JASBasicInstFi = .text:0x8029A65C; // type:function size:0x24 scope:global align:4 __dt__Q212JASBasicInst7TKeymapFv = .text:0x8029A680; // type:function size:0x3C scope:global align:4 -__dt__7JASInstFv = .text:0x8029A6BC; // type:function size:0x48 scope:global align:4 -__ct__Q212JASBasicInst7TKeymapFv = .text:0x8029A704; // type:function size:0xC scope:global align:4 -getType__12JASBasicInstCFv = .text:0x8029A710; // type:function size:0xC scope:global align:4 +__dt__7JASInstFv = .text:0x8029A6BC; // type:function size:0x48 scope:weak align:4 +__ct__Q212JASBasicInst7TKeymapFv = .text:0x8029A704; // type:function size:0xC scope:weak align:4 +getType__12JASBasicInstCFv = .text:0x8029A710; // type:function size:0xC scope:weak align:4 __ct__10JASDrumSetFv = .text:0x8029A71C; // type:function size:0x28 scope:global align:4 __dt__10JASDrumSetFv = .text:0x8029A744; // type:function size:0x5C scope:global align:4 newPercArray__10JASDrumSetFUcP7JKRHeap = .text:0x8029A7A0; // type:function size:0x5C scope:global align:4 @@ -11556,7 +11554,7 @@ setRelease__Q210JASDrumSet5TPercFUl = .text:0x8029A914; // type:function size:0x getType__10JASDrumSetCFv = .text:0x8029A91C; // type:function size:0xC scope:global align:4 __ct__16JASBasicWaveBankFv = .text:0x8029A928; // type:function size:0x60 scope:global align:4 __dt__16JASBasicWaveBankFv = .text:0x8029A988; // type:function size:0x8C scope:global align:4 -__dt__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x8029AA14; // type:function size:0x5C scope:global align:4 +__dt__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x8029AA14; // type:function size:0x5C scope:weak align:4 getWaveGroup__16JASBasicWaveBankFUl = .text:0x8029AA70; // type:function size:0x24 scope:global align:4 setGroupCount__16JASBasicWaveBankFUlP7JKRHeap = .text:0x8029AA94; // type:function size:0xAC scope:global align:4 setWaveTableSize__16JASBasicWaveBankFUlP7JKRHeap = .text:0x8029AB40; // type:function size:0x80 scope:global align:4 @@ -11571,16 +11569,16 @@ onLoadDone__Q216JASBasicWaveBank10TWaveGroupFv = .text:0x8029AF34; // type:funct onEraseDone__Q216JASBasicWaveBank10TWaveGroupFv = .text:0x8029AF5C; // type:function size:0x28 scope:global align:4 getWaveID__Q216JASBasicWaveBank10TWaveGroupCFi = .text:0x8029AF84; // type:function size:0x10 scope:global align:4 getWavePtr__Q216JASBasicWaveBank11TWaveHandleCFv = .text:0x8029AF94; // type:function size:0x24 scope:global align:4 -__dt__11JASWaveBankFv = .text:0x8029AFB8; // type:function size:0x48 scope:global align:4 -__dt__13JASWaveHandleFv = .text:0x8029B000; // type:function size:0x48 scope:global align:4 -__ct__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x8029B048; // type:function size:0x34 scope:global align:4 -__ct__Q216JASBasicWaveBank14TGroupWaveInfoFv = .text:0x8029B07C; // type:function size:0x18 scope:global align:4 -getWaveInfo__Q216JASBasicWaveBank11TWaveHandleCFv = .text:0x8029B094; // type:function size:0x8 scope:global align:4 -getWaveArc__16JASBasicWaveBankFUl = .text:0x8029B09C; // type:function size:0x20 scope:global align:4 -getArcCount__16JASBasicWaveBankCFv = .text:0x8029B0BC; // type:function size:0x8 scope:global align:4 +__dt__11JASWaveBankFv = .text:0x8029AFB8; // type:function size:0x48 scope:weak align:4 +__dt__13JASWaveHandleFv = .text:0x8029B000; // type:function size:0x48 scope:weak align:4 +__ct__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x8029B048; // type:function size:0x34 scope:weak align:4 +__ct__Q216JASBasicWaveBank14TGroupWaveInfoFv = .text:0x8029B07C; // type:function size:0x18 scope:weak align:4 +getWaveInfo__Q216JASBasicWaveBank11TWaveHandleCFv = .text:0x8029B094; // type:function size:0x8 scope:weak align:4 +getWaveArc__16JASBasicWaveBankFUl = .text:0x8029B09C; // type:function size:0x20 scope:weak align:4 +getArcCount__16JASBasicWaveBankCFv = .text:0x8029B0BC; // type:function size:0x8 scope:weak align:4 __ct__17JASSimpleWaveBankFv = .text:0x8029B0C4; // type:function size:0x60 scope:global align:4 __dt__17JASSimpleWaveBankFv = .text:0x8029B124; // type:function size:0x90 scope:global align:4 -__dt__Q217JASSimpleWaveBank11TWaveHandleFv = .text:0x8029B1B4; // type:function size:0x5C scope:global align:4 +__dt__Q217JASSimpleWaveBank11TWaveHandleFv = .text:0x8029B1B4; // type:function size:0x5C scope:weak align:4 setWaveTableSize__17JASSimpleWaveBankFUlP7JKRHeap = .text:0x8029B210; // type:function size:0x80 scope:global align:4 getWaveHandle__17JASSimpleWaveBankCFUl = .text:0x8029B290; // type:function size:0x24 scope:global align:4 setWaveInfo__17JASSimpleWaveBankFUlRC11JASWaveInfo = .text:0x8029B2B4; // type:function size:0x94 scope:global align:4 @@ -11589,20 +11587,20 @@ getWavePtr__Q217JASSimpleWaveBank11TWaveHandleCFv = .text:0x8029B368; // type:fu __ct__Q217JASSimpleWaveBank11TWaveHandleFv = .text:0x8029B38C; // type:function size:0x34 scope:global align:4 getWaveInfo__Q217JASSimpleWaveBank11TWaveHandleCFv = .text:0x8029B3C0; // type:function size:0x8 scope:global align:4 getArcCount__17JASSimpleWaveBankCFv = .text:0x8029B3C8; // type:function size:0x8 scope:global align:4 -onLoadDone__10JASWaveArcFv = .text:0x8029B3D0; // type:function size:0x4 scope:global align:4 -onEraseDone__10JASWaveArcFv = .text:0x8029B3D4; // type:function size:0x4 scope:global align:4 -@4@__dt__17JASSimpleWaveBankFv = .text:0x8029B3D8; // type:function size:0x8 scope:local align:4 +onLoadDone__10JASWaveArcFv = .text:0x8029B3D0; // type:function size:0x4 scope:weak align:4 +onEraseDone__10JASWaveArcFv = .text:0x8029B3D4; // type:function size:0x4 scope:weak align:4 +@4@__dt__17JASSimpleWaveBankFv = .text:0x8029B3D8; // type:function size:0x8 scope:weak align:4 getGroupCount__11JASWSParserFPCv = .text:0x8029B3E0; // type:function size:0x28 scope:global align:4 createWaveBank__11JASWSParserFPCvP7JKRHeap = .text:0x8029B408; // type:function size:0x5C scope:global align:4 createBasicWaveBank__11JASWSParserFPCvP7JKRHeap = .text:0x8029B464; // type:function size:0x230 scope:global align:4 createSimpleWaveBank__11JASWSParserFPCvP7JKRHeap = .text:0x8029B694; // type:function size:0x22C scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B8C0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B8D8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B8F0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B908; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B920; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B938; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B950; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B8C0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B8D8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B8F0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B908; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B920; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B938; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029B950; // type:function size:0x18 scope:weak align:4 createBank__12JASBNKParserFPCvP7JKRHeap = .text:0x8029B968; // type:function size:0x20 scope:global align:4 createBasicBank__12JASBNKParserFPCvP7JKRHeap = .text:0x8029B988; // type:function size:0xA8 scope:global align:4 findChunk__Q212JASBNKParser4Ver1FPCvUl = .text:0x8029BA30; // type:function size:0x3C scope:global align:4 @@ -11610,13 +11608,13 @@ createBasicBank__Q212JASBNKParser4Ver1FPCvP7JKRHeap = .text:0x8029BA6C; // type: createBasicBank__Q212JASBNKParser4Ver0FPCvP7JKRHeap = .text:0x8029BE6C; // type:function size:0x42C scope:global align:4 findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc = .text:0x8029C298; // type:function size:0x124 scope:global align:4 getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point = .text:0x8029C3BC; // type:function size:0x14 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C3D0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C3E8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C400; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C418; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C430; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C448; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C460; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C3D0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C3E8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C400; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C418; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C430; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C448; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029C460; // type:function size:0x18 scope:weak align:4 __sinit_JASBNKParser_cpp = .text:0x8029C478; // type:function size:0x58 scope:local align:4 getRootHeap__16JASWaveArcLoaderFv = .text:0x8029C4D0; // type:function size:0x30 scope:global align:4 setCurrentDir__16JASWaveArcLoaderFPCc = .text:0x8029C500; // type:function size:0x60 scope:global align:4 @@ -11633,7 +11631,7 @@ erase__10JASWaveArcFv = .text:0x8029CA70; // type:function size:0x24 scope:globa onDispose__10JASWaveArcFv = .text:0x8029CA94; // type:function size:0x48 scope:global align:4 setEntryNum__10JASWaveArcFl = .text:0x8029CADC; // type:function size:0x60 scope:global align:4 setFileName__10JASWaveArcFPCc = .text:0x8029CB3C; // type:function size:0xAC scope:global align:4 -__dt__11JASDisposerFv = .text:0x8029CBE8; // type:function size:0x48 scope:global align:4 +__dt__11JASDisposerFv = .text:0x8029CBE8; // type:function size:0x48 scope:weak align:4 __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv = .text:0x8029CC30; // type:function size:0x118 scope:global align:4 __dt__10JASChannelFv = .text:0x8029CD48; // type:function size:0xD8 scope:global align:4 play__10JASChannelFv = .text:0x8029CE20; // type:function size:0x70 scope:global align:4 @@ -11691,7 +11689,7 @@ stop__14JASAudioThreadFv = .text:0x8029F1F0; // type:function size:0x2C scope:gl run__14JASAudioThreadFv = .text:0x8029F21C; // type:function size:0x17C scope:global align:4 DMACallback__14JASAudioThreadFv = .text:0x8029F398; // type:function size:0x54 scope:global align:4 DSPCallback__14JASAudioThreadFPv = .text:0x8029F3EC; // type:function size:0x6C scope:global align:4 -__dt__14JASAudioThreadFv = .text:0x8029F458; // type:function size:0x8C scope:global align:4 +__dt__14JASAudioThreadFv = .text:0x8029F458; // type:function size:0x8C scope:weak align:4 __ct__15JASAudioReseterFv = .text:0x8029F4E4; // type:function size:0x48 scope:global align:4 __dt__15JASAudioReseterFv = .text:0x8029F52C; // type:function size:0x3C scope:global align:4 start__15JASAudioReseterFUlb = .text:0x8029F568; // type:function size:0x9C scope:global align:4 @@ -11761,27 +11759,27 @@ subframeCallback__9JASDriverFv = .text:0x802A06D8; // type:function size:0x28 sc DSPSyncCallback__9JASDriverFv = .text:0x802A0700; // type:function size:0x28 scope:global align:4 updateDacCallback__9JASDriverFv = .text:0x802A0728; // type:function size:0x28 scope:global align:4 __sinit_JASDriverIF_cpp = .text:0x802A0750; // type:function size:0x80 scope:local align:4 -__ct__Q214JASCallbackMgr9TCallbackFv = .text:0x802A07D0; // type:function size:0x10 scope:global align:4 +__ct__Q214JASCallbackMgr9TCallbackFv = .text:0x802A07D0; // type:function size:0x10 scope:weak align:4 clamp__14JASSoundParamsFv = .text:0x802A07E0; // type:function size:0xCC scope:global align:4 combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams = .text:0x802A08AC; // type:function size:0x5C scope:global align:4 DSPReleaseHalt2__FUl = .text:0x802A0920; // type:function size:0x48 scope:global align:32 -setup_callback__FUs = .text:0x802A0980; // type:function size:0xC scope:global align:32 +setup_callback__FUs = .text:0x802A0980; // type:function size:0xC scope:local align:32 DsetupTable__FUlUlUlUlUl = .text:0x802A09A0; // type:function size:0x64 scope:global align:32 DsetMixerLevel__Ff = .text:0x802A0A20; // type:function size:0x24 scope:global align:32 DsyncFrame2ch__FUlUlUl = .text:0x802A0A60; // type:function size:0x54 scope:global align:32 DsyncFrame4ch__FUlUlUlUlUl = .text:0x802A0AC0; // type:function size:0x50 scope:global align:32 -DspHandShake__FPv = .text:0x802A0B20; // type:function size:0x38 scope:global align:32 +DspHandShake__FPv = .text:0x802A0B20; // type:function size:0x38 scope:local align:32 DspBoot__FPFPv_v = .text:0x802A0B60; // type:function size:0xAC scope:global align:32 DSPSendCommands2__FPUlUlPFUs_v = .text:0x802A0C20; // type:function size:0xE8 scope:global align:32 -DspInitWork__Fv = .text:0x802A0D20; // type:function size:0x2C scope:global align:32 -DspStartWork__FUlPFUs_v = .text:0x802A0D60; // type:function size:0x48 scope:global align:32 +DspInitWork__Fv = .text:0x802A0D20; // type:function size:0x2C scope:local align:32 +DspStartWork__FUlPFUs_v = .text:0x802A0D60; // type:function size:0x48 scope:local align:32 DspFinishWork__FUs = .text:0x802A0DC0; // type:function size:0x68 scope:global align:32 -DSPAddTask = .text:0x802A0E40; // type:function size:0x84 scope:global align:32 +DSPAddTask = .text:0x802A0E40; // type:function size:0x84 scope:weak align:32 DSPAddPriorTask__FP15STRUCT_DSP_TASK = .text:0x802A0EE0; // type:function size:0x7C scope:global align:32 __DSPHandler = .text:0x802A0F60; // type:function size:0x304 scope:global align:32 DsyncFrame2__FUlUlUl = .text:0x802A1280; // type:function size:0x50 scope:global align:32 -DsyncFrame3__FUlUlUlUlUl = .text:0x802A12E0; // type:function size:0x58 scope:global align:32 -Dsp_Update_Request__Fv = .text:0x802A1340; // type:function size:0x78 scope:global align:32 +DsyncFrame3__FUlUlUlUlUl = .text:0x802A12E0; // type:function size:0x58 scope:local align:32 +Dsp_Update_Request__Fv = .text:0x802A1340; // type:function size:0x78 scope:local align:32 Dsp_Running_Check__Fv = .text:0x802A13C0; // type:function size:0x14 scope:global align:32 Dsp_Running_Start__Fv = .text:0x802A13E0; // type:function size:0xC scope:global align:32 __dt__10JAIAudibleFv = .text:0x802A13EC; // type:function size:0x48 scope:global align:4 @@ -11803,19 +11801,19 @@ getTrack__5JAISeFv = .text:0x802A1C8C; // type:function size:0x8 scope:global al getChildTrack__5JAISeFi = .text:0x802A1C94; // type:function size:0x10 scope:global align:4 asSe__5JAISeFv = .text:0x802A1CA4; // type:function size:0x4 scope:global align:4 getTempoMgr__5JAISeFv = .text:0x802A1CA8; // type:function size:0x8 scope:global align:4 -@16@JAISound_tryDie___5JAISeFv = .text:0x802A1CB0; // type:function size:0x8 scope:local align:4 -@16@getTempoMgr__5JAISeFv = .text:0x802A1CB8; // type:function size:0x8 scope:local align:4 -@16@getChildTrack__5JAISeFi = .text:0x802A1CC0; // type:function size:0x8 scope:local align:4 -@16@getTrack__5JAISeFv = .text:0x802A1CC8; // type:function size:0x8 scope:local align:4 -@16@asSe__5JAISeFv = .text:0x802A1CD0; // type:function size:0x8 scope:local align:4 -@16@releaseChild__5JAISeFi = .text:0x802A1CD8; // type:function size:0x8 scope:local align:4 -@16@getChild__5JAISeFi = .text:0x802A1CE0; // type:function size:0x8 scope:local align:4 -@16@getNumChild__5JAISeCFv = .text:0x802A1CE8; // type:function size:0x8 scope:local align:4 +@16@JAISound_tryDie___5JAISeFv = .text:0x802A1CB0; // type:function size:0x8 scope:weak align:4 +@16@getTempoMgr__5JAISeFv = .text:0x802A1CB8; // type:function size:0x8 scope:weak align:4 +@16@getChildTrack__5JAISeFi = .text:0x802A1CC0; // type:function size:0x8 scope:weak align:4 +@16@getTrack__5JAISeFv = .text:0x802A1CC8; // type:function size:0x8 scope:weak align:4 +@16@asSe__5JAISeFv = .text:0x802A1CD0; // type:function size:0x8 scope:weak align:4 +@16@releaseChild__5JAISeFi = .text:0x802A1CD8; // type:function size:0x8 scope:weak align:4 +@16@getChild__5JAISeFi = .text:0x802A1CE0; // type:function size:0x8 scope:weak align:4 +@16@getNumChild__5JAISeCFv = .text:0x802A1CE8; // type:function size:0x8 scope:weak align:4 isUsingSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion = .text:0x802A1CF0; // type:function size:0x6C scope:global align:4 releaseSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion = .text:0x802A1D5C; // type:function size:0xA8 scope:global align:4 JAISeMgr_calc___16JAISeCategoryMgrFv = .text:0x802A1E04; // type:function size:0x16C scope:global align:4 JAISeMgr_freeDeadSe___16JAISeCategoryMgrFv = .text:0x802A1F70; // type:function size:0x104 scope:global align:4 -__dt__18JASMemPool<5JAISe>Fv = .text:0x802A2074; // type:function size:0x54 scope:global align:4 +__dt__18JASMemPool<5JAISe>Fv = .text:0x802A2074; // type:function size:0x54 scope:weak align:4 JAISeMgr_acceptsNewSe___16JAISeCategoryMgrCFUl = .text:0x802A20C8; // type:function size:0xB8 scope:global align:4 sortByPriority___16JAISeCategoryMgrFv = .text:0x802A2180; // type:function size:0xA0 scope:global align:4 stop__16JAISeCategoryMgrFUl = .text:0x802A2220; // type:function size:0x54 scope:global align:4 @@ -11838,9 +11836,9 @@ calc__8JAISeMgrFv = .text:0x802A29B4; // type:function size:0x190 scope:global a mixOut__8JAISeMgrFv = .text:0x802A2B44; // type:function size:0x64 scope:global align:4 startSound__8JAISeMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A2BA8; // type:function size:0x168 scope:global align:4 getNumActiveSe__8JAISeMgrCFv = .text:0x802A2D10; // type:function size:0x2C scope:global align:4 -__dt__8JAISeMgrFv = .text:0x802A2D3C; // type:function size:0x98 scope:global align:4 -__ct__16JAISeCategoryMgrFv = .text:0x802A2DD4; // type:function size:0xD8 scope:global align:4 -JASTrack_isFreeOrStopped__20@unnamed@JAISeq_cpp@FP8JASTrack = .text:0x802A2EAC; // type:function size:0x20 scope:global align:4 +__dt__8JAISeMgrFv = .text:0x802A2D3C; // type:function size:0x98 scope:weak align:4 +__ct__16JAISeCategoryMgrFv = .text:0x802A2DD4; // type:function size:0xD8 scope:weak align:4 +JASTrack_isFreeOrStopped__20@unnamed@JAISeq_cpp@FP8JASTrack = .text:0x802A2EAC; // type:function size:0x20 scope:local align:4 __ct__6JAISeqFP9JAISeqMgrP28JAISoundStrategyMgr<6JAISeq> = .text:0x802A2ECC; // type:function size:0xD8 scope:global align:4 JAISeqMgr_startID___6JAISeqF10JAISoundIDPCQ29JGeometry8TVec3P11JAIAudienceii = .text:0x802A2FA4; // type:function size:0xA0 scope:global align:4 playSeqData___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A3044; // type:function size:0xA0 scope:global align:4 @@ -11850,7 +11848,7 @@ prepare_getSeqData___6JAISeqFv = .text:0x802A331C; // type:function size:0xB4 sc prepare___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A33D0; // type:function size:0xFC scope:global align:4 JAISeqMgr_calc___6JAISeqFv = .text:0x802A34CC; // type:function size:0xF4 scope:global align:4 die___6JAISeqFv = .text:0x802A35C0; // type:function size:0xE8 scope:global align:4 -__dt__27JASMemPool<13JAISoundChild>Fv = .text:0x802A36A8; // type:function size:0x54 scope:global align:4 +__dt__27JASMemPool<13JAISoundChild>Fv = .text:0x802A36A8; // type:function size:0x54 scope:weak align:4 JAISound_tryDie___6JAISeqFv = .text:0x802A36FC; // type:function size:0x8C scope:global align:4 mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A3788; // type:function size:0x1B4 scope:global align:4 JAISeqMgr_mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A393C; // type:function size:0x74 scope:global align:4 @@ -11867,7 +11865,7 @@ isUsingSeqData__9JAISeqMgrFRC16JAISeqDataRegion = .text:0x802A3C44; // type:func releaseSeqData__9JAISeqMgrFRC16JAISeqDataRegion = .text:0x802A3CB0; // type:function size:0xA4 scope:global align:4 __ct__9JAISeqMgrFb = .text:0x802A3D54; // type:function size:0xF4 scope:global align:4 freeDeadSeq___9JAISeqMgrFv = .text:0x802A3E48; // type:function size:0xEC scope:global align:4 -__dt__19JASMemPool<6JAISeq>Fv = .text:0x802A3F34; // type:function size:0x54 scope:global align:4 +__dt__19JASMemPool<6JAISeq>Fv = .text:0x802A3F34; // type:function size:0x54 scope:weak align:4 startSound__9JAISeqMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A3F88; // type:function size:0x148 scope:global align:4 calc__9JAISeqMgrFv = .text:0x802A40D0; // type:function size:0x16C scope:global align:4 stop__9JAISeqMgrFv = .text:0x802A423C; // type:function size:0x40 scope:global align:4 @@ -11876,7 +11874,7 @@ stopSoundID__9JAISeqMgrF10JAISoundID = .text:0x802A42CC; // type:function size:0 mixOut__9JAISeqMgrFv = .text:0x802A433C; // type:function size:0x5C scope:global align:4 beginStartSeq___9JAISeqMgrFv = .text:0x802A4398; // type:function size:0x90 scope:global align:4 endStartSeq___9JAISeqMgrFP6JAISeqP14JAISoundHandle = .text:0x802A4428; // type:function size:0x108 scope:global align:4 -__dt__9JAISeqMgrFv = .text:0x802A4530; // type:function size:0x94 scope:global align:4 +__dt__9JAISeqMgrFv = .text:0x802A4530; // type:function size:0x94 scope:weak align:4 releaseSound__14JAISoundHandleFv = .text:0x802A45C4; // type:function size:0x1C scope:global align:4 releaseHandle__8JAISoundFv = .text:0x802A45E0; // type:function size:0x1C scope:global align:4 attachHandle__8JAISoundFP14JAISoundHandle = .text:0x802A45FC; // type:function size:0x64 scope:global align:4 @@ -11911,7 +11909,7 @@ moveDolby__18JAISoundParamsMoveFfUl = .text:0x802A5354; // type:function size:0x __ct__15JAISoundStarterFb = .text:0x802A53AC; // type:function size:0x1C scope:global align:4 __dt__15JAISoundStarterFv = .text:0x802A53C8; // type:function size:0x64 scope:global align:4 startLevelSound__15JAISoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A542C; // type:function size:0xE8 scope:global align:4 -JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv = .text:0x802A5514; // type:function size:0x30 scope:global align:4 +JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv = .text:0x802A5514; // type:function size:0x30 scope:local align:4 __ct__9JAIStreamFP12JAIStreamMgrP31JAISoundStrategyMgr<9JAIStream> = .text:0x802A5544; // type:function size:0x98 scope:global align:4 JAIStreamMgr_startID___9JAIStreamF10JAISoundIDlPCQ29JGeometry8TVec3P11JAIAudiencei = .text:0x802A55DC; // type:function size:0x94 scope:global align:4 prepare_prepareStream___9JAIStreamFv = .text:0x802A5670; // type:function size:0x1C4 scope:global align:4 @@ -11933,7 +11931,7 @@ __dt__16JAIStreamAramMgrFv = .text:0x802A5F60; // type:function size:0x48 scope: __ct__12JAIStreamMgrFb = .text:0x802A5FA8; // type:function size:0xD4 scope:global align:4 startSound__12JAIStreamMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A607C; // type:function size:0x134 scope:global align:4 freeDeadStream___12JAIStreamMgrFv = .text:0x802A61B0; // type:function size:0xF8 scope:global align:4 -__dt__22JASMemPool<9JAIStream>Fv = .text:0x802A62A8; // type:function size:0x54 scope:global align:4 +__dt__22JASMemPool<9JAIStream>Fv = .text:0x802A62A8; // type:function size:0x54 scope:weak align:4 calc__12JAIStreamMgrFv = .text:0x802A62FC; // type:function size:0x16C scope:global align:4 stop__12JAIStreamMgrFv = .text:0x802A6468; // type:function size:0x40 scope:global align:4 stop__12JAIStreamMgrFUl = .text:0x802A64A8; // type:function size:0x50 scope:global align:4 @@ -11960,11 +11958,11 @@ readBSFT__17JAUAudioArcLoaderFPCv = .text:0x802A6DA8; // type:function size:0x28 beginBNKList__17JAUAudioArcLoaderFUlUl = .text:0x802A6DD0; // type:function size:0x24 scope:global align:4 endBNKList__17JAUAudioArcLoaderFv = .text:0x802A6DF4; // type:function size:0x24 scope:global align:4 readMaxSeCategory__17JAUAudioArcLoaderFiii = .text:0x802A6E18; // type:function size:0x24 scope:global align:4 -__dt__17JAUAudioArcLoaderFv = .text:0x802A6E3C; // type:function size:0x60 scope:global align:4 -__defctor__7JASHeapFv = .text:0x802A6E9C; // type:function size:0x24 scope:global align:4 +__dt__17JAUAudioArcLoaderFv = .text:0x802A6E3C; // type:function size:0x60 scope:weak align:4 +__defctor__7JASHeapFv = .text:0x802A6E9C; // type:function size:0x24 scope:weak align:4 appendBankTable__22JAUBankTableDictionaryFP23JSULink<12JAUBankTable> = .text:0x802A6EC0; // type:function size:0x20 scope:global align:4 -getBank__12JAUBankTableCFUl = .text:0x802A6EE0; // type:function size:0x24 scope:global align:4 -__ct__14JAISoundHandleFv = .text:0x802A6F04; // type:function size:0xC scope:global align:4 +getBank__12JAUBankTableCFUl = .text:0x802A6EE0; // type:function size:0x24 scope:weak align:4 +__ct__14JAISoundHandleFv = .text:0x802A6F04; // type:function size:0xC scope:weak align:4 __ct__18JAU_JASInitializerFv = .text:0x802A6F10; // type:function size:0x58 scope:global align:4 initJASystem__18JAU_JASInitializerFP12JKRSolidHeap = .text:0x802A6F68; // type:function size:0x214 scope:global align:4 __ct__18JAU_JAIInitializerFv = .text:0x802A717C; // type:function size:0x24 scope:global align:4 @@ -11993,7 +11991,7 @@ __ct__Q214JAUSectionHeap16TSectionHeapDataFv = .text:0x802A8234; // type:functio setSeqDataArchive__14JAUSectionHeapFP10JKRArchive = .text:0x802A82A0; // type:function size:0x60 scope:global align:4 loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb = .text:0x802A8300; // type:function size:0x38 scope:global align:4 releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv = .text:0x802A8338; // type:function size:0x2C scope:global align:4 -JAUNewSectionHeap__FP12JKRSolidHeapb = .text:0x802A8364; // type:function size:0x78 scope:global align:4 +JAUNewSectionHeap__FP12JKRSolidHeapb = .text:0x802A8364; // type:function size:0x78 scope:local align:4 JAUNewSectionHeap__Fb = .text:0x802A83DC; // type:function size:0x44 scope:global align:4 __ct__14JAUSectionHeapFP12JKRSolidHeapbl = .text:0x802A8420; // type:function size:0xB4 scope:global align:4 getOpenSection__14JAUSectionHeapFv = .text:0x802A84D4; // type:function size:0xC scope:global align:4 @@ -12001,18 +11999,18 @@ setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser = .text:0x802A84E0; // type:f newDynamicSeqBlock__14JAUSectionHeapFUl = .text:0x802A84EC; // type:function size:0x124 scope:global align:4 getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData = .text:0x802A8610; // type:function size:0xA0 scope:global align:4 releaseSeqData__14JAUSectionHeapFv = .text:0x802A86B0; // type:function size:0x8 scope:global align:4 -__dt__14JAUSectionHeapFv = .text:0x802A86B8; // type:function size:0x1C8 scope:global align:4 -getStreamFileEntry__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrF10JAISoundID = .text:0x802A8880; // type:function size:0x28 scope:global align:4 -__dt__10JAUSectionFv = .text:0x802A88A8; // type:function size:0x10C scope:global align:4 -__dt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrFv = .text:0x802A89B4; // type:function size:0x60 scope:global align:4 -set__Q23std16__bitset_base<8>FUlb = .text:0x802A8A14; // type:function size:0x40 scope:global align:4 -reset__Q23std16__bitset_base<8>FUl = .text:0x802A8A54; // type:function size:0x20 scope:global align:4 -test__Q23std16__bitset_base<8>CFUl = .text:0x802A8A74; // type:function size:0x28 scope:global align:4 -__ct__Q23std16__bitset_base<8>Fv = .text:0x802A8A9C; // type:function size:0x24 scope:global align:4 -@220@setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser = .text:0x802A8AC0; // type:function size:0x8 scope:local align:4 -@220@releaseSeqData__14JAUSectionHeapFv = .text:0x802A8AC8; // type:function size:0x8 scope:local align:4 -@220@getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData = .text:0x802A8AD0; // type:function size:0x8 scope:local align:4 -@220@__dt__14JAUSectionHeapFv = .text:0x802A8AD8; // type:function size:0x8 scope:local align:4 +__dt__14JAUSectionHeapFv = .text:0x802A86B8; // type:function size:0x1C8 scope:weak align:4 +getStreamFileEntry__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrF10JAISoundID = .text:0x802A8880; // type:function size:0x28 scope:local align:4 +__dt__10JAUSectionFv = .text:0x802A88A8; // type:function size:0x10C scope:weak align:4 +__dt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrFv = .text:0x802A89B4; // type:function size:0x60 scope:local align:4 +set__Q23std16__bitset_base<8>FUlb = .text:0x802A8A14; // type:function size:0x40 scope:weak align:4 +reset__Q23std16__bitset_base<8>FUl = .text:0x802A8A54; // type:function size:0x20 scope:weak align:4 +test__Q23std16__bitset_base<8>CFUl = .text:0x802A8A74; // type:function size:0x28 scope:weak align:4 +__ct__Q23std16__bitset_base<8>Fv = .text:0x802A8A9C; // type:function size:0x24 scope:weak align:4 +@220@setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser = .text:0x802A8AC0; // type:function size:0x8 scope:weak align:4 +@220@releaseSeqData__14JAUSectionHeapFv = .text:0x802A8AC8; // type:function size:0x8 scope:weak align:4 +@220@getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData = .text:0x802A8AD0; // type:function size:0x8 scope:weak align:4 +@220@__dt__14JAUSectionHeapFv = .text:0x802A8AD8; // type:function size:0x8 scope:weak align:4 __ct__16JAUSeqCollectionFv = .text:0x802A8AE0; // type:function size:0xC scope:global align:4 init__16JAUSeqCollectionFPCv = .text:0x802A8AEC; // type:function size:0x50 scope:global align:4 getSeqData__16JAUSeqCollectionFiiP10JAISeqData = .text:0x802A8B3C; // type:function size:0x58 scope:global align:4 @@ -12032,7 +12030,7 @@ __ct__23JAUDynamicSeqDataBlocksFv = .text:0x802A8E98; // type:function size:0x48 setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive = .text:0x802A8EE0; // type:function size:0x8 scope:global align:4 getSeqData__23JAUDynamicSeqDataBlocksF10JAISoundIDP14JAISeqDataUserP10JAISeqDatab = .text:0x802A8EE8; // type:function size:0xE4 scope:global align:4 appendDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP15JAUSeqDataBlock = .text:0x802A8FCC; // type:function size:0x68 scope:global align:4 -JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl = .text:0x802A9034; // type:function size:0x24 scope:global align:4 +JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl = .text:0x802A9034; // type:function size:0x24 scope:local align:4 loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser = .text:0x802A9058; // type:function size:0x130 scope:global align:4 releaseIdleDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP14JAISeqDataUser = .text:0x802A9188; // type:function size:0xB8 scope:global align:4 releaseIdleDynamicSeqDataBlock___23JAUDynamicSeqDataBlocksFP14JAISeqDataUserUl = .text:0x802A9240; // type:function size:0xDC scope:global align:4 @@ -12048,7 +12046,7 @@ init__18JAUStreamFileTableFPCv = .text:0x802A986C; // type:function size:0x4C sc getNumFiles__18JAUStreamFileTableCFv = .text:0x802A98B8; // type:function size:0xC scope:global align:4 getFilePath__18JAUStreamFileTableCFi = .text:0x802A98C4; // type:function size:0x28 scope:global align:4 getStreamFileEntry__32JAUStreamDataMgr_StreamFileTableF10JAISoundID = .text:0x802A98EC; // type:function size:0x3C scope:global align:4 -__dt__32JAUStreamDataMgr_StreamFileTableFv = .text:0x802A9928; // type:function size:0x60 scope:global align:4 +__dt__32JAUStreamDataMgr_StreamFileTableFv = .text:0x802A9928; // type:function size:0x60 scope:weak align:4 __ct__Q28JMessage8TControlFv = .text:0x802A9988; // type:function size:0x44 scope:global align:4 __dt__Q28JMessage8TControlFv = .text:0x802A99CC; // type:function size:0x48 scope:global align:4 reset__Q28JMessage8TControlFv = .text:0x802A9A14; // type:function size:0x60 scope:global align:4 @@ -12119,8 +12117,8 @@ process__Q28JMessage19TRenderingProcessorFPCc = .text:0x802AAF60; // type:functi do_begin___Q28JMessage19TRenderingProcessorFPCvPCc = .text:0x802AAFE4; // type:function size:0x4 scope:global align:4 do_end___Q28JMessage19TRenderingProcessorFv = .text:0x802AAFE8; // type:function size:0x4 scope:global align:4 do_tag___Q28JMessage19TRenderingProcessorFUlPCvUl = .text:0x802AAFEC; // type:function size:0x78 scope:global align:4 -on_message__Q28JMessage10TProcessorCFUl = .text:0x802AB064; // type:function size:0x20 scope:global align:4 -getMessageText_messageCode__Q28JMessage10TProcessorCFUl = .text:0x802AB084; // type:function size:0x98 scope:global align:4 +on_message__Q28JMessage10TProcessorCFUl = .text:0x802AB064; // type:function size:0x20 scope:weak align:4 +getMessageText_messageCode__Q28JMessage10TProcessorCFUl = .text:0x802AB084; // type:function size:0x98 scope:weak align:4 toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb = .text:0x802AB11C; // type:function size:0x1E4 scope:global align:4 __ct__Q38JMessage18TResourceContainer10TCResourceFv = .text:0x802AB300; // type:function size:0x38 scope:global align:4 __dt__Q38JMessage18TResourceContainer10TCResourceFv = .text:0x802AB338; // type:function size:0x74 scope:global align:4 @@ -12136,7 +12134,7 @@ parseHeader_next__Q28JMessage6TParseFPPCvPUlUl = .text:0x802AB5F8; // type:funct parseBlock_next__Q28JMessage6TParseFPPCvPUlUl = .text:0x802AB734; // type:function size:0x19C scope:global align:4 parseCharacter_1Byte__Q28JMessage6localeFPPCc = .text:0x802AB8D0; // type:function size:0x18 scope:global align:4 parseCharacter_2Byte__Q28JMessage6localeFPPCc = .text:0x802AB8E8; // type:function size:0x2C scope:global align:4 -lower_bound__3stdFPCUlPCUlRCUl = .text:0x802AB914; // type:function size:0x54 scope:global align:4 +lower_bound__3stdFPCUlPCUlRCUl = .text:0x802AB914; // type:function size:0x54 scope:weak align:4 parseCharacter_ShiftJIS__Q28JMessage6localeFPPCc = .text:0x802AB968; // type:function size:0x64 scope:global align:4 parseCharacter_UTF8__Q28JMessage6localeFPPCc = .text:0x802AB9CC; // type:function size:0x100 scope:global align:4 linearTransform__6Z2CalcFfffffb = .text:0x802ABACC; // type:function size:0x68 scope:global align:4 @@ -12150,7 +12148,7 @@ __ct__16Z2AudioArcLoaderFP10JAUSection = .text:0x802ABE74; // type:function size readCommandMore__16Z2AudioArcLoaderFUl = .text:0x802ABEB0; // type:function size:0x58 scope:global align:4 readBFCA__16Z2AudioArcLoaderFPCv = .text:0x802ABF08; // type:function size:0x8C scope:global align:4 readBSTN__16Z2AudioArcLoaderFPCvUl = .text:0x802ABF94; // type:function size:0x4 scope:global align:4 -__dt__16Z2AudioArcLoaderFv = .text:0x802ABF98; // type:function size:0x70 scope:global align:4 +__dt__16Z2AudioArcLoaderFv = .text:0x802ABF98; // type:function size:0x70 scope:weak align:4 seqCallback__FP8JASTrackUs = .text:0x802AC008; // type:function size:0x2B8 scope:global align:4 __ct__10Z2SoundMgrFv = .text:0x802AC2C0; // type:function size:0x68 scope:global align:4 startSound__10Z2SoundMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802AC328; // type:function size:0x2C8 scope:global align:4 @@ -12172,12 +12170,12 @@ startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3UlfffffUl = .text:0x802AD07C; // type:function size:0x2A0 scope:global align:4 setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc = .text:0x802AD31C; // type:function size:0x98 scope:global align:4 getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc = .text:0x802AD3B4; // type:function size:0x7C scope:global align:4 -__dt__14Z2SoundStarterFv = .text:0x802AD430; // type:function size:0x8C scope:global align:4 +__dt__14Z2SoundStarterFv = .text:0x802AD430; // type:function size:0x8C scope:weak align:4 __ct__14Z2SoundHandlesFv = .text:0x802AD4BC; // type:function size:0x38 scope:global align:4 __dt__14Z2SoundHandlesFv = .text:0x802AD4F4; // type:function size:0x64 scope:global align:4 initHandlesPool__14Z2SoundHandlesFUc = .text:0x802AD558; // type:function size:0x8 scope:global align:4 deleteHandlesPool__14Z2SoundHandlesFv = .text:0x802AD560; // type:function size:0xE0 scope:global align:4 -__dt__31JASMemPool<17Z2SoundHandlePool>Fv = .text:0x802AD640; // type:function size:0x54 scope:global align:4 +__dt__31JASMemPool<17Z2SoundHandlePool>Fv = .text:0x802AD640; // type:function size:0x54 scope:weak align:4 getHandleSoundID__14Z2SoundHandlesF10JAISoundID = .text:0x802AD694; // type:function size:0x4C scope:global align:4 getHandleUserData__14Z2SoundHandlesFUl = .text:0x802AD6E0; // type:function size:0x38 scope:global align:4 getFreeHandle__14Z2SoundHandlesFv = .text:0x802AD718; // type:function size:0xF8 scope:global align:4 @@ -12329,11 +12327,11 @@ getStreamFilePath__11Z2SoundInfoF10JAISoundID = .text:0x802BDE50; // type:functi getStreamFileEntry__11Z2SoundInfoF10JAISoundID = .text:0x802BDEC8; // type:function size:0x40 scope:global align:4 getSwBit__11Z2SoundInfoCF10JAISoundID = .text:0x802BDF08; // type:function size:0x80 scope:global align:4 getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound = .text:0x802BDF88; // type:function size:0x98 scope:global align:4 -__dt__11Z2SoundInfoFv = .text:0x802BE020; // type:function size:0xDC scope:global align:4 -@4@getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID = .text:0x802BE0FC; // type:function size:0x8 scope:local align:4 -@4@getAudibleSw__11Z2SoundInfoCF10JAISoundID = .text:0x802BE104; // type:function size:0x8 scope:local align:4 -@8@__dt__11Z2SoundInfoFv = .text:0x802BE10C; // type:function size:0x8 scope:local align:4 -@8@getStreamFileEntry__11Z2SoundInfoF10JAISoundID = .text:0x802BE114; // type:function size:0x8 scope:local align:4 +__dt__11Z2SoundInfoFv = .text:0x802BE020; // type:function size:0xDC scope:weak align:4 +@4@getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID = .text:0x802BE0FC; // type:function size:0x8 scope:weak align:4 +@4@getAudibleSw__11Z2SoundInfoCF10JAISoundID = .text:0x802BE104; // type:function size:0x8 scope:weak align:4 +@8@__dt__11Z2SoundInfoFv = .text:0x802BE10C; // type:function size:0x8 scope:weak align:4 +@8@getStreamFileEntry__11Z2SoundInfoF10JAISoundID = .text:0x802BE114; // type:function size:0x8 scope:weak align:4 calc__15Z2AudibleAbsPosFRCQ29JGeometry8TVec3 = .text:0x802BE11C; // type:function size:0x3C scope:global align:4 init__15Z2AudibleAbsPosFPQ29JGeometry8TVec3RCQ29JGeometry8TVec3PCQ29JGeometry8TVec3 = .text:0x802BE158; // type:function size:0x7C scope:global align:4 __ct__9Z2AudibleFRCQ29JGeometry8TVec3PCQ29JGeometry8TVec3Ulb = .text:0x802BE1D4; // type:function size:0xE0 scope:global align:4 @@ -12365,7 +12363,7 @@ calcMicPriority__9Z2SpotMicFf = .text:0x802BF424; // type:function size:0x58 sco calcMicVolume__9Z2SpotMicFfif = .text:0x802BF47C; // type:function size:0xF4 scope:global align:4 __ct__10Z2AudienceFv = .text:0x802BF570; // type:function size:0xCC scope:global align:4 __dt__10Z2AudienceFv = .text:0x802BF63C; // type:function size:0x8C scope:global align:4 -__dt__22JASMemPool<9Z2Audible>Fv = .text:0x802BF6C8; // type:function size:0x54 scope:global align:4 +__dt__22JASMemPool<9Z2Audible>Fv = .text:0x802BF6C8; // type:function size:0x54 scope:weak align:4 setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib = .text:0x802BF71C; // type:function size:0x5C scope:global align:4 newAudible__10Z2AudienceFRCQ29JGeometry8TVec310JAISoundIDPCQ29JGeometry8TVec3Ul = .text:0x802BF778; // type:function size:0x19C scope:global align:4 deleteAudible__10Z2AudienceFP10JAIAudible = .text:0x802BF914; // type:function size:0x3C scope:global align:4 @@ -12486,10 +12484,10 @@ framework__12Z2CreatureOIFUlSc = .text:0x802C4D00; // type:function size:0x170 s startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc = .text:0x802C4E70; // type:function size:0x2B0 scope:global align:4 startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc = .text:0x802C5120; // type:function size:0x50 scope:global align:4 startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc = .text:0x802C5170; // type:function size:0x10C scope:global align:4 -Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C527C; // type:function size:0x74 scope:global align:4 -Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl = .text:0x802C52F0; // type:function size:0x48 scope:global align:4 -Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C5338; // type:function size:0x48 scope:global align:4 -Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C5380; // type:function size:0x15C scope:global align:4 +Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C527C; // type:function size:0x74 scope:local align:4 +Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl = .text:0x802C52F0; // type:function size:0x48 scope:local align:4 +Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C5338; // type:function size:0x48 scope:local align:4 +Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C5380; // type:function size:0x15C scope:local align:4 __sinit_Z2Creature_cpp = .text:0x802C54DC; // type:function size:0x1DC scope:local align:4 setLinkGroupInfo__14Z2CreatureLinkFUc = .text:0x802C56B8; // type:function size:0x4 scope:global align:4 setLinkHp__14Z2CreatureLinkFll = .text:0x802C56BC; // type:function size:0x8 scope:global align:4 @@ -12497,7 +12495,7 @@ setLinkSwordType__14Z2CreatureLinkFll = .text:0x802C56C4; // type:function size: setLinkShieldType__14Z2CreatureLinkFll = .text:0x802C5728; // type:function size:0x64 scope:global align:4 setLinkBootsType__14Z2CreatureLinkFl = .text:0x802C578C; // type:function size:0x4C scope:global align:4 __ct__14Z2CreatureLinkFv = .text:0x802C57D8; // type:function size:0x128 scope:global align:4 -__dt__18Z2LinkSoundStarterFv = .text:0x802C5900; // type:function size:0x9C scope:global align:4 +__dt__18Z2LinkSoundStarterFv = .text:0x802C5900; // type:function size:0x9C scope:weak align:4 __dt__14Z2CreatureLinkFv = .text:0x802C599C; // type:function size:0xF8 scope:global align:4 deleteObject__14Z2CreatureLinkFv = .text:0x802C5A94; // type:function size:0x40 scope:global align:4 init__14Z2CreatureLinkFP3VecP3VecP3Vec = .text:0x802C5AD4; // type:function size:0xD8 scope:global align:4 @@ -12520,7 +12518,7 @@ setResumeAttack__14Z2CreatureLinkFb = .text:0x802C6D74; // type:function size:0x __ct__18Z2LinkSoundStarterFv = .text:0x802C6D84; // type:function size:0x40 scope:global align:4 startSound__18Z2LinkSoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3UlfffffUl = .text:0x802C6DC4; // type:function size:0x6D4 scope:global align:4 __ct__14Z2CreatureRideFv = .text:0x802C7498; // type:function size:0x7C scope:global align:4 -__dt__18Z2RideSoundStarterFv = .text:0x802C7514; // type:function size:0x9C scope:global align:4 +__dt__18Z2RideSoundStarterFv = .text:0x802C7514; // type:function size:0x9C scope:weak align:4 __dt__14Z2CreatureRideFv = .text:0x802C75B0; // type:function size:0xD8 scope:global align:4 deleteObject__14Z2CreatureRideFv = .text:0x802C7688; // type:function size:0x20 scope:global align:4 init__14Z2CreatureRideFP3VecP3VecUcUc = .text:0x802C76A8; // type:function size:0x20 scope:global align:4 @@ -12532,8 +12530,8 @@ init__15Z2SoundObjCoachFP3VecUc = .text:0x802C7998; // type:function size:0x20 s startWheelSound__15Z2SoundObjCoachFf = .text:0x802C79B8; // type:function size:0x1A4 scope:global align:4 startFireSound__15Z2SoundObjCoachFUs = .text:0x802C7B5C; // type:function size:0x100 scope:global align:4 startSound__15Z2SoundObjCoachF10JAISoundIDUlSc = .text:0x802C7C5C; // type:function size:0xCC scope:global align:4 -@144@__dt__14Z2CreatureLinkFv = .text:0x802C7D28; // type:function size:0x8 scope:local align:4 -@144@__dt__14Z2CreatureRideFv = .text:0x802C7D30; // type:function size:0x8 scope:local align:4 +@144@__dt__14Z2CreatureLinkFv = .text:0x802C7D28; // type:function size:0x8 scope:weak align:4 +@144@__dt__14Z2CreatureRideFv = .text:0x802C7D30; // type:function size:0x8 scope:weak align:4 __ct__11Z2EnvSeBaseFP3Vec = .text:0x802C7D38; // type:function size:0x10 scope:global align:4 __dt__11Z2EnvSeBaseFv = .text:0x802C7D48; // type:function size:0x5C scope:global align:4 startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl = .text:0x802C7DA4; // type:function size:0x1AC scope:global align:4 @@ -12600,7 +12598,7 @@ startGuideMelody__13Z2WolfHowlMgrFb = .text:0x802CDF24; // type:function size:0x skipCorrectDemo__13Z2WolfHowlMgrFv = .text:0x802CDFF4; // type:function size:0x24 scope:global align:4 __sinit_Z2WolfHowlMgr_cpp = .text:0x802CE018; // type:function size:0xE4 scope:local align:4 __ct__12Z2SpeechMgr2Fv = .text:0x802CE0FC; // type:function size:0x8C scope:global align:4 -__dt__15Z2SpeechStarterFv = .text:0x802CE188; // type:function size:0x9C scope:global align:4 +__dt__15Z2SpeechStarterFv = .text:0x802CE188; // type:function size:0x9C scope:weak align:4 setString__12Z2SpeechMgr2FPCUssUcUs = .text:0x802CE224; // type:function size:0x1D8 scope:global align:4 setTextCount__12Z2SpeechMgr2Fs = .text:0x802CE3FC; // type:function size:0x230 scope:global align:4 speakOneWord__12Z2SpeechMgr2Fb = .text:0x802CE62C; // type:function size:0x16C scope:global align:4 @@ -12780,8 +12778,8 @@ run__9JKRThreadFv = .text:0x802D42B0; // type:function size:0x8 scope:global ali draw__15JKRThreadSwitchFP14JKRThreadName_ = .text:0x802D42B8; // type:function size:0x30 scope:global align:4 __dt__15JKRThreadSwitchFv = .text:0x802D42E8; // type:function size:0x48 scope:global align:4 __sinit_JKRThread_cpp = .text:0x802D4330; // type:function size:0x68 scope:local align:4 -__dt__17JSUList<7JKRTask>Fv = .text:0x802D4398; // type:function size:0x54 scope:global align:4 -__dt__19JSUList<9JKRThread>Fv = .text:0x802D43EC; // type:function size:0x54 scope:global align:4 +__dt__17JSUList<7JKRTask>Fv = .text:0x802D4398; // type:function size:0x54 scope:weak align:4 +__dt__19JSUList<9JKRThread>Fv = .text:0x802D43EC; // type:function size:0x54 scope:weak align:4 create__7JKRAramFUlUllll = .text:0x802D4440; // type:function size:0x9C scope:global align:4 __ct__7JKRAramFUlUll = .text:0x802D44DC; // type:function size:0x10C scope:global align:4 __dt__7JKRAramFv = .text:0x802D45E8; // type:function size:0x90 scope:global align:4 @@ -12790,12 +12788,12 @@ checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl = .text:0x802D46E4; // type:func changeGroupIdIfNeed__7JKRAramFPUci = .text:0x802D4778; // type:function size:0x60 scope:global align:4 mainRamToAram__7JKRAramFPUcUlUl15JKRExpandSwitchUlP7JKRHeapiPUl = .text:0x802D47D8; // type:function size:0x278 scope:global align:4 aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl = .text:0x802D4A50; // type:function size:0x27C scope:global align:4 -JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl = .text:0x802D4CCC; // type:function size:0x170 scope:global align:4 -decompSZS_subroutine__FPUcPUc = .text:0x802D4E3C; // type:function size:0x2A0 scope:local align:4 +JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl = .text:0x802D4CCC; // type:function size:0x170 scope:local align:4 +decompSZS_subroutine__FPUcPUc = .text:0x802D4E3C; // type:function size:0x2A0 scope:global align:4 firstSrcData__Fv = .text:0x802D50DC; // type:function size:0xA4 scope:local align:4 nextSrcData__FPUc = .text:0x802D5180; // type:function size:0xC8 scope:local align:4 __sinit_JKRAram_cpp = .text:0x802D5248; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRAMCommand>Fv = .text:0x802D528C; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRAMCommand>Fv = .text:0x802D528C; // type:function size:0x54 scope:weak align:4 __ct__11JKRAramHeapFUlUl = .text:0x802D52E0; // type:function size:0xD0 scope:global align:4 __dt__11JKRAramHeapFv = .text:0x802D53B0; // type:function size:0xA8 scope:global align:4 alloc__11JKRAramHeapFUlQ211JKRAramHeap10EAllocMode = .text:0x802D5458; // type:function size:0x78 scope:global align:4 @@ -12805,7 +12803,7 @@ getFreeSize__11JKRAramHeapFv = .text:0x802D55D0; // type:function size:0x78 scop getTotalFreeSize__11JKRAramHeapFv = .text:0x802D5648; // type:function size:0x6C scope:global align:4 dump__11JKRAramHeapFv = .text:0x802D56B4; // type:function size:0x54 scope:global align:4 __sinit_JKRAramHeap_cpp = .text:0x802D5708; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRAramBlock>Fv = .text:0x802D574C; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRAramBlock>Fv = .text:0x802D574C; // type:function size:0x54 scope:weak align:4 __ct__12JKRAramBlockFUlUlUlUcb = .text:0x802D57A0; // type:function size:0x74 scope:global align:4 __dt__12JKRAramBlockFv = .text:0x802D5814; // type:function size:0xBC scope:global align:4 allocHead__12JKRAramBlockFUlUcP11JKRAramHeap = .text:0x802D58D0; // type:function size:0x9C scope:global align:4 @@ -12830,7 +12828,7 @@ write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl = .text sync__13JKRAramStreamFP20JKRAramStreamCommandi = .text:0x802D643C; // type:function size:0x94 scope:global align:4 setTransBuffer__13JKRAramStreamFPUcUlP7JKRHeap = .text:0x802D64D0; // type:function size:0x54 scope:global align:4 __ct__20JKRAramStreamCommandFv = .text:0x802D6524; // type:function size:0xC scope:global align:4 -getAvailable__20JSURandomInputStreamCFv = .text:0x802D6530; // type:function size:0x5C scope:global align:4 +getAvailable__20JSURandomInputStreamCFv = .text:0x802D6530; // type:function size:0x5C scope:weak align:4 __ct__13JKRFileLoaderFv = .text:0x802D658C; // type:function size:0x58 scope:global align:4 __dt__13JKRFileLoaderFv = .text:0x802D65E4; // type:function size:0x8C scope:global align:4 unmount__13JKRFileLoaderFv = .text:0x802D6670; // type:function size:0x50 scope:global align:4 @@ -12841,14 +12839,14 @@ detachResource__13JKRFileLoaderFPvP13JKRFileLoader = .text:0x802D683C; // type:f findVolume__13JKRFileLoaderFPPCc = .text:0x802D68D4; // type:function size:0x8C scope:global align:4 fetchVolumeName__13JKRFileLoaderFPclPCc = .text:0x802D6960; // type:function size:0xDC scope:global align:4 __sinit_JKRFileLoader_cpp = .text:0x802D6A3C; // type:function size:0x44 scope:local align:4 -__dt__24JSUList<13JKRFileLoader>Fv = .text:0x802D6A80; // type:function size:0x54 scope:global align:4 +__dt__24JSUList<13JKRFileLoader>Fv = .text:0x802D6A80; // type:function size:0x54 scope:weak align:4 __ct__12JKRArcFinderFP10JKRArchivell = .text:0x802D6AD4; // type:function size:0x8C scope:global align:4 findNextFile__12JKRArcFinderFv = .text:0x802D6B60; // type:function size:0xAC scope:global align:4 __ct__12JKRDvdFinderFPCc = .text:0x802D6C0C; // type:function size:0x84 scope:global align:4 __dt__12JKRDvdFinderFv = .text:0x802D6C90; // type:function size:0x80 scope:global align:4 findNextFile__12JKRDvdFinderFv = .text:0x802D6D10; // type:function size:0x9C scope:global align:4 -__dt__13JKRFileFinderFv = .text:0x802D6DAC; // type:function size:0x48 scope:global align:4 -__dt__12JKRArcFinderFv = .text:0x802D6DF4; // type:function size:0x5C scope:global align:4 +__dt__13JKRFileFinderFv = .text:0x802D6DAC; // type:function size:0x48 scope:weak align:4 +__dt__12JKRArcFinderFv = .text:0x802D6DF4; // type:function size:0x5C scope:weak align:4 mount__12JKRFileCacheFPCcP7JKRHeapPCc = .text:0x802D6E50; // type:function size:0x100 scope:global align:4 __ct__12JKRFileCacheFPCcPCc = .text:0x802D6F50; // type:function size:0x1BC scope:global align:4 __dt__12JKRFileCacheFv = .text:0x802D710C; // type:function size:0xD4 scope:global align:4 @@ -12932,7 +12930,7 @@ getAramAddress__14JKRAramArchiveFPCc = .text:0x802D9CB8; // type:function size:0 fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli = .text:0x802D9CF4; // type:function size:0xBC scope:global align:4 fetchResource_subroutine__14JKRAramArchiveFUlUlP7JKRHeapiPPUc = .text:0x802D9DB0; // type:function size:0x150 scope:global align:4 getExpandedResSize__14JKRAramArchiveCFPCv = .text:0x802D9F00; // type:function size:0x12C scope:global align:4 -__dt__7JKRFileFv = .text:0x802DA02C; // type:function size:0x60 scope:global align:4 +__dt__7JKRFileFv = .text:0x802DA02C; // type:function size:0x60 scope:weak align:4 __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection = .text:0x802DA08C; // type:function size:0xA8 scope:global align:4 __dt__13JKRDvdArchiveFv = .text:0x802DA134; // type:function size:0x11C scope:global align:4 open__13JKRDvdArchiveFl = .text:0x802DA250; // type:function size:0x29C scope:global align:4 @@ -12964,32 +12962,32 @@ sync__10JKRDvdFileFv = .text:0x802DBF0C; // type:function size:0x54 scope:global doneProcess__10JKRDvdFileFlP11DVDFileInfo = .text:0x802DBF60; // type:function size:0x34 scope:global align:4 getFileSize__10JKRDvdFileCFv = .text:0x802DBF94; // type:function size:0x8 scope:global align:4 __sinit_JKRDvdFile_cpp = .text:0x802DBF9C; // type:function size:0x44 scope:local align:4 -__dt__21JSUList<10JKRDvdFile>Fv = .text:0x802DBFE0; // type:function size:0x54 scope:global align:4 +__dt__21JSUList<10JKRDvdFile>Fv = .text:0x802DBFE0; // type:function size:0x54 scope:weak align:4 loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl = .text:0x802DC034; // type:function size:0xBC scope:global align:4 loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl = .text:0x802DC0F0; // type:function size:0xBC scope:global align:4 loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl = .text:0x802DC1AC; // type:function size:0x4D4 scope:global align:4 -JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl = .text:0x802DC680; // type:function size:0x178 scope:global align:4 +JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl = .text:0x802DC680; // type:function size:0x178 scope:local align:4 decompSZS_subroutine__FPUcPUc = .text:0x802DC7F8; // type:function size:0x2B0 scope:local align:4 firstSrcData__Fv = .text:0x802DCAA8; // type:function size:0xCC scope:local align:4 nextSrcData__FPUc = .text:0x802DCB74; // type:function size:0xFC scope:local align:4 isErrorRetry__12JKRDvdRipperFv = .text:0x802DCC70; // type:function size:0x8 scope:global align:4 __sinit_JKRDvdRipper_cpp = .text:0x802DCC78; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRDMCommand>Fv = .text:0x802DCCBC; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRDMCommand>Fv = .text:0x802DCCBC; // type:function size:0x54 scope:weak align:4 loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl = .text:0x802DCD10; // type:function size:0xA4 scope:global align:4 loadToAram__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchUlUlPUl = .text:0x802DCDB4; // type:function size:0xA8 scope:global align:4 loadToAram_Async__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchPFUl_vUlUlPUl = .text:0x802DCE5C; // type:function size:0xB4 scope:global align:4 callCommand_Async__16JKRDvdAramRipperFP12JKRADCommand = .text:0x802DCF10; // type:function size:0x364 scope:global align:4 -__dt__18JSUFileInputStreamFv = .text:0x802DD274; // type:function size:0x70 scope:global align:4 +__dt__18JSUFileInputStreamFv = .text:0x802DD274; // type:function size:0x70 scope:weak align:4 syncAram__16JKRDvdAramRipperFP12JKRADCommandi = .text:0x802DD2E4; // type:function size:0xD4 scope:global align:4 __ct__12JKRADCommandFv = .text:0x802DD3B8; // type:function size:0x40 scope:global align:4 __dt__12JKRADCommandFv = .text:0x802DD3F8; // type:function size:0x8C scope:global align:4 -JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl = .text:0x802DD484; // type:function size:0x178 scope:global align:4 -decompSZS_subroutine__FPUcUl = .text:0x802DD5FC; // type:function size:0x288 scope:global align:4 +JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl = .text:0x802DD484; // type:function size:0x178 scope:local align:4 +decompSZS_subroutine__FPUcUl = .text:0x802DD5FC; // type:function size:0x288 scope:local align:4 firstSrcData__Fv = .text:0x802DD884; // type:function size:0xB4 scope:local align:4 nextSrcData__FPUc = .text:0x802DD938; // type:function size:0xE4 scope:local align:4 -dmaBufferFlush__FUl = .text:0x802DDA1C; // type:function size:0x68 scope:global align:4 +dmaBufferFlush__FUl = .text:0x802DDA1C; // type:function size:0x68 scope:local align:4 __sinit_JKRDvdAramRipper_cpp = .text:0x802DDA84; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRADCommand>Fv = .text:0x802DDAC8; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRADCommand>Fv = .text:0x802DDAC8; // type:function size:0x54 scope:weak align:4 create__9JKRDecompFl = .text:0x802DDB1C; // type:function size:0x60 scope:global align:4 __ct__9JKRDecompFl = .text:0x802DDB7C; // type:function size:0x50 scope:global align:4 __dt__9JKRDecompFv = .text:0x802DDBCC; // type:function size:0x60 scope:global align:4 @@ -13048,9 +13046,9 @@ __ct__Q27JGadget20TVector_pointer_voidFRCQ27JGadget14TAllocator = .text:0x80 __dt__Q27JGadget20TVector_pointer_voidFv = .text:0x802DF198; // type:function size:0xA8 scope:global align:4 insert__Q27JGadget20TVector_pointer_voidFPPvRCPv = .text:0x802DF240; // type:function size:0x20 scope:global align:4 erase__Q27JGadget20TVector_pointer_voidFPPvPPv = .text:0x802DF260; // type:function size:0x58 scope:global align:4 -insert__Q27JGadget38TVector>FPPvUlRCPv = .text:0x802DF2B8; // type:function size:0x70 scope:global align:4 -Insert_raw__Q27JGadget38TVector>FPPvUl = .text:0x802DF328; // type:function size:0x2A4 scope:global align:4 -insert__Q27JGadget38TVector>FPPvRCPv = .text:0x802DF5CC; // type:function size:0x58 scope:global align:4 +insert__Q27JGadget38TVector>FPPvUlRCPv = .text:0x802DF2B8; // type:function size:0x70 scope:weak align:4 +Insert_raw__Q27JGadget38TVector>FPPvUl = .text:0x802DF328; // type:function size:0x2A4 scope:weak align:4 +insert__Q27JGadget38TVector>FPPvRCPv = .text:0x802DF5CC; // type:function size:0x58 scope:weak align:4 __ct__12JUTCacheFontFPC7ResFONTUlP7JKRHeap = .text:0x802DF624; // type:function size:0x80 scope:global align:4 __dt__12JUTCacheFontFv = .text:0x802DF6A4; // type:function size:0x94 scope:global align:4 deleteMemBlocks_CacheFont__12JUTCacheFontFv = .text:0x802DF738; // type:function size:0x84 scope:global align:4 @@ -13123,9 +13121,9 @@ isLeadByte__10JUTResFontCFi = .text:0x802E2240; // type:function size:0x34 scope getFontCode__10JUTResFontCFi = .text:0x802E2274; // type:function size:0x188 scope:global align:4 loadImage__10JUTResFontFi11_GXTexMapID = .text:0x802E23FC; // type:function size:0x164 scope:global align:4 convertSjis__10JUTResFontCFiPUs = .text:0x802E2560; // type:function size:0x44 scope:global align:4 -isLeadByte_1Byte__7JUTFontFi = .text:0x802E25A4; // type:function size:0x8 scope:global align:4 -isLeadByte_2Byte__7JUTFontFi = .text:0x802E25AC; // type:function size:0x8 scope:global align:4 -isLeadByte_ShiftJIS__7JUTFontFi = .text:0x802E25B4; // type:function size:0x30 scope:global align:4 +isLeadByte_1Byte__7JUTFontFi = .text:0x802E25A4; // type:function size:0x8 scope:weak align:4 +isLeadByte_2Byte__7JUTFontFi = .text:0x802E25AC; // type:function size:0x8 scope:weak align:4 +isLeadByte_ShiftJIS__7JUTFontFi = .text:0x802E25B4; // type:function size:0x30 scope:weak align:4 __ct__10JUTDbPrintFP7JUTFontP7JKRHeap = .text:0x802E25E4; // type:function size:0x48 scope:global align:4 start__10JUTDbPrintFP7JUTFontP7JKRHeap = .text:0x802E262C; // type:function size:0x74 scope:global align:4 changeFont__10JUTDbPrintFP7JUTFont = .text:0x802E26A0; // type:function size:0x18 scope:global align:4 @@ -13155,7 +13153,7 @@ clear__Q210JUTGamePad7CRumbleFv = .text:0x802E3A50; // type:function size:0x24 s clear__Q210JUTGamePad7CRumbleFP10JUTGamePad = .text:0x802E3A74; // type:function size:0x5C scope:global align:4 startMotor__Q210JUTGamePad7CRumbleFi = .text:0x802E3AD0; // type:function size:0x58 scope:global align:4 stopMotor__Q210JUTGamePad7CRumbleFib = .text:0x802E3B28; // type:function size:0x6C scope:global align:4 -getNumBit__FPUci = .text:0x802E3B94; // type:function size:0x28 scope:global align:4 +getNumBit__FPUci = .text:0x802E3B94; // type:function size:0x28 scope:local align:4 update__Q210JUTGamePad7CRumbleFs = .text:0x802E3BBC; // type:function size:0x184 scope:global align:4 triggerPatternedRumble__Q210JUTGamePad7CRumbleFUl = .text:0x802E3D40; // type:function size:0x28 scope:global align:4 startPatternedRumble__Q210JUTGamePad7CRumbleFPvQ310JUTGamePad7CRumble7ERumbleUl = .text:0x802E3D68; // type:function size:0x7C scope:global align:4 @@ -13167,10 +13165,10 @@ setRepeat__Q210JUTGamePad7CButtonFUlUlUl = .text:0x802E3F18; // type:function si recalibrate__10JUTGamePadFUl = .text:0x802E3F34; // type:function size:0x64 scope:global align:4 checkCallback__19JUTGamePadLongPressFiUl = .text:0x802E3F98; // type:function size:0x64 scope:global align:4 __sinit_JUTGamePad_cpp = .text:0x802E3FFC; // type:function size:0xF4 scope:local align:4 -__dt__30JSUList<19JUTGamePadLongPress>Fv = .text:0x802E40F0; // type:function size:0x54 scope:global align:4 -__ct__Q210JUTGamePad6CStickFv = .text:0x802E4144; // type:function size:0x30 scope:global align:4 -__ct__Q210JUTGamePad7CButtonFv = .text:0x802E4174; // type:function size:0x30 scope:global align:4 -__dt__21JSUList<10JUTGamePad>Fv = .text:0x802E41A4; // type:function size:0x54 scope:global align:4 +__dt__30JSUList<19JUTGamePadLongPress>Fv = .text:0x802E40F0; // type:function size:0x54 scope:weak align:4 +__ct__Q210JUTGamePad6CStickFv = .text:0x802E4144; // type:function size:0x30 scope:weak align:4 +__ct__Q210JUTGamePad7CButtonFv = .text:0x802E4174; // type:function size:0x30 scope:weak align:4 +__dt__21JSUList<10JUTGamePad>Fv = .text:0x802E41A4; // type:function size:0x54 scope:weak align:4 __ct__12JUTExceptionFP14JUTDirectPrint = .text:0x802E41F8; // type:function size:0xE4 scope:global align:4 create__12JUTExceptionFP14JUTDirectPrint = .text:0x802E42DC; // type:function size:0x68 scope:global align:4 run__12JUTExceptionFv = .text:0x802E4344; // type:function size:0x124 scope:global align:4 @@ -13181,7 +13179,7 @@ setFPException__12JUTExceptionFUl = .text:0x802E4718; // type:function size:0x48 showFloatSub__12JUTExceptionFif = .text:0x802E4760; // type:function size:0x190 scope:global align:4 showFloat__12JUTExceptionFP9OSContext = .text:0x802E48F0; // type:function size:0x124 scope:global align:4 searchPartialModule__12JUTExceptionFUlPUlPUlPUlPUl = .text:0x802E4A14; // type:function size:0xC0 scope:global align:4 -search_name_part__FPUcPUci = .text:0x802E4AD4; // type:function size:0x78 scope:global align:4 +search_name_part__FPUcPUci = .text:0x802E4AD4; // type:function size:0x78 scope:local align:4 showStack__12JUTExceptionFP9OSContext = .text:0x802E4B4C; // type:function size:0x100 scope:global align:4 showMainInfo__12JUTExceptionFUsP9OSContextUlUl = .text:0x802E4C4C; // type:function size:0x2D4 scope:global align:4 showGPR__12JUTExceptionFP9OSContext = .text:0x802E4F20; // type:function size:0xC0 scope:global align:4 @@ -13203,7 +13201,7 @@ createConsole__12JUTExceptionFPvUl = .text:0x802E6488; // type:function size:0xE __ct__13JUTExternalFBFP16_GXRenderModeObj8_GXGammaPvUl = .text:0x802E6568; // type:function size:0x20 scope:global align:4 __dt__12JUTExceptionFv = .text:0x802E6588; // type:function size:0x60 scope:global align:4 __sinit_JUTException_cpp = .text:0x802E65E8; // type:function size:0x48 scope:local align:4 -__dt__39JSUListFv = .text:0x802E6630; // type:function size:0x54 scope:global align:4 +__dt__39JSUListFv = .text:0x802E6630; // type:function size:0x54 scope:weak align:4 __ct__14JUTDirectPrintFv = .text:0x802E6684; // type:function size:0x58 scope:global align:4 start__14JUTDirectPrintFv = .text:0x802E66DC; // type:function size:0x48 scope:global align:4 erase__14JUTDirectPrintFiiii = .text:0x802E6724; // type:function size:0x94 scope:global align:4 @@ -13255,11 +13253,11 @@ bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor = .text adjustMeterLength__10JUTProcBarFUlPfffPi = .text:0x802E8160; // type:function size:0x144 scope:global align:4 draw__10JUTProcBarFv = .text:0x802E82A4; // type:function size:0x34 scope:global align:4 drawProcessBar__10JUTProcBarFv = .text:0x802E82D8; // type:function size:0xF00 scope:global align:4 -addrToXPos__FPvi = .text:0x802E91D8; // type:function size:0x68 scope:global align:4 -byteToXLen__Fii = .text:0x802E9240; // type:function size:0x68 scope:global align:4 -heapBar__FP7JKRHeapiiiii = .text:0x802E92A8; // type:function size:0x194 scope:global align:4 +addrToXPos__FPvi = .text:0x802E91D8; // type:function size:0x68 scope:local align:4 +byteToXLen__Fii = .text:0x802E9240; // type:function size:0x68 scope:local align:4 +heapBar__FP7JKRHeapiiiii = .text:0x802E92A8; // type:function size:0x194 scope:local align:4 drawHeapBar__10JUTProcBarFv = .text:0x802E943C; // type:function size:0x3A0 scope:global align:4 -__ct__Q210JUTProcBar5CTimeFv = .text:0x802E97DC; // type:function size:0x14 scope:global align:4 +__ct__Q210JUTProcBar5CTimeFv = .text:0x802E97DC; // type:function size:0x14 scope:weak align:4 create__10JUTConsoleFUiUiP7JKRHeap = .text:0x802E97F0; // type:function size:0x90 scope:global align:4 create__10JUTConsoleFUiPvUl = .text:0x802E9880; // type:function size:0x88 scope:global align:4 __ct__10JUTConsoleFUiUib = .text:0x802E9908; // type:function size:0xF0 scope:global align:4 @@ -13309,10 +13307,10 @@ fillBox__14J2DGrafContextFRCQ29JGeometry8TBox2 = .text:0x802EB6FC; // type:fu drawFrame__14J2DGrafContextFRCQ29JGeometry8TBox2 = .text:0x802EB804; // type:function size:0x120 scope:global align:4 line__14J2DGrafContextFQ29JGeometry8TVec2Q29JGeometry8TVec2 = .text:0x802EB924; // type:function size:0xDC scope:global align:4 lineTo__14J2DGrafContextFQ29JGeometry8TVec2 = .text:0x802EBA00; // type:function size:0x70 scope:global align:4 -__dt__14J2DGrafContextFv = .text:0x802EBA70; // type:function size:0x48 scope:global align:4 -place__14J2DGrafContextFffff = .text:0x802EBAB8; // type:function size:0x48 scope:global align:4 -getGrafType__14J2DGrafContextCFv = .text:0x802EBB00; // type:function size:0x8 scope:global align:4 -setLookat__14J2DGrafContextFv = .text:0x802EBB08; // type:function size:0x4 scope:global align:4 +__dt__14J2DGrafContextFv = .text:0x802EBA70; // type:function size:0x48 scope:weak align:4 +place__14J2DGrafContextFffff = .text:0x802EBAB8; // type:function size:0x48 scope:weak align:4 +getGrafType__14J2DGrafContextCFv = .text:0x802EBB00; // type:function size:0x8 scope:weak align:4 +setLookat__14J2DGrafContextFv = .text:0x802EBB08; // type:function size:0x4 scope:weak align:4 __ct__13J2DOrthoGraphFv = .text:0x802EBB0C; // type:function size:0x60 scope:global align:4 __ct__13J2DOrthoGraphFffffff = .text:0x802EBB6C; // type:function size:0xE4 scope:global align:4 setPort__13J2DOrthoGraphFv = .text:0x802EBC50; // type:function size:0x58 scope:global align:4 @@ -13324,7 +13322,7 @@ J2DFillBox__FffffQ28JUtility6TColor = .text:0x802EBF60; // type:function size:0x J2DFillBox__FRCQ29JGeometry8TBox2Q28JUtility6TColor = .text:0x802EBFA8; // type:function size:0x90 scope:global align:4 J2DDrawFrame__FffffQ28JUtility6TColorUc = .text:0x802EC038; // type:function size:0x4C scope:global align:4 J2DDrawFrame__FRCQ29JGeometry8TBox2Q28JUtility6TColorUc = .text:0x802EC084; // type:function size:0xA0 scope:global align:4 -getGrafType__13J2DOrthoGraphCFv = .text:0x802EC124; // type:function size:0x8 scope:global align:4 +getGrafType__13J2DOrthoGraphCFv = .text:0x802EC124; // type:function size:0x8 scope:weak align:4 load__9J2DTexMtxFUl = .text:0x802EC12C; // type:function size:0x34 scope:global align:4 calc__9J2DTexMtxFv = .text:0x802EC160; // type:function size:0x68 scope:global align:4 getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f = .text:0x802EC1C8; // type:function size:0x190 scope:global align:4 @@ -13333,21 +13331,21 @@ load__14J2DIndTevStageFUc = .text:0x802EC4E0; // type:function size:0x54 scope:g load__12J2DIndTexMtxFUc = .text:0x802EC534; // type:function size:0x34 scope:global align:4 load__19J2DIndTexCoordScaleFUc = .text:0x802EC568; // type:function size:0x30 scope:global align:4 load__14J2DIndTexOrderFUc = .text:0x802EC598; // type:function size:0x30 scope:global align:4 -getTevSwapModeTable__11J2DTevBlockFUl = .text:0x802EC5C8; // type:function size:0x8 scope:global align:4 -getTevStage__11J2DTevBlockFUl = .text:0x802EC5D0; // type:function size:0x8 scope:global align:4 -getTevColor__11J2DTevBlockFUl = .text:0x802EC5D8; // type:function size:0x8 scope:global align:4 -getTevOrder__11J2DTevBlockFUl = .text:0x802EC5E0; // type:function size:0x8 scope:global align:4 -getTevKAlphaSel__11J2DTevBlockFUl = .text:0x802EC5E8; // type:function size:0x8 scope:global align:4 -getTevKColorSel__11J2DTevBlockFUl = .text:0x802EC5F0; // type:function size:0x8 scope:global align:4 -getTevKColor__11J2DTevBlockFUl = .text:0x802EC5F8; // type:function size:0x8 scope:global align:4 -getFontNo__11J2DTevBlockCFv = .text:0x802EC600; // type:function size:0xC scope:global align:4 -getTexNo__11J2DTevBlockCFUl = .text:0x802EC60C; // type:function size:0xC scope:global align:4 -getTevStageNum__11J2DTevBlockCFv = .text:0x802EC618; // type:function size:0x8 scope:global align:4 -getIndTevStage__11J2DTevBlockFUl = .text:0x802EC620; // type:function size:0x8 scope:global align:4 -getIndTexCoordScale__11J2DIndBlockFUl = .text:0x802EC628; // type:function size:0x8 scope:global align:4 -getIndTexMtx__11J2DIndBlockFUl = .text:0x802EC630; // type:function size:0x8 scope:global align:4 -getIndTexOrder__11J2DIndBlockFUl = .text:0x802EC638; // type:function size:0x8 scope:global align:4 -getIndTexStageNum__11J2DIndBlockCFv = .text:0x802EC640; // type:function size:0x8 scope:global align:4 +getTevSwapModeTable__11J2DTevBlockFUl = .text:0x802EC5C8; // type:function size:0x8 scope:weak align:4 +getTevStage__11J2DTevBlockFUl = .text:0x802EC5D0; // type:function size:0x8 scope:weak align:4 +getTevColor__11J2DTevBlockFUl = .text:0x802EC5D8; // type:function size:0x8 scope:weak align:4 +getTevOrder__11J2DTevBlockFUl = .text:0x802EC5E0; // type:function size:0x8 scope:weak align:4 +getTevKAlphaSel__11J2DTevBlockFUl = .text:0x802EC5E8; // type:function size:0x8 scope:weak align:4 +getTevKColorSel__11J2DTevBlockFUl = .text:0x802EC5F0; // type:function size:0x8 scope:weak align:4 +getTevKColor__11J2DTevBlockFUl = .text:0x802EC5F8; // type:function size:0x8 scope:weak align:4 +getFontNo__11J2DTevBlockCFv = .text:0x802EC600; // type:function size:0xC scope:weak align:4 +getTexNo__11J2DTevBlockCFUl = .text:0x802EC60C; // type:function size:0xC scope:weak align:4 +getTevStageNum__11J2DTevBlockCFv = .text:0x802EC618; // type:function size:0x8 scope:weak align:4 +getIndTevStage__11J2DTevBlockFUl = .text:0x802EC620; // type:function size:0x8 scope:weak align:4 +getIndTexCoordScale__11J2DIndBlockFUl = .text:0x802EC628; // type:function size:0x8 scope:weak align:4 +getIndTexMtx__11J2DIndBlockFUl = .text:0x802EC630; // type:function size:0x8 scope:weak align:4 +getIndTexOrder__11J2DIndBlockFUl = .text:0x802EC638; // type:function size:0x8 scope:weak align:4 +getIndTexStageNum__11J2DIndBlockCFv = .text:0x802EC640; // type:function size:0x8 scope:weak align:4 __ct__11J2DMaterialFv = .text:0x802EC648; // type:function size:0x120 scope:global align:4 __dt__11J2DMaterialFv = .text:0x802EC768; // type:function size:0xC0 scope:global align:4 setGX__11J2DMaterialFv = .text:0x802EC828; // type:function size:0x84 scope:global align:4 @@ -13472,202 +13470,202 @@ initialize__15J2DIndBlockFullFv = .text:0x802F3B00; // type:function size:0xCC s setGX__15J2DIndBlockFullFv = .text:0x802F3BCC; // type:function size:0xCC scope:global align:4 initialize__10J2DPEBlockFv = .text:0x802F3C98; // type:function size:0x44 scope:global align:4 setGX__10J2DPEBlockFv = .text:0x802F3CDC; // type:function size:0x60 scope:global align:4 -__ct__14J2DIndTevStageFv = .text:0x802F3D3C; // type:function size:0x94 scope:global align:4 -__ct__19J2DTevSwapModeTableFv = .text:0x802F3DD0; // type:function size:0xC scope:global align:4 -__ct__11J2DTevStageFv = .text:0x802F3DDC; // type:function size:0x68 scope:global align:4 -setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F3E44; // type:function size:0x1C8 scope:global align:4 -__ct__11J2DTevOrderFv = .text:0x802F400C; // type:function size:0x20 scope:global align:4 -__ct__13J2DGXColorS10Fv = .text:0x802F402C; // type:function size:0x4 scope:global align:4 -getType__15J2DIndBlockFullFv = .text:0x802F4030; // type:function size:0xC scope:global align:4 -setIndTexStageNum__15J2DIndBlockFullFUc = .text:0x802F403C; // type:function size:0x8 scope:global align:4 -getIndTexStageNum__15J2DIndBlockFullCFv = .text:0x802F4044; // type:function size:0x8 scope:global align:4 -setIndTexOrder__15J2DIndBlockFullFUl14J2DIndTexOrder = .text:0x802F404C; // type:function size:0x1C scope:global align:4 -getIndTexOrder__15J2DIndBlockFullFUl = .text:0x802F4068; // type:function size:0x14 scope:global align:4 -setIndTexMtx__15J2DIndBlockFullFUl12J2DIndTexMtx = .text:0x802F407C; // type:function size:0x58 scope:global align:4 -getIndTexMtx__15J2DIndBlockFullFUl = .text:0x802F40D4; // type:function size:0x14 scope:global align:4 -setIndTexCoordScale__15J2DIndBlockFullFUl19J2DIndTexCoordScale = .text:0x802F40E8; // type:function size:0x1C scope:global align:4 -getIndTexCoordScale__15J2DIndBlockFullFUl = .text:0x802F4104; // type:function size:0x14 scope:global align:4 -__dt__15J2DIndBlockFullFv = .text:0x802F4118; // type:function size:0x9C scope:global align:4 -getType__13J2DTevBlock16Fv = .text:0x802F41B4; // type:function size:0xC scope:global align:4 -getMaxStage__13J2DTevBlock16Fv = .text:0x802F41C0; // type:function size:0x8 scope:global align:4 -setTexNo__13J2DTevBlock16FUlUs = .text:0x802F41C8; // type:function size:0x10 scope:global align:4 -getTexNo__13J2DTevBlock16CFUl = .text:0x802F41D8; // type:function size:0x10 scope:global align:4 -setFontNo__13J2DTevBlock16FUs = .text:0x802F41E8; // type:function size:0x8 scope:global align:4 -getFontNo__13J2DTevBlock16CFv = .text:0x802F41F0; // type:function size:0x8 scope:global align:4 -setTevOrder__13J2DTevBlock16FUl11J2DTevOrder = .text:0x802F41F8; // type:function size:0x24 scope:global align:4 -getTevOrder__13J2DTevBlock16FUl = .text:0x802F421C; // type:function size:0x14 scope:global align:4 -setTevColor__13J2DTevBlock16FUl13J2DGXColorS10 = .text:0x802F4230; // type:function size:0x2C scope:global align:4 -getTevColor__13J2DTevBlock16FUl = .text:0x802F425C; // type:function size:0x14 scope:global align:4 -setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor = .text:0x802F4270; // type:function size:0x2C scope:global align:4 -getTevKColor__13J2DTevBlock16FUl = .text:0x802F429C; // type:function size:0x14 scope:global align:4 -setTevKColorSel__13J2DTevBlock16FUlUc = .text:0x802F42B0; // type:function size:0xC scope:global align:4 -getTevKColorSel__13J2DTevBlock16FUl = .text:0x802F42BC; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__13J2DTevBlock16FUlUc = .text:0x802F42C8; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__13J2DTevBlock16FUl = .text:0x802F42D4; // type:function size:0xC scope:global align:4 -setTevStageNum__13J2DTevBlock16FUc = .text:0x802F42E0; // type:function size:0x8 scope:global align:4 -getTevStageNum__13J2DTevBlock16CFv = .text:0x802F42E8; // type:function size:0x8 scope:global align:4 -setTevStage__13J2DTevBlock16FUl11J2DTevStage = .text:0x802F42F0; // type:function size:0x3C scope:global align:4 -getTevStage__13J2DTevBlock16FUl = .text:0x802F432C; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo = .text:0x802F4340; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable = .text:0x802F4378; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__13J2DTevBlock16FUl = .text:0x802F4388; // type:function size:0x10 scope:global align:4 -setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage = .text:0x802F4398; // type:function size:0x14 scope:global align:4 -getIndTevStage__13J2DTevBlock16FUl = .text:0x802F43AC; // type:function size:0x14 scope:global align:4 -insertTexture__13J2DTevBlock16FUlPC7ResTIMG = .text:0x802F43C0; // type:function size:0x30 scope:global align:4 -getTexture__13J2DTevBlock16FUl = .text:0x802F43F0; // type:function size:0x20 scope:global align:4 -getPalette__13J2DTevBlock16FUl = .text:0x802F4410; // type:function size:0x20 scope:global align:4 -getFont__13J2DTevBlock16Fv = .text:0x802F4430; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__13J2DTevBlock16FUc = .text:0x802F4438; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__13J2DTevBlock16Fv = .text:0x802F4448; // type:function size:0xC scope:global align:4 -getType__12J2DTevBlock8Fv = .text:0x802F4454; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock8Fv = .text:0x802F4460; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock8FUlUs = .text:0x802F4468; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock8CFUl = .text:0x802F4478; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock8FUs = .text:0x802F4488; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock8CFv = .text:0x802F4490; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock8FUl11J2DTevOrder = .text:0x802F4498; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock8FUl = .text:0x802F44BC; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock8FUl13J2DGXColorS10 = .text:0x802F44D0; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock8FUl = .text:0x802F44FC; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor = .text:0x802F4510; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock8FUl = .text:0x802F453C; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock8FUlUc = .text:0x802F4550; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock8FUl = .text:0x802F455C; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock8FUlUc = .text:0x802F4568; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock8FUl = .text:0x802F4574; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock8FUc = .text:0x802F4580; // type:function size:0x8 scope:global align:4 -getTevStageNum__12J2DTevBlock8CFv = .text:0x802F4588; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock8FUl11J2DTevStage = .text:0x802F4590; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock8FUl = .text:0x802F45CC; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo = .text:0x802F45E0; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable = .text:0x802F4618; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock8FUl = .text:0x802F4628; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage = .text:0x802F4638; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock8FUl = .text:0x802F464C; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock8FUlPC7ResTIMG = .text:0x802F4660; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock8FUl = .text:0x802F4690; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock8FUl = .text:0x802F46B0; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock8Fv = .text:0x802F46D0; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock8FUc = .text:0x802F46D8; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock8Fv = .text:0x802F46E8; // type:function size:0xC scope:global align:4 -getType__12J2DTevBlock4Fv = .text:0x802F46F4; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock4Fv = .text:0x802F4700; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock4FUlUs = .text:0x802F4708; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock4CFUl = .text:0x802F4718; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock4FUs = .text:0x802F4728; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock4CFv = .text:0x802F4730; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock4FUl11J2DTevOrder = .text:0x802F4738; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock4FUl = .text:0x802F475C; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock4FUl13J2DGXColorS10 = .text:0x802F4770; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock4FUl = .text:0x802F479C; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor = .text:0x802F47B0; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock4FUl = .text:0x802F47DC; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock4FUlUc = .text:0x802F47F0; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock4FUl = .text:0x802F47FC; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock4FUlUc = .text:0x802F4808; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock4FUl = .text:0x802F4814; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock4FUc = .text:0x802F4820; // type:function size:0x8 scope:global align:4 -getTevStageNum__12J2DTevBlock4CFv = .text:0x802F4828; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock4FUl11J2DTevStage = .text:0x802F4830; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock4FUl = .text:0x802F486C; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo = .text:0x802F4880; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable = .text:0x802F48B8; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock4FUl = .text:0x802F48C8; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage = .text:0x802F48D8; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock4FUl = .text:0x802F48EC; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock4FUlPC7ResTIMG = .text:0x802F4900; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock4FUl = .text:0x802F4930; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock4FUl = .text:0x802F4950; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock4Fv = .text:0x802F4970; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock4FUc = .text:0x802F4978; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock4Fv = .text:0x802F4988; // type:function size:0x10 scope:global align:4 -getType__12J2DTevBlock2Fv = .text:0x802F4998; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock2Fv = .text:0x802F49A4; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock2FUlUs = .text:0x802F49AC; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock2CFUl = .text:0x802F49BC; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock2FUs = .text:0x802F49CC; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock2CFv = .text:0x802F49D4; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock2FUl11J2DTevOrder = .text:0x802F49DC; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock2FUl = .text:0x802F4A00; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock2FUl13J2DGXColorS10 = .text:0x802F4A14; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock2FUl = .text:0x802F4A40; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor = .text:0x802F4A54; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock2FUl = .text:0x802F4A80; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock2FUlUc = .text:0x802F4A94; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock2FUl = .text:0x802F4AA0; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock2FUlUc = .text:0x802F4AAC; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock2FUl = .text:0x802F4AB8; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock2FUc = .text:0x802F4AC4; // type:function size:0x8 scope:global align:4 -getTevStageNum__12J2DTevBlock2CFv = .text:0x802F4ACC; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock2FUl11J2DTevStage = .text:0x802F4AD4; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock2FUl = .text:0x802F4B10; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo = .text:0x802F4B24; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable = .text:0x802F4B5C; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock2FUl = .text:0x802F4B6C; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage = .text:0x802F4B7C; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock2FUl = .text:0x802F4B90; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock2FUlPC7ResTIMG = .text:0x802F4BA4; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock2FUl = .text:0x802F4BD4; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock2FUl = .text:0x802F4BF4; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock2Fv = .text:0x802F4C14; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock2FUc = .text:0x802F4C1C; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock2Fv = .text:0x802F4C2C; // type:function size:0x10 scope:global align:4 -getType__12J2DTevBlock1Fv = .text:0x802F4C3C; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock1Fv = .text:0x802F4C48; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock1FUlUs = .text:0x802F4C50; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock1CFUl = .text:0x802F4C60; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock1FUs = .text:0x802F4C70; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock1CFv = .text:0x802F4C78; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock1FUl11J2DTevOrder = .text:0x802F4C80; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock1FUl = .text:0x802F4CA4; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock1FUl13J2DGXColorS10 = .text:0x802F4CB8; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock1FUl = .text:0x802F4CE4; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor = .text:0x802F4CF8; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock1FUl = .text:0x802F4D24; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock1FUlUc = .text:0x802F4D38; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock1FUl = .text:0x802F4D44; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock1FUlUc = .text:0x802F4D50; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock1FUl = .text:0x802F4D5C; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock1FUc = .text:0x802F4D68; // type:function size:0x4 scope:global align:4 -getTevStageNum__12J2DTevBlock1CFv = .text:0x802F4D6C; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock1FUl11J2DTevStage = .text:0x802F4D74; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock1FUl = .text:0x802F4DB0; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo = .text:0x802F4DC4; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable = .text:0x802F4DFC; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock1FUl = .text:0x802F4E0C; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage = .text:0x802F4E1C; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock1FUl = .text:0x802F4E30; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock1FUlPC7ResTIMG = .text:0x802F4E44; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock1FUl = .text:0x802F4E74; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock1FUl = .text:0x802F4E94; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock1Fv = .text:0x802F4EB4; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock1FUc = .text:0x802F4EBC; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock1Fv = .text:0x802F4ECC; // type:function size:0x10 scope:global align:4 -initialize__11J2DTevBlockFv = .text:0x802F4EDC; // type:function size:0x4 scope:global align:4 -loadTexture__11J2DTevBlockF11_GXTexMapIDUl = .text:0x802F4EE0; // type:function size:0x4 scope:global align:4 -setFontNo__11J2DTevBlockFUs = .text:0x802F4EE4; // type:function size:0x4 scope:global align:4 -setTevOrder__11J2DTevBlockFUl11J2DTevOrder = .text:0x802F4EE8; // type:function size:0x4 scope:global align:4 -setTevKColorSel__11J2DTevBlockFUlUc = .text:0x802F4EEC; // type:function size:0x4 scope:global align:4 -setTevKAlphaSel__11J2DTevBlockFUlUc = .text:0x802F4EF0; // type:function size:0x4 scope:global align:4 -setTevStageNum__11J2DTevBlockFUc = .text:0x802F4EF4; // type:function size:0x4 scope:global align:4 -setTevStage__11J2DTevBlockFUl11J2DTevStage = .text:0x802F4EF8; // type:function size:0x4 scope:global align:4 -setTevSwapModeInfo__11J2DTevBlockFUl18J2DTevSwapModeInfo = .text:0x802F4EFC; // type:function size:0x4 scope:global align:4 -setTevSwapModeTable__11J2DTevBlockFUl19J2DTevSwapModeTable = .text:0x802F4F00; // type:function size:0x4 scope:global align:4 -setIndTevStage__11J2DTevBlockFUl14J2DIndTevStage = .text:0x802F4F04; // type:function size:0x4 scope:global align:4 -insertTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F4F08; // type:function size:0x8 scope:global align:4 -insertTexture__11J2DTevBlockFUlPC7ResTIMGP10JUTPalette = .text:0x802F4F10; // type:function size:0x8 scope:global align:4 -insertTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F4F18; // type:function size:0x8 scope:global align:4 -setTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F4F20; // type:function size:0x8 scope:global align:4 -setTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F4F28; // type:function size:0x8 scope:global align:4 -removeTexture__11J2DTevBlockFUl = .text:0x802F4F30; // type:function size:0x8 scope:global align:4 -setFont__11J2DTevBlockFP7JUTFont = .text:0x802F4F38; // type:function size:0x8 scope:global align:4 -setFont__11J2DTevBlockFP7ResFONT = .text:0x802F4F40; // type:function size:0x8 scope:global align:4 -setPalette__11J2DTevBlockFUlPC7ResTLUT = .text:0x802F4F48; // type:function size:0x8 scope:global align:4 -prepareTexture__11J2DTevBlockFUc = .text:0x802F4F50; // type:function size:0x8 scope:global align:4 -getFont__11J2DTevBlockFv = .text:0x802F4F58; // type:function size:0x8 scope:global align:4 -shiftDeleteFlag__11J2DTevBlockFUcb = .text:0x802F4F60; // type:function size:0x4 scope:global align:4 -setUndeleteFlag__11J2DTevBlockFUc = .text:0x802F4F64; // type:function size:0x4 scope:global align:4 -setFontUndeleteFlag__11J2DTevBlockFv = .text:0x802F4F68; // type:function size:0x4 scope:global align:4 +__ct__14J2DIndTevStageFv = .text:0x802F3D3C; // type:function size:0x94 scope:weak align:4 +__ct__19J2DTevSwapModeTableFv = .text:0x802F3DD0; // type:function size:0xC scope:weak align:4 +__ct__11J2DTevStageFv = .text:0x802F3DDC; // type:function size:0x68 scope:weak align:4 +setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F3E44; // type:function size:0x1C8 scope:weak align:4 +__ct__11J2DTevOrderFv = .text:0x802F400C; // type:function size:0x20 scope:weak align:4 +__ct__13J2DGXColorS10Fv = .text:0x802F402C; // type:function size:0x4 scope:weak align:4 +getType__15J2DIndBlockFullFv = .text:0x802F4030; // type:function size:0xC scope:weak align:4 +setIndTexStageNum__15J2DIndBlockFullFUc = .text:0x802F403C; // type:function size:0x8 scope:weak align:4 +getIndTexStageNum__15J2DIndBlockFullCFv = .text:0x802F4044; // type:function size:0x8 scope:weak align:4 +setIndTexOrder__15J2DIndBlockFullFUl14J2DIndTexOrder = .text:0x802F404C; // type:function size:0x1C scope:weak align:4 +getIndTexOrder__15J2DIndBlockFullFUl = .text:0x802F4068; // type:function size:0x14 scope:weak align:4 +setIndTexMtx__15J2DIndBlockFullFUl12J2DIndTexMtx = .text:0x802F407C; // type:function size:0x58 scope:weak align:4 +getIndTexMtx__15J2DIndBlockFullFUl = .text:0x802F40D4; // type:function size:0x14 scope:weak align:4 +setIndTexCoordScale__15J2DIndBlockFullFUl19J2DIndTexCoordScale = .text:0x802F40E8; // type:function size:0x1C scope:weak align:4 +getIndTexCoordScale__15J2DIndBlockFullFUl = .text:0x802F4104; // type:function size:0x14 scope:weak align:4 +__dt__15J2DIndBlockFullFv = .text:0x802F4118; // type:function size:0x9C scope:weak align:4 +getType__13J2DTevBlock16Fv = .text:0x802F41B4; // type:function size:0xC scope:weak align:4 +getMaxStage__13J2DTevBlock16Fv = .text:0x802F41C0; // type:function size:0x8 scope:weak align:4 +setTexNo__13J2DTevBlock16FUlUs = .text:0x802F41C8; // type:function size:0x10 scope:weak align:4 +getTexNo__13J2DTevBlock16CFUl = .text:0x802F41D8; // type:function size:0x10 scope:weak align:4 +setFontNo__13J2DTevBlock16FUs = .text:0x802F41E8; // type:function size:0x8 scope:weak align:4 +getFontNo__13J2DTevBlock16CFv = .text:0x802F41F0; // type:function size:0x8 scope:weak align:4 +setTevOrder__13J2DTevBlock16FUl11J2DTevOrder = .text:0x802F41F8; // type:function size:0x24 scope:weak align:4 +getTevOrder__13J2DTevBlock16FUl = .text:0x802F421C; // type:function size:0x14 scope:weak align:4 +setTevColor__13J2DTevBlock16FUl13J2DGXColorS10 = .text:0x802F4230; // type:function size:0x2C scope:weak align:4 +getTevColor__13J2DTevBlock16FUl = .text:0x802F425C; // type:function size:0x14 scope:weak align:4 +setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor = .text:0x802F4270; // type:function size:0x2C scope:weak align:4 +getTevKColor__13J2DTevBlock16FUl = .text:0x802F429C; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__13J2DTevBlock16FUlUc = .text:0x802F42B0; // type:function size:0xC scope:weak align:4 +getTevKColorSel__13J2DTevBlock16FUl = .text:0x802F42BC; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__13J2DTevBlock16FUlUc = .text:0x802F42C8; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__13J2DTevBlock16FUl = .text:0x802F42D4; // type:function size:0xC scope:weak align:4 +setTevStageNum__13J2DTevBlock16FUc = .text:0x802F42E0; // type:function size:0x8 scope:weak align:4 +getTevStageNum__13J2DTevBlock16CFv = .text:0x802F42E8; // type:function size:0x8 scope:weak align:4 +setTevStage__13J2DTevBlock16FUl11J2DTevStage = .text:0x802F42F0; // type:function size:0x3C scope:weak align:4 +getTevStage__13J2DTevBlock16FUl = .text:0x802F432C; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo = .text:0x802F4340; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable = .text:0x802F4378; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__13J2DTevBlock16FUl = .text:0x802F4388; // type:function size:0x10 scope:weak align:4 +setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage = .text:0x802F4398; // type:function size:0x14 scope:weak align:4 +getIndTevStage__13J2DTevBlock16FUl = .text:0x802F43AC; // type:function size:0x14 scope:weak align:4 +insertTexture__13J2DTevBlock16FUlPC7ResTIMG = .text:0x802F43C0; // type:function size:0x30 scope:weak align:4 +getTexture__13J2DTevBlock16FUl = .text:0x802F43F0; // type:function size:0x20 scope:weak align:4 +getPalette__13J2DTevBlock16FUl = .text:0x802F4410; // type:function size:0x20 scope:weak align:4 +getFont__13J2DTevBlock16Fv = .text:0x802F4430; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__13J2DTevBlock16FUc = .text:0x802F4438; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__13J2DTevBlock16Fv = .text:0x802F4448; // type:function size:0xC scope:weak align:4 +getType__12J2DTevBlock8Fv = .text:0x802F4454; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock8Fv = .text:0x802F4460; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock8FUlUs = .text:0x802F4468; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock8CFUl = .text:0x802F4478; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock8FUs = .text:0x802F4488; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock8CFv = .text:0x802F4490; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock8FUl11J2DTevOrder = .text:0x802F4498; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock8FUl = .text:0x802F44BC; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock8FUl13J2DGXColorS10 = .text:0x802F44D0; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock8FUl = .text:0x802F44FC; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor = .text:0x802F4510; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock8FUl = .text:0x802F453C; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock8FUlUc = .text:0x802F4550; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock8FUl = .text:0x802F455C; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock8FUlUc = .text:0x802F4568; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock8FUl = .text:0x802F4574; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock8FUc = .text:0x802F4580; // type:function size:0x8 scope:weak align:4 +getTevStageNum__12J2DTevBlock8CFv = .text:0x802F4588; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock8FUl11J2DTevStage = .text:0x802F4590; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock8FUl = .text:0x802F45CC; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo = .text:0x802F45E0; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable = .text:0x802F4618; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock8FUl = .text:0x802F4628; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage = .text:0x802F4638; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock8FUl = .text:0x802F464C; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock8FUlPC7ResTIMG = .text:0x802F4660; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock8FUl = .text:0x802F4690; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock8FUl = .text:0x802F46B0; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock8Fv = .text:0x802F46D0; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock8FUc = .text:0x802F46D8; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock8Fv = .text:0x802F46E8; // type:function size:0xC scope:weak align:4 +getType__12J2DTevBlock4Fv = .text:0x802F46F4; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock4Fv = .text:0x802F4700; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock4FUlUs = .text:0x802F4708; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock4CFUl = .text:0x802F4718; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock4FUs = .text:0x802F4728; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock4CFv = .text:0x802F4730; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock4FUl11J2DTevOrder = .text:0x802F4738; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock4FUl = .text:0x802F475C; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock4FUl13J2DGXColorS10 = .text:0x802F4770; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock4FUl = .text:0x802F479C; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor = .text:0x802F47B0; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock4FUl = .text:0x802F47DC; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock4FUlUc = .text:0x802F47F0; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock4FUl = .text:0x802F47FC; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock4FUlUc = .text:0x802F4808; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock4FUl = .text:0x802F4814; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock4FUc = .text:0x802F4820; // type:function size:0x8 scope:weak align:4 +getTevStageNum__12J2DTevBlock4CFv = .text:0x802F4828; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock4FUl11J2DTevStage = .text:0x802F4830; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock4FUl = .text:0x802F486C; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo = .text:0x802F4880; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable = .text:0x802F48B8; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock4FUl = .text:0x802F48C8; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage = .text:0x802F48D8; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock4FUl = .text:0x802F48EC; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock4FUlPC7ResTIMG = .text:0x802F4900; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock4FUl = .text:0x802F4930; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock4FUl = .text:0x802F4950; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock4Fv = .text:0x802F4970; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock4FUc = .text:0x802F4978; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock4Fv = .text:0x802F4988; // type:function size:0x10 scope:weak align:4 +getType__12J2DTevBlock2Fv = .text:0x802F4998; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock2Fv = .text:0x802F49A4; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock2FUlUs = .text:0x802F49AC; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock2CFUl = .text:0x802F49BC; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock2FUs = .text:0x802F49CC; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock2CFv = .text:0x802F49D4; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock2FUl11J2DTevOrder = .text:0x802F49DC; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock2FUl = .text:0x802F4A00; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock2FUl13J2DGXColorS10 = .text:0x802F4A14; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock2FUl = .text:0x802F4A40; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor = .text:0x802F4A54; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock2FUl = .text:0x802F4A80; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock2FUlUc = .text:0x802F4A94; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock2FUl = .text:0x802F4AA0; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock2FUlUc = .text:0x802F4AAC; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock2FUl = .text:0x802F4AB8; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock2FUc = .text:0x802F4AC4; // type:function size:0x8 scope:weak align:4 +getTevStageNum__12J2DTevBlock2CFv = .text:0x802F4ACC; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock2FUl11J2DTevStage = .text:0x802F4AD4; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock2FUl = .text:0x802F4B10; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo = .text:0x802F4B24; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable = .text:0x802F4B5C; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock2FUl = .text:0x802F4B6C; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage = .text:0x802F4B7C; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock2FUl = .text:0x802F4B90; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock2FUlPC7ResTIMG = .text:0x802F4BA4; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock2FUl = .text:0x802F4BD4; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock2FUl = .text:0x802F4BF4; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock2Fv = .text:0x802F4C14; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock2FUc = .text:0x802F4C1C; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock2Fv = .text:0x802F4C2C; // type:function size:0x10 scope:weak align:4 +getType__12J2DTevBlock1Fv = .text:0x802F4C3C; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock1Fv = .text:0x802F4C48; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock1FUlUs = .text:0x802F4C50; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock1CFUl = .text:0x802F4C60; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock1FUs = .text:0x802F4C70; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock1CFv = .text:0x802F4C78; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock1FUl11J2DTevOrder = .text:0x802F4C80; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock1FUl = .text:0x802F4CA4; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock1FUl13J2DGXColorS10 = .text:0x802F4CB8; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock1FUl = .text:0x802F4CE4; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor = .text:0x802F4CF8; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock1FUl = .text:0x802F4D24; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock1FUlUc = .text:0x802F4D38; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock1FUl = .text:0x802F4D44; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock1FUlUc = .text:0x802F4D50; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock1FUl = .text:0x802F4D5C; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock1FUc = .text:0x802F4D68; // type:function size:0x4 scope:weak align:4 +getTevStageNum__12J2DTevBlock1CFv = .text:0x802F4D6C; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock1FUl11J2DTevStage = .text:0x802F4D74; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock1FUl = .text:0x802F4DB0; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo = .text:0x802F4DC4; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable = .text:0x802F4DFC; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock1FUl = .text:0x802F4E0C; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage = .text:0x802F4E1C; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock1FUl = .text:0x802F4E30; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock1FUlPC7ResTIMG = .text:0x802F4E44; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock1FUl = .text:0x802F4E74; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock1FUl = .text:0x802F4E94; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock1Fv = .text:0x802F4EB4; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock1FUc = .text:0x802F4EBC; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock1Fv = .text:0x802F4ECC; // type:function size:0x10 scope:weak align:4 +initialize__11J2DTevBlockFv = .text:0x802F4EDC; // type:function size:0x4 scope:weak align:4 +loadTexture__11J2DTevBlockF11_GXTexMapIDUl = .text:0x802F4EE0; // type:function size:0x4 scope:weak align:4 +setFontNo__11J2DTevBlockFUs = .text:0x802F4EE4; // type:function size:0x4 scope:weak align:4 +setTevOrder__11J2DTevBlockFUl11J2DTevOrder = .text:0x802F4EE8; // type:function size:0x4 scope:weak align:4 +setTevKColorSel__11J2DTevBlockFUlUc = .text:0x802F4EEC; // type:function size:0x4 scope:weak align:4 +setTevKAlphaSel__11J2DTevBlockFUlUc = .text:0x802F4EF0; // type:function size:0x4 scope:weak align:4 +setTevStageNum__11J2DTevBlockFUc = .text:0x802F4EF4; // type:function size:0x4 scope:weak align:4 +setTevStage__11J2DTevBlockFUl11J2DTevStage = .text:0x802F4EF8; // type:function size:0x4 scope:weak align:4 +setTevSwapModeInfo__11J2DTevBlockFUl18J2DTevSwapModeInfo = .text:0x802F4EFC; // type:function size:0x4 scope:weak align:4 +setTevSwapModeTable__11J2DTevBlockFUl19J2DTevSwapModeTable = .text:0x802F4F00; // type:function size:0x4 scope:weak align:4 +setIndTevStage__11J2DTevBlockFUl14J2DIndTevStage = .text:0x802F4F04; // type:function size:0x4 scope:weak align:4 +insertTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F4F08; // type:function size:0x8 scope:weak align:4 +insertTexture__11J2DTevBlockFUlPC7ResTIMGP10JUTPalette = .text:0x802F4F10; // type:function size:0x8 scope:weak align:4 +insertTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F4F18; // type:function size:0x8 scope:weak align:4 +setTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F4F20; // type:function size:0x8 scope:weak align:4 +setTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F4F28; // type:function size:0x8 scope:weak align:4 +removeTexture__11J2DTevBlockFUl = .text:0x802F4F30; // type:function size:0x8 scope:weak align:4 +setFont__11J2DTevBlockFP7JUTFont = .text:0x802F4F38; // type:function size:0x8 scope:weak align:4 +setFont__11J2DTevBlockFP7ResFONT = .text:0x802F4F40; // type:function size:0x8 scope:weak align:4 +setPalette__11J2DTevBlockFUlPC7ResTLUT = .text:0x802F4F48; // type:function size:0x8 scope:weak align:4 +prepareTexture__11J2DTevBlockFUc = .text:0x802F4F50; // type:function size:0x8 scope:weak align:4 +getFont__11J2DTevBlockFv = .text:0x802F4F58; // type:function size:0x8 scope:weak align:4 +shiftDeleteFlag__11J2DTevBlockFUcb = .text:0x802F4F60; // type:function size:0x4 scope:weak align:4 +setUndeleteFlag__11J2DTevBlockFUc = .text:0x802F4F64; // type:function size:0x4 scope:weak align:4 +setFontUndeleteFlag__11J2DTevBlockFv = .text:0x802F4F68; // type:function size:0x4 scope:weak align:4 __ct__18J2DMaterialFactoryFRC16J2DMaterialBlock = .text:0x802F4F6C; // type:function size:0x1C4 scope:global align:4 countStages__18J2DMaterialFactoryCFi = .text:0x802F5130; // type:function size:0x88 scope:global align:4 create__18J2DMaterialFactoryCFP11J2DMaterialiUlP15J2DResReferenceP15J2DResReferenceP10JKRArchive = .text:0x802F51B8; // type:function size:0x910 scope:global align:4 @@ -13694,23 +13692,23 @@ newIndTexCoordScale__18J2DMaterialFactoryCFii = .text:0x802F6414; // type:functi newAlphaComp__18J2DMaterialFactoryCFi = .text:0x802F647C; // type:function size:0x7C scope:global align:4 newBlend__18J2DMaterialFactoryCFi = .text:0x802F64F8; // type:function size:0x7C scope:global align:4 newDither__18J2DMaterialFactoryCFi = .text:0x802F6574; // type:function size:0x38 scope:global align:4 -__ct__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F65AC; // type:function size:0x60 scope:global align:4 -JSUConvertOffsetToPtr<12J2DBlendInfo>__FPCvPCv = .text:0x802F660C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J2DAlphaCompInfo>__FPCvPCv = .text:0x802F6624; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J2DTevSwapModeTableInfo>__FPCvPCv = .text:0x802F663C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J2DTevSwapModeInfo>__FPCvPCv = .text:0x802F6654; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J2DTevStageInfo>__FPCvPCv = .text:0x802F666C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<11_GXColorS10>__FPCvPCv = .text:0x802F6684; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J2DTevOrderInfo>__FPCvPCv = .text:0x802F669C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<13J2DTexMtxInfo>__FPCvPCv = .text:0x802F66B4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J2DTexCoordInfo>__FPCvPCv = .text:0x802F66CC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J2DColorChanInfo>__FPCvPCv = .text:0x802F66E4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F66FC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<8_GXColor>__FPCvPCv = .text:0x802F6714; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<11_GXCullMode>__FPCvPCv = .text:0x802F672C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<14J2DIndInitData>__FPCvPCv = .text:0x802F6744; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F675C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J2DMaterialInitData>__FPCvPCv = .text:0x802F6774; // type:function size:0x18 scope:global align:4 +__ct__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F65AC; // type:function size:0x60 scope:weak align:4 +JSUConvertOffsetToPtr<12J2DBlendInfo>__FPCvPCv = .text:0x802F660C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J2DAlphaCompInfo>__FPCvPCv = .text:0x802F6624; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J2DTevSwapModeTableInfo>__FPCvPCv = .text:0x802F663C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J2DTevSwapModeInfo>__FPCvPCv = .text:0x802F6654; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J2DTevStageInfo>__FPCvPCv = .text:0x802F666C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<11_GXColorS10>__FPCvPCv = .text:0x802F6684; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J2DTevOrderInfo>__FPCvPCv = .text:0x802F669C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<13J2DTexMtxInfo>__FPCvPCv = .text:0x802F66B4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J2DTexCoordInfo>__FPCvPCv = .text:0x802F66CC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J2DColorChanInfo>__FPCvPCv = .text:0x802F66E4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F66FC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<8_GXColor>__FPCvPCv = .text:0x802F6714; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<11_GXCullMode>__FPCvPCv = .text:0x802F672C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<14J2DIndInitData>__FPCvPCv = .text:0x802F6744; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F675C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J2DMaterialInitData>__FPCvPCv = .text:0x802F6774; // type:function size:0x18 scope:weak align:4 J2DPrint_print_alpha_va = .text:0x802F678C; // type:function size:0xA4 scope:global align:4 __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor = .text:0x802F6830; // type:function size:0x8C scope:global align:4 __dt__8J2DPrintFv = .text:0x802F68BC; // type:function size:0x48 scope:global align:4 @@ -13878,26 +13876,26 @@ setTexCoord__10J2DPictureFPQ29JGeometry8TVec2PC10JUTTexture10J2DBinding9J2DMi isUsed__10J2DPictureFPC7ResTIMG = .text:0x80301538; // type:function size:0x64 scope:global align:4 getUsableTlut__10J2DPictureFUc = .text:0x8030159C; // type:function size:0xD0 scope:global align:4 getTlutID__10J2DPictureFPC7ResTIMGUc = .text:0x8030166C; // type:function size:0x34 scope:global align:4 -__ct__Q29JGeometry8TVec2Fv = .text:0x803016A0; // type:function size:0x4 scope:global align:4 -append__10J2DPictureFP10JUTTexturef = .text:0x803016A4; // type:function size:0x30 scope:global align:4 -append__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x803016D4; // type:function size:0x30 scope:global align:4 -load__10J2DPictureFUc = .text:0x80301704; // type:function size:0x34 scope:global align:4 -load__10J2DPictureF11_GXTexMapIDUc = .text:0x80301738; // type:function size:0x4C scope:global align:4 -getTypeID__10J2DPictureCFv = .text:0x80301784; // type:function size:0x8 scope:global align:4 -append__10J2DPictureFPCcP10JUTPalettef = .text:0x8030178C; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFP10JUTTexturef = .text:0x803017BC; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPCcP10JUTPalettef = .text:0x803017EC; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPCcf = .text:0x8030181C; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x8030184C; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPC7ResTIMGf = .text:0x8030187C; // type:function size:0x30 scope:global align:4 -remove__10J2DPictureFv = .text:0x803018AC; // type:function size:0x38 scope:global align:4 -draw__10J2DPictureFffUcbbb = .text:0x803018E4; // type:function size:0x98 scope:global align:4 -draw__10J2DPictureFffbbb = .text:0x8030197C; // type:function size:0x44 scope:global align:4 -drawOut__10J2DPictureFffffffff = .text:0x803019C0; // type:function size:0x64 scope:global align:4 -drawOut__10J2DPictureFffffff = .text:0x80301A24; // type:function size:0xAC scope:global align:4 -getTextureCount__10J2DPictureCFv = .text:0x80301AD0; // type:function size:0x8 scope:global align:4 -isUsed__10J2DPictureFPC7ResFONT = .text:0x80301AD8; // type:function size:0x20 scope:global align:4 -rewriteAlpha__10J2DPictureFv = .text:0x80301AF8; // type:function size:0x4 scope:global align:4 +__ct__Q29JGeometry8TVec2Fv = .text:0x803016A0; // type:function size:0x4 scope:weak align:4 +append__10J2DPictureFP10JUTTexturef = .text:0x803016A4; // type:function size:0x30 scope:weak align:4 +append__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x803016D4; // type:function size:0x30 scope:weak align:4 +load__10J2DPictureFUc = .text:0x80301704; // type:function size:0x34 scope:weak align:4 +load__10J2DPictureF11_GXTexMapIDUc = .text:0x80301738; // type:function size:0x4C scope:weak align:4 +getTypeID__10J2DPictureCFv = .text:0x80301784; // type:function size:0x8 scope:weak align:4 +append__10J2DPictureFPCcP10JUTPalettef = .text:0x8030178C; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFP10JUTTexturef = .text:0x803017BC; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPCcP10JUTPalettef = .text:0x803017EC; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPCcf = .text:0x8030181C; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x8030184C; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPC7ResTIMGf = .text:0x8030187C; // type:function size:0x30 scope:weak align:4 +remove__10J2DPictureFv = .text:0x803018AC; // type:function size:0x38 scope:weak align:4 +draw__10J2DPictureFffUcbbb = .text:0x803018E4; // type:function size:0x98 scope:weak align:4 +draw__10J2DPictureFffbbb = .text:0x8030197C; // type:function size:0x44 scope:weak align:4 +drawOut__10J2DPictureFffffffff = .text:0x803019C0; // type:function size:0x64 scope:weak align:4 +drawOut__10J2DPictureFffffff = .text:0x80301A24; // type:function size:0xAC scope:weak align:4 +getTextureCount__10J2DPictureCFv = .text:0x80301AD0; // type:function size:0x8 scope:weak align:4 +isUsed__10J2DPictureFPC7ResFONT = .text:0x80301AD8; // type:function size:0x20 scope:weak align:4 +rewriteAlpha__10J2DPictureFv = .text:0x80301AF8; // type:function size:0x4 scope:weak align:4 __ct__10J2DTextBoxFv = .text:0x80301AFC; // type:function size:0x78 scope:global align:4 __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive = .text:0x80301B74; // type:function size:0x84 scope:global align:4 __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial = .text:0x80301BF8; // type:function size:0x468 scope:global align:4 @@ -13959,7 +13957,7 @@ draw__11J2DWindowExFffff = .text:0x80305A04; // type:function size:0x58 scope:gl setCullBack__11J2DWindowExFb = .text:0x80305A5C; // type:function size:0x3C scope:global align:4 isUsed__11J2DWindowExFPC7ResFONT = .text:0x80305A98; // type:function size:0x20 scope:global align:4 setAnimation__11J2DWindowExFP10J2DAnmBase = .text:0x80305AB8; // type:function size:0x20 scope:global align:4 -getColor__14J2DAnmVtxColorCFUcUsP8_GXColor = .text:0x80305AD8; // type:function size:0x4 scope:global align:4 +getColor__14J2DAnmVtxColorCFUcUsP8_GXColor = .text:0x80305AD8; // type:function size:0x4 scope:weak align:4 initiate__12J2DPictureExFPC7ResTIMGPC7ResTLUT = .text:0x80305ADC; // type:function size:0xAC scope:global align:4 __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial = .text:0x80305B88; // type:function size:0x250 scope:global align:4 __dt__12J2DPictureExFv = .text:0x80305DD8; // type:function size:0x90 scope:global align:4 @@ -14093,22 +14091,22 @@ readAnmVisibility__20J2DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData = .text:0 setAnmVisibility__20J2DAnmFullLoader_v15FP20J2DAnmVisibilityFullPC24J3DAnmVisibilityFullData = .text:0x8030C654; // type:function size:0x7C scope:global align:4 readAnmVtxColor__20J2DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData = .text:0x8030C6D0; // type:function size:0x28 scope:global align:4 setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFullData = .text:0x8030C6F8; // type:function size:0xFC scope:global align:4 -__dt__14J2DAnmVtxColorFv = .text:0x8030C7F4; // type:function size:0x5C scope:global align:4 -__dt__20J2DAnmVisibilityFullFv = .text:0x8030C850; // type:function size:0x5C scope:global align:4 -__dt__12J2DAnmLoaderFv = .text:0x8030C8AC; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<25J3DAnmVisibilityFullTable>__FPCvPCv = .text:0x8030C8F4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DAnmKRegKeyTable>__FPCvPCv = .text:0x8030C90C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DAnmCRegKeyTable>__FPCvPCv = .text:0x8030C924; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<25J3DAnmTexPatternFullTable>__FPCvPCv = .text:0x8030C93C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<20J3DAnmColorFullTable>__FPCvPCv = .text:0x8030C954; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<24J3DAnmTransformFullTable>__FPCvPCv = .text:0x8030C96C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J3DAnmVtxColorIndexData>__FPCvPCv = .text:0x8030C984; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J3DAnmColorKeyTable>__FPCvPCv = .text:0x8030C99C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<3Vec>__FPCvPCv = .text:0x8030C9B4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<7ResNTAB>__FPCvPCv = .text:0x8030C9CC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030C9E4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030C9FC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J3DAnmTransformKeyTable>__FPCvPCv = .text:0x8030CA14; // type:function size:0x18 scope:global align:4 +__dt__14J2DAnmVtxColorFv = .text:0x8030C7F4; // type:function size:0x5C scope:weak align:4 +__dt__20J2DAnmVisibilityFullFv = .text:0x8030C850; // type:function size:0x5C scope:weak align:4 +__dt__12J2DAnmLoaderFv = .text:0x8030C8AC; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<25J3DAnmVisibilityFullTable>__FPCvPCv = .text:0x8030C8F4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DAnmKRegKeyTable>__FPCvPCv = .text:0x8030C90C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DAnmCRegKeyTable>__FPCvPCv = .text:0x8030C924; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<25J3DAnmTexPatternFullTable>__FPCvPCv = .text:0x8030C93C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<20J3DAnmColorFullTable>__FPCvPCv = .text:0x8030C954; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<24J3DAnmTransformFullTable>__FPCvPCv = .text:0x8030C96C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J3DAnmVtxColorIndexData>__FPCvPCv = .text:0x8030C984; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J3DAnmColorKeyTable>__FPCvPCv = .text:0x8030C99C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<3Vec>__FPCvPCv = .text:0x8030C9B4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<7ResNTAB>__FPCvPCv = .text:0x8030C9CC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030C9E4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030C9FC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J3DAnmTransformKeyTable>__FPCvPCv = .text:0x8030CA14; // type:function size:0x18 scope:weak align:4 getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo = .text:0x8030CA2C; // type:function size:0x56C scope:global align:4 calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo = .text:0x8030CF98; // type:function size:0x428 scope:global align:4 searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen = .text:0x8030D3C0; // type:function size:0xA4 scope:global align:4 @@ -14126,16 +14124,16 @@ getVisibility__20J2DAnmVisibilityFullCFUsPUc = .text:0x8030E4E4; // type:functio getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10 = .text:0x8030E58C; // type:function size:0x2C4 scope:global align:4 getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor = .text:0x8030E850; // type:function size:0x2C4 scope:global align:4 searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen = .text:0x8030EB14; // type:function size:0x104 scope:global align:4 -J2DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs = .text:0x8030EC18; // type:function size:0x234 scope:global align:4 -J2DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf = .text:0x8030EE4C; // type:function size:0x17C scope:global align:4 +J2DGetKeyFrameInterpolations__FfP18J3DAnmKeyTableBasePs = .text:0x8030EC18; // type:function size:0x234 scope:global align:4 +J2DGetKeyFrameInterpolationf__FfP18J3DAnmKeyTableBasePf = .text:0x8030EE4C; // type:function size:0x17C scope:global align:4 __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv = .text:0x8030EFC8; // type:function size:0x10 scope:global align:4 __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv = .text:0x8030EFD8; // type:function size:0x54 scope:global align:4 -__dt__16J2DAnmTexPatternFv = .text:0x8030F02C; // type:function size:0x90 scope:global align:4 -__dt__17J2DAnmVtxColorKeyFv = .text:0x8030F0BC; // type:function size:0x6C scope:global align:4 -__dt__18J2DAnmVtxColorFullFv = .text:0x8030F128; // type:function size:0x6C scope:global align:4 -__dt__15J2DAnmColorFullFv = .text:0x8030F194; // type:function size:0x84 scope:global align:4 -getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8030F218; // type:function size:0x30 scope:global align:4 -__dt__19J2DAnmTransformFullFv = .text:0x8030F248; // type:function size:0x6C scope:global align:4 +__dt__16J2DAnmTexPatternFv = .text:0x8030F02C; // type:function size:0x90 scope:weak align:4 +__dt__17J2DAnmVtxColorKeyFv = .text:0x8030F0BC; // type:function size:0x6C scope:weak align:4 +__dt__18J2DAnmVtxColorFullFv = .text:0x8030F128; // type:function size:0x6C scope:weak align:4 +__dt__15J2DAnmColorFullFv = .text:0x8030F194; // type:function size:0x84 scope:weak align:4 +getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8030F218; // type:function size:0x30 scope:weak align:4 +__dt__19J2DAnmTransformFullFv = .text:0x8030F248; // type:function size:0x6C scope:weak align:4 get__13J2DDataManageFPCc = .text:0x8030F2B4; // type:function size:0x64 scope:global align:4 get__13J2DDataManageFP14JSUInputStream = .text:0x8030F318; // type:function size:0x94 scope:global align:4 getResReference__15J2DResReferenceCFUs = .text:0x8030F3AC; // type:function size:0x34 scope:global align:4 @@ -14267,25 +14265,25 @@ load__26J3DShapeMtxMultiConcatViewCFv = .text:0x80316440; // type:function size: loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUsPA4_f = .text:0x80316638; // type:function size:0x138 scope:global align:4 load__27J3DShapeMtxBBoardConcatViewCFv = .text:0x80316770; // type:function size:0x110 scope:global align:4 load__28J3DShapeMtxYBBoardConcatViewCFv = .text:0x80316880; // type:function size:0x13C scope:global align:4 -__dt__28J3DShapeMtxYBBoardConcatViewFv = .text:0x803169BC; // type:function size:0x6C scope:global align:4 -getType__28J3DShapeMtxYBBoardConcatViewCFv = .text:0x80316A28; // type:function size:0xC scope:global align:4 -loadNrmMtx__21J3DShapeMtxConcatViewCFiUs = .text:0x80316A34; // type:function size:0x4 scope:global align:4 -getUseMtxIndex__11J3DShapeMtxCFUs = .text:0x80316A38; // type:function size:0x8 scope:global align:4 -__dt__27J3DShapeMtxBBoardConcatViewFv = .text:0x80316A40; // type:function size:0x6C scope:global align:4 -getType__27J3DShapeMtxBBoardConcatViewCFv = .text:0x80316AAC; // type:function size:0xC scope:global align:4 -__dt__26J3DShapeMtxMultiConcatViewFv = .text:0x80316AB8; // type:function size:0x6C scope:global align:4 -getType__26J3DShapeMtxMultiConcatViewCFv = .text:0x80316B24; // type:function size:0xC scope:global align:4 -getUseMtxNum__26J3DShapeMtxMultiConcatViewCFv = .text:0x80316B30; // type:function size:0x8 scope:global align:4 -getUseMtxIndex__26J3DShapeMtxMultiConcatViewCFUs = .text:0x80316B38; // type:function size:0x10 scope:global align:4 -loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUs = .text:0x80316B48; // type:function size:0x4 scope:global align:4 -__dt__16J3DShapeMtxMultiFv = .text:0x80316B4C; // type:function size:0x5C scope:global align:4 -getType__16J3DShapeMtxMultiCFv = .text:0x80316BA8; // type:function size:0xC scope:global align:4 -getUseMtxNum__16J3DShapeMtxMultiCFv = .text:0x80316BB4; // type:function size:0x8 scope:global align:4 -getUseMtxIndex__16J3DShapeMtxMultiCFUs = .text:0x80316BBC; // type:function size:0x10 scope:global align:4 -__dt__21J3DShapeMtxConcatViewFv = .text:0x80316BCC; // type:function size:0x5C scope:global align:4 -getType__21J3DShapeMtxConcatViewCFv = .text:0x80316C28; // type:function size:0xC scope:global align:4 -__dt__11J3DShapeMtxFv = .text:0x80316C34; // type:function size:0x48 scope:global align:4 -getType__11J3DShapeMtxCFv = .text:0x80316C7C; // type:function size:0xC scope:global align:4 +__dt__28J3DShapeMtxYBBoardConcatViewFv = .text:0x803169BC; // type:function size:0x6C scope:weak align:4 +getType__28J3DShapeMtxYBBoardConcatViewCFv = .text:0x80316A28; // type:function size:0xC scope:weak align:4 +loadNrmMtx__21J3DShapeMtxConcatViewCFiUs = .text:0x80316A34; // type:function size:0x4 scope:weak align:4 +getUseMtxIndex__11J3DShapeMtxCFUs = .text:0x80316A38; // type:function size:0x8 scope:weak align:4 +__dt__27J3DShapeMtxBBoardConcatViewFv = .text:0x80316A40; // type:function size:0x6C scope:weak align:4 +getType__27J3DShapeMtxBBoardConcatViewCFv = .text:0x80316AAC; // type:function size:0xC scope:weak align:4 +__dt__26J3DShapeMtxMultiConcatViewFv = .text:0x80316AB8; // type:function size:0x6C scope:weak align:4 +getType__26J3DShapeMtxMultiConcatViewCFv = .text:0x80316B24; // type:function size:0xC scope:weak align:4 +getUseMtxNum__26J3DShapeMtxMultiConcatViewCFv = .text:0x80316B30; // type:function size:0x8 scope:weak align:4 +getUseMtxIndex__26J3DShapeMtxMultiConcatViewCFUs = .text:0x80316B38; // type:function size:0x10 scope:weak align:4 +loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUs = .text:0x80316B48; // type:function size:0x4 scope:weak align:4 +__dt__16J3DShapeMtxMultiFv = .text:0x80316B4C; // type:function size:0x5C scope:weak align:4 +getType__16J3DShapeMtxMultiCFv = .text:0x80316BA8; // type:function size:0xC scope:weak align:4 +getUseMtxNum__16J3DShapeMtxMultiCFv = .text:0x80316BB4; // type:function size:0x8 scope:weak align:4 +getUseMtxIndex__16J3DShapeMtxMultiCFUs = .text:0x80316BBC; // type:function size:0x10 scope:weak align:4 +__dt__21J3DShapeMtxConcatViewFv = .text:0x80316BCC; // type:function size:0x5C scope:weak align:4 +getType__21J3DShapeMtxConcatViewCFv = .text:0x80316C28; // type:function size:0xC scope:weak align:4 +__dt__11J3DShapeMtxFv = .text:0x80316C34; // type:function size:0x48 scope:weak align:4 +getType__11J3DShapeMtxCFv = .text:0x80316C7C; // type:function size:0xC scope:weak align:4 __sinit_J3DShapeMtx_cpp = .text:0x80316C88; // type:function size:0x138 scope:local align:4 countVertex__12J3DShapeDrawFUl = .text:0x80316DC0; // type:function size:0x50 scope:global align:4 addTexMtxIndexInDL__12J3DShapeDrawFUlUlUl = .text:0x80316E10; // type:function size:0x148 scope:global align:4 @@ -14298,7 +14296,7 @@ addTexMtxIndexInVcd__8J3DShapeF7_GXAttr = .text:0x80317158; // type:function siz calcNBTScale__8J3DShapeFRC3VecPA3_A3_fPA3_A3_f = .text:0x80317244; // type:function size:0x80 scope:global align:4 countBumpMtxNum__8J3DShapeCFv = .text:0x803172C4; // type:function size:0x70 scope:global align:4 J3DLoadCPCmd__FUcUl = .text:0x80317334; // type:function size:0x18 scope:global align:4 -J3DLoadArrayBasePtr__F7_GXAttrPv = .text:0x8031734C; // type:function size:0x3C scope:global align:4 +J3DLoadArrayBasePtr__F7_GXAttrPv = .text:0x8031734C; // type:function size:0x3C scope:local align:4 loadVtxArray__8J3DShapeCFv = .text:0x80317388; // type:function size:0x70 scope:global align:4 isSameVcdVatCmd__8J3DShapeFP8J3DShape = .text:0x803173F8; // type:function size:0x3C scope:global align:4 makeVtxArrayCmd__8J3DShapeFv = .text:0x80317434; // type:function size:0x2C8 scope:global align:4 @@ -14354,72 +14352,72 @@ diff__17J3DLockedMaterialFUl = .text:0x80319568; // type:function size:0x4 scope calc__17J3DLockedMaterialFPA4_Cf = .text:0x8031956C; // type:function size:0x4 scope:global align:4 reset__17J3DLockedMaterialFv = .text:0x80319570; // type:function size:0x4 scope:global align:4 change__17J3DLockedMaterialFv = .text:0x80319574; // type:function size:0x4 scope:global align:4 -__dt__21J3DColorBlockLightOffFv = .text:0x80319578; // type:function size:0x5C scope:global align:4 -__dt__13J3DColorBlockFv = .text:0x803195D4; // type:function size:0x48 scope:global align:4 -__dt__21J3DTexGenBlockPatchedFv = .text:0x8031961C; // type:function size:0x5C scope:global align:4 -__dt__14J3DTexGenBlockFv = .text:0x80319678; // type:function size:0x48 scope:global align:4 -__dt__11J3DTevBlockFv = .text:0x803196C0; // type:function size:0x48 scope:global align:4 -__dt__11J3DIndBlockFv = .text:0x80319708; // type:function size:0x48 scope:global align:4 -__dt__10J3DPEBlockFv = .text:0x80319750; // type:function size:0x48 scope:global align:4 -countDLSize__14J3DTexGenBlockFv = .text:0x80319798; // type:function size:0x8 scope:global align:4 -countDLSize__13J3DColorBlockFv = .text:0x803197A0; // type:function size:0x8 scope:global align:4 -countDLSize__11J3DTevBlockFv = .text:0x803197A8; // type:function size:0x8 scope:global align:4 -countDLSize__11J3DIndBlockFv = .text:0x803197B0; // type:function size:0x8 scope:global align:4 -countDLSize__10J3DPEBlockFv = .text:0x803197B8; // type:function size:0x8 scope:global align:4 -load__13J3DColorBlockFv = .text:0x803197C0; // type:function size:0x4 scope:global align:4 -getCullMode__13J3DColorBlockCFv = .text:0x803197C4; // type:function size:0x8 scope:global align:4 -load__11J3DTevBlockFv = .text:0x803197CC; // type:function size:0x4 scope:global align:4 -getNBTScale__14J3DTexGenBlockFv = .text:0x803197D0; // type:function size:0x8 scope:global align:4 -patch__13J3DColorBlockFv = .text:0x803197D8; // type:function size:0x4 scope:global align:4 -diff__13J3DColorBlockFUl = .text:0x803197DC; // type:function size:0x4 scope:global align:4 -diff__10J3DPEBlockFUl = .text:0x803197E0; // type:function size:0x4 scope:global align:4 -reset__10J3DPEBlockFP10J3DPEBlock = .text:0x803197E4; // type:function size:0x4 scope:global align:4 -reset__11J3DIndBlockFP11J3DIndBlock = .text:0x803197E8; // type:function size:0x4 scope:global align:4 -reset__11J3DTevBlockFP11J3DTevBlock = .text:0x803197EC; // type:function size:0x4 scope:global align:4 -reset__14J3DTexGenBlockFP14J3DTexGenBlock = .text:0x803197F0; // type:function size:0x4 scope:global align:4 -reset__13J3DColorBlockFP13J3DColorBlock = .text:0x803197F4; // type:function size:0x4 scope:global align:4 -diffFog__10J3DPEBlockFv = .text:0x803197F8; // type:function size:0x4 scope:global align:4 -diffBlend__10J3DPEBlockFv = .text:0x803197FC; // type:function size:0x4 scope:global align:4 -setFog__10J3DPEBlockFP6J3DFog = .text:0x80319800; // type:function size:0x4 scope:global align:4 -setFog__10J3DPEBlockF6J3DFog = .text:0x80319804; // type:function size:0x4 scope:global align:4 -setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp = .text:0x80319808; // type:function size:0x4 scope:global align:4 -setBlend__10J3DPEBlockFPC8J3DBlend = .text:0x8031980C; // type:function size:0x4 scope:global align:4 -setZMode__10J3DPEBlockFPC8J3DZMode = .text:0x80319810; // type:function size:0x4 scope:global align:4 -setZCompLoc__10J3DPEBlockFPCUc = .text:0x80319814; // type:function size:0x4 scope:global align:4 -setDither__10J3DPEBlockFUc = .text:0x80319818; // type:function size:0x4 scope:global align:4 -setDither__10J3DPEBlockFPCUc = .text:0x8031981C; // type:function size:0x4 scope:global align:4 -getDither__10J3DPEBlockCFv = .text:0x80319820; // type:function size:0x8 scope:global align:4 -getFogOffset__10J3DPEBlockCFv = .text:0x80319828; // type:function size:0x8 scope:global align:4 -setFogOffset__10J3DPEBlockFUl = .text:0x80319830; // type:function size:0x4 scope:global align:4 -diff__15J3DIndBlockNullFUl = .text:0x80319834; // type:function size:0x4 scope:global align:4 -load__15J3DIndBlockNullFv = .text:0x80319838; // type:function size:0x4 scope:global align:4 -reset__15J3DIndBlockNullFP11J3DIndBlock = .text:0x8031983C; // type:function size:0x4 scope:global align:4 -getType__15J3DIndBlockNullFv = .text:0x80319840; // type:function size:0xC scope:global align:4 -__dt__15J3DIndBlockNullFv = .text:0x8031984C; // type:function size:0x5C scope:global align:4 -setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder = .text:0x803198A8; // type:function size:0x4 scope:global align:4 -setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder = .text:0x803198AC; // type:function size:0x4 scope:global align:4 -setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx = .text:0x803198B0; // type:function size:0x4 scope:global align:4 -setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale = .text:0x803198B4; // type:function size:0x4 scope:global align:4 -setTexGenNum__14J3DTexGenBlockFPCUl = .text:0x803198B8; // type:function size:0x4 scope:global align:4 -setNBTScale__14J3DTexGenBlockF11J3DNBTScale = .text:0x803198BC; // type:function size:0x4 scope:global align:4 -setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale = .text:0x803198C0; // type:function size:0x4 scope:global align:4 -getTexMtxOffset__14J3DTexGenBlockCFv = .text:0x803198C4; // type:function size:0x8 scope:global align:4 -setTexMtxOffset__14J3DTexGenBlockFUl = .text:0x803198CC; // type:function size:0x4 scope:global align:4 -patchMatColor__13J3DColorBlockFv = .text:0x803198D0; // type:function size:0x4 scope:global align:4 -diffAmbColor__13J3DColorBlockFv = .text:0x803198D4; // type:function size:0x4 scope:global align:4 -diffMatColor__13J3DColorBlockFv = .text:0x803198D8; // type:function size:0x4 scope:global align:4 -diffColorChan__13J3DColorBlockFv = .text:0x803198DC; // type:function size:0x4 scope:global align:4 -diffLightObj__13J3DColorBlockFUl = .text:0x803198E0; // type:function size:0x4 scope:global align:4 -setMatColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x803198E4; // type:function size:0x4 scope:global align:4 -setColorChanNum__13J3DColorBlockFPCUc = .text:0x803198E8; // type:function size:0x4 scope:global align:4 -setColorChan__13J3DColorBlockFUlPC12J3DColorChan = .text:0x803198EC; // type:function size:0x4 scope:global align:4 -getLight__13J3DColorBlockFUl = .text:0x803198F0; // type:function size:0x8 scope:global align:4 -setCullMode__13J3DColorBlockFUc = .text:0x803198F8; // type:function size:0x4 scope:global align:4 -setCullMode__13J3DColorBlockFPCUc = .text:0x803198FC; // type:function size:0x4 scope:global align:4 -getMatColorOffset__13J3DColorBlockCFv = .text:0x80319900; // type:function size:0x8 scope:global align:4 -getColorChanOffset__13J3DColorBlockCFv = .text:0x80319908; // type:function size:0x8 scope:global align:4 -setMatColorOffset__13J3DColorBlockFUl = .text:0x80319910; // type:function size:0x4 scope:global align:4 -setColorChanOffset__13J3DColorBlockFUl = .text:0x80319914; // type:function size:0x4 scope:global align:4 +__dt__21J3DColorBlockLightOffFv = .text:0x80319578; // type:function size:0x5C scope:weak align:4 +__dt__13J3DColorBlockFv = .text:0x803195D4; // type:function size:0x48 scope:weak align:4 +__dt__21J3DTexGenBlockPatchedFv = .text:0x8031961C; // type:function size:0x5C scope:weak align:4 +__dt__14J3DTexGenBlockFv = .text:0x80319678; // type:function size:0x48 scope:weak align:4 +__dt__11J3DTevBlockFv = .text:0x803196C0; // type:function size:0x48 scope:weak align:4 +__dt__11J3DIndBlockFv = .text:0x80319708; // type:function size:0x48 scope:weak align:4 +__dt__10J3DPEBlockFv = .text:0x80319750; // type:function size:0x48 scope:weak align:4 +countDLSize__14J3DTexGenBlockFv = .text:0x80319798; // type:function size:0x8 scope:weak align:4 +countDLSize__13J3DColorBlockFv = .text:0x803197A0; // type:function size:0x8 scope:weak align:4 +countDLSize__11J3DTevBlockFv = .text:0x803197A8; // type:function size:0x8 scope:weak align:4 +countDLSize__11J3DIndBlockFv = .text:0x803197B0; // type:function size:0x8 scope:weak align:4 +countDLSize__10J3DPEBlockFv = .text:0x803197B8; // type:function size:0x8 scope:weak align:4 +load__13J3DColorBlockFv = .text:0x803197C0; // type:function size:0x4 scope:weak align:4 +getCullMode__13J3DColorBlockCFv = .text:0x803197C4; // type:function size:0x8 scope:weak align:4 +load__11J3DTevBlockFv = .text:0x803197CC; // type:function size:0x4 scope:weak align:4 +getNBTScale__14J3DTexGenBlockFv = .text:0x803197D0; // type:function size:0x8 scope:weak align:4 +patch__13J3DColorBlockFv = .text:0x803197D8; // type:function size:0x4 scope:weak align:4 +diff__13J3DColorBlockFUl = .text:0x803197DC; // type:function size:0x4 scope:weak align:4 +diff__10J3DPEBlockFUl = .text:0x803197E0; // type:function size:0x4 scope:weak align:4 +reset__10J3DPEBlockFP10J3DPEBlock = .text:0x803197E4; // type:function size:0x4 scope:weak align:4 +reset__11J3DIndBlockFP11J3DIndBlock = .text:0x803197E8; // type:function size:0x4 scope:weak align:4 +reset__11J3DTevBlockFP11J3DTevBlock = .text:0x803197EC; // type:function size:0x4 scope:weak align:4 +reset__14J3DTexGenBlockFP14J3DTexGenBlock = .text:0x803197F0; // type:function size:0x4 scope:weak align:4 +reset__13J3DColorBlockFP13J3DColorBlock = .text:0x803197F4; // type:function size:0x4 scope:weak align:4 +diffFog__10J3DPEBlockFv = .text:0x803197F8; // type:function size:0x4 scope:weak align:4 +diffBlend__10J3DPEBlockFv = .text:0x803197FC; // type:function size:0x4 scope:weak align:4 +setFog__10J3DPEBlockFP6J3DFog = .text:0x80319800; // type:function size:0x4 scope:weak align:4 +setFog__10J3DPEBlockF6J3DFog = .text:0x80319804; // type:function size:0x4 scope:weak align:4 +setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp = .text:0x80319808; // type:function size:0x4 scope:weak align:4 +setBlend__10J3DPEBlockFPC8J3DBlend = .text:0x8031980C; // type:function size:0x4 scope:weak align:4 +setZMode__10J3DPEBlockFPC8J3DZMode = .text:0x80319810; // type:function size:0x4 scope:weak align:4 +setZCompLoc__10J3DPEBlockFPCUc = .text:0x80319814; // type:function size:0x4 scope:weak align:4 +setDither__10J3DPEBlockFUc = .text:0x80319818; // type:function size:0x4 scope:weak align:4 +setDither__10J3DPEBlockFPCUc = .text:0x8031981C; // type:function size:0x4 scope:weak align:4 +getDither__10J3DPEBlockCFv = .text:0x80319820; // type:function size:0x8 scope:weak align:4 +getFogOffset__10J3DPEBlockCFv = .text:0x80319828; // type:function size:0x8 scope:weak align:4 +setFogOffset__10J3DPEBlockFUl = .text:0x80319830; // type:function size:0x4 scope:weak align:4 +diff__15J3DIndBlockNullFUl = .text:0x80319834; // type:function size:0x4 scope:weak align:4 +load__15J3DIndBlockNullFv = .text:0x80319838; // type:function size:0x4 scope:weak align:4 +reset__15J3DIndBlockNullFP11J3DIndBlock = .text:0x8031983C; // type:function size:0x4 scope:weak align:4 +getType__15J3DIndBlockNullFv = .text:0x80319840; // type:function size:0xC scope:weak align:4 +__dt__15J3DIndBlockNullFv = .text:0x8031984C; // type:function size:0x5C scope:weak align:4 +setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder = .text:0x803198A8; // type:function size:0x4 scope:weak align:4 +setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder = .text:0x803198AC; // type:function size:0x4 scope:weak align:4 +setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx = .text:0x803198B0; // type:function size:0x4 scope:weak align:4 +setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale = .text:0x803198B4; // type:function size:0x4 scope:weak align:4 +setTexGenNum__14J3DTexGenBlockFPCUl = .text:0x803198B8; // type:function size:0x4 scope:weak align:4 +setNBTScale__14J3DTexGenBlockF11J3DNBTScale = .text:0x803198BC; // type:function size:0x4 scope:weak align:4 +setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale = .text:0x803198C0; // type:function size:0x4 scope:weak align:4 +getTexMtxOffset__14J3DTexGenBlockCFv = .text:0x803198C4; // type:function size:0x8 scope:weak align:4 +setTexMtxOffset__14J3DTexGenBlockFUl = .text:0x803198CC; // type:function size:0x4 scope:weak align:4 +patchMatColor__13J3DColorBlockFv = .text:0x803198D0; // type:function size:0x4 scope:weak align:4 +diffAmbColor__13J3DColorBlockFv = .text:0x803198D4; // type:function size:0x4 scope:weak align:4 +diffMatColor__13J3DColorBlockFv = .text:0x803198D8; // type:function size:0x4 scope:weak align:4 +diffColorChan__13J3DColorBlockFv = .text:0x803198DC; // type:function size:0x4 scope:weak align:4 +diffLightObj__13J3DColorBlockFUl = .text:0x803198E0; // type:function size:0x4 scope:weak align:4 +setMatColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x803198E4; // type:function size:0x4 scope:weak align:4 +setColorChanNum__13J3DColorBlockFPCUc = .text:0x803198E8; // type:function size:0x4 scope:weak align:4 +setColorChan__13J3DColorBlockFUlPC12J3DColorChan = .text:0x803198EC; // type:function size:0x4 scope:weak align:4 +getLight__13J3DColorBlockFUl = .text:0x803198F0; // type:function size:0x8 scope:weak align:4 +setCullMode__13J3DColorBlockFUc = .text:0x803198F8; // type:function size:0x4 scope:weak align:4 +setCullMode__13J3DColorBlockFPCUc = .text:0x803198FC; // type:function size:0x4 scope:weak align:4 +getMatColorOffset__13J3DColorBlockCFv = .text:0x80319900; // type:function size:0x8 scope:weak align:4 +getColorChanOffset__13J3DColorBlockCFv = .text:0x80319908; // type:function size:0x8 scope:weak align:4 +setMatColorOffset__13J3DColorBlockFUl = .text:0x80319910; // type:function size:0x4 scope:weak align:4 +setColorChanOffset__13J3DColorBlockFUl = .text:0x80319914; // type:function size:0x4 scope:weak align:4 initialize__21J3DColorBlockLightOffFv = .text:0x80319918; // type:function size:0x60 scope:global align:4 initialize__22J3DColorBlockAmbientOnFv = .text:0x80319978; // type:function size:0xA4 scope:global align:4 initialize__20J3DColorBlockLightOnFv = .text:0x80319A1C; // type:function size:0xC4 scope:global align:4 @@ -14891,8 +14889,8 @@ makeZModeTable__Fv = .text:0x80326744; // type:function size:0x6C scope:global a makeTevSwapTable__Fv = .text:0x803267B0; // type:function size:0x44 scope:global align:4 loadTexMtx__9J3DTexMtxCFUl = .text:0x803267F4; // type:function size:0x64 scope:global align:4 loadPostTexMtx__9J3DTexMtxCFUl = .text:0x80326858; // type:function size:0x60 scope:global align:4 -J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType = .text:0x803268B8; // type:function size:0x580 scope:global align:4 -J3DGDLoadPostTexMtxImm__FPA4_fUl = .text:0x80326E38; // type:function size:0x56C scope:global align:4 +J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType = .text:0x803268B8; // type:function size:0x580 scope:local align:4 +J3DGDLoadPostTexMtxImm__FPA4_fUl = .text:0x80326E38; // type:function size:0x56C scope:local align:4 initialize__13J3DDrawBufferFv = .text:0x803273A4; // type:function size:0x68 scope:global align:4 allocBuffer__13J3DDrawBufferFUl = .text:0x8032740C; // type:function size:0x98 scope:global align:4 __dt__13J3DDrawBufferFv = .text:0x803274A4; // type:function size:0x60 scope:global align:4 @@ -14923,7 +14921,7 @@ makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTabl findImportantMtxIndex__12J3DJointTreeFv = .text:0x8032809C; // type:function size:0xAC scope:global align:4 calc__12J3DJointTreeFP12J3DMtxBufferRC3VecRA3_A4_Cf = .text:0x80328148; // type:function size:0x70 scope:global align:4 setMtxBuffer__10J3DMtxCalcFP12J3DMtxBuffer = .text:0x803281B8; // type:function size:0x8 scope:global align:4 -__dt__12J3DJointTreeFv = .text:0x803281C0; // type:function size:0x64 scope:global align:4 +__dt__12J3DJointTreeFv = .text:0x803281C0; // type:function size:0x64 scope:weak align:4 clear__12J3DModelDataFv = .text:0x80328224; // type:function size:0x18 scope:global align:4 __ct__12J3DModelDataFv = .text:0x8032823C; // type:function size:0x74 scope:global align:4 newSharedDisplayList__12J3DModelDataFUl = .text:0x803282B0; // type:function size:0xB4 scope:global align:4 @@ -14932,8 +14930,8 @@ makeSharedDL__12J3DModelDataFv = .text:0x80328430; // type:function size:0x78 sc simpleCalcMaterial__12J3DModelDataFUsPA4_f = .text:0x803284A8; // type:function size:0xC0 scope:global align:4 syncJ3DSysPointers__12J3DModelDataCFv = .text:0x80328568; // type:function size:0x2C scope:global align:4 syncJ3DSysFlags__12J3DModelDataCFv = .text:0x80328594; // type:function size:0x3C scope:global align:4 -__dt__13J3DShapeTableFv = .text:0x803285D0; // type:function size:0x48 scope:global align:4 -__dt__12J3DModelDataFv = .text:0x80328618; // type:function size:0x98 scope:global align:4 +__dt__13J3DShapeTableFv = .text:0x803285D0; // type:function size:0x48 scope:weak align:4 +__dt__12J3DModelDataFv = .text:0x80328618; // type:function size:0x98 scope:weak align:4 initialize__12J3DMtxBufferFv = .text:0x803286B0; // type:function size:0x44 scope:global align:4 create__12J3DMtxBufferFP12J3DModelDataUl = .text:0x803286F4; // type:function size:0x10C scope:global align:4 createAnmMtx__12J3DMtxBufferFP12J3DModelData = .text:0x80328800; // type:function size:0x8C scope:global align:4 @@ -14968,8 +14966,8 @@ calcNrmMtx__8J3DModelFv = .text:0x8032A62C; // type:function size:0x24 scope:glo calcBumpMtx__8J3DModelFv = .text:0x8032A650; // type:function size:0x104 scope:global align:4 calcBBoardMtx__8J3DModelFv = .text:0x8032A754; // type:function size:0x34 scope:global align:4 prepareShapePackets__8J3DModelFv = .text:0x8032A788; // type:function size:0x64 scope:global align:4 -__dt__8J3DModelFv = .text:0x8032A7EC; // type:function size:0x64 scope:global align:4 -__dt__12J3DMtxBufferFv = .text:0x8032A850; // type:function size:0x48 scope:global align:4 +__dt__8J3DModelFv = .text:0x8032A7EC; // type:function size:0x64 scope:weak align:4 +__dt__12J3DMtxBufferFv = .text:0x8032A850; // type:function size:0x48 scope:weak align:4 init__12J3DFrameCtrlFs = .text:0x8032A898; // type:function size:0x30 scope:global align:4 checkPass__12J3DFrameCtrlFf = .text:0x8032A8C8; // type:function size:0x5A0 scope:global align:4 update__12J3DFrameCtrlFv = .text:0x8032AE68; // type:function size:0x474 scope:global align:4 @@ -15003,39 +15001,39 @@ getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10 = .text:0x8032D694; // type: getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor = .text:0x8032D958; // type:function size:0x2C4 scope:global align:4 searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable = .text:0x8032DC1C; // type:function size:0xFC scope:global align:4 searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData = .text:0x8032DD18; // type:function size:0x24 scope:global align:4 -J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs = .text:0x8032DD3C; // type:function size:0x234 scope:global align:4 -J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf = .text:0x8032DF70; // type:function size:0x17C scope:global align:4 -__dt__14J3DAnmVtxColorFv = .text:0x8032E0EC; // type:function size:0x5C scope:global align:4 -__dt__11J3DAnmColorFv = .text:0x8032E148; // type:function size:0x74 scope:global align:4 -__dt__16J3DAnmTexPatternFv = .text:0x8032E1BC; // type:function size:0x74 scope:global align:4 -getKind__16J3DAnmTexPatternCFv = .text:0x8032E230; // type:function size:0x8 scope:global align:4 -__dt__15J3DAnmTevRegKeyFv = .text:0x8032E238; // type:function size:0x88 scope:global align:4 -getKind__15J3DAnmTevRegKeyCFv = .text:0x8032E2C0; // type:function size:0x8 scope:global align:4 -__dt__14J3DAnmColorKeyFv = .text:0x8032E2C8; // type:function size:0x84 scope:global align:4 -getKind__14J3DAnmColorKeyCFv = .text:0x8032E34C; // type:function size:0x8 scope:global align:4 -__dt__15J3DAnmColorFullFv = .text:0x8032E354; // type:function size:0x84 scope:global align:4 -getKind__15J3DAnmColorFullCFv = .text:0x8032E3D8; // type:function size:0x8 scope:global align:4 -getKind__11J3DAnmColorCFv = .text:0x8032E3E0; // type:function size:0x8 scope:global align:4 -getColor__11J3DAnmColorCFUsP8_GXColor = .text:0x8032E3E8; // type:function size:0x4 scope:global align:4 -__dt__17J3DAnmVtxColorKeyFv = .text:0x8032E3EC; // type:function size:0x6C scope:global align:4 -getKind__17J3DAnmVtxColorKeyCFv = .text:0x8032E458; // type:function size:0x8 scope:global align:4 -__dt__18J3DAnmVtxColorFullFv = .text:0x8032E460; // type:function size:0x6C scope:global align:4 -getKind__18J3DAnmVtxColorFullCFv = .text:0x8032E4CC; // type:function size:0x8 scope:global align:4 -getKind__14J3DAnmVtxColorCFv = .text:0x8032E4D4; // type:function size:0x8 scope:global align:4 -getColor__14J3DAnmVtxColorCFUcUsP8_GXColor = .text:0x8032E4DC; // type:function size:0x4 scope:global align:4 -__dt__16J3DAnmClusterKeyFv = .text:0x8032E4E0; // type:function size:0x6C scope:global align:4 -getKind__16J3DAnmClusterKeyCFv = .text:0x8032E54C; // type:function size:0x8 scope:global align:4 -__dt__13J3DAnmClusterFv = .text:0x8032E554; // type:function size:0x5C scope:global align:4 -getKind__13J3DAnmClusterCFv = .text:0x8032E5B0; // type:function size:0x8 scope:global align:4 -getWeight__13J3DAnmClusterCFUs = .text:0x8032E5B8; // type:function size:0x8 scope:global align:4 -__dt__17J3DAnmClusterFullFv = .text:0x8032E5C0; // type:function size:0x6C scope:global align:4 -getKind__17J3DAnmClusterFullCFv = .text:0x8032E62C; // type:function size:0x8 scope:global align:4 -__dt__19J3DAnmTextureSRTKeyFv = .text:0x8032E634; // type:function size:0x88 scope:global align:4 -getKind__19J3DAnmTextureSRTKeyCFv = .text:0x8032E6BC; // type:function size:0x8 scope:global align:4 -__dt__27J3DAnmTransformFullWithLerpFv = .text:0x8032E6C4; // type:function size:0x7C scope:global align:4 -getKind__27J3DAnmTransformFullWithLerpCFv = .text:0x8032E740; // type:function size:0x8 scope:global align:4 -__dt__19J3DAnmTransformFullFv = .text:0x8032E748; // type:function size:0x6C scope:global align:4 -getKind__19J3DAnmTransformFullCFv = .text:0x8032E7B4; // type:function size:0x8 scope:global align:4 +J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs = .text:0x8032DD3C; // type:function size:0x234 scope:weak align:4 +J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf = .text:0x8032DF70; // type:function size:0x17C scope:weak align:4 +__dt__14J3DAnmVtxColorFv = .text:0x8032E0EC; // type:function size:0x5C scope:weak align:4 +__dt__11J3DAnmColorFv = .text:0x8032E148; // type:function size:0x74 scope:weak align:4 +__dt__16J3DAnmTexPatternFv = .text:0x8032E1BC; // type:function size:0x74 scope:weak align:4 +getKind__16J3DAnmTexPatternCFv = .text:0x8032E230; // type:function size:0x8 scope:weak align:4 +__dt__15J3DAnmTevRegKeyFv = .text:0x8032E238; // type:function size:0x88 scope:weak align:4 +getKind__15J3DAnmTevRegKeyCFv = .text:0x8032E2C0; // type:function size:0x8 scope:weak align:4 +__dt__14J3DAnmColorKeyFv = .text:0x8032E2C8; // type:function size:0x84 scope:weak align:4 +getKind__14J3DAnmColorKeyCFv = .text:0x8032E34C; // type:function size:0x8 scope:weak align:4 +__dt__15J3DAnmColorFullFv = .text:0x8032E354; // type:function size:0x84 scope:weak align:4 +getKind__15J3DAnmColorFullCFv = .text:0x8032E3D8; // type:function size:0x8 scope:weak align:4 +getKind__11J3DAnmColorCFv = .text:0x8032E3E0; // type:function size:0x8 scope:weak align:4 +getColor__11J3DAnmColorCFUsP8_GXColor = .text:0x8032E3E8; // type:function size:0x4 scope:weak align:4 +__dt__17J3DAnmVtxColorKeyFv = .text:0x8032E3EC; // type:function size:0x6C scope:weak align:4 +getKind__17J3DAnmVtxColorKeyCFv = .text:0x8032E458; // type:function size:0x8 scope:weak align:4 +__dt__18J3DAnmVtxColorFullFv = .text:0x8032E460; // type:function size:0x6C scope:weak align:4 +getKind__18J3DAnmVtxColorFullCFv = .text:0x8032E4CC; // type:function size:0x8 scope:weak align:4 +getKind__14J3DAnmVtxColorCFv = .text:0x8032E4D4; // type:function size:0x8 scope:weak align:4 +getColor__14J3DAnmVtxColorCFUcUsP8_GXColor = .text:0x8032E4DC; // type:function size:0x4 scope:weak align:4 +__dt__16J3DAnmClusterKeyFv = .text:0x8032E4E0; // type:function size:0x6C scope:weak align:4 +getKind__16J3DAnmClusterKeyCFv = .text:0x8032E54C; // type:function size:0x8 scope:weak align:4 +__dt__13J3DAnmClusterFv = .text:0x8032E554; // type:function size:0x5C scope:weak align:4 +getKind__13J3DAnmClusterCFv = .text:0x8032E5B0; // type:function size:0x8 scope:weak align:4 +getWeight__13J3DAnmClusterCFUs = .text:0x8032E5B8; // type:function size:0x8 scope:weak align:4 +__dt__17J3DAnmClusterFullFv = .text:0x8032E5C0; // type:function size:0x6C scope:weak align:4 +getKind__17J3DAnmClusterFullCFv = .text:0x8032E62C; // type:function size:0x8 scope:weak align:4 +__dt__19J3DAnmTextureSRTKeyFv = .text:0x8032E634; // type:function size:0x88 scope:weak align:4 +getKind__19J3DAnmTextureSRTKeyCFv = .text:0x8032E6BC; // type:function size:0x8 scope:weak align:4 +__dt__27J3DAnmTransformFullWithLerpFv = .text:0x8032E6C4; // type:function size:0x7C scope:weak align:4 +getKind__27J3DAnmTransformFullWithLerpCFv = .text:0x8032E740; // type:function size:0x8 scope:weak align:4 +__dt__19J3DAnmTransformFullFv = .text:0x8032E748; // type:function size:0x6C scope:weak align:4 +getKind__19J3DAnmTransformFullCFv = .text:0x8032E7B4; // type:function size:0x8 scope:weak align:4 initialize__14J3DMaterialAnmFv = .text:0x8032E7BC; // type:function size:0xA4 scope:global align:4 calc__14J3DMaterialAnmCFP11J3DMaterial = .text:0x8032E860; // type:function size:0x1E0 scope:global align:4 setMatColorAnm__14J3DMaterialAnmFiP14J3DMatColorAnm = .text:0x8032EA40; // type:function size:0x40 scope:global align:4 @@ -15044,8 +15042,8 @@ setTexNoAnm__14J3DMaterialAnmFiP11J3DTexNoAnm = .text:0x8032EAC0; // type:functi setTevColorAnm__14J3DMaterialAnmFiP14J3DTevColorAnm = .text:0x8032EB00; // type:function size:0x40 scope:global align:4 setTevKColorAnm__14J3DMaterialAnmFiP15J3DTevKColorAnm = .text:0x8032EB40; // type:function size:0x40 scope:global align:4 __ct__12J3DSkinNListFv = .text:0x8032EB80; // type:function size:0x20 scope:global align:4 -J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec = .text:0x8032EBA0; // type:function size:0xB8 scope:global align:4 -J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec = .text:0x8032EC58; // type:function size:0xA0 scope:global align:4 +J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec = .text:0x8032EBA0; // type:function size:0xB8 scope:local align:4 +J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec = .text:0x8032EC58; // type:function size:0xA0 scope:local align:4 calcSkin_VtxPosF32__12J3DSkinNListFPA4_fPvPv = .text:0x8032ECF8; // type:function size:0x88 scope:global align:4 calcSkin_VtxNrmF32__12J3DSkinNListFPA4_fPvPv = .text:0x8032ED80; // type:function size:0x88 scope:global align:4 __ct__13J3DSkinDeformFv = .text:0x8032EE08; // type:function size:0x44 scope:global align:4 @@ -15138,47 +15136,47 @@ newZMode__18J3DMaterialFactoryCFi = .text:0x80334CC8; // type:function size:0x60 newZCompLoc__18J3DMaterialFactoryCFi = .text:0x80334D28; // type:function size:0x38 scope:global align:4 newDither__18J3DMaterialFactoryCFi = .text:0x80334D60; // type:function size:0x38 scope:global align:4 newNBTScale__18J3DMaterialFactoryCFi = .text:0x80334D98; // type:function size:0xA4 scope:global align:4 -load__14J3DPEBlockNullFv = .text:0x80334E3C; // type:function size:0x4 scope:global align:4 -getType__14J3DPEBlockNullFv = .text:0x80334E40; // type:function size:0xC scope:global align:4 -__dt__14J3DPEBlockNullFv = .text:0x80334E4C; // type:function size:0x5C scope:global align:4 -reset__15J3DTevBlockNullFP11J3DTevBlock = .text:0x80334EA8; // type:function size:0x4 scope:global align:4 -ptrToIndex__15J3DTevBlockNullFv = .text:0x80334EAC; // type:function size:0x4 scope:global align:4 -indexToPtr__15J3DTevBlockNullFv = .text:0x80334EB0; // type:function size:0x24 scope:global align:4 -getType__15J3DTevBlockNullFv = .text:0x80334ED4; // type:function size:0xC scope:global align:4 -__dt__15J3DTevBlockNullFv = .text:0x80334EE0; // type:function size:0x5C scope:global align:4 -calc__18J3DTexGenBlockNullFPA4_Cf = .text:0x80334F3C; // type:function size:0x4 scope:global align:4 -calcWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80334F40; // type:function size:0x4 scope:global align:4 -calcPostTexMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80334F44; // type:function size:0x4 scope:global align:4 -calcPostTexMtxWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80334F48; // type:function size:0x4 scope:global align:4 -load__18J3DTexGenBlockNullFv = .text:0x80334F4C; // type:function size:0x4 scope:global align:4 -patch__18J3DTexGenBlockNullFv = .text:0x80334F50; // type:function size:0x4 scope:global align:4 -diff__18J3DTexGenBlockNullFUl = .text:0x80334F54; // type:function size:0x4 scope:global align:4 -diffTexMtx__18J3DTexGenBlockNullFv = .text:0x80334F58; // type:function size:0x4 scope:global align:4 -diffTexGen__18J3DTexGenBlockNullFv = .text:0x80334F5C; // type:function size:0x4 scope:global align:4 -getType__18J3DTexGenBlockNullFv = .text:0x80334F60; // type:function size:0xC scope:global align:4 -__dt__18J3DTexGenBlockNullFv = .text:0x80334F6C; // type:function size:0x5C scope:global align:4 -getType__17J3DColorBlockNullFv = .text:0x80334FC8; // type:function size:0xC scope:global align:4 -__dt__17J3DColorBlockNullFv = .text:0x80334FD4; // type:function size:0x5C scope:global align:4 -__dt__11J3DMaterialFv = .text:0x80335030; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<17J3DCurrentMtxInfo>__FPCvPCv = .text:0x80335078; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DPatchingInfo>__FPCvPCv = .text:0x80335090; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DDisplayListInit>__FPCvPCv = .text:0x803350A8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DNBTScaleInfo>__FPCvPCv = .text:0x803350C0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<12J3DZModeInfo>__FPCvPCv = .text:0x803350D8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<12J3DBlendInfo>__FPCvPCv = .text:0x803350F0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DAlphaCompInfo>__FPCvPCv = .text:0x80335108; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<10J3DFogInfo>__FPCvPCv = .text:0x80335120; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J3DTevSwapModeTableInfo>__FPCvPCv = .text:0x80335138; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DTevSwapModeInfo>__FPCvPCv = .text:0x80335150; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DTevStageInfo>__FPCvPCv = .text:0x80335168; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DTevOrderInfo>__FPCvPCv = .text:0x80335180; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<13J3DTexMtxInfo>__FPCvPCv = .text:0x80335198; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DTexCoord2Info>__FPCvPCv = .text:0x803351B0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DTexCoordInfo>__FPCvPCv = .text:0x803351C8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<12J3DLightInfo>__FPCvPCv = .text:0x803351E0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DColorChanInfo>__FPCvPCv = .text:0x803351F8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<14J3DIndInitData>__FPCvPCv = .text:0x80335210; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J3DMaterialInitData>__FPCvPCv = .text:0x80335228; // type:function size:0x18 scope:global align:4 +load__14J3DPEBlockNullFv = .text:0x80334E3C; // type:function size:0x4 scope:weak align:4 +getType__14J3DPEBlockNullFv = .text:0x80334E40; // type:function size:0xC scope:weak align:4 +__dt__14J3DPEBlockNullFv = .text:0x80334E4C; // type:function size:0x5C scope:weak align:4 +reset__15J3DTevBlockNullFP11J3DTevBlock = .text:0x80334EA8; // type:function size:0x4 scope:weak align:4 +ptrToIndex__15J3DTevBlockNullFv = .text:0x80334EAC; // type:function size:0x4 scope:weak align:4 +indexToPtr__15J3DTevBlockNullFv = .text:0x80334EB0; // type:function size:0x24 scope:weak align:4 +getType__15J3DTevBlockNullFv = .text:0x80334ED4; // type:function size:0xC scope:weak align:4 +__dt__15J3DTevBlockNullFv = .text:0x80334EE0; // type:function size:0x5C scope:weak align:4 +calc__18J3DTexGenBlockNullFPA4_Cf = .text:0x80334F3C; // type:function size:0x4 scope:weak align:4 +calcWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80334F40; // type:function size:0x4 scope:weak align:4 +calcPostTexMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80334F44; // type:function size:0x4 scope:weak align:4 +calcPostTexMtxWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x80334F48; // type:function size:0x4 scope:weak align:4 +load__18J3DTexGenBlockNullFv = .text:0x80334F4C; // type:function size:0x4 scope:weak align:4 +patch__18J3DTexGenBlockNullFv = .text:0x80334F50; // type:function size:0x4 scope:weak align:4 +diff__18J3DTexGenBlockNullFUl = .text:0x80334F54; // type:function size:0x4 scope:weak align:4 +diffTexMtx__18J3DTexGenBlockNullFv = .text:0x80334F58; // type:function size:0x4 scope:weak align:4 +diffTexGen__18J3DTexGenBlockNullFv = .text:0x80334F5C; // type:function size:0x4 scope:weak align:4 +getType__18J3DTexGenBlockNullFv = .text:0x80334F60; // type:function size:0xC scope:weak align:4 +__dt__18J3DTexGenBlockNullFv = .text:0x80334F6C; // type:function size:0x5C scope:weak align:4 +getType__17J3DColorBlockNullFv = .text:0x80334FC8; // type:function size:0xC scope:weak align:4 +__dt__17J3DColorBlockNullFv = .text:0x80334FD4; // type:function size:0x5C scope:weak align:4 +__dt__11J3DMaterialFv = .text:0x80335030; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<17J3DCurrentMtxInfo>__FPCvPCv = .text:0x80335078; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DPatchingInfo>__FPCvPCv = .text:0x80335090; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DDisplayListInit>__FPCvPCv = .text:0x803350A8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DNBTScaleInfo>__FPCvPCv = .text:0x803350C0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<12J3DZModeInfo>__FPCvPCv = .text:0x803350D8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<12J3DBlendInfo>__FPCvPCv = .text:0x803350F0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DAlphaCompInfo>__FPCvPCv = .text:0x80335108; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<10J3DFogInfo>__FPCvPCv = .text:0x80335120; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J3DTevSwapModeTableInfo>__FPCvPCv = .text:0x80335138; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DTevSwapModeInfo>__FPCvPCv = .text:0x80335150; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DTevStageInfo>__FPCvPCv = .text:0x80335168; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DTevOrderInfo>__FPCvPCv = .text:0x80335180; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<13J3DTexMtxInfo>__FPCvPCv = .text:0x80335198; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DTexCoord2Info>__FPCvPCv = .text:0x803351B0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DTexCoordInfo>__FPCvPCv = .text:0x803351C8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<12J3DLightInfo>__FPCvPCv = .text:0x803351E0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DColorChanInfo>__FPCvPCv = .text:0x803351F8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<14J3DIndInitData>__FPCvPCv = .text:0x80335210; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J3DMaterialInitData>__FPCvPCv = .text:0x80335228; // type:function size:0x18 scope:weak align:4 __ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21 = .text:0x80335240; // type:function size:0x1E0 scope:global align:4 countUniqueMaterials__22J3DMaterialFactory_v21Fv = .text:0x80335420; // type:function size:0x24 scope:global align:4 countTexGens__22J3DMaterialFactory_v21CFi = .text:0x80335444; // type:function size:0x38 scope:global align:4 @@ -15205,16 +15203,16 @@ newZMode__22J3DMaterialFactory_v21CFi = .text:0x80336440; // type:function size: newZCompLoc__22J3DMaterialFactory_v21CFi = .text:0x803364A0; // type:function size:0x38 scope:global align:4 newDither__22J3DMaterialFactory_v21CFi = .text:0x803364D8; // type:function size:0x38 scope:global align:4 newNBTScale__22J3DMaterialFactory_v21CFi = .text:0x80336510; // type:function size:0xA4 scope:global align:4 -JSUConvertOffsetToPtr<23J3DMaterialInitData_v21>__FPCvPCv = .text:0x803365B4; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr<23J3DMaterialInitData_v21>__FPCvPCv = .text:0x803365B4; // type:function size:0x18 scope:weak align:4 load__24J3DClusterLoaderDataBaseFPCv = .text:0x803365CC; // type:function size:0x9C scope:global align:4 __ct__20J3DClusterLoader_v15Fv = .text:0x80336668; // type:function size:0x1C scope:global align:4 __dt__20J3DClusterLoader_v15Fv = .text:0x80336684; // type:function size:0x5C scope:global align:4 load__20J3DClusterLoader_v15FPCv = .text:0x803366E0; // type:function size:0xB4 scope:global align:4 readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock = .text:0x80336794; // type:function size:0x304 scope:global align:4 -__dt__16J3DClusterLoaderFv = .text:0x80336A98; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<16J3DClusterVertex>__FPCvPCv = .text:0x80336AE0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<13J3DClusterKey>__FPCvPCv = .text:0x80336AF8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<10J3DCluster>__FPCvPCv = .text:0x80336B10; // type:function size:0x18 scope:global align:4 +__dt__16J3DClusterLoaderFv = .text:0x80336A98; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DClusterVertex>__FPCvPCv = .text:0x80336AE0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<13J3DClusterKey>__FPCvPCv = .text:0x80336AF8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<10J3DCluster>__FPCvPCv = .text:0x80336B10; // type:function size:0x18 scope:weak align:4 __ct__14J3DModelLoaderFv = .text:0x80336B28; // type:function size:0x30 scope:global align:4 load__22J3DModelLoaderDataBaseFPCvUl = .text:0x80336B58; // type:function size:0x124 scope:global align:4 load__14J3DModelLoaderFPCvUl = .text:0x80336C7C; // type:function size:0x2DC scope:global align:4 @@ -15222,7 +15220,7 @@ loadMaterialTable__14J3DModelLoaderFPCv = .text:0x80336F58; // type:function siz loadBinaryDisplayList__14J3DModelLoaderFPCvUl = .text:0x803370BC; // type:function size:0x2C0 scope:global align:4 setupBBoardInfo__14J3DModelLoaderFv = .text:0x8033737C; // type:function size:0x168 scope:global align:4 readInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl = .text:0x803374E4; // type:function size:0x15C scope:global align:4 -getFmtType__FP17_GXVtxAttrFmtList7_GXAttr = .text:0x80337640; // type:function size:0x2C scope:global align:4 +getFmtType__FP17_GXVtxAttrFmtList7_GXAttr = .text:0x80337640; // type:function size:0x2C scope:local align:4 readVertex__14J3DModelLoaderFPC14J3DVertexBlock = .text:0x8033766C; // type:function size:0x220 scope:global align:4 readEnvelop__14J3DModelLoaderFPC16J3DEnvelopeBlock = .text:0x8033788C; // type:function size:0x90 scope:global align:4 readDraw__14J3DModelLoaderFPC12J3DDrawBlock = .text:0x8033791C; // type:function size:0xB0 scope:global align:4 @@ -15237,30 +15235,30 @@ readTextureTable__14J3DModelLoaderFPC15J3DTextureBlock = .text:0x803383F8; // ty readPatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803384C4; // type:function size:0x140 scope:global align:4 readMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl = .text:0x80338604; // type:function size:0x1B4 scope:global align:4 modifyMaterial__14J3DModelLoaderFUl = .text:0x803387B8; // type:function size:0x7C scope:global align:4 -__dt__18J3DModelLoader_v26Fv = .text:0x80338834; // type:function size:0x5C scope:global align:4 -__dt__18J3DModelLoader_v21Fv = .text:0x80338890; // type:function size:0x5C scope:global align:4 -__dt__14J3DModelLoaderFv = .text:0x803388EC; // type:function size:0x48 scope:global align:4 -readMaterial_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x80338934; // type:function size:0x4 scope:global align:4 -readMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80338938; // type:function size:0x4 scope:global align:4 -readMaterialTable_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x8033893C; // type:function size:0x4 scope:global align:4 -readMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80338940; // type:function size:0x4 scope:global align:4 -calcSizeMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80338944; // type:function size:0x8 scope:global align:4 -calcSizeMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x8033894C; // type:function size:0x8 scope:global align:4 -__dt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x80338954; // type:function size:0x6C scope:global align:4 -init__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>FRC3VecRA3_A4_Cf = .text:0x803389C0; // type:function size:0x48 scope:global align:4 -calc__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x80338A08; // type:function size:0x28 scope:global align:4 -__dt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80338A30; // type:function size:0x6C scope:global align:4 -init__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>FRC3VecRA3_A4_Cf = .text:0x80338A9C; // type:function size:0x28 scope:global align:4 -calc__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80338AC4; // type:function size:0x28 scope:global align:4 -__ct__11J3DMaterialFv = .text:0x80338AEC; // type:function size:0x54 scope:global align:4 -__dt__10J3DTextureFv = .text:0x80338B40; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<7ResTIMG>__FPCvPCv = .text:0x80338B88; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x80338BA0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x80338BB8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<17_GXVtxAttrFmtList>__FPCvPCv = .text:0x80338BD0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<17J3DModelHierarchy>__FPCvPCv = .text:0x80338BE8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DShapeInitData>__FPCvUl = .text:0x80338C00; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80338C18; // type:function size:0x18 scope:global align:4 +__dt__18J3DModelLoader_v26Fv = .text:0x80338834; // type:function size:0x5C scope:weak align:4 +__dt__18J3DModelLoader_v21Fv = .text:0x80338890; // type:function size:0x5C scope:weak align:4 +__dt__14J3DModelLoaderFv = .text:0x803388EC; // type:function size:0x48 scope:weak align:4 +readMaterial_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x80338934; // type:function size:0x4 scope:weak align:4 +readMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80338938; // type:function size:0x4 scope:weak align:4 +readMaterialTable_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x8033893C; // type:function size:0x4 scope:weak align:4 +readMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80338940; // type:function size:0x4 scope:weak align:4 +calcSizeMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80338944; // type:function size:0x8 scope:weak align:4 +calcSizeMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x8033894C; // type:function size:0x8 scope:weak align:4 +__dt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x80338954; // type:function size:0x6C scope:weak align:4 +init__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>FRC3VecRA3_A4_Cf = .text:0x803389C0; // type:function size:0x48 scope:weak align:4 +calc__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x80338A08; // type:function size:0x28 scope:weak align:4 +__dt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80338A30; // type:function size:0x6C scope:weak align:4 +init__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>FRC3VecRA3_A4_Cf = .text:0x80338A9C; // type:function size:0x28 scope:weak align:4 +calc__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80338AC4; // type:function size:0x28 scope:weak align:4 +__ct__11J3DMaterialFv = .text:0x80338AEC; // type:function size:0x54 scope:weak align:4 +__dt__10J3DTextureFv = .text:0x80338B40; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<7ResTIMG>__FPCvPCv = .text:0x80338B88; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x80338BA0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x80338BB8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<17_GXVtxAttrFmtList>__FPCvPCv = .text:0x80338BD0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<17J3DModelHierarchy>__FPCvPCv = .text:0x80338BE8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DShapeInitData>__FPCvUl = .text:0x80338C00; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80338C18; // type:function size:0x18 scope:weak align:4 countMaterialNum__14J3DModelLoaderFPCv = .text:0x80338C30; // type:function size:0x40 scope:global align:4 calcLoadSize__14J3DModelLoaderFPCvUl = .text:0x80338C70; // type:function size:0x1CC scope:global align:4 calcLoadMaterialTableSize__14J3DModelLoaderFPCv = .text:0x80338E3C; // type:function size:0xF8 scope:global align:4 @@ -15278,7 +15276,7 @@ calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80339 calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl = .text:0x8033953C; // type:function size:0xD8 scope:global align:4 __ct__15J3DJointFactoryFRC13J3DJointBlock = .text:0x80339614; // type:function size:0x58 scope:global align:4 create__15J3DJointFactoryFi = .text:0x8033966C; // type:function size:0x168 scope:global align:4 -JSUConvertOffsetToPtr<16J3DJointInitData>__FPCvUl = .text:0x803397D4; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr<16J3DJointInitData>__FPCvUl = .text:0x803397D4; // type:function size:0x18 scope:weak align:4 __ct__15J3DShapeFactoryFRC13J3DShapeBlock = .text:0x803397EC; // type:function size:0xB0 scope:global align:4 create__15J3DShapeFactoryFiUlP14_GXVtxDescList = .text:0x8033989C; // type:function size:0x1BC scope:global align:4 newShapeMtx__15J3DShapeFactoryCFUlii = .text:0x80339A58; // type:function size:0x290 scope:global align:4 @@ -15287,10 +15285,10 @@ allocVcdVatCmdBuffer__15J3DShapeFactoryFUl = .text:0x80339D74; // type:function calcSize__15J3DShapeFactoryFiUl = .text:0x80339DE0; // type:function size:0x94 scope:global align:4 calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl = .text:0x80339E74; // type:function size:0x10 scope:global align:4 calcSizeShapeMtx__15J3DShapeFactoryCFUlii = .text:0x80339E84; // type:function size:0xF8 scope:global align:4 -JSUConvertOffsetToPtr<20J3DShapeDrawInitData>__FPCvUl = .text:0x80339F7C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J3DShapeMtxInitData>__FPCvUl = .text:0x80339F94; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80339FAC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<14_GXVtxDescList>__FPCvUl = .text:0x80339FC4; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr<20J3DShapeDrawInitData>__FPCvUl = .text:0x80339F7C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J3DShapeMtxInitData>__FPCvUl = .text:0x80339F94; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80339FAC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<14_GXVtxDescList>__FPCvUl = .text:0x80339FC4; // type:function size:0x18 scope:weak align:4 load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag = .text:0x80339FDC; // type:function size:0x5F4 scope:global align:4 setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv = .text:0x8033A5D0; // type:function size:0x334 scope:global align:4 __ct__20J3DAnmFullLoader_v15Fv = .text:0x8033A904; // type:function size:0x1C scope:global align:4 @@ -15325,11 +15323,11 @@ readAnmTevReg__19J3DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData = .text:0x8033B8F4; setAnmTevReg__19J3DAnmKeyLoader_v15FP15J3DAnmTevRegKeyPC19J3DAnmTevRegKeyData = .text:0x8033B91C; // type:function size:0x18C scope:global align:4 readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData = .text:0x8033BAA8; // type:function size:0x28 scope:global align:4 setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData = .text:0x8033BAD0; // type:function size:0x168 scope:global align:4 -__dt__20J3DAnmVisibilityFullFv = .text:0x8033BC38; // type:function size:0x5C scope:global align:4 -getKind__20J3DAnmVisibilityFullCFv = .text:0x8033BC94; // type:function size:0x8 scope:global align:4 -__dt__12J3DAnmLoaderFv = .text:0x8033BC9C; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<21J3DAnmClusterKeyTable>__FPCvPCv = .text:0x8033BCE4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<22J3DAnmClusterFullTable>__FPCvPCv = .text:0x8033BCFC; // type:function size:0x18 scope:global align:4 +__dt__20J3DAnmVisibilityFullFv = .text:0x8033BC38; // type:function size:0x5C scope:weak align:4 +getKind__20J3DAnmVisibilityFullCFv = .text:0x8033BC94; // type:function size:0x8 scope:weak align:4 +__dt__12J3DAnmLoaderFv = .text:0x8033BC9C; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<21J3DAnmClusterKeyTable>__FPCvPCv = .text:0x8033BCE4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<22J3DAnmClusterFullTable>__FPCvPCv = .text:0x8033BCFC; // type:function size:0x18 scope:weak align:4 JMAEulerToQuat__FsssP10Quaternion = .text:0x8033BD14; // type:function size:0xC0 scope:global align:4 JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion = .text:0x8033BDD4; // type:function size:0xF8 scope:global align:4 JMAFastVECNormalize__FPC3VecP3Vec = .text:0x8033BECC; // type:function size:0x2C scope:global align:4 @@ -15337,7 +15335,7 @@ JMAVECScaleAdd__FPC3VecPC3VecP3Vecf = .text:0x8033BEF8; // type:function size:0x JMAMTXApplyScale__FPA4_CfPA4_ffff = .text:0x8033BF20; // type:function size:0x60 scope:global align:4 __ct__Q25JMath13TRandom_fast_FUl = .text:0x8033BF80; // type:function size:0x8 scope:global align:4 __sinit_JMATrigonometric_cpp = .text:0x8033BF88; // type:function size:0x1C4 scope:local align:4 -__ct__Q23std9pairFv = .text:0x8033C14C; // type:function size:0x10 scope:global align:4 +__ct__Q23std9pairFv = .text:0x8033C14C; // type:function size:0x10 scope:weak align:4 PPCMfmsr = .text:0x8033C15C; // type:function size:0x8 scope:global align:4 PPCMtmsr = .text:0x8033C164; // type:function size:0x8 scope:global align:4 PPCMfhid0 = .text:0x8033C16C; // type:function size:0x8 scope:global align:4 @@ -15362,17 +15360,17 @@ PPCDisableSpeculation = .text:0x8033C240; // type:function size:0x28 scope:globa PPCSetFpNonIEEEMode = .text:0x8033C268; // type:function size:0x8 scope:global align:4 __OSFPRInit = .text:0x8033C270; // type:function size:0x128 scope:global align:4 OSGetConsoleType = .text:0x8033C398; // type:function size:0x28 scope:global align:4 -InquiryCallback = .text:0x8033C3C0; // type:function size:0x3C scope:global align:4 +InquiryCallback = .text:0x8033C3C0; // type:function size:0x3C scope:local align:4 OSInit = .text:0x8033C3FC; // type:function size:0x4E0 scope:global align:4 -OSExceptionInit = .text:0x8033C8DC; // type:function size:0x280 scope:global align:4 -__OSDBIntegrator = .text:0x8033CB5C; // type:function size:0x24 scope:global align:4 +OSExceptionInit = .text:0x8033C8DC; // type:function size:0x280 scope:local align:4 +__OSDBIntegrator = .text:0x8033CB5C; // type:function size:0x24 scope:local align:4 __OSDBINTSTART = .text:0x8033CB5C; // type:label scope:global align:4 -__OSDBJump = .text:0x8033CB80; // type:function size:0x4 scope:global align:4 +__OSDBJump = .text:0x8033CB80; // type:function size:0x4 scope:local align:4 __OSDBJUMPSTART = .text:0x8033CB80; // type:label scope:global align:4 __OSSetExceptionHandler = .text:0x8033CB84; // type:function size:0x1C scope:global align:4 __OSDBJUMPEND = .text:0x8033CB84; // type:label scope:global align:4 __OSGetExceptionHandler = .text:0x8033CBA0; // type:function size:0x14 scope:global align:4 -OSExceptionVector = .text:0x8033CBB4; // type:function size:0x9C scope:global align:4 +OSExceptionVector = .text:0x8033CBB4; // type:function size:0x9C scope:local align:4 __OSEVStart = .text:0x8033CBB4; // type:label scope:global align:4 __DBVECTOR = .text:0x8033CC0C; // type:label scope:global align:4 data:4byte __OSEVSetNumber = .text:0x8033CC1C; // type:label scope:global align:4 data:4byte @@ -15383,14 +15381,14 @@ __OSGetDIConfig = .text:0x8033CCFC; // type:function size:0x14 scope:global alig OSRegisterVersion = .text:0x8033CD10; // type:function size:0x2C scope:global align:4 OSInitAlarm = .text:0x8033CD3C; // type:function size:0x58 scope:global align:4 OSCreateAlarm = .text:0x8033CD94; // type:function size:0x10 scope:global align:4 -InsertAlarm = .text:0x8033CDA4; // type:function size:0x250 scope:global align:4 +InsertAlarm = .text:0x8033CDA4; // type:function size:0x250 scope:local align:4 OSSetAlarm = .text:0x8033CFF4; // type:function size:0x68 scope:global align:4 OSSetPeriodicAlarm = .text:0x8033D05C; // type:function size:0x7C scope:global align:4 OSCancelAlarm = .text:0x8033D0D8; // type:function size:0x11C scope:global align:4 -DecrementerExceptionCallback = .text:0x8033D1F4; // type:function size:0x230 scope:global align:4 -DecrementerExceptionHandler = .text:0x8033D424; // type:function size:0x50 scope:global align:4 +DecrementerExceptionCallback = .text:0x8033D1F4; // type:function size:0x230 scope:local align:4 +DecrementerExceptionHandler = .text:0x8033D424; // type:function size:0x50 scope:local align:4 OnReset = .text:0x8033D474; // type:function size:0xA0 scope:local align:4 -DLInsert = .text:0x8033D514; // type:function size:0xAC scope:global align:4 +DLInsert = .text:0x8033D514; // type:function size:0xAC scope:local align:4 OSFreeToHeap = .text:0x8033D5C0; // type:function size:0x7C scope:global align:4 OSSetCurrentHeap = .text:0x8033D63C; // type:function size:0x10 scope:global align:4 OSInitAlloc = .text:0x8033D64C; // type:function size:0x70 scope:global align:4 @@ -15412,7 +15410,7 @@ DCZeroRange = .text:0x8033DB00; // type:function size:0x2C scope:global align:4 ICInvalidateRange = .text:0x8033DB2C; // type:function size:0x34 scope:global align:4 ICFlashInvalidate = .text:0x8033DB60; // type:function size:0x10 scope:global align:4 ICEnable = .text:0x8033DB70; // type:function size:0x14 scope:global align:4 -__LCEnable = .text:0x8033DB84; // type:function size:0xCC scope:global align:4 +__LCEnable = .text:0x8033DB84; // type:function size:0xCC scope:local align:4 LCEnable = .text:0x8033DC50; // type:function size:0x38 scope:global align:4 LCDisable = .text:0x8033DC88; // type:function size:0x28 scope:global align:4 LCStoreBlocks = .text:0x8033DCB0; // type:function size:0x24 scope:global align:4 @@ -15421,8 +15419,8 @@ LCQueueWait = .text:0x8033DD80; // type:function size:0x14 scope:global align:4 L2GlobalInvalidate = .text:0x8033DD94; // type:function size:0x98 scope:global align:4 DMAErrorHandler = .text:0x8033DE2C; // type:function size:0x160 scope:global align:4 __OSCacheInit = .text:0x8033DF8C; // type:function size:0xF4 scope:global align:4 -__OSLoadFPUContext = .text:0x8033E080; // type:function size:0x124 scope:global align:4 -__OSSaveFPUContext = .text:0x8033E1A4; // type:function size:0x128 scope:global align:4 +__OSLoadFPUContext = .text:0x8033E080; // type:function size:0x124 scope:local align:4 +__OSSaveFPUContext = .text:0x8033E1A4; // type:function size:0x128 scope:local align:4 OSSaveFPUContext = .text:0x8033E2CC; // type:function size:0x8 scope:global align:4 OSSetCurrentContext = .text:0x8033E2D4; // type:function size:0x5C scope:global align:4 OSGetCurrentContext = .text:0x8033E330; // type:function size:0xC scope:global align:4 @@ -15432,22 +15430,22 @@ OSGetStackPointer = .text:0x8033E494; // type:function size:0x8 scope:global ali OSClearContext = .text:0x8033E49C; // type:function size:0x24 scope:global align:4 OSInitContext = .text:0x8033E4C0; // type:function size:0xBC scope:global align:4 OSDumpContext = .text:0x8033E57C; // type:function size:0x2A8 scope:global align:4 -OSSwitchFPUContext = .text:0x8033E824; // type:function size:0x84 scope:global align:4 +OSSwitchFPUContext = .text:0x8033E824; // type:function size:0x84 scope:local align:4 __OSContextInit = .text:0x8033E8A8; // type:function size:0x48 scope:global align:4 OSFillFPUContext = .text:0x8033E8F0; // type:function size:0x12C scope:global align:4 OSSetErrorHandler = .text:0x8033EA1C; // type:function size:0x218 scope:global align:4 __OSUnhandledException = .text:0x8033EC34; // type:function size:0x2E8 scope:global align:4 -PackArgs = .text:0x8033EF1C; // type:function size:0x188 scope:global align:4 -Run = .text:0x8033F0A4; // type:function size:0x3C scope:global align:4 -ReadDisc = .text:0x8033F0E0; // type:function size:0x6C scope:global align:4 +PackArgs = .text:0x8033EF1C; // type:function size:0x188 scope:local align:4 +Run = .text:0x8033F0A4; // type:function size:0x3C scope:local align:4 +ReadDisc = .text:0x8033F0E0; // type:function size:0x6C scope:local align:4 Callback = .text:0x8033F14C; // type:function size:0xC scope:local align:4 __OSGetExecParams = .text:0x8033F158; // type:function size:0x40 scope:global align:4 -GetApploaderPosition = .text:0x8033F198; // type:function size:0xC4 scope:global align:4 +GetApploaderPosition = .text:0x8033F198; // type:function size:0xC4 scope:local align:4 __OSBootDolSimple = .text:0x8033F25C; // type:function size:0x484 scope:global align:4 __OSBootDol = .text:0x8033F6E0; // type:function size:0x19C scope:global align:4 -GetFontCode = .text:0x8033F87C; // type:function size:0x174 scope:global align:4 +GetFontCode = .text:0x8033F87C; // type:function size:0x174 scope:local align:4 OSGetFontEncode = .text:0x8033F9F0; // type:function size:0x64 scope:global align:4 -ParseStringS = .text:0x8033FA54; // type:function size:0x13C scope:global align:4 +ParseStringS = .text:0x8033FA54; // type:function size:0x13C scope:local align:4 OSDisableInterrupts = .text:0x8033FB90; // type:function size:0x14 scope:global align:4 __RAS_OSDisableInterrupts_begin = .text:0x8033FB90; // type:label scope:global align:4 __RAS_OSDisableInterrupts_end = .text:0x8033FB9C; // type:label scope:global align:4 @@ -15456,19 +15454,19 @@ OSRestoreInterrupts = .text:0x8033FBB8; // type:function size:0x24 scope:global __OSSetInterruptHandler = .text:0x8033FBDC; // type:function size:0x1C scope:global align:4 __OSGetInterruptHandler = .text:0x8033FBF8; // type:function size:0x14 scope:global align:4 __OSInterruptInit = .text:0x8033FC0C; // type:function size:0x74 scope:global align:4 -SetInterruptMask = .text:0x8033FC80; // type:function size:0x2D8 scope:global align:4 +SetInterruptMask = .text:0x8033FC80; // type:function size:0x2D8 scope:local align:4 __OSMaskInterrupts = .text:0x8033FF58; // type:function size:0x88 scope:global align:4 __OSUnmaskInterrupts = .text:0x8033FFE0; // type:function size:0x88 scope:global align:4 __OSDispatchInterrupt = .text:0x80340068; // type:function size:0x344 scope:global align:4 -ExternalInterruptHandler = .text:0x803403AC; // type:function size:0x50 scope:global align:4 +ExternalInterruptHandler = .text:0x803403AC; // type:function size:0x50 scope:local align:4 OSNotifyLink = .text:0x803403FC; // type:function size:0x4 scope:global align:4 OSNotifyUnlink = .text:0x80340400; // type:function size:0x4 scope:global align:4 OSSetStringTable = .text:0x80340404; // type:function size:0xC scope:global align:4 -Relocate = .text:0x80340410; // type:function size:0x2BC scope:global align:4 -Link = .text:0x803406CC; // type:function size:0x2E0 scope:global align:4 +Relocate = .text:0x80340410; // type:function size:0x2BC scope:local align:4 +Link = .text:0x803406CC; // type:function size:0x2E0 scope:local align:4 OSLink = .text:0x803409AC; // type:function size:0x24 scope:global align:4 OSLinkFixed = .text:0x803409D0; // type:function size:0x3C scope:global align:4 -Undo = .text:0x80340A0C; // type:function size:0x238 scope:global align:4 +Undo = .text:0x80340A0C; // type:function size:0x238 scope:local align:4 OSUnlink = .text:0x80340C44; // type:function size:0x1D4 scope:global align:4 __OSModuleInit = .text:0x80340E18; // type:function size:0x18 scope:global align:4 OSInitMessageQueue = .text:0x80340E30; // type:function size:0x60 scope:global align:4 @@ -15476,11 +15474,11 @@ OSSendMessage = .text:0x80340E90; // type:function size:0xC8 scope:global align: OSReceiveMessage = .text:0x80340F58; // type:function size:0xDC scope:global align:4 OSJamMessage = .text:0x80341034; // type:function size:0xD4 scope:global align:4 OnReset = .text:0x80341108; // type:function size:0x3C scope:local align:4 -MEMIntrruptHandler = .text:0x80341144; // type:function size:0x6C scope:global align:4 +MEMIntrruptHandler = .text:0x80341144; // type:function size:0x6C scope:local align:4 OSProtectRange = .text:0x803411B0; // type:function size:0xC4 scope:global align:4 -Config24MB = .text:0x80341274; // type:function size:0x80 scope:global align:4 -Config48MB = .text:0x803412F4; // type:function size:0x80 scope:global align:4 -RealMode = .text:0x80341374; // type:function size:0x18 scope:global align:4 +Config24MB = .text:0x80341274; // type:function size:0x80 scope:local align:4 +Config48MB = .text:0x803412F4; // type:function size:0x80 scope:local align:4 +RealMode = .text:0x80341374; // type:function size:0x18 scope:local align:4 __OSInitMemoryProtection = .text:0x8034138C; // type:function size:0x118 scope:global align:4 OSInitMutex = .text:0x803414A4; // type:function size:0x38 scope:global align:4 OSLockMutex = .text:0x803414DC; // type:function size:0xDC scope:global align:4 @@ -15498,20 +15496,20 @@ OSSetSaveRegion = .text:0x80341ADC; // type:function size:0xC scope:global align OSGetSaveRegion = .text:0x80341AE8; // type:function size:0x14 scope:global align:4 OSRegisterResetFunction = .text:0x80341AFC; // type:function size:0x84 scope:global align:4 __OSCallResetFunctions = .text:0x80341B80; // type:function size:0xA8 scope:global align:4 -Reset = .text:0x80341C28; // type:function size:0x70 scope:global align:4 -KillThreads = .text:0x80341C98; // type:function size:0x68 scope:global align:4 +Reset = .text:0x80341C28; // type:function size:0x70 scope:local align:4 +KillThreads = .text:0x80341C98; // type:function size:0x68 scope:local align:4 __OSDoHotReset = .text:0x80341D00; // type:function size:0x48 scope:global align:4 OSResetSystem = .text:0x80341D48; // type:function size:0x200 scope:global align:4 OSGetResetCode = .text:0x80341F48; // type:function size:0x38 scope:global align:4 __OSResetSWInterruptHandler = .text:0x80341F80; // type:function size:0xF4 scope:global align:4 OSGetResetButtonState = .text:0x80342074; // type:function size:0x298 scope:global align:4 OSGetResetSwitchState = .text:0x8034230C; // type:function size:0x20 scope:global align:4 -WriteSramCallback = .text:0x8034232C; // type:function size:0x60 scope:global align:4 -WriteSram = .text:0x8034238C; // type:function size:0x118 scope:global align:4 +WriteSramCallback = .text:0x8034232C; // type:function size:0x60 scope:local align:4 +WriteSram = .text:0x8034238C; // type:function size:0x118 scope:local align:4 __OSInitSram = .text:0x803424A4; // type:function size:0x13C scope:global align:4 __OSLockSram = .text:0x803425E0; // type:function size:0x5C scope:global align:4 __OSLockSramEx = .text:0x8034263C; // type:function size:0x5C scope:global align:4 -UnlockSram = .text:0x80342698; // type:function size:0x33C scope:global align:4 +UnlockSram = .text:0x80342698; // type:function size:0x33C scope:local align:4 __OSUnlockSram = .text:0x803429D4; // type:function size:0x24 scope:global align:4 __OSUnlockSramEx = .text:0x803429F8; // type:function size:0x24 scope:global align:4 __OSSyncSram = .text:0x80342A1C; // type:function size:0x10 scope:global align:4 @@ -15523,11 +15521,11 @@ OSGetWirelessID = .text:0x80342C64; // type:function size:0x84 scope:global alig OSSetWirelessID = .text:0x80342CE8; // type:function size:0xAC scope:global align:4 OSGetGbsMode = .text:0x80342D94; // type:function size:0x70 scope:global align:4 OSSetGbsMode = .text:0x80342E04; // type:function size:0xB8 scope:global align:4 -SystemCallVector = .text:0x80342EBC; // type:function size:0x20 scope:global align:4 +SystemCallVector = .text:0x80342EBC; // type:function size:0x20 scope:local align:4 __OSSystemCallVectorStart = .text:0x80342EBC; // type:label scope:global align:4 __OSSystemCallVectorEnd = .text:0x80342ED8; // type:label scope:global align:4 __OSInitSystemCall = .text:0x80342EDC; // type:function size:0x64 scope:global align:4 -DefaultSwitchThreadCallback = .text:0x80342F40; // type:function size:0x4 scope:global align:4 +DefaultSwitchThreadCallback = .text:0x80342F40; // type:function size:0x4 scope:local align:4 OSSetSwitchThreadCallback = .text:0x80342F44; // type:function size:0x74 scope:global align:4 __OSThreadInit = .text:0x80342FB8; // type:function size:0x158 scope:global align:4 OSInitThreadQueue = .text:0x80343110; // type:function size:0x10 scope:global align:4 @@ -15535,11 +15533,11 @@ OSGetCurrentThread = .text:0x80343120; // type:function size:0xC scope:global al OSIsThreadTerminated = .text:0x8034312C; // type:function size:0x34 scope:global align:4 OSDisableScheduler = .text:0x80343160; // type:function size:0x40 scope:global align:4 OSEnableScheduler = .text:0x803431A0; // type:function size:0x40 scope:global align:4 -UnsetRun = .text:0x803431E0; // type:function size:0x68 scope:global align:4 +UnsetRun = .text:0x803431E0; // type:function size:0x68 scope:local align:4 __OSGetEffectivePriority = .text:0x80343248; // type:function size:0x3C scope:global align:4 -SetEffectivePriority = .text:0x80343284; // type:function size:0x1C0 scope:global align:4 +SetEffectivePriority = .text:0x80343284; // type:function size:0x1C0 scope:local align:4 __OSPromoteThread = .text:0x80343444; // type:function size:0x50 scope:global align:4 -SelectThread = .text:0x80343494; // type:function size:0x228 scope:global align:4 +SelectThread = .text:0x80343494; // type:function size:0x228 scope:local align:4 __OSReschedule = .text:0x803436BC; // type:function size:0x30 scope:global align:4 OSYieldThread = .text:0x803436EC; // type:function size:0x3C scope:global align:4 OSCreateThread = .text:0x80343728; // type:function size:0x1E8 scope:global align:4 @@ -15552,65 +15550,65 @@ OSSleepThread = .text:0x80344048; // type:function size:0xEC scope:global align: OSWakeupThread = .text:0x80344134; // type:function size:0x104 scope:global align:4 OSSetThreadPriority = .text:0x80344238; // type:function size:0xC0 scope:global align:4 OSGetThreadPriority = .text:0x803442F8; // type:function size:0x8 scope:global align:4 -CheckThreadQueue = .text:0x80344300; // type:function size:0x9C scope:global align:4 +CheckThreadQueue = .text:0x80344300; // type:function size:0x9C scope:local align:4 OSCheckActiveThreads = .text:0x8034439C; // type:function size:0x750 scope:global align:4 OSClearStack = .text:0x80344AEC; // type:function size:0xAC scope:global align:4 OSGetTime = .text:0x80344B98; // type:function size:0x18 scope:global align:4 OSGetTick = .text:0x80344BB0; // type:function size:0x8 scope:global align:4 __OSGetSystemTime = .text:0x80344BB8; // type:function size:0x64 scope:global align:4 __OSTimeToSystemTime = .text:0x80344C1C; // type:function size:0x58 scope:global align:4 -GetDates = .text:0x80344C74; // type:function size:0x19C scope:global align:4 +GetDates = .text:0x80344C74; // type:function size:0x19C scope:local align:4 OSTicksToCalendarTime = .text:0x80344E10; // type:function size:0x204 scope:global align:4 __init_user = .text:0x80345014; // type:function size:0x20 scope:global align:4 __init_cpp = .text:0x80345034; // type:function size:0x54 scope:global align:4 _ExitProcess = .text:0x80345088; // type:function size:0x20 scope:global align:4 -SetExiInterruptMask = .text:0x803450A8; // type:function size:0xF4 scope:global align:4 +SetExiInterruptMask = .text:0x803450A8; // type:function size:0xF4 scope:local align:4 EXIImm = .text:0x8034519C; // type:function size:0x25C scope:global align:4 EXIImmEx = .text:0x803453F8; // type:function size:0xA0 scope:global align:4 EXIDma = .text:0x80345498; // type:function size:0xEC scope:global align:4 EXISync = .text:0x80345584; // type:function size:0x24C scope:global align:4 EXIClearInterrupts = .text:0x803457D0; // type:function size:0x48 scope:global align:4 EXISetExiCallback = .text:0x80345818; // type:function size:0x7C scope:global align:4 -__EXIProbe = .text:0x80345894; // type:function size:0x174 scope:global align:4 +__EXIProbe = .text:0x80345894; // type:function size:0x174 scope:local align:4 EXIProbe = .text:0x80345A08; // type:function size:0x80 scope:global align:4 EXIProbeEx = .text:0x80345A88; // type:function size:0xB4 scope:global align:4 EXIAttach = .text:0x80345B3C; // type:function size:0x10C scope:global align:4 EXIDetach = .text:0x80345C48; // type:function size:0xBC scope:global align:4 EXISelect = .text:0x80345D04; // type:function size:0x12C scope:global align:4 EXIDeselect = .text:0x80345E30; // type:function size:0x110 scope:global align:4 -EXIIntrruptHandler = .text:0x80345F40; // type:function size:0xC8 scope:global align:4 -TCIntrruptHandler = .text:0x80346008; // type:function size:0x218 scope:global align:4 -EXTIntrruptHandler = .text:0x80346220; // type:function size:0xD0 scope:global align:4 +EXIIntrruptHandler = .text:0x80345F40; // type:function size:0xC8 scope:local align:4 +TCIntrruptHandler = .text:0x80346008; // type:function size:0x218 scope:local align:4 +EXTIntrruptHandler = .text:0x80346220; // type:function size:0xD0 scope:local align:4 EXIInit = .text:0x803462F0; // type:function size:0x1D4 scope:global align:4 EXILock = .text:0x803464C4; // type:function size:0xF4 scope:global align:4 EXIUnlock = .text:0x803465B8; // type:function size:0xDC scope:global align:4 EXIGetState = .text:0x80346694; // type:function size:0x18 scope:global align:4 -UnlockedHandler = .text:0x803466AC; // type:function size:0x28 scope:global align:4 +UnlockedHandler = .text:0x803466AC; // type:function size:0x28 scope:local align:4 EXIGetID = .text:0x803466D4; // type:function size:0x3B0 scope:global align:4 -ProbeBarnacle = .text:0x80346A84; // type:function size:0x18C scope:global align:4 +ProbeBarnacle = .text:0x80346A84; // type:function size:0x18C scope:local align:4 __OSEnableBarnacle = .text:0x80346C10; // type:function size:0x1BC scope:global align:4 InitializeUART = .text:0x80346DCC; // type:function size:0x70 scope:global align:4 WriteUARTN = .text:0x80346E3C; // type:function size:0x200 scope:global align:4 SIBusy = .text:0x8034703C; // type:function size:0x20 scope:global align:4 SIIsChanBusy = .text:0x8034705C; // type:function size:0x3C scope:global align:4 -CompleteTransfer = .text:0x80347098; // type:function size:0x2FC scope:global align:4 -SIInterruptHandler = .text:0x80347394; // type:function size:0x344 scope:global align:4 -SIEnablePollingInterrupt = .text:0x803476D8; // type:function size:0x98 scope:global align:4 +CompleteTransfer = .text:0x80347098; // type:function size:0x2FC scope:local align:4 +SIInterruptHandler = .text:0x80347394; // type:function size:0x344 scope:local align:4 +SIEnablePollingInterrupt = .text:0x803476D8; // type:function size:0x98 scope:local align:4 SIRegisterPollingHandler = .text:0x80347770; // type:function size:0xCC scope:global align:4 SIUnregisterPollingHandler = .text:0x8034783C; // type:function size:0xF4 scope:global align:4 SIInit = .text:0x80347930; // type:function size:0xB4 scope:global align:4 -__SITransfer = .text:0x803479E4; // type:function size:0x20C scope:global align:4 +__SITransfer = .text:0x803479E4; // type:function size:0x20C scope:local align:4 SIGetStatus = .text:0x80347BF0; // type:function size:0x7C scope:global align:4 SISetCommand = .text:0x80347C6C; // type:function size:0x14 scope:global align:4 SITransferCommands = .text:0x80347C80; // type:function size:0x10 scope:global align:4 SISetXY = .text:0x80347C90; // type:function size:0x6C scope:global align:4 SIEnablePolling = .text:0x80347CFC; // type:function size:0x9C scope:global align:4 SIDisablePolling = .text:0x80347D98; // type:function size:0x6C scope:global align:4 -SIGetResponseRaw = .text:0x80347E04; // type:function size:0xD4 scope:global align:4 +SIGetResponseRaw = .text:0x80347E04; // type:function size:0xD4 scope:local align:4 SIGetResponse = .text:0x80347ED8; // type:function size:0xC4 scope:global align:4 AlarmHandler = .text:0x80347F9C; // type:function size:0x8C scope:local align:4 SITransfer = .text:0x80348028; // type:function size:0x16C scope:global align:4 -GetTypeCallback = .text:0x80348194; // type:function size:0x298 scope:global align:4 +GetTypeCallback = .text:0x80348194; // type:function size:0x298 scope:local align:4 SIGetType = .text:0x8034842C; // type:function size:0x1C4 scope:global align:4 SIGetTypeAsync = .text:0x803485F0; // type:function size:0x13C scope:global align:4 SISetSamplingRate = .text:0x8034872C; // type:function size:0xE4 scope:global align:4 @@ -15626,7 +15624,7 @@ PSMTXConcat = .text:0x80348980; // type:function size:0xCC scope:global align:4 PSMTXInverse = .text:0x80348A4C; // type:function size:0xF8 scope:global align:4 PSMTXRotRad = .text:0x80348B44; // type:function size:0x70 scope:global align:4 PSMTXRotTrig = .text:0x80348BB4; // type:function size:0xB0 scope:global align:4 -__PSMTXRotAxisRadInternal = .text:0x80348C64; // type:function size:0xB0 scope:global align:4 +__PSMTXRotAxisRadInternal = .text:0x80348C64; // type:function size:0xB0 scope:local align:4 PSMTXRotAxisRad = .text:0x80348D14; // type:function size:0x70 scope:global align:4 PSMTXTrans = .text:0x80348D84; // type:function size:0x34 scope:global align:4 PSMTXTransApply = .text:0x80348DB8; // type:function size:0x4C scope:global align:4 @@ -15660,9 +15658,9 @@ C_QUATSlerp = .text:0x8034999C; // type:function size:0x174 scope:global align:4 __DVDInitWA = .text:0x80349B10; // type:function size:0x40 scope:global align:4 __DVDInterruptHandler = .text:0x80349B50; // type:function size:0x2E0 scope:global align:4 AlarmHandler = .text:0x80349E30; // type:function size:0x84 scope:local align:4 -AlarmHandlerForTimeout = .text:0x80349EB4; // type:function size:0x70 scope:global align:4 -Read = .text:0x80349F24; // type:function size:0x110 scope:global align:4 -SeekTwiceBeforeRead = .text:0x8034A034; // type:function size:0x80 scope:global align:4 +AlarmHandlerForTimeout = .text:0x80349EB4; // type:function size:0x70 scope:local align:4 +Read = .text:0x80349F24; // type:function size:0x110 scope:local align:4 +SeekTwiceBeforeRead = .text:0x8034A034; // type:function size:0x80 scope:local align:4 DVDLowRead = .text:0x8034A0B4; // type:function size:0x298 scope:global align:4 DVDLowSeek = .text:0x8034A34C; // type:function size:0x94 scope:global align:4 DVDLowWaitCoverClose = .text:0x8034A3E0; // type:function size:0x2C scope:global align:4 @@ -15683,47 +15681,47 @@ DVDConvertPathToEntrynum = .text:0x8034A9C4; // type:function size:0x2F4 scope:g DVDFastOpen = .text:0x8034ACB8; // type:function size:0x74 scope:global align:4 DVDOpen = .text:0x8034AD2C; // type:function size:0xC8 scope:global align:4 DVDClose = .text:0x8034ADF4; // type:function size:0x24 scope:global align:4 -entryToPath = .text:0x8034AE18; // type:function size:0x160 scope:global align:4 -DVDConvertEntrynumToPath = .text:0x8034AF78; // type:function size:0x154 scope:global align:4 +entryToPath = .text:0x8034AE18; // type:function size:0x160 scope:local align:4 +DVDConvertEntrynumToPath = .text:0x8034AF78; // type:function size:0x154 scope:local align:4 DVDGetCurrentDir = .text:0x8034B0CC; // type:function size:0xC4 scope:global align:4 DVDChangeDir = .text:0x8034B190; // type:function size:0x60 scope:global align:4 DVDReadAsyncPrio = .text:0x8034B1F0; // type:function size:0xC0 scope:global align:4 -cbForReadAsync = .text:0x8034B2B0; // type:function size:0x30 scope:global align:4 +cbForReadAsync = .text:0x8034B2B0; // type:function size:0x30 scope:local align:4 DVDReadPrio = .text:0x8034B2E0; // type:function size:0x118 scope:global align:4 -cbForReadSync = .text:0x8034B3F8; // type:function size:0x24 scope:global align:4 +cbForReadSync = .text:0x8034B3F8; // type:function size:0x24 scope:local align:4 DVDOpenDir = .text:0x8034B41C; // type:function size:0xC0 scope:global align:4 DVDReadDir = .text:0x8034B4DC; // type:function size:0xA4 scope:global align:4 DVDCloseDir = .text:0x8034B580; // type:function size:0x8 scope:global align:4 -defaultOptionalCommandChecker = .text:0x8034B588; // type:function size:0x4 scope:global align:4 +defaultOptionalCommandChecker = .text:0x8034B588; // type:function size:0x4 scope:local align:4 DVDInit = .text:0x8034B58C; // type:function size:0xD8 scope:global align:4 -stateReadingFST = .text:0x8034B664; // type:function size:0x94 scope:global align:4 -cbForStateReadingFST = .text:0x8034B6F8; // type:function size:0x80 scope:global align:4 -cbForStateError = .text:0x8034B778; // type:function size:0xAC scope:global align:4 -stateTimeout = .text:0x8034B824; // type:function size:0x34 scope:global align:4 -stateGettingError = .text:0x8034B858; // type:function size:0x28 scope:global align:4 -CategorizeError = .text:0x8034B880; // type:function size:0xB4 scope:global align:4 -cbForStateGettingError = .text:0x8034B934; // type:function size:0x264 scope:global align:4 -cbForUnrecoveredError = .text:0x8034BB98; // type:function size:0x5C scope:global align:4 -cbForUnrecoveredErrorRetry = .text:0x8034BBF4; // type:function size:0x80 scope:global align:4 -stateGoToRetry = .text:0x8034BC74; // type:function size:0x28 scope:global align:4 -cbForStateGoToRetry = .text:0x8034BC9C; // type:function size:0x140 scope:global align:4 -stateCheckID = .text:0x8034BDDC; // type:function size:0xE0 scope:global align:4 -stateCheckID3 = .text:0x8034BEBC; // type:function size:0x34 scope:global align:4 -stateCheckID2a = .text:0x8034BEF0; // type:function size:0x34 scope:global align:4 -cbForStateCheckID2a = .text:0x8034BF24; // type:function size:0x68 scope:global align:4 -stateCheckID2 = .text:0x8034BF8C; // type:function size:0x38 scope:global align:4 -cbForStateCheckID1 = .text:0x8034BFC4; // type:function size:0xFC scope:global align:4 -cbForStateCheckID2 = .text:0x8034C0C0; // type:function size:0xD8 scope:global align:4 -cbForStateCheckID3 = .text:0x8034C198; // type:function size:0xF0 scope:global align:4 +stateReadingFST = .text:0x8034B664; // type:function size:0x94 scope:local align:4 +cbForStateReadingFST = .text:0x8034B6F8; // type:function size:0x80 scope:local align:4 +cbForStateError = .text:0x8034B778; // type:function size:0xAC scope:local align:4 +stateTimeout = .text:0x8034B824; // type:function size:0x34 scope:local align:4 +stateGettingError = .text:0x8034B858; // type:function size:0x28 scope:local align:4 +CategorizeError = .text:0x8034B880; // type:function size:0xB4 scope:local align:4 +cbForStateGettingError = .text:0x8034B934; // type:function size:0x264 scope:local align:4 +cbForUnrecoveredError = .text:0x8034BB98; // type:function size:0x5C scope:local align:4 +cbForUnrecoveredErrorRetry = .text:0x8034BBF4; // type:function size:0x80 scope:local align:4 +stateGoToRetry = .text:0x8034BC74; // type:function size:0x28 scope:local align:4 +cbForStateGoToRetry = .text:0x8034BC9C; // type:function size:0x140 scope:local align:4 +stateCheckID = .text:0x8034BDDC; // type:function size:0xE0 scope:local align:4 +stateCheckID3 = .text:0x8034BEBC; // type:function size:0x34 scope:local align:4 +stateCheckID2a = .text:0x8034BEF0; // type:function size:0x34 scope:local align:4 +cbForStateCheckID2a = .text:0x8034BF24; // type:function size:0x68 scope:local align:4 +stateCheckID2 = .text:0x8034BF8C; // type:function size:0x38 scope:local align:4 +cbForStateCheckID1 = .text:0x8034BFC4; // type:function size:0xFC scope:local align:4 +cbForStateCheckID2 = .text:0x8034C0C0; // type:function size:0xD8 scope:local align:4 +cbForStateCheckID3 = .text:0x8034C198; // type:function size:0xF0 scope:local align:4 AlarmHandler = .text:0x8034C288; // type:function size:0x44 scope:local align:4 -stateCoverClosed = .text:0x8034C2CC; // type:function size:0xD4 scope:global align:4 -stateCoverClosed_CMD = .text:0x8034C3A0; // type:function size:0x30 scope:global align:4 -cbForStateCoverClosed = .text:0x8034C3D0; // type:function size:0x64 scope:global align:4 -stateMotorStopped = .text:0x8034C434; // type:function size:0x28 scope:global align:4 -cbForStateMotorStopped = .text:0x8034C45C; // type:function size:0xEC scope:global align:4 -stateReady = .text:0x8034C548; // type:function size:0x2E8 scope:global align:4 -stateBusy = .text:0x8034C830; // type:function size:0x340 scope:global align:4 -cbForStateBusy = .text:0x8034CB70; // type:function size:0x658 scope:global align:4 +stateCoverClosed = .text:0x8034C2CC; // type:function size:0xD4 scope:local align:4 +stateCoverClosed_CMD = .text:0x8034C3A0; // type:function size:0x30 scope:local align:4 +cbForStateCoverClosed = .text:0x8034C3D0; // type:function size:0x64 scope:local align:4 +stateMotorStopped = .text:0x8034C434; // type:function size:0x28 scope:local align:4 +cbForStateMotorStopped = .text:0x8034C45C; // type:function size:0xEC scope:local align:4 +stateReady = .text:0x8034C548; // type:function size:0x2E8 scope:local align:4 +stateBusy = .text:0x8034C830; // type:function size:0x340 scope:local align:4 +cbForStateBusy = .text:0x8034CB70; // type:function size:0x658 scope:local align:4 DVDReadAbsAsyncPrio = .text:0x8034D1C8; // type:function size:0xDC scope:global align:4 DVDReadAbsAsyncForBS = .text:0x8034D2A4; // type:function size:0xD0 scope:global align:4 DVDReadDiskID = .text:0x8034D374; // type:function size:0xD4 scope:global align:4 @@ -15736,7 +15734,7 @@ DVDSetAutoInvalidation = .text:0x8034D710; // type:function size:0x10 scope:glob DVDResume = .text:0x8034D720; // type:function size:0x50 scope:global align:4 DVDCancelAsync = .text:0x8034D770; // type:function size:0x27C scope:global align:4 DVDCancel = .text:0x8034D9EC; // type:function size:0xAC scope:global align:4 -cbForCancelSync = .text:0x8034DA98; // type:function size:0x24 scope:global align:4 +cbForCancelSync = .text:0x8034DA98; // type:function size:0x24 scope:local align:4 DVDGetCurrentDiskID = .text:0x8034DABC; // type:function size:0x8 scope:global align:4 DVDCheckDisk = .text:0x8034DAC4; // type:function size:0xF8 scope:global align:4 __DVDPrepareResetAsync = .text:0x8034DBBC; // type:function size:0x11C scope:global align:4 @@ -15746,21 +15744,21 @@ __DVDPushWaitingQueue = .text:0x8034DD48; // type:function size:0x68 scope:globa __DVDPopWaitingQueue = .text:0x8034DDB0; // type:function size:0xA0 scope:global align:4 __DVDCheckWaitingQueue = .text:0x8034DE50; // type:function size:0x58 scope:global align:4 __DVDDequeueWaitingQueue = .text:0x8034DEA8; // type:function size:0x60 scope:global align:4 -ErrorCode2Num = .text:0x8034DF08; // type:function size:0x11C scope:global align:4 +ErrorCode2Num = .text:0x8034DF08; // type:function size:0x11C scope:local align:4 __DVDStoreErrorCode = .text:0x8034E024; // type:function size:0x7C scope:global align:4 DVDCompareDiskID = .text:0x8034E0A0; // type:function size:0xF8 scope:global align:4 __DVDPrintFatalMessage = .text:0x8034E198; // type:function size:0x30 scope:global align:4 -cb = .text:0x8034E1C8; // type:function size:0xD8 scope:global align:4 +cb = .text:0x8034E1C8; // type:function size:0xD8 scope:local align:4 __fstLoad = .text:0x8034E2A0; // type:function size:0x168 scope:global align:4 -__VIRetraceHandler = .text:0x8034E408; // type:function size:0x274 scope:global align:4 +__VIRetraceHandler = .text:0x8034E408; // type:function size:0x274 scope:local align:4 VISetPreRetraceCallback = .text:0x8034E67C; // type:function size:0x44 scope:global align:4 VISetPostRetraceCallback = .text:0x8034E6C0; // type:function size:0x44 scope:global align:4 -getTiming = .text:0x8034E704; // type:function size:0xA8 scope:global align:4 +getTiming = .text:0x8034E704; // type:function size:0xA8 scope:local align:4 __VIInit = .text:0x8034E7AC; // type:function size:0x204 scope:global align:4 VIInit = .text:0x8034E9B0; // type:function size:0x4B0 scope:global align:4 VIWaitForRetrace = .text:0x8034EE60; // type:function size:0x54 scope:global align:4 -setFbbRegs = .text:0x8034EEB4; // type:function size:0x2D4 scope:global align:4 -setVerticalRegs = .text:0x8034F188; // type:function size:0x1A0 scope:global align:4 +setFbbRegs = .text:0x8034EEB4; // type:function size:0x2D4 scope:local align:4 +setVerticalRegs = .text:0x8034F188; // type:function size:0x1A0 scope:local align:4 VIConfigure = .text:0x8034F328; // type:function size:0x808 scope:global align:4 VIFlush = .text:0x8034FB30; // type:function size:0x130 scope:global align:4 VISetNextFrameBuffer = .text:0x8034FC60; // type:function size:0x6C scope:global align:4 @@ -15768,36 +15766,36 @@ VIGetNextFrameBuffer = .text:0x8034FCCC; // type:function size:0x8 scope:global VIGetCurrentFrameBuffer = .text:0x8034FCD4; // type:function size:0x8 scope:global align:4 VISetBlack = .text:0x8034FCDC; // type:function size:0x7C scope:global align:4 VIGetRetraceCount = .text:0x8034FD58; // type:function size:0x8 scope:global align:4 -GetCurrentDisplayPosition = .text:0x8034FD60; // type:function size:0x3C scope:global align:4 -getCurrentFieldEvenOdd = .text:0x8034FD9C; // type:function size:0x68 scope:global align:4 +GetCurrentDisplayPosition = .text:0x8034FD60; // type:function size:0x3C scope:local align:4 +getCurrentFieldEvenOdd = .text:0x8034FD9C; // type:function size:0x68 scope:local align:4 VIGetNextField = .text:0x8034FE04; // type:function size:0x9C scope:global align:4 VIGetCurrentLine = .text:0x8034FEA0; // type:function size:0x98 scope:global align:4 VIGetTvFormat = .text:0x8034FF38; // type:function size:0x68 scope:global align:4 VIGetDTVStatus = .text:0x8034FFA0; // type:function size:0x3C scope:global align:4 __VIDisplayPositionToXY = .text:0x8034FFDC; // type:function size:0x21C scope:global align:4 __VIGetCurrentPosition = .text:0x803501F8; // type:function size:0x60 scope:global align:4 -ClampStick = .text:0x80350258; // type:function size:0x130 scope:global align:4 -ClampCircle = .text:0x80350388; // type:function size:0x1A8 scope:global align:4 +ClampStick = .text:0x80350258; // type:function size:0x130 scope:local align:4 +ClampCircle = .text:0x80350388; // type:function size:0x1A8 scope:local align:4 PADClamp = .text:0x80350530; // type:function size:0x114 scope:global align:4 PADClampCircle = .text:0x80350644; // type:function size:0x10C scope:global align:4 -UpdateOrigin = .text:0x80350750; // type:function size:0x1A4 scope:global align:4 -PADOriginCallback = .text:0x803508F4; // type:function size:0xC4 scope:global align:4 -PADOriginUpdateCallback = .text:0x803509B8; // type:function size:0xCC scope:global align:4 -PADProbeCallback = .text:0x80350A84; // type:function size:0xD8 scope:global align:4 -PADTypeAndStatusCallback = .text:0x80350B5C; // type:function size:0x32C scope:global align:4 -PADReceiveCheckCallback = .text:0x80350E88; // type:function size:0x140 scope:global align:4 +UpdateOrigin = .text:0x80350750; // type:function size:0x1A4 scope:local align:4 +PADOriginCallback = .text:0x803508F4; // type:function size:0xC4 scope:local align:4 +PADOriginUpdateCallback = .text:0x803509B8; // type:function size:0xCC scope:local align:4 +PADProbeCallback = .text:0x80350A84; // type:function size:0xD8 scope:local align:4 +PADTypeAndStatusCallback = .text:0x80350B5C; // type:function size:0x32C scope:local align:4 +PADReceiveCheckCallback = .text:0x80350E88; // type:function size:0x140 scope:local align:4 PADReset = .text:0x80350FC8; // type:function size:0x110 scope:global align:4 PADRecalibrate = .text:0x803510D8; // type:function size:0x114 scope:global align:4 PADInit = .text:0x803511EC; // type:function size:0x150 scope:global align:4 PADRead = .text:0x8035133C; // type:function size:0x300 scope:global align:4 PADControlMotor = .text:0x8035163C; // type:function size:0xB8 scope:global align:4 PADSetSpec = .text:0x803516F4; // type:function size:0x60 scope:global align:4 -SPEC0_MakeStatus = .text:0x80351754; // type:function size:0x174 scope:global align:4 -SPEC1_MakeStatus = .text:0x803518C8; // type:function size:0x174 scope:global align:4 -SPEC2_MakeStatus = .text:0x80351A3C; // type:function size:0x470 scope:global align:4 +SPEC0_MakeStatus = .text:0x80351754; // type:function size:0x174 scope:local align:4 +SPEC1_MakeStatus = .text:0x803518C8; // type:function size:0x174 scope:local align:4 +SPEC2_MakeStatus = .text:0x80351A3C; // type:function size:0x470 scope:local align:4 PADSetAnalogMode = .text:0x80351EAC; // type:function size:0x74 scope:global align:4 OnReset = .text:0x80351F20; // type:function size:0xBC scope:local align:4 -SamplingHandler = .text:0x80351FDC; // type:function size:0x60 scope:global align:4 +SamplingHandler = .text:0x80351FDC; // type:function size:0x60 scope:local align:4 PADSetSamplingCallback = .text:0x8035203C; // type:function size:0x54 scope:global align:4 __PADDisableRecalibration = .text:0x80352090; // type:function size:0x7C scope:global align:4 AIRegisterDMACallback = .text:0x8035210C; // type:function size:0x44 scope:global align:4 @@ -15808,27 +15806,27 @@ AISetStreamPlayState = .text:0x80352208; // type:function size:0xD8 scope:global AIGetStreamPlayState = .text:0x803522E0; // type:function size:0x10 scope:global align:4 AISetDSPSampleRate = .text:0x803522F0; // type:function size:0xE0 scope:global align:4 AIGetDSPSampleRate = .text:0x803523D0; // type:function size:0x14 scope:global align:4 -__AI_set_stream_sample_rate = .text:0x803523E4; // type:function size:0xD4 scope:global align:4 +__AI_set_stream_sample_rate = .text:0x803523E4; // type:function size:0xD4 scope:local align:4 AIGetStreamSampleRate = .text:0x803524B8; // type:function size:0x10 scope:global align:4 AISetStreamVolLeft = .text:0x803524C8; // type:function size:0x1C scope:global align:4 AIGetStreamVolLeft = .text:0x803524E4; // type:function size:0x10 scope:global align:4 AISetStreamVolRight = .text:0x803524F4; // type:function size:0x1C scope:global align:4 AIGetStreamVolRight = .text:0x80352510; // type:function size:0x10 scope:global align:4 AIInit = .text:0x80352520; // type:function size:0x16C scope:global align:4 -__AISHandler = .text:0x8035268C; // type:function size:0x7C scope:global align:4 -__AIDHandler = .text:0x80352708; // type:function size:0xAC scope:global align:4 -__AICallbackStackSwitch = .text:0x803527B4; // type:function size:0x58 scope:global align:4 -__AI_SRC_INIT = .text:0x8035280C; // type:function size:0x1E4 scope:global align:4 +__AISHandler = .text:0x8035268C; // type:function size:0x7C scope:local align:4 +__AIDHandler = .text:0x80352708; // type:function size:0xAC scope:local align:4 +__AICallbackStackSwitch = .text:0x803527B4; // type:function size:0x58 scope:local align:4 +__AI_SRC_INIT = .text:0x8035280C; // type:function size:0x1E4 scope:local align:4 ARRegisterDMACallback = .text:0x803529F0; // type:function size:0x44 scope:global align:4 ARGetDMAStatus = .text:0x80352A34; // type:function size:0x3C scope:global align:4 ARStartDMA = .text:0x80352A70; // type:function size:0xF0 scope:global align:4 ARAlloc = .text:0x80352B60; // type:function size:0x68 scope:global align:4 ARInit = .text:0x80352BC8; // type:function size:0xC4 scope:global align:4 ARGetSize = .text:0x80352C8C; // type:function size:0x8 scope:global align:4 -__ARHandler = .text:0x80352C94; // type:function size:0x78 scope:global align:4 +__ARHandler = .text:0x80352C94; // type:function size:0x78 scope:local align:4 __ARClearInterrupt = .text:0x80352D0C; // type:function size:0x20 scope:global align:4 __ARGetInterruptStatus = .text:0x80352D2C; // type:function size:0x10 scope:global align:4 -__ARChecksize = .text:0x80352D3C; // type:function size:0x17F4 scope:global align:4 +__ARChecksize = .text:0x80352D3C; // type:function size:0x17F4 scope:local align:4 __ARQServiceQueueLo = .text:0x80354530; // type:function size:0x100 scope:global align:4 __ARQCallbackHack = .text:0x80354630; // type:function size:0x4 scope:global align:4 __ARQInterruptServiceRoutine = .text:0x80354634; // type:function size:0xCC scope:global align:4 @@ -15855,10 +15853,10 @@ __CARDEnableInterrupt = .text:0x80355220; // type:function size:0xC0 scope:globa __CARDReadStatus = .text:0x803552E0; // type:function size:0xF0 scope:global align:4 __CARDReadVendorID = .text:0x803553D0; // type:function size:0xF0 scope:global align:4 __CARDClearStatus = .text:0x803554C0; // type:function size:0xAC scope:global align:4 -TimeoutHandler = .text:0x8035556C; // type:function size:0xA4 scope:global align:4 -Retry = .text:0x80355610; // type:function size:0x2A0 scope:global align:4 -UnlockedCallback = .text:0x803558B0; // type:function size:0x110 scope:global align:4 -__CARDStart = .text:0x803559C0; // type:function size:0x224 scope:global align:4 +TimeoutHandler = .text:0x8035556C; // type:function size:0xA4 scope:local align:4 +Retry = .text:0x80355610; // type:function size:0x2A0 scope:local align:4 +UnlockedCallback = .text:0x803558B0; // type:function size:0x110 scope:local align:4 +__CARDStart = .text:0x803559C0; // type:function size:0x224 scope:local align:4 __CARDReadSegment = .text:0x80355BE4; // type:function size:0x134 scope:global align:4 __CARDWritePage = .text:0x80355D18; // type:function size:0x13C scope:global align:4 __CARDEraseSector = .text:0x80355E54; // type:function size:0x110 scope:global align:4 @@ -15871,15 +15869,15 @@ CARDFreeBlocks = .text:0x8035616C; // type:function size:0x150 scope:global alig __CARDSync = .text:0x803562BC; // type:function size:0x98 scope:global align:4 OnReset = .text:0x80356354; // type:function size:0x50 scope:local align:4 CARDGetFastMode = .text:0x803563A4; // type:function size:0x1C scope:global align:4 -bitrev = .text:0x803563C0; // type:function size:0x16C scope:global align:4 -ReadArrayUnlock = .text:0x8035652C; // type:function size:0x144 scope:global align:4 -DummyLen = .text:0x80356670; // type:function size:0xC4 scope:global align:4 +bitrev = .text:0x803563C0; // type:function size:0x16C scope:local align:4 +ReadArrayUnlock = .text:0x8035652C; // type:function size:0x144 scope:local align:4 +DummyLen = .text:0x80356670; // type:function size:0xC4 scope:local align:4 __CARDUnlock = .text:0x80356734; // type:function size:0xB58 scope:global align:4 -InitCallback = .text:0x8035728C; // type:function size:0x70 scope:global align:4 -DoneCallback = .text:0x803572FC; // type:function size:0x324 scope:global align:4 -BlockReadCallback = .text:0x80357620; // type:function size:0xDC scope:global align:4 +InitCallback = .text:0x8035728C; // type:function size:0x70 scope:local align:4 +DoneCallback = .text:0x803572FC; // type:function size:0x324 scope:local align:4 +BlockReadCallback = .text:0x80357620; // type:function size:0xDC scope:local align:4 __CARDRead = .text:0x803576FC; // type:function size:0x64 scope:global align:4 -BlockWriteCallback = .text:0x80357760; // type:function size:0xE8 scope:global align:4 +BlockWriteCallback = .text:0x80357760; // type:function size:0xE8 scope:local align:4 __CARDWrite = .text:0x80357848; // type:function size:0x68 scope:global align:4 __CARDGetFatBlock = .text:0x803578B0; // type:function size:0x8 scope:global align:4 WriteCallback = .text:0x803578B8; // type:function size:0xD4 scope:local align:4 @@ -15891,22 +15889,22 @@ WriteCallback = .text:0x80357C20; // type:function size:0xD0 scope:local align:4 EraseCallback = .text:0x80357CF0; // type:function size:0xC8 scope:local align:4 __CARDUpdateDir = .text:0x80357DB8; // type:function size:0xC4 scope:global align:4 __CARDCheckSum = .text:0x80357E7C; // type:function size:0x1B0 scope:global align:4 -VerifyID = .text:0x8035802C; // type:function size:0x284 scope:global align:4 -VerifyDir = .text:0x803582B0; // type:function size:0x240 scope:global align:4 -VerifyFAT = .text:0x803584F0; // type:function size:0x284 scope:global align:4 +VerifyID = .text:0x8035802C; // type:function size:0x284 scope:local align:4 +VerifyDir = .text:0x803582B0; // type:function size:0x240 scope:local align:4 +VerifyFAT = .text:0x803584F0; // type:function size:0x284 scope:local align:4 __CARDVerify = .text:0x80358774; // type:function size:0x8C scope:global align:4 CARDCheckExAsync = .text:0x80358800; // type:function size:0x590 scope:global align:4 CARDCheck = .text:0x80358D90; // type:function size:0x54 scope:global align:4 -IsCard = .text:0x80358DE4; // type:function size:0xCC scope:global align:4 +IsCard = .text:0x80358DE4; // type:function size:0xCC scope:local align:4 CARDProbe = .text:0x80358EB0; // type:function size:0x38 scope:global align:4 CARDProbeEx = .text:0x80358EE8; // type:function size:0x17C scope:global align:4 -DoMount = .text:0x80359064; // type:function size:0x454 scope:global align:4 +DoMount = .text:0x80359064; // type:function size:0x454 scope:local align:4 __CARDMountCallback = .text:0x803594B8; // type:function size:0x138 scope:global align:4 CARDMountAsync = .text:0x803595F0; // type:function size:0x1A0 scope:global align:4 CARDMount = .text:0x80359790; // type:function size:0x48 scope:global align:4 -DoUnmount = .text:0x803597D8; // type:function size:0x9C scope:global align:4 +DoUnmount = .text:0x803597D8; // type:function size:0x9C scope:local align:4 CARDUnmount = .text:0x80359874; // type:function size:0xAC scope:global align:4 -FormatCallback = .text:0x80359920; // type:function size:0x144 scope:global align:4 +FormatCallback = .text:0x80359920; // type:function size:0x144 scope:local align:4 __CARDFormatRegionAsync = .text:0x80359A64; // type:function size:0x658 scope:global align:4 CARDFormat = .text:0x8035A0BC; // type:function size:0x54 scope:global align:4 __CARDCompareFileName = .text:0x8035A110; // type:function size:0x68 scope:global align:4 @@ -15915,29 +15913,29 @@ __CARDIsWritable = .text:0x8035A20C; // type:function size:0x134 scope:global al __CARDIsReadable = .text:0x8035A340; // type:function size:0xF4 scope:global align:4 CARDOpen = .text:0x8035A434; // type:function size:0x11C scope:global align:4 CARDClose = .text:0x8035A550; // type:function size:0x54 scope:global align:4 -CreateCallbackFat = .text:0x8035A5A4; // type:function size:0x130 scope:global align:4 +CreateCallbackFat = .text:0x8035A5A4; // type:function size:0x130 scope:local align:4 CARDCreateAsync = .text:0x8035A6D4; // type:function size:0x220 scope:global align:4 CARDCreate = .text:0x8035A8F4; // type:function size:0x48 scope:global align:4 __CARDSeek = .text:0x8035A93C; // type:function size:0x1B8 scope:global align:4 -ReadCallback = .text:0x8035AAF4; // type:function size:0x130 scope:global align:4 +ReadCallback = .text:0x8035AAF4; // type:function size:0x130 scope:local align:4 CARDReadAsync = .text:0x8035AC24; // type:function size:0x144 scope:global align:4 CARDRead = .text:0x8035AD68; // type:function size:0x48 scope:global align:4 WriteCallback = .text:0x8035ADB0; // type:function size:0x170 scope:local align:4 EraseCallback = .text:0x8035AF20; // type:function size:0xB0 scope:local align:4 CARDWriteAsync = .text:0x8035AFD0; // type:function size:0x114 scope:global align:4 CARDWrite = .text:0x8035B0E4; // type:function size:0x48 scope:global align:4 -UpdateIconOffsets = .text:0x8035B12C; // type:function size:0x1F8 scope:global align:4 +UpdateIconOffsets = .text:0x8035B12C; // type:function size:0x1F8 scope:local align:4 CARDGetStatus = .text:0x8035B324; // type:function size:0x114 scope:global align:4 CARDSetStatusAsync = .text:0x8035B438; // type:function size:0x174 scope:global align:4 CARDSetStatus = .text:0x8035B5AC; // type:function size:0x48 scope:global align:4 CARDGetSerialNo = .text:0x8035B5F4; // type:function size:0xC4 scope:global align:4 -__GXDefaultTexRegionCallback = .text:0x8035B6B8; // type:function size:0xFC scope:global align:4 -__GXDefaultTlutRegionCallback = .text:0x8035B7B4; // type:function size:0x24 scope:global align:4 -__GXShutdown = .text:0x8035B7D8; // type:function size:0x190 scope:global align:4 +__GXDefaultTexRegionCallback = .text:0x8035B6B8; // type:function size:0xFC scope:local align:4 +__GXDefaultTlutRegionCallback = .text:0x8035B7B4; // type:function size:0x24 scope:local align:4 +__GXShutdown = .text:0x8035B7D8; // type:function size:0x190 scope:local align:4 __GXInitRevisionBits = .text:0x8035B968; // type:function size:0x1A4 scope:global align:4 GXInit = .text:0x8035BB0C; // type:function size:0x600 scope:global align:4 __GXInitGX = .text:0x8035C10C; // type:function size:0x938 scope:global align:4 -GXCPInterruptHandler = .text:0x8035CA44; // type:function size:0x134 scope:global align:4 +GXCPInterruptHandler = .text:0x8035CA44; // type:function size:0x134 scope:local align:4 GXInitFifoBase = .text:0x8035CB78; // type:function size:0x6C scope:global align:4 GXInitFifoPtrs = .text:0x8035CBE4; // type:function size:0x70 scope:global align:4 GXInitFifoLimits = .text:0x8035CC54; // type:function size:0xC scope:global align:4 @@ -15950,11 +15948,11 @@ GXGetFifoBase = .text:0x8035D074; // type:function size:0x8 scope:global align:4 GXGetFifoSize = .text:0x8035D07C; // type:function size:0x8 scope:global align:4 GXSetBreakPtCallback = .text:0x8035D084; // type:function size:0x44 scope:global align:4 __GXFifoInit = .text:0x8035D0C8; // type:function size:0x4C scope:global align:4 -__GXFifoReadEnable = .text:0x8035D114; // type:function size:0x24 scope:global align:4 -__GXFifoReadDisable = .text:0x8035D138; // type:function size:0x24 scope:global align:4 -__GXFifoLink = .text:0x8035D15C; // type:function size:0x34 scope:global align:4 -__GXWriteFifoIntEnable = .text:0x8035D190; // type:function size:0x30 scope:global align:4 -__GXWriteFifoIntReset = .text:0x8035D1C0; // type:function size:0x30 scope:global align:4 +__GXFifoReadEnable = .text:0x8035D114; // type:function size:0x24 scope:local align:4 +__GXFifoReadDisable = .text:0x8035D138; // type:function size:0x24 scope:local align:4 +__GXFifoLink = .text:0x8035D15C; // type:function size:0x34 scope:local align:4 +__GXWriteFifoIntEnable = .text:0x8035D190; // type:function size:0x30 scope:local align:4 +__GXWriteFifoIntReset = .text:0x8035D1C0; // type:function size:0x30 scope:local align:4 __GXCleanGPFifo = .text:0x8035D1F0; // type:function size:0x100 scope:global align:4 GXSetCurrentGXThread = .text:0x8035D2F0; // type:function size:0x4C scope:global align:4 GXGetCurrentGXThread = .text:0x8035D33C; // type:function size:0x8 scope:global align:4 @@ -15989,9 +15987,9 @@ GXPokeDither = .text:0x8035E920; // type:function size:0x18 scope:global align:4 GXPokeZMode = .text:0x8035E938; // type:function size:0x20 scope:global align:4 GXPeekZ = .text:0x8035E958; // type:function size:0x24 scope:global align:4 GXSetDrawSyncCallback = .text:0x8035E97C; // type:function size:0x44 scope:global align:4 -GXTokenInterruptHandler = .text:0x8035E9C0; // type:function size:0x88 scope:global align:4 +GXTokenInterruptHandler = .text:0x8035E9C0; // type:function size:0x88 scope:local align:4 GXSetDrawDoneCallback = .text:0x8035EA48; // type:function size:0x44 scope:global align:4 -GXFinishInterruptHandler = .text:0x8035EA8C; // type:function size:0x80 scope:global align:4 +GXFinishInterruptHandler = .text:0x8035EA8C; // type:function size:0x80 scope:local align:4 __GXPEInit = .text:0x8035EB0C; // type:function size:0x74 scope:global align:4 __GXSetDirtyState = .text:0x8035EB80; // type:function size:0x80 scope:global align:4 GXBegin = .text:0x8035EC00; // type:function size:0xD0 scope:global align:4 @@ -16050,7 +16048,7 @@ GXInvalidateTexAll = .text:0x80360B00; // type:function size:0x48 scope:global a GXSetTexRegionCallback = .text:0x80360B48; // type:function size:0x14 scope:global align:4 GXSetTlutRegionCallback = .text:0x80360B5C; // type:function size:0x14 scope:global align:4 GXSetTexCoordScaleManually = .text:0x80360B70; // type:function size:0x7C scope:global align:4 -__SetSURegs = .text:0x80360BEC; // type:function size:0xA0 scope:global align:4 +__SetSURegs = .text:0x80360BEC; // type:function size:0xA0 scope:local align:4 __GXSetSUTexRegs = .text:0x80360C8C; // type:function size:0x17C scope:global align:4 __GXSetTmemConfig = .text:0x80360E08; // type:function size:0x354 scope:global align:4 GXSetTevIndirect = .text:0x8036115C; // type:function size:0x6C scope:global align:4 @@ -16124,13 +16122,13 @@ __copy = .text:0x803640D8; // type:function size:0x30 scope:global align:4 __destroy_new_array = .text:0x80364108; // type:function size:0x7C scope:global align:4 __destroy_arr = .text:0x80364184; // type:function size:0x78 scope:global align:4 __construct_array = .text:0x803641FC; // type:function size:0xFC scope:global align:4 -__dt__26__partial_array_destructorFv = .text:0x803642F8; // type:function size:0xB8 scope:global align:4 +__dt__26__partial_array_destructorFv = .text:0x803642F8; // type:function size:0xB8 scope:weak align:4 __construct_new_array = .text:0x803643B0; // type:function size:0x104 scope:global align:4 __ptmf_test = .text:0x803644B4; // type:function size:0x30 scope:global align:4 __ptmf_cmpr = .text:0x803644E4; // type:function size:0x3C scope:global align:4 __ptmf_scall = .text:0x80364520; // type:function size:0x28 scope:global align:4 __cvt_fp2unsigned = .text:0x80364548; // type:function size:0x5C scope:global align:4 -__save_fpr = .text:0x803645A4; // type:function size:0x4C scope:global align:4 +__save_fpr = .text:0x803645A4; // type:function size:0x4C scope:local align:4 _savefpr_14 = .text:0x803645A4; // type:label scope:global _savefpr_15 = .text:0x803645A8; // type:label scope:global _savefpr_16 = .text:0x803645AC; // type:label scope:global @@ -16149,7 +16147,7 @@ _savefpr_28 = .text:0x803645DC; // type:label scope:global align:4 _savefpr_29 = .text:0x803645E0; // type:label scope:global align:4 _savefpr_30 = .text:0x803645E4; // type:label scope:global _savefpr_31 = .text:0x803645E8; // type:label scope:global -__restore_fpr = .text:0x803645F0; // type:function size:0x4C scope:global align:4 +__restore_fpr = .text:0x803645F0; // type:function size:0x4C scope:local align:4 _restfpr_14 = .text:0x803645F0; // type:label scope:global _restfpr_15 = .text:0x803645F4; // type:label scope:global _restfpr_16 = .text:0x803645F8; // type:label scope:global @@ -16168,7 +16166,7 @@ _restfpr_28 = .text:0x80364628; // type:label scope:global align:4 _restfpr_29 = .text:0x8036462C; // type:label scope:global align:4 _restfpr_30 = .text:0x80364630; // type:label scope:global _restfpr_31 = .text:0x80364634; // type:label scope:global -__save_gpr = .text:0x8036463C; // type:function size:0x4C scope:global align:4 +__save_gpr = .text:0x8036463C; // type:function size:0x4C scope:local align:4 _savegpr_14 = .text:0x8036463C; // type:label scope:global align:4 _savegpr_15 = .text:0x80364640; // type:label scope:global align:4 _savegpr_16 = .text:0x80364644; // type:label scope:global align:4 @@ -16187,7 +16185,7 @@ _savegpr_28 = .text:0x80364674; // type:label scope:global align:4 _savegpr_29 = .text:0x80364678; // type:label scope:global align:4 _savegpr_30 = .text:0x8036467C; // type:label scope:global _savegpr_31 = .text:0x80364680; // type:label scope:global -__restore_gpr = .text:0x80364688; // type:function size:0x4C scope:global align:4 +__restore_gpr = .text:0x80364688; // type:function size:0x4C scope:local align:4 _restgpr_14 = .text:0x80364688; // type:label scope:global align:4 _restgpr_15 = .text:0x8036468C; // type:label scope:global align:4 _restgpr_16 = .text:0x80364690; // type:label scope:global align:4 @@ -16225,7 +16223,7 @@ abort = .text:0x80364F58; // type:function size:0x9C scope:global align:4 free = .text:0x80364FF4; // type:function size:0x70 scope:global align:4 __pool_free = .text:0x80365064; // type:function size:0x58 scope:global align:4 deallocate_from_fixed_pools = .text:0x803650BC; // type:function size:0x158 scope:global align:4 -deallocate_from_var_pools = .text:0x80365214; // type:function size:0x294 scope:global align:4 +deallocate_from_var_pools = .text:0x80365214; // type:function size:0x294 scope:local align:4 __flush_all = .text:0x803654A8; // type:function size:0x70 scope:global align:4 __close_all = .text:0x80365518; // type:function size:0xA8 scope:global align:4 __num2dec = .text:0x803655C0; // type:function size:0x1A4 scope:global align:4 @@ -16266,15 +16264,15 @@ vsnprintf = .text:0x80368B2C; // type:function size:0x74 scope:global align:4 vprintf = .text:0x80368BA0; // type:function size:0x98 scope:global align:4 fprintf = .text:0x80368C38; // type:function size:0xE0 scope:global align:4 printf = .text:0x80368D18; // type:function size:0xE8 scope:global align:4 -__StringWrite = .text:0x80368E00; // type:function size:0x6C scope:global align:4 -__FileWrite = .text:0x80368E6C; // type:function size:0x58 scope:global align:4 -__pformatter = .text:0x80368EC4; // type:function size:0x774 scope:global align:4 -float2str = .text:0x80369638; // type:function size:0x71C scope:global align:4 -round_decimal = .text:0x80369D54; // type:function size:0x12C scope:global align:4 -double2hex = .text:0x80369E80; // type:function size:0x338 scope:global align:4 -longlong2str = .text:0x8036A1B8; // type:function size:0x314 scope:global align:4 -long2str = .text:0x8036A4CC; // type:function size:0x258 scope:global align:4 -parse_format = .text:0x8036A724; // type:function size:0x504 scope:global align:4 +__StringWrite = .text:0x80368E00; // type:function size:0x6C scope:local align:4 +__FileWrite = .text:0x80368E6C; // type:function size:0x58 scope:local align:4 +__pformatter = .text:0x80368EC4; // type:function size:0x774 scope:local align:4 +float2str = .text:0x80369638; // type:function size:0x71C scope:local align:4 +round_decimal = .text:0x80369D54; // type:function size:0x12C scope:local align:4 +double2hex = .text:0x80369E80; // type:function size:0x338 scope:local align:4 +longlong2str = .text:0x8036A1B8; // type:function size:0x314 scope:local align:4 +long2str = .text:0x8036A4CC; // type:function size:0x258 scope:local align:4 +parse_format = .text:0x8036A724; // type:function size:0x504 scope:local align:4 __StringRead = .text:0x8036AC28; // type:function size:0x90 scope:global align:4 raise = .text:0x8036ACB8; // type:function size:0xC0 scope:global align:4 strrchr = .text:0x8036AD78; // type:function size:0x48 scope:global align:4 @@ -16319,10 +16317,10 @@ exp = .text:0x8036EBDC; // type:function size:0x20 scope:global align:4 fmod = .text:0x8036EBFC; // type:function size:0x20 scope:global align:4 pow = .text:0x8036EC1C; // type:function size:0x20 scope:global align:4 __ieee754_sqrt = .text:0x8036EC3C; // type:function size:0x224 scope:global align:4 -tanf = .text:0x8036EE60; // type:function size:0x24 scope:global align:4 -sinf = .text:0x8036EE84; // type:function size:0x24 scope:global align:4 -cosf = .text:0x8036EEA8; // type:function size:0x24 scope:global align:4 -acosf = .text:0x8036EECC; // type:function size:0x24 scope:global align:4 +tanf = .text:0x8036EE60; // type:function size:0x24 scope:weak align:4 +sinf = .text:0x8036EE84; // type:function size:0x24 scope:weak align:4 +cosf = .text:0x8036EEA8; // type:function size:0x24 scope:weak align:4 +acosf = .text:0x8036EECC; // type:function size:0x24 scope:weak align:4 sqrt = .text:0x8036EEF0; // type:function size:0x20 scope:global align:4 strnicmp = .text:0x8036EF10; // type:function size:0x20 scope:global align:4 stricmp = .text:0x8036EF30; // type:function size:0x8C scope:global align:4 @@ -16389,9 +16387,9 @@ TRK_flush_cache = .text:0x803719E4; // type:function size:0x38 scope:global alig TRK_fill_mem = .text:0x80371A1C; // type:function size:0xB8 scope:global align:4 __TRK_get_MSR = .text:0x80371AD4; // type:function size:0x8 scope:global align:4 __TRK_set_MSR = .text:0x80371ADC; // type:function size:0x8 scope:global align:4 -TRK_ppc_memcpy = .text:0x80371AE4; // type:function size:0x3C scope:global align:4 +TRK_ppc_memcpy = .text:0x80371AE4; // type:function size:0x3C scope:local align:4 TRKInterruptHandler = .text:0x80371B20; // type:function size:0x194 scope:global align:4 -TRKExceptionHandler = .text:0x80371CB4; // type:function size:0x9C scope:global align:4 +TRKExceptionHandler = .text:0x80371CB4; // type:function size:0x9C scope:local align:4 TRKSwapAndGo = .text:0x80371D50; // type:function size:0xC4 scope:global align:4 TRKInterruptHandlerEnableInterrupts = .text:0x80371E14; // type:function size:0x54 scope:global align:4 ReadFPSCR = .text:0x80371E68; // type:function size:0x24 scope:global align:4 @@ -16449,15 +16447,15 @@ GetUseSerialIO = .text:0x80374610; // type:function size:0x10 scope:global align SetUseSerialIO = .text:0x80374620; // type:function size:0xC scope:global align:4 __TRK_write_console = .text:0x8037462C; // type:function size:0xBC scope:global align:4 __read_console = .text:0x803746E8; // type:function size:0xBC scope:global align:4 -udp_cc_post_stop = .text:0x803747A4; // type:function size:0x8 scope:global align:4 -udp_cc_pre_continue = .text:0x803747AC; // type:function size:0x8 scope:global align:4 -udp_cc_peek = .text:0x803747B4; // type:function size:0x8 scope:global align:4 -udp_cc_write = .text:0x803747BC; // type:function size:0x8 scope:global align:4 -udp_cc_read = .text:0x803747C4; // type:function size:0x8 scope:global align:4 -udp_cc_close = .text:0x803747CC; // type:function size:0x8 scope:global align:4 -udp_cc_open = .text:0x803747D4; // type:function size:0x8 scope:global align:4 -udp_cc_shutdown = .text:0x803747DC; // type:function size:0x8 scope:global align:4 -udp_cc_initialize = .text:0x803747E4; // type:function size:0x8 scope:global align:4 +udp_cc_post_stop = .text:0x803747A4; // type:function size:0x8 scope:weak align:4 +udp_cc_pre_continue = .text:0x803747AC; // type:function size:0x8 scope:weak align:4 +udp_cc_peek = .text:0x803747B4; // type:function size:0x8 scope:weak align:4 +udp_cc_write = .text:0x803747BC; // type:function size:0x8 scope:weak align:4 +udp_cc_read = .text:0x803747C4; // type:function size:0x8 scope:weak align:4 +udp_cc_close = .text:0x803747CC; // type:function size:0x8 scope:weak align:4 +udp_cc_open = .text:0x803747D4; // type:function size:0x8 scope:weak align:4 +udp_cc_shutdown = .text:0x803747DC; // type:function size:0x8 scope:weak align:4 +udp_cc_initialize = .text:0x803747E4; // type:function size:0x8 scope:weak align:4 ddh_cc_initinterrupts = .text:0x803747EC; // type:function size:0x24 scope:global align:4 ddh_cc_peek = .text:0x80374810; // type:function size:0x70 scope:global align:4 ddh_cc_post_stop = .text:0x80374880; // type:function size:0x24 scope:global align:4 @@ -16501,13 +16499,13 @@ DBRead = .text:0x80375424; // type:function size:0x8C scope:global align:4 DBQueryData = .text:0x803754B0; // type:function size:0x9C scope:global align:4 DBInitInterrupts = .text:0x8037554C; // type:function size:0x54 scope:global align:4 DBInitComm = .text:0x803755A0; // type:function size:0x78 scope:global align:4 -DBGHandler = .text:0x80375618; // type:function size:0x40 scope:global align:4 -MWCallback = .text:0x80375658; // type:function size:0x3C scope:global align:4 -DBGReadStatus = .text:0x80375694; // type:function size:0xAC scope:global align:4 -DBGWrite = .text:0x80375740; // type:function size:0xDC scope:global align:4 -DBGRead = .text:0x8037581C; // type:function size:0xDC scope:global align:4 -DBGReadMailbox = .text:0x803758F8; // type:function size:0xAC scope:global align:4 -DBGEXIImm = .text:0x803759A4; // type:function size:0x298 scope:global align:4 +DBGHandler = .text:0x80375618; // type:function size:0x40 scope:local align:4 +MWCallback = .text:0x80375658; // type:function size:0x3C scope:local align:4 +DBGReadStatus = .text:0x80375694; // type:function size:0xAC scope:local align:4 +DBGWrite = .text:0x80375740; // type:function size:0xDC scope:local align:4 +DBGRead = .text:0x8037581C; // type:function size:0xDC scope:local align:4 +DBGReadMailbox = .text:0x803758F8; // type:function size:0xAC scope:local align:4 +DBGEXIImm = .text:0x803759A4; // type:function size:0x298 scope:local align:4 Hu_IsStub = .text:0x80375C3C; // type:function size:0x8 scope:global align:4 __init_cpp_exceptions_reference = .ctors:0x80375C60; // type:object size:0x4 scope:global align:4 _ctors = .ctors:0x80375C60; // type:label scope:global data:4byte @@ -16528,7 +16526,7 @@ fontdata$8287 = .rodata:0x80376588; // type:object size:0x14 scope:local align:4 @stringBase0 = .rodata:0x80376898; // type:object size:0x9 scope:local align:4 data:string_table @stringBase0 = .rodata:0x803768A8; // type:object size:0x5D scope:local align:4 data:string_table @stringBase0 = .rodata:0x80376908; // type:object size:0x1DF scope:local align:4 data:string_table -DynamicNameTable = .rodata:0x80376AE8; // type:object size:0x17A8 scope:global align:4 data:2byte +DynamicNameTable = .rodata:0x80376AE8; // type:object size:0x17A8 scope:local align:4 data:2byte @stringBase0 = .rodata:0x80378290; // type:object size:0x2A8F scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037AD20; // type:object size:0x6 scope:local align:4 data:string_table @4932 = .rodata:0x8037AD28; // type:object size:0xC scope:local align:4 data:4byte @@ -16554,26 +16552,26 @@ m_data__12daItemBase_c = .rodata:0x8037B758; // type:object size:0x38 scope:glob mData__12daShopItem_c = .rodata:0x8037B790; // type:object size:0x450 scope:global align:4 @stringBase0 = .rodata:0x8037BBE0; // type:object size:0xBF scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037BCA0; // type:object size:0x46 scope:local align:4 data:string_table -l_texMtxInfo = .rodata:0x8037BCE8; // type:object size:0x64 scope:global align:4 +l_texMtxInfo = .rodata:0x8037BCE8; // type:object size:0x64 scope:local align:4 l_tevStageInfo$3774 = .rodata:0x8037BD4C; // type:object size:0x14 scope:local align:4 @stringBase0 = .rodata:0x8037BD60; // type:object size:0x373 scope:local align:4 data:string_table data$3644 = .rodata:0x8037C0D8; // type:object size:0x1C scope:local align:4 @stringBase0 = .rodata:0x8037C0F4; // type:object size:0x7 scope:local align:4 data:string_table -l_100x100BoxVertexList = .rodata:0x8037C100; // type:object size:0x30 scope:global align:4 +l_100x100BoxVertexList = .rodata:0x8037C100; // type:object size:0x30 scope:local align:4 l_treasureDispList$4524 = .rodata:0x8037C130; // type:object size:0x30 scope:local align:4 data:byte l_treasureDispList$4606 = .rodata:0x8037C160; // type:object size:0x84 scope:local align:4 data:byte l_iconPosData$4686 = .rodata:0x8037C1E4; // type:object size:0x20 scope:local align:4 data:float l_offset$4703 = .rodata:0x8037C204; // type:object size:0x24 scope:local align:4 @stringBase0 = .rodata:0x8037C228; // type:object size:0x4E scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037C278; // type:object size:0x17E scope:local align:4 data:string_table -DataFileName__29@unnamed@d_event_manager_cpp@ = .rodata:0x8037C3F8; // type:object size:0xF scope:global align:4 data:string +DataFileName__29@unnamed@d_event_manager_cpp@ = .rodata:0x8037C3F8; // type:object size:0xF scope:local align:4 data:string @stringBase0 = .rodata:0x8037C408; // type:object size:0x1A4 scope:local align:4 data:string_table @4065 = .rodata:0x8037C5B0; // type:object size:0xC scope:local align:4 data:4byte @5691 = .rodata:0x8037C5BC; // type:object size:0xC scope:local align:4 data:4byte @6363 = .rodata:0x8037C5C8; // type:object size:0xC scope:local align:4 data:4byte @stringBase0 = .rodata:0x8037C5D4; // type:object size:0x4B scope:local align:4 data:string_table -l_drawlistSize$5656 = .rodata:0x8037C620; // type:object size:0x2A scope:local align:4 data:2byte -l_nonSortId$5662 = .rodata:0x8037C64C; // type:object size:0x9 scope:local align:4 data:byte +l_drawlistSize = .rodata:0x8037C620; // type:object size:0x2A scope:local align:4 data:2byte +l_nonSortId = .rodata:0x8037C64C; // type:object size:0x9 scope:local align:4 data:byte @stringBase0 = .rodata:0x8037C658; // type:object size:0xC scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037C668; // type:object size:0x1A4 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037C810; // type:object size:0x153 scope:local align:4 data:string_table @@ -16611,14 +16609,16 @@ m_hitSeID__12dCcD_GObjInf = .rodata:0x8037CC28; // type:object size:0x60 scope:g @stringBase0 = .rodata:0x8037D578; // type:object size:0x7 scope:local align:4 data:string_table typeToTypeGroup__7dTres_c = .rodata:0x8037D580; // type:object size:0x22 scope:global align:4 @stringBase0 = .rodata:0x8037D5A8; // type:object size:0x2A scope:local align:4 data:string_table -black_tex = .rodata:0x8037D5E0; // type:object size:0x40 scope:global align:32 -msg_data = .rodata:0x8037D620; // type:object size:0x220 scope:global align:4 -font_data = .rodata:0x8037D840; // type:object size:0x9E80 scope:global align:4 noreloc +black_tex = .rodata:0x8037D5E0; // type:object size:0x40 scope:local align:32 +msg_data = .rodata:0x8037D620; // type:object size:0x220 scope:local align:4 +font_data = .rodata:0x8037D840; // type:object size:0x9E80 scope:local align:4 noreloc @stringBase0 = .rodata:0x803876C0; // type:object size:0x13 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x803876D8; // type:label scope:local align:4 @3757 = .rodata:0x803876D8; // type:object size:0xC scope:local align:4 m__19daAlinkHIO_basic_c0 = .rodata:0x803876E4; // type:object size:0x58 scope:global align:4 +...rodata.0 = .rodata:0x803876E4; // type:label scope:local m__18daAlinkHIO_move_c0 = .rodata:0x8038773C; // type:object size:0x58 scope:global align:4 +...rodata.0 = .rodata:0x8038773C; // type:label scope:local m__21daAlinkHIO_atnMove_c0 = .rodata:0x80387794; // type:object size:0x54 scope:global align:4 data:2byte m__26daAlinkHIO_noActAtnMove_c0 = .rodata:0x803877E8; // type:object size:0x54 scope:global align:4 data:2byte m__23daAlinkHIO_frontRoll_c0 = .rodata:0x8038783C; // type:object size:0x70 scope:global align:4 data:2byte @@ -16898,7 +16898,9 @@ localBoomCatchPos$74913 = .rodata:0x8038C108; // type:object size:0xC scope:loca ...rodata.0 = .rodata:0x8038C700; // type:label scope:local align:4 mCcDObjData__8daNpcT_c = .rodata:0x8038C700; // type:object size:0x30 scope:global align:4 data:4byte mCcDObj__11daBaseNpc_c = .rodata:0x8038C730; // type:object size:0x30 scope:global align:4 +...rodata.0 = .rodata:0x8038C730; // type:label scope:local mCcDObjInfo__8daNpcF_c = .rodata:0x8038C760; // type:object size:0x30 scope:global align:4 +...rodata.0 = .rodata:0x8038C760; // type:label scope:local @stringBase0 = .rodata:0x8038C790; // type:object size:0x302 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8038CA98; // type:label scope:local align:4 l_resMANa = .rodata:0x8038CA98; // type:object size:0x18 scope:local align:4 data:4byte @@ -16942,7 +16944,9 @@ a_jntNumTbl$4463 = .rodata:0x8038D044; // type:object size:0x24 scope:local alig ...rodata.0 = .rodata:0x8038D2D0; // type:label scope:local align:4 l_resMANa = .rodata:0x8038D2D0; // type:object size:0x18 scope:local align:4 data:4byte l_resMADa = .rodata:0x8038D2E8; // type:object size:0x18 scope:local align:4 data:4byte +...rodata.0 = .rodata:0x8038D2E8; // type:label scope:local l_resMCNa = .rodata:0x8038D300; // type:object size:0x18 scope:local align:4 data:4byte +...rodata.0 = .rodata:0x8038D300; // type:label scope:local l_resMONa = .rodata:0x8038D318; // type:object size:0x18 scope:local align:4 data:4byte l_resMANb = .rodata:0x8038D330; // type:object size:0x18 scope:local align:4 data:4byte l_resMANc = .rodata:0x8038D348; // type:object size:0x18 scope:local align:4 data:4byte @@ -17005,9 +17009,9 @@ txTVhide$3752 = .rodata:0x8038EA30; // type:object size:0x28 scope:local align:4 @stringBase0 = .rodata:0x8038EA58; // type:object size:0x18 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8038EA70; // type:object size:0x1C scope:local align:4 data:string_table corner_tag$3707 = .rodata:0x8038EA90; // type:object size:0x20 scope:local align:4 data:4byte -tag$4181 = .rodata:0x8038EAB0; // type:object size:0x20 scope:local align:4 data:4byte -tag$4197 = .rodata:0x8038EAD0; // type:object size:0x40 scope:local align:4 data:4byte -tag$4204 = .rodata:0x8038EB10; // type:object size:0x10 scope:local align:4 data:4byte +tag_4181$2130 = .rodata:0x8038EAB0; // type:object size:0x20 scope:local align:4 data:4byte +tag_4197$2146 = .rodata:0x8038EAD0; // type:object size:0x40 scope:local align:4 data:4byte +tag_4204$2153 = .rodata:0x8038EB10; // type:object size:0x10 scope:local align:4 data:4byte @stringBase0 = .rodata:0x8038EB20; // type:object size:0x16D scope:local align:4 data:string_table @stringBase0 = .rodata:0x8038EC90; // type:object size:0x16 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8038ECA8; // type:object size:0x32 scope:local align:4 data:string_table @@ -17019,7 +17023,9 @@ tag$4204 = .rodata:0x8038EB10; // type:object size:0x10 scope:local align:4 data @stringBase0 = .rodata:0x8038EFF0; // type:object size:0x1 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8038EFF8; // type:label scope:local align:4 @3778 = .rodata:0x8038EFF8; // type:object size:0xC scope:local align:4 +...rodata.0 = .rodata:0x8038F004; // type:label scope:local text_sv$4768 = .rodata:0x8038F008; // type:object size:0x18 scope:local align:4 +...rodata.0 = .rodata:0x8038F008; // type:label scope:local text_op$4769 = .rodata:0x8038F020; // type:object size:0x18 scope:local align:4 ftext_sv$4770 = .rodata:0x8038F038; // type:object size:0x18 scope:local align:4 ftext_op$4771 = .rodata:0x8038F050; // type:object size:0x18 scope:local align:4 @@ -17062,7 +17068,7 @@ key_tag$5002 = .rodata:0x8038F7B0; // type:object size:0x18 scope:local align:4 item_tag$5040 = .rodata:0x8038F7C8; // type:object size:0x18 scope:local align:4 @stringBase0 = .rodata:0x8038F7E0; // type:object size:0xEB scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8038F8E0; // type:label scope:local align:4 -l_paletteDmap_m = .rodata:0x8038F8E0; // type:object size:0xF0 scope:global align:4 noreloc +l_paletteDmap_m = .rodata:0x8038F8E0; // type:object size:0xF0 scope:local align:4 noreloc l_dungeon_offColor$3841 = .rodata:0x8038F9D0; // type:object size:0x24 scope:local align:4 l_dungeon_onColor$3842 = .rodata:0x8038F9F4; // type:object size:0x24 scope:local align:4 l_dungeon_stayColor$3843 = .rodata:0x8038FA18; // type:object size:0x24 scope:local align:4 @@ -17111,7 +17117,7 @@ fuji_c$5850 = .rodata:0x803904C0; // type:object size:0x28 scope:local align:4 d ast_c$5856 = .rodata:0x803904E8; // type:object size:0x28 scope:local align:4 fst_c$5857 = .rodata:0x80390510; // type:object size:0x28 scope:local align:4 sfont_name$6110 = .rodata:0x80390538; // type:object size:0x38 scope:local align:4 data:4byte -area_name$6125 = .rodata:0x80390570; // type:object size:0x18 scope:local align:4 data:4byte +iarea_name$4189 = .rodata:0x80390570; // type:object size:0x18 scope:local align:4 data:4byte cont_zt$6148 = .rodata:0x80390588; // type:object size:0x28 scope:local align:4 data:4byte cont_bt$6176 = .rodata:0x803905B0; // type:object size:0x28 scope:local align:4 data:4byte cont_at$6194 = .rodata:0x803905D8; // type:object size:0x28 scope:local align:4 data:4byte @@ -17150,7 +17156,7 @@ text_a_tag$5093 = .rodata:0x80390E50; // type:object size:0x28 scope:local align text_b_tag$5094 = .rodata:0x80390E78; // type:object size:0x28 scope:local align:4 data:4byte @stringBase0 = .rodata:0x80390EA0; // type:object size:0xE8 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80390F88; // type:label scope:local align:4 -dMo_soundMode = .rodata:0x80390F88; // type:object size:0xC scope:global align:4 +dMo_soundMode = .rodata:0x80390F88; // type:object size:0xC scope:local align:4 text_a_tag$3906 = .rodata:0x80390F98; // type:object size:0x28 scope:local align:4 data:string text_b_tag$3907 = .rodata:0x80390FC0; // type:object size:0x28 scope:local align:4 data:string l_tagName012$3920 = .rodata:0x80390FE8; // type:object size:0x10 scope:local align:4 @@ -17290,7 +17296,7 @@ juji_m_tag$5176 = .rodata:0x80392930; // type:object size:0x28 scope:local align tag_bigh$5757 = .rodata:0x80392958; // type:object size:0x20 scope:local align:4 data:4byte tag_du$5758 = .rodata:0x80392978; // type:object size:0x10 scope:local align:4 data:4byte tag$7267 = .rodata:0x80392988; // type:object size:0x10 scope:local align:4 data:string -tag$7665 = .rodata:0x80392998; // type:object size:0x18 scope:local align:4 data:string +tag_7759 = .rodata:0x80392998; // type:object size:0x18 scope:local align:4 data:string @stringBase0 = .rodata:0x803929B0; // type:object size:0x1A7 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80392B58; // type:label scope:local align:4 black_color$4650 = .rodata:0x80392B58; // type:object size:0x94 scope:local align:4 @@ -17325,7 +17331,7 @@ tag_name$3763 = .rodata:0x803937E8; // type:object size:0x120 scope:local align: @stringBase0 = .rodata:0x80393B60; // type:object size:0x1F scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80393B80; // type:label scope:local align:4 t_tag$3770 = .rodata:0x80393B80; // type:object size:0x18 scope:local align:4 data:4byte -t_tag$3778 = .rodata:0x80393B98; // type:object size:0x18 scope:local align:4 +t_tag_2$1740 = .rodata:0x80393B98; // type:object size:0x18 scope:local align:4 tr_tag$3779 = .rodata:0x80393BB0; // type:object size:0x18 scope:local align:4 @stringBase0 = .rodata:0x80393BC8; // type:object size:0x4B scope:local align:4 data:string_table @stringBase0 = .rodata:0x80393C18; // type:object size:0x6C scope:local align:4 data:string_table @@ -17340,28 +17346,28 @@ tr_tag$3774 = .rodata:0x80393D50; // type:object size:0x18 scope:local align:4 @stringBase0 = .rodata:0x80393DD0; // type:object size:0x13 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80393DE8; // type:object size:0x18 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80393E00; // type:object size:0x348 scope:local align:4 data:string_table -l_preLoad_dylKeyTbl = .rodata:0x80394148; // type:object size:0x1C scope:global align:4 +l_preLoad_dylKeyTbl = .rodata:0x80394148; // type:object size:0x1C scope:local align:4 @stringBase0 = .rodata:0x80394164; // type:object size:0x2A7 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80394410; // type:object size:0x1D scope:local align:4 data:string_table -PreLoadInfoT = .rodata:0x80394430; // type:object size:0x10 scope:global align:4 data:4byte +PreLoadInfoT = .rodata:0x80394430; // type:object size:0x10 scope:local align:4 data:4byte @stringBase0 = .rodata:0x80394440; // type:object size:0xA9 scope:local align:4 data:string_table @stringBase0 = .rodata:0x803944F0; // type:object size:0x4B scope:local align:4 data:string_table @stringBase0 = .rodata:0x80394540; // type:object size:0xAC scope:local align:4 data:string_table -kColor$localstatic3$draw__9dkWmark_cFv = .rodata:0x803945F0; // type:object size:0xC scope:local align:4 +kColor$localstatic3$draw__9dkWmark_cFv = .rodata:0x803945F0; // type:object size:0xC scope:weak align:4 @stringBase0 = .rodata:0x803945FC; // type:object size:0x6 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80394608; // type:object size:0x344 scope:local align:4 data:string_table -l_base = .rodata:0x80394950; // type:object size:0x80 scope:global align:4 +l_base = .rodata:0x80394950; // type:object size:0x80 scope:local align:4 @2299 = .rodata:0x803949D0; // type:object size:0xC scope:local align:4 data:4byte @stringBase0 = .rodata:0x803949E0; // type:object size:0xD0 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80394AB0; // type:label scope:local align:4 -@898 = .rodata:0x80394AB0; // type:object size:0xC scope:local align:4 +unused$285 = .rodata:0x80394AB0; // type:object size:0xC scope:local align:4 @899 = .rodata:0x80394ABC; // type:object size:0xC scope:local align:4 @900 = .rodata:0x80394AC8; // type:object size:0xC scope:local align:4 @901 = .rodata:0x80394AD4; // type:object size:0xC scope:local align:4 @902 = .rodata:0x80394AE0; // type:object size:0xC scope:local align:4 @stringBase0 = .rodata:0x80394AEC; // type:object size:0x65 scope:local align:4 data:string_table -gapfnExtrapolateParameter___Q27JStudio27@unnamed@functionvalue_cpp@ = .rodata:0x80394B58; // type:object size:0x10 scope:global align:4 data:4byte -saCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@ = .rodata:0x80394B68; // type:object size:0x40 scope:global align:4 +gapfnExtrapolateParameter___Q27JStudio27@unnamed@functionvalue_cpp@ = .rodata:0x80394B58; // type:object size:0x10 scope:local align:4 data:4byte +saCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@ = .rodata:0x80394B68; // type:object size:0x40 scope:local align:4 @745 = .rodata:0x80394BA8; // type:object size:0xC scope:local align:4 data:4byte @838 = .rodata:0x80394BB4; // type:object size:0xC scope:local align:4 data:4byte @1138 = .rodata:0x80394BC0; // type:object size:0xC scope:local align:4 data:4byte @@ -17395,10 +17401,12 @@ __two_to_x$982 = .rodata:0x80395120; // type:object size:0x18 scope:local align: ...rodata.0 = .rodata:0x80395138; // type:label scope:local align:4 sAdsTable__8JASTrack = .rodata:0x80395138; // type:object size:0x18 scope:global align:4 data:2byte sEnvOsc__8JASTrack = .rodata:0x80395150; // type:object size:0x18 scope:global align:4 data:float +...rodata.0 = .rodata:0x80395150; // type:label scope:local sPitchEnvOsc__8JASTrack = .rodata:0x80395168; // type:object size:0x18 scope:global align:4 +...rodata.0 = .rodata:0x80395168; // type:label scope:local @stringBase0 = .rodata:0x80395180; // type:object size:0x14A scope:local align:4 data:string_table -OSC_RELEASE_TABLE = .rodata:0x803952D0; // type:object size:0xC scope:global align:4 -OSC_ENV = .rodata:0x803952DC; // type:object size:0x18 scope:global align:4 +OSC_RELEASE_TABLE = .rodata:0x803952D0; // type:object size:0xC scope:local align:4 +OSC_ENV = .rodata:0x803952DC; // type:object size:0x18 scope:local align:4 OSC_RELEASE_TABLE$260 = .rodata:0x803952F8; // type:object size:0xC scope:local align:4 OSC_ENV$261 = .rodata:0x80395304; // type:object size:0x18 scope:local align:4 sOscData__12JASVoiceBank = .rodata:0x80395320; // type:object size:0x18 scope:global align:4 @@ -17417,7 +17425,7 @@ connect_table$463 = .rodata:0x80395A00; // type:object size:0x18 scope:local ali @stringBase0 = .rodata:0x80395A58; // type:object size:0x14 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80395A70; // type:object size:0x3A scope:local align:4 data:string_table @stringBase0 = .rodata:0x80395AB0; // type:object size:0x69 scope:local align:4 data:string_table -cResetFilterTable = .rodata:0x80395B20; // type:object size:0x10 scope:global align:4 +cResetFilterTable = .rodata:0x80395B20; // type:object size:0x10 scope:local align:4 @stringBase0 = .rodata:0x80395B30; // type:object size:0x1D scope:local align:4 data:string_table @5054 = .rodata:0x80395B50; // type:object size:0xC scope:local align:4 data:4byte @5100 = .rodata:0x80395B5C; // type:object size:0xC scope:local align:4 data:4byte @@ -17472,7 +17480,7 @@ sPrm__8Z2MdnPrm = .rodata:0x80396AEC; // type:object size:0xCC scope:global alig @stringBase0 = .rodata:0x80397450; // type:object size:0x70 scope:local align:4 data:string_table @stringBase0 = .rodata:0x803974C0; // type:object size:0x29 scope:local align:4 data:string_table saoAboutEncoding___10JUTResFont = .rodata:0x803974F0; // type:object size:0xC scope:global align:4 -halftofull$726 = .rodata:0x803974FC; // type:object size:0xBE scope:local align:4 +halftofull = .rodata:0x803974FC; // type:object size:0xBE scope:local align:4 @stringBase0 = .rodata:0x803975BC; // type:object size:0x34 scope:local align:4 data:string_table @stringBase0 = .rodata:0x803975F0; // type:object size:0x50E scope:local align:4 data:string_table @stringBase0 = .rodata:0x80397B00; // type:object size:0x3 scope:local align:4 data:string_table @@ -17488,17 +17496,17 @@ j2dDefaultIndTevStageInfo = .rodata:0x8039BD54; // type:object size:0xC scope:gl @1849 = .rodata:0x8039BD80; // type:object size:0x10 scope:local align:4 data:4byte @3028 = .rodata:0x8039BD90; // type:object size:0x10 scope:local align:4 data:4byte @3037 = .rodata:0x8039BDA0; // type:object size:0x14 scope:local align:4 data:4byte -@stringBase0 = .rodata:0x8039BDB8; // type:object size:0x4 scope:local align:4 data:string_table +@stringBase0 = .rodata:0x8039BDB8; // type:object size:0x3 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8039BDC0; // type:label scope:local align:4 @1508 = .rodata:0x8039BDC0; // type:object size:0x10 scope:local align:4 data:4byte -@1557 = .rodata:0x8039BDD0; // type:object size:0x10 scope:local align:4 -@1566 = .rodata:0x8039BDE0; // type:object size:0x10 scope:local align:4 -@1575 = .rodata:0x8039BDF0; // type:object size:0x10 scope:local align:4 -@1581 = .rodata:0x8039BE00; // type:object size:0x10 scope:local align:4 -@1587 = .rodata:0x8039BE10; // type:object size:0x10 scope:local align:4 -@1596 = .rodata:0x8039BE20; // type:object size:0x10 scope:local align:4 -@1605 = .rodata:0x8039BE30; // type:object size:0x10 scope:local align:4 -@1612 = .rodata:0x8039BE40; // type:object size:0x10 scope:local align:4 +lit_1557 = .rodata:0x8039BDD0; // type:object size:0x10 scope:local align:4 +lit_1566 = .rodata:0x8039BDE0; // type:object size:0x10 scope:local align:4 +lit_1575 = .rodata:0x8039BDF0; // type:object size:0x10 scope:local align:4 +lit_1581 = .rodata:0x8039BE00; // type:object size:0x10 scope:local align:4 +lit_1587 = .rodata:0x8039BE10; // type:object size:0x10 scope:local align:4 +lit_1596 = .rodata:0x8039BE20; // type:object size:0x10 scope:local align:4 +lit_1605 = .rodata:0x8039BE30; // type:object size:0x10 scope:local align:4 +lit_1612 = .rodata:0x8039BE40; // type:object size:0x10 scope:local align:4 @2530 = .rodata:0x8039BE50; // type:object size:0x18 scope:local align:4 @2531 = .rodata:0x8039BE68; // type:object size:0x18 scope:local align:4 @2532 = .rodata:0x8039BE80; // type:object size:0x1E scope:local align:4 @@ -17544,32 +17552,32 @@ j3dDefaultNBTScaleInfo = .rodata:0x8039C148; // type:object size:0x10 scope:glob @stringBase0 = .rodata:0x8039C260; // type:object size:0x2C scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039C290; // type:object size:0x3D scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8039C2D0; // type:label scope:local align:4 -ClampRegion = .rodata:0x8039C2D0; // type:object size:0xA scope:global align:4 data:byte +ClampRegion = .rodata:0x8039C2D0; // type:object size:0xA scope:local align:4 data:byte __ptmf_null = .rodata:0x8039C2E0; // type:object size:0xC scope:global align:4 data:4byte -__constants = .rodata:0x8039C2F0; // type:object size:0x18 scope:global align:4 data:double +__constants = .rodata:0x8039C2F0; // type:object size:0x18 scope:local align:4 data:double @55 = .rodata:0x8039C308; // type:object size:0x36 scope:local align:4 data:string @56 = .rodata:0x8039C340; // type:object size:0x39 scope:local align:4 data:string -fix_pool_sizes = .rodata:0x8039C380; // type:object size:0x18 scope:global align:4 data:4byte +fix_pool_sizes = .rodata:0x8039C380; // type:object size:0x18 scope:local align:4 data:4byte @stringBase0 = .rodata:0x8039C398; // type:object size:0xDD scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039C478; // type:object size:0x25 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8039C4A0; // type:label scope:local align:4 -halF = .rodata:0x8039C4A0; // type:object size:0x10 scope:global align:4 -ln2HI = .rodata:0x8039C4B0; // type:object size:0x10 scope:global align:4 -ln2LO = .rodata:0x8039C4C0; // type:object size:0x10 scope:global align:4 -Zero = .rodata:0x8039C4D0; // type:object size:0x10 scope:global align:4 +halF = .rodata:0x8039C4A0; // type:object size:0x10 scope:local align:4 +ln2HI = .rodata:0x8039C4B0; // type:object size:0x10 scope:local align:4 +ln2LO = .rodata:0x8039C4C0; // type:object size:0x10 scope:local align:4 +Zero = .rodata:0x8039C4D0; // type:object size:0x10 scope:local align:4 ...rodata.0 = .rodata:0x8039C4E0; // type:label scope:local align:4 -bp = .rodata:0x8039C4E0; // type:object size:0x10 scope:global align:4 -dp_h = .rodata:0x8039C4F0; // type:object size:0x10 scope:global align:4 -dp_l = .rodata:0x8039C500; // type:object size:0x10 scope:global align:4 -two_over_pi = .rodata:0x8039C510; // type:object size:0x108 scope:global align:4 -npio2_hw = .rodata:0x8039C618; // type:object size:0x80 scope:global align:4 -init_jk = .rodata:0x8039C698; // type:object size:0x10 scope:global align:4 -PIo2 = .rodata:0x8039C6A8; // type:object size:0x40 scope:global align:4 data:double -T = .rodata:0x8039C6E8; // type:object size:0x68 scope:global align:4 data:double +bp = .rodata:0x8039C4E0; // type:object size:0x10 scope:local align:4 +dp_h = .rodata:0x8039C4F0; // type:object size:0x10 scope:local align:4 +dp_l = .rodata:0x8039C500; // type:object size:0x10 scope:local align:4 +two_over_pi = .rodata:0x8039C510; // type:object size:0x108 scope:local align:4 +npio2_hw = .rodata:0x8039C618; // type:object size:0x80 scope:local align:4 +init_jk = .rodata:0x8039C698; // type:object size:0x10 scope:local align:4 +PIo2 = .rodata:0x8039C6A8; // type:object size:0x40 scope:local align:4 data:double +T = .rodata:0x8039C6E8; // type:object size:0x68 scope:local align:4 data:double ...rodata.0 = .rodata:0x8039C750; // type:label scope:local align:4 -atanhi = .rodata:0x8039C750; // type:object size:0x20 scope:global align:4 -atanlo = .rodata:0x8039C770; // type:object size:0x20 scope:global align:4 -aT = .rodata:0x8039C790; // type:object size:0x58 scope:global align:4 +atanhi = .rodata:0x8039C750; // type:object size:0x20 scope:local align:4 +atanlo = .rodata:0x8039C770; // type:object size:0x20 scope:local align:4 +aT = .rodata:0x8039C790; // type:object size:0x58 scope:local align:4 @133 = .rodata:0x8039C7E8; // type:object size:0x1B scope:local align:4 data:string @154 = .rodata:0x8039C804; // type:object size:0x10 scope:local align:4 data:string @98 = .rodata:0x8039C818; // type:object size:0x25 scope:local align:4 data:string @@ -17644,11 +17652,11 @@ EndofProgramInstruction$162 = .rodata:0x8039CD68; // type:object size:0x4 scope: @349 = .rodata:0x8039D018; // type:object size:0x18 scope:local align:4 data:string ...data.0 = .data:0x8039D040; // type:label scope:local align:4 COPYDATE_STRING__7mDoMain = .data:0x8039D040; // type:object size:0x12 scope:global align:4 data:string -HeapCheckTable = .data:0x8039D054; // type:object size:0x20 scope:global align:4 +HeapCheckTable = .data:0x8039D054; // type:object size:0x20 scope:local align:4 desc1$3717 = .data:0x8039D074; // type:object size:0x14 scope:local align:4 desc2$3718 = .data:0x8039D088; // type:object size:0x14 scope:local align:4 -__vt__17mDoAud_zelAudio_c = .data:0x8039D0A0; // type:object size:0xC scope:global align:4 -__vt__12JAUSoundInfo = .data:0x8039D0AC; // type:object size:0x10 scope:global align:4 +__vt__17mDoAud_zelAudio_c = .data:0x8039D0A0; // type:object size:0xC scope:weak align:4 +__vt__12JAUSoundInfo = .data:0x8039D0AC; // type:object size:0x10 scope:weak align:4 g_ntscZeldaIntDf = .data:0x8039D0C0; // type:object size:0x3C scope:global align:4 g_ntscZeldaProg = .data:0x8039D0FC; // type:object size:0x3C scope:global align:4 g_mDoMtx_identity = .data:0x8039D138; // type:object size:0x30 scope:global align:4 @@ -17673,7 +17681,7 @@ __vt__25mDoExt_MtxCalcAnmBlendTbl = .data:0x8039D544; // type:object size:0x2C s __vt__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya> = .data:0x8039D570; // type:object size:0x2C scope:global align:4 __vt__17J3DMtxCalcAnmBase = .data:0x8039D59C; // type:object size:0x2C scope:global align:4 __vt__10J3DMtxCalc = .data:0x8039D5C8; // type:object size:0x2C scope:global align:4 -__vt__11J3DUClipper = .data:0x8039D5F8; // type:object size:0xC scope:global align:4 +__vt__11J3DUClipper = .data:0x8039D5F8; // type:object size:0xC scope:weak align:4 __vt__21mDoDvdThd_toMainRam_c = .data:0x8039D608; // type:object size:0x10 scope:global align:4 __vt__25mDoDvdThd_mountXArchive_c = .data:0x8039D618; // type:object size:0x10 scope:global align:4 __vt__24mDoDvdThd_mountArchive_c = .data:0x8039D628; // type:object size:0x10 scope:global align:4 @@ -17682,18 +17690,18 @@ __vt__19mDoDvdThd_command_c = .data:0x8039D648; // type:object size:0x10 scope:g @3770 = .data:0x8039D658; // type:object size:0x38 scope:local align:4 @3850 = .data:0x8039D690; // type:object size:0x38 scope:local align:4 __vt__24JPTraceParticleCallBack4 = .data:0x8039D6C8; // type:object size:0x14 scope:global align:4 -__vt__19JPAParticleCallBack = .data:0x8039D6DC; // type:object size:0x14 scope:global align:4 +__vt__19JPAParticleCallBack = .data:0x8039D6DC; // type:object size:0x14 scope:weak align:4 l_method$3807 = .data:0x8039D6F0; // type:object size:0xC scope:local align:4 __vt__11fapGm_HIO_c = .data:0x8039D700; // type:object size:0xC scope:global align:4 g_fopAc_Method = .data:0x8039D710; // type:object size:0x20 scope:global align:4 -__vt__11dEvt_info_c = .data:0x8039D730; // type:object size:0xC scope:global align:4 +__vt__11dEvt_info_c = .data:0x8039D730; // type:object size:0xC scope:weak align:4 g_fopAcTg_Queue = .data:0x8039D740; // type:object size:0xC scope:global align:4 -l_cullSizeBox = .data:0x8039D750; // type:object size:0x150 scope:global align:4 -l_cullSizeSphere = .data:0x8039D8A0; // type:object size:0x80 scope:global align:4 -__vt__8cM3dGPla = .data:0x8039D920; // type:object size:0xC scope:global align:4 -__vt__15dBgS_ObjRoofChk = .data:0x8039D92C; // type:object size:0x30 scope:global align:4 -__vt__11dBgS_WtrChk = .data:0x8039D95C; // type:object size:0x30 scope:global align:4 -__vt__14dBgS_ObjGndChk = .data:0x8039D98C; // type:object size:0x30 scope:global align:4 +l_cullSizeBox = .data:0x8039D750; // type:object size:0x150 scope:local align:4 +l_cullSizeSphere = .data:0x8039D8A0; // type:object size:0x80 scope:local align:4 +__vt__8cM3dGPla = .data:0x8039D920; // type:object size:0xC scope:weak align:4 +__vt__15dBgS_ObjRoofChk = .data:0x8039D92C; // type:object size:0x30 scope:weak align:4 +__vt__11dBgS_WtrChk = .data:0x8039D95C; // type:object size:0x30 scope:weak align:4 +__vt__14dBgS_ObjGndChk = .data:0x8039D98C; // type:object size:0x30 scope:weak align:4 g_fopCam_Method = .data:0x8039D9C0; // type:object size:0x14 scope:global align:4 g_fopOvlp_Method = .data:0x8039D9D8; // type:object size:0x14 scope:global align:4 phaseMethod$2260 = .data:0x8039D9F0; // type:object size:0x20 scope:local align:4 @@ -17710,11 +17718,11 @@ g_fopMsg_Method = .data:0x8039DAB8; // type:object size:0x14 scope:global align: g_fpcCtTg_Queue = .data:0x8039DAF0; // type:object size:0xC scope:global align:4 g_fpcDtTg_Queue = .data:0x8039DB00; // type:object size:0xC scope:global align:4 l_fpcLy_Crear = .data:0x8039DB10; // type:object size:0x2C scope:global align:4 data:4byte -l_fpcLy_LayerList = .data:0x8039DB3C; // type:object size:0xC scope:global align:4 data:4byte +l_fpcLy_LayerList = .data:0x8039DB3C; // type:object size:0xC scope:local align:4 data:4byte g_fpcLf_Method = .data:0x8039DB48; // type:object size:0x14 scope:global align:4 crear$2239 = .data:0x8039DB60; // type:object size:0x1C scope:local align:4 data:4byte g_fpcNd_Method = .data:0x8039DB80; // type:object size:0x14 scope:global align:4 -l_fpcNdRq_Queue = .data:0x8039DB98; // type:object size:0xC scope:global align:4 data:4byte +l_fpcNdRq_Queue = .data:0x8039DB98; // type:object size:0xC scope:local align:4 data:4byte clear$2359 = .data:0x8039DBA4; // type:object size:0x64 scope:local align:4 data:4byte methods$2376 = .data:0x8039DC08; // type:object size:0x18 scope:local align:4 methods$2386 = .data:0x8039DC20; // type:object size:0x10 scope:local align:4 @@ -17722,7 +17730,7 @@ methods$2397 = .data:0x8039DC30; // type:object size:0xC scope:local align:4 submethod$2214 = .data:0x8039DC40; // type:object size:0xC scope:local align:4 submethod$2261 = .data:0x8039DC50; // type:object size:0xC scope:local align:4 method$2262 = .data:0x8039DC5C; // type:object size:0x1C scope:local align:4 -l_objectName = .data:0x8039DC78; // type:object size:0x2AB4 scope:global align:4 +l_objectName = .data:0x8039DC78; // type:object size:0x2AB4 scope:local align:4 l_roomFuncTable$5052 = .data:0x803A072C; // type:object size:0x30 scope:local align:4 l_layerFuncTable$5053 = .data:0x803A075C; // type:object size:0x24 scope:local align:4 l_layerFuncTable$5131 = .data:0x803A0780; // type:object size:0x18 scope:local align:4 @@ -17738,50 +17746,50 @@ mMemoryBlock__20dStage_roomControl_c = .data:0x803A0A80; // type:object size:0x4 mArcBank__20dStage_roomControl_c = .data:0x803A0ACC; // type:object size:0x140 scope:global align:4 __vt__15dStage_roomDt_c = .data:0x803A0C0C; // type:object size:0x174 scope:global align:4 __vt__16dStage_stageDt_c = .data:0x803A0D80; // type:object size:0x174 scope:global align:4 -__vt__11dStage_dt_c = .data:0x803A0EF4; // type:object size:0x174 scope:global align:4 +__vt__11dStage_dt_c = .data:0x803A0EF4; // type:object size:0x174 scope:weak align:4 @3806 = .data:0x803A1068; // type:object size:0x20 scope:local align:4 @4259 = .data:0x803A1088; // type:object size:0x44 scope:local align:4 @4694 = .data:0x803A10CC; // type:object size:0x1C scope:local align:4 -__vt__12dDlst_base_c = .data:0x803A10E8; // type:object size:0xC scope:global align:4 -__vt__28dDrawPathWithNormalPattern_c = .data:0x803A10F4; // type:object size:0x40 scope:global align:4 -__vt__15dRenderingMap_c = .data:0x803A1134; // type:object size:0x5C scope:global align:4 +__vt__12dDlst_base_c = .data:0x803A10E8; // type:object size:0xC scope:weak align:4 +__vt__28dDrawPathWithNormalPattern_c = .data:0x803A10F4; // type:object size:0x40 scope:weak align:4 +__vt__15dRenderingMap_c = .data:0x803A1134; // type:object size:0x5C scope:weak align:4 __vt__6dMap_c = .data:0x803A1190; // type:object size:0xC4 scope:global align:4 __vt__15renderingAmap_c = .data:0x803A1254; // type:object size:0xC4 scope:global align:4 l_method$5017 = .data:0x803A1318; // type:object size:0xC scope:local align:4 l_method$5051 = .data:0x803A1324; // type:object size:0xC scope:local align:4 l_itemno$6402 = .data:0x803A1330; // type:object size:0x18 scope:local align:4 data:byte -__vt__25mDoExt_McaMorfCallBack1_c = .data:0x803A1348; // type:object size:0xC scope:global align:4 -__vt__12dCcMassS_Obj = .data:0x803A1354; // type:object size:0xC scope:global align:4 -__vt__15cCcD_DivideArea = .data:0x803A1360; // type:object size:0xC scope:global align:4 -__vt__8cM3dGCyl = .data:0x803A136C; // type:object size:0xC scope:global align:4 -__vt__8cM3dGAab = .data:0x803A1378; // type:object size:0xC scope:global align:4 -__vt__15cCcD_DivideInfo = .data:0x803A1384; // type:object size:0xC scope:global align:4 -__vt__12dCcMassS_Mng = .data:0x803A1390; // type:object size:0xC scope:global align:4 +__vt__25mDoExt_McaMorfCallBack1_c = .data:0x803A1348; // type:object size:0xC scope:weak align:4 +__vt__12dCcMassS_Obj = .data:0x803A1354; // type:object size:0xC scope:weak align:4 +__vt__15cCcD_DivideArea = .data:0x803A1360; // type:object size:0xC scope:weak align:4 +__vt__8cM3dGCyl = .data:0x803A136C; // type:object size:0xC scope:weak align:4 +__vt__8cM3dGAab = .data:0x803A1378; // type:object size:0xC scope:weak align:4 +__vt__15cCcD_DivideInfo = .data:0x803A1384; // type:object size:0xC scope:weak align:4 +__vt__12dCcMassS_Mng = .data:0x803A1390; // type:object size:0xC scope:weak align:4 ZeroQuat = .data:0x803A13A0; // type:object size:0x10 scope:global align:4 __vt__10CSTControl = .data:0x803A13B0; // type:object size:0x10 scope:global align:4 __vt__9STControl = .data:0x803A13C0; // type:object size:0x10 scope:global align:4 i_item_lst$4006 = .data:0x803A13D0; // type:object size:0x17 scope:local align:4 data:byte saveBitLabels__16dSv_event_flag_c = .data:0x803A13E8; // type:object size:0x66C scope:global align:4 -__vt__8cM3dGLin = .data:0x803A1A58; // type:object size:0xC scope:global align:4 -__vt__8cM3dGSph = .data:0x803A1A64; // type:object size:0xC scope:global align:4 +__vt__8cM3dGLin = .data:0x803A1A58; // type:object size:0xC scope:weak align:4 +__vt__8cM3dGSph = .data:0x803A1A64; // type:object size:0xC scope:weak align:4 __vt__16dDemo_particle_c = .data:0x803A1A70; // type:object size:0x18 scope:global align:4 __vt__17jmessage_tControl = .data:0x803A1A88; // type:object size:0xC scope:global align:4 -__vt__Q27JStudio13TCreateObject = .data:0x803A1A94; // type:object size:0x10 scope:global align:4 +__vt__Q27JStudio13TCreateObject = .data:0x803A1A94; // type:object size:0x10 scope:weak align:4 __vt__14dDemo_system_c = .data:0x803A1AA4; // type:object size:0x50 scope:global align:4 __vt__11dDemo_fog_c = .data:0x803A1AF4; // type:object size:0x5C scope:global align:4 __vt__13dDemo_light_c = .data:0x803A1B50; // type:object size:0x6C scope:global align:4 __vt__15dDemo_ambient_c = .data:0x803A1BBC; // type:object size:0x44 scope:global align:4 __vt__14dDemo_camera_c = .data:0x803A1C00; // type:object size:0x94 scope:global align:4 __vt__13dDemo_actor_c = .data:0x803A1C94; // type:object size:0x8C scope:global align:4 -__vt__Q27JStudio16TAdaptor_message = .data:0x803A1D20; // type:object size:0x24 scope:global align:4 -__vt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_message = .data:0x803A1D44; // type:object size:0x10 scope:global align:4 -__vt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_message = .data:0x803A1D54; // type:object size:0x24 scope:global align:4 +__vt__Q27JStudio16TAdaptor_message = .data:0x803A1D20; // type:object size:0x24 scope:weak align:4 +__vt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_message = .data:0x803A1D44; // type:object size:0x10 scope:local align:4 +__vt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_message = .data:0x803A1D54; // type:object size:0x24 scope:local align:4 @4017 = .data:0x803A1D78; // type:object size:0x20 scope:local align:4 -__vt__10J3DAnmBase = .data:0x803A1D98; // type:object size:0x10 scope:global align:4 -__vt__15J3DAnmTransform = .data:0x803A1DA8; // type:object size:0x14 scope:global align:4 -__vt__18mDoExt_transAnmBas = .data:0x803A1DBC; // type:object size:0x14 scope:global align:4 -__vt__18J3DAnmTransformKey = .data:0x803A1DD0; // type:object size:0x14 scope:global align:4 -__vt__11J3DTexNoAnm = .data:0x803A1DE4; // type:object size:0xC scope:global align:4 +__vt__10J3DAnmBase = .data:0x803A1D98; // type:object size:0x10 scope:weak align:4 +__vt__15J3DAnmTransform = .data:0x803A1DA8; // type:object size:0x14 scope:weak align:4 +__vt__18mDoExt_transAnmBas = .data:0x803A1DBC; // type:object size:0x14 scope:weak align:4 +__vt__18J3DAnmTransformKey = .data:0x803A1DD0; // type:object size:0x14 scope:weak align:4 +__vt__11J3DTexNoAnm = .data:0x803A1DE4; // type:object size:0xC scope:weak align:4 __vt__18dRenderingFDAmap_c = .data:0x803A1DF0; // type:object size:0x68 scope:global align:4 __vt__11dDrawPath_c = .data:0x803A1E58; // type:object size:0x40 scope:global align:4 @4467 = .data:0x803A1E98; // type:object size:0x3C scope:local align:4 @@ -17790,7 +17798,7 @@ __vt__19renderingPlusDoor_c = .data:0x803A1EE0; // type:object size:0xA4 scope:g __vt__28renderingPlusDoorAndCursor_c = .data:0x803A1F84; // type:object size:0xBC scope:global align:4 __vt__16renderingDAmap_c = .data:0x803A2040; // type:object size:0x98 scope:global align:4 @4719 = .data:0x803A20D8; // type:object size:0x38 scope:local align:4 -TelopData = .data:0x803A2110; // type:object size:0x288 scope:global align:4 data:4byte +TelopData = .data:0x803A2110; // type:object size:0x288 scope:local align:4 data:4byte @4398 = .data:0x803A2398; // type:object size:0x34 scope:local align:4 soecial_names$3966 = .data:0x803A23D0; // type:object size:0x38 scope:local align:4 action_table$5100 = .data:0x803A2408; // type:object size:0xC scope:local align:4 @@ -17804,7 +17812,9 @@ __vt__15dSmplMdl_draw_c = .data:0x803A2458; // type:object size:0xC scope:global ...data.0 = .data:0x803A2468; // type:label scope:local align:4 l_lifeBallColor = .data:0x803A2468; // type:object size:0xC scope:global align:4 data:byte effectIDTable$5499 = .data:0x803A2474; // type:object size:0x18 scope:local align:4 +...data.0 = .data:0x803A2474; // type:label scope:local ringID$5531 = .data:0x803A248C; // type:object size:0x30 scope:local align:4 +...data.0 = .data:0x803A248C; // type:label scope:local normalID$5532 = .data:0x803A24BC; // type:object size:0x30 scope:local align:4 __vt__28dPa_particleTracePcallBack_c = .data:0x803A24EC; // type:object size:0x14 scope:global align:4 data:2byte __vt__22dPa_hermiteEcallBack_c = .data:0x803A2500; // type:object size:0x24 scope:global align:4 @@ -17851,29 +17861,29 @@ m_typeFourData__8dPaPoF_c = .data:0x803A2830; // type:object size:0x3C scope:glo m_emitterFourData__8dPaPoF_c = .data:0x803A28A8; // type:object size:0x3C scope:global align:4 data:4byte ...data.0 = .data:0x803A2900; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803A2900; // type:object size:0xC scope:local align:4 -l_frontZMat = .data:0x803A2920; // type:object size:0x3C scope:global align:32 -l_frontNoZSubMat = .data:0x803A2960; // type:object size:0x2A scope:global align:32 -l_shadowVolPos = .data:0x803A298C; // type:object size:0x60 scope:global align:4 -l_shadowVolDL = .data:0x803A2A00; // type:object size:0x3B scope:global align:32 -l_shadowProjMat = .data:0x803A2A40; // type:object size:0x5A scope:global align:32 -l_shadowVolMat = .data:0x803A2AA0; // type:object size:0x5A scope:global align:32 noreloc -l_clearMat = .data:0x803A2B00; // type:object size:0x55 scope:global align:32 -l_frontMat = .data:0x803A2B60; // type:object size:0x55 scope:global align:32 -l_backSubMat = .data:0x803A2BC0; // type:object size:0x3C scope:global align:32 -l_simpleShadowPos = .data:0x803A2BFC; // type:object size:0xA8 scope:global align:4 -l_shadowVolumeDL = .data:0x803A2CC0; // type:object size:0x58 scope:global align:32 -l_shadowSealTexDL = .data:0x803A2D20; // type:object size:0x55 scope:global align:32 -l_shadowSealTex2DL = .data:0x803A2D80; // type:object size:0x55 scope:global align:32 -l_shadowSealDL = .data:0x803A2DE0; // type:object size:0x69 scope:global align:32 +l_frontZMat = .data:0x803A2920; // type:object size:0x3C scope:local align:32 +l_frontNoZSubMat = .data:0x803A2960; // type:object size:0x2A scope:local align:32 +l_shadowVolPos = .data:0x803A298C; // type:object size:0x60 scope:local align:4 +l_shadowVolDL = .data:0x803A2A00; // type:object size:0x3B scope:local align:32 +l_shadowProjMat = .data:0x803A2A40; // type:object size:0x5A scope:local align:32 +l_shadowVolMat = .data:0x803A2AA0; // type:object size:0x5A scope:local align:32 noreloc +l_clearMat = .data:0x803A2B00; // type:object size:0x55 scope:local align:32 +l_frontMat = .data:0x803A2B60; // type:object size:0x55 scope:local align:32 +l_backSubMat = .data:0x803A2BC0; // type:object size:0x3C scope:local align:32 +l_simpleShadowPos = .data:0x803A2BFC; // type:object size:0xA8 scope:local align:4 +l_shadowVolumeDL = .data:0x803A2CC0; // type:object size:0x58 scope:local align:32 +l_shadowSealTexDL = .data:0x803A2D20; // type:object size:0x55 scope:local align:32 +l_shadowSealTex2DL = .data:0x803A2D80; // type:object size:0x55 scope:local align:32 +l_shadowSealDL = .data:0x803A2DE0; // type:object size:0x69 scope:local align:32 l_matDL$5404 = .data:0x803A2E60; // type:object size:0x7B scope:local align:32 l_imageDrawColor$5405 = .data:0x803A2EDC; // type:object size:0x10 scope:local align:4 l_tevColorChan$5438 = .data:0x803A2EEC; // type:object size:0x10 scope:local align:4 mtx_adj$5842 = .data:0x803A2EFC; // type:object size:0x30 scope:local align:4 -__vt__18dDlst_shadowPoly_c = .data:0x803A2F2C; // type:object size:0x10 scope:global align:4 -__vt__22dDlst_shadowRealPoly_c = .data:0x803A2F3C; // type:object size:0x10 scope:global align:4 -__vt__14ShdwDrawPoly_c = .data:0x803A2F4C; // type:object size:0xC scope:global align:4 +__vt__18dDlst_shadowPoly_c = .data:0x803A2F2C; // type:object size:0x10 scope:weak align:4 +__vt__22dDlst_shadowRealPoly_c = .data:0x803A2F3C; // type:object size:0x10 scope:weak align:4 +__vt__14ShdwDrawPoly_c = .data:0x803A2F4C; // type:object size:0xC scope:weak align:4 __vt__18dDlst_effectLine_c = .data:0x803A2F58; // type:object size:0xC scope:global align:4 -__vt__10J2DAnmBase = .data:0x803A2F64; // type:object size:0x10 scope:global align:4 +__vt__10J2DAnmBase = .data:0x803A2F64; // type:object size:0x10 scope:weak align:4 __vt__11dDlst_blo_c = .data:0x803A2F74; // type:object size:0xC scope:global align:4 __vt__10dDlst_2D_c = .data:0x803A2F80; // type:object size:0xC scope:global align:4 __vt__12dDlst_2DMt_c = .data:0x803A2F8C; // type:object size:0xC scope:global align:4 @@ -17884,18 +17894,18 @@ __vt__11dDlst_2DT_c = .data:0x803A2FC8; // type:object size:0xC scope:global ali __vt__15dDlst_2DPoint_c = .data:0x803A2FD4; // type:object size:0xC scope:global align:4 __vt__14dDlst_2DQuad_c = .data:0x803A2FE0; // type:object size:0xC scope:global align:4 __vt__13dDlst_2DTri_c = .data:0x803A2FEC; // type:object size:0xC scope:global align:4 -l_kydata_BloomInf_tbl = .data:0x803A2FF8; // type:object size:0x300 scope:global align:4 -l_darkworld_tbl = .data:0x803A32F8; // type:object size:0x110 scope:global align:4 -l_light_size_tbl = .data:0x803A3408; // type:object size:0x120 scope:global align:4 -l_light_size_tbl_tw = .data:0x803A3528; // type:object size:0x48 scope:global align:4 -l_maple_col = .data:0x803A3570; // type:object size:0x24 scope:global align:4 -l_time_attribute = .data:0x803A3594; // type:object size:0x84 scope:global align:4 -l_time_attribute_boss = .data:0x803A3618; // type:object size:0x84 scope:global align:4 -l_field_data = .data:0x803A369C; // type:object size:0x340 scope:global align:4 -l_pselect_default = .data:0x803A39DC; // type:object size:0x18 scope:global align:4 -l_envr_default = .data:0x803A39F4; // type:object size:0x82 scope:global align:4 -l_vr_box_data = .data:0x803A3A78; // type:object size:0x17A scope:global align:4 -S_xfog_table_data = .data:0x803A3BF4; // type:object size:0x28 scope:global align:4 +l_kydata_BloomInf_tbl = .data:0x803A2FF8; // type:object size:0x300 scope:local align:4 +l_darkworld_tbl = .data:0x803A32F8; // type:object size:0x110 scope:local align:4 +l_light_size_tbl = .data:0x803A3408; // type:object size:0x120 scope:local align:4 +l_light_size_tbl_tw = .data:0x803A3528; // type:object size:0x48 scope:local align:4 +l_maple_col = .data:0x803A3570; // type:object size:0x24 scope:local align:4 +l_time_attribute = .data:0x803A3594; // type:object size:0x84 scope:local align:4 +l_time_attribute_boss = .data:0x803A3618; // type:object size:0x84 scope:local align:4 +l_field_data = .data:0x803A369C; // type:object size:0x340 scope:local align:4 +l_pselect_default = .data:0x803A39DC; // type:object size:0x18 scope:local align:4 +l_envr_default = .data:0x803A39F4; // type:object size:0x82 scope:local align:4 +l_vr_box_data = .data:0x803A3A78; // type:object size:0x17A scope:local align:4 +S_xfog_table_data = .data:0x803A3BF4; // type:object size:0x28 scope:local align:4 __vt__19dKankyo_evil_Packet = .data:0x803A3C20; // type:object size:0x14 scope:global align:4 __vt__18dKankyo_mud_Packet = .data:0x803A3C34; // type:object size:0x14 scope:global align:4 __vt__20dKankyo_odour_Packet = .data:0x803A3C48; // type:object size:0x14 scope:global align:4 @@ -17916,14 +17926,14 @@ act_type_tbl__12dAttention_c = .data:0x803A3D64; // type:object size:0x14 scope: ftp_table$4417 = .data:0x803A3D78; // type:object size:0x24 scope:local align:4 ang_table2$4419 = .data:0x803A3D9C; // type:object size:0xC scope:local align:4 __vt__19dAttDraw_CallBack_c = .data:0x803A3DA8; // type:object size:0xC scope:global align:4 -__vt__15dAttDrawParam_c = .data:0x803A3DB4; // type:object size:0xC scope:global align:4 +__vt__15dAttDrawParam_c = .data:0x803A3DB4; // type:object size:0xC scope:weak align:4 __vt__11dAttParam_c = .data:0x803A3DC0; // type:object size:0xC scope:global align:4 dist_table__12dAttention_c = .data:0x803A3DD0; // type:object size:0x1998 scope:global align:4 __vt__4dBgS = .data:0x803A5768; // type:object size:0x14 scope:global align:4 __vt__4cBgS = .data:0x803A577C; // type:object size:0x14 scope:global align:4 __vt__11cBgS_ChkElm = .data:0x803A5790; // type:object size:0x10 scope:global align:4 __vt__9dBgS_Acch = .data:0x803A57A0; // type:object size:0x24 scope:global align:4 -__vt__12dBgS_AcchCir = .data:0x803A57C4; // type:object size:0xC scope:global align:4 +__vt__12dBgS_AcchCir = .data:0x803A57C4; // type:object size:0xC scope:weak align:4 __vt__8dBgS_Chk = .data:0x803A57D0; // type:object size:0x18 scope:global align:4 __vt__18dBgS_CamGndChk_Wtr = .data:0x803A57E8; // type:object size:0x30 scope:global align:4 __vt__14dBgS_CamGndChk = .data:0x803A5818; // type:object size:0x30 scope:global align:4 @@ -17932,7 +17942,7 @@ __vt__18dBgS_ObjGndChk_Spl = .data:0x803A5878; // type:object size:0x30 scope:gl __vt__18dBgS_ObjGndChk_Wtr = .data:0x803A58A8; // type:object size:0x30 scope:global align:4 __vt__11dBgS_GndChk = .data:0x803A58D8; // type:object size:0x30 scope:global align:4 __vt__15dBgS_GrpPassChk = .data:0x803A5908; // type:object size:0xC scope:global align:4 -__vt__15cBgS_GrpPassChk = .data:0x803A5914; // type:object size:0xC scope:global align:4 +__vt__15cBgS_GrpPassChk = .data:0x803A5914; // type:object size:0xC scope:weak align:4 __vt__16dBgS_HorseLinChk = .data:0x803A5920; // type:object size:0x30 scope:global align:4 __vt__15dBgS_RopeLinChk = .data:0x803A5950; // type:object size:0x30 scope:global align:4 __vt__20dBgS_BoomerangLinChk = .data:0x803A5980; // type:object size:0x30 scope:global align:4 @@ -17947,17 +17957,17 @@ __vt__16dBgS_MoveBgActor = .data:0x803A5B00; // type:object size:0x28 scope:glob __vt__11dBgS_SphChk = .data:0x803A5B28; // type:object size:0x3C scope:global align:4 __vt__14dBgS_SplGrpChk = .data:0x803A5B68; // type:object size:0x30 scope:global align:4 __vt__16dBgS_PolyPassChk = .data:0x803A5B98; // type:object size:0xC scope:global align:4 -__vt__16cBgS_PolyPassChk = .data:0x803A5BA4; // type:object size:0xC scope:global align:4 +__vt__16cBgS_PolyPassChk = .data:0x803A5BA4; // type:object size:0xC scope:weak align:4 __vt__12dBgS_RoofChk = .data:0x803A5BB0; // type:object size:0x30 scope:global align:4 __vt__4dBgW = .data:0x803A5BE0; // type:object size:0x104 scope:global align:4 -__vt__8cM3dGTri = .data:0x803A5CE4; // type:object size:0xC scope:global align:4 +__vt__8cM3dGTri = .data:0x803A5CE4; // type:object size:0xC scope:weak align:4 __vt__11cBgW_GrpElm = .data:0x803A5CF0; // type:object size:0xC scope:global align:4 __vt__11cBgW_TriElm = .data:0x803A5CFC; // type:object size:0xC scope:global align:4 __vt__4cBgW = .data:0x803A5D08; // type:object size:0x104 scope:global align:4 __vt__13cBgW_NodeTree = .data:0x803A5E0C; // type:object size:0xC scope:global align:4 __vt__11cBgW_RwgElm = .data:0x803A5E18; // type:object size:0xC scope:global align:4 __vt__9dBgW_Base = .data:0x803A5E28; // type:object size:0xF0 scope:global align:4 -__vt__9cBgW_BgId = .data:0x803A5F18; // type:object size:0xC scope:global align:4 +__vt__9cBgW_BgId = .data:0x803A5F18; // type:object size:0xC scope:weak align:4 __vt__8dBgWKCol = .data:0x803A5F28; // type:object size:0xF0 scope:global align:4 __vt__6dBgWSv = .data:0x803A6018; // type:object size:0x104 scope:global align:4 __vt__8dCcD_Sph = .data:0x803A6120; // type:object size:0x90 scope:global align:4 @@ -17979,23 +17989,24 @@ __vt__14cCcD_ObjHitInf = .data:0x803A6438; // type:object size:0xC scope:global __vt__9dCcD_Stts = .data:0x803A6444; // type:object size:0x2C scope:global align:4 __vt__10dCcD_GStts = .data:0x803A6470; // type:object size:0xC scope:global align:4 __vt__10cCcD_GStts = .data:0x803A647C; // type:object size:0xC scope:global align:4 -rank_tbl = .data:0x803A6488; // type:object size:0x79 scope:global align:4 +rank_tbl = .data:0x803A6488; // type:object size:0x79 scope:local align:4 m_mtrl_hit_tbl__4dCcS = .data:0x803A6504; // type:object size:0x40 scope:global align:4 __vt__4dCcS = .data:0x803A6544; // type:object size:0x34 scope:global align:4 -plCutLRC = .data:0x803A6578; // type:object size:0xE8 scope:global align:4 +plCutLRC = .data:0x803A6578; // type:object size:0xE8 scope:local align:4 __vt__11dCamSetup_c = .data:0x803A6660; // type:object size:0xC scope:global align:4 __vt__11dCamParam_c = .data:0x803A666C; // type:object size:0xC scope:global align:4 -__vt__9dCstick_c = .data:0x803A6678; // type:object size:0xC scope:global align:4 +__vt__9dCstick_c = .data:0x803A6678; // type:object size:0xC scope:weak align:4 @8754 = .data:0x803A6688; // type:object size:0x78 scope:local align:4 item_resource__10dItem_data = .data:0x803A6700; // type:object size:0x17E8 scope:global align:4 field_item_res__10dItem_data = .data:0x803A7EE8; // type:object size:0xFF0 scope:global align:4 item_info__10dItem_data = .data:0x803A8ED8; // type:object size:0x3FC scope:global align:4 -item_func_ptr = .data:0x803A92D8; // type:object size:0x400 scope:global align:4 -item_getcheck_func_ptr = .data:0x803A96D8; // type:object size:0x400 scope:global align:4 +item_func_ptr = .data:0x803A92D8; // type:object size:0x400 scope:local align:4 +item_getcheck_func_ptr = .data:0x803A96D8; // type:object size:0x400 scope:local align:4 __vt__6dMdl_c = .data:0x803A9AD8; // type:object size:0x14 scope:global align:4 ...data.0 = .data:0x803A9AF0; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803A9AF0; // type:object size:0xC scope:local align:4 l_peepEventName = .data:0x803A9AFC; // type:object size:0xA scope:global align:4 data:string +...data.0 = .data:0x803A9AFC; // type:label scope:local @4422 = .data:0x803A9B08; // type:object size:0xC scope:local align:4 @4423 = .data:0x803A9B14; // type:object size:0xC scope:local align:4 @4424 = .data:0x803A9B20; // type:object size:0xC scope:local align:4 @@ -18476,12 +18487,14 @@ __vt__29dAlink_bottleWaterPcallBack_c = .data:0x803AD714; // type:object size:0x __vt__12dBgS_ObjAcch = .data:0x803AD728; // type:object size:0x24 scope:global align:4 __vt__Q29daAlink_c14hsChainShape_c = .data:0x803AD74C; // type:object size:0x14 scope:global align:4 __vt__12daItemBase_c = .data:0x803AD770; // type:object size:0x44 scope:global align:4 -daNocrm_METHODS = .data:0x803AD7B8; // type:object size:0x20 scope:global align:4 +daNocrm_METHODS = .data:0x803AD7B8; // type:object size:0x20 scope:local align:4 g_profile_NO_CHG_ROOM = .data:0x803AD7D8; // type:object size:0x30 scope:global align:4 ...data.0 = .data:0x803AD808; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803AD808; // type:object size:0xC scope:local align:4 @5258 = .data:0x803AD814; // type:object size:0x24 scope:local align:4 +...data.0 = .data:0x803AD814; // type:label scope:local mCcDCyl__8daNpcT_c = .data:0x803AD838; // type:object size:0x44 scope:global align:4 +...data.0 = .data:0x803AD838; // type:label scope:local mCcDSph__8daNpcT_c = .data:0x803AD87C; // type:object size:0x40 scope:global align:4 mCcDCyl__11daBaseNpc_c = .data:0x803AD8BC; // type:object size:0x44 scope:global align:4 mCcDSph__11daBaseNpc_c = .data:0x803AD900; // type:object size:0x40 scope:global align:4 @@ -18512,15 +18525,17 @@ a_jntTbl_M$3905 = .data:0x803ADF44; // type:object size:0xF00 scope:local align: a_prmTbl_M$3906 = .data:0x803AEE44; // type:object size:0x400 scope:local align:4 a_jntTbl_W$3907 = .data:0x803AF244; // type:object size:0xD20 scope:local align:4 a_prmTbl_W$3908 = .data:0x803AFF64; // type:object size:0x380 scope:local align:4 -__vt__17daNpcCd_HIO_Jnt_c = .data:0x803B02E4; // type:object size:0xC scope:global align:4 -__vt__19daNpcCd_HIO_Child_c = .data:0x803B02F0; // type:object size:0xC scope:global align:4 -__vt__13daNpcCd_HIO_c = .data:0x803B02FC; // type:object size:0xC scope:global align:4 -__vt__18fOpAcm_HIO_entry_c = .data:0x803B0308; // type:object size:0xC scope:global align:4 -__vt__14mDoHIO_entry_c = .data:0x803B0314; // type:object size:0xC scope:global align:4 +__vt__17daNpcCd_HIO_Jnt_c = .data:0x803B02E4; // type:object size:0xC scope:weak align:4 +__vt__19daNpcCd_HIO_Child_c = .data:0x803B02F0; // type:object size:0xC scope:weak align:4 +__vt__13daNpcCd_HIO_c = .data:0x803B02FC; // type:object size:0xC scope:weak align:4 +__vt__18fOpAcm_HIO_entry_c = .data:0x803B0308; // type:object size:0xC scope:weak align:4 +__vt__14mDoHIO_entry_c = .data:0x803B0314; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803B0320; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B0320; // type:object size:0xC scope:local align:4 l_resNameTbl = .data:0x803B032C; // type:object size:0x78 scope:local align:4 +...data.0 = .data:0x803B032C; // type:label scope:local l_bmdTbl = .data:0x803B03A4; // type:object size:0xF0 scope:local align:4 data:4byte +...data.0 = .data:0x803B03A4; // type:label scope:local l_bmdTWTbl = .data:0x803B0494; // type:object size:0xF0 scope:local align:4 data:4byte l_btpTbl = .data:0x803B0584; // type:object size:0xF0 scope:global align:4 data:4byte l_btpTWTbl = .data:0x803B0674; // type:object size:0xF0 scope:global align:4 data:4byte @@ -18552,18 +18567,20 @@ mode_proc$4678 = .data:0x803B3F24; // type:object size:0x18 scope:local align:4 @5248 = .data:0x803B3FEC; // type:object size:0xC scope:local align:4 mFuncPtr__8daItem_c = .data:0x803B3FF8; // type:object size:0x78 scope:global align:4 data:4byte m_cyl_src__8daItem_c = .data:0x803B4070; // type:object size:0x44 scope:global align:4 -l_daItem_Method = .data:0x803B40B4; // type:object size:0x20 scope:global align:4 +l_daItem_Method = .data:0x803B40B4; // type:object size:0x20 scope:local align:4 g_profile_ITEM = .data:0x803B40D4; // type:object size:0x30 scope:global align:4 __vt__8daItem_c = .data:0x803B4104; // type:object size:0x44 scope:global align:4 -__vt__9dInsect_c = .data:0x803B41D8; // type:object size:0xC scope:global align:4 +__vt__9dInsect_c = .data:0x803B41D8; // type:object size:0xC scope:weak align:4 __vt__14daObj_SSBase_c = .data:0x803B41E8; // type:object size:0x14 scope:global align:4 arcName$4622 = .data:0x803B4200; // type:object size:0x20 scope:local align:4 -l_sightDL = .data:0x803B4220; // type:object size:0x89 scope:global align:4 noreloc +l_sightDL = .data:0x803B4220; // type:object size:0x89 scope:local align:4 noreloc __vt__18daPy_sightPacket_c = .data:0x803B42AC; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803B42C0; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B42C0; // type:object size:0xC scope:local align:4 @4478 = .data:0x803B42CC; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803B42CC; // type:label scope:local @4479 = .data:0x803B42D8; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803B42D8; // type:label scope:local @4480 = .data:0x803B42E4; // type:object size:0xC scope:local align:4 @4481 = .data:0x803B42F0; // type:object size:0xC scope:local align:4 @4482 = .data:0x803B42FC; // type:object size:0xC scope:local align:4 @@ -18628,7 +18645,7 @@ g_profile_CAMERA = .data:0x803B4858; // type:object size:0x44 scope:global align g_profile_CAMERA2 = .data:0x803B489C; // type:object size:0x44 scope:global align:4 __vt__14dBgS_CamSphChk = .data:0x803B48F8; // type:object size:0x3C scope:global align:4 __vt__14d2DBSplinePath = .data:0x803B494C; // type:object size:0xC scope:global align:4 -l_dEnvSe_Method = .data:0x803B4968; // type:object size:0x14 scope:global align:4 +l_dEnvSe_Method = .data:0x803B4968; // type:object size:0x14 scope:local align:4 g_profile_ENVSE = .data:0x803B497C; // type:object size:0x28 scope:global align:4 ...data.0 = .data:0x803B49A8; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B49A8; // type:object size:0xC scope:local align:4 @@ -18636,9 +18653,9 @@ SelStartFrameTbl = .data:0x803B49B4; // type:object size:0xC scope:local align:4 SelEndFrameTbl = .data:0x803B49C0; // type:object size:0xC scope:local align:4 SelOpenStartFrameTbl = .data:0x803B49CC; // type:object size:0xC scope:local align:4 SelOpenEndFrameTbl = .data:0x803B49D8; // type:object size:0xC scope:local align:4 -MenuSelStartFrameTbl = .data:0x803B49E4; // type:object size:0xC scope:global align:4 -MenuSelEndFrameTbl = .data:0x803B49F0; // type:object size:0xC scope:global align:4 -l_tagName13 = .data:0x803B4A00; // type:object size:0x18 scope:global align:4 data:string +MenuSelStartFrameTbl = .data:0x803B49E4; // type:object size:0xC scope:local align:4 +MenuSelEndFrameTbl = .data:0x803B49F0; // type:object size:0xC scope:local align:4 +l_tagName13 = .data:0x803B4A00; // type:object size:0x18 scope:local align:4 data:string @4167 = .data:0x803B4A18; // type:object size:0xC scope:local align:4 @4168 = .data:0x803B4A24; // type:object size:0xC scope:local align:4 @4169 = .data:0x803B4A30; // type:object size:0xC scope:local align:4 @@ -18686,7 +18703,7 @@ l_tagName13 = .data:0x803B4A00; // type:object size:0x18 scope:global align:4 da @4211 = .data:0x803B4C28; // type:object size:0xC scope:local align:4 @4212 = .data:0x803B4C34; // type:object size:0xC scope:local align:4 @4213 = .data:0x803B4C40; // type:object size:0xC scope:local align:4 -DataSelProc = .data:0x803B4C4C; // type:object size:0x234 scope:global align:4 data:4byte +DataSelProc = .data:0x803B4C4C; // type:object size:0x234 scope:local align:4 data:4byte l_tagName101$5620 = .data:0x803B4E80; // type:object size:0x10 scope:local align:4 data:4byte l_numTex$5621 = .data:0x803B4E90; // type:object size:0xC scope:local align:4 l_tagName0$6517 = .data:0x803B4EA0; // type:object size:0x18 scope:local align:4 data:string @@ -18745,7 +18762,7 @@ l_tagName011U$7072 = .data:0x803B5130; // type:object size:0x18 scope:local alig @7774 = .data:0x803B5268; // type:object size:0xC scope:local align:4 @7775 = .data:0x803B5274; // type:object size:0xC scope:local align:4 @7776 = .data:0x803B5280; // type:object size:0xC scope:local align:4 -MemCardCheckProc = .data:0x803B528C; // type:object size:0x144 scope:global align:4 data:4byte +MemCardCheckProc = .data:0x803B528C; // type:object size:0x144 scope:local align:4 data:4byte @7788 = .data:0x803B53D0; // type:object size:0xC scope:local align:4 @7790 = .data:0x803B53DC; // type:object size:0xC scope:local align:4 @7792 = .data:0x803B53E8; // type:object size:0xC scope:local align:4 @@ -18765,10 +18782,10 @@ __vt__17dDlst_FileSelYn_c = .data:0x803B54D8; // type:object size:0x10 scope:glo __vt__17dDlst_FileSelCp_c = .data:0x803B54E8; // type:object size:0x10 scope:global align:4 __vt__17dDlst_FileSelDt_c = .data:0x803B54F8; // type:object size:0x10 scope:global align:4 __vt__15dDlst_FileSel_c = .data:0x803B5508; // type:object size:0x10 scope:global align:4 -__vt__15J2DAnmTransform = .data:0x803B5518; // type:object size:0x14 scope:global align:4 -__vt__10JUTNameTab = .data:0x803B553C; // type:object size:0xC scope:global align:4 +__vt__15J2DAnmTransform = .data:0x803B5518; // type:object size:0x14 scope:weak align:4 +__vt__10JUTNameTab = .data:0x803B553C; // type:object size:0xC scope:weak align:4 __vt__14dFile_select_c = .data:0x803B5548; // type:object size:0xC scope:global align:4 -__vt__9dFs_HIO_c = .data:0x803B5560; // type:object size:0xC scope:global align:4 +__vt__9dFs_HIO_c = .data:0x803B5560; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803B5570; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B5570; // type:object size:0xC scope:local align:4 @3805 = .data:0x803B557C; // type:object size:0xC scope:local align:4 @@ -18789,7 +18806,7 @@ __vt__12dFile_info_c = .data:0x803B56F8; // type:object size:0xC scope:global al cNullVec__6Z2Calc = .data:0x803B5710; // type:object size:0xC scope:local align:4 @3795 = .data:0x803B571C; // type:object size:0xC scope:local align:4 @3796 = .data:0x803B5728; // type:object size:0xC scope:local align:4 -brightChackProc = .data:0x803B5734; // type:object size:0x18 scope:global align:4 data:4byte +brightChackProc = .data:0x803B5734; // type:object size:0x18 scope:local align:4 data:4byte __vt__19dDlst_BrightCheck_c = .data:0x803B574C; // type:object size:0x10 scope:global align:4 __vt__14dBrightCheck_c = .data:0x803B575C; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803B5778; // type:label scope:local align:4 @@ -18797,13 +18814,13 @@ cNullVec__6Z2Calc = .data:0x803B5778; // type:object size:0xC scope:local align: @3693 = .data:0x803B5784; // type:object size:0xC scope:local align:4 @3694 = .data:0x803B5790; // type:object size:0xC scope:local align:4 @3695 = .data:0x803B579C; // type:object size:0xC scope:local align:4 -init_process = .data:0x803B57A8; // type:object size:0x24 scope:local align:4 data:4byte +init_process = .data:0x803B57A8; // type:object size:0x24 scope:global align:4 data:4byte @3696 = .data:0x803B57CC; // type:object size:0xC scope:local align:4 @3697 = .data:0x803B57D8; // type:object size:0xC scope:local align:4 @3698 = .data:0x803B57E4; // type:object size:0xC scope:local align:4 -move_process = .data:0x803B57F0; // type:object size:0x24 scope:local align:4 data:4byte +move_process = .data:0x803B57F0; // type:object size:0x24 scope:global align:4 data:4byte __vt__8dScope_c = .data:0x803B5814; // type:object size:0x20 scope:global align:4 -__vt__11dMeterSub_c = .data:0x803B5834; // type:object size:0x20 scope:global align:4 +__vt__11dMeterSub_c = .data:0x803B5834; // type:object size:0x20 scope:weak align:4 ...data.0 = .data:0x803B5860; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B5860; // type:object size:0xC scope:local align:4 blo_name$3684 = .data:0x803B586C; // type:object size:0x10 scope:local align:4 @@ -18812,18 +18829,18 @@ bpk_name$3686 = .data:0x803B588C; // type:object size:0x10 scope:local align:4 btk_name$3687 = .data:0x803B589C; // type:object size:0x10 scope:local align:4 btk2_name$3688 = .data:0x803B58AC; // type:object size:0x10 scope:local align:4 __vt__16dSelect_cursor_c = .data:0x803B58EC; // type:object size:0x10 scope:global align:4 -__vt__19dSelect_cursorHIO_c = .data:0x803B5908; // type:object size:0xC scope:global align:4 -__vt__9dSi_HIO_c = .data:0x803B5918; // type:object size:0xC scope:global align:4 -cam_seira_shop = .data:0x803B5928; // type:object size:0x38 scope:global align:4 -cam_seira_evnt_before = .data:0x803B5960; // type:object size:0x38 scope:global align:4 -cam_seira_evnt_after = .data:0x803B5998; // type:object size:0x38 scope:global align:4 -shop_cam_data_tbl = .data:0x803B59D0; // type:object size:0xC scope:global align:4 +__vt__19dSelect_cursorHIO_c = .data:0x803B5908; // type:object size:0xC scope:weak align:4 +__vt__9dSi_HIO_c = .data:0x803B5918; // type:object size:0xC scope:weak align:4 +cam_seira_shop = .data:0x803B5928; // type:object size:0x38 scope:local align:4 +cam_seira_evnt_before = .data:0x803B5960; // type:object size:0x38 scope:local align:4 +cam_seira_evnt_after = .data:0x803B5998; // type:object size:0x38 scope:local align:4 +shop_cam_data_tbl = .data:0x803B59D0; // type:object size:0xC scope:local align:4 @3771 = .data:0x803B59DC; // type:object size:0xC scope:local align:4 data:4byte __vt__15dShopItemCtrl_c = .data:0x803B59E8; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803B59F8; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B59F8; // type:object size:0xC scope:local align:4 -dShopSystem_itemActor = .data:0x803B5A04; // type:object size:0x1C scope:global align:4 data:4byte -item_seira_shop = .data:0x803B5A20; // type:object size:0x24 scope:global align:4 +dShopSystem_itemActor = .data:0x803B5A04; // type:object size:0x1C scope:local align:4 data:4byte +item_seira_shop = .data:0x803B5A20; // type:object size:0x24 scope:local align:4 @4056 = .data:0x803B5A44; // type:object size:0xC scope:local align:4 @4057 = .data:0x803B5A50; // type:object size:0xC scope:local align:4 @4058 = .data:0x803B5A5C; // type:object size:0xC scope:local align:4 @@ -18861,16 +18878,16 @@ init_process = .data:0x803B5D28; // type:object size:0x6C scope:local align:4 da @3900 = .data:0x803B5DF4; // type:object size:0xC scope:local align:4 move_process = .data:0x803B5E00; // type:object size:0x6C scope:local align:4 data:4byte offset$4331 = .data:0x803B5E6C; // type:object size:0x20 scope:local align:4 -l_dGameover_Method = .data:0x803B5E8C; // type:object size:0x14 scope:global align:4 +l_dGameover_Method = .data:0x803B5E8C; // type:object size:0x14 scope:local align:4 g_profile_GAMEOVER = .data:0x803B5EA0; // type:object size:0x28 scope:global align:4 __vt__24dDlst_GameOverScrnDraw_c = .data:0x803B5EC8; // type:object size:0x10 scope:global align:4 -__vt__12dMenu_save_c = .data:0x803B5ED8; // type:object size:0xC scope:global align:4 -__vt__10dGov_HIO_c = .data:0x803B5EF0; // type:object size:0xC scope:global align:4 +__vt__12dMenu_save_c = .data:0x803B5ED8; // type:object size:0xC scope:weak align:4 +__vt__10dGov_HIO_c = .data:0x803B5EF0; // type:object size:0xC scope:weak align:4 __vt__24dDlst_Gameover_CAPTURE_c = .data:0x803B5F08; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803B5F18; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B5F18; // type:object size:0xC scope:local align:4 -lightStatusBase = .data:0x803B5F24; // type:object size:0xE8 scope:global align:4 data:4byte -lightMaskData = .data:0x803B600C; // type:object size:0x10 scope:global align:4 data:2byte +lightStatusBase = .data:0x803B5F24; // type:object size:0xE8 scope:local align:4 data:4byte +lightMaskData = .data:0x803B600C; // type:object size:0x10 scope:local align:4 data:2byte @4322 = .data:0x803B601C; // type:object size:0x40 scope:local align:4 @4364 = .data:0x803B605C; // type:object size:0x40 scope:local align:4 @4511 = .data:0x803B609C; // type:object size:0x1C scope:local align:4 @@ -18884,15 +18901,16 @@ now_shadow_alpha$5927 = .data:0x803B6170; // type:object size:0x18 scope:local a flush_col$7304 = .data:0x803B61D0; // type:object size:0x10 scope:local align:4 flush_col2$7305 = .data:0x803B61E0; // type:object size:0x10 scope:local align:4 flush_col3$7306 = .data:0x803B61F0; // type:object size:0x10 scope:local align:4 -l_dKy_Method = .data:0x803B6200; // type:object size:0x14 scope:global align:4 +l_dKy_Method = .data:0x803B6200; // type:object size:0x14 scope:local align:4 g_profile_KANKYO = .data:0x803B6214; // type:object size:0x28 scope:global align:4 parcent_tabel$9036 = .data:0x803B623C; // type:object size:0x30 scope:local align:4 -__vt__18dScnKy_env_light_c = .data:0x803B629C; // type:object size:0xC scope:global align:4 -l_dKyeff_Method = .data:0x803B62B8; // type:object size:0x14 scope:global align:4 +dummy_padding_data_0x354 = .data:0x803B626C; // type:object size:0x30 scope:local +__vt__18dScnKy_env_light_c = .data:0x803B629C; // type:object size:0xC scope:weak align:4 +l_dKyeff_Method = .data:0x803B62B8; // type:object size:0x14 scope:local align:4 g_profile_KYEFF = .data:0x803B62CC; // type:object size:0x28 scope:global align:4 -l_dKyeff2_Method = .data:0x803B62F8; // type:object size:0x14 scope:global align:4 +l_dKyeff2_Method = .data:0x803B62F8; // type:object size:0x14 scope:local align:4 g_profile_KYEFF2 = .data:0x803B630C; // type:object size:0x28 scope:global align:4 -l_dThunder_Method = .data:0x803B6338; // type:object size:0x14 scope:global align:4 +l_dThunder_Method = .data:0x803B6338; // type:object size:0x14 scope:local align:4 g_profile_KY_THUNDER = .data:0x803B634C; // type:object size:0x28 scope:global align:4 __vt__19dDlst_KanteraIcon_c = .data:0x803B6378; // type:object size:0x10 scope:global align:4 __vt__15dKantera_icon_c = .data:0x803B6388; // type:object size:0xC scope:global align:4 @@ -18913,10 +18931,13 @@ map_init_process = .data:0x803B63EC; // type:object size:0x48 scope:local align: @3810 = .data:0x803B6470; // type:object size:0xC scope:local align:4 map_move_process = .data:0x803B647C; // type:object size:0x48 scope:local align:4 data:4byte __vt__19dMenu_Calibration_c = .data:0x803B64C4; // type:object size:0x10 scope:global align:4 +__vt__20dummy_abstract_class = .data:0x803B64D4; // type:object size:0xC scope:weak ...data.0 = .data:0x803B64E0; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B64E0; // type:object size:0xC scope:local align:4 @4422 = .data:0x803B64EC; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803B64EC; // type:label scope:local @4423 = .data:0x803B64F8; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803B64F8; // type:label scope:local @4424 = .data:0x803B6504; // type:object size:0xC scope:local align:4 @4425 = .data:0x803B6510; // type:object size:0xC scope:local align:4 @4426 = .data:0x803B651C; // type:object size:0xC scope:local align:4 @@ -18982,13 +19003,13 @@ move_process = .data:0x803B6A00; // type:object size:0x3C scope:local align:4 da @4873 = .data:0x803B6A54; // type:object size:0xC scope:local align:4 @4874 = .data:0x803B6A60; // type:object size:0xC scope:local align:4 @4875 = .data:0x803B6A6C; // type:object size:0xC scope:local align:4 -itemInfo_subProcess = .data:0x803B6A78; // type:object size:0x3C scope:global align:4 data:4byte +itemInfo_subProcess = .data:0x803B6A78; // type:object size:0x3C scope:local align:4 data:4byte @4876 = .data:0x803B6AB4; // type:object size:0xC scope:local align:4 @4877 = .data:0x803B6AC0; // type:object size:0xC scope:local align:4 -floor_init_process = .data:0x803B6ACC; // type:object size:0x18 scope:global align:4 data:4byte +floor_init_process = .data:0x803B6ACC; // type:object size:0x18 scope:local align:4 data:4byte @4878 = .data:0x803B6AE4; // type:object size:0xC scope:local align:4 @4879 = .data:0x803B6AF0; // type:object size:0xC scope:local align:4 -floor_move_process = .data:0x803B6AFC; // type:object size:0x18 scope:global align:4 data:4byte +floor_move_process = .data:0x803B6AFC; // type:object size:0x18 scope:local align:4 data:4byte @4880 = .data:0x803B6B14; // type:object size:0xC scope:local align:4 @4881 = .data:0x803B6B20; // type:object size:0xC scope:local align:4 @4882 = .data:0x803B6B2C; // type:object size:0xC scope:local align:4 @@ -18997,14 +19018,14 @@ map_init_process = .data:0x803B6B38; // type:object size:0x24 scope:local align: @4884 = .data:0x803B6B68; // type:object size:0xC scope:local align:4 @4885 = .data:0x803B6B74; // type:object size:0xC scope:local align:4 map_move_process = .data:0x803B6B80; // type:object size:0x24 scope:local align:4 data:4byte -__vt__15dMenu_DmapMap_c = .data:0x803B6C40; // type:object size:0xC scope:global align:4 -__vt__20dMenu_StageMapCtrl_c = .data:0x803B6C4C; // type:object size:0x24 scope:global align:4 +__vt__15dMenu_DmapMap_c = .data:0x803B6C40; // type:object size:0xC scope:weak align:4 +__vt__20dMenu_StageMapCtrl_c = .data:0x803B6C4C; // type:object size:0x24 scope:weak align:4 __vt__12dMenu_Dmap_c = .data:0x803B6C70; // type:object size:0xC scope:global align:4 __vt__14dMenu_DmapBg_c = .data:0x803B6C98; // type:object size:0x1C scope:global align:4 ...data.0 = .data:0x803B6CC0; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B6CC0; // type:object size:0xC scope:local align:4 @3798 = .data:0x803B6CCC; // type:object size:0x44 scope:local align:4 -l_data = .data:0x803B6D20; // type:object size:0xF4 scope:global align:4 noreloc +l_data = .data:0x803B6D20; // type:object size:0xF4 scope:local align:4 noreloc @3922 = .data:0x803B6E14; // type:object size:0xC scope:local align:4 @3923 = .data:0x803B6E20; // type:object size:0xC scope:local align:4 @3924 = .data:0x803B6E2C; // type:object size:0xC scope:local align:4 @@ -19017,14 +19038,14 @@ init_process = .data:0x803B6E44; // type:object size:0x30 scope:local align:4 da move_process = .data:0x803B6EA4; // type:object size:0x30 scope:local align:4 data:4byte __vt__19dMenu_DmapMapCtrl_c = .data:0x803B6ED4; // type:object size:0x28 scope:global align:4 __vt__15renderingDmap_c = .data:0x803B6FC8; // type:object size:0xAC scope:global align:4 -map_icon_size = .data:0x803B7078; // type:object size:0x114 scope:global align:4 data:float +map_icon_size = .data:0x803B7078; // type:object size:0x114 scope:local align:4 data:float __vt__16dMenuMapCommon_c = .data:0x803B718C; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803B7198; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B7198; // type:object size:0xC scope:local align:4 @3790 = .data:0x803B71A4; // type:object size:0xC scope:local align:4 -map_init_process = .data:0x803B71B0; // type:object size:0xC scope:local align:4 data:4byte +map_init_process = .data:0x803B71B0; // type:object size:0xC scope:global align:4 data:4byte @3791 = .data:0x803B71BC; // type:object size:0xC scope:local align:4 -map_move_process = .data:0x803B71C8; // type:object size:0xC scope:local align:4 data:4byte +map_move_process = .data:0x803B71C8; // type:object size:0xC scope:global align:4 data:4byte __vt__15dMenu_Fishing_c = .data:0x803B71D4; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803B71F0; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B71F0; // type:object size:0xC scope:local align:4 @@ -19093,7 +19114,7 @@ move_process = .data:0x803B7634; // type:object size:0x168 scope:local align:4 d stage_name$7318 = .data:0x803B779C; // type:object size:0x10 scope:local align:4 stage_name$7375 = .data:0x803B77AC; // type:object size:0x18 scope:local align:4 __vt__12dMenu_Fmap_c = .data:0x803B77C4; // type:object size:0xC scope:global align:4 -__vt__9dMf_HIO_c = .data:0x803B77D0; // type:object size:0xC scope:global align:4 +__vt__9dMf_HIO_c = .data:0x803B77D0; // type:object size:0xC scope:weak align:4 __vt__15dMenu_FmapMap_c = .data:0x803B77E0; // type:object size:0x68 scope:global align:4 __vt__15renderingFmap_c = .data:0x803B7848; // type:object size:0x68 scope:global align:4 __vt__17dMenu_Fmap2DTop_c = .data:0x803B78B0; // type:object size:0x10 scope:global align:4 @@ -19180,13 +19201,13 @@ process = .data:0x803B7E58; // type:object size:0x6C scope:local align:4 data:4b @3858 = .data:0x803B7EDC; // type:object size:0xC scope:local align:4 @3859 = .data:0x803B7EE8; // type:object size:0xC scope:local align:4 @3860 = .data:0x803B7EF4; // type:object size:0xC scope:local align:4 -tv_process = .data:0x803B7F00; // type:object size:0x3C scope:global align:4 data:4byte +tv_process = .data:0x803B7F00; // type:object size:0x3C scope:local align:4 data:4byte @3861 = .data:0x803B7F3C; // type:object size:0xC scope:local align:4 @3862 = .data:0x803B7F48; // type:object size:0xC scope:local align:4 @3863 = .data:0x803B7F54; // type:object size:0xC scope:local align:4 @3864 = .data:0x803B7F60; // type:object size:0xC scope:local align:4 @3865 = .data:0x803B7F6C; // type:object size:0xC scope:local align:4 -calibration_process = .data:0x803B7F78; // type:object size:0x3C scope:global align:4 +calibration_process = .data:0x803B7F78; // type:object size:0x3C scope:local align:4 __vt__14dMenu_Option_c = .data:0x803B7FE4; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803B8000; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B8000; // type:object size:0xC scope:local align:4 @@ -19194,12 +19215,12 @@ cNullVec__6Z2Calc = .data:0x803B8000; // type:object size:0xC scope:local align: @3863 = .data:0x803B8018; // type:object size:0xC scope:local align:4 @3864 = .data:0x803B8024; // type:object size:0xC scope:local align:4 @3865 = .data:0x803B8030; // type:object size:0xC scope:local align:4 -stick_init = .data:0x803B803C; // type:object size:0x30 scope:global align:4 data:4byte +stick_init = .data:0x803B803C; // type:object size:0x30 scope:local align:4 data:4byte @3866 = .data:0x803B806C; // type:object size:0xC scope:local align:4 @3867 = .data:0x803B8078; // type:object size:0xC scope:local align:4 @3868 = .data:0x803B8084; // type:object size:0xC scope:local align:4 @3869 = .data:0x803B8090; // type:object size:0xC scope:local align:4 -stick_proc = .data:0x803B809C; // type:object size:0x30 scope:global align:4 data:4byte +stick_proc = .data:0x803B809C; // type:object size:0x30 scope:local align:4 data:4byte @4803 = .data:0x803B80CC; // type:object size:0x20 scope:local align:4 __vt__12dMenu_Ring_c = .data:0x803B80EC; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803B8108; // type:label scope:local align:4 @@ -19293,7 +19314,7 @@ MenuSaveProc = .data:0x803B8564; // type:object size:0x2E8 scope:global align:4 @4888 = .data:0x803B8898; // type:object size:0xC scope:local align:4 data:4byte __vt__16dDlst_MenuSave_c = .data:0x803B88A4; // type:object size:0x10 scope:global align:4 __vt__23dDlst_MenuSaveExplain_c = .data:0x803B88B4; // type:object size:0x10 scope:global align:4 -__vt__9dMs_HIO_c = .data:0x803B890C; // type:object size:0xC scope:global align:4 +__vt__9dMs_HIO_c = .data:0x803B890C; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803B8918; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B8918; // type:object size:0xC scope:local align:4 @3795 = .data:0x803B8924; // type:object size:0xC scope:local align:4 @@ -19308,12 +19329,14 @@ map_init_process = .data:0x803B8954; // type:object size:0x30 scope:local align: map_move_process = .data:0x803B89B4; // type:object size:0x30 scope:local align:4 data:4byte evt_id$4557 = .data:0x803B89E4; // type:object size:0x1C scope:local align:4 __vt__13dMenu_Skill_c = .data:0x803B8A00; // type:object size:0x10 scope:global align:4 -__vt__10dMw_DHIO_c = .data:0x803B8A20; // type:object size:0xC scope:global align:4 -__vt__9dMw_HIO_c = .data:0x803B8A2C; // type:object size:0xC scope:global align:4 +__vt__10dMw_DHIO_c = .data:0x803B8A20; // type:object size:0xC scope:weak align:4 +__vt__9dMw_HIO_c = .data:0x803B8A2C; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803B8A38; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B8A38; // type:object size:0xC scope:local align:4 @4276 = .data:0x803B8A44; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803B8A44; // type:label scope:local @4277 = .data:0x803B8A50; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803B8A50; // type:label scope:local @4278 = .data:0x803B8A5C; // type:object size:0xC scope:local align:4 @4279 = .data:0x803B8A68; // type:object size:0xC scope:local align:4 @4280 = .data:0x803B8A74; // type:object size:0xC scope:local align:4 @@ -19389,22 +19412,22 @@ move_proc = .data:0x803B8F30; // type:object size:0x1A4 scope:global align:4 dat l_dMw_Method = .data:0x803B91C0; // type:object size:0x14 scope:global align:4 g_profile_MENUWINDOW = .data:0x803B91D4; // type:object size:0x28 scope:global align:4 __vt__20dDlst_MENU_CAPTURE_c = .data:0x803B9214; // type:object size:0x10 scope:global align:4 -__vt__18dMeter_cursorHIO_c = .data:0x803B9228; // type:object size:0xC scope:global align:4 +__vt__18dMeter_cursorHIO_c = .data:0x803B9228; // type:object size:0xC scope:weak align:4 __vt__16dMeter_fmapHIO_c = .data:0x803B9234; // type:object size:0xC scope:global align:4 -__vt__19dMeter_mapIconHIO_c = .data:0x803B9240; // type:object size:0xC scope:global align:4 -__vt__16dMeter_ringHIO_c = .data:0x803B924C; // type:object size:0xC scope:global align:4 -__vt__16dMeter_drawHIO_c = .data:0x803B9258; // type:object size:0xC scope:global align:4 -__vt__25dMeter_drawLightDropHIO_c = .data:0x803B9264; // type:object size:0xC scope:global align:4 -__vt__24dMeter_drawMiniGameHIO_c = .data:0x803B9270; // type:object size:0xC scope:global align:4 -__vt__25dMeter_drawEmpButtonHIO_c = .data:0x803B927C; // type:object size:0xC scope:global align:4 -__vt__21dMeter_drawSkillHIO_c = .data:0x803B9288; // type:object size:0xC scope:global align:4 -__vt__27dMeter_drawCalibrationHIO_c = .data:0x803B9294; // type:object size:0xC scope:global align:4 -__vt__22dMeter_drawInsectHIO_c = .data:0x803B92A0; // type:object size:0xC scope:global align:4 -__vt__23dMeter_drawFishingHIO_c = .data:0x803B92AC; // type:object size:0xC scope:global align:4 -__vt__22dMeter_drawLetterHIO_c = .data:0x803B92B8; // type:object size:0xC scope:global align:4 -__vt__22dMeter_drawOptionHIO_c = .data:0x803B92C4; // type:object size:0xC scope:global align:4 -__vt__23dMeter_drawCollectHIO_c = .data:0x803B92D0; // type:object size:0xC scope:global align:4 -__vt__16dMeter_menuHIO_c = .data:0x803B92DC; // type:object size:0xC scope:global align:4 +__vt__19dMeter_mapIconHIO_c = .data:0x803B9240; // type:object size:0xC scope:weak align:4 +__vt__16dMeter_ringHIO_c = .data:0x803B924C; // type:object size:0xC scope:weak align:4 +__vt__16dMeter_drawHIO_c = .data:0x803B9258; // type:object size:0xC scope:weak align:4 +__vt__25dMeter_drawLightDropHIO_c = .data:0x803B9264; // type:object size:0xC scope:weak align:4 +__vt__24dMeter_drawMiniGameHIO_c = .data:0x803B9270; // type:object size:0xC scope:weak align:4 +__vt__25dMeter_drawEmpButtonHIO_c = .data:0x803B927C; // type:object size:0xC scope:weak align:4 +__vt__21dMeter_drawSkillHIO_c = .data:0x803B9288; // type:object size:0xC scope:weak align:4 +__vt__27dMeter_drawCalibrationHIO_c = .data:0x803B9294; // type:object size:0xC scope:weak align:4 +__vt__22dMeter_drawInsectHIO_c = .data:0x803B92A0; // type:object size:0xC scope:weak align:4 +__vt__23dMeter_drawFishingHIO_c = .data:0x803B92AC; // type:object size:0xC scope:weak align:4 +__vt__22dMeter_drawLetterHIO_c = .data:0x803B92B8; // type:object size:0xC scope:weak align:4 +__vt__22dMeter_drawOptionHIO_c = .data:0x803B92C4; // type:object size:0xC scope:weak align:4 +__vt__23dMeter_drawCollectHIO_c = .data:0x803B92D0; // type:object size:0xC scope:weak align:4 +__vt__16dMeter_menuHIO_c = .data:0x803B92DC; // type:object size:0xC scope:weak align:4 @7833 = .data:0x803B92E8; // type:object size:0x58 scope:local align:4 @7884 = .data:0x803B9340; // type:object size:0x58 scope:local align:4 __vt__14dMeterButton_c = .data:0x803B9398; // type:object size:0x10 scope:global align:4 @@ -19426,7 +19449,7 @@ tex_name$5199 = .data:0x803B9934; // type:object size:0x28 scope:local align:4 letter_data__12dMenu_Letter = .data:0x803B995C; // type:object size:0x200 scope:global align:4 data:2byte __vt__13dMeter2Info_c = .data:0x803B9B5C; // type:object size:0xC scope:global align:4 @5038 = .data:0x803B9B68; // type:object size:0x2C scope:local align:4 -l_dMeter2_Method = .data:0x803B9B94; // type:object size:0x14 scope:global align:4 +l_dMeter2_Method = .data:0x803B9B94; // type:object size:0x14 scope:local align:4 g_profile_METER2 = .data:0x803B9BA8; // type:object size:0x28 scope:global align:4 @4395 = .data:0x803B9BD0; // type:object size:0x118 scope:local align:4 @4999 = .data:0x803B9CE8; // type:object size:0x104 scope:local align:4 @@ -19459,7 +19482,7 @@ char_table$3795 = .data:0x803B9F38; // type:object size:0x80 scope:local align:4 __vt__35jmessage_string_tRenderingProcessor = .data:0x803BAA48; // type:object size:0x40 scope:global align:4 __vt__34jmessage_string_tSequenceProcessor = .data:0x803BAA88; // type:object size:0x58 scope:global align:4 __vt__33jmessage_string_tMeasureProcessor = .data:0x803BAAE0; // type:object size:0x40 scope:global align:4 -__vt__24jmessage_string_tControl = .data:0x803BAB20; // type:object size:0xC scope:global align:4 +__vt__24jmessage_string_tControl = .data:0x803BAB20; // type:object size:0xC scope:weak align:4 __vt__26jmessage_string_tReference = .data:0x803BAB2C; // type:object size:0x10 scope:global align:4 __vt__28jmessage_tRenderingProcessor = .data:0x803BAB3C; // type:object size:0x40 scope:global align:4 __vt__27jmessage_tSequenceProcessor = .data:0x803BAB7C; // type:object size:0x58 scope:global align:4 @@ -19480,7 +19503,7 @@ cNullVec__6Z2Calc = .data:0x803BAD40; // type:object size:0xC scope:local align: @3757 = .data:0x803BAD70; // type:object size:0xC scope:local align:4 @3758 = .data:0x803BAD7C; // type:object size:0xC scope:local align:4 @3759 = .data:0x803BAD88; // type:object size:0xC scope:local align:4 -process = .data:0x803BAD94; // type:object size:0x48 scope:local align:4 data:4byte +process = .data:0x803BAD94; // type:object size:0x48 scope:global align:4 data:4byte tag_n$4991 = .data:0x803BADE0; // type:object size:0x18 scope:local align:4 data:4byte __vt__17dMsgScrn3Select_c = .data:0x803BAE28; // type:object size:0xC scope:global align:4 __vt__15dMsgScrnArrow_c = .data:0x803BAE38; // type:object size:0xC scope:global align:4 @@ -19528,7 +19551,7 @@ __vt__14dMsgScrnHowl_c = .data:0x803BB2D0; // type:object size:0x58 scope:global __vt__16dMsgScrnJimaku_c = .data:0x803BB328; // type:object size:0x58 scope:global align:4 __vt__16dMsgScrnKanban_c = .data:0x803BB380; // type:object size:0x58 scope:global align:4 __vt__15dMsgScrnLight_c = .data:0x803BB3D8; // type:object size:0xC scope:global align:4 -__vt__19dMsgScrnLight_HIO_c = .data:0x803BB3E4; // type:object size:0xC scope:global align:4 +__vt__19dMsgScrnLight_HIO_c = .data:0x803BB3E4; // type:object size:0xC scope:weak align:4 t_tag$3877 = .data:0x803BB3F0; // type:object size:0x38 scope:local align:4 data:4byte __vt__15dMsgScrnPlace_c = .data:0x803BB428; // type:object size:0x58 scope:global align:4 t_tag$3752 = .data:0x803BB480; // type:object size:0x30 scope:local align:4 data:4byte @@ -19646,13 +19669,13 @@ mEventList__10dMsgFlow_c = .data:0x803BBE0C; // type:object size:0x204 scope:glo __vt__10dMsgFlow_c = .data:0x803BC080; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803BC090; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BC090; // type:object size:0xC scope:local align:4 -l_mojiHira = .data:0x803BC09C; // type:object size:0x104 scope:global align:4 -l_mojiHira2 = .data:0x803BC1A0; // type:object size:0x104 scope:global align:4 -l_mojiHira3 = .data:0x803BC2A4; // type:object size:0x104 scope:global align:4 -l_mojikata = .data:0x803BC3A8; // type:object size:0x104 scope:global align:4 -l_mojikata2 = .data:0x803BC4AC; // type:object size:0x104 scope:global align:4 -l_mojikata3 = .data:0x803BC5B0; // type:object size:0x104 scope:global align:4 -l_mojiEisu = .data:0x803BC6B4; // type:object size:0x104 scope:global align:4 +l_mojiHira = .data:0x803BC09C; // type:object size:0x104 scope:local align:4 +l_mojiHira2 = .data:0x803BC1A0; // type:object size:0x104 scope:local align:4 +l_mojiHira3 = .data:0x803BC2A4; // type:object size:0x104 scope:local align:4 +l_mojikata = .data:0x803BC3A8; // type:object size:0x104 scope:local align:4 +l_mojikata2 = .data:0x803BC4AC; // type:object size:0x104 scope:local align:4 +l_mojikata3 = .data:0x803BC5B0; // type:object size:0x104 scope:local align:4 +l_mojiEisu = .data:0x803BC6B4; // type:object size:0x104 scope:local align:4 @3855 = .data:0x803BC7B8; // type:object size:0xC scope:local align:4 @3856 = .data:0x803BC7C4; // type:object size:0xC scope:local align:4 @3857 = .data:0x803BC7D0; // type:object size:0xC scope:local align:4 @@ -19662,7 +19685,7 @@ l_mojiEisu = .data:0x803BC6B4; // type:object size:0x104 scope:global align:4 @3861 = .data:0x803BC800; // type:object size:0xC scope:local align:4 @3862 = .data:0x803BC80C; // type:object size:0xC scope:local align:4 @3863 = .data:0x803BC818; // type:object size:0xC scope:local align:4 -SelProc = .data:0x803BC824; // type:object size:0x6C scope:global align:4 data:4byte +SelProc = .data:0x803BC824; // type:object size:0x6C scope:local align:4 data:4byte @4185 = .data:0x803BC890; // type:object size:0x34 scope:local align:4 l_cur0TagName$4789 = .data:0x803BC8C8; // type:object size:0x40 scope:local align:4 l_cur1TagName$4790 = .data:0x803BC908; // type:object size:0x40 scope:local align:4 @@ -19674,9 +19697,9 @@ l_nameTagName$4819 = .data:0x803BCBF8; // type:object size:0x40 scope:local alig l_nameCurTagName$4820 = .data:0x803BCC38; // type:object size:0x40 scope:local align:4 __vt__14dDlst_NameIN_c = .data:0x803BCC78; // type:object size:0x10 scope:global align:4 __vt__7dName_c = .data:0x803BCCA4; // type:object size:0xC scope:global align:4 -__vt__9dNm_HIO_c = .data:0x803BCCBC; // type:object size:0xC scope:global align:4 -__vt__16dNpcLib_lookat_c = .data:0x803BCCC8; // type:object size:0xC scope:global align:4 -l_dOvlpFd_Method = .data:0x803BCCD8; // type:object size:0x14 scope:global align:4 +__vt__9dNm_HIO_c = .data:0x803BCCBC; // type:object size:0xC scope:weak align:4 +__vt__16dNpcLib_lookat_c = .data:0x803BCCC8; // type:object size:0xC scope:weak align:4 +l_dOvlpFd_Method = .data:0x803BCCD8; // type:object size:0x14 scope:local align:4 g_profile_OVERLAP0 = .data:0x803BCCEC; // type:object size:0x28 scope:global align:4 g_profile_OVERLAP1 = .data:0x803BCD14; // type:object size:0x28 scope:global align:4 g_profile_OVERLAP6 = .data:0x803BCD3C; // type:object size:0x28 scope:global align:4 @@ -19689,18 +19712,18 @@ g_profile_OVERLAP11 = .data:0x803BCE04; // type:object size:0x28 scope:global al @3721 = .data:0x803BCE3C; // type:object size:0xC scope:local align:4 data:4byte @3736 = .data:0x803BCE48; // type:object size:0xC scope:local align:4 data:4byte @3765 = .data:0x803BCE54; // type:object size:0xC scope:local align:4 data:4byte -l_dOvlpFd2_Method = .data:0x803BCE60; // type:object size:0x14 scope:global align:4 +l_dOvlpFd2_Method = .data:0x803BCE60; // type:object size:0x14 scope:local align:4 g_profile_OVERLAP2 = .data:0x803BCE74; // type:object size:0x28 scope:global align:4 __vt__15dOvlpFd2_dlst_c = .data:0x803BCE9C; // type:object size:0x10 scope:global align:4 @3812 = .data:0x803BCEB0; // type:object size:0xC scope:local align:4 data:4byte @3857 = .data:0x803BCEBC; // type:object size:0xC scope:local align:4 data:4byte @3871 = .data:0x803BCEC8; // type:object size:0xC scope:local align:4 data:4byte @3898 = .data:0x803BCED4; // type:object size:0xC scope:local align:4 data:4byte -l_dOvlpFd3_Method = .data:0x803BCEE0; // type:object size:0x14 scope:global align:4 +l_dOvlpFd3_Method = .data:0x803BCEE0; // type:object size:0x14 scope:local align:4 g_profile_OVERLAP3 = .data:0x803BCEF4; // type:object size:0x28 scope:global align:4 __vt__15dOvlpFd3_dlst_c = .data:0x803BCF1C; // type:object size:0x10 scope:global align:4 __vt__16dDlst_snapShot_c = .data:0x803BCF2C; // type:object size:0xC scope:global align:4 -__vt__10JSUIosBase = .data:0x803BCF38; // type:object size:0xC scope:global align:4 +__vt__10JSUIosBase = .data:0x803BCF38; // type:object size:0xC scope:weak align:4 __vt__8CPaneMgr = .data:0x803BCF44; // type:object size:0x10 scope:global align:4 __vt__17CPaneMgrAlphaMorf = .data:0x803BCF58; // type:object size:0x10 scope:global align:4 __vt__13CPaneMgrAlpha = .data:0x803BCF68; // type:object size:0x10 scope:global align:4 @@ -19722,9 +19745,9 @@ cNullVec__6Z2Calc = .data:0x803BCF78; // type:object size:0xC scope:local align: @3749 = .data:0x803BD020; // type:object size:0xC scope:local align:4 @3750 = .data:0x803BD02C; // type:object size:0xC scope:local align:4 @3751 = .data:0x803BD038; // type:object size:0xC scope:local align:4 -l_execFunc = .data:0x803BD044; // type:object size:0xC0 scope:global align:4 data:4byte +l_execFunc = .data:0x803BD044; // type:object size:0xC0 scope:local align:4 data:4byte l_method$4622 = .data:0x803BD104; // type:object size:0xC scope:local align:4 -l_dScnLogo_Method = .data:0x803BD110; // type:object size:0x14 scope:global align:4 +l_dScnLogo_Method = .data:0x803BD110; // type:object size:0x14 scope:local align:4 g_profile_LOGO_SCENE = .data:0x803BD124; // type:object size:0x28 scope:global align:4 __vt__10dLog_HIO_c = .data:0x803BD14C; // type:object size:0xC scope:global align:4 g_profile_MENU_SCENE = .data:0x803BD158; // type:object size:0x28 scope:global align:4 @@ -19736,51 +19759,51 @@ cNullVec__6Z2Calc = .data:0x803BD180; // type:object size:0xC scope:local align: @3945 = .data:0x803BD1B0; // type:object size:0xC scope:local align:4 @3946 = .data:0x803BD1BC; // type:object size:0xC scope:local align:4 @3947 = .data:0x803BD1C8; // type:object size:0xC scope:local align:4 -MainProc = .data:0x803BD1D4; // type:object size:0x48 scope:global align:4 data:4byte -l_dScnName_Method = .data:0x803BD21C; // type:object size:0x14 scope:global align:4 +MainProc = .data:0x803BD1D4; // type:object size:0x48 scope:local align:4 data:4byte +l_dScnName_Method = .data:0x803BD21C; // type:object size:0x14 scope:local align:4 g_profile_NAME_SCENE = .data:0x803BD230; // type:object size:0x28 scope:global align:4 g_profile_NAMEEX_SCENE = .data:0x803BD258; // type:object size:0x28 scope:global align:4 -__vt__17dScnName_camera_c = .data:0x803BD280; // type:object size:0xC scope:global align:4 -__vt__9dSn_HIO_c = .data:0x803BD28C; // type:object size:0xC scope:global align:4 +__vt__17dScnName_camera_c = .data:0x803BD280; // type:object size:0xC scope:weak align:4 +__vt__9dSn_HIO_c = .data:0x803BD28C; // type:object size:0xC scope:weak align:4 l_wipeType$4081 = .data:0x803BD298; // type:object size:0x2E scope:local align:4 camparamarc$4608 = .data:0x803BD2C8; // type:object size:0xA scope:local align:4 l_method$4860 = .data:0x803BD2D4; // type:object size:0x2C scope:local align:4 -l_dScnPly_Method = .data:0x803BD300; // type:object size:0x14 scope:global align:4 +l_dScnPly_Method = .data:0x803BD300; // type:object size:0x14 scope:local align:4 g_profile_PLAY_SCENE = .data:0x803BD314; // type:object size:0x28 scope:global align:4 g_profile_OPENING_SCENE = .data:0x803BD33C; // type:object size:0x28 scope:global align:4 -__vt__22dScnPly_env_debugHIO_c = .data:0x803BD364; // type:object size:0xC scope:global align:4 -__vt__22dScnPly_env_otherHIO_c = .data:0x803BD370; // type:object size:0xC scope:global align:4 -__vt__17dScnPly_env_HIO_c = .data:0x803BD37C; // type:object size:0xC scope:global align:4 -__vt__17dScnPly_reg_HIO_c = .data:0x803BD388; // type:object size:0xC scope:global align:4 -__vt__21dScnPly_preLoad_HIO_c = .data:0x803BD394; // type:object size:0xC scope:global align:4 +__vt__22dScnPly_env_debugHIO_c = .data:0x803BD364; // type:object size:0xC scope:weak align:4 +__vt__22dScnPly_env_otherHIO_c = .data:0x803BD370; // type:object size:0xC scope:weak align:4 +__vt__17dScnPly_env_HIO_c = .data:0x803BD37C; // type:object size:0xC scope:weak align:4 +__vt__17dScnPly_reg_HIO_c = .data:0x803BD388; // type:object size:0xC scope:weak align:4 +__vt__21dScnPly_preLoad_HIO_c = .data:0x803BD394; // type:object size:0xC scope:weak align:4 l_method$4056 = .data:0x803BD3A0; // type:object size:0x14 scope:local align:4 -l_dScnRoom_Method = .data:0x803BD3B4; // type:object size:0x14 scope:global align:4 +l_dScnRoom_Method = .data:0x803BD3B4; // type:object size:0x14 scope:local align:4 g_profile_ROOM_SCENE = .data:0x803BD3C8; // type:object size:0x28 scope:global align:4 g_profile_WARNING_SCENE = .data:0x803BD3F0; // type:object size:0x28 scope:global align:4 g_profile_WARNING2_SCENE = .data:0x803BD418; // type:object size:0x28 scope:global align:4 -__vt__22dSvBit_childOtherHIO_c = .data:0x803BD440; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childTransformHIO_c = .data:0x803BD44C; // type:object size:0xC scope:global align:4 -__vt__25dSvBit_childDarknessHIO_c = .data:0x803BD458; // type:object size:0xC scope:global align:4 -__vt__29dSvBit_childTbPerfectionHIO_c = .data:0x803BD464; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childItOneZoneHIO_c = .data:0x803BD470; // type:object size:0xC scope:global align:4 -__vt__23dSvBit_childItZoneHIO_c = .data:0x803BD47C; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childItDungeonHIO_c = .data:0x803BD488; // type:object size:0xC scope:global align:4 -__vt__29dSvBit_childItPerfectionHIO_c = .data:0x803BD494; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childSwOneZoneHIO_c = .data:0x803BD4A0; // type:object size:0xC scope:global align:4 -__vt__23dSvBit_childSwZoneHIO_c = .data:0x803BD4AC; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childSwDungeonHIO_c = .data:0x803BD4B8; // type:object size:0xC scope:global align:4 -__vt__29dSvBit_childSwPerfectionHIO_c = .data:0x803BD4C4; // type:object size:0xC scope:global align:4 -__vt__25dSvBit_childTreasureHIO_c = .data:0x803BD4D0; // type:object size:0xC scope:global align:4 -__vt__21dSvBit_childItemHIO_c = .data:0x803BD4DC; // type:object size:0xC scope:global align:4 -__vt__23dSvBit_childSwitchHIO_c = .data:0x803BD4E8; // type:object size:0xC scope:global align:4 -__vt__12dSvBit_HIO_c = .data:0x803BD4F4; // type:object size:0xC scope:global align:4 +__vt__22dSvBit_childOtherHIO_c = .data:0x803BD440; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childTransformHIO_c = .data:0x803BD44C; // type:object size:0xC scope:weak align:4 +__vt__25dSvBit_childDarknessHIO_c = .data:0x803BD458; // type:object size:0xC scope:weak align:4 +__vt__29dSvBit_childTbPerfectionHIO_c = .data:0x803BD464; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childItOneZoneHIO_c = .data:0x803BD470; // type:object size:0xC scope:weak align:4 +__vt__23dSvBit_childItZoneHIO_c = .data:0x803BD47C; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childItDungeonHIO_c = .data:0x803BD488; // type:object size:0xC scope:weak align:4 +__vt__29dSvBit_childItPerfectionHIO_c = .data:0x803BD494; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childSwOneZoneHIO_c = .data:0x803BD4A0; // type:object size:0xC scope:weak align:4 +__vt__23dSvBit_childSwZoneHIO_c = .data:0x803BD4AC; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childSwDungeonHIO_c = .data:0x803BD4B8; // type:object size:0xC scope:weak align:4 +__vt__29dSvBit_childSwPerfectionHIO_c = .data:0x803BD4C4; // type:object size:0xC scope:weak align:4 +__vt__25dSvBit_childTreasureHIO_c = .data:0x803BD4D0; // type:object size:0xC scope:weak align:4 +__vt__21dSvBit_childItemHIO_c = .data:0x803BD4DC; // type:object size:0xC scope:weak align:4 +__vt__23dSvBit_childSwitchHIO_c = .data:0x803BD4E8; // type:object size:0xC scope:weak align:4 +__vt__12dSvBit_HIO_c = .data:0x803BD4F4; // type:object size:0xC scope:weak align:4 @5239 = .data:0x803BD500; // type:object size:0x24 scope:local align:4 -l_dTimer_Method = .data:0x803BD524; // type:object size:0x14 scope:global align:4 +l_dTimer_Method = .data:0x803BD524; // type:object size:0x14 scope:local align:4 g_profile_TIMER = .data:0x803BD538; // type:object size:0x28 scope:global align:4 __vt__21dDlst_TimerScrnDraw_c = .data:0x803BD560; // type:object size:0x10 scope:global align:4 -l_dkWmark_Method = .data:0x803BD570; // type:object size:0x14 scope:global align:4 +l_dkWmark_Method = .data:0x803BD570; // type:object size:0x14 scope:local align:4 g_profile_WMARK = .data:0x803BD584; // type:object size:0x28 scope:global align:4 -l_dkWpillar_Method = .data:0x803BD5B0; // type:object size:0x14 scope:global align:4 +l_dkWpillar_Method = .data:0x803BD5B0; // type:object size:0x14 scope:local align:4 g_profile_WPILLAR = .data:0x803BD5C4; // type:object size:0x28 scope:global align:4 strings$4165 = .data:0x803BD5F0; // type:object size:0x10 scope:local align:4 __vt__20DynamicModuleControl = .data:0x803BD600; // type:object size:0x34 scope:global align:4 @@ -19793,30 +19816,31 @@ __vt__12cCcD_TriAttr = .data:0x803BD7AC; // type:object size:0x64 scope:global a __vt__14cCcD_ShapeAttr = .data:0x803BD810; // type:object size:0x58 scope:global align:4 __vt__9cCcD_Stts = .data:0x803BD868; // type:object size:0x20 scope:global align:4 __vt__4cCcS = .data:0x803BD888; // type:object size:0x30 scope:global align:4 -atntable = .data:0x803BD8B8; // type:object size:0x802 scope:global align:4 +atntable = .data:0x803BD8B8; // type:object size:0x802 scope:local align:4 __vt__8cBgS_Chk = .data:0x803BE0C0; // type:object size:0xC scope:global align:4 __vt__11cBgS_GndChk = .data:0x803BE0D0; // type:object size:0x18 scope:global align:4 __vt__11cBgS_LinChk = .data:0x803BE0E8; // type:object size:0x18 scope:global align:4 __vt__13cBgS_ShdwDraw = .data:0x803BE100; // type:object size:0xC scope:global align:4 __vt__13cBgS_PolyInfo = .data:0x803BE110; // type:object size:0xC scope:global align:4 __vt__8cM3dGCir = .data:0x803BE120; // type:object size:0xC scope:global align:4 -__vt__8cM2dGCir = .data:0x803BE12C; // type:object size:0xC scope:global align:4 +__vt__8cM2dGCir = .data:0x803BE12C; // type:object size:0xC scope:weak align:4 __vt__8cM3dGCps = .data:0x803BE138; // type:object size:0xC scope:global align:4 -e_mtx = .data:0x803BE160; // type:object size:0x30 scope:global align:32 -clear_z_TX = .data:0x803BE1A0; // type:object size:0x40 scope:global align:32 +e_mtx = .data:0x803BE160; // type:object size:0x30 scope:local align:32 +clear_z_TX = .data:0x803BE1A0; // type:object size:0x40 scope:local align:32 __vt__10JFWDisplay = .data:0x803BE1E0; // type:object size:0x18 scope:global align:4 -jpa_pos = .data:0x803BE200; // type:object size:0x144 scope:global align:32 -jpa_crd = .data:0x803BE360; // type:object size:0x20 scope:global align:4 +jpa_pos = .data:0x803BE200; // type:object size:0x144 scope:local align:32 +jpa_crd = .data:0x803BE360; // type:object size:0x20 scope:local align:4 @2829 = .data:0x803BE380; // type:object size:0x2C scope:local align:4 @2828 = .data:0x803BE3AC; // type:object size:0x2C scope:local align:4 @3454 = .data:0x803BE3D8; // type:object size:0x2C scope:local align:4 +jpa_resource_padding = .data:0x803BE404; // type:object size:0x1C scope:local ...data.0 = .data:0x803BE420; // type:label scope:local align:4 -jpa_dl = .data:0x803BE420; // type:object size:0x20 scope:global align:4 -jpa_dl_x = .data:0x803BE440; // type:object size:0x20 scope:global align:4 -p_prj = .data:0x803BE460; // type:object size:0xC scope:global align:4 -p_direction = .data:0x803BE46C; // type:object size:0x14 scope:global align:4 -p_rot = .data:0x803BE480; // type:object size:0x14 scope:global align:4 -p_plane = .data:0x803BE494; // type:object size:0xC scope:global align:4 +jpa_dl = .data:0x803BE420; // type:object size:0x20 scope:local align:4 +jpa_dl_x = .data:0x803BE440; // type:object size:0x20 scope:local align:4 +p_prj = .data:0x803BE460; // type:object size:0xC scope:local align:4 +p_direction = .data:0x803BE46C; // type:object size:0x14 scope:local align:4 +p_rot = .data:0x803BE480; // type:object size:0x14 scope:local align:4 +p_plane = .data:0x803BE494; // type:object size:0xC scope:local align:4 st_bm__12JPABaseShape = .data:0x803BE4A0; // type:object size:0xC scope:global align:4 st_bf__12JPABaseShape = .data:0x803BE4AC; // type:object size:0x28 scope:global align:4 st_lo__12JPABaseShape = .data:0x803BE4D4; // type:object size:0x40 scope:global align:4 @@ -19826,7 +19850,7 @@ st_ca__12JPABaseShape = .data:0x803BE544; // type:object size:0x60 scope:global st_aa__12JPABaseShape = .data:0x803BE5A4; // type:object size:0x20 scope:global align:4 @2631 = .data:0x803BE5C8; // type:object size:0x1C scope:local align:4 @3259 = .data:0x803BE5E8; // type:object size:0x24 scope:local align:4 -__vt__12JPAFieldBase = .data:0x803BE60C; // type:object size:0x14 scope:global align:4 +__vt__12JPAFieldBase = .data:0x803BE60C; // type:object size:0x14 scope:weak align:4 __vt__12JPAFieldSpin = .data:0x803BE620; // type:object size:0x14 scope:global align:4 __vt__12JPAFieldDrag = .data:0x803BE634; // type:object size:0x14 scope:global align:4 __vt__14JPAFieldRandom = .data:0x803BE648; // type:object size:0x14 scope:global align:4 @@ -19845,18 +19869,18 @@ __vt__Q26JStage6TLight = .data:0x803BE8B8; // type:object size:0x6C scope:global __vt__Q26JStage7TObject = .data:0x803BE928; // type:object size:0x3C scope:global align:4 __vt__Q26JStage7TSystem = .data:0x803BE968; // type:object size:0x50 scope:global align:4 __vt__Q37JStudio3ctb6TParse = .data:0x803BE9B8; // type:object size:0x14 scope:global align:4 -__vt__Q37JGadget6binary19TParse_header_block = .data:0x803BE9CC; // type:object size:0x14 scope:global align:4 +__vt__Q37JGadget6binary19TParse_header_block = .data:0x803BE9CC; // type:object size:0x14 scope:weak align:4 __vt__Q37JStudio3ctb8TFactory = .data:0x803BE9E0; // type:object size:0x14 scope:global align:4 __vt__Q37JStudio3ctb8TControl = .data:0x803BE9F4; // type:object size:0xC scope:global align:4 __vt__Q37JStudio3ctb14TObject_TxyzRy = .data:0x803BEA00; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio3ctb7TObject = .data:0x803BEA10; // type:object size:0x10 scope:global align:4 +__vt__Q37JStudio3ctb7TObject = .data:0x803BEA10; // type:object size:0x10 scope:weak align:4 __vt__Q27JStudio22TFunctionValue_hermite = .data:0x803BEA20; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio29TFunctionValue_list_parameter = .data:0x803BEA40; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio19TFunctionValue_list = .data:0x803BEA60; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio25TFunctionValue_transition = .data:0x803BEA80; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio23TFunctionValue_constant = .data:0x803BEAA0; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio24TFunctionValue_composite = .data:0x803BEAC0; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TFunctionValue = .data:0x803BEAE0; // type:object size:0x20 scope:global align:4 +__vt__Q27JStudio14TFunctionValue = .data:0x803BEAE0; // type:object size:0x20 scope:weak align:4 @838 = .data:0x803BEB00; // type:object size:0x5C scope:local align:4 __vt__Q37JStudio3fvb6TParse = .data:0x803BEB5C; // type:object size:0x14 scope:global align:4 __vt__Q37JStudio3fvb8TFactory = .data:0x803BEB70; // type:object size:0x14 scope:global align:4 @@ -19867,7 +19891,7 @@ __vt__Q37JStudio3fvb12TObject_list = .data:0x803BEBB0; // type:object size:0x10 __vt__Q37JStudio3fvb18TObject_transition = .data:0x803BEBC0; // type:object size:0x10 scope:global align:4 __vt__Q37JStudio3fvb16TObject_constant = .data:0x803BEBD0; // type:object size:0x10 scope:global align:4 __vt__Q37JStudio3fvb17TObject_composite = .data:0x803BEBE0; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio3fvb7TObject = .data:0x803BEBF0; // type:object size:0x10 scope:global align:4 +__vt__Q37JStudio3fvb7TObject = .data:0x803BEBF0; // type:object size:0x10 scope:weak align:4 __vt__Q27JStudio6TParse = .data:0x803BEC00; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio8TFactory = .data:0x803BEC20; // type:object size:0x14 scope:global align:4 __vt__Q27JStudio8TControl = .data:0x803BEC34; // type:object size:0xC scope:global align:4 @@ -19938,33 +19962,33 @@ __vt__Q27JStudio8TControl = .data:0x803BEC34; // type:object size:0xC scope:glob @1800 = .data:0x803BF364; // type:object size:0xC scope:local align:4 @1831 = .data:0x803BF370; // type:object size:0x10C scope:local align:4 __vt__Q27JStudio13TObject_sound = .data:0x803BF47C; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TAdaptor_sound = .data:0x803BF49C; // type:object size:0x50 scope:global align:4 +__vt__Q27JStudio14TAdaptor_sound = .data:0x803BF49C; // type:object size:0x50 scope:weak align:4 __vt__Q27JStudio16TObject_particle = .data:0x803BF4EC; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio17TAdaptor_particle = .data:0x803BF50C; // type:object size:0x4C scope:global align:4 +__vt__Q27JStudio17TAdaptor_particle = .data:0x803BF50C; // type:object size:0x4C scope:weak align:4 __vt__Q27JStudio15TObject_message = .data:0x803BF558; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio13TObject_light = .data:0x803BF59C; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TAdaptor_light = .data:0x803BF5BC; // type:object size:0x28 scope:global align:4 +__vt__Q27JStudio14TAdaptor_light = .data:0x803BF5BC; // type:object size:0x28 scope:weak align:4 __vt__Q27JStudio11TObject_fog = .data:0x803BF5E4; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio12TAdaptor_fog = .data:0x803BF604; // type:object size:0x20 scope:global align:4 +__vt__Q27JStudio12TAdaptor_fog = .data:0x803BF604; // type:object size:0x20 scope:weak align:4 __vt__Q27JStudio14TObject_camera = .data:0x803BF624; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio15TAdaptor_camera = .data:0x803BF644; // type:object size:0x3C scope:global align:4 +__vt__Q27JStudio15TAdaptor_camera = .data:0x803BF644; // type:object size:0x3C scope:weak align:4 __vt__Q27JStudio20TObject_ambientLight = .data:0x803BF680; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio21TAdaptor_ambientLight = .data:0x803BF6A0; // type:object size:0x20 scope:global align:4 +__vt__Q27JStudio21TAdaptor_ambientLight = .data:0x803BF6A0; // type:object size:0x20 scope:weak align:4 __vt__Q27JStudio13TObject_actor = .data:0x803BF6C0; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TAdaptor_actor = .data:0x803BF6E0; // type:object size:0x50 scope:global align:4 +__vt__Q27JStudio14TAdaptor_actor = .data:0x803BF6E0; // type:object size:0x50 scope:weak align:4 __vt__Q27JStudio7TObject = .data:0x803BF730; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio8TAdaptor = .data:0x803BF750; // type:object size:0x20 scope:global align:4 __vt__Q37JStudio14TVariableValue13TOutput_none_ = .data:0x803BF770; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio14TVariableValue7TOutput = .data:0x803BF780; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803BF790; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_ = .data:0x803BF7A0; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803BF7B0; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_ = .data:0x803BF7C0; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803BF7D0; // type:object size:0x10 scope:global align:4 +__vt__Q37JStudio14TVariableValue7TOutput = .data:0x803BF780; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803BF790; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_ = .data:0x803BF7A0; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803BF7B0; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_ = .data:0x803BF7C0; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803BF7D0; // type:object size:0x10 scope:weak align:4 __vt__Q37JStudio3stb6TParse = .data:0x803BF7E0; // type:object size:0x20 scope:global align:4 __vt__Q37JStudio3stb8TFactory = .data:0x803BF800; // type:object size:0x14 scope:global align:4 __vt__Q37JStudio3stb8TControl = .data:0x803BF814; // type:object size:0xC scope:global align:4 -__vt__Q37JStudio3stb15TObject_control = .data:0x803BF820; // type:object size:0x20 scope:global align:4 +__vt__Q37JStudio3stb15TObject_control = .data:0x803BF820; // type:object size:0x20 scope:weak align:4 __vt__Q37JStudio3stb7TObject = .data:0x803BF840; // type:object size:0x20 scope:global align:4 __vt__Q214JStudio_JStage13TCreateObject = .data:0x803BF860; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BF870; // type:label scope:local align:4 @@ -19981,7 +20005,7 @@ __vt__Q214JStudio_JStage13TCreateObject = .data:0x803BF860; // type:object size: @1098 = .data:0x803BF8E8; // type:object size:0xC scope:local align:4 __vt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_ = .data:0x803BF8F4; // type:object size:0x10 scope:global align:4 __vt__Q214JStudio_JStage14TAdaptor_actor = .data:0x803BF904; // type:object size:0x50 scope:global align:4 -__vt__Q214JStudio_JStage81TVariableValueOutput_object_ = .data:0x803BF9A4; // type:object size:0x10 scope:global align:4 +__vt__Q214JStudio_JStage81TVariableValueOutput_object_ = .data:0x803BF9A4; // type:object size:0x10 scope:weak align:4 __vt__Q214JStudio_JStage21TAdaptor_ambientLight = .data:0x803BF9C8; // type:object size:0x20 scope:global align:4 ...data.0 = .data:0x803BF9E8; // type:label scope:local align:4 @1014 = .data:0x803BF9E8; // type:object size:0xC scope:local align:4 data:4byte @@ -19993,14 +20017,14 @@ __vt__Q214JStudio_JStage21TAdaptor_ambientLight = .data:0x803BF9C8; // type:obje @1029 = .data:0x803BFA30; // type:object size:0xC scope:local align:4 @1030 = .data:0x803BFA3C; // type:object size:0xC scope:local align:4 __vt__Q214JStudio_JStage15TAdaptor_camera = .data:0x803BFA48; // type:object size:0x3C scope:global align:4 -__vt__Q214JStudio_JStage83TVariableValueOutput_object_ = .data:0x803BFAC0; // type:object size:0x10 scope:global align:4 +__vt__Q214JStudio_JStage83TVariableValueOutput_object_ = .data:0x803BFAC0; // type:object size:0x10 scope:weak align:4 ...data.0 = .data:0x803BFAE0; // type:label scope:local align:4 @844 = .data:0x803BFAE0; // type:object size:0xC scope:local align:4 data:4byte @845 = .data:0x803BFAEC; // type:object size:0xC scope:local align:4 @849 = .data:0x803BFAF8; // type:object size:0xC scope:local align:4 @850 = .data:0x803BFB04; // type:object size:0xC scope:local align:4 __vt__Q214JStudio_JStage12TAdaptor_fog = .data:0x803BFB10; // type:object size:0x20 scope:global align:4 -__vt__Q214JStudio_JStage77TVariableValueOutput_object_ = .data:0x803BFB50; // type:object size:0x10 scope:global align:4 +__vt__Q214JStudio_JStage77TVariableValueOutput_object_ = .data:0x803BFB50; // type:object size:0x10 scope:weak align:4 __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_ = .data:0x803BFB70; // type:object size:0x10 scope:global align:4 __vt__Q214JStudio_JStage14TAdaptor_light = .data:0x803BFB80; // type:object size:0x28 scope:global align:4 __vt__Q215JStudio_JAudio213TCreateObject = .data:0x803BFBA8; // type:object size:0x10 scope:global align:4 @@ -20081,29 +20105,29 @@ sExtCmdInfo__12JASSeqParser = .data:0x803C05CC; // type:object size:0xFF0 scope: __vt__12JASSeqParser = .data:0x803C1790; // type:object size:0x20 scope:global align:4 @613 = .data:0x803C17B0; // type:object size:0x34 scope:local align:4 __vt__12JASBasicBank = .data:0x803C17E8; // type:object size:0x14 scope:global align:4 -__vt__7JASBank = .data:0x803C17FC; // type:object size:0x14 scope:global align:4 +__vt__7JASBank = .data:0x803C17FC; // type:object size:0x14 scope:weak align:4 __vt__12JASVoiceBank = .data:0x803C1810; // type:object size:0x14 scope:global align:4 __vt__12JASBasicInst = .data:0x803C1828; // type:object size:0x14 scope:global align:4 -__vt__7JASInst = .data:0x803C183C; // type:object size:0x14 scope:global align:4 +__vt__7JASInst = .data:0x803C183C; // type:object size:0x14 scope:weak align:4 __vt__10JASDrumSet = .data:0x803C1850; // type:object size:0x14 scope:global align:4 __vt__Q216JASBasicWaveBank11TWaveHandle = .data:0x803C1868; // type:object size:0x14 scope:global align:4 __vt__Q216JASBasicWaveBank10TWaveGroup = .data:0x803C187C; // type:object size:0x18 scope:global align:4 -__vt__13JASWaveHandle = .data:0x803C1894; // type:object size:0x14 scope:global align:4 +__vt__13JASWaveHandle = .data:0x803C1894; // type:object size:0x14 scope:weak align:4 __vt__16JASBasicWaveBank = .data:0x803C18A8; // type:object size:0x18 scope:global align:4 -__vt__11JASWaveBank = .data:0x803C18C0; // type:object size:0x18 scope:global align:4 +__vt__11JASWaveBank = .data:0x803C18C0; // type:object size:0x18 scope:weak align:4 __vt__Q217JASSimpleWaveBank11TWaveHandle = .data:0x803C18D8; // type:object size:0x14 scope:global align:4 __vt__17JASSimpleWaveBank = .data:0x803C18EC; // type:object size:0x30 scope:global align:4 sCurrentDir__16JASWaveArcLoader = .data:0x803C1920; // type:object size:0x40 scope:global align:4 __vt__10JASWaveArc = .data:0x803C1960; // type:object size:0x18 scope:global align:4 -__vt__11JASDisposer = .data:0x803C1978; // type:object size:0x10 scope:global align:4 +__vt__11JASDisposer = .data:0x803C1978; // type:object size:0x10 scope:weak align:4 @662 = .data:0x803C1988; // type:object size:0x1C scope:local align:4 @977 = .data:0x803C19A4; // type:object size:0x20 scope:local align:4 @974 = .data:0x803C19C4; // type:object size:0x20 scope:local align:4 -table_list$151 = .data:0x803C19E8; // type:object size:0x10 scope:local align:4 +table_list = .data:0x803C19E8; // type:object size:0x10 scope:local align:4 history$267 = .data:0x803C19F8; // type:object size:0x28 scope:local align:4 data:4byte __vt__14JASAudioThread = .data:0x803C1A20; // type:object size:0x10 scope:global align:4 SEND_TABLE__6JASDsp = .data:0x803C1A30; // type:object size:0x18 scope:global align:4 -jdsp = .data:0x803C1A60; // type:object size:0x1F00 scope:global align:32 noreloc +jdsp = .data:0x803C1A60; // type:object size:0x1F00 scope:local align:32 noreloc __vt__10JAIAudible = .data:0x803C3960; // type:object size:0x14 scope:global align:4 __vt__11JAIAudience = .data:0x803C3978; // type:object size:0x20 scope:global align:4 __vt__5JAISe = .data:0x803C3998; // type:object size:0x58 scope:global align:4 @@ -20123,9 +20147,9 @@ __vt__16JAIStreamDataMgr = .data:0x803C3B5C; // type:object size:0x10 scope:glob __vt__22JAUAudioArcInterpreter = .data:0x803C3B70; // type:object size:0x44 scope:global align:4 __vt__17JAUAudioArcLoader = .data:0x803C3BB8; // type:object size:0x44 scope:global align:4 __vt__14JAUSectionHeap = .data:0x803C3C00; // type:object size:0x34 scope:global align:4 -__vt__16JAUBankTableLink = .data:0x803C3C34; // type:object size:0x14 scope:global align:4 -__vt__12JAUBankTable = .data:0x803C3C48; // type:object size:0xC scope:global align:4 -__vt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgr = .data:0x803C3C54; // type:object size:0x10 scope:global align:4 +__vt__16JAUBankTableLink = .data:0x803C3C34; // type:object size:0x14 scope:weak align:4 +__vt__12JAUBankTable = .data:0x803C3C48; // type:object size:0xC scope:weak align:4 +__vt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgr = .data:0x803C3C54; // type:object size:0x10 scope:weak align:4 __vt__10JAUSection = .data:0x803C3C64; // type:object size:0x10 scope:global align:4 __vt__27JAUSeqDataMgr_SeqCollection = .data:0x803C3C78; // type:object size:0x18 scope:global align:4 __vt__32JAUStreamDataMgr_StreamFileTable = .data:0x803C3C90; // type:object size:0x10 scope:global align:4 @@ -20138,7 +20162,7 @@ __vt__Q28JMessage10TReference = .data:0x803C3DAC; // type:object size:0x10 scope sapfnParseCharacter___Q28JMessage18TResourceContainer = .data:0x803C3DC0; // type:object size:0x14 scope:global align:4 __vt__Q28JMessage6TParse = .data:0x803C3DD4; // type:object size:0x14 scope:global align:4 __vt__Q38JMessage18TResourceContainer10TCResource = .data:0x803C3DE8; // type:object size:0x14 scope:global align:4 -__vt__Q27JGadget42TLinkList_factory = .data:0x803C3DFC; // type:object size:0x14 scope:global align:4 +__vt__Q27JGadget42TLinkList_factory = .data:0x803C3DFC; // type:object size:0x14 scope:weak align:4 __vt__16Z2AudioArcLoader = .data:0x803C3E10; // type:object size:0x44 scope:global align:4 @3690 = .data:0x803C3E58; // type:object size:0x58 scope:local align:4 __vt__10Z2SoundMgr = .data:0x803C3EB0; // type:object size:0xC scope:global align:4 @@ -20198,15 +20222,15 @@ __vt__14Z2CreatureLink = .data:0x803C5AC0; // type:object size:0x48 scope:global @5074 = .data:0x803C5D08; // type:object size:0x28 scope:local align:4 @5259 = .data:0x803C5D30; // type:object size:0x38 scope:local align:4 @5258 = .data:0x803C5D68; // type:object size:0x28 scope:local align:4 -sHowlUmakusa = .data:0x803C5D90; // type:object size:0xC scope:global align:4 -sHowlZeldaSong = .data:0x803C5D9C; // type:object size:0xC scope:global align:4 -sHowlLightPrelude = .data:0x803C5DA8; // type:object size:0xC scope:global align:4 -sHowlSoulRequiem = .data:0x803C5DB4; // type:object size:0xC scope:global align:4 -sHealingSong = .data:0x803C5DC0; // type:object size:0xC scope:global align:4 -sNewSong1 = .data:0x803C5DCC; // type:object size:0xE scope:global align:4 -sNewSong2 = .data:0x803C5DDC; // type:object size:0x10 scope:global align:4 -sNewSong3 = .data:0x803C5DEC; // type:object size:0x12 scope:global align:4 -sGuideData = .data:0x803C5E00; // type:object size:0x48 scope:global align:4 +sHowlUmakusa = .data:0x803C5D90; // type:object size:0xC scope:local align:4 +sHowlZeldaSong = .data:0x803C5D9C; // type:object size:0xC scope:local align:4 +sHowlLightPrelude = .data:0x803C5DA8; // type:object size:0xC scope:local align:4 +sHowlSoulRequiem = .data:0x803C5DB4; // type:object size:0xC scope:local align:4 +sHealingSong = .data:0x803C5DC0; // type:object size:0xC scope:local align:4 +sNewSong1 = .data:0x803C5DCC; // type:object size:0xE scope:local align:4 +sNewSong2 = .data:0x803C5DDC; // type:object size:0x10 scope:local align:4 +sNewSong3 = .data:0x803C5DEC; // type:object size:0x12 scope:local align:4 +sGuideData = .data:0x803C5E00; // type:object size:0x48 scope:local align:4 @3729 = .data:0x803C5E48; // type:object size:0x1C8 scope:local align:4 @3839 = .data:0x803C6010; // type:object size:0x54 scope:local align:4 __vt__15Z2SpeechStarter = .data:0x803C6064; // type:object size:0x14 scope:global align:4 @@ -20231,11 +20255,11 @@ __vt__13JKRAramStream = .data:0x803C62F8; // type:object size:0x10 scope:global __vt__13JKRFileLoader = .data:0x803C6308; // type:object size:0x3C scope:global align:4 __vt__12JKRDvdFinder = .data:0x803C6348; // type:object size:0x10 scope:global align:4 __vt__12JKRArcFinder = .data:0x803C6358; // type:object size:0x10 scope:global align:4 -__vt__13JKRFileFinder = .data:0x803C6368; // type:object size:0x10 scope:global align:4 +__vt__13JKRFileFinder = .data:0x803C6368; // type:object size:0x10 scope:weak align:4 __vt__12JKRFileCache = .data:0x803C6378; // type:object size:0x4C scope:global align:4 __vt__10JKRArchive = .data:0x803C63C8; // type:object size:0x50 scope:global align:4 __vt__13JKRMemArchive = .data:0x803C6418; // type:object size:0x50 scope:global align:4 -__vt__7JKRFile = .data:0x803C6468; // type:object size:0x20 scope:global align:4 +__vt__7JKRFile = .data:0x803C6468; // type:object size:0x20 scope:weak align:4 __vt__14JKRAramArchive = .data:0x803C6488; // type:object size:0x50 scope:global align:4 __vt__13JKRDvdArchive = .data:0x803C64D8; // type:object size:0x50 scope:global align:4 __vt__14JKRCompArchive = .data:0x803C6528; // type:object size:0x50 scope:global align:4 @@ -20251,17 +20275,17 @@ __vt__12JUTCacheFont = .data:0x803C6680; // type:object size:0x4C scope:global a __vt__12JUTGraphFifo = .data:0x803C66D0; // type:object size:0xC scope:global align:4 __vt__10JUTResFont = .data:0x803C66E0; // type:object size:0x4C scope:global align:4 sChannelMask__Q210JUTGamePad7CRumble = .data:0x803C6730; // type:object size:0x10 scope:global align:4 -channel_mask = .data:0x803C6740; // type:object size:0x10 scope:global align:4 +channel_mask = .data:0x803C6740; // type:object size:0x10 scope:local align:4 __vt__10JUTGamePad = .data:0x803C6750; // type:object size:0xC scope:global align:4 sMessageQueue__12JUTException = .data:0x803C6760; // type:object size:0x20 scope:global align:4 -c3bcnt = .data:0x803C6780; // type:object size:0x20 scope:global align:4 data:4byte +c3bcnt = .data:0x803C6780; // type:object size:0x20 scope:local align:4 data:4byte sCpuExpName__12JUTException = .data:0x803C67A0; // type:object size:0x44 scope:global align:4 __vt__12JUTException = .data:0x803C67E4; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803C67F8; // type:label scope:local align:4 sAsciiTable__14JUTDirectPrint = .data:0x803C67F8; // type:object size:0x80 scope:global align:4 sFontData__14JUTDirectPrint = .data:0x803C6878; // type:object size:0x100 scope:global align:4 noreloc sFontData2__14JUTDirectPrint = .data:0x803C6978; // type:object size:0x134 scope:global align:4 noreloc -twiceBit$371 = .data:0x803C6AAC; // type:object size:0x10 scope:local align:4 +twiceBit = .data:0x803C6AAC; // type:object size:0x10 scope:local align:4 __vt__8JUTVideo = .data:0x803C6AC0; // type:object size:0xC scope:global align:4 __vt__8JUTFader = .data:0x803C6AD0; // type:object size:0x18 scope:global align:4 __vt__10JUTConsole = .data:0x803C6AE8; // type:object size:0xC scope:global align:4 @@ -20292,9 +20316,9 @@ __vt__12J2DPictureEx = .data:0x803C75F8; // type:object size:0x14C scope:global __vt__12J2DTextBoxEx = .data:0x803C7748; // type:object size:0xBC scope:global align:4 __vt__20J2DAnmFullLoader_v15 = .data:0x803C7808; // type:object size:0x14 scope:global align:4 __vt__19J2DAnmKeyLoader_v15 = .data:0x803C781C; // type:object size:0x14 scope:global align:4 -__vt__12J2DAnmLoader = .data:0x803C7830; // type:object size:0x14 scope:global align:4 -__vt__20J2DAnmVisibilityFull = .data:0x803C7844; // type:object size:0x10 scope:global align:4 -__vt__14J2DAnmVtxColor = .data:0x803C7854; // type:object size:0x14 scope:global align:4 +__vt__12J2DAnmLoader = .data:0x803C7830; // type:object size:0x14 scope:weak align:4 +__vt__20J2DAnmVisibilityFull = .data:0x803C7844; // type:object size:0x10 scope:weak align:4 +__vt__14J2DAnmVtxColor = .data:0x803C7854; // type:object size:0x14 scope:weak align:4 __vt__15J2DAnmTevRegKey = .data:0x803C7868; // type:object size:0x10 scope:global align:4 __vt__16J2DAnmTexPattern = .data:0x803C7878; // type:object size:0x10 scope:global align:4 __vt__19J2DAnmTextureSRTKey = .data:0x803C7888; // type:object size:0x10 scope:global align:4 @@ -20308,12 +20332,12 @@ __vt__19J2DAnmTransformFull = .data:0x803C7914; // type:object size:0x14 scope:g @899 = .data:0x803C7928; // type:object size:0x44 scope:local align:4 @951 = .data:0x803C796C; // type:object size:0x54 scope:local align:4 c2r$1302 = .data:0x803C79C0; // type:object size:0x10 scope:local align:4 -NullTexData = .data:0x803C79E0; // type:object size:0x10 scope:global align:4 -j3dIdentityMtx = .data:0x803C79F0; // type:object size:0x30 scope:global align:4 -IndMtx = .data:0x803C7A20; // type:object size:0x18 scope:global align:4 +NullTexData = .data:0x803C79E0; // type:object size:0x10 scope:local align:4 +j3dIdentityMtx = .data:0x803C79F0; // type:object size:0x30 scope:local align:4 +IndMtx = .data:0x803C7A20; // type:object size:0x18 scope:local align:4 PSMulUnit01 = .data:0x803C7A38; // type:object size:0x8 scope:global align:4 -sDifferedRegister = .data:0x803C7A40; // type:object size:0x20 scope:global align:4 -sSizeOfDiffered = .data:0x803C7A60; // type:object size:0x20 scope:global align:4 +sDifferedRegister = .data:0x803C7A40; // type:object size:0x20 scope:local align:4 +sSizeOfDiffered = .data:0x803C7A60; // type:object size:0x20 scope:local align:4 __vt__14J3DShapePacket = .data:0x803C7A80; // type:object size:0x14 scope:global align:4 __vt__12J3DMatPacket = .data:0x803C7A94; // type:object size:0x14 scope:global align:4 __vt__13J3DDrawPacket = .data:0x803C7AA8; // type:object size:0x14 scope:global align:4 @@ -20350,11 +20374,11 @@ __vt__8J3DShape = .data:0x803C7DB8; // type:object size:0x18 scope:global align: __vt__17J3DLockedMaterial = .data:0x803C7DD0; // type:object size:0x30 scope:global align:4 __vt__18J3DPatchedMaterial = .data:0x803C7E00; // type:object size:0x30 scope:global align:4 __vt__11J3DMaterial = .data:0x803C7E30; // type:object size:0x30 scope:global align:4 -__vt__10J3DPEBlock = .data:0x803C7E60; // type:object size:0x7C scope:global align:4 -__vt__15J3DIndBlockNull = .data:0x803C7EDC; // type:object size:0x4C scope:global align:4 -__vt__11J3DIndBlock = .data:0x803C7F28; // type:object size:0x4C scope:global align:4 -__vt__14J3DTexGenBlock = .data:0x803C7F74; // type:object size:0x6C scope:global align:4 -__vt__13J3DColorBlock = .data:0x803C7FE0; // type:object size:0x90 scope:global align:4 +__vt__10J3DPEBlock = .data:0x803C7E60; // type:object size:0x7C scope:weak align:4 +__vt__15J3DIndBlockNull = .data:0x803C7EDC; // type:object size:0x4C scope:weak align:4 +__vt__11J3DIndBlock = .data:0x803C7F28; // type:object size:0x4C scope:weak align:4 +__vt__14J3DTexGenBlock = .data:0x803C7F74; // type:object size:0x6C scope:weak align:4 +__vt__13J3DColorBlock = .data:0x803C7FE0; // type:object size:0x90 scope:weak align:4 @5062 = .data:0x803C8070; // type:object size:0x30 scope:local align:4 @5110 = .data:0x803C80A0; // type:object size:0x30 scope:local align:4 @5150 = .data:0x803C80D0; // type:object size:0x30 scope:local align:4 @@ -20396,43 +20420,43 @@ sortFuncTable__13J3DDrawBuffer = .data:0x803C8D70; // type:object size:0x48 scop drawFuncTable__13J3DDrawBuffer = .data:0x803C8DD0; // type:object size:0x18 scope:global align:4 data:4byte @871 = .data:0x803C8DE8; // type:object size:0x4C scope:local align:4 __vt__12J3DJointTree = .data:0x803C8E34; // type:object size:0x10 scope:global align:4 -__vt__13J3DShapeTable = .data:0x803C8E48; // type:object size:0xC scope:global align:4 -__vt__12J3DModelData = .data:0x803C8E54; // type:object size:0xC scope:global align:4 +__vt__13J3DShapeTable = .data:0x803C8E48; // type:object size:0xC scope:weak align:4 +__vt__12J3DModelData = .data:0x803C8E54; // type:object size:0xC scope:weak align:4 __vt__8J3DModel = .data:0x803C8E60; // type:object size:0x24 scope:global align:4 -__vt__12J3DMtxBuffer = .data:0x803C8E84; // type:object size:0xC scope:global align:4 -__vt__16J3DAnmTexPattern = .data:0x803C8E90; // type:object size:0x10 scope:global align:4 -__vt__15J3DAnmTevRegKey = .data:0x803C8EA0; // type:object size:0x10 scope:global align:4 +__vt__12J3DMtxBuffer = .data:0x803C8E84; // type:object size:0xC scope:weak align:4 +__vt__16J3DAnmTexPattern = .data:0x803C8E90; // type:object size:0x10 scope:weak align:4 +__vt__15J3DAnmTevRegKey = .data:0x803C8EA0; // type:object size:0x10 scope:weak align:4 __vt__14J3DAnmColorKey = .data:0x803C8EB0; // type:object size:0x14 scope:global align:4 __vt__15J3DAnmColorFull = .data:0x803C8EC4; // type:object size:0x14 scope:global align:4 -__vt__11J3DAnmColor = .data:0x803C8ED8; // type:object size:0x14 scope:global align:4 +__vt__11J3DAnmColor = .data:0x803C8ED8; // type:object size:0x14 scope:weak align:4 __vt__17J3DAnmVtxColorKey = .data:0x803C8EEC; // type:object size:0x14 scope:global align:4 __vt__18J3DAnmVtxColorFull = .data:0x803C8F00; // type:object size:0x14 scope:global align:4 -__vt__14J3DAnmVtxColor = .data:0x803C8F14; // type:object size:0x14 scope:global align:4 +__vt__14J3DAnmVtxColor = .data:0x803C8F14; // type:object size:0x14 scope:weak align:4 __vt__16J3DAnmClusterKey = .data:0x803C8F28; // type:object size:0x14 scope:global align:4 -__vt__13J3DAnmCluster = .data:0x803C8F3C; // type:object size:0x14 scope:global align:4 +__vt__13J3DAnmCluster = .data:0x803C8F3C; // type:object size:0x14 scope:weak align:4 __vt__17J3DAnmClusterFull = .data:0x803C8F50; // type:object size:0x14 scope:global align:4 -__vt__19J3DAnmTextureSRTKey = .data:0x803C8F64; // type:object size:0x10 scope:global align:4 +__vt__19J3DAnmTextureSRTKey = .data:0x803C8F64; // type:object size:0x10 scope:weak align:4 __vt__27J3DAnmTransformFullWithLerp = .data:0x803C8F74; // type:object size:0x14 scope:global align:4 __vt__19J3DAnmTransformFull = .data:0x803C8F88; // type:object size:0x14 scope:global align:4 __vt__14J3DMaterialAnm = .data:0x803C8FA0; // type:object size:0x10 scope:global align:4 __vt__13J3DSkinDeform = .data:0x803C8FB0; // type:object size:0x10 scope:global align:4 __vt__16J3DMaterialTable = .data:0x803C8FC0; // type:object size:0xC scope:global align:4 -__vt__14J3DPEBlockNull = .data:0x803C8FD0; // type:object size:0x7C scope:global align:4 -__vt__15J3DTevBlockNull = .data:0x803C904C; // type:object size:0xDC scope:global align:4 -__vt__18J3DTexGenBlockNull = .data:0x803C9128; // type:object size:0x6C scope:global align:4 -__vt__17J3DColorBlockNull = .data:0x803C9194; // type:object size:0x90 scope:global align:4 +__vt__14J3DPEBlockNull = .data:0x803C8FD0; // type:object size:0x7C scope:weak align:4 +__vt__15J3DTevBlockNull = .data:0x803C904C; // type:object size:0xDC scope:weak align:4 +__vt__18J3DTexGenBlockNull = .data:0x803C9128; // type:object size:0x6C scope:weak align:4 +__vt__17J3DColorBlockNull = .data:0x803C9194; // type:object size:0x90 scope:weak align:4 __vt__20J3DClusterLoader_v15 = .data:0x803C9228; // type:object size:0x10 scope:global align:4 -__vt__16J3DClusterLoader = .data:0x803C9238; // type:object size:0x10 scope:global align:4 +__vt__16J3DClusterLoader = .data:0x803C9238; // type:object size:0x10 scope:weak align:4 __vt__18J3DModelLoader_v21 = .data:0x803C9248; // type:object size:0x44 scope:global align:4 __vt__18J3DModelLoader_v26 = .data:0x803C928C; // type:object size:0x44 scope:global align:4 -__vt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage> = .data:0x803C92D0; // type:object size:0x2C scope:global align:4 -__vt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic> = .data:0x803C92FC; // type:object size:0x2C scope:global align:4 -__vt__10J3DTexture = .data:0x803C9328; // type:object size:0xC scope:global align:4 +__vt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage> = .data:0x803C92D0; // type:object size:0x2C scope:weak align:4 +__vt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic> = .data:0x803C92FC; // type:object size:0x2C scope:weak align:4 +__vt__10J3DTexture = .data:0x803C9328; // type:object size:0xC scope:weak align:4 __vt__14J3DModelLoader = .data:0x803C9334; // type:object size:0x44 scope:global align:4 __vt__19J3DAnmKeyLoader_v15 = .data:0x803C9378; // type:object size:0x14 scope:global align:4 __vt__20J3DAnmFullLoader_v15 = .data:0x803C938C; // type:object size:0x14 scope:global align:4 -__vt__12J3DAnmLoader = .data:0x803C93A0; // type:object size:0x14 scope:global align:4 -__vt__20J3DAnmVisibilityFull = .data:0x803C93B4; // type:object size:0x10 scope:global align:4 +__vt__12J3DAnmLoader = .data:0x803C93A0; // type:object size:0x14 scope:weak align:4 +__vt__20J3DAnmVisibilityFull = .data:0x803C93B4; // type:object size:0x10 scope:weak align:4 ...data.0 = .data:0x803C93C8; // type:label scope:local align:4 @1 = .data:0x803C93C8; // type:object size:0x44 scope:local align:4 data:string @105 = .data:0x803C940C; // type:object size:0xD scope:local align:4 data:string @@ -20448,13 +20472,13 @@ __vt__20J3DAnmVisibilityFull = .data:0x803C93B4; // type:object size:0x10 scope: @115 = .data:0x803C94A8; // type:object size:0x19 scope:local align:4 data:string @117 = .data:0x803C94C4; // type:object size:0xE scope:local align:4 data:string @118 = .data:0x803C94D4; // type:object size:0x15 scope:local align:4 data:string -__OSExceptionLocations = .data:0x803C94EC; // type:object size:0x3C scope:global align:4 +__OSExceptionLocations = .data:0x803C94EC; // type:object size:0x3C scope:local align:4 @152 = .data:0x803C9528; // type:object size:0x1B scope:local align:4 data:string @153 = .data:0x803C9544; // type:object size:0x2E scope:local align:4 data:string @154 = .data:0x803C9574; // type:object size:0x2F scope:local align:4 data:string @155 = .data:0x803C95A4; // type:object size:0x1B scope:local align:4 data:string ResetFunctionInfo = .data:0x803C95C0; // type:object size:0x10 scope:local align:4 -DSPInitCode = .data:0x803C95D0; // type:object size:0x80 scope:global align:4 +DSPInitCode = .data:0x803C95D0; // type:object size:0x80 scope:local align:4 ...data.0 = .data:0x803C9650; // type:label scope:local align:4 @63 = .data:0x803C9650; // type:object size:0x29 scope:local align:4 data:string @84 = .data:0x803C967C; // type:object size:0x18 scope:local align:4 data:string @@ -20502,9 +20526,9 @@ DSPInitCode = .data:0x803C95D0; // type:object size:0x80 scope:global align:4 @86 = .data:0x803C9CFC; // type:object size:0x35 scope:local align:4 data:string @87 = .data:0x803C9D34; // type:object size:0x40 scope:local align:4 @115 = .data:0x803C9D78; // type:object size:0xB scope:local align:4 data:string -HankakuToCode = .data:0x803C9D88; // type:object size:0x180 scope:global align:4 -Zenkaku2Code = .data:0x803C9F08; // type:object size:0x98A scope:global align:4 -InterruptPrioTable = .data:0x803CA898; // type:object size:0x2C scope:global align:4 data:4byte +HankakuToCode = .data:0x803C9D88; // type:object size:0x180 scope:local align:4 +Zenkaku2Code = .data:0x803C9F08; // type:object size:0x98A scope:local align:4 +InterruptPrioTable = .data:0x803CA898; // type:object size:0x2C scope:local align:4 data:4byte @62 = .data:0x803CA8C8; // type:object size:0x25 scope:local align:4 data:string @189 = .data:0x803CA8F0; // type:object size:0x27 scope:local align:4 data:string ResetFunctionInfo = .data:0x803CA918; // type:object size:0x10 scope:local align:4 @@ -20535,8 +20559,8 @@ ResetFunctionInfo = .data:0x803CA918; // type:object size:0x10 scope:local align @854 = .data:0x803CB098; // type:object size:0x67 scope:local align:4 data:string @855 = .data:0x803CB100; // type:object size:0x45 scope:local align:4 data:string @856 = .data:0x803CB148; // type:object size:0x3D scope:local align:4 data:string -YearDays = .data:0x803CB188; // type:object size:0x30 scope:global align:4 -LeapYearDays = .data:0x803CB1B8; // type:object size:0x30 scope:global align:4 +YearDays = .data:0x803CB188; // type:object size:0x30 scope:local align:4 +LeapYearDays = .data:0x803CB1B8; // type:object size:0x30 scope:local align:4 ...data.0 = .data:0x803CB1E8; // type:label scope:local align:4 @1 = .data:0x803CB1E8; // type:object size:0x45 scope:local align:4 data:string @473 = .data:0x803CB230; // type:object size:0xF scope:local align:4 data:string @@ -20553,7 +20577,7 @@ LeapYearDays = .data:0x803CB1B8; // type:object size:0x30 scope:global align:4 @490 = .data:0x803CB2E4; // type:object size:0xE scope:local align:4 data:string ...data.0 = .data:0x803CB2F8; // type:label scope:local align:4 @1 = .data:0x803CB2F8; // type:object size:0x44 scope:local align:4 data:string -Si = .data:0x803CB33C; // type:object size:0x14 scope:global align:4 data:4byte +Si = .data:0x803CB33C; // type:object size:0x14 scope:local align:4 data:4byte Type = .data:0x803CB350; // type:object size:0x10 scope:local align:4 @457 = .data:0x803CB360; // type:object size:0xC scope:local align:4 data:string @459 = .data:0x803CB36C; // type:object size:0xF scope:local align:4 data:string @@ -20567,8 +20591,8 @@ Type = .data:0x803CB350; // type:object size:0x10 scope:local align:4 @467 = .data:0x803CB3F4; // type:object size:0x9 scope:local align:4 data:string @468 = .data:0x803CB400; // type:object size:0x9 scope:local align:4 data:string ...data.0 = .data:0x803CB410; // type:label scope:local align:4 -XYNTSC = .data:0x803CB410; // type:object size:0x30 scope:global align:4 -XYPAL = .data:0x803CB440; // type:object size:0x30 scope:global align:4 +XYNTSC = .data:0x803CB410; // type:object size:0x30 scope:local align:4 +XYPAL = .data:0x803CB440; // type:object size:0x30 scope:local align:4 @16 = .data:0x803CB470; // type:object size:0x33 scope:local align:4 data:string @9 = .data:0x803CB4A8; // type:object size:0x18 scope:local align:4 data:string @119 = .data:0x803CB4C0; // type:object size:0xC8 scope:local align:4 data:string @@ -20581,11 +20605,11 @@ XYPAL = .data:0x803CB440; // type:object size:0x30 scope:global align:4 @18 = .data:0x803CB6A8; // type:object size:0xA scope:local align:4 data:string @24 = .data:0x803CB6B4; // type:object size:0x34 scope:local align:4 data:string @359 = .data:0x803CB6E8; // type:object size:0x44 scope:local align:4 -ImmCommand = .data:0x803CB72C; // type:object size:0xC scope:global align:4 data:4byte +ImmCommand = .data:0x803CB72C; // type:object size:0xC scope:local align:4 data:4byte @789 = .data:0x803CB738; // type:object size:0x41 scope:local align:4 data:string @956 = .data:0x803CB77C; // type:object size:0x34 scope:local align:4 @1060 = .data:0x803CB7B0; // type:object size:0x34 scope:local align:4 -ErrorTable = .data:0x803CB7E8; // type:object size:0x48 scope:global align:4 data:4byte +ErrorTable = .data:0x803CB7E8; // type:object size:0x48 scope:local align:4 data:4byte ...data.0 = .data:0x803CB830; // type:label scope:local align:4 @38 = .data:0x803CB830; // type:object size:0x1A scope:local align:4 data:string @39 = .data:0x803CB84C; // type:object size:0x16 scope:local align:4 data:string @@ -20594,8 +20618,8 @@ ErrorTable = .data:0x803CB7E8; // type:object size:0x48 scope:global align:4 dat @44 = .data:0x803CB88C; // type:object size:0x14 scope:local align:4 data:string ...data.0 = .data:0x803CB8A0; // type:label scope:local align:4 @1 = .data:0x803CB8A0; // type:object size:0x44 scope:local align:4 data:string -timing = .data:0x803CB8E4; // type:object size:0x17C scope:global align:4 -taps = .data:0x803CBA60; // type:object size:0x32 scope:global align:4 +timing = .data:0x803CB8E4; // type:object size:0x17C scope:local align:4 +taps = .data:0x803CBA60; // type:object size:0x32 scope:local align:4 @101 = .data:0x803CBA94; // type:object size:0x7C scope:local align:4 @355 = .data:0x803CBB10; // type:object size:0x29 scope:local align:4 data:string @356 = .data:0x803CBB3C; // type:object size:0x29 scope:local align:4 data:string @@ -20630,16 +20654,16 @@ ResetFunctionInfo = .data:0x803CBCD0; // type:object size:0x10 scope:local align ...data.0 = .data:0x803CBF78; // type:label scope:local align:4 @1 = .data:0x803CBF78; // type:object size:0x46 scope:local align:4 data:string ResetFunctionInfo = .data:0x803CBFC0; // type:object size:0x10 scope:local align:4 -CardData = .data:0x803CBFE0; // type:object size:0x160 scope:global align:32 -SectorSizeTable = .data:0x803CC140; // type:object size:0x20 scope:global align:4 -LatencyTable = .data:0x803CC160; // type:object size:0x20 scope:global align:4 +CardData = .data:0x803CBFE0; // type:object size:0x160 scope:local align:32 +SectorSizeTable = .data:0x803CC140; // type:object size:0x20 scope:local align:4 +LatencyTable = .data:0x803CC160; // type:object size:0x20 scope:local align:4 ...data.0 = .data:0x803CC180; // type:label scope:local align:4 @1 = .data:0x803CC180; // type:object size:0x44 scope:local align:4 data:string -DefaultTexData = .data:0x803CC1E0; // type:object size:0x20 scope:global align:32 -GXDefaultVATList = .data:0x803CC200; // type:object size:0xD0 scope:global align:4 -GXDefaultProjData = .data:0x803CC2D0; // type:object size:0x1C scope:global align:4 -GXTexRegionAddrTable = .data:0x803CC2EC; // type:object size:0xC0 scope:global align:4 data:4byte -GXResetFuncInfo = .data:0x803CC3AC; // type:object size:0x10 scope:global align:4 +DefaultTexData = .data:0x803CC1E0; // type:object size:0x20 scope:local align:32 +GXDefaultVATList = .data:0x803CC200; // type:object size:0xD0 scope:local align:4 +GXDefaultProjData = .data:0x803CC2D0; // type:object size:0x1C scope:local align:4 +GXTexRegionAddrTable = .data:0x803CC2EC; // type:object size:0xC0 scope:local align:4 data:4byte +GXResetFuncInfo = .data:0x803CC3AC; // type:object size:0x10 scope:local align:4 @176 = .data:0x803CC3C0; // type:object size:0x68 scope:local align:4 @223 = .data:0x803CC428; // type:object size:0x68 scope:local align:4 @476 = .data:0x803CC490; // type:object size:0x44 scope:local align:4 @@ -20656,10 +20680,10 @@ GXEurgb60Hz480IntDf = .data:0x803CC678; // type:object size:0x3C scope:global al @145 = .data:0x803CC7CC; // type:object size:0xF4 scope:local align:4 @224 = .data:0x803CC8C0; // type:object size:0x3C scope:local align:4 ...data.0 = .data:0x803CC900; // type:label scope:local align:4 -TEVCOpTableST0 = .data:0x803CC900; // type:object size:0x14 scope:global align:4 -TEVCOpTableST1 = .data:0x803CC914; // type:object size:0x14 scope:global align:4 -TEVAOpTableST0 = .data:0x803CC928; // type:object size:0x14 scope:global align:4 -TEVAOpTableST1 = .data:0x803CC93C; // type:object size:0x14 scope:global align:4 +TEVCOpTableST0 = .data:0x803CC900; // type:object size:0x14 scope:local align:4 +TEVCOpTableST1 = .data:0x803CC914; // type:object size:0x14 scope:local align:4 +TEVAOpTableST0 = .data:0x803CC928; // type:object size:0x14 scope:local align:4 +TEVAOpTableST1 = .data:0x803CC93C; // type:object size:0x14 scope:local align:4 c2r$334 = .data:0x803CC950; // type:object size:0x24 scope:local align:4 p2f$358 = .data:0x803CC978; // type:object size:0x20 scope:local align:4 @182 = .data:0x803CC998; // type:object size:0x5C scope:local align:4 @@ -20679,24 +20703,24 @@ __upper_map = .data:0x803CCF58; // type:object size:0x100 scope:global align:4 @499 = .data:0x803CD340; // type:object size:0x1C scope:local align:4 @536 = .data:0x803CD35C; // type:object size:0x1C scope:local align:4 gTRKRestoreFlags = .data:0x803CD378; // type:object size:0x9 scope:global align:4 data:byte -gTRKExceptionStatus = .data:0x803CD384; // type:object size:0x10 scope:global align:4 data:4byte -gTRKStepStatus = .data:0x803CD394; // type:object size:0x14 scope:global align:4 data:4byte -TRK_ISR_OFFSETS = .data:0x803CD3A8; // type:object size:0x3C scope:global align:4 data:4byte +gTRKExceptionStatus = .data:0x803CD384; // type:object size:0x10 scope:local align:4 data:4byte +gTRKStepStatus = .data:0x803CD394; // type:object size:0x14 scope:local align:4 data:4byte +TRK_ISR_OFFSETS = .data:0x803CD3A8; // type:object size:0x3C scope:local align:4 data:4byte gDBCommTable = .data:0x803CD3E8; // type:object size:0x28 scope:global align:4 data:4byte ...bss.0 = .bss:0x803CD420; // type:label scope:local align:4 -RootHeapCheck = .bss:0x803CD420; // type:object size:0x28 scope:global align:4 data:4byte -SystemHeapCheck = .bss:0x803CD448; // type:object size:0x28 scope:global align:4 data:4byte -ZeldaHeapCheck = .bss:0x803CD470; // type:object size:0x28 scope:global align:4 data:4byte -GameHeapCheck = .bss:0x803CD498; // type:object size:0x28 scope:global align:4 data:4byte -ArchiveHeapCheck = .bss:0x803CD4C0; // type:object size:0x28 scope:global align:4 data:4byte -J2dHeapCheck = .bss:0x803CD4E8; // type:object size:0x28 scope:global align:4 data:4byte -HostioHeapCheck = .bss:0x803CD510; // type:object size:0x28 scope:global align:4 data:4byte -CommandHeapCheck = .bss:0x803CD538; // type:object size:0x28 scope:global align:4 data:4byte -mainThreadStack = .bss:0x803CD560; // type:object size:0x8000 scope:global align:4 -mainThread = .bss:0x803D5560; // type:object size:0x318 scope:global align:4 -mDoPrintf_FiberStack = .bss:0x803D5880; // type:object size:0x800 scope:global align:32 +RootHeapCheck = .bss:0x803CD420; // type:object size:0x28 scope:local align:4 data:4byte +SystemHeapCheck = .bss:0x803CD448; // type:object size:0x28 scope:local align:4 data:4byte +ZeldaHeapCheck = .bss:0x803CD470; // type:object size:0x28 scope:local align:4 data:4byte +GameHeapCheck = .bss:0x803CD498; // type:object size:0x28 scope:local align:4 data:4byte +ArchiveHeapCheck = .bss:0x803CD4C0; // type:object size:0x28 scope:local align:4 data:4byte +J2dHeapCheck = .bss:0x803CD4E8; // type:object size:0x28 scope:local align:4 data:4byte +HostioHeapCheck = .bss:0x803CD510; // type:object size:0x28 scope:local align:4 data:4byte +CommandHeapCheck = .bss:0x803CD538; // type:object size:0x28 scope:local align:4 data:4byte +mainThreadStack = .bss:0x803CD560; // type:object size:0x8000 scope:local align:4 +mainThread = .bss:0x803D5560; // type:object size:0x318 scope:local align:4 +mDoPrintf_FiberStack = .bss:0x803D5880; // type:object size:0x800 scope:local align:32 @3620 = .bss:0x803D6080; // type:object size:0xC scope:local align:4 -g_mDoAud_zelAudio = .bss:0x803D608C; // type:object size:0x138C scope:global align:4 +g_mDoAud_zelAudio = .bss:0x803D608C; // type:object size:0x138C scope:local align:4 m_gamePad__8mDoCPd_c = .bss:0x803D7418; // type:object size:0x10 scope:global align:4 data:4byte m_cpadInfo__8mDoCPd_c = .bss:0x803D7428; // type:object size:0x100 scope:global align:4 data:float mFrameBufferTexObj__13mDoGph_gInf_c = .bss:0x803D7528; // type:object size:0x20 scope:global align:4 @@ -20708,24 +20732,25 @@ now__14mDoMtx_stack_c = .bss:0x803D75B0; // type:object size:0x30 scope:global a buffer__14mDoMtx_stack_c = .bss:0x803D75E0; // type:object size:0x300 scope:global align:4 @4048 = .bss:0x803D78E0; // type:object size:0xC scope:local align:4 @4078 = .bss:0x803D78EC; // type:object size:0xC scope:local align:4 -mDoMtx_quatStack = .bss:0x803D78F8; // type:object size:0x11C scope:global align:4 +mDoMtx_quatStack = .bss:0x803D78F8; // type:object size:0x11C scope:local align:4 @3727 = .bss:0x803D7A18; // type:object size:0xC scope:local align:4 mClipper__14mDoLib_clipper = .bss:0x803D7A24; // type:object size:0x5C scope:global align:4 data:4byte ...bss.0 = .bss:0x803D7A80; // type:label scope:local align:4 l_thread__9mDoDvdThd = .bss:0x803D7A80; // type:object size:0x318 scope:global align:4 l_threadStack__9mDoDvdThd = .bss:0x803D7DA0; // type:object size:0x1000 scope:global align:4 l_param__9mDoDvdThd = .bss:0x803D8DA0; // type:object size:0x48 scope:global align:4 +padding = .bss:0x803D8DE8; // type:object size:0x18 scope:local ...bss.0 = .bss:0x803D8E00; // type:label scope:local align:4 -DvdErr_thread = .bss:0x803D8E00; // type:object size:0x318 scope:global align:4 -DvdErr_stack = .bss:0x803D9120; // type:object size:0xC00 scope:global align:4 +DvdErr_thread = .bss:0x803D8E00; // type:object size:0x318 scope:local align:4 +DvdErr_stack = .bss:0x803D9120; // type:object size:0xC00 scope:local align:4 Alarm = .bss:0x803D9D20; // type:object size:0x28 scope:local align:4 -MemCardStack = .bss:0x803D9D60; // type:object size:0x1000 scope:global align:4 -MemCardThread = .bss:0x803DAD60; // type:object size:0x318 scope:global align:4 -MemCardWorkArea0 = .bss:0x803DB080; // type:object size:0xA000 scope:global align:32 +MemCardStack = .bss:0x803D9D60; // type:object size:0x1000 scope:local align:4 +MemCardThread = .bss:0x803DAD60; // type:object size:0x318 scope:local align:4 +MemCardWorkArea0 = .bss:0x803DB080; // type:object size:0xA000 scope:local align:32 g_mDoMemCd_control = .bss:0x803E5080; // type:object size:0x2000 scope:global align:4 -sTmpBuf = .bss:0x803E7080; // type:object size:0x4000 scope:global align:4 data:4byte +sTmpBuf = .bss:0x803E7080; // type:object size:0x4000 scope:local align:4 data:4byte @3741 = .bss:0x803EB080; // type:object size:0xC scope:local align:4 -DMC = .bss:0x803EB090; // type:object size:0xC60 scope:global align:4 +DMC = .bss:0x803EB090; // type:object size:0xC60 scope:local align:4 @3691 = .bss:0x803EBCF0; // type:object size:0xC scope:local align:4 g_HIO = .bss:0x803EBCFC; // type:object size:0x40 scope:global align:4 ...bss.0 = .bss:0x803EBD40; // type:label scope:local align:4 @@ -20742,22 +20767,22 @@ mGndCheck__11fopAcM_gc_c = .bss:0x803EBE04; // type:object size:0x54 scope:globa mRoofCheck__11fopAcM_rc_c = .bss:0x803EBE64; // type:object size:0x50 scope:global align:4 @6519 = .bss:0x803EBEB4; // type:object size:0xC scope:local align:4 mWaterCheck__11fopAcM_wt_c = .bss:0x803EBEC0; // type:object size:0x54 scope:global align:4 -l_fopCamM_id = .bss:0x803EBF18; // type:object size:0x10 scope:global align:4 -l_fopOvlpM_Request = .bss:0x803EBF28; // type:object size:0x28 scope:global align:4 +l_fopCamM_id = .bss:0x803EBF18; // type:object size:0x10 scope:local align:4 +l_fopOvlpM_Request = .bss:0x803EBF28; // type:object size:0x28 scope:local align:4 lists$2216 = .bss:0x803EBF50; // type:object size:0x2EE0 scope:local align:4 -l_fpcLn_Line = .bss:0x803EEE30; // type:object size:0xC0 scope:global align:4 +l_fpcLn_Line = .bss:0x803EEE30; // type:object size:0xC0 scope:local align:4 rootlayer$3716 = .bss:0x803EEEF0; // type:object size:0x2C scope:local align:4 queue$3717 = .bss:0x803EEF1C; // type:object size:0x78 scope:local align:4 -l_fpcPi_Queue = .bss:0x803EEF98; // type:object size:0xC scope:global align:4 +l_fpcPi_Queue = .bss:0x803EEF98; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x803EEFA8; // type:label scope:local align:4 @3926 = .bss:0x803EEFA8; // type:object size:0xC scope:local align:4 -DoorInfo = .bss:0x803EEFB4; // type:object size:0x904 scope:global align:4 data:4byte +DoorInfo = .bss:0x803EEFB4; // type:object size:0x904 scope:local align:4 data:4byte @3981 = .bss:0x803EF8B8; // type:object size:0xC scope:local align:4 -l_RoomKeepDoorInfo = .bss:0x803EF8C4; // type:object size:0x904 scope:global align:4 data:4byte +l_RoomKeepDoorInfo = .bss:0x803EF8C4; // type:object size:0x904 scope:local align:4 data:4byte @5376 = .bss:0x803F01C8; // type:object size:0xC scope:local align:4 mStatus__20dStage_roomControl_c = .bss:0x803F01D4; // type:object size:0x10100 scope:global align:4 data:4byte mDemoArcName__20dStage_roomControl_c = .bss:0x804002D4; // type:object size:0xA scope:global align:4 data:byte -dComIfG_mTimerInfo = .bss:0x804002E0; // type:object size:0x14 scope:global align:4 data:4byte +dComIfG_mTimerInfo = .bss:0x804002E0; // type:object size:0x14 scope:local align:4 data:4byte @5065 = .bss:0x804002F4; // type:object size:0xC scope:local align:4 g_dComIfG_gameInfo = .bss:0x80400300; // type:object size:0x1DE10 scope:global align:4 data:2byte buf$7371 = .bss:0x8041E110; // type:object size:0x20 scope:local align:4 @@ -20786,12 +20811,14 @@ m_texObjAgg__8dMpath_n = .bss:0x8041E7C4; // type:object size:0x1C scope:global map_tool_name$4449 = .bss:0x8041E7E0; // type:object size:0x11 scope:local align:4 map_tool_name$4498 = .bss:0x8041E7F4; // type:object size:0x11 scope:local align:4 map_tool_name$4511 = .bss:0x8041E808; // type:object size:0x11 scope:local align:4 -l_startAction = .bss:0x8041E820; // type:object size:0x18 scope:global align:4 data:4byte -l_runAction = .bss:0x8041E838; // type:object size:0x18 scope:global align:4 data:4byte +l_startAction = .bss:0x8041E820; // type:object size:0x18 scope:local align:4 data:4byte +l_runAction = .bss:0x8041E838; // type:object size:0x18 scope:local align:4 data:4byte ...bss.0 = .bss:0x8041E850; // type:label scope:local align:4 @4053 = .bss:0x8041E850; // type:object size:0xC scope:local align:4 @4054 = .bss:0x8041E85C; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x8041E85C; // type:label scope:local pos$4424 = .bss:0x8041E868; // type:object size:0xC scope:local align:4 data:float +...bss.0 = .bss:0x8041E868; // type:label scope:local @4723 = .bss:0x8041E874; // type:object size:0xC scope:local align:4 @4724 = .bss:0x8041E880; // type:object size:0xC scope:local align:4 @4725 = .bss:0x8041E88C; // type:object size:0xC scope:local align:4 @@ -20855,9 +20882,9 @@ l_wcsbuf = .bss:0x8041F0D4; // type:object size:0x3F0 scope:local align:4 data:f vtx_tbl$5950 = .bss:0x8041F4C4; // type:object size:0x24 scope:local align:4 data:float ...bss.0 = .bss:0x8041F4E8; // type:label scope:local align:4 @4202 = .bss:0x8041F4E8; // type:object size:0xC scope:local align:4 -WolfAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x8041F4F4; // type:object size:0xC scope:global align:4 data:float +WolfAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x8041F4F4; // type:object size:0xC scope:local align:4 data:float @4203 = .bss:0x8041F500; // type:object size:0xC scope:local align:4 -MidnaAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x8041F50C; // type:object size:0xC scope:global align:4 data:float +MidnaAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x8041F50C; // type:object size:0xC scope:local align:4 data:float @5852 = .bss:0x8041F518; // type:object size:0xC scope:local align:4 DefaultGap$5851 = .bss:0x8041F524; // type:object size:0xC scope:local align:4 data:float @6756 = .bss:0x8041F530; // type:object size:0xC scope:local align:4 @@ -20870,7 +20897,9 @@ mTypeGroupListAll__7dTres_c = .bss:0x8041F578; // type:object size:0xCC scope:gl ...bss.0 = .bss:0x8041F648; // type:label scope:local align:4 @4409 = .bss:0x8041F648; // type:object size:0xC scope:local align:4 l_waitBaseAnime = .bss:0x8041F654; // type:object size:0xC scope:global align:4 data:float +...bss.0 = .bss:0x8041F654; // type:label scope:local @4410 = .bss:0x8041F660; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x8041F660; // type:label scope:local l_ironBallBaseAnime = .bss:0x8041F66C; // type:object size:0xC scope:global align:4 data:float @4411 = .bss:0x8041F678; // type:object size:0xC scope:local align:4 l_halfAtnWaitBaseAnime = .bss:0x8041F684; // type:object size:0xC scope:global align:4 data:float @@ -20949,7 +20978,9 @@ a_eyeOfsTbl$4079 = .bss:0x804225E8; // type:object size:0x168 scope:local align: ...bss.0 = .bss:0x80422750; // type:label scope:local align:4 @3982 = .bss:0x80422750; // type:object size:0xC scope:local align:4 l_Cd2_HIO = .bss:0x8042275C; // type:object size:0x400C scope:global align:4 +...bss.0 = .bss:0x8042275C; // type:label scope:local @4290 = .bss:0x80426768; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x80426768; // type:label scope:local @4293 = .bss:0x80426774; // type:object size:0xC scope:local align:4 @4294 = .bss:0x80426780; // type:object size:0xC scope:local align:4 @4295 = .bss:0x8042678C; // type:object size:0xC scope:local align:4 @@ -20983,33 +21014,35 @@ a_eyeOfsTbl$4289 = .bss:0x804268D0; // type:object size:0x168 scope:local align: ...bss.0 = .bss:0x80426A38; // type:label scope:local align:4 specialType__22@unnamed@d_camera_cpp@ = .bss:0x80426A38; // type:object size:0xA8 scope:global align:4 data:4byte @9808 = .bss:0x80426AE0; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x80426AE0; // type:label scope:local @14159 = .bss:0x80426AEC; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x80426AEC; // type:label scope:local @14615 = .bss:0x80426AF8; // type:object size:0xC scope:local align:4 @14964 = .bss:0x80426B04; // type:object size:0xC scope:local align:4 @14968 = .bss:0x80426B10; // type:object size:0xC scope:local align:4 @3807 = .bss:0x80426B20; // type:object size:0xC scope:local align:4 -g_fsHIO = .bss:0x80426B2C; // type:object size:0x24 scope:global align:4 +g_fsHIO = .bss:0x80426B2C; // type:object size:0x24 scope:local align:4 @3648 = .bss:0x80426B50; // type:object size:0xC scope:local align:4 @3882 = .bss:0x80426B60; // type:object size:0xC scope:local align:4 -l_HIO = .bss:0x80426B6C; // type:object size:0x1C scope:global align:4 +l_HIO = .bss:0x80426B6C; // type:object size:0x1C scope:local align:4 ...bss.0 = .bss:0x80426B88; // type:label scope:local align:4 @4112 = .bss:0x80426B88; // type:object size:0xC scope:local align:4 g_env_light = .bss:0x80426B94; // type:object size:0x1310 scope:global align:4 @4113 = .bss:0x80427EA4; // type:object size:0xC scope:local align:4 g_mEnvSeMgr = .bss:0x80427EB0; // type:object size:0x30C scope:global align:4 -lightStatusData = .bss:0x804281BC; // type:object size:0x740 scope:global align:4 data:float +lightStatusData = .bss:0x804281BC; // type:object size:0x740 scope:local align:4 data:float @7485 = .bss:0x804288FC; // type:object size:0xC scope:local align:4 S_old_cameye$7484 = .bss:0x80428908; // type:object size:0xC scope:local align:4 @7489 = .bss:0x80428914; // type:object size:0xC scope:local align:4 S_old_camctr$7488 = .bss:0x80428920; // type:object size:0xC scope:local align:4 @3816 = .bss:0x80428930; // type:object size:0xC scope:local align:4 @3818 = .bss:0x8042893C; // type:object size:0xC scope:local align:4 -l_offsetPos$localstatic3$draw__10dThunder_cFv = .bss:0x80428948; // type:object size:0xC scope:local align:4 data:float -l_scale$localstatic5$draw__10dThunder_cFv = .bss:0x80428954; // type:object size:0xC scope:local align:4 data:float +l_offsetPos$localstatic3$draw__10dThunder_cFv = .bss:0x80428948; // type:object size:0xC scope:weak align:4 data:float +l_scale$localstatic5$draw__10dThunder_cFv = .bss:0x80428954; // type:object size:0xC scope:weak align:4 data:float @3989 = .bss:0x80428960; // type:object size:0xC scope:local align:4 -g_fmHIO = .bss:0x8042896C; // type:object size:0x14 scope:global align:4 +g_fmHIO = .bss:0x8042896C; // type:object size:0x14 scope:local align:4 @3785 = .bss:0x80428980; // type:object size:0xC scope:local align:4 -g_msHIO = .bss:0x8042898C; // type:object size:0x10 scope:global align:4 +g_msHIO = .bss:0x8042898C; // type:object size:0x10 scope:local align:4 ...bss.0 = .bss:0x804289A0; // type:label scope:local align:4 @3773 = .bss:0x804289A0; // type:object size:0xC scope:local align:4 g_mwHIO = .bss:0x804289AC; // type:object size:0x130 scope:global align:4 @@ -21033,10 +21066,10 @@ g_MsgObject_HIO_c = .bss:0x8042A3CC; // type:object size:0x410 scope:global alig arcName$6105 = .bss:0x8042A7DC; // type:object size:0x16 scope:local align:4 @3640 = .bss:0x8042A7F8; // type:object size:0xC scope:local align:4 @3735 = .bss:0x8042A808; // type:object size:0xC scope:local align:4 -g_MsgScrnLight_HIO_c = .bss:0x8042A814; // type:object size:0x50 scope:global align:4 +g_MsgScrnLight_HIO_c = .bss:0x8042A814; // type:object size:0x50 scope:local align:4 @3660 = .bss:0x8042A868; // type:object size:0xC scope:local align:4 -g_nmHIO = .bss:0x8042A874; // type:object size:0x14 scope:global align:4 -static_mBounds = .bss:0x8042A888; // type:object size:0x10 scope:global align:4 data:float +g_nmHIO = .bss:0x8042A874; // type:object size:0x14 scope:local align:4 +static_mBounds = .bss:0x8042A888; // type:object size:0x10 scope:local align:4 data:float @3701 = .bss:0x8042A898; // type:object size:0xC scope:local align:4 @3822 = .bss:0x8042A8A8; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x8042A8B8; // type:label scope:local align:4 @@ -21047,7 +21080,7 @@ g_envHIO = .bss:0x8042A8DC; // type:object size:0x44 scope:global align:4 data:4 @3659 = .bss:0x8042A920; // type:object size:0xC scope:local align:4 g_save_bit_HIO = .bss:0x8042A92C; // type:object size:0x4A0 scope:global align:4 data:4byte @3644 = .bss:0x8042ADD0; // type:object size:0xC scope:local align:4 -wolfFootScale$localstatic3$create__9dkWmark_cFv = .bss:0x8042ADDC; // type:object size:0xC scope:local align:4 data:float +wolfFootScale$localstatic3$create__9dkWmark_cFv = .bss:0x8042ADDC; // type:object size:0xC scope:weak align:4 data:float @2414 = .bss:0x8042ADE8; // type:object size:0xC scope:local align:4 m_virtual_center__14cCcD_ShapeAttr = .bss:0x8042ADF4; // type:object size:0xC scope:global align:4 data:float @2492 = .bss:0x8042AE00; // type:object size:0xC scope:local align:4 @@ -21071,7 +21104,7 @@ BaseYZ__4cXyz = .bss:0x8042AEC4; // type:object size:0xC scope:global align:4 @2457 = .bss:0x8042AED0; // type:object size:0xC scope:local align:4 BaseXYZ__4cXyz = .bss:0x8042AEDC; // type:object size:0xC scope:global align:4 @262 = .bss:0x8042AEE8; // type:object size:0xC scope:local align:4 -mtx = .bss:0x8042AEF8; // type:object size:0x1E0 scope:global align:4 +mtx = .bss:0x8042AEF8; // type:object size:0x1E0 scope:local align:4 ...bss.0 = .bss:0x8042B0D8; // type:label scope:local align:4 @2401 = .bss:0x8042B0D8; // type:object size:0xC scope:local align:4 @2402 = .bss:0x8042B0E4; // type:object size:0xC scope:local align:4 @@ -21080,34 +21113,34 @@ mtx = .bss:0x8042AEF8; // type:object size:0x1E0 scope:global align:4 @2405 = .bss:0x8042B108; // type:object size:0xC scope:local align:4 @2184 = .bss:0x8042B118; // type:object size:0xC scope:local align:4 sList__8JFWAlarm = .bss:0x8042B124; // type:object size:0xC scope:global align:4 -clear_z_tobj = .bss:0x8042B130; // type:object size:0x20 scope:global align:4 +clear_z_tobj = .bss:0x8042B130; // type:object size:0x20 scope:local align:4 ...bss.0 = .bss:0x8042B150; // type:label scope:local align:4 @744 = .bss:0x8042B150; // type:object size:0xC scope:local align:4 -soovv_actor_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B15C; // type:object size:0x10 scope:global align:4 data:4byte +soovv_actor_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B15C; // type:object size:0x10 scope:local align:4 data:4byte @747 = .bss:0x8042B16C; // type:object size:0xC scope:local align:4 -soovv_actor_RELATION_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B178; // type:object size:0x10 scope:global align:4 data:4byte +soovv_actor_RELATION_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B178; // type:object size:0x10 scope:local align:4 data:4byte @750 = .bss:0x8042B188; // type:object size:0xC scope:local align:4 -soovv_camera_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B194; // type:object size:0x10 scope:global align:4 data:4byte +soovv_camera_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B194; // type:object size:0x10 scope:local align:4 data:4byte @753 = .bss:0x8042B1A4; // type:object size:0xC scope:local align:4 -soovv_camera_TARGET_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B1B0; // type:object size:0x10 scope:global align:4 data:4byte +soovv_camera_TARGET_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B1B0; // type:object size:0x10 scope:local align:4 data:4byte @756 = .bss:0x8042B1C0; // type:object size:0xC scope:local align:4 -soovv_light_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B1CC; // type:object size:0x10 scope:global align:4 data:4byte +soovv_light_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B1CC; // type:object size:0x10 scope:local align:4 data:4byte @759 = .bss:0x8042B1DC; // type:object size:0xC scope:local align:4 -soovv_particle_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B1E8; // type:object size:0x10 scope:global align:4 +soovv_particle_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B1E8; // type:object size:0x10 scope:local align:4 @762 = .bss:0x8042B1F8; // type:object size:0xC scope:local align:4 -soovv_particle_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B204; // type:object size:0x10 scope:global align:4 +soovv_particle_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B204; // type:object size:0x10 scope:local align:4 @765 = .bss:0x8042B214; // type:object size:0xC scope:local align:4 -soovv_particle_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B220; // type:object size:0x10 scope:global align:4 +soovv_particle_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B220; // type:object size:0x10 scope:local align:4 @768 = .bss:0x8042B230; // type:object size:0xC scope:local align:4 -soovv_sound_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B23C; // type:object size:0x10 scope:global align:4 +soovv_sound_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B23C; // type:object size:0x10 scope:local align:4 @771 = .bss:0x8042B24C; // type:object size:0xC scope:local align:4 -soovv_sound_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B258; // type:object size:0x10 scope:global align:4 +soovv_sound_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B258; // type:object size:0x10 scope:local align:4 @774 = .bss:0x8042B268; // type:object size:0xC scope:local align:4 -soovv_sound_CONTINUOUS___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B274; // type:object size:0x10 scope:global align:4 +soovv_sound_CONTINUOUS___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B274; // type:object size:0x10 scope:local align:4 @777 = .bss:0x8042B284; // type:object size:0xC scope:local align:4 -soovv_sound_LOCATED___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B290; // type:object size:0x10 scope:global align:4 +soovv_sound_LOCATED___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B290; // type:object size:0x10 scope:local align:4 @780 = .bss:0x8042B2A0; // type:object size:0xC scope:local align:4 -soovv_sound_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B2AC; // type:object size:0x10 scope:global align:4 +soovv_sound_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8042B2AC; // type:object size:0x10 scope:local align:4 @819 = .bss:0x8042B2BC; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x8042B2C8; // type:label scope:local align:4 @1087 = .bss:0x8042B2C8; // type:object size:0xC scope:local align:4 @@ -21150,7 +21183,7 @@ aoData$1265 = .bss:0x8042B680; // type:object size:0x90 scope:local align:4 data @313 = .bss:0x8042B710; // type:object size:0xC scope:local align:4 audioAramHeap__9JASKernel = .bss:0x8042B71C; // type:object size:0x44 scope:global align:4 sProbeTable__8JASProbe = .bss:0x8042B760; // type:object size:0x40 scope:global align:4 -sMutex = .bss:0x8042B7A0; // type:object size:0x18 scope:global align:4 +sMutex = .bss:0x8042B7A0; // type:object size:0x18 scope:local align:4 ...bss.0 = .bss:0x8042B7B8; // type:label scope:local align:4 @80 = .bss:0x8042B7B8; // type:object size:0xC scope:local align:4 sCommandListOnce__10JASPortCmd = .bss:0x8042B7C4; // type:object size:0xC scope:global align:4 @@ -21159,7 +21192,9 @@ sCommandListStay__10JASPortCmd = .bss:0x8042B7DC; // type:object size:0xC scope: ...bss.0 = .bss:0x8042B7E8; // type:label scope:local align:4 @431 = .bss:0x8042B7E8; // type:object size:0xC scope:local align:4 sDefaultBankTable__8JASTrack = .bss:0x8042B7F4; // type:object size:0x40C scope:global align:4 data:4byte +...bss.0 = .bss:0x8042B7F4; // type:label scope:local @433 = .bss:0x8042BC00; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x8042BC00; // type:label scope:local sTrackList__8JASTrack = .bss:0x8042BC0C; // type:object size:0x10 scope:global align:4 data:4byte @470 = .bss:0x8042BC1C; // type:object size:0xC scope:local align:4 @476 = .bss:0x8042BC28; // type:object size:0xC scope:local align:4 @@ -21169,7 +21204,7 @@ memPool_$localstatic3$getMemPool__43JASPoolAllocObject_MultiThreaded<8JASTrack>F @792 = .bss:0x8042BC68; // type:object size:0xC scope:local align:4 memPool_$localstatic3$getMemPool__46JASPoolAllocObject_MultiThreaded<10JASChannel>Fv = .bss:0x8042BC74; // type:object size:0x10 scope:weak align:4 @156 = .bss:0x8042BC88; // type:object size:0xC scope:local align:4 -osc$213 = .bss:0x8042BC98; // type:object size:0x18 scope:local align:4 data:float +osc$306 = .bss:0x8042BC98; // type:object size:0x18 scope:local align:4 data:float @1065 = .bss:0x8042BCB0; // type:object size:0xC scope:local align:4 memPool___46JASPoolAllocObject_MultiThreaded<10JASChannel> = .bss:0x8042BCBC; // type:object size:0x10 scope:global align:4 sBankDisposeMsgQ__10JASChannel = .bss:0x8042BCD0; // type:object size:0x20 scope:global align:4 @@ -21183,10 +21218,10 @@ sDmaDacBuffer__9JASDriver = .bss:0x8042BD98; // type:object size:0xC scope:globa sDspSyncCallback__9JASDriver = .bss:0x8042BDB8; // type:object size:0x100 scope:global align:4 sSubFrameCallback__9JASDriver = .bss:0x8042BEB8; // type:object size:0x100 scope:global align:4 sUpdateDacCallback__9JASDriver = .bss:0x8042BFB8; // type:object size:0x100 scope:global align:4 -audio_task = .bss:0x8042C0C0; // type:object size:0x50 scope:global align:32 -AUDIO_YIELD_BUFFER = .bss:0x8042C120; // type:object size:0x2000 scope:global align:32 -taskwork = .bss:0x8042E120; // type:object size:0x80 scope:global align:4 -sync_stack = .bss:0x8042E1A0; // type:object size:0x14 scope:global align:4 data:4byte +audio_task = .bss:0x8042C0C0; // type:object size:0x50 scope:local align:32 +AUDIO_YIELD_BUFFER = .bss:0x8042C120; // type:object size:0x2000 scope:local align:32 +taskwork = .bss:0x8042E120; // type:object size:0x80 scope:local align:4 +sync_stack = .bss:0x8042E1A0; // type:object size:0x14 scope:local align:4 data:4byte @744 = .bss:0x8042E1B8; // type:object size:0xC scope:local align:4 memPool_$localstatic3$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .bss:0x8042E1C4; // type:object size:0x10 scope:weak align:4 @716 = .bss:0x8042E1D8; // type:object size:0xC scope:local align:4 @@ -21209,9 +21244,9 @@ memPool_$localstatic3$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = @1539 = .bss:0x8042E318; // type:object size:0xC scope:local align:4 memPool_$localstatic3$getMemPool___30JASPoolAllocObject<9Z2Audible>Fv = .bss:0x8042E324; // type:object size:0x10 scope:weak align:4 ...bss.0 = .bss:0x8042E338; // type:label scope:local align:4 -sCorrectPhrase = .bss:0x8042E338; // type:object size:0x24 scope:global align:4 data:4byte -sWindStoneSound = .bss:0x8042E35C; // type:object size:0x24 scope:global align:4 data:4byte -sCorrectDuo = .bss:0x8042E380; // type:object size:0x24 scope:global align:4 data:4byte +sCorrectPhrase = .bss:0x8042E338; // type:object size:0x24 scope:local align:4 data:4byte +sWindStoneSound = .bss:0x8042E35C; // type:object size:0x24 scope:local align:4 data:4byte +sCorrectDuo = .bss:0x8042E380; // type:object size:0x24 scope:local align:4 data:4byte @3779 = .bss:0x8042E3A8; // type:object size:0xC scope:local align:4 @3783 = .bss:0x8042E3B4; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x8042E3C0; // type:label scope:local align:4 @@ -21247,12 +21282,12 @@ mPadMStick__10JUTGamePad = .bss:0x8042E620; // type:object size:0x40 scope:globa mPadSStick__10JUTGamePad = .bss:0x8042E660; // type:object size:0x40 scope:global align:4 @1373 = .bss:0x8042E6A0; // type:object size:0xC scope:local align:4 sPatternList__19JUTGamePadLongPress = .bss:0x8042E6AC; // type:object size:0xC scope:global align:4 data:4byte -exCallbackObject = .bss:0x8042E6B8; // type:object size:0x14 scope:global align:4 data:4byte +exCallbackObject = .bss:0x8042E6B8; // type:object size:0x14 scope:local align:4 data:4byte @2182 = .bss:0x8042E6CC; // type:object size:0xC scope:local align:4 sMapFileList__12JUTException = .bss:0x8042E6D8; // type:object size:0xC scope:global align:4 data:4byte -context$2230 = .bss:0x8042E6E8; // type:object size:0x2C8 scope:local align:4 -sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x8042E9B0; // type:object size:0x40 scope:global align:4 -sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x8042E9F0; // type:object size:0x100 scope:global align:4 +context$404 = .bss:0x8042E6E8; // type:object size:0x2C8 scope:local align:4 +sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x8042E9B0; // type:object size:0x40 scope:local align:4 +sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x8042E9F0; // type:object size:0x100 scope:local align:4 static_mBounds__7J2DPane = .bss:0x8042EAF0; // type:object size:0x10 scope:global align:4 data:float p_name$494 = .bss:0x8042EB00; // type:object size:0x101 scope:local align:4 data:byte j3dSys = .bss:0x8042EC08; // type:object size:0x11C scope:global align:4 @@ -21262,7 +21297,7 @@ mParentS__6J3DSys = .bss:0x8042ED60; // type:object size:0xC scope:global align: sTexCoordScaleTable__6J3DSys = .bss:0x8042ED6C; // type:object size:0x40 scope:global align:4 data:2byte sGDLObj__17J3DDisplayListObj = .bss:0x8042EDB0; // type:object size:0x10 scope:global align:4 data:4byte sMtxLoadCache__11J3DShapeMtx = .bss:0x8042EDC0; // type:object size:0x14 scope:global align:4 data:2byte -j3dTexCoordTable = .bss:0x8042EDD8; // type:object size:0x1DC7 scope:global align:4 +j3dTexCoordTable = .bss:0x8042EDD8; // type:object size:0x1DC7 scope:local align:4 j3dTevSwapTableTable = .bss:0x80430BA0; // type:object size:0x400 scope:global align:4 data:byte j3dAlphaCmpTable = .bss:0x80430FA0; // type:object size:0x300 scope:global align:4 j3dZModeTable = .bss:0x804312A0; // type:object size:0x60 scope:global align:4 @@ -21275,79 +21310,79 @@ sincosTable___5JMath = .bss:0x80433B60; // type:object size:0x10000 scope:global atanTable___5JMath = .bss:0x80443B60; // type:object size:0x1020 scope:global align:4 data:float asinAcosTable___5JMath = .bss:0x80444B80; // type:object size:0x1020 scope:global align:4 data:float ...bss.0 = .bss:0x80445BA0; // type:label scope:local align:4 -DriveInfo = .bss:0x80445BA0; // type:object size:0x20 scope:global align:4 -DriveBlock = .bss:0x80445BC0; // type:object size:0x30 scope:global align:4 +DriveInfo = .bss:0x80445BA0; // type:object size:0x20 scope:local align:4 +DriveBlock = .bss:0x80445BC0; // type:object size:0x30 scope:local align:4 __OSRebootParams = .bss:0x80445BF0; // type:object size:0x1C scope:global align:4 data:4byte ...bss.0 = .bss:0x80445C10; // type:label scope:local align:4 __OSErrorTable = .bss:0x80445C10; // type:object size:0x44 scope:global align:4 data:4byte ...bss.0 = .bss:0x80445C60; // type:label scope:local align:4 -Scb = .bss:0x80445C60; // type:object size:0x54 scope:global align:32 data:4byte +Scb = .bss:0x80445C60; // type:object size:0x54 scope:local align:32 data:4byte ...bss.0 = .bss:0x80445CB8; // type:label scope:local align:4 -RunQueue = .bss:0x80445CB8; // type:object size:0x100 scope:global align:4 data:4byte -IdleThread = .bss:0x80445DB8; // type:object size:0x318 scope:global align:4 -DefaultThread = .bss:0x804460D0; // type:object size:0x318 scope:global align:4 -IdleContext = .bss:0x804463E8; // type:object size:0x2C8 scope:global align:4 -Ecb = .bss:0x804466B0; // type:object size:0xC0 scope:global align:4 data:4byte +RunQueue = .bss:0x80445CB8; // type:object size:0x100 scope:local align:4 data:4byte +IdleThread = .bss:0x80445DB8; // type:object size:0x318 scope:local align:4 +DefaultThread = .bss:0x804460D0; // type:object size:0x318 scope:local align:4 +IdleContext = .bss:0x804463E8; // type:object size:0x2C8 scope:local align:4 +Ecb = .bss:0x804466B0; // type:object size:0xC0 scope:local align:4 data:4byte ...bss.0 = .bss:0x80446770; // type:label scope:local align:4 -Packet = .bss:0x80446770; // type:object size:0x80 scope:global align:4 data:4byte +Packet = .bss:0x80446770; // type:object size:0x80 scope:local align:4 data:4byte Alarm = .bss:0x804467F0; // type:object size:0xA0 scope:local align:4 -TypeTime = .bss:0x80446890; // type:object size:0x20 scope:global align:4 -XferTime = .bss:0x804468B0; // type:object size:0x20 scope:global align:4 -TypeCallback = .bss:0x804468D0; // type:object size:0x40 scope:global align:4 -RDSTHandler = .bss:0x80446910; // type:object size:0x10 scope:global align:4 data:4byte -InputBufferValid = .bss:0x80446920; // type:object size:0x10 scope:global align:4 -InputBuffer = .bss:0x80446930; // type:object size:0x20 scope:global align:4 -InputBufferVcount = .bss:0x80446950; // type:object size:0x10 scope:global align:4 +TypeTime = .bss:0x80446890; // type:object size:0x20 scope:local align:4 +XferTime = .bss:0x804468B0; // type:object size:0x20 scope:local align:4 +TypeCallback = .bss:0x804468D0; // type:object size:0x40 scope:local align:4 +RDSTHandler = .bss:0x80446910; // type:object size:0x10 scope:local align:4 data:4byte +InputBufferValid = .bss:0x80446920; // type:object size:0x10 scope:local align:4 +InputBuffer = .bss:0x80446930; // type:object size:0x20 scope:local align:4 +InputBufferVcount = .bss:0x80446950; // type:object size:0x10 scope:local align:4 cmdFixDevice$327 = .bss:0x80446960; // type:object size:0x10 scope:local align:4 ...bss.0 = .bss:0x80446970; // type:label scope:local align:4 -CommandList = .bss:0x80446970; // type:object size:0x3C scope:global align:4 data:4byte -AlarmForWA = .bss:0x804469B0; // type:object size:0x28 scope:global align:4 -AlarmForTimeout = .bss:0x804469D8; // type:object size:0x28 scope:global align:4 -AlarmForBreak = .bss:0x80446A00; // type:object size:0x28 scope:global align:4 -Prev = .bss:0x80446A28; // type:object size:0xC scope:global align:4 -Curr = .bss:0x80446A34; // type:object size:0xC scope:global align:4 +CommandList = .bss:0x80446970; // type:object size:0x3C scope:local align:4 data:4byte +AlarmForWA = .bss:0x804469B0; // type:object size:0x28 scope:local align:4 +AlarmForTimeout = .bss:0x804469D8; // type:object size:0x28 scope:local align:4 +AlarmForBreak = .bss:0x80446A00; // type:object size:0x28 scope:local align:4 +Prev = .bss:0x80446A28; // type:object size:0xC scope:local align:4 +Curr = .bss:0x80446A34; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x80446A40; // type:label scope:local align:4 -BB2 = .bss:0x80446A40; // type:object size:0x20 scope:global align:32 -CurrDiskID = .bss:0x80446A60; // type:object size:0x20 scope:global align:32 -DummyCommandBlock = .bss:0x80446A80; // type:object size:0x30 scope:global align:4 -ResetAlarm = .bss:0x80446AB0; // type:object size:0x28 scope:global align:4 +BB2 = .bss:0x80446A40; // type:object size:0x20 scope:local align:32 +CurrDiskID = .bss:0x80446A60; // type:object size:0x20 scope:local align:32 +DummyCommandBlock = .bss:0x80446A80; // type:object size:0x30 scope:local align:4 +ResetAlarm = .bss:0x80446AB0; // type:object size:0x28 scope:local align:4 ...bss.0 = .bss:0x80446AD8; // type:label scope:local align:4 -WaitingQueue = .bss:0x80446AD8; // type:object size:0x20 scope:global align:4 data:4byte -bb2Buf = .bss:0x80446AF8; // type:object size:0x3F scope:global align:4 +WaitingQueue = .bss:0x80446AD8; // type:object size:0x20 scope:local align:4 data:4byte +bb2Buf = .bss:0x80446AF8; // type:object size:0x3F scope:local align:4 block$18 = .bss:0x80446B38; // type:object size:0x30 scope:local align:4 ...bss.0 = .bss:0x80446B68; // type:label scope:local align:4 -regs = .bss:0x80446B68; // type:object size:0x76 scope:global align:4 data:2byte -shdwRegs = .bss:0x80446BE0; // type:object size:0x76 scope:global align:4 -HorVer = .bss:0x80446C58; // type:object size:0x58 scope:global align:4 data:2byte +regs = .bss:0x80446B68; // type:object size:0x76 scope:local align:4 data:2byte +shdwRegs = .bss:0x80446BE0; // type:object size:0x76 scope:local align:4 +HorVer = .bss:0x80446C58; // type:object size:0x58 scope:local align:4 data:2byte ...bss.0 = .bss:0x80446CB0; // type:label scope:local align:4 Type = .bss:0x80446CB0; // type:object size:0x10 scope:local align:4 -Origin = .bss:0x80446CC0; // type:object size:0x30 scope:global align:4 -CmdProbeDevice = .bss:0x80446CF0; // type:object size:0x10 scope:global align:4 +Origin = .bss:0x80446CC0; // type:object size:0x30 scope:local align:4 +CmdProbeDevice = .bss:0x80446CF0; // type:object size:0x10 scope:local align:4 ...bss.0 = .bss:0x80446D00; // type:label scope:local align:4 __CARDBlock = .bss:0x80446D00; // type:object size:0x220 scope:global align:4 data:4byte __CARDDiskNone = .bss:0x80446F20; // type:object size:0x20 scope:global align:4 ...bss.0 = .bss:0x80446F40; // type:label scope:local align:4 -FifoObj = .bss:0x80446F40; // type:object size:0x80 scope:global align:4 -gxData = .bss:0x80446FC0; // type:object size:0x5B0 scope:global align:4 -fragmentinfo = .bss:0x80447570; // type:object size:0xC scope:global align:4 data:4byte -__atexit_funcs = .bss:0x80447580; // type:object size:0x100 scope:global align:4 +FifoObj = .bss:0x80446F40; // type:object size:0x80 scope:local align:4 +gxData = .bss:0x80446FC0; // type:object size:0x5B0 scope:local align:4 +fragmentinfo = .bss:0x80447570; // type:object size:0xC scope:local align:4 data:4byte +__atexit_funcs = .bss:0x80447580; // type:object size:0x100 scope:local align:4 protopool$192 = .bss:0x80447680; // type:object size:0x38 scope:local align:4 -stderr_buff = .bss:0x804476B8; // type:object size:0x100 scope:global align:4 -stdout_buff = .bss:0x804477B8; // type:object size:0x100 scope:global align:4 -stdin_buff = .bss:0x804478B8; // type:object size:0x100 scope:global align:4 +stderr_buff = .bss:0x804476B8; // type:object size:0x100 scope:local align:4 +stdout_buff = .bss:0x804477B8; // type:object size:0x100 scope:local align:4 +stdin_buff = .bss:0x804478B8; // type:object size:0x100 scope:local align:4 signal_funcs = .bss:0x804479B8; // type:object size:0x18 scope:global align:4 gTRKEventQueue = .bss:0x804479D0; // type:object size:0x28 scope:global align:4 gTRKBigEndian = .bss:0x804479F8; // type:object size:0x4 scope:global align:4 data:4byte gTRKMsgBufs = .bss:0x80447A00; // type:object size:0x19B0 scope:global align:4 -gTRKFramingState = .bss:0x804493B0; // type:object size:0x14 scope:global align:4 data:4byte -IsTRKConnected = .bss:0x804493C8; // type:object size:0x4 scope:global align:4 data:4byte -TRK_saved_exceptionID = .bss:0x804493D0; // type:object size:0x2 scope:global align:4 data:2byte +gTRKFramingState = .bss:0x804493B0; // type:object size:0x14 scope:local align:4 data:4byte +IsTRKConnected = .bss:0x804493C8; // type:object size:0x4 scope:local align:4 data:4byte +TRK_saved_exceptionID = .bss:0x804493D0; // type:object size:0x2 scope:local align:4 data:2byte gTRKState = .bss:0x804493D4; // type:object size:0xA4 scope:global align:4 data:4byte gTRKCPUState = .bss:0x80449478; // type:object size:0x430 scope:global align:4 gTRKSaveState = .bss:0x804498A8; // type:object size:0x94 scope:global align:4 data:4byte TRKvalue128_temp = .bss:0x8044993C; // type:object size:0x10 scope:global align:4 -lc_base = .bss:0x80449950; // type:object size:0x4 scope:global align:4 data:4byte -TRK_mainError = .bss:0x80449958; // type:object size:0x4 scope:global align:4 data:4byte +lc_base = .bss:0x80449950; // type:object size:0x4 scope:local align:4 data:4byte +TRK_mainError = .bss:0x80449958; // type:object size:0x4 scope:local align:4 data:4byte TRK_Use_BBA = .bss:0x80449960; // type:object size:0x1 scope:global data:byte _MetroTRK_Has_Framing = .bss:0x80449964; // type:object size:0x4 scope:global align:4 useSerialIO = .bss:0x80449968; // type:object size:0x1 scope:local align:1 data:byte @@ -21357,17 +21392,17 @@ gRecvBuf = .bss:0x8044A190; // type:object size:0x500 scope:local align:4 gRecvCB = .bss:0x8044A690; // type:object size:0x1C scope:local align:4 developmentMode__7mDoMain = .sdata:0x8044A6C0; // type:object size:0x1 data:byte memMargin__7mDoMain = .sdata:0x8044A6C4; // type:object size:0x4 scope:global align:4 data:4byte -mHeapBriefType__7mDoMain = .sdata:0x8044A6C8; // type:object size:0x1 data:byte +mHeapBriefType = .sdata:0x8044A6C8; // type:object size:0x1 data:byte mBackColor__13mDoGph_gInf_c = .sdata:0x8044A6D0; // type:object size:0x4 scope:global align:4 data:byte mFadeColor__13mDoGph_gInf_c = .sdata:0x8044A6D4; // type:object size:0x4 scope:global align:4 data:4byte l_tevColor0$4208 = .sdata:0x8044A6D8; // type:object size:0x8 scope:local align:4 data:4byte mRenderModeObj__15mDoMch_render_c = .sdata:0x8044A6E0; // type:object size:0x4 scope:global align:4 data:4byte next__14mDoMtx_stack_c = .sdata:0x8044A6E8; // type:object size:0x4 scope:global align:4 data:4byte end__14mDoMtx_stack_c = .sdata:0x8044A6EC; // type:object size:0x4 scope:global align:4 data:4byte -l_fopOvlpM_overlap = .sdata:0x8044A6F0; // type:object size:0x4 scope:global align:4 data:4byte -l_scnRqID = .sdata:0x8044A6F8; // type:object size:0x4 scope:global align:4 data:4byte +l_fopOvlpM_overlap = .sdata:0x8044A6F0; // type:object size:0x4 scope:local align:4 data:4byte +l_scnRqID = .sdata:0x8044A6F8; // type:object size:0x4 scope:local align:4 data:4byte m_name$3788 = .sdata:0x8044A700; // type:object size:0x4 scope:local align:4 -i_msgID = .sdata:0x8044A708; // type:object size:0x4 scope:global align:4 data:4byte +i_msgID = .sdata:0x8044A708; // type:object size:0x4 scope:local align:4 data:4byte g_fopDwTg_Queue = .sdata:0x8044A710; // type:object size:0x8 scope:global align:4 data:4byte g_fpcLn_Queue = .sdata:0x8044A718; // type:object size:0x8 scope:global align:4 g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x8044A720; // type:object size:0x4 scope:global align:4 data:4byte @@ -21388,7 +21423,7 @@ mBottomFloorNo__8dMpath_c = .sdata:0x8044A774; // type:object size:0x1 scope:glo mTopFloorNo__8dMpath_c = .sdata:0x8044A775; // type:object size:0x1 scope:global align:1 data:byte data_80450636 = .sdata:0x8044A776; // type:object size:0x1 scope:local align:1 data:byte l_cursorColor$4709 = .sdata:0x8044A778; // type:object size:0x4 scope:local align:4 data:4byte -numTelopData = .sdata:0x8044A780; // type:object size:0x4 scope:global align:4 data:4byte +numTelopData = .sdata:0x8044A780; // type:object size:0x4 scope:local align:4 data:4byte l_color$4033 = .sdata:0x8044A788; // type:object size:0x4 scope:local align:4 data:4byte l_color$5004 = .sdata:0x8044A78C; // type:object size:0x4 scope:local align:4 data:4byte l_color$5326 = .sdata:0x8044A790; // type:object size:0x4 scope:local align:4 data:4byte @@ -21401,8 +21436,8 @@ chk_type_tbl__12dAttention_c = .sdata:0x8044A7A8; // type:object size:0x4 scope: chk_type_num__12dAttention_c = .sdata:0x8044A7AC; // type:object size:0x4 scope:global align:4 data:4byte attn_opt_hold = .sdata:0x8044A7B0; // type:object size:0x1 scope:local align:1 data:byte ang_table$4418 = .sdata:0x8044A7B4; // type:object size:0x6 scope:local align:4 -data_80450680 = .sdata:0x8044A7C0; // type:object size:0x8 scope:global align:4 data:byte -data_80450688 = .sdata:0x8044A7C8; // type:object size:0x1 scope:global align:4 data:byte +data_80450680 = .sdata:0x8044A7C0; // type:object size:0x1 scope:local align:4 data:byte +l_captureAlpha = .sdata:0x8044A7C8; // type:object size:0x1 scope:local align:4 data:byte l_autoUpHeight = .sdata:0x8044A7D0; // type:object size:0x4 scope:global align:4 data:float l_autoDownHeight = .sdata:0x8044A7D4; // type:object size:0x4 scope:global align:4 data:float l_ladderAnmBaseTransY = .sdata:0x8044A7D8; // type:object size:0x4 scope:global align:4 data:float @@ -21411,32 +21446,32 @@ nColor0$42528 = .sdata:0x8044A7E4; // type:object size:0x4 scope:local align:4 d m_timer_max__8daItem_c = .sdata:0x8044A7E8; // type:object size:0x4 scope:global align:4 data:4byte YnSelStartFrameTbl = .sdata:0x8044A7F0; // type:object size:0x8 scope:local align:4 YnSelEndFrameTbl = .sdata:0x8044A7F8; // type:object size:0x8 scope:local align:4 -msgTbl = .sdata:0x8044A800; // type:object size:0x6 scope:global align:4 +msgTbl = .sdata:0x8044A800; // type:object size:0x6 scope:local align:4 l_msgNum2$6993 = .sdata:0x8044A808; // type:object size:0x2 scope:local align:4 l_msgNum$7073 = .sdata:0x8044A80C; // type:object size:0x3 scope:local align:4 data:string fontsize$7221 = .sdata:0x8044A810; // type:object size:0x8 scope:local align:4 linespace$7222 = .sdata:0x8044A818; // type:object size:0x8 scope:local align:4 charspace$7223 = .sdata:0x8044A820; // type:object size:0x8 scope:local align:4 -dShopSystem_itemNo = .sdata:0x8044A828; // type:object size:0x7 scope:global align:4 data:byte -dShopSystem_cameraActor = .sdata:0x8044A830; // type:object size:0x8 scope:global align:4 data:4byte -shop_item_pos_data_tbl = .sdata:0x8044A838; // type:object size:0x4 scope:global align:4 data:4byte -lightMask = .sdata:0x8044A840; // type:object size:0x2 scope:global align:4 data:2byte -lightStatusPt = .sdata:0x8044A844; // type:object size:0x4 scope:global align:4 data:4byte -l_zmodeUpEnable = .sdata:0x8044A848; // type:object size:0x4 scope:global align:4 data:byte -l_zmodeUpDisable = .sdata:0x8044A84C; // type:object size:0x4 scope:global align:4 data:byte -l_alphaCompInfoOPA = .sdata:0x8044A850; // type:object size:0x8 scope:global align:4 data:byte -l_alphaCompInfo = .sdata:0x8044A858; // type:object size:0x8 scope:global align:4 data:byte +dShopSystem_itemNo = .sdata:0x8044A828; // type:object size:0x7 scope:local align:4 data:byte +dShopSystem_cameraActor = .sdata:0x8044A830; // type:object size:0x8 scope:local align:4 data:4byte +shop_item_pos_data_tbl = .sdata:0x8044A838; // type:object size:0x4 scope:local align:4 data:4byte +lightMask = .sdata:0x8044A840; // type:object size:0x2 scope:local align:4 data:2byte +lightStatusPt = .sdata:0x8044A844; // type:object size:0x4 scope:local align:4 data:4byte +l_zmodeUpEnable = .sdata:0x8044A848; // type:object size:0x4 scope:local align:4 data:byte +l_zmodeUpDisable = .sdata:0x8044A84C; // type:object size:0x4 scope:local align:4 data:byte +l_alphaCompInfoOPA = .sdata:0x8044A850; // type:object size:0x8 scope:local align:4 data:byte +l_alphaCompInfo = .sdata:0x8044A858; // type:object size:0x8 scope:local align:4 data:byte mViewOffsetY__17dMenu_Collect3D_c = .sdata:0x8044A860; // type:object size:0x4 scope:global align:4 data:float black$4166 = .sdata:0x8044A868; // type:object size:0x4 scope:local align:4 data:byte -OptYnSelStartFrameTbl = .sdata:0x8044A870; // type:object size:0x8 scope:global align:4 -OptYnSelEndFrameTbl = .sdata:0x8044A878; // type:object size:0x8 scope:global align:4 +OptYnSelStartFrameTbl = .sdata:0x8044A870; // type:object size:0x8 scope:local align:4 +OptYnSelEndFrameTbl = .sdata:0x8044A878; // type:object size:0x8 scope:local align:4 l_msgNum0$3868 = .sdata:0x8044A880; // type:object size:0x2 scope:local align:4 l_msgNum$3881 = .sdata:0x8044A884; // type:object size:0x2 scope:local align:4 data:string m_cloth_item$3797 = .sdata:0x8044A888; // type:object size:0x3 scope:local align:4 data:byte m_sword_item$3798 = .sdata:0x8044A88C; // type:object size:0x4 scope:local align:4 data:byte m_shield_item$3799 = .sdata:0x8044A890; // type:object size:0x3 scope:local align:4 data:byte l_method$3851 = .sdata:0x8044A898; // type:object size:0x8 scope:local align:4 -T_JOINT_resName = .sdata:0x8044A8A0; // type:object size:0x4 scope:global align:4 +T_JOINT_resName = .sdata:0x8044A8A0; // type:object size:0x4 scope:local align:4 preLoadNo = .sdata:0x8044A8A4; // type:object size:0x1 scope:local align:1 data:byte doPreLoad = .sdata:0x8044A8A5; // type:object size:0x1 scope:local align:1 data:byte calc_mtx = .sdata:0x8044A8A8; // type:object size:0x4 scope:global align:4 data:4byte @@ -21451,7 +21486,7 @@ aPiecePriority__Q29JFWSystem11CSetUpParam = .sdata:0x8044A8CC; // type:object si systemFontRes__Q29JFWSystem11CSetUpParam = .sdata:0x8044A8D0; // type:object size:0x4 scope:global align:4 data:4byte renderMode__Q29JFWSystem11CSetUpParam = .sdata:0x8044A8D4; // type:object size:0x4 scope:global align:4 data:4byte exConsoleBufferSize__Q29JFWSystem11CSetUpParam = .sdata:0x8044A8D8; // type:object size:0x4 scope:global align:4 data:4byte -p_dl = .sdata:0x8044A8E0; // type:object size:0x8 scope:global align:4 +p_dl = .sdata:0x8044A8E0; // type:object size:0x8 scope:local align:4 data_804507A8 = .sdata:0x8044A8E8; // type:object size:0x1 scope:local align:1 data:byte sMixMode__9JASDriver = .sdata:0x8044A8EC; // type:object size:0x4 scope:global align:4 data:4byte sDacRate__9JASDriver = .sdata:0x8044A8F0; // type:object size:0x4 scope:global align:4 data:float @@ -21459,7 +21494,7 @@ sSubFrames__9JASDriver = .sdata:0x8044A8F4; // type:object size:0x4 scope:global one__11JASWaveInfo = .sdata:0x8044A8F8; // type:object size:0x4 scope:global align:4 MAX_MIXERLEVEL__9JASDriver = .sdata:0x8044A900; // type:object size:0x2 scope:global align:4 data:2byte JAS_SYSTEM_OUTPUT_MODE__9JASDriver = .sdata:0x8044A904; // type:object size:0x4 scope:global align:4 data:4byte -DSP_MIXERLEVEL = .sdata:0x8044A908; // type:object size:0x2 scope:global align:4 data:2byte +DSP_MIXERLEVEL = .sdata:0x8044A908; // type:object size:0x2 scope:local align:4 data:2byte @2588 = .sdata:0x8044A910; // type:object size:0x4 scope:local align:4 data:4byte DISTANCE_MAX__7Z2Param = .sdata:0x8044A918; // type:object size:0x4 scope:global align:4 data:float MAX_VOLUME_DISTANCE__7Z2Param = .sdata:0x8044A91C; // type:object size:0x4 scope:global align:4 data:float @@ -21508,26 +21543,26 @@ ENDING_BLOW_VOL_LOWER_TIME__7Z2Param = .sdata:0x8044A9A9; // type:object size:0x ENDING_BLOW_VOL_LOWER_RECOVER_TIME__7Z2Param = .sdata:0x8044A9AA; // type:object size:0x1 scope:global align:1 data:byte ENDING_BLOW_MIN_FINISH_TIME__7Z2Param = .sdata:0x8044A9AB; // type:object size:0x1 scope:global align:1 data:byte data_8045086C = .sdata:0x8044A9AC; // type:object size:0x1 scope:global align:1 data:byte -sDeathMtBottom = .sdata:0x8044A9B0; // type:object size:0x4 scope:global align:4 data:float -sDeathMtTop = .sdata:0x8044A9B4; // type:object size:0x4 scope:global align:4 data:float -sUnderWaterDepthMax = .sdata:0x8044A9B8; // type:object size:0x4 scope:global align:4 data:float -cPitchDown = .sdata:0x8044A9C0; // type:object size:0x4 scope:global align:4 data:float -cPitchCenter = .sdata:0x8044A9C4; // type:object size:0x4 scope:global align:4 data:float -cPitchUp = .sdata:0x8044A9C8; // type:object size:0x4 scope:global align:4 data:float +sDeathMtBottom = .sdata:0x8044A9B0; // type:object size:0x4 scope:local align:4 data:float +sDeathMtTop = .sdata:0x8044A9B4; // type:object size:0x4 scope:local align:4 data:float +sUnderWaterDepthMax = .sdata:0x8044A9B8; // type:object size:0x4 scope:local align:4 data:float +cPitchDown = .sdata:0x8044A9C0; // type:object size:0x4 scope:local align:4 data:float +cPitchCenter = .sdata:0x8044A9C4; // type:object size:0x4 scope:local align:4 data:float +cPitchUp = .sdata:0x8044A9C8; // type:object size:0x4 scope:local align:4 data:float struct_8045088C = .sdata:0x8044A9CC; // type:object size:0x1 scope:local align:1 data:byte struct_8045088D = .sdata:0x8044A9CD; // type:object size:0x1 scope:local align:1 data:byte -data_8045088E = .sdata:0x8044A9CE; // type:object size:0x1 scope:local align:1 data:byte -cR_FlatWidth = .sdata:0x8044A9D0; // type:object size:0x4 scope:global align:4 data:float +cBeginHowlTime = .sdata:0x8044A9CE; // type:object size:0x1 scope:local align:1 data:byte +cR_FlatWidth = .sdata:0x8044A9D0; // type:object size:0x4 scope:local align:4 data:float struct_80450894 = .sdata:0x8044A9D4; // type:object size:0x1 scope:local align:1 data:byte struct_80450895 = .sdata:0x8044A9D5; // type:object size:0x1 scope:local align:1 data:byte -sStickHigh = .sdata:0x8044A9D8; // type:object size:0x4 scope:global align:4 data:float -sStickCenter = .sdata:0x8044A9DC; // type:object size:0x4 scope:global align:4 data:float -sHowlTobikusa = .sdata:0x8044A9E0; // type:object size:0x8 scope:global align:4 +sStickHigh = .sdata:0x8044A9D8; // type:object size:0x4 scope:local align:4 data:float +sStickCenter = .sdata:0x8044A9DC; // type:object size:0x4 scope:local align:4 data:float +sHowlTobikusa = .sdata:0x8044A9E0; // type:object size:0x8 scope:local align:4 cm2hw$539 = .sdata:0x8044A9E8; // type:object size:0x4 scope:local align:4 data_804508B0 = .sdata:0x8044A9F0; // type:object size:0x1 data:byte sSZSBufferSize__7JKRAram = .sdata:0x8044A9F8; // type:object size:0x4 scope:global align:4 data:4byte -rootPath$2498 = .sdata:0x8044AA00; // type:object size:0x2 scope:local align:4 data:string -errorRetry = .sdata:0x8044AA08; // type:object size:0x1 data:byte +rootPath = .sdata:0x8044AA00; // type:object size:0x2 scope:local align:4 data:string +errorRetry = .sdata:0x8044AA08; // type:object size:0x1 scope:local data:byte sSZSBufferSize__12JKRDvdRipper = .sdata:0x8044AA0C; // type:object size:0x4 scope:global align:4 data:4byte errorRetry__16JKRDvdAramRipper = .sdata:0x8044AA10; // type:object size:0x1 data:byte sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x8044AA14; // type:object size:0x4 scope:global align:4 data:4byte @@ -21539,66 +21574,66 @@ sResetPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x8044AA28; // type:object sResetMaskPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x8044AA2C; // type:object size:0x4 scope:global align:4 data:4byte sMessageBuffer__12JUTException = .sdata:0x8044AA30; // type:object size:0x4 scope:global align:4 sAssertVisible = .sdata:0x8044AA38; // type:object size:0x1 scope:global align:1 data:byte -oneFrameRate = .sdata:0x8044AA40; // type:object size:0x4 scope:global align:4 data:float -oneFrameRateUser = .sdata:0x8044AA44; // type:object size:0x4 scope:global align:4 data:float +oneFrameRate = .sdata:0x8044AA40; // type:object size:0x4 scope:local align:4 data:float +oneFrameRateUser = .sdata:0x8044AA44; // type:object size:0x4 scope:local align:4 data:float cm2hw$552 = .sdata:0x8044AA48; // type:object size:0x4 scope:local align:4 -J3DGDTexMode0Ids = .sdata:0x8044AA4C; // type:object size:0x8 scope:global align:4 -J3DGDTexMode1Ids = .sdata:0x8044AA54; // type:object size:0x8 scope:global align:4 -J3DGDTexImage0Ids = .sdata:0x8044AA5C; // type:object size:0x8 scope:global align:4 -J3DGDTexImage3Ids = .sdata:0x8044AA64; // type:object size:0x8 scope:global align:4 -J3DGDTexTlutIds = .sdata:0x8044AA6C; // type:object size:0x8 scope:global align:4 +J3DGDTexMode0Ids = .sdata:0x8044AA4C; // type:object size:0x8 scope:local align:4 +J3DGDTexMode1Ids = .sdata:0x8044AA54; // type:object size:0x8 scope:local align:4 +J3DGDTexImage0Ids = .sdata:0x8044AA5C; // type:object size:0x8 scope:local align:4 +J3DGDTexImage3Ids = .sdata:0x8044AA64; // type:object size:0x8 scope:local align:4 +J3DGDTexTlutIds = .sdata:0x8044AA6C; // type:object size:0x8 scope:local align:4 GX2HWFiltConv = .sdata:0x8044AA74; // type:object size:0x6 scope:local align:4 -J3DTexImage1Ids = .sdata:0x8044AA7C; // type:object size:0x8 scope:global align:4 -J3DTexImage2Ids = .sdata:0x8044AA84; // type:object size:0x8 scope:global align:4 -ColorBlack = .sdata:0x8044AA90; // type:object size:0x4 scope:global align:4 data:4byte -ColorWhite = .sdata:0x8044AA94; // type:object size:0x4 scope:global align:4 data:4byte +J3DTexImage1Ids = .sdata:0x8044AA7C; // type:object size:0x8 scope:local align:4 +J3DTexImage2Ids = .sdata:0x8044AA84; // type:object size:0x8 scope:local align:4 +ColorBlack = .sdata:0x8044AA90; // type:object size:0x4 scope:local align:4 data:4byte +ColorWhite = .sdata:0x8044AA94; // type:object size:0x4 scope:local align:4 data:4byte Unit01 = .sdata:0x8044AA98; // type:object size:0x8 scope:local align:4 SizeOfLoadMatColors = .sdata:0x8044AAA0; // type:object size:0x4 scope:global align:4 data:4byte SizeOfLoadAmbColors = .sdata:0x8044AAA4; // type:object size:0x4 scope:global align:4 data:4byte SizeOfLoadColorChans = .sdata:0x8044AAA8; // type:object size:0x4 scope:global align:4 data:4byte sNoUseDrawMtxPtr__12J3DMtxBuffer = .sdata:0x8044AAB0; // type:object size:0x4 scope:global align:4 sNoUseNrmMtxPtr__12J3DMtxBuffer = .sdata:0x8044AAB4; // type:object size:0x4 scope:global align:4 -J3DUnit01 = .sdata:0x8044AAB8; // type:object size:0x8 scope:global align:4 +J3DUnit01 = .sdata:0x8044AAB8; // type:object size:0x8 scope:local align:4 __OSVersion = .sdata:0x8044AAC0; // type:object size:0x4 scope:global align:4 data:4byte @116 = .sdata:0x8044AAC4; // type:object size:0x6 scope:local align:4 data:string @163 = .sdata:0x8044AACC; // type:object size:0x4 scope:local align:4 data:string __OSCurrHeap = .sdata:0x8044AAD0; // type:object size:0x4 scope:global align:4 data:4byte -__OSArenaLo = .sdata:0x8044AAD8; // type:object size:0x4 scope:global align:4 data:4byte +__OSArenaLo = .sdata:0x8044AAD8; // type:object size:0x4 scope:local align:4 data:4byte __OSFpscrEnableBits = .sdata:0x8044AAE0; // type:object size:0x4 scope:global align:4 data:4byte @76 = .sdata:0x8044AAE4; // type:object size:0x2 scope:local align:4 data:string @213 = .sdata:0x8044AAE8; // type:object size:0x3 scope:local align:4 data:string -FontEncode = .sdata:0x8044AAF0; // type:object size:0x2 scope:global align:4 data:2byte -SwitchThreadCallback = .sdata:0x8044AAF8; // type:object size:0x4 scope:global align:4 data:4byte +FontEncode = .sdata:0x8044AAF0; // type:object size:0x2 scope:local align:4 data:2byte +SwitchThreadCallback = .sdata:0x8044AAF8; // type:object size:0x4 scope:local align:4 data:4byte @833 = .sdata:0x8044AAFC; // type:object size:0x1 scope:local align:4 __EXIVersion = .sdata:0x8044AB00; // type:object size:0x4 scope:global align:4 data:4byte __SIVersion = .sdata:0x8044AB08; // type:object size:0x4 scope:global align:4 data:4byte Unit01 = .sdata:0x8044AB10; // type:object size:0x8 scope:local align:4 -FirstRead = .sdata:0x8044AB18; // type:object size:0x4 scope:global align:4 data:4byte +FirstRead = .sdata:0x8044AB18; // type:object size:0x4 scope:local align:4 data:4byte @118 = .sdata:0x8044AB20; // type:object size:0x8 scope:local align:4 data:string __DVDVersion = .sdata:0x8044AB28; // type:object size:0x4 scope:global align:4 data:4byte -autoInvalidation = .sdata:0x8044AB2C; // type:object size:0x4 scope:global align:4 data:4byte -checkOptionalCommand = .sdata:0x8044AB30; // type:object size:0x4 scope:global align:4 data:4byte +autoInvalidation = .sdata:0x8044AB2C; // type:object size:0x4 scope:local align:4 data:4byte +checkOptionalCommand = .sdata:0x8044AB30; // type:object size:0x4 scope:local align:4 data:4byte @23 = .sdata:0x8044AB34; // type:object size:0x6 scope:local align:4 data:string -DmaCommand = .sdata:0x8044AB3C; // type:object size:0x4 scope:global align:4 data:4byte +DmaCommand = .sdata:0x8044AB3C; // type:object size:0x4 scope:local align:4 data:4byte @37 = .sdata:0x8044AB40; // type:object size:0x2 scope:local align:4 data:string @42 = .sdata:0x8044AB44; // type:object size:0x4 scope:local align:4 data:string @43 = .sdata:0x8044AB48; // type:object size:0x3 scope:local align:4 data:string __VIVersion = .sdata:0x8044AB50; // type:object size:0x4 scope:global align:4 data:4byte @537 = .sdata:0x8044AB54; // type:object size:0x5 scope:local align:4 data:string __PADVersion = .sdata:0x8044AB60; // type:object size:0x4 scope:global align:4 data:4byte -ResettingChan = .sdata:0x8044AB64; // type:object size:0x4 scope:global align:4 data:4byte -XPatchBits = .sdata:0x8044AB68; // type:object size:0x4 scope:global align:4 data:4byte -AnalogMode = .sdata:0x8044AB6C; // type:object size:0x4 scope:global align:4 data:4byte -Spec = .sdata:0x8044AB70; // type:object size:0x4 scope:global align:4 data:4byte -MakeStatus = .sdata:0x8044AB74; // type:object size:0x4 scope:global align:4 data:4byte -CmdReadOrigin = .sdata:0x8044AB78; // type:object size:0x4 scope:global align:4 -CmdCalibrate = .sdata:0x8044AB7C; // type:object size:0x4 scope:global align:4 +ResettingChan = .sdata:0x8044AB64; // type:object size:0x4 scope:local align:4 data:4byte +XPatchBits = .sdata:0x8044AB68; // type:object size:0x4 scope:local align:4 data:4byte +AnalogMode = .sdata:0x8044AB6C; // type:object size:0x4 scope:local align:4 data:4byte +Spec = .sdata:0x8044AB70; // type:object size:0x4 scope:local align:4 data:4byte +MakeStatus = .sdata:0x8044AB74; // type:object size:0x4 scope:local align:4 data:4byte +CmdReadOrigin = .sdata:0x8044AB78; // type:object size:0x4 scope:local align:4 +CmdCalibrate = .sdata:0x8044AB7C; // type:object size:0x4 scope:local align:4 __AIVersion = .sdata:0x8044AB80; // type:object size:0x4 scope:global align:4 data:4byte __ARVersion = .sdata:0x8044AB88; // type:object size:0x4 scope:global align:4 data:4byte __ARQVersion = .sdata:0x8044AB90; // type:object size:0x4 scope:global align:4 data:4byte __DSPVersion = .sdata:0x8044AB98; // type:object size:0x4 scope:global align:4 data:4byte __CARDVersion = .sdata:0x8044ABA0; // type:object size:0x4 scope:global align:4 data:4byte -next = .sdata:0x8044ABA8; // type:object size:0x4 scope:global align:4 data:4byte +next = .sdata:0x8044ABA8; // type:object size:0x4 scope:local align:4 data:4byte __CARDVendorID = .sdata:0x8044ABB0; // type:object size:0x2 scope:global align:4 data:2byte __CARDPermMask = .sdata:0x8044ABB2; // type:object size:0x1 scope:global align:1 data:byte __GXVersion = .sdata:0x8044ABB8; // type:object size:0x4 scope:global align:4 data:4byte @@ -21613,25 +21648,25 @@ GXTexImage2Ids = .sdata:0x8044ABF0; // type:object size:0x8 scope:global align:4 GXTexImage3Ids = .sdata:0x8044ABF8; // type:object size:0x8 scope:global align:4 GXTexTlutIds = .sdata:0x8044AC00; // type:object size:0x8 scope:global align:4 GX2HWFiltConv = .sdata:0x8044AC08; // type:object size:0x6 scope:local align:4 -fragmentID = .sdata:0x8044AC10; // type:object size:0x4 scope:global align:4 data:4byte +fragmentID = .sdata:0x8044AC10; // type:object size:0x4 scope:local align:4 data:4byte @wstringBase0 = .sdata:0x8044AC18; // type:object size:0x2 scope:local align:4 __float_nan = .sdata:0x8044AC20; // type:object size:0x4 scope:global align:4 data:float __float_huge = .sdata:0x8044AC24; // type:object size:0x4 scope:global align:4 data:float __float_max = .sdata:0x8044AC28; // type:object size:0x4 scope:global align:4 data:float __float_epsilon = .sdata:0x8044AC2C; // type:object size:0x4 scope:global align:4 data:float -SendCount = .sdata:0x8044AC30; // type:object size:0x1 data:byte -fillcheck_check_frame = .sbss:0x8044AC40; // type:object size:0x1 data:byte +SendCount = .sdata:0x8044AC30; // type:object size:0x1 scope:local data:byte +fillcheck_check_frame = .sbss:0x8044AC40; // type:object size:0x1 scope:local data:byte sPowerOnTime__7mDoMain = .sbss:0x8044AC48; // type:object size:0x8 scope:global align:4 data:4byte sHungUpTime__7mDoMain = .sbss:0x8044AC50; // type:object size:0x8 scope:global align:4 data:4byte -mDisplayHeapSize = .sbss:0x8044AC58; // type:object size:0x1 data:byte -mSelectHeapBar = .sbss:0x8044AC59; // type:object size:0x1 data:byte -mCheckHeap = .sbss:0x8044AC5A; // type:object size:0x1 data:byte +mDisplayHeapSize = .sbss:0x8044AC58; // type:object size:0x1 scope:local data:byte +mSelectHeapBar = .sbss:0x8044AC59; // type:object size:0x1 scope:local data:byte +mCheckHeap = .sbss:0x8044AC5A; // type:object size:0x1 scope:local data:byte console_position_x$3776 = .sbss:0x8044AC5C; // type:object size:0x4 scope:local align:4 data:float -console_x_init$1077 = .sbss:0x8044AC60; // type:object size:0x1 data:byte +init$1677 = .sbss:0x8044AC60; // type:object size:0x1 scope:local data:byte console_position_y$3779 = .sbss:0x8044AC64; // type:object size:0x4 scope:local align:4 data:float -console_y_init$1079 = .sbss:0x8044AC68; // type:object size:0x1 data:byte +init$1680 = .sbss:0x8044AC68; // type:object size:0x1 scope:local data:byte console_scroll$3782 = .sbss:0x8044AC6C; // type:object size:0x4 scope:local align:4 data:float -console_scroll_init$1081 = .sbss:0x8044AC70; // type:object size:0x1 data:byte +init$1683 = .sbss:0x8044AC70; // type:object size:0x1 scope:local data:byte frame$3939 = .sbss:0x8044AC74; // type:object size:0x4 scope:local align:4 data:4byte sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .sbss:0x8044AC78; // type:object size:0x4 scope:global align:4 data:4byte sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .sbss:0x8044AC7C; // type:object size:0x4 scope:global align:4 data:4byte @@ -21661,7 +21696,7 @@ __OSReport_Error_disable = .sbss:0x8044ACD9; // type:object size:0x1 scope:globa __OSReport_Warning_disable = .sbss:0x8044ACDA; // type:object size:0x1 scope:global align:1 data:byte __OSReport_System_disable = .sbss:0x8044ACDB; // type:object size:0x1 scope:global align:1 data:byte __OSReport_enable = .sbss:0x8044ACDC; // type:object size:0x1 scope:global align:1 data:byte -__OSReport_MonopolyThread = .sbss:0x8044ACE0; // type:object size:0x4 scope:global align:4 data:4byte +__OSReport_MonopolyThread = .sbss:0x8044ACE0; // type:object size:0x4 scope:local align:4 data:4byte print_counts = .sbss:0x8044ACE4; // type:object size:0x4 scope:global align:4 data:4byte print_errors = .sbss:0x8044ACE8; // type:object size:0x4 scope:global align:4 data:4byte print_warings = .sbss:0x8044ACEC; // type:object size:0x4 scope:global align:4 data:4byte @@ -21672,8 +21707,8 @@ mInitFlag__17mDoAud_zelAudio_c = .sbss:0x8044ACF8; // type:object size:0x1 data: mResetFlag__17mDoAud_zelAudio_c = .sbss:0x8044ACF9; // type:object size:0x1 data:byte mBgmSet__17mDoAud_zelAudio_c = .sbss:0x8044ACFA; // type:object size:0x1 data:byte g_mDoAud_audioHeap = .sbss:0x8044ACFC; // type:object size:0x4 scope:global align:4 data:4byte -l_affCommand = .sbss:0x8044AD00; // type:object size:0x4 scope:global align:4 data:4byte -l_arcCommand = .sbss:0x8044AD04; // type:object size:0x4 scope:global align:4 data:4byte +l_affCommand = .sbss:0x8044AD00; // type:object size:0x4 scope:local align:4 data:4byte +l_arcCommand = .sbss:0x8044AD04; // type:object size:0x4 scope:local align:4 data:4byte mFader__13mDoGph_gInf_c = .sbss:0x8044AD08; // type:object size:0x4 scope:global align:4 data:4byte mFrameBufferTimg__13mDoGph_gInf_c = .sbss:0x8044AD0C; // type:object size:0x4 scope:global align:4 data:4byte mFrameBufferTex__13mDoGph_gInf_c = .sbss:0x8044AD10; // type:object size:0x4 scope:global align:4 data:4byte @@ -21685,20 +21720,20 @@ mBlureFlag__13mDoGph_gInf_c = .sbss:0x8044AD24; // type:object size:0x1 data:byt mBlureRate__13mDoGph_gInf_c = .sbss:0x8044AD25; // type:object size:0x1 data:byte mFade__13mDoGph_gInf_c = .sbss:0x8044AD26; // type:object size:0x1 data:byte mAutoForcus__13mDoGph_gInf_c = .sbss:0x8044AD27; // type:object size:0x1 data:byte -data_80450BE8 = .sbss:0x8044AD28; // type:object size:0x8 scope:local align:1 data:byte +data_80450BE8 = .sbss:0x8044AD28; // type:object size:0x1 scope:local align:1 data:byte mDebugFill__6mDoMch = .sbss:0x8044AD30; // type:object size:0x1 data:byte -solidHeapErrors = .sbss:0x8044AD34; // type:object size:0x4 scope:global align:4 data:4byte -gameHeapErrors = .sbss:0x8044AD38; // type:object size:0x4 scope:global align:4 data:4byte -zeldaHeapErrors = .sbss:0x8044AD3C; // type:object size:0x4 scope:global align:4 data:4byte -commandHeapErrors = .sbss:0x8044AD40; // type:object size:0x4 scope:global align:4 data:4byte -archiveHeapErrors = .sbss:0x8044AD44; // type:object size:0x4 scope:global align:4 data:4byte -unknownHeapErrors = .sbss:0x8044AD48; // type:object size:0x4 scope:global align:4 data:4byte -heapErrors = .sbss:0x8044AD4C; // type:object size:0x4 scope:global align:4 data:4byte +solidHeapErrors = .sbss:0x8044AD34; // type:object size:0x4 scope:local align:4 data:4byte +gameHeapErrors = .sbss:0x8044AD38; // type:object size:0x4 scope:local align:4 data:4byte +zeldaHeapErrors = .sbss:0x8044AD3C; // type:object size:0x4 scope:local align:4 data:4byte +commandHeapErrors = .sbss:0x8044AD40; // type:object size:0x4 scope:local align:4 data:4byte +archiveHeapErrors = .sbss:0x8044AD44; // type:object size:0x4 scope:local align:4 data:4byte +unknownHeapErrors = .sbss:0x8044AD48; // type:object size:0x4 scope:local align:4 data:4byte +heapErrors = .sbss:0x8044AD4C; // type:object size:0x4 scope:local align:4 data:4byte tmpString$3651 = .sbss:0x8044AD50; // type:object size:0x5 scope:local align:4 data:byte -key_link$698 = .sbss:0x8044AD55; // type:object size:0x1 data:byte -key_ganon$699 = .sbss:0x8044AD56; // type:object size:0x1 data:byte -key_zelda$700 = .sbss:0x8044AD57; // type:object size:0x1 data:byte -mDoMtx_stack = .sbss:0x8044AD58; // type:object size:0x1 scope:global align:4 +key_link$1073 = .sbss:0x8044AD55; // type:object size:0x1 scope:local data:byte +key_ganon$1074 = .sbss:0x8044AD56; // type:object size:0x1 scope:local data:byte +key_zelda$1075 = .sbss:0x8044AD57; // type:object size:0x1 scope:local data:byte +mDoMtx_stack = .sbss:0x8044AD58; // type:object size:0x1 scope:local align:4 AssertHeap = .sbss:0x8044AD60; // type:object size:0x4 scope:global align:4 data:4byte DbPrintHeap = .sbss:0x8044AD64; // type:object size:0x4 scope:global align:4 data:4byte gameHeap = .sbss:0x8044AD68; // type:object size:0x4 scope:global align:4 data:4byte @@ -21722,9 +21757,9 @@ mSystemFar__14mDoLib_clipper = .sbss:0x8044ADB0; // type:object size:0x4 scope:g mFovyRate__14mDoLib_clipper = .sbss:0x8044ADB4; // type:object size:0x4 scope:global align:4 data:float mResetData__6mDoRst = .sbss:0x8044ADB8; // type:object size:0x4 scope:global align:4 data:4byte SyncWidthSound__9mDoDvdThd = .sbss:0x8044ADC0; // type:object size:0x1 data:byte -sDefaultDirection = .sbss:0x8044ADC1; // type:object size:0x7 data:byte +sDefaultDirection = .sbss:0x8044ADC1; // type:object size:0x1 data:byte mDoDvdErr_initialized = .sbss:0x8044ADC8; // type:object size:0x1 data:byte -sConsole = .sbss:0x8044ADD0; // type:object size:0x4 scope:global align:4 data:4byte +sConsole = .sbss:0x8044ADD0; // type:object size:0x4 scope:local align:4 data:4byte cDmr_SkipInfo = .sbss:0x8044ADD8; // type:object size:0x1 data_80450C99 = .sbss:0x8044ADD9; // type:object size:0x1 data_80450C9A = .sbss:0x8044ADDA; // type:object size:0x1 @@ -21733,30 +21768,30 @@ data_80450C9C = .sbss:0x8044ADDC; // type:object size:0x1 data_80450C9D = .sbss:0x8044ADDD; // type:object size:0x1 data_80450C9E = .sbss:0x8044ADDE; // type:object size:0x1 cDmr_FishingWether = .sbss:0x8044ADDF; // type:object size:0x1 -data_80450CA0 = .sbss:0x8044ADE0; // type:object size:0x4 +data_80450CA0 = .sbss:0x8044ADE0; // type:object size:0x1 scope:global align:1 data:byte JPTracePCB4 = .sbss:0x8044ADE4; // type:object size:0x4 scope:global align:4 data:4byte -DMC_initialized = .sbss:0x8044ADE8; // type:object size:0x1 data:byte -cDyl_Initialized = .sbss:0x8044ADEC; // type:object size:0x4 scope:global align:4 data:4byte -cDyl_DVD = .sbss:0x8044ADF0; // type:object size:0x4 scope:global align:4 data:4byte +DMC_initialized = .sbss:0x8044ADE8; // type:object size:0x1 scope:local data:byte +cDyl_Initialized = .sbss:0x8044ADEC; // type:object size:0x4 scope:local align:4 data:4byte +cDyl_DVD = .sbss:0x8044ADF0; // type:object size:0x4 scope:local align:4 data:4byte g_fopAc_type = .sbss:0x8044ADF8; // type:object size:0x4 scope:global align:4 data:4byte stopStatus__10fopAc_ac_c = .sbss:0x8044ADFC; // type:object size:0x4 scope:global align:4 data:4byte sInstance__35JASGlobalInstance<14JAUSectionHeap> = .sbss:0x8044AE00; // type:object size:0x4 scope:global align:4 data:4byte HeapAdjustEntry__6fopAcM = .sbss:0x8044AE08; // type:object size:0x1 scope:global data:byte -HeapAdjustVerbose__6fopAcM = .sbss:0x8044AE09; // type:object size:0x1 scope:global data:byte -l_hio = .sbss:0x8044AE0C; // type:object size:0x1 scope:global align:4 +HeapAdjustUnk__6fopAcM = .sbss:0x8044AE09; // type:object size:0x1 scope:global data:byte +l_hio = .sbss:0x8044AE0C; // type:object size:0x1 scope:local align:4 mGroundY__11fopAcM_gc_c = .sbss:0x8044AE10; // type:object size:0x4 scope:global align:4 data:float mRoofY__11fopAcM_rc_c = .sbss:0x8044AE14; // type:object size:0x4 scope:global align:4 data:float mWaterY__11fopAcM_wt_c = .sbss:0x8044AE18; // type:object size:0x4 scope:global align:4 data:float -l_fopScnRq_IsUsingOfOverlap = .sbss:0x8044AE20; // type:object size:0x4 scope:global align:4 data:4byte -fopKy_KANKYO_TYPE = .sbss:0x8044AE28; // type:object size:0x4 scope:global align:4 -fopMsg_MSG_TYPE = .sbss:0x8044AE30; // type:object size:0x4 scope:global align:4 -l_fopDwTg_id = .sbss:0x8044AE38; // type:object size:0x4 scope:global align:4 data:4byte +l_fopScnRq_IsUsingOfOverlap = .sbss:0x8044AE20; // type:object size:0x4 scope:local align:4 data:4byte +fopKy_KANKYO_TYPE = .sbss:0x8044AE28; // type:object size:0x4 scope:local align:4 +fopMsg_MSG_TYPE = .sbss:0x8044AE30; // type:object size:0x4 scope:local align:4 +l_fopDwTg_id = .sbss:0x8044AE38; // type:object size:0x4 scope:local align:4 data:4byte g_fpcBs_type = .sbss:0x8044AE40; // type:object size:0x4 scope:global align:4 t_type$2207 = .sbss:0x8044AE44; // type:object size:0x4 scope:local align:4 data:4byte init$13 = .sbss:0x8044AE48; // type:object size:0x1 scope:local align:1 data:byte process_id$2216 = .sbss:0x8044AE4C; // type:object size:0x4 scope:local align:4 data:4byte init$22 = .sbss:0x8044AE50; // type:object size:0x1 scope:local align:1 data:byte -l_fpcLy_CurrLayer_p = .sbss:0x8044AE58; // type:object size:0x4 scope:global align:4 data:4byte +l_fpcLy_CurrLayer_p = .sbss:0x8044AE58; // type:object size:0x4 scope:local align:4 data:4byte IsInitOfLayerList$2308 = .sbss:0x8044AE5C; // type:object size:0x4 scope:local align:4 data:4byte init$113 = .sbss:0x8044AE60; // type:object size:0x1 scope:local align:1 data:byte layer_id$2311 = .sbss:0x8044AE64; // type:object size:0x4 scope:local align:4 data:4byte @@ -21828,7 +21863,7 @@ m_branchData__7dDemo_c = .sbss:0x8044AF84; // type:object size:0x4 scope:global init$1867 = .sbss:0x8044AF88; // type:object size:0x1 scope:local align:1 data:byte init$1870 = .sbss:0x8044AF89; // type:object size:0x1 scope:local align:1 data:byte it$4206 = .sbss:0x8044AF8C; // type:object size:0x4 scope:local align:4 data:4byte -init$1672 = .sbss:0x8044AF90; // type:object size:0x8 scope:local align:1 data:byte +init$1672 = .sbss:0x8044AF90; // type:object size:0x1 scope:local align:1 data:byte mNowStayFloorNo__10dMapInfo_c = .sbss:0x8044AF98; // type:object size:0x1 data:byte mNowStayRoomNo__10dMapInfo_c = .sbss:0x8044AF9C; // type:object size:0x4 scope:global align:4 data:4byte mNowStayFloorNoDecisionFlg__10dMapInfo_c = .sbss:0x8044AFA0; // type:object size:0x1 data:byte @@ -21862,47 +21897,47 @@ mParticleTracePCB__13dPa_control_c = .sbss:0x8044B008; // type:object size:0x4 s mWipe__12dDlst_list_c = .sbss:0x8044B010; // type:object size:0x1 data:byte mWipeRate__12dDlst_list_c = .sbss:0x8044B014; // type:object size:0x4 scope:global align:4 data:float mWipeSpeed__12dDlst_list_c = .sbss:0x8044B018; // type:object size:0x4 scope:global align:4 data:float -init$2153 = .sbss:0x8044B020; // type:object size:0x1 data:byte +init$2955 = .sbss:0x8044B020; // type:object size:0x1 scope:local data:byte S_parcent_bak$4131 = .sbss:0x8044B028; // type:object size:0x4 scope:local align:4 data:float -init$4132 = .sbss:0x8044B02C; // type:object size:0x1 data:byte +init$1980 = .sbss:0x8044B02C; // type:object size:0x1 scope:local data:byte S_rot_work1$7572 = .sbss:0x8044B02E; // type:object size:0x2 scope:local align:2 data:2byte -init$7573 = .sbss:0x8044B030; // type:object size:0x1 data:byte +init$5244 = .sbss:0x8044B030; // type:object size:0x1 scope:local data:byte S_rot_work2$7575 = .sbss:0x8044B032; // type:object size:0x2 scope:local align:2 data:2byte -init$7576 = .sbss:0x8044B034; // type:object size:0x1 data:byte +init$5247 = .sbss:0x8044B034; // type:object size:0x1 scope:local data:byte rot$7951 = .sbss:0x8044B038; // type:object size:0x4 scope:local align:4 data:4byte -init$7952 = .sbss:0x8044B03C; // type:object size:0x1 data:byte -init$7972 = .sbss:0x8044B03D; // type:object size:0x1 data:byte +init$5598 = .sbss:0x8044B03C; // type:object size:0x1 scope:local data:byte +init$5630 = .sbss:0x8044B03D; // type:object size:0x1 scope:local data:byte rot$8398 = .sbss:0x8044B040; // type:object size:0x4 scope:local align:4 data:float -init$8399 = .sbss:0x8044B044; // type:object size:0x1 data:byte +init$5990 = .sbss:0x8044B044; // type:object size:0x1 scope:local data:byte rot$8968 = .sbss:0x8044B048; // type:object size:0x4 scope:local align:4 data:float -init$8969 = .sbss:0x8044B04C; // type:object size:0x1 data:byte -init$8975 = .sbss:0x8044B04D; // type:object size:0x1 data:byte +init$6525 = .sbss:0x8044B04C; // type:object size:0x1 scope:local data:byte +init$6531 = .sbss:0x8044B04D; // type:object size:0x1 scope:local data:byte S_fubuki_ratio$8980 = .sbss:0x8044B050; // type:object size:0x4 scope:local align:4 data:float -init$8981 = .sbss:0x8044B054; // type:object size:0x1 data:byte +init$6537 = .sbss:0x8044B054; // type:object size:0x1 scope:local data:byte rot$9453 = .sbss:0x8044B058; // type:object size:0x4 scope:local align:4 data:float -init$9454 = .sbss:0x8044B05C; // type:object size:0x1 data:byte -init$9458 = .sbss:0x8044B05D; // type:object size:0x1 data:byte +init$6970 = .sbss:0x8044B05C; // type:object size:0x1 scope:local data:byte +init$6974 = .sbss:0x8044B05D; // type:object size:0x1 scope:local data:byte rot$9899 = .sbss:0x8044B060; // type:object size:0x4 scope:local align:4 data:float -init$9900 = .sbss:0x8044B064; // type:object size:0x1 data:byte +init$7400 = .sbss:0x8044B064; // type:object size:0x1 scope:local data:byte howa_loop_cnt$10162 = .sbss:0x8044B068; // type:object size:0x4 scope:local align:4 data:float -init$10163 = .sbss:0x8044B06C; // type:object size:0x1 data:byte +init$7648 = .sbss:0x8044B06C; // type:object size:0x1 scope:local data:byte rot$10956 = .sbss:0x8044B070; // type:object size:0x4 scope:local align:4 data:float -init$10957 = .sbss:0x8044B074; // type:object size:0x1 data:byte +init$8390 = .sbss:0x8044B074; // type:object size:0x1 scope:local data:byte rot$11381 = .sbss:0x8044B078; // type:object size:0x4 scope:local align:4 data:float -init$11382 = .sbss:0x8044B07C; // type:object size:0x1 data:byte +init$8781 = .sbss:0x8044B07C; // type:object size:0x1 scope:local data:byte rot$11660 = .sbss:0x8044B080; // type:object size:0x4 scope:local align:4 data:float -init$11661 = .sbss:0x8044B084; // type:object size:0x1 data:byte +init$9013 = .sbss:0x8044B084; // type:object size:0x1 scope:local data:byte rot$12032 = .sbss:0x8044B088; // type:object size:0x4 scope:local align:4 data:float -init$12033 = .sbss:0x8044B08C; // type:object size:0x1 data:byte +init$9332 = .sbss:0x8044B08C; // type:object size:0x1 scope:local data:byte data$3831 = .sbss:0x8044B090; // type:object size:0x8 scope:local align:4 -l_isFinalBossStg = .sbss:0x8044B098; // type:object size:0x1 data:byte -l_SetCounter = .sbss:0x8044B0A0; // type:object size:0x4 scope:global align:4 data:4byte +l_isFinalBossStg = .sbss:0x8044B098; // type:object size:0x1 scope:local data:byte +l_SetCounter = .sbss:0x8044B0A0; // type:object size:0x4 scope:local align:4 data:4byte init$1793 = .sbss:0x8044B0A8; // type:object size:0x1 scope:local align:1 data:byte m_name__16dBgS_MoveBgActor = .sbss:0x8044B0B0; // type:object size:0x4 scope:global align:4 data:4byte m_dzb_id__16dBgS_MoveBgActor = .sbss:0x8044B0B4; // type:object size:0x4 scope:global align:4 data:4byte m_set_func__16dBgS_MoveBgActor = .sbss:0x8044B0B8; // type:object size:0x4 scope:global align:4 data:4byte -l_start = .sbss:0x8044B0C0; // type:object size:0x4 scope:global align:4 data:4byte -l_wcsbuf_num = .sbss:0x8044B0C4; // type:object size:0x4 scope:global align:4 data:4byte +l_start = .sbss:0x8044B0C0; // type:object size:0x4 scope:local align:4 data:4byte +l_wcsbuf_num = .sbss:0x8044B0C4; // type:object size:0x4 scope:local align:4 data:4byte init$3207 = .sbss:0x8044B0C8; // type:object size:0x1 scope:local align:1 data:byte init$4121 = .sbss:0x8044B0C9; // type:object size:0x1 scope:local align:1 data:byte init$4717 = .sbss:0x8044B0CA; // type:object size:0x1 scope:local align:1 data:byte @@ -21912,9 +21947,9 @@ mTypeGroupData__7dTres_c = .sbss:0x8044B0D8; // type:object size:0x4 scope:globa mNum__7dTres_c = .sbss:0x8044B0DC; // type:object size:0x2 scope:global align:4 data:2byte m_myObj__10dMdl_mng_c = .sbss:0x8044B0E0; // type:object size:0x4 scope:global align:4 data:4byte m_obj__12dEyeHL_mng_c = .sbss:0x8044B0E8; // type:object size:0x4 scope:global align:4 data:4byte -struct_80450FB0 = .sbss:0x8044B0F0; // type:object size:0x1 scope:local align:1 data:byte -lbl_8044B0F1 = .sbss:0x8044B0F1; // type:object size:0x1 data:byte -lbl_8044B0F2 = .sbss:0x8044B0F2; // type:object size:0x6 data:byte +l_dvdError$1879 = .sbss:0x8044B0F0; // type:object size:0x1 scope:local align:1 data:byte +l_texCopied$1902 = .sbss:0x8044B0F1; // type:object size:0x1 scope:local data:byte +init$1903 = .sbss:0x8044B0F2; // type:object size:0x1 scope:local data:byte init$11203 = .sbss:0x8044B0F8; // type:object size:0x1 scope:local align:1 data:byte init$11207 = .sbss:0x8044B0F9; // type:object size:0x1 scope:local align:1 data:byte init$11211 = .sbss:0x8044B0FA; // type:object size:0x1 scope:local align:1 data:byte @@ -21923,23 +21958,23 @@ init$33110 = .sbss:0x8044B0FC; // type:object size:0x1 scope:local align:1 data: init$33113 = .sbss:0x8044B0FD; // type:object size:0x1 scope:local align:1 data:byte it$36766 = .sbss:0x8044B100; // type:object size:0x4 scope:local align:4 data:4byte init$37466 = .sbss:0x8044B104; // type:object size:0x1 scope:local align:1 data:byte -lbl_8044B105 = .sbss:0x8044B105; // type:object size:0x1 data:byte -lbl_8044B106 = .sbss:0x8044B106; // type:object size:0x1 data:byte -lbl_8044B107 = .sbss:0x8044B107; // type:object size:0x1 data:byte -m_eye_move_flg = .sbss:0x8044B108; // type:object size:0x1 scope:local align:1 data:byte +init$37469 = .sbss:0x8044B105; // type:object size:0x1 data:byte +init$37472 = .sbss:0x8044B106; // type:object size:0x1 data:byte +init$37475 = .sbss:0x8044B107; // type:object size:0x1 data:byte +m_eye_move_flg__16daAlink_matAnm_c = .sbss:0x8044B108; // type:object size:0x1 scope:local align:1 data:byte m_morf_frame__16daAlink_matAnm_c = .sbss:0x8044B109; // type:object size:0x1 scope:global align:1 data:byte bgWaitFlg$58407 = .sbss:0x8044B10C; // type:object size:0x4 scope:local align:4 data:4byte -struct_80450FD0 = .sbss:0x8044B110; // type:object size:0x1 scope:local align:1 data:byte -data_80450FD1 = .sbss:0x8044B111; // type:object size:0x1 scope:local align:1 data:byte +init$58408 = .sbss:0x8044B110; // type:object size:0x1 scope:local align:1 data:byte +init$60914 = .sbss:0x8044B111; // type:object size:0x1 scope:local align:1 data:byte mSrchName__8daNpcT_c = .sbss:0x8044B118; // type:object size:0x2 scope:global align:4 data:2byte mFindCount__8daNpcT_c = .sbss:0x8044B11C; // type:object size:0x4 scope:global align:4 data:4byte m_name__23daBaseNpc_moveBgActor_c = .sbss:0x8044B120; // type:object size:0x4 scope:global align:4 data:4byte m_dzb_id__23daBaseNpc_moveBgActor_c = .sbss:0x8044B124; // type:object size:0x4 scope:global align:4 data:4byte m_set_func__23daBaseNpc_moveBgActor_c = .sbss:0x8044B128; // type:object size:0x4 scope:global align:4 data:4byte -data_80450FEC = .sbss:0x8044B12C; // type:object size:0x1 scope:local align:4 data:byte +init$7278 = .sbss:0x8044B12C; // type:object size:0x1 scope:local align:4 data:byte mFindCount__8daNpcF_c = .sbss:0x8044B130; // type:object size:0x4 scope:global align:4 data:4byte mSrchActorName__8daNpcF_c = .sbss:0x8044B134; // type:object size:0x2 scope:global align:4 data:2byte -init$1719 = .sbss:0x8044B138; // type:object size:0x8 scope:local align:1 data:byte +init$1719 = .sbss:0x8044B138; // type:object size:0x1 scope:local align:1 data:byte init$1834 = .sbss:0x8044B140; // type:object size:0x1 scope:local align:1 data:byte target = .sbss:0x8044B144; // type:object size:0x4 scope:global align:4 data:4byte targetWay = .sbss:0x8044B148; // type:object size:0x4 scope:global align:4 data:float @@ -21950,33 +21985,33 @@ m_dropAngleY__20daPy_boomerangMove_c = .sbss:0x8044B15C; // type:object size:0x2 m_eventKeepFlg__20daPy_boomerangMove_c = .sbss:0x8044B15E; // type:object size:0x2 scope:global align:2 data:2byte Stage__22@unnamed@d_camera_cpp@ = .sbss:0x8044B160; // type:object size:0x4 scope:global align:4 data:4byte prev_plat1$8536 = .sbss:0x8044B164; // type:object size:0x4 scope:local align:4 data:4byte -data_80451028 = .sbss:0x8044B168; // type:object size:0x1 scope:local align:4 data:byte +init$8537 = .sbss:0x8044B168; // type:object size:0x1 scope:local align:4 data:byte prev_plat2$8539 = .sbss:0x8044B16C; // type:object size:0x4 scope:local align:4 data:4byte -data_80451030 = .sbss:0x8044B170; // type:object size:0x1 scope:local align:4 data:byte +init$8540 = .sbss:0x8044B170; // type:object size:0x1 scope:local align:4 data:byte JumpCushion$9801 = .sbss:0x8044B174; // type:object size:0x4 scope:local align:4 data:float -data_80451038 = .sbss:0x8044B178; // type:object size:0x1 scope:local align:4 data:byte -data_80451039 = .sbss:0x8044B179; // type:object size:0x1 data:byte +init$9802 = .sbss:0x8044B178; // type:object size:0x1 scope:local align:4 data:byte +init$9803 = .sbss:0x8044B179; // type:object size:0x1 data:byte LatitudeLimitMax$9807 = .sbss:0x8044B17C; // type:object size:0x2 scope:local align:4 -data_8045103E = .sbss:0x8044B17E; // type:object size:0x1 data:byte +init$14160 = .sbss:0x8044B17E; // type:object size:0x1 data:byte _120$14158 = .sbss:0x8044B180; // type:object size:0x2 scope:local align:4 data:2byte -data_80451042 = .sbss:0x8044B182; // type:object size:0x1 data:byte +init$14616 = .sbss:0x8044B182; // type:object size:0x1 data:byte _120$14614 = .sbss:0x8044B184; // type:object size:0x2 scope:local align:4 data:2byte -data_80451046 = .sbss:0x8044B186; // type:object size:0x1 data:byte +init$14965 = .sbss:0x8044B186; // type:object size:0x1 data:byte LatMin$14963 = .sbss:0x8044B188; // type:object size:0x2 scope:local align:4 data:2byte -data_8045104A = .sbss:0x8044B18A; // type:object size:0x1 data:byte +init$14969 = .sbss:0x8044B18A; // type:object size:0x1 data:byte LatMax$14967 = .sbss:0x8044B18C; // type:object size:0x2 scope:local align:4 data:2byte -g_siHIO = .sbss:0x8044B190; // type:object size:0x8 scope:global align:4 +g_siHIO = .sbss:0x8044B190; // type:object size:0x8 scope:local align:4 dShopSystem_sellItemMax = .sbss:0x8044B198; // type:object size:0x1 scope:local align:1 data:byte -dShopSystem_item_count = .sbss:0x8044B19C; // type:object size:0x4 scope:global align:4 data:4byte +dShopSystem_item_count = .sbss:0x8044B19C; // type:object size:0x4 scope:local align:4 data:4byte data_80451060 = .sbss:0x8044B1A0; // type:object size:0x1 scope:local align:1 data:byte -dShopSystem_camera_count = .sbss:0x8044B1A4; // type:object size:0x4 scope:global align:4 data:4byte +dShopSystem_camera_count = .sbss:0x8044B1A4; // type:object size:0x4 scope:local align:4 data:4byte S_fuwan_sin$5904 = .sbss:0x8044B1A8; // type:object size:0x2 scope:local align:4 data:2byte -init$4995 = .sbss:0x8044B1AA; // type:object size:0x1 data:byte -init$4999 = .sbss:0x8044B1AB; // type:object size:0x1 data:byte +init$5093 = .sbss:0x8044B1AA; // type:object size:0x1 scope:local data:byte +init$5097 = .sbss:0x8044B1AB; // type:object size:0x1 scope:local data:byte init$localstatic4$draw__10dThunder_cFv = .sbss:0x8044B1B0; // type:object size:0x1 scope:weak align:1 data:byte init$localstatic6$draw__10dThunder_cFv = .sbss:0x8044B1B1; // type:object size:0x1 scope:weak align:1 data:byte -player_px = .sbss:0x8044B1B8; // type:object size:0x4 scope:global align:4 data:float -player_py = .sbss:0x8044B1BC; // type:object size:0x4 scope:global align:4 data:float +player_px = .sbss:0x8044B1B8; // type:object size:0x4 scope:local align:4 data:float +player_py = .sbss:0x8044B1BC; // type:object size:0x4 scope:local align:4 data:float myclass__12dMenu_Dmap_c = .sbss:0x8044B1C0; // type:object size:0x4 scope:global align:4 data:4byte m_res__22dMdm_HIO_prm_res_dst_s = .sbss:0x8044B1C8; // type:object size:0x4 scope:global align:4 data:4byte m_zoomCenterMinX__20dMenu_StageMapCtrl_c = .sbss:0x8044B1CC; // type:object size:0x4 scope:global align:4 data:float @@ -21988,23 +22023,23 @@ virtual_stage$3999 = .sbss:0x8044B1E4; // type:object size:0x8 scope:local align MyClass__12dMenu_Fmap_c = .sbss:0x8044B1EC; // type:object size:0x4 scope:global align:4 data:4byte g_menuHIO = .sbss:0x8044B1F0; // type:object size:0x8 scope:global align:4 tex_name$5204 = .sbss:0x8044B1F8; // type:object size:0x4 scope:local align:4 data:4byte -init$2118 = .sbss:0x8044B1FC; // type:object size:0x1 scope:local align:1 data:byte +init$3140 = .sbss:0x8044B1FC; // type:object size:0x1 scope:local align:1 data:byte mMoji$3770 = .sbss:0x8044B200; // type:object size:0x3 scope:local align:4 data:byte s_groupID = .sbss:0x8044B208; // type:object size:0x2 scope:global align:4 data:2byte g_msg_unit = .sbss:0x8044B210; // type:object size:0x4 scope:global align:4 -l_lightCount = .sbss:0x8044B218; // type:object size:0x1 data:byte -dOvlpFd_execute_f = .sbss:0x8044B220; // type:object size:0x4 scope:global align:4 data:4byte -g_LogHIO = .sbss:0x8044B228; // type:object size:0x8 scope:global align:4 -g_snHIO = .sbss:0x8044B230; // type:object size:0x8 scope:global align:4 -resPhase = .sbss:0x8044B238; // type:object size:0x8 scope:global align:4 -dylPhase = .sbss:0x8044B240; // type:object size:0x8 scope:global align:4 -dylPreLoadTime1 = .sbss:0x8044B248; // type:object size:0x8 scope:global align:4 data:4byte -resPreLoadTime0 = .sbss:0x8044B250; // type:object size:0x8 scope:global align:4 data:4byte -resPreLoadTime1 = .sbss:0x8044B258; // type:object size:0x8 scope:global align:4 data:4byte -g_preLoadHIO = .sbss:0x8044B260; // type:object size:0x4 scope:global align:4 data:4byte +l_lightCount = .sbss:0x8044B218; // type:object size:0x1 scope:local data:byte +dOvlpFd_execute_f = .sbss:0x8044B220; // type:object size:0x4 scope:local align:4 data:4byte +g_LogHIO = .sbss:0x8044B228; // type:object size:0x8 scope:local align:4 +g_snHIO = .sbss:0x8044B230; // type:object size:0x8 scope:local align:4 +resPhase = .sbss:0x8044B238; // type:object size:0x8 scope:local align:4 +dylPhase = .sbss:0x8044B240; // type:object size:0x8 scope:local align:4 +dylPreLoadTime1 = .sbss:0x8044B248; // type:object size:0x8 scope:local align:4 data:4byte +resPreLoadTime0 = .sbss:0x8044B250; // type:object size:0x8 scope:local align:4 data:4byte +resPreLoadTime1 = .sbss:0x8044B258; // type:object size:0x8 scope:local align:4 data:4byte +g_preLoadHIO = .sbss:0x8044B260; // type:object size:0x4 scope:local align:4 data:4byte pauseTimer__9dScnPly_c = .sbss:0x8044B264; // type:object size:0x1 data:byte nextPauseTimer__9dScnPly_c = .sbss:0x8044B265; // type:object size:0x1 data:byte -g_regHIO = .sbss:0x8044B268; // type:object size:0x4 scope:global align:4 data:4byte +g_regHIO = .sbss:0x8044B268; // type:object size:0x8 scope:global align:4 data:4byte m_nowID__9dkWmark_c = .sbss:0x8044B270; // type:object size:0x4 scope:global align:4 data:4byte init$localstatic4$create__9dkWmark_cFv = .sbss:0x8044B274; // type:object size:0x1 scope:weak align:1 data:byte mFirst__24DynamicModuleControlBase = .sbss:0x8044B278; // type:object size:0x4 scope:global align:4 data:4byte @@ -22015,12 +22050,12 @@ sFileCache__20DynamicModuleControl = .sbss:0x8044B288; // type:object size:0x4 s Heap__3cMl = .sbss:0x8044B290; // type:object size:0x4 scope:global align:4 data:4byte init$296 = .sbss:0x8044B298; // type:object size:0x1 scope:local align:1 data:byte Zero__5csXyz = .sbss:0x8044B2A0; // type:object size:0x6 scope:global align:4 -r0 = .sbss:0x8044B2A8; // type:object size:0x4 scope:global align:4 data:4byte -r1 = .sbss:0x8044B2AC; // type:object size:0x4 scope:global align:4 data:4byte -r2 = .sbss:0x8044B2B0; // type:object size:0x4 scope:global align:4 data:4byte -r02 = .sbss:0x8044B2B4; // type:object size:0x4 scope:global align:4 data:4byte -r12 = .sbss:0x8044B2B8; // type:object size:0x4 scope:global align:4 data:4byte -r22 = .sbss:0x8044B2BC; // type:object size:0x4 scope:global align:4 data:4byte +r0 = .sbss:0x8044B2A8; // type:object size:0x4 scope:local align:4 data:4byte +r1 = .sbss:0x8044B2AC; // type:object size:0x4 scope:local align:4 data:4byte +r2 = .sbss:0x8044B2B0; // type:object size:0x4 scope:local align:4 data:4byte +r02 = .sbss:0x8044B2B4; // type:object size:0x4 scope:local align:4 data:4byte +r12 = .sbss:0x8044B2B8; // type:object size:0x4 scope:local align:4 data:4byte +r22 = .sbss:0x8044B2BC; // type:object size:0x4 scope:local align:4 data:4byte G_CM3D_F_ABS_MIN = .sbss:0x8044B2C0; // type:object size:0x4 scope:global align:4 data:float _0__7cSAngle = .sbss:0x8044B2C8; // type:object size:0x2 scope:global align:4 data:2byte _1__7cSAngle = .sbss:0x8044B2CC; // type:object size:0x2 scope:global align:4 @@ -22037,24 +22072,24 @@ systemConsole__9JFWSystem = .sbss:0x8044B2F8; // type:object size:0x4 scope:glob sInitCalled__9JFWSystem = .sbss:0x8044B2FC; // type:object size:0x1 scope:global align:1 data:byte sManager__10JFWDisplay = .sbss:0x8044B300; // type:object size:0x4 scope:global align:4 data:4byte prevFrame$2597 = .sbss:0x8044B304; // type:object size:0x4 scope:local align:4 data:4byte -data_804511C8 = .sbss:0x8044B308; // type:object size:0x8 scope:local align:1 data:byte +init$740 = .sbss:0x8044B308; // type:object size:0x1 scope:local align:1 data:byte nextTick$2642 = .sbss:0x8044B310; // type:object size:0x8 scope:local align:8 data:4byte init$579 = .sbss:0x8044B318; // type:object size:0x1 scope:local align:1 data:byte nextCount$2650 = .sbss:0x8044B31C; // type:object size:0x4 scope:local align:4 data:4byte init$587 = .sbss:0x8044B320; // type:object size:0x1 scope:local align:1 data:byte @569 = .sbss:0x8044B328; // type:object size:0x1 scope:local align:4 data:byte soOutput_none___Q27JStudio14TVariableValue = .sbss:0x8044B330; // type:object size:0x4 scope:global align:4 data:4byte -init$365 = .sbss:0x8044B338; // type:object size:0x8 scope:local align:1 data:byte +init$365 = .sbss:0x8044B338; // type:object size:0x1 scope:local align:1 data:byte init$298 = .sbss:0x8044B340; // type:object size:0x1 scope:local align:1 data:byte sThread__6JASDvd = .sbss:0x8044B348; // type:object size:0x4 scope:global align:4 data:4byte JASDram = .sbss:0x8044B350; // type:object size:0x4 scope:global align:4 data:4byte sAramBase__9JASKernel = .sbss:0x8044B354; // type:object size:0x4 scope:global align:4 data:4byte sSystemHeap__9JASKernel = .sbss:0x8044B358; // type:object size:0x4 scope:global align:4 data:4byte sCommandHeap__9JASKernel = .sbss:0x8044B35C; // type:object size:0x4 scope:global align:4 data:4byte -sBuffer = .sbss:0x8044B360; // type:object size:0x4 scope:global align:4 data:4byte -sLineMax = .sbss:0x8044B364; // type:object size:0x4 scope:global align:4 data:4byte -sLineCount = .sbss:0x8044B368; // type:object size:0x4 scope:global align:4 data:4byte -sTop = .sbss:0x8044B36C; // type:object size:0x4 scope:global align:4 data:4byte +sBuffer = .sbss:0x8044B360; // type:object size:0x4 scope:local align:4 data:4byte +sLineMax = .sbss:0x8044B364; // type:object size:0x4 scope:local align:4 data:4byte +sLineCount = .sbss:0x8044B368; // type:object size:0x4 scope:local align:4 data:4byte +sTop = .sbss:0x8044B36C; // type:object size:0x4 scope:local align:4 data:4byte init$localstatic4$getMemPool__58JASPoolAllocObject_MultiThreadedFv = .sbss:0x8044B370; // type:object size:0x1 data:byte init$localstatic4$getMemPool__43JASPoolAllocObject_MultiThreaded<8JASTrack>Fv = .sbss:0x8044B371; // type:object size:0x1 data:byte sDefaultParser__10JASSeqCtrl = .sbss:0x8044B378; // type:object size:0x4 scope:global align:4 data:4byte @@ -22065,16 +22100,16 @@ sLoadThread__13JASAramStream = .sbss:0x8044B390; // type:object size:0x4 scope:g sReadBuffer__13JASAramStream = .sbss:0x8044B394; // type:object size:0x4 scope:global align:4 data:4byte sBlockSize__13JASAramStream = .sbss:0x8044B398; // type:object size:0x4 scope:global align:4 data:4byte sChannelMax__13JASAramStream = .sbss:0x8044B39C; // type:object size:0x4 scope:global align:4 data:4byte -data_80451260 = .sbss:0x8044B3A0; // type:object size:0x1 scope:global align:1 data:byte -data_80451261 = .sbss:0x8044B3A1; // type:object size:0x1 scope:global align:1 data:byte -init$localstatic4$getMemPool__46JASPoolAllocObject_MultiThreaded<10JASChannel>Fv = .sbss:0x8044B3A2; // type:object size:0x1 data:byte +struct_80451260 = .sbss:0x8044B3A0; // type:object size:0x1 scope:global align:1 data:byte +struct_80451261 = .sbss:0x8044B3A1; // type:object size:0x1 scope:global align:1 data:byte +init$localstatic4$getMemPool__46JASPoolAllocObject_MultiThreaded<10JASChannel>Fv = .sbss:0x8044B3A2; // type:object size:0x1 scope:weak data:byte sOscTable__12JASVoiceBank = .sbss:0x8044B3A8; // type:object size:0x4 scope:global align:4 data:4byte oscp$214 = .sbss:0x8044B3B0; // type:object size:0x4 scope:local align:4 data:4byte -data_80451274 = .sbss:0x8044B3B4; // type:object size:0x1 scope:local align:1 data:byte +data_80451274$0 = .sbss:0x8044B3B4; // type:object size:0x1 scope:local align:1 data:byte mNoLoad__16JASBasicWaveBank = .sbss:0x8044B3B8; // type:object size:0x4 scope:global align:4 sUsedHeapSize__11JASWSParser = .sbss:0x8044B3C0; // type:object size:0x4 scope:global align:4 data:4byte sUsedHeapSize__12JASBNKParser = .sbss:0x8044B3C8; // type:object size:0x4 scope:global align:4 data:4byte -data_8045128C = .sbss:0x8044B3CC; // type:object size:0x1 scope:local align:1 data:byte +__init__memPool___46JASPoolAllocObject_MultiThreaded<10JASChannel> = .sbss:0x8044B3CC; // type:object size:0x1 scope:weak align:1 data:byte sAramHeap__16JASWaveArcLoader = .sbss:0x8044B3D0; // type:object size:0x4 scope:global align:4 data:4byte sBankDisposeListSize__10JASChannel = .sbss:0x8044B3D8; // type:object size:0x4 scope:global align:4 data:4byte sDspDacBuffer__9JASDriver = .sbss:0x8044B3E0; // type:object size:0x4 scope:global align:4 data:4byte @@ -22090,24 +22125,24 @@ sSubFrameCounter__9JASDriver = .sbss:0x8044B404; // type:object size:0x4 scope:g dacp$239 = .sbss:0x8044B408; // type:object size:0x4 scope:local align:4 data:4byte init$58 = .sbss:0x8044B40C; // type:object size:0x1 scope:local align:1 data:byte old_time$264 = .sbss:0x8044B410; // type:object size:0x4 scope:local align:4 data:4byte -data_804512D4 = .sbss:0x8044B414; // type:object size:0x1 scope:local align:1 data:byte +init$374 = .sbss:0x8044B414; // type:object size:0x1 scope:local align:1 data:byte snIntCount__14JASAudioThread = .sbss:0x8044B418; // type:object size:0x4 scope:global align:4 data:4byte sDspChannels__13JASDSPChannel = .sbss:0x8044B420; // type:object size:0x4 scope:global align:4 data:4byte CH_BUF__6JASDsp = .sbss:0x8044B428; // type:object size:0x4 scope:global align:4 data:4byte FX_BUF__6JASDsp = .sbss:0x8044B42C; // type:object size:0x4 scope:global align:4 data:4byte sDSPVolume__6JASDsp = .sbss:0x8044B430; // type:object size:0x4 scope:global align:4 data:float data_804512F4$25 = .sbss:0x8044B434; // type:object size:0x1 scope:local align:1 data:byte -init$33 = .sbss:0x8044B435; // type:object size:0x1 scope:local align:1 data:byte -flag = .sbss:0x8044B438; // type:object size:0x4 scope:global align:4 data:4byte -taskreadp = .sbss:0x8044B440; // type:object size:0x4 scope:global align:4 data:4byte -taskwritep = .sbss:0x8044B444; // type:object size:0x4 scope:global align:4 data:4byte +init$26 = .sbss:0x8044B435; // type:object size:0x1 scope:local align:1 data:byte +flag = .sbss:0x8044B438; // type:object size:0x4 scope:local align:4 data:4byte +taskreadp = .sbss:0x8044B440; // type:object size:0x4 scope:local align:4 data:4byte +taskwritep = .sbss:0x8044B444; // type:object size:0x4 scope:local align:4 data:4byte struct_80451308 = .sbss:0x8044B448; // type:object size:0x1 scope:local align:1 data:byte struct_80451309 = .sbss:0x8044B449; // type:object size:0x1 scope:local align:1 data:byte DSP_prior_task = .sbss:0x8044B44C; // type:object size:0x4 scope:global align:4 data:4byte -init$localstatic4$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .sbss:0x8044B450; // type:object size:0x1 scope:global align:1 data:byte -init$localstatic4$getMemPool___35JASPoolAllocObject<13JAISoundChild>Fv = .sbss:0x8044B458; // type:object size:0x1 scope:global align:1 data:byte -init$localstatic4$getMemPool___27JASPoolAllocObject<6JAISeq>Fv = .sbss:0x8044B460; // type:object size:0x1 scope:global align:1 data:byte -init$localstatic4$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .sbss:0x8044B468; // type:object size:0x1 scope:global align:1 data:byte +init$localstatic4$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .sbss:0x8044B450; // type:object size:0x1 scope:weak align:1 data:byte +init$localstatic4$getMemPool___35JASPoolAllocObject<13JAISoundChild>Fv = .sbss:0x8044B458; // type:object size:0x1 scope:weak align:1 data:byte +init$localstatic4$getMemPool___27JASPoolAllocObject<6JAISeq>Fv = .sbss:0x8044B460; // type:object size:0x1 scope:weak align:1 data:byte +init$localstatic4$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .sbss:0x8044B468; // type:object size:0x1 scope:weak align:1 data:byte init$80 = .sbss:0x8044B470; // type:object size:0x1 scope:local align:1 data:byte oRandom$401 = .sbss:0x8044B474; // type:object size:0x4 scope:local align:4 data:4byte MIN_DISTANCE_VOLUME__7Z2Param = .sbss:0x8044B478; // type:object size:0x4 scope:global align:4 data:float @@ -22115,9 +22150,9 @@ ENEMY_LASTHIT_MUTE_VOLUME__7Z2Param = .sbss:0x8044B47C; // type:object size:0x4 DARK_SE_FILTER_ON__7Z2Param = .sbss:0x8044B480; // type:object size:0x1 scope:global align:1 data:byte DARK_SE_LOW_PASS_FILTER_SETTING__7Z2Param = .sbss:0x8044B481; // type:object size:0x1 scope:global align:1 data:byte SYSTEM_SE_USE_DARK_SE_SETTING__7Z2Param = .sbss:0x8044B482; // type:object size:0x1 scope:global align:1 data:byte -init$localstatic4$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = .sbss:0x8044B488; // type:object size:0x1 data:byte -cNearFarRatio = .sbss:0x8044B490; // type:object size:0x4 scope:global align:4 data:float -init$localstatic4$getMemPool___30JASPoolAllocObject<9Z2Audible>Fv = .sbss:0x8044B494; // type:object size:0x1 data:byte +init$localstatic4$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = .sbss:0x8044B488; // type:object size:0x1 scope:weak data:byte +cNearFarRatio = .sbss:0x8044B490; // type:object size:0x4 scope:local align:4 data:float +init$localstatic4$getMemPool___30JASPoolAllocObject<9Z2Audible>Fv = .sbss:0x8044B494; // type:object size:0x1 scope:weak data:byte data_80451358 = .sbss:0x8044B498; // type:object size:0x1 align:1 data:byte data_80451359 = .sbss:0x8044B499; // type:object size:0x1 align:1 data:byte mLinkPtr__14Z2CreatureLink = .sbss:0x8044B4A0; // type:object size:0x4 scope:global align:4 data:4byte @@ -22132,14 +22167,15 @@ mCodeEnd__7JKRHeap = .sbss:0x8044B4C8; // type:object size:0x4 scope:global alig mUserRamStart__7JKRHeap = .sbss:0x8044B4CC; // type:object size:0x4 scope:global align:4 data:4byte mUserRamEnd__7JKRHeap = .sbss:0x8044B4D0; // type:object size:0x4 scope:global align:4 data:4byte mMemorySize__7JKRHeap = .sbss:0x8044B4D4; // type:object size:0x4 scope:global align:4 data:4byte -DBfoundSize = .sbss:0x8044B4D8; // type:object size:0x4 scope:global align:4 data:4byte -DBfoundOffset = .sbss:0x8044B4DC; // type:object size:0x4 scope:global align:4 data:4byte -DBfoundBlock = .sbss:0x8044B4E0; // type:object size:0x4 scope:global align:4 data:4byte -DBnewFreeBlock = .sbss:0x8044B4E4; // type:object size:0x4 scope:global align:4 data:4byte -DBnewUsedBlock = .sbss:0x8044B4E8; // type:object size:0x4 scope:global align:4 data:4byte +DBfoundSize = .sbss:0x8044B4D8; // type:object size:0x4 scope:local align:4 data:4byte +DBfoundOffset = .sbss:0x8044B4DC; // type:object size:0x4 scope:local align:4 data:4byte +DBfoundBlock = .sbss:0x8044B4E0; // type:object size:0x4 scope:local align:4 data:4byte +DBnewFreeBlock = .sbss:0x8044B4E4; // type:object size:0x4 scope:local align:4 data:4byte +DBnewUsedBlock = .sbss:0x8044B4E8; // type:object size:0x4 scope:local align:4 data:4byte sManager__15JKRThreadSwitch = .sbss:0x8044B4F0; // type:object size:0x4 scope:global align:4 data:4byte sTotalCount__15JKRThreadSwitch = .sbss:0x8044B4F4; // type:object size:0x4 scope:global align:4 data:4byte -sTotalStart__15JKRThreadSwitch = .sbss:0x8044B4F8; // type:object size:0x8 scope:global align:4 data:4byte +sTotalStart__15JKRThreadSwitch = .sbss:0x8044B4F8; // type:object size:0x4 scope:global align:4 data:4byte +data_804513BC = .sbss:0x8044B4FC; // type:object size:0x4 scope:local data:4byte mUserPreCallback__15JKRThreadSwitch = .sbss:0x8044B500; // type:object size:0x4 scope:global align:4 data:4byte mUserPostCallback__15JKRThreadSwitch = .sbss:0x8044B504; // type:object size:0x4 scope:global align:4 data:4byte sAramObject__7JKRAram = .sbss:0x8044B508; // type:object size:0x4 scope:global align:4 data:4byte @@ -22151,7 +22187,7 @@ refCurrent = .sbss:0x8044B51C; // type:object size:0x4 scope:local align:4 data: srcOffset = .sbss:0x8044B520; // type:object size:0x4 scope:local align:4 data:4byte transLeft = .sbss:0x8044B524; // type:object size:0x4 scope:local align:4 data:4byte srcLimit = .sbss:0x8044B528; // type:object size:0x4 scope:local align:4 data:4byte -srcAddress = .sbss:0x8044B52C; // type:object size:0x4 scope:global align:4 data:4byte +srcAddress = .sbss:0x8044B52C; // type:object size:0x4 scope:local align:4 data:4byte fileOffset = .sbss:0x8044B530; // type:object size:0x4 scope:local align:4 data:4byte readCount = .sbss:0x8044B534; // type:object size:0x4 scope:local align:4 data:4byte maxDest = .sbss:0x8044B538; // type:object size:0x4 scope:local align:4 data:4byte @@ -22176,7 +22212,7 @@ srcFile = .sbss:0x8044B588; // type:object size:0x4 scope:local align:4 data:4by fileOffset = .sbss:0x8044B58C; // type:object size:0x4 scope:local align:4 data:4byte readCount = .sbss:0x8044B590; // type:object size:0x4 scope:local align:4 data:4byte maxDest = .sbss:0x8044B594; // type:object size:0x4 scope:local align:4 data:4byte -data_80451458 = .sbss:0x8044B598; // type:object size:0x1 data:byte +data_80451458 = .sbss:0x8044B598; // type:object size:0x1 scope:local data:byte tsPtr = .sbss:0x8044B59C; // type:object size:0x4 scope:local align:4 data:4byte tsArea = .sbss:0x8044B5A0; // type:object size:0x4 scope:local align:4 data:4byte szpBuf = .sbss:0x8044B5A8; // type:object size:0x4 scope:local align:4 data:4byte @@ -22184,9 +22220,9 @@ szpEnd = .sbss:0x8044B5AC; // type:object size:0x4 scope:local align:4 data:4byt refBuf = .sbss:0x8044B5B0; // type:object size:0x4 scope:local align:4 data:4byte refEnd = .sbss:0x8044B5B4; // type:object size:0x4 scope:local align:4 data:4byte refCurrent = .sbss:0x8044B5B8; // type:object size:0x4 scope:local align:4 data:4byte -dmaBuf = .sbss:0x8044B5BC; // type:object size:0x4 scope:global align:4 data:4byte -dmaEnd = .sbss:0x8044B5C0; // type:object size:0x4 scope:global align:4 data:4byte -dmaCurrent = .sbss:0x8044B5C4; // type:object size:0x4 scope:global align:4 data:4byte +dmaBuf = .sbss:0x8044B5BC; // type:object size:0x4 scope:local align:4 data:4byte +dmaEnd = .sbss:0x8044B5C0; // type:object size:0x4 scope:local align:4 data:4byte +dmaCurrent = .sbss:0x8044B5C4; // type:object size:0x4 scope:local align:4 data:4byte srcOffset = .sbss:0x8044B5C8; // type:object size:0x4 scope:local align:4 data:4byte transLeft = .sbss:0x8044B5CC; // type:object size:0x4 scope:local align:4 data:4byte srcLimit = .sbss:0x8044B5D0; // type:object size:0x4 scope:local align:4 data:4byte @@ -22194,11 +22230,11 @@ srcFile = .sbss:0x8044B5D4; // type:object size:0x4 scope:local align:4 data:4by fileOffset = .sbss:0x8044B5D8; // type:object size:0x4 scope:local align:4 data:4byte readCount = .sbss:0x8044B5DC; // type:object size:0x4 scope:local align:4 data:4byte maxDest = .sbss:0x8044B5E0; // type:object size:0x4 scope:local align:4 data:4byte -data_804514A4 = .sbss:0x8044B5E4; // type:object size:0x1 data:byte +data_804514A4 = .sbss:0x8044B5E4; // type:object size:0x1 scope:local data:byte tsPtr = .sbss:0x8044B5E8; // type:object size:0x4 scope:local align:4 data:4byte tsArea = .sbss:0x8044B5EC; // type:object size:0x4 scope:local align:4 data:4byte sDecompObject__9JKRDecomp = .sbss:0x8044B5F0; // type:object size:0x4 scope:global align:4 data:4byte -data_804514B8 = .sbss:0x8044B5F8; // type:object size:0x1 data:byte +data_804514B8 = .sbss:0x8044B5F8; // type:object size:0x1 scope:local data:byte sCurrentFifo__12JUTGraphFifo = .sbss:0x8044B5FC; // type:object size:0x4 scope:global align:4 data:4byte mGpStatus__12JUTGraphFifo = .sbss:0x8044B600; // type:object size:0x5 scope:global align:4 sDebugPrint__10JUTDbPrint = .sbss:0x8044B608; // type:object size:0x4 scope:global align:4 data:4byte @@ -22224,7 +22260,7 @@ sConsole__12JUTException = .sbss:0x8044B65C; // type:object size:0x4 scope:globa msr__12JUTException = .sbss:0x8044B660; // type:object size:0x4 scope:global align:4 data:4byte fpscr__12JUTException = .sbss:0x8044B664; // type:object size:0x4 scope:global align:4 data:4byte sDirectPrint__14JUTDirectPrint = .sbss:0x8044B668; // type:object size:0x4 scope:global align:4 data:4byte -sMessageLife__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x8044B670; // type:object size:0x4 scope:global align:4 data:4byte +sMessageLife__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x8044B670; // type:object size:0x4 scope:local align:4 data:4byte sManager__8JUTVideo = .sbss:0x8044B678; // type:object size:0x4 scope:global align:4 data:4byte sVideoLastTick__8JUTVideo = .sbss:0x8044B67C; // type:object size:0x4 scope:global align:4 data:4byte sVideoInterval__8JUTVideo = .sbss:0x8044B680; // type:object size:0x4 scope:global align:4 data:4byte @@ -22238,8 +22274,8 @@ init$231 = .sbss:0x8044B6A0; // type:object size:0x1 scope:local align:1 data:by cntUser$2379 = .sbss:0x8044B6A4; // type:object size:0x4 scope:local align:4 data:4byte init$280 = .sbss:0x8044B6A8; // type:object size:0x1 scope:local align:1 data:byte sManager__17JUTConsoleManager = .sbss:0x8044B6B0; // type:object size:0x4 scope:global align:4 data:4byte -sReportConsole = .sbss:0x8044B6B4; // type:object size:0x4 scope:global align:4 data:4byte -sWarningConsole = .sbss:0x8044B6B8; // type:object size:0x4 scope:global align:4 data:4byte +sReportConsole = .sbss:0x8044B6B4; // type:object size:0x4 scope:local align:4 data:4byte +sWarningConsole = .sbss:0x8044B6B8; // type:object size:0x4 scope:local align:4 data:4byte mStrBuff__8J2DPrint = .sbss:0x8044B6C0; // type:object size:0x4 scope:global align:4 data:4byte sStrBufInitialized = .sbss:0x8044B6C4; // type:object size:0x1 scope:local align:1 data:byte mStrBuffSize__8J2DPrint = .sbss:0x8044B6C8; // type:object size:0x4 scope:global align:4 data:4byte @@ -22258,213 +22294,213 @@ sTexMtxObj__17J3DDifferedTexMtx = .sbss:0x8044B704; // type:object size:0x4 scop sInterruptFlag$903 = .sbss:0x8044B708; // type:object size:0x4 scope:local align:4 data:4byte init$465 = .sbss:0x8044B70C; // type:object size:0x1 scope:local align:1 data:byte sOldVcdVatCmd__8J3DShape = .sbss:0x8044B710; // type:object size:0x4 scope:global align:4 data:4byte -sEnvelopeFlag__8J3DShape = .sbss:0x8044B714; // type:object size:0x1 scope:local align:1 data:byte +sEnvelopeFlag__8J3DShape = .sbss:0x8044B714; // type:object size:0x1 scope:global align:1 data:byte SizeOfJ3DColorBlockLightOffLoad = .sbss:0x8044B718; // type:object size:0x4 scope:global align:4 data:4byte SizeOfJ3DColorBlockAmbientOnLoad = .sbss:0x8044B71C; // type:object size:0x4 scope:global align:4 data:4byte entryNum__13J3DDrawBuffer = .sbss:0x8044B720; // type:object size:0x4 scope:global align:4 data:4byte sInterruptFlag$965 = .sbss:0x8044B728; // type:object size:0x4 scope:local align:4 data:4byte -sInitInterruptFlag = .sbss:0x8044B72C; // type:object size:0x1 scope:local align:1 data:byte +init$461 = .sbss:0x8044B72C; // type:object size:0x1 scope:local align:1 data:byte mMtxBuffer__10J3DMtxCalc = .sbss:0x8044B730; // type:object size:0x4 scope:global align:4 data:4byte mJoint__10J3DMtxCalc = .sbss:0x8044B734; // type:object size:0x4 scope:global align:4 data:4byte mCurrentMtxCalc__8J3DJoint = .sbss:0x8044B738; // type:object size:0x4 scope:global align:4 data:4byte BootInfo = .sbss:0x8044B740; // type:object size:0x4 scope:local align:4 data:4byte -BI2DebugFlag = .sbss:0x8044B744; // type:object size:0x4 scope:global align:4 data:4byte -BI2DebugFlagHolder = .sbss:0x8044B748; // type:object size:0x4 scope:global align:4 data:4byte -__OSIsGcam = .sbss:0x8044B74C; // type:object size:0x4 scope:global align:4 data:4byte +BI2DebugFlag = .sbss:0x8044B744; // type:object size:0x4 scope:local align:4 data:4byte +BI2DebugFlagHolder = .sbss:0x8044B748; // type:object size:0x4 scope:local align:4 data:4byte +__OSIsGcam = .sbss:0x8044B74C; // type:object size:0x4 scope:weak align:4 data:4byte ZeroF = .sbss:0x8044B750; // type:object size:0x8 scope:global align:4 data:double ZeroPS = .sbss:0x8044B758; // type:object size:0x8 scope:global align:4 AreWeInitialized = .sbss:0x8044B760; // type:object size:0x4 scope:global align:4 data:4byte OSExceptionTable = .sbss:0x8044B764; // type:object size:0x4 scope:global align:4 data:4byte __OSInIPL = .sbss:0x8044B768; // type:object size:0x4 scope:global align:4 data:4byte __OSStartTime = .sbss:0x8044B770; // type:object size:0x8 scope:global align:4 data:4byte -AlarmQueue = .sbss:0x8044B778; // type:object size:0x8 scope:global align:4 data:4byte -HeapArray = .sbss:0x8044B780; // type:object size:0x4 scope:global align:4 data:4byte -NumHeaps = .sbss:0x8044B784; // type:object size:0x4 scope:global align:4 data:4byte -ArenaStart = .sbss:0x8044B788; // type:object size:0x4 scope:global align:4 data:4byte -ArenaEnd = .sbss:0x8044B78C; // type:object size:0x4 scope:global align:4 data:4byte -__OSArenaHi = .sbss:0x8044B790; // type:object size:0x4 scope:global align:4 data:4byte -Prepared = .sbss:0x8044B798; // type:object size:0x4 scope:global align:4 data:4byte +AlarmQueue = .sbss:0x8044B778; // type:object size:0x8 scope:local align:4 data:4byte +HeapArray = .sbss:0x8044B780; // type:object size:0x4 scope:local align:4 data:4byte +NumHeaps = .sbss:0x8044B784; // type:object size:0x4 scope:local align:4 data:4byte +ArenaStart = .sbss:0x8044B788; // type:object size:0x4 scope:local align:4 data:4byte +ArenaEnd = .sbss:0x8044B78C; // type:object size:0x4 scope:local align:4 data:4byte +__OSArenaHi = .sbss:0x8044B790; // type:object size:0x4 scope:local align:4 data:4byte +Prepared = .sbss:0x8044B798; // type:object size:0x4 scope:local align:4 data:4byte apploaderPosition$69 = .sbss:0x8044B79C; // type:object size:0x4 scope:local align:4 data:4byte -FontDataAnsi = .sbss:0x8044B7A0; // type:object size:0x4 scope:global align:4 data:4byte -FontDataSjis = .sbss:0x8044B7A4; // type:object size:0x4 scope:global align:4 data:4byte -ParseString = .sbss:0x8044B7A8; // type:object size:0x4 scope:global align:4 data:4byte -InterruptHandlerTable = .sbss:0x8044B7B0; // type:object size:0x4 scope:global align:4 data:4byte +FontDataAnsi = .sbss:0x8044B7A0; // type:object size:0x4 scope:local align:4 data:4byte +FontDataSjis = .sbss:0x8044B7A4; // type:object size:0x4 scope:local align:4 data:4byte +ParseString = .sbss:0x8044B7A8; // type:object size:0x4 scope:local align:4 data:4byte +InterruptHandlerTable = .sbss:0x8044B7B0; // type:object size:0x4 scope:local align:4 data:4byte __OSLastInterruptSrr0 = .sbss:0x8044B7B4; // type:object size:0x4 scope:global align:4 data:4byte __OSLastInterrupt = .sbss:0x8044B7B8; // type:object size:0x2 scope:global align:4 data:2byte __OSLastInterruptTime = .sbss:0x8044B7C0; // type:object size:0x8 scope:global align:4 data:4byte -SaveStart = .sbss:0x8044B7C8; // type:object size:0x4 scope:global align:4 data:4byte -SaveEnd = .sbss:0x8044B7CC; // type:object size:0x4 scope:global align:4 data:4byte -ResetFunctionQueue = .sbss:0x8044B7D0; // type:object size:0x8 scope:global align:4 data:4byte -bootThisDol = .sbss:0x8044B7D8; // type:object size:0x4 scope:global align:4 data:4byte -ResetCallback = .sbss:0x8044B7E0; // type:object size:0x4 scope:global align:4 data:4byte -Down = .sbss:0x8044B7E4; // type:object size:0x4 scope:global align:4 data:4byte +SaveStart = .sbss:0x8044B7C8; // type:object size:0x4 scope:local align:4 data:4byte +SaveEnd = .sbss:0x8044B7CC; // type:object size:0x4 scope:local align:4 data:4byte +ResetFunctionQueue = .sbss:0x8044B7D0; // type:object size:0x8 scope:local align:4 data:4byte +bootThisDol = .sbss:0x8044B7D8; // type:object size:0x4 scope:local align:4 data:4byte +ResetCallback = .sbss:0x8044B7E0; // type:object size:0x4 scope:local align:4 data:4byte +Down = .sbss:0x8044B7E4; // type:object size:0x4 scope:local align:4 data:4byte LastState = .sbss:0x8044B7E8; // type:object size:0x4 scope:local align:4 data:4byte -HoldUp = .sbss:0x8044B7F0; // type:object size:0x8 scope:global align:4 data:4byte -HoldDown = .sbss:0x8044B7F8; // type:object size:0x8 scope:global align:4 data:4byte -RunQueueBits = .sbss:0x8044B800; // type:object size:0x4 scope:global align:4 data:4byte -RunQueueHint = .sbss:0x8044B804; // type:object size:0x4 scope:global align:4 data:4byte -Reschedule = .sbss:0x8044B808; // type:object size:0x4 scope:global align:4 data:4byte +HoldUp = .sbss:0x8044B7F0; // type:object size:0x8 scope:local align:4 data:4byte +HoldDown = .sbss:0x8044B7F8; // type:object size:0x8 scope:local align:4 data:4byte +RunQueueBits = .sbss:0x8044B800; // type:object size:0x4 scope:local align:4 data:4byte +RunQueueHint = .sbss:0x8044B804; // type:object size:0x4 scope:local align:4 data:4byte +Reschedule = .sbss:0x8044B808; // type:object size:0x4 scope:local align:4 data:4byte Debug_BBA = .sbss:0x8044B810; // type:object size:0x1 scope:global align:8 data:byte -IDSerialPort1 = .sbss:0x8044B818; // type:object size:0x4 scope:global align:4 data:4byte -Chan = .sbss:0x8044B820; // type:object size:0x4 scope:global align:4 data:4byte -Dev = .sbss:0x8044B824; // type:object size:0x4 scope:global align:4 data:4byte -Enabled = .sbss:0x8044B828; // type:object size:0x4 scope:global align:4 data:4byte -BarnacleEnabled = .sbss:0x8044B82C; // type:object size:0x4 scope:global align:4 data:4byte +IDSerialPort1 = .sbss:0x8044B818; // type:object size:0x4 scope:local align:4 data:4byte +Chan = .sbss:0x8044B820; // type:object size:0x4 scope:local align:4 data:4byte +Dev = .sbss:0x8044B824; // type:object size:0x4 scope:local align:4 data:4byte +Enabled = .sbss:0x8044B828; // type:object size:0x4 scope:local align:4 data:4byte +BarnacleEnabled = .sbss:0x8044B82C; // type:object size:0x4 scope:local align:4 data:4byte cmdTypeAndStatus$78 = .sbss:0x8044B830; // type:object size:0x4 scope:local align:4 cmdTypeAndStatus$372 = .sbss:0x8044B834; // type:object size:0x4 scope:local align:4 __PADFixBits = .sbss:0x8044B838; // type:object size:0x4 scope:global align:4 data:4byte -SamplingRate = .sbss:0x8044B840; // type:object size:0x4 scope:global align:4 data:4byte +SamplingRate = .sbss:0x8044B840; // type:object size:0x4 scope:local align:4 data:4byte __DBInterface = .sbss:0x8044B848; // type:object size:0x4 scope:global align:4 data:4byte DBVerbose = .sbss:0x8044B84C; // type:object size:0x4 scope:global align:4 data:4byte -StopAtNextInt = .sbss:0x8044B850; // type:object size:0x4 scope:global align:4 data:4byte -LastLength = .sbss:0x8044B854; // type:object size:0x4 scope:global align:4 data:4byte +StopAtNextInt = .sbss:0x8044B850; // type:object size:0x4 scope:local align:4 data:4byte +LastLength = .sbss:0x8044B854; // type:object size:0x4 scope:local align:4 data:4byte Callback = .sbss:0x8044B858; // type:object size:0x4 scope:local align:4 data:4byte -ResetCoverCallback = .sbss:0x8044B85C; // type:object size:0x4 scope:global align:4 data:4byte -LastResetEnd = .sbss:0x8044B860; // type:object size:0x8 scope:global align:4 data:4byte -ResetOccurred = .sbss:0x8044B868; // type:object size:0x4 scope:global align:4 data:4byte -WaitingCoverClose = .sbss:0x8044B86C; // type:object size:0x4 scope:global align:4 data:4byte -Breaking = .sbss:0x8044B870; // type:object size:0x4 scope:global align:4 data:4byte -WorkAroundType = .sbss:0x8044B874; // type:object size:0x4 scope:global align:4 data:4byte -WorkAroundSeekLocation = .sbss:0x8044B878; // type:object size:0x4 scope:global align:4 data:4byte -LastReadFinished = .sbss:0x8044B880; // type:object size:0x8 scope:global align:4 data:4byte -LastReadIssued = .sbss:0x8044B888; // type:object size:0x8 scope:global align:4 data:4byte -LastCommandWasRead = .sbss:0x8044B890; // type:object size:0x4 scope:global align:4 data:4byte -NextCommandNumber = .sbss:0x8044B894; // type:object size:0x4 scope:global align:4 data:4byte +ResetCoverCallback = .sbss:0x8044B85C; // type:object size:0x4 scope:local align:4 data:4byte +LastResetEnd = .sbss:0x8044B860; // type:object size:0x8 scope:local align:4 data:4byte +ResetOccurred = .sbss:0x8044B868; // type:object size:0x4 scope:local align:4 data:4byte +WaitingCoverClose = .sbss:0x8044B86C; // type:object size:0x4 scope:local align:4 data:4byte +Breaking = .sbss:0x8044B870; // type:object size:0x4 scope:local align:4 data:4byte +WorkAroundType = .sbss:0x8044B874; // type:object size:0x4 scope:local align:4 data:4byte +WorkAroundSeekLocation = .sbss:0x8044B878; // type:object size:0x4 scope:local align:4 data:4byte +LastReadFinished = .sbss:0x8044B880; // type:object size:0x8 scope:local align:4 data:4byte +LastReadIssued = .sbss:0x8044B888; // type:object size:0x8 scope:local align:4 data:4byte +LastCommandWasRead = .sbss:0x8044B890; // type:object size:0x4 scope:local align:4 data:4byte +NextCommandNumber = .sbss:0x8044B894; // type:object size:0x4 scope:local align:4 data:4byte BootInfo = .sbss:0x8044B898; // type:object size:0x4 scope:local align:4 data:4byte -FstStart = .sbss:0x8044B89C; // type:object size:0x4 scope:global align:4 data:4byte -FstStringStart = .sbss:0x8044B8A0; // type:object size:0x4 scope:global align:4 data:4byte -MaxEntryNum = .sbss:0x8044B8A4; // type:object size:0x4 scope:global align:4 data:4byte -currentDirectory = .sbss:0x8044B8A8; // type:object size:0x4 scope:global align:4 data:4byte +FstStart = .sbss:0x8044B89C; // type:object size:0x4 scope:local align:4 data:4byte +FstStringStart = .sbss:0x8044B8A0; // type:object size:0x4 scope:local align:4 data:4byte +MaxEntryNum = .sbss:0x8044B8A4; // type:object size:0x4 scope:local align:4 data:4byte +currentDirectory = .sbss:0x8044B8A8; // type:object size:0x4 scope:local align:4 data:4byte __DVDLongFileNameFlag = .sbss:0x8044B8AC; // type:object size:0x4 scope:global align:4 data:4byte __DVDThreadQueue = .sbss:0x8044B8B0; // type:object size:0x8 scope:global align:4 -executing = .sbss:0x8044B8B8; // type:object size:0x4 scope:global align:4 data:4byte -IDShouldBe = .sbss:0x8044B8BC; // type:object size:0x4 scope:global align:4 data:4byte -bootInfo = .sbss:0x8044B8C0; // type:object size:0x4 scope:global align:4 data:4byte -PauseFlag = .sbss:0x8044B8C4; // type:object size:0x4 scope:global align:4 data:4byte -PausingFlag = .sbss:0x8044B8C8; // type:object size:0x4 scope:global align:4 data:4byte -AutoFinishing = .sbss:0x8044B8CC; // type:object size:0x4 scope:global align:4 data:4byte -FatalErrorFlag = .sbss:0x8044B8D0; // type:object size:0x4 scope:global align:4 data:4byte -CurrCommand = .sbss:0x8044B8D4; // type:object size:0x4 scope:global align:4 data:4byte -Canceling = .sbss:0x8044B8D8; // type:object size:0x4 scope:global align:4 data:4byte -CancelCallback = .sbss:0x8044B8DC; // type:object size:0x4 scope:global align:4 data:4byte -ResumeFromHere = .sbss:0x8044B8E0; // type:object size:0x4 scope:global align:4 data:4byte -CancelLastError = .sbss:0x8044B8E4; // type:object size:0x4 scope:global align:4 data:4byte -LastError = .sbss:0x8044B8E8; // type:object size:0x4 scope:global align:4 data:4byte -NumInternalRetry = .sbss:0x8044B8EC; // type:object size:0x4 scope:global align:4 data:4byte -ResetRequired = .sbss:0x8044B8F0; // type:object size:0x4 scope:global align:4 data:4byte -FirstTimeInBootrom = .sbss:0x8044B8F4; // type:object size:0x4 scope:global align:4 data:4byte -MotorState = .sbss:0x8044B8F8; // type:object size:0x4 scope:global align:4 data:4byte -DVDInitialized = .sbss:0x8044B8FC; // type:object size:0x4 scope:global align:4 data:4byte -LastState = .sbss:0x8044B900; // type:object size:0x4 scope:local align:4 data:4byte -FatalFunc = .sbss:0x8044B908; // type:object size:0x4 scope:global align:4 data:4byte -status = .sbss:0x8044B910; // type:object size:0x4 scope:global align:4 data:4byte -bb2 = .sbss:0x8044B914; // type:object size:0x4 scope:global align:4 data:4byte -idTmp = .sbss:0x8044B918; // type:object size:0x4 scope:global align:4 data:4byte -IsInitialized = .sbss:0x8044B920; // type:object size:0x4 scope:global align:4 data:4byte -retraceCount = .sbss:0x8044B924; // type:object size:0x4 scope:global align:4 data:4byte -flushFlag = .sbss:0x8044B928; // type:object size:0x4 scope:global align:4 data:4byte -retraceQueue = .sbss:0x8044B92C; // type:object size:0x8 scope:global align:4 -PreCB = .sbss:0x8044B934; // type:object size:0x4 scope:global align:4 data:4byte -PostCB = .sbss:0x8044B938; // type:object size:0x4 scope:global align:4 data:4byte -PositionCallback = .sbss:0x8044B93C; // type:object size:0x4 scope:global align:4 data:4byte -encoderType = .sbss:0x8044B940; // type:object size:0x4 scope:global align:4 data:4byte -displayOffsetH = .sbss:0x8044B944; // type:object size:0x2 scope:global align:2 data:2byte -displayOffsetV = .sbss:0x8044B946; // type:object size:0x2 scope:global align:2 data:2byte -changeMode = .sbss:0x8044B948; // type:object size:0x4 scope:global align:4 data:4byte -changed = .sbss:0x8044B950; // type:object size:0x8 scope:global align:4 data:4byte -shdwChangeMode = .sbss:0x8044B958; // type:object size:0x4 scope:global align:4 data:4byte -shdwChanged = .sbss:0x8044B960; // type:object size:0x8 scope:global align:4 data:4byte -CurrTiming = .sbss:0x8044B968; // type:object size:0x4 scope:global align:4 data:4byte -CurrTvMode = .sbss:0x8044B96C; // type:object size:0x4 scope:global align:4 data:4byte -NextBufAddr = .sbss:0x8044B970; // type:object size:0x4 scope:global align:4 data:4byte -CurrBufAddr = .sbss:0x8044B974; // type:object size:0x4 scope:global align:4 data:4byte -FBSet = .sbss:0x8044B978; // type:object size:0x4 scope:global align:4 data:4byte -timingExtra = .sbss:0x8044B97C; // type:object size:0x4 scope:global align:4 data:4byte +executing = .sbss:0x8044B8B8; // type:object size:0x4 scope:local align:4 data:4byte +IDShouldBe = .sbss:0x8044B8BC; // type:object size:0x4 scope:local align:4 data:4byte +bootInfo = .sbss:0x8044B8C0; // type:object size:0x4 scope:local align:4 data:4byte +PauseFlag = .sbss:0x8044B8C4; // type:object size:0x4 scope:local align:4 data:4byte +PausingFlag = .sbss:0x8044B8C8; // type:object size:0x4 scope:local align:4 data:4byte +AutoFinishing = .sbss:0x8044B8CC; // type:object size:0x4 scope:local align:4 data:4byte +FatalErrorFlag = .sbss:0x8044B8D0; // type:object size:0x4 scope:local align:4 data:4byte +CurrCommand = .sbss:0x8044B8D4; // type:object size:0x4 scope:local align:4 data:4byte +Canceling = .sbss:0x8044B8D8; // type:object size:0x4 scope:local align:4 data:4byte +CancelCallback = .sbss:0x8044B8DC; // type:object size:0x4 scope:local align:4 data:4byte +ResumeFromHere = .sbss:0x8044B8E0; // type:object size:0x4 scope:local align:4 data:4byte +CancelLastError = .sbss:0x8044B8E4; // type:object size:0x4 scope:local align:4 data:4byte +LastError = .sbss:0x8044B8E8; // type:object size:0x4 scope:local align:4 data:4byte +NumInternalRetry = .sbss:0x8044B8EC; // type:object size:0x4 scope:local align:4 data:4byte +ResetRequired = .sbss:0x8044B8F0; // type:object size:0x4 scope:local align:4 data:4byte +FirstTimeInBootrom = .sbss:0x8044B8F4; // type:object size:0x4 scope:local align:4 data:4byte +MotorState = .sbss:0x8044B8F8; // type:object size:0x4 scope:local align:4 data:4byte +DVDInitialized = .sbss:0x8044B8FC; // type:object size:0x4 scope:local align:4 data:4byte +LastState = .sbss:0x8044B900; // type:object size:0x4 scope:global align:4 data:4byte +FatalFunc = .sbss:0x8044B908; // type:object size:0x4 scope:local align:4 data:4byte +status = .sbss:0x8044B910; // type:object size:0x4 scope:local align:4 data:4byte +bb2 = .sbss:0x8044B914; // type:object size:0x4 scope:local align:4 data:4byte +idTmp = .sbss:0x8044B918; // type:object size:0x4 scope:local align:4 data:4byte +IsInitialized = .sbss:0x8044B920; // type:object size:0x4 scope:local align:4 data:4byte +retraceCount = .sbss:0x8044B924; // type:object size:0x4 scope:local align:4 data:4byte +flushFlag = .sbss:0x8044B928; // type:object size:0x4 scope:local align:4 data:4byte +retraceQueue = .sbss:0x8044B92C; // type:object size:0x8 scope:local align:4 +PreCB = .sbss:0x8044B934; // type:object size:0x4 scope:local align:4 data:4byte +PostCB = .sbss:0x8044B938; // type:object size:0x4 scope:local align:4 data:4byte +PositionCallback = .sbss:0x8044B93C; // type:object size:0x4 scope:local align:4 data:4byte +encoderType = .sbss:0x8044B940; // type:object size:0x4 scope:local align:4 data:4byte +displayOffsetH = .sbss:0x8044B944; // type:object size:0x2 scope:local align:2 data:2byte +displayOffsetV = .sbss:0x8044B946; // type:object size:0x2 scope:local align:2 data:2byte +changeMode = .sbss:0x8044B948; // type:object size:0x4 scope:local align:4 data:4byte +changed = .sbss:0x8044B950; // type:object size:0x8 scope:local align:4 data:4byte +shdwChangeMode = .sbss:0x8044B958; // type:object size:0x4 scope:local align:4 data:4byte +shdwChanged = .sbss:0x8044B960; // type:object size:0x8 scope:local align:4 data:4byte +CurrTiming = .sbss:0x8044B968; // type:object size:0x4 scope:local align:4 data:4byte +CurrTvMode = .sbss:0x8044B96C; // type:object size:0x4 scope:local align:4 data:4byte +NextBufAddr = .sbss:0x8044B970; // type:object size:0x4 scope:local align:4 data:4byte +CurrBufAddr = .sbss:0x8044B974; // type:object size:0x4 scope:local align:4 data:4byte +FBSet = .sbss:0x8044B978; // type:object size:0x4 scope:local align:4 data:4byte +timingExtra = .sbss:0x8044B97C; // type:object size:0x4 scope:local align:4 data:4byte message$351 = .sbss:0x8044B980; // type:object size:0x4 scope:local align:4 data:4byte -Initialized = .sbss:0x8044B988; // type:object size:0x4 scope:global align:4 data:4byte -EnabledBits = .sbss:0x8044B98C; // type:object size:0x4 scope:global align:4 data:4byte -ResettingBits = .sbss:0x8044B990; // type:object size:0x4 scope:global align:4 data:4byte -RecalibrateBits = .sbss:0x8044B994; // type:object size:0x4 scope:global align:4 data:4byte -WaitingBits = .sbss:0x8044B998; // type:object size:0x4 scope:global align:4 data:4byte -CheckingBits = .sbss:0x8044B99C; // type:object size:0x4 scope:global align:4 data:4byte -PendingBits = .sbss:0x8044B9A0; // type:object size:0x4 scope:global align:4 data:4byte -BarrelBits = .sbss:0x8044B9A4; // type:object size:0x4 scope:global align:4 data:4byte -SamplingCallback = .sbss:0x8044B9A8; // type:object size:0x4 scope:global align:4 data:4byte +Initialized = .sbss:0x8044B988; // type:object size:0x4 scope:local align:4 data:4byte +EnabledBits = .sbss:0x8044B98C; // type:object size:0x4 scope:local align:4 data:4byte +ResettingBits = .sbss:0x8044B990; // type:object size:0x4 scope:local align:4 data:4byte +RecalibrateBits = .sbss:0x8044B994; // type:object size:0x4 scope:local align:4 data:4byte +WaitingBits = .sbss:0x8044B998; // type:object size:0x4 scope:local align:4 data:4byte +CheckingBits = .sbss:0x8044B99C; // type:object size:0x4 scope:local align:4 data:4byte +PendingBits = .sbss:0x8044B9A0; // type:object size:0x4 scope:local align:4 data:4byte +BarrelBits = .sbss:0x8044B9A4; // type:object size:0x4 scope:local align:4 data:4byte +SamplingCallback = .sbss:0x8044B9A8; // type:object size:0x4 scope:local align:4 data:4byte recalibrated$388 = .sbss:0x8044B9AC; // type:object size:0x4 scope:local align:4 data:4byte __PADSpec = .sbss:0x8044B9B0; // type:object size:0x4 scope:global align:4 data:4byte -__AIS_Callback = .sbss:0x8044B9B8; // type:object size:0x4 scope:global align:4 data:4byte -__AID_Callback = .sbss:0x8044B9BC; // type:object size:0x4 scope:global align:4 data:4byte -__CallbackStack = .sbss:0x8044B9C0; // type:object size:0x4 scope:global align:4 data:4byte -__OldStack = .sbss:0x8044B9C4; // type:object size:0x4 scope:global align:4 data:4byte -__AI_init_flag = .sbss:0x8044B9C8; // type:object size:0x4 scope:global align:4 data:4byte -__AID_Active = .sbss:0x8044B9CC; // type:object size:0x4 scope:global align:4 data:4byte -bound_32KHz = .sbss:0x8044B9D0; // type:object size:0x8 scope:global align:4 data:4byte -bound_48KHz = .sbss:0x8044B9D8; // type:object size:0x8 scope:global align:4 data:4byte -min_wait = .sbss:0x8044B9E0; // type:object size:0x8 scope:global align:4 data:4byte -max_wait = .sbss:0x8044B9E8; // type:object size:0x8 scope:global align:4 data:4byte -buffer = .sbss:0x8044B9F0; // type:object size:0x8 scope:global align:4 data:4byte -__AR_Callback = .sbss:0x8044B9F8; // type:object size:0x4 scope:global align:4 data:4byte -__AR_Size = .sbss:0x8044B9FC; // type:object size:0x4 scope:global align:4 data:4byte -__AR_InternalSize = .sbss:0x8044BA00; // type:object size:0x4 scope:global align:4 data:4byte -__AR_ExpansionSize = .sbss:0x8044BA04; // type:object size:0x4 scope:global align:4 data:4byte -__AR_StackPointer = .sbss:0x8044BA08; // type:object size:0x4 scope:global align:4 data:4byte -__AR_FreeBlocks = .sbss:0x8044BA0C; // type:object size:0x4 scope:global align:4 data:4byte -__AR_BlockLength = .sbss:0x8044BA10; // type:object size:0x4 scope:global align:4 data:4byte -__AR_init_flag = .sbss:0x8044BA14; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestQueueHi = .sbss:0x8044BA18; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestTailHi = .sbss:0x8044BA1C; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestQueueLo = .sbss:0x8044BA20; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestTailLo = .sbss:0x8044BA24; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestPendingHi = .sbss:0x8044BA28; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestPendingLo = .sbss:0x8044BA2C; // type:object size:0x4 scope:global align:4 data:4byte -__ARQCallbackHi = .sbss:0x8044BA30; // type:object size:0x4 scope:global align:4 data:4byte -__ARQCallbackLo = .sbss:0x8044BA34; // type:object size:0x4 scope:global align:4 data:4byte -__ARQChunkSize = .sbss:0x8044BA38; // type:object size:0x4 scope:global align:4 data:4byte -__ARQ_init_flag = .sbss:0x8044BA3C; // type:object size:0x4 scope:global align:4 data:4byte -__DSP_init_flag = .sbss:0x8044BA40; // type:object size:0x4 scope:global align:4 data:4byte +__AIS_Callback = .sbss:0x8044B9B8; // type:object size:0x4 scope:local align:4 data:4byte +__AID_Callback = .sbss:0x8044B9BC; // type:object size:0x4 scope:local align:4 data:4byte +__CallbackStack = .sbss:0x8044B9C0; // type:object size:0x4 scope:local align:4 data:4byte +__OldStack = .sbss:0x8044B9C4; // type:object size:0x4 scope:local align:4 data:4byte +__AI_init_flag = .sbss:0x8044B9C8; // type:object size:0x4 scope:local align:4 data:4byte +__AID_Active = .sbss:0x8044B9CC; // type:object size:0x4 scope:local align:4 data:4byte +bound_32KHz = .sbss:0x8044B9D0; // type:object size:0x8 scope:local align:4 data:4byte +bound_48KHz = .sbss:0x8044B9D8; // type:object size:0x8 scope:local align:4 data:4byte +min_wait = .sbss:0x8044B9E0; // type:object size:0x8 scope:local align:4 data:4byte +max_wait = .sbss:0x8044B9E8; // type:object size:0x8 scope:local align:4 data:4byte +buffer = .sbss:0x8044B9F0; // type:object size:0x8 scope:local align:4 data:4byte +__AR_Callback = .sbss:0x8044B9F8; // type:object size:0x4 scope:local align:4 data:4byte +__AR_Size = .sbss:0x8044B9FC; // type:object size:0x4 scope:local align:4 data:4byte +__AR_InternalSize = .sbss:0x8044BA00; // type:object size:0x4 scope:local align:4 data:4byte +__AR_ExpansionSize = .sbss:0x8044BA04; // type:object size:0x4 scope:local align:4 data:4byte +__AR_StackPointer = .sbss:0x8044BA08; // type:object size:0x4 scope:local align:4 data:4byte +__AR_FreeBlocks = .sbss:0x8044BA0C; // type:object size:0x4 scope:local align:4 data:4byte +__AR_BlockLength = .sbss:0x8044BA10; // type:object size:0x4 scope:local align:4 data:4byte +__AR_init_flag = .sbss:0x8044BA14; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestQueueHi = .sbss:0x8044BA18; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestTailHi = .sbss:0x8044BA1C; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestQueueLo = .sbss:0x8044BA20; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestTailLo = .sbss:0x8044BA24; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestPendingHi = .sbss:0x8044BA28; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestPendingLo = .sbss:0x8044BA2C; // type:object size:0x4 scope:local align:4 data:4byte +__ARQCallbackHi = .sbss:0x8044BA30; // type:object size:0x4 scope:local align:4 data:4byte +__ARQCallbackLo = .sbss:0x8044BA34; // type:object size:0x4 scope:local align:4 data:4byte +__ARQChunkSize = .sbss:0x8044BA38; // type:object size:0x4 scope:local align:4 data:4byte +__ARQ_init_flag = .sbss:0x8044BA3C; // type:object size:0x4 scope:local align:4 data:4byte +__DSP_init_flag = .sbss:0x8044BA40; // type:object size:0x4 scope:local align:4 data:4byte __DSP_tmp_task = .sbss:0x8044BA48; // type:object size:0x4 scope:global align:4 data:4byte __DSP_last_task = .sbss:0x8044BA4C; // type:object size:0x4 scope:global align:4 data:4byte __DSP_first_task = .sbss:0x8044BA50; // type:object size:0x4 scope:global align:4 data:4byte __DSP_curr_task = .sbss:0x8044BA54; // type:object size:0x4 scope:global align:4 data:4byte -__CARDEncode = .sbss:0x8044BA58; // type:object size:0x2 scope:global align:2 data:2byte -__CARDFastMode = .sbss:0x8044BA5A; // type:object size:0x2 scope:global align:2 data:2byte +__CARDEncode = .sbss:0x8044BA58; // type:object size:0x2 scope:local align:2 data:2byte +__CARDFastMode = .sbss:0x8044BA5A; // type:object size:0x2 scope:local align:2 data:2byte __piReg = .sbss:0x8044BA60; // type:object size:0x4 scope:global align:4 data:4byte __cpReg = .sbss:0x8044BA64; // type:object size:0x4 scope:global align:4 data:4byte __peReg = .sbss:0x8044BA68; // type:object size:0x4 scope:global align:4 data:4byte __memReg = .sbss:0x8044BA6C; // type:object size:0x4 scope:global align:4 data:4byte -peCount$35 = .sbss:0x8044BA70; // type:object size:0x4 scope:local align:4 data:4byte -time$36 = .sbss:0x8044BA78; // type:object size:0x8 scope:local align:4 data:4byte -calledOnce$37 = .sbss:0x8044BA80; // type:object size:0x4 scope:local align:4 data:4byte -resetFuncRegistered$145 = .sbss:0x8044BA84; // type:object size:0x4 scope:local align:4 data:4byte -CPUFifo = .sbss:0x8044BA88; // type:object size:0x4 scope:global align:4 data:4byte -GPFifo = .sbss:0x8044BA8C; // type:object size:0x4 scope:global align:4 data:4byte -__GXCurrentThread = .sbss:0x8044BA90; // type:object size:0x4 scope:global align:4 data:4byte +peCount = .sbss:0x8044BA70; // type:object size:0x4 scope:global align:4 data:4byte +time = .sbss:0x8044BA78; // type:object size:0x8 scope:global align:4 data:4byte +calledOnce = .sbss:0x8044BA80; // type:object size:0x4 scope:global align:4 data:4byte +resetFuncRegistered = .sbss:0x8044BA84; // type:object size:0x4 scope:global align:4 data:4byte +CPUFifo = .sbss:0x8044BA88; // type:object size:0x4 scope:local align:4 data:4byte +GPFifo = .sbss:0x8044BA8C; // type:object size:0x4 scope:local align:4 data:4byte +__GXCurrentThread = .sbss:0x8044BA90; // type:object size:0x4 scope:local align:4 data:4byte CPGPLinked = .sbss:0x8044BA94; // type:object size:0x1 scope:local align:1 data:byte -GXOverflowSuspendInProgress = .sbss:0x8044BA98; // type:object size:0x4 scope:global align:4 data:4byte -BreakPointCB = .sbss:0x8044BA9C; // type:object size:0x4 scope:global align:4 data:4byte -__GXOverflowCount = .sbss:0x8044BAA0; // type:object size:0x4 scope:global align:4 data:4byte -TokenCB = .sbss:0x8044BAA8; // type:object size:0x4 scope:global align:4 data:4byte -DrawDoneCB = .sbss:0x8044BAAC; // type:object size:0x4 scope:global align:4 data:4byte +GXOverflowSuspendInProgress = .sbss:0x8044BA98; // type:object size:0x4 scope:local align:4 data:4byte +BreakPointCB = .sbss:0x8044BA9C; // type:object size:0x4 scope:local align:4 data:4byte +__GXOverflowCount = .sbss:0x8044BAA0; // type:object size:0x4 scope:local align:4 data:4byte +TokenCB = .sbss:0x8044BAA8; // type:object size:0x4 scope:local align:4 data:4byte +DrawDoneCB = .sbss:0x8044BAAC; // type:object size:0x4 scope:local align:4 data:4byte DrawDone = .sbss:0x8044BAB0; // type:object size:0x1 scope:local align:1 data:byte -FinishQueue = .sbss:0x8044BAB4; // type:object size:0x8 scope:global align:4 +FinishQueue = .sbss:0x8044BAB4; // type:object size:0x8 scope:local align:4 __GDCurrentDL = .sbss:0x8044BAC0; // type:object size:0x4 scope:global align:4 data:4byte -overflowcb = .sbss:0x8044BAC4; // type:object size:0x4 scope:global align:4 data:4byte +overflowcb = .sbss:0x8044BAC4; // type:object size:0x4 scope:local align:4 data:4byte __global_destructor_chain = .sbss:0x8044BAC8; // type:object size:0x4 scope:global align:4 data:4byte -__aborting = .sbss:0x8044BAD0; // type:object size:0x4 scope:global align:4 data:4byte -__atexit_curr_func = .sbss:0x8044BAD4; // type:object size:0x4 scope:global align:4 data:4byte +__aborting = .sbss:0x8044BAD0; // type:object size:0x4 scope:local align:4 data:4byte +__atexit_curr_func = .sbss:0x8044BAD4; // type:object size:0x4 scope:local align:4 data:4byte __stdio_exit = .sbss:0x8044BAD8; // type:object size:0x4 scope:global align:4 data:4byte -__console_exit = .sbss:0x8044BADC; // type:object size:0x4 scope:global align:4 data:4byte +__console_exit = .sbss:0x8044BADC; // type:object size:0x4 scope:local align:4 data:4byte init$49 = .sbss:0x8044BAE0; // type:object size:0x1 scope:local align:1 data:byte errno = .sbss:0x8044BAE8; // type:object size:0x4 scope:global align:4 data:4byte initialized$60 = .sbss:0x8044BAF0; // type:object size:0x4 scope:local align:4 data:4byte gTRKInputPendingPtr = .sbss:0x8044BAF8; // type:object size:0x4 scope:global align:4 data:4byte gIsInitialized = .sbss:0x8044BB00; // type:object size:0x4 scope:local align:4 data:4byte gIsInitialized = .sbss:0x8044BB08; // type:object size:0x4 scope:local align:4 data:4byte -MTRCallback = .sbss:0x8044BB10; // type:object size:0x4 scope:global align:4 data:4byte -DBGCallback = .sbss:0x8044BB14; // type:object size:0x4 scope:global align:4 data:4byte -SendMailData = .sbss:0x8044BB18; // type:object size:0x4 scope:global align:4 data:4byte -RecvDataLeng = .sbss:0x8044BB1C; // type:object size:0x4 scope:global align:4 data:4byte -pEXIInputFlag = .sbss:0x8044BB20; // type:object size:0x4 scope:global align:4 data:4byte +MTRCallback = .sbss:0x8044BB10; // type:object size:0x4 scope:local align:4 data:4byte +DBGCallback = .sbss:0x8044BB14; // type:object size:0x4 scope:local align:4 data:4byte +SendMailData = .sbss:0x8044BB18; // type:object size:0x4 scope:local align:4 data:4byte +RecvDataLeng = .sbss:0x8044BB1C; // type:object size:0x4 scope:local align:4 data:4byte +pEXIInputFlag = .sbss:0x8044BB20; // type:object size:0x4 scope:local align:4 data:4byte EXIInputFlag = .sbss:0x8044BB24; // type:object size:0x1 scope:local align:1 data:byte @3884 = .sdata2:0x8044BB40; // type:object size:0x4 scope:local align:4 data:float @3885 = .sdata2:0x8044BB44; // type:object size:0x4 scope:local align:4 data:float @@ -22684,22 +22720,22 @@ l_mapBaseColor$4239 = .sdata2:0x8044BF88; // type:object size:0x4 scope:local al @4264 = .sdata2:0x8044BF8C; // type:object size:0x4 scope:local align:4 data:float @4265 = .sdata2:0x8044BF90; // type:object size:0x4 scope:local align:4 data:float @4266 = .sdata2:0x8044BF94; // type:object size:0x4 scope:local align:4 data:float -l_doorWhite = .sdata2:0x8044BF98; // type:object size:0x4 scope:global align:4 data:4byte -l_doorWhiteNoStay = .sdata2:0x8044BF9C; // type:object size:0x4 scope:global align:4 data:4byte -l_doorWhite2 = .sdata2:0x8044BFA0; // type:object size:0x4 scope:global align:4 data:4byte -l_doorWhiteNoStay2 = .sdata2:0x8044BFA4; // type:object size:0x4 scope:global align:4 data:4byte +l_doorWhite = .sdata2:0x8044BF98; // type:object size:0x4 scope:local align:4 data:4byte +l_doorWhiteNoStay = .sdata2:0x8044BF9C; // type:object size:0x4 scope:local align:4 data:4byte +l_doorWhite2 = .sdata2:0x8044BFA0; // type:object size:0x4 scope:local align:4 data:4byte +l_doorWhiteNoStay2 = .sdata2:0x8044BFA4; // type:object size:0x4 scope:local align:4 data:4byte l_tex0$4406 = .sdata2:0x8044BFA8; // type:object size:0x8 scope:local align:4 @4484 = .sdata2:0x8044BFB0; // type:object size:0x4 scope:local align:4 data:float -l_entranceStartColor = .sdata2:0x8044BFB4; // type:object size:0x4 scope:global align:4 -l_entranceLv8StartColor = .sdata2:0x8044BFB8; // type:object size:0x4 scope:global align:4 -l_treasureStartColor = .sdata2:0x8044BFBC; // type:object size:0x4 scope:global align:4 data:byte -l_smallKeyStartColor = .sdata2:0x8044BFC0; // type:object size:0x4 scope:global align:4 -l_bossStartColor = .sdata2:0x8044BFC4; // type:object size:0x4 scope:global align:4 -l_npc0StartColor = .sdata2:0x8044BFC8; // type:object size:0x4 scope:global align:4 -l_destinationStartColor = .sdata2:0x8044BFCC; // type:object size:0x4 scope:global align:4 -l_npcYkmStartColor = .sdata2:0x8044BFD0; // type:object size:0x4 scope:global align:4 -l_npcYkwStartColor = .sdata2:0x8044BFD4; // type:object size:0x4 scope:global align:4 -l_tksStartColor = .sdata2:0x8044BFD8; // type:object size:0x4 scope:global align:4 +l_entranceStartColor = .sdata2:0x8044BFB4; // type:object size:0x4 scope:local align:4 +l_entranceLv8StartColor = .sdata2:0x8044BFB8; // type:object size:0x4 scope:local align:4 +l_treasureStartColor = .sdata2:0x8044BFBC; // type:object size:0x4 scope:local align:4 data:byte +l_smallKeyStartColor = .sdata2:0x8044BFC0; // type:object size:0x4 scope:local align:4 +l_bossStartColor = .sdata2:0x8044BFC4; // type:object size:0x4 scope:local align:4 +l_npc0StartColor = .sdata2:0x8044BFC8; // type:object size:0x4 scope:local align:4 +l_destinationStartColor = .sdata2:0x8044BFCC; // type:object size:0x4 scope:local align:4 +l_npcYkmStartColor = .sdata2:0x8044BFD0; // type:object size:0x4 scope:local align:4 +l_npcYkwStartColor = .sdata2:0x8044BFD4; // type:object size:0x4 scope:local align:4 +l_tksStartColor = .sdata2:0x8044BFD8; // type:object size:0x4 scope:local align:4 l_iconTex0$4523 = .sdata2:0x8044BFDC; // type:object size:0x8 scope:local align:4 tboxNotStayColor$4542 = .sdata2:0x8044BFE4; // type:object size:0x4 scope:local align:4 data:byte @4600 = .sdata2:0x8044BFE8; // type:object size:0x4 scope:local align:4 data:float @@ -22811,7 +22847,7 @@ particleID$5076 = .sdata2:0x8044C0D0; // type:object size:0x4 scope:local align: @5551 = .sdata2:0x8044C1F8; // type:object size:0x4 scope:local align:4 data:float @5552 = .sdata2:0x8044C1FC; // type:object size:0x4 scope:local align:4 data:float @5553 = .sdata2:0x8044C200; // type:object size:0x4 scope:local align:4 data:float -l_zSortId$5668 = .sdata2:0x8044C204; // type:object size:0x6 scope:local align:4 data:byte +l_zSortId = .sdata2:0x8044C204; // type:object size:0x6 scope:local align:4 data:byte @5747 = .sdata2:0x8044C20C; // type:object size:0x4 scope:local align:4 data:float @5809 = .sdata2:0x8044C210; // type:object size:0x4 scope:local align:4 data:float @5810 = .sdata2:0x8044C214; // type:object size:0x4 scope:local align:4 data:float @@ -23659,8 +23695,8 @@ l_arcName = .sdata2:0x8044CDD8; // type:object size:0x6 scope:local align:4 data @21680 = .sdata2:0x8044D074; // type:object size:0x4 scope:local align:4 data:float @21736 = .sdata2:0x8044D078; // type:object size:0x4 scope:local align:4 data:float @22146 = .sdata2:0x8044D07C; // type:object size:0x4 scope:local align:4 data:float -data_80452F38 = .sdata2:0x8044D080; // type:object size:0x1 scope:local align:1 data:byte -data_80452F39 = .sdata2:0x8044D081; // type:object size:0x1 scope:local align:1 data:byte +data_80452F38$22150 = .sdata2:0x8044D080; // type:object size:0x1 scope:local align:1 data:byte +data_80452F39$22151 = .sdata2:0x8044D081; // type:object size:0x1 scope:local align:1 data:byte @22608 = .sdata2:0x8044D084; // type:object size:0x4 scope:local align:4 data:float @22609 = .sdata2:0x8044D088; // type:object size:0x4 scope:local align:4 data:float @23155 = .sdata2:0x8044D08C; // type:object size:0x4 scope:local align:4 data:float @@ -25429,7 +25465,7 @@ i_expID$6481 = .sdata2:0x8044E564; // type:object size:0x8 scope:local align:4 @3927 = .sdata2:0x8044F028; // type:object size:0x4 scope:local align:4 data:float @3928 = .sdata2:0x8044F02C; // type:object size:0x4 scope:local align:4 data:float @3930 = .sdata2:0x8044F030; // type:object size:0x8 scope:local align:4 data:double -T_JOINT_dylKeyTbl = .sdata2:0x8044F038; // type:object size:0x2 scope:global align:4 +T_JOINT_dylKeyTbl = .sdata2:0x8044F038; // type:object size:0x2 scope:local align:4 @4055 = .sdata2:0x8044F03C; // type:object size:0x4 scope:local align:4 data:float @4066 = .sdata2:0x8044F040; // type:object size:0x4 scope:local align:4 data:float @4067 = .sdata2:0x8044F044; // type:object size:0x4 scope:local align:4 data:float @@ -25532,32 +25568,32 @@ l_arcName = .sdata2:0x8044F110; // type:object size:0x7 scope:local align:4 data @2259 = .sdata2:0x8044F250; // type:object size:0x8 scope:local align:4 data:double @2273 = .sdata2:0x8044F258; // type:object size:0x4 scope:local align:4 data:float @2346 = .sdata2:0x8044F25C; // type:object size:0x4 scope:local align:4 data:float -BPCP_OUTCODE0 = .sdata2:0x8044F260; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE1 = .sdata2:0x8044F264; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE4 = .sdata2:0x8044F268; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE5 = .sdata2:0x8044F26C; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE2 = .sdata2:0x8044F270; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE3 = .sdata2:0x8044F274; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE0 = .sdata2:0x8044F278; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE1 = .sdata2:0x8044F27C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE2 = .sdata2:0x8044F280; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE3 = .sdata2:0x8044F284; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE4 = .sdata2:0x8044F288; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE5 = .sdata2:0x8044F28C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE6 = .sdata2:0x8044F290; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE7 = .sdata2:0x8044F294; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE8 = .sdata2:0x8044F298; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE9 = .sdata2:0x8044F29C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE10 = .sdata2:0x8044F2A0; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE11 = .sdata2:0x8044F2A4; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE0 = .sdata2:0x8044F2A8; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE1 = .sdata2:0x8044F2AC; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE2 = .sdata2:0x8044F2B0; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE3 = .sdata2:0x8044F2B4; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE4 = .sdata2:0x8044F2B8; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE5 = .sdata2:0x8044F2BC; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE6 = .sdata2:0x8044F2C0; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE7 = .sdata2:0x8044F2C4; // type:object size:0x4 scope:global align:4 data:4byte +BPCP_OUTCODE0 = .sdata2:0x8044F260; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE1 = .sdata2:0x8044F264; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE4 = .sdata2:0x8044F268; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE5 = .sdata2:0x8044F26C; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE2 = .sdata2:0x8044F270; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE3 = .sdata2:0x8044F274; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE0 = .sdata2:0x8044F278; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE1 = .sdata2:0x8044F27C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE2 = .sdata2:0x8044F280; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE3 = .sdata2:0x8044F284; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE4 = .sdata2:0x8044F288; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE5 = .sdata2:0x8044F28C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE6 = .sdata2:0x8044F290; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE7 = .sdata2:0x8044F294; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE8 = .sdata2:0x8044F298; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE9 = .sdata2:0x8044F29C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE10 = .sdata2:0x8044F2A0; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE11 = .sdata2:0x8044F2A4; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE0 = .sdata2:0x8044F2A8; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE1 = .sdata2:0x8044F2AC; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE2 = .sdata2:0x8044F2B0; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE3 = .sdata2:0x8044F2B4; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE4 = .sdata2:0x8044F2B8; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE5 = .sdata2:0x8044F2BC; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE6 = .sdata2:0x8044F2C0; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE7 = .sdata2:0x8044F2C4; // type:object size:0x4 scope:local align:4 data:4byte @3082 = .sdata2:0x8044F2C8; // type:object size:0x4 scope:local align:4 data:float @3205 = .sdata2:0x8044F2CC; // type:object size:0x4 scope:local align:4 data:float @3229 = .sdata2:0x8044F2D0; // type:object size:0x4 scope:local align:4 data:float @@ -25698,7 +25734,7 @@ sauVariableValue_2_DISTANCE_NEAR_FAR__Q27JStudio15TAdaptor_camera = .sdata2:0x80 sauVariableValue_2_RANGE_BEGIN_END__Q27JStudio12TAdaptor_fog = .sdata2:0x8044F5D8; // type:object size:0x8 scope:global align:4 sauVariableValue_2_DIRECTION_THETA_PHI__Q27JStudio14TAdaptor_light = .sdata2:0x8044F5E0; // type:object size:0x8 scope:global align:4 @1967 = .sdata2:0x8044F5E8; // type:object size:0x4 scope:local align:4 data:float -gu32Mask_TSequence_value_signExpansion__Q37JStudio3stb4data = .sdata2:0x8044F5F0; // type:object size:0x4 scope:global align:4 data:4byte +gu32Mask_TSequence_value_signExpansion__Q37JStudio3stb4data = .sdata2:0x8044F5F0; // type:object size:0x4 scope:local align:4 data:4byte ga4cSignature__Q37JStudio3stb4data = .sdata2:0x8044F5F8; // type:object size:0x4 scope:global align:4 data:string @1081 = .sdata2:0x8044F600; // type:object size:0x4 scope:local align:4 data:float @846 = .sdata2:0x8044F608; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZ2P01/config.yml b/config/GZ2P01/config.yml index 98ab9a50d0..ed3824393f 100644 --- a/config/GZ2P01/config.yml +++ b/config/GZ2P01/config.yml @@ -14,6 +14,12 @@ force_active: [ block_relocations: - source: .sdata:0x8045256c add_relocations: +- source: extab:0x80005624 + type: abs + target: __dt__26__partial_array_destructorFv +- source: extab:0x80005644 + type: abs + target: __dt__26__partial_array_destructorFv - source: .sdata:0x8045256c type: abs target: buffer__14mDoMtx_stack_c diff --git a/config/GZ2P01/rels/d_a_arrow/splits.txt b/config/GZ2P01/rels/d_a_arrow/splits.txt index 5066c91f19..7c1a6042c3 100644 --- a/config/GZ2P01/rels/d_a_arrow/splits.txt +++ b/config/GZ2P01/rels/d_a_arrow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_arrow.cpp: diff --git a/config/GZ2P01/rels/d_a_arrow/symbols.txt b/config/GZ2P01/rels/d_a_arrow/symbols.txt index b96d85fd30..230295cded 100644 --- a/config/GZ2P01/rels/d_a_arrow/symbols.txt +++ b/config/GZ2P01/rels/d_a_arrow/symbols.txt @@ -59,7 +59,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3768 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3768 = .rodata:0x00000000; // type:object size:0xC scope:local l_atCpsSrc = .rodata:0x0000000C; // type:object size:0x4C scope:global l_coSphSrc = .rodata:0x00000058; // type:object size:0x40 scope:global @4130 = .rodata:0x00000098; // type:object size:0x4 scope:local align:4 data:float @@ -111,7 +111,8 @@ tmpColor$5589 = .rodata:0x00000164; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000180; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_45_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4777 = .data:0x00000020; // type:object size:0xC scope:local data:4byte @4874 = .data:0x0000002C; // type:object size:0xC scope:local @4974 = .data:0x00000038; // type:object size:0xC scope:local @@ -148,6 +149,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @4612 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte localOffset$4611 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_b_bh/splits.txt b/config/GZ2P01/rels/d_a_b_bh/splits.txt index afc6dbfe7e..55331d74cd 100644 --- a/config/GZ2P01/rels/d_a_b_bh/splits.txt +++ b/config/GZ2P01/rels/d_a_b_bh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_bh.cpp: diff --git a/config/GZ2P01/rels/d_a_b_bh/symbols.txt b/config/GZ2P01/rels/d_a_b_bh/symbols.txt index fe1e9e4029..414a56ece1 100644 --- a/config/GZ2P01/rels/d_a_b_bh/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_bh/symbols.txt @@ -128,7 +128,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_138_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3759 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte bh = .bss:0x0000006C; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_b_bq/splits.txt b/config/GZ2P01/rels/d_a_b_bq/splits.txt index bcc48ab376..5c0f9c5a63 100644 --- a/config/GZ2P01/rels/d_a_b_bq/splits.txt +++ b/config/GZ2P01/rels/d_a_b_bq/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_bq.cpp: diff --git a/config/GZ2P01/rels/d_a_b_bq/symbols.txt b/config/GZ2P01/rels/d_a_b_bq/symbols.txt index 838f24ce50..da5dfcbfbe 100644 --- a/config/GZ2P01/rels/d_a_b_bq/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_bq/symbols.txt @@ -260,7 +260,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000002E4; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_139_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4431 = .data:0x00000020; // type:object size:0xA8 scope:local fireno$4463 = .data:0x000000C8; // type:object size:0x8 scope:local fireno$4473 = .data:0x000000D0; // type:object size:0x4 scope:local @@ -291,7 +292,7 @@ __vt__8cM3dGAab = .data:0x000004AC; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000004B8; // type:object size:0xC scope:global __vt__12daB_BQ_HIO_c = .data:0x000004C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_139_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_805BAD50 = .bss:0x00000008; // type:object size:0x1 data:byte @3811 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte -lbl_139_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +data_805BAD70 = .bss:0x00000028; // type:object size:0x1 data:byte diff --git a/config/GZ2P01/rels/d_a_b_dr/splits.txt b/config/GZ2P01/rels/d_a_b_dr/splits.txt index 6bfa586d0a..0ecd3a4dcc 100644 --- a/config/GZ2P01/rels/d_a_b_dr/splits.txt +++ b/config/GZ2P01/rels/d_a_b_dr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_dr.cpp: diff --git a/config/GZ2P01/rels/d_a_b_dr/symbols.txt b/config/GZ2P01/rels/d_a_b_dr/symbols.txt index 62243b220e..25960313cb 100644 --- a/config/GZ2P01/rels/d_a_b_dr/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_dr/symbols.txt @@ -225,7 +225,8 @@ DOWN_SPH_DT$8062 = .rodata:0x000004FC; // type:object size:0xB4 scope:local alig @stringBase0 = .rodata:0x000005CC; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_140_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_dr_week_src__22@unnamed@d_a_b_dr_cpp@ = .data:0x00000020; // type:object size:0x44 scope:global cc_dr_tail_src__22@unnamed@d_a_b_dr_cpp@ = .data:0x00000064; // type:object size:0x40 scope:global cc_dr_breath_at_src__22@unnamed@d_a_b_dr_cpp@ = .data:0x000000A4; // type:object size:0x40 scope:global @@ -278,10 +279,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_140_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3795 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x68 scope:global data:byte -lbl_140_bss_BC = .bss:0x000000BC; // type:object size:0x1 data:byte +data_805C7974 = .bss:0x000000BC; // type:object size:0x1 scope:local data:byte @6782 = .bss:0x000000C0; // type:object size:0xC scope:local @6785 = .bss:0x000000D0; // type:object size:0xC scope:local @6786 = .bss:0x000000DC; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_b_dre/splits.txt b/config/GZ2P01/rels/d_a_b_dre/splits.txt index 31c56cd8e5..f7a33f0d9e 100644 --- a/config/GZ2P01/rels/d_a_b_dre/splits.txt +++ b/config/GZ2P01/rels/d_a_b_dre/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_dre.cpp: diff --git a/config/GZ2P01/rels/d_a_b_dre/symbols.txt b/config/GZ2P01/rels/d_a_b_dre/symbols.txt index ea01563666..40a45c3c9f 100644 --- a/config/GZ2P01/rels/d_a_b_dre/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_dre/symbols.txt @@ -166,7 +166,7 @@ s_HeadPos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000060; // type:object size:0xC s_BodyPos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000078; // type:object size:0xC scope:global @3770 = .bss:0x00000084; // type:object size:0xC scope:local s_TalePos__23@unnamed@d_a_b_dre_cpp@ = .bss:0x00000090; // type:object size:0xC scope:global -lbl_141_bss_9C = .bss:0x0000009C; // type:object size:0x1 data:byte +data_805CB0D4 = .bss:0x0000009C; // type:object size:0x1 scope:local data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000A8; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_b_ds/splits.txt b/config/GZ2P01/rels/d_a_b_ds/splits.txt index 8dd0cb3279..f2729a483b 100644 --- a/config/GZ2P01/rels/d_a_b_ds/splits.txt +++ b/config/GZ2P01/rels/d_a_b_ds/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_ds.cpp: diff --git a/config/GZ2P01/rels/d_a_b_ds/symbols.txt b/config/GZ2P01/rels/d_a_b_ds/symbols.txt index 6e0793c957..c29f2ba7f5 100644 --- a/config/GZ2P01/rels/d_a_b_ds/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_ds/symbols.txt @@ -449,7 +449,8 @@ B2_ETC_CC_DT$10792 = .rodata:0x0000078C; // type:object size:0x28 scope:local al @stringBase0 = .rodata:0x000007D8; // type:object size:0x1B scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_142_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3811 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3812 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3820 = .data:0x00000030; // type:object size:0x6 scope:local @@ -521,18 +522,20 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_142_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3948 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x50 scope:global data:byte handL_ang = .bss:0x000000A4; // type:object size:0x2 scope:global handR_ang = .bss:0x000000A6; // type:object size:0x2 scope:global handX_ang = .bss:0x000000A8; // type:object size:0x2 scope:global -lbl_142_bss_AA = .bss:0x000000AA; // type:object size:0x1 data:byte +breathTimerBase = .bss:0x000000AA; // type:object size:0x1 scope:local data:byte @5249 = .bss:0x000000AC; // type:object size:0xC scope:local +init$0000 = .bss:0x000000B8; // type:object size:0x1 scope:local align:1 data:byte @5252 = .bss:0x000000BC; // type:object size:0xC scope:local @5253 = .bss:0x000000C8; // type:object size:0xC scope:local mOpPlayerDt$5248 = .bss:0x000000D4; // type:object size:0x24 scope:local @5255 = .bss:0x000000F8; // type:object size:0xC scope:local +init$0001 = .bss:0x00000104; // type:object size:0x1 scope:local align:1 data:byte @5258 = .bss:0x00000108; // type:object size:0xC scope:local @5259 = .bss:0x00000114; // type:object size:0xC scope:local @5260 = .bss:0x00000120; // type:object size:0xC scope:local @@ -549,9 +552,11 @@ mOpPlayerDt$5248 = .bss:0x000000D4; // type:object size:0x24 scope:local @5271 = .bss:0x000001A4; // type:object size:0xC scope:local mOpCenterDt$5254 = .bss:0x000001B0; // type:object size:0xB4 scope:local @5273 = .bss:0x00000264; // type:object size:0xC scope:local +init$0002 = .bss:0x00000270; // type:object size:0x1 scope:local align:1 data:byte @5276 = .bss:0x00000274; // type:object size:0xC scope:local mOpCenterBodyDt$5272 = .bss:0x00000280; // type:object size:0x18 scope:local @5278 = .bss:0x00000298; // type:object size:0xC scope:local +init$0003 = .bss:0x000002A4; // type:object size:0x1 scope:local align:1 data:byte @5281 = .bss:0x000002A8; // type:object size:0xC scope:local @5282 = .bss:0x000002B4; // type:object size:0xC scope:local @5283 = .bss:0x000002C0; // type:object size:0xC scope:local @@ -568,25 +573,30 @@ mOpCenterBodyDt$5272 = .bss:0x00000280; // type:object size:0x18 scope:local @5294 = .bss:0x00000344; // type:object size:0xC scope:local mOpEyeDt$5277 = .bss:0x00000350; // type:object size:0xB4 scope:local @5296 = .bss:0x00000404; // type:object size:0xC scope:local +init$0004 = .bss:0x00000410; // type:object size:0x1 scope:local align:1 data:byte @5299 = .bss:0x00000414; // type:object size:0xC scope:local mOpEyeBodyDt$5295 = .bss:0x00000420; // type:object size:0x18 scope:local @6354 = .bss:0x00000438; // type:object size:0xC scope:local +init$0005 = .bss:0x00000444; // type:object size:0x1 scope:local align:1 data:byte @6357 = .bss:0x00000448; // type:object size:0xC scope:local @6358 = .bss:0x00000454; // type:object size:0xC scope:local @6359 = .bss:0x00000460; // type:object size:0xC scope:local @6360 = .bss:0x0000046C; // type:object size:0xC scope:local down_center_dt$6353 = .bss:0x00000478; // type:object size:0x3C scope:local @6362 = .bss:0x000004B4; // type:object size:0xC scope:local +init$0006 = .bss:0x000004C0; // type:object size:0x1 scope:local align:1 data:byte @6365 = .bss:0x000004C4; // type:object size:0xC scope:local @6366 = .bss:0x000004D0; // type:object size:0xC scope:local @6367 = .bss:0x000004DC; // type:object size:0xC scope:local @6368 = .bss:0x000004E8; // type:object size:0xC scope:local down_eye_dt$6361 = .bss:0x000004F4; // type:object size:0x3C scope:local @7447 = .bss:0x00000530; // type:object size:0xC scope:local +init$0007 = .bss:0x0000053C; // type:object size:0x1 scope:local align:1 data:byte @7450 = .bss:0x00000540; // type:object size:0xC scope:local @7451 = .bss:0x0000054C; // type:object size:0xC scope:local mOp2PlayerDt$7446 = .bss:0x00000558; // type:object size:0x24 scope:local @7453 = .bss:0x0000057C; // type:object size:0xC scope:local +init$0008 = .bss:0x00000588; // type:object size:0x1 scope:local align:1 data:byte @7456 = .bss:0x0000058C; // type:object size:0xC scope:local @7457 = .bss:0x00000598; // type:object size:0xC scope:local @7458 = .bss:0x000005A4; // type:object size:0xC scope:local @@ -595,6 +605,7 @@ mOp2PlayerDt$7446 = .bss:0x00000558; // type:object size:0x24 scope:local @7461 = .bss:0x000005C8; // type:object size:0xC scope:local mOp2CenterDt$7452 = .bss:0x000005D4; // type:object size:0x54 scope:local @7463 = .bss:0x00000628; // type:object size:0xC scope:local +init$0009 = .bss:0x00000634; // type:object size:0x1 scope:local align:1 data:byte @7466 = .bss:0x00000638; // type:object size:0xC scope:local @7467 = .bss:0x00000644; // type:object size:0xC scope:local @7468 = .bss:0x00000650; // type:object size:0xC scope:local @@ -603,20 +614,24 @@ mOp2CenterDt$7452 = .bss:0x000005D4; // type:object size:0x54 scope:local @7471 = .bss:0x00000674; // type:object size:0xC scope:local mOp2EyeDt$7462 = .bss:0x00000680; // type:object size:0x54 scope:local @9091 = .bss:0x000006D4; // type:object size:0xC scope:local +init$0010 = .bss:0x000006E0; // type:object size:0x1 scope:local align:1 data:byte @9094 = .bss:0x000006E4; // type:object size:0xC scope:local mEd2CenterDt$9090 = .bss:0x000006F0; // type:object size:0x18 scope:local @9096 = .bss:0x00000708; // type:object size:0xC scope:local +init$0011 = .bss:0x00000714; // type:object size:0x1 scope:local align:1 data:byte @9099 = .bss:0x00000718; // type:object size:0xC scope:local mEd22EyeDt$9095 = .bss:0x00000724; // type:object size:0x18 scope:local -lbl_142_bss_73C = .bss:0x0000073C; // type:object size:0x1 data:byte +init$0012 = .bss:0x0000073C; // type:object size:0x1 scope:local align:1 data:byte mWaitDt$9733 = .bss:0x00000740; // type:object size:0xC scope:local data:4byte @10210 = .bss:0x0000074C; // type:object size:0xC scope:local +init$0013 = .bss:0x00000758; // type:object size:0x1 scope:local align:1 data:byte @10213 = .bss:0x0000075C; // type:object size:0xC scope:local @10214 = .bss:0x00000768; // type:object size:0xC scope:local @10215 = .bss:0x00000774; // type:object size:0xC scope:local @10216 = .bss:0x00000780; // type:object size:0xC scope:local head_cc_dt$10209 = .bss:0x0000078C; // type:object size:0x3C scope:local @10829 = .bss:0x000007C8; // type:object size:0xC scope:local +init$0014 = .bss:0x000007D4; // type:object size:0x1 scope:local align:1 data:byte @10832 = .bss:0x000007D8; // type:object size:0xC scope:local @10833 = .bss:0x000007E4; // type:object size:0xC scope:local @10834 = .bss:0x000007F0; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_b_gg/splits.txt b/config/GZ2P01/rels/d_a_b_gg/splits.txt index 76df93067a..37bbd10322 100644 --- a/config/GZ2P01/rels/d_a_b_gg/splits.txt +++ b/config/GZ2P01/rels/d_a_b_gg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gg.cpp: diff --git a/config/GZ2P01/rels/d_a_b_gg/symbols.txt b/config/GZ2P01/rels/d_a_b_gg/symbols.txt index 2dc408dd6b..124e8530c3 100644 --- a/config/GZ2P01/rels/d_a_b_gg/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_gg/symbols.txt @@ -266,7 +266,8 @@ ccSphSrc$3982 = .rodata:0x00000100; // type:object size:0x40 scope:local @stringBase0 = .rodata:0x00000374; // type:object size:0x19 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_143_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3790 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3791 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3799 = .data:0x00000030; // type:object size:0x6 scope:local @@ -305,7 +306,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_143_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3927 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte s_dis__22@unnamed@d_a_b_gg_cpp@ = .bss:0x00000070; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_b_gm/splits.txt b/config/GZ2P01/rels/d_a_b_gm/splits.txt index 6fe68269de..caea243977 100644 --- a/config/GZ2P01/rels/d_a_b_gm/splits.txt +++ b/config/GZ2P01/rels/d_a_b_gm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gm.cpp: diff --git a/config/GZ2P01/rels/d_a_b_gm/symbols.txt b/config/GZ2P01/rels/d_a_b_gm/symbols.txt index 85cbfc9193..a661807322 100644 --- a/config/GZ2P01/rels/d_a_b_gm/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_gm/symbols.txt @@ -183,7 +183,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000200; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_144_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double name$4019 = .data:0x00000020; // type:object size:0x6 scope:local name$4042 = .data:0x00000028; // type:object size:0x8 scope:local @4354 = .data:0x00000030; // type:object size:0x2C scope:local @@ -226,7 +227,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_144_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4C scope:global data:byte ko_ct = .bss:0x000000A0; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_b_gnd/splits.txt b/config/GZ2P01/rels/d_a_b_gnd/splits.txt index c7e4552796..f369fe0fd7 100644 --- a/config/GZ2P01/rels/d_a_b_gnd/splits.txt +++ b/config/GZ2P01/rels/d_a_b_gnd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gnd.cpp: diff --git a/config/GZ2P01/rels/d_a_b_gnd/symbols.txt b/config/GZ2P01/rels/d_a_b_gnd/symbols.txt index f051720f8b..a5c1e56b12 100644 --- a/config/GZ2P01/rels/d_a_b_gnd/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_gnd/symbols.txt @@ -306,7 +306,8 @@ blur_model$8822 = .rodata:0x00000340; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000348; // type:object size:0x21 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_145_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_color$3983 = .data:0x00000020; // type:object size:0x4 scope:local chk_x$4163 = .data:0x00000024; // type:object size:0x10 scope:local chk_z$4164 = .data:0x00000034; // type:object size:0x10 scope:local @@ -361,13 +362,15 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_145_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3810 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte @4187 = .bss:0x00000070; // type:object size:0xC scope:local +init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte k_pos$4186 = .bss:0x00000080; // type:object size:0xC scope:local @4509 = .bss:0x0000008C; // type:object size:0xC scope:local b_path = .bss:0x00000098; // type:object size:0x60 scope:global align:4 data:float +unk_bss_0xF0 = .bss:0x000000F8; // type:object size:0x4 scope:local data:4byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000FC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000100; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000104; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_b_go/splits.txt b/config/GZ2P01/rels/d_a_b_go/splits.txt index 6ef11f39b6..b7954231f5 100644 --- a/config/GZ2P01/rels/d_a_b_go/splits.txt +++ b/config/GZ2P01/rels/d_a_b_go/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_go.cpp: diff --git a/config/GZ2P01/rels/d_a_b_go/symbols.txt b/config/GZ2P01/rels/d_a_b_go/symbols.txt index e83df13316..ee92e3724a 100644 --- a/config/GZ2P01/rels/d_a_b_go/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_go/symbols.txt @@ -56,6 +56,6 @@ __vt__8cM3dGAab = .data:0x00000068; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000074; // type:object size:0x24 scope:global __vt__12daB_GO_HIO_c = .data:0x00000098; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_146_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_80604140 = .bss:0x00000008; // type:object size:0x1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_b_gos/splits.txt b/config/GZ2P01/rels/d_a_b_gos/splits.txt index 6ce1eba36b..ebd4ea4c44 100644 --- a/config/GZ2P01/rels/d_a_b_gos/splits.txt +++ b/config/GZ2P01/rels/d_a_b_gos/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_gos.cpp: diff --git a/config/GZ2P01/rels/d_a_b_gos/symbols.txt b/config/GZ2P01/rels/d_a_b_gos/symbols.txt index 9ee77a54dd..4f41bf693e 100644 --- a/config/GZ2P01/rels/d_a_b_gos/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_gos/symbols.txt @@ -61,6 +61,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B0; // type:object size:0x24 scope:global __vt__13daB_GOS_HIO_c = .data:0x000001D4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global boss = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte -lbl_147_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +data_8060560C = .bss:0x0000000C; // type:object size:0x1 scope:local data:byte @3641 = .bss:0x00000010; // type:object size:0xC scope:local l_HIO = .bss:0x0000001C; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_b_mgn/splits.txt b/config/GZ2P01/rels/d_a_b_mgn/splits.txt index 13e6c0c18c..76998b0b2e 100644 --- a/config/GZ2P01/rels/d_a_b_mgn/splits.txt +++ b/config/GZ2P01/rels/d_a_b_mgn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_mgn.cpp: diff --git a/config/GZ2P01/rels/d_a_b_mgn/symbols.txt b/config/GZ2P01/rels/d_a_b_mgn/symbols.txt index 2b634541ff..ed79f4ca0e 100644 --- a/config/GZ2P01/rels/d_a_b_mgn/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_mgn/symbols.txt @@ -223,7 +223,8 @@ cc_set_jnt$7875 = .rodata:0x00000258; // type:object size:0x3C scope:local @stringBase0 = .rodata:0x000002A4; // type:object size:0xD scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_148_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3807 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3808 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3816 = .data:0x00000030; // type:object size:0x6 scope:local @@ -254,6 +255,6 @@ __vt__12J3DFrameCtrl = .data:0x00000380; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x0000038C; // type:object size:0xC scope:global __vt__13daB_MGN_HIO_c = .data:0x00000398; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_148_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3944 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_b_ob/splits.txt b/config/GZ2P01/rels/d_a_b_ob/splits.txt index 453f3327f9..fcbb33befc 100644 --- a/config/GZ2P01/rels/d_a_b_ob/splits.txt +++ b/config/GZ2P01/rels/d_a_b_ob/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_ob.cpp: diff --git a/config/GZ2P01/rels/d_a_b_ob/symbols.txt b/config/GZ2P01/rels/d_a_b_ob/symbols.txt index 37d3e9f2c8..4539d3b380 100644 --- a/config/GZ2P01/rels/d_a_b_ob/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_ob/symbols.txt @@ -297,7 +297,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000318; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_149_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double iso_eff$5401 = .data:0x00000020; // type:object size:0xA scope:local buf_p = .data:0x0000002C; // type:object size:0x4C scope:global size_p = .data:0x00000078; // type:object size:0x4C scope:global @@ -341,7 +342,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_149_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +data_8061B4FD = .bss:0x00000045; // type:object size:0x1 scope:local data:byte moveSW = .bss:0x00000048; // type:object size:0x4 scope:global moveSW2 = .bss:0x0000004C; // type:object size:0x4 scope:global data:4byte @3767 = .bss:0x00000050; // type:object size:0xC scope:local @@ -350,6 +351,7 @@ pno = .bss:0x0000007C; // type:object size:0x4 scope:global data:4byte fin = .bss:0x00000080; // type:object size:0x4 scope:global data:4byte bf_ct = .bss:0x00000084; // type:object size:0x4 scope:global data:4byte @5008 = .bss:0x00000088; // type:object size:0xC scope:local +init$0000 = .bss:0x00000094; // type:object size:0x1 scope:local align:1 data:byte @5011 = .bss:0x00000098; // type:object size:0xC scope:local @5012 = .bss:0x000000A4; // type:object size:0xC scope:local @5013 = .bss:0x000000B0; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_b_oh/splits.txt b/config/GZ2P01/rels/d_a_b_oh/splits.txt index 63c656903c..1707d87f7a 100644 --- a/config/GZ2P01/rels/d_a_b_oh/splits.txt +++ b/config/GZ2P01/rels/d_a_b_oh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_oh.cpp: diff --git a/config/GZ2P01/rels/d_a_b_oh/symbols.txt b/config/GZ2P01/rels/d_a_b_oh/symbols.txt index fac7433e0a..acd8008ea8 100644 --- a/config/GZ2P01/rels/d_a_b_oh/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_oh/symbols.txt @@ -100,7 +100,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_150_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +data_8061DBB5 = .bss:0x00000045; // type:object size:0x1 data:byte @3645 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte boss = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_b_tn/splits.txt b/config/GZ2P01/rels/d_a_b_tn/splits.txt index c90af169cd..7345bf245e 100644 --- a/config/GZ2P01/rels/d_a_b_tn/splits.txt +++ b/config/GZ2P01/rels/d_a_b_tn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_tn.cpp: diff --git a/config/GZ2P01/rels/d_a_b_tn/symbols.txt b/config/GZ2P01/rels/d_a_b_tn/symbols.txt index 8afe071729..09682538c9 100644 --- a/config/GZ2P01/rels/d_a_b_tn/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_tn/symbols.txt @@ -269,7 +269,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000002B4; // type:object size:0x19 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_152_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3799 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3800 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3808 = .data:0x00000030; // type:object size:0x6 scope:local @@ -326,7 +327,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_152_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3936 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x30 scope:global data:byte @3949 = .bss:0x00000084; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_b_yo/splits.txt b/config/GZ2P01/rels/d_a_b_yo/splits.txt index 639db0fa1a..1bfd860136 100644 --- a/config/GZ2P01/rels/d_a_b_yo/splits.txt +++ b/config/GZ2P01/rels/d_a_b_yo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_yo.cpp: diff --git a/config/GZ2P01/rels/d_a_b_yo/symbols.txt b/config/GZ2P01/rels/d_a_b_yo/symbols.txt index e0b000f008..fae6a702da 100644 --- a/config/GZ2P01/rels/d_a_b_yo/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_yo/symbols.txt @@ -221,7 +221,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000240; // type:object size:0x2B scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_153_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_yo_src__22@unnamed@d_a_b_yo_cpp@ = .data:0x00000020; // type:object size:0x44 scope:global cc_yo_tg_src__22@unnamed@d_a_b_yo_cpp@ = .data:0x00000064; // type:object size:0x40 scope:global cc_yo_iron_src__22@unnamed@d_a_b_yo_cpp@ = .data:0x000000A4; // type:object size:0x40 scope:global @@ -279,7 +280,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_153_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3783 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x5C scope:global data:byte @3802 = .bss:0x000000B0; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_b_yo_ice/splits.txt b/config/GZ2P01/rels/d_a_b_yo_ice/splits.txt index 8349ae09b3..baa4f2e91c 100644 --- a/config/GZ2P01/rels/d_a_b_yo_ice/splits.txt +++ b/config/GZ2P01/rels/d_a_b_yo_ice/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_yo_ice.cpp: diff --git a/config/GZ2P01/rels/d_a_b_yo_ice/symbols.txt b/config/GZ2P01/rels/d_a_b_yo_ice/symbols.txt index 9db7229042..d57b91025f 100644 --- a/config/GZ2P01/rels/d_a_b_yo_ice/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_yo_ice/symbols.txt @@ -109,7 +109,8 @@ yoi_fall_timer = .rodata:0x0000002C; // type:object size:0x28 scope:global @stringBase0 = .rodata:0x00000118; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_154_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_yo_src__26@unnamed@d_a_b_yo_ice_cpp@ = .data:0x00000020; // type:object size:0x44 scope:global cc_yo_iron_src__26@unnamed@d_a_b_yo_ice_cpp@ = .data:0x00000064; // type:object size:0x44 scope:global cc_yo_cam_src__26@unnamed@d_a_b_yo_ice_cpp@ = .data:0x000000A8; // type:object size:0x44 scope:global @@ -129,6 +130,6 @@ __vt__8cM3dGCyl = .data:0x00000214; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000220; // type:object size:0xC scope:global __vt__13daB_YOI_HIO_c = .data:0x0000022C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_154_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3771 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_b_zant/splits.txt b/config/GZ2P01/rels/d_a_b_zant/splits.txt index 89293dbc7f..2954410a88 100644 --- a/config/GZ2P01/rels/d_a_b_zant/splits.txt +++ b/config/GZ2P01/rels/d_a_b_zant/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_zant.cpp: diff --git a/config/GZ2P01/rels/d_a_b_zant/symbols.txt b/config/GZ2P01/rels/d_a_b_zant/symbols.txt index 12b31895c6..66d61f2185 100644 --- a/config/GZ2P01/rels/d_a_b_zant/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_zant/symbols.txt @@ -288,7 +288,8 @@ damage_jump_speed$7712 = .rodata:0x0000024C; // type:object size:0x2C scope:loca @stringBase0 = .rodata:0x00000344; // type:object size:0x2B scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_155_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_zant_src__24@unnamed@d_a_b_zant_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_zant_sword_src__24@unnamed@d_a_b_zant_cpp@ = .data:0x00000060; // type:object size:0x40 scope:global cc_zant_roll_src__24@unnamed@d_a_b_zant_cpp@ = .data:0x000000A0; // type:object size:0x44 scope:global @@ -344,7 +345,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_155_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4164 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x44 scope:global data:byte @4182 = .bss:0x00000098; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_b_zant_magic/symbols.txt b/config/GZ2P01/rels/d_a_b_zant_magic/symbols.txt index 4436630984..97ce19d3ad 100644 --- a/config/GZ2P01/rels/d_a_b_zant_magic/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_zant_magic/symbols.txt @@ -45,7 +45,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3940 = .rodata:0x00000048; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_156_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_zant_src__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x00000020; // type:object size:0x4C scope:global cc_zant_src2__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x0000006C; // type:object size:0x40 scope:global cc_zant_src3__30@unnamed@d_a_b_zant_magic_cpp@ = .data:0x000000AC; // type:object size:0x40 scope:global diff --git a/config/GZ2P01/rels/d_a_b_zant_mobile/splits.txt b/config/GZ2P01/rels/d_a_b_zant_mobile/splits.txt index 80ce04e0f1..48fb27a5d2 100644 --- a/config/GZ2P01/rels/d_a_b_zant_mobile/splits.txt +++ b/config/GZ2P01/rels/d_a_b_zant_mobile/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_b_zant_mobile.cpp: diff --git a/config/GZ2P01/rels/d_a_b_zant_mobile/symbols.txt b/config/GZ2P01/rels/d_a_b_zant_mobile/symbols.txt index 3c965d209f..b291b25704 100644 --- a/config/GZ2P01/rels/d_a_b_zant_mobile/symbols.txt +++ b/config/GZ2P01/rels/d_a_b_zant_mobile/symbols.txt @@ -88,6 +88,6 @@ __vt__12J3DFrameCtrl = .data:0x000000F8; // type:object size:0xC scope:global __vt__14dBgS_ObjGndChk = .data:0x00000104; // type:object size:0x30 scope:global __vt__15daB_ZANTZ_HIO_c = .data:0x00000134; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_157_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_balloon_2D/splits.txt b/config/GZ2P01/rels/d_a_balloon_2D/splits.txt index 9180d9a115..be330b7a5c 100644 --- a/config/GZ2P01/rels/d_a_balloon_2D/splits.txt +++ b/config/GZ2P01/rels/d_a_balloon_2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_balloon_2D.cpp: diff --git a/config/GZ2P01/rels/d_a_bd/splits.txt b/config/GZ2P01/rels/d_a_bd/splits.txt index c01e402d7c..0c5664cb56 100644 --- a/config/GZ2P01/rels/d_a_bd/splits.txt +++ b/config/GZ2P01/rels/d_a_bd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_bd.cpp: diff --git a/config/GZ2P01/rels/d_a_bd/symbols.txt b/config/GZ2P01/rels/d_a_bd/symbols.txt index 5731497f87..0c0a76c15e 100644 --- a/config/GZ2P01/rels/d_a_bd/symbols.txt +++ b/config/GZ2P01/rels/d_a_bd/symbols.txt @@ -131,7 +131,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3937 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3946 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_bg_obj/symbols.txt b/config/GZ2P01/rels/d_a_bg_obj/symbols.txt index 4ac4ffc810..31e6bf940e 100644 --- a/config/GZ2P01/rels/d_a_bg_obj/symbols.txt +++ b/config/GZ2P01/rels/d_a_bg_obj/symbols.txt @@ -79,7 +79,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @stringBase0 = .rodata:0x00000068; // type:object size:0xA2 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_4_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_tri_src = .data:0x00000020; // type:object size:0x54 scope:global l_specName = .data:0x00000074; // type:object size:0x4 scope:global data:4byte @3761 = .data:0x00000078; // type:object size:0xC scope:local @@ -122,4 +123,4 @@ l_bmdName$3644 = .bss:0x00000000; // type:object size:0x10 scope:local l_btkName$3652 = .bss:0x00000010; // type:object size:0x10 scope:local l_brkName$3660 = .bss:0x00000020; // type:object size:0x10 scope:local l_dzbName$3668 = .bss:0x00000030; // type:object size:0x10 scope:local -lbl_4_bss_40 = .bss:0x00000040; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000040; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_boomerang/symbols.txt b/config/GZ2P01/rels/d_a_boomerang/symbols.txt index ad70b0f0a3..12a14138c2 100644 --- a/config/GZ2P01/rels/d_a_boomerang/symbols.txt +++ b/config/GZ2P01/rels/d_a_boomerang/symbols.txt @@ -124,7 +124,8 @@ l_lockSeFlg = .rodata:0x00000040; // type:object size:0x14 scope:global @stringBase0 = .rodata:0x00000140; // type:object size:0x14A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_46_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @5412 = .data:0x00000020; // type:object size:0xC scope:local data:4byte @5579 = .data:0x0000002C; // type:object size:0xC scope:local data:4byte l_atCpsSrc = .data:0x00000038; // type:object size:0x4C scope:global diff --git a/config/GZ2P01/rels/d_a_bullet/splits.txt b/config/GZ2P01/rels/d_a_bullet/splits.txt index 580fde4232..a68bf22432 100644 --- a/config/GZ2P01/rels/d_a_bullet/splits.txt +++ b/config/GZ2P01/rels/d_a_bullet/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_bullet.cpp: diff --git a/config/GZ2P01/rels/d_a_canoe/splits.txt b/config/GZ2P01/rels/d_a_canoe/splits.txt index c45ab13f2f..a4ad8e394c 100644 --- a/config/GZ2P01/rels/d_a_canoe/splits.txt +++ b/config/GZ2P01/rels/d_a_canoe/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_canoe.cpp: diff --git a/config/GZ2P01/rels/d_a_canoe/symbols.txt b/config/GZ2P01/rels/d_a_canoe/symbols.txt index 2d70658869..c1eea38106 100644 --- a/config/GZ2P01/rels/d_a_canoe/symbols.txt +++ b/config/GZ2P01/rels/d_a_canoe/symbols.txt @@ -40,7 +40,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3766 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3766 = .rodata:0x00000000; // type:object size:0xC scope:local l_arcName = .rodata:0x0000000C; // type:object size:0x6 scope:global data:string l_arcName2 = .rodata:0x00000014; // type:object size:0x7 scope:global data:string l_arcName3 = .rodata:0x0000001C; // type:object size:0x8 scope:global data:string @@ -124,8 +124,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @5103 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte paddleRippleScale$5102 = .bss:0x00000058; // type:object size:0xC scope:local @5356 = .bss:0x00000064; // type:object size:0xC scope:local +init$0001 = .bss:0x00000070; // type:object size:0x1 scope:local align:1 data:byte bodyRippleScale$5355 = .bss:0x00000074; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_coach_2D/splits.txt b/config/GZ2P01/rels/d_a_coach_2D/splits.txt index 1f225391f5..6d1128a89f 100644 --- a/config/GZ2P01/rels/d_a_coach_2D/splits.txt +++ b/config/GZ2P01/rels/d_a_coach_2D/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_coach_2D.cpp: diff --git a/config/GZ2P01/rels/d_a_cow/splits.txt b/config/GZ2P01/rels/d_a_cow/splits.txt index 38d3de1d06..35666f2bdc 100644 --- a/config/GZ2P01/rels/d_a_cow/splits.txt +++ b/config/GZ2P01/rels/d_a_cow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_cow.cpp: diff --git a/config/GZ2P01/rels/d_a_cow/symbols.txt b/config/GZ2P01/rels/d_a_cow/symbols.txt index 7974b9ba87..a039ab1331 100644 --- a/config/GZ2P01/rels/d_a_cow/symbols.txt +++ b/config/GZ2P01/rels/d_a_cow/symbols.txt @@ -200,7 +200,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000168; // type:object size:0x3E scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_163_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__21@unnamed@d_a_cow_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global pen_dir__21@unnamed@d_a_cow_cpp@ = .data:0x00000060; // type:object size:0x2 scope:global data:2byte gate_dir__21@unnamed@d_a_cow_cpp@ = .data:0x00000062; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2P01/rels/d_a_crod/symbols.txt b/config/GZ2P01/rels/d_a_crod/symbols.txt index f4f6486578..3110023bf4 100644 --- a/config/GZ2P01/rels/d_a_crod/symbols.txt +++ b/config/GZ2P01/rels/d_a_crod/symbols.txt @@ -44,4 +44,4 @@ __vt__10cCcD_GStts = .data:0x000000A8; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x000000B4; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000C0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000CC; // type:object size:0xC scope:global -lbl_47_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_cstatue/splits.txt b/config/GZ2P01/rels/d_a_cstatue/splits.txt index e80e577aa1..ea8ebe0f7e 100644 --- a/config/GZ2P01/rels/d_a_cstatue/splits.txt +++ b/config/GZ2P01/rels/d_a_cstatue/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_cstatue.cpp: diff --git a/config/GZ2P01/rels/d_a_cstatue/symbols.txt b/config/GZ2P01/rels/d_a_cstatue/symbols.txt index 50fc49cbc5..1593aa886f 100644 --- a/config/GZ2P01/rels/d_a_cstatue/symbols.txt +++ b/config/GZ2P01/rels/d_a_cstatue/symbols.txt @@ -130,7 +130,8 @@ brkIdx$6115 = .rodata:0x00000308; // type:object size:0xA scope:local @6396 = .rodata:0x00000314; // type:object size:0x4 scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_164_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_atCpsSrc = .data:0x00000020; // type:object size:0x4C scope:global l_cylSrc = .data:0x0000006C; // type:object size:0x44 scope:global l_sphSrc = .data:0x000000B0; // type:object size:0x40 scope:global diff --git a/config/GZ2P01/rels/d_a_demo00/splits.txt b/config/GZ2P01/rels/d_a_demo00/splits.txt index 480c9e0411..a59a8f3eac 100644 --- a/config/GZ2P01/rels/d_a_demo00/splits.txt +++ b/config/GZ2P01/rels/d_a_demo00/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_demo00.cpp: diff --git a/config/GZ2P01/rels/d_a_demo00/symbols.txt b/config/GZ2P01/rels/d_a_demo00/symbols.txt index 9946a10262..616da0d0dc 100644 --- a/config/GZ2P01/rels/d_a_demo00/symbols.txt +++ b/config/GZ2P01/rels/d_a_demo00/symbols.txt @@ -42,7 +42,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3727 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3727 = .rodata:0x00000000; // type:object size:0xC scope:local @4004 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @4122 = .rodata:0x00000010; // type:object size:0x4 scope:local @4123 = .rodata:0x00000014; // type:object size:0x4 scope:local align:4 data:float @@ -116,7 +116,8 @@ l_itemNo$localstatic3$execute__10daDemo00_cFv = .rodata:0x0000006C; // type:obje @stringBase0 = .rodata:0x00000138; // type:object size:0x28 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_48_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_lightData = .data:0x00000020; // type:object size:0x18 scope:global @4662 = .data:0x00000038; // type:object size:0xC scope:local data:4byte @4676 = .data:0x00000044; // type:object size:0xC scope:local data:4byte diff --git a/config/GZ2P01/rels/d_a_demo_item/splits.txt b/config/GZ2P01/rels/d_a_demo_item/splits.txt index 8f26b5f468..6009d922bf 100644 --- a/config/GZ2P01/rels/d_a_demo_item/splits.txt +++ b/config/GZ2P01/rels/d_a_demo_item/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_demo_item.cpp: diff --git a/config/GZ2P01/rels/d_a_demo_item/symbols.txt b/config/GZ2P01/rels/d_a_demo_item/symbols.txt index 6b18be8eb5..50792b822e 100644 --- a/config/GZ2P01/rels/d_a_demo_item/symbols.txt +++ b/config/GZ2P01/rels/d_a_demo_item/symbols.txt @@ -96,6 +96,7 @@ l_wolf_offset = .bss:0x0000006C; // type:object size:0xC scope:global @3760 = .bss:0x00000078; // type:object size:0xC scope:local l_horse_offset = .bss:0x00000084; // type:object size:0xC scope:global @4275 = .bss:0x00000090; // type:object size:0xC scope:local +init$0000 = .bss:0x0000009C; // type:object size:0x1 scope:local align:1 data:byte @4278 = .bss:0x000000A0; // type:object size:0xC scope:local @4279 = .bss:0x000000AC; // type:object size:0xC scope:local offset_tbl$4274 = .bss:0x000000B8; // type:object size:0x24 scope:local diff --git a/config/GZ2P01/rels/d_a_do/splits.txt b/config/GZ2P01/rels/d_a_do/splits.txt index 4048a749bb..bcd5ed0814 100644 --- a/config/GZ2P01/rels/d_a_do/splits.txt +++ b/config/GZ2P01/rels/d_a_do/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_do.cpp: diff --git a/config/GZ2P01/rels/d_a_do/symbols.txt b/config/GZ2P01/rels/d_a_do/symbols.txt index 93efa62619..3547a91977 100644 --- a/config/GZ2P01/rels/d_a_do/symbols.txt +++ b/config/GZ2P01/rels/d_a_do/symbols.txt @@ -200,13 +200,15 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_165_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte +noFallCheck = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte target_info = .bss:0x00000074; // type:object size:0x14 scope:global target_info_count = .bss:0x00000088; // type:object size:0x4 scope:global data:4byte target_bgc = .bss:0x0000008C; // type:object size:0x14 scope:global @5578 = .bss:0x000000A0; // type:object size:0xC scope:local +init$0000 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte scc$5577 = .bss:0x000000B0; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000BC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000C0; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_door_boss/symbols.txt b/config/GZ2P01/rels/d_a_door_boss/symbols.txt index 5854691dc0..de7c4701a4 100644 --- a/config/GZ2P01/rels/d_a_door_boss/symbols.txt +++ b/config/GZ2P01/rels/d_a_door_boss/symbols.txt @@ -59,7 +59,8 @@ l_staff_name = .rodata:0x00000058; // type:object size:0xD scope:global data:str @stringBase0 = .rodata:0x00000070; // type:object size:0x9C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_166_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double action_table$3817 = .data:0x00000020; // type:object size:0x2C scope:local @3939 = .data:0x0000004C; // type:object size:0x2C scope:local @3938 = .data:0x00000078; // type:object size:0x2C scope:local @@ -73,4 +74,4 @@ g_profile_BOSS_DOOR = .data:0x00000124; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global -lbl_166_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_door_bossL1/symbols.txt b/config/GZ2P01/rels/d_a_door_bossL1/symbols.txt index 07d58a1768..457df5aa81 100644 --- a/config/GZ2P01/rels/d_a_door_bossL1/symbols.txt +++ b/config/GZ2P01/rels/d_a_door_bossL1/symbols.txt @@ -92,7 +92,8 @@ l_lv6_eff_b$4257 = .rodata:0x00000074; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000C8; // type:object size:0x31A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_64_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_stageName$3673 = .data:0x00000020; // type:object size:0x50 scope:local @3700 = .data:0x00000070; // type:object size:0x28 scope:local @3713 = .data:0x00000098; // type:object size:0x28 scope:local @@ -110,4 +111,4 @@ g_profile_L1BOSS_DOOR = .data:0x00000240; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000270; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000027C; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000002A0; // type:object size:0xC scope:global -lbl_64_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_door_bossL5/symbols.txt b/config/GZ2P01/rels/d_a_door_bossL5/symbols.txt index 4e5f4f1f5b..e693aa1d4d 100644 --- a/config/GZ2P01/rels/d_a_door_bossL5/symbols.txt +++ b/config/GZ2P01/rels/d_a_door_bossL5/symbols.txt @@ -69,7 +69,8 @@ l_staff_name = .rodata:0x00000034; // type:object size:0xD scope:global data:str @stringBase0 = .rodata:0x00000080; // type:object size:0xAA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_167_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double action_table$3861 = .data:0x00000020; // type:object size:0x38 scope:local @3952 = .data:0x00000058; // type:object size:0x2C scope:local @3951 = .data:0x00000084; // type:object size:0x38 scope:local @@ -83,4 +84,4 @@ g_profile_L5BOSS_DOOR = .data:0x0000013C; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x0000016C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000178; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x0000019C; // type:object size:0xC scope:global -lbl_167_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_door_dbdoor00/symbols.txt b/config/GZ2P01/rels/d_a_door_dbdoor00/symbols.txt index 9739e8626d..16ad902a8b 100644 --- a/config/GZ2P01/rels/d_a_door_dbdoor00/symbols.txt +++ b/config/GZ2P01/rels/d_a_door_dbdoor00/symbols.txt @@ -52,7 +52,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000038; // type:object size:0xF6 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_6_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmd_base_name = .data:0x00000020; // type:object size:0x4 scope:global data:4byte action_table$3865 = .data:0x00000024; // type:object size:0x24 scope:local @3957 = .data:0x00000048; // type:object size:0x24 scope:local @@ -66,4 +67,4 @@ l_action$4091 = .data:0x000000B4; // type:object size:0x48 scope:local l_daDbdoor00_Method = .data:0x000000FC; // type:object size:0x20 scope:global g_profile_DBDOOR = .data:0x0000011C; // type:object size:0x30 scope:global l_bmdName$3699 = .bss:0x00000000; // type:object size:0x20 scope:local -lbl_6_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_door_knob00/symbols.txt b/config/GZ2P01/rels/d_a_door_knob00/symbols.txt index 522a4478c5..f7a5fa75d2 100644 --- a/config/GZ2P01/rels/d_a_door_knob00/symbols.txt +++ b/config/GZ2P01/rels/d_a_door_knob00/symbols.txt @@ -75,7 +75,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000005C; // type:object size:0x1B0 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_7_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmd_base_name = .data:0x00000020; // type:object size:0x4 scope:global data:4byte ev_name_table$4009 = .data:0x00000024; // type:object size:0x1C scope:local action_table$4177 = .data:0x00000040; // type:object size:0x40 scope:local @@ -95,4 +96,4 @@ l_daKnob20_Method = .data:0x000001C4; // type:object size:0x20 scope:global g_profile_KNOB20 = .data:0x000001E4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000214; // type:object size:0xC scope:global l_bmdName$3809 = .bss:0x00000000; // type:object size:0x20 scope:local -lbl_7_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_door_mbossL1/symbols.txt b/config/GZ2P01/rels/d_a_door_mbossL1/symbols.txt index 23cf9cafa1..bb30c89b06 100644 --- a/config/GZ2P01/rels/d_a_door_mbossL1/symbols.txt +++ b/config/GZ2P01/rels/d_a_door_mbossL1/symbols.txt @@ -142,7 +142,8 @@ l_eff_id_lv4$4706 = .rodata:0x00000094; // type:object size:0xA scope:local @stringBase0 = .rodata:0x00000108; // type:object size:0x310 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_168_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_door_open_demo = .data:0x00000020; // type:object size:0x2C scope:global l_door_open_demoB = .data:0x0000004C; // type:object size:0x2C scope:global l_door_open_demoLv5 = .data:0x00000078; // type:object size:0x10 scope:global @@ -167,4 +168,4 @@ __vt__14dBgS_ObjGndChk = .data:0x00000358; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000388; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000394; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000003B8; // type:object size:0xC scope:global -lbl_168_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_door_push/symbols.txt b/config/GZ2P01/rels/d_a_door_push/symbols.txt index fa0829dece..b6c44fa00a 100644 --- a/config/GZ2P01/rels/d_a_door_push/symbols.txt +++ b/config/GZ2P01/rels/d_a_door_push/symbols.txt @@ -51,7 +51,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000004C; // type:object size:0x36 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_169_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float @3792 = .data:0x0000003C; // type:object size:0xC scope:local data:4byte @@ -64,5 +65,5 @@ action_table$3910 = .data:0x0000009C; // type:object size:0xC scope:local daDoorPush_METHODS = .data:0x000000A8; // type:object size:0x20 scope:global g_profile_PushDoor = .data:0x000000C8; // type:object size:0x30 scope:global __vt__12daDoorPush_c = .data:0x000000F8; // type:object size:0x28 scope:global -lbl_169_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_169_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_door_shutter/symbols.txt b/config/GZ2P01/rels/d_a_door_shutter/symbols.txt index 746a9c1869..74d9bd8e64 100644 --- a/config/GZ2P01/rels/d_a_door_shutter/symbols.txt +++ b/config/GZ2P01/rels/d_a_door_shutter/symbols.txt @@ -138,7 +138,8 @@ l_eff_id$4449 = .rodata:0x00000044; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000B8; // type:object size:0x5A3 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_8_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3980 = .data:0x00000020; // type:object size:0x34 scope:local @4126 = .data:0x00000054; // type:object size:0x34 scope:local @4496 = .data:0x00000088; // type:object size:0x34 scope:local diff --git a/config/GZ2P01/rels/d_a_dshutter/symbols.txt b/config/GZ2P01/rels/d_a_dshutter/symbols.txt index 77fdc33f3d..8884706b26 100644 --- a/config/GZ2P01/rels/d_a_dshutter/symbols.txt +++ b/config/GZ2P01/rels/d_a_dshutter/symbols.txt @@ -39,7 +39,8 @@ l_heap_size = .rodata:0x00000018; // type:object size:0xC scope:global @stringBase0 = .rodata:0x0000003C; // type:object size:0x1C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_10_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0xC scope:global @3631 = .data:0x0000002C; // type:object size:0xC scope:local @3632 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_ai/splits.txt b/config/GZ2P01/rels/d_a_e_ai/splits.txt index baa5914f6b..8effc34a59 100644 --- a/config/GZ2P01/rels/d_a_e_ai/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ai/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ai.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ai/symbols.txt b/config/GZ2P01/rels/d_a_e_ai/symbols.txt index 6ab2257461..5a6632ebda 100644 --- a/config/GZ2P01/rels/d_a_e_ai/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ai/symbols.txt @@ -95,7 +95,8 @@ shield_sph_src$3818 = .rodata:0x0000007C; // type:object size:0x40 scope:local @stringBase0 = .rodata:0x0000013C; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_170_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -112,6 +113,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000114; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000138; // type:object size:0xC scope:global __vt__12daE_AI_HIO_c = .data:0x00000144; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_170_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_arrow/splits.txt b/config/GZ2P01/rels/d_a_e_arrow/splits.txt index 13f6223baa..706fc8f133 100644 --- a/config/GZ2P01/rels/d_a_e_arrow/splits.txt +++ b/config/GZ2P01/rels/d_a_e_arrow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_arrow.cpp: diff --git a/config/GZ2P01/rels/d_a_e_arrow/symbols.txt b/config/GZ2P01/rels/d_a_e_arrow/symbols.txt index 77743d7284..7eedab5b3f 100644 --- a/config/GZ2P01/rels/d_a_e_arrow/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_arrow/symbols.txt @@ -87,7 +87,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000EC; // type:object size:0xB scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_171_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double fire_name$4663 = .data:0x00000020; // type:object size:0x8 scope:local at_sph_src$5035 = .data:0x00000028; // type:object size:0x40 scope:local tg_sph_src$5036 = .data:0x00000068; // type:object size:0x40 scope:local diff --git a/config/GZ2P01/rels/d_a_e_ba/splits.txt b/config/GZ2P01/rels/d_a_e_ba/splits.txt index 6e14363e38..5b53c9a3b1 100644 --- a/config/GZ2P01/rels/d_a_e_ba/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ba/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ba.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ba/symbols.txt b/config/GZ2P01/rels/d_a_e_ba/symbols.txt index e50c2b6ee3..ffb8db7a24 100644 --- a/config/GZ2P01/rels/d_a_e_ba/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ba/symbols.txt @@ -94,7 +94,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000D0; // type:object size:0xF scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_172_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3826 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3827 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3835 = .data:0x00000030; // type:object size:0x6 scope:local @@ -113,7 +114,7 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12daE_BA_HIO_c = .data:0x00000184; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_172_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3963 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte check_index$4162 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_e_bee/splits.txt b/config/GZ2P01/rels/d_a_e_bee/splits.txt index 07fbd9ead7..24515fbaeb 100644 --- a/config/GZ2P01/rels/d_a_e_bee/splits.txt +++ b/config/GZ2P01/rels/d_a_e_bee/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bee.cpp: diff --git a/config/GZ2P01/rels/d_a_e_bee/symbols.txt b/config/GZ2P01/rels/d_a_e_bee/symbols.txt index a3385370eb..0e3b5a180f 100644 --- a/config/GZ2P01/rels/d_a_e_bee/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_bee/symbols.txt @@ -106,11 +106,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_173_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3765 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte -lbl_173_bss_64 = .bss:0x00000064; // type:object size:0x1 data:byte +ccCylSet = .bss:0x00000064; // type:object size:0x1 data:byte @4455 = .bss:0x00000068; // type:object size:0xC scope:local +init$0000 = .bss:0x00000074; // type:object size:0x1 scope:local align:1 data:byte non$4454 = .bss:0x00000078; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000088; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_bg/splits.txt b/config/GZ2P01/rels/d_a_e_bg/splits.txt index 3dfd48865c..ef7b3fe271 100644 --- a/config/GZ2P01/rels/d_a_e_bg/splits.txt +++ b/config/GZ2P01/rels/d_a_e_bg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bg.cpp: diff --git a/config/GZ2P01/rels/d_a_e_bg/symbols.txt b/config/GZ2P01/rels/d_a_e_bg/symbols.txt index cc3fcbdef7..dbc6558b68 100644 --- a/config/GZ2P01/rels/d_a_e_bg/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_bg/symbols.txt @@ -105,6 +105,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global __vt__12daE_BG_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_174_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_bi/splits.txt b/config/GZ2P01/rels/d_a_e_bi/splits.txt index 58283d77c8..653298655a 100644 --- a/config/GZ2P01/rels/d_a_e_bi/splits.txt +++ b/config/GZ2P01/rels/d_a_e_bi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bi.cpp: diff --git a/config/GZ2P01/rels/d_a_e_bi/symbols.txt b/config/GZ2P01/rels/d_a_e_bi/symbols.txt index 9767922c87..e3499dba63 100644 --- a/config/GZ2P01/rels/d_a_e_bi/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_bi/symbols.txt @@ -101,7 +101,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000EC; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_175_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -139,10 +140,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_175_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte @4522 = .bss:0x00000070; // type:object size:0xC scope:local +init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte sc$4521 = .bss:0x00000080; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000008C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000090; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_bs/splits.txt b/config/GZ2P01/rels/d_a_e_bs/splits.txt index 52104b5bdc..4683bf1c88 100644 --- a/config/GZ2P01/rels/d_a_e_bs/splits.txt +++ b/config/GZ2P01/rels/d_a_e_bs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bs.cpp: diff --git a/config/GZ2P01/rels/d_a_e_bs/symbols.txt b/config/GZ2P01/rels/d_a_e_bs/symbols.txt index 9cdadcfd58..c1fdf1eb21 100644 --- a/config/GZ2P01/rels/d_a_e_bs/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_bs/symbols.txt @@ -96,7 +96,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000E0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_177_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -115,6 +116,6 @@ __vt__8cM3dGAab = .data:0x00000184; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000190; // type:object size:0x24 scope:global __vt__12daE_BS_HIO_c = .data:0x000001B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_177_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_bu/splits.txt b/config/GZ2P01/rels/d_a_e_bu/splits.txt index d099d0c2a5..cb43e2362d 100644 --- a/config/GZ2P01/rels/d_a_e_bu/splits.txt +++ b/config/GZ2P01/rels/d_a_e_bu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bu.cpp: diff --git a/config/GZ2P01/rels/d_a_e_bu/symbols.txt b/config/GZ2P01/rels/d_a_e_bu/symbols.txt index 3570c1e7ee..a79afabe0a 100644 --- a/config/GZ2P01/rels/d_a_e_bu/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_bu/symbols.txt @@ -95,7 +95,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000E0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_178_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -114,7 +115,7 @@ __vt__8cM3dGAab = .data:0x00000194; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001A0; // type:object size:0x24 scope:global __vt__12daE_BU_HIO_c = .data:0x000001C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_178_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte check_index$4007 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_e_bug/splits.txt b/config/GZ2P01/rels/d_a_e_bug/splits.txt index ab9630a930..4327da7562 100644 --- a/config/GZ2P01/rels/d_a_e_bug/splits.txt +++ b/config/GZ2P01/rels/d_a_e_bug/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_bug.cpp: diff --git a/config/GZ2P01/rels/d_a_e_bug/symbols.txt b/config/GZ2P01/rels/d_a_e_bug/symbols.txt index fb1cfb392a..a2af9f75b5 100644 --- a/config/GZ2P01/rels/d_a_e_bug/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_bug/symbols.txt @@ -113,15 +113,15 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_179_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3824 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x10 scope:global data:byte -lbl_179_bss_64 = .bss:0x00000064; // type:object size:0x1 data:byte -lbl_179_bss_65 = .bss:0x00000065; // type:object size:0x1 data:byte +l_roomNo = .bss:0x00000064; // type:object size:0x1 scope:local data:byte +data_80697E8D = .bss:0x00000065; // type:object size:0x1 scope:local data:byte @3831 = .bss:0x00000068; // type:object size:0xC scope:local at_pos = .bss:0x00000074; // type:object size:0xC scope:global align:4 data:float at_size = .bss:0x00000080; // type:object size:0x4 scope:global -lbl_179_bss_84 = .bss:0x00000084; // type:object size:0x1 data:byte +data_80697EAC = .bss:0x00000084; // type:object size:0x1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000088; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000008C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000090; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_cr/splits.txt b/config/GZ2P01/rels/d_a_e_cr/splits.txt index 1e0c62a5d5..84d4c3ce75 100644 --- a/config/GZ2P01/rels/d_a_e_cr/splits.txt +++ b/config/GZ2P01/rels/d_a_e_cr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_cr.cpp: diff --git a/config/GZ2P01/rels/d_a_e_cr/symbols.txt b/config/GZ2P01/rels/d_a_e_cr/symbols.txt index d1e5c1742d..43cf6affb0 100644 --- a/config/GZ2P01/rels/d_a_e_cr/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_cr/symbols.txt @@ -70,7 +70,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000090; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_180_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -85,6 +86,6 @@ __vt__8cM3dGAab = .data:0x000000F8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000104; // type:object size:0x24 scope:global __vt__12daE_CR_HIO_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_180_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_db/splits.txt b/config/GZ2P01/rels/d_a_e_db/splits.txt index 04791bb43c..ae0869a6ab 100644 --- a/config/GZ2P01/rels/d_a_e_db/splits.txt +++ b/config/GZ2P01/rels/d_a_e_db/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_db.cpp: diff --git a/config/GZ2P01/rels/d_a_e_db/symbols.txt b/config/GZ2P01/rels/d_a_e_db/symbols.txt index 7d1133e426..c8338106c1 100644 --- a/config/GZ2P01/rels/d_a_e_db/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_db/symbols.txt @@ -139,7 +139,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000160; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_182_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local @@ -163,6 +164,6 @@ __vt__8cM3dGAab = .data:0x000002F0; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:global __vt__12daE_DB_HIO_c = .data:0x00000310; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_182_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_dd/splits.txt b/config/GZ2P01/rels/d_a_e_dd/splits.txt index 31e1c647ec..5fb2c94238 100644 --- a/config/GZ2P01/rels/d_a_e_dd/splits.txt +++ b/config/GZ2P01/rels/d_a_e_dd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dd.cpp: diff --git a/config/GZ2P01/rels/d_a_e_dd/symbols.txt b/config/GZ2P01/rels/d_a_e_dd/symbols.txt index b25e9888b7..f32494aabc 100644 --- a/config/GZ2P01/rels/d_a_e_dd/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_dd/symbols.txt @@ -109,7 +109,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000F0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_184_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -133,7 +134,7 @@ __vt__12dBgS_ObjAcch = .data:0x000001B0; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001D4; // type:object size:0xC scope:global __vt__12daE_DD_HIO_c = .data:0x000001E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_184_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x28 scope:global data:byte check_index$4196 = .bss:0x00000040; // type:object size:0xFF scope:local diff --git a/config/GZ2P01/rels/d_a_e_df/splits.txt b/config/GZ2P01/rels/d_a_e_df/splits.txt index c29b8e5455..0c09a27f69 100644 --- a/config/GZ2P01/rels/d_a_e_df/splits.txt +++ b/config/GZ2P01/rels/d_a_e_df/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_df.cpp: diff --git a/config/GZ2P01/rels/d_a_e_df/symbols.txt b/config/GZ2P01/rels/d_a_e_df/symbols.txt index b36c3a5a78..da9e8d0dc7 100644 --- a/config/GZ2P01/rels/d_a_e_df/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_df/symbols.txt @@ -82,9 +82,11 @@ ccCylSrc$3961 = .rodata:0x0000002C; // type:object size:0x44 scope:local @4627 = .rodata:0x000000C4; // type:object size:0x4 scope:local align:4 data:float @4811 = .rodata:0x000000C8; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000CC; // type:object size:0x5 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_185_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3795 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3796 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3804 = .data:0x00000030; // type:object size:0x6 scope:local @@ -96,6 +98,6 @@ __vt__8cM3dGCyl = .data:0x000000A0; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000AC; // type:object size:0xC scope:global __vt__12daE_DF_HIO_c = .data:0x000000B8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_185_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3932 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_dk/splits.txt b/config/GZ2P01/rels/d_a_e_dk/splits.txt index d180106753..440de014bc 100644 --- a/config/GZ2P01/rels/d_a_e_dk/splits.txt +++ b/config/GZ2P01/rels/d_a_e_dk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dk.cpp: diff --git a/config/GZ2P01/rels/d_a_e_dk/symbols.txt b/config/GZ2P01/rels/d_a_e_dk/symbols.txt index 7dfe9681f6..780a1d1ab5 100644 --- a/config/GZ2P01/rels/d_a_e_dk/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_dk/symbols.txt @@ -105,7 +105,8 @@ dk_btk_name__22@unnamed@d_a_e_dk_cpp@ = .rodata:0x00000014; // type:object size: @stringBase0 = .rodata:0x000000F0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_186_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_dk_src__22@unnamed@d_a_e_dk_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_dk_at_src__22@unnamed@d_a_e_dk_cpp@ = .data:0x00000060; // type:object size:0x40 scope:global cc_dk_core_src__22@unnamed@d_a_e_dk_cpp@ = .data:0x000000A0; // type:object size:0x40 scope:global @@ -122,6 +123,6 @@ __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001A0; // type:object size:0xC scope:global __vt__12daE_DK_HIO_c = .data:0x000001AC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_186_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_806AD7F8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3759 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_dn/splits.txt b/config/GZ2P01/rels/d_a_e_dn/splits.txt index 3dec0f57eb..091f7de8b8 100644 --- a/config/GZ2P01/rels/d_a_e_dn/splits.txt +++ b/config/GZ2P01/rels/d_a_e_dn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dn.cpp: diff --git a/config/GZ2P01/rels/d_a_e_dn/symbols.txt b/config/GZ2P01/rels/d_a_e_dn/symbols.txt index 74cb291a64..82bee14c8b 100644 --- a/config/GZ2P01/rels/d_a_e_dn/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_dn/symbols.txt @@ -172,7 +172,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000188; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_65_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -218,7 +219,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_65_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte target_info = .bss:0x0000007C; // type:object size:0x28 scope:global diff --git a/config/GZ2P01/rels/d_a_e_dt/splits.txt b/config/GZ2P01/rels/d_a_e_dt/splits.txt index b0863c0ccd..2bde2c4c57 100644 --- a/config/GZ2P01/rels/d_a_e_dt/splits.txt +++ b/config/GZ2P01/rels/d_a_e_dt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_dt.cpp: diff --git a/config/GZ2P01/rels/d_a_e_dt/symbols.txt b/config/GZ2P01/rels/d_a_e_dt/symbols.txt index 7830955398..3832bccc63 100644 --- a/config/GZ2P01/rels/d_a_e_dt/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_dt/symbols.txt @@ -255,9 +255,9 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_187_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3787 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0x30 scope:global data:byte +l_HIO = .bss:0x00000054; // type:object size:0x30 scope:local data:byte mDt_OtamaNum__6E_DT_n = .bss:0x00000084; // type:object size:0x4 scope:global data:4byte mDt_OtamaNo__6E_DT_n = .bss:0x00000088; // type:object size:0x50 scope:global m_fall_no__6E_DT_n = .bss:0x000000D8; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_e_fb/splits.txt b/config/GZ2P01/rels/d_a_e_fb/splits.txt index 764e18f891..b043402c97 100644 --- a/config/GZ2P01/rels/d_a_e_fb/splits.txt +++ b/config/GZ2P01/rels/d_a_e_fb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fb.cpp: diff --git a/config/GZ2P01/rels/d_a_e_fb/symbols.txt b/config/GZ2P01/rels/d_a_e_fb/symbols.txt index bc2bab1a2a..7e54c462a8 100644 --- a/config/GZ2P01/rels/d_a_e_fb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_fb/symbols.txt @@ -114,7 +114,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte mFireTimer = .bss:0x00000078; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_e_fk/splits.txt b/config/GZ2P01/rels/d_a_e_fk/splits.txt index 6bda4f5c6b..50a0f28b85 100644 --- a/config/GZ2P01/rels/d_a_e_fk/splits.txt +++ b/config/GZ2P01/rels/d_a_e_fk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fk.cpp: diff --git a/config/GZ2P01/rels/d_a_e_fk/symbols.txt b/config/GZ2P01/rels/d_a_e_fk/symbols.txt index e86f8cc383..2826afbdf2 100644 --- a/config/GZ2P01/rels/d_a_e_fk/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_fk/symbols.txt @@ -132,7 +132,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_189_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3843 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:global data:byte s_dis__22@unnamed@d_a_e_fk_cpp@ = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_fm/splits.txt b/config/GZ2P01/rels/d_a_e_fm/splits.txt index 4694668680..56f30c0aa8 100644 --- a/config/GZ2P01/rels/d_a_e_fm/splits.txt +++ b/config/GZ2P01/rels/d_a_e_fm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fm.cpp: diff --git a/config/GZ2P01/rels/d_a_e_fm/symbols.txt b/config/GZ2P01/rels/d_a_e_fm/symbols.txt index 0e2314ec8c..dc78104dee 100644 --- a/config/GZ2P01/rels/d_a_e_fm/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_fm/symbols.txt @@ -240,7 +240,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000028C; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_66_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double h_id$3853 = .data:0x00000020; // type:object size:0x6 scope:local chain_z = .data:0x00000028; // type:object size:0x64 scope:global tame_name$4558 = .data:0x0000008C; // type:object size:0x4 scope:local @@ -302,7 +303,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_66_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3772 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xB0 scope:global data:byte @3819 = .bss:0x00000104; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_fs/splits.txt b/config/GZ2P01/rels/d_a_e_fs/splits.txt index 4c707c74c0..0ad263ab26 100644 --- a/config/GZ2P01/rels/d_a_e_fs/splits.txt +++ b/config/GZ2P01/rels/d_a_e_fs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fs.cpp: diff --git a/config/GZ2P01/rels/d_a_e_fs/symbols.txt b/config/GZ2P01/rels/d_a_e_fs/symbols.txt index 62c2e3ce3e..95c52af595 100644 --- a/config/GZ2P01/rels/d_a_e_fs/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_fs/symbols.txt @@ -90,7 +90,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000D8; // type:object size:0x1A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_190_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3796 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3797 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3805 = .data:0x00000030; // type:object size:0x6 scope:local @@ -128,7 +129,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local s_AtCount__22@unnamed@d_a_e_fs_cpp@ = .bss:0x00000046; // type:object size:0x2 scope:global data:2byte -hio_set = .bss:0x00000048; // type:object size:0x1 data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte @3933 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x1C scope:global data:byte @4275 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_fz/splits.txt b/config/GZ2P01/rels/d_a_e_fz/splits.txt index c4e0d9a5e5..c475968316 100644 --- a/config/GZ2P01/rels/d_a_e_fz/splits.txt +++ b/config/GZ2P01/rels/d_a_e_fz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_fz.cpp: diff --git a/config/GZ2P01/rels/d_a_e_fz/symbols.txt b/config/GZ2P01/rels/d_a_e_fz/symbols.txt index fb704bf0fc..f17325b624 100644 --- a/config/GZ2P01/rels/d_a_e_fz/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_fz/symbols.txt @@ -92,7 +92,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000BC; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_191_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3682 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3683 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3691 = .data:0x00000030; // type:object size:0x6 scope:local @@ -110,6 +111,6 @@ __vt__8cM3dGAab = .data:0x0000015C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000168; // type:object size:0x24 scope:global __vt__12daE_FZ_HIO_c = .data:0x0000018C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_191_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_806C1BA0 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3819 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x38 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_ga/splits.txt b/config/GZ2P01/rels/d_a_e_ga/splits.txt index 9eedebfb9b..a593112a61 100644 --- a/config/GZ2P01/rels/d_a_e_ga/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ga/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ga.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ga/symbols.txt b/config/GZ2P01/rels/d_a_e_ga/symbols.txt index c0e1315d30..ea080e9058 100644 --- a/config/GZ2P01/rels/d_a_e_ga/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ga/symbols.txt @@ -41,6 +41,6 @@ l_daE_Ga_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_E_GA = .data:0x00000020; // type:object size:0x30 scope:global __vt__12daE_Ga_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_67_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_gb/splits.txt b/config/GZ2P01/rels/d_a_e_gb/splits.txt index d6d78508ea..edd944731f 100644 --- a/config/GZ2P01/rels/d_a_e_gb/splits.txt +++ b/config/GZ2P01/rels/d_a_e_gb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gb.cpp: diff --git a/config/GZ2P01/rels/d_a_e_gb/symbols.txt b/config/GZ2P01/rels/d_a_e_gb/symbols.txt index 1d50e80adb..6d64fa8b0c 100644 --- a/config/GZ2P01/rels/d_a_e_gb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_gb/symbols.txt @@ -166,7 +166,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001D0; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_192_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local @@ -179,7 +180,7 @@ eno$4864 = .data:0x000000F4; // type:object size:0xA scope:local key_eno$5459 = .data:0x00000100; // type:object size:0x4 scope:local head_cc_sph_src$5811 = .data:0x00000104; // type:object size:0x40 scope:local body_cyl_src$5812 = .data:0x00000144; // type:object size:0x44 scope:local -l_daE_GB_Method = .data:0x00000188; // type:object size:0x20 scope:global +l_daE_GB_Method = .data:0x00000188; // type:object size:0x20 scope:local g_profile_E_GB = .data:0x000001A8; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x000001D8; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x000001E4; // type:object size:0xC scope:global @@ -191,6 +192,6 @@ __vt__8cM3dGAab = .data:0x00000238; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000244; // type:object size:0xC scope:global __vt__12daE_GB_HIO_c = .data:0x00000250; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_192_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +data_806C7928 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3922 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x20 scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0x20 scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_e_ge/splits.txt b/config/GZ2P01/rels/d_a_e_ge/splits.txt index 60894697a0..38aa83d186 100644 --- a/config/GZ2P01/rels/d_a_e_ge/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ge/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ge.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ge/symbols.txt b/config/GZ2P01/rels/d_a_e_ge/symbols.txt index d8d6efa9f8..9c56f935e0 100644 --- a/config/GZ2P01/rels/d_a_e_ge/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ge/symbols.txt @@ -126,7 +126,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000010C; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_193_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3783 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3784 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3792 = .data:0x00000030; // type:object size:0x6 scope:local @@ -152,7 +153,7 @@ __vt__8cM3dGAab = .data:0x000001FC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000208; // type:object size:0x24 scope:global __vt__12daE_GE_HIO_c = .data:0x0000022C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_193_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3920 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x34 scope:global data:byte target_count = .bss:0x0000004C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_e_gi/splits.txt b/config/GZ2P01/rels/d_a_e_gi/splits.txt index 2d4d4d7c9f..7b4b9d46bf 100644 --- a/config/GZ2P01/rels/d_a_e_gi/splits.txt +++ b/config/GZ2P01/rels/d_a_e_gi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gi.cpp: diff --git a/config/GZ2P01/rels/d_a_e_gi/symbols.txt b/config/GZ2P01/rels/d_a_e_gi/symbols.txt index c5de07846c..d08a8efc50 100644 --- a/config/GZ2P01/rels/d_a_e_gi/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_gi/symbols.txt @@ -123,7 +123,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000118; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_194_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3786 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3787 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3795 = .data:0x00000030; // type:object size:0x6 scope:local @@ -141,7 +142,7 @@ __vt__8cM3dGSph = .data:0x00000160; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000016C; // type:object size:0x24 scope:global __vt__12daE_GI_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_194_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3923 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte m_cry_gi = .bss:0x00000044; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_e_gm/splits.txt b/config/GZ2P01/rels/d_a_e_gm/splits.txt index a7a62ae9bc..2a940ae23c 100644 --- a/config/GZ2P01/rels/d_a_e_gm/splits.txt +++ b/config/GZ2P01/rels/d_a_e_gm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gm.cpp: diff --git a/config/GZ2P01/rels/d_a_e_gm/symbols.txt b/config/GZ2P01/rels/d_a_e_gm/symbols.txt index 88c7b7eb8c..ffab898c51 100644 --- a/config/GZ2P01/rels/d_a_e_gm/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_gm/symbols.txt @@ -134,7 +134,8 @@ l_heapsize = .rodata:0x00000140; // type:object size:0x8 scope:global @stringBase0 = .rodata:0x00000150; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_195_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2P01/rels/d_a_e_gob/splits.txt b/config/GZ2P01/rels/d_a_e_gob/splits.txt index 479e8b6be6..d1648abdbc 100644 --- a/config/GZ2P01/rels/d_a_e_gob/splits.txt +++ b/config/GZ2P01/rels/d_a_e_gob/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gob.cpp: diff --git a/config/GZ2P01/rels/d_a_e_gob/symbols.txt b/config/GZ2P01/rels/d_a_e_gob/symbols.txt index 951027439b..23ea9f23e3 100644 --- a/config/GZ2P01/rels/d_a_e_gob/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_gob/symbols.txt @@ -207,7 +207,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_196_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3758 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte ms = .bss:0x00000074; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_e_gs/splits.txt b/config/GZ2P01/rels/d_a_e_gs/splits.txt index 1119561263..479ee51db3 100644 --- a/config/GZ2P01/rels/d_a_e_gs/splits.txt +++ b/config/GZ2P01/rels/d_a_e_gs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_gs.cpp: diff --git a/config/GZ2P01/rels/d_a_e_gs/symbols.txt b/config/GZ2P01/rels/d_a_e_gs/symbols.txt index f373b81623..761f1a11e7 100644 --- a/config/GZ2P01/rels/d_a_e_gs/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_gs/symbols.txt @@ -38,6 +38,6 @@ l_daE_GS_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_E_GS = .data:0x00000020; // type:object size:0x30 scope:global __vt__12daE_GS_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_197_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3641 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_hb/splits.txt b/config/GZ2P01/rels/d_a_e_hb/splits.txt index 9f53805739..ef28826270 100644 --- a/config/GZ2P01/rels/d_a_e_hb/splits.txt +++ b/config/GZ2P01/rels/d_a_e_hb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hb.cpp: diff --git a/config/GZ2P01/rels/d_a_e_hb/symbols.txt b/config/GZ2P01/rels/d_a_e_hb/symbols.txt index bbd29ee018..3aa96db52f 100644 --- a/config/GZ2P01/rels/d_a_e_hb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_hb/symbols.txt @@ -121,7 +121,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000130; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_68_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -144,6 +145,6 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000001FC; // type:object size:0x14 scope:global __vt__12daE_HB_HIO_c = .data:0x00000210; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_68_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_hm/splits.txt b/config/GZ2P01/rels/d_a_e_hm/splits.txt index 74d7a16ae5..422c8424ba 100644 --- a/config/GZ2P01/rels/d_a_e_hm/splits.txt +++ b/config/GZ2P01/rels/d_a_e_hm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hm.cpp: diff --git a/config/GZ2P01/rels/d_a_e_hm/symbols.txt b/config/GZ2P01/rels/d_a_e_hm/symbols.txt index fe75134251..3d933e81de 100644 --- a/config/GZ2P01/rels/d_a_e_hm/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_hm/symbols.txt @@ -145,7 +145,8 @@ ccShpSrc$3893 = .rodata:0x00000040; // type:object size:0x40 scope:local @stringBase0 = .rodata:0x00000154; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_199_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3670 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3671 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3679 = .data:0x00000030; // type:object size:0x6 scope:local @@ -180,7 +181,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3807 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte s_dis__22@unnamed@d_a_e_hm_cpp@ = .bss:0x00000074; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_e_hp/splits.txt b/config/GZ2P01/rels/d_a_e_hp/splits.txt index 5d40f97ca1..1c44f1d8cc 100644 --- a/config/GZ2P01/rels/d_a_e_hp/splits.txt +++ b/config/GZ2P01/rels/d_a_e_hp/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hp.cpp: diff --git a/config/GZ2P01/rels/d_a_e_hp/symbols.txt b/config/GZ2P01/rels/d_a_e_hp/symbols.txt index c6012fdf7d..bb63f95ad3 100644 --- a/config/GZ2P01/rels/d_a_e_hp/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_hp/symbols.txt @@ -100,7 +100,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000D8; // type:object size:0x1A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_200_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3784 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3785 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3793 = .data:0x00000030; // type:object size:0x6 scope:local @@ -121,6 +122,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global __vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3921 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_hz/splits.txt b/config/GZ2P01/rels/d_a_e_hz/splits.txt index ee33ab3807..2265bcd5bb 100644 --- a/config/GZ2P01/rels/d_a_e_hz/splits.txt +++ b/config/GZ2P01/rels/d_a_e_hz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hz.cpp: diff --git a/config/GZ2P01/rels/d_a_e_hz/symbols.txt b/config/GZ2P01/rels/d_a_e_hz/symbols.txt index aed3e56382..07260d5d09 100644 --- a/config/GZ2P01/rels/d_a_e_hz/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_hz/symbols.txt @@ -133,7 +133,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000FC; // type:object size:0x17 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_201_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3845 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3846 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3854 = .data:0x00000030; // type:object size:0x6 scope:local @@ -169,13 +170,14 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_201_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3982 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global data:byte m_near_bomb = .bss:0x00000090; // type:object size:0x4 scope:global m_near_carry = .bss:0x00000094; // type:object size:0x4 scope:global m_near_weapon = .bss:0x00000098; // type:object size:0x4 scope:global @5585 = .bss:0x0000009C; // type:object size:0xC scope:local +init$0000 = .bss:0x000000A8; // type:object size:0x1 scope:local align:1 data:byte sc$5584 = .bss:0x000000AC; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B8; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000BC; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_hzelda/splits.txt b/config/GZ2P01/rels/d_a_e_hzelda/splits.txt index 4ea18ee7f1..cc06bc408a 100644 --- a/config/GZ2P01/rels/d_a_e_hzelda/splits.txt +++ b/config/GZ2P01/rels/d_a_e_hzelda/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_hzelda.cpp: diff --git a/config/GZ2P01/rels/d_a_e_hzelda/symbols.txt b/config/GZ2P01/rels/d_a_e_hzelda/symbols.txt index 3bdcbafaa7..a9a73530dd 100644 --- a/config/GZ2P01/rels/d_a_e_hzelda/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_hzelda/symbols.txt @@ -119,7 +119,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000140; // type:object size:0x7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_202_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double b_id$4252 = .data:0x00000020; // type:object size:0x6 scope:local @4500 = .data:0x00000028; // type:object size:0x30 scope:local b_id$4879 = .data:0x00000058; // type:object size:0x6 scope:local @@ -131,7 +132,7 @@ ball_at_sph_src$5569 = .data:0x000000F8; // type:object size:0x40 scope:local ball_tg_sph_src$5570 = .data:0x00000138; // type:object size:0x40 scope:local tri_at_sph_src$5571 = .data:0x00000178; // type:object size:0x40 scope:local pl_at_sph_src$5572 = .data:0x000001B8; // type:object size:0x40 scope:local -l_daE_HZELDA_Method = .data:0x000001F8; // type:object size:0x20 scope:global +l_daE_HZELDA_Method = .data:0x000001F8; // type:object size:0x20 scope:local g_profile_E_HZELDA = .data:0x00000218; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000248; // type:object size:0xC scope:global __vt__10cCcD_GStts = .data:0x00000254; // type:object size:0xC scope:global @@ -142,6 +143,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000284; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000002A8; // type:object size:0xC scope:global __vt__16daE_HZELDA_HIO_c = .data:0x000002B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_202_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3762 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0xC scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_e_is/splits.txt b/config/GZ2P01/rels/d_a_e_is/splits.txt index ed3b485b0e..dd431b766a 100644 --- a/config/GZ2P01/rels/d_a_e_is/splits.txt +++ b/config/GZ2P01/rels/d_a_e_is/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_is.cpp: diff --git a/config/GZ2P01/rels/d_a_e_is/symbols.txt b/config/GZ2P01/rels/d_a_e_is/symbols.txt index 0781094b6d..bc9421757a 100644 --- a/config/GZ2P01/rels/d_a_e_is/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_is/symbols.txt @@ -85,7 +85,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000A8; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_203_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double at_sph_src$4258 = .data:0x00000020; // type:object size:0x40 scope:local cc_cyl_src$4259 = .data:0x00000060; // type:object size:0x44 scope:local core_sph_src$4260 = .data:0x000000A4; // type:object size:0x40 scope:local @@ -100,6 +101,6 @@ __vt__8cM3dGAab = .data:0x00000170; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12daE_IS_HIO_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_203_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_kg/splits.txt b/config/GZ2P01/rels/d_a_e_kg/splits.txt index 32fc575c97..269805d8f1 100644 --- a/config/GZ2P01/rels/d_a_e_kg/splits.txt +++ b/config/GZ2P01/rels/d_a_e_kg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kg.cpp: diff --git a/config/GZ2P01/rels/d_a_e_kg/symbols.txt b/config/GZ2P01/rels/d_a_e_kg/symbols.txt index bee6095c31..0e8b9cbbbe 100644 --- a/config/GZ2P01/rels/d_a_e_kg/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_kg/symbols.txt @@ -87,7 +87,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000C8; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_204_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2P01/rels/d_a_e_kk/splits.txt b/config/GZ2P01/rels/d_a_e_kk/splits.txt index 78b412d9ef..685d22cf7f 100644 --- a/config/GZ2P01/rels/d_a_e_kk/splits.txt +++ b/config/GZ2P01/rels/d_a_e_kk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kk.cpp: diff --git a/config/GZ2P01/rels/d_a_e_kk/symbols.txt b/config/GZ2P01/rels/d_a_e_kk/symbols.txt index f787a18fb7..b46485473e 100644 --- a/config/GZ2P01/rels/d_a_e_kk/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_kk/symbols.txt @@ -108,7 +108,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000D0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_205_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3671 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3672 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3680 = .data:0x00000030; // type:object size:0x6 scope:local @@ -126,6 +127,6 @@ __vt__8cM3dGAab = .data:0x00000174; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000180; // type:object size:0x24 scope:global __vt__12daE_KK_HIO_c = .data:0x000001A4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_205_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3808 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_kr/splits.txt b/config/GZ2P01/rels/d_a_e_kr/splits.txt index 38a744babe..42848809b2 100644 --- a/config/GZ2P01/rels/d_a_e_kr/splits.txt +++ b/config/GZ2P01/rels/d_a_e_kr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_kr.cpp: diff --git a/config/GZ2P01/rels/d_a_e_kr/symbols.txt b/config/GZ2P01/rels/d_a_e_kr/symbols.txt index 1fa7ae9b07..f1a10df2ce 100644 --- a/config/GZ2P01/rels/d_a_e_kr/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_kr/symbols.txt @@ -132,7 +132,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000154; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_206_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2P01/rels/d_a_e_mb/splits.txt b/config/GZ2P01/rels/d_a_e_mb/splits.txt index a359d07601..91f3010614 100644 --- a/config/GZ2P01/rels/d_a_e_mb/splits.txt +++ b/config/GZ2P01/rels/d_a_e_mb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mb.cpp: diff --git a/config/GZ2P01/rels/d_a_e_mb/symbols.txt b/config/GZ2P01/rels/d_a_e_mb/symbols.txt index 4a36801bd3..cc6094c8f4 100644 --- a/config/GZ2P01/rels/d_a_e_mb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_mb/symbols.txt @@ -107,23 +107,23 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_207_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3759 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte +l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte @3824 = .bss:0x00000070; // type:object size:0xC scope:local -L_pos1 = .bss:0x0000007C; // type:object size:0xC scope:global +L_pos1 = .bss:0x0000007C; // type:object size:0xC scope:local @3825 = .bss:0x00000088; // type:object size:0xC scope:local -L_pos2 = .bss:0x00000094; // type:object size:0xC scope:global align:4 data:float +L_pos2 = .bss:0x00000094; // type:object size:0xC scope:local align:4 data:float @3826 = .bss:0x000000A0; // type:object size:0xC scope:local -L_Hpos = .bss:0x000000AC; // type:object size:0xC scope:global +L_Hpos = .bss:0x000000AC; // type:object size:0xC scope:local @3827 = .bss:0x000000B8; // type:object size:0xC scope:local -R_pos1 = .bss:0x000000C4; // type:object size:0xC scope:global +R_pos1 = .bss:0x000000C4; // type:object size:0xC scope:local @3828 = .bss:0x000000D0; // type:object size:0xC scope:local -R_pos2 = .bss:0x000000DC; // type:object size:0xC scope:global align:4 data:float +R_pos2 = .bss:0x000000DC; // type:object size:0xC scope:local align:4 data:float @3829 = .bss:0x000000E8; // type:object size:0xC scope:local -R_Hpos = .bss:0x000000F4; // type:object size:0xC scope:global +R_Hpos = .bss:0x000000F4; // type:object size:0xC scope:local @3830 = .bss:0x00000100; // type:object size:0xC scope:local -c_pos = .bss:0x0000010C; // type:object size:0xC scope:global +c_pos = .bss:0x0000010C; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000118; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000011C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000120; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_mf/splits.txt b/config/GZ2P01/rels/d_a_e_mf/splits.txt index 58906b79fe..f17172d89e 100644 --- a/config/GZ2P01/rels/d_a_e_mf/splits.txt +++ b/config/GZ2P01/rels/d_a_e_mf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mf.cpp: diff --git a/config/GZ2P01/rels/d_a_e_mf/symbols.txt b/config/GZ2P01/rels/d_a_e_mf/symbols.txt index f432e117bc..a81fd2a033 100644 --- a/config/GZ2P01/rels/d_a_e_mf/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_mf/symbols.txt @@ -169,7 +169,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000180; // type:object size:0x13 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_209_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3707 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3708 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3716 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2P01/rels/d_a_e_mk/splits.txt b/config/GZ2P01/rels/d_a_e_mk/splits.txt index 4c7bea7ee9..cb3d85174f 100644 --- a/config/GZ2P01/rels/d_a_e_mk/splits.txt +++ b/config/GZ2P01/rels/d_a_e_mk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mk.cpp: diff --git a/config/GZ2P01/rels/d_a_e_mk/symbols.txt b/config/GZ2P01/rels/d_a_e_mk/symbols.txt index a5765970d9..dbdaf45b3d 100644 --- a/config/GZ2P01/rels/d_a_e_mk/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_mk/symbols.txt @@ -258,12 +258,12 @@ demo_jump_pos_3 = .bss:0x00000084; // type:object size:0xC scope:global @3769 = .bss:0x00000090; // type:object size:0xC scope:local STAGE_CENTER_POS = .bss:0x0000009C; // type:object size:0xC scope:global align:4 data:float STAGE_ANGLE_Y = .bss:0x000000A8; // type:object size:0x2 scope:global data:2byte -lbl_210_bss_AA = .bss:0x000000AA; // type:object size:0x1 data:byte +hio_set = .bss:0x000000AA; // type:object size:0x1 scope:local align:1 data:byte @3772 = .bss:0x000000AC; // type:object size:0xC scope:local l_HIO = .bss:0x000000B8; // type:object size:0x24 scope:global data:byte target_info = .bss:0x000000DC; // type:object size:0x50 scope:global data:4byte target_info_count = .bss:0x0000012C; // type:object size:0x4 scope:global data:4byte -lbl_210_bss_130 = .bss:0x00000130; // type:object size:0x1 data:byte +lbl_210_bss_130 = .bss:0x00000130; // type:object size:0x1 scope:local data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000134; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000138; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000013C; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_mk_bo/splits.txt b/config/GZ2P01/rels/d_a_e_mk_bo/splits.txt index 9f8095f62a..30a241f6a1 100644 --- a/config/GZ2P01/rels/d_a_e_mk_bo/splits.txt +++ b/config/GZ2P01/rels/d_a_e_mk_bo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mk_bo.cpp: diff --git a/config/GZ2P01/rels/d_a_e_mk_bo/symbols.txt b/config/GZ2P01/rels/d_a_e_mk_bo/symbols.txt index 2ae7615b7c..228de7ea31 100644 --- a/config/GZ2P01/rels/d_a_e_mk_bo/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_mk_bo/symbols.txt @@ -67,7 +67,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000098; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_211_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double bo_eno_1$4378 = .data:0x00000020; // type:object size:0x8 scope:local bo_eno_2$4379 = .data:0x00000028; // type:object size:0x8 scope:local bo_eno_12$4402 = .data:0x00000030; // type:object size:0x4 scope:local diff --git a/config/GZ2P01/rels/d_a_e_mm/splits.txt b/config/GZ2P01/rels/d_a_e_mm/splits.txt index 6f15426eb2..c6f4ae2d2d 100644 --- a/config/GZ2P01/rels/d_a_e_mm/splits.txt +++ b/config/GZ2P01/rels/d_a_e_mm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_mm.cpp: diff --git a/config/GZ2P01/rels/d_a_e_mm/symbols.txt b/config/GZ2P01/rels/d_a_e_mm/symbols.txt index 1357828c73..c69e567c6c 100644 --- a/config/GZ2P01/rels/d_a_e_mm/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_mm/symbols.txt @@ -80,7 +80,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000AC; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_212_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -99,6 +100,6 @@ __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12daE_MM_HIO_c = .data:0x000001A8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_212_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x34 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_mm_mt/symbols.txt b/config/GZ2P01/rels/d_a_e_mm_mt/symbols.txt index faa85c3733..92f0273f7f 100644 --- a/config/GZ2P01/rels/d_a_e_mm_mt/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_mm_mt/symbols.txt @@ -77,7 +77,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000D4; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_213_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2P01/rels/d_a_e_ms/splits.txt b/config/GZ2P01/rels/d_a_e_ms/splits.txt index 2941c2ee33..8a93758f63 100644 --- a/config/GZ2P01/rels/d_a_e_ms/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ms/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ms.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ms/symbols.txt b/config/GZ2P01/rels/d_a_e_ms/symbols.txt index 1fb48bb131..28c82bbe16 100644 --- a/config/GZ2P01/rels/d_a_e_ms/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ms/symbols.txt @@ -106,7 +106,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000F8; // type:object size:0x11 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_214_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3679 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3680 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3688 = .data:0x00000030; // type:object size:0x6 scope:local @@ -141,7 +142,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_214_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3816 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte target_info = .bss:0x00000070; // type:object size:0x50 scope:global diff --git a/config/GZ2P01/rels/d_a_e_nest/splits.txt b/config/GZ2P01/rels/d_a_e_nest/splits.txt index 8ad0484758..e12dca12d4 100644 --- a/config/GZ2P01/rels/d_a_e_nest/splits.txt +++ b/config/GZ2P01/rels/d_a_e_nest/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_nest.cpp: diff --git a/config/GZ2P01/rels/d_a_e_nest/symbols.txt b/config/GZ2P01/rels/d_a_e_nest/symbols.txt index e974e7b788..0103015e20 100644 --- a/config/GZ2P01/rels/d_a_e_nest/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_nest/symbols.txt @@ -118,6 +118,6 @@ __vt__8cM3dGAab = .data:0x00000110; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000011C; // type:object size:0x24 scope:global __vt__14daE_Nest_HIO_c = .data:0x00000140; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_69_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3994 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_nz/splits.txt b/config/GZ2P01/rels/d_a_e_nz/splits.txt index a781156b2e..6bac93cb42 100644 --- a/config/GZ2P01/rels/d_a_e_nz/splits.txt +++ b/config/GZ2P01/rels/d_a_e_nz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_nz.cpp: diff --git a/config/GZ2P01/rels/d_a_e_nz/symbols.txt b/config/GZ2P01/rels/d_a_e_nz/symbols.txt index 077d1abc5a..ebe944621c 100644 --- a/config/GZ2P01/rels/d_a_e_nz/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_nz/symbols.txt @@ -80,7 +80,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000C0; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_215_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -115,11 +116,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte -lbl_215_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte +data_8072C454 = .bss:0x00000074; // type:object size:0x4 data:4byte @4220 = .bss:0x00000078; // type:object size:0xC scope:local +init$0000 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte sc$4219 = .bss:0x00000088; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000094; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000098; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_oc/splits.txt b/config/GZ2P01/rels/d_a_e_oc/splits.txt index 783af67c8f..4f15d581c2 100644 --- a/config/GZ2P01/rels/d_a_e_oc/splits.txt +++ b/config/GZ2P01/rels/d_a_e_oc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_oc.cpp: diff --git a/config/GZ2P01/rels/d_a_e_oc/symbols.txt b/config/GZ2P01/rels/d_a_e_oc/symbols.txt index 6496470a1b..8e41485d59 100644 --- a/config/GZ2P01/rels/d_a_e_oc/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_oc/symbols.txt @@ -191,7 +191,8 @@ oc_attackc_trans__6E_OC_n = .rodata:0x00000054; // type:object size:0x28 scope:g @stringBase0 = .rodata:0x000001E4; // type:object size:0x1D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_216_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3790 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3791 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3799 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2P01/rels/d_a_e_oct_bg/splits.txt b/config/GZ2P01/rels/d_a_e_oct_bg/splits.txt index fd7fd9801f..a9c2c451fb 100644 --- a/config/GZ2P01/rels/d_a_e_oct_bg/splits.txt +++ b/config/GZ2P01/rels/d_a_e_oct_bg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_oct_bg.cpp: diff --git a/config/GZ2P01/rels/d_a_e_oct_bg/symbols.txt b/config/GZ2P01/rels/d_a_e_oct_bg/symbols.txt index 7fbb7791fa..a773bdc65c 100644 --- a/config/GZ2P01/rels/d_a_e_oct_bg/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_oct_bg/symbols.txt @@ -107,7 +107,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000E4; // type:object size:0xD scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_217_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3618 = .data:0x00000020; // type:object size:0xC scope:local data:4byte cc_obg_src__26@unnamed@d_a_e_oct_bg_cpp@ = .data:0x0000002C; // type:object size:0x40 scope:global cc_obg_at_src__26@unnamed@d_a_e_oct_bg_cpp@ = .data:0x0000006C; // type:object size:0x40 scope:global @@ -164,11 +165,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_217_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +struct_8073A13D = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3763 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x24 scope:global data:byte -lbl_217_bss_79 = .bss:0x00000079; // type:object size:0x1 data:byte -lbl_217_bss_7A = .bss:0x0000007A; // type:object size:0x1 data:byte +unk_bss_78 = .bss:0x00000078; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_79 = .bss:0x00000079; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_7A = .bss:0x0000007A; // type:object size:0x1 scope:local align:1 data:byte +unk_bss_7B = .bss:0x0000007B; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_ot/splits.txt b/config/GZ2P01/rels/d_a_e_ot/splits.txt index 7e4baaea3c..754e31e143 100644 --- a/config/GZ2P01/rels/d_a_e_ot/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ot/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ot.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ot/symbols.txt b/config/GZ2P01/rels/d_a_e_ot/symbols.txt index 57227ad144..34c68f02eb 100644 --- a/config/GZ2P01/rels/d_a_e_ot/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ot/symbols.txt @@ -94,7 +94,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000C4; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_218_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3789 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3790 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3798 = .data:0x00000030; // type:object size:0x6 scope:local @@ -137,12 +138,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_218_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3926 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte -lbl_218_bss_74 = .bss:0x00000074; // type:object size:0x1 data:byte -lbl_218_bss_75 = .bss:0x00000075; // type:object size:0x1 data:byte +data_8073D2DC = .bss:0x00000074; // type:object size:0x1 scope:local data:byte +data_8073D2DD = .bss:0x00000075; // type:object size:0x1 scope:local data:byte @4086 = .bss:0x00000078; // type:object size:0xC scope:local +init$0000 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte sc$4085 = .bss:0x00000088; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000094; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000098; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_ph/splits.txt b/config/GZ2P01/rels/d_a_e_ph/splits.txt index 98f255d16e..48eb4106b1 100644 --- a/config/GZ2P01/rels/d_a_e_ph/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ph/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ph.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ph/symbols.txt b/config/GZ2P01/rels/d_a_e_ph/symbols.txt index 8a06998f23..d349fcd73e 100644 --- a/config/GZ2P01/rels/d_a_e_ph/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ph/symbols.txt @@ -120,6 +120,6 @@ __vt__8cM3dGAab = .data:0x0000005C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000068; // type:object size:0x24 scope:global __vt__12daE_PH_HIO_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_219_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +initialized = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3762 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_pm/splits.txt b/config/GZ2P01/rels/d_a_e_pm/splits.txt index 63707dd671..6c70901c73 100644 --- a/config/GZ2P01/rels/d_a_e_pm/splits.txt +++ b/config/GZ2P01/rels/d_a_e_pm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_pm.cpp: diff --git a/config/GZ2P01/rels/d_a_e_pm/symbols.txt b/config/GZ2P01/rels/d_a_e_pm/symbols.txt index f943f230b4..2e503ba86c 100644 --- a/config/GZ2P01/rels/d_a_e_pm/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_pm/symbols.txt @@ -204,7 +204,8 @@ ccCylSrc$4052 = .rodata:0x00000050; // type:object size:0x44 scope:local @stringBase0 = .rodata:0x0000020C; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_220_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3789 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3790 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3798 = .data:0x00000030; // type:object size:0x6 scope:local @@ -245,7 +246,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_220_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3928 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4C scope:global data:byte s_dis__22@unnamed@d_a_e_pm_cpp@ = .bss:0x000000A0; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_e_po/splits.txt b/config/GZ2P01/rels/d_a_e_po/splits.txt index ca4de81d74..fe8c87b3c7 100644 --- a/config/GZ2P01/rels/d_a_e_po/splits.txt +++ b/config/GZ2P01/rels/d_a_e_po/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_po.cpp: diff --git a/config/GZ2P01/rels/d_a_e_po/symbols.txt b/config/GZ2P01/rels/d_a_e_po/symbols.txt index a515c05f4d..e8ab6fe1d8 100644 --- a/config/GZ2P01/rels/d_a_e_po/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_po/symbols.txt @@ -312,7 +312,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000038C; // type:object size:0x1A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_221_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3796 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3797 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3805 = .data:0x00000030; // type:object size:0x6 scope:local @@ -362,7 +363,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3933 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global align:4 data:float mRollCount = .bss:0x00000090; // type:object size:0x2 scope:global diff --git a/config/GZ2P01/rels/d_a_e_pz/splits.txt b/config/GZ2P01/rels/d_a_e_pz/splits.txt index 1a3b9f60c7..d7f10891c5 100644 --- a/config/GZ2P01/rels/d_a_e_pz/splits.txt +++ b/config/GZ2P01/rels/d_a_e_pz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_pz.cpp: diff --git a/config/GZ2P01/rels/d_a_e_pz/symbols.txt b/config/GZ2P01/rels/d_a_e_pz/symbols.txt index b7f71df642..9953619656 100644 --- a/config/GZ2P01/rels/d_a_e_pz/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_pz/symbols.txt @@ -217,7 +217,8 @@ mDBaBa_birthHani_dt = .rodata:0x00000264; // type:object size:0x30 scope:global @stringBase0 = .rodata:0x000002B8; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_222_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local @@ -267,11 +268,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_222_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3922 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global align:4 data:float +lbl_222_bss_70 = .bss:0x00000070; // type:object size:0x1 data:byte lbl_222_bss_71 = .bss:0x00000071; // type:object size:0x1 data:byte @4339 = .bss:0x00000074; // type:object size:0xC scope:local +init$4340 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 data:byte @4342 = .bss:0x00000084; // type:object size:0xC scope:local @4343 = .bss:0x00000090; // type:object size:0xC scope:local @4344 = .bss:0x0000009C; // type:object size:0xC scope:local @@ -291,6 +294,7 @@ lbl_222_bss_71 = .bss:0x00000071; // type:object size:0x1 data:byte @4358 = .bss:0x00000144; // type:object size:0xC scope:local mPzCenterInit_dt$4338 = .bss:0x00000150; // type:object size:0xD8 scope:local @4360 = .bss:0x00000228; // type:object size:0xC scope:local +init$4361 = .bss:0x00000234; // type:object size:0x1 scope:local align:1 data:byte @4363 = .bss:0x00000238; // type:object size:0xC scope:local @4364 = .bss:0x00000244; // type:object size:0xC scope:local @4365 = .bss:0x00000250; // type:object size:0xC scope:local @@ -310,10 +314,12 @@ mPzCenterInit_dt$4338 = .bss:0x00000150; // type:object size:0xD8 scope:local @4379 = .bss:0x000002F8; // type:object size:0xC scope:local mPzEyeInit_dt$4359 = .bss:0x00000304; // type:object size:0xD8 scope:local @5677 = .bss:0x000003DC; // type:object size:0xC scope:local +init$5678 = .bss:0x000003E8; // type:object size:0x1 scope:local align:1 data:byte @5680 = .bss:0x000003EC; // type:object size:0xC scope:local @5681 = .bss:0x000003F8; // type:object size:0xC scope:local mPzDeadDemo_mCenter_dt$5676 = .bss:0x00000404; // type:object size:0x24 scope:local @5683 = .bss:0x00000428; // type:object size:0xC scope:local +init$5684 = .bss:0x00000434; // type:object size:0x1 scope:local align:1 data:byte @5686 = .bss:0x00000438; // type:object size:0xC scope:local @5687 = .bss:0x00000444; // type:object size:0xC scope:local mPzDeadDemo_mEye_dt$5682 = .bss:0x00000450; // type:object size:0x24 scope:local diff --git a/config/GZ2P01/rels/d_a_e_rb/splits.txt b/config/GZ2P01/rels/d_a_e_rb/splits.txt index 4869ba857e..eca44bdd6f 100644 --- a/config/GZ2P01/rels/d_a_e_rb/splits.txt +++ b/config/GZ2P01/rels/d_a_e_rb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rb.cpp: diff --git a/config/GZ2P01/rels/d_a_e_rb/symbols.txt b/config/GZ2P01/rels/d_a_e_rb/symbols.txt index 4ab3d0ad25..d9f9cd74fa 100644 --- a/config/GZ2P01/rels/d_a_e_rb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_rb/symbols.txt @@ -88,7 +88,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000C8; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_223_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -106,7 +107,7 @@ __vt__8cM3dGPla = .data:0x00000154; // type:object size:0xC scope:global __vt__14dBgS_ObjGndChk = .data:0x00000160; // type:object size:0x30 scope:global __vt__12daE_RB_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_223_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte child = .bss:0x00000028; // type:object size:0x28 scope:global diff --git a/config/GZ2P01/rels/d_a_e_rd/splits.txt b/config/GZ2P01/rels/d_a_e_rd/splits.txt index 1ca151ccc3..60a5b045bb 100644 --- a/config/GZ2P01/rels/d_a_e_rd/splits.txt +++ b/config/GZ2P01/rels/d_a_e_rd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rd.cpp: diff --git a/config/GZ2P01/rels/d_a_e_rd/symbols.txt b/config/GZ2P01/rels/d_a_e_rd/symbols.txt index f17caf19f1..2a2f2830e9 100644 --- a/config/GZ2P01/rels/d_a_e_rd/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_rd/symbols.txt @@ -378,7 +378,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000003E4; // type:object size:0x40 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_70_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$4087 = .data:0x00000020; // type:object size:0x8 scope:local e_env$4088 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$4096 = .data:0x00000030; // type:object size:0x6 scope:local @@ -437,21 +438,24 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local boss = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -lbl_70_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @4224 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x50 scope:global data:byte S_find = .bss:0x000000AC; // type:object size:0x2 scope:global data:2byte lbl_70_bss_AE = .bss:0x000000AE; // type:object size:0x1 data:byte @4242 = .bss:0x000000B0; // type:object size:0xC scope:local S_find_pos = .bss:0x000000BC; // type:object size:0xC scope:global align:4 data:float -lbl_70_bss_C8 = .bss:0x000000C8; // type:object size:0x1 data:byte +data_80519200 = .bss:0x000000C8; // type:object size:0x1 data:byte +data_80519201 = .bss:0x000000C9; // type:object size:0x1 data:byte target_info = .bss:0x000000CC; // type:object size:0x28 scope:global data:4byte target_info_count = .bss:0x000000F4; // type:object size:0x4 scope:global data:4byte +data_80519230 = .bss:0x000000F8; // type:object size:0x1 scope:local data:byte check_index$5284 = .bss:0x000000FC; // type:object size:0xFF scope:local rd_count = .bss:0x000001FC; // type:object size:0x4 scope:global data:4byte -lbl_70_bss_200 = .bss:0x00000200; // type:object size:0x1 data:byte +data_80519338 = .bss:0x00000200; // type:object size:0x1 scope:local align:1 data:byte c_start = .bss:0x00000204; // type:object size:0x4 scope:global @11269 = .bss:0x00000208; // type:object size:0xC scope:local +init$8899 = .bss:0x00000214; // type:object size:0x1 scope:local align:1 data:byte @11272 = .bss:0x00000218; // type:object size:0xC scope:local @11273 = .bss:0x00000224; // type:object size:0xC scope:local @11274 = .bss:0x00000230; // type:object size:0xC scope:local @@ -459,9 +463,11 @@ c_start = .bss:0x00000204; // type:object size:0x4 scope:global @11276 = .bss:0x00000248; // type:object size:0xC scope:local set_pos$11268 = .bss:0x00000254; // type:object size:0x48 scope:local @11412 = .bss:0x0000029C; // type:object size:0xC scope:local +init$9041 = .bss:0x000002A8; // type:object size:0x1 scope:local align:1 data:byte @11415 = .bss:0x000002AC; // type:object size:0xC scope:local @11416 = .bss:0x000002B8; // type:object size:0xC scope:local set_pos$11411 = .bss:0x000002C4; // type:object size:0x24 scope:local +instanceCount = .bss:0x000002E8; // type:object size:0x1 scope:local data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000002EC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000002F0; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000002F4; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_rdb/splits.txt b/config/GZ2P01/rels/d_a_e_rdb/splits.txt index 2da6925dd4..7ebbf7142d 100644 --- a/config/GZ2P01/rels/d_a_e_rdb/splits.txt +++ b/config/GZ2P01/rels/d_a_e_rdb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rdb.cpp: diff --git a/config/GZ2P01/rels/d_a_e_rdb/symbols.txt b/config/GZ2P01/rels/d_a_e_rdb/symbols.txt index 755110a7f9..01185e4919 100644 --- a/config/GZ2P01/rels/d_a_e_rdb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_rdb/symbols.txt @@ -201,7 +201,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000268; // type:object size:0x33 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_224_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3886 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3887 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3895 = .data:0x00000030; // type:object size:0x6 scope:local @@ -242,10 +243,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_224_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4023 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @5932 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte @5935 = .bss:0x00000070; // type:object size:0xC scope:local @5936 = .bss:0x0000007C; // type:object size:0xC scope:local @5937 = .bss:0x00000088; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_rdy/splits.txt b/config/GZ2P01/rels/d_a_e_rdy/splits.txt index 14adc48ce3..283e3b7f93 100644 --- a/config/GZ2P01/rels/d_a_e_rdy/splits.txt +++ b/config/GZ2P01/rels/d_a_e_rdy/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_rdy.cpp: diff --git a/config/GZ2P01/rels/d_a_e_rdy/symbols.txt b/config/GZ2P01/rels/d_a_e_rdy/symbols.txt index a7dca54576..c398d8ed8a 100644 --- a/config/GZ2P01/rels/d_a_e_rdy/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_rdy/symbols.txt @@ -265,7 +265,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000002C0; // type:object size:0x1D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_225_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3897 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3898 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3906 = .data:0x00000030; // type:object size:0x6 scope:local @@ -317,7 +318,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local boss = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -lbl_225_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @4034 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x50 scope:global data:byte S_find = .bss:0x000000AC; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2P01/rels/d_a_e_s1/splits.txt b/config/GZ2P01/rels/d_a_e_s1/splits.txt index 5a762f1348..d3ca26d184 100644 --- a/config/GZ2P01/rels/d_a_e_s1/splits.txt +++ b/config/GZ2P01/rels/d_a_e_s1/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_s1.cpp: diff --git a/config/GZ2P01/rels/d_a_e_s1/symbols.txt b/config/GZ2P01/rels/d_a_e_s1/symbols.txt index 433d246aaa..303db167f3 100644 --- a/config/GZ2P01/rels/d_a_e_s1/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_s1/symbols.txt @@ -169,7 +169,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001B0; // type:object size:0x31 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_226_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -211,8 +212,8 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_226_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte -lbl_226_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte +l_no_fail = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x2C scope:global data:byte check_index$4023 = .bss:0x00000080; // type:object size:0xFF scope:local diff --git a/config/GZ2P01/rels/d_a_e_sb/splits.txt b/config/GZ2P01/rels/d_a_e_sb/splits.txt index 2cb921f87b..aaaf974979 100644 --- a/config/GZ2P01/rels/d_a_e_sb/splits.txt +++ b/config/GZ2P01/rels/d_a_e_sb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sb.cpp: diff --git a/config/GZ2P01/rels/d_a_e_sb/symbols.txt b/config/GZ2P01/rels/d_a_e_sb/symbols.txt index 2e3a678cf7..1f098a8158 100644 --- a/config/GZ2P01/rels/d_a_e_sb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_sb/symbols.txt @@ -136,12 +136,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_227_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3653 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0x40 scope:global data:byte -s_Bomb__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000094; // type:object size:0x4 scope:global data:4byte -s_TargetAngle__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000098; // type:object size:0x2 scope:global data:2byte -s_LinkPos__22@unnamed@d_a_e_sb_cpp@ = .bss:0x0000009C; // type:object size:0x4 scope:global data:4byte +l_HIO = .bss:0x00000054; // type:object size:0x40 scope:local data:byte +s_Bomb__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000094; // type:object size:0x4 scope:local data:4byte +s_TargetAngle__22@unnamed@d_a_e_sb_cpp@ = .bss:0x00000098; // type:object size:0x2 scope:local data:2byte +s_LinkPos__22@unnamed@d_a_e_sb_cpp@ = .bss:0x0000009C; // type:object size:0x4 scope:local data:4byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000A8; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_sf/splits.txt b/config/GZ2P01/rels/d_a_e_sf/splits.txt index 270eba4def..d7984ce3e8 100644 --- a/config/GZ2P01/rels/d_a_e_sf/splits.txt +++ b/config/GZ2P01/rels/d_a_e_sf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sf.cpp: diff --git a/config/GZ2P01/rels/d_a_e_sf/symbols.txt b/config/GZ2P01/rels/d_a_e_sf/symbols.txt index f7342ab7d3..0a0240aa5c 100644 --- a/config/GZ2P01/rels/d_a_e_sf/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_sf/symbols.txt @@ -129,7 +129,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000014C; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_228_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3787 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3788 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3796 = .data:0x00000030; // type:object size:0x6 scope:local @@ -170,7 +171,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_228_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3924 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte target_info = .bss:0x0000007C; // type:object size:0x28 scope:global diff --git a/config/GZ2P01/rels/d_a_e_sg/splits.txt b/config/GZ2P01/rels/d_a_e_sg/splits.txt index e6a36a6d30..64f3eea100 100644 --- a/config/GZ2P01/rels/d_a_e_sg/splits.txt +++ b/config/GZ2P01/rels/d_a_e_sg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sg.cpp: diff --git a/config/GZ2P01/rels/d_a_e_sg/symbols.txt b/config/GZ2P01/rels/d_a_e_sg/symbols.txt index 5a848f01cf..2a7bc877ff 100644 --- a/config/GZ2P01/rels/d_a_e_sg/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_sg/symbols.txt @@ -127,7 +127,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_229_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3762 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte stick_pt = .bss:0x0000006C; // type:object size:0x4 scope:global data:4byte @@ -137,6 +137,7 @@ bg_on = .bss:0x00000098; // type:object size:0xA scope:global bg_cross = .bss:0x000000B0; // type:object size:0x78 scope:global target_info_count = .bss:0x00000128; // type:object size:0x4 scope:global data:4byte @4849 = .bss:0x0000012C; // type:object size:0xC scope:local +init$0000 = .bss:0x00000138; // type:object size:0x1 scope:local align:1 data:byte sc$4848 = .bss:0x0000013C; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000148; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000014C; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_sh/splits.txt b/config/GZ2P01/rels/d_a_e_sh/splits.txt index 209a4f3e61..6825b26511 100644 --- a/config/GZ2P01/rels/d_a_e_sh/splits.txt +++ b/config/GZ2P01/rels/d_a_e_sh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sh.cpp: diff --git a/config/GZ2P01/rels/d_a_e_sh/symbols.txt b/config/GZ2P01/rels/d_a_e_sh/symbols.txt index d0fbea44b7..fd559d08ac 100644 --- a/config/GZ2P01/rels/d_a_e_sh/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_sh/symbols.txt @@ -121,7 +121,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000150; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_230_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local @@ -143,6 +144,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_sm/splits.txt b/config/GZ2P01/rels/d_a_e_sm/splits.txt index e4721f6ea5..c5a1c25381 100644 --- a/config/GZ2P01/rels/d_a_e_sm/splits.txt +++ b/config/GZ2P01/rels/d_a_e_sm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sm.cpp: diff --git a/config/GZ2P01/rels/d_a_e_sm/symbols.txt b/config/GZ2P01/rels/d_a_e_sm/symbols.txt index 5981498f55..f2232cf88e 100644 --- a/config/GZ2P01/rels/d_a_e_sm/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_sm/symbols.txt @@ -170,7 +170,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001A0; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_231_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3799 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3800 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3808 = .data:0x00000030; // type:object size:0x6 scope:local @@ -205,7 +206,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_231_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3936 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:global data:byte s_Dis__22@unnamed@d_a_e_sm_cpp@ = .bss:0x00000068; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_e_sm2/splits.txt b/config/GZ2P01/rels/d_a_e_sm2/splits.txt index c9c06b9044..4d8f456d71 100644 --- a/config/GZ2P01/rels/d_a_e_sm2/splits.txt +++ b/config/GZ2P01/rels/d_a_e_sm2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sm2.cpp: diff --git a/config/GZ2P01/rels/d_a_e_sm2/symbols.txt b/config/GZ2P01/rels/d_a_e_sm2/symbols.txt index ae1e28e422..9b60afc2ae 100644 --- a/config/GZ2P01/rels/d_a_e_sm2/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_sm2/symbols.txt @@ -141,7 +141,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000168; // type:object size:0x1C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_232_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3669 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3670 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3678 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2P01/rels/d_a_e_st/splits.txt b/config/GZ2P01/rels/d_a_e_st/splits.txt index 1baa0316a0..054aadbcba 100644 --- a/config/GZ2P01/rels/d_a_e_st/splits.txt +++ b/config/GZ2P01/rels/d_a_e_st/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_st.cpp: diff --git a/config/GZ2P01/rels/d_a_e_st/symbols.txt b/config/GZ2P01/rels/d_a_e_st/symbols.txt index 21084d5e47..172309efe5 100644 --- a/config/GZ2P01/rels/d_a_e_st/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_st/symbols.txt @@ -188,7 +188,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001BC; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_233_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3782 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3783 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3791 = .data:0x00000030; // type:object size:0x6 scope:local @@ -234,7 +235,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local small = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte -lbl_233_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @3919 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x24 scope:global data:byte @6303 = .bss:0x00000080; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_sw/splits.txt b/config/GZ2P01/rels/d_a_e_sw/splits.txt index b75966e443..7df766053f 100644 --- a/config/GZ2P01/rels/d_a_e_sw/splits.txt +++ b/config/GZ2P01/rels/d_a_e_sw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_sw.cpp: diff --git a/config/GZ2P01/rels/d_a_e_sw/symbols.txt b/config/GZ2P01/rels/d_a_e_sw/symbols.txt index 0b999523a2..df01685880 100644 --- a/config/GZ2P01/rels/d_a_e_sw/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_sw/symbols.txt @@ -161,7 +161,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000144; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_235_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3788 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3789 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3797 = .data:0x00000030; // type:object size:0x6 scope:local @@ -232,10 +233,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local target_info__22@unnamed@d_a_e_sw_cpp@ = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte target_dist__22@unnamed@d_a_e_sw_cpp@ = .bss:0x0000004C; // type:object size:0x4 scope:global align:4 data:float -lbl_235_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte -lbl_235_bss_51 = .bss:0x00000051; // type:object size:0x1 data:byte -lbl_235_bss_52 = .bss:0x00000052; // type:object size:0x1 data:byte -lbl_235_bss_53 = .bss:0x00000053; // type:object size:0x1 data:byte +data_807B0200 = .bss:0x00000050; // type:object size:0x1 scope:local data:byte +data_807B0201 = .bss:0x00000051; // type:object size:0x1 scope:local data:byte +data_807B0202 = .bss:0x00000052; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000053; // type:object size:0x1 scope:local align:1 data:byte @3925 = .bss:0x00000054; // type:object size:0xC scope:local l_HIO = .bss:0x00000060; // type:object size:0x24 scope:global align:4 data:float sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_th/splits.txt b/config/GZ2P01/rels/d_a_e_th/splits.txt index aa251c7a89..59e500d184 100644 --- a/config/GZ2P01/rels/d_a_e_th/splits.txt +++ b/config/GZ2P01/rels/d_a_e_th/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_th.cpp: diff --git a/config/GZ2P01/rels/d_a_e_th/symbols.txt b/config/GZ2P01/rels/d_a_e_th/symbols.txt index 72e79a94b2..46bf325e3b 100644 --- a/config/GZ2P01/rels/d_a_e_th/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_th/symbols.txt @@ -156,7 +156,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001A8; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_236_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3785 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3786 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3794 = .data:0x00000030; // type:object size:0x6 scope:local @@ -176,6 +177,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000001D4; // type:object size:0x14 scope:gl __vt__12dBgS_ObjAcch = .data:0x000001E8; // type:object size:0x24 scope:global __vt__12daE_TH_HIO_c = .data:0x0000020C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_236_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3922 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_tk/splits.txt b/config/GZ2P01/rels/d_a_e_tk/splits.txt index 8bdea734c5..3de29d9a96 100644 --- a/config/GZ2P01/rels/d_a_e_tk/splits.txt +++ b/config/GZ2P01/rels/d_a_e_tk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tk.cpp: diff --git a/config/GZ2P01/rels/d_a_e_tk/symbols.txt b/config/GZ2P01/rels/d_a_e_tk/symbols.txt index 81e295557a..532d7bd5c2 100644 --- a/config/GZ2P01/rels/d_a_e_tk/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_tk/symbols.txt @@ -78,6 +78,6 @@ __vt__8cM3dGAab = .data:0x000000FC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000108; // type:object size:0x24 scope:global __vt__12daE_TK_HIO_c = .data:0x0000012C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_238_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_tk2/splits.txt b/config/GZ2P01/rels/d_a_e_tk2/splits.txt index c66e709551..ef62327e76 100644 --- a/config/GZ2P01/rels/d_a_e_tk2/splits.txt +++ b/config/GZ2P01/rels/d_a_e_tk2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tk2.cpp: diff --git a/config/GZ2P01/rels/d_a_e_tk2/symbols.txt b/config/GZ2P01/rels/d_a_e_tk2/symbols.txt index f26389f8b1..4190e8dcad 100644 --- a/config/GZ2P01/rels/d_a_e_tk2/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_tk2/symbols.txt @@ -71,6 +71,6 @@ __vt__8cM3dGAab = .data:0x000000D0; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000DC; // type:object size:0x24 scope:global __vt__13daE_TK2_HIO_c = .data:0x00000100; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_239_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_tt/splits.txt b/config/GZ2P01/rels/d_a_e_tt/splits.txt index e485f25f41..8046205c30 100644 --- a/config/GZ2P01/rels/d_a_e_tt/splits.txt +++ b/config/GZ2P01/rels/d_a_e_tt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_tt.cpp: diff --git a/config/GZ2P01/rels/d_a_e_tt/symbols.txt b/config/GZ2P01/rels/d_a_e_tt/symbols.txt index 7ac76d11e9..060928c13a 100644 --- a/config/GZ2P01/rels/d_a_e_tt/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_tt/symbols.txt @@ -117,7 +117,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000F8; // type:object size:0x16 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_241_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3787 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3788 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3796 = .data:0x00000030; // type:object size:0x6 scope:local @@ -161,19 +162,24 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_241_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3924 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x18 scope:global data:byte m_attack_tt = .bss:0x0000006C; // type:object size:0x4 scope:global data:4byte @4154 = .bss:0x00000070; // type:object size:0xC scope:local +init$0000 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte sc$4153 = .bss:0x00000080; // type:object size:0xC scope:local @4269 = .bss:0x0000008C; // type:object size:0xC scope:local +init$0001 = .bss:0x00000098; // type:object size:0x1 scope:local align:1 data:byte sc$4268 = .bss:0x0000009C; // type:object size:0xC scope:local @4302 = .bss:0x000000A8; // type:object size:0xC scope:local +init$0002 = .bss:0x000000B4; // type:object size:0x1 scope:local align:1 data:byte sc$4301 = .bss:0x000000B8; // type:object size:0xC scope:local @4400 = .bss:0x000000C4; // type:object size:0xC scope:local +init$0003 = .bss:0x000000D0; // type:object size:0x1 scope:local align:1 data:byte sc$4399 = .bss:0x000000D4; // type:object size:0xC scope:local @4489 = .bss:0x000000E0; // type:object size:0xC scope:local +init$0004 = .bss:0x000000EC; // type:object size:0x1 scope:local align:1 data:byte sc$4488 = .bss:0x000000F0; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000FC; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000100; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_vt/splits.txt b/config/GZ2P01/rels/d_a_e_vt/splits.txt index 859828df19..5c0a91de09 100644 --- a/config/GZ2P01/rels/d_a_e_vt/splits.txt +++ b/config/GZ2P01/rels/d_a_e_vt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_vt.cpp: diff --git a/config/GZ2P01/rels/d_a_e_vt/symbols.txt b/config/GZ2P01/rels/d_a_e_vt/symbols.txt index 2eadf069ea..c39038c769 100644 --- a/config/GZ2P01/rels/d_a_e_vt/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_vt/symbols.txt @@ -246,7 +246,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000254; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_242_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3786 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3787 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3795 = .data:0x00000030; // type:object size:0x6 scope:local @@ -305,7 +306,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_242_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3923 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x40 scope:global data:byte @5409 = .bss:0x00000094; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_wb/splits.txt b/config/GZ2P01/rels/d_a_e_wb/splits.txt index 95cd6f7d43..df396c14c2 100644 --- a/config/GZ2P01/rels/d_a_e_wb/splits.txt +++ b/config/GZ2P01/rels/d_a_e_wb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_wb.cpp: diff --git a/config/GZ2P01/rels/d_a_e_wb/symbols.txt b/config/GZ2P01/rels/d_a_e_wb/symbols.txt index 6dbac9ae6e..01fb3c8788 100644 --- a/config/GZ2P01/rels/d_a_e_wb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_wb/symbols.txt @@ -484,7 +484,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000580; // type:object size:0x49 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_244_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_color$4786 = .data:0x00000020; // type:object size:0x4 scope:local chk_x$5015 = .data:0x00000024; // type:object size:0x10 scope:local chk_z$5016 = .data:0x00000034; // type:object size:0x10 scope:local @@ -538,10 +539,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_244_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte -lbl_244_bss_46 = .bss:0x00000046; // type:object size:0x1 data:byte -lbl_244_bss_47 = .bss:0x00000047; // type:object size:0x1 data:byte -lbl_244_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte +lbl_244_bss_45 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +lbl_244_bss_46 = .bss:0x00000046; // type:object size:0x1 scope:local data:byte +lbl_244_bss_47 = .bss:0x00000047; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte @4435 = .bss:0x0000004C; // type:object size:0xC scope:local l_HIO = .bss:0x00000058; // type:object size:0x5C scope:global data:byte @4746 = .bss:0x000000B4; // type:object size:0xC scope:local @@ -549,28 +550,35 @@ b_path = .bss:0x000000C0; // type:object size:0x60 scope:global align:4 data:flo @5743 = .bss:0x00000120; // type:object size:0xC scope:local b_path2 = .bss:0x0000012C; // type:object size:0x60 scope:global align:4 data:float @6258 = .bss:0x0000018C; // type:object size:0xC scope:local +init$0000 = .bss:0x00000198; // type:object size:0x1 scope:local align:1 data:byte arrow_rd_pos$6257 = .bss:0x0000019C; // type:object size:0xC scope:local @6279 = .bss:0x000001A8; // type:object size:0xC scope:local saku_p = .bss:0x000001B4; // type:object size:0xC scope:global @6280 = .bss:0x000001C0; // type:object size:0xC scope:local saku_p2 = .bss:0x000001CC; // type:object size:0xC scope:global @6285 = .bss:0x000001D8; // type:object size:0xC scope:local +init$0001 = .bss:0x000001E4; // type:object size:0x1 scope:local align:1 data:byte @6288 = .bss:0x000001E8; // type:object size:0xC scope:local ikki_pos$6284 = .bss:0x000001F4; // type:object size:0x18 scope:local @6400 = .bss:0x0000020C; // type:object size:0xC scope:local +init$0002 = .bss:0x00000218; // type:object size:0x1 scope:local align:1 data:byte @6403 = .bss:0x0000021C; // type:object size:0xC scope:local f_pos$6399 = .bss:0x00000228; // type:object size:0x18 scope:local @6612 = .bss:0x00000240; // type:object size:0xC scope:local +init$0003 = .bss:0x0000024C; // type:object size:0x1 scope:local align:1 data:byte @6615 = .bss:0x00000250; // type:object size:0xC scope:local ikki2_pos$6611 = .bss:0x0000025C; // type:object size:0x18 scope:local @7515 = .bss:0x00000274; // type:object size:0xC scope:local +init$0004 = .bss:0x00000280; // type:object size:0x1 scope:local align:1 data:byte sc$7514 = .bss:0x00000284; // type:object size:0xC scope:local rd_count = .bss:0x00000290; // type:object size:0x4 scope:global data:4byte @7814 = .bss:0x00000294; // type:object size:0xC scope:local +init$0005 = .bss:0x000002A0; // type:object size:0x1 scope:local align:1 data:byte @7817 = .bss:0x000002A4; // type:object size:0xC scope:local @7818 = .bss:0x000002B0; // type:object size:0xC scope:local sh_pos$7813 = .bss:0x000002BC; // type:object size:0x24 scope:local @7820 = .bss:0x000002E0; // type:object size:0xC scope:local +init$0006 = .bss:0x000002EC; // type:object size:0x1 scope:local align:1 data:byte @7823 = .bss:0x000002F0; // type:object size:0xC scope:local @7824 = .bss:0x000002FC; // type:object size:0xC scope:local sh_posH$7819 = .bss:0x00000308; // type:object size:0x24 scope:local diff --git a/config/GZ2P01/rels/d_a_e_ws/splits.txt b/config/GZ2P01/rels/d_a_e_ws/splits.txt index f71158b422..f37746f346 100644 --- a/config/GZ2P01/rels/d_a_e_ws/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ws/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ws.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ws/symbols.txt b/config/GZ2P01/rels/d_a_e_ws/symbols.txt index 5aa61f46dc..5b34d233df 100644 --- a/config/GZ2P01/rels/d_a_e_ws/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ws/symbols.txt @@ -110,9 +110,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4989 = .rodata:0x000000FC; // type:object size:0x4 scope:local @5154 = .rodata:0x00000100; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000104; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_245_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3681 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3682 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3690 = .data:0x00000030; // type:object size:0x6 scope:local @@ -130,6 +132,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000184; // type:object size:0xC scope:global __vt__12daE_WS_HIO_c = .data:0x00000190; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_245_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3818 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x28 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_ww/splits.txt b/config/GZ2P01/rels/d_a_e_ww/splits.txt index ef80bf3cbf..5ae499a796 100644 --- a/config/GZ2P01/rels/d_a_e_ww/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ww/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ww.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ww/symbols.txt b/config/GZ2P01/rels/d_a_e_ww/symbols.txt index 3f59d9941f..83036f4cd5 100644 --- a/config/GZ2P01/rels/d_a_e_ww/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ww/symbols.txt @@ -152,7 +152,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000148; // type:object size:0x11 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_246_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3784 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3785 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3793 = .data:0x00000030; // type:object size:0x6 scope:local @@ -190,10 +191,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_246_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3921 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x28 scope:global data:byte -lbl_246_bss_7C = .bss:0x0000007C; // type:object size:0x1 data:byte +lbl_237_bss_30 = .bss:0x0000007C; // type:object size:0x1 scope:local data:byte @4585 = .bss:0x00000080; // type:object size:0xC scope:local @4586 = .bss:0x0000008C; // type:object size:0xC scope:local @4587 = .bss:0x00000098; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_yc/splits.txt b/config/GZ2P01/rels/d_a_e_yc/splits.txt index 7fad049fed..8d356c7a5c 100644 --- a/config/GZ2P01/rels/d_a_e_yc/splits.txt +++ b/config/GZ2P01/rels/d_a_e_yc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yc.cpp: diff --git a/config/GZ2P01/rels/d_a_e_yc/symbols.txt b/config/GZ2P01/rels/d_a_e_yc/symbols.txt index a13545877b..1e93b74912 100644 --- a/config/GZ2P01/rels/d_a_e_yc/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_yc/symbols.txt @@ -100,6 +100,6 @@ __vt__12dBgS_ObjAcch = .data:0x0000017C; // type:object size:0x24 scope:global __vt__12daE_YC_HIO_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global S_area_dis = .bss:0x00000008; // type:object size:0x4 scope:global align:4 data:float -lbl_247_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte @3710 = .bss:0x00000010; // type:object size:0xC scope:local l_HIO = .bss:0x0000001C; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_yd/splits.txt b/config/GZ2P01/rels/d_a_e_yd/splits.txt index 7939bb0da7..773dc5f0c8 100644 --- a/config/GZ2P01/rels/d_a_e_yd/splits.txt +++ b/config/GZ2P01/rels/d_a_e_yd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yd.cpp: diff --git a/config/GZ2P01/rels/d_a_e_yd/symbols.txt b/config/GZ2P01/rels/d_a_e_yd/symbols.txt index ab81c0c354..c3858fc68b 100644 --- a/config/GZ2P01/rels/d_a_e_yd/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_yd/symbols.txt @@ -122,9 +122,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @5472 = .rodata:0x00000120; // type:object size:0x4 scope:local @5474 = .rodata:0x00000128; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000130; // type:object size:0x5 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_248_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3667 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3668 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3676 = .data:0x00000030; // type:object size:0x6 scope:local @@ -148,6 +150,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000001FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000210; // type:object size:0xC scope:global __vt__12daE_YD_HIO_c = .data:0x0000021C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_248_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3804 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_yg/splits.txt b/config/GZ2P01/rels/d_a_e_yg/splits.txt index f2340e27d2..426a57515c 100644 --- a/config/GZ2P01/rels/d_a_e_yg/splits.txt +++ b/config/GZ2P01/rels/d_a_e_yg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yg.cpp: diff --git a/config/GZ2P01/rels/d_a_e_yg/symbols.txt b/config/GZ2P01/rels/d_a_e_yg/symbols.txt index efbda178bb..0b30b6d97a 100644 --- a/config/GZ2P01/rels/d_a_e_yg/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_yg/symbols.txt @@ -127,7 +127,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000013C; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_250_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3680 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3681 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3689 = .data:0x00000030; // type:object size:0x6 scope:local @@ -164,10 +165,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_250_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3817 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte @3917 = .bss:0x00000070; // type:object size:0xC scope:local +init$1863 = .bss:0x0000007C; // type:object size:0x1 scope:local align:1 data:byte @3920 = .bss:0x00000080; // type:object size:0xC scope:local @3921 = .bss:0x0000008C; // type:object size:0xC scope:local e_pos$3916 = .bss:0x00000098; // type:object size:0x24 scope:local @@ -202,6 +204,7 @@ ke_p = .bss:0x000001AC; // type:object size:0x9C scope:global align:4 data:float @4714 = .bss:0x000002D8; // type:object size:0xC scope:local ke_a = .bss:0x000002E4; // type:object size:0x4E scope:global data:2byte @5031 = .bss:0x00000334; // type:object size:0xC scope:local +init$2973 = .bss:0x00000340; // type:object size:0x1 scope:local align:1 data:byte sc$5030 = .bss:0x00000344; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000350; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000354; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_e_yh/splits.txt b/config/GZ2P01/rels/d_a_e_yh/splits.txt index aa325aec54..cd016865d1 100644 --- a/config/GZ2P01/rels/d_a_e_yh/splits.txt +++ b/config/GZ2P01/rels/d_a_e_yh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yh.cpp: diff --git a/config/GZ2P01/rels/d_a_e_yh/symbols.txt b/config/GZ2P01/rels/d_a_e_yh/symbols.txt index b5a33970db..9d2a4f0113 100644 --- a/config/GZ2P01/rels/d_a_e_yh/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_yh/symbols.txt @@ -141,7 +141,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000160; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_251_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local @@ -166,6 +167,6 @@ __vt__18mDoExt_3DlineMat_c = .data:0x000002FC; // type:object size:0x14 scope:gl __vt__12J3DFrameCtrl = .data:0x00000310; // type:object size:0xC scope:global __vt__12daE_YH_HIO_c = .data:0x0000031C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_yk/splits.txt b/config/GZ2P01/rels/d_a_e_yk/splits.txt index 13da412364..92ff20ea9f 100644 --- a/config/GZ2P01/rels/d_a_e_yk/splits.txt +++ b/config/GZ2P01/rels/d_a_e_yk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yk.cpp: diff --git a/config/GZ2P01/rels/d_a_e_yk/symbols.txt b/config/GZ2P01/rels/d_a_e_yk/symbols.txt index 0a9d7295b7..56a392b6f6 100644 --- a/config/GZ2P01/rels/d_a_e_yk/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_yk/symbols.txt @@ -90,9 +90,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @5029 = .rodata:0x000000BC; // type:object size:0x4 scope:local @5031 = .rodata:0x000000C0; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000000C8; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_252_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3820 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3821 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3829 = .data:0x00000030; // type:object size:0x6 scope:local @@ -110,7 +112,7 @@ __vt__8cM3dGAab = .data:0x00000140; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000014C; // type:object size:0x24 scope:global __vt__12daE_YK_HIO_c = .data:0x00000170; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_252_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3957 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte check_index$4191 = .bss:0x00000034; // type:object size:0xFF scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_e_ym/splits.txt b/config/GZ2P01/rels/d_a_e_ym/splits.txt index 4d2dd8ee29..e9631d3c46 100644 --- a/config/GZ2P01/rels/d_a_e_ym/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ym/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ym.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ym/symbols.txt b/config/GZ2P01/rels/d_a_e_ym/symbols.txt index a4944afa9f..2cb3e71de8 100644 --- a/config/GZ2P01/rels/d_a_e_ym/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ym/symbols.txt @@ -181,7 +181,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000158; // type:object size:0x17 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_253_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3804 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3805 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3813 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2P01/rels/d_a_e_ymb/splits.txt b/config/GZ2P01/rels/d_a_e_ymb/splits.txt index c1864cfec7..e9bd5fd369 100644 --- a/config/GZ2P01/rels/d_a_e_ymb/splits.txt +++ b/config/GZ2P01/rels/d_a_e_ymb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_ymb.cpp: diff --git a/config/GZ2P01/rels/d_a_e_ymb/symbols.txt b/config/GZ2P01/rels/d_a_e_ymb/symbols.txt index 3112600a0b..eed3ca9eb0 100644 --- a/config/GZ2P01/rels/d_a_e_ymb/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_ymb/symbols.txt @@ -236,7 +236,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000258; // type:object size:0xB scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_255_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_ymb_src__23@unnamed@d_a_e_ymb_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_ymb_at_src__23@unnamed@d_a_e_ymb_cpp@ = .data:0x00000060; // type:object size:0x40 scope:global cc_ymb_eye_src__23@unnamed@d_a_e_ymb_cpp@ = .data:0x000000A0; // type:object size:0x40 scope:global @@ -287,7 +288,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_255_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3786 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x20 scope:global data:byte @3797 = .bss:0x00000074; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_yr/splits.txt b/config/GZ2P01/rels/d_a_e_yr/splits.txt index 632a763104..584302b521 100644 --- a/config/GZ2P01/rels/d_a_e_yr/splits.txt +++ b/config/GZ2P01/rels/d_a_e_yr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_yr.cpp: diff --git a/config/GZ2P01/rels/d_a_e_yr/symbols.txt b/config/GZ2P01/rels/d_a_e_yr/symbols.txt index 22f7201f73..4dcffdbada 100644 --- a/config/GZ2P01/rels/d_a_e_yr/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_yr/symbols.txt @@ -130,7 +130,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000158; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_256_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3781 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3782 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3790 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2P01/rels/d_a_e_zh/splits.txt b/config/GZ2P01/rels/d_a_e_zh/splits.txt index 21ab275493..21948d2db6 100644 --- a/config/GZ2P01/rels/d_a_e_zh/splits.txt +++ b/config/GZ2P01/rels/d_a_e_zh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zh.cpp: diff --git a/config/GZ2P01/rels/d_a_e_zh/symbols.txt b/config/GZ2P01/rels/d_a_e_zh/symbols.txt index 8d3ec6193f..05e9a75553 100644 --- a/config/GZ2P01/rels/d_a_e_zh/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_zh/symbols.txt @@ -171,7 +171,8 @@ START_EFF_DT$4324 = .rodata:0x00000080; // type:object size:0x58 scope:local @stringBase0 = .rodata:0x00000208; // type:object size:0xD scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_257_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_zhSph_src__22@unnamed@d_a_e_zh_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global cc_zhCyl_src__22@unnamed@d_a_e_zh_cpp@ = .data:0x00000060; // type:object size:0x44 scope:global cc_zhCyl_at_src__22@unnamed@d_a_e_zh_cpp@ = .data:0x000000A4; // type:object size:0x44 scope:global @@ -209,11 +210,12 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_257_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3773 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte -mStartFlag = .bss:0x00000070; // type:object size:0x4 scope:global data:4byte +l_HIO = .bss:0x00000054; // type:object size:0x1C scope:local data:byte +mStartFlag = .bss:0x00000070; // type:object size:0x4 scope:local data:4byte @4079 = .bss:0x00000074; // type:object size:0xC scope:local +init$0000 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 data:byte @4082 = .bss:0x00000084; // type:object size:0xC scope:local @4083 = .bss:0x00000090; // type:object size:0xC scope:local @4084 = .bss:0x0000009C; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_e_zm/splits.txt b/config/GZ2P01/rels/d_a_e_zm/splits.txt index 7bc8d7cd26..710ff47c1c 100644 --- a/config/GZ2P01/rels/d_a_e_zm/splits.txt +++ b/config/GZ2P01/rels/d_a_e_zm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zm.cpp: diff --git a/config/GZ2P01/rels/d_a_e_zm/symbols.txt b/config/GZ2P01/rels/d_a_e_zm/symbols.txt index 8cee400277..69444edab6 100644 --- a/config/GZ2P01/rels/d_a_e_zm/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_zm/symbols.txt @@ -90,9 +90,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @5031 = .rodata:0x000000B8; // type:object size:0x4 scope:local @5032 = .rodata:0x000000BC; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000C0; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_258_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3668 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3669 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3677 = .data:0x00000030; // type:object size:0x6 scope:local @@ -113,6 +115,6 @@ __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12daE_ZM_HIO_c = .data:0x000001A8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_258_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3805 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_e_zs/splits.txt b/config/GZ2P01/rels/d_a_e_zs/splits.txt index 4534718056..5f0cc235f2 100644 --- a/config/GZ2P01/rels/d_a_e_zs/splits.txt +++ b/config/GZ2P01/rels/d_a_e_zs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_e_zs.cpp: diff --git a/config/GZ2P01/rels/d_a_e_zs/symbols.txt b/config/GZ2P01/rels/d_a_e_zs/symbols.txt index 0a13268c92..1a1a566b8a 100644 --- a/config/GZ2P01/rels/d_a_e_zs/symbols.txt +++ b/config/GZ2P01/rels/d_a_e_zs/symbols.txt @@ -72,7 +72,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000074; // type:object size:0x5 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_259_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double e_prim$3788 = .data:0x00000020; // type:object size:0x8 scope:local e_env$3789 = .data:0x00000028; // type:object size:0x8 scope:local eff_id$3797 = .data:0x00000030; // type:object size:0x6 scope:local diff --git a/config/GZ2P01/rels/d_a_econt/symbols.txt b/config/GZ2P01/rels/d_a_econt/symbols.txt index 8ecf694dad..a7c5dde6cb 100644 --- a/config/GZ2P01/rels/d_a_econt/symbols.txt +++ b/config/GZ2P01/rels/d_a_econt/symbols.txt @@ -17,4 +17,4 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3873 = .rodata:0x0000000C; // type:object size:0x4 scope:local l_daEcont_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_ECONT = .data:0x00000020; // type:object size:0x30 scope:global -lbl_71_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +data_805197E0 = .bss:0x00000000; // type:object size:0x4 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_ep/symbols.txt b/config/GZ2P01/rels/d_a_ep/symbols.txt index d328d16263..19cf506bf0 100644 --- a/config/GZ2P01/rels/d_a_ep/symbols.txt +++ b/config/GZ2P01/rels/d_a_ep/symbols.txt @@ -102,7 +102,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000010C; // type:object size:0x26 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_11_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double w_eff_id$3717 = .data:0x00000020; // type:object size:0x8 scope:local actions$4245 = .data:0x00000028; // type:object size:0x8 scope:local l_particle_fire_A$4270 = .data:0x00000030; // type:object size:0x4 scope:local diff --git a/config/GZ2P01/rels/d_a_formation_mng/symbols.txt b/config/GZ2P01/rels/d_a_formation_mng/symbols.txt index 660b0dec4d..898599ab2e 100644 --- a/config/GZ2P01/rels/d_a_formation_mng/symbols.txt +++ b/config/GZ2P01/rels/d_a_formation_mng/symbols.txt @@ -53,7 +53,8 @@ M_attr__10daFmtMng_c = .rodata:0x00000000; // type:object size:0x18 scope:global @4802 = .rodata:0x00000080; // type:object size:0x4 scope:local align:4 data:float cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_260_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3861 = .data:0x00000020; // type:object size:0xC scope:local @3862 = .data:0x0000002C; // type:object size:0xC scope:local @3863 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_fr/splits.txt b/config/GZ2P01/rels/d_a_fr/splits.txt index 62ca034015..8c00ffee96 100644 --- a/config/GZ2P01/rels/d_a_fr/splits.txt +++ b/config/GZ2P01/rels/d_a_fr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_fr.cpp: diff --git a/config/GZ2P01/rels/d_a_fr/symbols.txt b/config/GZ2P01/rels/d_a_fr/symbols.txt index e956629048..26a7e4749b 100644 --- a/config/GZ2P01/rels/d_a_fr/symbols.txt +++ b/config/GZ2P01/rels/d_a_fr/symbols.txt @@ -91,6 +91,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000134; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000158; // type:object size:0xC scope:global __vt__10daFr_HIO_c = .data:0x00000164; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_72_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_grass/splits.txt b/config/GZ2P01/rels/d_a_grass/splits.txt index 7e31bb82bb..92903b2d26 100644 --- a/config/GZ2P01/rels/d_a_grass/splits.txt +++ b/config/GZ2P01/rels/d_a_grass/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_grass.cpp: diff --git a/config/GZ2P01/rels/d_a_grass/symbols.txt b/config/GZ2P01/rels/d_a_grass/symbols.txt index 03f333bb13..61bba51c34 100644 --- a/config/GZ2P01/rels/d_a_grass/symbols.txt +++ b/config/GZ2P01/rels/d_a_grass/symbols.txt @@ -232,16 +232,16 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local data_8052790d = .bss:0x00000045; // type:object size:0x1 scope:local @4293 = .bss:0x00000048; // type:object size:0xC scope:local -init$4294 = .bss:0x00000054; // type:object size:0x1 scope:local +init$4294 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte ang$4292 = .bss:0x00000058; // type:object size:0x6 scope:local exec_count_dammy$4868 = .bss:0x0000005E; // type:object size:0x2 scope:local -init$4869 = .bss:0x00000060; // type:object size:0x1 scope:local +init$4869 = .bss:0x00000060; // type:object size:0x1 scope:local align:1 data:byte exec_count_dammy2$4871 = .bss:0x00000062; // type:object size:0x2 scope:local -init$4872 = .bss:0x00000064; // type:object size:0x1 scope:local +init$4872 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte mAngleZ$5046 = .bss:0x00000068; // type:object size:0xBB8 scope:local data_805284E8 = .bss:0x00000C20; // type:object size:0x1 scope:local data:byte @5442 = .bss:0x00000C24; // type:object size:0xC scope:local -init$5443 = .bss:0x00000C30; // type:object size:0x1 scope:local +init$5443 = .bss:0x00000C30; // type:object size:0x1 scope:local align:1 data:byte ang$5441 = .bss:0x00000C34; // type:object size:0x6 scope:local @6340 = .bss:0x00000C3C; // type:object size:0xC scope:local @6342 = .bss:0x00000C48; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_horse/splits.txt b/config/GZ2P01/rels/d_a_horse/splits.txt index c0f908f9c2..3d4856ee98 100644 --- a/config/GZ2P01/rels/d_a_horse/splits.txt +++ b/config/GZ2P01/rels/d_a_horse/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_horse.cpp: diff --git a/config/GZ2P01/rels/d_a_horse/symbols.txt b/config/GZ2P01/rels/d_a_horse/symbols.txt index 2509533703..69cf13a843 100644 --- a/config/GZ2P01/rels/d_a_horse/symbols.txt +++ b/config/GZ2P01/rels/d_a_horse/symbols.txt @@ -262,7 +262,8 @@ stopStandFootEffectFrame$9721 = .rodata:0x00000344; // type:object size:0x30 sco @stringBase0 = .rodata:0x000003B0; // type:object size:0x75 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_262_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_autoUpHeight = .data:0x00000020; // type:object size:0x4 scope:global align:4 data:float l_cylSrc = .data:0x00000024; // type:object size:0x44 scope:global l_sphSrc = .data:0x00000068; // type:object size:0x40 scope:global @@ -321,32 +322,46 @@ l_frontFootOffset = .bss:0x00000054; // type:object size:0xC scope:global align: @4180 = .bss:0x00000060; // type:object size:0xC scope:local l_backFootOffset = .bss:0x0000006C; // type:object size:0xC scope:global align:4 data:float @7279 = .bss:0x00000078; // type:object size:0xC scope:local +init$4891 = .bss:0x00000084; // type:object size:0x1 scope:local align:1 data:byte localEyePos$7278 = .bss:0x00000088; // type:object size:0xC scope:local @7469 = .bss:0x00000094; // type:object size:0xC scope:local +init$5140 = .bss:0x000000A0; // type:object size:0x1 scope:local align:1 data:byte runScale$7468 = .bss:0x000000A4; // type:object size:0xC scope:local @7473 = .bss:0x000000B0; // type:object size:0xC scope:local +init$5144 = .bss:0x000000BC; // type:object size:0x1 scope:local align:1 data:byte landScale$7472 = .bss:0x000000C0; // type:object size:0xC scope:local @7477 = .bss:0x000000CC; // type:object size:0xC scope:local +init$5083 = .bss:0x000000D8; // type:object size:0x1 scope:local align:1 data:byte grassRunScale$7476 = .bss:0x000000DC; // type:object size:0xC scope:local @7481 = .bss:0x000000E8; // type:object size:0xC scope:local +init$5091 = .bss:0x000000F4; // type:object size:0x1 scope:local align:1 data:byte waterDirection$7480 = .bss:0x000000F8; // type:object size:0xC scope:local @8516 = .bss:0x00000104; // type:object size:0xC scope:local +init$6089 = .bss:0x00000110; // type:object size:0x1 scope:local align:1 data:byte reinLeftStart$8515 = .bss:0x00000114; // type:object size:0xC scope:local @8520 = .bss:0x00000120; // type:object size:0xC scope:local +init$6093 = .bss:0x0000012C; // type:object size:0x1 scope:local align:1 data:byte reinRightStart$8519 = .bss:0x00000130; // type:object size:0xC scope:local @8524 = .bss:0x0000013C; // type:object size:0xC scope:local +init$6097 = .bss:0x00000148; // type:object size:0x1 scope:local align:1 data:byte localNeckLeft$8523 = .bss:0x0000014C; // type:object size:0xC scope:local @8528 = .bss:0x00000158; // type:object size:0xC scope:local +init$6101 = .bss:0x00000164; // type:object size:0x1 scope:local align:1 data:byte localNeckRight$8527 = .bss:0x00000168; // type:object size:0xC scope:local @8753 = .bss:0x00000174; // type:object size:0xC scope:local +init$6311 = .bss:0x00000180; // type:object size:0x1 scope:local align:1 data:byte saddleLeft$8752 = .bss:0x00000184; // type:object size:0xC scope:local @8757 = .bss:0x00000190; // type:object size:0xC scope:local +init$6315 = .bss:0x0000019C; // type:object size:0x1 scope:local align:1 data:byte saddleRight$8756 = .bss:0x000001A0; // type:object size:0xC scope:local @8813 = .bss:0x000001AC; // type:object size:0xC scope:local +init$6374 = .bss:0x000001B8; // type:object size:0x1 scope:local align:1 data:byte localCenterPos$8812 = .bss:0x000001BC; // type:object size:0xC scope:local @8817 = .bss:0x000001C8; // type:object size:0xC scope:local +init$6378 = .bss:0x000001D4; // type:object size:0x1 scope:local align:1 data:byte localFrontPos$8816 = .bss:0x000001D8; // type:object size:0xC scope:local @8821 = .bss:0x000001E4; // type:object size:0xC scope:local +init$6382 = .bss:0x000001F0; // type:object size:0x1 scope:local align:1 data:byte localBackPos$8820 = .bss:0x000001F4; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000200; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000204; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_hozelda/splits.txt b/config/GZ2P01/rels/d_a_hozelda/splits.txt index 498dcf3971..b283de947d 100644 --- a/config/GZ2P01/rels/d_a_hozelda/splits.txt +++ b/config/GZ2P01/rels/d_a_hozelda/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_hozelda.cpp: .text start:0x00000078 end:0x00003014 .rodata start:0x00000000 end:0x000000C8 .data start:0x00000000 end:0x00000108 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2P01/rels/d_a_kago/splits.txt b/config/GZ2P01/rels/d_a_kago/splits.txt index 60a4519ae8..187e17317b 100644 --- a/config/GZ2P01/rels/d_a_kago/splits.txt +++ b/config/GZ2P01/rels/d_a_kago/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kago.cpp: diff --git a/config/GZ2P01/rels/d_a_kago/symbols.txt b/config/GZ2P01/rels/d_a_kago/symbols.txt index 0b84959ecd..ac2d8c9f12 100644 --- a/config/GZ2P01/rels/d_a_kago/symbols.txt +++ b/config/GZ2P01/rels/d_a_kago/symbols.txt @@ -246,6 +246,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001D8; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001FC; // type:object size:0xC scope:global __vt__12daKago_HIO_c = .data:0x00000208; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_265_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3924 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x5C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_kytag03/symbols.txt b/config/GZ2P01/rels/d_a_kytag03/symbols.txt index 9d5a0f354c..ebdf5d367c 100644 --- a/config/GZ2P01/rels/d_a_kytag03/symbols.txt +++ b/config/GZ2P01/rels/d_a_kytag03/symbols.txt @@ -60,4 +60,4 @@ l_daKytag03_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_KYTAG03 = .data:0x00000020; // type:object size:0x30 scope:global __vt__8cM3dGLin = .data:0x00000050; // type:object size:0xC scope:global S_ang_y_work$4270 = .bss:0x00000000; // type:object size:0x2 scope:local -lbl_268_bss_2 = .bss:0x00000002; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000002; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_kytag06/splits.txt b/config/GZ2P01/rels/d_a_kytag06/splits.txt index e9f6e13722..dcf1d65e9f 100644 --- a/config/GZ2P01/rels/d_a_kytag06/splits.txt +++ b/config/GZ2P01/rels/d_a_kytag06/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_kytag06.cpp: diff --git a/config/GZ2P01/rels/d_a_kytag06/symbols.txt b/config/GZ2P01/rels/d_a_kytag06/symbols.txt index e1134cee2d..ecf2786249 100644 --- a/config/GZ2P01/rels/d_a_kytag06/symbols.txt +++ b/config/GZ2P01/rels/d_a_kytag06/symbols.txt @@ -103,7 +103,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000118; // type:object size:0x10 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_269_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double S_time_table$3766 = .data:0x00000020; // type:object size:0x20 scope:local S_wether_table$3767 = .data:0x00000040; // type:object size:0x8 scope:local S_wether_mode_pat01$3768 = .data:0x00000048; // type:object size:0x4 scope:local diff --git a/config/GZ2P01/rels/d_a_mant/symbols.txt b/config/GZ2P01/rels/d_a_mant/symbols.txt index 66a0159ff7..dff1763162 100644 --- a/config/GZ2P01/rels/d_a_mant/symbols.txt +++ b/config/GZ2P01/rels/d_a_mant/symbols.txt @@ -68,7 +68,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4539 = .rodata:0x000000D0; // type:object size:0x4 scope:local data:string cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_277_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_Egnd_mantTEX = .data:0x00000020; // type:object size:0x4000 scope:global l_Egnd_mantTEX_U = .data:0x00004020; // type:object size:0x4000 scope:global data:byte l_Egnd_mantPAL = .data:0x00008020; // type:object size:0x60 scope:global diff --git a/config/GZ2P01/rels/d_a_mg_fish/splits.txt b/config/GZ2P01/rels/d_a_mg_fish/splits.txt index b196da91cc..f86fd63423 100644 --- a/config/GZ2P01/rels/d_a_mg_fish/splits.txt +++ b/config/GZ2P01/rels/d_a_mg_fish/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_mg_fish.cpp: diff --git a/config/GZ2P01/rels/d_a_mg_fish/symbols.txt b/config/GZ2P01/rels/d_a_mg_fish/symbols.txt index 44ce579669..10d6caec2f 100644 --- a/config/GZ2P01/rels/d_a_mg_fish/symbols.txt +++ b/config/GZ2P01/rels/d_a_mg_fish/symbols.txt @@ -253,7 +253,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000002D0; // type:object size:0x6A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_78_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double check_kind = .data:0x00000020; // type:object size:0x8 scope:global vib_p$3694 = .data:0x00000028; // type:object size:0x10 scope:local learn_d$3913 = .data:0x00000038; // type:object size:0x5 scope:local @@ -309,7 +310,7 @@ lit_1007 = .bss:0x00000046; // type:object size:0x1 data:byte l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte s_fish_ct = .bss:0x00000070; // type:object size:0x4 scope:global data:4byte @7458 = .bss:0x00000074; // type:object size:0xC scope:local -init$5289 = .bss:0x00000080; // type:object size:0x1 scope:local +init$0000 = .bss:0x00000080; // type:object size:0x1 scope:local align:1 data:byte @7461 = .bss:0x00000084; // type:object size:0xC scope:local @7462 = .bss:0x00000090; // type:object size:0xC scope:local @7463 = .bss:0x0000009C; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_mg_fshop/splits.txt b/config/GZ2P01/rels/d_a_mg_fshop/splits.txt index 0643cf1f5a..40da3cba13 100644 --- a/config/GZ2P01/rels/d_a_mg_fshop/splits.txt +++ b/config/GZ2P01/rels/d_a_mg_fshop/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_mg_fshop.cpp: diff --git a/config/GZ2P01/rels/d_a_mg_fshop/symbols.txt b/config/GZ2P01/rels/d_a_mg_fshop/symbols.txt index f046358c74..1f22c05b44 100644 --- a/config/GZ2P01/rels/d_a_mg_fshop/symbols.txt +++ b/config/GZ2P01/rels/d_a_mg_fshop/symbols.txt @@ -158,7 +158,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000001E8; // type:object size:0x6 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_278_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double koro2_map_LV1 = .data:0x00000020; // type:object size:0x87 scope:global koro2_map_LV2 = .data:0x000000A8; // type:object size:0x87 scope:global koro2_map_LV3 = .data:0x00000130; // type:object size:0x87 scope:global @@ -225,7 +226,7 @@ ArcIX_A_crcurve_a_model = .bss:0x00000100; // type:object size:0x40 scope:global ArcIX_A_crcurve_b_model = .bss:0x00000140; // type:object size:0x10 scope:global ArcIX_A_crsaka_model = .bss:0x00000150; // type:object size:0x20 scope:global old_stick_x$4410 = .bss:0x00000170; // type:object size:0x4 scope:local align:4 data:float -lbl_278_bss_174 = .bss:0x00000174; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000174; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000178; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000017C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000180; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_mg_rod/splits.txt b/config/GZ2P01/rels/d_a_mg_rod/splits.txt index 24f11cf6d1..d011ba16b8 100644 --- a/config/GZ2P01/rels/d_a_mg_rod/splits.txt +++ b/config/GZ2P01/rels/d_a_mg_rod/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_mg_rod.cpp: diff --git a/config/GZ2P01/rels/d_a_mg_rod/symbols.txt b/config/GZ2P01/rels/d_a_mg_rod/symbols.txt index 2ce0f10234..7cdfdbe726 100644 --- a/config/GZ2P01/rels/d_a_mg_rod/symbols.txt +++ b/config/GZ2P01/rels/d_a_mg_rod/symbols.txt @@ -108,7 +108,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3879 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3879 = .rodata:0x00000000; // type:object size:0xC scope:local @4285 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @4286 = .rodata:0x00000010; // type:object size:0x4 scope:local @4287 = .rodata:0x00000014; // type:object size:0x4 scope:local data:string @@ -296,7 +296,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_50_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double check_kind = .data:0x00000020; // type:object size:0x8 scope:global l_color$4439 = .data:0x00000028; // type:object size:0x4 scope:local l_color$4445 = .data:0x0000002C; // type:object size:0x4 scope:local @@ -363,22 +364,22 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local henna = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte data_804BBBD4 = .bss:0x0000004C; // type:object size:0x1 data:byte -hio_set = .bss:0x0000004D; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004D; // type:object size:0x1 scope:local align:1 data:byte @4280 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x28 scope:global data:byte @4921 = .bss:0x00000084; // type:object size:0xC scope:local old_line_pos = .bss:0x00000090; // type:object size:0x4B0 scope:global @5446 = .bss:0x00000540; // type:object size:0xC scope:local -init$5447 = .bss:0x0000054C; // type:object size:0x1 scope:local data:byte +init$5447 = .bss:0x0000054C; // type:object size:0x1 scope:local align:1 data:byte sc$5445 = .bss:0x00000550; // type:object size:0xC scope:local @8906 = .bss:0x0000055C; // type:object size:0xC scope:local -init$8907 = .bss:0x00000568; // type:object size:0x1 scope:local data:byte +init$8907 = .bss:0x00000568; // type:object size:0x1 scope:local align:1 data:byte @8909 = .bss:0x0000056C; // type:object size:0xC scope:local sp_pos$8905 = .bss:0x00000578; // type:object size:0x18 scope:local old_stick_x$9448 = .bss:0x00000590; // type:object size:0x4 scope:local -init$9449 = .bss:0x00000594; // type:object size:0x1 scope:local data:byte +init$9449 = .bss:0x00000594; // type:object size:0x1 scope:local align:1 data:byte old_stick_sx$9451 = .bss:0x00000598; // type:object size:0x4 scope:local -init$9452 = .bss:0x0000059C; // type:object size:0x1 scope:local data:byte +init$9452 = .bss:0x0000059C; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000005A0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000005A4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000005A8; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_midna/splits.txt b/config/GZ2P01/rels/d_a_midna/splits.txt index 7b9849aad6..6ad8be17f5 100644 --- a/config/GZ2P01/rels/d_a_midna/splits.txt +++ b/config/GZ2P01/rels/d_a_midna/splits.txt @@ -13,3 +13,4 @@ d/actor/d_a_midna.cpp: .text start:0x00000078 end:0x0000A320 .rodata start:0x00000000 end:0x0000076C .data start:0x00000000 end:0x000000A0 + .bss start:0x00000000 end:0x00000004 diff --git a/config/GZ2P01/rels/d_a_myna/splits.txt b/config/GZ2P01/rels/d_a_myna/splits.txt index c0186af5c6..a8a798c952 100644 --- a/config/GZ2P01/rels/d_a_myna/splits.txt +++ b/config/GZ2P01/rels/d_a_myna/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_myna.cpp: diff --git a/config/GZ2P01/rels/d_a_myna/symbols.txt b/config/GZ2P01/rels/d_a_myna/symbols.txt index 8131aebaf9..38aa0c366b 100644 --- a/config/GZ2P01/rels/d_a_myna/symbols.txt +++ b/config/GZ2P01/rels/d_a_myna/symbols.txt @@ -138,7 +138,8 @@ mCcDSph__8daMyna_c = .rodata:0x00000000; // type:object size:0x40 scope:global @stringBase0 = .rodata:0x0000009C; // type:object size:0x112 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_281_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3800 = .data:0x00000020; // type:object size:0xC scope:local @3801 = .data:0x0000002C; // type:object size:0xC scope:local @3802 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_nbomb/splits.txt b/config/GZ2P01/rels/d_a_nbomb/splits.txt index 2629644480..320058d8d3 100644 --- a/config/GZ2P01/rels/d_a_nbomb/splits.txt +++ b/config/GZ2P01/rels/d_a_nbomb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_nbomb.cpp: diff --git a/config/GZ2P01/rels/d_a_nbomb/symbols.txt b/config/GZ2P01/rels/d_a_nbomb/symbols.txt index f873820527..2bcd278d60 100644 --- a/config/GZ2P01/rels/d_a_nbomb/symbols.txt +++ b/config/GZ2P01/rels/d_a_nbomb/symbols.txt @@ -64,7 +64,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3767 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3767 = .rodata:0x00000000; // type:object size:0xC scope:local l_localCenterOffset = .rodata:0x0000000C; // type:object size:0xC scope:global l_arcNameBombF = .rodata:0x00000018; // type:object size:0x6 scope:global data:string l_arcNameBombE = .rodata:0x00000020; // type:object size:0x5 scope:global data:string @@ -174,6 +174,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @5069 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte effectScale$5068 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_ni/splits.txt b/config/GZ2P01/rels/d_a_ni/splits.txt index 3886f5dde4..049eb272ce 100644 --- a/config/GZ2P01/rels/d_a_ni/splits.txt +++ b/config/GZ2P01/rels/d_a_ni/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_ni.cpp: diff --git a/config/GZ2P01/rels/d_a_ni/symbols.txt b/config/GZ2P01/rels/d_a_ni/symbols.txt index 15ebef8e5b..26bd672efb 100644 --- a/config/GZ2P01/rels/d_a_ni/symbols.txt +++ b/config/GZ2P01/rels/d_a_ni/symbols.txt @@ -137,7 +137,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000015C; // type:object size:0x13 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_282_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double hane_id$3986 = .data:0x00000020; // type:object size:0x8 scope:local @5125 = .data:0x00000028; // type:object size:0x7C scope:local j_w$5390 = .data:0x000000A4; // type:object size:0x10 scope:local @@ -174,10 +175,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_282_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +data_8095158d = .bss:0x00000045; // type:object size:0x1 scope:local data:byte @3953 = .bss:0x00000048; // type:object size:0xC scope:local -l_HIO = .bss:0x00000054; // type:object size:0x3C scope:global data:byte -target_info = .bss:0x00000090; // type:object size:0x28 scope:global +l_HIO = .bss:0x00000054; // type:object size:0x3C scope:local data:byte +target_info = .bss:0x00000090; // type:object size:0x28 scope:local target_info_count = .bss:0x000000B8; // type:object size:0x4 scope:global data:4byte @5415 = .bss:0x000000BC; // type:object size:0xC scope:local sc$5414 = .bss:0x000000CC; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_npc_aru/splits.txt b/config/GZ2P01/rels/d_a_npc_aru/splits.txt index d1b15daa93..9176d9c9a3 100644 --- a/config/GZ2P01/rels/d_a_npc_aru/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_aru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_aru.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_aru/symbols.txt b/config/GZ2P01/rels/d_a_npc_aru/symbols.txt index 654cc5e9e2..9fcaa7bdaa 100644 --- a/config/GZ2P01/rels/d_a_npc_aru/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_aru/symbols.txt @@ -161,7 +161,8 @@ heapSize$4024 = .rodata:0x000000A0; // type:object size:0x18 scope:local @stringBase0 = .rodata:0x0000014C; // type:object size:0xCC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_283_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x60 scope:global l_resNameList = .data:0x00000088; // type:object size:0xC scope:global diff --git a/config/GZ2P01/rels/d_a_npc_ash/splits.txt b/config/GZ2P01/rels/d_a_npc_ash/splits.txt index 3d076d9682..5a51cf1673 100644 --- a/config/GZ2P01/rels/d_a_npc_ash/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_ash/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ash.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_ash/symbols.txt b/config/GZ2P01/rels/d_a_npc_ash/symbols.txt index 9f6f16612e..69dd300282 100644 --- a/config/GZ2P01/rels/d_a_npc_ash/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_ash/symbols.txt @@ -163,7 +163,8 @@ m__16daNpcAsh_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:globa @stringBase0 = .rodata:0x000002D0; // type:object size:0x7F scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_284_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xD8 scope:global l_btpGetParamList = .data:0x000000F8; // type:object size:0xC scope:global l_btkGetParamList = .data:0x00000104; // type:object size:0xC scope:global diff --git a/config/GZ2P01/rels/d_a_npc_ashB/splits.txt b/config/GZ2P01/rels/d_a_npc_ashB/splits.txt index b3323a0527..2e9e1fdfd6 100644 --- a/config/GZ2P01/rels/d_a_npc_ashB/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_ashB/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ashB.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_ashB/symbols.txt b/config/GZ2P01/rels/d_a_npc_ashB/symbols.txt index e7a919025d..14ccacb080 100644 --- a/config/GZ2P01/rels/d_a_npc_ashB/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_ashB/symbols.txt @@ -151,7 +151,8 @@ m__17daNpcAshB_Param_c = .rodata:0x00000000; // type:object size:0x70 scope:glob @stringBase0 = .rodata:0x00000304; // type:object size:0x2D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_285_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xFC scope:global l_btpGetParamList = .data:0x0000011C; // type:object size:0x30 scope:global l_btkGetParamList = .data:0x0000014C; // type:object size:0x30 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_bans/splits.txt b/config/GZ2P01/rels/d_a_npc_bans/splits.txt index 409489c74c..ba8af2b74e 100644 --- a/config/GZ2P01/rels/d_a_npc_bans/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_bans/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bans.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_bans/symbols.txt b/config/GZ2P01/rels/d_a_npc_bans/symbols.txt index 90c3fb683a..df6d34ff4b 100644 --- a/config/GZ2P01/rels/d_a_npc_bans/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_bans/symbols.txt @@ -156,7 +156,8 @@ id$5349 = .rodata:0x00000138; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x0000014C; // type:object size:0x94 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_286_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global data:4byte l_evtList = .data:0x00000040; // type:object size:0x48 scope:global l_resNameList = .data:0x00000088; // type:object size:0x18 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_besu/splits.txt b/config/GZ2P01/rels/d_a_npc_besu/splits.txt index 81d7a73a58..039e493173 100644 --- a/config/GZ2P01/rels/d_a_npc_besu/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_besu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_besu.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_besu/symbols.txt b/config/GZ2P01/rels/d_a_npc_besu/symbols.txt index 2e27a981f6..532e52a445 100644 --- a/config/GZ2P01/rels/d_a_npc_besu/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_besu/symbols.txt @@ -170,7 +170,8 @@ jointNo$5355 = .rodata:0x00000174; // type:object size:0x4 scope:local data:4byt @stringBase0 = .rodata:0x000001B4; // type:object size:0x252 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_79_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x30 scope:global data:4byte l_evtList = .data:0x00000050; // type:object size:0x68 scope:global l_resNameList = .data:0x000000B8; // type:object size:0x30 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_blue_ns/splits.txt b/config/GZ2P01/rels/d_a_npc_blue_ns/splits.txt index 4851562802..443044817f 100644 --- a/config/GZ2P01/rels/d_a_npc_blue_ns/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_blue_ns/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_blue_ns.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_blue_ns/symbols.txt b/config/GZ2P01/rels/d_a_npc_blue_ns/symbols.txt index 3f30aa77c0..0f55d62e0b 100644 --- a/config/GZ2P01/rels/d_a_npc_blue_ns/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_blue_ns/symbols.txt @@ -150,7 +150,8 @@ ptclOffsetY$5218 = .rodata:0x00000220; // type:object size:0xC scope:local @stringBase0 = .rodata:0x0000022C; // type:object size:0x51 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_287_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x6C scope:global l_arcNames = .data:0x0000008C; // type:object size:0x4 scope:global data:4byte l_evtNames = .data:0x00000090; // type:object size:0x1C scope:global diff --git a/config/GZ2P01/rels/d_a_npc_bou/splits.txt b/config/GZ2P01/rels/d_a_npc_bou/splits.txt index a6fb5dd13c..3573b6f10f 100644 --- a/config/GZ2P01/rels/d_a_npc_bou/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_bou/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bou.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_bou/symbols.txt b/config/GZ2P01/rels/d_a_npc_bou/symbols.txt index e4aaf0cb6b..d0d6f62c3d 100644 --- a/config/GZ2P01/rels/d_a_npc_bou/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_bou/symbols.txt @@ -144,7 +144,8 @@ heapSize$4096 = .rodata:0x0000009C; // type:object size:0x18 scope:local @stringBase0 = .rodata:0x0000013C; // type:object size:0xF1 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_288_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x58 scope:global l_resNameList = .data:0x00000080; // type:object size:0x1C scope:global diff --git a/config/GZ2P01/rels/d_a_npc_bouS/splits.txt b/config/GZ2P01/rels/d_a_npc_bouS/splits.txt index 9469997a33..bb08fe9cd1 100644 --- a/config/GZ2P01/rels/d_a_npc_bouS/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_bouS/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_bouS.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_bouS/symbols.txt b/config/GZ2P01/rels/d_a_npc_bouS/symbols.txt index 5a58300cfc..2fe6c1237a 100644 --- a/config/GZ2P01/rels/d_a_npc_bouS/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_bouS/symbols.txt @@ -162,7 +162,8 @@ m__17daNpcBouS_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob @stringBase0 = .rodata:0x00000348; // type:object size:0x4C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_289_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x114 scope:global l_btpGetParamList = .data:0x00000134; // type:object size:0x3C scope:global l_btkGetParamList = .data:0x00000170; // type:object size:0xC scope:global data:4byte @@ -248,5 +249,5 @@ sInstance__32JASGlobalInstance<11Z2FxLineMgr> = .bss:0x000000D0; // type:object sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .bss:0x000000D4; // type:object size:0x4 scope:global sInstance__32JASGlobalInstance<11Z2SpeechMgr> = .bss:0x000000D8; // type:object size:0x4 scope:global sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .bss:0x000000DC; // type:object size:0x4 scope:global -lbl_289_bss_E0 = .bss:0x000000E0; // type:object size:0x1 data:byte +init$localstatic4$setAttnPos__11daNpcBouS_cFv = .bss:0x000000E0; // type:object size:0x1 data:byte eyeOffset$localstatic3$setAttnPos__11daNpcBouS_cFv = .bss:0x000000E4; // type:object size:0xC scope:local align:4 data:float diff --git a/config/GZ2P01/rels/d_a_npc_cdn3/symbols.txt b/config/GZ2P01/rels/d_a_npc_cdn3/symbols.txt index 4b2a2a5ca3..ae903985b1 100644 --- a/config/GZ2P01/rels/d_a_npc_cdn3/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_cdn3/symbols.txt @@ -121,7 +121,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000006C; // type:object size:0xFC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_290_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3940 = .data:0x00000020; // type:object size:0xC scope:local @3941 = .data:0x0000002C; // type:object size:0xC scope:local @3942 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_npc_chat/splits.txt b/config/GZ2P01/rels/d_a_npc_chat/splits.txt index eac5f9fb3a..27a480b479 100644 --- a/config/GZ2P01/rels/d_a_npc_chat/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_chat/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_chat.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_chat/symbols.txt b/config/GZ2P01/rels/d_a_npc_chat/symbols.txt index 7b345bdb70..b1375b9d83 100644 --- a/config/GZ2P01/rels/d_a_npc_chat/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_chat/symbols.txt @@ -289,7 +289,8 @@ a_jntNumTbl$5570 = .rodata:0x000005C8; // type:object size:0x68 scope:local @stringBase0 = .rodata:0x00000DA4; // type:object size:0x219 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_291_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameTbl = .data:0x00000020; // type:object size:0x78 scope:global l_bmdTbl = .data:0x00000098; // type:object size:0xF0 scope:global data:4byte l_bmdTWTbl = .data:0x00000188; // type:object size:0xF0 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_chin/splits.txt b/config/GZ2P01/rels/d_a_npc_chin/splits.txt index 6879f55230..940f849f8e 100644 --- a/config/GZ2P01/rels/d_a_npc_chin/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_chin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_chin.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_chin/symbols.txt b/config/GZ2P01/rels/d_a_npc_chin/symbols.txt index f266c67a55..9d57f37bdf 100644 --- a/config/GZ2P01/rels/d_a_npc_chin/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_chin/symbols.txt @@ -224,7 +224,8 @@ m__17daNpcChin_Param_c = .rodata:0x00000014; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x00000448; // type:object size:0x9A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_292_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x18C scope:global l_btpGetParamList = .data:0x000001AC; // type:object size:0xB4 scope:global l_btkGetParamList = .data:0x00000260; // type:object size:0x6C scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_clerka/splits.txt b/config/GZ2P01/rels/d_a_npc_clerka/splits.txt index 8a24e56b31..4c215a3cb0 100644 --- a/config/GZ2P01/rels/d_a_npc_clerka/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_clerka/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerka.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_clerka/symbols.txt b/config/GZ2P01/rels/d_a_npc_clerka/symbols.txt index c81114a07f..f6b677e954 100644 --- a/config/GZ2P01/rels/d_a_npc_clerka/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_clerka/symbols.txt @@ -134,7 +134,8 @@ m__20daNpc_clerkA_Param_c = .rodata:0x00000000; // type:object size:0x90 scope:g @stringBase0 = .rodata:0x00000100; // type:object size:0x24 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_293_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_clerkb/splits.txt b/config/GZ2P01/rels/d_a_npc_clerkb/splits.txt index bf1e54d934..3275bd53cb 100644 --- a/config/GZ2P01/rels/d_a_npc_clerkb/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_clerkb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerkb.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_clerkb/symbols.txt b/config/GZ2P01/rels/d_a_npc_clerkb/symbols.txt index c884f2c304..c76d267afb 100644 --- a/config/GZ2P01/rels/d_a_npc_clerkb/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_clerkb/symbols.txt @@ -137,7 +137,8 @@ m__20daNpc_clerkB_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:g @stringBase0 = .rodata:0x00000114; // type:object size:0x24 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_294_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_clerkt/splits.txt b/config/GZ2P01/rels/d_a_npc_clerkt/splits.txt index 6cfa914495..62e30d2ada 100644 --- a/config/GZ2P01/rels/d_a_npc_clerkt/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_clerkt/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_clerkt.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_clerkt/symbols.txt b/config/GZ2P01/rels/d_a_npc_clerkt/symbols.txt index 6670c1b696..6f780f8d1e 100644 --- a/config/GZ2P01/rels/d_a_npc_clerkt/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_clerkt/symbols.txt @@ -130,7 +130,8 @@ m__19daNpcClerkt_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x000000F8; // type:object size:0x1C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_295_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_df/splits.txt b/config/GZ2P01/rels/d_a_npc_df/splits.txt index 4a1bc8869c..361302ea7c 100644 --- a/config/GZ2P01/rels/d_a_npc_df/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_df/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_df.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_doc/splits.txt b/config/GZ2P01/rels/d_a_npc_doc/splits.txt index faec1c0187..705d650271 100644 --- a/config/GZ2P01/rels/d_a_npc_doc/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_doc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_doc.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_doc/symbols.txt b/config/GZ2P01/rels/d_a_npc_doc/symbols.txt index 1247872390..5b5b5cfc49 100644 --- a/config/GZ2P01/rels/d_a_npc_doc/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_doc/symbols.txt @@ -128,7 +128,8 @@ heapSize$3968 = .rodata:0x00000090; // type:object size:0xC scope:local @stringBase0 = .rodata:0x0000010C; // type:object size:0x16 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_298_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0xC scope:global diff --git a/config/GZ2P01/rels/d_a_npc_doorboy/splits.txt b/config/GZ2P01/rels/d_a_npc_doorboy/splits.txt index 17f7c28a81..77332a5fd2 100644 --- a/config/GZ2P01/rels/d_a_npc_doorboy/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_doorboy/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_doorboy.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_doorboy/symbols.txt b/config/GZ2P01/rels/d_a_npc_doorboy/symbols.txt index 5b62d5015e..73909606ae 100644 --- a/config/GZ2P01/rels/d_a_npc_doorboy/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_doorboy/symbols.txt @@ -98,7 +98,8 @@ m__20daNpcDoorBoy_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:g @stringBase0 = .rodata:0x0000015C; // type:object size:0x21 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_299_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x48 scope:global l_btpGetParamList = .data:0x00000068; // type:object size:0xC scope:global l_arcNames = .data:0x00000074; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_drainSol/splits.txt b/config/GZ2P01/rels/d_a_npc_drainSol/splits.txt index 2cf697f780..3bb08a07cc 100644 --- a/config/GZ2P01/rels/d_a_npc_drainSol/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_drainSol/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_drainSol.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_du/splits.txt b/config/GZ2P01/rels/d_a_npc_du/splits.txt index 28773a55db..cb4a20abd8 100644 --- a/config/GZ2P01/rels/d_a_npc_du/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_du/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_du.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_du/symbols.txt b/config/GZ2P01/rels/d_a_npc_du/symbols.txt index fc428c5a35..1c2324cbb6 100644 --- a/config/GZ2P01/rels/d_a_npc_du/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_du/symbols.txt @@ -78,6 +78,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000B8; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000000DC; // type:object size:0xC scope:global __vt__14daNpc_Du_HIO_c = .data:0x000000E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_301_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_npc_fairy/splits.txt b/config/GZ2P01/rels/d_a_npc_fairy/splits.txt index 27fbb571b1..d20ffe84b7 100644 --- a/config/GZ2P01/rels/d_a_npc_fairy/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_fairy/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_fairy.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_fairy/symbols.txt b/config/GZ2P01/rels/d_a_npc_fairy/symbols.txt index bcae5cd3f9..373c3688e5 100644 --- a/config/GZ2P01/rels/d_a_npc_fairy/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_fairy/symbols.txt @@ -213,7 +213,8 @@ sEvtBitNo$5358 = .rodata:0x00000190; // type:object size:0xA scope:local @stringBase0 = .rodata:0x000001E8; // type:object size:0x10A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_302_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_loadResPtrn0 = .data:0x00000028; // type:object size:0x2 scope:global l_loadResPtrnList = .data:0x0000002C; // type:object size:0x14 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_fairy_seirei/splits.txt b/config/GZ2P01/rels/d_a_npc_fairy_seirei/splits.txt index 7d1251d591..53c3ab2401 100644 --- a/config/GZ2P01/rels/d_a_npc_fairy_seirei/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_fairy_seirei/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_fairy_seirei.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_fairy_seirei/symbols.txt b/config/GZ2P01/rels/d_a_npc_fairy_seirei/symbols.txt index 3a0a13217d..1a0e3f9762 100644 --- a/config/GZ2P01/rels/d_a_npc_fairy_seirei/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_fairy_seirei/symbols.txt @@ -98,7 +98,8 @@ sTempBit$4575 = .rodata:0x000000BC; // type:object size:0x10 scope:local @stringBase0 = .rodata:0x000000CC; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_80_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_evtList = .data:0x00000020; // type:object size:0x8 scope:global l_resNameList = .data:0x00000028; // type:object size:0x8 scope:global l_loadResPtrn0 = .data:0x00000030; // type:object size:0x2 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_fish/symbols.txt b/config/GZ2P01/rels/d_a_npc_fish/symbols.txt index dd9041385f..1e7f407413 100644 --- a/config/GZ2P01/rels/d_a_npc_fish/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_fish/symbols.txt @@ -20,7 +20,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000001C; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_81_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double fish_d127_S = .data:0x00000020; // type:object size:0x3D4 scope:global fish_d127 = .data:0x000003F4; // type:object size:0x460 scope:global lf_pos = .data:0x00000854; // type:object size:0x90 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_gnd/splits.txt b/config/GZ2P01/rels/d_a_npc_gnd/splits.txt index 504644c041..b136cd9de7 100644 --- a/config/GZ2P01/rels/d_a_npc_gnd/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_gnd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gnd.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_gnd/symbols.txt b/config/GZ2P01/rels/d_a_npc_gnd/symbols.txt index 2eaa50ac07..e4e2a5cacd 100644 --- a/config/GZ2P01/rels/d_a_npc_gnd/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_gnd/symbols.txt @@ -123,7 +123,8 @@ m__17daNpc_Gnd_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob @stringBase0 = .rodata:0x000000E8; // type:object size:0x11 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_304_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_gra/splits.txt b/config/GZ2P01/rels/d_a_npc_gra/splits.txt index 2ec441a606..5204f31b61 100644 --- a/config/GZ2P01/rels/d_a_npc_gra/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_gra/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gra.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_gra/symbols.txt b/config/GZ2P01/rels/d_a_npc_gra/symbols.txt index 11e14e87a7..75c54efae6 100644 --- a/config/GZ2P01/rels/d_a_npc_gra/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_gra/symbols.txt @@ -313,7 +313,8 @@ l_prticles_id$6368 = .rodata:0x00000694; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000720; // type:object size:0x15A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_305_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x28 scope:global data:4byte l_bckGetParamList = .data:0x00000048; // type:object size:0x198 scope:global l_btpGetParamList = .data:0x000001E0; // type:object size:0x80 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_grc/splits.txt b/config/GZ2P01/rels/d_a_npc_grc/splits.txt index 32077a261b..5421ecbe9c 100644 --- a/config/GZ2P01/rels/d_a_npc_grc/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_grc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grc.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_grc/symbols.txt b/config/GZ2P01/rels/d_a_npc_grc/symbols.txt index 5ac20c0f74..ee4ec723b5 100644 --- a/config/GZ2P01/rels/d_a_npc_grc/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_grc/symbols.txt @@ -145,7 +145,8 @@ m__17daNpc_grC_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x000002D4; // type:object size:0x2C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_306_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x98 scope:global l_btpGetParamList = .data:0x000000C8; // type:object size:0x30 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_grd/splits.txt b/config/GZ2P01/rels/d_a_npc_grd/splits.txt index 2ac90e7e25..49e082901e 100644 --- a/config/GZ2P01/rels/d_a_npc_grd/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_grd/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grd.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_grd/symbols.txt b/config/GZ2P01/rels/d_a_npc_grd/symbols.txt index b4ed89b682..567764b26e 100644 --- a/config/GZ2P01/rels/d_a_npc_grd/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_grd/symbols.txt @@ -137,7 +137,8 @@ m__17daNpc_Grd_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x000001F0; // type:object size:0x1F scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_307_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x60 scope:global l_btpGetParamList = .data:0x00000088; // type:object size:0x20 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_grm/splits.txt b/config/GZ2P01/rels/d_a_npc_grm/splits.txt index 4a5fe1ac5f..79a9e8515b 100644 --- a/config/GZ2P01/rels/d_a_npc_grm/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_grm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grm.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_grm/symbols.txt b/config/GZ2P01/rels/d_a_npc_grm/symbols.txt index 6fd8627845..958e7f400e 100644 --- a/config/GZ2P01/rels/d_a_npc_grm/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_grm/symbols.txt @@ -121,7 +121,8 @@ m__17daNpc_grM_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob @stringBase0 = .rodata:0x000000F0; // type:object size:0x33 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_308_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0xC scope:global diff --git a/config/GZ2P01/rels/d_a_npc_grmc/splits.txt b/config/GZ2P01/rels/d_a_npc_grmc/splits.txt index 21ee0e831e..e02b25c3ce 100644 --- a/config/GZ2P01/rels/d_a_npc_grmc/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_grmc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grmc.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_grmc/symbols.txt b/config/GZ2P01/rels/d_a_npc_grmc/symbols.txt index 40bd42acac..f67d655c46 100644 --- a/config/GZ2P01/rels/d_a_npc_grmc/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_grmc/symbols.txt @@ -121,7 +121,8 @@ m__18daNpc_grMC_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000F8; // type:object size:0x22 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_309_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0xC scope:global diff --git a/config/GZ2P01/rels/d_a_npc_gro/splits.txt b/config/GZ2P01/rels/d_a_npc_gro/splits.txt index e2d96b0ebf..bace7d2e35 100644 --- a/config/GZ2P01/rels/d_a_npc_gro/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_gro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gro.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_gro/symbols.txt b/config/GZ2P01/rels/d_a_npc_gro/symbols.txt index 562918f8e2..7600db2553 100644 --- a/config/GZ2P01/rels/d_a_npc_gro/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_gro/symbols.txt @@ -168,7 +168,8 @@ heapSize$4387 = .rodata:0x0000006C; // type:object size:0x10 scope:local @stringBase0 = .rodata:0x0000033C; // type:object size:0x40 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_310_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4083 = .data:0x00000020; // type:object size:0xC scope:local l_bmdGetParamList = .data:0x0000002C; // type:object size:0x18 scope:global l_bckGetParamList = .data:0x00000044; // type:object size:0xB8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_grr/splits.txt b/config/GZ2P01/rels/d_a_npc_grr/splits.txt index ba92d3e917..037f7ff4b9 100644 --- a/config/GZ2P01/rels/d_a_npc_grr/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_grr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grr.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_grr/symbols.txt b/config/GZ2P01/rels/d_a_npc_grr/symbols.txt index 8fcbb74f27..0c9400d51e 100644 --- a/config/GZ2P01/rels/d_a_npc_grr/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_grr/symbols.txt @@ -157,7 +157,8 @@ heapSize$4308 = .rodata:0x0000006C; // type:object size:0x10 scope:local @stringBase0 = .rodata:0x000002F4; // type:object size:0x21 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_311_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x98 scope:global l_btpGetParamList = .data:0x000000C0; // type:object size:0x30 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_grs/splits.txt b/config/GZ2P01/rels/d_a_npc_grs/splits.txt index d87b3a701a..34574a7d50 100644 --- a/config/GZ2P01/rels/d_a_npc_grs/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_grs/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grs.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_grs/symbols.txt b/config/GZ2P01/rels/d_a_npc_grs/symbols.txt index 4887edfe32..23cbba0596 100644 --- a/config/GZ2P01/rels/d_a_npc_grs/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_grs/symbols.txt @@ -132,7 +132,8 @@ jointNo$5517 = .rodata:0x000001B4; // type:object size:0x18 scope:local @stringBase0 = .rodata:0x000001D0; // type:object size:0x28 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_312_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x40 scope:global l_btpGetParamList = .data:0x00000070; // type:object size:0x18 scope:global @@ -187,7 +188,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @4050 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte @4752 = .bss:0x00000058; // type:object size:0xC scope:local -init$4753 = .bss:0x00000064; // type:object size:0x1 scope:local +init$4753 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte eyeOffset$4751 = .bss:0x00000068; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000074; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000078; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_grz/splits.txt b/config/GZ2P01/rels/d_a_npc_grz/splits.txt index cc54401f18..c51a768db1 100644 --- a/config/GZ2P01/rels/d_a_npc_grz/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_grz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_grz.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_grz/symbols.txt b/config/GZ2P01/rels/d_a_npc_grz/symbols.txt index b8b8a8a5b7..a310d813a3 100644 --- a/config/GZ2P01/rels/d_a_npc_grz/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_grz/symbols.txt @@ -229,7 +229,8 @@ l_prticles_id$6299 = .rodata:0x00000428; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000444; // type:object size:0x66 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_313_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x110 scope:global l_btpGetParamList = .data:0x00000138; // type:object size:0x50 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_guard/symbols.txt b/config/GZ2P01/rels/d_a_npc_guard/symbols.txt index 8fe330d58d..f0aca48b64 100644 --- a/config/GZ2P01/rels/d_a_npc_guard/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_guard/symbols.txt @@ -99,7 +99,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x000000F8; // type:object size:0x7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_314_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3824 = .data:0x00000020; // type:object size:0xC scope:local @3825 = .data:0x0000002C; // type:object size:0xC scope:local @3826 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_npc_gwolf/splits.txt b/config/GZ2P01/rels/d_a_npc_gwolf/splits.txt index 42883f6ff7..c17a45cb67 100644 --- a/config/GZ2P01/rels/d_a_npc_gwolf/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_gwolf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_gwolf.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_gwolf/symbols.txt b/config/GZ2P01/rels/d_a_npc_gwolf/symbols.txt index 3f89f16189..3ccead7ccd 100644 --- a/config/GZ2P01/rels/d_a_npc_gwolf/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_gwolf/symbols.txt @@ -156,7 +156,8 @@ m__19daNpc_GWolf_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x00000228; // type:object size:0xD7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_315_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x60 scope:global l_btkGetParamList = .data:0x00000088; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_hanjo/splits.txt b/config/GZ2P01/rels/d_a_npc_hanjo/splits.txt index bc6918cd37..c736549d52 100644 --- a/config/GZ2P01/rels/d_a_npc_hanjo/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_hanjo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_hanjo.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_hanjo/symbols.txt b/config/GZ2P01/rels/d_a_npc_hanjo/symbols.txt index f3a4bc3e25..939f2a8f16 100644 --- a/config/GZ2P01/rels/d_a_npc_hanjo/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_hanjo/symbols.txt @@ -189,7 +189,8 @@ bmdTypeList$4495 = .rodata:0x00000110; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000001F8; // type:object size:0x146 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_316_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global data:4byte l_evtList = .data:0x00000040; // type:object size:0x58 scope:global data:4byte l_resNameList = .data:0x00000098; // type:object size:0x18 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_henna/splits.txt b/config/GZ2P01/rels/d_a_npc_henna/splits.txt index e6393bbd2a..1a347004d1 100644 --- a/config/GZ2P01/rels/d_a_npc_henna/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_henna/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_henna.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_henna/symbols.txt b/config/GZ2P01/rels/d_a_npc_henna/symbols.txt index 247cd65789..1666488530 100644 --- a/config/GZ2P01/rels/d_a_npc_henna/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_henna/symbols.txt @@ -270,7 +270,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000030C; // type:object size:0x16 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_82_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double check_kind = .data:0x00000020; // type:object size:0x8 scope:global data:2byte @4437 = .data:0x00000028; // type:object size:0x34 scope:local @4753 = .data:0x0000005C; // type:object size:0x30 scope:local @@ -303,7 +304,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3900 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x38 scope:global data:byte lrl = .bss:0x0000008C; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_hoz/splits.txt b/config/GZ2P01/rels/d_a_npc_hoz/splits.txt index da0da0f2cb..9b67dfd4f1 100644 --- a/config/GZ2P01/rels/d_a_npc_hoz/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_hoz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_hoz.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_hoz/symbols.txt b/config/GZ2P01/rels/d_a_npc_hoz/symbols.txt index 4434fe3686..6e054ad27d 100644 --- a/config/GZ2P01/rels/d_a_npc_hoz/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_hoz/symbols.txt @@ -145,7 +145,8 @@ heapSize$4117 = .rodata:0x00000090; // type:object size:0x1C scope:local @stringBase0 = .rodata:0x00000114; // type:object size:0xA0 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_318_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x48 scope:global l_resNameList = .data:0x00000078; // type:object size:0x1C scope:global diff --git a/config/GZ2P01/rels/d_a_npc_impal/splits.txt b/config/GZ2P01/rels/d_a_npc_impal/splits.txt index 15d6699d8c..05a4157c3e 100644 --- a/config/GZ2P01/rels/d_a_npc_impal/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_impal/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_impal.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_impal/symbols.txt b/config/GZ2P01/rels/d_a_npc_impal/symbols.txt index a3da253e30..9bd4619723 100644 --- a/config/GZ2P01/rels/d_a_npc_impal/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_impal/symbols.txt @@ -142,7 +142,8 @@ m__18daNpcImpal_Param_c = .rodata:0x00000000; // type:object size:0x70 scope:glo @stringBase0 = .rodata:0x00000258; // type:object size:0x5C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_319_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xD8 scope:global l_btpGetParamList = .data:0x000000F8; // type:object size:0x78 scope:global l_btkGetParamList = .data:0x00000170; // type:object size:0x30 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_ins/splits.txt b/config/GZ2P01/rels/d_a_npc_ins/splits.txt index e7e21d357f..2d98d7204d 100644 --- a/config/GZ2P01/rels/d_a_npc_ins/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_ins/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ins.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_ins/symbols.txt b/config/GZ2P01/rels/d_a_npc_ins/symbols.txt index 47987a2078..5bf375c28d 100644 --- a/config/GZ2P01/rels/d_a_npc_ins/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_ins/symbols.txt @@ -169,7 +169,8 @@ m__16daNpcIns_Param_c = .rodata:0x000000C0; // type:object size:0x70 scope:globa @stringBase0 = .rodata:0x000003BC; // type:object size:0x32 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_321_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x120 scope:global l_btpGetParamList = .data:0x00000140; // type:object size:0x60 scope:global l_btkGetParamList = .data:0x000001A0; // type:object size:0x18 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_jagar/splits.txt b/config/GZ2P01/rels/d_a_npc_jagar/splits.txt index 5de90e7bb2..8b9a2c5f73 100644 --- a/config/GZ2P01/rels/d_a_npc_jagar/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_jagar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_jagar.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_jagar/symbols.txt b/config/GZ2P01/rels/d_a_npc_jagar/symbols.txt index decfb15385..9533bfb6f9 100644 --- a/config/GZ2P01/rels/d_a_npc_jagar/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_jagar/symbols.txt @@ -155,7 +155,8 @@ heapSize$4099 = .rodata:0x000000A0; // type:object size:0x10 scope:local @stringBase0 = .rodata:0x0000016C; // type:object size:0xAA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_322_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x48 scope:global l_resNameList = .data:0x00000070; // type:object size:0x14 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_kakashi/splits.txt b/config/GZ2P01/rels/d_a_npc_kakashi/splits.txt index 0ce59dbfc3..e27d65f5d1 100644 --- a/config/GZ2P01/rels/d_a_npc_kakashi/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_kakashi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kakashi.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_kakashi/symbols.txt b/config/GZ2P01/rels/d_a_npc_kakashi/symbols.txt index 8c037c50d2..076146cf41 100644 --- a/config/GZ2P01/rels/d_a_npc_kakashi/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_kakashi/symbols.txt @@ -128,7 +128,8 @@ id$5174 = .rodata:0x00000108; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000010C; // type:object size:0x1CA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_83_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte l_evtList = .data:0x00000038; // type:object size:0xA8 scope:global l_resNameList = .data:0x000000E0; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_kasi_hana/splits.txt b/config/GZ2P01/rels/d_a_npc_kasi_hana/splits.txt index e8b02ace71..f69d6af5fa 100644 --- a/config/GZ2P01/rels/d_a_npc_kasi_hana/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_kasi_hana/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_hana.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_kasi_hana/symbols.txt b/config/GZ2P01/rels/d_a_npc_kasi_hana/symbols.txt index e00b263efb..51a23a67bc 100644 --- a/config/GZ2P01/rels/d_a_npc_kasi_hana/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_kasi_hana/symbols.txt @@ -196,7 +196,8 @@ m__21daNpcKasiHana_Param_c = .rodata:0x00000048; // type:object size:0x7C scope: @stringBase0 = .rodata:0x000002D8; // type:object size:0x79 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_323_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xB4 scope:global l_btpGetParamList = .data:0x000000D4; // type:object size:0xC scope:global l_arcNames = .data:0x000000E0; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_kasi_kyu/splits.txt b/config/GZ2P01/rels/d_a_npc_kasi_kyu/splits.txt index b92316ec8d..220ccfb44c 100644 --- a/config/GZ2P01/rels/d_a_npc_kasi_kyu/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_kasi_kyu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_kyu.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_kasi_kyu/symbols.txt b/config/GZ2P01/rels/d_a_npc_kasi_kyu/symbols.txt index fdaa973a5f..69f189d22e 100644 --- a/config/GZ2P01/rels/d_a_npc_kasi_kyu/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_kasi_kyu/symbols.txt @@ -152,7 +152,8 @@ m__20daNpcKasiKyu_Param_c = .rodata:0x00000000; // type:object size:0x74 scope:g @stringBase0 = .rodata:0x00000254; // type:object size:0x18 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_324_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xC0 scope:global l_btpGetParamList = .data:0x000000E0; // type:object size:0xC scope:global l_arcNames = .data:0x000000EC; // type:object size:0xC scope:global data:4byte @@ -233,7 +234,7 @@ l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte mTargetTag__14daNpcKasiKyu_c = .bss:0x00000058; // type:object size:0x4 scope:global data:4byte mTargetTagDist__14daNpcKasiKyu_c = .bss:0x0000005C; // type:object size:0x4 scope:global mWolfAngle__14daNpcKasiKyu_c = .bss:0x00000060; // type:object size:0x2 scope:global data:2byte -lbl_324_bss_62 = .bss:0x00000062; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000062; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000006C; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_kasi_mich/splits.txt b/config/GZ2P01/rels/d_a_npc_kasi_mich/splits.txt index caef80f2c4..3d9458405b 100644 --- a/config/GZ2P01/rels/d_a_npc_kasi_mich/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_kasi_mich/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kasi_mich.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_kasi_mich/symbols.txt b/config/GZ2P01/rels/d_a_npc_kasi_mich/symbols.txt index d80ee64131..f5be599a9e 100644 --- a/config/GZ2P01/rels/d_a_npc_kasi_mich/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_kasi_mich/symbols.txt @@ -150,7 +150,8 @@ m__21daNpcKasiMich_Param_c = .rodata:0x00000000; // type:object size:0x74 scope: @stringBase0 = .rodata:0x0000024C; // type:object size:0x19 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_325_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xC0 scope:global l_btpGetParamList = .data:0x000000E0; // type:object size:0xC scope:global l_arcNames = .data:0x000000EC; // type:object size:0xC scope:global data:4byte @@ -231,7 +232,7 @@ l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte mTargetTag__15daNpcKasiMich_c = .bss:0x00000058; // type:object size:0x4 scope:global data:4byte mTargetTagDist__15daNpcKasiMich_c = .bss:0x0000005C; // type:object size:0x4 scope:global mWolfAngle__15daNpcKasiMich_c = .bss:0x00000060; // type:object size:0x2 scope:global data:2byte -lbl_325_bss_62 = .bss:0x00000062; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000062; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000068; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000006C; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_kkri/splits.txt b/config/GZ2P01/rels/d_a_npc_kkri/splits.txt index 62166bee72..bdea450be0 100644 --- a/config/GZ2P01/rels/d_a_npc_kkri/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_kkri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kkri.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_kkri/symbols.txt b/config/GZ2P01/rels/d_a_npc_kkri/symbols.txt index a1fcd9d1ac..a81825a60f 100644 --- a/config/GZ2P01/rels/d_a_npc_kkri/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_kkri/symbols.txt @@ -140,7 +140,8 @@ heapSize$4005 = .rodata:0x0000008C; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000114; // type:object size:0x54 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_84_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x28 scope:global l_resNameList = .data:0x00000058; // type:object size:0xC scope:global diff --git a/config/GZ2P01/rels/d_a_npc_kn/splits.txt b/config/GZ2P01/rels/d_a_npc_kn/splits.txt index a970c3d3d4..7acb87c62b 100644 --- a/config/GZ2P01/rels/d_a_npc_kn/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_kn/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kn.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_kn/symbols.txt b/config/GZ2P01/rels/d_a_npc_kn/symbols.txt index c5a18b385a..ed331890b6 100644 --- a/config/GZ2P01/rels/d_a_npc_kn/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_kn/symbols.txt @@ -299,7 +299,8 @@ heapSize$6094 = .rodata:0x0000015C; // type:object size:0x20 scope:local @stringBase0 = .rodata:0x00000230; // type:object size:0x239 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_327_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daNpc_Kn_c = .data:0x00000020; // type:object size:0x44 scope:global mCcDSph__10daNpc_Kn_c = .data:0x00000064; // type:object size:0x40 scope:global l_bmdData = .data:0x000000A4; // type:object size:0x18 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_knj/splits.txt b/config/GZ2P01/rels/d_a_npc_knj/splits.txt index 62eac259b2..9344b72d55 100644 --- a/config/GZ2P01/rels/d_a_npc_knj/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_knj/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_knj.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_knj/symbols.txt b/config/GZ2P01/rels/d_a_npc_knj/symbols.txt index 5aed0ea98a..f34ade164a 100644 --- a/config/GZ2P01/rels/d_a_npc_knj/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_knj/symbols.txt @@ -94,7 +94,8 @@ m__17daNpc_Knj_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob @stringBase0 = .rodata:0x000000AC; // type:object size:0x11 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_328_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_kolin/splits.txt b/config/GZ2P01/rels/d_a_npc_kolin/splits.txt index ce50229f88..c8f93513d6 100644 --- a/config/GZ2P01/rels/d_a_npc_kolin/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_kolin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kolin.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_kolin/symbols.txt b/config/GZ2P01/rels/d_a_npc_kolin/symbols.txt index f0c0aedbc1..7313144bae 100644 --- a/config/GZ2P01/rels/d_a_npc_kolin/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_kolin/symbols.txt @@ -173,7 +173,8 @@ jointNo$5054 = .rodata:0x00000150; // type:object size:0x4 scope:local data:4byt @stringBase0 = .rodata:0x000001C8; // type:object size:0x149 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_85_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte l_evtList = .data:0x00000038; // type:object size:0x48 scope:global l_resNameList = .data:0x00000080; // type:object size:0x20 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_kolinb/splits.txt b/config/GZ2P01/rels/d_a_npc_kolinb/splits.txt index 917e244263..c7e2bf4b20 100644 --- a/config/GZ2P01/rels/d_a_npc_kolinb/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_kolinb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kolinb.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_kolinb/symbols.txt b/config/GZ2P01/rels/d_a_npc_kolinb/symbols.txt index 2321372ec6..bbb6eab0e4 100644 --- a/config/GZ2P01/rels/d_a_npc_kolinb/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_kolinb/symbols.txt @@ -111,7 +111,8 @@ heapSize$3973 = .rodata:0x0000008C; // type:object size:0x10 scope:local @stringBase0 = .rodata:0x000000CC; // type:object size:0x75 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_329_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x10 scope:global l_resNameList = .data:0x00000040; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_ks/splits.txt b/config/GZ2P01/rels/d_a_npc_ks/splits.txt index b774877f84..6a4ac28794 100644 --- a/config/GZ2P01/rels/d_a_npc_ks/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_ks/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ks.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_ks/symbols.txt b/config/GZ2P01/rels/d_a_npc_ks/symbols.txt index ce210db0b2..0158e6e6f0 100644 --- a/config/GZ2P01/rels/d_a_npc_ks/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_ks/symbols.txt @@ -458,7 +458,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000053C; // type:object size:0x20 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_330_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double saru_p = .data:0x00000020; // type:object size:0x20 scope:global data:4byte @4808 = .data:0x00000040; // type:object size:0x38 scope:local guide_path_04 = .data:0x00000078; // type:object size:0x16C scope:global @@ -521,14 +522,16 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa obj_pos = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float leader = .bss:0x00000060; // type:object size:0x4 scope:global data:4byte call_pt = .bss:0x00000064; // type:object size:0x4 scope:global data:4byte -lbl_330_bss_68 = .bss:0x00000068; // type:object size:0x1 data:byte +hio_set = .bss:0x00000068; // type:object size:0x1 scope:local align:1 data:byte @4025 = .bss:0x0000006C; // type:object size:0xC scope:local l_HIO = .bss:0x00000078; // type:object size:0x38 scope:global data:byte target_info = .bss:0x000000B0; // type:object size:0x28 scope:global target_info_count = .bss:0x000000D8; // type:object size:0x4 scope:global data:4byte target_bgc = .bss:0x000000DC; // type:object size:0x28 scope:global start_pya$6091 = .bss:0x00000104; // type:object size:0x2 scope:local +init$3911 = .bss:0x00000106; // type:object size:0x1 scope:local align:1 data:byte @7870 = .bss:0x00000108; // type:object size:0xC scope:local +init$5647 = .bss:0x00000114; // type:object size:0x1 scope:local align:1 data:byte sc$7869 = .bss:0x00000118; // type:object size:0xC scope:local c_start = .bss:0x00000124; // type:object size:0x4 scope:global sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000128; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_kyury/splits.txt b/config/GZ2P01/rels/d_a_npc_kyury/splits.txt index 890ea4f9c6..05452c7d1d 100644 --- a/config/GZ2P01/rels/d_a_npc_kyury/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_kyury/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_kyury.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_len/splits.txt b/config/GZ2P01/rels/d_a_npc_len/splits.txt index ea206a79f3..4b15da9176 100644 --- a/config/GZ2P01/rels/d_a_npc_len/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_len/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_len.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_len/symbols.txt b/config/GZ2P01/rels/d_a_npc_len/symbols.txt index 080956b071..581ca3e7a8 100644 --- a/config/GZ2P01/rels/d_a_npc_len/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_len/symbols.txt @@ -138,7 +138,8 @@ heapSize$4002 = .rodata:0x00000094; // type:object size:0x28 scope:local @stringBase0 = .rodata:0x00000138; // type:object size:0xAA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_332_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x38 scope:global l_resNameList = .data:0x00000068; // type:object size:0x10 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_lf/splits.txt b/config/GZ2P01/rels/d_a_npc_lf/splits.txt index 62c53eb27e..d6b4e82ab3 100644 --- a/config/GZ2P01/rels/d_a_npc_lf/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_lf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_lf.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_lf/symbols.txt b/config/GZ2P01/rels/d_a_npc_lf/symbols.txt index 8f15b67f1f..2ae3a8a0c5 100644 --- a/config/GZ2P01/rels/d_a_npc_lf/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_lf/symbols.txt @@ -56,10 +56,10 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4176 = .rodata:0x00000094; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000098; // type:object size:0x7 scope:local data:string_table wp$3976 = .data:0x00000000; // type:object size:0xC scope:local -l_daNPC_LF_Method = .data:0x0000000C; // type:object size:0x20 scope:global +l_daNPC_LF_Method = .data:0x0000000C; // type:object size:0x20 scope:local g_profile_NPC_LF = .data:0x0000002C; // type:object size:0x30 scope:global __vt__14daNPC_LF_HIO_c = .data:0x0000005C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_333_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte +l_HIO = .bss:0x00000018; // type:object size:0x1C scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_npc_lud/splits.txt b/config/GZ2P01/rels/d_a_npc_lud/splits.txt index 5eda121326..63ee988277 100644 --- a/config/GZ2P01/rels/d_a_npc_lud/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_lud/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_lud.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_lud/symbols.txt b/config/GZ2P01/rels/d_a_npc_lud/symbols.txt index a5d281a33c..c3411c7295 100644 --- a/config/GZ2P01/rels/d_a_npc_lud/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_lud/symbols.txt @@ -147,7 +147,8 @@ jointNo$5056 = .rodata:0x0000012C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000150; // type:object size:0xFD scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_334_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x28 scope:global data:4byte l_evtList = .data:0x00000048; // type:object size:0x30 scope:global l_resNameList = .data:0x00000078; // type:object size:0x18 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_maro/splits.txt b/config/GZ2P01/rels/d_a_npc_maro/splits.txt index ba8135bb4c..5d28bb8b3f 100644 --- a/config/GZ2P01/rels/d_a_npc_maro/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_maro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_maro.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_maro/symbols.txt b/config/GZ2P01/rels/d_a_npc_maro/symbols.txt index 3af5cc0cd9..5776842019 100644 --- a/config/GZ2P01/rels/d_a_npc_maro/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_maro/symbols.txt @@ -183,7 +183,8 @@ heapSize$4152 = .rodata:0x00000090; // type:object size:0x44 scope:local @stringBase0 = .rodata:0x000001AC; // type:object size:0x237 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_86_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4085 = .data:0x00000020; // type:object size:0xC scope:local l_bmdData = .data:0x0000002C; // type:object size:0x10 scope:global l_evtList = .data:0x0000003C; // type:object size:0x78 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_midp/splits.txt b/config/GZ2P01/rels/d_a_npc_midp/splits.txt index 08a2a0000f..ba2d9fce2e 100644 --- a/config/GZ2P01/rels/d_a_npc_midp/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_midp/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_midp.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_midp/symbols.txt b/config/GZ2P01/rels/d_a_npc_midp/symbols.txt index 544e2a96ad..c41a078f88 100644 --- a/config/GZ2P01/rels/d_a_npc_midp/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_midp/symbols.txt @@ -121,7 +121,8 @@ m__18daNpc_midP_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000E0; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_335_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_moi/splits.txt b/config/GZ2P01/rels/d_a_npc_moi/splits.txt index c582fd1167..b0e43d984e 100644 --- a/config/GZ2P01/rels/d_a_npc_moi/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_moi/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_moi.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_moi/symbols.txt b/config/GZ2P01/rels/d_a_npc_moi/symbols.txt index 330b837746..1fb0a97b31 100644 --- a/config/GZ2P01/rels/d_a_npc_moi/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_moi/symbols.txt @@ -183,7 +183,8 @@ jointNo$5214 = .rodata:0x00000178; // type:object size:0x18 scope:local @stringBase0 = .rodata:0x000001E8; // type:object size:0x83 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_337_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x40 scope:global data:4byte l_evtList = .data:0x00000060; // type:object size:0x20 scope:global l_resNameList = .data:0x00000080; // type:object size:0x18 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_moir/splits.txt b/config/GZ2P01/rels/d_a_npc_moir/splits.txt index e8e9e22828..001fc8bad9 100644 --- a/config/GZ2P01/rels/d_a_npc_moir/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_moir/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_moir.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_moir/symbols.txt b/config/GZ2P01/rels/d_a_npc_moir/symbols.txt index ddef1585c7..ef82f9b326 100644 --- a/config/GZ2P01/rels/d_a_npc_moir/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_moir/symbols.txt @@ -223,7 +223,8 @@ m__17daNpcMoiR_Param_c = .rodata:0x00000000; // type:object size:0x74 scope:glob @stringBase0 = .rodata:0x00000594; // type:object size:0x6D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_338_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x1D4 scope:global data:4byte l_btpGetParamList = .data:0x000001F4; // type:object size:0x18 scope:global l_btkGetParamList = .data:0x0000020C; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_myna2/splits.txt b/config/GZ2P01/rels/d_a_npc_myna2/splits.txt index 77202a83fa..d080d4d9e3 100644 --- a/config/GZ2P01/rels/d_a_npc_myna2/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_myna2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_myna2.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_myna2/symbols.txt b/config/GZ2P01/rels/d_a_npc_myna2/symbols.txt index cf3f508b85..1bc0786288 100644 --- a/config/GZ2P01/rels/d_a_npc_myna2/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_myna2/symbols.txt @@ -146,7 +146,8 @@ heapSize$4340 = .rodata:0x00000074; // type:object size:0x14 scope:local @stringBase0 = .rodata:0x00000220; // type:object size:0x60 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_339_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_bckGetParamList = .data:0x00000028; // type:object size:0x78 scope:global l_btpGetParamList = .data:0x000000A0; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_ne/splits.txt b/config/GZ2P01/rels/d_a_npc_ne/splits.txt index 3792d29dc1..b9b54ed0c4 100644 --- a/config/GZ2P01/rels/d_a_npc_ne/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_ne/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ne.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_ne/symbols.txt b/config/GZ2P01/rels/d_a_npc_ne/symbols.txt index cd69a5a955..3cf6e09b96 100644 --- a/config/GZ2P01/rels/d_a_npc_ne/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_ne/symbols.txt @@ -205,7 +205,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_340_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3985 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x1C scope:global data:byte target_info = .bss:0x00000070; // type:object size:0x14 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_pachi_besu/splits.txt b/config/GZ2P01/rels/d_a_npc_pachi_besu/splits.txt index b2918b0a86..efa7371efc 100644 --- a/config/GZ2P01/rels/d_a_npc_pachi_besu/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_pachi_besu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_besu.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_pachi_besu/symbols.txt b/config/GZ2P01/rels/d_a_npc_pachi_besu/symbols.txt index 786d52609e..f695f9bc12 100644 --- a/config/GZ2P01/rels/d_a_npc_pachi_besu/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_pachi_besu/symbols.txt @@ -158,7 +158,8 @@ m__24daNpc_Pachi_Besu_Param_c = .rodata:0x00000000; // type:object size:0x8C sco @stringBase0 = .rodata:0x000000F4; // type:object size:0xDE scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_342_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x30 scope:global data:4byte l_evtList = .data:0x00000050; // type:object size:0x10 scope:global l_resNameList = .data:0x00000060; // type:object size:0x20 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_pachi_maro/splits.txt b/config/GZ2P01/rels/d_a_npc_pachi_maro/splits.txt index f73b896535..1dbce106b5 100644 --- a/config/GZ2P01/rels/d_a_npc_pachi_maro/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_pachi_maro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_maro.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_pachi_maro/symbols.txt b/config/GZ2P01/rels/d_a_npc_pachi_maro/symbols.txt index a437a43a58..62868f42fb 100644 --- a/config/GZ2P01/rels/d_a_npc_pachi_maro/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_pachi_maro/symbols.txt @@ -159,7 +159,8 @@ m__24daNpc_Pachi_Maro_Param_c = .rodata:0x00000000; // type:object size:0x90 sco @stringBase0 = .rodata:0x000000FC; // type:object size:0xEF scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_343_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_evtList = .data:0x00000030; // type:object size:0x10 scope:global l_resNameList = .data:0x00000040; // type:object size:0x2C scope:global diff --git a/config/GZ2P01/rels/d_a_npc_pachi_taro/splits.txt b/config/GZ2P01/rels/d_a_npc_pachi_taro/splits.txt index da9fa3003b..c42248e020 100644 --- a/config/GZ2P01/rels/d_a_npc_pachi_taro/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_pachi_taro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pachi_taro.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_pachi_taro/symbols.txt b/config/GZ2P01/rels/d_a_npc_pachi_taro/symbols.txt index 410f8fbc02..b624270921 100644 --- a/config/GZ2P01/rels/d_a_npc_pachi_taro/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_pachi_taro/symbols.txt @@ -205,7 +205,8 @@ sHitMsg$5762 = .rodata:0x000001C8; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000210; // type:object size:0x118 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_344_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x28 scope:global data:4byte l_evtList = .data:0x00000048; // type:object size:0x58 scope:global l_resNameList = .data:0x000000A0; // type:object size:0x30 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_passer/symbols.txt b/config/GZ2P01/rels/d_a_npc_passer/symbols.txt index ea628252bc..3dba572a3e 100644 --- a/config/GZ2P01/rels/d_a_npc_passer/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_passer/symbols.txt @@ -105,7 +105,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4975 = .rodata:0x00000070; // type:object size:0x8 scope:local align:8 data:double cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_345_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3829 = .data:0x00000020; // type:object size:0xC scope:local @3830 = .data:0x0000002C; // type:object size:0xC scope:local @3831 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_npc_passer2/symbols.txt b/config/GZ2P01/rels/d_a_npc_passer2/symbols.txt index 891e762ffb..32d515cb56 100644 --- a/config/GZ2P01/rels/d_a_npc_passer2/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_passer2/symbols.txt @@ -52,7 +52,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4481 = .rodata:0x00000048; // type:object size:0x8 scope:local align:8 data:double cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_346_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3845 = .data:0x00000020; // type:object size:0xC scope:local @3846 = .data:0x0000002C; // type:object size:0xC scope:local ActionTable__14daNpcPasser2_c = .data:0x00000038; // type:object size:0x18 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_post/splits.txt b/config/GZ2P01/rels/d_a_npc_post/splits.txt index 80c6bc51a7..f0d7ba3a4a 100644 --- a/config/GZ2P01/rels/d_a_npc_post/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_post/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_post.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_post/symbols.txt b/config/GZ2P01/rels/d_a_npc_post/symbols.txt index c0123faf9e..bcf288bcad 100644 --- a/config/GZ2P01/rels/d_a_npc_post/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_post/symbols.txt @@ -152,7 +152,8 @@ jointNo$4959 = .rodata:0x0000012C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000160; // type:object size:0x5E scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_347_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global data:4byte l_evtList = .data:0x00000040; // type:object size:0x28 scope:global l_resNameList = .data:0x00000068; // type:object size:0x10 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_pouya/splits.txt b/config/GZ2P01/rels/d_a_npc_pouya/splits.txt index 72ca6c813d..0a07fee93b 100644 --- a/config/GZ2P01/rels/d_a_npc_pouya/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_pouya/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_pouya.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_prayer/splits.txt b/config/GZ2P01/rels/d_a_npc_prayer/splits.txt index 900921e858..2b8c0f686b 100644 --- a/config/GZ2P01/rels/d_a_npc_prayer/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_prayer/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_prayer.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_prayer/symbols.txt b/config/GZ2P01/rels/d_a_npc_prayer/symbols.txt index d214af0972..90c6f22fd2 100644 --- a/config/GZ2P01/rels/d_a_npc_prayer/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_prayer/symbols.txt @@ -111,7 +111,8 @@ m__17daNpcPray_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x0000015C; // type:object size:0x20 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_349_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x48 scope:global l_arcNames = .data:0x00000068; // type:object size:0x8 scope:global data:4byte l_evtNames = .data:0x00000070; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_raca/splits.txt b/config/GZ2P01/rels/d_a_npc_raca/splits.txt index e53162b79b..3b4879897b 100644 --- a/config/GZ2P01/rels/d_a_npc_raca/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_raca/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_raca.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_raca/symbols.txt b/config/GZ2P01/rels/d_a_npc_raca/symbols.txt index 8f4c7cfe19..d36b85f30a 100644 --- a/config/GZ2P01/rels/d_a_npc_raca/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_raca/symbols.txt @@ -126,7 +126,8 @@ m__18daNpc_Raca_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000E0; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_350_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_rafrel/splits.txt b/config/GZ2P01/rels/d_a_npc_rafrel/splits.txt index 4da058c3ca..380c17f07b 100644 --- a/config/GZ2P01/rels/d_a_npc_rafrel/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_rafrel/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_rafrel.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_rafrel/symbols.txt b/config/GZ2P01/rels/d_a_npc_rafrel/symbols.txt index 443fb4163b..09ab138465 100644 --- a/config/GZ2P01/rels/d_a_npc_rafrel/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_rafrel/symbols.txt @@ -185,7 +185,8 @@ m__19daNpcRafrel_Param_c = .rodata:0x00000000; // type:object size:0x74 scope:gl @stringBase0 = .rodata:0x000003DC; // type:object size:0xC2 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_351_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x15C scope:global l_btpGetParamList = .data:0x0000017C; // type:object size:0x30 scope:global l_btkGetParamList = .data:0x000001AC; // type:object size:0x3C scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_saru/splits.txt b/config/GZ2P01/rels/d_a_npc_saru/splits.txt index 38f46e186f..4053dd1f49 100644 --- a/config/GZ2P01/rels/d_a_npc_saru/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_saru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_saru.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_saru/symbols.txt b/config/GZ2P01/rels/d_a_npc_saru/symbols.txt index 70dc8ed7c6..d264927e78 100644 --- a/config/GZ2P01/rels/d_a_npc_saru/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_saru/symbols.txt @@ -141,7 +141,8 @@ jointNo$4884 = .rodata:0x00000114; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x0000015C; // type:object size:0x4E scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_352_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x20 scope:global l_evtList = .data:0x00000040; // type:object size:0x18 scope:global data:4byte l_resNameList = .data:0x00000058; // type:object size:0x10 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_seib/splits.txt b/config/GZ2P01/rels/d_a_npc_seib/splits.txt index fe60c75324..6674273a27 100644 --- a/config/GZ2P01/rels/d_a_npc_seib/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_seib/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seib.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_seib/symbols.txt b/config/GZ2P01/rels/d_a_npc_seib/symbols.txt index f1ed3323dd..22be200da4 100644 --- a/config/GZ2P01/rels/d_a_npc_seib/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_seib/symbols.txt @@ -96,7 +96,8 @@ m__18daNpc_seiB_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:glo @stringBase0 = .rodata:0x000000AC; // type:object size:0x27 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_353_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_seic/splits.txt b/config/GZ2P01/rels/d_a_npc_seic/splits.txt index a9fce8ef65..afd500af28 100644 --- a/config/GZ2P01/rels/d_a_npc_seic/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_seic/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seic.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_seic/symbols.txt b/config/GZ2P01/rels/d_a_npc_seic/symbols.txt index d69e2fd183..da838b7533 100644 --- a/config/GZ2P01/rels/d_a_npc_seic/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_seic/symbols.txt @@ -96,7 +96,8 @@ m__18daNpc_seiC_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:glo @stringBase0 = .rodata:0x000000AC; // type:object size:0x27 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_354_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_seid/splits.txt b/config/GZ2P01/rels/d_a_npc_seid/splits.txt index 571bdf0ce5..15cb8b939b 100644 --- a/config/GZ2P01/rels/d_a_npc_seid/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_seid/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seid.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_seid/symbols.txt b/config/GZ2P01/rels/d_a_npc_seid/symbols.txt index 8d4bbf270c..3168ad4d37 100644 --- a/config/GZ2P01/rels/d_a_npc_seid/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_seid/symbols.txt @@ -96,7 +96,8 @@ m__18daNpc_seiD_Param_c = .rodata:0x00000000; // type:object size:0x94 scope:glo @stringBase0 = .rodata:0x000000AC; // type:object size:0x27 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_355_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_seira/splits.txt b/config/GZ2P01/rels/d_a_npc_seira/splits.txt index 6f9580eece..360d26d4f7 100644 --- a/config/GZ2P01/rels/d_a_npc_seira/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_seira/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seira.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_seira/symbols.txt b/config/GZ2P01/rels/d_a_npc_seira/symbols.txt index cce75d655b..0f5f040b3f 100644 --- a/config/GZ2P01/rels/d_a_npc_seira/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_seira/symbols.txt @@ -150,7 +150,8 @@ m__19daNpc_Seira_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x00000114; // type:object size:0x8A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_356_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_evtList = .data:0x00000030; // type:object size:0x20 scope:global l_resNameList = .data:0x00000050; // type:object size:0x14 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_seira2/splits.txt b/config/GZ2P01/rels/d_a_npc_seira2/splits.txt index 1e3cf84c59..c31bda4213 100644 --- a/config/GZ2P01/rels/d_a_npc_seira2/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_seira2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seira2.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_seira2/symbols.txt b/config/GZ2P01/rels/d_a_npc_seira2/symbols.txt index cdd272d024..4d1fe23352 100644 --- a/config/GZ2P01/rels/d_a_npc_seira2/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_seira2/symbols.txt @@ -145,7 +145,8 @@ m__20daNpc_Seira2_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:g @stringBase0 = .rodata:0x000000FC; // type:object size:0x32 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_357_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_evtList = .data:0x00000030; // type:object size:0x10 scope:global l_resNameList = .data:0x00000040; // type:object size:0x10 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_seirei/splits.txt b/config/GZ2P01/rels/d_a_npc_seirei/splits.txt index 5524c64304..1a85f3eea2 100644 --- a/config/GZ2P01/rels/d_a_npc_seirei/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_seirei/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_seirei.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_seirei/symbols.txt b/config/GZ2P01/rels/d_a_npc_seirei/symbols.txt index 76f1f904fd..4ee9fd95a4 100644 --- a/config/GZ2P01/rels/d_a_npc_seirei/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_seirei/symbols.txt @@ -106,7 +106,8 @@ id2$4628 = .rodata:0x000000D0; // type:object size:0xE scope:local @stringBase0 = .rodata:0x000000E0; // type:object size:0x59 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_358_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x20 scope:global l_resNameList = .data:0x00000048; // type:object size:0xC scope:global diff --git a/config/GZ2P01/rels/d_a_npc_shad/splits.txt b/config/GZ2P01/rels/d_a_npc_shad/splits.txt index 9a40f41420..eca80600c7 100644 --- a/config/GZ2P01/rels/d_a_npc_shad/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_shad/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shad.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_shad/symbols.txt b/config/GZ2P01/rels/d_a_npc_shad/symbols.txt index 21d3f1aef1..32fde27b74 100644 --- a/config/GZ2P01/rels/d_a_npc_shad/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_shad/symbols.txt @@ -227,7 +227,8 @@ m__17daNpcShad_Param_c = .rodata:0x00000000; // type:object size:0x70 scope:glob @stringBase0 = .rodata:0x000004E8; // type:object size:0x15C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_359_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x1B0 scope:global l_btpGetParamList = .data:0x000001D0; // type:object size:0x84 scope:global l_btkGetParamList = .data:0x00000254; // type:object size:0x3C scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_shaman/splits.txt b/config/GZ2P01/rels/d_a_npc_shaman/splits.txt index d3038040b4..302e760cbf 100644 --- a/config/GZ2P01/rels/d_a_npc_shaman/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_shaman/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shaman.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_shaman/symbols.txt b/config/GZ2P01/rels/d_a_npc_shaman/symbols.txt index 4bb50d678f..3b5cabe0e3 100644 --- a/config/GZ2P01/rels/d_a_npc_shaman/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_shaman/symbols.txt @@ -141,7 +141,8 @@ heapSize$3961 = .rodata:0x0000008C; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000104; // type:object size:0x4C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_360_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x30 scope:global l_resNameList = .data:0x00000058; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_shoe/splits.txt b/config/GZ2P01/rels/d_a_npc_shoe/splits.txt index f8ee3e5ae4..8d043bcfb6 100644 --- a/config/GZ2P01/rels/d_a_npc_shoe/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_shoe/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_shoe.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_shoe/symbols.txt b/config/GZ2P01/rels/d_a_npc_shoe/symbols.txt index 54b90c584a..7d37b90bdb 100644 --- a/config/GZ2P01/rels/d_a_npc_shoe/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_shoe/symbols.txt @@ -98,7 +98,8 @@ m__17daNpcShoe_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x0000016C; // type:object size:0x1A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_361_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x3C scope:global l_btpGetParamList = .data:0x0000005C; // type:object size:0xC scope:global l_arcNames = .data:0x00000068; // type:object size:0xC scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_sola/splits.txt b/config/GZ2P01/rels/d_a_npc_sola/splits.txt index 54258a8bbd..216e2cab50 100644 --- a/config/GZ2P01/rels/d_a_npc_sola/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_sola/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_sola.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_sola/symbols.txt b/config/GZ2P01/rels/d_a_npc_sola/symbols.txt index 7de30f60fb..46b9b2a3c4 100644 --- a/config/GZ2P01/rels/d_a_npc_sola/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_sola/symbols.txt @@ -109,7 +109,8 @@ m__18daNpc_solA_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000E0; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_364_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_soldierA/splits.txt b/config/GZ2P01/rels/d_a_npc_soldierA/splits.txt index a507647d91..3636817a07 100644 --- a/config/GZ2P01/rels/d_a_npc_soldierA/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_soldierA/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_soldierA.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_soldierA/symbols.txt b/config/GZ2P01/rels/d_a_npc_soldierA/symbols.txt index 37a967b614..fb094127b7 100644 --- a/config/GZ2P01/rels/d_a_npc_soldierA/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_soldierA/symbols.txt @@ -109,7 +109,8 @@ m__22daNpc_SoldierA_Param_c = .rodata:0x00000000; // type:object size:0x6C scope @stringBase0 = .rodata:0x0000017C; // type:object size:0x23 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_365_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x38 scope:global l_evtGetParamList = .data:0x00000068; // type:object size:0x10 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_soldierB/splits.txt b/config/GZ2P01/rels/d_a_npc_soldierB/splits.txt index b95d52395c..828f7aff8e 100644 --- a/config/GZ2P01/rels/d_a_npc_soldierB/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_soldierB/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_soldierB.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_soldierB/symbols.txt b/config/GZ2P01/rels/d_a_npc_soldierB/symbols.txt index d03832d019..8eaf98701c 100644 --- a/config/GZ2P01/rels/d_a_npc_soldierB/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_soldierB/symbols.txt @@ -101,7 +101,8 @@ m__22daNpc_SoldierB_Param_c = .rodata:0x00000000; // type:object size:0x6C scope @stringBase0 = .rodata:0x00000120; // type:object size:0x19 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_366_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x20 scope:global l_evtGetParamList = .data:0x00000050; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_sq/splits.txt b/config/GZ2P01/rels/d_a_npc_sq/splits.txt index 7efa26d57f..37fe155ab8 100644 --- a/config/GZ2P01/rels/d_a_npc_sq/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_sq/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_sq.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_sq/symbols.txt b/config/GZ2P01/rels/d_a_npc_sq/symbols.txt index 57e6ba0cf5..99c99be8b4 100644 --- a/config/GZ2P01/rels/d_a_npc_sq/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_sq/symbols.txt @@ -72,6 +72,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000D0; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000000F4; // type:object size:0xC scope:global __vt__14daNpc_Sq_HIO_c = .data:0x00000100; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_367_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_npc_taro/splits.txt b/config/GZ2P01/rels/d_a_npc_taro/splits.txt index 619e79a536..4c7a8ca5fd 100644 --- a/config/GZ2P01/rels/d_a_npc_taro/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_taro/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_taro.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_taro/symbols.txt b/config/GZ2P01/rels/d_a_npc_taro/symbols.txt index a6338a184d..c377133ebd 100644 --- a/config/GZ2P01/rels/d_a_npc_taro/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_taro/symbols.txt @@ -194,7 +194,8 @@ jointNo$5646 = .rodata:0x0000014C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000240; // type:object size:0x2C0 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_87_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3931 = .data:0x00000020; // type:object size:0xC scope:local l_bmdData = .data:0x0000002C; // type:object size:0x28 scope:global data:4byte l_evtList = .data:0x00000054; // type:object size:0xD8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_the/splits.txt b/config/GZ2P01/rels/d_a_npc_the/splits.txt index 2671f4c863..d4943eaf12 100644 --- a/config/GZ2P01/rels/d_a_npc_the/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_the/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_the.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_the/symbols.txt b/config/GZ2P01/rels/d_a_npc_the/symbols.txt index 56a8937ec7..7e4b1288ba 100644 --- a/config/GZ2P01/rels/d_a_npc_the/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_the/symbols.txt @@ -151,7 +151,8 @@ m__16daNpcThe_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:globa @stringBase0 = .rodata:0x0000034C; // type:object size:0x78 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_368_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global l_bckGetParamList = .data:0x00000030; // type:object size:0xD8 scope:global data:4byte l_btpGetParamList = .data:0x00000108; // type:object size:0x70 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_theB/splits.txt b/config/GZ2P01/rels/d_a_npc_theB/splits.txt index 79afbbf067..48817a6f5e 100644 --- a/config/GZ2P01/rels/d_a_npc_theB/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_theB/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_theB.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_theB/symbols.txt b/config/GZ2P01/rels/d_a_npc_theB/symbols.txt index e23ed238f2..0b345d1b5a 100644 --- a/config/GZ2P01/rels/d_a_npc_theB/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_theB/symbols.txt @@ -140,7 +140,8 @@ m__17daNpcTheB_Param_c = .rodata:0x00000000; // type:object size:0x6C scope:glob @stringBase0 = .rodata:0x00000234; // type:object size:0x88 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_369_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x4 scope:global l_bckGetParamList = .data:0x00000024; // type:object size:0x70 scope:global data:4byte l_btpGetParamList = .data:0x00000094; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_tk/splits.txt b/config/GZ2P01/rels/d_a_npc_tk/splits.txt index 96b50cacee..4491eb8d0d 100644 --- a/config/GZ2P01/rels/d_a_npc_tk/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_tk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tk.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_tk/symbols.txt b/config/GZ2P01/rels/d_a_npc_tk/symbols.txt index d973504ba0..13d30db8af 100644 --- a/config/GZ2P01/rels/d_a_npc_tk/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_tk/symbols.txt @@ -226,10 +226,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1009 = .bss:0x00000044; // type:object size:0x1 scope:local m_near_angle = .bss:0x00000046; // type:object size:0x2 scope:global m_near_actor = .bss:0x00000048; // type:object size:0x4 scope:global -lbl_370_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +hio_set = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte @3994 = .bss:0x00000050; // type:object size:0xC scope:local l_HIO = .bss:0x0000005C; // type:object size:0x40 scope:global data:byte @5011 = .bss:0x0000009C; // type:object size:0xC scope:local +init$0000 = .bss:0x000000A8; // type:object size:0x1 scope:local align:1 data:byte sc$5010 = .bss:0x000000AC; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B8; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000BC; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_tkc/splits.txt b/config/GZ2P01/rels/d_a_npc_tkc/splits.txt index 4233f137a5..30572bf897 100644 --- a/config/GZ2P01/rels/d_a_npc_tkc/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_tkc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkc.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_tkc/symbols.txt b/config/GZ2P01/rels/d_a_npc_tkc/symbols.txt index a7334c8287..a8637a2a11 100644 --- a/config/GZ2P01/rels/d_a_npc_tkc/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_tkc/symbols.txt @@ -126,7 +126,8 @@ m_cameraItemNum$4552 = .rodata:0x000000B4; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000178; // type:object size:0x32 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_371_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x18 scope:global l_btpGetParamList = .data:0x00000038; // type:object size:0x8 scope:global l_btkGetParamList = .data:0x00000040; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_tkj/splits.txt b/config/GZ2P01/rels/d_a_npc_tkj/splits.txt index 71d468cee5..f1a6c89309 100644 --- a/config/GZ2P01/rels/d_a_npc_tkj/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_tkj/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkj.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_tkj/symbols.txt b/config/GZ2P01/rels/d_a_npc_tkj/symbols.txt index 1726524056..23059401d6 100644 --- a/config/GZ2P01/rels/d_a_npc_tkj/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_tkj/symbols.txt @@ -126,7 +126,8 @@ m__17daNpc_Tkj_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glob @stringBase0 = .rodata:0x000000F4; // type:object size:0x25 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_88_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_tkj2/splits.txt b/config/GZ2P01/rels/d_a_npc_tkj2/splits.txt index 85c1b46230..c785c234c9 100644 --- a/config/GZ2P01/rels/d_a_npc_tkj2/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_tkj2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tkj2.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_tkj2/symbols.txt b/config/GZ2P01/rels/d_a_npc_tkj2/symbols.txt index 91e862d1ad..80f9f74909 100644 --- a/config/GZ2P01/rels/d_a_npc_tkj2/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_tkj2/symbols.txt @@ -105,6 +105,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000F4; // type:object size:0x30 scope:global __vt__8cM3dGPla = .data:0x00000124; // type:object size:0xC scope:global __vt__16daNpc_Tkj2_HIO_c = .data:0x00000130; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_372_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_npc_tks/splits.txt b/config/GZ2P01/rels/d_a_npc_tks/splits.txt index 2a20f200a9..b3946b9fa9 100644 --- a/config/GZ2P01/rels/d_a_npc_tks/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_tks/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tks.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_tks/symbols.txt b/config/GZ2P01/rels/d_a_npc_tks/symbols.txt index 0e3e32d538..ff2291df42 100644 --- a/config/GZ2P01/rels/d_a_npc_tks/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_tks/symbols.txt @@ -204,7 +204,8 @@ m__16daNpcTks_Param_c = .rodata:0x00000000; // type:object size:0x98 scope:globa @stringBase0 = .rodata:0x000002F0; // type:object size:0x99 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_373_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0xB0 scope:global data:4byte l_btpGetParamList = .data:0x000000D0; // type:object size:0x8 scope:global l_btkGetParamList = .data:0x000000D8; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_npc_toby/splits.txt b/config/GZ2P01/rels/d_a_npc_toby/splits.txt index a7a571dd23..f600125f41 100644 --- a/config/GZ2P01/rels/d_a_npc_toby/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_toby/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_toby.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_toby/symbols.txt b/config/GZ2P01/rels/d_a_npc_toby/symbols.txt index 67529ffa29..23abc8dd7b 100644 --- a/config/GZ2P01/rels/d_a_npc_toby/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_toby/symbols.txt @@ -165,7 +165,8 @@ jointNo$5107 = .rodata:0x00000138; // type:object size:0x4 scope:local data:4byt @stringBase0 = .rodata:0x000001A8; // type:object size:0xBB scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_374_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global l_evtList = .data:0x00000038; // type:object size:0x38 scope:global l_resNameList = .data:0x00000070; // type:object size:0x24 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_tr/splits.txt b/config/GZ2P01/rels/d_a_npc_tr/splits.txt index 59b845f265..13215f94b7 100644 --- a/config/GZ2P01/rels/d_a_npc_tr/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_tr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_tr.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_tr/symbols.txt b/config/GZ2P01/rels/d_a_npc_tr/symbols.txt index 483c52bcba..faa32dbe0a 100644 --- a/config/GZ2P01/rels/d_a_npc_tr/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_tr/symbols.txt @@ -52,6 +52,6 @@ l_daNPC_TR_Method = .data:0x00000000; // type:object size:0x20 scope:global g_profile_NPC_TR = .data:0x00000020; // type:object size:0x30 scope:global __vt__14daNPC_TR_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_375_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x1C scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_npc_uri/splits.txt b/config/GZ2P01/rels/d_a_npc_uri/splits.txt index 6078d6002d..bb119068a8 100644 --- a/config/GZ2P01/rels/d_a_npc_uri/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_uri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_uri.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_uri/symbols.txt b/config/GZ2P01/rels/d_a_npc_uri/symbols.txt index 104fcb6262..799e0279c4 100644 --- a/config/GZ2P01/rels/d_a_npc_uri/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_uri/symbols.txt @@ -152,7 +152,8 @@ jointNo$5001 = .rodata:0x00000130; // type:object size:0x4 scope:local data:4byt @stringBase0 = .rodata:0x00000160; // type:object size:0xD4 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_376_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_evtList = .data:0x00000030; // type:object size:0x58 scope:global l_resNameList = .data:0x00000088; // type:object size:0x18 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_wrestler/splits.txt b/config/GZ2P01/rels/d_a_npc_wrestler/splits.txt index eaccbb31a9..934a28d841 100644 --- a/config/GZ2P01/rels/d_a_npc_wrestler/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_wrestler/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_wrestler.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_wrestler/symbols.txt b/config/GZ2P01/rels/d_a_npc_wrestler/symbols.txt index bf7efbd2db..af8a280fa7 100644 --- a/config/GZ2P01/rels/d_a_npc_wrestler/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_wrestler/symbols.txt @@ -289,7 +289,8 @@ m__21daNpcWrestler_Param_c = .rodata:0x00000000; // type:object size:0x194 scope @stringBase0 = .rodata:0x000006A0; // type:object size:0x7A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_378_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resALink = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_resName = .data:0x00000024; // type:object size:0x14 scope:global l_bmdGetParamList = .data:0x00000038; // type:object size:0x14 scope:global @@ -445,5 +446,5 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3974 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x4 scope:global data:4byte @4628 = .bss:0x00000018; // type:object size:0xC scope:local -lbl_378_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$localstatic4$setAttnPos__15daNpcWrestler_cFv = .bss:0x00000024; // type:object size:0x1 scope:local data:byte eyeOffset$localstatic3$setAttnPos__15daNpcWrestler_cFv = .bss:0x00000028; // type:object size:0xC scope:local align:4 data:float diff --git a/config/GZ2P01/rels/d_a_npc_yamid/splits.txt b/config/GZ2P01/rels/d_a_npc_yamid/splits.txt index 4e5b6053ef..8d95996c47 100644 --- a/config/GZ2P01/rels/d_a_npc_yamid/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_yamid/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamid.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_yamid/symbols.txt b/config/GZ2P01/rels/d_a_npc_yamid/symbols.txt index 3fab92fd97..0c15160e16 100644 --- a/config/GZ2P01/rels/d_a_npc_yamid/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_yamid/symbols.txt @@ -125,7 +125,8 @@ m__19daNpc_yamiD_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x000000E0; // type:object size:0x15 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_379_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_yamis/splits.txt b/config/GZ2P01/rels/d_a_npc_yamis/splits.txt index b7b99cc049..a91265e7ed 100644 --- a/config/GZ2P01/rels/d_a_npc_yamis/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_yamis/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamis.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_yamis/symbols.txt b/config/GZ2P01/rels/d_a_npc_yamis/symbols.txt index 48a0677aec..dc7f38c95e 100644 --- a/config/GZ2P01/rels/d_a_npc_yamis/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_yamis/symbols.txt @@ -125,7 +125,8 @@ m__19daNpc_yamiS_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x000000E0; // type:object size:0x15 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_380_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_yamit/splits.txt b/config/GZ2P01/rels/d_a_npc_yamit/splits.txt index 5123a528b9..10e3caa091 100644 --- a/config/GZ2P01/rels/d_a_npc_yamit/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_yamit/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yamit.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_yamit/symbols.txt b/config/GZ2P01/rels/d_a_npc_yamit/symbols.txt index 7cd5d2e2b6..595b8c8a5d 100644 --- a/config/GZ2P01/rels/d_a_npc_yamit/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_yamit/symbols.txt @@ -126,7 +126,8 @@ m__19daNpc_yamiT_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x000000E0; // type:object size:0x15 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_381_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_yelia/splits.txt b/config/GZ2P01/rels/d_a_npc_yelia/splits.txt index 659821fce1..ed090e1617 100644 --- a/config/GZ2P01/rels/d_a_npc_yelia/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_yelia/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_yelia.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_yelia/symbols.txt b/config/GZ2P01/rels/d_a_npc_yelia/symbols.txt index f1d776a12f..43eb77b10b 100644 --- a/config/GZ2P01/rels/d_a_npc_yelia/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_yelia/symbols.txt @@ -144,7 +144,8 @@ heapSize$4085 = .rodata:0x0000008C; // type:object size:0x28 scope:local @stringBase0 = .rodata:0x00000154; // type:object size:0xD2 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_382_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x18 scope:global data:4byte l_evtList = .data:0x00000038; // type:object size:0x30 scope:global data:4byte l_resNameList = .data:0x00000068; // type:object size:0x20 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_ykm/splits.txt b/config/GZ2P01/rels/d_a_npc_ykm/splits.txt index 455aafa992..7a0ad09b1e 100644 --- a/config/GZ2P01/rels/d_a_npc_ykm/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_ykm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ykm.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_ykm/symbols.txt b/config/GZ2P01/rels/d_a_npc_ykm/symbols.txt index 3bbcb77aa6..f5c62d87f0 100644 --- a/config/GZ2P01/rels/d_a_npc_ykm/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_ykm/symbols.txt @@ -222,7 +222,8 @@ motionTbl1$7524 = .rodata:0x0000027C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000002AC; // type:object size:0xA7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_383_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x30 scope:global data:4byte l_evtList = .data:0x00000050; // type:object size:0x50 scope:global l_resNameList = .data:0x000000A0; // type:object size:0x14 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_ykw/splits.txt b/config/GZ2P01/rels/d_a_npc_ykw/splits.txt index 152024a144..3ae68555b8 100644 --- a/config/GZ2P01/rels/d_a_npc_ykw/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_ykw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_ykw.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_ykw/symbols.txt b/config/GZ2P01/rels/d_a_npc_ykw/symbols.txt index be2c7baaec..7eb023fa83 100644 --- a/config/GZ2P01/rels/d_a_npc_ykw/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_ykw/symbols.txt @@ -204,7 +204,8 @@ motionTbl2$6949 = .rodata:0x00000200; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000230; // type:object size:0xD8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_384_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x50 scope:global data:4byte l_resNameList = .data:0x00000078; // type:object size:0x14 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_zanb/splits.txt b/config/GZ2P01/rels/d_a_npc_zanb/splits.txt index 0158ee265e..7a1d0a3734 100644 --- a/config/GZ2P01/rels/d_a_npc_zanb/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_zanb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zanb.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_zanb/symbols.txt b/config/GZ2P01/rels/d_a_npc_zanb/symbols.txt index 33a203a39c..ad1e6b098f 100644 --- a/config/GZ2P01/rels/d_a_npc_zanb/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_zanb/symbols.txt @@ -125,7 +125,8 @@ heapSize$3959 = .rodata:0x0000008C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000000F8; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_385_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_zant/splits.txt b/config/GZ2P01/rels/d_a_npc_zant/splits.txt index c45ca889d4..305bb39828 100644 --- a/config/GZ2P01/rels/d_a_npc_zant/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_zant/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zant.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_zant/symbols.txt b/config/GZ2P01/rels/d_a_npc_zant/symbols.txt index 3f03681e04..c86dde375d 100644 --- a/config/GZ2P01/rels/d_a_npc_zant/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_zant/symbols.txt @@ -108,7 +108,8 @@ m__18daNpc_Zant_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000D8; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_386_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_zelR/splits.txt b/config/GZ2P01/rels/d_a_npc_zelR/splits.txt index 74d2758af7..1524fdf90e 100644 --- a/config/GZ2P01/rels/d_a_npc_zelR/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_zelR/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelR.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_zelR/symbols.txt b/config/GZ2P01/rels/d_a_npc_zelR/symbols.txt index cef9d392f0..ce8694c590 100644 --- a/config/GZ2P01/rels/d_a_npc_zelR/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_zelR/symbols.txt @@ -124,7 +124,8 @@ m__18daNpc_ZelR_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:glo @stringBase0 = .rodata:0x000000E0; // type:object size:0x18 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_387_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_zelRo/splits.txt b/config/GZ2P01/rels/d_a_npc_zelRo/splits.txt index 15253cc4f3..16deca4e7c 100644 --- a/config/GZ2P01/rels/d_a_npc_zelRo/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_zelRo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelRo.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_zelRo/symbols.txt b/config/GZ2P01/rels/d_a_npc_zelRo/symbols.txt index df2474dbcd..01677cab73 100644 --- a/config/GZ2P01/rels/d_a_npc_zelRo/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_zelRo/symbols.txt @@ -124,7 +124,8 @@ m__19daNpc_ZelRo_Param_c = .rodata:0x00000000; // type:object size:0x8C scope:gl @stringBase0 = .rodata:0x000000E0; // type:object size:0x19 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_388_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_zelda/splits.txt b/config/GZ2P01/rels/d_a_npc_zelda/splits.txt index cd55e99530..8631652295 100644 --- a/config/GZ2P01/rels/d_a_npc_zelda/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_zelda/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zelda.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_zelda/symbols.txt b/config/GZ2P01/rels/d_a_npc_zelda/symbols.txt index 69e3731176..43de19c8d0 100644 --- a/config/GZ2P01/rels/d_a_npc_zelda/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_zelda/symbols.txt @@ -127,7 +127,8 @@ heapSize$3959 = .rodata:0x0000008C; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000000FC; // type:object size:0x13 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_389_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x10 scope:global l_resNameList = .data:0x00000038; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_zra/splits.txt b/config/GZ2P01/rels/d_a_npc_zra/splits.txt index fdd0db056d..78b8667de2 100644 --- a/config/GZ2P01/rels/d_a_npc_zra/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_zra/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zra.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_zrc/splits.txt b/config/GZ2P01/rels/d_a_npc_zrc/splits.txt index 13d61ed3c3..b8a63e20be 100644 --- a/config/GZ2P01/rels/d_a_npc_zrc/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_zrc/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zrc.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_zrc/symbols.txt b/config/GZ2P01/rels/d_a_npc_zrc/symbols.txt index 0334358049..3f454d28dc 100644 --- a/config/GZ2P01/rels/d_a_npc_zrc/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_zrc/symbols.txt @@ -202,7 +202,8 @@ heapSize$4316 = .rodata:0x00000074; // type:object size:0x14 scope:local @stringBase0 = .rodata:0x000004A0; // type:object size:0x4B scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_391_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_bckGetParamList = .data:0x00000030; // type:object size:0x100 scope:global l_btpGetParamList = .data:0x00000130; // type:object size:0x78 scope:global diff --git a/config/GZ2P01/rels/d_a_npc_zrz/splits.txt b/config/GZ2P01/rels/d_a_npc_zrz/splits.txt index d9247f5178..3b956ad03c 100644 --- a/config/GZ2P01/rels/d_a_npc_zrz/splits.txt +++ b/config/GZ2P01/rels/d_a_npc_zrz/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_npc_zrz.cpp: diff --git a/config/GZ2P01/rels/d_a_npc_zrz/symbols.txt b/config/GZ2P01/rels/d_a_npc_zrz/symbols.txt index 64701cb3a7..b2f727c9b5 100644 --- a/config/GZ2P01/rels/d_a_npc_zrz/symbols.txt +++ b/config/GZ2P01/rels/d_a_npc_zrz/symbols.txt @@ -178,7 +178,8 @@ key_color$5707 = .rodata:0x000001AC; // type:object size:0x20 scope:local @stringBase0 = .rodata:0x00000234; // type:object size:0x64 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_392_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global l_bmdGTGetParamList = .data:0x00000028; // type:object size:0x8 scope:global l_bckGetParamList = .data:0x00000030; // type:object size:0x28 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_Turara/splits.txt b/config/GZ2P01/rels/d_a_obj_Turara/splits.txt index ad92ea8424..1f59be5f26 100644 --- a/config/GZ2P01/rels/d_a_obj_Turara/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_Turara/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_Turara.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_Turara/symbols.txt b/config/GZ2P01/rels/d_a_obj_Turara/symbols.txt index 86f1546963..583772d956 100644 --- a/config/GZ2P01/rels/d_a_obj_Turara/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_Turara/symbols.txt @@ -71,9 +71,11 @@ l_bmdIdx = .rodata:0x00000044; // type:object size:0x8 scope:global @4263 = .rodata:0x00000074; // type:object size:0x4 scope:local @4264 = .rodata:0x00000078; // type:object size:0x4 scope:local data:string @stringBase0 = .rodata:0x0000007C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_394_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daTurara_c = .data:0x00000020; // type:object size:0x44 scope:global @3924 = .data:0x00000064; // type:object size:0xC scope:local @3925 = .data:0x00000070; // type:object size:0xC scope:local @@ -97,4 +99,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000204; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3653 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:global data:byte -lbl_394_bss_34 = .bss:0x00000034; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_TvCdlst/splits.txt b/config/GZ2P01/rels/d_a_obj_TvCdlst/splits.txt index da4e6e0592..b93be766fb 100644 --- a/config/GZ2P01/rels/d_a_obj_TvCdlst/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_TvCdlst/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_TvCdlst.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_Y_taihou/splits.txt b/config/GZ2P01/rels/d_a_obj_Y_taihou/splits.txt index 4750cdf588..a12617a1fa 100644 --- a/config/GZ2P01/rels/d_a_obj_Y_taihou/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_Y_taihou/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_Y_taihou.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_Y_taihou/symbols.txt b/config/GZ2P01/rels/d_a_obj_Y_taihou/symbols.txt index d0c1bb0a05..e65b5ef27e 100644 --- a/config/GZ2P01/rels/d_a_obj_Y_taihou/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_Y_taihou/symbols.txt @@ -95,8 +95,9 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local l_wheelMinR$3836 = .bss:0x00000048; // type:object size:0x4 scope:local align:4 data:float -lbl_396_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +lbl_396_bss_4C$0000 = .bss:0x0000004C; // type:object size:0x1 scope:local data:byte @3951 = .bss:0x00000050; // type:object size:0xC scope:local +init$0000 = .bss:0x0000005C; // type:object size:0x1 scope:local align:1 data:byte l_effectScale$3950 = .bss:0x00000060; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000006C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000070; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_amiShutter/splits.txt b/config/GZ2P01/rels/d_a_obj_amiShutter/splits.txt index d7e169e10b..71b4e6d012 100644 --- a/config/GZ2P01/rels/d_a_obj_amiShutter/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_amiShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_amiShutter.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_amiShutter/symbols.txt b/config/GZ2P01/rels/d_a_obj_amiShutter/symbols.txt index 6dd46449f1..71186b1acb 100644 --- a/config/GZ2P01/rels/d_a_obj_amiShutter/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_amiShutter/symbols.txt @@ -57,9 +57,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3900 = .rodata:0x0000003C; // type:object size:0x4 scope:local @3919 = .rodata:0x00000040; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_397_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3759 = .data:0x00000020; // type:object size:0xC scope:local @3760 = .data:0x0000002C; // type:object size:0xC scope:local @3761 = .data:0x00000038; // type:object size:0xC scope:local @@ -76,4 +78,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000016C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3649 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global align:4 data:float -lbl_397_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_ari/splits.txt b/config/GZ2P01/rels/d_a_obj_ari/splits.txt index 47d0b4945c..cdd94232c9 100644 --- a/config/GZ2P01/rels/d_a_obj_ari/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_ari/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ari.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_ari/symbols.txt b/config/GZ2P01/rels/d_a_obj_ari/symbols.txt index 3cbe730333..03be6aaea1 100644 --- a/config/GZ2P01/rels/d_a_obj_ari/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_ari/symbols.txt @@ -98,6 +98,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_AriHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_398_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3771 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_automata/splits.txt b/config/GZ2P01/rels/d_a_obj_automata/splits.txt index 5219aac973..5e25b728d7 100644 --- a/config/GZ2P01/rels/d_a_obj_automata/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_automata/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_automata.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_automata/symbols.txt b/config/GZ2P01/rels/d_a_obj_automata/symbols.txt index f9c8536d1a..5229bfc388 100644 --- a/config/GZ2P01/rels/d_a_obj_automata/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_automata/symbols.txt @@ -61,7 +61,8 @@ playMode$4222 = .rodata:0x00000078; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000094; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_399_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global l_resNameList = .data:0x00000028; // type:object size:0x8 scope:global l_ccDCyl = .data:0x00000030; // type:object size:0x44 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_avalanche/symbols.txt b/config/GZ2P01/rels/d_a_obj_avalanche/symbols.txt index 18500bf572..c4fafc2f5b 100644 --- a/config/GZ2P01/rels/d_a_obj_avalanche/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_avalanche/symbols.txt @@ -37,9 +37,11 @@ l_check_pos = .rodata:0x00000008; // type:object size:0x18 scope:global align:4 @3846 = .rodata:0x00000038; // type:object size:0x4 scope:local align:4 data:float @3964 = .rodata:0x0000003C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000040; // type:object size:0x31 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_400_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte @@ -54,4 +56,4 @@ daObjAvalanche_METHODS = .data:0x000000AC; // type:object size:0x20 scope:global g_profile_Obj_Avalanche = .data:0x000000CC; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000FC; // type:object size:0xC scope:global __vt__16daObjAvalanche_c = .data:0x00000108; // type:object size:0x28 scope:global -lbl_400_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_balloon/splits.txt b/config/GZ2P01/rels/d_a_obj_balloon/splits.txt index cb6f8049b2..0ffb55264c 100644 --- a/config/GZ2P01/rels/d_a_obj_balloon/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_balloon/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_balloon.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_balloon/symbols.txt b/config/GZ2P01/rels/d_a_obj_balloon/symbols.txt index c4dee35518..835e73240f 100644 --- a/config/GZ2P01/rels/d_a_obj_balloon/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_balloon/symbols.txt @@ -54,7 +54,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000048; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_401_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double m_combo_type__29@unnamed@d_a_obj_balloon_cpp@ = .data:0x00000020; // type:object size:0x4 scope:global balloon_radius$3706 = .data:0x00000024; // type:object size:0xC scope:local kago_wall_hit_id$3736 = .data:0x00000030; // type:object size:0x4 scope:local @@ -91,7 +92,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa m_combo_count__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x00000048; // type:object size:0x4 scope:global m_combo_next_score__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x0000004C; // type:object size:0x4 scope:global m_balloon_score__29@unnamed@d_a_obj_balloon_cpp@ = .bss:0x00000050; // type:object size:0x4 scope:global data:4byte -lbl_401_bss_54 = .bss:0x00000054; // type:object size:0x1 data:byte +hio_set = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3651 = .bss:0x00000058; // type:object size:0xC scope:local l_HIO = .bss:0x00000064; // type:object size:0x20 scope:global data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_barDesk/splits.txt b/config/GZ2P01/rels/d_a_obj_barDesk/splits.txt index 9550ce4bbd..35cf1e837d 100644 --- a/config/GZ2P01/rels/d_a_obj_barDesk/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_barDesk/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_barDesk.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_barDesk/symbols.txt b/config/GZ2P01/rels/d_a_obj_barDesk/symbols.txt index b2469889e9..d93e026832 100644 --- a/config/GZ2P01/rels/d_a_obj_barDesk/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_barDesk/symbols.txt @@ -38,9 +38,11 @@ mCcDObjInfo__11daBarDesk_c = .rodata:0x00000000; // type:object size:0x30 scope: @3863 = .rodata:0x0000003C; // type:object size:0x4 scope:local particle_id$3871 = .rodata:0x00000040; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_402_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daBarDesk_c = .data:0x00000020; // type:object size:0x44 scope:global @3821 = .data:0x00000064; // type:object size:0xC scope:local @3822 = .data:0x00000070; // type:object size:0xC scope:local @@ -57,4 +59,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000148; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:byte -lbl_402_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_batta/splits.txt b/config/GZ2P01/rels/d_a_obj_batta/splits.txt index d77e6ade50..9a6a91870e 100644 --- a/config/GZ2P01/rels/d_a_obj_batta/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_batta/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_batta.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_batta/symbols.txt b/config/GZ2P01/rels/d_a_obj_batta/symbols.txt index a3acf1ce9a..bbda4e7a2f 100644 --- a/config/GZ2P01/rels/d_a_obj_batta/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_batta/symbols.txt @@ -97,7 +97,8 @@ l_musiya_num = .rodata:0x000000EC; // type:object size:0x4 scope:global @stringBase0 = .rodata:0x000000F4; // type:object size:0xC scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_403_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__27@unnamed@d_a_obj_batta_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global @3903 = .data:0x00000060; // type:object size:0xC scope:local data:4byte @3907 = .data:0x0000006C; // type:object size:0xC scope:local data:4byte @@ -129,6 +130,6 @@ __vt__12daObjBATTA_c = .data:0x000001E8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global __vt__16daObj_BattaHIO_c = .data:0x00000200; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_bed/splits.txt b/config/GZ2P01/rels/d_a_obj_bed/splits.txt index 562ad25411..a598360305 100644 --- a/config/GZ2P01/rels/d_a_obj_bed/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_bed/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bed.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_bemos/splits.txt b/config/GZ2P01/rels/d_a_obj_bemos/splits.txt index 0e8d243f29..1094792c45 100644 --- a/config/GZ2P01/rels/d_a_obj_bemos/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_bemos/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bemos.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_bemos/symbols.txt b/config/GZ2P01/rels/d_a_obj_bemos/symbols.txt index d29d7230ff..fedaac7eb2 100644 --- a/config/GZ2P01/rels/d_a_obj_bemos/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_bemos/symbols.txt @@ -204,11 +204,12 @@ lit_1014 = .bss:0x00000038; // type:object size:0x1 scope:local lit_1012 = .bss:0x0000003C; // type:object size:0x1 scope:local lit_1010 = .bss:0x00000040; // type:object size:0x1 scope:local lit_1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$2123 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte -init$2180 = .bss:0x00000046; // type:object size:0x1 scope:local data:byte -init$2232 = .bss:0x00000047; // type:object size:0x1 scope:local data:byte -init$2548 = .bss:0x00000048; // type:object size:0x1 scope:local data:byte +init$2123 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte +init$2180 = .bss:0x00000046; // type:object size:0x1 scope:local align:1 data:byte +init$2232 = .bss:0x00000047; // type:object size:0x1 scope:local align:1 data:byte +init$2548 = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte @4973 = .bss:0x0000004C; // type:object size:0xC scope:local +init$0000 = .bss:0x00000058; // type:object size:0x1 scope:local align:1 data:byte @4976 = .bss:0x0000005C; // type:object size:0xC scope:local @4977 = .bss:0x00000068; // type:object size:0xC scope:local @4978 = .bss:0x00000074; // type:object size:0xC scope:local @@ -220,6 +221,7 @@ M_wrt_work__Q29daObjBm_c5Bgc_c = .bss:0x00000854; // type:object size:0x54 scope @5104 = .bss:0x000008A8; // type:object size:0xC scope:local M_wall_work__Q29daObjBm_c5Bgc_c = .bss:0x000008B4; // type:object size:0xA10 scope:global align:4 data:float @5249 = .bss:0x000012C4; // type:object size:0xC scope:local +init$0001 = .bss:0x000012D0; // type:object size:0x1 scope:local align:1 data:byte touch_work$5248 = .bss:0x000012D4; // type:object size:0x70 scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00001344; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00001348; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_bk_leaf/symbols.txt b/config/GZ2P01/rels/d_a_obj_bk_leaf/symbols.txt index 16df1fe578..aae710280a 100644 --- a/config/GZ2P01/rels/d_a_obj_bk_leaf/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_bk_leaf/symbols.txt @@ -23,7 +23,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000008; // type:object size:0x1D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_408_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_bmdName = .data:0x00000024; // type:object size:0x4 scope:global l_bckName = .data:0x00000028; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_bky_rock/symbols.txt b/config/GZ2P01/rels/d_a_obj_bky_rock/symbols.txt index aa8817eaff..f84f77543e 100644 --- a/config/GZ2P01/rels/d_a_obj_bky_rock/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_bky_rock/symbols.txt @@ -76,7 +76,8 @@ PIECE_SCALE_BASE$4100 = .rodata:0x00000148; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000164; // type:object size:0x7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_409_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3933 = .data:0x00000024; // type:object size:0xC scope:local @3934 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_bmWindow/splits.txt b/config/GZ2P01/rels/d_a_obj_bmWindow/splits.txt index d1029e8604..d219cb3d61 100644 --- a/config/GZ2P01/rels/d_a_obj_bmWindow/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_bmWindow/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bmWindow.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_bmWindow/symbols.txt b/config/GZ2P01/rels/d_a_obj_bmWindow/symbols.txt index 4179e97a27..3db57c5389 100644 --- a/config/GZ2P01/rels/d_a_obj_bmWindow/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_bmWindow/symbols.txt @@ -61,9 +61,11 @@ l_check_area = .rodata:0x00000054; // type:object size:0x30 scope:global @4007 = .rodata:0x000000B0; // type:object size:0x8 scope:local particle_id$4102 = .rodata:0x000000B8; // type:object size:0xC scope:local @stringBase0 = .rodata:0x000000C4; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_410_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daBmWindow_c = .data:0x00000020; // type:object size:0x44 scope:global @3865 = .data:0x00000064; // type:object size:0xC scope:local @3866 = .data:0x00000070; // type:object size:0xC scope:local @@ -82,4 +84,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000016C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x3C scope:global data:byte -lbl_410_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_bmshutter/symbols.txt b/config/GZ2P01/rels/d_a_obj_bmshutter/symbols.txt index 3efa4494dd..d8881dbed6 100644 --- a/config/GZ2P01/rels/d_a_obj_bmshutter/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_bmshutter/symbols.txt @@ -41,9 +41,11 @@ l_check_area = .rodata:0x00000018; // type:object size:0x30 scope:global @3973 = .rodata:0x00000068; // type:object size:0x4 scope:local @3981 = .rodata:0x0000006C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000070; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_411_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3852 = .data:0x00000024; // type:object size:0xC scope:local @3853 = .data:0x00000030; // type:object size:0xC scope:local @@ -57,5 +59,5 @@ l_func$3894 = .data:0x000000A8; // type:object size:0x24 scope:local l_daObjBmSh_Method = .data:0x000000CC; // type:object size:0x20 scope:global g_profile_Obj_BoomShutter = .data:0x000000EC; // type:object size:0x30 scope:global __vt__11daObjBmSh_c = .data:0x0000011C; // type:object size:0x28 scope:global -lbl_411_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_411_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_bosswarp/symbols.txt b/config/GZ2P01/rels/d_a_obj_bosswarp/symbols.txt index 147ac385e5..2be7dadaa3 100644 --- a/config/GZ2P01/rels/d_a_obj_bosswarp/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_bosswarp/symbols.txt @@ -78,7 +78,8 @@ l_dangeon_clr_bitNo$4282 = .rodata:0x00000130; // type:object size:0x24 scope:lo @stringBase0 = .rodata:0x0000018C; // type:object size:0x169 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_91_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_clearEvName = .data:0x00000024; // type:object size:0x24 scope:global l_warp_check_evName = .data:0x00000048; // type:object size:0x4 scope:global @@ -102,4 +103,4 @@ action_table$4273 = .data:0x00000158; // type:object size:0x3C scope:local l_daObjBossWarp_Method = .data:0x00000218; // type:object size:0x20 scope:global g_profile_Obj_BossWarp = .data:0x00000238; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000268; // type:object size:0xC scope:global -lbl_91_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_boumato/splits.txt b/config/GZ2P01/rels/d_a_obj_boumato/splits.txt index 34ec9e6528..c5e1a6e159 100644 --- a/config/GZ2P01/rels/d_a_obj_boumato/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_boumato/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_boumato.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_brg/splits.txt b/config/GZ2P01/rels/d_a_obj_brg/splits.txt index 54a4e56398..19b12eecaa 100644 --- a/config/GZ2P01/rels/d_a_obj_brg/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_brg/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_brg.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_bsGate/splits.txt b/config/GZ2P01/rels/d_a_obj_bsGate/splits.txt index 6a36cbb38a..78db365ff0 100644 --- a/config/GZ2P01/rels/d_a_obj_bsGate/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_bsGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bsGate.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_bsGate/symbols.txt b/config/GZ2P01/rels/d_a_obj_bsGate/symbols.txt index b40a0f7381..266dd02cd5 100644 --- a/config/GZ2P01/rels/d_a_obj_bsGate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_bsGate/symbols.txt @@ -38,9 +38,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3786 = .rodata:0x0000001C; // type:object size:0x4 scope:local @3820 = .rodata:0x00000020; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000024; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_415_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3724 = .data:0x00000020; // type:object size:0xC scope:local @3725 = .data:0x0000002C; // type:object size:0xC scope:local @3726 = .data:0x00000038; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_415_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_bubblePilar/splits.txt b/config/GZ2P01/rels/d_a_obj_bubblePilar/splits.txt index cddb6bae12..8b593ec5a6 100644 --- a/config/GZ2P01/rels/d_a_obj_bubblePilar/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_bubblePilar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_bubblePilar.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_bubblePilar/symbols.txt b/config/GZ2P01/rels/d_a_obj_bubblePilar/symbols.txt index 941ec4205a..adebc009ac 100644 --- a/config/GZ2P01/rels/d_a_obj_bubblePilar/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_bubblePilar/symbols.txt @@ -35,9 +35,11 @@ mCcDObjInfo__13daBubbPilar_c = .rodata:0x00000000; // type:object size:0x30 scop @3940 = .rodata:0x00000038; // type:object size:0x4 scope:local particle_id$3953 = .rodata:0x0000003C; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_416_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__13daBubbPilar_c = .data:0x00000020; // type:object size:0x44 scope:global @3843 = .data:0x00000064; // type:object size:0xC scope:local @3844 = .data:0x00000070; // type:object size:0xC scope:local @@ -54,4 +56,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000148; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3623 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global -lbl_416_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$1367 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_carry/symbols.txt b/config/GZ2P01/rels/d_a_obj_carry/symbols.txt index 8a4248b400..db62cad5c3 100644 --- a/config/GZ2P01/rels/d_a_obj_carry/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_carry/symbols.txt @@ -262,7 +262,8 @@ particle_id$7914 = .rodata:0x00000BA0; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000BB0; // type:object size:0x191 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_18_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x38 scope:global l_bmdName = .data:0x00000058; // type:object size:0x38 scope:global kibako_jv_offset = .data:0x00000090; // type:object size:0x18 scope:global @@ -390,10 +391,10 @@ __vt__8cM3dGAab = .data:0x00000B4C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000B58; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000B7C; // type:object size:0xC scope:global l_sw_id = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_18_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte -lbl_18_bss_5 = .bss:0x00000005; // type:object size:0x1 data:byte -lbl_18_bss_6 = .bss:0x00000006; // type:object size:0x1 data:byte -lbl_18_bss_7 = .bss:0x00000007; // type:object size:0x1 data:byte -lbl_18_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte -lbl_18_bss_9 = .bss:0x00000009; // type:object size:0x1 data:byte -lbl_18_bss_A = .bss:0x0000000A; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000005; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x00000006; // type:object size:0x1 scope:local align:1 data:byte +init$0003 = .bss:0x00000007; // type:object size:0x1 scope:local align:1 data:byte +init$0004 = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte +init$0005 = .bss:0x00000009; // type:object size:0x1 scope:local align:1 data:byte +init$0006 = .bss:0x0000000A; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_cb/splits.txt b/config/GZ2P01/rels/d_a_obj_cb/splits.txt index a0b87e2f7a..af71e3063b 100644 --- a/config/GZ2P01/rels/d_a_obj_cb/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_cb/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cb.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_cb/symbols.txt b/config/GZ2P01/rels/d_a_obj_cb/symbols.txt index 47e595e280..2687b4d656 100644 --- a/config/GZ2P01/rels/d_a_obj_cb/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_cb/symbols.txt @@ -53,6 +53,6 @@ __vt__8cM3dGAab = .data:0x0000005C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000068; // type:object size:0x24 scope:global __vt__14daObj_Cb_HIO_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_418_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_cblock/splits.txt b/config/GZ2P01/rels/d_a_obj_cblock/splits.txt index ca395a0774..2cfb7b4906 100644 --- a/config/GZ2P01/rels/d_a_obj_cblock/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_cblock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cblock.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_cblock/symbols.txt b/config/GZ2P01/rels/d_a_obj_cblock/symbols.txt index e7910b43f4..96cc78473c 100644 --- a/config/GZ2P01/rels/d_a_obj_cblock/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_cblock/symbols.txt @@ -67,7 +67,8 @@ l_cull_box = .rodata:0x00000000; // type:object size:0x18 scope:global @stringBase0 = .rodata:0x00000090; // type:object size:0x9 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_419_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_side_co_offset = .data:0x00000024; // type:object size:0x30 scope:global l_cyl_src = .data:0x00000054; // type:object size:0x44 scope:global @@ -103,6 +104,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_chainOffset = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3645 = .bss:0x00000060; // type:object size:0xC scope:local l_smokeSetOffset = .bss:0x0000006C; // type:object size:0xC scope:global +init$0000 = .bss:0x00000078; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_cdoor/symbols.txt b/config/GZ2P01/rels/d_a_obj_cdoor/symbols.txt index 1862827aa2..4417b2c606 100644 --- a/config/GZ2P01/rels/d_a_obj_cdoor/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_cdoor/symbols.txt @@ -37,9 +37,11 @@ l_attentionOffsetY = .rodata:0x00000010; // type:object size:0x8 scope:global @4014 = .rodata:0x00000028; // type:object size:0x4 scope:local align:4 data:float @4015 = .rodata:0x0000002C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000030; // type:object size:0xF scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_420_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_moveOffsetY = .data:0x00000028; // type:object size:0x8 scope:global @4020 = .data:0x00000030; // type:object size:0xC scope:local @@ -55,5 +57,5 @@ l_daObjCdoor_Method = .data:0x000000D8; // type:object size:0x20 scope:global g_profile_Obj_Cdoor = .data:0x000000F8; // type:object size:0x30 scope:global __vt__12daObjCdoor_c = .data:0x00000128; // type:object size:0x2C scope:global __vt__12J3DFrameCtrl = .data:0x00000154; // type:object size:0xC scope:global -lbl_420_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_420_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_chandelier/symbols.txt b/config/GZ2P01/rels/d_a_obj_chandelier/symbols.txt index a73101fe98..847790f03b 100644 --- a/config/GZ2P01/rels/d_a_obj_chandelier/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_chandelier/symbols.txt @@ -52,7 +52,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000060; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_421_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3715 = .data:0x00000024; // type:object size:0xC scope:local @3716 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_chest/symbols.txt b/config/GZ2P01/rels/d_a_obj_chest/symbols.txt index 023c76b148..4797c67276 100644 --- a/config/GZ2P01/rels/d_a_obj_chest/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_chest/symbols.txt @@ -57,9 +57,11 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @4072 = .rodata:0x000000AC; // type:object size:0x4 scope:local @4073 = .rodata:0x000000B0; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000B4; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_422_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3876 = .data:0x00000024; // type:object size:0xC scope:local @3877 = .data:0x00000030; // type:object size:0xC scope:local @@ -74,4 +76,4 @@ __vt__8cM3dGAab = .data:0x000000E0; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__12daObjChest_c = .data:0x0000011C; // type:object size:0x28 scope:global -lbl_422_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_cho/splits.txt b/config/GZ2P01/rels/d_a_obj_cho/splits.txt index bc07dfd3e9..fb9fefedb8 100644 --- a/config/GZ2P01/rels/d_a_obj_cho/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_cho/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cho.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_cho/symbols.txt b/config/GZ2P01/rels/d_a_obj_cho/symbols.txt index 2390e68b5e..1e23062966 100644 --- a/config/GZ2P01/rels/d_a_obj_cho/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_cho/symbols.txt @@ -96,6 +96,6 @@ __vt__10daObjCHO_c = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_ChoHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_423_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_cwall/splits.txt b/config/GZ2P01/rels/d_a_obj_cwall/splits.txt index f093cbb230..c54f8ce49c 100644 --- a/config/GZ2P01/rels/d_a_obj_cwall/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_cwall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_cwall.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_cwall/symbols.txt b/config/GZ2P01/rels/d_a_obj_cwall/symbols.txt index 39b1ee845c..0fb9404e39 100644 --- a/config/GZ2P01/rels/d_a_obj_cwall/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_cwall/symbols.txt @@ -99,7 +99,8 @@ l_check_max_wolf = .rodata:0x00000058; // type:object size:0xC scope:global @stringBase0 = .rodata:0x00000108; // type:object size:0x12 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_433_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_cull_box = .data:0x00000028; // type:object size:0x18 scope:global l_side_co_offset = .data:0x00000040; // type:object size:0x30 scope:global align:4 data:float @@ -140,7 +141,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_chainOffset = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3760 = .bss:0x00000060; // type:object size:0xC scope:local l_smokeSetOffset = .bss:0x0000006C; // type:object size:0xC scope:global -lbl_433_bss_78 = .bss:0x00000078; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000078; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000084; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_dan/splits.txt b/config/GZ2P01/rels/d_a_obj_dan/splits.txt index df7be832f3..3cdee62db3 100644 --- a/config/GZ2P01/rels/d_a_obj_dan/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_dan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_dan.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_dan/symbols.txt b/config/GZ2P01/rels/d_a_obj_dan/symbols.txt index cc85422ce2..fdb9192547 100644 --- a/config/GZ2P01/rels/d_a_obj_dan/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_dan/symbols.txt @@ -86,6 +86,6 @@ __vt__10daObjDAN_c = .data:0x000000BC; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000C8; // type:object size:0xC scope:global __vt__14daObj_DanHIO_c = .data:0x000000D4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_435_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_digsnow/symbols.txt b/config/GZ2P01/rels/d_a_obj_digsnow/symbols.txt index fda35eb59f..3fb2a69dfa 100644 --- a/config/GZ2P01/rels/d_a_obj_digsnow/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_digsnow/symbols.txt @@ -41,9 +41,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3763 = .rodata:0x0000000C; // type:object size:0x4 scope:local @3764 = .rodata:0x00000010; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000014; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_437_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3713 = .data:0x00000024; // type:object size:0xC scope:local @3714 = .data:0x00000030; // type:object size:0xC scope:local @@ -59,4 +61,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__14dBgS_ObjGndChk = .data:0x0000011C; // type:object size:0x30 scope:global __vt__14daObjDigSnow_c = .data:0x0000014C; // type:object size:0x28 scope:global -lbl_437_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_dmelevator/splits.txt b/config/GZ2P01/rels/d_a_obj_dmelevator/splits.txt index d4cf3d408f..ae33f5fd67 100644 --- a/config/GZ2P01/rels/d_a_obj_dmelevator/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_dmelevator/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_dmelevator.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_dmelevator/symbols.txt b/config/GZ2P01/rels/d_a_obj_dmelevator/symbols.txt index 1537eb4800..74a6bd7b0b 100644 --- a/config/GZ2P01/rels/d_a_obj_dmelevator/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_dmelevator/symbols.txt @@ -81,7 +81,8 @@ l_swOffset = .rodata:0x00000000; // type:object size:0xC scope:global @stringBase0 = .rodata:0x0000007C; // type:object size:0x56 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_438_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_el_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_sw_arcName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000028; // type:object size:0x4 scope:global @@ -126,13 +127,14 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3654 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000058; // type:object size:0xC scope:local @3658 = .bss:0x00000064; // type:object size:0xC scope:local @3659 = .bss:0x00000070; // type:object size:0xC scope:local l_push_check_pos$3653 = .bss:0x0000007C; // type:object size:0x30 scope:local -lbl_438_bss_AC = .bss:0x000000AC; // type:object size:0x1 data:byte -lbl_438_bss_AD = .bss:0x000000AD; // type:object size:0x1 data:byte -lbl_438_bss_AE = .bss:0x000000AE; // type:object size:0x1 data:byte +init$0001 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte +init$0003 = .bss:0x000000AE; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_drop/symbols.txt b/config/GZ2P01/rels/d_a_obj_drop/symbols.txt index 290ac9467b..f95a35d596 100644 --- a/config/GZ2P01/rels/d_a_obj_drop/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_drop/symbols.txt @@ -77,9 +77,11 @@ target_angle_x$4297 = .rodata:0x00000090; // type:object size:0x6 scope:local @4730 = .rodata:0x000000B8; // type:object size:0x4 scope:local @4787 = .rodata:0x000000BC; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000C0; // type:object size:0x18 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_439_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4815 = .data:0x00000020; // type:object size:0xC scope:local @4816 = .data:0x0000002C; // type:object size:0xC scope:local @4817 = .data:0x00000038; // type:object size:0xC scope:local @@ -101,5 +103,5 @@ __vt__10dCcD_GStts = .data:0x00000190; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001B4; // type:object size:0x24 scope:global -lbl_439_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_439_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_fireWood/splits.txt b/config/GZ2P01/rels/d_a_obj_fireWood/splits.txt index ed5962a1db..9e72d60d5a 100644 --- a/config/GZ2P01/rels/d_a_obj_fireWood/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_fireWood/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fireWood.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_fireWood2/splits.txt b/config/GZ2P01/rels/d_a_obj_fireWood2/splits.txt index 8aeaef0582..c0e1563474 100644 --- a/config/GZ2P01/rels/d_a_obj_fireWood2/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_fireWood2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fireWood2.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_firepillar/symbols.txt b/config/GZ2P01/rels/d_a_obj_firepillar/symbols.txt index 637bc097df..101004f90a 100644 --- a/config/GZ2P01/rels/d_a_obj_firepillar/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_firepillar/symbols.txt @@ -37,9 +37,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3784 = .rodata:0x00000010; // type:object size:0x4 scope:local align:4 data:float @3853 = .rodata:0x00000014; // type:object size:0x4 scope:local align:4 data:float @3895 = .rodata:0x00000018; // type:object size:0x4 scope:local +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_447_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global align:4 data:float l_cps_src = .data:0x00000038; // type:object size:0x4C scope:global @3789 = .data:0x00000084; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ __vt__10cCcD_GStts = .data:0x00000128; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x00000134; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000140; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000014C; // type:object size:0x24 scope:global -lbl_447_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_firepillar2/symbols.txt b/config/GZ2P01/rels/d_a_obj_firepillar2/symbols.txt index 4ffb93d009..85e05a089c 100644 --- a/config/GZ2P01/rels/d_a_obj_firepillar2/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_firepillar2/symbols.txt @@ -56,9 +56,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4294 = .rodata:0x00000050; // type:object size:0x4 scope:local @4295 = .rodata:0x00000054; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000058; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_448_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cps_src = .data:0x0000003C; // type:object size:0x4C scope:global @@ -80,4 +82,4 @@ __vt__10dCcD_GStts = .data:0x0000016C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000178; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000184; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001A8; // type:object size:0xC scope:global -lbl_448_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_food/splits.txt b/config/GZ2P01/rels/d_a_obj_food/splits.txt index 00ffb11a11..397338c68c 100644 --- a/config/GZ2P01/rels/d_a_obj_food/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_food/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_food.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_food/symbols.txt b/config/GZ2P01/rels/d_a_obj_food/symbols.txt index 6b3171c27f..495e38aa46 100644 --- a/config/GZ2P01/rels/d_a_obj_food/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_food/symbols.txt @@ -70,6 +70,6 @@ __vt__8cM3dGAab = .data:0x000000E4; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F0; // type:object size:0x24 scope:global __vt__16daObj_Food_HIO_c = .data:0x00000114; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_452_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3642 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_fw/splits.txt b/config/GZ2P01/rels/d_a_obj_fw/splits.txt index b07e9ec321..39b7b0be41 100644 --- a/config/GZ2P01/rels/d_a_obj_fw/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_fw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_fw.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_fw/symbols.txt b/config/GZ2P01/rels/d_a_obj_fw/symbols.txt index 9f88b36990..bb5a3adf18 100644 --- a/config/GZ2P01/rels/d_a_obj_fw/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_fw/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Fw_Method = .data:0x00000010; // type:object size:0x20 scope:global g_profile_OBJ_FW = .data:0x00000030; // type:object size:0x30 scope:global __vt__14daObj_Fw_HIO_c = .data:0x00000060; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_453_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3642 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_gadget/splits.txt b/config/GZ2P01/rels/d_a_obj_gadget/splits.txt index 73f2637801..e67e4a0030 100644 --- a/config/GZ2P01/rels/d_a_obj_gadget/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_gadget/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gadget.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_gadget/symbols.txt b/config/GZ2P01/rels/d_a_obj_gadget/symbols.txt index e58c0bc36c..c14608a647 100644 --- a/config/GZ2P01/rels/d_a_obj_gadget/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_gadget/symbols.txt @@ -78,7 +78,8 @@ l_ccDObjData = .rodata:0x0000002C; // type:object size:0x30 scope:global @stringBase0 = .rodata:0x000000E0; // type:object size:0x6 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_454_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global l_ccDCyl = .data:0x00000038; // type:object size:0x44 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_gb/symbols.txt b/config/GZ2P01/rels/d_a_obj_gb/symbols.txt index 52759b74f6..e14b85f310 100644 --- a/config/GZ2P01/rels/d_a_obj_gb/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_gb/symbols.txt @@ -27,7 +27,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000030; // type:object size:0xF scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_457_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double bmd$3914 = .data:0x00000020; // type:object size:0x8 scope:local brk$3915 = .data:0x00000028; // type:object size:0x8 scope:local btk$3916 = .data:0x00000030; // type:object size:0x8 scope:local diff --git a/config/GZ2P01/rels/d_a_obj_geyser/symbols.txt b/config/GZ2P01/rels/d_a_obj_geyser/symbols.txt index b638d89b41..ff23b18df7 100644 --- a/config/GZ2P01/rels/d_a_obj_geyser/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_geyser/symbols.txt @@ -71,9 +71,11 @@ l_scale = .rodata:0x00000008; // type:object size:0x18 scope:global @4280 = .rodata:0x0000006C; // type:object size:0x4 scope:local @4281 = .rodata:0x00000070; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000074; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_458_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cps_src = .data:0x0000003C; // type:object size:0x4C scope:global @@ -93,5 +95,5 @@ __vt__10dCcD_GStts = .data:0x0000018C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000198; // type:object size:0xC scope:global __vt__8cM3dGLin = .data:0x000001A4; // type:object size:0xC scope:global __vt__13daObjGeyser_c = .data:0x000001B0; // type:object size:0x28 scope:global -lbl_458_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_458_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_glowSphere/splits.txt b/config/GZ2P01/rels/d_a_obj_glowSphere/splits.txt index 7a32f7c9c4..bfeaf6a9fb 100644 --- a/config/GZ2P01/rels/d_a_obj_glowSphere/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_glowSphere/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_glowSphere.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_glowSphere/symbols.txt b/config/GZ2P01/rels/d_a_obj_glowSphere/symbols.txt index 8cbaff6045..e638ed79cd 100644 --- a/config/GZ2P01/rels/d_a_obj_glowSphere/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_glowSphere/symbols.txt @@ -66,9 +66,11 @@ mCcDObjInfo__10daGlwSph_c = .rodata:0x00000008; // type:object size:0x30 scope:g @4031 = .rodata:0x0000004C; // type:object size:0x4 scope:local align:4 data:float @4103 = .rodata:0x00000050; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000054; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_459_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global align:4 data:float mCcDSph__10daGlwSph_c = .data:0x00000038; // type:object size:0x40 scope:global l_prmColor = .data:0x00000078; // type:object size:0x4 scope:global @@ -118,8 +120,8 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_HIO = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3673 = .bss:0x00000060; // type:object size:0xC scope:local mSphMng__10daGlwSph_c = .bss:0x0000006C; // type:object size:0x3C4 scope:global -lbl_459_bss_430 = .bss:0x00000430; // type:object size:0x1 data:byte -lbl_459_bss_431 = .bss:0x00000431; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000430; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000431; // type:object size:0x1 scope:local align:1 data:byte sSeId$4016 = .bss:0x00000434; // type:object size:0x14 scope:local data:4byte mSphSe__12_GlSph_Mng_c = .bss:0x00000448; // type:object size:0x2 scope:global data:2byte mSeClrTmr__12_GlSph_Mng_c = .bss:0x0000044A; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2P01/rels/d_a_obj_gm/splits.txt b/config/GZ2P01/rels/d_a_obj_gm/splits.txt index 5a84ec5cc0..f07956488e 100644 --- a/config/GZ2P01/rels/d_a_obj_gm/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_gm/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gm.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_gm/symbols.txt b/config/GZ2P01/rels/d_a_obj_gm/symbols.txt index 29da718574..56f6602a9f 100644 --- a/config/GZ2P01/rels/d_a_obj_gm/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_gm/symbols.txt @@ -67,9 +67,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4425 = .rodata:0x0000008C; // type:object size:0x4 scope:local @4426 = .rodata:0x00000090; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000094; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_460_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double obj_size = .data:0x00000020; // type:object size:0x1C scope:global weg = .data:0x0000003C; // type:object size:0x1C scope:global tim = .data:0x00000058; // type:object size:0xE scope:global @@ -88,6 +90,6 @@ __vt__8cM3dGAab = .data:0x0000018C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000198; // type:object size:0x24 scope:global __vt__14daObj_Gm_HIO_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3661 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_goGate/splits.txt b/config/GZ2P01/rels/d_a_obj_goGate/splits.txt index 354717688c..0d2a15792b 100644 --- a/config/GZ2P01/rels/d_a_obj_goGate/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_goGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_goGate.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_goGate/symbols.txt b/config/GZ2P01/rels/d_a_obj_goGate/symbols.txt index bd5856b56c..a2505cd7f8 100644 --- a/config/GZ2P01/rels/d_a_obj_goGate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_goGate/symbols.txt @@ -38,9 +38,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3782 = .rodata:0x00000018; // type:object size:0x4 scope:local @3783 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_461_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3727 = .data:0x00000020; // type:object size:0xC scope:local @3728 = .data:0x0000002C; // type:object size:0xC scope:local @3729 = .data:0x00000038; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:byte -lbl_461_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_gomikabe/splits.txt b/config/GZ2P01/rels/d_a_obj_gomikabe/splits.txt index e2b75e2cd5..f807654679 100644 --- a/config/GZ2P01/rels/d_a_obj_gomikabe/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_gomikabe/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gomikabe.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt b/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt index 99f0c23f4d..bac3e3da28 100644 --- a/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_gomikabe/symbols.txt @@ -91,6 +91,6 @@ __vt__8cM3dGSph = .data:0x00000090; // type:object size:0xC scope:global __vt__15daObjGOMIKABE_c = .data:0x0000009C; // type:object size:0x28 scope:global __vt__19daObjGOMIKABE_HIO_c = .data:0x000000C4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3761 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_obj_gpTaru/splits.txt b/config/GZ2P01/rels/d_a_obj_gpTaru/splits.txt index e824a86e22..dc3917df81 100644 --- a/config/GZ2P01/rels/d_a_obj_gpTaru/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_gpTaru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gpTaru.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_gpTaru/symbols.txt b/config/GZ2P01/rels/d_a_obj_gpTaru/symbols.txt index 4b12314a4d..c51ae460b8 100644 --- a/config/GZ2P01/rels/d_a_obj_gpTaru/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_gpTaru/symbols.txt @@ -106,7 +106,8 @@ mCcDObjInfo__10daGpTaru_c = .rodata:0x00000014; // type:object size:0x30 scope:g @stringBase0 = .rodata:0x000000F4; // type:object size:0x21 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_96_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daGpTaru_c = .data:0x00000020; // type:object size:0x44 scope:global @4338 = .data:0x00000064; // type:object size:0xC scope:local @4339 = .data:0x00000070; // type:object size:0xC scope:local @@ -134,4 +135,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000238; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x3C scope:global align:4 data:float -lbl_96_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_gra2/splits.txt b/config/GZ2P01/rels/d_a_obj_gra2/splits.txt index 5b6e332a9a..863e63fc7e 100644 --- a/config/GZ2P01/rels/d_a_obj_gra2/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_gra2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_gra2.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_gra2/symbols.txt b/config/GZ2P01/rels/d_a_obj_gra2/symbols.txt index 0be368e779..7c7ccc918f 100644 --- a/config/GZ2P01/rels/d_a_obj_gra2/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_gra2/symbols.txt @@ -326,7 +326,8 @@ l_prticles_id$6229 = .rodata:0x00000254; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000398; // type:object size:0x54 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_463_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resFileNameList = .data:0x00000020; // type:object size:0x10 scope:global l_exLoadRes_GRAa = .data:0x00000030; // type:object size:0x10 scope:global l_exLoadRes_GRA_jump = .data:0x00000040; // type:object size:0x10 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_groundwater/splits.txt b/config/GZ2P01/rels/d_a_obj_groundwater/splits.txt index d8ef2670d5..080dbe02cc 100644 --- a/config/GZ2P01/rels/d_a_obj_groundwater/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_groundwater/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_groundwater.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_groundwater/symbols.txt b/config/GZ2P01/rels/d_a_obj_groundwater/symbols.txt index c2a1426c62..6aa2773cee 100644 --- a/config/GZ2P01/rels/d_a_obj_groundwater/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_groundwater/symbols.txt @@ -40,7 +40,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000014; // type:object size:0x6 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_467_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3993 = .data:0x00000020; // type:object size:0xC scope:local @3994 = .data:0x0000002C; // type:object size:0xC scope:local @3995 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_h_saku/splits.txt b/config/GZ2P01/rels/d_a_obj_h_saku/splits.txt index 183f8e88a3..73a1dbdfd5 100644 --- a/config/GZ2P01/rels/d_a_obj_h_saku/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_h_saku/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_h_saku.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_heavySw/splits.txt b/config/GZ2P01/rels/d_a_obj_heavySw/splits.txt index fdbfff035e..7c3c1ca60d 100644 --- a/config/GZ2P01/rels/d_a_obj_heavySw/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_heavySw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_heavySw.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_heavySw/symbols.txt b/config/GZ2P01/rels/d_a_obj_heavySw/symbols.txt index 1e0a3d809b..6ba64ae3b8 100644 --- a/config/GZ2P01/rels/d_a_obj_heavySw/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_heavySw/symbols.txt @@ -57,9 +57,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3998 = .rodata:0x00000044; // type:object size:0x4 scope:local @3999 = .rodata:0x00000048; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000004C; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_476_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3770 = .data:0x00000020; // type:object size:0xC scope:local @3771 = .data:0x0000002C; // type:object size:0xC scope:local @3772 = .data:0x00000038; // type:object size:0xC scope:local @@ -76,4 +78,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000014C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3641 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x38 scope:global data:byte -lbl_476_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000004C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_hfuta/splits.txt b/config/GZ2P01/rels/d_a_obj_hfuta/splits.txt index 489dc0a1ba..e160aa45c9 100644 --- a/config/GZ2P01/rels/d_a_obj_hfuta/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_hfuta/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_hfuta.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_hfuta/symbols.txt b/config/GZ2P01/rels/d_a_obj_hfuta/symbols.txt index 5cb0f1d61d..82c8ed0758 100644 --- a/config/GZ2P01/rels/d_a_obj_hfuta/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_hfuta/symbols.txt @@ -33,6 +33,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3997 = .rodata:0x00000018; // type:object size:0x4 scope:local @3998 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @@ -62,6 +63,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3687 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3690 = .bss:0x00000058; // type:object size:0xC scope:local @3691 = .bss:0x00000064; // type:object size:0xC scope:local @3692 = .bss:0x00000070; // type:object size:0xC scope:local @@ -105,7 +107,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @3730 = .bss:0x00000238; // type:object size:0xC scope:local @3731 = .bss:0x00000244; // type:object size:0xC scope:local l_rot_data$3686 = .bss:0x00000250; // type:object size:0x102 scope:local -lbl_477_bss_352 = .bss:0x00000352; // type:object size:0x1 data:byte +init$0001 = .bss:0x00000352; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000354; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000358; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000035C; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_hsTarget/splits.txt b/config/GZ2P01/rels/d_a_obj_hsTarget/splits.txt index 159497784a..b4b384c34e 100644 --- a/config/GZ2P01/rels/d_a_obj_hsTarget/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_hsTarget/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_hsTarget.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_ice_s/splits.txt b/config/GZ2P01/rels/d_a_obj_ice_s/splits.txt index 5a1b8599f3..1fe95ce4db 100644 --- a/config/GZ2P01/rels/d_a_obj_ice_s/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_ice_s/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ice_s.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt b/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt index 23c57b9e6f..2d6551c178 100644 --- a/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_ice_s/symbols.txt @@ -65,6 +65,6 @@ g_profile_Obj_Ice_s = .data:0x00000024; // type:object size:0x30 scope:global __vt__12daObjIce_s_c = .data:0x00000054; // type:object size:0x28 scope:global __vt__17daOBJ_ICE_S_HIO_c = .data:0x0000007C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3639 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_iceblock/symbols.txt b/config/GZ2P01/rels/d_a_obj_iceblock/symbols.txt index dbb8fb91a8..e2aa9afc5e 100644 --- a/config/GZ2P01/rels/d_a_obj_iceblock/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_iceblock/symbols.txt @@ -86,9 +86,11 @@ l_check_offsetXZ$4577 = .rodata:0x00000124; // type:object size:0x3C scope:local l_check_offsetXZ$4641 = .rodata:0x00000168; // type:object size:0x3C scope:local @4696 = .rodata:0x000001A4; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000001A8; // type:object size:0x34 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_481_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @4231 = .data:0x00000024; // type:object size:0xC scope:local @4232 = .data:0x00000030; // type:object size:0xC scope:local @@ -109,5 +111,5 @@ __vt__8cM3dGAab = .data:0x00000164; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000170; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x00000194; // type:object size:0xC scope:global __vt__13daObjIceBlk_c = .data:0x000001A0; // type:object size:0x28 scope:global -lbl_481_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_481_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_iceleaf/symbols.txt b/config/GZ2P01/rels/d_a_obj_iceleaf/symbols.txt index 4e26d78eba..968ddd7b96 100644 --- a/config/GZ2P01/rels/d_a_obj_iceleaf/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_iceleaf/symbols.txt @@ -55,7 +55,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_482_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000024; // type:object size:0x44 scope:global @3975 = .data:0x00000068; // type:object size:0xC scope:local @@ -77,5 +78,5 @@ __vt__8cM3dGCyl = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001B4; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x000001D8; // type:object size:0xC scope:global -init$1997 = .bss:0x00000000; // type:object size:0x1 data:byte -init$2129 = .bss:0x00000001; // type:object size:0x1 data:byte +init$1997 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$2129 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_ita/splits.txt b/config/GZ2P01/rels/d_a_obj_ita/splits.txt index 596b188993..86d91f3f61 100644 --- a/config/GZ2P01/rels/d_a_obj_ita/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_ita/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ita.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_itamato/splits.txt b/config/GZ2P01/rels/d_a_obj_itamato/splits.txt index 978d110e95..7e960f0232 100644 --- a/config/GZ2P01/rels/d_a_obj_itamato/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_itamato/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_itamato.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_ito/splits.txt b/config/GZ2P01/rels/d_a_obj_ito/splits.txt index 57e4daea3e..07bfd8fd4c 100644 --- a/config/GZ2P01/rels/d_a_obj_ito/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_ito/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ito.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_ito/symbols.txt b/config/GZ2P01/rels/d_a_obj_ito/symbols.txt index 0e78432374..a548ca3657 100644 --- a/config/GZ2P01/rels/d_a_obj_ito/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_ito/symbols.txt @@ -80,6 +80,6 @@ __vt__8cM3dGSph = .data:0x000000B8; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x000000C4; // type:object size:0x14 scope:global __vt__15daObj_Ito_HIO_c = .data:0x000000D8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_19_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3765 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_kabuto/splits.txt b/config/GZ2P01/rels/d_a_obj_kabuto/splits.txt index ede0d65156..906b589a51 100644 --- a/config/GZ2P01/rels/d_a_obj_kabuto/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_kabuto/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kabuto.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kabuto/symbols.txt b/config/GZ2P01/rels/d_a_obj_kabuto/symbols.txt index f6e756713c..e380990650 100644 --- a/config/GZ2P01/rels/d_a_obj_kabuto/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kabuto/symbols.txt @@ -101,6 +101,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KabHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_488_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_kag/splits.txt b/config/GZ2P01/rels/d_a_obj_kag/splits.txt index 0f89dce71b..a3d02bfa53 100644 --- a/config/GZ2P01/rels/d_a_obj_kag/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_kag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kag.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kag/symbols.txt b/config/GZ2P01/rels/d_a_obj_kag/symbols.txt index a350b5aff7..6eefbd8374 100644 --- a/config/GZ2P01/rels/d_a_obj_kag/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kag/symbols.txt @@ -98,9 +98,11 @@ l_kag_itemno = .rodata:0x000000E8; // type:object size:0x2 scope:global l_musiya_num = .rodata:0x0000010C; // type:object size:0x4 scope:global @4994 = .rodata:0x00000110; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000114; // type:object size:0xE scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_489_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__25@unnamed@d_a_obj_kag_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global @3980 = .data:0x00000060; // type:object size:0xC scope:local data:4byte @4341 = .data:0x0000006C; // type:object size:0xC scope:local data:4byte @@ -127,6 +129,6 @@ __vt__8cM3dGPla = .data:0x00000194; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001A0; // type:object size:0xC scope:global __vt__14daObj_KagHIO_c = .data:0x000001AC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_489_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_kago/splits.txt b/config/GZ2P01/rels/d_a_obj_kago/splits.txt index 6083fbd40d..14dd82a7fa 100644 --- a/config/GZ2P01/rels/d_a_obj_kago/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_kago/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kago.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kago/symbols.txt b/config/GZ2P01/rels/d_a_obj_kago/symbols.txt index 0c8307372d..5f6d454cf0 100644 --- a/config/GZ2P01/rels/d_a_obj_kago/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kago/symbols.txt @@ -89,7 +89,8 @@ heapSize$3870 = .rodata:0x0000005C; // type:object size:0x14 scope:local @stringBase0 = .rodata:0x00000114; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_491_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global l_ccDCyl = .data:0x00000038; // type:object size:0x44 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_kamakiri/splits.txt b/config/GZ2P01/rels/d_a_obj_kamakiri/splits.txt index 0f4ccae4fd..a54be4fbf7 100644 --- a/config/GZ2P01/rels/d_a_obj_kamakiri/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_kamakiri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kamakiri.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kamakiri/symbols.txt b/config/GZ2P01/rels/d_a_obj_kamakiri/symbols.txt index 6e060164da..0b5d0c4ebc 100644 --- a/config/GZ2P01/rels/d_a_obj_kamakiri/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kamakiri/symbols.txt @@ -98,6 +98,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KamHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_493_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_kanban2/splits.txt b/config/GZ2P01/rels/d_a_obj_kanban2/splits.txt index 61180c71f8..28418b62ab 100644 --- a/config/GZ2P01/rels/d_a_obj_kanban2/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_kanban2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kanban2.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kanban2/symbols.txt b/config/GZ2P01/rels/d_a_obj_kanban2/symbols.txt index 3b5ddc92ea..44efad4b61 100644 --- a/config/GZ2P01/rels/d_a_obj_kanban2/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kanban2/symbols.txt @@ -147,10 +147,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_98_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3965 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @4561 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte sc$4560 = .bss:0x00000070; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_kantera/symbols.txt b/config/GZ2P01/rels/d_a_obj_kantera/symbols.txt index 8a42aaf1e9..c346ba9d66 100644 --- a/config/GZ2P01/rels/d_a_obj_kantera/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kantera/symbols.txt @@ -47,9 +47,11 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @4079 = .rodata:0x0000007C; // type:object size:0x4 scope:local @4145 = .rodata:0x00000080; // type:object size:0x4 scope:local data:string @stringBase0 = .rodata:0x00000084; // type:object size:0x10 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_494_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4184 = .data:0x00000020; // type:object size:0xC scope:local @4185 = .data:0x0000002C; // type:object size:0xC scope:local @4186 = .data:0x00000038; // type:object size:0xC scope:local @@ -65,4 +67,4 @@ __vt__8cM3dGAab = .data:0x00000100; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000010C; // type:object size:0x24 scope:global __vt__15daItemKantera_c = .data:0x00000130; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x00000174; // type:object size:0xC scope:global -lbl_494_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_katatsumuri/splits.txt b/config/GZ2P01/rels/d_a_obj_katatsumuri/splits.txt index a445b88e2d..4fb5fc047f 100644 --- a/config/GZ2P01/rels/d_a_obj_katatsumuri/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_katatsumuri/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_katatsumuri.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_katatsumuri/symbols.txt b/config/GZ2P01/rels/d_a_obj_katatsumuri/symbols.txt index f609dc9b92..4dac95e845 100644 --- a/config/GZ2P01/rels/d_a_obj_katatsumuri/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_katatsumuri/symbols.txt @@ -94,6 +94,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KatHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_495_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_kbacket/splits.txt b/config/GZ2P01/rels/d_a_obj_kbacket/splits.txt index 10d5a8fb94..99aea992f8 100644 --- a/config/GZ2P01/rels/d_a_obj_kbacket/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_kbacket/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kbacket.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kbacket/symbols.txt b/config/GZ2P01/rels/d_a_obj_kbacket/symbols.txt index ed40e5bb60..b7b0414fe9 100644 --- a/config/GZ2P01/rels/d_a_obj_kbacket/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kbacket/symbols.txt @@ -80,7 +80,8 @@ l_ccDObjData = .rodata:0x0000002C; // type:object size:0x30 scope:global @stringBase0 = .rodata:0x000000EC; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_99_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte l_resNameList = .data:0x00000030; // type:object size:0x4 scope:global data:4byte l_ccDCyl = .data:0x00000034; // type:object size:0x44 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_kbox/splits.txt b/config/GZ2P01/rels/d_a_obj_kbox/splits.txt index 517449ef35..dcb92fa326 100644 --- a/config/GZ2P01/rels/d_a_obj_kbox/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_kbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kbox.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kbox/symbols.txt b/config/GZ2P01/rels/d_a_obj_kbox/symbols.txt index 20e516dad6..f4f2b7d9ea 100644 --- a/config/GZ2P01/rels/d_a_obj_kbox/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kbox/symbols.txt @@ -105,10 +105,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_497_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @3976 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte sc$3975 = .bss:0x00000070; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x0000007C; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000080; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_key/splits.txt b/config/GZ2P01/rels/d_a_obj_key/splits.txt index f0e95d6771..c38900b510 100644 --- a/config/GZ2P01/rels/d_a_obj_key/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_key/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_key.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_key/symbols.txt b/config/GZ2P01/rels/d_a_obj_key/symbols.txt index 30995d3d75..1be44badfd 100644 --- a/config/GZ2P01/rels/d_a_obj_key/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_key/symbols.txt @@ -74,7 +74,7 @@ __vt__8cM3dGAab = .data:0x00000060; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000006C; // type:object size:0x24 scope:global __vt__15daObj_Key_HIO_c = .data:0x00000090; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_498_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3773 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte target_info_count = .bss:0x00000028; // type:object size:0x2 scope:global data:2byte diff --git a/config/GZ2P01/rels/d_a_obj_keyhole/splits.txt b/config/GZ2P01/rels/d_a_obj_keyhole/splits.txt index 93c8d55660..718783fd0a 100644 --- a/config/GZ2P01/rels/d_a_obj_keyhole/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_keyhole/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_keyhole.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_keyhole/symbols.txt b/config/GZ2P01/rels/d_a_obj_keyhole/symbols.txt index 7c6539e61b..e7d459bd54 100644 --- a/config/GZ2P01/rels/d_a_obj_keyhole/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_keyhole/symbols.txt @@ -88,7 +88,8 @@ estimateSizeTbl$4475 = .rodata:0x000000B0; // type:object size:0x14 scope:local @stringBase0 = .rodata:0x000000D8; // type:object size:0x30 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_499_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double bmd_d$4377 = .data:0x00000020; // type:object size:0x28 scope:local mdl_f$4378 = .data:0x00000048; // type:object size:0x28 scope:local bck_d$4396 = .data:0x00000070; // type:object size:0x28 scope:local @@ -120,10 +121,11 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -lbl_499_bss_45 = .bss:0x00000045; // type:object size:0x1 data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3650 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:global data:byte @3934 = .bss:0x00000060; // type:object size:0xC scope:local +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte @3937 = .bss:0x00000070; // type:object size:0xC scope:local @3938 = .bss:0x0000007C; // type:object size:0xC scope:local @3939 = .bss:0x00000088; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_kgate/symbols.txt b/config/GZ2P01/rels/d_a_obj_kgate/symbols.txt index 9f4d290a5f..b6a1fc6e07 100644 --- a/config/GZ2P01/rels/d_a_obj_kgate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kgate/symbols.txt @@ -95,7 +95,8 @@ l_tg_offset$4833 = .rodata:0x00000158; // type:object size:0x30 scope:local @stringBase0 = .rodata:0x00000188; // type:object size:0x6A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_100_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0xC scope:global l_evName$4056 = .data:0x0000002C; // type:object size:0xC scope:local @4582 = .data:0x00000038; // type:object size:0xC scope:local @@ -114,5 +115,5 @@ __vt__10dCcD_GStts = .data:0x00000134; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000140; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x0000014C; // type:object size:0xC scope:global __vt__12daObjKGate_c = .data:0x00000158; // type:object size:0x28 scope:global -lbl_100_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_100_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_ki/splits.txt b/config/GZ2P01/rels/d_a_obj_ki/splits.txt index a220f5d6da..0274050b1b 100644 --- a/config/GZ2P01/rels/d_a_obj_ki/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_ki/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ki.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_ki/symbols.txt b/config/GZ2P01/rels/d_a_obj_ki/symbols.txt index 513c684e92..be0b46d673 100644 --- a/config/GZ2P01/rels/d_a_obj_ki/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_ki/symbols.txt @@ -47,6 +47,6 @@ l_daObj_Ki_Method = .data:0x00000010; // type:object size:0x20 scope:global g_profile_OBJ_KI = .data:0x00000030; // type:object size:0x30 scope:global __vt__14daObj_Ki_HIO_c = .data:0x00000060; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_500_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_kiPot/splits.txt b/config/GZ2P01/rels/d_a_obj_kiPot/splits.txt index 212bdb7626..938fc2db32 100644 --- a/config/GZ2P01/rels/d_a_obj_kiPot/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_kiPot/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kiPot.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kiPot/symbols.txt b/config/GZ2P01/rels/d_a_obj_kiPot/symbols.txt index 82107971f1..172c8bca9f 100644 --- a/config/GZ2P01/rels/d_a_obj_kiPot/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kiPot/symbols.txt @@ -38,4 +38,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000008C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3620 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global -lbl_501_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_kita/splits.txt b/config/GZ2P01/rels/d_a_obj_kita/splits.txt index 332b298e53..c5fa02f337 100644 --- a/config/GZ2P01/rels/d_a_obj_kita/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_kita/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kita.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kita/symbols.txt b/config/GZ2P01/rels/d_a_obj_kita/symbols.txt index bac9b5db57..3934771498 100644 --- a/config/GZ2P01/rels/d_a_obj_kita/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kita/symbols.txt @@ -50,6 +50,6 @@ l_daObj_Kita_Method = .data:0x00000000; // type:object size:0x20 scope:local g_profile_OBJ_KITA = .data:0x00000020; // type:object size:0x30 scope:global __vt__16daObj_Kita_HIO_c = .data:0x00000050; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x18 scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_obj_kshutter/symbols.txt b/config/GZ2P01/rels/d_a_obj_kshutter/symbols.txt index 64180b8200..4a78c2963c 100644 --- a/config/GZ2P01/rels/d_a_obj_kshutter/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kshutter/symbols.txt @@ -70,9 +70,11 @@ l_eff_id$4307 = .rodata:0x00000084; // type:object size:0xA scope:local @4357 = .rodata:0x00000094; // type:object size:0x4 scope:local @4358 = .rodata:0x00000098; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000009C; // type:object size:0x119 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_506_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x14 scope:global l_anmName = .data:0x00000034; // type:object size:0x28 scope:global l_eventName = .data:0x0000005C; // type:object size:0x28 scope:global @@ -101,8 +103,8 @@ daObjKshtr_METHODS = .data:0x00000200; // type:object size:0x20 scope:global g_profile_Obj_Kshutter = .data:0x00000220; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000250; // type:object size:0xC scope:global __vt__12daObjKshtr_c = .data:0x0000025C; // type:object size:0x28 scope:global -lbl_506_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_506_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte -lbl_506_bss_2 = .bss:0x00000002; // type:object size:0x1 data:byte -lbl_506_bss_3 = .bss:0x00000003; // type:object size:0x1 data:byte -lbl_506_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x00000002; // type:object size:0x1 scope:local align:1 data:byte +init$0003 = .bss:0x00000003; // type:object size:0x1 scope:local align:1 data:byte +init$0004 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_ktOnFire/splits.txt b/config/GZ2P01/rels/d_a_obj_ktOnFire/splits.txt index 7c63735e8c..03141eab1b 100644 --- a/config/GZ2P01/rels/d_a_obj_ktOnFire/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_ktOnFire/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ktOnFire.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kuwagata/splits.txt b/config/GZ2P01/rels/d_a_obj_kuwagata/splits.txt index c9ede69e1b..e3532a60e6 100644 --- a/config/GZ2P01/rels/d_a_obj_kuwagata/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_kuwagata/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_kuwagata.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt b/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt index 6b58a43d16..fef3b93622 100644 --- a/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kuwagata/symbols.txt @@ -99,6 +99,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_KuwHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:local align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_kznkarm/symbols.txt b/config/GZ2P01/rels/d_a_obj_kznkarm/symbols.txt index c129d736a5..8e4f359a18 100644 --- a/config/GZ2P01/rels/d_a_obj_kznkarm/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_kznkarm/symbols.txt @@ -51,7 +51,8 @@ M_attr__14daObjKznkarm_c = .rodata:0x00000000; // type:object size:0x38 scope:gl @stringBase0 = .rodata:0x00000088; // type:object size:0x11 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_510_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte @3641 = .data:0x00000024; // type:object size:0xC scope:local @3642 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_ladder/symbols.txt b/config/GZ2P01/rels/d_a_obj_ladder/symbols.txt index 68c44877b7..3f13114c64 100644 --- a/config/GZ2P01/rels/d_a_obj_ladder/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_ladder/symbols.txt @@ -48,9 +48,11 @@ M_arcname__Q211daObjLadder5Act_c = .rodata:0x00000024; // type:object size:0x5 s @3838 = .rodata:0x00000050; // type:object size:0x4 scope:local @3839 = .rodata:0x00000054; // type:object size:0x4 scope:local @3840 = .rodata:0x00000058; // type:object size:0x4 scope:local +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_103_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double L_attr_type__Q211daObjLadder28@unnamed@d_a_obj_ladder_cpp@ = .data:0x00000020; // type:object size:0x30 scope:global @3878 = .data:0x00000050; // type:object size:0xC scope:local @3879 = .data:0x0000005C; // type:object size:0xC scope:local @@ -63,4 +65,4 @@ g_profile_Obj_Ladder = .data:0x000000E8; // type:object size:0x30 scope:global __vt__14dBgS_ObjGndChk = .data:0x00000118; // type:object size:0x30 scope:global __vt__Q211daObjLadder5Act_c = .data:0x00000148; // type:object size:0x28 scope:global M_tmp_mtx__Q211daObjLadder5Act_c = .bss:0x00000000; // type:object size:0x30 scope:global -lbl_103_bss_30 = .bss:0x00000030; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000030; // type:object size:0x1 align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lbox/splits.txt b/config/GZ2P01/rels/d_a_obj_lbox/splits.txt index 3fff317a32..8c2427e5c2 100644 --- a/config/GZ2P01/rels/d_a_obj_lbox/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lbox.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lbox/symbols.txt b/config/GZ2P01/rels/d_a_obj_lbox/symbols.txt index 9184ad9efe..b6f5b49362 100644 --- a/config/GZ2P01/rels/d_a_obj_lbox/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lbox/symbols.txt @@ -47,6 +47,6 @@ __vt__8cM3dGAab = .data:0x0000009C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000A8; // type:object size:0x24 scope:global __vt__16daObj_Lbox_HIO_c = .data:0x000000CC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_513_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3763 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_life_container/symbols.txt b/config/GZ2P01/rels/d_a_obj_life_container/symbols.txt index 7a72c933dd..2b33b0a2a1 100644 --- a/config/GZ2P01/rels/d_a_obj_life_container/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_life_container/symbols.txt @@ -77,7 +77,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @stringBase0 = .rodata:0x000000B0; // type:object size:0x28 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_53_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4479 = .data:0x00000020; // type:object size:0xC scope:local @4480 = .data:0x0000002C; // type:object size:0xC scope:local @4481 = .data:0x00000038; // type:object size:0xC scope:local @@ -96,4 +97,4 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__11daObjLife_c = .data:0x00000184; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001C8; // type:object size:0xC scope:global -lbl_53_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv1Candle00/splits.txt b/config/GZ2P01/rels/d_a_obj_lv1Candle00/splits.txt index 0ea456e188..ed188e11ad 100644 --- a/config/GZ2P01/rels/d_a_obj_lv1Candle00/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv1Candle00/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv1Candle00.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv1Candle01/splits.txt b/config/GZ2P01/rels/d_a_obj_lv1Candle01/splits.txt index 68a546f9e6..e4fb138496 100644 --- a/config/GZ2P01/rels/d_a_obj_lv1Candle01/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv1Candle01/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv1Candle01.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv2Candle/splits.txt b/config/GZ2P01/rels/d_a_obj_lv2Candle/splits.txt index 62f91bb2ed..b618332442 100644 --- a/config/GZ2P01/rels/d_a_obj_lv2Candle/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv2Candle/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv2Candle.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv3Candle/splits.txt b/config/GZ2P01/rels/d_a_obj_lv3Candle/splits.txt index dd14a358b4..ebe5dd296f 100644 --- a/config/GZ2P01/rels/d_a_obj_lv3Candle/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv3Candle/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Candle.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv3Water/splits.txt b/config/GZ2P01/rels/d_a_obj_lv3Water/splits.txt index ce388d462c..47234d64fd 100644 --- a/config/GZ2P01/rels/d_a_obj_lv3Water/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv3Water/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Water.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv3Water/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv3Water/symbols.txt index ca126b217c..e0d91a5cdb 100644 --- a/config/GZ2P01/rels/d_a_obj_lv3Water/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv3Water/symbols.txt @@ -49,7 +49,8 @@ estimateSizeTbl$3746 = .rodata:0x000001A8; // type:object size:0x2A scope:local @stringBase0 = .rodata:0x000001F8; // type:object size:0xD2 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_518_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x54 scope:global @3830 = .data:0x00000074; // type:object size:0xC scope:local @3831 = .data:0x00000080; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_lv3Water2/splits.txt b/config/GZ2P01/rels/d_a_obj_lv3Water2/splits.txt index b224967d11..844154d523 100644 --- a/config/GZ2P01/rels/d_a_obj_lv3Water2/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv3Water2/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv3Water2.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv3Water2/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv3Water2/symbols.txt index 4d1c47c38c..04f443591f 100644 --- a/config/GZ2P01/rels/d_a_obj_lv3Water2/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv3Water2/symbols.txt @@ -46,7 +46,8 @@ l_btkIdx = .rodata:0x00000008; // type:object size:0x4 scope:global @stringBase0 = .rodata:0x00000034; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_519_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x4 scope:global @3767 = .data:0x00000024; // type:object size:0xC scope:local @3768 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/splits.txt b/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/splits.txt index 212da12114..bd0f1f032b 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/splits.txt @@ -10,7 +10,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4CandleDemoTag.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt index 85a76a8196..fc76308d7d 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4CandleDemoTag/symbols.txt @@ -37,6 +37,7 @@ __dt__20dalv4CandleDemoTag_cFv = .text:0x00000884; // type:function size:0x80 sc _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global lit_1787 = .data:0x0000000C; // type:object size:0x14 scope:local @3702 = .data:0x00000020; // type:object size:0xC scope:local @@ -53,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3632 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:2byte -hio_set = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv4CandleTag/splits.txt b/config/GZ2P01/rels/d_a_obj_lv4CandleTag/splits.txt index 1482725f04..41a6e44e77 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4CandleTag/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4CandleTag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4CandleTag.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv4CandleTag/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4CandleTag/symbols.txt index 796f6e1ff7..f3eccbf113 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4CandleTag/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4CandleTag/symbols.txt @@ -38,9 +38,11 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc _dtors = .dtors:0x00000000; // type:label scope:global @3727 = .rodata:0x00000000; // type:object size:0x4 scope:local @3728 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_524_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3686 = .data:0x00000020; // type:object size:0xC scope:local @3687 = .data:0x0000002C; // type:object size:0xC scope:local @3688 = .data:0x00000038; // type:object size:0xC scope:local @@ -55,4 +57,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3624 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:byte -lbl_524_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv4EdShutter/splits.txt b/config/GZ2P01/rels/d_a_obj_lv4EdShutter/splits.txt index 83fbb12549..0473970533 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4EdShutter/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4EdShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4EdShutter.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv4EdShutter/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4EdShutter/symbols.txt index b71e4104db..0044f39bcb 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4EdShutter/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4EdShutter/symbols.txt @@ -47,9 +47,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3817 = .rodata:0x00000018; // type:object size:0x4 scope:local @3818 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_525_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3721 = .data:0x00000020; // type:object size:0xC scope:local @3722 = .data:0x0000002C; // type:object size:0xC scope:local @3723 = .data:0x00000038; // type:object size:0xC scope:local @@ -64,4 +66,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000013C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3628 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_525_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv4Gate/splits.txt b/config/GZ2P01/rels/d_a_obj_lv4Gate/splits.txt index c303a6c3b5..d140489c9b 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4Gate/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4Gate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4Gate.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv4Gate/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4Gate/symbols.txt index 33cc67ee8c..332f096bca 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4Gate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4Gate/symbols.txt @@ -37,9 +37,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3777 = .rodata:0x00000018; // type:object size:0x4 scope:local @3778 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_526_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3725 = .data:0x00000020; // type:object size:0xC scope:local @3726 = .data:0x0000002C; // type:object size:0xC scope:local @3727 = .data:0x00000038; // type:object size:0xC scope:local @@ -52,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:byte -lbl_526_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv4HsTarget/splits.txt b/config/GZ2P01/rels/d_a_obj_lv4HsTarget/splits.txt index 6f82fdbe60..84dc0254c9 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4HsTarget/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4HsTarget/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4HsTarget.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv4PoGate/splits.txt b/config/GZ2P01/rels/d_a_obj_lv4PoGate/splits.txt index eebf3bbd28..cfe3d115f5 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4PoGate/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4PoGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4PoGate.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv4PoGate/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4PoGate/symbols.txt index 7d0eb573bc..dd0c2116d2 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4PoGate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4PoGate/symbols.txt @@ -52,9 +52,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3853 = .rodata:0x0000002C; // type:object size:0x4 scope:local particle_id$3866 = .rodata:0x00000030; // type:object size:0x14 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_528_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3727 = .data:0x00000020; // type:object size:0xC scope:local @3728 = .data:0x0000002C; // type:object size:0xC scope:local @3729 = .data:0x00000038; // type:object size:0xC scope:local @@ -71,4 +73,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000014C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3623 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x28 scope:global data:byte -lbl_528_bss_3C = .bss:0x0000003C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000003C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv4RailWall/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4RailWall/symbols.txt index 24e3e17ff4..44e1d3607c 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4RailWall/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4RailWall/symbols.txt @@ -53,9 +53,11 @@ l_spd_tbl$3801 = .rodata:0x00000020; // type:object size:0x44 scope:local @3884 = .rodata:0x00000070; // type:object size:0x4 scope:local @3885 = .rodata:0x00000074; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000078; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_529_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3758 = .data:0x00000024; // type:object size:0xC scope:local @3759 = .data:0x00000030; // type:object size:0xC scope:local @@ -71,4 +73,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__17dEvLib_callback_c = .data:0x0000011C; // type:object size:0x18 scope:global __vt__14daObjLv4Wall_c = .data:0x00000134; // type:object size:0x48 scope:global -lbl_529_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv4SlideWall/splits.txt b/config/GZ2P01/rels/d_a_obj_lv4SlideWall/splits.txt index 0013f2b984..8fc8c7c869 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4SlideWall/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4SlideWall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv4SlideWall.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv4SlideWall/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4SlideWall/symbols.txt index a8f1dba7b0..b0b70d2087 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4SlideWall/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4SlideWall/symbols.txt @@ -37,9 +37,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3765 = .rodata:0x00000014; // type:object size:0x4 scope:local @3766 = .rodata:0x00000018; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000001C; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_530_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3720 = .data:0x00000020; // type:object size:0xC scope:local @3721 = .data:0x0000002C; // type:object size:0xC scope:local @3722 = .data:0x00000038; // type:object size:0xC scope:local @@ -52,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_530_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv4bridge/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4bridge/symbols.txt index 9d66c1e6b4..2ebfbb2174 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4bridge/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4bridge/symbols.txt @@ -40,9 +40,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3767 = .rodata:0x00000018; // type:object size:0x4 scope:local @3768 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_531_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3702 = .data:0x00000024; // type:object size:0xC scope:local @3703 = .data:0x00000030; // type:object size:0xC scope:local @@ -52,4 +54,4 @@ daObjLv4Brg_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global g_profile_Obj_Lv4Bridge = .data:0x0000008C; // type:object size:0x30 scope:global __vt__17dEvLib_callback_c = .data:0x000000BC; // type:object size:0x18 scope:global __vt__13daObjLv4Brg_c = .data:0x000000D4; // type:object size:0x48 scope:global -lbl_531_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv4digsand/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4digsand/symbols.txt index f474102bc8..e122bd76a2 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4digsand/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4digsand/symbols.txt @@ -41,9 +41,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3766 = .rodata:0x00000008; // type:object size:0x4 scope:local @3767 = .rodata:0x0000000C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000010; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_533_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3715 = .data:0x00000024; // type:object size:0xC scope:local @3716 = .data:0x00000030; // type:object size:0xC scope:local @@ -59,4 +61,4 @@ __vt__8cM3dGAab = .data:0x000000EC; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000000F8; // type:object size:0x24 scope:global __vt__14dBgS_ObjGndChk = .data:0x0000011C; // type:object size:0x30 scope:global __vt__16daObjL4DigSand_c = .data:0x0000014C; // type:object size:0x28 scope:global -lbl_533_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv4floor/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4floor/symbols.txt index 3cdd218349..0c2ab206d2 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4floor/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4floor/symbols.txt @@ -27,9 +27,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3712 = .rodata:0x00000008; // type:object size:0x4 scope:local @3713 = .rodata:0x0000000C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000010; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_534_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3678 = .data:0x00000024; // type:object size:0xC scope:local @3679 = .data:0x00000030; // type:object size:0xC scope:local @@ -38,4 +40,4 @@ l_func$3677 = .data:0x00000048; // type:object size:0x24 scope:local daObjLv4Floor_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global g_profile_Obj_Lv4Floor = .data:0x0000008C; // type:object size:0x30 scope:global __vt__15daObjLv4Floor_c = .data:0x000000BC; // type:object size:0x28 scope:global -lbl_534_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv4sand/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv4sand/symbols.txt index 367c4d3f1f..287ee026ce 100644 --- a/config/GZ2P01/rels/d_a_obj_lv4sand/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv4sand/symbols.txt @@ -40,9 +40,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3786 = .rodata:0x00000014; // type:object size:0x4 scope:local @3787 = .rodata:0x00000018; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000001C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_538_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3754 = .data:0x00000024; // type:object size:0xC scope:local @3755 = .data:0x00000030; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ g_profile_Obj_Lv4Sand = .data:0x0000008C; // type:object size:0x30 scope:global __vt__17dEvLib_callback_c = .data:0x000000BC; // type:object size:0x18 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObjLv4Sand_c = .data:0x000000E0; // type:object size:0x48 scope:global -lbl_538_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv5FloorBoard/splits.txt b/config/GZ2P01/rels/d_a_obj_lv5FloorBoard/splits.txt index 03c8eb538f..cadd4c57b6 100644 --- a/config/GZ2P01/rels/d_a_obj_lv5FloorBoard/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv5FloorBoard/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5FloorBoard.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv5FloorBoard/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv5FloorBoard/symbols.txt index 8a4af9357a..bc8cd5383d 100644 --- a/config/GZ2P01/rels/d_a_obj_lv5FloorBoard/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv5FloorBoard/symbols.txt @@ -38,9 +38,11 @@ mCcDObjInfo__12daFlorBoad_c = .rodata:0x00000004; // type:object size:0x30 scope @3872 = .rodata:0x0000003C; // type:object size:0x4 scope:local @3891 = .rodata:0x00000040; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000044; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_539_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daFlorBoad_c = .data:0x00000020; // type:object size:0x44 scope:global @3839 = .data:0x00000064; // type:object size:0xC scope:local @3840 = .data:0x00000070; // type:object size:0xC scope:local @@ -58,4 +60,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000154; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_539_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv5IceWall/splits.txt b/config/GZ2P01/rels/d_a_obj_lv5IceWall/splits.txt index 723c8fa8f9..53d5edc56b 100644 --- a/config/GZ2P01/rels/d_a_obj_lv5IceWall/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv5IceWall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5IceWall.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv5IceWall/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv5IceWall/symbols.txt index 18ec506e4a..c3a5d6c460 100644 --- a/config/GZ2P01/rels/d_a_obj_lv5IceWall/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv5IceWall/symbols.txt @@ -52,9 +52,11 @@ l_eff_b$3933 = .rodata:0x00000048; // type:object size:0x4 scope:local @4060 = .rodata:0x00000074; // type:object size:0x4 scope:local l_eff_break_b$4077 = .rodata:0x00000078; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000007C; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_540_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daIceWall_c = .data:0x00000020; // type:object size:0x44 scope:global @3891 = .data:0x00000064; // type:object size:0xC scope:local @3892 = .data:0x00000070; // type:object size:0xC scope:local @@ -72,4 +74,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000154; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_540_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv5SwIce/splits.txt b/config/GZ2P01/rels/d_a_obj_lv5SwIce/splits.txt index d874b76741..63f82db0cf 100644 --- a/config/GZ2P01/rels/d_a_obj_lv5SwIce/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv5SwIce/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv5SwIce.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv5SwIce/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv5SwIce/symbols.txt index b4688100ba..d7126438ad 100644 --- a/config/GZ2P01/rels/d_a_obj_lv5SwIce/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv5SwIce/symbols.txt @@ -41,9 +41,11 @@ l_eff_r$3861 = .rodata:0x00000030; // type:object size:0x4 scope:local l_eff_break$3922 = .rodata:0x00000048; // type:object size:0x4 scope:local @3948 = .rodata:0x0000004C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000050; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_541_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daLv5SwIce_c = .data:0x00000020; // type:object size:0x44 scope:global @3837 = .data:0x00000064; // type:object size:0xC scope:local @3838 = .data:0x00000070; // type:object size:0xC scope:local @@ -61,4 +63,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000154; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global data:byte -lbl_541_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6ChangeGate/splits.txt b/config/GZ2P01/rels/d_a_obj_lv6ChangeGate/splits.txt index 1f51bcecf7..96725b61e7 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6ChangeGate/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6ChangeGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6ChangeGate.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv6ChangeGate/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6ChangeGate/symbols.txt index 1349001aa4..c46a180e8d 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6ChangeGate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6ChangeGate/symbols.txt @@ -58,9 +58,11 @@ mCcDObjInfo__17daLv6ChangeGate_c = .rodata:0x00000008; // type:object size:0x30 @3923 = .rodata:0x00000050; // type:object size:0x4 scope:local align:4 data:float @3953 = .rodata:0x00000054; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000058; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_544_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__17daLv6ChangeGate_c = .data:0x00000020; // type:object size:0x44 scope:global @3874 = .data:0x00000064; // type:object size:0xC scope:local @3875 = .data:0x00000070; // type:object size:0xC scope:local @@ -81,4 +83,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3631 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_544_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6FurikoTrap/splits.txt b/config/GZ2P01/rels/d_a_obj_lv6FurikoTrap/splits.txt index 9f6a1bccd7..2147daf592 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6FurikoTrap/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6FurikoTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6FurikoTrap.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv6FurikoTrap/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6FurikoTrap/symbols.txt index 130de8a12b..92ce683dd0 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6FurikoTrap/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6FurikoTrap/symbols.txt @@ -58,4 +58,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000010C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_545_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6Lblock/splits.txt b/config/GZ2P01/rels/d_a_obj_lv6Lblock/splits.txt index c457136059..ac127f1004 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6Lblock/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6Lblock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6Lblock.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv6Lblock/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6Lblock/symbols.txt index fb281239cc..14d4bc67e2 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6Lblock/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6Lblock/symbols.txt @@ -37,9 +37,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3780 = .rodata:0x00000014; // type:object size:0x4 scope:local @3781 = .rodata:0x00000018; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000001C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_546_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_liftUpMax = .data:0x00000020; // type:object size:0x8 scope:global @3734 = .data:0x00000028; // type:object size:0xC scope:local @3735 = .data:0x00000034; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000F4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_546_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6SwGate/splits.txt b/config/GZ2P01/rels/d_a_obj_lv6SwGate/splits.txt index feefe6f370..5b6673926d 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6SwGate/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6SwGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6SwGate.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv6SwGate/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6SwGate/symbols.txt index 6a11fd17e5..d8b5fe5be2 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6SwGate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6SwGate/symbols.txt @@ -53,9 +53,11 @@ mCcDObjInfo__13daLv6SwGate_c = .rodata:0x0000000C; // type:object size:0x30 scop @3994 = .rodata:0x00000060; // type:object size:0x4 scope:local align:4 data:float @3995 = .rodata:0x00000064; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000068; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_547_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__13daLv6SwGate_c = .data:0x00000020; // type:object size:0x44 scope:global l_cull_box = .data:0x00000064; // type:object size:0x18 scope:global align:4 data:float @3948 = .data:0x0000007C; // type:object size:0xC scope:local @@ -76,4 +78,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000019C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3625 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global align:4 data:float -lbl_547_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6SzGate/splits.txt b/config/GZ2P01/rels/d_a_obj_lv6SzGate/splits.txt index 48d480013a..11a87ce927 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6SzGate/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6SzGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6SzGate.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv6SzGate/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6SzGate/symbols.txt index 9f5792b853..c913f65210 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6SzGate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6SzGate/symbols.txt @@ -46,9 +46,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3880 = .rodata:0x00000024; // type:object size:0x4 scope:local @3901 = .rodata:0x00000028; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000002C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_548_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global align:4 data:float @3799 = .data:0x00000038; // type:object size:0xC scope:local @3800 = .data:0x00000044; // type:object size:0xC scope:local @@ -66,4 +68,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000158; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global align:4 data:float -lbl_548_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6Tenbin/splits.txt b/config/GZ2P01/rels/d_a_obj_lv6Tenbin/splits.txt index 474b2d7989..ba47f9d24c 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6Tenbin/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6Tenbin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6Tenbin.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv6Tenbin/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6Tenbin/symbols.txt index f7cb5cb832..e371647a92 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6Tenbin/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6Tenbin/symbols.txt @@ -58,4 +58,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3662 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x44 scope:global align:4 data:float -lbl_549_bss_58 = .bss:0x00000058; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000058; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6TogeRoll/splits.txt b/config/GZ2P01/rels/d_a_obj_lv6TogeRoll/splits.txt index 407a59b7f6..250d23638c 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6TogeRoll/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6TogeRoll/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6TogeRoll.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv6TogeRoll/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6TogeRoll/symbols.txt index e86f8ff01b..970a3281ad 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6TogeRoll/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6TogeRoll/symbols.txt @@ -70,9 +70,11 @@ mSpeed__12daTogeRoll_c = .rodata:0x0000006C; // type:object size:0x40 scope:glob @4239 = .rodata:0x000000F8; // type:object size:0x4 scope:local @4285 = .rodata:0x000000FC; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000100; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_550_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__12daTogeRoll_c = .data:0x00000020; // type:object size:0x40 scope:global mCcDCps__12daTogeRoll_c = .data:0x00000060; // type:object size:0x4C scope:global @3971 = .data:0x000000AC; // type:object size:0xC scope:local @@ -97,4 +99,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000238; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global align:4 data:float -lbl_550_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6TogeTrap/splits.txt b/config/GZ2P01/rels/d_a_obj_lv6TogeTrap/splits.txt index 12d78e691e..a5b238b4e7 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6TogeTrap/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6TogeTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv6TogeTrap.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv6TogeTrap/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6TogeTrap/symbols.txt index 1e8da65f10..303c8d3f6d 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6TogeTrap/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6TogeTrap/symbols.txt @@ -93,9 +93,11 @@ estimateSizeTbl$3689 = .rodata:0x000000D4; // type:object size:0x6 scope:local @4534 = .rodata:0x0000013C; // type:object size:0x4 scope:local @4535 = .rodata:0x00000140; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000144; // type:object size:0x19 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_551_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__15daLv6TogeTrap_c = .data:0x00000020; // type:object size:0x40 scope:global mCcDCyl__15daLv6TogeTrap_c = .data:0x00000060; // type:object size:0x44 scope:global l_resNameIdx = .data:0x000000A4; // type:object size:0xC scope:global @@ -128,4 +130,4 @@ __vt__14mDoHIO_entry_c = .data:0x000002CC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3625 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x28 scope:global align:4 data:float -lbl_551_bss_3C = .bss:0x0000003C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000003C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6bemos/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6bemos/symbols.txt index 408b103a22..1fa03a00f1 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6bemos/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6bemos/symbols.txt @@ -50,9 +50,11 @@ l_particle_id$3914 = .rodata:0x00000078; // type:object size:0xC scope:local @4160 = .rodata:0x00000098; // type:object size:0x4 scope:local @4161 = .rodata:0x0000009C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000A0; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_552_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cps_src = .data:0x0000003C; // type:object size:0x4C scope:global @@ -70,4 +72,4 @@ __vt__8cM3dGAab = .data:0x00000174; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x00000180; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x0000018C; // type:object size:0xC scope:global __vt__11daObjL6Bm_c = .data:0x00000198; // type:object size:0x28 scope:global -lbl_552_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6bemos2/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6bemos2/symbols.txt index b152d10d1c..09cb9c38f4 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6bemos2/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6bemos2/symbols.txt @@ -81,7 +81,8 @@ l_eff_id$4949 = .rodata:0x00000090; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000A0; // type:object size:0x35 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_553_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_eye_matName = .data:0x00000024; // type:object size:0x4 scope:global l_head_joint = .data:0x00000028; // type:object size:0x4 scope:global @@ -115,5 +116,5 @@ __vt__8cM3dGAab = .data:0x00000294; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x000002A0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000002AC; // type:object size:0xC scope:global __vt__12daObjLv6Bm_c = .data:0x000002B8; // type:object size:0x28 scope:global -init$2007 = .bss:0x00000000; // type:object size:0x1 data:byte -init$2384 = .bss:0x00000001; // type:object size:0x1 data:byte +init$2007 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$2384 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv6swturn/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv6swturn/symbols.txt index 6ef431c562..b615b905cb 100644 --- a/config/GZ2P01/rels/d_a_obj_lv6swturn/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv6swturn/symbols.txt @@ -30,9 +30,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4069 = .rodata:0x00000018; // type:object size:0x4 scope:local @4070 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_556_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3777 = .data:0x00000024; // type:object size:0xC scope:local @3778 = .data:0x00000030; // type:object size:0xC scope:local @@ -40,4 +42,4 @@ l_func$3776 = .data:0x0000003C; // type:object size:0x18 scope:local daObjLv6SwTurn_METHODS = .data:0x00000054; // type:object size:0x20 scope:global g_profile_Obj_Lv6SwTurn = .data:0x00000074; // type:object size:0x30 scope:global __vt__16daObjLv6SwTurn_c = .data:0x000000A4; // type:object size:0x28 scope:global -lbl_556_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv7BsGate/splits.txt b/config/GZ2P01/rels/d_a_obj_lv7BsGate/splits.txt index 48e060cb8c..9caacfae4b 100644 --- a/config/GZ2P01/rels/d_a_obj_lv7BsGate/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv7BsGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv7BsGate.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv7BsGate/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv7BsGate/symbols.txt index 15eba8eb56..1161f16444 100644 --- a/config/GZ2P01/rels/d_a_obj_lv7BsGate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv7BsGate/symbols.txt @@ -38,9 +38,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3799 = .rodata:0x0000001C; // type:object size:0x4 scope:local @3833 = .rodata:0x00000020; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000024; // type:object size:0xF scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_557_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x8 scope:global l_bmdIdx = .data:0x00000028; // type:object size:0x8 scope:global l_dzbIdx = .data:0x00000030; // type:object size:0x8 scope:global @@ -56,4 +58,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000104; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3622 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_557_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv7PropellerY/splits.txt b/config/GZ2P01/rels/d_a_obj_lv7PropellerY/splits.txt index b44e37500d..d9cac35233 100644 --- a/config/GZ2P01/rels/d_a_obj_lv7PropellerY/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv7PropellerY/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv7PropellerY.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv7PropellerY/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv7PropellerY/symbols.txt index 1699b91b55..e7c571648a 100644 --- a/config/GZ2P01/rels/d_a_obj_lv7PropellerY/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv7PropellerY/symbols.txt @@ -44,9 +44,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3849 = .rodata:0x00000024; // type:object size:0x4 scope:local @3913 = .rodata:0x00000028; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000030; // type:object size:0x14 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_558_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x8 scope:global l_bmdIdx = .data:0x00000028; // type:object size:0x8 scope:global l_dzbIdx = .data:0x00000030; // type:object size:0x8 scope:global @@ -64,4 +66,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000134; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3644 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:global align:4 data:float -lbl_558_bss_34 = .bss:0x00000034; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv7bridge/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv7bridge/symbols.txt index 88be6bba83..4f8fbd89cf 100644 --- a/config/GZ2P01/rels/d_a_obj_lv7bridge/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv7bridge/symbols.txt @@ -59,7 +59,8 @@ l_bck$3780 = .rodata:0x00000040; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000080; // type:object size:0x13 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_559_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_cyl_src = .data:0x00000028; // type:object size:0x44 scope:global @3941 = .data:0x0000006C; // type:object size:0xC scope:local @@ -75,4 +76,4 @@ __vt__8cM3dGCyl = .data:0x0000011C; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000128; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x0000014C; // type:object size:0xC scope:global __vt__13daObjLv7Brg_c = .data:0x00000158; // type:object size:0x28 scope:global -init$3943 = .bss:0x00000000; // type:object size:0x1 data:byte +init$3943 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv8KekkaiTrap/splits.txt b/config/GZ2P01/rels/d_a_obj_lv8KekkaiTrap/splits.txt index c238d6e60b..9fd8a3621c 100644 --- a/config/GZ2P01/rels/d_a_obj_lv8KekkaiTrap/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv8KekkaiTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8KekkaiTrap.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt index 0bfdeff2f9..90f5408339 100644 --- a/config/GZ2P01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv8KekkaiTrap/symbols.txt @@ -34,9 +34,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3803 = .rodata:0x0000000C; // type:object size:0x4 scope:local @3804 = .rodata:0x00000010; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000014; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_560_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x4 scope:global l_bmdIdx = .data:0x00000024; // type:object size:0x4 scope:global l_dzbIdx = .data:0x00000028; // type:object size:0x4 scope:global @@ -52,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000F8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x1C scope:global align:4 data:float -lbl_560_bss_30 = .bss:0x00000030; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000030; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv8Lift/splits.txt b/config/GZ2P01/rels/d_a_obj_lv8Lift/splits.txt index 42da1a289d..b010fad4da 100644 --- a/config/GZ2P01/rels/d_a_obj_lv8Lift/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv8Lift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8Lift.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv8Lift/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv8Lift/symbols.txt index 8666a935ea..5ad9bcd61f 100644 --- a/config/GZ2P01/rels/d_a_obj_lv8Lift/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv8Lift/symbols.txt @@ -69,9 +69,11 @@ mSpeed__10daL8Lift_c = .rodata:0x00000004; // type:object size:0x40 scope:global @4110 = .rodata:0x00000094; // type:object size:0x4 scope:local align:4 data:float @4213 = .rodata:0x00000098; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000009C; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_561_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3822 = .data:0x00000020; // type:object size:0xC scope:local @3823 = .data:0x0000002C; // type:object size:0xC scope:local @3824 = .data:0x00000038; // type:object size:0xC scope:local @@ -94,4 +96,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001D0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_561_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv8OptiLift/splits.txt b/config/GZ2P01/rels/d_a_obj_lv8OptiLift/splits.txt index 3f0e9d6446..c16aadb3a1 100644 --- a/config/GZ2P01/rels/d_a_obj_lv8OptiLift/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv8OptiLift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8OptiLift.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv8OptiLift/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv8OptiLift/symbols.txt index aa3d8de7e1..66af4b8baa 100644 --- a/config/GZ2P01/rels/d_a_obj_lv8OptiLift/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv8OptiLift/symbols.txt @@ -63,9 +63,11 @@ mSpeed__12daOptiLift_c = .rodata:0x00000004; // type:object size:0x40 scope:glob @4231 = .rodata:0x00000088; // type:object size:0x4 scope:local @4232 = .rodata:0x0000008C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000090; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_562_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3826 = .data:0x00000020; // type:object size:0xC scope:local @3827 = .data:0x0000002C; // type:object size:0xC scope:local @3828 = .data:0x00000038; // type:object size:0xC scope:local @@ -85,4 +87,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000188; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3655 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global data:byte -lbl_562_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv8UdFloor/splits.txt b/config/GZ2P01/rels/d_a_obj_lv8UdFloor/splits.txt index cd46526bd9..0ba2d8c00a 100644 --- a/config/GZ2P01/rels/d_a_obj_lv8UdFloor/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv8UdFloor/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv8UdFloor.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv8UdFloor/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv8UdFloor/symbols.txt index 6d4663c673..37fffe52e9 100644 --- a/config/GZ2P01/rels/d_a_obj_lv8UdFloor/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv8UdFloor/symbols.txt @@ -46,9 +46,11 @@ l_heap_size = .rodata:0x00000014; // type:object size:0x8 scope:global @3857 = .rodata:0x0000003C; // type:object size:0x4 scope:local @3892 = .rodata:0x00000040; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0xF scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_563_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x8 scope:global @3736 = .data:0x00000028; // type:object size:0xC scope:local @3737 = .data:0x00000034; // type:object size:0xC scope:local @@ -64,4 +66,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000124; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3622 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global data:byte -lbl_563_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_lv9SwShutter/splits.txt b/config/GZ2P01/rels/d_a_obj_lv9SwShutter/splits.txt index 4c797f16d5..55b103d011 100644 --- a/config/GZ2P01/rels/d_a_obj_lv9SwShutter/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_lv9SwShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_lv9SwShutter.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_lv9SwShutter/symbols.txt b/config/GZ2P01/rels/d_a_obj_lv9SwShutter/symbols.txt index d6ac681745..6b5cc29c1d 100644 --- a/config/GZ2P01/rels/d_a_obj_lv9SwShutter/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_lv9SwShutter/symbols.txt @@ -38,9 +38,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3784 = .rodata:0x0000001C; // type:object size:0x4 scope:local @3785 = .rodata:0x00000020; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000024; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_564_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3722 = .data:0x00000020; // type:object size:0xC scope:local @3723 = .data:0x0000002C; // type:object size:0xC scope:local @3724 = .data:0x00000038; // type:object size:0xC scope:local @@ -53,4 +55,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global align:4 data:float -lbl_564_bss_28 = .bss:0x00000028; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000028; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_magLift/splits.txt b/config/GZ2P01/rels/d_a_obj_magLift/splits.txt index dbc092c03c..e7e0ec08dc 100644 --- a/config/GZ2P01/rels/d_a_obj_magLift/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_magLift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_magLift.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_magLift/symbols.txt b/config/GZ2P01/rels/d_a_obj_magLift/symbols.txt index 51f0bb74cb..454bf63ef3 100644 --- a/config/GZ2P01/rels/d_a_obj_magLift/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_magLift/symbols.txt @@ -47,9 +47,11 @@ mSpeed__11daMagLift_c = .rodata:0x00000000; // type:object size:0x40 scope:globa @3838 = .rodata:0x0000006C; // type:object size:0x4 scope:local @3852 = .rodata:0x00000070; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000074; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_565_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3736 = .data:0x00000020; // type:object size:0xC scope:local @3737 = .data:0x0000002C; // type:object size:0xC scope:local @3738 = .data:0x00000038; // type:object size:0xC scope:local @@ -66,4 +68,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000158; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x8 scope:global -lbl_565_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000001C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_magLiftRot/splits.txt b/config/GZ2P01/rels/d_a_obj_magLiftRot/splits.txt index d2be67dce9..8478afda34 100644 --- a/config/GZ2P01/rels/d_a_obj_magLiftRot/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_magLiftRot/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_magLiftRot.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_magLiftRot/symbols.txt b/config/GZ2P01/rels/d_a_obj_magLiftRot/symbols.txt index 9559cba3cf..92e2978583 100644 --- a/config/GZ2P01/rels/d_a_obj_magLiftRot/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_magLiftRot/symbols.txt @@ -53,9 +53,11 @@ l_brkIdx = .rodata:0x00000054; // type:object size:0xC scope:global @3950 = .rodata:0x00000084; // type:object size:0x4 scope:local @3951 = .rodata:0x00000088; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000008C; // type:object size:0x1B scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_566_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0xC scope:global @3856 = .data:0x0000002C; // type:object size:0xC scope:local @3857 = .data:0x00000038; // type:object size:0xC scope:local @@ -72,4 +74,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000011C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x40 scope:global align:4 data:float -lbl_566_bss_54 = .bss:0x00000054; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_magne_arm/symbols.txt b/config/GZ2P01/rels/d_a_obj_magne_arm/symbols.txt index cb9b5622ff..b91895cc61 100644 --- a/config/GZ2P01/rels/d_a_obj_magne_arm/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_magne_arm/symbols.txt @@ -134,7 +134,8 @@ l_offsetF$3738 = .rodata:0x000000AC; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000128; // type:object size:0xE scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_105_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float l_cull_box2 = .data:0x0000003C; // type:object size:0x18 scope:global align:4 data:float @@ -202,7 +203,11 @@ __vt__11daObjMarm_c = .data:0x000003BC; // type:object size:0x28 scope:global @1012 = .bss:0x00000034; // type:object size:0x1 scope:local @1010 = .bss:0x00000038; // type:object size:0x1 scope:local @1009 = .bss:0x0000003C; // type:object size:0x1 scope:local -lbl_105_bss_3D = .bss:0x0000003D; // type:object size:0x7 data:byte +init$0000 = .bss:0x0000003D; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x0000003E; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x0000003F; // type:object size:0x1 scope:local align:1 data:byte +init$0003 = .bss:0x00000040; // type:object size:0x1 scope:local align:1 data:byte +init$0004 = .bss:0x00000041; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000044; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000048; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x0000004C; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_maki/splits.txt b/config/GZ2P01/rels/d_a_obj_maki/splits.txt index 231f501a3c..bc0ce90e20 100644 --- a/config/GZ2P01/rels/d_a_obj_maki/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_maki/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_maki.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_master_sword/symbols.txt b/config/GZ2P01/rels/d_a_obj_master_sword/symbols.txt index e3b88d97e9..5790ad398e 100644 --- a/config/GZ2P01/rels/d_a_obj_master_sword/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_master_sword/symbols.txt @@ -40,7 +40,8 @@ mAttr__18daObjMasterSword_c = .rodata:0x00000000; // type:object size:0x4 scope: ...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_568_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte @3655 = .data:0x00000024; // type:object size:0xC scope:local @3656 = .data:0x00000030; // type:object size:0xC scope:local @@ -55,4 +56,4 @@ __vt__12dBgS_ObjAcch = .data:0x0000010C; // type:object size:0x24 scope:global __vt__8cM3dGCyl = .data:0x00000130; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x0000013C; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x00000148; // type:object size:0xC scope:global -lbl_568_bss_0 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$localstatic4$initCollision__18daObjMasterSword_cFv = .bss:0x00000000; // type:object size:0x1 scope:local data:byte diff --git a/config/GZ2P01/rels/d_a_obj_mgate/symbols.txt b/config/GZ2P01/rels/d_a_obj_mgate/symbols.txt index a2dc56b7af..0b7ddfe898 100644 --- a/config/GZ2P01/rels/d_a_obj_mgate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_mgate/symbols.txt @@ -33,7 +33,8 @@ l_roll_crash_check_areaL2 = .rodata:0x0000005C; // type:object size:0x30 scope:g @stringBase0 = .rodata:0x000000B4; // type:object size:0x69 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_107_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_bmdName = .data:0x00000028; // type:object size:0x8 scope:global l_dzbName = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_mie/splits.txt b/config/GZ2P01/rels/d_a_obj_mie/splits.txt index e998395be8..8749728261 100644 --- a/config/GZ2P01/rels/d_a_obj_mie/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_mie/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_mie.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_mirror_6pole/symbols.txt b/config/GZ2P01/rels/d_a_obj_mirror_6pole/symbols.txt index a3ad3be13e..2d31a2aefb 100644 --- a/config/GZ2P01/rels/d_a_obj_mirror_6pole/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_mirror_6pole/symbols.txt @@ -23,7 +23,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000010; // type:object size:0x9 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_572_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3617 = .data:0x00000024; // type:object size:0xC scope:local @3618 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_mirror_screw/symbols.txt b/config/GZ2P01/rels/d_a_obj_mirror_screw/symbols.txt index 0356f58738..3f9b086649 100644 --- a/config/GZ2P01/rels/d_a_obj_mirror_screw/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_mirror_screw/symbols.txt @@ -29,7 +29,8 @@ M_attr__18daObjMirrorScrew_c = .rodata:0x00000000; // type:object size:0x18 scop @stringBase0 = .rodata:0x00000038; // type:object size:0x9 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_575_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3648 = .data:0x00000024; // type:object size:0xC scope:local @3649 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_movebox/splits.txt b/config/GZ2P01/rels/d_a_obj_movebox/splits.txt index 440e7adb31..4d3883bd3b 100644 --- a/config/GZ2P01/rels/d_a_obj_movebox/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_movebox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_movebox.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_movebox/symbols.txt b/config/GZ2P01/rels/d_a_obj_movebox/symbols.txt index 56589c9852..d8253bc172 100644 --- a/config/GZ2P01/rels/d_a_obj_movebox/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_movebox/symbols.txt @@ -98,7 +98,8 @@ particle_id$4913 = .rodata:0x00000770; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x0000077C; // type:object size:0x5E scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_20_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4747 = .data:0x00000020; // type:object size:0xC scope:local @4748 = .data:0x0000002C; // type:object size:0xC scope:local @4749 = .data:0x00000038; // type:object size:0xC scope:local @@ -138,15 +139,19 @@ M_wrt_work__Q212daObjMovebox5Bgc_c = .bss:0x000007EC; // type:object size:0x54 s @3672 = .bss:0x00000840; // type:object size:0xC scope:local M_wall_work__Q212daObjMovebox5Bgc_c = .bss:0x0000084C; // type:object size:0xA10 scope:global align:4 data:float @3909 = .bss:0x0000125C; // type:object size:0xC scope:local +init$3910 = .bss:0x00001268; // type:object size:0x1 scope:local align:1 data:byte touch_work$3908 = .bss:0x0000126C; // type:object size:0x70 scope:local @4501 = .bss:0x000012DC; // type:object size:0xC scope:local +init$4502 = .bss:0x000012E8; // type:object size:0x1 scope:local align:1 data:byte scl$4500 = .bss:0x000012EC; // type:object size:0xC scope:local @4574 = .bss:0x000012F8; // type:object size:0xC scope:local +init$4575 = .bss:0x00001304; // type:object size:0x1 scope:local align:1 data:byte @4577 = .bss:0x00001308; // type:object size:0xC scope:local @4578 = .bss:0x00001314; // type:object size:0xC scope:local @4579 = .bss:0x00001320; // type:object size:0xC scope:local dir_vec$4573 = .bss:0x0000132C; // type:object size:0x30 scope:local @4762 = .bss:0x0000135C; // type:object size:0xC scope:local +init$4763 = .bss:0x00001368; // type:object size:0x1 scope:local align:1 data:byte particle_scale$4761 = .bss:0x0000136C; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00001378; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000137C; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_msima/splits.txt b/config/GZ2P01/rels/d_a_obj_msima/splits.txt index 8991846e80..fabed8f8e3 100644 --- a/config/GZ2P01/rels/d_a_obj_msima/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_msima/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_msima.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_msima/symbols.txt b/config/GZ2P01/rels/d_a_obj_msima/symbols.txt index aea56fe4d5..b2271862e4 100644 --- a/config/GZ2P01/rels/d_a_obj_msima/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_msima/symbols.txt @@ -88,7 +88,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3858 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0x14 scope:local data:byte @3958 = .bss:0x00000068; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_mvstair/symbols.txt b/config/GZ2P01/rels/d_a_obj_mvstair/symbols.txt index 2062852306..46b0b823fc 100644 --- a/config/GZ2P01/rels/d_a_obj_mvstair/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_mvstair/symbols.txt @@ -59,9 +59,11 @@ l_heap_size = .rodata:0x00000028; // type:object size:0x8 scope:global @4064 = .rodata:0x00000058; // type:object size:0x4 scope:local @4065 = .rodata:0x0000005C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000060; // type:object size:0x14 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_578_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global @3754 = .data:0x00000028; // type:object size:0xC scope:local @3755 = .data:0x00000034; // type:object size:0xC scope:local @@ -77,5 +79,5 @@ daObjStair_METHODS = .data:0x000000E8; // type:object size:0x20 scope:global g_profile_Obj_MvStair = .data:0x00000108; // type:object size:0x30 scope:global __vt__18dPa_levelEcallBack = .data:0x00000138; // type:object size:0x24 scope:global __vt__12daObjStair_c = .data:0x0000015C; // type:object size:0x28 scope:global -lbl_578_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_578_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_myogan/splits.txt b/config/GZ2P01/rels/d_a_obj_myogan/splits.txt index 7be77c73e5..5c659cc14b 100644 --- a/config/GZ2P01/rels/d_a_obj_myogan/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_myogan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_myogan.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_myogan/symbols.txt b/config/GZ2P01/rels/d_a_obj_myogan/symbols.txt index 1057d7e7e5..e686fb3bce 100644 --- a/config/GZ2P01/rels/d_a_obj_myogan/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_myogan/symbols.txt @@ -29,6 +29,6 @@ g_profile_OBJ_MYOGAN = .data:0x00000020; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000050; // type:object size:0xC scope:global __vt__18daObj_Myogan_HIO_c = .data:0x0000005C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_579_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3757 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_nameplate/symbols.txt b/config/GZ2P01/rels/d_a_obj_nameplate/symbols.txt index a2e77a79dc..8ce4a38d5f 100644 --- a/config/GZ2P01/rels/d_a_obj_nameplate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_nameplate/symbols.txt @@ -38,7 +38,7 @@ ccSphSrc$3700 = .rodata:0x00000040; // type:object size:0x40 scope:local @3769 = .rodata:0x00000088; // type:object size:0x4 scope:local @3791 = .rodata:0x00000090; // type:object size:0x8 scope:local align:8 data:double @stringBase0 = .rodata:0x00000098; // type:object size:0x19 scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global +l_arcName__16daObjNameplate_c = .data:0x00000000; // type:object size:0x4 scope:global l_daObjNameplate_Method = .data:0x00000004; // type:object size:0x20 scope:global g_profile_Obj_NamePlate = .data:0x00000024; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x00000054; // type:object size:0xC scope:global diff --git a/config/GZ2P01/rels/d_a_obj_nan/splits.txt b/config/GZ2P01/rels/d_a_obj_nan/splits.txt index 52a0243278..09b90966dd 100644 --- a/config/GZ2P01/rels/d_a_obj_nan/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_nan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_nan.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_nan/symbols.txt b/config/GZ2P01/rels/d_a_obj_nan/symbols.txt index c605154cfd..6103b51eb9 100644 --- a/config/GZ2P01/rels/d_a_obj_nan/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_nan/symbols.txt @@ -89,9 +89,11 @@ l_musiya_num = .rodata:0x000000D8; // type:object size:0x4 scope:global l_heapsize = .rodata:0x000000DC; // type:object size:0x4 scope:global @5034 = .rodata:0x000000E0; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000E4; // type:object size:0xE scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_581_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double cc_sph_src__25@unnamed@d_a_obj_nan_cpp@ = .data:0x00000020; // type:object size:0x40 scope:global @3924 = .data:0x00000060; // type:object size:0xC scope:local data:4byte @4034 = .data:0x0000006C; // type:object size:0xC scope:local data:4byte @@ -121,6 +123,6 @@ __vt__8cM3dGPla = .data:0x000001B8; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000001C4; // type:object size:0xC scope:global __vt__14daObj_NanHIO_c = .data:0x000001D0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_581_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3769 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_nougu/splits.txt b/config/GZ2P01/rels/d_a_obj_nougu/splits.txt index 1a55b7b10a..84941b9b11 100644 --- a/config/GZ2P01/rels/d_a_obj_nougu/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_nougu/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_nougu.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_octhashi/symbols.txt b/config/GZ2P01/rels/d_a_obj_octhashi/symbols.txt index 1f3cd5c56f..6bc38d728f 100644 --- a/config/GZ2P01/rels/d_a_obj_octhashi/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_octhashi/symbols.txt @@ -72,9 +72,9 @@ ccSphSrc$3655 = .rodata:0x00000000; // type:object size:0x40 scope:local @4166 = .rodata:0x000000C8; // type:object size:0x4 scope:local @4167 = .rodata:0x000000CC; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000D0; // type:object size:0x33 scope:local data:string_table -l_arcName = .data:0x00000000; // type:object size:0x4 scope:global +l_arcName = .data:0x00000000; // type:object size:0x4 scope:local ccCylSrc$3656 = .data:0x00000004; // type:object size:0x44 scope:local align:4 data:float -l_daObjOCTHASHI_Method = .data:0x00000048; // type:object size:0x20 scope:global +l_daObjOCTHASHI_Method = .data:0x00000048; // type:object size:0x20 scope:local g_profile_OCTHASHI = .data:0x00000068; // type:object size:0x30 scope:global __vt__10cCcD_GStts = .data:0x00000098; // type:object size:0xC scope:global __vt__10dCcD_GStts = .data:0x000000A4; // type:object size:0xC scope:global @@ -82,4 +82,4 @@ __vt__8cM3dGSph = .data:0x000000B0; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x000000BC; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000000C8; // type:object size:0xC scope:global __vt__15daObjOCTHASHI_c = .data:0x000000D4; // type:object size:0x28 scope:global -lbl_584_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +l_cyl_height_init = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_oiltubo/symbols.txt b/config/GZ2P01/rels/d_a_obj_oiltubo/symbols.txt index 74863e882f..270023daf0 100644 --- a/config/GZ2P01/rels/d_a_obj_oiltubo/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_oiltubo/symbols.txt @@ -50,7 +50,8 @@ mCcDObjInfo__15daObj_Oiltubo_c = .rodata:0x00000000; // type:object size:0x30 sc @stringBase0 = .rodata:0x00000054; // type:object size:0x3F scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_585_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resFileName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_bmdFileName = .data:0x00000024; // type:object size:0x4 scope:global l_bbmdFileName = .data:0x00000028; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_onsenTaru/splits.txt b/config/GZ2P01/rels/d_a_obj_onsenTaru/splits.txt index 83f9bc9133..c482a16aea 100644 --- a/config/GZ2P01/rels/d_a_obj_onsenTaru/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_onsenTaru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_onsenTaru.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_onsenTaru/symbols.txt b/config/GZ2P01/rels/d_a_obj_onsenTaru/symbols.txt index f8704d22a2..944803c561 100644 --- a/config/GZ2P01/rels/d_a_obj_onsenTaru/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_onsenTaru/symbols.txt @@ -67,9 +67,11 @@ mCcDObjInfo__11daOnsTaru_c = .rodata:0x00000008; // type:object size:0x30 scope: @4136 = .rodata:0x00000074; // type:object size:0x4 scope:local @4186 = .rodata:0x00000078; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x0000007C; // type:object size:0x21 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_588_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daOnsTaru_c = .data:0x00000020; // type:object size:0x44 scope:global @4002 = .data:0x00000064; // type:object size:0xC scope:local @4003 = .data:0x00000070; // type:object size:0xC scope:local @@ -92,4 +94,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001BC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -lbl_588_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$1920 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_pdoor/symbols.txt b/config/GZ2P01/rels/d_a_obj_pdoor/symbols.txt index 08eca93f6e..de3bc86d29 100644 --- a/config/GZ2P01/rels/d_a_obj_pdoor/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_pdoor/symbols.txt @@ -30,9 +30,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4053 = .rodata:0x00000018; // type:object size:0x4 scope:local @4054 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_589_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cull_box = .data:0x00000024; // type:object size:0x18 scope:global align:4 data:float @3781 = .data:0x0000003C; // type:object size:0xC scope:local @@ -41,4 +43,4 @@ l_func$3780 = .data:0x00000054; // type:object size:0x18 scope:local daObjPDoor_METHODS = .data:0x0000006C; // type:object size:0x20 scope:global g_profile_Obj_PushDoor = .data:0x0000008C; // type:object size:0x30 scope:global __vt__12daObjPDoor_c = .data:0x000000BC; // type:object size:0x28 scope:global -lbl_589_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_pdtile/symbols.txt b/config/GZ2P01/rels/d_a_obj_pdtile/symbols.txt index fa49c99206..bca19f1104 100644 --- a/config/GZ2P01/rels/d_a_obj_pdtile/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_pdtile/symbols.txt @@ -57,7 +57,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000074; // type:object size:0x1C scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_590_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName4 = .data:0x00000020; // type:object size:0x4 scope:global l_dzbidx4 = .data:0x00000024; // type:object size:0x8 scope:global l_bmdidx4 = .data:0x0000002C; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_pillar/splits.txt b/config/GZ2P01/rels/d_a_obj_pillar/splits.txt index f220bcb15f..f1c6137890 100644 --- a/config/GZ2P01/rels/d_a_obj_pillar/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_pillar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pillar.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_pillar/symbols.txt b/config/GZ2P01/rels/d_a_obj_pillar/symbols.txt index ac85343b1b..65d6d41b0f 100644 --- a/config/GZ2P01/rels/d_a_obj_pillar/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_pillar/symbols.txt @@ -63,9 +63,11 @@ l_shake_data = .rodata:0x00000064; // type:object size:0x30 scope:global data:2b @4266 = .rodata:0x000000F0; // type:object size:0x4 scope:local @4267 = .rodata:0x000000F4; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000F8; // type:object size:0x1B scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_593_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global @4193 = .data:0x00000028; // type:object size:0xC scope:local @4194 = .data:0x00000034; // type:object size:0xC scope:local @@ -83,4 +85,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000124; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3657 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x28 scope:global align:4 data:float -lbl_593_bss_3C = .bss:0x0000003C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000003C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_pleaf/splits.txt b/config/GZ2P01/rels/d_a_obj_pleaf/splits.txt index b40bc20f27..504fb1b960 100644 --- a/config/GZ2P01/rels/d_a_obj_pleaf/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_pleaf/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pleaf.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_poCandle/splits.txt b/config/GZ2P01/rels/d_a_obj_poCandle/splits.txt index 4df1a366a5..cc39941536 100644 --- a/config/GZ2P01/rels/d_a_obj_poCandle/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_poCandle/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poCandle.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_poCandle/symbols.txt b/config/GZ2P01/rels/d_a_obj_poCandle/symbols.txt index f7071915c8..85a06cf1d9 100644 --- a/config/GZ2P01/rels/d_a_obj_poCandle/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_poCandle/symbols.txt @@ -53,9 +53,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3769 = .rodata:0x00000028; // type:object size:0x4 scope:local @3814 = .rodata:0x0000002C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000030; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_595_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3774 = .data:0x00000020; // type:object size:0xC scope:local @3775 = .data:0x0000002C; // type:object size:0xC scope:local @3776 = .data:0x00000038; // type:object size:0xC scope:local @@ -70,4 +72,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000013C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3629 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global align:4 data:float -lbl_595_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_poFire/splits.txt b/config/GZ2P01/rels/d_a_obj_poFire/splits.txt index 94cfbd0ed4..f88811c765 100644 --- a/config/GZ2P01/rels/d_a_obj_poFire/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_poFire/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poFire.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_poFire/symbols.txt b/config/GZ2P01/rels/d_a_obj_poFire/symbols.txt index 95b6bb9923..cec1e34cf9 100644 --- a/config/GZ2P01/rels/d_a_obj_poFire/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_poFire/symbols.txt @@ -74,9 +74,11 @@ itemNo = .rodata:0x0000001C; // type:object size:0x4 scope:global @4107 = .rodata:0x00000048; // type:object size:0x4 scope:local @4134 = .rodata:0x0000004C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000050; // type:object size:0x17 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_596_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3740 = .data:0x00000020; // type:object size:0xC scope:local @3741 = .data:0x0000002C; // type:object size:0xC scope:local @3742 = .data:0x00000038; // type:object size:0xC scope:local @@ -97,4 +99,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001A0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3656 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x34 scope:global data:byte -lbl_596_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_poTbox/splits.txt b/config/GZ2P01/rels/d_a_obj_poTbox/splits.txt index 1d8f74ec86..0fa2b1ca2d 100644 --- a/config/GZ2P01/rels/d_a_obj_poTbox/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_poTbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_poTbox.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_poTbox/symbols.txt b/config/GZ2P01/rels/d_a_obj_poTbox/symbols.txt index ff97e58d8b..877008ed62 100644 --- a/config/GZ2P01/rels/d_a_obj_poTbox/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_poTbox/symbols.txt @@ -35,9 +35,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3835 = .rodata:0x00000010; // type:object size:0x8 scope:local align:8 data:double @3926 = .rodata:0x00000018; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x0000001C; // type:object size:0x10 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_597_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_type = .data:0x00000020; // type:object size:0x8 scope:global l_bmdIdx = .data:0x00000028; // type:object size:0x8 scope:global l_dzbIdx = .data:0x00000030; // type:object size:0x8 scope:global @@ -55,4 +57,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3622 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global -lbl_597_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_pumpkin/splits.txt b/config/GZ2P01/rels/d_a_obj_pumpkin/splits.txt index f1acf4b648..a4a83c5585 100644 --- a/config/GZ2P01/rels/d_a_obj_pumpkin/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_pumpkin/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_pumpkin.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_pumpkin/symbols.txt b/config/GZ2P01/rels/d_a_obj_pumpkin/symbols.txt index dd7dee69f2..65f1270502 100644 --- a/config/GZ2P01/rels/d_a_obj_pumpkin/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_pumpkin/symbols.txt @@ -82,7 +82,8 @@ l_ccDObjData = .rodata:0x00000034; // type:object size:0x30 scope:global @stringBase0 = .rodata:0x000000F0; // type:object size:0x9 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_599_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_resNameList = .data:0x00000028; // type:object size:0x8 scope:global l_ccDCyl = .data:0x00000030; // type:object size:0x44 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_rfHole/splits.txt b/config/GZ2P01/rels/d_a_obj_rfHole/splits.txt index b7bae7bc58..dd169c4040 100644 --- a/config/GZ2P01/rels/d_a_obj_rfHole/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_rfHole/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rfHole.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_rfHole/symbols.txt b/config/GZ2P01/rels/d_a_obj_rfHole/symbols.txt index c5c9d81845..f0ae86a723 100644 --- a/config/GZ2P01/rels/d_a_obj_rfHole/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_rfHole/symbols.txt @@ -43,9 +43,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3821 = .rodata:0x0000002C; // type:object size:0x4 scope:local particle_id$3917 = .rodata:0x00000030; // type:object size:0xA scope:local @stringBase0 = .rodata:0x0000003C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_601_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3835 = .data:0x00000020; // type:object size:0xC scope:local @3836 = .data:0x0000002C; // type:object size:0xC scope:local @3837 = .data:0x00000038; // type:object size:0xC scope:local @@ -59,4 +61,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000104; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x18 scope:global align:4 data:float -lbl_601_bss_2C = .bss:0x0000002C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000002C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_rgate/symbols.txt b/config/GZ2P01/rels/d_a_obj_rgate/symbols.txt index b14810af68..a46e9b9292 100644 --- a/config/GZ2P01/rels/d_a_obj_rgate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_rgate/symbols.txt @@ -79,9 +79,11 @@ l_cyl_src = .rodata:0x00000018; // type:object size:0x44 scope:global @4742 = .rodata:0x000000E4; // type:object size:0x4 scope:local data:string @4744 = .rodata:0x000000E8; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x000000F0; // type:object size:0x45 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_602_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @4797 = .data:0x00000024; // type:object size:0xC scope:local @4798 = .data:0x00000030; // type:object size:0xC scope:local @@ -96,5 +98,5 @@ __vt__8cM3dGAab = .data:0x000000E4; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x000000F0; // type:object size:0xC scope:global __vt__12daObjRgate_c = .data:0x000000FC; // type:object size:0x28 scope:global l_evName$4049 = .bss:0x00000000; // type:object size:0x4 scope:local -lbl_602_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte -lbl_602_bss_5 = .bss:0x00000005; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000005; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_riverrock/splits.txt b/config/GZ2P01/rels/d_a_obj_riverrock/splits.txt index ecd6bae4b0..5ee30642ca 100644 --- a/config/GZ2P01/rels/d_a_obj_riverrock/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_riverrock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_riverrock.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_riverrock/symbols.txt b/config/GZ2P01/rels/d_a_obj_riverrock/symbols.txt index 16232a3684..5637c4cf0c 100644 --- a/config/GZ2P01/rels/d_a_obj_riverrock/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_riverrock/symbols.txt @@ -70,6 +70,6 @@ __vt__8cM3dGAab = .data:0x00000060; // type:object size:0xC scope:global __vt__16daObjRIVERROCK_c = .data:0x0000006C; // type:object size:0x28 scope:global __vt__20daObjRIVERROCK_HIO_c = .data:0x00000094; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_603_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3626 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_rope_bridge/symbols.txt b/config/GZ2P01/rels/d_a_obj_rope_bridge/symbols.txt index a075e6fcdb..cebf2fa75b 100644 --- a/config/GZ2P01/rels/d_a_obj_rope_bridge/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_rope_bridge/symbols.txt @@ -68,7 +68,8 @@ l_rope_cullbox = .rodata:0x00000048; // type:object size:0x18 scope:global align @stringBase0 = .rodata:0x000000C4; // type:object size:0x24 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_110_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_ropeArcName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte l_rope_offsetL = .data:0x0000002C; // type:object size:0x18 scope:global @@ -97,4 +98,4 @@ __vt__8cM3dGSph = .data:0x00000240; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x0000024C; // type:object size:0xC scope:global __vt__18mDoExt_3DlineMat_c = .data:0x00000258; // type:object size:0x14 scope:global __vt__14daObjRBridge_c = .data:0x0000026C; // type:object size:0x28 scope:global -lbl_110_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_rotBridge/splits.txt b/config/GZ2P01/rels/d_a_obj_rotBridge/splits.txt index ca839421bc..fb53325064 100644 --- a/config/GZ2P01/rels/d_a_obj_rotBridge/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_rotBridge/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rotBridge.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_rotTrap/splits.txt b/config/GZ2P01/rels/d_a_obj_rotTrap/splits.txt index 22f0c2ec29..bb3bd8b87b 100644 --- a/config/GZ2P01/rels/d_a_obj_rotTrap/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_rotTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rotTrap.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_rotTrap/symbols.txt b/config/GZ2P01/rels/d_a_obj_rotTrap/symbols.txt index 8f3911c1b5..5ef2d7bec9 100644 --- a/config/GZ2P01/rels/d_a_obj_rotTrap/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_rotTrap/symbols.txt @@ -45,9 +45,11 @@ mCcDObjInfo__11daRotTrap_c = .rodata:0x00000004; // type:object size:0x30 scope: @3925 = .rodata:0x00000048; // type:object size:0x4 scope:local @3940 = .rodata:0x0000004C; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000050; // type:object size:0x7 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_606_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daRotTrap_c = .data:0x00000020; // type:object size:0x44 scope:global atPos = .data:0x00000064; // type:object size:0xA8 scope:global atR = .data:0x0000010C; // type:object size:0x38 scope:global @@ -67,4 +69,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000240; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global align:4 data:float -lbl_606_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_rstair/symbols.txt b/config/GZ2P01/rels/d_a_obj_rstair/symbols.txt index 8476affb70..f11a67e70d 100644 --- a/config/GZ2P01/rels/d_a_obj_rstair/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_rstair/symbols.txt @@ -39,9 +39,11 @@ l_target_angleY = .rodata:0x00000010; // type:object size:0x10 scope:global @3912 = .rodata:0x00000028; // type:object size:0x4 scope:local @4107 = .rodata:0x0000002C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000030; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_608_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_water_check_offset = .data:0x00000024; // type:object size:0xC scope:global @3811 = .data:0x00000030; // type:object size:0xC scope:local @@ -56,5 +58,5 @@ daObjRotStair_METHODS = .data:0x000000C0; // type:object size:0x20 scope:global g_profile_Obj_RotStair = .data:0x000000E0; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000110; // type:object size:0xC scope:global __vt__15daObjRotStair_c = .data:0x0000011C; // type:object size:0x28 scope:global -lbl_608_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_608_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_rw/splits.txt b/config/GZ2P01/rels/d_a_obj_rw/splits.txt index 512cc1b3b7..35df00ee56 100644 --- a/config/GZ2P01/rels/d_a_obj_rw/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_rw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_rw.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_rw/symbols.txt b/config/GZ2P01/rels/d_a_obj_rw/symbols.txt index 6f81469e6c..8cbf2eb9a2 100644 --- a/config/GZ2P01/rels/d_a_obj_rw/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_rw/symbols.txt @@ -60,6 +60,6 @@ __vt__8cM3dGAab = .data:0x00000100; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x0000010C; // type:object size:0xC scope:global __vt__14daOBJ_RW_HIO_c = .data:0x00000118; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_609_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3644 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_sWallShutter/splits.txt b/config/GZ2P01/rels/d_a_obj_sWallShutter/splits.txt index 954037f834..ebdb2c2f98 100644 --- a/config/GZ2P01/rels/d_a_obj_sWallShutter/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_sWallShutter/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sWallShutter.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_sWallShutter/symbols.txt b/config/GZ2P01/rels/d_a_obj_sWallShutter/symbols.txt index 1948099b9e..495f590b1f 100644 --- a/config/GZ2P01/rels/d_a_obj_sWallShutter/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_sWallShutter/symbols.txt @@ -47,7 +47,8 @@ l_dzbIdx = .rodata:0x00000028; // type:object size:0x8 scope:global @stringBase0 = .rodata:0x00000040; // type:object size:0xF scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_111_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resNameIdx = .data:0x00000020; // type:object size:0x8 scope:global @3746 = .data:0x00000028; // type:object size:0xC scope:local @3747 = .data:0x00000034; // type:object size:0xC scope:local @@ -62,4 +63,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000010C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3624 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x2C scope:global data:byte -lbl_111_bss_40 = .bss:0x00000040; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000040; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_saidan/splits.txt b/config/GZ2P01/rels/d_a_obj_saidan/splits.txt index e2d85e7f2b..29bfc7d674 100644 --- a/config/GZ2P01/rels/d_a_obj_saidan/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_saidan/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_saidan.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_saidan/symbols.txt b/config/GZ2P01/rels/d_a_obj_saidan/symbols.txt index b7561d1a4c..e8edbe0233 100644 --- a/config/GZ2P01/rels/d_a_obj_saidan/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_saidan/symbols.txt @@ -36,9 +36,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3761 = .rodata:0x00000014; // type:object size:0x4 scope:local align:4 data:float @3762 = .rodata:0x00000018; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000001C; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_610_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3718 = .data:0x00000020; // type:object size:0xC scope:local @3719 = .data:0x0000002C; // type:object size:0xC scope:local @3720 = .data:0x00000038; // type:object size:0xC scope:local @@ -51,4 +53,4 @@ __vt__14mDoHIO_entry_c = .data:0x000000EC; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global align:4 data:float -lbl_610_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_scannon/symbols.txt b/config/GZ2P01/rels/d_a_obj_scannon/symbols.txt index 2ab59e7aea..b42f479c30 100644 --- a/config/GZ2P01/rels/d_a_obj_scannon/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_scannon/symbols.txt @@ -83,7 +83,8 @@ s_demoTable__11daSCannon_c = .rodata:0x0000003C; // type:object size:0x30 scope: @stringBase0 = .rodata:0x0000009C; // type:object size:0xE0 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_613_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName_Comp = .data:0x00000020; // type:object size:0x4 scope:global l_arcName_Crash = .data:0x00000024; // type:object size:0x4 scope:global l_arcName_Zev = .data:0x00000028; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_obj_scannon_crs/symbols.txt b/config/GZ2P01/rels/d_a_obj_scannon_crs/symbols.txt index b06332c345..fd90f41e32 100644 --- a/config/GZ2P01/rels/d_a_obj_scannon_crs/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_scannon_crs/symbols.txt @@ -62,7 +62,8 @@ MIDNA_BEAM_OFFSET$4360 = .rodata:0x00000080; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000094; // type:object size:0x45 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_614_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_obj_scannon_ten/symbols.txt b/config/GZ2P01/rels/d_a_obj_scannon_ten/symbols.txt index e8e80a51b0..1b15313a46 100644 --- a/config/GZ2P01/rels/d_a_obj_scannon_ten/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_scannon_ten/symbols.txt @@ -71,7 +71,8 @@ PARTICLE_NAME$4297 = .rodata:0x00000040; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000048; // type:object size:0x4D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_615_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_obj_sekidoor/splits.txt b/config/GZ2P01/rels/d_a_obj_sekidoor/splits.txt index 540e8a3867..561aaf3ff7 100644 --- a/config/GZ2P01/rels/d_a_obj_sekidoor/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_sekidoor/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekidoor.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_sekidoor/symbols.txt b/config/GZ2P01/rels/d_a_obj_sekidoor/symbols.txt index 0573ef98df..13f42e4941 100644 --- a/config/GZ2P01/rels/d_a_obj_sekidoor/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_sekidoor/symbols.txt @@ -36,7 +36,8 @@ id$4006 = .rodata:0x00000020; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000028; // type:object size:0xA scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_616_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global l_dzbData = .data:0x00000028; // type:object size:0x8 scope:global l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_sekizo/splits.txt b/config/GZ2P01/rels/d_a_obj_sekizo/splits.txt index 8e5032b6ec..cb711953d2 100644 --- a/config/GZ2P01/rels/d_a_obj_sekizo/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_sekizo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekizo.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_sekizo/symbols.txt b/config/GZ2P01/rels/d_a_obj_sekizo/symbols.txt index 923fc6608a..9b3ad28267 100644 --- a/config/GZ2P01/rels/d_a_obj_sekizo/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_sekizo/symbols.txt @@ -24,7 +24,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000000; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_617_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global l_dzbData = .data:0x00000028; // type:object size:0x8 scope:global l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_sekizoa/splits.txt b/config/GZ2P01/rels/d_a_obj_sekizoa/splits.txt index 9b3d30fcbd..6e652aa808 100644 --- a/config/GZ2P01/rels/d_a_obj_sekizoa/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_sekizoa/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_sekizoa.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_sekizoa/symbols.txt b/config/GZ2P01/rels/d_a_obj_sekizoa/symbols.txt index b14a5f1bfd..8ca0bc9934 100644 --- a/config/GZ2P01/rels/d_a_obj_sekizoa/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_sekizoa/symbols.txt @@ -153,7 +153,8 @@ heapSize$4093 = .rodata:0x0000009C; // type:object size:0x20 scope:local @stringBase0 = .rodata:0x00000168; // type:object size:0x71 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_618_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x48 scope:global l_evtList = .data:0x00000068; // type:object size:0x50 scope:global data:4byte l_resNameList = .data:0x000000B8; // type:object size:0xC scope:global diff --git a/config/GZ2P01/rels/d_a_obj_shield/symbols.txt b/config/GZ2P01/rels/d_a_obj_shield/symbols.txt index f81f43b099..2cd3abc00a 100644 --- a/config/GZ2P01/rels/d_a_obj_shield/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_shield/symbols.txt @@ -64,9 +64,11 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @4336 = .rodata:0x000000B0; // type:object size:0x4 scope:local @4337 = .rodata:0x000000B4; // type:object size:0x4 scope:local data:string @stringBase0 = .rodata:0x000000B8; // type:object size:0x10 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_619_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4189 = .data:0x00000020; // type:object size:0xC scope:local @4190 = .data:0x0000002C; // type:object size:0xC scope:local @4191 = .data:0x00000038; // type:object size:0xC scope:local @@ -87,5 +89,5 @@ __vt__8cM3dGAab = .data:0x00000160; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000016C; // type:object size:0x24 scope:global __vt__14daItemShield_c = .data:0x00000190; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001D4; // type:object size:0xC scope:global -lbl_619_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_619_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_smallkey/symbols.txt b/config/GZ2P01/rels/d_a_obj_smallkey/symbols.txt index 22fd8ada7a..af9c1794d8 100644 --- a/config/GZ2P01/rels/d_a_obj_smallkey/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_smallkey/symbols.txt @@ -78,9 +78,11 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @4503 = .rodata:0x00000094; // type:object size:0x4 scope:local align:4 data:float @4618 = .rodata:0x00000098; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000009C; // type:object size:0x18 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_621_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4652 = .data:0x00000020; // type:object size:0xC scope:local @4653 = .data:0x0000002C; // type:object size:0xC scope:local @4654 = .data:0x00000038; // type:object size:0xC scope:local @@ -101,4 +103,4 @@ __vt__8cM3dGAab = .data:0x00000184; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000190; // type:object size:0x24 scope:global __vt__7daKey_c = .data:0x000001B4; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001F8; // type:object size:0xC scope:global -lbl_621_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_smgdoor/symbols.txt b/config/GZ2P01/rels/d_a_obj_smgdoor/symbols.txt index 40ac5fd5f9..e4a30d1076 100644 --- a/config/GZ2P01/rels/d_a_obj_smgdoor/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_smgdoor/symbols.txt @@ -61,4 +61,4 @@ l_func$3923 = .data:0x00000094; // type:object size:0x24 scope:local daObjSmgDoor_METHODS = .data:0x000000B8; // type:object size:0x20 scope:global g_profile_Obj_SmgDoor = .data:0x000000D8; // type:object size:0x30 scope:global __vt__14daObjSmgDoor_c = .data:0x00000108; // type:object size:0x28 scope:global -init$1847 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1847 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_smtile/splits.txt b/config/GZ2P01/rels/d_a_obj_smtile/splits.txt index 0d2f9be9c3..5d1eb3043a 100644 --- a/config/GZ2P01/rels/d_a_obj_smtile/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_smtile/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_smtile.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_snowEffTag/splits.txt b/config/GZ2P01/rels/d_a_obj_snowEffTag/splits.txt index f429528250..b52be28dd5 100644 --- a/config/GZ2P01/rels/d_a_obj_snowEffTag/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_snowEffTag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_snowEffTag.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_so/splits.txt b/config/GZ2P01/rels/d_a_obj_so/splits.txt index 866abd824a..73d7243a3f 100644 --- a/config/GZ2P01/rels/d_a_obj_so/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_so/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_so.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_so/symbols.txt b/config/GZ2P01/rels/d_a_obj_so/symbols.txt index edc721f1bc..805466faa3 100644 --- a/config/GZ2P01/rels/d_a_obj_so/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_so/symbols.txt @@ -141,6 +141,6 @@ __vt__12dBgS_ObjAcch = .data:0x000000B4; // type:object size:0x24 scope:global __vt__14dBgS_ObjGndChk = .data:0x000000D8; // type:object size:0x30 scope:global __vt__14daObj_So_HIO_c = .data:0x00000108; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_628_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3774 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0xC scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_spinLift/splits.txt b/config/GZ2P01/rels/d_a_obj_spinLift/splits.txt index 4e398c4423..8dddbc306e 100644 --- a/config/GZ2P01/rels/d_a_obj_spinLift/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_spinLift/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_spinLift.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_spinLift/symbols.txt b/config/GZ2P01/rels/d_a_obj_spinLift/symbols.txt index e6ef9cf494..742a89a2f6 100644 --- a/config/GZ2P01/rels/d_a_obj_spinLift/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_spinLift/symbols.txt @@ -61,4 +61,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000128; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3631 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x10 scope:global data:byte -init$1678 = .bss:0x00000024; // type:object size:0x1 data:byte +init$1678 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_ss_drink/symbols.txt b/config/GZ2P01/rels/d_a_obj_ss_drink/symbols.txt index 1e8f43055b..e3c36517a5 100644 --- a/config/GZ2P01/rels/d_a_obj_ss_drink/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_ss_drink/symbols.txt @@ -66,7 +66,8 @@ mCcDObjInfo__15daObj_SSDrink_c = .rodata:0x00000000; // type:object size:0x30 sc @stringBase0 = .rodata:0x00000060; // type:object size:0x32 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_630_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_resFileName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_bmdName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte mCcDCyl__15daObj_SSDrink_c = .data:0x00000028; // type:object size:0x44 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_stairBlock/splits.txt b/config/GZ2P01/rels/d_a_obj_stairBlock/splits.txt index 7f0ca5486d..0a98b4691c 100644 --- a/config/GZ2P01/rels/d_a_obj_stairBlock/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_stairBlock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stairBlock.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_stick/splits.txt b/config/GZ2P01/rels/d_a_obj_stick/splits.txt index 75e845f3f0..8d108c032c 100644 --- a/config/GZ2P01/rels/d_a_obj_stick/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_stick/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stick.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_stone/symbols.txt b/config/GZ2P01/rels/d_a_obj_stone/symbols.txt index 3f9e9ef8a5..8855ecc528 100644 --- a/config/GZ2P01/rels/d_a_obj_stone/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_stone/symbols.txt @@ -111,9 +111,11 @@ l_eff_id$5089 = .rodata:0x0000016C; // type:object size:0x6 scope:local @5256 = .rodata:0x00000178; // type:object size:0x8 scope:local l_carry_eff_id$5307 = .rodata:0x00000180; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x00000188; // type:object size:0x17 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_633_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global @4015 = .data:0x00000028; // type:object size:0xC scope:local @4016 = .data:0x00000034; // type:object size:0xC scope:local @@ -133,4 +135,4 @@ __vt__8cM3dGSph = .data:0x00000174; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000180; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x0000018C; // type:object size:0x24 scope:global __vt__8cM3dGPla = .data:0x000001B0; // type:object size:0xC scope:global -lbl_633_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_stopper/splits.txt b/config/GZ2P01/rels/d_a_obj_stopper/splits.txt index 439634cbe9..5d445edd08 100644 --- a/config/GZ2P01/rels/d_a_obj_stopper/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_stopper/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_stopper.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_stopper/symbols.txt b/config/GZ2P01/rels/d_a_obj_stopper/symbols.txt index 57f9c5bfc5..f26c6bb968 100644 --- a/config/GZ2P01/rels/d_a_obj_stopper/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_stopper/symbols.txt @@ -70,9 +70,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @4311 = .rodata:0x00000048; // type:object size:0x4 scope:local @4312 = .rodata:0x0000004C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000050; // type:object size:0xE scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_634_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3843 = .data:0x00000020; // type:object size:0xC scope:local @3844 = .data:0x0000002C; // type:object size:0xC scope:local @3845 = .data:0x00000038; // type:object size:0xC scope:local @@ -111,8 +113,9 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3627 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte l_offset$3626 = .bss:0x00000058; // type:object size:0xC scope:local -lbl_634_bss_64 = .bss:0x00000064; // type:object size:0x1 data:byte +init$0001 = .bss:0x00000064; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000068; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x0000006C; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x00000070; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_stopper2/symbols.txt b/config/GZ2P01/rels/d_a_obj_stopper2/symbols.txt index 23d17ac1f6..fb53cdc87d 100644 --- a/config/GZ2P01/rels/d_a_obj_stopper2/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_stopper2/symbols.txt @@ -36,9 +36,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3925 = .rodata:0x00000018; // type:object size:0x4 scope:local @3926 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0x52 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_635_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x10 scope:global l_staffName = .data:0x00000034; // type:object size:0x4 scope:global data:4byte @@ -50,4 +52,4 @@ l_func$3768 = .data:0x00000068; // type:object size:0x30 scope:local action_table$3859 = .data:0x00000098; // type:object size:0xC scope:local l_daObjStopper2_Method = .data:0x000000A4; // type:object size:0x20 scope:global g_profile_Obj_Stopper2 = .data:0x000000C4; // type:object size:0x30 scope:global -lbl_635_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_swBallA/symbols.txt b/config/GZ2P01/rels/d_a_obj_swBallA/symbols.txt index acee329b1f..6b28dd457d 100644 --- a/config/GZ2P01/rels/d_a_obj_swBallA/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_swBallA/symbols.txt @@ -40,9 +40,11 @@ l_color = .rodata:0x00000000; // type:object size:0x4 scope:global @4032 = .rodata:0x00000024; // type:object size:0x4 scope:local align:4 data:float @4122 = .rodata:0x00000028; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000002C; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_638_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3956 = .data:0x00000024; // type:object size:0xC scope:local @3957 = .data:0x00000030; // type:object size:0xC scope:local @@ -54,4 +56,4 @@ __vt__17dEvLib_callback_c = .data:0x000000C8; // type:object size:0x18 scope:glo __vt__12J3DFrameCtrl = .data:0x000000E0; // type:object size:0xC scope:global l_target_info = .bss:0x00000000; // type:object size:0x20 scope:global l_target_info_count = .bss:0x00000020; // type:object size:0x4 scope:global data:4byte -lbl_638_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_swBallB/symbols.txt b/config/GZ2P01/rels/d_a_obj_swBallB/symbols.txt index 8fa82dc145..dd68bf1a94 100644 --- a/config/GZ2P01/rels/d_a_obj_swBallB/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_swBallB/symbols.txt @@ -42,9 +42,11 @@ l_event_bitB = .rodata:0x00000010; // type:object size:0xC scope:global @4178 = .rodata:0x0000003C; // type:object size:0x4 scope:local @4276 = .rodata:0x00000040; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000044; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_639_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @4007 = .data:0x00000024; // type:object size:0xC scope:local @4008 = .data:0x00000030; // type:object size:0xC scope:local @@ -56,4 +58,4 @@ __vt__17dEvLib_callback_c = .data:0x000000C8; // type:object size:0x18 scope:glo __vt__12J3DFrameCtrl = .data:0x000000E0; // type:object size:0xC scope:global l_target_info = .bss:0x00000000; // type:object size:0x8 scope:global l_target_info_count = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte -lbl_639_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_swBallC/symbols.txt b/config/GZ2P01/rels/d_a_obj_swBallC/symbols.txt index 55d09580cb..d2096a75a9 100644 --- a/config/GZ2P01/rels/d_a_obj_swBallC/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_swBallC/symbols.txt @@ -46,9 +46,11 @@ l_color = .rodata:0x00000000; // type:object size:0x4 scope:global @4252 = .rodata:0x0000002C; // type:object size:0x4 scope:local @4253 = .rodata:0x00000030; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000034; // type:object size:0x87 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_640_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte @@ -63,4 +65,4 @@ action_table$3966 = .data:0x0000008C; // type:object size:0x34 scope:local l_daObjSwBallC_Method = .data:0x00000128; // type:object size:0x20 scope:global g_profile_Obj_SwBallC = .data:0x00000148; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000178; // type:object size:0xC scope:global -lbl_640_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_swLight/symbols.txt b/config/GZ2P01/rels/d_a_obj_swLight/symbols.txt index 93be2d29e9..674716218d 100644 --- a/config/GZ2P01/rels/d_a_obj_swLight/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_swLight/symbols.txt @@ -77,4 +77,4 @@ __vt__8cM3dGSph = .data:0x00000154; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000160; // type:object size:0xC scope:global __vt__17dEvLib_callback_c = .data:0x0000016C; // type:object size:0x18 scope:global __vt__14daObjSwLight_c = .data:0x00000184; // type:object size:0x44 scope:global -lbl_641_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_swhang/symbols.txt b/config/GZ2P01/rels/d_a_obj_swhang/symbols.txt index 21e2093ba0..9ffcdf1df1 100644 --- a/config/GZ2P01/rels/d_a_obj_swhang/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_swhang/symbols.txt @@ -58,9 +58,11 @@ l_heap_size = .rodata:0x00000050; // type:object size:0x14 scope:global @4229 = .rodata:0x0000008C; // type:object size:0x4 scope:local @4232 = .rodata:0x00000090; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000098; // type:object size:0x42 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_643_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x14 scope:global l_pull_jnt = .data:0x00000034; // type:object size:0x14 scope:global l_hang_offset = .data:0x00000048; // type:object size:0x3C scope:global @@ -77,4 +79,4 @@ __vt__8cM3dGSph = .data:0x0000019C; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global __vt__17dEvLib_callback_c = .data:0x000001B4; // type:object size:0x18 scope:global __vt__13daObjSwHang_c = .data:0x000001CC; // type:object size:0x48 scope:global -init$2095 = .bss:0x00000000; // type:object size:0x1 align:1 data:byte +init$2095 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_sword/symbols.txt b/config/GZ2P01/rels/d_a_obj_sword/symbols.txt index 28d66e8281..b6e7016a48 100644 --- a/config/GZ2P01/rels/d_a_obj_sword/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_sword/symbols.txt @@ -27,9 +27,11 @@ __dt__10cCcD_GSttsFv = .text:0x00000944; // type:function size:0x48 scope:global _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000000; // type:object size:0x10 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_644_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global align:4 data:float @3900 = .data:0x00000038; // type:object size:0xC scope:local @3901 = .data:0x00000044; // type:object size:0xC scope:local @@ -44,4 +46,4 @@ __vt__12daObjSword_c = .data:0x000000F4; // type:object size:0x44 scope:global __vt__8cM3dGCyl = .data:0x00000138; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000150; // type:object size:0x24 scope:global -lbl_644_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_swpush/splits.txt b/config/GZ2P01/rels/d_a_obj_swpush/splits.txt index 53f6db86bf..0fa179e99c 100644 --- a/config/GZ2P01/rels/d_a_obj_swpush/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_swpush/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swpush.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_swpush/symbols.txt b/config/GZ2P01/rels/d_a_obj_swpush/symbols.txt index 597903801c..8a7353a8df 100644 --- a/config/GZ2P01/rels/d_a_obj_swpush/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_swpush/symbols.txt @@ -77,7 +77,8 @@ tri_id$3921 = .rodata:0x00000124; // type:object size:0x6 scope:local @stringBase0 = .rodata:0x0000013C; // type:object size:0x38 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_21_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double M_arcname__Q211daObjSwpush5Act_c = .data:0x00000020; // type:object size:0xC scope:global @4518 = .data:0x0000002C; // type:object size:0xC scope:local @4519 = .data:0x00000038; // type:object size:0xC scope:local @@ -113,12 +114,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3915 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3918 = .bss:0x00000058; // type:object size:0xC scope:local @3919 = .bss:0x00000064; // type:object size:0xC scope:local @3920 = .bss:0x00000070; // type:object size:0xC scope:local no_push_vec$3914 = .bss:0x0000007C; // type:object size:0x30 scope:local -lbl_21_bss_AC = .bss:0x000000AC; // type:object size:0x1 data:byte -lbl_21_bss_AD = .bss:0x000000AD; // type:object size:0x1 data:byte +init$0001 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_swpush2/symbols.txt b/config/GZ2P01/rels/d_a_obj_swpush2/symbols.txt index 221cc24017..a75ba0052f 100644 --- a/config/GZ2P01/rels/d_a_obj_swpush2/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_swpush2/symbols.txt @@ -69,9 +69,11 @@ M_attr__Q212daObjSwpush25Act_c = .rodata:0x0000000C; // type:object size:0xE0 sc @4396 = .rodata:0x00000120; // type:object size:0x8 scope:local @4397 = .rodata:0x00000128; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000130; // type:object size:0x7C scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_645_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4336 = .data:0x00000020; // type:object size:0xC scope:local @4337 = .data:0x0000002C; // type:object size:0xC scope:local @4338 = .data:0x00000038; // type:object size:0xC scope:local @@ -86,5 +88,5 @@ mode_proc$4343 = .data:0x000000C8; // type:object size:0x30 scope:local Mthd_Table__Q212daObjSwpush229@unnamed@d_a_obj_swpush2_cpp@ = .data:0x000000F8; // type:object size:0x20 scope:global g_profile_Obj_Swpush2 = .data:0x00000118; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000148; // type:object size:0xC scope:global -lbl_645_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_645_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_swpush5/splits.txt b/config/GZ2P01/rels/d_a_obj_swpush5/splits.txt index 7e9bde187b..a87bc61af8 100644 --- a/config/GZ2P01/rels/d_a_obj_swpush5/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_swpush5/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_swpush5.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_swpush5/symbols.txt b/config/GZ2P01/rels/d_a_obj_swpush5/symbols.txt index 1e43a1a499..af703b8158 100644 --- a/config/GZ2P01/rels/d_a_obj_swpush5/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_swpush5/symbols.txt @@ -57,7 +57,8 @@ l_dzbIdx = .rodata:0x00000000; // type:object size:0x8 scope:global @stringBase0 = .rodata:0x0000002C; // type:object size:0x9 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_115_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3907 = .data:0x00000024; // type:object size:0xC scope:local @3908 = .data:0x00000030; // type:object size:0xC scope:local @@ -93,12 +94,13 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local @3654 = .bss:0x00000048; // type:object size:0xC scope:local +init$0000 = .bss:0x00000054; // type:object size:0x1 scope:local align:1 data:byte @3657 = .bss:0x00000058; // type:object size:0xC scope:local @3658 = .bss:0x00000064; // type:object size:0xC scope:local @3659 = .bss:0x00000070; // type:object size:0xC scope:local l_push_check_pos$3653 = .bss:0x0000007C; // type:object size:0x30 scope:local -lbl_115_bss_AC = .bss:0x000000AC; // type:object size:0x1 data:byte -lbl_115_bss_AD = .bss:0x000000AD; // type:object size:0x1 data:byte +init$0001 = .bss:0x000000AC; // type:object size:0x1 scope:local align:1 data:byte +init$0002 = .bss:0x000000AD; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000B0; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000B4; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000B8; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_swturn/symbols.txt b/config/GZ2P01/rels/d_a_obj_swturn/symbols.txt index 000fb04318..5bb87db7ed 100644 --- a/config/GZ2P01/rels/d_a_obj_swturn/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_swturn/symbols.txt @@ -39,9 +39,11 @@ l_tame_time_cnt = .rodata:0x00000020; // type:object size:0x2 scope:global data: @4189 = .rodata:0x00000044; // type:object size:0x4 scope:local @4304 = .rodata:0x00000048; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000004C; // type:object size:0x13 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_647_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global @3813 = .data:0x00000028; // type:object size:0xC scope:local @3814 = .data:0x00000034; // type:object size:0xC scope:local @@ -49,4 +51,4 @@ l_func$3812 = .data:0x00000040; // type:object size:0x18 scope:local daObjSwTurn_METHODS = .data:0x00000058; // type:object size:0x20 scope:global g_profile_Obj_SwTurn = .data:0x00000078; // type:object size:0x30 scope:global __vt__13daObjSwTurn_c = .data:0x000000A8; // type:object size:0x28 scope:global -lbl_647_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_syRock/splits.txt b/config/GZ2P01/rels/d_a_obj_syRock/splits.txt index 98115bf46b..25c9737f3f 100644 --- a/config/GZ2P01/rels/d_a_obj_syRock/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_syRock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_syRock.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_syRock/symbols.txt b/config/GZ2P01/rels/d_a_obj_syRock/symbols.txt index bbd2b18a11..8c145bcb77 100644 --- a/config/GZ2P01/rels/d_a_obj_syRock/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_syRock/symbols.txt @@ -82,9 +82,11 @@ mCcDObjInfo__10daSyRock_c = .rodata:0x00000028; // type:object size:0x30 scope:g @4197 = .rodata:0x00000098; // type:object size:0x4 scope:local align:4 data:float @4275 = .rodata:0x0000009C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000A0; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_648_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__10daSyRock_c = .data:0x00000020; // type:object size:0x44 scope:global @3922 = .data:0x00000064; // type:object size:0xC scope:local @3923 = .data:0x00000070; // type:object size:0xC scope:local @@ -108,4 +110,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000210; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3656 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x34 scope:global data:byte -lbl_648_bss_48 = .bss:0x00000048; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000048; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_taFence/splits.txt b/config/GZ2P01/rels/d_a_obj_taFence/splits.txt index 9100cabbfd..fb142af441 100644 --- a/config/GZ2P01/rels/d_a_obj_taFence/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_taFence/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_taFence.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_taFence/symbols.txt b/config/GZ2P01/rels/d_a_obj_taFence/symbols.txt index 83384ee213..32ea092875 100644 --- a/config/GZ2P01/rels/d_a_obj_taFence/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_taFence/symbols.txt @@ -60,9 +60,11 @@ l_check_area = .rodata:0x00000064; // type:object size:0x30 scope:global @3981 = .rodata:0x000000B0; // type:object size:0x4 scope:local align:4 data:float @4028 = .rodata:0x000000B4; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000B8; // type:object size:0x9 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_650_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__11daTaFence_c = .data:0x00000020; // type:object size:0x44 scope:global @3870 = .data:0x00000064; // type:object size:0xC scope:local @3871 = .data:0x00000070; // type:object size:0xC scope:local @@ -81,4 +83,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000178; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3645 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x74 scope:global data:byte -lbl_650_bss_88 = .bss:0x00000088; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000088; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_takaraDai/splits.txt b/config/GZ2P01/rels/d_a_obj_takaraDai/splits.txt index c34759ac2b..0495e417cb 100644 --- a/config/GZ2P01/rels/d_a_obj_takaraDai/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_takaraDai/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_takaraDai.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_takaraDai/symbols.txt b/config/GZ2P01/rels/d_a_obj_takaraDai/symbols.txt index 2a6f816fe3..14a79d3164 100644 --- a/config/GZ2P01/rels/d_a_obj_takaraDai/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_takaraDai/symbols.txt @@ -54,4 +54,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000009C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3621 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x3C scope:global align:4 data:float -lbl_652_bss_50 = .bss:0x00000050; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000050; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_ten/splits.txt b/config/GZ2P01/rels/d_a_obj_ten/splits.txt index 2df8d2c33b..a8d1a89795 100644 --- a/config/GZ2P01/rels/d_a_obj_ten/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_ten/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_ten.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_ten/symbols.txt b/config/GZ2P01/rels/d_a_obj_ten/symbols.txt index 9bb8e9b4ac..e99c7c124a 100644 --- a/config/GZ2P01/rels/d_a_obj_ten/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_ten/symbols.txt @@ -96,6 +96,6 @@ __vt__8cM3dGPla = .data:0x00000098; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A4; // type:object size:0xC scope:global __vt__14daObj_TenHIO_c = .data:0x000000B0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_654_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x10 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_thdoor/symbols.txt b/config/GZ2P01/rels/d_a_obj_thdoor/symbols.txt index e101ef7787..b61c61230b 100644 --- a/config/GZ2P01/rels/d_a_obj_thdoor/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_thdoor/symbols.txt @@ -64,4 +64,4 @@ __vt__10dCcD_GStts = .data:0x00000138; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000144; // type:object size:0xC scope:global __vt__8cM3dGCyl = .data:0x00000150; // type:object size:0xC scope:global __vt__13daObjThDoor_c = .data:0x0000015C; // type:object size:0x28 scope:global -init$1622 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte +init$1622 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_timeFire/splits.txt b/config/GZ2P01/rels/d_a_obj_timeFire/splits.txt index 209705648c..d62d887178 100644 --- a/config/GZ2P01/rels/d_a_obj_timeFire/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_timeFire/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_timeFire.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_timer/symbols.txt b/config/GZ2P01/rels/d_a_obj_timer/symbols.txt index 2f54c95c24..3b43318673 100644 --- a/config/GZ2P01/rels/d_a_obj_timer/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_timer/symbols.txt @@ -20,10 +20,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3721 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_22_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3726 = .data:0x00000020; // type:object size:0xC scope:local @3727 = .data:0x0000002C; // type:object size:0xC scope:local mode_proc$3725 = .data:0x00000038; // type:object size:0x18 scope:local Mthd_Table__Q210daObjTimer27@unnamed@d_a_obj_timer_cpp@ = .data:0x00000050; // type:object size:0x20 scope:global g_profile_Obj_Timer = .data:0x00000070; // type:object size:0x30 scope:global -lbl_22_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_tks/splits.txt b/config/GZ2P01/rels/d_a_obj_tks/splits.txt index 44d257f0e5..1029e9ea60 100644 --- a/config/GZ2P01/rels/d_a_obj_tks/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_tks/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tks.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_tks/symbols.txt b/config/GZ2P01/rels/d_a_obj_tks/symbols.txt index 3baa65a273..0ad479815a 100644 --- a/config/GZ2P01/rels/d_a_obj_tks/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_tks/symbols.txt @@ -117,7 +117,8 @@ m_cameraItemNum$4211 = .rodata:0x00000080; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000018C; // type:object size:0x25 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_660_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bckGetParamList = .data:0x00000020; // type:object size:0x30 scope:global l_btpGetParamList = .data:0x00000050; // type:object size:0x8 scope:global l_btkGetParamList = .data:0x00000058; // type:object size:0x8 scope:global data:4byte diff --git a/config/GZ2P01/rels/d_a_obj_toby/splits.txt b/config/GZ2P01/rels/d_a_obj_toby/splits.txt index 001ef71e37..811b4206de 100644 --- a/config/GZ2P01/rels/d_a_obj_toby/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_toby/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_toby.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_toby/symbols.txt b/config/GZ2P01/rels/d_a_obj_toby/symbols.txt index 369ed50225..e012a8ac5c 100644 --- a/config/GZ2P01/rels/d_a_obj_toby/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_toby/symbols.txt @@ -98,7 +98,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -hio_set = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @3801 = .bss:0x00000048; // type:object size:0xC scope:local l_HIO = .bss:0x00000054; // type:object size:0xC scope:local data:byte hz_check_pos_x = .bss:0x00000060; // type:object size:0x4 scope:local align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_tobyhouse/splits.txt b/config/GZ2P01/rels/d_a_obj_tobyhouse/splits.txt index dadb6ac0d5..a544cc1029 100644 --- a/config/GZ2P01/rels/d_a_obj_tobyhouse/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_tobyhouse/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tobyhouse.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_tobyhouse/symbols.txt b/config/GZ2P01/rels/d_a_obj_tobyhouse/symbols.txt index 73a2e017df..e6f3c141f9 100644 --- a/config/GZ2P01/rels/d_a_obj_tobyhouse/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_tobyhouse/symbols.txt @@ -89,7 +89,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local -init$1832 = .bss:0x00000045; // type:object size:0x1 scope:local data:byte +init$1832 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte @4351 = .bss:0x00000048; // type:object size:0xC scope:local l_shotSmokeScale$4350 = .bss:0x00000058; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000064; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_togeTrap/splits.txt b/config/GZ2P01/rels/d_a_obj_togeTrap/splits.txt index de025bfe8e..1abacdd127 100644 --- a/config/GZ2P01/rels/d_a_obj_togeTrap/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_togeTrap/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_togeTrap.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_togeTrap/symbols.txt b/config/GZ2P01/rels/d_a_obj_togeTrap/symbols.txt index 19351ce637..e10da2ffee 100644 --- a/config/GZ2P01/rels/d_a_obj_togeTrap/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_togeTrap/symbols.txt @@ -58,7 +58,8 @@ mCcDObjInfo__12daTogeTrap_c = .rodata:0x00000014; // type:object size:0x30 scope @stringBase0 = .rodata:0x00000070; // type:object size:0x7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_665_data_10 = .data:0x00000010; // type:object size:0x10 scope:local +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDCyl__12daTogeTrap_c = .data:0x00000020; // type:object size:0x44 scope:global @3883 = .data:0x00000064; // type:object size:0xC scope:local @3884 = .data:0x00000070; // type:object size:0xC scope:local @@ -78,4 +79,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000184; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:local align:4 data:float -init$1675 = .bss:0x00000034; // type:object size:0x1 scope:local data:byte +init$1675 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_tombo/splits.txt b/config/GZ2P01/rels/d_a_obj_tombo/splits.txt index 94e308ea4c..328d05f7a0 100644 --- a/config/GZ2P01/rels/d_a_obj_tombo/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_tombo/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_tombo.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt b/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt index f90429ab44..437b88320e 100644 --- a/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_tombo/symbols.txt @@ -109,6 +109,6 @@ __vt__14dBgS_ObjGndChk = .data:0x000000A4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000000D4; // type:object size:0xC scope:global __vt__14daObj_TomHIO_c = .data:0x000000E0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -hio_set = .bss:0x00000008; // type:object size:0x1 scope:local data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3770 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global align:4 data:float diff --git a/config/GZ2P01/rels/d_a_obj_tp/symbols.txt b/config/GZ2P01/rels/d_a_obj_tp/symbols.txt index 608b62cabb..f960fce909 100644 --- a/config/GZ2P01/rels/d_a_obj_tp/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_tp/symbols.txt @@ -44,7 +44,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x0000006C; // type:object size:0x7 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_669_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4263 = .data:0x00000020; // type:object size:0x20 scope:local bmd$4283 = .data:0x00000040; // type:object size:0x8 scope:local brk$4284 = .data:0x00000048; // type:object size:0x8 scope:local diff --git a/config/GZ2P01/rels/d_a_obj_treesh/splits.txt b/config/GZ2P01/rels/d_a_obj_treesh/splits.txt index 7114495ecf..dfdb10d330 100644 --- a/config/GZ2P01/rels/d_a_obj_treesh/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_treesh/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_treesh.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_twGate/splits.txt b/config/GZ2P01/rels/d_a_obj_twGate/splits.txt index f12d5051ef..e1861ecbfd 100644 --- a/config/GZ2P01/rels/d_a_obj_twGate/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_twGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_twGate.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_volcball/symbols.txt b/config/GZ2P01/rels/d_a_obj_volcball/symbols.txt index 1c55f4891a..1848acb05f 100644 --- a/config/GZ2P01/rels/d_a_obj_volcball/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_volcball/symbols.txt @@ -87,9 +87,11 @@ l_fall_effect_id$4173 = .rodata:0x0000007C; // type:object size:0x8 scope:local @4411 = .rodata:0x000000A8; // type:object size:0x8 scope:local @4447 = .rodata:0x000000B0; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000B4; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_675_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_param = .data:0x00000024; // type:object size:0xA8 scope:global @3929 = .data:0x000000CC; // type:object size:0xC scope:local @@ -110,4 +112,4 @@ __vt__12dBgS_ObjAcch = .data:0x0000021C; // type:object size:0x24 scope:global __vt__8cM3dGAab = .data:0x00000240; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x0000024C; // type:object size:0xC scope:global __vt__17dEvLib_callback_c = .data:0x00000258; // type:object size:0x18 scope:global -lbl_675_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1953 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_volcbom/symbols.txt b/config/GZ2P01/rels/d_a_obj_volcbom/symbols.txt index d4bc0a61ad..7bc063c373 100644 --- a/config/GZ2P01/rels/d_a_obj_volcbom/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_volcbom/symbols.txt @@ -94,7 +94,8 @@ l_effect_id$4032 = .rodata:0x00000054; // type:object size:0xE scope:local @stringBase0 = .rodata:0x000000B0; // type:object size:0x48 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_676_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:local data:4byte l_portal_warp_name = .data:0x00000024; // type:object size:0x4 scope:local l_staff_name = .data:0x00000028; // type:object size:0x4 scope:local data:4byte @@ -122,5 +123,5 @@ __vt__8cM3dGAab = .data:0x000001F0; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x000001FC; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000220; // type:object size:0xC scope:global __vt__14daObjVolcBom_c = .data:0x0000022C; // type:object size:0x28 scope:global -init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local data:byte -init$2146 = .bss:0x00000001; // type:object size:0x1 scope:local data:byte +init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$2146 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_warp_kbrg/symbols.txt b/config/GZ2P01/rels/d_a_obj_warp_kbrg/symbols.txt index 5936c83b4b..c0cdeb667b 100644 --- a/config/GZ2P01/rels/d_a_obj_warp_kbrg/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_warp_kbrg/symbols.txt @@ -78,9 +78,11 @@ l_midna_wait_offset = .rodata:0x00000054; // type:object size:0xC scope:global a @4579 = .rodata:0x000000C8; // type:object size:0x8 scope:local align:8 data:double @4590 = .rodata:0x000000D0; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000D4; // type:object size:0x85 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_677_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x8 scope:global l_evArcName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte l_portal_warp_name = .data:0x0000002C; // type:object size:0x8 scope:global @@ -104,4 +106,4 @@ daObjWarpKBrg_METHODS = .data:0x00000194; // type:object size:0x20 scope:global g_profile_Obj_KakarikoBrg = .data:0x000001B4; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x000001E4; // type:object size:0xC scope:global __vt__15daObjWarpKBrg_c = .data:0x000001F0; // type:object size:0x28 scope:global -lbl_677_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_warp_obrg/symbols.txt b/config/GZ2P01/rels/d_a_obj_warp_obrg/symbols.txt index 1a3386758e..eb807a9701 100644 --- a/config/GZ2P01/rels/d_a_obj_warp_obrg/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_warp_obrg/symbols.txt @@ -59,9 +59,11 @@ l_midna_wait_offset = .rodata:0x00000040; // type:object size:0xC scope:global a @4607 = .rodata:0x000000AC; // type:object size:0x4 scope:local @4666 = .rodata:0x000000B0; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x000000B4; // type:object size:0x68 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_678_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_portal_warp_name = .data:0x00000024; // type:object size:0x8 scope:global l_staff_name = .data:0x0000002C; // type:object size:0x8 scope:global @@ -78,4 +80,4 @@ daObjWarpOBrg_METHODS = .data:0x000000EC; // type:object size:0x20 scope:global g_profile_Obj_OrdinBrg = .data:0x0000010C; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x0000013C; // type:object size:0xC scope:global __vt__15daObjWarpOBrg_c = .data:0x00000148; // type:object size:0x28 scope:global -lbl_678_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_waterGate/splits.txt b/config/GZ2P01/rels/d_a_obj_waterGate/splits.txt index eaa5cc3564..4c25b796bc 100644 --- a/config/GZ2P01/rels/d_a_obj_waterGate/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_waterGate/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_waterGate.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_waterGate/symbols.txt b/config/GZ2P01/rels/d_a_obj_waterGate/symbols.txt index e163601f62..3136149814 100644 --- a/config/GZ2P01/rels/d_a_obj_waterGate/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_waterGate/symbols.txt @@ -38,9 +38,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3783 = .rodata:0x00000018; // type:object size:0x4 scope:local @3784 = .rodata:0x0000001C; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000020; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_679_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3728 = .data:0x00000020; // type:object size:0xC scope:local @3729 = .data:0x0000002C; // type:object size:0xC scope:local @3730 = .data:0x00000038; // type:object size:0xC scope:local @@ -54,4 +56,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000104; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3619 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global align:4 data:float -lbl_679_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_waterPillar/splits.txt b/config/GZ2P01/rels/d_a_obj_waterPillar/splits.txt index dc39edf04a..f393d68cbc 100644 --- a/config/GZ2P01/rels/d_a_obj_waterPillar/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_waterPillar/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_waterPillar.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_waterPillar/symbols.txt b/config/GZ2P01/rels/d_a_obj_waterPillar/symbols.txt index b3d3d34c41..ff46abbb10 100644 --- a/config/GZ2P01/rels/d_a_obj_waterPillar/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_waterPillar/symbols.txt @@ -94,9 +94,11 @@ mCcDObjCoInfo__12daWtPillar_c = .rodata:0x00000050; // type:object size:0x30 sco @4272 = .rodata:0x000000CC; // type:object size:0x4 scope:local @4273 = .rodata:0x000000D0; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000D4; // type:object size:0x8 scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_680_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_cull_box = .data:0x00000020; // type:object size:0x18 scope:global mCcDCps__12daWtPillar_c = .data:0x00000038; // type:object size:0x4C scope:global mCcDCyl__12daWtPillar_c = .data:0x00000084; // type:object size:0x44 scope:global @@ -128,4 +130,4 @@ __vt__14mDoHIO_entry_c = .data:0x000002D0; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3635 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x58 scope:global align:4 data:float -lbl_680_bss_6C = .bss:0x0000006C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000006C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_wdStick/splits.txt b/config/GZ2P01/rels/d_a_obj_wdStick/splits.txt index 9b0de2fc3d..a1be6e322b 100644 --- a/config/GZ2P01/rels/d_a_obj_wdStick/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_wdStick/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_wdStick.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_wdStick/symbols.txt b/config/GZ2P01/rels/d_a_obj_wdStick/symbols.txt index 4ca8235fcd..a5c6dd3195 100644 --- a/config/GZ2P01/rels/d_a_obj_wdStick/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_wdStick/symbols.txt @@ -93,9 +93,11 @@ mCcDObjInfo__11daWdStick_c = .rodata:0x00000000; // type:object size:0x30 scope: @4779 = .rodata:0x000000D0; // type:object size:0x4 scope:local @4780 = .rodata:0x000000D4; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x000000D8; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_683_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__11daWdStick_c = .data:0x00000020; // type:object size:0x40 scope:global @4470 = .data:0x00000060; // type:object size:0xC scope:local @4471 = .data:0x0000006C; // type:object size:0xC scope:local @@ -119,4 +121,4 @@ __vt__14mDoHIO_entry_c = .data:0x000001E8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3643 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:2byte -lbl_683_bss_20 = .bss:0x00000020; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_web0/splits.txt b/config/GZ2P01/rels/d_a_obj_web0/splits.txt index 9a26cfe380..c8a5052714 100644 --- a/config/GZ2P01/rels/d_a_obj_web0/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_web0/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_web0.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_web0/symbols.txt b/config/GZ2P01/rels/d_a_obj_web0/symbols.txt index f004aa2850..54e81d608c 100644 --- a/config/GZ2P01/rels/d_a_obj_web0/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_web0/symbols.txt @@ -41,6 +41,6 @@ __vt__8cM3dGAab = .data:0x0000009C; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000A8; // type:object size:0xC scope:global __vt__16daObj_Web0_HIO_c = .data:0x000000B4; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_684_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_web1/splits.txt b/config/GZ2P01/rels/d_a_obj_web1/splits.txt index bcd1efd14d..dcf156365f 100644 --- a/config/GZ2P01/rels/d_a_obj_web1/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_web1/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_web1.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_web1/symbols.txt b/config/GZ2P01/rels/d_a_obj_web1/symbols.txt index a218599b44..b69a2e19bb 100644 --- a/config/GZ2P01/rels/d_a_obj_web1/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_web1/symbols.txt @@ -51,6 +51,6 @@ __vt__8cM3dGAab = .data:0x000000A0; // type:object size:0xC scope:global __vt__12J3DFrameCtrl = .data:0x000000AC; // type:object size:0xC scope:global __vt__16daObj_Web1_HIO_c = .data:0x000000B8; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_685_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3643 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x8 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_obj_well_cover/symbols.txt b/config/GZ2P01/rels/d_a_obj_well_cover/symbols.txt index 33c7ea9672..61384ffa4d 100644 --- a/config/GZ2P01/rels/d_a_obj_well_cover/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_well_cover/symbols.txt @@ -30,9 +30,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global particle_id$3806 = .rodata:0x00000028; // type:object size:0x6 scope:local @3833 = .rodata:0x00000030; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x00000034; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_686_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3731 = .data:0x00000024; // type:object size:0xC scope:local @3732 = .data:0x00000030; // type:object size:0xC scope:local @@ -40,4 +42,4 @@ l_func$3730 = .data:0x0000003C; // type:object size:0x18 scope:local l_daObjWCover_Method = .data:0x00000054; // type:object size:0x20 scope:global g_profile_Obj_WellCover = .data:0x00000074; // type:object size:0x30 scope:global __vt__13daObjWCover_c = .data:0x000000A4; // type:object size:0x28 scope:global -lbl_686_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_wood_statue/symbols.txt b/config/GZ2P01/rels/d_a_obj_wood_statue/symbols.txt index 328c69c652..1f8c84cfca 100644 --- a/config/GZ2P01/rels/d_a_obj_wood_statue/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_wood_statue/symbols.txt @@ -74,7 +74,8 @@ l_cyl_src = .rodata:0x00000000; // type:object size:0x44 scope:global @stringBase0 = .rodata:0x0000009C; // type:object size:0x45 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_691_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_eventName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte action_table$4273 = .data:0x00000028; // type:object size:0x10 scope:local @@ -95,4 +96,4 @@ __vt__8cM3dGAab = .data:0x00000154; // type:object size:0xC scope:global __vt__12dBgS_ObjAcch = .data:0x00000160; // type:object size:0x24 scope:global __vt__14daObjWStatue_c = .data:0x00000184; // type:object size:0x44 scope:global __vt__8cM3dGPla = .data:0x000001C8; // type:object size:0xC scope:global -init$2078 = .bss:0x00000000; // type:object size:0x1 data:byte +init$2078 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_yel_bag/splits.txt b/config/GZ2P01/rels/d_a_obj_yel_bag/splits.txt index b346ff5bf5..b3de7d6524 100644 --- a/config/GZ2P01/rels/d_a_obj_yel_bag/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_yel_bag/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_yel_bag.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_yel_bag/symbols.txt b/config/GZ2P01/rels/d_a_obj_yel_bag/symbols.txt index 9eca0372ca..f0e13175ab 100644 --- a/config/GZ2P01/rels/d_a_obj_yel_bag/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_yel_bag/symbols.txt @@ -80,7 +80,8 @@ m__18daObj_YBag_Param_c = .rodata:0x00000030; // type:object size:0x2C scope:glo @stringBase0 = .rodata:0x000000E0; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_693_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdGetParamList = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_loadRes_YBAG0 = .data:0x00000028; // type:object size:0xC scope:global l_loadRes_list = .data:0x00000034; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_obj_yobikusa/symbols.txt b/config/GZ2P01/rels/d_a_obj_yobikusa/symbols.txt index c39e50ea2c..111f86dd3a 100644 --- a/config/GZ2P01/rels/d_a_obj_yobikusa/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_yobikusa/symbols.txt @@ -54,7 +54,8 @@ ccCylSrc$3880 = .rodata:0x00000064; // type:object size:0x44 scope:local @stringBase0 = .rodata:0x000000A8; // type:object size:0x44 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_116_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName1 = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_arcName2 = .data:0x00000024; // type:object size:0x4 scope:global data:4byte @3641 = .data:0x00000028; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_obj_zrTurara/splits.txt b/config/GZ2P01/rels/d_a_obj_zrTurara/splits.txt index ad9e149c7a..61516da5d9 100644 --- a/config/GZ2P01/rels/d_a_obj_zrTurara/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_zrTurara/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zrTurara.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_zrTurara/symbols.txt b/config/GZ2P01/rels/d_a_obj_zrTurara/symbols.txt index 8caee4b36e..897a47191c 100644 --- a/config/GZ2P01/rels/d_a_obj_zrTurara/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_zrTurara/symbols.txt @@ -62,4 +62,4 @@ __vt__14mDoHIO_entry_c = .data:0x00000160; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3651 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0xC scope:global data:byte -init$1683 = .bss:0x00000020; // type:object size:0x1 data:byte +init$1683 = .bss:0x00000020; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_zrTuraraRock/splits.txt b/config/GZ2P01/rels/d_a_obj_zrTuraraRock/splits.txt index ee108a21c3..135f45df92 100644 --- a/config/GZ2P01/rels/d_a_obj_zrTuraraRock/splits.txt +++ b/config/GZ2P01/rels/d_a_obj_zrTuraraRock/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_obj_zrTuraraRock.cpp: diff --git a/config/GZ2P01/rels/d_a_obj_zrTuraraRock/symbols.txt b/config/GZ2P01/rels/d_a_obj_zrTuraraRock/symbols.txt index ba9f525834..6ddd25e442 100644 --- a/config/GZ2P01/rels/d_a_obj_zrTuraraRock/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_zrTuraraRock/symbols.txt @@ -53,9 +53,11 @@ mCcDObjInfo__12daZrTuraRc_c = .rodata:0x00000014; // type:object size:0x30 scope @3782 = .rodata:0x00000068; // type:object size:0x8 scope:local @3885 = .rodata:0x00000070; // type:object size:0x4 scope:local align:4 data:float @stringBase0 = .rodata:0x00000074; // type:object size:0xA scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_698_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mCcDSph__12daZrTuraRc_c = .data:0x00000020; // type:object size:0x40 scope:global @3871 = .data:0x00000060; // type:object size:0xC scope:local @3872 = .data:0x0000006C; // type:object size:0xC scope:local @@ -73,4 +75,4 @@ __vt__14mDoHIO_entry_c = .data:0x0000014C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global @3647 = .bss:0x00000008; // type:object size:0xC scope:local l_HIO = .bss:0x00000014; // type:object size:0x20 scope:global align:4 data:float -lbl_698_bss_34 = .bss:0x00000034; // type:object size:0x1 data:byte +init$1850 = .bss:0x00000034; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_obj_zraMark/symbols.txt b/config/GZ2P01/rels/d_a_obj_zraMark/symbols.txt index 8b20f4b576..686096b256 100644 --- a/config/GZ2P01/rels/d_a_obj_zraMark/symbols.txt +++ b/config/GZ2P01/rels/d_a_obj_zraMark/symbols.txt @@ -68,7 +68,7 @@ sRoot$4500 = .rodata:0x00000104; // type:object size:0xE0 scope:local @4571 = .rodata:0x00000204; // type:object size:0x4 scope:local align:4 data:float @4658 = .rodata:0x00000208; // type:object size:0x8 scope:local align:8 data:double @stringBase0 = .rodata:0x00000210; // type:object size:0x5 scope:local data:string_table -lbl_699_data_0 = .data:0x00000000; // type:object size:0x1 data:byte +@1738 = .data:0x00000000; // type:object size:0x1 data:byte l_arcName = .data:0x00000004; // type:object size:0x4 scope:global data:4byte l_daObjZraMark_Method = .data:0x00000008; // type:object size:0x20 scope:global g_profile_ZRA_MARK = .data:0x00000028; // type:object size:0x30 scope:global @@ -76,4 +76,4 @@ __vt__18daNpcF_ActorMngr_c = .data:0x00000058; // type:object size:0xC scope:glo __vt__8cM3dGCyl = .data:0x00000064; // type:object size:0xC scope:global __vt__8cM3dGAab = .data:0x00000070; // type:object size:0xC scope:global roottype$4501 = .bss:0x00000000; // type:object size:0x4 scope:local -lbl_699_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte +init$2350 = .bss:0x00000004; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_peru/splits.txt b/config/GZ2P01/rels/d_a_peru/splits.txt index 1714f683e7..71725d20e9 100644 --- a/config/GZ2P01/rels/d_a_peru/splits.txt +++ b/config/GZ2P01/rels/d_a_peru/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_peru.cpp: diff --git a/config/GZ2P01/rels/d_a_peru/symbols.txt b/config/GZ2P01/rels/d_a_peru/symbols.txt index e18114993f..84feeec37c 100644 --- a/config/GZ2P01/rels/d_a_peru/symbols.txt +++ b/config/GZ2P01/rels/d_a_peru/symbols.txt @@ -166,7 +166,8 @@ m__14daPeru_Param_c = .rodata:0x00000000; // type:object size:0x98 scope:global @stringBase0 = .rodata:0x00000150; // type:object size:0x2A scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_703_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_bmdData = .data:0x00000020; // type:object size:0x8 scope:global data:4byte l_evtList = .data:0x00000028; // type:object size:0x18 scope:global l_resNameList = .data:0x00000040; // type:object size:0x8 scope:global diff --git a/config/GZ2P01/rels/d_a_ppolamp/symbols.txt b/config/GZ2P01/rels/d_a_ppolamp/symbols.txt index 65e95cbb01..999840bd88 100644 --- a/config/GZ2P01/rels/d_a_ppolamp/symbols.txt +++ b/config/GZ2P01/rels/d_a_ppolamp/symbols.txt @@ -55,9 +55,9 @@ __vt__11daPPolamp_c = .data:0x00000060; // type:object size:0xC scope:global @1012 = .bss:0x00000034; // type:object size:0x1 scope:local @1010 = .bss:0x00000038; // type:object size:0x1 scope:local @1009 = .bss:0x0000003C; // type:object size:0x1 scope:local -init$1515 = .bss:0x0000003D; // type:object size:0x1 scope:local +init$1515 = .bss:0x0000003D; // type:object size:0x1 scope:local align:1 data:byte TEV_COLOR_1$3795 = .bss:0x00000040; // type:object size:0x8 scope:local -init$1520 = .bss:0x00000049; // type:object size:0x1 scope:local +init$1520 = .bss:0x00000049; // type:object size:0x1 scope:local align:1 data:byte TEV_COLOR_2$3800 = .bss:0x0000004C; // type:object size:0x8 scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000054; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000058; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_scene_exit2/symbols.txt b/config/GZ2P01/rels/d_a_scene_exit2/symbols.txt index 0cec89805d..20ae657a5d 100644 --- a/config/GZ2P01/rels/d_a_scene_exit2/symbols.txt +++ b/config/GZ2P01/rels/d_a_scene_exit2/symbols.txt @@ -31,7 +31,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000014; // type:object size:0x30 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_117_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte @3699 = .data:0x00000028; // type:object size:0xC scope:local @@ -42,4 +43,4 @@ l_func$3698 = .data:0x00000058; // type:object size:0x30 scope:local action_table$3745 = .data:0x00000088; // type:object size:0xC scope:local l_daScExit_Method = .data:0x00000094; // type:object size:0x20 scope:global g_profile_SCENE_EXIT2 = .data:0x000000B4; // type:object size:0x30 scope:global -lbl_117_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_spinner/splits.txt b/config/GZ2P01/rels/d_a_spinner/splits.txt index 6daada460c..428e044482 100644 --- a/config/GZ2P01/rels/d_a_spinner/splits.txt +++ b/config/GZ2P01/rels/d_a_spinner/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_spinner.cpp: diff --git a/config/GZ2P01/rels/d_a_spinner/symbols.txt b/config/GZ2P01/rels/d_a_spinner/symbols.txt index 01cb55a8f8..a320beafe9 100644 --- a/config/GZ2P01/rels/d_a_spinner/symbols.txt +++ b/config/GZ2P01/rels/d_a_spinner/symbols.txt @@ -42,7 +42,7 @@ _ctors = .ctors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global _dtors = .dtors:0x00000000; // type:label scope:global ...rodata.0 = .rodata:0x00000000; // type:label scope:local -@3768 = .rodata:0x00000000; // type:object size:0xC scope:local +lit_3768 = .rodata:0x00000000; // type:object size:0xC scope:local @4168 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float @4241 = .rodata:0x00000010; // type:object size:0x4 scope:local @4242 = .rodata:0x00000014; // type:object size:0x4 scope:local data:string @@ -120,8 +120,10 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local @1010 = .bss:0x00000040; // type:object size:0x1 scope:local @1009 = .bss:0x00000044; // type:object size:0x1 scope:local +init$0000 = .bss:0x00000045; // type:object size:0x1 scope:local align:1 data:byte effDirection$4433 = .bss:0x00000048; // type:object size:0xC scope:local @4437 = .bss:0x00000054; // type:object size:0xC scope:local +init$0001 = .bss:0x00000060; // type:object size:0x1 scope:local align:1 data:byte particleScale$4436 = .bss:0x00000064; // type:object size:0xC scope:local sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x00000070; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x00000074; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_sq/splits.txt b/config/GZ2P01/rels/d_a_sq/splits.txt index 88422c0ac5..5d9a75a943 100644 --- a/config/GZ2P01/rels/d_a_sq/splits.txt +++ b/config/GZ2P01/rels/d_a_sq/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_sq.cpp: diff --git a/config/GZ2P01/rels/d_a_sq/symbols.txt b/config/GZ2P01/rels/d_a_sq/symbols.txt index 8f6b26420b..475085d670 100644 --- a/config/GZ2P01/rels/d_a_sq/symbols.txt +++ b/config/GZ2P01/rels/d_a_sq/symbols.txt @@ -78,6 +78,6 @@ __vt__12dBgS_ObjAcch = .data:0x00000104; // type:object size:0x24 scope:global __vt__12J3DFrameCtrl = .data:0x00000128; // type:object size:0xC scope:global __vt__10daSq_HIO_c = .data:0x00000134; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_119_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +hio_set = .bss:0x00000008; // type:object size:0x1 scope:local align:1 data:byte @3764 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x30 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_swBall/symbols.txt b/config/GZ2P01/rels/d_a_swBall/symbols.txt index 64589c80ee..86bd6915a4 100644 --- a/config/GZ2P01/rels/d_a_swBall/symbols.txt +++ b/config/GZ2P01/rels/d_a_swBall/symbols.txt @@ -24,9 +24,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3720 = .rodata:0x00000008; // type:object size:0x4 scope:local @3721 = .rodata:0x0000000C; // type:object size:0x4 scope:local @3994 = .rodata:0x00000010; // type:object size:0x4 scope:local +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_707_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3847 = .data:0x00000020; // type:object size:0xC scope:local @3848 = .data:0x0000002C; // type:object size:0xC scope:local l_func$3846 = .data:0x00000038; // type:object size:0x18 scope:local @@ -34,4 +36,4 @@ l_daSwBall_Method = .data:0x00000050; // type:object size:0x20 scope:global g_profile_SwBall = .data:0x00000070; // type:object size:0x30 scope:global l_target_info = .bss:0x00000000; // type:object size:0x20 scope:global l_target_info_count = .bss:0x00000020; // type:object size:0x4 scope:global data:4byte -lbl_707_bss_24 = .bss:0x00000024; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000024; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_swLBall/symbols.txt b/config/GZ2P01/rels/d_a_swLBall/symbols.txt index 80a79d5e65..f70f108ed9 100644 --- a/config/GZ2P01/rels/d_a_swLBall/symbols.txt +++ b/config/GZ2P01/rels/d_a_swLBall/symbols.txt @@ -25,9 +25,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3725 = .rodata:0x00000008; // type:object size:0x4 scope:local @3726 = .rodata:0x0000000C; // type:object size:0x4 scope:local @4000 = .rodata:0x00000010; // type:object size:0x4 scope:local +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_708_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3835 = .data:0x00000020; // type:object size:0xC scope:local @3836 = .data:0x0000002C; // type:object size:0xC scope:local @3837 = .data:0x00000038; // type:object size:0xC scope:local @@ -36,4 +38,4 @@ l_daSwLBall_Method = .data:0x00000068; // type:object size:0x20 scope:global g_profile_SwLBall = .data:0x00000088; // type:object size:0x30 scope:global l_target_info = .bss:0x00000000; // type:object size:0x8 scope:global l_target_info_count = .bss:0x00000008; // type:object size:0x4 scope:global data:4byte -lbl_708_bss_C = .bss:0x0000000C; // type:object size:0x1 data:byte +init$0000 = .bss:0x0000000C; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_swc00/symbols.txt b/config/GZ2P01/rels/d_a_swc00/symbols.txt index f64db49efa..8b73f61406 100644 --- a/config/GZ2P01/rels/d_a_swc00/symbols.txt +++ b/config/GZ2P01/rels/d_a_swc00/symbols.txt @@ -24,7 +24,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000018; // type:object size:0x26 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_120_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3812 = .data:0x00000020; // type:object size:0x40 scope:local @3820 = .data:0x00000060; // type:object size:0xC scope:local @3821 = .data:0x0000006C; // type:object size:0xC scope:local @@ -34,4 +35,4 @@ l_func$3819 = .data:0x00000090; // type:object size:0x30 scope:local @3996 = .data:0x000000C0; // type:object size:0x40 scope:local l_daSwc00_Method = .data:0x00000100; // type:object size:0x20 scope:global g_profile_SWC00 = .data:0x00000120; // type:object size:0x30 scope:global -lbl_120_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_tag_CstaSw/splits.txt b/config/GZ2P01/rels/d_a_tag_CstaSw/splits.txt index cc92263021..fab27d3113 100644 --- a/config/GZ2P01/rels/d_a_tag_CstaSw/splits.txt +++ b/config/GZ2P01/rels/d_a_tag_CstaSw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_CstaSw.cpp: diff --git a/config/GZ2P01/rels/d_a_tag_TWgate/symbols.txt b/config/GZ2P01/rels/d_a_tag_TWgate/symbols.txt index 1b4d859a2a..1f3fc596cd 100644 --- a/config/GZ2P01/rels/d_a_tag_TWgate/symbols.txt +++ b/config/GZ2P01/rels/d_a_tag_TWgate/symbols.txt @@ -56,7 +56,8 @@ l_zevParamTbl = .rodata:0x00000004; // type:object size:0x70 scope:global @stringBase0 = .rodata:0x0000009C; // type:object size:0x129 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_713_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_myName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte @3744 = .data:0x00000024; // type:object size:0xC scope:local @3745 = .data:0x00000030; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_tag_csw/symbols.txt b/config/GZ2P01/rels/d_a_tag_csw/symbols.txt index ca0116f93f..2e869ea91c 100644 --- a/config/GZ2P01/rels/d_a_tag_csw/symbols.txt +++ b/config/GZ2P01/rels/d_a_tag_csw/symbols.txt @@ -49,7 +49,8 @@ l_dbz_idx = .rodata:0x00000010; // type:object size:0x8 scope:global @stringBase0 = .rodata:0x00000068; // type:object size:0x8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_718_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000024; // type:object size:0x44 scope:global l_tg_src = .data:0x00000068; // type:object size:0x44 scope:global diff --git a/config/GZ2P01/rels/d_a_tag_evtmsg/symbols.txt b/config/GZ2P01/rels/d_a_tag_evtmsg/symbols.txt index 5e672717cd..7803ac229c 100644 --- a/config/GZ2P01/rels/d_a_tag_evtmsg/symbols.txt +++ b/config/GZ2P01/rels/d_a_tag_evtmsg/symbols.txt @@ -28,7 +28,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global @stringBase0 = .rodata:0x00000004; // type:object size:0x29 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_33_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double mEvtCutNameList__14daTag_EvtMsg_c = .data:0x00000020; // type:object size:0xC scope:global @3802 = .data:0x0000002C; // type:object size:0xC scope:local @3803 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_tag_firewall/symbols.txt b/config/GZ2P01/rels/d_a_tag_firewall/symbols.txt index eb287a2173..ed735cd4ba 100644 --- a/config/GZ2P01/rels/d_a_tag_firewall/symbols.txt +++ b/config/GZ2P01/rels/d_a_tag_firewall/symbols.txt @@ -34,4 +34,4 @@ g_profile_Tag_FWall = .data:0x00000068; // type:object size:0x30 scope:global __vt__8cM3dGAab = .data:0x00000098; // type:object size:0xC scope:global __vt__8cM3dGSph = .data:0x000000A4; // type:object size:0xC scope:global fire_leader = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_720_bss_4 = .bss:0x00000004; // type:object size:0x1 data:byte +fire_num = .bss:0x00000004; // type:object size:0x1 data:byte diff --git a/config/GZ2P01/rels/d_a_tag_hstop/splits.txt b/config/GZ2P01/rels/d_a_tag_hstop/splits.txt index cbd78c8d11..701b189842 100644 --- a/config/GZ2P01/rels/d_a_tag_hstop/splits.txt +++ b/config/GZ2P01/rels/d_a_tag_hstop/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_hstop.cpp: diff --git a/config/GZ2P01/rels/d_a_tag_lantern/splits.txt b/config/GZ2P01/rels/d_a_tag_lantern/splits.txt index 2a71e6d3db..7af2bf0b37 100644 --- a/config/GZ2P01/rels/d_a_tag_lantern/splits.txt +++ b/config/GZ2P01/rels/d_a_tag_lantern/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_lantern.cpp: diff --git a/config/GZ2P01/rels/d_a_tag_lv2prchk/symbols.txt b/config/GZ2P01/rels/d_a_tag_lv2prchk/symbols.txt index 8157656193..b56b0d22ef 100644 --- a/config/GZ2P01/rels/d_a_tag_lv2prchk/symbols.txt +++ b/config/GZ2P01/rels/d_a_tag_lv2prchk/symbols.txt @@ -16,12 +16,14 @@ _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global @3844 = .rodata:0x00000000; // type:object size:0x4 scope:local @3845 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_128_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @3667 = .data:0x00000020; // type:object size:0xC scope:local @3668 = .data:0x0000002C; // type:object size:0xC scope:local l_func$3666 = .data:0x00000038; // type:object size:0x18 scope:local l_daTagLv2PrChk_Method = .data:0x00000050; // type:object size:0x20 scope:global g_profile_Tag_Lv2PrChk = .data:0x00000070; // type:object size:0x30 scope:global -lbl_128_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_tag_lv6CstaSw/splits.txt b/config/GZ2P01/rels/d_a_tag_lv6CstaSw/splits.txt index 00e0980c33..21926072bd 100644 --- a/config/GZ2P01/rels/d_a_tag_lv6CstaSw/splits.txt +++ b/config/GZ2P01/rels/d_a_tag_lv6CstaSw/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_lv6CstaSw.cpp: diff --git a/config/GZ2P01/rels/d_a_tag_poFire/splits.txt b/config/GZ2P01/rels/d_a_tag_poFire/splits.txt index d792935823..d468cdd6e9 100644 --- a/config/GZ2P01/rels/d_a_tag_poFire/splits.txt +++ b/config/GZ2P01/rels/d_a_tag_poFire/splits.txt @@ -10,7 +10,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_poFire.cpp: diff --git a/config/GZ2P01/rels/d_a_tag_river_back/symbols.txt b/config/GZ2P01/rels/d_a_tag_river_back/symbols.txt index c550dcdf34..58c8200336 100644 --- a/config/GZ2P01/rels/d_a_tag_river_back/symbols.txt +++ b/config/GZ2P01/rels/d_a_tag_river_back/symbols.txt @@ -22,9 +22,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global @3814 = .rodata:0x00000004; // type:object size:0x4 scope:local @3815 = .rodata:0x00000008; // type:object size:0x4 scope:local @stringBase0 = .rodata:0x0000000C; // type:object size:0x2E scope:local data:string_table +...data.0 = .data:0x00000000; // type:label scope:local cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_736_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_evName = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_staffName = .data:0x00000028; // type:object size:0x4 scope:global data:4byte @@ -36,4 +38,4 @@ l_func$3711 = .data:0x0000005C; // type:object size:0x30 scope:local action_table$3769 = .data:0x0000008C; // type:object size:0x8 scope:local l_daTagRiverBack_Method = .data:0x00000094; // type:object size:0x20 scope:global g_profile_Tag_RiverBack = .data:0x000000B4; // type:object size:0x30 scope:global -lbl_736_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$1712 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_tag_statue_evt/symbols.txt b/config/GZ2P01/rels/d_a_tag_statue_evt/symbols.txt index 89636eb2cf..fcfd5ab910 100644 --- a/config/GZ2P01/rels/d_a_tag_statue_evt/symbols.txt +++ b/config/GZ2P01/rels/d_a_tag_statue_evt/symbols.txt @@ -45,7 +45,8 @@ l_event_bit = .rodata:0x00000000; // type:object size:0xC scope:global @stringBase0 = .rodata:0x00000050; // type:object size:0xA8 scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_133_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_eff_id = .data:0x00000024; // type:object size:0x6 scope:global l_eventName = .data:0x0000002C; // type:object size:0x18 scope:global @@ -62,4 +63,4 @@ l_statue_ang$3944 = .data:0x00000128; // type:object size:0xC scope:local l_daTagStatue_Method = .data:0x00000134; // type:object size:0x20 scope:global g_profile_Tag_Statue = .data:0x00000154; // type:object size:0x30 scope:global __vt__12J3DFrameCtrl = .data:0x00000184; // type:object size:0xC scope:global -lbl_133_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_tag_waterfall/splits.txt b/config/GZ2P01/rels/d_a_tag_waterfall/splits.txt index 5b17cf97a0..b3d0072010 100644 --- a/config/GZ2P01/rels/d_a_tag_waterfall/splits.txt +++ b/config/GZ2P01/rels/d_a_tag_waterfall/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tag_waterfall.cpp: diff --git a/config/GZ2P01/rels/d_a_tag_waterfall/symbols.txt b/config/GZ2P01/rels/d_a_tag_waterfall/symbols.txt index cb23cee4d2..80b04578d0 100644 --- a/config/GZ2P01/rels/d_a_tag_waterfall/symbols.txt +++ b/config/GZ2P01/rels/d_a_tag_waterfall/symbols.txt @@ -34,6 +34,6 @@ l_daTagWaterFall_Method = .data:0x00000004; // type:object size:0x20 scope:globa g_profile_Tag_WaterFall = .data:0x00000024; // type:object size:0x30 scope:global __vt__20daTagWaterFall_HIO_c = .data:0x00000054; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_751_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +masterWaterfallTagExists = .bss:0x00000008; // type:object size:0x1 data:byte @3753 = .bss:0x0000000C; // type:object size:0xC scope:local l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte diff --git a/config/GZ2P01/rels/d_a_tbox/splits.txt b/config/GZ2P01/rels/d_a_tbox/splits.txt index fd0c1fb717..78c5420e61 100644 --- a/config/GZ2P01/rels/d_a_tbox/splits.txt +++ b/config/GZ2P01/rels/d_a_tbox/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_tbox.cpp: diff --git a/config/GZ2P01/rels/d_a_tbox/symbols.txt b/config/GZ2P01/rels/d_a_tbox/symbols.txt index 1dea0fdbb5..aefcebe675 100644 --- a/config/GZ2P01/rels/d_a_tbox/symbols.txt +++ b/config/GZ2P01/rels/d_a_tbox/symbols.txt @@ -140,7 +140,8 @@ eff_id$4956 = .rodata:0x00000128; // type:object size:0xC scope:local @stringBase0 = .rodata:0x00000160; // type:object size:0x15D scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_41_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_staff_name = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000024; // type:object size:0x44 scope:global l_modelInfo = .data:0x00000068; // type:object size:0x54 scope:global @@ -211,7 +212,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa l_light_offset = .bss:0x00000054; // type:object size:0xC scope:global align:4 data:float @3824 = .bss:0x00000060; // type:object size:0xC scope:local l_HIO = .bss:0x0000006C; // type:object size:0x34 scope:global -lbl_41_bss_A0 = .bss:0x000000A0; // type:object size:0x1 data:byte +init$0000 = .bss:0x000000A0; // type:object size:0x1 scope:local align:1 data:byte sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000000A4; // type:object size:0x4 scope:global sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000000A8; // type:object size:0x4 scope:global sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000000AC; // type:object size:0x4 scope:global diff --git a/config/GZ2P01/rels/d_a_tbox2/symbols.txt b/config/GZ2P01/rels/d_a_tbox2/symbols.txt index f9cad807c8..ccdda8007f 100644 --- a/config/GZ2P01/rels/d_a_tbox2/symbols.txt +++ b/config/GZ2P01/rels/d_a_tbox2/symbols.txt @@ -56,7 +56,8 @@ l_cyl_info = .rodata:0x00000020; // type:object size:0x3C scope:global @stringBase0 = .rodata:0x00000080; // type:object size:0x7B scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_42_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double l_arcName = .data:0x00000020; // type:object size:0x4 scope:global data:4byte l_staff_name = .data:0x00000024; // type:object size:0x4 scope:global data:4byte l_cyl_src = .data:0x00000028; // type:object size:0x44 scope:global @@ -80,5 +81,5 @@ __vt__8cM3dGAab = .data:0x000001B0; // type:object size:0xC scope:global __vt__12daTboxBase_c = .data:0x000001BC; // type:object size:0x2C scope:global __vt__12J3DFrameCtrl = .data:0x000001E8; // type:object size:0xC scope:global __vt__9daTbox2_c = .data:0x000001F4; // type:object size:0x2C scope:global -lbl_42_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte -lbl_42_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte +init$0000 = .bss:0x00000000; // type:object size:0x1 scope:local align:1 data:byte +init$0001 = .bss:0x00000001; // type:object size:0x1 scope:local align:1 data:byte diff --git a/config/GZ2P01/rels/d_a_title/splits.txt b/config/GZ2P01/rels/d_a_title/splits.txt index 90f6d8bfe9..5183bbe136 100644 --- a/config/GZ2P01/rels/d_a_title/splits.txt +++ b/config/GZ2P01/rels/d_a_title/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_title.cpp: diff --git a/config/GZ2P01/rels/d_a_title/symbols.txt b/config/GZ2P01/rels/d_a_title/symbols.txt index 7598b52112..705210d423 100644 --- a/config/GZ2P01/rels/d_a_title/symbols.txt +++ b/config/GZ2P01/rels/d_a_title/symbols.txt @@ -52,7 +52,8 @@ l_arcName = .rodata:0x0000000C; // type:object size:0x9 scope:global data:string @stringBase0 = .rodata:0x00000044; // type:object size:0x2F scope:local data:string_table cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global @1787 = .data:0x0000000C; // type:object size:0x4 scope:local -lbl_756_data_10 = .data:0x00000010; // type:object size:0x10 +_three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double +_half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @4039 = .data:0x00000020; // type:object size:0xC scope:local @4040 = .data:0x0000002C; // type:object size:0xC scope:local @4041 = .data:0x00000038; // type:object size:0xC scope:local diff --git a/config/GZ2P01/rels/d_a_ykgr/splits.txt b/config/GZ2P01/rels/d_a_ykgr/splits.txt index 124324536a..1b63dedc27 100644 --- a/config/GZ2P01/rels/d_a_ykgr/splits.txt +++ b/config/GZ2P01/rels/d_a_ykgr/splits.txt @@ -11,7 +11,7 @@ REL/executor.c: REL/global_destructor_chain.c: .text start:0x00000078 end:0x000000EC - .dtors start:0x00000000 end:0x00000004 rename:.dtors$10 + .dtors start:0x00000000 end:0x00000008 rename:.dtors$10 .bss start:0x00000000 end:0x00000008 d/actor/d_a_ykgr.cpp: diff --git a/config/GZ2P01/splits.txt b/config/GZ2P01/splits.txt index 520f385e2c..0c0107c9e7 100644 --- a/config/GZ2P01/splits.txt +++ b/config/GZ2P01/splits.txt @@ -917,7 +917,7 @@ d/d_kankyo.cpp: .data start:0x803BDA98 end:0x803BDE38 .bss start:0x8042EA08 end:0x804307B0 .sdata start:0x804526C0 end:0x804526E0 - .sbss start:0x80453028 end:0x80453038 + .sbss start:0x80453028 end:0x80453030 .sdata2 start:0x80455B80 end:0x80455E18 d/d_kyeff.cpp: @@ -935,6 +935,7 @@ d/d_ky_thunder.cpp: .rodata start:0x80396740 end:0x80396750 .data start:0x803BDEB8 end:0x803BDEF8 .bss start:0x804307B0 end:0x804307E0 + .sbss start:0x80453030 end:0x80453038 .sdata2 start:0x80455E30 end:0x80455EB8 d/d_kantera_icon_meter.cpp: @@ -1839,6 +1840,7 @@ JSystem/JAudio2/JASTrack.cpp: .rodata start:0x8039CCB0 end:0x8039CCF8 .data start:0x803C7B08 end:0x803C7B30 .bss start:0x80433668 end:0x80433AD8 + .sbss start:0x804531F8 end:0x80453200 .sdata2 start:0x80457578 end:0x804575B0 JSystem/JAudio2/JASTrackPort.cpp: @@ -2006,7 +2008,7 @@ JSystem/JAudio2/osdsp.cpp: JSystem/JAudio2/osdsp_task.cpp: .text start:0x8029F920 end:0x8029FDAC .bss start:0x80436020 end:0x80436038 - .sbss start:0x804532D0 end:0x804532F8 + .sbss start:0x804532D0 end:0x804532D8 JSystem/JAudio2/JAIAudible.cpp: .text start:0x8029FDAC end:0x8029FDF4 @@ -2026,12 +2028,14 @@ JSystem/JAudio2/JAISeMgr.cpp: .rodata start:0x8039D5D8 end:0x8039D5F0 .data start:0x803CB850 end:0x803CB878 .bss start:0x80436038 end:0x80436058 + .sbss start:0x804532D8 end:0x804532E0 .sdata2 start:0x80457760 end:0x80457770 JSystem/JAudio2/JAISeq.cpp: .text start:0x802A186C end:0x802A2574 .data start:0x803CB878 end:0x803CB8C8 .bss start:0x80436058 end:0x80436080 + .sbss start:0x804532E0 end:0x804532E8 .sdata2 start:0x80457770 end:0x80457780 JSystem/JAudio2/JAISeqDataMgr.cpp: @@ -2042,6 +2046,7 @@ JSystem/JAudio2/JAISeqMgr.cpp: .text start:0x802A2604 end:0x802A2F84 .data start:0x803CB8F8 end:0x803CB910 .bss start:0x80436080 end:0x804360A0 + .sbss start:0x804532E8 end:0x804532F0 .sdata2 start:0x80457780 end:0x80457790 JSystem/JAudio2/JAISound.cpp: @@ -2082,6 +2087,7 @@ JSystem/JAudio2/JAIStreamDataMgr.cpp: JSystem/JAudio2/JAIStreamMgr.cpp: .text start:0x802A4968 end:0x802A5044 .bss start:0x804360B0 end:0x804360D0 + .sbss start:0x804532F0 end:0x804532F8 .sdata2 start:0x804577D8 end:0x804577E8 JSystem/JAudio2/JAUAudioArcInterpreter.cpp: @@ -2154,7 +2160,7 @@ Z2AudioLib/Z2Calc.cpp: Z2AudioLib/Z2Param.cpp: .sdata start:0x80452798 end:0x80452830 - .sbss start:0x80453300 end:0x80453318 + .sbss start:0x80453300 end:0x80453310 Z2AudioLib/Z2AudioArcLoader.cpp: .text start:0x802AA834 end:0x802AA9C8 @@ -2174,6 +2180,7 @@ Z2AudioLib/Z2SoundStarter.cpp: Z2AudioLib/Z2SoundHandles.cpp: .text start:0x802ABE7C end:0x802AC44C .bss start:0x80436178 end:0x80436198 + .sbss start:0x80453310 end:0x80453318 Z2AudioLib/Z2SeMgr.cpp: .text start:0x802AC44C end:0x802AFCA0 @@ -2375,10 +2382,10 @@ JSystem/JKernel/JKRFileCache.cpp: JSystem/JKernel/JKRArchivePub.cpp: .text start:0x802D6578 end:0x802D7094 + .data start:0x803CE228 end:0x803CE278 JSystem/JKernel/JKRArchivePri.cpp: .text start:0x802D7094 end:0x802D77B8 - .data start:0x803CE228 end:0x803CE278 .sbss start:0x804533E8 end:0x804533F0 JSystem/JKernel/JKRMemArchive.cpp: diff --git a/config/GZ2P01/symbols.txt b/config/GZ2P01/symbols.txt index ae9eb5e908..14389374c0 100644 --- a/config/GZ2P01/symbols.txt +++ b/config/GZ2P01/symbols.txt @@ -1,9 +1,9 @@ -__check_pad3 = .init:0x80003100; // type:function size:0x40 scope:local -__set_debug_bba = .init:0x80003140; // type:function size:0xC scope:local -__get_debug_bba = .init:0x8000314C; // type:function size:0x8 scope:local -__start = .init:0x80003154; // type:function size:0x15C scope:weak -__init_registers = .init:0x800032B0; // type:function size:0x90 scope:local -__init_data = .init:0x80003340; // type:function size:0xC0 scope:local +__check_pad3 = .init:0x80003100; // type:function size:0x40 scope:global +__set_debug_bba = .init:0x80003140; // type:function size:0xC scope:global +__get_debug_bba = .init:0x8000314C; // type:function size:0x8 scope:global +__start = .init:0x80003154; // type:function size:0x15C scope:global +__init_registers = .init:0x800032B0; // type:function size:0x90 scope:global +__init_data = .init:0x80003340; // type:function size:0xC0 scope:global __init_hardware = .init:0x80003400; // type:function size:0x24 scope:global __flush_cache = .init:0x80003424; // type:function size:0x34 scope:global memset = .init:0x80003458; // type:function size:0x30 scope:global @@ -16,11 +16,11 @@ __TRK_reset = .init:0x80005518; // type:function size:0x2C scope:global align:4 gTRKInterruptVectorTableEnd = .init:0x80005518; // type:label scope:global _rom_copy_info = .init:0x80005544; // type:object size:0x84 scope:global data:4byte _bss_init_info = .init:0x800055C8; // type:object size:0x20 scope:global data:4byte -@etb_80005600 = extab:0x80005600; // type:object size:0x8 scope:local hidden -@etb_80005608 = extab:0x80005608; // type:object size:0x8 scope:local hidden -@etb_80005610 = extab:0x80005610; // type:object size:0x18 scope:local hidden -@etb_80005628 = extab:0x80005628; // type:object size:0x8 scope:local hidden -@etb_80005630 = extab:0x80005630; // type:object size:0x18 scope:local hidden +@154 = extab:0x80005600; // type:object size:0x8 scope:local hidden +@159 = extab:0x80005608; // type:object size:0x8 scope:local hidden +@180 = extab:0x80005610; // type:object size:0x18 scope:local hidden +@188 = extab:0x80005628; // type:object size:0x8 scope:local hidden +@211 = extab:0x80005630; // type:object size:0x18 scope:local hidden @206 = extabindex:0x80005660; // type:object size:0xC scope:local align:4 @211 = extabindex:0x8000566C; // type:object size:0xC scope:local align:4 @232 = extabindex:0x80005678; // type:object size:0xC scope:local align:4 @@ -30,13 +30,13 @@ _eti_init_info = extabindex:0x8000569C; // type:object size:0x20 scope:global version_check__Fv = .text:0x800056C0; // type:function size:0x68 scope:global align:4 CheckHeap1__9HeapCheckFv = .text:0x80005728; // type:function size:0x64 scope:global align:4 CheckHeap__FUl = .text:0x8000578C; // type:function size:0xBC scope:global align:4 -countUsed__FP10JKRExpHeap = .text:0x80005848; // type:function size:0x58 scope:global align:4 +countUsed__FP10JKRExpHeap = .text:0x80005848; // type:function size:0x58 scope:local align:4 getUsedCount__9HeapCheckCFv = .text:0x800058A0; // type:function size:0x24 scope:global align:4 heapDisplay__9HeapCheckCFv = .text:0x800058C4; // type:function size:0x214 scope:global align:4 debugDisplay__Fv = .text:0x80005AD8; // type:function size:0x274 scope:global align:4 Debug_console__FUl = .text:0x80005D4C; // type:function size:0x400 scope:global align:4 LOAD_COPYDATE__FPv = .text:0x8000614C; // type:function size:0x7C scope:global align:4 -debug__Fv = .text:0x800061C8; // type:function size:0xC4 scope:global align:4 +debug__Fv = .text:0x800061C8; // type:function size:0xC4 scope:local align:4 main01__Fv = .text:0x8000628C; // type:function size:0x1C8 scope:global align:4 main = .text:0x80006454; // type:function size:0x184 scope:global align:4 dump_sort__7JKRHeapFv = .text:0x800065D8; // type:function size:0x8 scope:global align:4 @@ -44,25 +44,25 @@ __sinit_m_Do_main_cpp = .text:0x800065E0; // type:function size:0x1B8 scope:loca OSSwitchFiberEx__FUlUlUlUlUlUl = .text:0x80006798; // type:function size:0x30 scope:global align:4 my_PutString__FPCc = .text:0x800067C8; // type:function size:0x2C scope:global align:4 OSVAttention__FPCcP16__va_list_struct = .text:0x800067F4; // type:function size:0x20 scope:global align:4 -OSAttention = .text:0x80006814; // type:function size:0x80 scope:global align:4 -OSReportDisable = .text:0x80006894; // type:function size:0xC scope:global align:4 -OSReportEnable = .text:0x800068A0; // type:function size:0xC scope:global align:4 -OSReportForceEnableOn = .text:0x800068AC; // type:function size:0xC scope:global align:4 -OSReportForceEnableOff = .text:0x800068B8; // type:function size:0xC scope:global align:4 +OSAttention = .text:0x80006814; // type:function size:0x80 scope:weak align:4 +OSReportDisable = .text:0x80006894; // type:function size:0xC scope:weak align:4 +OSReportEnable = .text:0x800068A0; // type:function size:0xC scope:weak align:4 +OSReportForceEnableOn = .text:0x800068AC; // type:function size:0xC scope:weak align:4 +OSReportForceEnableOff = .text:0x800068B8; // type:function size:0xC scope:weak align:4 OSReportInit__Fv = .text:0x800068C4; // type:function size:0x18 scope:global align:4 mDoPrintf_vprintf_Interrupt__FPCcP16__va_list_struct = .text:0x800068DC; // type:function size:0x88 scope:global align:4 mDoPrintf_vprintf_Thread__FPCcP16__va_list_struct = .text:0x80006964; // type:function size:0x20 scope:global align:4 mDoPrintf_vprintf__FPCcP16__va_list_struct = .text:0x80006984; // type:function size:0x8C scope:global align:4 mDoPrintf_VReport = .text:0x80006A10; // type:function size:0x8C scope:global align:4 -OSVReport = .text:0x80006A9C; // type:function size:0x20 scope:global align:4 -OSReport = .text:0x80006ABC; // type:function size:0x80 scope:global align:4 -OSReport_FatalError = .text:0x80006B3C; // type:function size:0xD0 scope:global align:4 -OSReport_Error = .text:0x80006C0C; // type:function size:0xE0 scope:global align:4 -OSReport_Warning = .text:0x80006CEC; // type:function size:0xE0 scope:global align:4 -OSReport_System = .text:0x80006DCC; // type:function size:0xB0 scope:global align:4 -OSPanic = .text:0x80006E7C; // type:function size:0x138 scope:global align:4 +OSVReport = .text:0x80006A9C; // type:function size:0x20 scope:weak align:4 +OSReport = .text:0x80006ABC; // type:function size:0x80 scope:weak align:4 +OSReport_FatalError = .text:0x80006B3C; // type:function size:0xD0 scope:weak align:4 +OSReport_Error = .text:0x80006C0C; // type:function size:0xE0 scope:weak align:4 +OSReport_Warning = .text:0x80006CEC; // type:function size:0xE0 scope:weak align:4 +OSReport_System = .text:0x80006DCC; // type:function size:0xB0 scope:weak align:4 +OSPanic = .text:0x80006E7C; // type:function size:0x138 scope:weak align:4 reset__17mDoAud_zelAudio_cFv = .text:0x80006FB4; // type:function size:0xC scope:global align:4 -mDoAud_Create__Fv = .text:0x80006FC0; // type:function size:0x1A4 scope:global align:4 +mDoAud_Create__Fv = .text:0x80006FC0; // type:function size:0x1A4 scope:local align:4 mDoAud_Execute__Fv = .text:0x80007164; // type:function size:0x58 scope:global align:4 mDoAud_setSceneName__FPCcll = .text:0x800071BC; // type:function size:0x3C scope:global align:4 mDoAud_load1stDynamicWave__Fv = .text:0x800071F8; // type:function size:0x2C scope:global align:4 @@ -71,17 +71,17 @@ mDoAud_setFadeInStart__FUc = .text:0x80007254; // type:function size:0x30 scope: mDoAud_resetProcess__Fv = .text:0x80007284; // type:function size:0x40 scope:global align:4 mDoAud_resetRecover__Fv = .text:0x800072C4; // type:function size:0x54 scope:global align:4 __sinit_m_Do_audio_cpp = .text:0x80007318; // type:function size:0x50 scope:local align:4 -__dt__17mDoAud_zelAudio_cFv = .text:0x80007368; // type:function size:0x60 scope:global align:4 -__dt__10Z2AudioMgrFv = .text:0x800073C8; // type:function size:0x470 scope:global align:4 -__dt__14JAISoundHandleFv = .text:0x80007838; // type:function size:0x50 scope:global align:4 -__dt__12Z2MultiSeObjFv = .text:0x80007888; // type:function size:0x54 scope:global align:4 -__dt__16JAISeCategoryMgrFv = .text:0x800078DC; // type:function size:0x78 scope:global align:4 +__dt__17mDoAud_zelAudio_cFv = .text:0x80007368; // type:function size:0x60 scope:weak align:4 +__dt__10Z2AudioMgrFv = .text:0x800073C8; // type:function size:0x470 scope:weak align:4 +__dt__14JAISoundHandleFv = .text:0x80007838; // type:function size:0x50 scope:weak align:4 +__dt__12Z2MultiSeObjFv = .text:0x80007888; // type:function size:0x54 scope:weak align:4 +__dt__16JAISeCategoryMgrFv = .text:0x800078DC; // type:function size:0x78 scope:weak align:4 create__8mDoCPd_cFv = .text:0x80007954; // type:function size:0x140 scope:global align:4 read__8mDoCPd_cFv = .text:0x80007A94; // type:function size:0xE8 scope:global align:4 convert__8mDoCPd_cFP27interface_of_controller_padP10JUTGamePad = .text:0x80007B7C; // type:function size:0x154 scope:global align:4 LRlockCheck__8mDoCPd_cFP27interface_of_controller_pad = .text:0x80007CD0; // type:function size:0xA4 scope:global align:4 recalibrate__8mDoCPd_cFv = .text:0x80007D74; // type:function size:0x28 scope:global align:4 -createTimg__FUsUsUl = .text:0x80007D9C; // type:function size:0xA8 scope:global align:4 +createTimg__FUsUsUl = .text:0x80007D9C; // type:function size:0xA8 scope:local align:4 create__13mDoGph_gInf_cFv = .text:0x80007E44; // type:function size:0x14C scope:global align:4 beginRender__13mDoGph_gInf_cFv = .text:0x80007F90; // type:function size:0x48 scope:global align:4 fadeOut__13mDoGph_gInf_cFfR8_GXColor = .text:0x80007FD8; // type:function size:0x50 scope:global align:4 @@ -93,35 +93,35 @@ darwFilter__F8_GXColor = .text:0x800080F4; // type:function size:0x23C scope:glo calcFade__13mDoGph_gInf_cFv = .text:0x80008330; // type:function size:0xEC scope:global align:4 mDoGph_BlankingON__Fv = .text:0x8000841C; // type:function size:0x4 scope:global align:4 mDoGph_BlankingOFF__Fv = .text:0x80008420; // type:function size:0x4 scope:global align:4 -dScnPly_BeforeOfPaint__Fv = .text:0x80008424; // type:function size:0x2C scope:global align:4 +dScnPly_BeforeOfPaint__Fv = .text:0x80008424; // type:function size:0x2C scope:local align:4 mDoGph_BeforeOfDraw__Fv = .text:0x80008450; // type:function size:0x24 scope:global align:4 mDoGph_AfterOfDraw__Fv = .text:0x80008474; // type:function size:0x1BC scope:global align:4 -drawDepth2__FP10view_classP15view_port_classi = .text:0x80008630; // type:function size:0xB54 scope:global align:4 -__dt__4cXyzFv = .text:0x80009184; // type:function size:0x3C scope:global align:4 -trimming__FP10view_classP15view_port_class = .text:0x800091C0; // type:function size:0x2F4 scope:global align:4 +drawDepth2__FP10view_classP15view_port_classi = .text:0x80008630; // type:function size:0xB54 scope:local align:4 +__dt__4cXyzFv = .text:0x80009184; // type:function size:0x3C scope:weak align:4 +trimming__FP10view_classP15view_port_class = .text:0x800091C0; // type:function size:0x2F4 scope:local align:4 mDoGph_drawFilterQuad__FScSc = .text:0x800094B4; // type:function size:0x90 scope:global align:4 create__Q213mDoGph_gInf_c7bloom_cFv = .text:0x80009544; // type:function size:0xB4 scope:global align:4 remove__Q213mDoGph_gInf_c7bloom_cFv = .text:0x800095F8; // type:function size:0x58 scope:global align:4 draw__Q213mDoGph_gInf_c7bloom_cFv = .text:0x80009650; // type:function size:0xB10 scope:global align:4 -retry_captue_frame__FP10view_classP15view_port_classi = .text:0x8000A160; // type:function size:0x130 scope:global align:4 -motionBlure__FP10view_class = .text:0x8000A290; // type:function size:0x274 scope:global align:4 -setLight__Fv = .text:0x8000A504; // type:function size:0x88 scope:global align:4 -drawItem3D__Fv = .text:0x8000A58C; // type:function size:0x78 scope:global align:4 +retry_captue_frame__FP10view_classP15view_port_classi = .text:0x8000A160; // type:function size:0x130 scope:local align:4 +motionBlure__FP10view_class = .text:0x8000A290; // type:function size:0x274 scope:local align:4 +setLight__Fv = .text:0x8000A504; // type:function size:0x88 scope:local align:4 +drawItem3D__Fv = .text:0x8000A58C; // type:function size:0x78 scope:local align:4 mDoGph_Painter__Fv = .text:0x8000A604; // type:function size:0xB14 scope:global align:4 -__dt__13J2DOrthoGraphFv = .text:0x8000B118; // type:function size:0x5C scope:global align:4 +__dt__13J2DOrthoGraphFv = .text:0x8000B118; // type:function size:0x5C scope:weak align:4 mDoGph_Create__Fv = .text:0x8000B174; // type:function size:0x5C scope:global align:4 __sinit_m_Do_graphic_cpp = .text:0x8000B1D0; // type:function size:0x14 scope:local align:4 -getAtnActorID__9daPy_py_cCFv = .text:0x8000B1E4; // type:function size:0x8 scope:global align:4 -myGetHeapTypeByString__FP7JKRHeap = .text:0x8000B1EC; // type:function size:0x200 scope:global align:4 -myMemoryErrorRoutine__FPvUli = .text:0x8000B3EC; // type:function size:0x1DC scope:global align:4 +getAtnActorID__9daPy_py_cCFv = .text:0x8000B1E4; // type:function size:0x8 scope:weak align:4 +myGetHeapTypeByString__FP7JKRHeap = .text:0x8000B1EC; // type:function size:0x200 scope:local align:4 +myMemoryErrorRoutine__FPvUli = .text:0x8000B3EC; // type:function size:0x1DC scope:local align:4 myHeapCheckRecursive__FP7JKRHeap = .text:0x8000B5C8; // type:function size:0xA0 scope:global align:4 mDoMch_HeapCheckAll__Fv = .text:0x8000B668; // type:function size:0x24 scope:global align:4 -developKeyCheck__FUlUl = .text:0x8000B68C; // type:function size:0xB0 scope:global align:4 +developKeyCheck__FUlUl = .text:0x8000B68C; // type:function size:0xB0 scope:local align:4 exceptionReadPad__FPUlPUl = .text:0x8000B73C; // type:function size:0x30 scope:global align:4 exceptionRestart__Fv = .text:0x8000B76C; // type:function size:0x30 scope:global align:4 myExceptionCallback__FUsP9OSContextUlUl = .text:0x8000B79C; // type:function size:0x194 scope:global align:4 -fault_callback_scroll__FUsP9OSContextUlUl = .text:0x8000B930; // type:function size:0x398 scope:global align:4 -my_PrintHeap__FPCcUl = .text:0x8000BCC8; // type:function size:0x4 scope:global align:4 +fault_callback_scroll__FUsP9OSContextUlUl = .text:0x8000B930; // type:function size:0x398 scope:local align:4 +my_PrintHeap__FPCcUl = .text:0x8000BCC8; // type:function size:0x4 scope:local align:4 my_SysPrintHeap__FPCcPvUl = .text:0x8000BCCC; // type:function size:0x4C scope:global align:4 mDoMch_Create__Fv = .text:0x8000BD18; // type:function size:0x368 scope:global align:4 mDoMtx_XYZrotS__FPA4_fsss = .text:0x8000C080; // type:function size:0x98 scope:global align:4 @@ -154,8 +154,8 @@ ZXYrotS__14mDoMtx_stack_cFRC5csXyz = .text:0x8000CEC0; // type:function size:0x3 ZXYrotM__14mDoMtx_stack_cFRC5csXyz = .text:0x8000CEF8; // type:function size:0x38 scope:global align:4 quatM__14mDoMtx_stack_cFPC10Quaternion = .text:0x8000CF30; // type:function size:0x3C scope:global align:4 __sinit_m_Do_mtx_cpp = .text:0x8000CF6C; // type:function size:0x7C scope:local align:4 -__dt__18mDoMtx_quatStack_cFv = .text:0x8000CFE8; // type:function size:0x3C scope:global align:4 -__dt__14mDoMtx_stack_cFv = .text:0x8000D024; // type:function size:0x3C scope:global align:4 +__dt__18mDoMtx_quatStack_cFv = .text:0x8000CFE8; // type:function size:0x3C scope:weak align:4 +__dt__14mDoMtx_stack_cFv = .text:0x8000D024; // type:function size:0x3C scope:weak align:4 mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs = .text:0x8000D060; // type:function size:0x274 scope:global align:4 initPlay__14mDoExt_baseAnmFsifss = .text:0x8000D2D4; // type:function size:0x108 scope:global align:4 play__14mDoExt_baseAnmFv = .text:0x8000D3DC; // type:function size:0x54 scope:global align:4 @@ -386,16 +386,16 @@ setup__14mDoLib_clipperFffff = .text:0x80015240; // type:function size:0x84 scop mDoLib_project__FP3VecP3Vec = .text:0x800152C4; // type:function size:0x1DC scope:global align:4 mDoLib_pos2camera__FP3VecP3Vec = .text:0x800154A0; // type:function size:0x58 scope:global align:4 __sinit_m_Do_lib_cpp = .text:0x800154F8; // type:function size:0x4C scope:local align:4 -__dt__11J3DUClipperFv = .text:0x80015544; // type:function size:0x48 scope:global align:4 -my_OSCancelAlarmAll__Fv = .text:0x8001558C; // type:function size:0x4 scope:global align:4 -destroyVideo__Fv = .text:0x80015590; // type:function size:0x38 scope:global align:4 +__dt__11J3DUClipperFv = .text:0x80015544; // type:function size:0x48 scope:weak align:4 +my_OSCancelAlarmAll__Fv = .text:0x8001558C; // type:function size:0x4 scope:local align:4 +destroyVideo__Fv = .text:0x80015590; // type:function size:0x38 scope:local align:4 mDoRst_reset__FiUli = .text:0x800155C8; // type:function size:0x138 scope:global align:4 mDoRst_resetCallBack__FiPv = .text:0x80015700; // type:function size:0xA8 scope:global align:4 -getResetData__6mDoRstFv = .text:0x800157A8; // type:function size:0x8 scope:global align:4 +getResetData__6mDoRstFv = .text:0x800157A8; // type:function size:0x8 scope:weak align:4 main__9mDoDvdThdFPv = .text:0x800157B0; // type:function size:0x5C scope:global align:4 create__9mDoDvdThdFl = .text:0x8001580C; // type:function size:0x5C scope:global align:4 suspend__9mDoDvdThdFv = .text:0x80015868; // type:function size:0x28 scope:global align:4 -my_DVDConvertPathToEntrynum__FPCc = .text:0x80015890; // type:function size:0x20 scope:global align:4 +my_DVDConvertPathToEntrynum__FPCc = .text:0x80015890; // type:function size:0x20 scope:local align:4 __dt__19mDoDvdThd_command_cFv = .text:0x800158B0; // type:function size:0x48 scope:global align:4 __ct__17mDoDvdThd_param_cFv = .text:0x800158F8; // type:function size:0x48 scope:global align:4 kick__17mDoDvdThd_param_cFv = .text:0x80015940; // type:function size:0x28 scope:global align:4 @@ -403,7 +403,7 @@ waitForKick__17mDoDvdThd_param_cFv = .text:0x80015968; // type:function size:0x2 getFirstCommand__17mDoDvdThd_param_cFv = .text:0x80015990; // type:function size:0x8 scope:global align:4 addition__17mDoDvdThd_param_cFP19mDoDvdThd_command_c = .text:0x80015998; // type:function size:0x58 scope:global align:4 cut__17mDoDvdThd_param_cFP19mDoDvdThd_command_c = .text:0x800159F0; // type:function size:0x54 scope:global align:4 -cb__FPv = .text:0x80015A44; // type:function size:0x48 scope:global align:4 +cb__FPv = .text:0x80015A44; // type:function size:0x48 scope:local align:4 mainLoop__17mDoDvdThd_param_cFv = .text:0x80015A8C; // type:function size:0x9C scope:global align:4 __ct__19mDoDvdThd_command_cFv = .text:0x80015B28; // type:function size:0x44 scope:global align:4 __dt__20mDoDvdThd_callback_cFv = .text:0x80015B6C; // type:function size:0x60 scope:global align:4 @@ -425,8 +425,8 @@ execute__21mDoDvdThd_toMainRam_cFv = .text:0x80016470; // type:function size:0xB __sinit_m_Do_dvd_thread_cpp = .text:0x80016528; // type:function size:0x28 scope:local align:4 mDoDvdErr_ThdInit__Fv = .text:0x80016550; // type:function size:0xC0 scope:global align:4 mDoDvdErr_ThdCleanup__Fv = .text:0x80016610; // type:function size:0x48 scope:global align:4 -mDoDvdErr_Watch__FPv = .text:0x80016658; // type:function size:0x60 scope:global align:4 -AlarmHandler__FP7OSAlarmP9OSContext = .text:0x800166B8; // type:function size:0x28 scope:global align:4 +mDoDvdErr_Watch__FPv = .text:0x80016658; // type:function size:0x60 scope:local align:4 +AlarmHandler__FP7OSAlarmP9OSContext = .text:0x800166B8; // type:function size:0x28 scope:local align:4 __ct__15mDoMemCd_Ctrl_cFv = .text:0x800166E0; // type:function size:0x4 scope:global align:4 ThdInit__15mDoMemCd_Ctrl_cFv = .text:0x800166E4; // type:function size:0xA0 scope:global align:4 main__15mDoMemCd_Ctrl_cFv = .text:0x80016784; // type:function size:0xC4 scope:global align:4 @@ -448,15 +448,15 @@ mount__15mDoMemCd_Ctrl_cFv = .text:0x800170FC; // type:function size:0x12C scope loadfile__15mDoMemCd_Ctrl_cFv = .text:0x80017228; // type:function size:0x60 scope:global align:4 checkspace__15mDoMemCd_Ctrl_cFv = .text:0x80017288; // type:function size:0x8C scope:global align:4 setCardState__15mDoMemCd_Ctrl_cFl = .text:0x80017314; // type:function size:0xBC scope:global align:4 -mDoMemCd_main__FPv = .text:0x800173D0; // type:function size:0x54 scope:global align:4 +mDoMemCd_main__FPv = .text:0x800173D0; // type:function size:0x54 scope:local align:4 __sinit_m_Do_MemCard_cpp = .text:0x80017424; // type:function size:0x28 scope:local align:4 mDoMemCdRWm_Store__FP12CARDFileInfoPvUl = .text:0x8001744C; // type:function size:0x204 scope:global align:4 mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl = .text:0x80017650; // type:function size:0x1E0 scope:global align:4 -mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData = .text:0x80017830; // type:function size:0x25C scope:global align:4 -mDoMemCdRWm_SetCardStat__FP12CARDFileInfo = .text:0x80017A8C; // type:function size:0x168 scope:global align:4 -mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo = .text:0x80017BF4; // type:function size:0x128 scope:global align:4 -mDoMemCdRWm_CalcCheckSum__FPvUl = .text:0x80017D1C; // type:function size:0x40 scope:global align:4 -mDoMemCdRWm_CalcCheckSumGameData__FPvUl = .text:0x80017D5C; // type:function size:0x38 scope:global align:4 +mDoMemCdRWm_BuildHeader__FP22mDoMemCdRWm_HeaderData = .text:0x80017830; // type:function size:0x25C scope:local align:4 +mDoMemCdRWm_SetCardStat__FP12CARDFileInfo = .text:0x80017A8C; // type:function size:0x168 scope:local align:4 +mDoMemCdRWm_CheckCardStat__FP12CARDFileInfo = .text:0x80017BF4; // type:function size:0x128 scope:local align:4 +mDoMemCdRWm_CalcCheckSum__FPvUl = .text:0x80017D1C; // type:function size:0x40 scope:local align:4 +mDoMemCdRWm_CalcCheckSumGameData__FPvUl = .text:0x80017D5C; // type:function size:0x38 scope:local align:4 mDoMemCdRWm_TestCheckSumGameData__FPv = .text:0x80017D94; // type:function size:0x4C scope:global align:4 mDoMemCdRWm_SetCheckSumGameData__FPUcUc = .text:0x80017DE0; // type:function size:0x44 scope:global align:4 print_f__FPCce = .text:0x80017E24; // type:function size:0x8C scope:global align:4 @@ -469,15 +469,15 @@ exception_addition__FP10JUTConsole = .text:0x800181F4; // type:function size:0x3 execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle = .text:0x80018224; // type:function size:0x128 scope:global align:4 draw__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle = .text:0x8001834C; // type:function size:0x4 scope:global align:4 cDmrNowMidnaTalk__Fv = .text:0x80018350; // type:function size:0x80 scope:global align:4 -__dt__24JPTraceParticleCallBack4Fv = .text:0x800183D0; // type:function size:0x60 scope:global align:4 +__dt__24JPTraceParticleCallBack4Fv = .text:0x800183D0; // type:function size:0x60 scope:weak align:4 __sinit_c_damagereaction_cpp = .text:0x80018430; // type:function size:0x4C scope:local align:4 -execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x8001847C; // type:function size:0x4 scope:global align:4 -draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x80018480; // type:function size:0x4 scope:global align:4 +execute__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x8001847C; // type:function size:0x4 scope:weak align:4 +draw__19JPAParticleCallBackFP14JPABaseEmitterP15JPABaseParticle = .text:0x80018480; // type:function size:0x4 scope:weak align:4 cCc_Init__Fv = .text:0x80018484; // type:function size:0x168 scope:global align:4 cDyl_IsLinked__Fs = .text:0x800185EC; // type:function size:0x38 scope:global align:4 cDyl_Unlink__Fs = .text:0x80018624; // type:function size:0x44 scope:global align:4 cDyl_LinkASync__Fs = .text:0x80018668; // type:function size:0xC8 scope:global align:4 -cDyl_InitCallback__FPv = .text:0x80018730; // type:function size:0xDC scope:global align:4 +cDyl_InitCallback__FPv = .text:0x80018730; // type:function size:0xDC scope:local align:4 cDyl_InitAsync__Fv = .text:0x8001880C; // type:function size:0x34 scope:global align:4 cDyl_InitAsyncIsDone__Fv = .text:0x80018840; // type:function size:0x6C scope:global align:4 phase_01__7cDylPhsFPv = .text:0x800188AC; // type:function size:0x8 scope:global align:4 @@ -485,8 +485,8 @@ phase_02__7cDylPhsFPs = .text:0x800188B4; // type:function size:0x38 scope:globa phase_03__7cDylPhsFPv = .text:0x800188EC; // type:function size:0x8 scope:global align:4 Link__7cDylPhsFP30request_of_phase_process_classs = .text:0x800188F4; // type:function size:0x44 scope:global align:4 Unlink__7cDylPhsFP30request_of_phase_process_classs = .text:0x80018938; // type:function size:0x4C scope:global align:4 -getModuleName__24DynamicModuleControlBaseCFv = .text:0x80018984; // type:function size:0x8 scope:global align:4 -__dt__20DynamicModuleControlFv = .text:0x8001898C; // type:function size:0x60 scope:global align:4 +getModuleName__24DynamicModuleControlBaseCFv = .text:0x80018984; // type:function size:0x8 scope:weak align:4 +__dt__20DynamicModuleControlFv = .text:0x8001898C; // type:function size:0x60 scope:weak align:4 __ct__11fapGm_HIO_cFv = .text:0x800189EC; // type:function size:0x100 scope:global align:4 fapGm_After__Fv = .text:0x80018AEC; // type:function size:0x28 scope:global align:4 fapGm_Execute__Fv = .text:0x80018B14; // type:function size:0x34 scope:global align:4 @@ -494,17 +494,17 @@ fapGm_Create__Fv = .text:0x80018B48; // type:function size:0x40 scope:global ali __dt__11fapGm_HIO_cFv = .text:0x80018B88; // type:function size:0x48 scope:global align:4 __sinit_f_ap_game_cpp = .text:0x80018BD0; // type:function size:0x3C scope:local align:4 __ct__10fopAc_ac_cFv = .text:0x80018C0C; // type:function size:0x6C scope:global align:4 -__dt__5csXyzFv = .text:0x80018C78; // type:function size:0x3C scope:global align:4 -__ct__11J3DLightObjFv = .text:0x80018CB4; // type:function size:0x38 scope:global align:4 -__dt__11dEvt_info_cFv = .text:0x80018CEC; // type:function size:0x48 scope:global align:4 +__dt__5csXyzFv = .text:0x80018C78; // type:function size:0x3C scope:weak align:4 +__ct__11J3DLightObjFv = .text:0x80018CB4; // type:function size:0x38 scope:weak align:4 +__dt__11dEvt_info_cFv = .text:0x80018CEC; // type:function size:0x48 scope:weak align:4 __dt__10fopAc_ac_cFv = .text:0x80018D34; // type:function size:0x54 scope:global align:4 fopAc_IsActor__FPv = .text:0x80018D88; // type:function size:0x2C scope:global align:4 -fopAc_Draw__FPv = .text:0x80018DB4; // type:function size:0xCC scope:global align:4 -fopAc_Execute__FPv = .text:0x80018E80; // type:function size:0x1A0 scope:global align:4 -fopAc_IsDelete__FPv = .text:0x80019020; // type:function size:0x54 scope:global align:4 -fopAc_Delete__FPv = .text:0x80019074; // type:function size:0x80 scope:global align:4 -fopAc_Create__FPv = .text:0x800190F4; // type:function size:0x3B0 scope:global align:4 -getFileListInfo__15dStage_roomDt_cCFv = .text:0x800194A4; // type:function size:0x8 scope:global align:4 +fopAc_Draw__FPv = .text:0x80018DB4; // type:function size:0xCC scope:local align:4 +fopAc_Execute__FPv = .text:0x80018E80; // type:function size:0x1A0 scope:local align:4 +fopAc_IsDelete__FPv = .text:0x80019020; // type:function size:0x54 scope:local align:4 +fopAc_Delete__FPv = .text:0x80019074; // type:function size:0x80 scope:local align:4 +fopAc_Create__FPv = .text:0x800190F4; // type:function size:0x3B0 scope:local align:4 +getFileListInfo__15dStage_roomDt_cCFv = .text:0x800194A4; // type:function size:0x8 scope:weak align:4 initBallModel__13fopEn_enemy_cFv = .text:0x800194AC; // type:function size:0xF8 scope:global align:4 checkBallModelDraw__13fopEn_enemy_cFv = .text:0x800195A4; // type:function size:0x24 scope:global align:4 setBallModelEffect__13fopEn_enemy_cFP12dKy_tevstr_c = .text:0x800195C8; // type:function size:0x180 scope:global align:4 @@ -599,11 +599,11 @@ fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci = .text:0x8001D0C8 fopAcM_effHamonSet__FPUlPC4cXyzff = .text:0x8001D1B4; // type:function size:0xE8 scope:global align:4 fopAcM_riverStream__FP4cXyzPsPff = .text:0x8001D29C; // type:function size:0x8 scope:global align:4 fopAcM_carryOffRevise__FP10fopAc_ac_c = .text:0x8001D2A4; // type:function size:0x130 scope:global align:4 -vectle_calc__FPC10DOUBLE_POSP4cXyz = .text:0x8001D3D4; // type:function size:0xA8 scope:global align:4 -get_vectle_calc__FPC4cXyzPC4cXyzP4cXyz = .text:0x8001D47C; // type:function size:0x58 scope:global align:4 +vectle_calc__FPC10DOUBLE_POSP4cXyz = .text:0x8001D3D4; // type:function size:0xA8 scope:local align:4 +get_vectle_calc__FPC4cXyzPC4cXyzP4cXyz = .text:0x8001D47C; // type:function size:0x58 scope:local align:4 fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData = .text:0x8001D4D4; // type:function size:0x178 scope:global align:4 fopAcM_getProcNameString__FPC10fopAc_ac_c = .text:0x8001D64C; // type:function size:0x48 scope:global align:4 -fopAcM_findObjectCB__FPC10fopAc_ac_cPv = .text:0x8001D694; // type:function size:0xAC scope:global align:4 +fopAcM_findObjectCB__FPC10fopAc_ac_cPv = .text:0x8001D694; // type:function size:0xAC scope:local align:4 fopAcM_searchFromName__FPCcUlUl = .text:0x8001D740; // type:function size:0x58 scope:global align:4 fopAcM_findObject4EventCB__FP10fopAc_ac_cPv = .text:0x8001D798; // type:function size:0xB0 scope:global align:4 fopAcM_searchFromName4Event__FPCcs = .text:0x8001D848; // type:function size:0xF0 scope:global align:4 @@ -611,7 +611,7 @@ fopAcM_getWaterY__FPC4cXyzPf = .text:0x8001D938; // type:function size:0x70 scop fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz = .text:0x8001D9A8; // type:function size:0xA8 scope:global align:4 fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii = .text:0x8001DA50; // type:function size:0x13C scope:global align:4 fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos = .text:0x8001DB8C; // type:function size:0xAC scope:global align:4 -__dt__8cM3dGPlaFv = .text:0x8001DC38; // type:function size:0x48 scope:global align:4 +__dt__8cM3dGPlaFv = .text:0x8001DC38; // type:function size:0x48 scope:weak align:4 fopAcM_getPolygonAngle__FPC8cM3dGPlas = .text:0x8001DC80; // type:function size:0x90 scope:global align:4 lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c = .text:0x8001DD10; // type:function size:0x54 scope:global align:4 gndCheck__11fopAcM_gc_cFPC4cXyz = .text:0x8001DD64; // type:function size:0x60 scope:global align:4 @@ -619,38 +619,38 @@ roofCheck__11fopAcM_rc_cFPC4cXyz = .text:0x8001DDC4; // type:function size:0x68 waterCheck__11fopAcM_wt_cFPC4cXyz = .text:0x8001DE2C; // type:function size:0x8C scope:global align:4 fopAcM_initManager__Fv = .text:0x8001DEB8; // type:function size:0x4 scope:global align:4 __sinit_f_op_actor_mng_cpp = .text:0x8001DEBC; // type:function size:0x11C scope:local align:4 -__dt__11dBgS_WtrChkFv = .text:0x8001DFD8; // type:function size:0x78 scope:global align:4 -__dt__15dBgS_ObjRoofChkFv = .text:0x8001E050; // type:function size:0x78 scope:global align:4 -__dt__14dBgS_ObjGndChkFv = .text:0x8001E0C8; // type:function size:0x78 scope:global align:4 -__dt__5l_HIOFv = .text:0x8001E140; // type:function size:0x3C scope:global align:4 -@20@__dt__14dBgS_ObjGndChkFv = .text:0x8001E17C; // type:function size:0x8 scope:local align:4 -@76@__dt__14dBgS_ObjGndChkFv = .text:0x8001E184; // type:function size:0x8 scope:local align:4 -@60@__dt__14dBgS_ObjGndChkFv = .text:0x8001E18C; // type:function size:0x8 scope:local align:4 -@16@__dt__11dBgS_WtrChkFv = .text:0x8001E194; // type:function size:0x8 scope:local align:4 -@52@__dt__11dBgS_WtrChkFv = .text:0x8001E19C; // type:function size:0x8 scope:local align:4 -@36@__dt__11dBgS_WtrChkFv = .text:0x8001E1A4; // type:function size:0x8 scope:local align:4 -@16@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E1AC; // type:function size:0x8 scope:local align:4 -@52@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E1B4; // type:function size:0x8 scope:local align:4 -@36@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E1BC; // type:function size:0x8 scope:local align:4 -onFrollCrashFlg__9daPy_py_cFUci = .text:0x8001E1C4; // type:function size:0x4 scope:global align:4 -checkWolfDash__9daPy_py_cCFv = .text:0x8001E1C8; // type:function size:0x8 scope:global align:4 -checkFrontRoll__9daPy_py_cCFv = .text:0x8001E1D0; // type:function size:0x8 scope:global align:4 -checkHorseRide__9daPy_py_cCFv = .text:0x8001E1D8; // type:function size:0x8 scope:global align:4 -getGrabActorID__9daPy_py_cCFv = .text:0x8001E1E0; // type:function size:0x8 scope:global align:4 -fopCam_Draw__FP12camera_class = .text:0x8001E1E8; // type:function size:0x40 scope:global align:4 -fopCam_Execute__FP12camera_class = .text:0x8001E228; // type:function size:0x48 scope:global align:4 +__dt__11dBgS_WtrChkFv = .text:0x8001DFD8; // type:function size:0x78 scope:weak align:4 +__dt__15dBgS_ObjRoofChkFv = .text:0x8001E050; // type:function size:0x78 scope:weak align:4 +__dt__14dBgS_ObjGndChkFv = .text:0x8001E0C8; // type:function size:0x78 scope:weak align:4 +__dt__5l_HIOFv = .text:0x8001E140; // type:function size:0x3C scope:weak align:4 +@20@__dt__14dBgS_ObjGndChkFv = .text:0x8001E17C; // type:function size:0x8 scope:weak align:4 +@76@__dt__14dBgS_ObjGndChkFv = .text:0x8001E184; // type:function size:0x8 scope:weak align:4 +@60@__dt__14dBgS_ObjGndChkFv = .text:0x8001E18C; // type:function size:0x8 scope:weak align:4 +@16@__dt__11dBgS_WtrChkFv = .text:0x8001E194; // type:function size:0x8 scope:weak align:4 +@52@__dt__11dBgS_WtrChkFv = .text:0x8001E19C; // type:function size:0x8 scope:weak align:4 +@36@__dt__11dBgS_WtrChkFv = .text:0x8001E1A4; // type:function size:0x8 scope:weak align:4 +@16@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E1AC; // type:function size:0x8 scope:weak align:4 +@52@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E1B4; // type:function size:0x8 scope:weak align:4 +@36@__dt__15dBgS_ObjRoofChkFv = .text:0x8001E1BC; // type:function size:0x8 scope:weak align:4 +onFrollCrashFlg__9daPy_py_cFUci = .text:0x8001E1C4; // type:function size:0x4 scope:weak align:4 +checkWolfDash__9daPy_py_cCFv = .text:0x8001E1C8; // type:function size:0x8 scope:weak align:4 +checkFrontRoll__9daPy_py_cCFv = .text:0x8001E1D0; // type:function size:0x8 scope:weak align:4 +checkHorseRide__9daPy_py_cCFv = .text:0x8001E1D8; // type:function size:0x8 scope:weak align:4 +getGrabActorID__9daPy_py_cCFv = .text:0x8001E1E0; // type:function size:0x8 scope:weak align:4 +fopCam_Draw__FP12camera_class = .text:0x8001E1E8; // type:function size:0x40 scope:local align:4 +fopCam_Execute__FP12camera_class = .text:0x8001E228; // type:function size:0x48 scope:local align:4 fopCam_IsDelete__FP12camera_class = .text:0x8001E270; // type:function size:0x54 scope:global align:4 fopCam_Delete__FP12camera_class = .text:0x8001E2C4; // type:function size:0x54 scope:global align:4 -fopCam_Create__FPv = .text:0x8001E318; // type:function size:0x98 scope:global align:4 +fopCam_Create__FPv = .text:0x8001E318; // type:function size:0x98 scope:local align:4 fopCamM_GetParam__FP12camera_class = .text:0x8001E3B0; // type:function size:0x8 scope:global align:4 fopCamM_Create__FisPv = .text:0x8001E3B8; // type:function size:0x64 scope:global align:4 fopCamM_Management__Fv = .text:0x8001E41C; // type:function size:0x4 scope:global align:4 fopCamM_Init__Fv = .text:0x8001E420; // type:function size:0x4 scope:global align:4 -fopOvlp_Draw__FPv = .text:0x8001E424; // type:function size:0x28 scope:global align:4 -fopOvlp_Execute__FPv = .text:0x8001E44C; // type:function size:0x28 scope:global align:4 -fopOvlp_IsDelete__FPv = .text:0x8001E474; // type:function size:0x28 scope:global align:4 -fopOvlp_Delete__FPv = .text:0x8001E49C; // type:function size:0x28 scope:global align:4 -fopOvlp_Create__FPv = .text:0x8001E4C4; // type:function size:0x68 scope:global align:4 +fopOvlp_Draw__FPv = .text:0x8001E424; // type:function size:0x28 scope:local align:4 +fopOvlp_Execute__FPv = .text:0x8001E44C; // type:function size:0x28 scope:local align:4 +fopOvlp_IsDelete__FPv = .text:0x8001E474; // type:function size:0x28 scope:local align:4 +fopOvlp_Delete__FPv = .text:0x8001E49C; // type:function size:0x28 scope:local align:4 +fopOvlp_Create__FPv = .text:0x8001E4C4; // type:function size:0x68 scope:local align:4 fopOvlpM_SceneIsStop__Fv = .text:0x8001E52C; // type:function size:0x40 scope:global align:4 fopOvlpM_SceneIsStart__Fv = .text:0x8001E56C; // type:function size:0x40 scope:global align:4 fopOvlpM_IsOutReq__FP18overlap_task_class = .text:0x8001E5AC; // type:function size:0x18 scope:global align:4 @@ -664,24 +664,24 @@ fopOvlpM_Request__FsUs = .text:0x8001E6AC; // type:function size:0x4C scope:glob fopOvlpM_Management__Fv = .text:0x8001E6F8; // type:function size:0x48 scope:global align:4 fopOvlpM_Cancel__Fv = .text:0x8001E740; // type:function size:0x50 scope:global align:4 fopOvlpM_Init__Fv = .text:0x8001E790; // type:function size:0x4 scope:global align:4 -fopOvlpReq_phase_Done__FP21overlap_request_class = .text:0x8001E794; // type:function size:0x5C scope:global align:4 -fopOvlpReq_phase_IsDone__FP21overlap_request_class = .text:0x8001E7F0; // type:function size:0x4C scope:global align:4 -fopOvlpReq_phase_IsWaitOfFadeout__FP21overlap_request_class = .text:0x8001E83C; // type:function size:0x50 scope:global align:4 -fopOvlpReq_phase_WaitOfFadeout__FP21overlap_request_class = .text:0x8001E88C; // type:function size:0x70 scope:global align:4 -fopOvlpReq_phase_IsComplete__FP21overlap_request_class = .text:0x8001E8FC; // type:function size:0x50 scope:global align:4 -fopOvlpReq_phase_IsCreated__FP21overlap_request_class = .text:0x8001E94C; // type:function size:0x60 scope:global align:4 -fopOvlpReq_phase_Create__FP21overlap_request_class = .text:0x8001E9AC; // type:function size:0x50 scope:global align:4 +fopOvlpReq_phase_Done__FP21overlap_request_class = .text:0x8001E794; // type:function size:0x5C scope:local align:4 +fopOvlpReq_phase_IsDone__FP21overlap_request_class = .text:0x8001E7F0; // type:function size:0x4C scope:local align:4 +fopOvlpReq_phase_IsWaitOfFadeout__FP21overlap_request_class = .text:0x8001E83C; // type:function size:0x50 scope:local align:4 +fopOvlpReq_phase_WaitOfFadeout__FP21overlap_request_class = .text:0x8001E88C; // type:function size:0x70 scope:local align:4 +fopOvlpReq_phase_IsComplete__FP21overlap_request_class = .text:0x8001E8FC; // type:function size:0x50 scope:local align:4 +fopOvlpReq_phase_IsCreated__FP21overlap_request_class = .text:0x8001E94C; // type:function size:0x60 scope:local align:4 +fopOvlpReq_phase_Create__FP21overlap_request_class = .text:0x8001E9AC; // type:function size:0x50 scope:local align:4 fopOvlpReq_Request__FP21overlap_request_classsUs = .text:0x8001E9FC; // type:function size:0x9C scope:global align:4 fopOvlpReq_Handler__FP21overlap_request_class = .text:0x8001EA98; // type:function size:0x98 scope:global align:4 fopOvlpReq_Cancel__FP21overlap_request_class = .text:0x8001EB30; // type:function size:0x2C scope:global align:4 fopOvlpReq_Is_PeektimeLimit__FP21overlap_request_class = .text:0x8001EB5C; // type:function size:0x10 scope:global align:4 fopOvlpReq_SetPeektime__FP21overlap_request_classUs = .text:0x8001EB6C; // type:function size:0x14 scope:global align:4 fopOvlpReq_OverlapClr__FP21overlap_request_class = .text:0x8001EB80; // type:function size:0x5C scope:global align:4 -fopScn_Draw__FP11scene_class = .text:0x8001EBDC; // type:function size:0x28 scope:global align:4 -fopScn_Execute__FP11scene_class = .text:0x8001EC04; // type:function size:0x28 scope:global align:4 -fopScn_IsDelete__FPv = .text:0x8001EC2C; // type:function size:0x28 scope:global align:4 -fopScn_Delete__FPv = .text:0x8001EC54; // type:function size:0x54 scope:global align:4 -fopScn_Create__FPv = .text:0x8001ECA8; // type:function size:0x74 scope:global align:4 +fopScn_Draw__FP11scene_class = .text:0x8001EBDC; // type:function size:0x28 scope:local align:4 +fopScn_Execute__FP11scene_class = .text:0x8001EC04; // type:function size:0x28 scope:local align:4 +fopScn_IsDelete__FPv = .text:0x8001EC2C; // type:function size:0x28 scope:local align:4 +fopScn_Delete__FPv = .text:0x8001EC54; // type:function size:0x54 scope:local align:4 +fopScn_Create__FPv = .text:0x8001ECA8; // type:function size:0x74 scope:local align:4 fopScnIt_Judge__FPFPvPv_PvPv = .text:0x8001ED1C; // type:function size:0x3C scope:global align:4 fopScnM_SearchByID__FUi = .text:0x8001ED58; // type:function size:0x30 scope:global align:4 fopScnM_ChangeReq__FP11scene_classssUs = .text:0x8001ED88; // type:function size:0x5C scope:global align:4 @@ -690,15 +690,15 @@ fopScnM_CreateReq__FssUsUl = .text:0x8001EE2C; // type:function size:0x48 scope: fopScnM_ReRequest__FsUl = .text:0x8001EE74; // type:function size:0x44 scope:global align:4 fopScnM_Management__Fv = .text:0x8001EEB8; // type:function size:0x20 scope:global align:4 fopScnM_Init__Fv = .text:0x8001EED8; // type:function size:0x4 scope:global align:4 -fopScnRq_phase_ClearOverlap__FP19scene_request_class = .text:0x8001EEDC; // type:function size:0x30 scope:global align:4 -fopScnRq_phase_Execute__FP19scene_request_class = .text:0x8001EF0C; // type:function size:0x20 scope:global align:4 -fopScnRq_phase_IsDoingOverlap__FP19scene_request_class = .text:0x8001EF2C; // type:function size:0x30 scope:global align:4 -fopScnRq_phase_IsDoneOverlap__FP19scene_request_class = .text:0x8001EF5C; // type:function size:0x30 scope:global align:4 -fopScnRq_phase_Done__FP19scene_request_class = .text:0x8001EF8C; // type:function size:0x40 scope:global align:4 -fopScnRq_Execute__FP19scene_request_class = .text:0x8001EFCC; // type:function size:0x48 scope:global align:4 -fopScnRq_PostMethod__FPvP19scene_request_class = .text:0x8001F014; // type:function size:0x44 scope:global align:4 -fopScnRq_Cancel__FP19scene_request_class = .text:0x8001F058; // type:function size:0x40 scope:global align:4 -fopScnRq_FadeRequest__FsUs = .text:0x8001F098; // type:function size:0x44 scope:global align:4 +fopScnRq_phase_ClearOverlap__FP19scene_request_class = .text:0x8001EEDC; // type:function size:0x30 scope:local align:4 +fopScnRq_phase_Execute__FP19scene_request_class = .text:0x8001EF0C; // type:function size:0x20 scope:local align:4 +fopScnRq_phase_IsDoingOverlap__FP19scene_request_class = .text:0x8001EF2C; // type:function size:0x30 scope:local align:4 +fopScnRq_phase_IsDoneOverlap__FP19scene_request_class = .text:0x8001EF5C; // type:function size:0x30 scope:local align:4 +fopScnRq_phase_Done__FP19scene_request_class = .text:0x8001EF8C; // type:function size:0x40 scope:local align:4 +fopScnRq_Execute__FP19scene_request_class = .text:0x8001EFCC; // type:function size:0x48 scope:local align:4 +fopScnRq_PostMethod__FPvP19scene_request_class = .text:0x8001F014; // type:function size:0x44 scope:local align:4 +fopScnRq_Cancel__FP19scene_request_class = .text:0x8001F058; // type:function size:0x40 scope:local align:4 +fopScnRq_FadeRequest__FsUs = .text:0x8001F098; // type:function size:0x44 scope:local align:4 fopScnRq_Request__FiP11scene_classsPvsUs = .text:0x8001F0DC; // type:function size:0xC8 scope:global align:4 fopScnRq_ReRequest__FUisPv = .text:0x8001F1A4; // type:function size:0x20 scope:global align:4 fopScnRq_Handler__Fv = .text:0x8001F1C4; // type:function size:0x20 scope:global align:4 @@ -710,18 +710,18 @@ fopVw_Execute__FP10view_class = .text:0x8001F278; // type:function size:0x28 sco fopVw_IsDelete__FPv = .text:0x8001F2A0; // type:function size:0x28 scope:global align:4 fopVw_Delete__FP10view_class = .text:0x8001F2C8; // type:function size:0x28 scope:global align:4 fopVw_Create__FPv = .text:0x8001F2F0; // type:function size:0x3C scope:global align:4 -fopKy_Draw__FPv = .text:0x8001F32C; // type:function size:0x3C scope:global align:4 -fopKy_Execute__FPv = .text:0x8001F368; // type:function size:0x54 scope:global align:4 -fopKy_IsDelete__FPv = .text:0x8001F3BC; // type:function size:0x54 scope:global align:4 -fopKy_Delete__FPv = .text:0x8001F410; // type:function size:0x4C scope:global align:4 -fopKy_Create__FPv = .text:0x8001F45C; // type:function size:0xD4 scope:global align:4 -fopMsg_Draw__FPv = .text:0x8001F530; // type:function size:0x28 scope:global align:4 -fopMsg_Execute__FPv = .text:0x8001F558; // type:function size:0x38 scope:global align:4 -fopMsg_IsDelete__FPv = .text:0x8001F590; // type:function size:0x54 scope:global align:4 -fopMsg_Delete__FPv = .text:0x8001F5E4; // type:function size:0x4C scope:global align:4 +fopKy_Draw__FPv = .text:0x8001F32C; // type:function size:0x3C scope:local align:4 +fopKy_Execute__FPv = .text:0x8001F368; // type:function size:0x54 scope:local align:4 +fopKy_IsDelete__FPv = .text:0x8001F3BC; // type:function size:0x54 scope:local align:4 +fopKy_Delete__FPv = .text:0x8001F410; // type:function size:0x4C scope:local align:4 +fopKy_Create__FPv = .text:0x8001F45C; // type:function size:0xD4 scope:local align:4 +fopMsg_Draw__FPv = .text:0x8001F530; // type:function size:0x28 scope:local align:4 +fopMsg_Execute__FPv = .text:0x8001F558; // type:function size:0x38 scope:local align:4 +fopMsg_IsDelete__FPv = .text:0x8001F590; // type:function size:0x54 scope:local align:4 +fopMsg_Delete__FPv = .text:0x8001F5E4; // type:function size:0x4C scope:local align:4 fopMsg_Create__FPv = .text:0x8001F630; // type:function size:0xD8 scope:global align:4 fopKyM_CreateAppend__Fv = .text:0x8001F708; // type:function size:0x58 scope:global align:4 -createAppend__FiP4cXyzP4cXyz = .text:0x8001F760; // type:function size:0x90 scope:global align:4 +createAppend__FiP4cXyzP4cXyz = .text:0x8001F760; // type:function size:0x90 scope:local align:4 fopKyM_Delete__FPv = .text:0x8001F7F0; // type:function size:0x20 scope:global align:4 fopKyM_Create__FsPFPv_iPv = .text:0x8001F810; // type:function size:0x50 scope:global align:4 fopKyM_create__FsiP4cXyzP4cXyzPFPv_i = .text:0x8001F860; // type:function size:0x60 scope:global align:4 @@ -732,8 +732,8 @@ fopMsgM_setStageLayer__FPv = .text:0x8001FA5C; // type:function size:0x70 scope: fopMsgM_SearchByID__FUi = .text:0x8001FACC; // type:function size:0x20 scope:global align:4 fopMsgM_GetAppend__FPv = .text:0x8001FAEC; // type:function size:0x8 scope:global align:4 fopMsgM_Delete__FPv = .text:0x8001FAF4; // type:function size:0x20 scope:global align:4 -createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi = .text:0x8001FB14; // type:function size:0xE4 scope:global align:4 -createTimerAppend__FiUlUcUcffffUi = .text:0x8001FBF8; // type:function size:0xFC scope:global align:4 +createAppend__FP10fopAc_ac_cP4cXyzPUlPUlUi = .text:0x8001FB14; // type:function size:0xE4 scope:local align:4 +createTimerAppend__FiUlUcUcffffUi = .text:0x8001FBF8; // type:function size:0xFC scope:local align:4 fopMsgM_create__FsP10fopAc_ac_cP4cXyzPUlPUlPFPv_i = .text:0x8001FCF4; // type:function size:0x74 scope:global align:4 fop_Timer_create__FsUcUlUcUcffffPFPv_i = .text:0x8001FD68; // type:function size:0x74 scope:global align:4 fopMsgM_messageSet__FUlP10fopAc_ac_cUl = .text:0x8001FDDC; // type:function size:0x150 scope:global align:4 @@ -744,9 +744,9 @@ fopMsgM_setMessageID__FUi = .text:0x800201A8; // type:function size:0x8 scope:gl fopMsgM_Create__FsPFPv_iPv = .text:0x800201B0; // type:function size:0x50 scope:global align:4 setAlpha__7J2DPaneFUc = .text:0x80020200; // type:function size:0x8 scope:global align:4 fopMsgM_valueIncrease__FiiUc = .text:0x80020208; // type:function size:0x16C scope:global align:4 -setBlendRatio__10J2DPictureFff = .text:0x80020374; // type:function size:0x6C scope:global align:4 -append__10J2DPictureFPCcf = .text:0x800203E0; // type:function size:0x30 scope:global align:4 -insert__10J2DPictureFPCcUcf = .text:0x80020410; // type:function size:0x34 scope:global align:4 +setBlendRatio__10J2DPictureFff = .text:0x80020374; // type:function size:0x6C scope:weak align:4 +append__10J2DPictureFPCcf = .text:0x800203E0; // type:function size:0x30 scope:weak align:4 +insert__10J2DPictureFPCcUcf = .text:0x80020410; // type:function size:0x34 scope:weak align:4 fopMsgM_createExpHeap__FUlP7JKRHeap = .text:0x80020444; // type:function size:0x44 scope:global align:4 fopMsgM_destroyExpHeap__FP10JKRExpHeap = .text:0x80020488; // type:function size:0x20 scope:global align:4 fopDwIt_GetTag__Fv = .text:0x800204A8; // type:function size:0x44 scope:global align:4 @@ -913,7 +913,7 @@ fpcLnTg_Move__FP8line_tagi = .text:0x80023650; // type:function size:0x58 scope: fpcLnTg_QueueTo__FP8line_tag = .text:0x800236A8; // type:function size:0x34 scope:global align:4 fpcLnTg_ToQueue__FP8line_tagi = .text:0x800236DC; // type:function size:0x58 scope:global align:4 fpcLnTg_Init__FP8line_tagPv = .text:0x80023734; // type:function size:0x34 scope:global align:4 -fpcLnIt_MethodCall__FP16create_tag_classP13method_filter = .text:0x80023768; // type:function size:0x68 scope:global align:4 +fpcLnIt_MethodCall__FP16create_tag_classP13method_filter = .text:0x80023768; // type:function size:0x68 scope:local align:4 fpcLnIt_Queue__FPFPvPv_i = .text:0x800237D0; // type:function size:0x3C scope:global align:4 fpcMtdIt_Method__FP15node_list_classPFPv_i = .text:0x8002380C; // type:function size:0x24 scope:global align:4 fpcMtdTg_Do__FP24process_method_tag_class = .text:0x80023830; // type:function size:0x30 scope:global align:4 @@ -943,13 +943,13 @@ set__18dStage_nextStage_cFPCcScsScScUc = .text:0x80023ED0; // type:function size dStage_SetErrorRoom__Fv = .text:0x80023F3C; // type:function size:0x30 scope:global align:4 dStage_SetErrorStage__Fv = .text:0x80023F6C; // type:function size:0x30 scope:global align:4 dStage_GetKeepDoorInfo__Fv = .text:0x80023F9C; // type:function size:0xC scope:global align:4 -dStage_isBossStage__FP11dStage_dt_c = .text:0x80023FA8; // type:function size:0x50 scope:global align:4 -dStage_KeepDoorInfoInit__FP11dStage_dt_c = .text:0x80023FF8; // type:function size:0x34 scope:global align:4 -dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x8002402C; // type:function size:0xD8 scope:global align:4 +dStage_isBossStage__FP11dStage_dt_c = .text:0x80023FA8; // type:function size:0x50 scope:local align:4 +dStage_KeepDoorInfoInit__FP11dStage_dt_c = .text:0x80023FF8; // type:function size:0x34 scope:local align:4 +dStage_KeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x8002402C; // type:function size:0xD8 scope:local align:4 dStage_GetRoomKeepDoorInfo__Fv = .text:0x80024104; // type:function size:0xC scope:global align:4 -dStage_initRoomKeepDoorInfo__Fv = .text:0x80024110; // type:function size:0x10 scope:global align:4 -dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x80024120; // type:function size:0xFC scope:global align:4 -dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv = .text:0x8002421C; // type:function size:0x28 scope:global align:4 +dStage_initRoomKeepDoorInfo__Fv = .text:0x80024110; // type:function size:0x10 scope:local align:4 +dStage_RoomKeepDoorInfoProc__FP11dStage_dt_cP16stage_tgsc_class = .text:0x80024120; // type:function size:0xFC scope:local align:4 +dStage_RoomKeepDoorInit__FP11dStage_dt_cPviPv = .text:0x8002421C; // type:function size:0x28 scope:local align:4 set__19dStage_startStage_cFPCcScsSc = .text:0x80024244; // type:function size:0x4C scope:global align:4 init__20dStage_roomControl_cFv = .text:0x80024290; // type:function size:0x150 scope:global align:4 initZone__20dStage_roomControl_cFv = .text:0x800243E0; // type:function size:0x4C scope:global align:4 @@ -957,12 +957,12 @@ getStatusRoomDt__20dStage_roomControl_cFi = .text:0x8002442C; // type:function s getMemoryBlock__20dStage_roomControl_cFi = .text:0x80024458; // type:function size:0x38 scope:global align:4 setStayNo__20dStage_roomControl_cFi = .text:0x80024490; // type:function size:0x3C scope:global align:4 setNextStayNo__20dStage_roomControl_cFi = .text:0x800244CC; // type:function size:0x8 scope:global align:4 -stayRoomCheck__FiPUci = .text:0x800244D4; // type:function size:0x34 scope:global align:4 -createRoomScene__Fi = .text:0x80024508; // type:function size:0x88 scope:global align:4 +stayRoomCheck__FiPUci = .text:0x800244D4; // type:function size:0x34 scope:local align:4 +createRoomScene__Fi = .text:0x80024508; // type:function size:0x88 scope:local align:4 checkRoomDisp__20dStage_roomControl_cCFi = .text:0x80024590; // type:function size:0x34 scope:global align:4 loadRoom__20dStage_roomControl_cFiPUcb = .text:0x800245C4; // type:function size:0x200 scope:global align:4 zoneCountCheck__20dStage_roomControl_cCFi = .text:0x800247C4; // type:function size:0x120 scope:global align:4 -getStagInfo__16dStage_stageDt_cCFv = .text:0x800248E4; // type:function size:0x8 scope:global align:4 +getStagInfo__16dStage_stageDt_cCFv = .text:0x800248E4; // type:function size:0x8 scope:weak align:4 createMemoryBlock__20dStage_roomControl_cFiUl = .text:0x800248EC; // type:function size:0x64 scope:global align:4 destroyMemoryBlock__20dStage_roomControl_cFv = .text:0x80024950; // type:function size:0x64 scope:global align:4 setArcBank__20dStage_roomControl_cFiPCc = .text:0x800249B4; // type:function size:0x34 scope:global align:4 @@ -974,81 +974,81 @@ add__Q220dStage_roomControl_c9roomDzs_cFUcUc = .text:0x80024BEC; // type:functio init__16dStage_stageDt_cFv = .text:0x80024CC4; // type:function size:0x8C scope:global align:4 initFileList2__15dStage_roomDt_cFv = .text:0x80024D50; // type:function size:0xC scope:global align:4 init__15dStage_roomDt_cFv = .text:0x80024D5C; // type:function size:0x5C scope:global align:4 -dStage_roomInit__Fi = .text:0x80024DB8; // type:function size:0xA0 scope:global align:4 -SetTimePass__20dStage_roomControl_cFi = .text:0x80024E58; // type:function size:0x8 scope:global align:4 -getRoom__16dStage_stageDt_cCFv = .text:0x80024E60; // type:function size:0x8 scope:global align:4 +dStage_roomInit__Fi = .text:0x80024DB8; // type:function size:0xA0 scope:local align:4 +SetTimePass__20dStage_roomControl_cFi = .text:0x80024E58; // type:function size:0x8 scope:weak align:4 +getRoom__16dStage_stageDt_cCFv = .text:0x80024E60; // type:function size:0x8 scope:weak align:4 dStage_searchName__FPCc = .text:0x80024E68; // type:function size:0x70 scope:global align:4 dStage_getName__FsSc = .text:0x80024ED8; // type:function size:0xAC scope:global align:4 dStage_getName2__FsSc = .text:0x80024F84; // type:function size:0x20 scope:global align:4 -dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class = .text:0x80024FA4; // type:function size:0x9C scope:global align:4 -dStage_cameraCreate__FP24stage_camera2_data_classii = .text:0x80025040; // type:function size:0x6C scope:global align:4 -getPlayer__15dStage_roomDt_cCFv = .text:0x800250AC; // type:function size:0x8 scope:global align:4 -getPlayer__16dStage_stageDt_cCFv = .text:0x800250B4; // type:function size:0x8 scope:global align:4 -dStage_playerInit__FP11dStage_dt_cPviPv = .text:0x800250BC; // type:function size:0x2A4 scope:global align:4 -dStage_cameraInit__FP11dStage_dt_cPviPv = .text:0x80025360; // type:function size:0x50 scope:global align:4 -dStage_RoomCameraInit__FP11dStage_dt_cPviPv = .text:0x800253B0; // type:function size:0x34 scope:global align:4 -dStage_arrowInit__FP11dStage_dt_cPviPv = .text:0x800253E4; // type:function size:0x34 scope:global align:4 +dStage_actorCreate__FP22stage_actor_data_classP16fopAcM_prm_class = .text:0x80024FA4; // type:function size:0x9C scope:local align:4 +dStage_cameraCreate__FP24stage_camera2_data_classii = .text:0x80025040; // type:function size:0x6C scope:local align:4 +getPlayer__15dStage_roomDt_cCFv = .text:0x800250AC; // type:function size:0x8 scope:weak align:4 +getPlayer__16dStage_stageDt_cCFv = .text:0x800250B4; // type:function size:0x8 scope:weak align:4 +dStage_playerInit__FP11dStage_dt_cPviPv = .text:0x800250BC; // type:function size:0x2A4 scope:local align:4 +dStage_cameraInit__FP11dStage_dt_cPviPv = .text:0x80025360; // type:function size:0x50 scope:local align:4 +dStage_RoomCameraInit__FP11dStage_dt_cPviPv = .text:0x800253B0; // type:function size:0x34 scope:local align:4 +dStage_arrowInit__FP11dStage_dt_cPviPv = .text:0x800253E4; // type:function size:0x34 scope:local align:4 getMapInfo2__15dStage_roomDt_cCFi = .text:0x80025418; // type:function size:0x8C scope:global align:4 -getMapInfoBase__15dStage_roomDt_cCFv = .text:0x800254A4; // type:function size:0x8 scope:global align:4 +getMapInfoBase__15dStage_roomDt_cCFv = .text:0x800254A4; // type:function size:0x8 scope:weak align:4 getMapInfo2__16dStage_stageDt_cCFi = .text:0x800254AC; // type:function size:0x8C scope:global align:4 -getMapInfoBase__16dStage_stageDt_cCFv = .text:0x80025538; // type:function size:0x8 scope:global align:4 -dStage_paletteInfoInit__FP11dStage_dt_cPviPv = .text:0x80025540; // type:function size:0x34 scope:global align:4 -dStage_pselectInfoInit__FP11dStage_dt_cPviPv = .text:0x80025574; // type:function size:0x34 scope:global align:4 -dStage_envrInfoInit__FP11dStage_dt_cPviPv = .text:0x800255A8; // type:function size:0x34 scope:global align:4 -dStage_filiInfo2Init__FP11dStage_dt_cPviPv = .text:0x800255DC; // type:function size:0x38 scope:global align:4 -dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv = .text:0x80025614; // type:function size:0x20 scope:global align:4 -dStage_filiInfoInit__FP11dStage_dt_cPviPv = .text:0x80025634; // type:function size:0x54 scope:global align:4 -dStage_vrboxInfoInit__FP11dStage_dt_cPviPv = .text:0x80025688; // type:function size:0x34 scope:global align:4 -dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv = .text:0x800256BC; // type:function size:0x34 scope:global align:4 -dStage_plightInfoInit__FP11dStage_dt_cPviPv = .text:0x800256F0; // type:function size:0x64 scope:global align:4 -dStage_lgtvInfoInit__FP11dStage_dt_cPviPv = .text:0x80025754; // type:function size:0x8C scope:global align:4 +getMapInfoBase__16dStage_stageDt_cCFv = .text:0x80025538; // type:function size:0x8 scope:weak align:4 +dStage_paletteInfoInit__FP11dStage_dt_cPviPv = .text:0x80025540; // type:function size:0x34 scope:local align:4 +dStage_pselectInfoInit__FP11dStage_dt_cPviPv = .text:0x80025574; // type:function size:0x34 scope:local align:4 +dStage_envrInfoInit__FP11dStage_dt_cPviPv = .text:0x800255A8; // type:function size:0x34 scope:local align:4 +dStage_filiInfo2Init__FP11dStage_dt_cPviPv = .text:0x800255DC; // type:function size:0x38 scope:local align:4 +dStage_fieldMapFiliInfo2Init__FP11dStage_dt_cPviPv = .text:0x80025614; // type:function size:0x20 scope:local align:4 +dStage_filiInfoInit__FP11dStage_dt_cPviPv = .text:0x80025634; // type:function size:0x54 scope:local align:4 +dStage_vrboxInfoInit__FP11dStage_dt_cPviPv = .text:0x80025688; // type:function size:0x34 scope:local align:4 +dStage_vrboxcolInfoInit__FP11dStage_dt_cPviPv = .text:0x800256BC; // type:function size:0x34 scope:local align:4 +dStage_plightInfoInit__FP11dStage_dt_cPviPv = .text:0x800256F0; // type:function size:0x64 scope:local align:4 +dStage_lgtvInfoInit__FP11dStage_dt_cPviPv = .text:0x80025754; // type:function size:0x8C scope:local align:4 dStage_stagInfo_GetParticleNo__FP21stage_stag_info_classi = .text:0x800257E0; // type:function size:0xC scope:global align:4 -dStage_stagInfoInit__FP11dStage_dt_cPviPv = .text:0x800257EC; // type:function size:0xE8 scope:global align:4 +dStage_stagInfoInit__FP11dStage_dt_cPviPv = .text:0x800257EC; // type:function size:0xE8 scope:local align:4 resetOldMulti__16dStage_stageDt_cFv = .text:0x800258D4; // type:function size:0xC scope:global align:4 -dStage_sclsInfoInit__FP11dStage_dt_cPviPv = .text:0x800258E0; // type:function size:0x34 scope:global align:4 -dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x80025914; // type:function size:0xEC scope:global align:4 -dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x80025A00; // type:function size:0xE0 scope:global align:4 -dStage_actorInit__FP11dStage_dt_cPviPv = .text:0x80025AE0; // type:function size:0xEC scope:global align:4 -dStage_actorInit_always__FP11dStage_dt_cPviPv = .text:0x80025BCC; // type:function size:0xD8 scope:global align:4 -dStage_tgscInfoInit__FP11dStage_dt_cPviPv = .text:0x80025CA4; // type:function size:0xE0 scope:global align:4 -dStage_doorInfoInit__FP11dStage_dt_cPviPv = .text:0x80025D84; // type:function size:0xCC scope:global align:4 -dStage_roomReadInit__FP11dStage_dt_cPviPv = .text:0x80025E50; // type:function size:0x98 scope:global align:4 +dStage_sclsInfoInit__FP11dStage_dt_cPviPv = .text:0x800258E0; // type:function size:0x34 scope:local align:4 +dStage_actorCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x80025914; // type:function size:0xEC scope:local align:4 +dStage_tgscCommonLayerInit__FP11dStage_dt_cPviPv = .text:0x80025A00; // type:function size:0xE0 scope:local align:4 +dStage_actorInit__FP11dStage_dt_cPviPv = .text:0x80025AE0; // type:function size:0xEC scope:local align:4 +dStage_actorInit_always__FP11dStage_dt_cPviPv = .text:0x80025BCC; // type:function size:0xD8 scope:local align:4 +dStage_tgscInfoInit__FP11dStage_dt_cPviPv = .text:0x80025CA4; // type:function size:0xE0 scope:local align:4 +dStage_doorInfoInit__FP11dStage_dt_cPviPv = .text:0x80025D84; // type:function size:0xCC scope:local align:4 +dStage_roomReadInit__FP11dStage_dt_cPviPv = .text:0x80025E50; // type:function size:0x98 scope:local align:4 dStage_roomRead_dt_c_GetReverbStage__FR14roomRead_classi = .text:0x80025EE8; // type:function size:0x30 scope:global align:4 -dStage_ppntInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F18; // type:function size:0x34 scope:global align:4 -dStage_pathInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F4C; // type:function size:0xA0 scope:global align:4 -dStage_rppnInfoInit__FP11dStage_dt_cPviPv = .text:0x80025FEC; // type:function size:0x34 scope:global align:4 -dStage_rpatInfoInit__FP11dStage_dt_cPviPv = .text:0x80026020; // type:function size:0xA0 scope:global align:4 -dStage_soundInfoInit__FP11dStage_dt_cPviPv = .text:0x800260C0; // type:function size:0x34 scope:global align:4 -dStage_soundInfoInitCL__FP11dStage_dt_cPviPv = .text:0x800260F4; // type:function size:0x34 scope:global align:4 -dStage_setLayerTagName__FP9FuncTableii = .text:0x80026128; // type:function size:0x34 scope:global align:4 -dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei = .text:0x8002615C; // type:function size:0xC8 scope:global align:4 -dStage_stEventInfoInit__FP11dStage_dt_cPviPv = .text:0x80026224; // type:function size:0x34 scope:global align:4 -dStage_mapEventInfoInit__FP11dStage_dt_cPviPv = .text:0x80026258; // type:function size:0x34 scope:global align:4 -dStage_floorInfoInit__FP11dStage_dt_cPviPv = .text:0x8002628C; // type:function size:0x34 scope:global align:4 -dStage_memaInfoInit__FP11dStage_dt_cPviPv = .text:0x800262C0; // type:function size:0x80 scope:global align:4 -dStage_mecoInfoInit__FP11dStage_dt_cPviPv = .text:0x80026340; // type:function size:0x84 scope:global align:4 -dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv = .text:0x800263C4; // type:function size:0x30 scope:global align:4 -dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv = .text:0x800263F4; // type:function size:0x10 scope:global align:4 -dStage_dt_c_offsetToPtr__FPv = .text:0x80026404; // type:function size:0x44 scope:global align:4 -dStage_mapPathInit__FP11dStage_dt_cPviPv = .text:0x80026448; // type:function size:0x30 scope:global align:4 -dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv = .text:0x80026478; // type:function size:0x30 scope:global align:4 -dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv = .text:0x800264A8; // type:function size:0x5C scope:global align:4 -readMult__FP11dStage_dt_cP14dStage_Multi_cb = .text:0x80026504; // type:function size:0x180 scope:global align:4 -dStage_multInfoInit__FP11dStage_dt_cPviPv = .text:0x80026684; // type:function size:0x94 scope:global align:4 -dStage_lbnkInfoInit__FP11dStage_dt_cPviPv = .text:0x80026718; // type:function size:0x34 scope:global align:4 -dStage_roomTresureInit__FP11dStage_dt_cPviPv = .text:0x8002674C; // type:function size:0x68 scope:global align:4 -dStage_layerTresureInit__FP11dStage_dt_cPviPv = .text:0x800267B4; // type:function size:0x24 scope:global align:4 -dStage_dmapInfoInit__FP11dStage_dt_cPviPv = .text:0x800267D8; // type:function size:0x34 scope:global align:4 -dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x8002680C; // type:function size:0x78 scope:global align:4 -dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x80026884; // type:function size:0x68 scope:global align:4 -dStage_elstInfoInit__FP11dStage_dt_cPviPv = .text:0x800268EC; // type:function size:0x54 scope:global align:4 -dKankyo_create__Fv = .text:0x80026940; // type:function size:0x7C scope:global align:4 -layerMemoryInfoLoader__FPvP11dStage_dt_ci = .text:0x800269BC; // type:function size:0x2C scope:global align:4 -dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c = .text:0x800269E8; // type:function size:0x74 scope:global align:4 -layerTableLoader__FPvP11dStage_dt_ci = .text:0x80026A5C; // type:function size:0x134 scope:global align:4 +dStage_ppntInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F18; // type:function size:0x34 scope:local align:4 +dStage_pathInfoInit__FP11dStage_dt_cPviPv = .text:0x80025F4C; // type:function size:0xA0 scope:local align:4 +dStage_rppnInfoInit__FP11dStage_dt_cPviPv = .text:0x80025FEC; // type:function size:0x34 scope:local align:4 +dStage_rpatInfoInit__FP11dStage_dt_cPviPv = .text:0x80026020; // type:function size:0xA0 scope:local align:4 +dStage_soundInfoInit__FP11dStage_dt_cPviPv = .text:0x800260C0; // type:function size:0x34 scope:local align:4 +dStage_soundInfoInitCL__FP11dStage_dt_cPviPv = .text:0x800260F4; // type:function size:0x34 scope:local align:4 +dStage_setLayerTagName__FP9FuncTableii = .text:0x80026128; // type:function size:0x34 scope:local align:4 +dStage_dt_c_decode__FPvP11dStage_dt_cP9FuncTablei = .text:0x8002615C; // type:function size:0xC8 scope:local align:4 +dStage_stEventInfoInit__FP11dStage_dt_cPviPv = .text:0x80026224; // type:function size:0x34 scope:local align:4 +dStage_mapEventInfoInit__FP11dStage_dt_cPviPv = .text:0x80026258; // type:function size:0x34 scope:local align:4 +dStage_floorInfoInit__FP11dStage_dt_cPviPv = .text:0x8002628C; // type:function size:0x34 scope:local align:4 +dStage_memaInfoInit__FP11dStage_dt_cPviPv = .text:0x800262C0; // type:function size:0x80 scope:local align:4 +dStage_mecoInfoInit__FP11dStage_dt_cPviPv = .text:0x80026340; // type:function size:0x84 scope:local align:4 +dStage_stageKeepTresureInit__FP11dStage_dt_cPviPv = .text:0x800263C4; // type:function size:0x30 scope:local align:4 +dStage_fieldMapTresureInit__FP11dStage_dt_cPviPv = .text:0x800263F4; // type:function size:0x10 scope:local align:4 +dStage_dt_c_offsetToPtr__FPv = .text:0x80026404; // type:function size:0x44 scope:local align:4 +dStage_mapPathInit__FP11dStage_dt_cPviPv = .text:0x80026448; // type:function size:0x30 scope:local align:4 +dStage_mapPathInitCommonLayer__FP11dStage_dt_cPviPv = .text:0x80026478; // type:function size:0x30 scope:local align:4 +dStage_fieldMapMapPathInit__FP11dStage_dt_cPviPv = .text:0x800264A8; // type:function size:0x5C scope:local align:4 +readMult__FP11dStage_dt_cP14dStage_Multi_cb = .text:0x80026504; // type:function size:0x180 scope:local align:4 +dStage_multInfoInit__FP11dStage_dt_cPviPv = .text:0x80026684; // type:function size:0x94 scope:local align:4 +dStage_lbnkInfoInit__FP11dStage_dt_cPviPv = .text:0x80026718; // type:function size:0x34 scope:local align:4 +dStage_roomTresureInit__FP11dStage_dt_cPviPv = .text:0x8002674C; // type:function size:0x68 scope:local align:4 +dStage_layerTresureInit__FP11dStage_dt_cPviPv = .text:0x800267B4; // type:function size:0x24 scope:local align:4 +dStage_dmapInfoInit__FP11dStage_dt_cPviPv = .text:0x800267D8; // type:function size:0x34 scope:local align:4 +dStage_stageDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x8002680C; // type:function size:0x78 scope:local align:4 +dStage_roomDrtgInfoInit__FP11dStage_dt_cPviPv = .text:0x80026884; // type:function size:0x68 scope:local align:4 +dStage_elstInfoInit__FP11dStage_dt_cPviPv = .text:0x800268EC; // type:function size:0x54 scope:local align:4 +dKankyo_create__Fv = .text:0x80026940; // type:function size:0x7C scope:local align:4 +layerMemoryInfoLoader__FPvP11dStage_dt_ci = .text:0x800269BC; // type:function size:0x2C scope:local align:4 +dStage_dt_c_stageInitLoader__FPvP11dStage_dt_c = .text:0x800269E8; // type:function size:0x74 scope:local align:4 +layerTableLoader__FPvP11dStage_dt_ci = .text:0x80026A5C; // type:function size:0x134 scope:local align:4 getElst__16dStage_stageDt_cFv = .text:0x80026B90; // type:function size:0x8 scope:global align:4 -layerActorLoader__FPvP11dStage_dt_ci = .text:0x80026B98; // type:function size:0x68 scope:global align:4 -dStage_dt_c_stageLoader__FPvP11dStage_dt_c = .text:0x80026C00; // type:function size:0x64 scope:global align:4 +layerActorLoader__FPvP11dStage_dt_ci = .text:0x80026B98; // type:function size:0x68 scope:local align:4 +dStage_dt_c_stageLoader__FPvP11dStage_dt_c = .text:0x80026C00; // type:function size:0x64 scope:local align:4 dStage_dt_c_roomLoader__FPvP11dStage_dt_ci = .text:0x80026C64; // type:function size:0x78 scope:global align:4 dStage_dt_c_roomReLoader__FPvP11dStage_dt_ci = .text:0x80026CDC; // type:function size:0x58 scope:global align:4 dStage_dt_c_fieldMapLoader__FPvP11dStage_dt_c = .text:0x80026D34; // type:function size:0x50 scope:global align:4 @@ -1059,183 +1059,183 @@ setOldMulti__16dStage_stageDt_cFv = .text:0x80027084; // type:function size:0xC dStage_RoomCheck__FP11cBgS_GndChk = .text:0x80027090; // type:function size:0x114 scope:global align:4 dStage_changeSceneExitId__FR13cBgS_PolyInfofUlScs = .text:0x800271A4; // type:function size:0x74 scope:global align:4 dStage_changeScene__FifUlScsi = .text:0x80027218; // type:function size:0x170 scope:global align:4 -getSclsInfo__15dStage_roomDt_cCFv = .text:0x80027388; // type:function size:0x8 scope:global align:4 -getSclsInfo__16dStage_stageDt_cCFv = .text:0x80027390; // type:function size:0x8 scope:global align:4 +getSclsInfo__15dStage_roomDt_cCFv = .text:0x80027388; // type:function size:0x8 scope:weak align:4 +getSclsInfo__16dStage_stageDt_cCFv = .text:0x80027390; // type:function size:0x8 scope:weak align:4 dStage_changeScene4Event__FiScibfUlsi = .text:0x80027398; // type:function size:0x1C0 scope:global align:4 dStage_restartRoom__FUlUli = .text:0x80027558; // type:function size:0x74 scope:global align:4 -setCamera__15dStage_roomDt_cFP18stage_camera_class = .text:0x800275CC; // type:function size:0x8 scope:global align:4 -getCamera__15dStage_roomDt_cCFv = .text:0x800275D4; // type:function size:0x8 scope:global align:4 -setArrow__15dStage_roomDt_cFP17stage_arrow_class = .text:0x800275DC; // type:function size:0x8 scope:global align:4 -getArrow__15dStage_roomDt_cCFv = .text:0x800275E4; // type:function size:0x8 scope:global align:4 -setPlayer__15dStage_roomDt_cFP17stage_actor_class = .text:0x800275EC; // type:function size:0x8 scope:global align:4 -setPlayerNum__15dStage_roomDt_cFUs = .text:0x800275F4; // type:function size:0x8 scope:global align:4 -getPlayerNum__15dStage_roomDt_cCFv = .text:0x800275FC; // type:function size:0x8 scope:global align:4 -setRoom__15dStage_roomDt_cFP14roomRead_class = .text:0x80027604; // type:function size:0x34 scope:global align:4 -getRoom__15dStage_roomDt_cCFv = .text:0x80027638; // type:function size:0x34 scope:global align:4 -setMapInfo__15dStage_roomDt_cFP20stage_map_info_class = .text:0x8002766C; // type:function size:0x8 scope:global align:4 -getMapInfo__15dStage_roomDt_cCFv = .text:0x80027674; // type:function size:0x8 scope:global align:4 -setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class = .text:0x8002767C; // type:function size:0x8 scope:global align:4 -setPaletteInfo__15dStage_roomDt_cFP24stage_palette_info_class = .text:0x80027684; // type:function size:0x34 scope:global align:4 -getPaletteInfo__15dStage_roomDt_cCFv = .text:0x800276B8; // type:function size:0x34 scope:global align:4 -setPselectInfo__15dStage_roomDt_cFP24stage_pselect_info_class = .text:0x800276EC; // type:function size:0x34 scope:global align:4 -getPselectInfo__15dStage_roomDt_cCFv = .text:0x80027720; // type:function size:0x34 scope:global align:4 -setEnvrInfo__15dStage_roomDt_cFP21stage_envr_info_class = .text:0x80027754; // type:function size:0x34 scope:global align:4 -getEnvrInfo__15dStage_roomDt_cCFv = .text:0x80027788; // type:function size:0x34 scope:global align:4 -setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class = .text:0x800277BC; // type:function size:0x8 scope:global align:4 -getVrboxInfo__15dStage_roomDt_cCFv = .text:0x800277C4; // type:function size:0x8 scope:global align:4 -setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class = .text:0x800277CC; // type:function size:0x8 scope:global align:4 -getVrboxcolInfo__15dStage_roomDt_cCFv = .text:0x800277D4; // type:function size:0x8 scope:global align:4 -setPlightInfo__15dStage_roomDt_cFP23stage_plight_info_class = .text:0x800277DC; // type:function size:0x34 scope:global align:4 -getPlightInfo__15dStage_roomDt_cCFv = .text:0x80027810; // type:function size:0x34 scope:global align:4 -setPaletteNumInfo__15dStage_roomDt_cFi = .text:0x80027844; // type:function size:0x34 scope:global align:4 -getPaletteNumInfo__15dStage_roomDt_cCFv = .text:0x80027878; // type:function size:0x34 scope:global align:4 -setPselectNumInfo__15dStage_roomDt_cFi = .text:0x800278AC; // type:function size:0x34 scope:global align:4 -getPselectNumInfo__15dStage_roomDt_cCFv = .text:0x800278E0; // type:function size:0x34 scope:global align:4 -setEnvrNumInfo__15dStage_roomDt_cFi = .text:0x80027914; // type:function size:0x34 scope:global align:4 -getEnvrNumInfo__15dStage_roomDt_cCFv = .text:0x80027948; // type:function size:0x34 scope:global align:4 -setVrboxNumInfo__15dStage_roomDt_cFi = .text:0x8002797C; // type:function size:0x8 scope:global align:4 -getVrboxNumInfo__15dStage_roomDt_cCFv = .text:0x80027984; // type:function size:0x8 scope:global align:4 -setVrboxcolNumInfo__15dStage_roomDt_cFi = .text:0x8002798C; // type:function size:0x8 scope:global align:4 -getVrboxcolNumInfo__15dStage_roomDt_cCFv = .text:0x80027994; // type:function size:0x8 scope:global align:4 -setPlightNumInfo__15dStage_roomDt_cFi = .text:0x8002799C; // type:function size:0x34 scope:global align:4 -getPlightNumInfo__15dStage_roomDt_cCFv = .text:0x800279D0; // type:function size:0x34 scope:global align:4 -setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class = .text:0x80027A04; // type:function size:0x8 scope:global align:4 -getLightVecInfo__15dStage_roomDt_cCFv = .text:0x80027A0C; // type:function size:0x8 scope:global align:4 -setLightVecInfoNum__15dStage_roomDt_cFi = .text:0x80027A14; // type:function size:0x8 scope:global align:4 -getLightVecInfoNum__15dStage_roomDt_cCFv = .text:0x80027A1C; // type:function size:0x8 scope:global align:4 -setStagInfo__15dStage_roomDt_cFP21stage_stag_info_class = .text:0x80027A24; // type:function size:0x34 scope:global align:4 -getStagInfo__15dStage_roomDt_cCFv = .text:0x80027A58; // type:function size:0x34 scope:global align:4 -setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class = .text:0x80027A8C; // type:function size:0x8 scope:global align:4 -setPntInfo__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x80027A94; // type:function size:0x34 scope:global align:4 -getPntInf__15dStage_roomDt_cCFv = .text:0x80027AC8; // type:function size:0x34 scope:global align:4 -setPathInfo__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027AFC; // type:function size:0x34 scope:global align:4 -getPathInf__15dStage_roomDt_cCFv = .text:0x80027B30; // type:function size:0x34 scope:global align:4 -setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x80027B64; // type:function size:0x8 scope:global align:4 -getPnt2Inf__15dStage_roomDt_cCFv = .text:0x80027B6C; // type:function size:0x8 scope:global align:4 -setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027B74; // type:function size:0x8 scope:global align:4 -getPath2Inf__15dStage_roomDt_cCFv = .text:0x80027B7C; // type:function size:0x8 scope:global align:4 -setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027B84; // type:function size:0x8 scope:global align:4 -getSoundInf__15dStage_roomDt_cCFv = .text:0x80027B8C; // type:function size:0x8 scope:global align:4 -setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027B94; // type:function size:0x8 scope:global align:4 -getSoundInfCL__15dStage_roomDt_cCFv = .text:0x80027B9C; // type:function size:0x8 scope:global align:4 -setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c = .text:0x80027BA4; // type:function size:0x8 scope:global align:4 -getMapEventInfo__15dStage_roomDt_cCFv = .text:0x80027BAC; // type:function size:0x8 scope:global align:4 -setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c = .text:0x80027BB4; // type:function size:0x8 scope:global align:4 -getFileList2Info__15dStage_roomDt_cCFv = .text:0x80027BBC; // type:function size:0x8 scope:global align:4 -setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c = .text:0x80027BC4; // type:function size:0x8 scope:global align:4 -setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c = .text:0x80027BCC; // type:function size:0x8 scope:global align:4 -getFloorInfo__15dStage_roomDt_cCFv = .text:0x80027BD4; // type:function size:0x8 scope:global align:4 -setMemoryConfig__15dStage_roomDt_cFP21dStage_MemoryConfig_c = .text:0x80027BDC; // type:function size:0x30 scope:global align:4 -getMemoryConfig__15dStage_roomDt_cCFv = .text:0x80027C0C; // type:function size:0x34 scope:global align:4 -setMemoryMap__15dStage_roomDt_cFP18dStage_MemoryMap_c = .text:0x80027C40; // type:function size:0x30 scope:global align:4 -getMemoryMap__15dStage_roomDt_cCFv = .text:0x80027C70; // type:function size:0x34 scope:global align:4 -setMulti__15dStage_roomDt_cFP14dStage_Multi_c = .text:0x80027CA4; // type:function size:0x30 scope:global align:4 -getMulti__15dStage_roomDt_cCFv = .text:0x80027CD4; // type:function size:0x34 scope:global align:4 -setOldMulti__15dStage_roomDt_cFv = .text:0x80027D08; // type:function size:0x30 scope:global align:4 -resetOldMulti__15dStage_roomDt_cFv = .text:0x80027D38; // type:function size:0x30 scope:global align:4 -getOldMulti__15dStage_roomDt_cCFv = .text:0x80027D68; // type:function size:0x34 scope:global align:4 -setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c = .text:0x80027D9C; // type:function size:0x8 scope:global align:4 -getLbnk__15dStage_roomDt_cCFv = .text:0x80027DA4; // type:function size:0x8 scope:global align:4 -setTresure__15dStage_roomDt_cFP19stage_tresure_class = .text:0x80027DAC; // type:function size:0x8 scope:global align:4 -getTresure__15dStage_roomDt_cCFv = .text:0x80027DB4; // type:function size:0x8 scope:global align:4 -setDMap__15dStage_roomDt_cFP13dStage_DMap_c = .text:0x80027DBC; // type:function size:0x4 scope:global align:4 -getDMap__15dStage_roomDt_cCFv = .text:0x80027DC0; // type:function size:0x8 scope:global align:4 -setDrTg__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027DC8; // type:function size:0x8 scope:global align:4 -getDrTg__15dStage_roomDt_cCFv = .text:0x80027DD0; // type:function size:0x8 scope:global align:4 -setDoor__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027DD8; // type:function size:0x8 scope:global align:4 -getDoor__15dStage_roomDt_cCFv = .text:0x80027DE0; // type:function size:0x8 scope:global align:4 -setMapPath__15dStage_roomDt_cFPv = .text:0x80027DE8; // type:function size:0x30 scope:global align:4 -getMapPath__15dStage_roomDt_cFv = .text:0x80027E18; // type:function size:0x34 scope:global align:4 -setElst__15dStage_roomDt_cFP13dStage_Elst_c = .text:0x80027E4C; // type:function size:0x34 scope:global align:4 -getElst__15dStage_roomDt_cFv = .text:0x80027E80; // type:function size:0x38 scope:global align:4 -setCamera__16dStage_stageDt_cFP18stage_camera_class = .text:0x80027EB8; // type:function size:0x8 scope:global align:4 -getCamera__16dStage_stageDt_cCFv = .text:0x80027EC0; // type:function size:0x8 scope:global align:4 -setArrow__16dStage_stageDt_cFP17stage_arrow_class = .text:0x80027EC8; // type:function size:0x8 scope:global align:4 -getArrow__16dStage_stageDt_cCFv = .text:0x80027ED0; // type:function size:0x8 scope:global align:4 -setPlayer__16dStage_stageDt_cFP17stage_actor_class = .text:0x80027ED8; // type:function size:0x8 scope:global align:4 -setPlayerNum__16dStage_stageDt_cFUs = .text:0x80027EE0; // type:function size:0x8 scope:global align:4 -getPlayerNum__16dStage_stageDt_cCFv = .text:0x80027EE8; // type:function size:0x8 scope:global align:4 -setRoom__16dStage_stageDt_cFP14roomRead_class = .text:0x80027EF0; // type:function size:0x8 scope:global align:4 -setMapInfo__16dStage_stageDt_cFP20stage_map_info_class = .text:0x80027EF8; // type:function size:0x8 scope:global align:4 -getMapInfo__16dStage_stageDt_cCFv = .text:0x80027F00; // type:function size:0x8 scope:global align:4 -setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class = .text:0x80027F08; // type:function size:0x8 scope:global align:4 -setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class = .text:0x80027F10; // type:function size:0x8 scope:global align:4 -getPaletteInfo__16dStage_stageDt_cCFv = .text:0x80027F18; // type:function size:0x8 scope:global align:4 -setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class = .text:0x80027F20; // type:function size:0x8 scope:global align:4 -getPselectInfo__16dStage_stageDt_cCFv = .text:0x80027F28; // type:function size:0x8 scope:global align:4 -setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class = .text:0x80027F30; // type:function size:0x8 scope:global align:4 -getEnvrInfo__16dStage_stageDt_cCFv = .text:0x80027F38; // type:function size:0x8 scope:global align:4 -setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class = .text:0x80027F40; // type:function size:0x8 scope:global align:4 -getVrboxInfo__16dStage_stageDt_cCFv = .text:0x80027F48; // type:function size:0x8 scope:global align:4 -setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class = .text:0x80027F50; // type:function size:0x8 scope:global align:4 -getVrboxcolInfo__16dStage_stageDt_cCFv = .text:0x80027F58; // type:function size:0x8 scope:global align:4 -setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class = .text:0x80027F60; // type:function size:0x8 scope:global align:4 -getPlightInfo__16dStage_stageDt_cCFv = .text:0x80027F68; // type:function size:0x8 scope:global align:4 -setPaletteNumInfo__16dStage_stageDt_cFi = .text:0x80027F70; // type:function size:0x8 scope:global align:4 -getPaletteNumInfo__16dStage_stageDt_cCFv = .text:0x80027F78; // type:function size:0x8 scope:global align:4 -setPselectNumInfo__16dStage_stageDt_cFi = .text:0x80027F80; // type:function size:0x8 scope:global align:4 -getPselectNumInfo__16dStage_stageDt_cCFv = .text:0x80027F88; // type:function size:0x8 scope:global align:4 -setEnvrNumInfo__16dStage_stageDt_cFi = .text:0x80027F90; // type:function size:0x8 scope:global align:4 -getEnvrNumInfo__16dStage_stageDt_cCFv = .text:0x80027F98; // type:function size:0x8 scope:global align:4 -setVrboxNumInfo__16dStage_stageDt_cFi = .text:0x80027FA0; // type:function size:0x8 scope:global align:4 -getVrboxNumInfo__16dStage_stageDt_cCFv = .text:0x80027FA8; // type:function size:0x8 scope:global align:4 -setVrboxcolNumInfo__16dStage_stageDt_cFi = .text:0x80027FB0; // type:function size:0x8 scope:global align:4 -getVrboxcolNumInfo__16dStage_stageDt_cCFv = .text:0x80027FB8; // type:function size:0x8 scope:global align:4 -setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class = .text:0x80027FC0; // type:function size:0x34 scope:global align:4 -getLightVecInfo__16dStage_stageDt_cCFv = .text:0x80027FF4; // type:function size:0x34 scope:global align:4 -setLightVecInfoNum__16dStage_stageDt_cFi = .text:0x80028028; // type:function size:0x34 scope:global align:4 -getLightVecInfoNum__16dStage_stageDt_cCFv = .text:0x8002805C; // type:function size:0x34 scope:global align:4 -setPlightNumInfo__16dStage_stageDt_cFi = .text:0x80028090; // type:function size:0x8 scope:global align:4 -getPlightNumInfo__16dStage_stageDt_cCFv = .text:0x80028098; // type:function size:0x8 scope:global align:4 -setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class = .text:0x800280A0; // type:function size:0x8 scope:global align:4 -setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class = .text:0x800280A8; // type:function size:0x8 scope:global align:4 -setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x800280B0; // type:function size:0x8 scope:global align:4 -getPntInf__16dStage_stageDt_cCFv = .text:0x800280B8; // type:function size:0x8 scope:global align:4 -setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x800280C0; // type:function size:0x8 scope:global align:4 -getPathInf__16dStage_stageDt_cCFv = .text:0x800280C8; // type:function size:0x8 scope:global align:4 -setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x800280D0; // type:function size:0x8 scope:global align:4 -getPnt2Inf__16dStage_stageDt_cCFv = .text:0x800280D8; // type:function size:0x8 scope:global align:4 -setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x800280E0; // type:function size:0x8 scope:global align:4 -getPath2Inf__16dStage_stageDt_cCFv = .text:0x800280E8; // type:function size:0x8 scope:global align:4 -setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x800280F0; // type:function size:0x8 scope:global align:4 -getSoundInf__16dStage_stageDt_cCFv = .text:0x800280F8; // type:function size:0x8 scope:global align:4 -setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x80028100; // type:function size:0x8 scope:global align:4 -getSoundInfCL__16dStage_stageDt_cCFv = .text:0x80028108; // type:function size:0x8 scope:global align:4 -setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c = .text:0x80028110; // type:function size:0x8 scope:global align:4 -getMapEventInfo__16dStage_stageDt_cCFv = .text:0x80028118; // type:function size:0x8 scope:global align:4 -setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c = .text:0x80028120; // type:function size:0x34 scope:global align:4 -getFileList2Info__16dStage_stageDt_cCFv = .text:0x80028154; // type:function size:0x34 scope:global align:4 -setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c = .text:0x80028188; // type:function size:0x34 scope:global align:4 -getFileListInfo__16dStage_stageDt_cCFv = .text:0x800281BC; // type:function size:0x34 scope:global align:4 -setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c = .text:0x800281F0; // type:function size:0x8 scope:global align:4 -getFloorInfo__16dStage_stageDt_cCFv = .text:0x800281F8; // type:function size:0x8 scope:global align:4 -setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c = .text:0x80028200; // type:function size:0x8 scope:global align:4 -getMemoryConfig__16dStage_stageDt_cCFv = .text:0x80028208; // type:function size:0x8 scope:global align:4 -setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c = .text:0x80028210; // type:function size:0x8 scope:global align:4 -getMemoryMap__16dStage_stageDt_cCFv = .text:0x80028218; // type:function size:0x8 scope:global align:4 -setMulti__16dStage_stageDt_cFP14dStage_Multi_c = .text:0x80028220; // type:function size:0x8 scope:global align:4 -getMulti__16dStage_stageDt_cCFv = .text:0x80028228; // type:function size:0x8 scope:global align:4 -getOldMulti__16dStage_stageDt_cCFv = .text:0x80028230; // type:function size:0x8 scope:global align:4 -setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c = .text:0x80028238; // type:function size:0x34 scope:global align:4 -getLbnk__16dStage_stageDt_cCFv = .text:0x8002826C; // type:function size:0x34 scope:global align:4 -setTresure__16dStage_stageDt_cFP19stage_tresure_class = .text:0x800282A0; // type:function size:0x8 scope:global align:4 -getTresure__16dStage_stageDt_cCFv = .text:0x800282A8; // type:function size:0x8 scope:global align:4 -setDMap__16dStage_stageDt_cFP13dStage_DMap_c = .text:0x800282B0; // type:function size:0x8 scope:global align:4 -getDMap__16dStage_stageDt_cCFv = .text:0x800282B8; // type:function size:0x8 scope:global align:4 -setDrTg__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x800282C0; // type:function size:0x8 scope:global align:4 -getDrTg__16dStage_stageDt_cCFv = .text:0x800282C8; // type:function size:0x8 scope:global align:4 -setDoor__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x800282D0; // type:function size:0x8 scope:global align:4 -getDoor__16dStage_stageDt_cCFv = .text:0x800282D8; // type:function size:0x8 scope:global align:4 -setMapPath__16dStage_stageDt_cFPv = .text:0x800282E0; // type:function size:0x4 scope:global align:4 -getMapPath__16dStage_stageDt_cFv = .text:0x800282E4; // type:function size:0x8 scope:global align:4 -setElst__16dStage_stageDt_cFP13dStage_Elst_c = .text:0x800282EC; // type:function size:0x8 scope:global align:4 +setCamera__15dStage_roomDt_cFP18stage_camera_class = .text:0x800275CC; // type:function size:0x8 scope:weak align:4 +getCamera__15dStage_roomDt_cCFv = .text:0x800275D4; // type:function size:0x8 scope:weak align:4 +setArrow__15dStage_roomDt_cFP17stage_arrow_class = .text:0x800275DC; // type:function size:0x8 scope:weak align:4 +getArrow__15dStage_roomDt_cCFv = .text:0x800275E4; // type:function size:0x8 scope:weak align:4 +setPlayer__15dStage_roomDt_cFP17stage_actor_class = .text:0x800275EC; // type:function size:0x8 scope:weak align:4 +setPlayerNum__15dStage_roomDt_cFUs = .text:0x800275F4; // type:function size:0x8 scope:weak align:4 +getPlayerNum__15dStage_roomDt_cCFv = .text:0x800275FC; // type:function size:0x8 scope:weak align:4 +setRoom__15dStage_roomDt_cFP14roomRead_class = .text:0x80027604; // type:function size:0x34 scope:weak align:4 +getRoom__15dStage_roomDt_cCFv = .text:0x80027638; // type:function size:0x34 scope:weak align:4 +setMapInfo__15dStage_roomDt_cFP20stage_map_info_class = .text:0x8002766C; // type:function size:0x8 scope:weak align:4 +getMapInfo__15dStage_roomDt_cCFv = .text:0x80027674; // type:function size:0x8 scope:weak align:4 +setMapInfoBase__15dStage_roomDt_cFP26stage_map_info_dummy_class = .text:0x8002767C; // type:function size:0x8 scope:weak align:4 +setPaletteInfo__15dStage_roomDt_cFP24stage_palette_info_class = .text:0x80027684; // type:function size:0x34 scope:weak align:4 +getPaletteInfo__15dStage_roomDt_cCFv = .text:0x800276B8; // type:function size:0x34 scope:weak align:4 +setPselectInfo__15dStage_roomDt_cFP24stage_pselect_info_class = .text:0x800276EC; // type:function size:0x34 scope:weak align:4 +getPselectInfo__15dStage_roomDt_cCFv = .text:0x80027720; // type:function size:0x34 scope:weak align:4 +setEnvrInfo__15dStage_roomDt_cFP21stage_envr_info_class = .text:0x80027754; // type:function size:0x34 scope:weak align:4 +getEnvrInfo__15dStage_roomDt_cCFv = .text:0x80027788; // type:function size:0x34 scope:weak align:4 +setVrboxInfo__15dStage_roomDt_cFP22stage_vrbox_info_class = .text:0x800277BC; // type:function size:0x8 scope:weak align:4 +getVrboxInfo__15dStage_roomDt_cCFv = .text:0x800277C4; // type:function size:0x8 scope:weak align:4 +setVrboxcolInfo__15dStage_roomDt_cFP25stage_vrboxcol_info_class = .text:0x800277CC; // type:function size:0x8 scope:weak align:4 +getVrboxcolInfo__15dStage_roomDt_cCFv = .text:0x800277D4; // type:function size:0x8 scope:weak align:4 +setPlightInfo__15dStage_roomDt_cFP23stage_plight_info_class = .text:0x800277DC; // type:function size:0x34 scope:weak align:4 +getPlightInfo__15dStage_roomDt_cCFv = .text:0x80027810; // type:function size:0x34 scope:weak align:4 +setPaletteNumInfo__15dStage_roomDt_cFi = .text:0x80027844; // type:function size:0x34 scope:weak align:4 +getPaletteNumInfo__15dStage_roomDt_cCFv = .text:0x80027878; // type:function size:0x34 scope:weak align:4 +setPselectNumInfo__15dStage_roomDt_cFi = .text:0x800278AC; // type:function size:0x34 scope:weak align:4 +getPselectNumInfo__15dStage_roomDt_cCFv = .text:0x800278E0; // type:function size:0x34 scope:weak align:4 +setEnvrNumInfo__15dStage_roomDt_cFi = .text:0x80027914; // type:function size:0x34 scope:weak align:4 +getEnvrNumInfo__15dStage_roomDt_cCFv = .text:0x80027948; // type:function size:0x34 scope:weak align:4 +setVrboxNumInfo__15dStage_roomDt_cFi = .text:0x8002797C; // type:function size:0x8 scope:weak align:4 +getVrboxNumInfo__15dStage_roomDt_cCFv = .text:0x80027984; // type:function size:0x8 scope:weak align:4 +setVrboxcolNumInfo__15dStage_roomDt_cFi = .text:0x8002798C; // type:function size:0x8 scope:weak align:4 +getVrboxcolNumInfo__15dStage_roomDt_cCFv = .text:0x80027994; // type:function size:0x8 scope:weak align:4 +setPlightNumInfo__15dStage_roomDt_cFi = .text:0x8002799C; // type:function size:0x34 scope:weak align:4 +getPlightNumInfo__15dStage_roomDt_cCFv = .text:0x800279D0; // type:function size:0x34 scope:weak align:4 +setLightVecInfo__15dStage_roomDt_cFP30stage_pure_lightvec_info_class = .text:0x80027A04; // type:function size:0x8 scope:weak align:4 +getLightVecInfo__15dStage_roomDt_cCFv = .text:0x80027A0C; // type:function size:0x8 scope:weak align:4 +setLightVecInfoNum__15dStage_roomDt_cFi = .text:0x80027A14; // type:function size:0x8 scope:weak align:4 +getLightVecInfoNum__15dStage_roomDt_cCFv = .text:0x80027A1C; // type:function size:0x8 scope:weak align:4 +setStagInfo__15dStage_roomDt_cFP21stage_stag_info_class = .text:0x80027A24; // type:function size:0x34 scope:weak align:4 +getStagInfo__15dStage_roomDt_cCFv = .text:0x80027A58; // type:function size:0x34 scope:weak align:4 +setSclsInfo__15dStage_roomDt_cFP27stage_scls_info_dummy_class = .text:0x80027A8C; // type:function size:0x8 scope:weak align:4 +setPntInfo__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x80027A94; // type:function size:0x34 scope:weak align:4 +getPntInf__15dStage_roomDt_cCFv = .text:0x80027AC8; // type:function size:0x34 scope:weak align:4 +setPathInfo__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027AFC; // type:function size:0x34 scope:weak align:4 +getPathInf__15dStage_roomDt_cCFv = .text:0x80027B30; // type:function size:0x34 scope:weak align:4 +setPnt2Info__15dStage_roomDt_cFP13dStage_dPnt_c = .text:0x80027B64; // type:function size:0x8 scope:weak align:4 +getPnt2Inf__15dStage_roomDt_cCFv = .text:0x80027B6C; // type:function size:0x8 scope:weak align:4 +setPath2Info__15dStage_roomDt_cFP14dStage_dPath_c = .text:0x80027B74; // type:function size:0x8 scope:weak align:4 +getPath2Inf__15dStage_roomDt_cCFv = .text:0x80027B7C; // type:function size:0x8 scope:weak align:4 +setSoundInf__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027B84; // type:function size:0x8 scope:weak align:4 +getSoundInf__15dStage_roomDt_cCFv = .text:0x80027B8C; // type:function size:0x8 scope:weak align:4 +setSoundInfCL__15dStage_roomDt_cFP18dStage_SoundInfo_c = .text:0x80027B94; // type:function size:0x8 scope:weak align:4 +getSoundInfCL__15dStage_roomDt_cCFv = .text:0x80027B9C; // type:function size:0x8 scope:weak align:4 +setMapEventInfo__15dStage_roomDt_cFP21dStage_MapEventInfo_c = .text:0x80027BA4; // type:function size:0x8 scope:weak align:4 +getMapEventInfo__15dStage_roomDt_cCFv = .text:0x80027BAC; // type:function size:0x8 scope:weak align:4 +setFileList2Info__15dStage_roomDt_cFP21dStage_FileList2_dt_c = .text:0x80027BB4; // type:function size:0x8 scope:weak align:4 +getFileList2Info__15dStage_roomDt_cCFv = .text:0x80027BBC; // type:function size:0x8 scope:weak align:4 +setFileListInfo__15dStage_roomDt_cFP20dStage_FileList_dt_c = .text:0x80027BC4; // type:function size:0x8 scope:weak align:4 +setFloorInfo__15dStage_roomDt_cFP18dStage_FloorInfo_c = .text:0x80027BCC; // type:function size:0x8 scope:weak align:4 +getFloorInfo__15dStage_roomDt_cCFv = .text:0x80027BD4; // type:function size:0x8 scope:weak align:4 +setMemoryConfig__15dStage_roomDt_cFP21dStage_MemoryConfig_c = .text:0x80027BDC; // type:function size:0x30 scope:weak align:4 +getMemoryConfig__15dStage_roomDt_cCFv = .text:0x80027C0C; // type:function size:0x34 scope:weak align:4 +setMemoryMap__15dStage_roomDt_cFP18dStage_MemoryMap_c = .text:0x80027C40; // type:function size:0x30 scope:weak align:4 +getMemoryMap__15dStage_roomDt_cCFv = .text:0x80027C70; // type:function size:0x34 scope:weak align:4 +setMulti__15dStage_roomDt_cFP14dStage_Multi_c = .text:0x80027CA4; // type:function size:0x30 scope:weak align:4 +getMulti__15dStage_roomDt_cCFv = .text:0x80027CD4; // type:function size:0x34 scope:weak align:4 +setOldMulti__15dStage_roomDt_cFv = .text:0x80027D08; // type:function size:0x30 scope:weak align:4 +resetOldMulti__15dStage_roomDt_cFv = .text:0x80027D38; // type:function size:0x30 scope:weak align:4 +getOldMulti__15dStage_roomDt_cCFv = .text:0x80027D68; // type:function size:0x34 scope:weak align:4 +setLbnk__15dStage_roomDt_cFP13dStage_Lbnk_c = .text:0x80027D9C; // type:function size:0x8 scope:weak align:4 +getLbnk__15dStage_roomDt_cCFv = .text:0x80027DA4; // type:function size:0x8 scope:weak align:4 +setTresure__15dStage_roomDt_cFP19stage_tresure_class = .text:0x80027DAC; // type:function size:0x8 scope:weak align:4 +getTresure__15dStage_roomDt_cCFv = .text:0x80027DB4; // type:function size:0x8 scope:weak align:4 +setDMap__15dStage_roomDt_cFP13dStage_DMap_c = .text:0x80027DBC; // type:function size:0x4 scope:weak align:4 +getDMap__15dStage_roomDt_cCFv = .text:0x80027DC0; // type:function size:0x8 scope:weak align:4 +setDrTg__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027DC8; // type:function size:0x8 scope:weak align:4 +getDrTg__15dStage_roomDt_cCFv = .text:0x80027DD0; // type:function size:0x8 scope:weak align:4 +setDoor__15dStage_roomDt_cFP16stage_tgsc_class = .text:0x80027DD8; // type:function size:0x8 scope:weak align:4 +getDoor__15dStage_roomDt_cCFv = .text:0x80027DE0; // type:function size:0x8 scope:weak align:4 +setMapPath__15dStage_roomDt_cFPv = .text:0x80027DE8; // type:function size:0x30 scope:weak align:4 +getMapPath__15dStage_roomDt_cFv = .text:0x80027E18; // type:function size:0x34 scope:weak align:4 +setElst__15dStage_roomDt_cFP13dStage_Elst_c = .text:0x80027E4C; // type:function size:0x34 scope:weak align:4 +getElst__15dStage_roomDt_cFv = .text:0x80027E80; // type:function size:0x38 scope:weak align:4 +setCamera__16dStage_stageDt_cFP18stage_camera_class = .text:0x80027EB8; // type:function size:0x8 scope:weak align:4 +getCamera__16dStage_stageDt_cCFv = .text:0x80027EC0; // type:function size:0x8 scope:weak align:4 +setArrow__16dStage_stageDt_cFP17stage_arrow_class = .text:0x80027EC8; // type:function size:0x8 scope:weak align:4 +getArrow__16dStage_stageDt_cCFv = .text:0x80027ED0; // type:function size:0x8 scope:weak align:4 +setPlayer__16dStage_stageDt_cFP17stage_actor_class = .text:0x80027ED8; // type:function size:0x8 scope:weak align:4 +setPlayerNum__16dStage_stageDt_cFUs = .text:0x80027EE0; // type:function size:0x8 scope:weak align:4 +getPlayerNum__16dStage_stageDt_cCFv = .text:0x80027EE8; // type:function size:0x8 scope:weak align:4 +setRoom__16dStage_stageDt_cFP14roomRead_class = .text:0x80027EF0; // type:function size:0x8 scope:weak align:4 +setMapInfo__16dStage_stageDt_cFP20stage_map_info_class = .text:0x80027EF8; // type:function size:0x8 scope:weak align:4 +getMapInfo__16dStage_stageDt_cCFv = .text:0x80027F00; // type:function size:0x8 scope:weak align:4 +setMapInfoBase__16dStage_stageDt_cFP26stage_map_info_dummy_class = .text:0x80027F08; // type:function size:0x8 scope:weak align:4 +setPaletteInfo__16dStage_stageDt_cFP24stage_palette_info_class = .text:0x80027F10; // type:function size:0x8 scope:weak align:4 +getPaletteInfo__16dStage_stageDt_cCFv = .text:0x80027F18; // type:function size:0x8 scope:weak align:4 +setPselectInfo__16dStage_stageDt_cFP24stage_pselect_info_class = .text:0x80027F20; // type:function size:0x8 scope:weak align:4 +getPselectInfo__16dStage_stageDt_cCFv = .text:0x80027F28; // type:function size:0x8 scope:weak align:4 +setEnvrInfo__16dStage_stageDt_cFP21stage_envr_info_class = .text:0x80027F30; // type:function size:0x8 scope:weak align:4 +getEnvrInfo__16dStage_stageDt_cCFv = .text:0x80027F38; // type:function size:0x8 scope:weak align:4 +setVrboxInfo__16dStage_stageDt_cFP22stage_vrbox_info_class = .text:0x80027F40; // type:function size:0x8 scope:weak align:4 +getVrboxInfo__16dStage_stageDt_cCFv = .text:0x80027F48; // type:function size:0x8 scope:weak align:4 +setVrboxcolInfo__16dStage_stageDt_cFP25stage_vrboxcol_info_class = .text:0x80027F50; // type:function size:0x8 scope:weak align:4 +getVrboxcolInfo__16dStage_stageDt_cCFv = .text:0x80027F58; // type:function size:0x8 scope:weak align:4 +setPlightInfo__16dStage_stageDt_cFP23stage_plight_info_class = .text:0x80027F60; // type:function size:0x8 scope:weak align:4 +getPlightInfo__16dStage_stageDt_cCFv = .text:0x80027F68; // type:function size:0x8 scope:weak align:4 +setPaletteNumInfo__16dStage_stageDt_cFi = .text:0x80027F70; // type:function size:0x8 scope:weak align:4 +getPaletteNumInfo__16dStage_stageDt_cCFv = .text:0x80027F78; // type:function size:0x8 scope:weak align:4 +setPselectNumInfo__16dStage_stageDt_cFi = .text:0x80027F80; // type:function size:0x8 scope:weak align:4 +getPselectNumInfo__16dStage_stageDt_cCFv = .text:0x80027F88; // type:function size:0x8 scope:weak align:4 +setEnvrNumInfo__16dStage_stageDt_cFi = .text:0x80027F90; // type:function size:0x8 scope:weak align:4 +getEnvrNumInfo__16dStage_stageDt_cCFv = .text:0x80027F98; // type:function size:0x8 scope:weak align:4 +setVrboxNumInfo__16dStage_stageDt_cFi = .text:0x80027FA0; // type:function size:0x8 scope:weak align:4 +getVrboxNumInfo__16dStage_stageDt_cCFv = .text:0x80027FA8; // type:function size:0x8 scope:weak align:4 +setVrboxcolNumInfo__16dStage_stageDt_cFi = .text:0x80027FB0; // type:function size:0x8 scope:weak align:4 +getVrboxcolNumInfo__16dStage_stageDt_cCFv = .text:0x80027FB8; // type:function size:0x8 scope:weak align:4 +setLightVecInfo__16dStage_stageDt_cFP30stage_pure_lightvec_info_class = .text:0x80027FC0; // type:function size:0x34 scope:weak align:4 +getLightVecInfo__16dStage_stageDt_cCFv = .text:0x80027FF4; // type:function size:0x34 scope:weak align:4 +setLightVecInfoNum__16dStage_stageDt_cFi = .text:0x80028028; // type:function size:0x34 scope:weak align:4 +getLightVecInfoNum__16dStage_stageDt_cCFv = .text:0x8002805C; // type:function size:0x34 scope:weak align:4 +setPlightNumInfo__16dStage_stageDt_cFi = .text:0x80028090; // type:function size:0x8 scope:weak align:4 +getPlightNumInfo__16dStage_stageDt_cCFv = .text:0x80028098; // type:function size:0x8 scope:weak align:4 +setStagInfo__16dStage_stageDt_cFP21stage_stag_info_class = .text:0x800280A0; // type:function size:0x8 scope:weak align:4 +setSclsInfo__16dStage_stageDt_cFP27stage_scls_info_dummy_class = .text:0x800280A8; // type:function size:0x8 scope:weak align:4 +setPntInfo__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x800280B0; // type:function size:0x8 scope:weak align:4 +getPntInf__16dStage_stageDt_cCFv = .text:0x800280B8; // type:function size:0x8 scope:weak align:4 +setPathInfo__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x800280C0; // type:function size:0x8 scope:weak align:4 +getPathInf__16dStage_stageDt_cCFv = .text:0x800280C8; // type:function size:0x8 scope:weak align:4 +setPnt2Info__16dStage_stageDt_cFP13dStage_dPnt_c = .text:0x800280D0; // type:function size:0x8 scope:weak align:4 +getPnt2Inf__16dStage_stageDt_cCFv = .text:0x800280D8; // type:function size:0x8 scope:weak align:4 +setPath2Info__16dStage_stageDt_cFP14dStage_dPath_c = .text:0x800280E0; // type:function size:0x8 scope:weak align:4 +getPath2Inf__16dStage_stageDt_cCFv = .text:0x800280E8; // type:function size:0x8 scope:weak align:4 +setSoundInf__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x800280F0; // type:function size:0x8 scope:weak align:4 +getSoundInf__16dStage_stageDt_cCFv = .text:0x800280F8; // type:function size:0x8 scope:weak align:4 +setSoundInfCL__16dStage_stageDt_cFP18dStage_SoundInfo_c = .text:0x80028100; // type:function size:0x8 scope:weak align:4 +getSoundInfCL__16dStage_stageDt_cCFv = .text:0x80028108; // type:function size:0x8 scope:weak align:4 +setMapEventInfo__16dStage_stageDt_cFP21dStage_MapEventInfo_c = .text:0x80028110; // type:function size:0x8 scope:weak align:4 +getMapEventInfo__16dStage_stageDt_cCFv = .text:0x80028118; // type:function size:0x8 scope:weak align:4 +setFileList2Info__16dStage_stageDt_cFP21dStage_FileList2_dt_c = .text:0x80028120; // type:function size:0x34 scope:weak align:4 +getFileList2Info__16dStage_stageDt_cCFv = .text:0x80028154; // type:function size:0x34 scope:weak align:4 +setFileListInfo__16dStage_stageDt_cFP20dStage_FileList_dt_c = .text:0x80028188; // type:function size:0x34 scope:weak align:4 +getFileListInfo__16dStage_stageDt_cCFv = .text:0x800281BC; // type:function size:0x34 scope:weak align:4 +setFloorInfo__16dStage_stageDt_cFP18dStage_FloorInfo_c = .text:0x800281F0; // type:function size:0x8 scope:weak align:4 +getFloorInfo__16dStage_stageDt_cCFv = .text:0x800281F8; // type:function size:0x8 scope:weak align:4 +setMemoryConfig__16dStage_stageDt_cFP21dStage_MemoryConfig_c = .text:0x80028200; // type:function size:0x8 scope:weak align:4 +getMemoryConfig__16dStage_stageDt_cCFv = .text:0x80028208; // type:function size:0x8 scope:weak align:4 +setMemoryMap__16dStage_stageDt_cFP18dStage_MemoryMap_c = .text:0x80028210; // type:function size:0x8 scope:weak align:4 +getMemoryMap__16dStage_stageDt_cCFv = .text:0x80028218; // type:function size:0x8 scope:weak align:4 +setMulti__16dStage_stageDt_cFP14dStage_Multi_c = .text:0x80028220; // type:function size:0x8 scope:weak align:4 +getMulti__16dStage_stageDt_cCFv = .text:0x80028228; // type:function size:0x8 scope:weak align:4 +getOldMulti__16dStage_stageDt_cCFv = .text:0x80028230; // type:function size:0x8 scope:weak align:4 +setLbnk__16dStage_stageDt_cFP13dStage_Lbnk_c = .text:0x80028238; // type:function size:0x34 scope:weak align:4 +getLbnk__16dStage_stageDt_cCFv = .text:0x8002826C; // type:function size:0x34 scope:weak align:4 +setTresure__16dStage_stageDt_cFP19stage_tresure_class = .text:0x800282A0; // type:function size:0x8 scope:weak align:4 +getTresure__16dStage_stageDt_cCFv = .text:0x800282A8; // type:function size:0x8 scope:weak align:4 +setDMap__16dStage_stageDt_cFP13dStage_DMap_c = .text:0x800282B0; // type:function size:0x8 scope:weak align:4 +getDMap__16dStage_stageDt_cCFv = .text:0x800282B8; // type:function size:0x8 scope:weak align:4 +setDrTg__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x800282C0; // type:function size:0x8 scope:weak align:4 +getDrTg__16dStage_stageDt_cCFv = .text:0x800282C8; // type:function size:0x8 scope:weak align:4 +setDoor__16dStage_stageDt_cFP16stage_tgsc_class = .text:0x800282D0; // type:function size:0x8 scope:weak align:4 +getDoor__16dStage_stageDt_cCFv = .text:0x800282D8; // type:function size:0x8 scope:weak align:4 +setMapPath__16dStage_stageDt_cFPv = .text:0x800282E0; // type:function size:0x4 scope:weak align:4 +getMapPath__16dStage_stageDt_cFv = .text:0x800282E4; // type:function size:0x8 scope:weak align:4 +setElst__16dStage_stageDt_cFP13dStage_Elst_c = .text:0x800282EC; // type:function size:0x8 scope:weak align:4 __sinit_d_stage_cpp = .text:0x800282F4; // type:function size:0xDC scope:local align:4 __arraydtor$5375 = .text:0x800283D0; // type:function size:0x38 scope:local align:4 -__dt__19dStage_roomStatus_cFv = .text:0x80028408; // type:function size:0x3C scope:global align:4 -__ct__19dStage_roomStatus_cFv = .text:0x80028444; // type:function size:0x7C scope:global align:4 -__dt__19dStage_KeepDoorInfoFv = .text:0x800284C0; // type:function size:0x64 scope:global align:4 -__dt__21stage_tgsc_data_classFv = .text:0x80028524; // type:function size:0x3C scope:global align:4 -__ct__21stage_tgsc_data_classFv = .text:0x80028560; // type:function size:0x4 scope:global align:4 +__dt__19dStage_roomStatus_cFv = .text:0x80028408; // type:function size:0x3C scope:weak align:4 +__ct__19dStage_roomStatus_cFv = .text:0x80028444; // type:function size:0x7C scope:weak align:4 +__dt__19dStage_KeepDoorInfoFv = .text:0x800284C0; // type:function size:0x64 scope:weak align:4 +__dt__21stage_tgsc_data_classFv = .text:0x80028524; // type:function size:0x3C scope:weak align:4 +__ct__21stage_tgsc_data_classFv = .text:0x80028560; // type:function size:0x4 scope:weak align:4 getIconSize__15renderingAmap_cCFUc = .text:0x80028564; // type:function size:0x14 scope:global align:4 draw__15renderingAmap_cFv = .text:0x80028578; // type:function size:0x3F4 scope:global align:4 getDispType__15renderingAmap_cCFv = .text:0x8002896C; // type:function size:0x9C scope:global align:4 @@ -1289,20 +1289,20 @@ _move__6dMap_cFffif = .text:0x8002A3D4; // type:function size:0x828 scope:global _draw__6dMap_cFv = .text:0x8002ABFC; // type:function size:0x58 scope:global align:4 getFirstData__6dMap_cFUc = .text:0x8002AC54; // type:function size:0x20 scope:global align:4 getNextData__6dMap_cFPQ27dTres_c15typeGroupData_c = .text:0x8002AC74; // type:function size:0x20 scope:global align:4 -draw__12dDlst_base_cFv = .text:0x8002AC94; // type:function size:0x4 scope:global align:4 -isDrawType__11dDrawPath_cFi = .text:0x8002AC98; // type:function size:0x8 scope:global align:4 -__dt__18dRenderingFDAmap_cFv = .text:0x8002ACA0; // type:function size:0x7C scope:global align:4 -__dt__15dRenderingMap_cFv = .text:0x8002AD1C; // type:function size:0x6C scope:global align:4 -__dt__28dDrawPathWithNormalPattern_cFv = .text:0x8002AD88; // type:function size:0x5C scope:global align:4 -__dt__11dDrawPath_cFv = .text:0x8002ADE4; // type:function size:0x48 scope:global align:4 -getLineColor__11dDrawPath_cFii = .text:0x8002AE2C; // type:function size:0x2C scope:global align:4 -__dt__15renderingAmap_cFv = .text:0x8002AE58; // type:function size:0xBC scope:global align:4 -__ct__15renderingAmap_cFv = .text:0x8002AF14; // type:function size:0xB4 scope:global align:4 -__dt__6dMap_cFv = .text:0x8002AFC8; // type:function size:0xE0 scope:global align:4 -isRendIcon__15renderingAmap_cCFv = .text:0x8002B0A8; // type:function size:0x8 scope:global align:4 -__dt__28renderingPlusDoorAndCursor_cFv = .text:0x8002B0B0; // type:function size:0xAC scope:global align:4 -__dt__19renderingPlusDoor_cFv = .text:0x8002B15C; // type:function size:0x9C scope:global align:4 -__dt__16renderingDAmap_cFv = .text:0x8002B1F8; // type:function size:0x8C scope:global align:4 +draw__12dDlst_base_cFv = .text:0x8002AC94; // type:function size:0x4 scope:weak align:4 +isDrawType__11dDrawPath_cFi = .text:0x8002AC98; // type:function size:0x8 scope:weak align:4 +__dt__18dRenderingFDAmap_cFv = .text:0x8002ACA0; // type:function size:0x7C scope:weak align:4 +__dt__15dRenderingMap_cFv = .text:0x8002AD1C; // type:function size:0x6C scope:weak align:4 +__dt__28dDrawPathWithNormalPattern_cFv = .text:0x8002AD88; // type:function size:0x5C scope:weak align:4 +__dt__11dDrawPath_cFv = .text:0x8002ADE4; // type:function size:0x48 scope:weak align:4 +getLineColor__11dDrawPath_cFii = .text:0x8002AE2C; // type:function size:0x2C scope:weak align:4 +__dt__15renderingAmap_cFv = .text:0x8002AE58; // type:function size:0xBC scope:weak align:4 +__ct__15renderingAmap_cFv = .text:0x8002AF14; // type:function size:0xB4 scope:weak align:4 +__dt__6dMap_cFv = .text:0x8002AFC8; // type:function size:0xE0 scope:weak align:4 +isRendIcon__15renderingAmap_cCFv = .text:0x8002B0A8; // type:function size:0x8 scope:weak align:4 +__dt__28renderingPlusDoorAndCursor_cFv = .text:0x8002B0B0; // type:function size:0xAC scope:weak align:4 +__dt__19renderingPlusDoor_cFv = .text:0x8002B15C; // type:function size:0x9C scope:weak align:4 +__dt__16renderingDAmap_cFv = .text:0x8002B1F8; // type:function size:0x8C scope:weak align:4 ct__14dComIfG_play_cFv = .text:0x8002B284; // type:function size:0x50 scope:global align:4 init__14dComIfG_play_cFv = .text:0x8002B2D4; // type:function size:0x7C scope:global align:4 dComIfGp_checkItemGet__FUci = .text:0x8002B350; // type:function size:0x20 scope:global align:4 @@ -1339,11 +1339,11 @@ dComIfG_changeOpeningScene__FP11scene_classs = .text:0x8002CCFC; // type:functio dComIfG_resetToOpening__FP11scene_class = .text:0x8002CDEC; // type:function size:0x74 scope:global align:4 phase_1__FPc = .text:0x8002CE60; // type:function size:0x80 scope:local align:4 phase_2__FPc = .text:0x8002CEE0; // type:function size:0x7C scope:local align:4 -phase_3__FPc = .text:0x8002CF5C; // type:function size:0x8 scope:global align:4 +phase_3__FPc = .text:0x8002CF5C; // type:function size:0x8 scope:local align:4 dComIfG_resLoad__FP30request_of_phase_process_classPCc = .text:0x8002CF64; // type:function size:0x40 scope:global align:4 -phase_01__FP12phaseParam_c = .text:0x8002CFA4; // type:function size:0x60 scope:global align:4 -phase_02__FP12phaseParam_c = .text:0x8002D004; // type:function size:0x5C scope:global align:4 -phase_03__FP12phaseParam_c = .text:0x8002D060; // type:function size:0x8 scope:global align:4 +phase_01__FP12phaseParam_c = .text:0x8002CFA4; // type:function size:0x60 scope:local align:4 +phase_02__FP12phaseParam_c = .text:0x8002D004; // type:function size:0x5C scope:local align:4 +phase_03__FP12phaseParam_c = .text:0x8002D060; // type:function size:0x8 scope:local align:4 dComIfG_resLoad__FP30request_of_phase_process_classPCcP7JKRHeap = .text:0x8002D068; // type:function size:0x48 scope:global align:4 dComIfG_resDelete__FP30request_of_phase_process_classPCc = .text:0x8002D0B0; // type:function size:0x64 scope:global align:4 dComIfGp_getReverb__Fi = .text:0x8002D114; // type:function size:0x48 scope:global align:4 @@ -1364,7 +1364,7 @@ dComIfGs_BossLife_public_Get__Fv = .text:0x8002D9B8; // type:function size:0x14 dComIfGs_sense_type_change_Set__FSc = .text:0x8002D9CC; // type:function size:0x14 scope:global align:4 dComIfGs_sense_type_change_Get__Fv = .text:0x8002D9E0; // type:function size:0x14 scope:global align:4 dComIfGs_onZoneSwitch__Fii = .text:0x8002D9F4; // type:function size:0x64 scope:global align:4 -getZoneNo__20dStage_roomControl_cFi = .text:0x8002DA58; // type:function size:0x1C scope:global align:4 +getZoneNo__20dStage_roomControl_cFi = .text:0x8002DA58; // type:function size:0x1C scope:weak align:4 dComIfGs_offZoneSwitch__Fii = .text:0x8002DA74; // type:function size:0x64 scope:global align:4 dComIfGs_isZoneSwitch__Fii = .text:0x8002DAD8; // type:function size:0x6C scope:global align:4 dComIfGs_onOneZoneSwitch__Fii = .text:0x8002DB44; // type:function size:0x64 scope:global align:4 @@ -1407,7 +1407,7 @@ dComIfGs_setSelectEquipClothes__FUc = .text:0x8002EF58; // type:function size:0x dComIfGs_setSelectEquipSword__FUc = .text:0x8002EF68; // type:function size:0xD4 scope:global align:4 dComIfGs_setSelectEquipShield__FUc = .text:0x8002F03C; // type:function size:0xAC scope:global align:4 dComIfGs_setKeyNum__FiUc = .text:0x8002F0E8; // type:function size:0xA0 scope:global align:4 -dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc = .text:0x8002F188; // type:function size:0x48 scope:global align:4 +dComIfGs_setWarpItemData__FiPCc4cXyzsScUcUc = .text:0x8002F188; // type:function size:0x48 scope:local align:4 setWarpItemData__14dComIfG_play_cFPCc4cXyzsScUcUc = .text:0x8002F1D0; // type:function size:0x74 scope:global align:4 dComIfGs_setWarpItemData__FPCc4cXyzsScUcUc = .text:0x8002F244; // type:function size:0xB0 scope:global align:4 dComIfGs_setLastWarpMarkItemData__FPCc4cXyzsScUcUc = .text:0x8002F2F4; // type:function size:0x60 scope:global align:4 @@ -1451,43 +1451,43 @@ dComIfGs_isVisitedRoom__Fi = .text:0x8002FD40; // type:function size:0x5C scope: dComIfGs_staffroll_next_go__Fv = .text:0x8002FD9C; // type:function size:0x14 scope:global align:4 dComIfGs_staffroll_next_go_check__Fv = .text:0x8002FDB0; // type:function size:0x10 scope:global align:4 __sinit_d_com_inf_game_cpp = .text:0x8002FDC0; // type:function size:0x5C scope:local align:4 -__dt__13dComIfG_inf_cFv = .text:0x8002FE1C; // type:function size:0x74 scope:global align:4 -__dt__14dComIfG_play_cFv = .text:0x8002FE90; // type:function size:0x110 scope:global align:4 -__dt__11cBgS_ChkElmFv = .text:0x8002FFA0; // type:function size:0x48 scope:global align:4 -__dt__4dCcSFv = .text:0x8002FFE8; // type:function size:0x1B4 scope:global align:4 -__dt__12dCcMassS_ObjFv = .text:0x8003019C; // type:function size:0x60 scope:global align:4 -__dt__12dEvt_order_cFv = .text:0x800301FC; // type:function size:0x3C scope:global align:4 -__dt__11dEvDtBase_cFv = .text:0x80030238; // type:function size:0x3C scope:global align:4 -__dt__14dDlst_window_cFv = .text:0x80030274; // type:function size:0x3C scope:global align:4 -__dt__25dComIfG_camera_info_classFv = .text:0x800302B0; // type:function size:0x3C scope:global align:4 -__ct__13dComIfG_inf_cFv = .text:0x800302EC; // type:function size:0x284 scope:global align:4 -__ct__25dComIfG_camera_info_classFv = .text:0x80030570; // type:function size:0x4 scope:global align:4 -__ct__14dDlst_window_cFv = .text:0x80030574; // type:function size:0x4 scope:global align:4 -__dt__10dAttList_cFv = .text:0x80030578; // type:function size:0x3C scope:global align:4 -__ct__10dAttList_cFv = .text:0x800305B4; // type:function size:0x4 scope:global align:4 -__dt__7cSAngleFv = .text:0x800305B8; // type:function size:0x3C scope:global align:4 -__dt__10dAttDraw_cFv = .text:0x800305F4; // type:function size:0x154 scope:global align:4 -__dt__13mDoExt_bckAnmFv = .text:0x80030748; // type:function size:0x54 scope:global align:4 -__dt__13mDoExt_bpkAnmFv = .text:0x8003079C; // type:function size:0x54 scope:global align:4 -__dt__13mDoExt_brkAnmFv = .text:0x800307F0; // type:function size:0x54 scope:global align:4 -__dt__13mDoExt_btkAnmFv = .text:0x80030844; // type:function size:0x54 scope:global align:4 -__ct__10dAttDraw_cFv = .text:0x80030898; // type:function size:0x164 scope:global align:4 -__ct__13mDoExt_btkAnmFv = .text:0x800309FC; // type:function size:0x48 scope:global align:4 -__ct__13mDoExt_brkAnmFv = .text:0x80030A44; // type:function size:0x48 scope:global align:4 -__ct__13mDoExt_bpkAnmFv = .text:0x80030A8C; // type:function size:0x48 scope:global align:4 -__ct__13mDoExt_bckAnmFv = .text:0x80030AD4; // type:function size:0x48 scope:global align:4 -__dt__12dCcMassS_MngFv = .text:0x80030B1C; // type:function size:0x168 scope:global align:4 -__dt__4cCcSFv = .text:0x80030C84; // type:function size:0x74 scope:global align:4 -__dt__4dBgSFv = .text:0x80030CF8; // type:function size:0x7C scope:global align:4 -__dt__4cBgSFv = .text:0x80030D74; // type:function size:0x6C scope:global align:4 -__ct__11cBgS_ChkElmFv = .text:0x80030DE0; // type:function size:0x3C scope:global align:4 -__ct__10dSv_zone_cFv = .text:0x80030E1C; // type:function size:0xC scope:global align:4 -__ct__13dSv_memory2_cFv = .text:0x80030E28; // type:function size:0x30 scope:global align:4 -__ct__12dSv_memory_cFv = .text:0x80030E58; // type:function size:0x30 scope:global align:4 -__dt__15cCcD_DivideAreaFv = .text:0x80030E88; // type:function size:0x5C scope:global align:4 -__dt__8cM3dGCylFv = .text:0x80030EE4; // type:function size:0x48 scope:global align:4 -__dt__8cM3dGAabFv = .text:0x80030F2C; // type:function size:0x48 scope:global align:4 -__dt__15cCcD_DivideInfoFv = .text:0x80030F74; // type:function size:0x48 scope:global align:4 +__dt__13dComIfG_inf_cFv = .text:0x8002FE1C; // type:function size:0x74 scope:weak align:4 +__dt__14dComIfG_play_cFv = .text:0x8002FE90; // type:function size:0x110 scope:weak align:4 +__dt__11cBgS_ChkElmFv = .text:0x8002FFA0; // type:function size:0x48 scope:weak align:4 +__dt__4dCcSFv = .text:0x8002FFE8; // type:function size:0x1B4 scope:weak align:4 +__dt__12dCcMassS_ObjFv = .text:0x8003019C; // type:function size:0x60 scope:weak align:4 +__dt__12dEvt_order_cFv = .text:0x800301FC; // type:function size:0x3C scope:weak align:4 +__dt__11dEvDtBase_cFv = .text:0x80030238; // type:function size:0x3C scope:weak align:4 +__dt__14dDlst_window_cFv = .text:0x80030274; // type:function size:0x3C scope:weak align:4 +__dt__25dComIfG_camera_info_classFv = .text:0x800302B0; // type:function size:0x3C scope:weak align:4 +__ct__13dComIfG_inf_cFv = .text:0x800302EC; // type:function size:0x284 scope:weak align:4 +__ct__25dComIfG_camera_info_classFv = .text:0x80030570; // type:function size:0x4 scope:weak align:4 +__ct__14dDlst_window_cFv = .text:0x80030574; // type:function size:0x4 scope:weak align:4 +__dt__10dAttList_cFv = .text:0x80030578; // type:function size:0x3C scope:weak align:4 +__ct__10dAttList_cFv = .text:0x800305B4; // type:function size:0x4 scope:weak align:4 +__dt__7cSAngleFv = .text:0x800305B8; // type:function size:0x3C scope:weak align:4 +__dt__10dAttDraw_cFv = .text:0x800305F4; // type:function size:0x154 scope:weak align:4 +__dt__13mDoExt_bckAnmFv = .text:0x80030748; // type:function size:0x54 scope:weak align:4 +__dt__13mDoExt_bpkAnmFv = .text:0x8003079C; // type:function size:0x54 scope:weak align:4 +__dt__13mDoExt_brkAnmFv = .text:0x800307F0; // type:function size:0x54 scope:weak align:4 +__dt__13mDoExt_btkAnmFv = .text:0x80030844; // type:function size:0x54 scope:weak align:4 +__ct__10dAttDraw_cFv = .text:0x80030898; // type:function size:0x164 scope:weak align:4 +__ct__13mDoExt_btkAnmFv = .text:0x800309FC; // type:function size:0x48 scope:weak align:4 +__ct__13mDoExt_brkAnmFv = .text:0x80030A44; // type:function size:0x48 scope:weak align:4 +__ct__13mDoExt_bpkAnmFv = .text:0x80030A8C; // type:function size:0x48 scope:weak align:4 +__ct__13mDoExt_bckAnmFv = .text:0x80030AD4; // type:function size:0x48 scope:weak align:4 +__dt__12dCcMassS_MngFv = .text:0x80030B1C; // type:function size:0x168 scope:weak align:4 +__dt__4cCcSFv = .text:0x80030C84; // type:function size:0x74 scope:weak align:4 +__dt__4dBgSFv = .text:0x80030CF8; // type:function size:0x7C scope:weak align:4 +__dt__4cBgSFv = .text:0x80030D74; // type:function size:0x6C scope:weak align:4 +__ct__11cBgS_ChkElmFv = .text:0x80030DE0; // type:function size:0x3C scope:weak align:4 +__ct__10dSv_zone_cFv = .text:0x80030E1C; // type:function size:0xC scope:weak align:4 +__ct__13dSv_memory2_cFv = .text:0x80030E28; // type:function size:0x30 scope:weak align:4 +__ct__12dSv_memory_cFv = .text:0x80030E58; // type:function size:0x30 scope:weak align:4 +__dt__15cCcD_DivideAreaFv = .text:0x80030E88; // type:function size:0x5C scope:weak align:4 +__dt__8cM3dGCylFv = .text:0x80030EE4; // type:function size:0x48 scope:weak align:4 +__dt__8cM3dGAabFv = .text:0x80030F2C; // type:function size:0x48 scope:weak align:4 +__dt__15cCcD_DivideInfoFv = .text:0x80030F74; // type:function size:0x48 scope:weak align:4 set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc = .text:0x80030FBC; // type:function size:0xA8 scope:global align:4 reset__Q27daSus_c6data_cFv = .text:0x80031064; // type:function size:0x10 scope:global align:4 isSwitch__Q27daSus_c6data_cFv = .text:0x80031074; // type:function size:0x6C scope:global align:4 @@ -1537,10 +1537,10 @@ setRoomNo__12daObjCarry_cFiSc = .text:0x80031E54; // type:function size:0xC scop getRoomNo__12daObjCarry_cFi = .text:0x80031E60; // type:function size:0xC scope:global align:4 __sinit_d_com_static_cpp = .text:0x80031E6C; // type:function size:0xE8 scope:local align:4 __arraydtor$4479 = .text:0x80031F54; // type:function size:0x38 scope:local align:4 -__ct__Q27daSus_c6room_cFv = .text:0x80031F8C; // type:function size:0xC scope:global align:4 +__ct__Q27daSus_c6room_cFv = .text:0x80031F8C; // type:function size:0xC scope:weak align:4 __arraydtor$3839 = .text:0x80031F98; // type:function size:0x38 scope:local align:4 -__dt__Q27daSus_c6data_cFv = .text:0x80031FD0; // type:function size:0x3C scope:global align:4 -__ct__Q27daSus_c6data_cFv = .text:0x8003200C; // type:function size:0x30 scope:global align:4 +__dt__Q27daSus_c6data_cFv = .text:0x80031FD0; // type:function size:0x3C scope:weak align:4 +__ct__Q27daSus_c6data_cFv = .text:0x8003200C; // type:function size:0x30 scope:weak align:4 checkStateCarry__7dBomb_cFv = .text:0x8003203C; // type:function size:0x38 scope:global align:4 checkFlowerBombWait__7dBomb_cFP10fopAc_ac_c = .text:0x80032074; // type:function size:0x28 scope:global align:4 checkWaterBomb__7dBomb_cFP10fopAc_ac_c = .text:0x8003209C; // type:function size:0x28 scope:global align:4 @@ -1565,7 +1565,7 @@ dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc = .text:0x800327E0; // getTime__11dLib_time_cFv = .text:0x800328AC; // type:function size:0x7C scope:global align:4 stopTime__11dLib_time_cFv = .text:0x80032928; // type:function size:0x3C scope:global align:4 startTime__11dLib_time_cFv = .text:0x80032964; // type:function size:0x5C scope:global align:4 -dSv_item_rename__FUc = .text:0x800329C0; // type:function size:0x40 scope:global align:4 +dSv_item_rename__FUc = .text:0x800329C0; // type:function size:0x40 scope:local align:4 init__21dSv_player_status_a_cFv = .text:0x80032A00; // type:function size:0xF0 scope:global align:4 setSelectItemIndex__21dSv_player_status_a_cFiUc = .text:0x80032AF0; // type:function size:0x14 scope:global align:4 getSelectItemIndex__21dSv_player_status_a_cCFi = .text:0x80032B04; // type:function size:0x1C scope:global align:4 @@ -1731,8 +1731,8 @@ __ct__9dJntCol_cFv = .text:0x80035DBC; // type:function size:0x14 scope:global a init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli = .text:0x80035DD0; // type:function size:0x28 scope:global align:4 setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz = .text:0x80035DF8; // type:function size:0x100 scope:global align:4 searchNearPos__9dJntCol_cCFPC8cM3dGLinPC4cXyzP4cXyzi = .text:0x80035EF8; // type:function size:0xC94 scope:global align:4 -__dt__8cM3dGLinFv = .text:0x80036B8C; // type:function size:0x48 scope:global align:4 -__dt__8cM3dGSphFv = .text:0x80036BD4; // type:function size:0x48 scope:global align:4 +__dt__8cM3dGLinFv = .text:0x80036B8C; // type:function size:0x48 scope:weak align:4 +__dt__8cM3dGSphFv = .text:0x80036BD4; // type:function size:0x48 scope:weak align:4 getArrowOffsetPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP4cXyz = .text:0x80036C1C; // type:function size:0x158 scope:global align:4 getHitmarkPosAndAngle__9dJntCol_cCFPC4cXyzPC5csXyzP4cXyzP5csXyzi = .text:0x80036D74; // type:function size:0x364 scope:global align:4 setArrowPosAndAngle__9dJntCol_cFPC4cXyzPC4cXyziP4cXyzP5csXyz = .text:0x800370D8; // type:function size:0x90 scope:global align:4 @@ -1742,13 +1742,13 @@ make_eff_break_kotubo2__5daObjFP10fopAc_ac_c = .text:0x80037340; // type:functio make_eff_break_gm_kotubo__5daObjFP10fopAc_ac_c = .text:0x800373D0; // type:function size:0x90 scope:global align:4 make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c = .text:0x80037460; // type:function size:0x90 scope:global align:4 posMoveF_stream__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzff = .text:0x800374F0; // type:function size:0x30 scope:global align:4 -posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff = .text:0x80037520; // type:function size:0xFC scope:global align:4 -posMoveF_grade_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzffPC4cXyzPC4cXyz = .text:0x8003761C; // type:function size:0x134 scope:global align:4 +posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff = .text:0x80037520; // type:function size:0xFC scope:local align:4 +posMoveF_grade_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzffPC4cXyzPC4cXyz = .text:0x8003761C; // type:function size:0x134 scope:local align:4 posMoveF_grade__5daObjFP10fopAc_ac_cPC4cXyzPC4cXyzffPC4cXyzffPC4cXyz = .text:0x80037750; // type:function size:0x168 scope:global align:4 quat_rotBaseY__5daObjFP10QuaternionRC4cXyz = .text:0x800378B8; // type:function size:0x178 scope:global align:4 HitSeStart__5daObjFPC4cXyziPC12dCcD_GObjInfUl = .text:0x80037A30; // type:function size:0x14C scope:global align:4 -GetCoCP__12cCcD_CylAttrFv = .text:0x80037B7C; // type:function size:0x8 scope:global align:4 -GetCoCP__12cCcD_SphAttrFv = .text:0x80037B84; // type:function size:0x8 scope:global align:4 +GetCoCP__12cCcD_CylAttrFv = .text:0x80037B7C; // type:function size:0x8 scope:weak align:4 +GetCoCP__12cCcD_SphAttrFv = .text:0x80037B84; // type:function size:0x8 scope:weak align:4 getItemNo__12daItemBase_cFv = .text:0x80037B8C; // type:function size:0x8 scope:global align:4 hide__12daItemBase_cFv = .text:0x80037B94; // type:function size:0x10 scope:global align:4 show__12daItemBase_cFv = .text:0x80037BA4; // type:function size:0x10 scope:global align:4 @@ -1771,19 +1771,19 @@ getOff__10e_wb_classFv = .text:0x80037E24; // type:function size:0x74 scope:glob checkDownDamage__10e_wb_classFv = .text:0x80037E98; // type:function size:0x2C scope:global align:4 checkNormalRideMode__10e_wb_classCFv = .text:0x80037EC4; // type:function size:0x28 scope:global align:4 setRunRideMode__10e_wb_classFv = .text:0x80037EEC; // type:function size:0x28 scope:global align:4 -__dt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFv = .text:0x80037F14; // type:function size:0x60 scope:global align:4 -adaptor_do_MESSAGE__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFQ37JStudio4data15TEOperationDataPCvUl = .text:0x80037F74; // type:function size:0x30 scope:global align:4 -__dt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFv = .text:0x80037FA4; // type:function size:0x60 scope:global align:4 -create__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x80038004; // type:function size:0x14C scope:global align:4 +__dt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFv = .text:0x80037F14; // type:function size:0x60 scope:local align:4 +adaptor_do_MESSAGE__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFQ37JStudio4data15TEOperationDataPCvUl = .text:0x80037F74; // type:function size:0x30 scope:local align:4 +__dt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFv = .text:0x80037FA4; // type:function size:0x60 scope:local align:4 +create__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x80038004; // type:function size:0x14C scope:local align:4 __ct__13dDemo_actor_cFv = .text:0x80038150; // type:function size:0x78 scope:global align:4 __dt__13dDemo_actor_cFv = .text:0x800381C8; // type:function size:0x90 scope:global align:4 getActor__13dDemo_actor_cFv = .text:0x80038258; // type:function size:0x34 scope:global align:4 setActor__13dDemo_actor_cFP10fopAc_ac_c = .text:0x8003828C; // type:function size:0x40 scope:global align:4 getPrm_Morf__13dDemo_actor_cFv = .text:0x800382CC; // type:function size:0x19C scope:global align:4 getDemoIDData__13dDemo_actor_cFPiPiPiPUsPUc = .text:0x80038468; // type:function size:0x158 scope:global align:4 -dDemo_getJaiPointer__FPCcUliPUs = .text:0x800385C0; // type:function size:0x88 scope:global align:4 +dDemo_getJaiPointer__FPCcUliPUs = .text:0x800385C0; // type:function size:0x88 scope:local align:4 dDemo_setDemoData__FP10fopAc_ac_cUcP14mDoExt_McaMorfPCciPUsUlSc = .text:0x80038648; // type:function size:0x290 scope:global align:4 -branchFile__FPCc = .text:0x800388D8; // type:function size:0x44 scope:global align:4 +branchFile__FPCc = .text:0x800388D8; // type:function size:0x44 scope:local align:4 JSGSetData__13dDemo_actor_cFUlPCvUl = .text:0x8003891C; // type:function size:0x134 scope:global align:4 JSGSetTranslation__13dDemo_actor_cFRC3Vec = .text:0x80038A50; // type:function size:0x60 scope:global align:4 JSGSetScaling__13dDemo_actor_cFRC3Vec = .text:0x80038AB0; // type:function size:0x28 scope:global align:4 @@ -1794,7 +1794,7 @@ JSGSetAnimationFrame__13dDemo_actor_cFf = .text:0x80038B70; // type:function siz JSGSetAnimationTransition__13dDemo_actor_cFf = .text:0x80038B84; // type:function size:0x14 scope:global align:4 JSGSetTextureAnimation__13dDemo_actor_cFUl = .text:0x80038B98; // type:function size:0x14 scope:global align:4 JSGSetTextureAnimationFrame__13dDemo_actor_cFf = .text:0x80038BAC; // type:function size:0x14 scope:global align:4 -getView__Fv = .text:0x80038BC0; // type:function size:0x34 scope:global align:4 +getView__Fv = .text:0x80038BC0; // type:function size:0x34 scope:local align:4 JSGGetProjectionNear__14dDemo_camera_cCFv = .text:0x80038BF4; // type:function size:0x34 scope:global align:4 JSGSetProjectionNear__14dDemo_camera_cFf = .text:0x80038C28; // type:function size:0x14 scope:global align:4 JSGGetProjectionFar__14dDemo_camera_cCFv = .text:0x80038C3C; // type:function size:0x34 scope:global align:4 @@ -1850,13 +1850,13 @@ reset__7dDemo_cFv = .text:0x8003A034; // type:function size:0x18 scope:global al emitter_create__16dDemo_particle_cFUl = .text:0x8003A04C; // type:function size:0x80 scope:global align:4 __dt__16dDemo_particle_cFv = .text:0x8003A0CC; // type:function size:0x60 scope:global align:4 __dt__14dDemo_camera_cFv = .text:0x8003A12C; // type:function size:0x60 scope:global align:4 -JSGFindNodeID__13dDemo_actor_cCFPCc = .text:0x8003A18C; // type:function size:0x2C scope:global align:4 -JSGGetNodeTransformation__13dDemo_actor_cCFUlPA4_f = .text:0x8003A1B8; // type:function size:0x40 scope:global align:4 -JSGGetAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A1F8; // type:function size:0x8 scope:global align:4 -JSGGetTextureAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A200; // type:function size:0x8 scope:global align:4 -JSGGetTranslation__13dDemo_actor_cCFP3Vec = .text:0x8003A208; // type:function size:0x1C scope:global align:4 -JSGGetScaling__13dDemo_actor_cCFP3Vec = .text:0x8003A224; // type:function size:0x1C scope:global align:4 -JSGGetRotation__13dDemo_actor_cCFP3Vec = .text:0x8003A240; // type:function size:0x78 scope:global align:4 +JSGFindNodeID__13dDemo_actor_cCFPCc = .text:0x8003A18C; // type:function size:0x2C scope:weak align:4 +JSGGetNodeTransformation__13dDemo_actor_cCFUlPA4_f = .text:0x8003A1B8; // type:function size:0x40 scope:weak align:4 +JSGGetAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A1F8; // type:function size:0x8 scope:weak align:4 +JSGGetTextureAnimationFrameMax__13dDemo_actor_cCFv = .text:0x8003A200; // type:function size:0x8 scope:weak align:4 +JSGGetTranslation__13dDemo_actor_cCFP3Vec = .text:0x8003A208; // type:function size:0x1C scope:weak align:4 +JSGGetScaling__13dDemo_actor_cCFP3Vec = .text:0x8003A224; // type:function size:0x1C scope:weak align:4 +JSGGetRotation__13dDemo_actor_cCFP3Vec = .text:0x8003A240; // type:function size:0x78 scope:weak align:4 getKind__13door_param2_cFP10fopAc_ac_c = .text:0x8003A2B8; // type:function size:0xC scope:global align:4 getDoorModel__13door_param2_cFP10fopAc_ac_c = .text:0x8003A2C4; // type:function size:0xC scope:global align:4 getFrontOption__13door_param2_cFP10fopAc_ac_c = .text:0x8003A2D0; // type:function size:0xC scope:global align:4 @@ -1878,35 +1878,35 @@ getMBLightInf__13door_param2_cFP10fopAc_ac_c = .text:0x8003A384; // type:functio __ct__11dRes_info_cFv = .text:0x8003A390; // type:function size:0x20 scope:global align:4 __dt__11dRes_info_cFv = .text:0x8003A3B0; // type:function size:0xC8 scope:global align:4 set__11dRes_info_cFPCcPCcUcP7JKRHeap = .text:0x8003A478; // type:function size:0xA8 scope:global align:4 -setAlpha__FP16J3DMaterialTable = .text:0x8003A520; // type:function size:0xA0 scope:global align:4 -setIndirectTex__FP12J3DModelData = .text:0x8003A5C0; // type:function size:0x38C scope:global align:4 -setAlpha__FP12J3DModelData = .text:0x8003A94C; // type:function size:0x24 scope:global align:4 -addWarpMaterial__FP12J3DModelData = .text:0x8003A970; // type:function size:0x28C scope:global align:4 -__ct__11J3DTevStageFRC15J3DTevStageInfo = .text:0x8003ABFC; // type:function size:0x60 scope:global align:4 -setTexMtx__14J3DTexGenBlockFUlP9J3DTexMtx = .text:0x8003AC5C; // type:function size:0x4 scope:global align:4 +setAlpha__FP16J3DMaterialTable = .text:0x8003A520; // type:function size:0xA0 scope:local align:4 +setIndirectTex__FP12J3DModelData = .text:0x8003A5C0; // type:function size:0x38C scope:local align:4 +setAlpha__FP12J3DModelData = .text:0x8003A94C; // type:function size:0x24 scope:local align:4 +addWarpMaterial__FP12J3DModelData = .text:0x8003A970; // type:function size:0x28C scope:local align:4 +__ct__11J3DTevStageFRC15J3DTevStageInfo = .text:0x8003ABFC; // type:function size:0x60 scope:weak align:4 +setTexMtx__14J3DTexGenBlockFUlP9J3DTexMtx = .text:0x8003AC5C; // type:function size:0x4 scope:weak align:4 onWarpMaterial__11dRes_info_cFP12J3DModelData = .text:0x8003AC60; // type:function size:0xEC scope:global align:4 offWarpMaterial__11dRes_info_cFP12J3DModelData = .text:0x8003AD4C; // type:function size:0xEC scope:global align:4 setWarpSRT__11dRes_info_cFP12J3DModelDataRC4cXyzff = .text:0x8003AE38; // type:function size:0x10C scope:global align:4 loaderBasicBmd__11dRes_info_cFUlPv = .text:0x8003AF44; // type:function size:0x33C scope:global align:4 -__dt__15J3DTevKColorAnmFv = .text:0x8003B280; // type:function size:0x3C scope:global align:4 -__ct__15J3DTevKColorAnmFv = .text:0x8003B2BC; // type:function size:0x18 scope:global align:4 -__dt__14J3DTevColorAnmFv = .text:0x8003B2D4; // type:function size:0x3C scope:global align:4 -__ct__14J3DTevColorAnmFv = .text:0x8003B310; // type:function size:0x18 scope:global align:4 -__dt__11J3DTexNoAnmFv = .text:0x8003B328; // type:function size:0x48 scope:global align:4 -__ct__11J3DTexNoAnmFv = .text:0x8003B370; // type:function size:0x24 scope:global align:4 -__dt__12J3DTexMtxAnmFv = .text:0x8003B394; // type:function size:0x3C scope:global align:4 -__ct__12J3DTexMtxAnmFv = .text:0x8003B3D0; // type:function size:0x18 scope:global align:4 -__dt__14J3DMatColorAnmFv = .text:0x8003B3E8; // type:function size:0x3C scope:global align:4 -__ct__14J3DMatColorAnmFv = .text:0x8003B424; // type:function size:0x18 scope:global align:4 +__dt__15J3DTevKColorAnmFv = .text:0x8003B280; // type:function size:0x3C scope:weak align:4 +__ct__15J3DTevKColorAnmFv = .text:0x8003B2BC; // type:function size:0x18 scope:weak align:4 +__dt__14J3DTevColorAnmFv = .text:0x8003B2D4; // type:function size:0x3C scope:weak align:4 +__ct__14J3DTevColorAnmFv = .text:0x8003B310; // type:function size:0x18 scope:weak align:4 +__dt__11J3DTexNoAnmFv = .text:0x8003B328; // type:function size:0x48 scope:weak align:4 +__ct__11J3DTexNoAnmFv = .text:0x8003B370; // type:function size:0x24 scope:weak align:4 +__dt__12J3DTexMtxAnmFv = .text:0x8003B394; // type:function size:0x3C scope:weak align:4 +__ct__12J3DTexMtxAnmFv = .text:0x8003B3D0; // type:function size:0x18 scope:weak align:4 +__dt__14J3DMatColorAnmFv = .text:0x8003B3E8; // type:function size:0x3C scope:weak align:4 +__ct__14J3DMatColorAnmFv = .text:0x8003B424; // type:function size:0x18 scope:weak align:4 loadResource__11dRes_info_cFv = .text:0x8003B43C; // type:function size:0x5C4 scope:global align:4 -__dt__18J3DAnmTransformKeyFv = .text:0x8003BA00; // type:function size:0x6C scope:global align:4 -__dt__15J3DAnmTransformFv = .text:0x8003BA6C; // type:function size:0x5C scope:global align:4 +__dt__18J3DAnmTransformKeyFv = .text:0x8003BA00; // type:function size:0x6C scope:weak align:4 +__dt__15J3DAnmTransformFv = .text:0x8003BA6C; // type:function size:0x5C scope:weak align:4 deleteArchiveRes__11dRes_info_cFv = .text:0x8003BAC8; // type:function size:0x104 scope:global align:4 -getArcHeader__FP10JKRArchive = .text:0x8003BBCC; // type:function size:0x28 scope:global align:4 +getArcHeader__FP10JKRArchive = .text:0x8003BBCC; // type:function size:0x28 scope:local align:4 setRes__11dRes_info_cFP10JKRArchiveP7JKRHeap = .text:0x8003BBF4; // type:function size:0x34 scope:global align:4 setRes__11dRes_info_cFv = .text:0x8003BC28; // type:function size:0x1A0 scope:global align:4 -myGetMemBlockSize__FPv = .text:0x8003BDC8; // type:function size:0x68 scope:global align:4 -myGetMemBlockSize0__FPv = .text:0x8003BE30; // type:function size:0x2C scope:global align:4 +myGetMemBlockSize__FPv = .text:0x8003BDC8; // type:function size:0x68 scope:local align:4 +myGetMemBlockSize0__FPv = .text:0x8003BE30; // type:function size:0x2C scope:local align:4 dump_long__11dRes_info_cFP11dRes_info_ci = .text:0x8003BE5C; // type:function size:0x10C scope:global align:4 dump__11dRes_info_cFP11dRes_info_ci = .text:0x8003BF68; // type:function size:0x178 scope:global align:4 __dt__14dRes_control_cFv = .text:0x8003C0E0; // type:function size:0xC8 scope:global align:4 @@ -1924,12 +1924,12 @@ setObjectRes__14dRes_control_cFPCcPvUlP7JKRHeap = .text:0x8003C614; // type:func setStageRes__14dRes_control_cFPCcP7JKRHeap = .text:0x8003C6EC; // type:function size:0x7C scope:global align:4 dump__14dRes_control_cFv = .text:0x8003C768; // type:function size:0x80 scope:global align:4 getObjectResName2Index__14dRes_control_cFPCcPCc = .text:0x8003C7E8; // type:function size:0x7C scope:global align:4 -__dt__10J3DAnmBaseFv = .text:0x8003C864; // type:function size:0x48 scope:global align:4 -getKind__15J3DAnmTransformCFv = .text:0x8003C8AC; // type:function size:0x8 scope:global align:4 -__dt__18mDoExt_transAnmBasFv = .text:0x8003C8B4; // type:function size:0x7C scope:global align:4 -getKind__18J3DAnmTransformKeyCFv = .text:0x8003C930; // type:function size:0x8 scope:global align:4 -getTransform__18J3DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8003C938; // type:function size:0x24 scope:global align:4 -calc__11J3DTexNoAnmCFPUs = .text:0x8003C95C; // type:function size:0x30 scope:global align:4 +__dt__10J3DAnmBaseFv = .text:0x8003C864; // type:function size:0x48 scope:weak align:4 +getKind__15J3DAnmTransformCFv = .text:0x8003C8AC; // type:function size:0x8 scope:weak align:4 +__dt__18mDoExt_transAnmBasFv = .text:0x8003C8B4; // type:function size:0x7C scope:weak align:4 +getKind__18J3DAnmTransformKeyCFv = .text:0x8003C930; // type:function size:0x8 scope:weak align:4 +getTransform__18J3DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8003C938; // type:function size:0x24 scope:weak align:4 +calc__11J3DTexNoAnmCFPUs = .text:0x8003C95C; // type:function size:0x30 scope:weak align:4 create__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003C98C; // type:function size:0x98 scope:global align:4 remove__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003CA24; // type:function size:0x58 scope:global align:4 rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class = .text:0x8003CA7C; // type:function size:0xF4 scope:global align:4 @@ -1949,7 +1949,7 @@ renderingDecoration__18dRenderingFDAmap_cFPCQ211dDrawPath_c10line_class = .text: getDecoLineColor__18dRenderingFDAmap_cFii = .text:0x8003D7BC; // type:function size:0x2C scope:global align:4 getDecorationLineWidth__18dRenderingFDAmap_cFi = .text:0x8003D7E8; // type:function size:0x2C scope:global align:4 __sinit_d_map_path_cpp = .text:0x8003D814; // type:function size:0x5C scope:local align:4 -__dt__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003D870; // type:function size:0x50 scope:global align:4 +__dt__Q28dMpath_n18dTexObjAggregate_cFv = .text:0x8003D870; // type:function size:0x50 scope:weak align:4 addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s = .text:0x8003D8C0; // type:function size:0x88 scope:global align:4 isArrival__22dMenu_Fmap_room_data_cFv = .text:0x8003D948; // type:function size:0x50 scope:global align:4 buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii = .text:0x8003D998; // type:function size:0xC4 scope:global align:4 @@ -1972,9 +1972,9 @@ nextData__22dMenuFmapIconPointer_cFv = .text:0x8003E5C0; // type:function size:0 getValidData__22dMenuFmapIconPointer_cFv = .text:0x8003E640; // type:function size:0x68 scope:global align:4 getPosition__19dMenuFmapIconDisp_cFPiPiPfPfPPCQ27dTres_c6data_s = .text:0x8003E6A8; // type:function size:0x170 scope:global align:4 isDrawDisp__19dMenuFmapIconDisp_cFv = .text:0x8003E818; // type:function size:0x428 scope:global align:4 -__dt__26fmpTresTypeGroupDataList_cFv = .text:0x8003EC40; // type:function size:0x60 scope:global align:4 -__dt__22fmpTresTypeGroupData_cFv = .text:0x8003ECA0; // type:function size:0x120 scope:global align:4 -__ct__26fmpTresTypeGroupDataList_cFv = .text:0x8003EDC0; // type:function size:0x10 scope:global align:4 +__dt__26fmpTresTypeGroupDataList_cFv = .text:0x8003EC40; // type:function size:0x60 scope:weak align:4 +__dt__22fmpTresTypeGroupData_cFv = .text:0x8003ECA0; // type:function size:0x120 scope:weak align:4 +__ct__26fmpTresTypeGroupDataList_cFv = .text:0x8003EDC0; // type:function size:0x10 scope:weak align:4 chkGetCompass__10dMapInfo_nFv = .text:0x8003EDD0; // type:function size:0x38 scope:global align:4 chkGetMap__10dMapInfo_nFv = .text:0x8003EE08; // type:function size:0x38 scope:global align:4 isVisitedRoom__10dMapInfo_nFi = .text:0x8003EE40; // type:function size:0x50 scope:global align:4 @@ -2042,8 +2042,8 @@ drawIconSingle__28renderingPlusDoorAndCursor_cFRC3Vecff = .text:0x80041338; // t drawCursor__28renderingPlusDoorAndCursor_cFRC3Vecsif = .text:0x800413F0; // type:function size:0x19C scope:global align:4 beforeDrawPath__19renderingPlusDoor_cFv = .text:0x8004158C; // type:function size:0x4 scope:global align:4 __sinit_d_map_path_dmap_cpp = .text:0x80041590; // type:function size:0x20 scope:local align:4 -event_debug_evnt__21@unnamed@d_event_cpp@Fv = .text:0x800415B0; // type:function size:0x8 scope:global align:4 -clear_tmpflag_for_message__21@unnamed@d_event_cpp@Fv = .text:0x800415B8; // type:function size:0xF8 scope:global align:4 +event_debug_evnt__21@unnamed@d_event_cpp@Fv = .text:0x800415B0; // type:function size:0x8 scope:local align:4 +clear_tmpflag_for_message__21@unnamed@d_event_cpp@Fv = .text:0x800415B8; // type:function size:0xF8 scope:local align:4 __ct__14dEvt_control_cFv = .text:0x800416B0; // type:function size:0x54 scope:global align:4 __ct__12dEvt_order_cFv = .text:0x80041704; // type:function size:0x4 scope:global align:4 orderOld__14dEvt_control_cFUsUsUsUsPvPvPCv = .text:0x80041708; // type:function size:0x90 scope:global align:4 @@ -2100,10 +2100,10 @@ setPtI__14dEvt_control_cFPv = .text:0x800437EC; // type:function size:0x30 scope setPtI_Id__14dEvt_control_cFUi = .text:0x8004381C; // type:function size:0x8 scope:global align:4 setPtD__14dEvt_control_cFPv = .text:0x80043824; // type:function size:0x30 scope:global align:4 setGtItm__14dEvt_control_cFUc = .text:0x80043854; // type:function size:0x8 scope:global align:4 -getTelopNo__FPCc = .text:0x8004385C; // type:function size:0x98 scope:global align:4 -getTelopNo__Fv = .text:0x800438F4; // type:function size:0x2C scope:global align:4 -getStartTelopNo__Fv = .text:0x80043920; // type:function size:0x224 scope:global align:4 -dEvDt_Next_Stage__Fii = .text:0x80043B44; // type:function size:0x34C scope:global align:4 +getTelopNo__FPCc = .text:0x8004385C; // type:function size:0x98 scope:local align:4 +getTelopNo__Fv = .text:0x800438F4; // type:function size:0x2C scope:local align:4 +getStartTelopNo__Fv = .text:0x80043920; // type:function size:0x224 scope:local align:4 +dEvDt_Next_Stage__Fii = .text:0x80043B44; // type:function size:0x34C scope:local align:4 flagCheck__11dEvDtFlag_cFi = .text:0x80043E90; // type:function size:0x68 scope:global align:4 flagSet__11dEvDtFlag_cFi = .text:0x80043EF8; // type:function size:0x68 scope:global align:4 flagMaxCheck__11dEvDtFlag_cFi = .text:0x80043F60; // type:function size:0x28 scope:global align:4 @@ -2134,7 +2134,7 @@ setStartDemo__18dEvent_exception_cFi = .text:0x80046520; // type:function size:0 getEventName__18dEvent_exception_cFv = .text:0x800465B0; // type:function size:0x168 scope:global align:4 getSubstance__16dEvent_manager_cFP11dEvDtData_ci = .text:0x80046718; // type:function size:0xA0 scope:global align:4 __ct__16dEvent_manager_cFv = .text:0x800467B8; // type:function size:0x58 scope:global align:4 -__ct__11dEvDtBase_cFv = .text:0x80046810; // type:function size:0x30 scope:global align:4 +__ct__11dEvDtBase_cFv = .text:0x80046810; // type:function size:0x30 scope:weak align:4 create__16dEvent_manager_cFv = .text:0x80046840; // type:function size:0xF0 scope:global align:4 setObjectArchive__16dEvent_manager_cFPc = .text:0x80046930; // type:function size:0x88 scope:global align:4 demoInit__16dEvent_manager_cFv = .text:0x800469B8; // type:function size:0x7C scope:global align:4 @@ -2142,9 +2142,9 @@ roomInit__16dEvent_manager_cFi = .text:0x80046A34; // type:function size:0xE8 sc roomFinish__16dEvent_manager_cFi = .text:0x80046B1C; // type:function size:0x6C scope:global align:4 orderStartDemo__16dEvent_manager_cFv = .text:0x80046B88; // type:function size:0x1B4 scope:global align:4 remove__16dEvent_manager_cFv = .text:0x80046D3C; // type:function size:0x68 scope:global align:4 -extraOnObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046DA4; // type:function size:0x14 scope:global align:4 -extraOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046DB8; // type:function size:0x14 scope:global align:4 -allOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046DCC; // type:function size:0x1C scope:global align:4 +extraOnObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046DA4; // type:function size:0x14 scope:local align:4 +extraOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046DB8; // type:function size:0x14 scope:local align:4 +allOffObjectCallBack__FP10fopAc_ac_cPv = .text:0x80046DCC; // type:function size:0x1C scope:local align:4 startProc__16dEvent_manager_cFP12dEvDtEvent_c = .text:0x80046DE8; // type:function size:0xE8 scope:global align:4 closeProc__16dEvent_manager_cFP12dEvDtEvent_c = .text:0x80046ED0; // type:function size:0xC scope:global align:4 endProc__16dEvent_manager_cFsi = .text:0x80046EDC; // type:function size:0xB8 scope:global align:4 @@ -2163,7 +2163,7 @@ endCheck__16dEvent_manager_cFs = .text:0x80047BA8; // type:function size:0x64 sc endCheckOld__16dEvent_manager_cFPCc = .text:0x80047C0C; // type:function size:0x40 scope:global align:4 getMyStaffId__16dEvent_manager_cFPCcP10fopAc_ac_ci = .text:0x80047C4C; // type:function size:0x230 scope:global align:4 getIsAddvance__16dEvent_manager_cFi = .text:0x80047E7C; // type:function size:0x60 scope:global align:4 -dEvmng_strcmp__FPCcPc = .text:0x80047EDC; // type:function size:0x64 scope:global align:4 +dEvmng_strcmp__FPCcPc = .text:0x80047EDC; // type:function size:0x64 scope:local align:4 getMyActIdx__16dEvent_manager_cFiPCPCciii = .text:0x80047F40; // type:function size:0x14C scope:global align:4 getMyNowCutName__16dEvent_manager_cFi = .text:0x8004808C; // type:function size:0x6C scope:global align:4 getMyDataP__16dEvent_manager_cFiPCci = .text:0x800480F8; // type:function size:0x124 scope:global align:4 @@ -2176,10 +2176,10 @@ cancelStaff__16dEvent_manager_cFPCc = .text:0x80048478; // type:function size:0x setGoal__16dEvent_manager_cFP4cXyz = .text:0x800484F4; // type:function size:0x1C scope:global align:4 getGoal__16dEvent_manager_cFv = .text:0x80048510; // type:function size:0x8 scope:global align:4 getRunEventName__16dEvent_manager_cFv = .text:0x80048518; // type:function size:0x84 scope:global align:4 -findShutterCallBack__FP10fopAc_ac_cPv = .text:0x8004859C; // type:function size:0xB4 scope:global align:4 +findShutterCallBack__FP10fopAc_ac_cPv = .text:0x8004859C; // type:function size:0xB4 scope:local align:4 specialCast_Shutter__16dEvent_manager_cFsi = .text:0x80048650; // type:function size:0xF8 scope:global align:4 specialCast__16dEvent_manager_cFPCci = .text:0x80048748; // type:function size:0x130 scope:global align:4 -dEv_talkman_get_action__Fi = .text:0x80048878; // type:function size:0xA8 scope:global align:4 +dEv_talkman_get_action__Fi = .text:0x80048878; // type:function size:0xA8 scope:local align:4 ChkPresentEnd__16dEvent_manager_cFv = .text:0x80048920; // type:function size:0x3C scope:global align:4 checkStartDemo__16dEvent_manager_cFv = .text:0x8004895C; // type:function size:0x40 scope:global align:4 eventUpdate__17dEvLib_callback_cFv = .text:0x8004899C; // type:function size:0x38 scope:global align:4 @@ -2193,7 +2193,7 @@ executeStart__17dEvLib_callback_cFv = .text:0x80048BA0; // type:function size:0x initRun__17dEvLib_callback_cFv = .text:0x80048C4C; // type:function size:0x2C scope:global align:4 executeRun__17dEvLib_callback_cFv = .text:0x80048C78; // type:function size:0x90 scope:global align:4 __sinit_d_event_lib_cpp = .text:0x80048D08; // type:function size:0x7C scope:local align:4 -dSmplMdl_modelUpdateDL__FP8J3DModel = .text:0x80048D84; // type:function size:0x60 scope:global align:4 +dSmplMdl_modelUpdateDL__FP8J3DModel = .text:0x80048D84; // type:function size:0x60 scope:local align:4 __ct__15dSmplMdl_draw_cFv = .text:0x80048DE4; // type:function size:0xAC scope:global align:4 __ct__12diff_model_cFv = .text:0x80048E90; // type:function size:0x20 scope:global align:4 __dt__15dSmplMdl_draw_cFv = .text:0x80048EB0; // type:function size:0x8C scope:global align:4 @@ -2356,16 +2356,16 @@ setEffectTwo__8dPaPoT_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC5csXyz clearTwoAllID__8dPaPoT_cFv = .text:0x800513C4; // type:function size:0x54 scope:global align:4 setEffectFour__8dPaPoF_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff = .text:0x80051418; // type:function size:0x13C scope:global align:4 clearFourAllID__8dPaPoF_cFv = .text:0x80051554; // type:function size:0x4C scope:global align:4 -getRightEffType__8dPaPoT_cCFi = .text:0x800515A0; // type:function size:0xC scope:global align:4 -getLeftEffType__8dPaPoT_cCFi = .text:0x800515AC; // type:function size:0xC scope:global align:4 -getCenterEffType__7dPaPo_cCFi = .text:0x800515B8; // type:function size:0xC scope:global align:4 -getRightEmitter__8dPaPoT_cFii = .text:0x800515C4; // type:function size:0x48 scope:global align:4 -getLeftEmitter__8dPaPoT_cFii = .text:0x8005160C; // type:function size:0x48 scope:global align:4 -getCenterEmitter__7dPaPo_cFii = .text:0x80051654; // type:function size:0x48 scope:global align:4 -getBackRightEffType__8dPaPoF_cCFi = .text:0x8005169C; // type:function size:0xC scope:global align:4 -getBackLeftEffType__8dPaPoF_cCFi = .text:0x800516A8; // type:function size:0xC scope:global align:4 -getBackRightEmitter__8dPaPoF_cFii = .text:0x800516B4; // type:function size:0x48 scope:global align:4 -getBackLeftEmitter__8dPaPoF_cFii = .text:0x800516FC; // type:function size:0x48 scope:global align:4 +getRightEffType__8dPaPoT_cCFi = .text:0x800515A0; // type:function size:0xC scope:weak align:4 +getLeftEffType__8dPaPoT_cCFi = .text:0x800515AC; // type:function size:0xC scope:weak align:4 +getCenterEffType__7dPaPo_cCFi = .text:0x800515B8; // type:function size:0xC scope:weak align:4 +getRightEmitter__8dPaPoT_cFii = .text:0x800515C4; // type:function size:0x48 scope:weak align:4 +getLeftEmitter__8dPaPoT_cFii = .text:0x8005160C; // type:function size:0x48 scope:weak align:4 +getCenterEmitter__7dPaPo_cFii = .text:0x80051654; // type:function size:0x48 scope:weak align:4 +getBackRightEffType__8dPaPoF_cCFi = .text:0x8005169C; // type:function size:0xC scope:weak align:4 +getBackLeftEffType__8dPaPoF_cCFi = .text:0x800516A8; // type:function size:0xC scope:weak align:4 +getBackRightEmitter__8dPaPoF_cFii = .text:0x800516B4; // type:function size:0x48 scope:weak align:4 +getBackLeftEmitter__8dPaPoF_cFii = .text:0x800516FC; // type:function size:0x48 scope:weak align:4 __sinit_d_particle_copoly_cpp = .text:0x80051744; // type:function size:0x19C scope:local align:4 dPath_GetPnt__FPC5dPathi = .text:0x800518E0; // type:function size:0x3C scope:global align:4 dPath_GetRoomPath__Fii = .text:0x8005191C; // type:function size:0xAC scope:global align:4 @@ -2383,17 +2383,17 @@ init__12dDlst_2DT2_cFP7ResTIMGffffUcUcUcff = .text:0x80052C7C; // type:function draw__11dDlst_2DM_cFv = .text:0x80052D88; // type:function size:0x4D4 scope:global align:4 draw__11dDlst_2Dm_cFv = .text:0x8005325C; // type:function size:0x520 scope:global align:4 draw__12dDlst_2DMt_cFv = .text:0x8005377C; // type:function size:0x390 scope:global align:4 -getTexture__10J2DPictureCFUc = .text:0x80053B0C; // type:function size:0x24 scope:global align:4 +getTexture__10J2DPictureCFUc = .text:0x80053B0C; // type:function size:0x24 scope:weak align:4 __ct__10dDlst_2D_cFP7ResTIMGssssUc = .text:0x80053B30; // type:function size:0x9C scope:global align:4 draw__10dDlst_2D_cFv = .text:0x80053BCC; // type:function size:0xC8 scope:global align:4 draw__11dDlst_blo_cFv = .text:0x80053C94; // type:function size:0x3C scope:global align:4 -clearAnmTransform__9J2DScreenFv = .text:0x80053CD0; // type:function size:0x20 scope:global align:4 -calcMtx__7J2DPaneFv = .text:0x80053CF0; // type:function size:0x40 scope:global align:4 -makeMatrix__7J2DPaneFff = .text:0x80053D30; // type:function size:0x3C scope:global align:4 -getTypeID__7J2DPaneCFv = .text:0x80053D6C; // type:function size:0x8 scope:global align:4 -setWhite__10J2DPictureFQ28JUtility6TColor = .text:0x80053D74; // type:function size:0x28 scope:global align:4 -setBlack__10J2DPictureFQ28JUtility6TColor = .text:0x80053D9C; // type:function size:0x28 scope:global align:4 -__dt__10J2DAnmBaseFv = .text:0x80053DC4; // type:function size:0x48 scope:global align:4 +clearAnmTransform__9J2DScreenFv = .text:0x80053CD0; // type:function size:0x20 scope:weak align:4 +calcMtx__7J2DPaneFv = .text:0x80053CF0; // type:function size:0x40 scope:weak align:4 +makeMatrix__7J2DPaneFff = .text:0x80053D30; // type:function size:0x3C scope:weak align:4 +getTypeID__7J2DPaneCFv = .text:0x80053D6C; // type:function size:0x8 scope:weak align:4 +setWhite__10J2DPictureFQ28JUtility6TColor = .text:0x80053D74; // type:function size:0x28 scope:weak align:4 +setBlack__10J2DPictureFQ28JUtility6TColor = .text:0x80053D9C; // type:function size:0x28 scope:weak align:4 +__dt__10J2DAnmBaseFv = .text:0x80053DC4; // type:function size:0x48 scope:weak align:4 init__8cM_rnd_cFiii = .text:0x80053E0C; // type:function size:0x10 scope:global align:4 get__8cM_rnd_cFv = .text:0x80053E1C; // type:function size:0xF4 scope:global align:4 getF__8cM_rnd_cFf = .text:0x80053F10; // type:function size:0x38 scope:global align:4 @@ -2403,14 +2403,14 @@ draw__18dDlst_effectLine_cFv = .text:0x80053FCC; // type:function size:0x358 sco update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff = .text:0x80054324; // type:function size:0x94 scope:global align:4 set__18dDlst_shadowPoly_cFP10cBgD_Vtx_tUsUsUsP8cM3dGPla = .text:0x800543B8; // type:function size:0x12C scope:global align:4 draw__18dDlst_shadowPoly_cFv = .text:0x800544E4; // type:function size:0xC4 scope:global align:4 -J3DDrawBuffer__create__FUl = .text:0x800545A8; // type:function size:0x78 scope:global align:4 +J3DDrawBuffer__create__FUl = .text:0x800545A8; // type:function size:0x78 scope:local align:4 reset__18dDlst_shadowReal_cFv = .text:0x80054620; // type:function size:0x10 scope:global align:4 imageDraw__18dDlst_shadowReal_cFPA4_f = .text:0x80054630; // type:function size:0xD4 scope:global align:4 draw__18dDlst_shadowReal_cFv = .text:0x80054704; // type:function size:0xB4 scope:global align:4 -psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla = .text:0x800547B8; // type:function size:0x1CC scope:global align:4 -realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c = .text:0x80054984; // type:function size:0x218 scope:global align:4 -__dt__14ShdwDrawPoly_cFv = .text:0x80054B9C; // type:function size:0x60 scope:global align:4 -setkankyoShadow__FP12dKy_tevstr_cPf = .text:0x80054BFC; // type:function size:0x104 scope:global align:4 +psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla = .text:0x800547B8; // type:function size:0x1CC scope:local align:4 +realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c = .text:0x80054984; // type:function size:0x218 scope:local align:4 +__dt__14ShdwDrawPoly_cFv = .text:0x80054B9C; // type:function size:0x60 scope:weak align:4 +setkankyoShadow__FP12dKy_tevstr_cPf = .text:0x80054BFC; // type:function size:0x104 scope:local align:4 setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c = .text:0x80054D00; // type:function size:0x458 scope:global align:4 set__18dDlst_shadowReal_cFUlP8J3DModelP4cXyzffP12dKy_tevstr_cff = .text:0x80055158; // type:function size:0x1AC scope:global align:4 add__18dDlst_shadowReal_cFP8J3DModel = .text:0x80055304; // type:function size:0x38 scope:global align:4 @@ -2427,11 +2427,11 @@ setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG = .text:0x80056118; // type:fun newData__13dDlst_peekZ_cFssPUl = .text:0x80056148; // type:function size:0x68 scope:global align:4 peekData__13dDlst_peekZ_cFv = .text:0x800561B0; // type:function size:0x70 scope:global align:4 __ct__12dDlst_list_cFv = .text:0x80056220; // type:function size:0xD8 scope:global align:4 -__ct__26mDoExt_3DlineMatSortPacketFv = .text:0x800562F8; // type:function size:0x30 scope:global align:4 -__dt__18dDlst_shadowReal_cFv = .text:0x80056328; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_shadowTri_cFv = .text:0x800563A0; // type:function size:0x60 scope:global align:4 -__ct__18dDlst_shadowReal_cFv = .text:0x80056400; // type:function size:0x74 scope:global align:4 -__ct__17dDlst_shadowTri_cFv = .text:0x80056474; // type:function size:0x48 scope:global align:4 +__ct__26mDoExt_3DlineMatSortPacketFv = .text:0x800562F8; // type:function size:0x30 scope:weak align:4 +__dt__18dDlst_shadowReal_cFv = .text:0x80056328; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_shadowTri_cFv = .text:0x800563A0; // type:function size:0x60 scope:weak align:4 +__ct__18dDlst_shadowReal_cFv = .text:0x80056400; // type:function size:0x74 scope:weak align:4 +__ct__17dDlst_shadowTri_cFv = .text:0x80056474; // type:function size:0x48 scope:weak align:4 __ct__20dDlst_shadowSimple_cFv = .text:0x800564BC; // type:function size:0x4 scope:global align:4 init__12dDlst_list_cFv = .text:0x800564C0; // type:function size:0xFC scope:global align:4 __dt__12dDlst_list_cFv = .text:0x800565BC; // type:function size:0xAC scope:global align:4 @@ -2446,9 +2446,9 @@ draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c = .text:0x800568F4; // typ wipeIn__12dDlst_list_cFfR8_GXColor = .text:0x8005694C; // type:function size:0xBC scope:global align:4 wipeIn__12dDlst_list_cFf = .text:0x80056A08; // type:function size:0x28 scope:global align:4 calcWipe__12dDlst_list_cFv = .text:0x80056A30; // type:function size:0xA0 scope:global align:4 -getTri__22dDlst_shadowRealPoly_cFv = .text:0x80056AD0; // type:function size:0x8 scope:global align:4 -getTriMax__22dDlst_shadowRealPoly_cFv = .text:0x80056AD8; // type:function size:0x8 scope:global align:4 -searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen = .text:0x80056AE0; // type:function size:0x4 scope:global align:4 +getTri__22dDlst_shadowRealPoly_cFv = .text:0x80056AD0; // type:function size:0x8 scope:weak align:4 +getTriMax__22dDlst_shadowRealPoly_cFv = .text:0x80056AD8; // type:function size:0x8 scope:weak align:4 +searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen = .text:0x80056AE0; // type:function size:0x4 scope:weak align:4 __sinit_d_drawlist_cpp = .text:0x80056AE4; // type:function size:0x28 scope:local align:4 dKyd_dmpalet_getp__Fv = .text:0x80056B0C; // type:function size:0xC scope:global align:4 dKyd_dmpselect_getp__Fv = .text:0x80056B18; // type:function size:0xC scope:global align:4 @@ -2462,10 +2462,10 @@ dKyd_darkworld_tbl_getp__Fv = .text:0x80056BA0; // type:function size:0xC scope: dKyd_light_size_tbl_getp__Fv = .text:0x80056BAC; // type:function size:0xC scope:global align:4 dKyd_light_tw_size_tbl_getp__Fv = .text:0x80056BB8; // type:function size:0xC scope:global align:4 dKyd_BloomInf_tbl_getp__Fi = .text:0x80056BC4; // type:function size:0x14 scope:global align:4 -dKyw_setDrawPacketList__FP9J3DPacketi = .text:0x80056BD8; // type:function size:0x50 scope:global align:4 -dKyw_setDrawPacketListIndScreen__FP9J3DPacketi = .text:0x80056C28; // type:function size:0x50 scope:global align:4 -dKyw_setDrawPacketListSky__FP9J3DPacketi = .text:0x80056C78; // type:function size:0x90 scope:global align:4 -dKyw_setDrawPacketListXluBg__FP9J3DPacketi = .text:0x80056D08; // type:function size:0x88 scope:global align:4 +dKyw_setDrawPacketList__FP9J3DPacketi = .text:0x80056BD8; // type:function size:0x50 scope:local align:4 +dKyw_setDrawPacketListIndScreen__FP9J3DPacketi = .text:0x80056C28; // type:function size:0x50 scope:local align:4 +dKyw_setDrawPacketListSky__FP9J3DPacketi = .text:0x80056C78; // type:function size:0x90 scope:local align:4 +dKyw_setDrawPacketListXluBg__FP9J3DPacketi = .text:0x80056D08; // type:function size:0x88 scope:local align:4 draw__18dKankyo_sun_PacketFv = .text:0x80056D90; // type:function size:0x38 scope:global align:4 draw__22dKankyo_sunlenz_PacketFv = .text:0x80056DC8; // type:function size:0x38 scope:global align:4 __dt__8RAIN_EFFFv = .text:0x80056E00; // type:function size:0x3C scope:global align:4 @@ -2495,30 +2495,30 @@ draw__18dKankyo_mud_PacketFv = .text:0x8005716C; // type:function size:0x30 scop __dt__11EF_EVIL_EFFFv = .text:0x8005719C; // type:function size:0x3C scope:global align:4 __ct__11EF_EVIL_EFFFv = .text:0x800571D8; // type:function size:0x4 scope:global align:4 draw__19dKankyo_evil_PacketFv = .text:0x800571DC; // type:function size:0x30 scope:global align:4 -dKyw_drawSun__Fi = .text:0x8005720C; // type:function size:0x30 scope:global align:4 -dKyw_Sun_Draw__Fv = .text:0x8005723C; // type:function size:0x24 scope:global align:4 -dKyw_drawSunlenz__Fi = .text:0x80057260; // type:function size:0x44 scope:global align:4 -dKyw_Sunlenz_Draw__Fv = .text:0x800572A4; // type:function size:0x24 scope:global align:4 -dKyw_drawRain__Fi = .text:0x800572C8; // type:function size:0x30 scope:global align:4 -dKyw_Rain_Draw__Fv = .text:0x800572F8; // type:function size:0x24 scope:global align:4 -dKyw_drawSnow__Fi = .text:0x8005731C; // type:function size:0x30 scope:global align:4 -dKyw_Snow_Draw__Fv = .text:0x8005734C; // type:function size:0x24 scope:global align:4 -dKyw_drawStar__Fi = .text:0x80057370; // type:function size:0x30 scope:global align:4 -dKyw_Star_Draw__Fv = .text:0x800573A0; // type:function size:0x24 scope:global align:4 -dKyw_drawHousi__Fi = .text:0x800573C4; // type:function size:0x30 scope:global align:4 -dKyw_Housi_Draw__Fv = .text:0x800573F4; // type:function size:0x24 scope:global align:4 -dKyw_drawCloud__Fi = .text:0x80057418; // type:function size:0x30 scope:global align:4 -dKyw_Cloud_Draw__Fv = .text:0x80057448; // type:function size:0x24 scope:global align:4 -dKyw_drawVrkumo__Fi = .text:0x8005746C; // type:function size:0x30 scope:global align:4 -dKyw_Vrkumo_Draw__Fv = .text:0x8005749C; // type:function size:0x24 scope:global align:4 -dKyw_shstar_packet__Fi = .text:0x800574C0; // type:function size:0x30 scope:global align:4 -dKyw_shstar_Draw__Fv = .text:0x800574F0; // type:function size:0x24 scope:global align:4 -dKyw_odour_packet__Fi = .text:0x80057514; // type:function size:0x30 scope:global align:4 -dKyw_Odour_Draw__Fv = .text:0x80057544; // type:function size:0x24 scope:global align:4 -dKyw_mud_packet__Fi = .text:0x80057568; // type:function size:0x30 scope:global align:4 -dKyw_mud_Draw__Fv = .text:0x80057598; // type:function size:0x24 scope:global align:4 -dKyw_evil_packet__Fi = .text:0x800575BC; // type:function size:0x30 scope:global align:4 -dKyw_evil_Draw__Fv = .text:0x800575EC; // type:function size:0x24 scope:global align:4 +dKyw_drawSun__Fi = .text:0x8005720C; // type:function size:0x30 scope:local align:4 +dKyw_Sun_Draw__Fv = .text:0x8005723C; // type:function size:0x24 scope:local align:4 +dKyw_drawSunlenz__Fi = .text:0x80057260; // type:function size:0x44 scope:local align:4 +dKyw_Sunlenz_Draw__Fv = .text:0x800572A4; // type:function size:0x24 scope:local align:4 +dKyw_drawRain__Fi = .text:0x800572C8; // type:function size:0x30 scope:local align:4 +dKyw_Rain_Draw__Fv = .text:0x800572F8; // type:function size:0x24 scope:local align:4 +dKyw_drawSnow__Fi = .text:0x8005731C; // type:function size:0x30 scope:local align:4 +dKyw_Snow_Draw__Fv = .text:0x8005734C; // type:function size:0x24 scope:local align:4 +dKyw_drawStar__Fi = .text:0x80057370; // type:function size:0x30 scope:local align:4 +dKyw_Star_Draw__Fv = .text:0x800573A0; // type:function size:0x24 scope:local align:4 +dKyw_drawHousi__Fi = .text:0x800573C4; // type:function size:0x30 scope:local align:4 +dKyw_Housi_Draw__Fv = .text:0x800573F4; // type:function size:0x24 scope:local align:4 +dKyw_drawCloud__Fi = .text:0x80057418; // type:function size:0x30 scope:local align:4 +dKyw_Cloud_Draw__Fv = .text:0x80057448; // type:function size:0x24 scope:local align:4 +dKyw_drawVrkumo__Fi = .text:0x8005746C; // type:function size:0x30 scope:local align:4 +dKyw_Vrkumo_Draw__Fv = .text:0x8005749C; // type:function size:0x24 scope:local align:4 +dKyw_shstar_packet__Fi = .text:0x800574C0; // type:function size:0x30 scope:local align:4 +dKyw_shstar_Draw__Fv = .text:0x800574F0; // type:function size:0x24 scope:local align:4 +dKyw_odour_packet__Fi = .text:0x80057514; // type:function size:0x30 scope:local align:4 +dKyw_Odour_Draw__Fv = .text:0x80057544; // type:function size:0x24 scope:local align:4 +dKyw_mud_packet__Fi = .text:0x80057568; // type:function size:0x30 scope:local align:4 +dKyw_mud_Draw__Fv = .text:0x80057598; // type:function size:0x24 scope:local align:4 +dKyw_evil_packet__Fi = .text:0x800575BC; // type:function size:0x30 scope:local align:4 +dKyw_evil_Draw__Fv = .text:0x800575EC; // type:function size:0x24 scope:local align:4 dKyw_wether_init__Fv = .text:0x80057610; // type:function size:0x50C scope:global align:4 dKyw_wether_init2__Fv = .text:0x80057B1C; // type:function size:0x18 scope:global align:4 dKyw_wether_delete__Fv = .text:0x80057B34; // type:function size:0x280 scope:global align:4 @@ -2534,37 +2534,37 @@ __dt__22dKankyo_sunlenz_PacketFv = .text:0x800581D4; // type:function size:0x84 __dt__18dKankyo_sun_PacketFv = .text:0x80058258; // type:function size:0x84 scope:global align:4 dKyw_wether_delete2__Fv = .text:0x800582DC; // type:function size:0x60 scope:global align:4 __dt__21dKankyo_vrkumo_PacketFv = .text:0x8005833C; // type:function size:0x84 scope:global align:4 -wether_move_thunder__Fv = .text:0x800583C0; // type:function size:0x68 scope:global align:4 +wether_move_thunder__Fv = .text:0x800583C0; // type:function size:0x68 scope:local align:4 dKyw_wether_move__Fv = .text:0x80058428; // type:function size:0x20 scope:global align:4 -wether_move_sun__Fv = .text:0x80058448; // type:function size:0x57C scope:global align:4 -wether_move_rain__Fv = .text:0x800589C4; // type:function size:0x26C scope:global align:4 -wether_move_snow__Fv = .text:0x80058C30; // type:function size:0x8C scope:global align:4 -wether_move_star__Fv = .text:0x80058CBC; // type:function size:0x38C scope:global align:4 -wether_move_housi__Fv = .text:0x80059048; // type:function size:0x4C4 scope:global align:4 -wether_move_odour__Fv = .text:0x8005950C; // type:function size:0x1A4 scope:global align:4 -wether_move_moya__Fv = .text:0x800596B0; // type:function size:0x1A8 scope:global align:4 -wether_move_vrkumo__Fv = .text:0x80059858; // type:function size:0x710 scope:global align:4 -wether_move_mud__Fv = .text:0x80059F68; // type:function size:0x13C scope:global align:4 -wether_move_evil__Fv = .text:0x8005A0A4; // type:function size:0x144 scope:global align:4 +wether_move_sun__Fv = .text:0x80058448; // type:function size:0x57C scope:local align:4 +wether_move_rain__Fv = .text:0x800589C4; // type:function size:0x26C scope:local align:4 +wether_move_snow__Fv = .text:0x80058C30; // type:function size:0x8C scope:local align:4 +wether_move_star__Fv = .text:0x80058CBC; // type:function size:0x38C scope:local align:4 +wether_move_housi__Fv = .text:0x80059048; // type:function size:0x4C4 scope:local align:4 +wether_move_odour__Fv = .text:0x8005950C; // type:function size:0x1A4 scope:local align:4 +wether_move_moya__Fv = .text:0x800596B0; // type:function size:0x1A8 scope:local align:4 +wether_move_vrkumo__Fv = .text:0x80059858; // type:function size:0x710 scope:local align:4 +wether_move_mud__Fv = .text:0x80059F68; // type:function size:0x13C scope:local align:4 +wether_move_evil__Fv = .text:0x8005A0A4; // type:function size:0x144 scope:local align:4 dKyw_wether_move_draw__Fv = .text:0x8005A1E8; // type:function size:0x9C scope:global align:4 dKyw_wether_move_draw2__Fv = .text:0x8005A284; // type:function size:0x20 scope:global align:4 dKyw_wether_draw__Fv = .text:0x8005A2A4; // type:function size:0x190 scope:global align:4 dKyw_wether_draw2__Fv = .text:0x8005A434; // type:function size:0x3C scope:global align:4 dKyw_wether_proc__Fv = .text:0x8005A470; // type:function size:0x23C scope:global align:4 -dKyw_wind_init__Fv = .text:0x8005A6AC; // type:function size:0x44 scope:global align:4 +dKyw_wind_init__Fv = .text:0x8005A6AC; // type:function size:0x44 scope:local align:4 dKyw_wind_set__Fv = .text:0x8005A6F0; // type:function size:0x520 scope:global align:4 dKyw_get_wind_vec__Fv = .text:0x8005AC10; // type:function size:0x10 scope:global align:4 dKyw_get_wind_pow__Fv = .text:0x8005AC20; // type:function size:0x10 scope:global align:4 dKyw_get_wind_vecpow__Fv = .text:0x8005AC30; // type:function size:0x64 scope:global align:4 dKyw_plight_collision_set__FP4cXyzssfffff = .text:0x8005AC94; // type:function size:0xCC scope:global align:4 -squal_proc__Fv = .text:0x8005AD60; // type:function size:0x114 scope:global align:4 -dKyw_pntwind_init__Fv = .text:0x8005AE74; // type:function size:0x54 scope:global align:4 -pntwind_set__FP14WIND_INFLUENCE = .text:0x8005AEC8; // type:function size:0x64 scope:global align:4 +squal_proc__Fv = .text:0x8005AD60; // type:function size:0x114 scope:local align:4 +dKyw_pntwind_init__Fv = .text:0x8005AE74; // type:function size:0x54 scope:local align:4 +pntwind_set__FP14WIND_INFLUENCE = .text:0x8005AEC8; // type:function size:0x64 scope:local align:4 dKyw_pntwind_set__FP14WIND_INFLUENCE = .text:0x8005AF2C; // type:function size:0x2C scope:global align:4 -dKyw_pntlight_set__FP14WIND_INFLUENCE = .text:0x8005AF58; // type:function size:0x30 scope:global align:4 +dKyw_pntlight_set__FP14WIND_INFLUENCE = .text:0x8005AF58; // type:function size:0x30 scope:local align:4 dKyw_pntwind_cut__FP14WIND_INFLUENCE = .text:0x8005AF88; // type:function size:0x38 scope:global align:4 -pntwind_get_info__FP4cXyzP4cXyzPfUc = .text:0x8005AFC0; // type:function size:0x3AC scope:global align:4 -dKyw_pntwind_get_info__FP4cXyzP4cXyzPf = .text:0x8005B36C; // type:function size:0x24 scope:global align:4 +pntwind_get_info__FP4cXyzP4cXyzPfUc = .text:0x8005AFC0; // type:function size:0x3AC scope:local align:4 +dKyw_pntwind_get_info__FP4cXyzP4cXyzPf = .text:0x8005B36C; // type:function size:0x24 scope:local align:4 dKyw_pntlight_collision_get_info__FP4cXyzP4cXyzPf = .text:0x8005B390; // type:function size:0x24 scope:global align:4 dKyw_pntwind_get_vecpow__FP4cXyz = .text:0x8005B3B4; // type:function size:0x74 scope:global align:4 dKyw_get_AllWind_vec__FP4cXyzP4cXyzPf = .text:0x8005B428; // type:function size:0x238 scope:global align:4 @@ -2573,22 +2573,22 @@ dKyw_custom_windpower__Ff = .text:0x8005B73C; // type:function size:0x10 scope:g dKyw_evt_wind_set__Fss = .text:0x8005B74C; // type:function size:0x1C scope:global align:4 dKyw_evt_wind_set_go__Fv = .text:0x8005B768; // type:function size:0x14 scope:global align:4 dKyw_rain_set__Fi = .text:0x8005B77C; // type:function size:0x14 scope:global align:4 -vectle_calc__FP10DOUBLE_POSP4cXyz = .text:0x8005B790; // type:function size:0xA8 scope:global align:4 -get_vectle_calc__FP4cXyzP4cXyzP4cXyz = .text:0x8005B838; // type:function size:0x58 scope:global align:4 +vectle_calc__FP10DOUBLE_POSP4cXyz = .text:0x8005B790; // type:function size:0xA8 scope:local align:4 +get_vectle_calc__FP4cXyzP4cXyzP4cXyz = .text:0x8005B838; // type:function size:0x58 scope:local align:4 dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz = .text:0x8005B890; // type:function size:0x20 scope:global align:4 -dKy_set_eyevect_calc__FP12camera_classP3Vecff = .text:0x8005B8B0; // type:function size:0xB0 scope:global align:4 +dKy_set_eyevect_calc__FP12camera_classP3Vecff = .text:0x8005B8B0; // type:function size:0xB0 scope:local align:4 dKy_set_eyevect_calc2__FP12camera_classP3Vecff = .text:0x8005B960; // type:function size:0xFC scope:global align:4 -dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID = .text:0x8005BA5C; // type:function size:0xF8 scope:global align:4 -dKyr_set_btitex__FP9_GXTexObjP7ResTIMG = .text:0x8005BB54; // type:function size:0x24 scope:global align:4 +dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID = .text:0x8005BA5C; // type:function size:0xF8 scope:local align:4 +dKyr_set_btitex__FP9_GXTexObjP7ResTIMG = .text:0x8005BB54; // type:function size:0x24 scope:local align:4 dKyr_lenzflare_move__Fv = .text:0x8005BB78; // type:function size:0x490 scope:global align:4 -dKyr_moon_arrival_check__Fv = .text:0x8005C008; // type:function size:0x30 scope:global align:4 +dKyr_moon_arrival_check__Fv = .text:0x8005C008; // type:function size:0x30 scope:local align:4 dKyr_sun_move__Fv = .text:0x8005C038; // type:function size:0xD54 scope:global align:4 dKyr_rain_init__Fv = .text:0x8005CD8C; // type:function size:0x14C scope:global align:4 -rain_bg_chk__FP19dKankyo_rain_Packeti = .text:0x8005CED8; // type:function size:0x28 scope:global align:4 -overhead_bg_chk__Fv = .text:0x8005CF00; // type:function size:0x1A8 scope:global align:4 -forward_overhead_bg_chk__FP4cXyzf = .text:0x8005D0A8; // type:function size:0x214 scope:global align:4 +rain_bg_chk__FP19dKankyo_rain_Packeti = .text:0x8005CED8; // type:function size:0x28 scope:local align:4 +overhead_bg_chk__Fv = .text:0x8005CF00; // type:function size:0x1A8 scope:local align:4 +forward_overhead_bg_chk__FP4cXyzf = .text:0x8005D0A8; // type:function size:0x214 scope:local align:4 dKyr_rain_move__Fv = .text:0x8005D2BC; // type:function size:0x1724 scope:global align:4 -d_krain_cut_turn_check__Fv = .text:0x8005E9E0; // type:function size:0x48 scope:global align:4 +d_krain_cut_turn_check__Fv = .text:0x8005E9E0; // type:function size:0x48 scope:local align:4 dKyr_housi_move__Fv = .text:0x8005EA28; // type:function size:0x12E4 scope:global align:4 dKyr_snow_init__Fv = .text:0x8005FD0C; // type:function size:0x16C scope:global align:4 dKyr_snow_move__Fv = .text:0x8005FE78; // type:function size:0x15DC scope:global align:4 @@ -2596,8 +2596,8 @@ dKyr_star_init__Fv = .text:0x80061454; // type:function size:0xE8 scope:global a dKyr_star_move__Fv = .text:0x8006153C; // type:function size:0x2C scope:global align:4 cloud_shadow_move__Fv = .text:0x80061568; // type:function size:0xC74 scope:global align:4 vrkumo_move__Fv = .text:0x800621DC; // type:function size:0xA30 scope:global align:4 -dKr_cullVtx_Set__Fv = .text:0x80062C0C; // type:function size:0x70 scope:global align:4 -dKyr_draw_rev_moon__FPA4_fPPUc = .text:0x80062C7C; // type:function size:0xB24 scope:global align:4 +dKr_cullVtx_Set__Fv = .text:0x80062C0C; // type:function size:0x70 scope:local align:4 +dKyr_draw_rev_moon__FPA4_fPPUc = .text:0x80062C7C; // type:function size:0xB24 scope:local align:4 dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc = .text:0x800637A0; // type:function size:0xDDC scope:global align:4 dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc = .text:0x8006457C; // type:function size:0x11E0 scope:global align:4 dKyr_drawRain__FPA4_fPPUc = .text:0x8006575C; // type:function size:0xA1C scope:global align:4 @@ -2619,14 +2619,14 @@ dKyr_mud_move__Fv = .text:0x8006C98C; // type:function size:0x7C0 scope:global a dKyr_mud_draw__FPA4_fPPUc = .text:0x8006D14C; // type:function size:0x8F8 scope:global align:4 dKyr_evil_init__Fv = .text:0x8006DA44; // type:function size:0xF0 scope:global align:4 dKyr_evil_move__Fv = .text:0x8006DB34; // type:function size:0x78 scope:global align:4 -dKyr_evil_draw2__FPA4_fPPUc = .text:0x8006DBAC; // type:function size:0x9CC scope:global align:4 -dKyr_near_bosslight_check__F4cXyz = .text:0x8006E578; // type:function size:0x268 scope:global align:4 +dKyr_evil_draw2__FPA4_fPPUc = .text:0x8006DBAC; // type:function size:0x9CC scope:local align:4 +dKyr_near_bosslight_check__F4cXyz = .text:0x8006E578; // type:function size:0x268 scope:local align:4 dKyr_evil_draw__FPA4_fPPUc = .text:0x8006E7E0; // type:function size:0xAB0 scope:global align:4 -getKandelaarFlamePos__9daPy_py_cFv = .text:0x8006F290; // type:function size:0x8 scope:global align:4 -makedata__25@unnamed@d_vibration_cpp@FPUsUll = .text:0x8006F298; // type:function size:0x1C scope:global align:4 -rollshift__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F2B4; // type:function size:0x20 scope:global align:4 -makebits__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F2D4; // type:function size:0x34 scope:global align:4 -randombit__25@unnamed@d_vibration_cpp@Fll = .text:0x8006F308; // type:function size:0x90 scope:global align:4 +getKandelaarFlamePos__9daPy_py_cFv = .text:0x8006F290; // type:function size:0x8 scope:weak align:4 +makedata__25@unnamed@d_vibration_cpp@FPUsUll = .text:0x8006F298; // type:function size:0x1C scope:local align:4 +rollshift__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F2B4; // type:function size:0x20 scope:local align:4 +makebits__25@unnamed@d_vibration_cpp@FUlll = .text:0x8006F2D4; // type:function size:0x34 scope:local align:4 +randombit__25@unnamed@d_vibration_cpp@Fll = .text:0x8006F308; // type:function size:0x90 scope:local align:4 Run__12dVibration_cFv = .text:0x8006F398; // type:function size:0x7BC scope:global align:4 StartShock__12dVibration_cFii4cXyz = .text:0x8006FB54; // type:function size:0xEC scope:global align:4 StartQuake__12dVibration_cFii4cXyz = .text:0x8006FC40; // type:function size:0xFC scope:global align:4 @@ -2638,7 +2638,7 @@ setDefault__12dVibration_cFv = .text:0x8006FFB4; // type:function size:0x80 scop Init__12dVibration_cFv = .text:0x80070034; // type:function size:0x34 scope:global align:4 Pause__12dVibration_cFv = .text:0x80070068; // type:function size:0xC0 scope:global align:4 Remove__12dVibration_cFv = .text:0x80070128; // type:function size:0x20 scope:global align:4 -padLockButton__25@unnamed@d_attention_cpp@Fl = .text:0x80070148; // type:function size:0x20 scope:global align:4 +padLockButton__25@unnamed@d_attention_cpp@Fl = .text:0x80070148; // type:function size:0x20 scope:local align:4 __ct__11dAttParam_cFl = .text:0x80070168; // type:function size:0xD8 scope:global align:4 __dt__11dAttParam_cFv = .text:0x80070240; // type:function size:0x48 scope:global align:4 __ct__15dAttDrawParam_cFv = .text:0x80070288; // type:function size:0x20 scope:global align:4 @@ -2649,26 +2649,26 @@ GetLockonList__12dAttention_cFl = .text:0x80070974; // type:function size:0x3C s getActionBtnB__12dAttention_cFv = .text:0x800709B0; // type:function size:0xF4 scope:global align:4 getActionBtnXY__12dAttention_cFv = .text:0x80070AA4; // type:function size:0xFC scope:global align:4 chkAttMask__12dAttention_cFUlUl = .text:0x80070BA0; // type:function size:0x50 scope:global align:4 -check_event_condition__FUlUs = .text:0x80070BF0; // type:function size:0x6C scope:global align:4 -check_flontofplayer__FUlss = .text:0x80070C5C; // type:function size:0xC8 scope:global align:4 -distace_weight__Ffsf = .text:0x80070D24; // type:function size:0x4C scope:global align:4 -distace_angle_adjust__Ffsf = .text:0x80070D70; // type:function size:0x60 scope:global align:4 -check_distace__FP4cXyzsP4cXyzffff = .text:0x80070DD0; // type:function size:0x1F0 scope:global align:4 +check_event_condition__FUlUs = .text:0x80070BF0; // type:function size:0x6C scope:local align:4 +check_flontofplayer__FUlss = .text:0x80070C5C; // type:function size:0xC8 scope:local align:4 +distace_weight__Ffsf = .text:0x80070D24; // type:function size:0x4C scope:local align:4 +distace_angle_adjust__Ffsf = .text:0x80070D70; // type:function size:0x60 scope:local align:4 +check_distace__FP4cXyzsP4cXyzffff = .text:0x80070DD0; // type:function size:0x1F0 scope:local align:4 calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl = .text:0x80070FC0; // type:function size:0x230 scope:global align:4 setList__12dAttention_cFiP10fopAc_ac_cff7cSAngleUl = .text:0x800711F0; // type:function size:0x180 scope:global align:4 initList__12dAttention_cFUl = .text:0x80071370; // type:function size:0x14C scope:global align:4 -select_attention__FP10fopAc_ac_cPv = .text:0x800714BC; // type:function size:0x40 scope:global align:4 +select_attention__FP10fopAc_ac_cPv = .text:0x800714BC; // type:function size:0x40 scope:local align:4 makeList__12dAttention_cFv = .text:0x800714FC; // type:function size:0x58 scope:global align:4 setOwnerAttentionPos__12dAttention_cFv = .text:0x80071554; // type:function size:0x64 scope:global align:4 SelectAttention__12dAttention_cFP10fopAc_ac_c = .text:0x800715B8; // type:function size:0x1F4 scope:global align:4 -__dt__7cSGlobeFv = .text:0x800717AC; // type:function size:0x3C scope:global align:4 +__dt__7cSGlobeFv = .text:0x800717AC; // type:function size:0x3C scope:weak align:4 sortList__12dAttention_cFv = .text:0x800717E8; // type:function size:0x1EC scope:global align:4 stockAttention__12dAttention_cFv = .text:0x800719D4; // type:function size:0xBC scope:global align:4 nextAttention__12dAttention_cFv = .text:0x80071A90; // type:function size:0x108 scope:global align:4 freeAttention__12dAttention_cFv = .text:0x80071B98; // type:function size:0x30 scope:global align:4 chaseAttention__12dAttention_cFv = .text:0x80071BC8; // type:function size:0x228 scope:global align:4 EnemyDistance__12dAttention_cFP10fopAc_ac_c = .text:0x80071DF0; // type:function size:0xAC scope:global align:4 -sound_attention__FP10fopAc_ac_cPv = .text:0x80071E9C; // type:function size:0x80 scope:global align:4 +sound_attention__FP10fopAc_ac_cPv = .text:0x80071E9C; // type:function size:0x80 scope:local align:4 runSoundProc__12dAttention_cFv = .text:0x80071F1C; // type:function size:0x98 scope:global align:4 runDrawProc__12dAttention_cFv = .text:0x80071FB4; // type:function size:0x270 scope:global align:4 runDebugDisp__12dAttention_cFv = .text:0x80072224; // type:function size:0x4 scope:global align:4 @@ -2683,7 +2683,7 @@ lockSoundStart__12dAttention_cFUl = .text:0x80072EB0; // type:function size:0x58 setAnm__10dAttDraw_cFUcf = .text:0x80072F08; // type:function size:0x210 scope:global align:4 setAlphaAnm__10dAttDraw_cFUcUc = .text:0x80073118; // type:function size:0x1C scope:global align:4 alphaAnm__10dAttDraw_cFv = .text:0x80073134; // type:function size:0x2A8 scope:global align:4 -setTevKColor__11J3DTevBlockFUlPC10J3DGXColor = .text:0x800733DC; // type:function size:0x4 scope:global align:4 +setTevKColor__11J3DTevBlockFUlPC10J3DGXColor = .text:0x800733DC; // type:function size:0x4 scope:weak align:4 draw__10dAttDraw_cFR4cXyzPA4_f = .text:0x800733E0; // type:function size:0x28C scope:global align:4 LockonTarget__12dAttention_cFl = .text:0x8007366C; // type:function size:0xA0 scope:global align:4 LockonReleaseDistanse__12dAttention_cFv = .text:0x8007370C; // type:function size:0xF0 scope:global align:4 @@ -2707,7 +2707,7 @@ convPId__10dAttLook_cFUi = .text:0x80073DD4; // type:function size:0x30 scope:gl init__10dAttLook_cFv = .text:0x80073E04; // type:function size:0x18 scope:global align:4 proc__10dAttLook_cFv = .text:0x80073E1C; // type:function size:0x1C scope:global align:4 request__10dAttLook_cFP10fopAc_ac_cfffsi = .text:0x80073E38; // type:function size:0x2BC scope:global align:4 -__dt__15dAttDrawParam_cFv = .text:0x800740F4; // type:function size:0x48 scope:global align:4 +__dt__15dAttDrawParam_cFv = .text:0x800740F4; // type:function size:0x48 scope:weak align:4 __sinit_d_attention_cpp = .text:0x8007413C; // type:function size:0x3C scope:local align:4 setCode__5dBgPcFR5sBgPc = .text:0x80074178; // type:function size:0x2C scope:global align:4 __ct__6dBgPlcFv = .text:0x800741A4; // type:function size:0xC scope:global align:4 @@ -2770,7 +2770,7 @@ MoveBgCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyzbb = .text:0x800758A4; MoveBgTransPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x800759B0; // type:function size:0xDC scope:global align:4 MoveBgMatrixCrrPos__4dBgSFRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075A8C; // type:function size:0xC8 scope:global align:4 dBgS_MoveBGProc_Typical__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075B54; // type:function size:0x80 scope:global align:4 -dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075BD4; // type:function size:0x34 scope:global align:4 +dBgS_MoveBGProc_RotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075BD4; // type:function size:0x34 scope:local align:4 dBgS_MoveBGProc_TypicalRotY__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075C08; // type:function size:0x6C scope:global align:4 dBgS_MoveBGProc_Trans__FP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz = .text:0x80075C74; // type:function size:0x40 scope:global align:4 RideCallBack__4dBgSFRC13cBgS_PolyInfoP10fopAc_ac_c = .text:0x80075CB4; // type:function size:0x70 scope:global align:4 @@ -2816,15 +2816,15 @@ ChkGndThinCellingOff__9dBgS_AcchFv = .text:0x80077510; // type:function size:0xC OnWallSort__9dBgS_AcchFv = .text:0x8007751C; // type:function size:0x10 scope:global align:4 ChkWallSort__9dBgS_AcchFv = .text:0x8007752C; // type:function size:0xC scope:global align:4 ChkLineDown__9dBgS_AcchFv = .text:0x80077538; // type:function size:0xC scope:global align:4 -__dt__12dBgS_AcchCirFv = .text:0x80077544; // type:function size:0x70 scope:global align:4 -@36@__dt__9dBgS_AcchFv = .text:0x800775B4; // type:function size:0x8 scope:local align:4 -@20@__dt__9dBgS_AcchFv = .text:0x800775BC; // type:function size:0x8 scope:local align:4 -checkPlayerFly__9daPy_py_cCFv = .text:0x800775C4; // type:function size:0x8 scope:global align:4 +__dt__12dBgS_AcchCirFv = .text:0x80077544; // type:function size:0x70 scope:weak align:4 +@36@__dt__9dBgS_AcchFv = .text:0x800775B4; // type:function size:0x8 scope:weak align:4 +@20@__dt__9dBgS_AcchFv = .text:0x800775BC; // type:function size:0x8 scope:weak align:4 +checkPlayerFly__9daPy_py_cCFv = .text:0x800775C4; // type:function size:0x8 scope:weak align:4 __ct__8dBgS_ChkFv = .text:0x800775CC; // type:function size:0x4C scope:global align:4 __dt__8dBgS_ChkFv = .text:0x80077618; // type:function size:0x78 scope:global align:4 GetPolyPassChkInfo__8dBgS_ChkFv = .text:0x80077690; // type:function size:0x4 scope:global align:4 GetGrpPassChkInfo__8dBgS_ChkFv = .text:0x80077694; // type:function size:0x10 scope:global align:4 -@16@__dt__8dBgS_ChkFv = .text:0x800776A4; // type:function size:0x8 scope:local align:4 +@16@__dt__8dBgS_ChkFv = .text:0x800776A4; // type:function size:0x8 scope:weak align:4 __ct__11dBgS_GndChkFv = .text:0x800776AC; // type:function size:0x74 scope:global align:4 __dt__11dBgS_GndChkFv = .text:0x80077720; // type:function size:0x88 scope:global align:4 __ct__18dBgS_ObjGndChk_WtrFv = .text:0x800777A8; // type:function size:0x98 scope:global align:4 @@ -2835,27 +2835,27 @@ __dt__18dBgS_ObjGndChk_AllFv = .text:0x80077A18; // type:function size:0xA0 scop __dt__14dBgS_CamGndChkFv = .text:0x80077AB8; // type:function size:0x78 scope:global align:4 __ct__18dBgS_CamGndChk_WtrFv = .text:0x80077B30; // type:function size:0x98 scope:global align:4 __dt__18dBgS_CamGndChk_WtrFv = .text:0x80077BC8; // type:function size:0x78 scope:global align:4 -@20@__dt__11dBgS_GndChkFv = .text:0x80077C40; // type:function size:0x8 scope:local align:4 -@76@__dt__11dBgS_GndChkFv = .text:0x80077C48; // type:function size:0x8 scope:local align:4 -@60@__dt__11dBgS_GndChkFv = .text:0x80077C50; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077C58; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077C60; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077C68; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077C70; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077C78; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077C80; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077C88; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077C90; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077C98; // type:function size:0x8 scope:local align:4 -@20@__dt__14dBgS_CamGndChkFv = .text:0x80077CA0; // type:function size:0x8 scope:local align:4 -@76@__dt__14dBgS_CamGndChkFv = .text:0x80077CA8; // type:function size:0x8 scope:local align:4 -@60@__dt__14dBgS_CamGndChkFv = .text:0x80077CB0; // type:function size:0x8 scope:local align:4 -@20@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077CB8; // type:function size:0x8 scope:local align:4 -@76@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077CC0; // type:function size:0x8 scope:local align:4 -@60@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077CC8; // type:function size:0x8 scope:local align:4 +@20@__dt__11dBgS_GndChkFv = .text:0x80077C40; // type:function size:0x8 scope:weak align:4 +@76@__dt__11dBgS_GndChkFv = .text:0x80077C48; // type:function size:0x8 scope:weak align:4 +@60@__dt__11dBgS_GndChkFv = .text:0x80077C50; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077C58; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077C60; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_ObjGndChk_WtrFv = .text:0x80077C68; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077C70; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077C78; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_ObjGndChk_SplFv = .text:0x80077C80; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077C88; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077C90; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_ObjGndChk_AllFv = .text:0x80077C98; // type:function size:0x8 scope:weak align:4 +@20@__dt__14dBgS_CamGndChkFv = .text:0x80077CA0; // type:function size:0x8 scope:weak align:4 +@76@__dt__14dBgS_CamGndChkFv = .text:0x80077CA8; // type:function size:0x8 scope:weak align:4 +@60@__dt__14dBgS_CamGndChkFv = .text:0x80077CB0; // type:function size:0x8 scope:weak align:4 +@20@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077CB8; // type:function size:0x8 scope:weak align:4 +@76@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077CC0; // type:function size:0x8 scope:weak align:4 +@60@__dt__18dBgS_CamGndChk_WtrFv = .text:0x80077CC8; // type:function size:0x8 scope:weak align:4 __ct__15dBgS_GrpPassChkFv = .text:0x80077CD0; // type:function size:0x24 scope:global align:4 __dt__15dBgS_GrpPassChkFv = .text:0x80077CF4; // type:function size:0x5C scope:global align:4 -__dt__15cBgS_GrpPassChkFv = .text:0x80077D50; // type:function size:0x48 scope:global align:4 +__dt__15cBgS_GrpPassChkFv = .text:0x80077D50; // type:function size:0x48 scope:weak align:4 __ct__11dBgS_LinChkFv = .text:0x80077D98; // type:function size:0x74 scope:global align:4 __dt__11dBgS_LinChkFv = .text:0x80077E0C; // type:function size:0x88 scope:global align:4 Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c = .text:0x80077E94; // type:function size:0x40 scope:global align:4 @@ -2877,36 +2877,36 @@ __ct__15dBgS_RopeLinChkFv = .text:0x800784BC; // type:function size:0x5C scope:g __dt__15dBgS_RopeLinChkFv = .text:0x80078518; // type:function size:0x78 scope:global align:4 __ct__16dBgS_HorseLinChkFv = .text:0x80078590; // type:function size:0x5C scope:global align:4 __dt__16dBgS_HorseLinChkFv = .text:0x800785EC; // type:function size:0x78 scope:global align:4 -@20@__dt__11dBgS_LinChkFv = .text:0x80078664; // type:function size:0x8 scope:local align:4 -@104@__dt__11dBgS_LinChkFv = .text:0x8007866C; // type:function size:0x8 scope:local align:4 -@88@__dt__11dBgS_LinChkFv = .text:0x80078674; // type:function size:0x8 scope:local align:4 -@20@__dt__14dBgS_CamLinChkFv = .text:0x8007867C; // type:function size:0x8 scope:local align:4 -@104@__dt__14dBgS_CamLinChkFv = .text:0x80078684; // type:function size:0x8 scope:local align:4 -@88@__dt__14dBgS_CamLinChkFv = .text:0x8007868C; // type:function size:0x8 scope:local align:4 -@20@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x80078694; // type:function size:0x8 scope:local align:4 -@104@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x8007869C; // type:function size:0x8 scope:local align:4 -@88@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x800786A4; // type:function size:0x8 scope:local align:4 -@20@__dt__14dBgS_ObjLinChkFv = .text:0x800786AC; // type:function size:0x8 scope:local align:4 -@104@__dt__14dBgS_ObjLinChkFv = .text:0x800786B4; // type:function size:0x8 scope:local align:4 -@88@__dt__14dBgS_ObjLinChkFv = .text:0x800786BC; // type:function size:0x8 scope:local align:4 -@20@__dt__15dBgS_LinkLinChkFv = .text:0x800786C4; // type:function size:0x8 scope:local align:4 -@104@__dt__15dBgS_LinkLinChkFv = .text:0x800786CC; // type:function size:0x8 scope:local align:4 -@88@__dt__15dBgS_LinkLinChkFv = .text:0x800786D4; // type:function size:0x8 scope:local align:4 -@20@__dt__15dBgS_BombLinChkFv = .text:0x800786DC; // type:function size:0x8 scope:local align:4 -@104@__dt__15dBgS_BombLinChkFv = .text:0x800786E4; // type:function size:0x8 scope:local align:4 -@88@__dt__15dBgS_BombLinChkFv = .text:0x800786EC; // type:function size:0x8 scope:local align:4 -@20@__dt__16dBgS_ArrowLinChkFv = .text:0x800786F4; // type:function size:0x8 scope:local align:4 -@104@__dt__16dBgS_ArrowLinChkFv = .text:0x800786FC; // type:function size:0x8 scope:local align:4 -@88@__dt__16dBgS_ArrowLinChkFv = .text:0x80078704; // type:function size:0x8 scope:local align:4 -@20@__dt__20dBgS_BoomerangLinChkFv = .text:0x8007870C; // type:function size:0x8 scope:local align:4 -@104@__dt__20dBgS_BoomerangLinChkFv = .text:0x80078714; // type:function size:0x8 scope:local align:4 -@88@__dt__20dBgS_BoomerangLinChkFv = .text:0x8007871C; // type:function size:0x8 scope:local align:4 -@20@__dt__15dBgS_RopeLinChkFv = .text:0x80078724; // type:function size:0x8 scope:local align:4 -@104@__dt__15dBgS_RopeLinChkFv = .text:0x8007872C; // type:function size:0x8 scope:local align:4 -@88@__dt__15dBgS_RopeLinChkFv = .text:0x80078734; // type:function size:0x8 scope:local align:4 -@20@__dt__16dBgS_HorseLinChkFv = .text:0x8007873C; // type:function size:0x8 scope:local align:4 -@104@__dt__16dBgS_HorseLinChkFv = .text:0x80078744; // type:function size:0x8 scope:local align:4 -@88@__dt__16dBgS_HorseLinChkFv = .text:0x8007874C; // type:function size:0x8 scope:local align:4 +@20@__dt__11dBgS_LinChkFv = .text:0x80078664; // type:function size:0x8 scope:weak align:4 +@104@__dt__11dBgS_LinChkFv = .text:0x8007866C; // type:function size:0x8 scope:weak align:4 +@88@__dt__11dBgS_LinChkFv = .text:0x80078674; // type:function size:0x8 scope:weak align:4 +@20@__dt__14dBgS_CamLinChkFv = .text:0x8007867C; // type:function size:0x8 scope:weak align:4 +@104@__dt__14dBgS_CamLinChkFv = .text:0x80078684; // type:function size:0x8 scope:weak align:4 +@88@__dt__14dBgS_CamLinChkFv = .text:0x8007868C; // type:function size:0x8 scope:weak align:4 +@20@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x80078694; // type:function size:0x8 scope:weak align:4 +@104@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x8007869C; // type:function size:0x8 scope:weak align:4 +@88@__dt__21dBgS_CamLinChk_NorWtrFv = .text:0x800786A4; // type:function size:0x8 scope:weak align:4 +@20@__dt__14dBgS_ObjLinChkFv = .text:0x800786AC; // type:function size:0x8 scope:weak align:4 +@104@__dt__14dBgS_ObjLinChkFv = .text:0x800786B4; // type:function size:0x8 scope:weak align:4 +@88@__dt__14dBgS_ObjLinChkFv = .text:0x800786BC; // type:function size:0x8 scope:weak align:4 +@20@__dt__15dBgS_LinkLinChkFv = .text:0x800786C4; // type:function size:0x8 scope:weak align:4 +@104@__dt__15dBgS_LinkLinChkFv = .text:0x800786CC; // type:function size:0x8 scope:weak align:4 +@88@__dt__15dBgS_LinkLinChkFv = .text:0x800786D4; // type:function size:0x8 scope:weak align:4 +@20@__dt__15dBgS_BombLinChkFv = .text:0x800786DC; // type:function size:0x8 scope:weak align:4 +@104@__dt__15dBgS_BombLinChkFv = .text:0x800786E4; // type:function size:0x8 scope:weak align:4 +@88@__dt__15dBgS_BombLinChkFv = .text:0x800786EC; // type:function size:0x8 scope:weak align:4 +@20@__dt__16dBgS_ArrowLinChkFv = .text:0x800786F4; // type:function size:0x8 scope:weak align:4 +@104@__dt__16dBgS_ArrowLinChkFv = .text:0x800786FC; // type:function size:0x8 scope:weak align:4 +@88@__dt__16dBgS_ArrowLinChkFv = .text:0x80078704; // type:function size:0x8 scope:weak align:4 +@20@__dt__20dBgS_BoomerangLinChkFv = .text:0x8007870C; // type:function size:0x8 scope:weak align:4 +@104@__dt__20dBgS_BoomerangLinChkFv = .text:0x80078714; // type:function size:0x8 scope:weak align:4 +@88@__dt__20dBgS_BoomerangLinChkFv = .text:0x8007871C; // type:function size:0x8 scope:weak align:4 +@20@__dt__15dBgS_RopeLinChkFv = .text:0x80078724; // type:function size:0x8 scope:weak align:4 +@104@__dt__15dBgS_RopeLinChkFv = .text:0x8007872C; // type:function size:0x8 scope:weak align:4 +@88@__dt__15dBgS_RopeLinChkFv = .text:0x80078734; // type:function size:0x8 scope:weak align:4 +@20@__dt__16dBgS_HorseLinChkFv = .text:0x8007873C; // type:function size:0x8 scope:weak align:4 +@104@__dt__16dBgS_HorseLinChkFv = .text:0x80078744; // type:function size:0x8 scope:weak align:4 +@88@__dt__16dBgS_HorseLinChkFv = .text:0x8007874C; // type:function size:0x8 scope:weak align:4 __ct__16dBgS_MoveBgActorFv = .text:0x80078754; // type:function size:0x44 scope:global align:4 CheckCreateHeap__FP10fopAc_ac_c = .text:0x80078798; // type:function size:0x20 scope:local align:4 CreateHeap__16dBgS_MoveBgActorFv = .text:0x800787B8; // type:function size:0x8 scope:global align:4 @@ -2923,17 +2923,17 @@ MoveBGDelete__16dBgS_MoveBgActorFv = .text:0x80078A0C; // type:function size:0x7 MoveBGExecute__16dBgS_MoveBgActorFv = .text:0x80078A80; // type:function size:0xC4 scope:global align:4 __ct__11dBgS_SphChkFv = .text:0x80078B44; // type:function size:0xAC scope:global align:4 __dt__11dBgS_SphChkFv = .text:0x80078BF0; // type:function size:0xB0 scope:global align:4 -@20@__dt__11dBgS_SphChkFv = .text:0x80078CA0; // type:function size:0x8 scope:local align:4 -@36@__dt__11dBgS_SphChkFv = .text:0x80078CA8; // type:function size:0x8 scope:local align:4 -@72@__dt__11dBgS_SphChkFv = .text:0x80078CB0; // type:function size:0x8 scope:local align:4 -@56@__dt__11dBgS_SphChkFv = .text:0x80078CB8; // type:function size:0x8 scope:local align:4 +@20@__dt__11dBgS_SphChkFv = .text:0x80078CA0; // type:function size:0x8 scope:weak align:4 +@36@__dt__11dBgS_SphChkFv = .text:0x80078CA8; // type:function size:0x8 scope:weak align:4 +@72@__dt__11dBgS_SphChkFv = .text:0x80078CB0; // type:function size:0x8 scope:weak align:4 +@56@__dt__11dBgS_SphChkFv = .text:0x80078CB8; // type:function size:0x8 scope:weak align:4 Set__14dBgS_SplGrpChkFR4cXyzf = .text:0x80078CC0; // type:function size:0x20 scope:global align:4 __ct__14dBgS_SplGrpChkFv = .text:0x80078CE0; // type:function size:0xC8 scope:global align:4 __dt__14dBgS_SplGrpChkFv = .text:0x80078DA8; // type:function size:0x94 scope:global align:4 Init__14dBgS_SplGrpChkFv = .text:0x80078E3C; // type:function size:0x40 scope:global align:4 -@16@__dt__14dBgS_SplGrpChkFv = .text:0x80078E7C; // type:function size:0x8 scope:local align:4 -@52@__dt__14dBgS_SplGrpChkFv = .text:0x80078E84; // type:function size:0x8 scope:local align:4 -@36@__dt__14dBgS_SplGrpChkFv = .text:0x80078E8C; // type:function size:0x8 scope:local align:4 +@16@__dt__14dBgS_SplGrpChkFv = .text:0x80078E7C; // type:function size:0x8 scope:weak align:4 +@52@__dt__14dBgS_SplGrpChkFv = .text:0x80078E84; // type:function size:0x8 scope:weak align:4 +@36@__dt__14dBgS_SplGrpChkFv = .text:0x80078E8C; // type:function size:0x8 scope:weak align:4 __ct__16dBgS_PolyPassChkFv = .text:0x80078E94; // type:function size:0x4C scope:global align:4 __dt__16dBgS_PolyPassChkFv = .text:0x80078EE0; // type:function size:0x5C scope:global align:4 SetPassChkInfo__16dBgS_PolyPassChkFR16dBgS_PolyPassChk = .text:0x80078F3C; // type:function size:0x5C scope:global align:4 @@ -2955,13 +2955,13 @@ SetStatue__16dBgS_PolyPassChkFv = .text:0x800790AC; // type:function size:0xC sc ClrStatue__16dBgS_PolyPassChkFv = .text:0x800790B8; // type:function size:0xC scope:global align:4 SetIronBall__16dBgS_PolyPassChkFv = .text:0x800790C4; // type:function size:0xC scope:global align:4 ClrIronBall__16dBgS_PolyPassChkFv = .text:0x800790D0; // type:function size:0xC scope:global align:4 -__dt__16cBgS_PolyPassChkFv = .text:0x800790DC; // type:function size:0x48 scope:global align:4 +__dt__16cBgS_PolyPassChkFv = .text:0x800790DC; // type:function size:0x48 scope:weak align:4 __ct__12dBgS_RoofChkFv = .text:0x80079124; // type:function size:0x9C scope:global align:4 __dt__12dBgS_RoofChkFv = .text:0x800791C0; // type:function size:0x94 scope:global align:4 Init__12dBgS_RoofChkFv = .text:0x80079254; // type:function size:0x28 scope:global align:4 -@16@__dt__12dBgS_RoofChkFv = .text:0x8007927C; // type:function size:0x8 scope:local align:4 -@52@__dt__12dBgS_RoofChkFv = .text:0x80079284; // type:function size:0x8 scope:local align:4 -@36@__dt__12dBgS_RoofChkFv = .text:0x8007928C; // type:function size:0x8 scope:local align:4 +@16@__dt__12dBgS_RoofChkFv = .text:0x8007927C; // type:function size:0x8 scope:weak align:4 +@52@__dt__12dBgS_RoofChkFv = .text:0x80079284; // type:function size:0x8 scope:weak align:4 +@36@__dt__12dBgS_RoofChkFv = .text:0x8007928C; // type:function size:0x8 scope:weak align:4 __ct__11dBgS_WtrChkFv = .text:0x80079294; // type:function size:0x60 scope:global align:4 __ct__11cBgW_RwgElmFv = .text:0x800792F4; // type:function size:0x10 scope:global align:4 __dt__11cBgW_RwgElmFv = .text:0x80079304; // type:function size:0x48 scope:global align:4 @@ -2989,7 +2989,7 @@ Set__4cBgWFP6cBgD_tUlPA3_A4_f = .text:0x8007A068; // type:function size:0x24C sc __dt__11cBgW_GrpElmFv = .text:0x8007A2B4; // type:function size:0x60 scope:global align:4 __ct__11cBgW_GrpElmFv = .text:0x8007A314; // type:function size:0x1C scope:global align:4 RwgLineCheck__4cBgWFUsP11cBgS_LinChk = .text:0x8007A330; // type:function size:0x144 scope:global align:4 -__dt__8cM3dGTriFv = .text:0x8007A474; // type:function size:0x5C scope:global align:4 +__dt__8cM3dGTriFv = .text:0x8007A474; // type:function size:0x5C scope:weak align:4 LineCheckRp__4cBgWFP11cBgS_LinChki = .text:0x8007A4D0; // type:function size:0x18C scope:global align:4 LineCheckGrpRp__4cBgWFP11cBgS_LinChkii = .text:0x8007A65C; // type:function size:0x12C scope:global align:4 LineCheck__4cBgWFP11cBgS_LinChk = .text:0x8007A788; // type:function size:0x28 scope:global align:4 @@ -3093,9 +3093,9 @@ CallArrowStickCallBack__4dBgWFP10fopAc_ac_cP10fopAc_ac_cR4cXyz = .text:0x8007E5A OffMoveFlag__4dBgWFv = .text:0x8007E5D4; // type:function size:0x10 scope:global align:4 ChkMoveFlag__4dBgWCFv = .text:0x8007E5E4; // type:function size:0xC scope:global align:4 dBgW_NewSet__FP6cBgD_tUlPA3_A4_f = .text:0x8007E5F0; // type:function size:0x88 scope:global align:4 -__dt__4dBgWFv = .text:0x8007E678; // type:function size:0x60 scope:global align:4 +__dt__4dBgWFv = .text:0x8007E678; // type:function size:0x60 scope:weak align:4 __ct__9dBgW_BaseFv = .text:0x8007E6D8; // type:function size:0x50 scope:global align:4 -__dt__9cBgW_BgIdFv = .text:0x8007E728; // type:function size:0x48 scope:global align:4 +__dt__9cBgW_BgIdFv = .text:0x8007E728; // type:function size:0x48 scope:weak align:4 __dt__9dBgW_BaseFv = .text:0x8007E770; // type:function size:0x5C scope:global align:4 ClrDBgWBase__9dBgW_BaseFv = .text:0x8007E7CC; // type:function size:0x34 scope:global align:4 ChkMemoryError__9dBgW_BaseFv = .text:0x8007E800; // type:function size:0x8 scope:global align:4 @@ -3173,7 +3173,7 @@ CrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz = .text:0x80083374; // TransPosWork__6dBgWSvFP4cXyziii = .text:0x80083430; // type:function size:0x21C scope:global align:4 TransPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz = .text:0x8008364C; // type:function size:0xBC scope:global align:4 MatrixCrrPos__6dBgWSvFRC13cBgS_PolyInfoPvbP4cXyzP5csXyzP5csXyz = .text:0x80083708; // type:function size:0x4 scope:global align:4 -__dt__6dBgWSvFv = .text:0x8008370C; // type:function size:0x70 scope:global align:4 +__dt__6dBgWSvFv = .text:0x8008370C; // type:function size:0x70 scope:weak align:4 ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv = .text:0x8008377C; // type:function size:0x14 scope:global align:4 ct__22dCcD_GAtTgCoCommonBaseFv = .text:0x80083790; // type:function size:0x18 scope:global align:4 SetHitApid__22dCcD_GAtTgCoCommonBaseFUi = .text:0x800837A8; // type:function size:0x10 scope:global align:4 @@ -3305,9 +3305,9 @@ Set__12dCcMassS_ObjFP8cCcD_ObjUcPFP10fopAc_ac_cP4cXyzUl_v = .text:0x80085410; // Clear__12dCcMassS_ObjFv = .text:0x80085420; // type:function size:0x44 scope:global align:4 ClearPointer__15dCcMassS_HitInfFv = .text:0x80085464; // type:function size:0x1C scope:global align:4 __ct__12dCcMassS_MngFv = .text:0x80085480; // type:function size:0x100 scope:global align:4 -__dt__12cCcD_CpsAttrFv = .text:0x80085580; // type:function size:0x90 scope:global align:4 -__dt__12cCcD_CylAttrFv = .text:0x80085610; // type:function size:0x8C scope:global align:4 -__dt__14cCcD_ShapeAttrFv = .text:0x8008569C; // type:function size:0x5C scope:global align:4 +__dt__12cCcD_CpsAttrFv = .text:0x80085580; // type:function size:0x90 scope:weak align:4 +__dt__12cCcD_CylAttrFv = .text:0x80085610; // type:function size:0x8C scope:weak align:4 +__dt__14cCcD_ShapeAttrFv = .text:0x8008569C; // type:function size:0x5C scope:weak align:4 __ct__12dCcMassS_ObjFv = .text:0x800856F8; // type:function size:0x1C scope:global align:4 Ct__12dCcMassS_MngFv = .text:0x80085714; // type:function size:0x4C scope:global align:4 SetAttr__12dCcMassS_MngFffUcUc = .text:0x80085760; // type:function size:0x60 scope:global align:4 @@ -3333,7 +3333,7 @@ ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCc SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz = .text:0x80086BF0; // type:function size:0x2CC scope:global align:4 ChkCamera__4dCcSFR4cXyzR4cXyzfP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c = .text:0x80086EBC; // type:function size:0x230 scope:global align:4 chkCameraPoint__4dCcSFRC4cXyzPQ214cCcD_ShapeAttr5ShapeP10fopAc_ac_cP10fopAc_ac_c = .text:0x800870EC; // type:function size:0x260 scope:global align:4 -__dt__12cCcD_SphAttrFv = .text:0x8008734C; // type:function size:0x8C scope:global align:4 +__dt__12cCcD_SphAttrFv = .text:0x8008734C; // type:function size:0x8C scope:weak align:4 MoveAfterCheck__4dCcSFv = .text:0x800873D8; // type:function size:0x4 scope:global align:4 DrawAfter__4dCcSFv = .text:0x800873DC; // type:function size:0x4 scope:global align:4 Move__4dCcSFv = .text:0x800873E0; // type:function size:0x20 scope:global align:4 @@ -3343,16 +3343,16 @@ ChkAtTgMtrlHit__4dCcSFUcUc = .text:0x80087460; // type:function size:0x1C scope: ChkNoHitGAtTg__4dCcSFPC12cCcD_GObjInfPC12cCcD_GObjInfP10cCcD_GSttsP10cCcD_GStts = .text:0x8008747C; // type:function size:0x64 scope:global align:4 pl_cut_LRC__Fi = .text:0x800874E0; // type:function size:0x24 scope:global align:4 cc_pl_cut_bit_get__Fv = .text:0x80087504; // type:function size:0xF0 scope:global align:4 -getMapInfo__FSc = .text:0x800875F4; // type:function size:0x2C scope:global align:4 -getHitId__FP8cCcD_Obji = .text:0x80087620; // type:function size:0x24 scope:global align:4 +getMapInfo__FSc = .text:0x800875F4; // type:function size:0x2C scope:local align:4 +getHitId__FP8cCcD_Obji = .text:0x80087620; // type:function size:0x24 scope:local align:4 def_se_set__FP10Z2CreatureP8cCcD_ObjUlP10fopAc_ac_c = .text:0x80087644; // type:function size:0x80 scope:global align:4 -at_power_get__FP11dCcU_AtInfo = .text:0x800876C4; // type:function size:0x4C4 scope:global align:4 +at_power_get__FP11dCcU_AtInfo = .text:0x800876C4; // type:function size:0x4C4 scope:local align:4 at_power_check__FP11dCcU_AtInfo = .text:0x80087B88; // type:function size:0x1AC scope:global align:4 cc_at_check__FP10fopAc_ac_cP11dCcU_AtInfo = .text:0x80087D34; // type:function size:0x530 scope:global align:4 -checkCutJumpCancelTurn__9daPy_py_cCFv = .text:0x80088264; // type:function size:0x8 scope:global align:4 +checkCutJumpCancelTurn__9daPy_py_cCFv = .text:0x80088264; // type:function size:0x8 scope:weak align:4 rationalBezierRatio__8dCamMathFff = .text:0x8008826C; // type:function size:0x148 scope:global align:4 zoomFovy__8dCamMathFff = .text:0x800883B4; // type:function size:0x5C scope:global align:4 -__dt__7cDegreeFv = .text:0x80088410; // type:function size:0x3C scope:global align:4 +__dt__7cDegreeFv = .text:0x80088410; // type:function size:0x3C scope:weak align:4 xyzRotateX__8dCamMathFR4cXyz7cSAngle = .text:0x8008844C; // type:function size:0x68 scope:global align:4 xyzRotateY__8dCamMathFR4cXyz7cSAngle = .text:0x800884B4; // type:function size:0x68 scope:global align:4 xyzHorizontalDistance__8dCamMathFR4cXyzR4cXyz = .text:0x8008851C; // type:function size:0x48 scope:global align:4 @@ -3367,8 +3367,8 @@ __ct__11dCamSetup_cFv = .text:0x80088798; // type:function size:0x250 scope:glob __dt__11dCamSetup_cFv = .text:0x800889E8; // type:function size:0x60 scope:global align:4 CheckLatitudeRange__11dCamSetup_cFPs = .text:0x80088A48; // type:function size:0x70 scope:global align:4 PlayerHideDist__11dCamSetup_cFv = .text:0x80088AB8; // type:function size:0x28 scope:global align:4 -__dt__9dCstick_cFv = .text:0x80088AE0; // type:function size:0x48 scope:global align:4 -isStageEvent__25@unnamed@d_ev_camera_cpp@Fi = .text:0x80088B28; // type:function size:0x84 scope:global align:4 +__dt__9dCstick_cFv = .text:0x80088AE0; // type:function size:0x48 scope:weak align:4 +isStageEvent__25@unnamed@d_ev_camera_cpp@Fi = .text:0x80088B28; // type:function size:0x84 scope:local align:4 StartEventCamera__9dCamera_cFiie = .text:0x80088BAC; // type:function size:0x140 scope:global align:4 EndEventCamera__9dCamera_cFi = .text:0x80088CEC; // type:function size:0x68 scope:global align:4 searchEventArgData__9dCamera_cFPc = .text:0x80088D54; // type:function size:0x8C scope:global align:4 @@ -3393,22 +3393,22 @@ uniformTransEvCamera__9dCamera_cFv = .text:0x8008BF5C; // type:function size:0x2 uniformBrakeEvCamera__9dCamera_cFv = .text:0x8008BF80; // type:function size:0x24 scope:global align:4 uniformAcceleEvCamera__9dCamera_cFv = .text:0x8008BFA4; // type:function size:0x24 scope:global align:4 transEvCamera__9dCamera_cFi = .text:0x8008BFC8; // type:function size:0x28B8 scope:global align:4 -isRelChar__25@unnamed@d_ev_camera_cpp@Fc = .text:0x8008E880; // type:function size:0x24 scope:global align:4 -__as__7cSGlobeFRC7cSGlobe = .text:0x8008E8A4; // type:function size:0x1C scope:global align:4 -abs__4cXyzCFv = .text:0x8008E8C0; // type:function size:0x104 scope:global align:4 -U__7cSGlobeFRC7cSAngle = .text:0x8008E9C4; // type:function size:0x3C scope:global align:4 -__ami__4cXyzFRC3Vec = .text:0x8008EA00; // type:function size:0x34 scope:global align:4 -__apl__4cXyzFRC3Vec = .text:0x8008EA34; // type:function size:0x34 scope:global align:4 +isRelChar__25@unnamed@d_ev_camera_cpp@Fc = .text:0x8008E880; // type:function size:0x24 scope:local align:4 +__as__7cSGlobeFRC7cSGlobe = .text:0x8008E8A4; // type:function size:0x1C scope:weak align:4 +abs__4cXyzCFv = .text:0x8008E8C0; // type:function size:0x104 scope:weak align:4 +U__7cSGlobeFRC7cSAngle = .text:0x8008E9C4; // type:function size:0x3C scope:weak align:4 +__ami__4cXyzFRC3Vec = .text:0x8008EA00; // type:function size:0x34 scope:weak align:4 +__apl__4cXyzFRC3Vec = .text:0x8008EA34; // type:function size:0x34 scope:weak align:4 watchActorEvCamera__9dCamera_cFv = .text:0x8008EA68; // type:function size:0x1120 scope:global align:4 -V__7cSGlobeFRC7cSAngle = .text:0x8008FB88; // type:function size:0x3C scope:global align:4 -lineCollisionCheck__25@unnamed@d_ev_camera_cpp@F4cXyz4cXyzP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c = .text:0x8008FBC4; // type:function size:0x54 scope:global align:4 +V__7cSGlobeFRC7cSAngle = .text:0x8008FB88; // type:function size:0x3C scope:weak align:4 +lineCollisionCheck__25@unnamed@d_ev_camera_cpp@F4cXyz4cXyzP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c = .text:0x8008FBC4; // type:function size:0x54 scope:local align:4 restorePosEvCamera__9dCamera_cFv = .text:0x8008FC18; // type:function size:0x68C scope:global align:4 talktoEvCamera__9dCamera_cFv = .text:0x800902A4; // type:function size:0xBC scope:global align:4 maptoolIdEvCamera__9dCamera_cFv = .text:0x80090360; // type:function size:0x248 scope:global align:4 styleEvCamera__9dCamera_cFv = .text:0x800905A8; // type:function size:0x9C scope:global align:4 gameOverEvCamera__9dCamera_cFv = .text:0x80090644; // type:function size:0xF54 scope:global align:4 tactEvCamera__9dCamera_cFv = .text:0x80091598; // type:function size:0xF04 scope:global align:4 -dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs = .text:0x8009249C; // type:function size:0x4C scope:global align:4 +dComIfGp_saveCameraPosition__FiP4cXyzP4cXyzfs = .text:0x8009249C; // type:function size:0x4C scope:weak align:4 turnToActorEvCamera__9dCamera_cFv = .text:0x800924E8; // type:function size:0x8 scope:global align:4 stbWaitEvCamera__9dCamera_cFv = .text:0x800924F0; // type:function size:0x110 scope:global align:4 saveEvCamera__9dCamera_cFv = .text:0x80092600; // type:function size:0xBC scope:global align:4 @@ -3426,23 +3426,23 @@ hintTalkEvCamera__9dCamera_cFv = .text:0x800966DC; // type:function size:0x930 s bspTransEvCamera__9dCamera_cFv = .text:0x8009700C; // type:function size:0x7B8 scope:global align:4 portalWarpEvCamera__9dCamera_cFv = .text:0x800977C4; // type:function size:0x8 scope:global align:4 __sinit_d_ev_camera_cpp = .text:0x800977CC; // type:function size:0x80 scope:local align:4 -attentionPos__9dCamera_cFP10fopAc_ac_c = .text:0x8009784C; // type:function size:0x1C scope:global align:4 -directionOf__9dCamera_cFP10fopAc_ac_c = .text:0x80097868; // type:function size:0x24 scope:global align:4 -positionOf__9dCamera_cFP10fopAc_ac_c = .text:0x8009788C; // type:function size:0x1C scope:global align:4 -setFlag__9dCamera_cFUl = .text:0x800978A8; // type:function size:0x14 scope:global align:4 -eyePos__9dCamera_cFP10fopAc_ac_c = .text:0x800978BC; // type:function size:0x1C scope:global align:4 -checkNoDraw__9daMidna_cCFv = .text:0x800978D8; // type:function size:0xC scope:global align:4 -checkMidnaRide__9daPy_py_cCFv = .text:0x800978E4; // type:function size:0xC scope:global align:4 -fopAcM_GetID__FPCv = .text:0x800978F0; // type:function size:0x18 scope:global align:4 -__as__4cXyzFRC4cXyz = .text:0x80097908; // type:function size:0x1C scope:global align:4 -__ct__4cXyzFRC4cXyz = .text:0x80097924; // type:function size:0x1C scope:global align:4 -__dt__Q29dCamera_c26@class$5983d_ev_camera_cppFv = .text:0x80097940; // type:function size:0x3C scope:local align:4 -__ct__Q29dCamera_c26@class$5983d_ev_camera_cppFv = .text:0x8009797C; // type:function size:0x4 scope:local align:4 -checkCanoeRide__9daPy_py_cCFv = .text:0x80097980; // type:function size:0x8 scope:global align:4 -checkBoardRide__9daPy_py_cCFv = .text:0x80097988; // type:function size:0x8 scope:global align:4 -checkSpinnerRide__9daPy_py_cCFv = .text:0x80097990; // type:function size:0x8 scope:global align:4 -checkBoarRide__9daPy_py_cCFv = .text:0x80097998; // type:function size:0x8 scope:global align:4 -getShadowTalkAtnPos__9daAlink_cFv = .text:0x800979A0; // type:function size:0x8 scope:global align:4 +attentionPos__9dCamera_cFP10fopAc_ac_c = .text:0x8009784C; // type:function size:0x1C scope:weak align:4 +directionOf__9dCamera_cFP10fopAc_ac_c = .text:0x80097868; // type:function size:0x24 scope:weak align:4 +positionOf__9dCamera_cFP10fopAc_ac_c = .text:0x8009788C; // type:function size:0x1C scope:weak align:4 +setFlag__9dCamera_cFUl = .text:0x800978A8; // type:function size:0x14 scope:weak align:4 +eyePos__9dCamera_cFP10fopAc_ac_c = .text:0x800978BC; // type:function size:0x1C scope:weak align:4 +checkNoDraw__9daMidna_cCFv = .text:0x800978D8; // type:function size:0xC scope:weak align:4 +checkMidnaRide__9daPy_py_cCFv = .text:0x800978E4; // type:function size:0xC scope:weak align:4 +fopAcM_GetID__FPCv = .text:0x800978F0; // type:function size:0x18 scope:weak align:4 +__as__4cXyzFRC4cXyz = .text:0x80097908; // type:function size:0x1C scope:weak align:4 +__ct__4cXyzFRC4cXyz = .text:0x80097924; // type:function size:0x1C scope:weak align:4 +__dt__Q29dCamera_c26@class$3517d_ev_camera_cppFv = .text:0x80097940; // type:function size:0x3C scope:weak align:4 +__ct__Q29dCamera_c26@class$3517d_ev_camera_cppFv = .text:0x8009797C; // type:function size:0x4 scope:weak align:4 +checkCanoeRide__9daPy_py_cCFv = .text:0x80097980; // type:function size:0x8 scope:weak align:4 +checkBoardRide__9daPy_py_cCFv = .text:0x80097988; // type:function size:0x8 scope:weak align:4 +checkSpinnerRide__9daPy_py_cCFv = .text:0x80097990; // type:function size:0x8 scope:weak align:4 +checkBoarRide__9daPy_py_cCFv = .text:0x80097998; // type:function size:0x8 scope:weak align:4 +getShadowTalkAtnPos__9daAlink_cFv = .text:0x800979A0; // type:function size:0x8 scope:weak align:4 Init__14d2DBSplinePathFll = .text:0x800979A8; // type:function size:0x8C scope:global align:4 Step__14d2DBSplinePathFv = .text:0x80097A34; // type:function size:0x168 scope:global align:4 Calc__14d2DBSplinePathFP4cXyz = .text:0x80097B9C; // type:function size:0xB4 scope:global align:4 @@ -3860,16 +3860,16 @@ __dt__6dMdl_cFv = .text:0x8009C938; // type:function size:0x5C scope:global alig remove__10dMdl_mng_cFv = .text:0x8009C994; // type:function size:0x5C scope:global align:4 reset__10dMdl_mng_cFv = .text:0x8009C9F0; // type:function size:0x18 scope:global align:4 entry__10dMdl_mng_cFP12J3DModelDataUsi = .text:0x8009CA08; // type:function size:0x58 scope:global align:4 -__ct__6dMdl_cFv = .text:0x8009CA60; // type:function size:0x34 scope:global align:4 +__ct__6dMdl_cFv = .text:0x8009CA60; // type:function size:0x34 scope:weak align:4 entry__8dEyeHL_cFP12J3DModelDataPCc = .text:0x8009CA94; // type:function size:0xC4 scope:global align:4 remove__8dEyeHL_cFv = .text:0x8009CB58; // type:function size:0x20 scope:global align:4 update__12dEyeHL_mng_cFv = .text:0x8009CB78; // type:function size:0xCC scope:global align:4 entry__12dEyeHL_mng_cFP8dEyeHL_c = .text:0x8009CC44; // type:function size:0x20 scope:global align:4 remove__12dEyeHL_mng_cFP8dEyeHL_c = .text:0x8009CC64; // type:function size:0x54 scope:global align:4 -messageSet__FUlb = .text:0x8009CCB8; // type:function size:0x6E8 scope:global align:4 +messageSet__FUlb = .text:0x8009CCB8; // type:function size:0x6E8 scope:local align:4 draw__14dDvdErrorMsg_cFl = .text:0x8009D3A0; // type:function size:0x1C0 scope:global align:4 execute__14dDvdErrorMsg_cFv = .text:0x8009D560; // type:function size:0xBC scope:global align:4 -drawCapture__FUc = .text:0x8009D61C; // type:function size:0x380 scope:global align:4 +drawCapture__FUc = .text:0x8009D61C; // type:function size:0x380 scope:local align:4 execute__19dShutdownErrorMsg_cFv = .text:0x8009D99C; // type:function size:0xEC scope:global align:4 getE3Zhint__9daAlink_cFv = .text:0x8009DA88; // type:function size:0x8 scope:global align:4 getAlinkArcName__9daAlink_cFv = .text:0x8009DA90; // type:function size:0x8 scope:global align:4 @@ -6076,13 +6076,13 @@ getBtpFrm__12daItemBase_cFv = .text:0x8014538C; // type:function size:0x1C scope getShadowSize__12daItemBase_cFv = .text:0x801453A8; // type:function size:0x18 scope:global align:4 getCollisionH__12daItemBase_cFv = .text:0x801453C0; // type:function size:0x1C scope:global align:4 getCollisionR__12daItemBase_cFv = .text:0x801453DC; // type:function size:0x1C scope:global align:4 -isLoadRoom__Fi = .text:0x801453F8; // type:function size:0xF0 scope:global align:4 +isLoadRoom__Fi = .text:0x801453F8; // type:function size:0xF0 scope:local align:4 execute__9daNocrm_cFv = .text:0x801454E8; // type:function size:0x22C scope:global align:4 getRoomNo__9daNocrm_cFi = .text:0x80145714; // type:function size:0xA0 scope:global align:4 -daNocrm_create__FP9daNocrm_c = .text:0x801457B4; // type:function size:0xFC scope:global align:4 -daNocrm_Delete__FP9daNocrm_c = .text:0x801458B0; // type:function size:0x8 scope:global align:4 -daNocrm_execute__FP9daNocrm_c = .text:0x801458B8; // type:function size:0x20 scope:global align:4 -daNocrm_draw__FP9daNocrm_c = .text:0x801458D8; // type:function size:0x8 scope:global align:4 +daNocrm_create__FP9daNocrm_c = .text:0x801457B4; // type:function size:0xFC scope:local align:4 +daNocrm_Delete__FP9daNocrm_c = .text:0x801458B0; // type:function size:0x8 scope:local align:4 +daNocrm_execute__FP9daNocrm_c = .text:0x801458B8; // type:function size:0x20 scope:local align:4 +daNocrm_draw__FP9daNocrm_c = .text:0x801458D8; // type:function size:0x8 scope:local align:4 initialize__18daNpcT_ActorMngr_cFv = .text:0x801458E0; // type:function size:0xC scope:global align:4 entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c = .text:0x801458EC; // type:function size:0x1C scope:global align:4 remove__18daNpcT_ActorMngr_cFv = .text:0x80145908; // type:function size:0xC scope:global align:4 @@ -6446,13 +6446,13 @@ setHitodamaParticle__9daNpcCd_cFv = .text:0x80157578; // type:function size:0x1B getNpcMdlDataP__9daNpcCd_cFi = .text:0x80157730; // type:function size:0x64 scope:global align:4 getObjMdlDataP__9daNpcCd_cFi = .text:0x80157794; // type:function size:0x78 scope:global align:4 __ct__13daNpcCd_HIO_cFv = .text:0x8015780C; // type:function size:0x1A0 scope:global align:4 -__dt__19daNpcCd_HIO_Child_cFv = .text:0x801579AC; // type:function size:0x70 scope:global align:4 -__dt__17daNpcCd_HIO_Jnt_cFv = .text:0x80157A1C; // type:function size:0x48 scope:global align:4 -__ct__19daNpcCd_HIO_Child_cFv = .text:0x80157A64; // type:function size:0x58 scope:global align:4 -__ct__17daNpcCd_HIO_Jnt_cFv = .text:0x80157ABC; // type:function size:0x10 scope:global align:4 -__dt__18fOpAcm_HIO_entry_cFv = .text:0x80157ACC; // type:function size:0x5C scope:global align:4 -__dt__14mDoHIO_entry_cFv = .text:0x80157B28; // type:function size:0x48 scope:global align:4 -__dt__13daNpcCd_HIO_cFv = .text:0x80157B70; // type:function size:0xAC scope:global align:4 +__dt__19daNpcCd_HIO_Child_cFv = .text:0x801579AC; // type:function size:0x70 scope:weak align:4 +__dt__17daNpcCd_HIO_Jnt_cFv = .text:0x80157A1C; // type:function size:0x48 scope:weak align:4 +__ct__19daNpcCd_HIO_Child_cFv = .text:0x80157A64; // type:function size:0x58 scope:weak align:4 +__ct__17daNpcCd_HIO_Jnt_cFv = .text:0x80157ABC; // type:function size:0x10 scope:weak align:4 +__dt__18fOpAcm_HIO_entry_cFv = .text:0x80157ACC; // type:function size:0x5C scope:weak align:4 +__dt__14mDoHIO_entry_cFv = .text:0x80157B28; // type:function size:0x48 scope:weak align:4 +__dt__13daNpcCd_HIO_cFv = .text:0x80157B70; // type:function size:0xAC scope:weak align:4 __sinit_d_a_npc_cd_cpp = .text:0x80157C1C; // type:function size:0x2A4 scope:local align:4 jntNodeCallBack__FP8J3DJointi = .text:0x80157EC0; // type:function size:0x4C scope:local align:4 NpcCreate__10daNpcCd2_cFi = .text:0x80157F0C; // type:function size:0x228 scope:global align:4 @@ -6499,18 +6499,18 @@ __dt__21daNpcCd2_HIO_MChild_cFv = .text:0x8015A9A4; // type:function size:0x70 s __ct__21daNpcCd2_HIO_MChild_cFv = .text:0x8015AA14; // type:function size:0x58 scope:global align:4 __dt__14daNpcCd2_HIO_cFv = .text:0x8015AA6C; // type:function size:0xAC scope:global align:4 __sinit_d_a_npc_cd2_cpp = .text:0x8015AB18; // type:function size:0x4C0 scope:local align:4 -Reflect__FP4cXyzRC13cBgS_PolyInfof = .text:0x8015AFD8; // type:function size:0x2EC scope:global align:4 +Reflect__FP4cXyzRC13cBgS_PolyInfof = .text:0x8015AFD8; // type:function size:0x2EC scope:local align:4 getData__12daItemBase_cFv = .text:0x8015B2C4; // type:function size:0xC scope:global align:4 initBaseMtx__8daItem_cFv = .text:0x8015B2D0; // type:function size:0x44 scope:global align:4 setBaseMtx__8daItem_cFv = .text:0x8015B314; // type:function size:0x88 scope:global align:4 setBaseMtx_0__8daItem_cFv = .text:0x8015B39C; // type:function size:0x38 scope:global align:4 setBaseMtx_1__8daItem_cFv = .text:0x8015B3D4; // type:function size:0x8C scope:global align:4 -itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B460; // type:function size:0xCC scope:global align:4 -itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B52C; // type:function size:0xB8 scope:global align:4 +itemGetCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B460; // type:function size:0xCC scope:local align:4 +itemGetTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf = .text:0x8015B52C; // type:function size:0xB8 scope:local align:4 CreateInit__8daItem_cFv = .text:0x8015B5E4; // type:function size:0x3E4 scope:global align:4 setCullInfo__8daItem_cFv = .text:0x8015B9C8; // type:function size:0x18 scope:global align:4 _daItem_create__8daItem_cFv = .text:0x8015B9E0; // type:function size:0x268 scope:global align:4 -__dt__16Z2SoundObjSimpleFv = .text:0x8015BC48; // type:function size:0x60 scope:global align:4 +__dt__16Z2SoundObjSimpleFv = .text:0x8015BC48; // type:function size:0x60 scope:weak align:4 _daItem_execute__8daItem_cFv = .text:0x8015BCA8; // type:function size:0x2E8 scope:global align:4 _daItem_draw__8daItem_cFv = .text:0x8015BF90; // type:function size:0x64 scope:global align:4 _daItem_delete__8daItem_cFv = .text:0x8015BFF4; // type:function size:0x78 scope:global align:4 @@ -6554,13 +6554,13 @@ initFlag__8daItem_cFv = .text:0x8015DCB8; // type:function size:0x144 scope:glob initScale__8daItem_cFv = .text:0x8015DDFC; // type:function size:0x50 scope:global align:4 initSpeed__8daItem_cFi = .text:0x8015DE4C; // type:function size:0x1F8 scope:global align:4 initAngle__8daItem_cFv = .text:0x8015E044; // type:function size:0x18 scope:global align:4 -daItem_Draw__FP8daItem_c = .text:0x8015E05C; // type:function size:0x20 scope:global align:4 -daItem_Execute__FP8daItem_c = .text:0x8015E07C; // type:function size:0x20 scope:global align:4 -daItem_Delete__FP8daItem_c = .text:0x8015E09C; // type:function size:0x20 scope:global align:4 -daItem_Create__FP10fopAc_ac_c = .text:0x8015E0BC; // type:function size:0x20 scope:global align:4 +daItem_Draw__FP8daItem_c = .text:0x8015E05C; // type:function size:0x20 scope:local align:4 +daItem_Execute__FP8daItem_c = .text:0x8015E07C; // type:function size:0x20 scope:local align:4 +daItem_Delete__FP8daItem_c = .text:0x8015E09C; // type:function size:0x20 scope:local align:4 +daItem_Create__FP10fopAc_ac_c = .text:0x8015E0BC; // type:function size:0x20 scope:local align:4 __sinit_d_a_obj_item_cpp = .text:0x8015E0DC; // type:function size:0x108 scope:local align:4 -getItemPos__9daPy_py_cCFv = .text:0x8015E1E4; // type:function size:0x1C scope:global align:4 -getLeftHandPos__9daPy_py_cCFv = .text:0x8015E200; // type:function size:0x1C scope:global align:4 +getItemPos__9daPy_py_cCFv = .text:0x8015E1E4; // type:function size:0x1C scope:weak align:4 +getLeftHandPos__9daPy_py_cCFv = .text:0x8015E200; // type:function size:0x1C scope:weak align:4 __ct__9dInsect_cFv = .text:0x8015E21C; // type:function size:0x68 scope:global align:4 Insect_GetDemoMain__9dInsect_cFv = .text:0x8015E284; // type:function size:0x1F4 scope:global align:4 CalcZBuffer__9dInsect_cFf = .text:0x8015E478; // type:function size:0x18C scope:global align:4 @@ -6863,21 +6863,21 @@ checkNoAttention__12daTagMstop_cCFv = .text:0x80182F70; // type:function size:0x checkNoAttention__12daTagMhint_cCFv = .text:0x80182F84; // type:function size:0x14 scope:global align:4 set__4cXyzFfff = .text:0x80182F98; // type:function size:0x10 scope:global align:4 checkEndMessage__12daTagMwait_cFv = .text:0x80182FA8; // type:function size:0x38 scope:global align:4 -dEnvSe_Draw__FP8dEnvSe_c = .text:0x80182FE0; // type:function size:0x8 scope:global align:4 -dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath = .text:0x80182FE8; // type:function size:0x1FC scope:global align:4 +dEnvSe_Draw__FP8dEnvSe_c = .text:0x80182FE0; // type:function size:0x8 scope:local align:4 +dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath = .text:0x80182FE8; // type:function size:0x1FC scope:local align:4 execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc = .text:0x801831E4; // type:function size:0x4A8 scope:global align:4 execute__8dEnvSe_cFv = .text:0x8018368C; // type:function size:0x120 scope:global align:4 -dEnvSe_Execute__FP8dEnvSe_c = .text:0x801837AC; // type:function size:0x20 scope:global align:4 -dEnvSe_IsDelete__FP8dEnvSe_c = .text:0x801837CC; // type:function size:0x8 scope:global align:4 -dEnvSe_Delete__FP8dEnvSe_c = .text:0x801837D4; // type:function size:0x8 scope:global align:4 -dEnvSe_Create__FP8dEnvSe_c = .text:0x801837DC; // type:function size:0x28 scope:global align:4 +dEnvSe_Execute__FP8dEnvSe_c = .text:0x801837AC; // type:function size:0x20 scope:local align:4 +dEnvSe_IsDelete__FP8dEnvSe_c = .text:0x801837CC; // type:function size:0x8 scope:local align:4 +dEnvSe_Delete__FP8dEnvSe_c = .text:0x801837D4; // type:function size:0x8 scope:local align:4 +dEnvSe_Create__FP8dEnvSe_c = .text:0x801837DC; // type:function size:0x28 scope:local align:4 __ct__9dFs_HIO_cFv = .text:0x80183804; // type:function size:0x74 scope:global align:4 __ct__14dFile_select_cFP10JKRArchive = .text:0x80183878; // type:function size:0xF0 scope:global align:4 __dt__14dFile_select_cFv = .text:0x80183968; // type:function size:0xA90 scope:global align:4 -__dt__15J2DAnmTevRegKeyFv = .text:0x801843F8; // type:function size:0x88 scope:global align:4 -__dt__19J2DAnmTextureSRTKeyFv = .text:0x80184480; // type:function size:0x88 scope:global align:4 -__dt__11J2DAnmColorFv = .text:0x80184508; // type:function size:0x74 scope:global align:4 -__dt__15J2DAnmTransformFv = .text:0x8018457C; // type:function size:0x5C scope:global align:4 +__dt__15J2DAnmTevRegKeyFv = .text:0x801843F8; // type:function size:0x88 scope:weak align:4 +__dt__19J2DAnmTextureSRTKeyFv = .text:0x80184480; // type:function size:0x88 scope:weak align:4 +__dt__11J2DAnmColorFv = .text:0x80184508; // type:function size:0x74 scope:weak align:4 +__dt__15J2DAnmTransformFv = .text:0x8018457C; // type:function size:0x5C scope:weak align:4 _create__14dFile_select_cFv = .text:0x801845D8; // type:function size:0x130 scope:global align:4 _move__14dFile_select_cFv = .text:0x80184708; // type:function size:0x168 scope:global align:4 selFileWakuAnm__14dFile_select_cFv = .text:0x80184870; // type:function size:0x23C scope:global align:4 @@ -6905,7 +6905,7 @@ menuSelect__14dFile_select_cFv = .text:0x80186980; // type:function size:0x178 s menuSelectStart__14dFile_select_cFv = .text:0x80186AF8; // type:function size:0x194 scope:global align:4 menuSelectCansel__14dFile_select_cFv = .text:0x80186C8C; // type:function size:0xC8 scope:global align:4 menuMoveAnmInitSet__14dFile_select_cFii = .text:0x80186D54; // type:function size:0x13C scope:global align:4 -setWhite__10J2DTextBoxFQ28JUtility6TColor = .text:0x80186E90; // type:function size:0x28 scope:global align:4 +setWhite__10J2DTextBoxFQ28JUtility6TColor = .text:0x80186E90; // type:function size:0x28 scope:weak align:4 menuMoveAnm__14dFile_select_cFv = .text:0x80186EB8; // type:function size:0x168 scope:global align:4 menuSelectAnmSet__14dFile_select_cFv = .text:0x80187020; // type:function size:0x184 scope:global align:4 menuSelectMoveAnm__14dFile_select_cFv = .text:0x801871A4; // type:function size:0x284 scope:global align:4 @@ -6962,8 +6962,8 @@ backDatSelWait__14dFile_select_cFv = .text:0x8018AE48; // type:function size:0xF backDatSelWait2__14dFile_select_cFv = .text:0x8018AF44; // type:function size:0x64 scope:global align:4 nextModeWait__14dFile_select_cFv = .text:0x8018AFA8; // type:function size:0x4 scope:global align:4 screenSet__14dFile_select_cFv = .text:0x8018AFAC; // type:function size:0x1140 scope:global align:4 -setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor = .text:0x8018C0EC; // type:function size:0x48 scope:global align:4 -setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey = .text:0x8018C134; // type:function size:0x4 scope:global align:4 +setBlackWhite__10J2DPictureFQ28JUtility6TColorQ28JUtility6TColor = .text:0x8018C0EC; // type:function size:0x48 scope:weak align:4 +setAnimation__7J2DPaneFP19J2DAnmTextureSRTKey = .text:0x8018C134; // type:function size:0x4 scope:weak align:4 screenSetCopySel__14dFile_select_cFv = .text:0x8018C138; // type:function size:0x5F8 scope:global align:4 screenSetYesNo__14dFile_select_cFv = .text:0x8018C730; // type:function size:0x3D0 scope:global align:4 screenSet3Menu__14dFile_select_cFv = .text:0x8018CB00; // type:function size:0x3DC scope:global align:4 @@ -7056,16 +7056,16 @@ createMaskModel__16dFile_select3D_cFv = .text:0x80190DB4; // type:function size: createMirrorModel__16dFile_select3D_cFv = .text:0x80190F74; // type:function size:0x280 scope:global align:4 toItem3Dpos__16dFile_select3D_cFfffP4cXyz = .text:0x801911F4; // type:function size:0xEC scope:global align:4 calcViewMtx__16dFile_select3D_cFPA4_f = .text:0x801912E0; // type:function size:0x5C scope:global align:4 -getTransform__15J2DAnmTransformCFUsP16J3DTransformInfo = .text:0x8019133C; // type:function size:0x4 scope:global align:4 -__dt__10JUTNameTabFv = .text:0x80191340; // type:function size:0x48 scope:global align:4 -__dt__17dDlst_FileSel3m_cFv = .text:0x80191388; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_FileSelYn_cFv = .text:0x80191400; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_FileSelCp_cFv = .text:0x80191478; // type:function size:0x78 scope:global align:4 -__dt__17dDlst_FileSelDt_cFv = .text:0x801914F0; // type:function size:0x78 scope:global align:4 -__dt__15dDlst_FileSel_cFv = .text:0x80191568; // type:function size:0x84 scope:global align:4 -__dt__9dFs_HIO_cFv = .text:0x801915EC; // type:function size:0x48 scope:global align:4 +getTransform__15J2DAnmTransformCFUsP16J3DTransformInfo = .text:0x8019133C; // type:function size:0x4 scope:weak align:4 +__dt__10JUTNameTabFv = .text:0x80191340; // type:function size:0x48 scope:weak align:4 +__dt__17dDlst_FileSel3m_cFv = .text:0x80191388; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_FileSelYn_cFv = .text:0x80191400; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_FileSelCp_cFv = .text:0x80191478; // type:function size:0x78 scope:weak align:4 +__dt__17dDlst_FileSelDt_cFv = .text:0x801914F0; // type:function size:0x78 scope:weak align:4 +__dt__15dDlst_FileSel_cFv = .text:0x80191568; // type:function size:0x84 scope:weak align:4 +__dt__9dFs_HIO_cFv = .text:0x801915EC; // type:function size:0x48 scope:weak align:4 __sinit_d_file_select_cpp = .text:0x80191634; // type:function size:0x744 scope:local align:4 -getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x80191D78; // type:function size:0x40 scope:global align:4 +getString__12dMsgString_cFUlP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x80191D78; // type:function size:0x40 scope:weak align:4 __ct__15dFile_warning_cFP10JKRArchiveUc = .text:0x80191DB8; // type:function size:0x6C scope:global align:4 __dt__15dFile_warning_cFv = .text:0x80191E24; // type:function size:0xDC scope:global align:4 screenSet__15dFile_warning_cFv = .text:0x80191F00; // type:function size:0x224 scope:global align:4 @@ -7080,11 +7080,11 @@ _draw__15dFile_warning_cFv = .text:0x8019239C; // type:function size:0x3C scope: drawSelf__15dFile_warning_cFv = .text:0x801923D8; // type:function size:0x2C scope:global align:4 setText__15dFile_warning_cFUl = .text:0x80192404; // type:function size:0x48 scope:global align:4 setFontColor__15dFile_warning_cFQ28JUtility6TColorQ28JUtility6TColor = .text:0x8019244C; // type:function size:0xCC scope:global align:4 -setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor = .text:0x80192518; // type:function size:0x48 scope:global align:4 +setBlackWhite__10J2DTextBoxFQ28JUtility6TColorQ28JUtility6TColor = .text:0x80192518; // type:function size:0x48 scope:weak align:4 draw__16dDlst_FileWarn_cFv = .text:0x80192560; // type:function size:0x38 scope:global align:4 __sinit_d_file_sel_warning_cpp = .text:0x80192598; // type:function size:0x40 scope:local align:4 -__dt__16dDlst_FileWarn_cFv = .text:0x801925D8; // type:function size:0x48 scope:global align:4 -setAnimation__9J2DScreenFP15J2DAnmTransform = .text:0x80192620; // type:function size:0x20 scope:global align:4 +__dt__16dDlst_FileWarn_cFv = .text:0x801925D8; // type:function size:0x48 scope:weak align:4 +setAnimation__9J2DScreenFP15J2DAnmTransform = .text:0x80192620; // type:function size:0x20 scope:weak align:4 __ct__12dFile_info_cFP10JKRArchiveUc = .text:0x80192640; // type:function size:0x6C scope:global align:4 __dt__12dFile_info_cFv = .text:0x801926AC; // type:function size:0xD0 scope:global align:4 screenSet__12dFile_info_cFv = .text:0x8019277C; // type:function size:0x3E4 scope:global align:4 @@ -7097,7 +7097,7 @@ modeMove__12dFile_info_cFv = .text:0x80192FB4; // type:function size:0x4 scope:g _draw__12dFile_info_cFv = .text:0x80192FB8; // type:function size:0x3C scope:global align:4 draw__16dDlst_FileInfo_cFv = .text:0x80192FF4; // type:function size:0xEC scope:global align:4 __sinit_d_file_sel_info_cpp = .text:0x801930E0; // type:function size:0x40 scope:local align:4 -__dt__16dDlst_FileInfo_cFv = .text:0x80193120; // type:function size:0x48 scope:global align:4 +__dt__16dDlst_FileInfo_cFv = .text:0x80193120; // type:function size:0x48 scope:weak align:4 __ct__14dBrightCheck_cFP10JKRArchive = .text:0x80193168; // type:function size:0x88 scope:global align:4 __dt__14dBrightCheck_cFv = .text:0x801931F0; // type:function size:0x98 scope:global align:4 screenSet__14dBrightCheck_cFv = .text:0x80193288; // type:function size:0x4A0 scope:global align:4 @@ -7107,9 +7107,9 @@ modeMove__14dBrightCheck_cFv = .text:0x80193764; // type:function size:0x88 scop _draw__14dBrightCheck_cFv = .text:0x801937EC; // type:function size:0x3C scope:global align:4 draw__19dDlst_BrightCheck_cFv = .text:0x80193828; // type:function size:0x38 scope:global align:4 __sinit_d_bright_check_cpp = .text:0x80193860; // type:function size:0x40 scope:local align:4 -__dt__19dDlst_BrightCheck_cFv = .text:0x801938A0; // type:function size:0x48 scope:global align:4 +__dt__19dDlst_BrightCheck_cFv = .text:0x801938A0; // type:function size:0x48 scope:weak align:4 __ct__8dScope_cFUc = .text:0x801938E8; // type:function size:0x2D0 scope:global align:4 -__ct__Q28JUtility6TColorFv = .text:0x80193BB8; // type:function size:0xC scope:global align:4 +__ct__Q28JUtility6TColorFv = .text:0x80193BB8; // type:function size:0xC scope:weak align:4 __dt__8dScope_cFv = .text:0x80193BC4; // type:function size:0x224 scope:global align:4 _execute__8dScope_cFUl = .text:0x80193DE8; // type:function size:0xD8 scope:global align:4 draw__8dScope_cFv = .text:0x80193EC0; // type:function size:0x338 scope:global align:4 @@ -7120,12 +7120,12 @@ move_init__8dScope_cFv = .text:0x801942A0; // type:function size:0x4 scope:globa move_proc__8dScope_cFv = .text:0x801942A4; // type:function size:0x4 scope:global align:4 close_init__8dScope_cFv = .text:0x801942A8; // type:function size:0x4 scope:global align:4 close_proc__8dScope_cFv = .text:0x801942AC; // type:function size:0x80 scope:global align:4 -__dt__11dMeterSub_cFv = .text:0x8019432C; // type:function size:0x48 scope:global align:4 -_create__11dMeterSub_cFv = .text:0x80194374; // type:function size:0x8 scope:global align:4 -_delete__11dMeterSub_cFv = .text:0x8019437C; // type:function size:0x8 scope:global align:4 -draw__11dMeterSub_cFv = .text:0x80194384; // type:function size:0x4 scope:global align:4 -_execute__11dMeterSub_cFUl = .text:0x80194388; // type:function size:0x8 scope:global align:4 -isDead__11dMeterSub_cFv = .text:0x80194390; // type:function size:0x8 scope:global align:4 +__dt__11dMeterSub_cFv = .text:0x8019432C; // type:function size:0x48 scope:weak align:4 +_create__11dMeterSub_cFv = .text:0x80194374; // type:function size:0x8 scope:weak align:4 +_delete__11dMeterSub_cFv = .text:0x8019437C; // type:function size:0x8 scope:weak align:4 +draw__11dMeterSub_cFv = .text:0x80194384; // type:function size:0x4 scope:weak align:4 +_execute__11dMeterSub_cFUl = .text:0x80194388; // type:function size:0x8 scope:weak align:4 +isDead__11dMeterSub_cFv = .text:0x80194390; // type:function size:0x8 scope:weak align:4 __sinit_d_scope_cpp = .text:0x80194398; // type:function size:0xA4 scope:local align:4 __ct__19dSelect_cursorHIO_cFv = .text:0x8019443C; // type:function size:0x3C scope:global align:4 __ct__16dSelect_cursor_cFUcfP10JKRArchive = .text:0x80194478; // type:function size:0x7CC scope:global align:4 @@ -7143,13 +7143,13 @@ setBtk0Animation__16dSelect_cursor_cFP19J2DAnmTextureSRTKey = .text:0x80195848; setCursorAnimation__16dSelect_cursor_cFv = .text:0x8019597C; // type:function size:0x1BC scope:global align:4 setBckAnimation__16dSelect_cursor_cFP18J2DAnmTransformKey = .text:0x80195B38; // type:function size:0x60 scope:global align:4 moveCenter__16dSelect_cursor_cFP7J2DPaneff = .text:0x80195B98; // type:function size:0x38 scope:global align:4 -__dt__19dSelect_cursorHIO_cFv = .text:0x80195BD0; // type:function size:0x48 scope:global align:4 -__dt__18J2DAnmTransformKeyFv = .text:0x80195C18; // type:function size:0x6C scope:global align:4 +__dt__19dSelect_cursorHIO_cFv = .text:0x80195BD0; // type:function size:0x48 scope:weak align:4 +__dt__18J2DAnmTransformKeyFv = .text:0x80195C18; // type:function size:0x6C scope:weak align:4 __ct__9dSi_HIO_cFv = .text:0x80195C84; // type:function size:0x10 scope:global align:4 animation__14dSelect_icon_cFv = .text:0x80195C94; // type:function size:0x104 scope:global align:4 setAlpha__14dSelect_icon_cFUc = .text:0x80195D98; // type:function size:0x30 scope:global align:4 setPos__14dSelect_icon_cFP7J2DPaneff = .text:0x80195DC8; // type:function size:0xAC scope:global align:4 -__dt__9dSi_HIO_cFv = .text:0x80195E74; // type:function size:0x48 scope:global align:4 +__dt__9dSi_HIO_cFv = .text:0x80195E74; // type:function size:0x48 scope:weak align:4 __sinit_d_select_icon_cpp = .text:0x80195EBC; // type:function size:0x38 scope:local align:4 shop_cam_action_init__16ShopCam_action_cFv = .text:0x80195EF4; // type:function size:0x17C scope:global align:4 shop_cam_action__16ShopCam_action_cFv = .text:0x80196070; // type:function size:0x4F4 scope:global align:4 @@ -7167,8 +7167,8 @@ getCurrentPos__15dShopItemCtrl_cFi = .text:0x80196BF8; // type:function size:0x9 isHomePos__15dShopItemCtrl_cFi = .text:0x80196C94; // type:function size:0xB4 scope:global align:4 setRotateAnime__15dShopItemCtrl_cFi = .text:0x80196D48; // type:function size:0xB4 scope:global align:4 setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb = .text:0x80196DFC; // type:function size:0x4F4 scope:global align:4 -dShopSystem_searchItemActor__FPvPv = .text:0x801972F0; // type:function size:0x1D8 scope:global align:4 -dShopSystem_searchCameraActor__FPvPv = .text:0x801974C8; // type:function size:0xC8 scope:global align:4 +dShopSystem_searchItemActor__FPvPv = .text:0x801972F0; // type:function size:0x1D8 scope:local align:4 +dShopSystem_searchCameraActor__FPvPv = .text:0x801974C8; // type:function size:0xC8 scope:local align:4 initShopSystem__13dShopSystem_cFv = .text:0x80197590; // type:function size:0x1AC scope:global align:4 __dt__13dShopSystem_cFv = .text:0x8019773C; // type:function size:0xDC scope:global align:4 onFlag__13dShopSystem_cFi = .text:0x80197818; // type:function size:0x1C scope:global align:4 @@ -7215,9 +7215,9 @@ checkLeftTrigger__13dShopSystem_cFP9STControl = .text:0x8019ADB8; // type:functi checkRightTrigger__13dShopSystem_cFP9STControl = .text:0x8019ADDC; // type:function size:0x24 scope:global align:4 dpdMove__13dShopSystem_cFv = .text:0x8019AE00; // type:function size:0x8 scope:global align:4 __sinit_d_shop_system_cpp = .text:0x8019AE08; // type:function size:0x130 scope:local align:4 -beforeStartSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019AF38; // type:function size:0x8 scope:global align:4 -beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019AF40; // type:function size:0x8 scope:global align:4 -getResName2__13dShopSystem_cFi = .text:0x8019AF48; // type:function size:0x8 scope:global align:4 +beforeStartSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019AF38; // type:function size:0x8 scope:weak align:4 +beforeSelectSeqAction__13dShopSystem_cFP10dMsgFlow_ci = .text:0x8019AF40; // type:function size:0x8 scope:weak align:4 +getResName2__13dShopSystem_cFi = .text:0x8019AF48; // type:function size:0x8 scope:weak align:4 draw__24dDlst_Gameover_CAPTURE_cFv = .text:0x8019AF50; // type:function size:0x2E8 scope:global align:4 __ct__10dGov_HIO_cFv = .text:0x8019B238; // type:function size:0x64 scope:global align:4 _create__11dGameover_cFv = .text:0x8019B29C; // type:function size:0x2B0 scope:global align:4 @@ -7246,17 +7246,17 @@ __ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive = .text:0x8019BB98; // type:funct __dt__24dDlst_GameOverScrnDraw_cFv = .text:0x8019BE54; // type:function size:0xB4 scope:global align:4 setBackAlpha__24dDlst_GameOverScrnDraw_cFf = .text:0x8019BF08; // type:function size:0x44 scope:global align:4 draw__24dDlst_GameOverScrnDraw_cFv = .text:0x8019BF4C; // type:function size:0x248 scope:global align:4 -dGameover_Draw__FP11dGameover_c = .text:0x8019C194; // type:function size:0x20 scope:global align:4 -dGameover_Execute__FP11dGameover_c = .text:0x8019C1B4; // type:function size:0x20 scope:global align:4 -dGameover_IsDelete__FP11dGameover_c = .text:0x8019C1D4; // type:function size:0x8 scope:global align:4 -dGameover_Delete__FP11dGameover_c = .text:0x8019C1DC; // type:function size:0x20 scope:global align:4 -dGameover_Create__FP9msg_class = .text:0x8019C1FC; // type:function size:0x20 scope:global align:4 +dGameover_Draw__FP11dGameover_c = .text:0x8019C194; // type:function size:0x20 scope:local align:4 +dGameover_Execute__FP11dGameover_c = .text:0x8019C1B4; // type:function size:0x20 scope:local align:4 +dGameover_IsDelete__FP11dGameover_c = .text:0x8019C1D4; // type:function size:0x8 scope:local align:4 +dGameover_Delete__FP11dGameover_c = .text:0x8019C1DC; // type:function size:0x20 scope:local align:4 +dGameover_Create__FP9msg_class = .text:0x8019C1FC; // type:function size:0x20 scope:local align:4 d_GameOver_Create__FUc = .text:0x8019C21C; // type:function size:0x44 scope:global align:4 d_GameOver_Delete__FRUi = .text:0x8019C260; // type:function size:0x64 scope:global align:4 -__dt__10dGov_HIO_cFv = .text:0x8019C2C4; // type:function size:0x5C scope:global align:4 +__dt__10dGov_HIO_cFv = .text:0x8019C2C4; // type:function size:0x5C scope:weak align:4 __sinit_d_gameover_cpp = .text:0x8019C320; // type:function size:0x204 scope:local align:4 -__dt__24dDlst_Gameover_CAPTURE_cFv = .text:0x8019C524; // type:function size:0x48 scope:global align:4 -__dt__12dMenu_save_cFv = .text:0x8019C56C; // type:function size:0x74 scope:global align:4 +__dt__24dDlst_Gameover_CAPTURE_cFv = .text:0x8019C524; // type:function size:0x48 scope:weak align:4 +__dt__12dMenu_save_cFv = .text:0x8019C56C; // type:function size:0x74 scope:weak align:4 dKy_WolfPowerup_AmbCol__FP11_GXColorS10 = .text:0x8019C5E0; // type:function size:0x1C scope:global align:4 dKy_sense_pat_get__Fv = .text:0x8019C5FC; // type:function size:0x768 scope:global align:4 dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10 = .text:0x8019CD64; // type:function size:0x1D0 scope:global align:4 @@ -7266,16 +7266,16 @@ dKy_twi_wolflight_set__Fi = .text:0x8019D23C; // type:function size:0x1BC scope: dKy_lightdir_set__FffP3Vec = .text:0x8019D3F8; // type:function size:0x124 scope:global align:4 dKy_GXInitLightSpot__FP12J3DLightInfofUc = .text:0x8019D51C; // type:function size:0x188 scope:global align:4 dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc = .text:0x8019D6A4; // type:function size:0xD4 scope:global align:4 -u8_data_ratio_set__FUcUcf = .text:0x8019D778; // type:function size:0x4C scope:global align:4 -s16_data_ratio_set__Fssf = .text:0x8019D7C4; // type:function size:0x50 scope:global align:4 -kankyo_color_ratio_calc_common__Fsf = .text:0x8019D814; // type:function size:0x60 scope:global align:4 -kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f = .text:0x8019D874; // type:function size:0x70 scope:global align:4 -kankyo_color_ratio_set__FUcUcfUcUcfsf = .text:0x8019D8E4; // type:function size:0x104 scope:global align:4 -fl_data_ratio_set__Ffff = .text:0x8019D9E8; // type:function size:0x10 scope:global align:4 -float_kankyo_color_ratio_set__Fffffffff = .text:0x8019D9F8; // type:function size:0xD8 scope:global align:4 -get_parcent__Ffff = .text:0x8019DAD0; // type:function size:0x34 scope:global align:4 +u8_data_ratio_set__FUcUcf = .text:0x8019D778; // type:function size:0x4C scope:local align:4 +s16_data_ratio_set__Fssf = .text:0x8019D7C4; // type:function size:0x50 scope:local align:4 +kankyo_color_ratio_calc_common__Fsf = .text:0x8019D814; // type:function size:0x60 scope:local align:4 +kankyo_color_ratio_calc__FP8_GXColor11_GXColorS10f = .text:0x8019D874; // type:function size:0x70 scope:local align:4 +kankyo_color_ratio_set__FUcUcfUcUcfsf = .text:0x8019D8E4; // type:function size:0x104 scope:local align:4 +fl_data_ratio_set__Ffff = .text:0x8019D9E8; // type:function size:0x10 scope:local align:4 +float_kankyo_color_ratio_set__Fffffffff = .text:0x8019D9F8; // type:function size:0xD8 scope:local align:4 +get_parcent__Ffff = .text:0x8019DAD0; // type:function size:0x34 scope:local align:4 dKy_get_parcent__Ffff = .text:0x8019DB04; // type:function size:0x20 scope:global align:4 -dKy_FiveSenses_fullthrottle_dark_static1__Fv = .text:0x8019DB24; // type:function size:0x480 scope:global align:4 +dKy_FiveSenses_fullthrottle_dark_static1__Fv = .text:0x8019DB24; // type:function size:0x480 scope:local align:4 dKy_FiveSenses_fullthrottle_dark__Fv = .text:0x8019DFA4; // type:function size:0x20 scope:global align:4 dKy_light_influence_id__F4cXyzi = .text:0x8019DFC4; // type:function size:0x3D0 scope:global align:4 dKy_eflight_influence_id__F4cXyzi = .text:0x8019E394; // type:function size:0x2C8 scope:global align:4 @@ -7284,26 +7284,26 @@ dKy_light_influence_col__FP8_GXColorf = .text:0x8019E688; // type:function size: dKy_light_influence_power__Fi = .text:0x8019E778; // type:function size:0x28 scope:global align:4 dKy_light_influence_yuragi__Fi = .text:0x8019E7A0; // type:function size:0x28 scope:global align:4 dKy_light_influence_distance__F4cXyzi = .text:0x8019E7C8; // type:function size:0x124 scope:global align:4 -plight_init__Fv = .text:0x8019E8EC; // type:function size:0x74 scope:global align:4 -darkmist_init__Fv = .text:0x8019E960; // type:function size:0x2C scope:global align:4 -plight_set__Fv = .text:0x8019E98C; // type:function size:0x120 scope:global align:4 -bgparts_activelight_init__Fv = .text:0x8019EAAC; // type:function size:0x20 scope:global align:4 -dungeonlight_init__Fv = .text:0x8019EACC; // type:function size:0x22C scope:global align:4 -undwater_init__Fv = .text:0x8019ECF8; // type:function size:0x130 scope:global align:4 +plight_init__Fv = .text:0x8019E8EC; // type:function size:0x74 scope:local align:4 +darkmist_init__Fv = .text:0x8019E960; // type:function size:0x2C scope:local align:4 +plight_set__Fv = .text:0x8019E98C; // type:function size:0x120 scope:local align:4 +bgparts_activelight_init__Fv = .text:0x8019EAAC; // type:function size:0x20 scope:local align:4 +dungeonlight_init__Fv = .text:0x8019EACC; // type:function size:0x22C scope:local align:4 +undwater_init__Fv = .text:0x8019ECF8; // type:function size:0x130 scope:local align:4 dKy_light_size_get__FPCc = .text:0x8019EE28; // type:function size:0xC8 scope:global align:4 -envcolor_init__Fv = .text:0x8019EEF0; // type:function size:0x5CC scope:global align:4 +envcolor_init__Fv = .text:0x8019EEF0; // type:function size:0x5CC scope:local align:4 dKy_clear_game_init__Fv = .text:0x8019F4BC; // type:function size:0x84 scope:global align:4 __ct__18dScnKy_env_light_cFv = .text:0x8019F540; // type:function size:0x118 scope:global align:4 -__ct__19GB_MAPLE_COL_CHANGEFv = .text:0x8019F658; // type:function size:0x38 scope:global align:4 -__dt__10BOSS_LIGHTFv = .text:0x8019F690; // type:function size:0x3C scope:global align:4 -__ct__10BOSS_LIGHTFv = .text:0x8019F6CC; // type:function size:0x4 scope:global align:4 -__dt__13DUNGEON_LIGHTFv = .text:0x8019F6D0; // type:function size:0x3C scope:global align:4 -__ct__13DUNGEON_LIGHTFv = .text:0x8019F70C; // type:function size:0x4 scope:global align:4 -__dt__15WIND_INF_ENTITYFv = .text:0x8019F710; // type:function size:0x3C scope:global align:4 -__ct__15WIND_INF_ENTITYFv = .text:0x8019F74C; // type:function size:0x4 scope:global align:4 -__ct__15LIGHT_INFLUENCEFv = .text:0x8019F750; // type:function size:0x4 scope:global align:4 +__ct__19GB_MAPLE_COL_CHANGEFv = .text:0x8019F658; // type:function size:0x38 scope:weak align:4 +__dt__10BOSS_LIGHTFv = .text:0x8019F690; // type:function size:0x3C scope:weak align:4 +__ct__10BOSS_LIGHTFv = .text:0x8019F6CC; // type:function size:0x4 scope:weak align:4 +__dt__13DUNGEON_LIGHTFv = .text:0x8019F6D0; // type:function size:0x3C scope:weak align:4 +__ct__13DUNGEON_LIGHTFv = .text:0x8019F70C; // type:function size:0x4 scope:weak align:4 +__dt__15WIND_INF_ENTITYFv = .text:0x8019F710; // type:function size:0x3C scope:weak align:4 +__ct__15WIND_INF_ENTITYFv = .text:0x8019F74C; // type:function size:0x4 scope:weak align:4 +__ct__15LIGHT_INFLUENCEFv = .text:0x8019F750; // type:function size:0x4 scope:weak align:4 setDaytime__18dScnKy_env_light_cFv = .text:0x8019F754; // type:function size:0x284 scope:global align:4 -GetTimePass__20dStage_roomControl_cFv = .text:0x8019F9D8; // type:function size:0x8 scope:global align:4 +GetTimePass__20dStage_roomControl_cFv = .text:0x8019F9D8; // type:function size:0x8 scope:weak align:4 setSunpos__18dScnKy_env_light_cFv = .text:0x8019F9E0; // type:function size:0x280 scope:global align:4 getDaytime__18dScnKy_env_light_cFv = .text:0x8019FC60; // type:function size:0x8 scope:global align:4 dKy_getdaytime_hour__Fv = .text:0x8019FC68; // type:function size:0x2C scope:global align:4 @@ -7320,13 +7320,13 @@ setLight_bg__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfP setLight_actor__18dScnKy_env_light_cFP12dKy_tevstr_cP11_GXColorS10PfPf = .text:0x801A1918; // type:function size:0x6A4 scope:global align:4 settingTevStruct_colget_actor__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf = .text:0x801A1FBC; // type:function size:0x1F4 scope:global align:4 settingTevStruct_colget_player__18dScnKy_env_light_cFP12dKy_tevstr_c = .text:0x801A21B0; // type:function size:0x138 scope:global align:4 -cLib_addCalcU8__FPUcUcss = .text:0x801A22E8; // type:function size:0x98 scope:global align:4 +cLib_addCalcU8__FPUcUcss = .text:0x801A22E8; // type:function size:0x98 scope:local align:4 settingTevStruct_plightcol_plus__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_c11_GXColorS1011_GXColorS10Uc = .text:0x801A2380; // type:function size:0x169C scope:global align:4 settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c = .text:0x801A3A1C; // type:function size:0xC58 scope:global align:4 setLightTevColorType__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c = .text:0x801A4674; // type:function size:0x4 scope:global align:4 -setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci = .text:0x801A4678; // type:function size:0x7E8 scope:global align:4 -setLight__13J3DColorBlockFUlP11J3DLightObj = .text:0x801A4E60; // type:function size:0x4 scope:global align:4 -setAmbColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x801A4E64; // type:function size:0x4 scope:global align:4 +setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci = .text:0x801A4678; // type:function size:0x7E8 scope:local align:4 +setLight__13J3DColorBlockFUlP11J3DLightObj = .text:0x801A4E60; // type:function size:0x4 scope:weak align:4 +setAmbColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x801A4E64; // type:function size:0x4 scope:weak align:4 dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci = .text:0x801A4E68; // type:function size:0x190 scope:global align:4 setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c = .text:0x801A4FF8; // type:function size:0xF0 scope:global align:4 CalcTevColor__18dScnKy_env_light_cFv = .text:0x801A50E8; // type:function size:0x94 scope:global align:4 @@ -7336,11 +7336,11 @@ SetBaseLight__18dScnKy_env_light_cFv = .text:0x801A53C4; // type:function size:0 exeKankyo__18dScnKy_env_light_cFv = .text:0x801A54E0; // type:function size:0x454 scope:global align:4 drawKankyo__18dScnKy_env_light_cFv = .text:0x801A5934; // type:function size:0x50 scope:global align:4 dKy_undwater_filter_draw__Fv = .text:0x801A5984; // type:function size:0x440 scope:global align:4 -dKy_Draw__FP17sub_kankyo__class = .text:0x801A5DC4; // type:function size:0x2C scope:global align:4 -dKy_Execute__FP17sub_kankyo__class = .text:0x801A5DF0; // type:function size:0x34 scope:global align:4 -dKy_IsDelete__FP17sub_kankyo__class = .text:0x801A5E24; // type:function size:0x8 scope:global align:4 -dKy_Delete__FP17sub_kankyo__class = .text:0x801A5E2C; // type:function size:0x48 scope:global align:4 -dKy_Create__FPv = .text:0x801A5E74; // type:function size:0x238 scope:global align:4 +dKy_Draw__FP17sub_kankyo__class = .text:0x801A5DC4; // type:function size:0x2C scope:local align:4 +dKy_Execute__FP17sub_kankyo__class = .text:0x801A5DF0; // type:function size:0x34 scope:local align:4 +dKy_IsDelete__FP17sub_kankyo__class = .text:0x801A5E24; // type:function size:0x8 scope:local align:4 +dKy_Delete__FP17sub_kankyo__class = .text:0x801A5E2C; // type:function size:0x48 scope:local align:4 +dKy_Create__FPv = .text:0x801A5E74; // type:function size:0x238 scope:local align:4 dKy_setLight_init__Fv = .text:0x801A60AC; // type:function size:0x268 scope:global align:4 dKy_setLight__Fv = .text:0x801A6314; // type:function size:0x24 scope:global align:4 dKy_GlobalLight_set__Fv = .text:0x801A6338; // type:function size:0x114 scope:global align:4 @@ -7380,12 +7380,12 @@ dKy_Sound_init__Fv = .text:0x801A83E8; // type:function size:0x30 scope:global a dKy_Sound_set__F4cXyziUii = .text:0x801A8418; // type:function size:0x2B4 scope:global align:4 dKy_Sound_get__Fv = .text:0x801A86CC; // type:function size:0x10 scope:global align:4 dKy_SordFlush_set__F4cXyzi = .text:0x801A86DC; // type:function size:0xB4 scope:global align:4 -GxFogSet_Sub__FP8_GXColor = .text:0x801A8790; // type:function size:0xB0 scope:global align:4 -GxFog_set__Fv = .text:0x801A8840; // type:function size:0x44 scope:global align:4 +GxFogSet_Sub__FP8_GXColor = .text:0x801A8790; // type:function size:0xB0 scope:local align:4 +GxFog_set__Fv = .text:0x801A8840; // type:function size:0x44 scope:local align:4 dKy_GxFog_set__Fv = .text:0x801A8884; // type:function size:0x24 scope:global align:4 dKy_GxFog_tevstr_set__FP12dKy_tevstr_c = .text:0x801A88A8; // type:function size:0xA8 scope:global align:4 dKy_GfFog_tevstr_set__FP12dKy_tevstr_c = .text:0x801A8950; // type:function size:0xA8 scope:global align:4 -GxXFog_set__Fv = .text:0x801A89F8; // type:function size:0x44 scope:global align:4 +GxXFog_set__Fv = .text:0x801A89F8; // type:function size:0x44 scope:local align:4 dKy_change_colpat__FUc = .text:0x801A8A3C; // type:function size:0x28 scope:global align:4 dKy_custom_colset__FUcUcf = .text:0x801A8A64; // type:function size:0x48 scope:global align:4 dKy_setLight_mine__FP12dKy_tevstr_c = .text:0x801A8AAC; // type:function size:0x98 scope:global align:4 @@ -7403,7 +7403,7 @@ dKy_get_dayofweek__Fv = .text:0x801A8D90; // type:function size:0x20 scope:globa dKy_set_nexttime__Ff = .text:0x801A8DB0; // type:function size:0x10 scope:global align:4 dKy_instant_timechg__Ff = .text:0x801A8DC0; // type:function size:0x60 scope:global align:4 dKy_instant_rainchg__Fv = .text:0x801A8E20; // type:function size:0x3C scope:global align:4 -NewAmbColGet__FP11_GXColorS10 = .text:0x801A8E5C; // type:function size:0x21C scope:global align:4 +NewAmbColGet__FP11_GXColorS10 = .text:0x801A8E5C; // type:function size:0x21C scope:local align:4 dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf = .text:0x801A9078; // type:function size:0xDC4 scope:global align:4 dKy_ParticleColor_get_actor__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf = .text:0x801A9E3C; // type:function size:0xD8 scope:global align:4 dKy_ParticleColor_get_bg__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf = .text:0x801A9F14; // type:function size:0xA4 scope:global align:4 @@ -7442,28 +7442,28 @@ dKy_shadow_mode_set__FUc = .text:0x801ACF34; // type:function size:0x18 scope:gl dKy_shadow_mode_reset__FUc = .text:0x801ACF4C; // type:function size:0x18 scope:global align:4 dKy_shadow_mode_check__FUc = .text:0x801ACF64; // type:function size:0x18 scope:global align:4 dKy_bg_MAxx_proc__FPv = .text:0x801ACF7C; // type:function size:0xE98 scope:global align:4 -__dt__18dScnKy_env_light_cFv = .text:0x801ADE14; // type:function size:0xE8 scope:global align:4 +__dt__18dScnKy_env_light_cFv = .text:0x801ADE14; // type:function size:0xE8 scope:weak align:4 __sinit_d_kankyo_cpp = .text:0x801ADEFC; // type:function size:0x5C scope:local align:4 -dKankyo_DayProc__Fv = .text:0x801ADF58; // type:function size:0x38 scope:global align:4 -dKyeff_Draw__FP8dKyeff_c = .text:0x801ADF90; // type:function size:0x24 scope:global align:4 +dKankyo_DayProc__Fv = .text:0x801ADF58; // type:function size:0x38 scope:local align:4 +dKyeff_Draw__FP8dKyeff_c = .text:0x801ADF90; // type:function size:0x24 scope:local align:4 execute__8dKyeff_cFv = .text:0x801ADFB4; // type:function size:0x58 scope:global align:4 -dKyeff_Execute__FP8dKyeff_c = .text:0x801AE00C; // type:function size:0x20 scope:global align:4 -dKyeff_IsDelete__FP8dKyeff_c = .text:0x801AE02C; // type:function size:0x8 scope:global align:4 -dKyeff_Delete__FP8dKyeff_c = .text:0x801AE034; // type:function size:0x24 scope:global align:4 -dKyeff_Create__FP12kankyo_class = .text:0x801AE058; // type:function size:0xA0 scope:global align:4 -dKyeff2_Draw__FP9dKyeff2_c = .text:0x801AE0F8; // type:function size:0x24 scope:global align:4 +dKyeff_Execute__FP8dKyeff_c = .text:0x801AE00C; // type:function size:0x20 scope:local align:4 +dKyeff_IsDelete__FP8dKyeff_c = .text:0x801AE02C; // type:function size:0x8 scope:local align:4 +dKyeff_Delete__FP8dKyeff_c = .text:0x801AE034; // type:function size:0x24 scope:local align:4 +dKyeff_Create__FP12kankyo_class = .text:0x801AE058; // type:function size:0xA0 scope:local align:4 +dKyeff2_Draw__FP9dKyeff2_c = .text:0x801AE0F8; // type:function size:0x24 scope:local align:4 execute__9dKyeff2_cFv = .text:0x801AE11C; // type:function size:0x24 scope:global align:4 -dKyeff2_Execute__FP9dKyeff2_c = .text:0x801AE140; // type:function size:0x20 scope:global align:4 -dKyeff2_IsDelete__FP9dKyeff2_c = .text:0x801AE160; // type:function size:0x8 scope:global align:4 -dKyeff2_Delete__FP9dKyeff2_c = .text:0x801AE168; // type:function size:0x24 scope:global align:4 -dKyeff2_Create__FP12kankyo_class = .text:0x801AE18C; // type:function size:0x24 scope:global align:4 +dKyeff2_Execute__FP9dKyeff2_c = .text:0x801AE140; // type:function size:0x20 scope:local align:4 +dKyeff2_IsDelete__FP9dKyeff2_c = .text:0x801AE160; // type:function size:0x8 scope:local align:4 +dKyeff2_Delete__FP9dKyeff2_c = .text:0x801AE168; // type:function size:0x24 scope:local align:4 +dKyeff2_Create__FP12kankyo_class = .text:0x801AE18C; // type:function size:0x24 scope:local align:4 createHeap__10dThunder_cFv = .text:0x801AE1B0; // type:function size:0x5C scope:global align:4 adjustHeap__10dThunder_cFv = .text:0x801AE20C; // type:function size:0x4C scope:global align:4 -dThunder_Draw__FP10dThunder_c = .text:0x801AE258; // type:function size:0x19C scope:global align:4 -dThunder_Execute__FP10dThunder_c = .text:0x801AE3F4; // type:function size:0x1D8 scope:global align:4 -dThunder_IsDelete__FP10dThunder_c = .text:0x801AE5CC; // type:function size:0x8 scope:global align:4 -dThunder_Delete__FP10dThunder_c = .text:0x801AE5D4; // type:function size:0x80 scope:global align:4 -dThunder_Create__FP12kankyo_class = .text:0x801AE654; // type:function size:0x5C scope:global align:4 +dThunder_Draw__FP10dThunder_c = .text:0x801AE258; // type:function size:0x19C scope:local align:4 +dThunder_Execute__FP10dThunder_c = .text:0x801AE3F4; // type:function size:0x1D8 scope:local align:4 +dThunder_IsDelete__FP10dThunder_c = .text:0x801AE5CC; // type:function size:0x8 scope:local align:4 +dThunder_Delete__FP10dThunder_c = .text:0x801AE5D4; // type:function size:0x80 scope:local align:4 +dThunder_Create__FP12kankyo_class = .text:0x801AE654; // type:function size:0x5C scope:local align:4 create__10dThunder_cFv = .text:0x801AE6B0; // type:function size:0x4E0 scope:global align:4 __ct__15dKantera_icon_cFv = .text:0x801AEB90; // type:function size:0x3C scope:global align:4 __dt__15dKantera_icon_cFv = .text:0x801AEBCC; // type:function size:0xF4 scope:global align:4 @@ -7630,7 +7630,7 @@ screenInit__12dMenu_Dmap_cFv = .text:0x801BB88C; // type:function size:0x1154 sc getPlayerIconPos__12dMenu_Dmap_cFScf = .text:0x801BC9E0; // type:function size:0xC0 scope:global align:4 getIconPos__12dMenu_Dmap_cFScf = .text:0x801BCAA0; // type:function size:0x5AC scope:global align:4 __dt__12dMenu_Dmap_cFv = .text:0x801BD04C; // type:function size:0x350 scope:global align:4 -__dt__19dMenu_DmapMapCtrl_cFv = .text:0x801BD39C; // type:function size:0x90 scope:global align:4 +__dt__19dMenu_DmapMapCtrl_cFv = .text:0x801BD39C; // type:function size:0x90 scope:weak align:4 getCurFloorPos__12dMenu_Dmap_cFv = .text:0x801BD42C; // type:function size:0x14 scope:global align:4 getDefaultCurFloorPos__12dMenu_Dmap_cFv = .text:0x801BD440; // type:function size:0x20 scope:global align:4 iconMoveCalc__12dMenu_Dmap_cFv = .text:0x801BD460; // type:function size:0x1B0 scope:global align:4 @@ -7639,8 +7639,8 @@ drawFloorScreenTop__12dMenu_Dmap_cFP9J2DScreenffP13J2DOrthoGraph = .text:0x801BD isMapMoveState__12dMenu_Dmap_cFv = .text:0x801BD8E8; // type:function size:0x34 scope:global align:4 floorChangeMode__12dMenu_Dmap_cFv = .text:0x801BD91C; // type:function size:0xFC scope:global align:4 _create__12dMenu_Dmap_cFv = .text:0x801BDA18; // type:function size:0x580 scope:global align:4 -append__10J2DPictureFPC7ResTIMGf = .text:0x801BDF98; // type:function size:0x30 scope:global align:4 -insert__10J2DPictureFPC7ResTIMGUcf = .text:0x801BDFC8; // type:function size:0x34 scope:global align:4 +append__10J2DPictureFPC7ResTIMGf = .text:0x801BDF98; // type:function size:0x30 scope:weak align:4 +insert__10J2DPictureFPC7ResTIMGUcf = .text:0x801BDFC8; // type:function size:0x34 scope:weak align:4 _move__12dMenu_Dmap_cFv = .text:0x801BDFFC; // type:function size:0x154 scope:global align:4 setMapTexture__12dMenu_Dmap_cFv = .text:0x801BE150; // type:function size:0x50 scope:global align:4 mapBgAnime__12dMenu_Dmap_cFv = .text:0x801BE1A0; // type:function size:0x24 scope:global align:4 @@ -7679,12 +7679,12 @@ zoomIn_init_proc__12dMenu_Dmap_cFv = .text:0x801C02E4; // type:function size:0x1 zoomIn_proc__12dMenu_Dmap_cFv = .text:0x801C03F8; // type:function size:0x9C scope:global align:4 zoomOut_init_proc__12dMenu_Dmap_cFv = .text:0x801C0494; // type:function size:0xB4 scope:global align:4 zoomOut_proc__12dMenu_Dmap_cFv = .text:0x801C0548; // type:function size:0x90 scope:global align:4 -__dt__15renderingDmap_cFv = .text:0x801C05D8; // type:function size:0xAC scope:global align:4 -__dt__20dMenu_StageMapCtrl_cFv = .text:0x801C0684; // type:function size:0x80 scope:global align:4 -__dt__15dMenu_DmapMap_cFv = .text:0x801C0704; // type:function size:0x70 scope:global align:4 -__ct__15renderingDmap_cFv = .text:0x801C0774; // type:function size:0xA8 scope:global align:4 +__dt__15renderingDmap_cFv = .text:0x801C05D8; // type:function size:0xAC scope:weak align:4 +__dt__20dMenu_StageMapCtrl_cFv = .text:0x801C0684; // type:function size:0x80 scope:weak align:4 +__dt__15dMenu_DmapMap_cFv = .text:0x801C0704; // type:function size:0x70 scope:weak align:4 +__ct__15renderingDmap_cFv = .text:0x801C0774; // type:function size:0xA8 scope:weak align:4 __sinit_d_menu_dmap_cpp = .text:0x801C081C; // type:function size:0x280 scope:local align:4 -@4@__dt__14dMenu_DmapBg_cFv = .text:0x801C0A9C; // type:function size:0x8 scope:local align:4 +@4@__dt__14dMenu_DmapBg_cFv = .text:0x801C0A9C; // type:function size:0x8 scope:weak align:4 hasMap__15renderingDmap_cCFv = .text:0x801C0AA4; // type:function size:0x20 scope:global align:4 isDrawIconSingle2__15renderingDmap_cCFPCQ27dTres_c6data_sbbi = .text:0x801C0AC4; // type:function size:0x2D4 scope:global align:4 getPlayerCursorSize__15renderingDmap_cFv = .text:0x801C0D98; // type:function size:0x8 scope:global align:4 @@ -7779,7 +7779,7 @@ setBButtonString__15dMenu_Fishing_cFUs = .text:0x801C622C; // type:function size getFigure__15dMenu_Fishing_cFi = .text:0x801C62DC; // type:function size:0x44 scope:global align:4 setFishParam__15dMenu_Fishing_cFiUsUc = .text:0x801C6320; // type:function size:0x1B4 scope:global align:4 setHIO__15dMenu_Fishing_cFb = .text:0x801C64D4; // type:function size:0x38C scope:global align:4 -draw__15dMenu_Fishing_cFv = .text:0x801C6860; // type:function size:0x20 scope:global align:4 +draw__15dMenu_Fishing_cFv = .text:0x801C6860; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_fishing_cpp = .text:0x801C6880; // type:function size:0x3C scope:local align:4 __ct__9dMf_HIO_cFv = .text:0x801C68BC; // type:function size:0x34 scope:global align:4 dMenuFmap_getStartStageName__FPv = .text:0x801C68F0; // type:function size:0xB8 scope:global align:4 @@ -7867,7 +7867,7 @@ readWorldData__12dMenu_Fmap_cFUc = .text:0x801CBA34; // type:function size:0x1C8 readAreaData__12dMenu_Fmap_cFUcb = .text:0x801CBBFC; // type:function size:0x5CC scope:global align:4 readRoomData__12dMenu_Fmap_cFPCcP23dMenu_Fmap_stage_data_cPviUc = .text:0x801CC1C8; // type:function size:0x190 scope:global align:4 readFieldMapData__12dMenu_Fmap_cFPPvPCcbb = .text:0x801CC358; // type:function size:0x1F0 scope:global align:4 -getExpandedResSize__10JKRArchiveCFPCv = .text:0x801CC548; // type:function size:0x2C scope:global align:4 +getExpandedResSize__10JKRArchiveCFPCv = .text:0x801CC548; // type:function size:0x2C scope:weak align:4 decodeFieldMapData__12dMenu_Fmap_cFv = .text:0x801CC574; // type:function size:0x23C scope:global align:4 decodePortalData__12dMenu_Fmap_cFv = .text:0x801CC7B0; // type:function size:0x30 scope:global align:4 readRoomDzsData__12dMenu_Fmap_cFPPvUlPCc = .text:0x801CC7E0; // type:function size:0x100 scope:global align:4 @@ -7904,10 +7904,10 @@ howlArrowPosInit__12dMenu_Fmap_cFv = .text:0x801CDAD8; // type:function size:0xA getHowlRegionID__12dMenu_Fmap_cFv = .text:0x801CDB78; // type:function size:0x78 scope:global align:4 isLightVesselGet__12dMenu_Fmap_cFv = .text:0x801CDBF0; // type:function size:0x30 scope:global align:4 getPlayerPos2D__12dMenu_Fmap_cFv = .text:0x801CDC20; // type:function size:0xD0 scope:global align:4 -__dt__9dMf_HIO_cFv = .text:0x801CDCF0; // type:function size:0x48 scope:global align:4 +__dt__9dMf_HIO_cFv = .text:0x801CDCF0; // type:function size:0x48 scope:weak align:4 __sinit_d_menu_fmap_cpp = .text:0x801CDD38; // type:function size:0x5F4 scope:local align:4 -twoValueLineInterpolation__FUcUcf = .text:0x801CE32C; // type:function size:0x64 scope:global align:4 -twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor = .text:0x801CE390; // type:function size:0x90 scope:global align:4 +twoValueLineInterpolation__FUcUcf = .text:0x801CE32C; // type:function size:0x64 scope:local align:4 +twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor = .text:0x801CE390; // type:function size:0x90 scope:local align:4 init__15renderingFmap_cFPUcUsUsUsUs = .text:0x801CE420; // type:function size:0x2C scope:global align:4 entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff = .text:0x801CE44C; // type:function size:0x9C scope:global align:4 isSwitchSpecialOff__15renderingFmap_cFi = .text:0x801CE4E8; // type:function size:0x64 scope:global align:4 @@ -7945,10 +7945,10 @@ getBackColor__15dMenu_FmapMap_cCFv = .text:0x801CF55C; // type:function size:0x8 getColor__15dMenu_FmapMap_cFi = .text:0x801CF564; // type:function size:0xF4 scope:global align:4 setTexture__15dMenu_FmapMap_cFUsUsUsUs = .text:0x801CF658; // type:function size:0xBC scope:global align:4 setRendering__15dMenu_FmapMap_cFP23dMenu_Fmap_world_data_ciffff = .text:0x801CF714; // type:function size:0x80 scope:global align:4 -__dt__15renderingFmap_cFv = .text:0x801CF794; // type:function size:0x8C scope:global align:4 -isRenderingFloor__15renderingFmap_cFi = .text:0x801CF820; // type:function size:0x8 scope:global align:4 -beforeDrawPath__15renderingFmap_cFv = .text:0x801CF828; // type:function size:0x4 scope:global align:4 -afterDrawPath__15renderingFmap_cFv = .text:0x801CF82C; // type:function size:0x4 scope:global align:4 +__dt__15renderingFmap_cFv = .text:0x801CF794; // type:function size:0x8C scope:weak align:4 +isRenderingFloor__15renderingFmap_cFi = .text:0x801CF820; // type:function size:0x8 scope:weak align:4 +beforeDrawPath__15renderingFmap_cFv = .text:0x801CF828; // type:function size:0x4 scope:weak align:4 +afterDrawPath__15renderingFmap_cFv = .text:0x801CF82C; // type:function size:0x4 scope:weak align:4 __ct__18dMenu_Fmap2DBack_cFv = .text:0x801CF830; // type:function size:0x770 scope:global align:4 __dt__18dMenu_Fmap2DBack_cFv = .text:0x801CFFA0; // type:function size:0x258 scope:global align:4 draw__18dMenu_Fmap2DBack_cFv = .text:0x801D01F8; // type:function size:0x8D0 scope:global align:4 @@ -8042,7 +8042,7 @@ checkWarpAcceptRegion4__17dMenu_Fmap2DTop_cFv = .text:0x801D7D78; // type:functi checkWarpAcceptCannon__17dMenu_Fmap2DTop_cFv = .text:0x801D7E1C; // type:function size:0x74 scope:global align:4 setHIO__17dMenu_Fmap2DTop_cFb = .text:0x801D7E90; // type:function size:0x4BC scope:global align:4 isWarpAccept__17dMenu_Fmap2DTop_cFv = .text:0x801D834C; // type:function size:0x84 scope:global align:4 -@4@__dt__18dMenu_Fmap2DBack_cFv = .text:0x801D83D0; // type:function size:0x8 scope:local align:4 +@4@__dt__18dMenu_Fmap2DBack_cFv = .text:0x801D83D0; // type:function size:0x8 scope:weak align:4 __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc = .text:0x801D83D8; // type:function size:0x1E0 scope:global align:4 __dt__14dMenu_Insect_cFv = .text:0x801D85B8; // type:function size:0x364 scope:global align:4 _create__14dMenu_Insect_cFv = .text:0x801D891C; // type:function size:0x70 scope:global align:4 @@ -8078,7 +8078,7 @@ dpdMove__14dMenu_Insect_cFv = .text:0x801DA5C0; // type:function size:0x8 scope: setAButtonString__14dMenu_Insect_cFUs = .text:0x801DA5C8; // type:function size:0xB0 scope:global align:4 setBButtonString__14dMenu_Insect_cFUs = .text:0x801DA678; // type:function size:0xB0 scope:global align:4 setHIO__14dMenu_Insect_cFb = .text:0x801DA728; // type:function size:0x1CC scope:global align:4 -draw__14dMenu_Insect_cFv = .text:0x801DA8F4; // type:function size:0x20 scope:global align:4 +draw__14dMenu_Insect_cFv = .text:0x801DA8F4; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_insect_cpp = .text:0x801DA914; // type:function size:0x104 scope:local align:4 __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb = .text:0x801DAA18; // type:function size:0x89C scope:global align:4 __dt__19dMenu_ItemExplain_cFv = .text:0x801DB2B4; // type:function size:0x480 scope:global align:4 @@ -8132,10 +8132,10 @@ read_next_fadein_move__14dMenu_Letter_cFv = .text:0x801DEFC8; // type:function s read_close_init__14dMenu_Letter_cFv = .text:0x801DF0E4; // type:function size:0x4C scope:global align:4 read_close_move__14dMenu_Letter_cFv = .text:0x801DF130; // type:function size:0x1A4 scope:global align:4 screenSetMenu__14dMenu_Letter_cFv = .text:0x801DF2D4; // type:function size:0xA18 scope:global align:4 -getWhite__10J2DTextBoxCFv = .text:0x801DFCEC; // type:function size:0xC scope:global align:4 -getBlack__10J2DTextBoxCFv = .text:0x801DFCF8; // type:function size:0xC scope:global align:4 -getWhite__10J2DPictureCFv = .text:0x801DFD04; // type:function size:0xC scope:global align:4 -getBlack__10J2DPictureCFv = .text:0x801DFD10; // type:function size:0xC scope:global align:4 +getWhite__10J2DTextBoxCFv = .text:0x801DFCEC; // type:function size:0xC scope:weak align:4 +getBlack__10J2DTextBoxCFv = .text:0x801DFCF8; // type:function size:0xC scope:weak align:4 +getWhite__10J2DPictureCFv = .text:0x801DFD04; // type:function size:0xC scope:weak align:4 +getBlack__10J2DPictureCFv = .text:0x801DFD10; // type:function size:0xC scope:weak align:4 screenSetBase__14dMenu_Letter_cFv = .text:0x801DFD1C; // type:function size:0x8D8 scope:global align:4 screenSetShadow__14dMenu_Letter_cFv = .text:0x801E05F4; // type:function size:0xA8 scope:global align:4 screenSetLetter__14dMenu_Letter_cFv = .text:0x801E069C; // type:function size:0x5D0 scope:global align:4 @@ -8150,8 +8150,8 @@ setAButtonString__14dMenu_Letter_cFUs = .text:0x801E17DC; // type:function size: setBButtonString__14dMenu_Letter_cFUs = .text:0x801E188C; // type:function size:0xB0 scope:global align:4 getLetterNum__14dMenu_Letter_cFv = .text:0x801E193C; // type:function size:0xD0 scope:global align:4 setHIO__14dMenu_Letter_cFb = .text:0x801E1A0C; // type:function size:0x5C8 scope:global align:4 -getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x801E1FD4; // type:function size:0x4C scope:global align:4 -draw__14dMenu_Letter_cFv = .text:0x801E2020; // type:function size:0x20 scope:global align:4 +getStringPage__12dMsgString_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc = .text:0x801E1FD4; // type:function size:0x4C scope:weak align:4 +draw__14dMenu_Letter_cFv = .text:0x801E2020; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_letter_cpp = .text:0x801E2040; // type:function size:0x194 scope:local align:4 __ct__14dMenu_Option_cFP10JKRArchiveP9STControl = .text:0x801E21D4; // type:function size:0x104 scope:global align:4 __dt__14dMenu_Option_cFv = .text:0x801E22D8; // type:function size:0x48 scope:global align:4 @@ -8223,7 +8223,7 @@ yesnoSelectAnmSet__14dMenu_Option_cFv = .text:0x801E8D8C; // type:function size: yesnoCancelAnmSet__14dMenu_Option_cFv = .text:0x801E8EFC; // type:function size:0x78 scope:global align:4 yesnoWakuAlpahAnmInit__14dMenu_Option_cFUcUcUcUc = .text:0x801E8F74; // type:function size:0x4C scope:global align:4 yesnoWakuAlpahAnm__14dMenu_Option_cFUc = .text:0x801E8FC0; // type:function size:0x170 scope:global align:4 -draw__14dMenu_Option_cFv = .text:0x801E9130; // type:function size:0x20 scope:global align:4 +draw__14dMenu_Option_cFv = .text:0x801E9130; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_option_cpp = .text:0x801E9150; // type:function size:0x28C scope:local align:4 __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc = .text:0x801E93DC; // type:function size:0x15F0 scope:global align:4 __dt__12dMenu_Ring_cFv = .text:0x801EA9CC; // type:function size:0x474 scope:global align:4 @@ -8278,7 +8278,7 @@ calcDistance__12dMenu_Ring_cFffff = .text:0x801EF438; // type:function size:0x2C clacEllipsePlotAverage__12dMenu_Ring_cFiff = .text:0x801EF464; // type:function size:0x2E4 scope:global align:4 dpdMove__12dMenu_Ring_cFv = .text:0x801EF748; // type:function size:0x8 scope:global align:4 openExplain__12dMenu_Ring_cFUc = .text:0x801EF750; // type:function size:0xD4 scope:global align:4 -draw__12dMenu_Ring_cFv = .text:0x801EF824; // type:function size:0x20 scope:global align:4 +draw__12dMenu_Ring_cFv = .text:0x801EF824; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_ring_cpp = .text:0x801EF844; // type:function size:0xD4 scope:local align:4 __ct__9dMs_HIO_cFv = .text:0x801EF918; // type:function size:0x4C scope:global align:4 __ct__12dMenu_save_cFv = .text:0x801EF964; // type:function size:0x10C scope:global align:4 @@ -8405,9 +8405,9 @@ _draw__12dMenu_save_cFv = .text:0x801F6C7C; // type:function size:0x44 scope:glo _draw2__12dMenu_save_cFv = .text:0x801F6CC0; // type:function size:0xE0 scope:global align:4 draw__23dDlst_MenuSaveExplain_cFv = .text:0x801F6DA0; // type:function size:0x30 scope:global align:4 draw__16dDlst_MenuSave_cFv = .text:0x801F6DD0; // type:function size:0x38 scope:global align:4 -__dt__16dDlst_MenuSave_cFv = .text:0x801F6E08; // type:function size:0x48 scope:global align:4 -__dt__23dDlst_MenuSaveExplain_cFv = .text:0x801F6E50; // type:function size:0x48 scope:global align:4 -__dt__9dMs_HIO_cFv = .text:0x801F6E98; // type:function size:0x48 scope:global align:4 +__dt__16dDlst_MenuSave_cFv = .text:0x801F6E08; // type:function size:0x48 scope:weak align:4 +__dt__23dDlst_MenuSaveExplain_cFv = .text:0x801F6E50; // type:function size:0x48 scope:weak align:4 +__dt__9dMs_HIO_cFv = .text:0x801F6E98; // type:function size:0x48 scope:weak align:4 __sinit_d_menu_save_cpp = .text:0x801F6EE0; // type:function size:0x608 scope:local align:4 __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl = .text:0x801F74E8; // type:function size:0x124 scope:global align:4 __dt__13dMenu_Skill_cFv = .text:0x801F760C; // type:function size:0x2F4 scope:global align:4 @@ -8438,7 +8438,7 @@ setBButtonString__13dMenu_Skill_cFUs = .text:0x801F95D4; // type:function size:0 setNameString__13dMenu_Skill_cFUs = .text:0x801F9684; // type:function size:0xB0 scope:global align:4 getSkillNum__13dMenu_Skill_cFv = .text:0x801F9734; // type:function size:0x90 scope:global align:4 setHIO__13dMenu_Skill_cFb = .text:0x801F97C4; // type:function size:0x508 scope:global align:4 -draw__13dMenu_Skill_cFv = .text:0x801F9CCC; // type:function size:0x20 scope:global align:4 +draw__13dMenu_Skill_cFv = .text:0x801F9CCC; // type:function size:0x20 scope:weak align:4 __sinit_d_menu_skill_cpp = .text:0x801F9CEC; // type:function size:0xD4 scope:local align:4 __ct__9dMw_HIO_cFv = .text:0x801F9DC0; // type:function size:0x3C scope:global align:4 init__9dMw_HIO_cFv = .text:0x801F9DFC; // type:function size:0x2DC scope:global align:4 @@ -8446,8 +8446,8 @@ getBombFlag__9dMw_HIO_cFv = .text:0x801FA0D8; // type:function size:0x8 scope:gl getArrowFlag__9dMw_HIO_cFv = .text:0x801FA0E0; // type:function size:0x8 scope:global align:4 getPachinkoFlag__9dMw_HIO_cFv = .text:0x801FA0E8; // type:function size:0x8 scope:global align:4 __ct__10dMw_DHIO_cFv = .text:0x801FA0F0; // type:function size:0x6C scope:global align:4 -__dt__10dMw_DHIO_cFv = .text:0x801FA15C; // type:function size:0x48 scope:global align:4 -__dt__9dMw_HIO_cFv = .text:0x801FA1A4; // type:function size:0x48 scope:global align:4 +__dt__10dMw_DHIO_cFv = .text:0x801FA15C; // type:function size:0x48 scope:weak align:4 +__dt__9dMw_HIO_cFv = .text:0x801FA1A4; // type:function size:0x48 scope:weak align:4 __sinit_d_menu_window_HIO_cpp = .text:0x801FA1EC; // type:function size:0x5C scope:local align:4 dMw_UP_TRIGGER__Fv = .text:0x801FA248; // type:function size:0x14 scope:global align:4 dMw_DOWN_TRIGGER__Fv = .text:0x801FA25C; // type:function size:0x14 scope:global align:4 @@ -8594,22 +8594,22 @@ __ct__19dMeter_mapIconHIO_cFv = .text:0x80200778; // type:function size:0x214 sc __ct__16dMeter_fmapHIO_cFv = .text:0x8020098C; // type:function size:0x504 scope:global align:4 __dt__16dMeter_fmapHIO_cFv = .text:0x80200E90; // type:function size:0x108 scope:global align:4 __ct__18dMeter_cursorHIO_cFv = .text:0x80200F98; // type:function size:0x84 scope:global align:4 -__dt__25dMeter_drawLightDropHIO_cFv = .text:0x8020101C; // type:function size:0x48 scope:global align:4 -__dt__25dMeter_drawEmpButtonHIO_cFv = .text:0x80201064; // type:function size:0x48 scope:global align:4 -__dt__24dMeter_drawMiniGameHIO_cFv = .text:0x802010AC; // type:function size:0x48 scope:global align:4 -__dt__21dMeter_drawSkillHIO_cFv = .text:0x802010F4; // type:function size:0x48 scope:global align:4 -__dt__27dMeter_drawCalibrationHIO_cFv = .text:0x8020113C; // type:function size:0x48 scope:global align:4 -__dt__22dMeter_drawInsectHIO_cFv = .text:0x80201184; // type:function size:0x48 scope:global align:4 -__dt__23dMeter_drawFishingHIO_cFv = .text:0x802011CC; // type:function size:0x48 scope:global align:4 -__dt__22dMeter_drawLetterHIO_cFv = .text:0x80201214; // type:function size:0x48 scope:global align:4 -__dt__22dMeter_drawOptionHIO_cFv = .text:0x8020125C; // type:function size:0x48 scope:global align:4 -__dt__23dMeter_drawCollectHIO_cFv = .text:0x802012A4; // type:function size:0x48 scope:global align:4 -__dt__19dMeter_mapIconHIO_cFv = .text:0x802012EC; // type:function size:0x48 scope:global align:4 -__ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv = .text:0x80201334; // type:function size:0x28 scope:global align:4 -__dt__18dMeter_cursorHIO_cFv = .text:0x8020135C; // type:function size:0x48 scope:global align:4 -__dt__16dMeter_ringHIO_cFv = .text:0x802013A4; // type:function size:0x48 scope:global align:4 -__dt__16dMeter_drawHIO_cFv = .text:0x802013EC; // type:function size:0x114 scope:global align:4 -__dt__16dMeter_menuHIO_cFv = .text:0x80201500; // type:function size:0x48 scope:global align:4 +__dt__25dMeter_drawLightDropHIO_cFv = .text:0x8020101C; // type:function size:0x48 scope:weak align:4 +__dt__25dMeter_drawEmpButtonHIO_cFv = .text:0x80201064; // type:function size:0x48 scope:weak align:4 +__dt__24dMeter_drawMiniGameHIO_cFv = .text:0x802010AC; // type:function size:0x48 scope:weak align:4 +__dt__21dMeter_drawSkillHIO_cFv = .text:0x802010F4; // type:function size:0x48 scope:weak align:4 +__dt__27dMeter_drawCalibrationHIO_cFv = .text:0x8020113C; // type:function size:0x48 scope:weak align:4 +__dt__22dMeter_drawInsectHIO_cFv = .text:0x80201184; // type:function size:0x48 scope:weak align:4 +__dt__23dMeter_drawFishingHIO_cFv = .text:0x802011CC; // type:function size:0x48 scope:weak align:4 +__dt__22dMeter_drawLetterHIO_cFv = .text:0x80201214; // type:function size:0x48 scope:weak align:4 +__dt__22dMeter_drawOptionHIO_cFv = .text:0x8020125C; // type:function size:0x48 scope:weak align:4 +__dt__23dMeter_drawCollectHIO_cFv = .text:0x802012A4; // type:function size:0x48 scope:weak align:4 +__dt__19dMeter_mapIconHIO_cFv = .text:0x802012EC; // type:function size:0x48 scope:weak align:4 +__ct__Q216dMeter_fmapHIO_c13MapBlinkAnimeFv = .text:0x80201334; // type:function size:0x28 scope:weak align:4 +__dt__18dMeter_cursorHIO_cFv = .text:0x8020135C; // type:function size:0x48 scope:weak align:4 +__dt__16dMeter_ringHIO_cFv = .text:0x802013A4; // type:function size:0x48 scope:weak align:4 +__dt__16dMeter_drawHIO_cFv = .text:0x802013EC; // type:function size:0x114 scope:weak align:4 +__dt__16dMeter_menuHIO_cFv = .text:0x80201500; // type:function size:0x48 scope:weak align:4 __sinit_d_meter_HIO_cpp = .text:0x80201548; // type:function size:0xA4 scope:local align:4 __ct__14dMeterButton_cFv = .text:0x802015EC; // type:function size:0x48 scope:global align:4 __dt__14dMeterButton_cFv = .text:0x80201634; // type:function size:0x5C scope:global align:4 @@ -8879,7 +8879,7 @@ getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c = .text:0x8021C514; // type:fun getStringKana__13dMeter2Info_cFUlPcP14JMSMesgEntry_c = .text:0x8021C634; // type:function size:0x1D4 scope:global align:4 getStringKanji__13dMeter2Info_cFUlPcP14JMSMesgEntry_c = .text:0x8021C808; // type:function size:0x160 scope:global align:4 getStringLength__13dMeter2Info_cFP10J2DTextBoxPc = .text:0x8021C968; // type:function size:0x150 scope:global align:4 -getFont__10J2DTextBoxCFv = .text:0x8021CAB8; // type:function size:0x8 scope:global align:4 +getFont__10J2DTextBoxCFv = .text:0x8021CAB8; // type:function size:0x8 scope:weak align:4 getStringLength__13dMeter2Info_cFP7JUTFontffPc = .text:0x8021CAC0; // type:function size:0x138 scope:global align:4 onDirectUseItem__13dMeter2Info_cFi = .text:0x8021CBF8; // type:function size:0x1C scope:global align:4 isDirectUseItem__13dMeter2Info_cFi = .text:0x8021CC14; // type:function size:0x20 scope:global align:4 @@ -8967,11 +8967,11 @@ killSubContents__9dMeter2_cFUc = .text:0x80225B64; // type:function size:0xC0 sc isKeyVisible__9dMeter2_cFv = .text:0x80225C24; // type:function size:0x98 scope:global align:4 isArrowEquip__9dMeter2_cFv = .text:0x80225CBC; // type:function size:0x6C scope:global align:4 isPachinkoEquip__9dMeter2_cFv = .text:0x80225D28; // type:function size:0x3C scope:global align:4 -dMeter2_Draw__FP9dMeter2_c = .text:0x80225D64; // type:function size:0x20 scope:global align:4 -dMeter2_Execute__FP9dMeter2_c = .text:0x80225D84; // type:function size:0x20 scope:global align:4 -dMeter2_IsDelete__FP9dMeter2_c = .text:0x80225DA4; // type:function size:0x8 scope:global align:4 -dMeter2_Delete__FP9dMeter2_c = .text:0x80225DAC; // type:function size:0x20 scope:global align:4 -dMeter2_Create__FP9msg_class = .text:0x80225DCC; // type:function size:0xB0 scope:global align:4 +dMeter2_Draw__FP9dMeter2_c = .text:0x80225D64; // type:function size:0x20 scope:local align:4 +dMeter2_Execute__FP9dMeter2_c = .text:0x80225D84; // type:function size:0x20 scope:local align:4 +dMeter2_IsDelete__FP9dMeter2_c = .text:0x80225DA4; // type:function size:0x8 scope:local align:4 +dMeter2_Delete__FP9dMeter2_c = .text:0x80225DAC; // type:function size:0x20 scope:local align:4 +dMeter2_Create__FP9msg_class = .text:0x80225DCC; // type:function size:0xB0 scope:local align:4 __ct__13COutFontSet_cFv = .text:0x80225E7C; // type:function size:0x3C scope:global align:4 __dt__13COutFontSet_cFv = .text:0x80225EB8; // type:function size:0x48 scope:global align:4 initialize__13COutFontSet_cFv = .text:0x80225F00; // type:function size:0x34 scope:global align:4 @@ -8987,17 +8987,17 @@ draw__10COutFont_cFP10J2DTextBoxfff = .text:0x80227074; // type:function size:0x reset__10COutFont_cFP10J2DTextBox = .text:0x8022870C; // type:function size:0x48 scope:global align:4 setBlendAnime__10COutFont_cFP10J2DPictures = .text:0x80228754; // type:function size:0xA0 scope:global align:4 getBtiName__10COutFont_cFi = .text:0x802287F4; // type:function size:0x48 scope:global align:4 -checkCharInfoCharactor__Fi = .text:0x8022883C; // type:function size:0x54 scope:global align:4 -changeCodeToChar__FUs = .text:0x80228890; // type:function size:0x3C scope:global align:4 -change1ByteTo2Bytes__Fi = .text:0x802288CC; // type:function size:0x230 scope:global align:4 -changeKataToHira__Fi = .text:0x80228AFC; // type:function size:0x70 scope:global align:4 -isOutfontKanjiCode__Fi = .text:0x80228B6C; // type:function size:0x54 scope:global align:4 -getFontCCColorTable__FUcUc = .text:0x80228BC0; // type:function size:0xAC scope:global align:4 -getFontGCColorTable__FUcUc = .text:0x80228C6C; // type:function size:0xAC scope:global align:4 -getOutFontNumberType__Fi = .text:0x80228D18; // type:function size:0x78 scope:global align:4 +checkCharInfoCharactor__Fi = .text:0x8022883C; // type:function size:0x54 scope:local align:4 +changeCodeToChar__FUs = .text:0x80228890; // type:function size:0x3C scope:local align:4 +change1ByteTo2Bytes__Fi = .text:0x802288CC; // type:function size:0x230 scope:local align:4 +changeKataToHira__Fi = .text:0x80228AFC; // type:function size:0x70 scope:local align:4 +isOutfontKanjiCode__Fi = .text:0x80228B6C; // type:function size:0x54 scope:local align:4 +getFontCCColorTable__FUcUc = .text:0x80228BC0; // type:function size:0xAC scope:local align:4 +getFontGCColorTable__FUcUc = .text:0x80228C6C; // type:function size:0xAC scope:local align:4 +getOutFontNumberType__Fi = .text:0x80228D18; // type:function size:0x78 scope:local align:4 setPlayerName__FPcUc = .text:0x80228D90; // type:function size:0xC8 scope:local align:4 setHorseName__FPcUc = .text:0x80228E58; // type:function size:0xC8 scope:local align:4 -getPohNum__Fv = .text:0x80228F20; // type:function size:0x38 scope:global align:4 +getPohNum__Fv = .text:0x80228F20; // type:function size:0x38 scope:local align:4 __ct__19jmessage_tReferenceFv = .text:0x80228F58; // type:function size:0x1B0 scope:global align:4 __dt__19jmessage_tReferenceFv = .text:0x80229108; // type:function size:0x74 scope:global align:4 calcDistance__19jmessage_tReferenceFv = .text:0x8022917C; // type:function size:0xB8 scope:global align:4 @@ -9039,7 +9039,7 @@ do_name1__26jmessage_tMeasureProcessorFv = .text:0x8022B920; // type:function si do_rubyset__26jmessage_tMeasureProcessorFPCvUl = .text:0x8022B924; // type:function size:0x88 scope:global align:4 push_word__26jmessage_tMeasureProcessorFPc = .text:0x8022B9AC; // type:function size:0x78 scope:global align:4 __ct__27jmessage_tSequenceProcessorFPC19jmessage_tReferenceP17jmessage_tControl = .text:0x8022BA24; // type:function size:0x9C scope:global align:4 -__dt__26jmessage_tMeasureProcessorFv = .text:0x8022BAC0; // type:function size:0x60 scope:global align:4 +__dt__26jmessage_tMeasureProcessorFv = .text:0x8022BAC0; // type:function size:0x60 scope:weak align:4 do_reset__27jmessage_tSequenceProcessorFv = .text:0x8022BB20; // type:function size:0x4 scope:global align:4 do_begin__27jmessage_tSequenceProcessorFPCvPCc = .text:0x8022BB24; // type:function size:0x3E4 scope:global align:4 do_end__27jmessage_tSequenceProcessorFv = .text:0x8022BF08; // type:function size:0x140 scope:global align:4 @@ -9098,7 +9098,7 @@ do_character__33jmessage_string_tMeasureProcessorFi = .text:0x802300F4; // type: do_tag__33jmessage_string_tMeasureProcessorFUlPCvUl = .text:0x802302BC; // type:function size:0xC0C scope:global align:4 do_rubyset__33jmessage_string_tMeasureProcessorFPCvUl = .text:0x80230EC8; // type:function size:0x7C scope:global align:4 __ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl = .text:0x80230F44; // type:function size:0x54 scope:global align:4 -__dt__33jmessage_string_tMeasureProcessorFv = .text:0x80230F98; // type:function size:0x60 scope:global align:4 +__dt__33jmessage_string_tMeasureProcessorFv = .text:0x80230F98; // type:function size:0x60 scope:weak align:4 do_reset__34jmessage_string_tSequenceProcessorFv = .text:0x80230FF8; // type:function size:0x4 scope:global align:4 do_begin__34jmessage_string_tSequenceProcessorFPCvPCc = .text:0x80230FFC; // type:function size:0xBC scope:global align:4 do_end__34jmessage_string_tSequenceProcessorFv = .text:0x802310B8; // type:function size:0x4 scope:global align:4 @@ -9125,12 +9125,12 @@ do_scale__35jmessage_string_tRenderingProcessorFf = .text:0x80232BB4; // type:fu do_linedown__35jmessage_string_tRenderingProcessorFs = .text:0x80232C44; // type:function size:0x54 scope:global align:4 do_numset__35jmessage_string_tRenderingProcessorFs = .text:0x80232C98; // type:function size:0xD8 scope:global align:4 push_word__35jmessage_string_tRenderingProcessorFPCc = .text:0x80232D70; // type:function size:0x3C scope:global align:4 -__dt__35jmessage_string_tRenderingProcessorFv = .text:0x80232DAC; // type:function size:0x60 scope:global align:4 -__dt__34jmessage_string_tSequenceProcessorFv = .text:0x80232E0C; // type:function size:0x84 scope:global align:4 -__dt__24jmessage_string_tControlFv = .text:0x80232E90; // type:function size:0x60 scope:global align:4 -__dt__28jmessage_tRenderingProcessorFv = .text:0x80232EF0; // type:function size:0x60 scope:global align:4 -__dt__27jmessage_tSequenceProcessorFv = .text:0x80232F50; // type:function size:0x84 scope:global align:4 -getActorPos__19jmessage_tReferenceFv = .text:0x80232FD4; // type:function size:0x1C scope:global align:4 +__dt__35jmessage_string_tRenderingProcessorFv = .text:0x80232DAC; // type:function size:0x60 scope:weak align:4 +__dt__34jmessage_string_tSequenceProcessorFv = .text:0x80232E0C; // type:function size:0x84 scope:weak align:4 +__dt__24jmessage_string_tControlFv = .text:0x80232E90; // type:function size:0x60 scope:weak align:4 +__dt__28jmessage_tRenderingProcessorFv = .text:0x80232EF0; // type:function size:0x60 scope:weak align:4 +__dt__27jmessage_tSequenceProcessorFv = .text:0x80232F50; // type:function size:0x84 scope:weak align:4 +getActorPos__19jmessage_tReferenceFv = .text:0x80232FD4; // type:function size:0x1C scope:weak align:4 dMsgObject_getGroupID__Fv = .text:0x80232FF0; // type:function size:0x8 scope:global align:4 dMsgObject_searchSSItem__FPvPv = .text:0x80232FF8; // type:function size:0xA8 scope:global align:4 __ct__20dMsgObject_HowlHIO_cFv = .text:0x802330A0; // type:function size:0x280 scope:global align:4 @@ -9310,7 +9310,7 @@ setTag__10dMsgUnit_cFiiPcb = .text:0x8023936C; // type:function size:0x3B4 scope __sinit_d_msg_unit_cpp = .text:0x80239720; // type:function size:0x38 scope:local align:4 __ct__17dMsgScrn3Select_cFv = .text:0x80239758; // type:function size:0x818 scope:global align:4 __dt__17dMsgScrn3Select_cFv = .text:0x80239F70; // type:function size:0x314 scope:global align:4 -__dt__14J2DAnmColorKeyFv = .text:0x8023A284; // type:function size:0x84 scope:global align:4 +__dt__14J2DAnmColorKeyFv = .text:0x8023A284; // type:function size:0x84 scope:weak align:4 isSelect__17dMsgScrn3Select_cFv = .text:0x8023A308; // type:function size:0x14 scope:global align:4 setString__17dMsgScrn3Select_cFPcPcPc = .text:0x8023A31C; // type:function size:0x90 scope:global align:4 setRubyString__17dMsgScrn3Select_cFPcPcPc = .text:0x8023A3AC; // type:function size:0x90 scope:global align:4 @@ -9469,7 +9469,7 @@ __dt__15dMsgScrnLight_cFv = .text:0x802461A4; // type:function size:0x104 scope: draw__15dMsgScrnLight_cFPffffffUc = .text:0x802462A8; // type:function size:0x38C scope:global align:4 draw__15dMsgScrnLight_cFPfffffffQ28JUtility6TColorQ28JUtility6TColor = .text:0x80246634; // type:function size:0x14C scope:global align:4 drawCommon__15dMsgScrnLight_cFfffff = .text:0x80246780; // type:function size:0x26C scope:global align:4 -__dt__19dMsgScrnLight_HIO_cFv = .text:0x802469EC; // type:function size:0x48 scope:global align:4 +__dt__19dMsgScrnLight_HIO_cFv = .text:0x802469EC; // type:function size:0x48 scope:weak align:4 __sinit_d_msg_scrn_light_cpp = .text:0x80246A34; // type:function size:0x3C scope:local align:4 __ct__15dMsgScrnPlace_cFv = .text:0x80246A70; // type:function size:0x3F8 scope:global align:4 __dt__15dMsgScrnPlace_cFv = .text:0x80246E68; // type:function size:0x160 scope:global align:4 @@ -9652,7 +9652,7 @@ event039__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024DFE0; event040__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024E014; // type:function size:0x108 scope:global align:4 event041__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024E11C; // type:function size:0x30 scope:global align:4 event042__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c = .text:0x8024E14C; // type:function size:0x8 scope:global align:4 -cLib_calcTimer__FPl = .text:0x8024E154; // type:function size:0x1C scope:global align:4 +cLib_calcTimer__FPl = .text:0x8024E154; // type:function size:0x1C scope:weak align:4 __sinit_d_msg_flow_cpp = .text:0x8024E170; // type:function size:0x914 scope:local align:4 __ct__9dNm_HIO_cFv = .text:0x8024EA84; // type:function size:0x28 scope:global align:4 __ct__7dName_cFP7J2DPane = .text:0x8024EAAC; // type:function size:0x60 scope:global align:4 @@ -9696,8 +9696,8 @@ displayInit__7dName_cFv = .text:0x8025188C; // type:function size:0x168 scope:gl NameStrSet__7dName_cFv = .text:0x802519F4; // type:function size:0xE8 scope:global align:4 getMenuPosIdx__7dName_cFUc = .text:0x80251ADC; // type:function size:0x40 scope:global align:4 draw__14dDlst_NameIN_cFv = .text:0x80251B1C; // type:function size:0xC8 scope:global align:4 -__dt__14dDlst_NameIN_cFv = .text:0x80251BE4; // type:function size:0x48 scope:global align:4 -__dt__9dNm_HIO_cFv = .text:0x80251C2C; // type:function size:0x48 scope:global align:4 +__dt__14dDlst_NameIN_cFv = .text:0x80251BE4; // type:function size:0x48 scope:weak align:4 +__dt__9dNm_HIO_cFv = .text:0x80251C2C; // type:function size:0x48 scope:weak align:4 __sinit_d_name_cpp = .text:0x80251C74; // type:function size:0x128 scope:local align:4 __ct__16dNpcLib_lookat_cFv = .text:0x80251D9C; // type:function size:0xF8 scope:global align:4 init__16dNpcLib_lookat_cFP8J3DModelPiP5csXyzP5csXyz = .text:0x80251E94; // type:function size:0x128 scope:global align:4 @@ -9706,29 +9706,29 @@ dbView__16dNpcLib_lookat_cFv = .text:0x802525E8; // type:function size:0x4 scope setPrm__16dNpcLib_lookat_cFv = .text:0x802525EC; // type:function size:0x394 scope:global align:4 update__16dNpcLib_lookat_cFv = .text:0x80252980; // type:function size:0x120 scope:global align:4 limitter__16dNpcLib_lookat_cFPssss = .text:0x80252AA0; // type:function size:0x7C scope:global align:4 -__dt__16dNpcLib_lookat_cFv = .text:0x80252B1C; // type:function size:0xE8 scope:global align:4 -dOvlpFd_Draw__FP14overlap1_class = .text:0x80252C04; // type:function size:0x8 scope:global align:4 -dOvlpFd_startFadeIn__Fi = .text:0x80252C0C; // type:function size:0x70 scope:global align:4 -dOvlpFd_FadeOut__FP14overlap1_class = .text:0x80252C7C; // type:function size:0xD4 scope:global align:4 -dOvlpFd_Wait__FP14overlap1_class = .text:0x80252D50; // type:function size:0x38 scope:global align:4 -dOvlpFd_FadeIn__FP14overlap1_class = .text:0x80252D88; // type:function size:0x12C scope:global align:4 -dOvlpFd_Execute__FP14overlap1_class = .text:0x80252EB4; // type:function size:0x2C scope:global align:4 -dOvlpFd_IsDelete__FP14overlap1_class = .text:0x80252EE0; // type:function size:0x8 scope:global align:4 -dOvlpFd_Delete__FP14overlap1_class = .text:0x80252EE8; // type:function size:0x8 scope:global align:4 -dOvlpFd_Create__FPv = .text:0x80252EF0; // type:function size:0x14 scope:global align:4 +__dt__16dNpcLib_lookat_cFv = .text:0x80252B1C; // type:function size:0xE8 scope:weak align:4 +dOvlpFd_Draw__FP14overlap1_class = .text:0x80252C04; // type:function size:0x8 scope:local align:4 +dOvlpFd_startFadeIn__Fi = .text:0x80252C0C; // type:function size:0x70 scope:local align:4 +dOvlpFd_FadeOut__FP14overlap1_class = .text:0x80252C7C; // type:function size:0xD4 scope:local align:4 +dOvlpFd_Wait__FP14overlap1_class = .text:0x80252D50; // type:function size:0x38 scope:local align:4 +dOvlpFd_FadeIn__FP14overlap1_class = .text:0x80252D88; // type:function size:0x12C scope:local align:4 +dOvlpFd_Execute__FP14overlap1_class = .text:0x80252EB4; // type:function size:0x2C scope:local align:4 +dOvlpFd_IsDelete__FP14overlap1_class = .text:0x80252EE0; // type:function size:0x8 scope:local align:4 +dOvlpFd_Delete__FP14overlap1_class = .text:0x80252EE8; // type:function size:0x8 scope:local align:4 +dOvlpFd_Create__FPv = .text:0x80252EF0; // type:function size:0x14 scope:local align:4 draw__15dOvlpFd2_dlst_cFv = .text:0x80252F04; // type:function size:0x514 scope:global align:4 __ct__10dOvlpFd2_cFv = .text:0x80253418; // type:function size:0x64 scope:global align:4 execFirstSnap__10dOvlpFd2_cFv = .text:0x8025347C; // type:function size:0x84 scope:global align:4 execFadeOut__10dOvlpFd2_cFv = .text:0x80253500; // type:function size:0x148 scope:global align:4 execNextSnap__10dOvlpFd2_cFv = .text:0x80253648; // type:function size:0xA8 scope:global align:4 execFadeIn__10dOvlpFd2_cFv = .text:0x802536F0; // type:function size:0xA4 scope:global align:4 -dOvlpFd2_Draw__FP10dOvlpFd2_c = .text:0x80253794; // type:function size:0xFC scope:global align:4 -dOvlpFd2_Execute__FP10dOvlpFd2_c = .text:0x80253890; // type:function size:0x2C scope:global align:4 -dOvlpFd2_IsDelete__FP10dOvlpFd2_c = .text:0x802538BC; // type:function size:0x8 scope:global align:4 -dOvlpFd2_Delete__FP10dOvlpFd2_c = .text:0x802538C4; // type:function size:0x8 scope:global align:4 -dOvlpFd2_Create__FPv = .text:0x802538CC; // type:function size:0x2C scope:global align:4 -cLib_calcTimer__FPSc = .text:0x802538F8; // type:function size:0x1C scope:global align:4 -__dt__15dOvlpFd2_dlst_cFv = .text:0x80253914; // type:function size:0x48 scope:global align:4 +dOvlpFd2_Draw__FP10dOvlpFd2_c = .text:0x80253794; // type:function size:0xFC scope:local align:4 +dOvlpFd2_Execute__FP10dOvlpFd2_c = .text:0x80253890; // type:function size:0x2C scope:local align:4 +dOvlpFd2_IsDelete__FP10dOvlpFd2_c = .text:0x802538BC; // type:function size:0x8 scope:local align:4 +dOvlpFd2_Delete__FP10dOvlpFd2_c = .text:0x802538C4; // type:function size:0x8 scope:local align:4 +dOvlpFd2_Create__FPv = .text:0x802538CC; // type:function size:0x2C scope:local align:4 +cLib_calcTimer__FPSc = .text:0x802538F8; // type:function size:0x1C scope:weak align:4 +__dt__15dOvlpFd2_dlst_cFv = .text:0x80253914; // type:function size:0x48 scope:weak align:4 draw__16dDlst_snapShot_cFv = .text:0x8025395C; // type:function size:0x54 scope:global align:4 draw__15dOvlpFd3_dlst_cFv = .text:0x802539B0; // type:function size:0x514 scope:global align:4 __ct__10dOvlpFd3_cFv = .text:0x80253EC4; // type:function size:0xDC scope:global align:4 @@ -9736,12 +9736,12 @@ execFirstSnap__10dOvlpFd3_cFv = .text:0x80253FA0; // type:function size:0x94 sco execFadeOut__10dOvlpFd3_cFv = .text:0x80254034; // type:function size:0xE0 scope:global align:4 execNextSnap__10dOvlpFd3_cFv = .text:0x80254114; // type:function size:0xA4 scope:global align:4 execFadeIn__10dOvlpFd3_cFv = .text:0x802541B8; // type:function size:0x7C scope:global align:4 -dOvlpFd3_Draw__FP10dOvlpFd3_c = .text:0x80254234; // type:function size:0xD4 scope:global align:4 -dOvlpFd3_Execute__FP10dOvlpFd3_c = .text:0x80254308; // type:function size:0x2C scope:global align:4 -dOvlpFd3_IsDelete__FP10dOvlpFd3_c = .text:0x80254334; // type:function size:0x8 scope:global align:4 -dOvlpFd3_Delete__FP10dOvlpFd3_c = .text:0x8025433C; // type:function size:0x8 scope:global align:4 -dOvlpFd3_Create__FPv = .text:0x80254344; // type:function size:0x2C scope:global align:4 -__dt__15dOvlpFd3_dlst_cFv = .text:0x80254370; // type:function size:0x48 scope:global align:4 +dOvlpFd3_Draw__FP10dOvlpFd3_c = .text:0x80254234; // type:function size:0xD4 scope:local align:4 +dOvlpFd3_Execute__FP10dOvlpFd3_c = .text:0x80254308; // type:function size:0x2C scope:local align:4 +dOvlpFd3_IsDelete__FP10dOvlpFd3_c = .text:0x80254334; // type:function size:0x8 scope:local align:4 +dOvlpFd3_Delete__FP10dOvlpFd3_c = .text:0x8025433C; // type:function size:0x8 scope:local align:4 +dOvlpFd3_Create__FPv = .text:0x80254344; // type:function size:0x2C scope:local align:4 +__dt__15dOvlpFd3_dlst_cFv = .text:0x80254370; // type:function size:0x48 scope:weak align:4 __ct__8CPaneMgrFv = .text:0x802543B8; // type:function size:0x54 scope:global align:4 __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap = .text:0x8025440C; // type:function size:0x94 scope:global align:4 __dt__8CPaneMgrFv = .text:0x802544A0; // type:function size:0x9C scope:global align:4 @@ -9769,9 +9769,9 @@ getBounds__8CPaneMgrFP7J2DPane = .text:0x80255A40; // type:function size:0x130 s dPaneClass_showNullPane__FP9J2DScreen = .text:0x80255B70; // type:function size:0x44 scope:global align:4 dPaneClass_showNullPane__FP7J2DPane = .text:0x80255BB4; // type:function size:0x58 scope:global align:4 dPaneClass_setPriority__FPPvP7JKRHeapP9J2DScreenPCcUlP10JKRArchive = .text:0x80255C0C; // type:function size:0x134 scope:global align:4 -__dt__20JSUMemoryInputStreamFv = .text:0x80255D40; // type:function size:0x70 scope:global align:4 -__dt__20JSURandomInputStreamFv = .text:0x80255DB0; // type:function size:0x60 scope:global align:4 -__dt__10JSUIosBaseFv = .text:0x80255E10; // type:function size:0x48 scope:global align:4 +__dt__20JSUMemoryInputStreamFv = .text:0x80255D40; // type:function size:0x70 scope:weak align:4 +__dt__20JSURandomInputStreamFv = .text:0x80255DB0; // type:function size:0x60 scope:weak align:4 +__dt__10JSUIosBaseFv = .text:0x80255E10; // type:function size:0x48 scope:weak align:4 __sinit_d_pane_class_cpp = .text:0x80255E58; // type:function size:0x1C scope:local align:4 __ct__13CPaneMgrAlphaFv = .text:0x80255E74; // type:function size:0x10 scope:global align:4 __ct__13CPaneMgrAlphaFP9J2DScreenUxUcP10JKRExpHeap = .text:0x80255E84; // type:function size:0x70 scope:global align:4 @@ -9796,16 +9796,16 @@ setBackupAlpha__17CPaneMgrAlphaMorfFv = .text:0x80256858; // type:function size: setAlphaMorfRate__17CPaneMgrAlphaMorfFf = .text:0x802568B0; // type:function size:0x70 scope:global align:4 childPaneBackupAlpha__17CPaneMgrAlphaMorfFP7J2DPane = .text:0x80256920; // type:function size:0x90 scope:global align:4 childPaneSetAlphaMorf__17CPaneMgrAlphaMorfFP7J2DPanef = .text:0x802569B0; // type:function size:0xF0 scope:global align:4 -setAnimation__7J2DPaneFP14J2DAnmVtxColor = .text:0x80256AA0; // type:function size:0x4 scope:global align:4 -setAnimation__7J2DPaneFP20J2DAnmVisibilityFull = .text:0x80256AA4; // type:function size:0x4 scope:global align:4 -setAnimation__7J2DPaneFP16J2DAnmTexPattern = .text:0x80256AA8; // type:function size:0x4 scope:global align:4 -getMaterial__12J2DTextBoxExCFv = .text:0x80256AAC; // type:function size:0x8 scope:global align:4 -getMaterial__10J2DTextBoxCFv = .text:0x80256AB4; // type:function size:0x8 scope:global align:4 -getMaterial__12J2DPictureExCFv = .text:0x80256ABC; // type:function size:0x8 scope:global align:4 -getMaterial__10J2DPictureCFv = .text:0x80256AC4; // type:function size:0x8 scope:global align:4 -setAnimation__12J2DTextBoxExFP15J2DAnmTransform = .text:0x80256ACC; // type:function size:0x20 scope:global align:4 -setAnimation__12J2DPictureExFP15J2DAnmTransform = .text:0x80256AEC; // type:function size:0x20 scope:global align:4 -setAnimation__11J2DWindowExFP15J2DAnmTransform = .text:0x80256B0C; // type:function size:0x20 scope:global align:4 +setAnimation__7J2DPaneFP14J2DAnmVtxColor = .text:0x80256AA0; // type:function size:0x4 scope:weak align:4 +setAnimation__7J2DPaneFP20J2DAnmVisibilityFull = .text:0x80256AA4; // type:function size:0x4 scope:weak align:4 +setAnimation__7J2DPaneFP16J2DAnmTexPattern = .text:0x80256AA8; // type:function size:0x4 scope:weak align:4 +getMaterial__12J2DTextBoxExCFv = .text:0x80256AAC; // type:function size:0x8 scope:weak align:4 +getMaterial__10J2DTextBoxCFv = .text:0x80256AB4; // type:function size:0x8 scope:weak align:4 +getMaterial__12J2DPictureExCFv = .text:0x80256ABC; // type:function size:0x8 scope:weak align:4 +getMaterial__10J2DPictureCFv = .text:0x80256AC4; // type:function size:0x8 scope:weak align:4 +setAnimation__12J2DTextBoxExFP15J2DAnmTransform = .text:0x80256ACC; // type:function size:0x20 scope:weak align:4 +setAnimation__12J2DPictureExFP15J2DAnmTransform = .text:0x80256AEC; // type:function size:0x20 scope:weak align:4 +setAnimation__11J2DWindowExFP15J2DAnmTransform = .text:0x80256B0C; // type:function size:0x20 scope:weak align:4 __ct__10dLog_HIO_cFv = .text:0x80256B2C; // type:function size:0x10 scope:global align:4 preLoad_dyl_create__10dScnLogo_cFv = .text:0x80256B3C; // type:function size:0x44 scope:global align:4 preLoad_dyl_remove__10dScnLogo_cFv = .text:0x80256B80; // type:function size:0x24 scope:global align:4 @@ -9829,30 +9829,30 @@ dolbyOutDraw2__10dScnLogo_cFv = .text:0x80257AC8; // type:function size:0x18 sco dvdWaitDraw__10dScnLogo_cFv = .text:0x80257AE0; // type:function size:0x214 scope:global align:4 nextSceneChange__10dScnLogo_cFv = .text:0x80257CF4; // type:function size:0x34 scope:global align:4 __dt__10dScnLogo_cFv = .text:0x80257D28; // type:function size:0x6A8 scope:global align:4 -phase_0__FP10dScnLogo_c = .text:0x802583D0; // type:function size:0x180 scope:global align:4 -phase_1__FP10dScnLogo_c = .text:0x80258550; // type:function size:0xE0 scope:global align:4 -phase_2__FP10dScnLogo_c = .text:0x80258630; // type:function size:0x44 scope:global align:4 -resLoad__FP30request_of_phase_process_classP10dScnLogo_c = .text:0x80258674; // type:function size:0x2C scope:global align:4 +phase_0__FP10dScnLogo_c = .text:0x802583D0; // type:function size:0x180 scope:local align:4 +phase_1__FP10dScnLogo_c = .text:0x80258550; // type:function size:0xE0 scope:local align:4 +phase_2__FP10dScnLogo_c = .text:0x80258630; // type:function size:0x44 scope:local align:4 +resLoad__FP30request_of_phase_process_classP10dScnLogo_c = .text:0x80258674; // type:function size:0x2C scope:local align:4 create__10dScnLogo_cFv = .text:0x802586A0; // type:function size:0x184 scope:global align:4 logoInitGC__10dScnLogo_cFv = .text:0x80258824; // type:function size:0x420 scope:global align:4 dvdDataLoad__10dScnLogo_cFv = .text:0x80258C44; // type:function size:0x4FC scope:global align:4 -dScnLogo_Create__FP11scene_class = .text:0x80259140; // type:function size:0x24 scope:global align:4 -dScnLogo_Execute__FP10dScnLogo_c = .text:0x80259164; // type:function size:0x40 scope:global align:4 -dScnLogo_Draw__FP10dScnLogo_c = .text:0x802591A4; // type:function size:0x24 scope:global align:4 -dScnLogo_Delete__FP10dScnLogo_c = .text:0x802591C8; // type:function size:0x28 scope:global align:4 -dScnLogo_IsDelete__FP10dScnLogo_c = .text:0x802591F0; // type:function size:0x8 scope:global align:4 +dScnLogo_Create__FP11scene_class = .text:0x80259140; // type:function size:0x24 scope:local align:4 +dScnLogo_Execute__FP10dScnLogo_c = .text:0x80259164; // type:function size:0x40 scope:local align:4 +dScnLogo_Draw__FP10dScnLogo_c = .text:0x802591A4; // type:function size:0x24 scope:local align:4 +dScnLogo_Delete__FP10dScnLogo_c = .text:0x802591C8; // type:function size:0x28 scope:local align:4 +dScnLogo_IsDelete__FP10dScnLogo_c = .text:0x802591F0; // type:function size:0x8 scope:local align:4 getPalLanguage__10dScnLogo_cFv = .text:0x802591F8; // type:function size:0x90 scope:global align:4 setProgressiveMode__10dScnLogo_cFUc = .text:0x80259288; // type:function size:0x24 scope:global align:4 getProgressiveMode__10dScnLogo_cFv = .text:0x802592AC; // type:function size:0x24 scope:global align:4 isProgressiveMode__10dScnLogo_cFv = .text:0x802592D0; // type:function size:0x2C scope:global align:4 setRenderMode__10dScnLogo_cFv = .text:0x802592FC; // type:function size:0x10 scope:global align:4 __dt__10dLog_HIO_cFv = .text:0x8025930C; // type:function size:0x48 scope:global align:4 -cLib_calcTimer__FPUs = .text:0x80259354; // type:function size:0x1C scope:global align:4 +cLib_calcTimer__FPUs = .text:0x80259354; // type:function size:0x1C scope:weak align:4 __sinit_d_s_logo_cpp = .text:0x80259370; // type:function size:0x1CC scope:local align:4 __ct__9dSn_HIO_cFv = .text:0x8025953C; // type:function size:0x18 scope:global align:4 phase_1__FPc = .text:0x80259554; // type:function size:0x7C scope:local align:4 phase_2__FPc = .text:0x802595D0; // type:function size:0x58 scope:local align:4 -resLoad__FP30request_of_phase_process_classPc = .text:0x80259628; // type:function size:0x28 scope:global align:4 +resLoad__FP30request_of_phase_process_classPc = .text:0x80259628; // type:function size:0x28 scope:local align:4 create__10dScnName_cFv = .text:0x80259650; // type:function size:0x29C scope:global align:4 setView__10dScnName_cFv = .text:0x802598EC; // type:function size:0x9C scope:global align:4 bmg_data_set__10dScnName_cFv = .text:0x80259988; // type:function size:0x18 scope:global align:4 @@ -9867,62 +9867,62 @@ FileSelectClose__10dScnName_cFv = .text:0x80259CFC; // type:function size:0xB4 s brightCheckOpen__10dScnName_cFv = .text:0x80259DB0; // type:function size:0x34 scope:global align:4 brightCheck__10dScnName_cFv = .text:0x80259DE4; // type:function size:0xF0 scope:global align:4 changeGameScene__10dScnName_cFv = .text:0x80259ED4; // type:function size:0xC8 scope:global align:4 -dScnName_Draw__FP10dScnName_c = .text:0x80259F9C; // type:function size:0x20 scope:global align:4 -dScnName_Execute__FP10dScnName_c = .text:0x80259FBC; // type:function size:0x20 scope:global align:4 -dScnName_IsDelete__FP10dScnName_c = .text:0x80259FDC; // type:function size:0x30 scope:global align:4 -dScnName_Delete__FP10dScnName_c = .text:0x8025A00C; // type:function size:0x4C scope:global align:4 -dScnName_Create__FP11scene_class = .text:0x8025A058; // type:function size:0x3C scope:global align:4 -__dt__17dScnName_camera_cFv = .text:0x8025A094; // type:function size:0x48 scope:global align:4 -__dt__9dSn_HIO_cFv = .text:0x8025A0DC; // type:function size:0x48 scope:global align:4 +dScnName_Draw__FP10dScnName_c = .text:0x80259F9C; // type:function size:0x20 scope:local align:4 +dScnName_Execute__FP10dScnName_c = .text:0x80259FBC; // type:function size:0x20 scope:local align:4 +dScnName_IsDelete__FP10dScnName_c = .text:0x80259FDC; // type:function size:0x30 scope:local align:4 +dScnName_Delete__FP10dScnName_c = .text:0x8025A00C; // type:function size:0x4C scope:local align:4 +dScnName_Create__FP11scene_class = .text:0x8025A058; // type:function size:0x3C scope:local align:4 +__dt__17dScnName_camera_cFv = .text:0x8025A094; // type:function size:0x48 scope:weak align:4 +__dt__9dSn_HIO_cFv = .text:0x8025A0DC; // type:function size:0x48 scope:weak align:4 __sinit_d_s_name_cpp = .text:0x8025A124; // type:function size:0xDC scope:local align:4 calcPauseTimer__9dScnPly_cFv = .text:0x8025A200; // type:function size:0x40 scope:global align:4 __ct__22dScnPly_env_otherHIO_cFv = .text:0x8025A240; // type:function size:0x28 scope:global align:4 __ct__22dScnPly_env_debugHIO_cFv = .text:0x8025A268; // type:function size:0x44 scope:global align:4 -dScnPly_Draw__FP9dScnPly_c = .text:0x8025A2AC; // type:function size:0x30C scope:global align:4 -dScnPly_Execute__FP9dScnPly_c = .text:0x8025A5B8; // type:function size:0xC4 scope:global align:4 -dScnPly_IsDelete__F9dScnPly_c = .text:0x8025A67C; // type:function size:0x30 scope:global align:4 -dScnPly_Delete__FP9dScnPly_c = .text:0x8025A6AC; // type:function size:0x218 scope:global align:4 +dScnPly_Draw__FP9dScnPly_c = .text:0x8025A2AC; // type:function size:0x30C scope:local align:4 +dScnPly_Execute__FP9dScnPly_c = .text:0x8025A5B8; // type:function size:0xC4 scope:local align:4 +dScnPly_IsDelete__F9dScnPly_c = .text:0x8025A67C; // type:function size:0x30 scope:local align:4 +dScnPly_Delete__FP9dScnPly_c = .text:0x8025A6AC; // type:function size:0x218 scope:local align:4 resetGame__9dScnPly_cFv = .text:0x8025A8C4; // type:function size:0x138 scope:global align:4 offReset__9dScnPly_cFv = .text:0x8025A9FC; // type:function size:0x74 scope:global align:4 -phase_00__FP9dScnPly_c = .text:0x8025AA70; // type:function size:0x3C scope:global align:4 -phase_01__FP9dScnPly_c = .text:0x8025AAAC; // type:function size:0xD0 scope:global align:4 -phase_0__FP9dScnPly_c = .text:0x8025AB7C; // type:function size:0x8 scope:global align:4 -phase_1__FP9dScnPly_c = .text:0x8025AB84; // type:function size:0x6B4 scope:global align:4 -phase_1_0__FP9dScnPly_c = .text:0x8025B238; // type:function size:0xC0 scope:global align:4 -phase_2__FP9dScnPly_c = .text:0x8025B2F8; // type:function size:0xDC scope:global align:4 -phase_3__FP9dScnPly_c = .text:0x8025B3D4; // type:function size:0x80 scope:global align:4 -phase_4__FP9dScnPly_c = .text:0x8025B454; // type:function size:0x3A0 scope:global align:4 -phase_5__FP9dScnPly_c = .text:0x8025B7F4; // type:function size:0xCC scope:global align:4 -phase_6__FP9dScnPly_c = .text:0x8025B8C0; // type:function size:0xCC scope:global align:4 -phase_compleate__FPv = .text:0x8025B98C; // type:function size:0x8 scope:global align:4 -dScnPly_Create__FP11scene_class = .text:0x8025B994; // type:function size:0x30 scope:global align:4 -__dt__22dScnPly_env_debugHIO_cFv = .text:0x8025B9C4; // type:function size:0x48 scope:global align:4 -__dt__22dScnPly_env_otherHIO_cFv = .text:0x8025BA0C; // type:function size:0x48 scope:global align:4 +phase_00__FP9dScnPly_c = .text:0x8025AA70; // type:function size:0x3C scope:local align:4 +phase_01__FP9dScnPly_c = .text:0x8025AAAC; // type:function size:0xD0 scope:local align:4 +phase_0__FP9dScnPly_c = .text:0x8025AB7C; // type:function size:0x8 scope:local align:4 +phase_1__FP9dScnPly_c = .text:0x8025AB84; // type:function size:0x6B4 scope:local align:4 +phase_1_0__FP9dScnPly_c = .text:0x8025B238; // type:function size:0xC0 scope:local align:4 +phase_2__FP9dScnPly_c = .text:0x8025B2F8; // type:function size:0xDC scope:local align:4 +phase_3__FP9dScnPly_c = .text:0x8025B3D4; // type:function size:0x80 scope:local align:4 +phase_4__FP9dScnPly_c = .text:0x8025B454; // type:function size:0x3A0 scope:local align:4 +phase_5__FP9dScnPly_c = .text:0x8025B7F4; // type:function size:0xCC scope:local align:4 +phase_6__FP9dScnPly_c = .text:0x8025B8C0; // type:function size:0xCC scope:local align:4 +phase_compleate__FPv = .text:0x8025B98C; // type:function size:0x8 scope:local align:4 +dScnPly_Create__FP11scene_class = .text:0x8025B994; // type:function size:0x30 scope:local align:4 +__dt__22dScnPly_env_debugHIO_cFv = .text:0x8025B9C4; // type:function size:0x48 scope:weak align:4 +__dt__22dScnPly_env_otherHIO_cFv = .text:0x8025BA0C; // type:function size:0x48 scope:weak align:4 __sinit_d_s_play_cpp = .text:0x8025BA54; // type:function size:0xB0 scope:local align:4 -__dt__17dScnPly_env_HIO_cFv = .text:0x8025BB04; // type:function size:0x74 scope:global align:4 -__dt__17dScnPly_reg_HIO_cFv = .text:0x8025BB78; // type:function size:0x48 scope:global align:4 -__dt__21dScnPly_preLoad_HIO_cFv = .text:0x8025BBC0; // type:function size:0x5C scope:global align:4 -dScnRoom_Draw__FP19room_of_scene_class = .text:0x8025BC1C; // type:function size:0x8 scope:global align:4 -getResetArchiveBank__FiPPCUc = .text:0x8025BC24; // type:function size:0x100 scope:global align:4 -resetArchiveBank__Fi = .text:0x8025BD24; // type:function size:0x28 scope:global align:4 -setArchiveBank__Fi = .text:0x8025BD4C; // type:function size:0x1A4 scope:global align:4 -objectDeleteJugge__FPvPv = .text:0x8025BEF0; // type:function size:0x60 scope:global align:4 -deleteJugge__FPvPv = .text:0x8025BF50; // type:function size:0x24 scope:global align:4 -isCreatingCallback__FP10create_tagPUi = .text:0x8025BF74; // type:function size:0x20 scope:global align:4 -isCreating__FUi = .text:0x8025BF94; // type:function size:0x3C scope:global align:4 -loadDemoArchive__Fi = .text:0x8025BFD0; // type:function size:0x11C scope:global align:4 -objectSetCheck__FP19room_of_scene_class = .text:0x8025C0EC; // type:function size:0x278 scope:global align:4 -dScnRoom_Execute__FP19room_of_scene_class = .text:0x8025C364; // type:function size:0x110 scope:global align:4 -dScnRoom_IsDelete__FP19room_of_scene_class = .text:0x8025C474; // type:function size:0x8 scope:global align:4 -isReadRoom__Fi = .text:0x8025C47C; // type:function size:0xC0 scope:global align:4 -dScnRoom_Delete__FP19room_of_scene_class = .text:0x8025C53C; // type:function size:0x134 scope:global align:4 -phase_0__FP19room_of_scene_class = .text:0x8025C670; // type:function size:0x34 scope:global align:4 -phase_1__FP19room_of_scene_class = .text:0x8025C6A4; // type:function size:0xDC scope:global align:4 -phase_2__FP19room_of_scene_class = .text:0x8025C780; // type:function size:0x12C scope:global align:4 +__dt__17dScnPly_env_HIO_cFv = .text:0x8025BB04; // type:function size:0x74 scope:weak align:4 +__dt__17dScnPly_reg_HIO_cFv = .text:0x8025BB78; // type:function size:0x48 scope:weak align:4 +__dt__21dScnPly_preLoad_HIO_cFv = .text:0x8025BBC0; // type:function size:0x5C scope:weak align:4 +dScnRoom_Draw__FP19room_of_scene_class = .text:0x8025BC1C; // type:function size:0x8 scope:local align:4 +getResetArchiveBank__FiPPCUc = .text:0x8025BC24; // type:function size:0x100 scope:local align:4 +resetArchiveBank__Fi = .text:0x8025BD24; // type:function size:0x28 scope:local align:4 +setArchiveBank__Fi = .text:0x8025BD4C; // type:function size:0x1A4 scope:local align:4 +objectDeleteJugge__FPvPv = .text:0x8025BEF0; // type:function size:0x60 scope:local align:4 +deleteJugge__FPvPv = .text:0x8025BF50; // type:function size:0x24 scope:local align:4 +isCreatingCallback__FP10create_tagPUi = .text:0x8025BF74; // type:function size:0x20 scope:local align:4 +isCreating__FUi = .text:0x8025BF94; // type:function size:0x3C scope:local align:4 +loadDemoArchive__Fi = .text:0x8025BFD0; // type:function size:0x11C scope:local align:4 +objectSetCheck__FP19room_of_scene_class = .text:0x8025C0EC; // type:function size:0x278 scope:local align:4 +dScnRoom_Execute__FP19room_of_scene_class = .text:0x8025C364; // type:function size:0x110 scope:local align:4 +dScnRoom_IsDelete__FP19room_of_scene_class = .text:0x8025C474; // type:function size:0x8 scope:local align:4 +isReadRoom__Fi = .text:0x8025C47C; // type:function size:0xC0 scope:local align:4 +dScnRoom_Delete__FP19room_of_scene_class = .text:0x8025C53C; // type:function size:0x134 scope:local align:4 +phase_0__FP19room_of_scene_class = .text:0x8025C670; // type:function size:0x34 scope:local align:4 +phase_1__FP19room_of_scene_class = .text:0x8025C6A4; // type:function size:0xDC scope:local align:4 +phase_2__FP19room_of_scene_class = .text:0x8025C780; // type:function size:0x12C scope:local align:4 setZoneNo__20dStage_roomControl_cFii = .text:0x8025C8AC; // type:function size:0x18 scope:global align:4 -phase_3__FP19room_of_scene_class = .text:0x8025C8C4; // type:function size:0x34 scope:global align:4 -phase_4__FP19room_of_scene_class = .text:0x8025C8F8; // type:function size:0x50 scope:global align:4 -dScnRoom_Create__FP11scene_class = .text:0x8025C948; // type:function size:0x30 scope:global align:4 +phase_3__FP19room_of_scene_class = .text:0x8025C8C4; // type:function size:0x34 scope:local align:4 +phase_4__FP19room_of_scene_class = .text:0x8025C8F8; // type:function size:0x50 scope:local align:4 +dScnRoom_Create__FP11scene_class = .text:0x8025C948; // type:function size:0x30 scope:local align:4 __ct__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025C978; // type:function size:0x34 scope:global align:4 init__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025C9AC; // type:function size:0x68 scope:global align:4 __ct__26dSvBit_childSwDungeonHIO_cFv = .text:0x8025CA14; // type:function size:0x34 scope:global align:4 @@ -9948,23 +9948,23 @@ init__26dSvBit_childTransformHIO_cFv = .text:0x8025CED4; // type:function size:0 __ct__22dSvBit_childOtherHIO_cFv = .text:0x8025CF3C; // type:function size:0x3C scope:global align:4 init__22dSvBit_childOtherHIO_cFv = .text:0x8025CF78; // type:function size:0x80 scope:global align:4 init__12dSvBit_HIO_cFv = .text:0x8025CFF8; // type:function size:0xA4 scope:global align:4 -__dt__22dSvBit_childOtherHIO_cFv = .text:0x8025D09C; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childTransformHIO_cFv = .text:0x8025D0E4; // type:function size:0x48 scope:global align:4 -__dt__25dSvBit_childDarknessHIO_cFv = .text:0x8025D12C; // type:function size:0x48 scope:global align:4 -__dt__29dSvBit_childTbPerfectionHIO_cFv = .text:0x8025D174; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childItOneZoneHIO_cFv = .text:0x8025D1BC; // type:function size:0x48 scope:global align:4 -__dt__23dSvBit_childItZoneHIO_cFv = .text:0x8025D204; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childItDungeonHIO_cFv = .text:0x8025D24C; // type:function size:0x48 scope:global align:4 -__dt__29dSvBit_childItPerfectionHIO_cFv = .text:0x8025D294; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childSwOneZoneHIO_cFv = .text:0x8025D2DC; // type:function size:0x48 scope:global align:4 -__dt__23dSvBit_childSwZoneHIO_cFv = .text:0x8025D324; // type:function size:0x48 scope:global align:4 -__dt__26dSvBit_childSwDungeonHIO_cFv = .text:0x8025D36C; // type:function size:0x48 scope:global align:4 -__dt__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025D3B4; // type:function size:0x48 scope:global align:4 +__dt__22dSvBit_childOtherHIO_cFv = .text:0x8025D09C; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childTransformHIO_cFv = .text:0x8025D0E4; // type:function size:0x48 scope:weak align:4 +__dt__25dSvBit_childDarknessHIO_cFv = .text:0x8025D12C; // type:function size:0x48 scope:weak align:4 +__dt__29dSvBit_childTbPerfectionHIO_cFv = .text:0x8025D174; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childItOneZoneHIO_cFv = .text:0x8025D1BC; // type:function size:0x48 scope:weak align:4 +__dt__23dSvBit_childItZoneHIO_cFv = .text:0x8025D204; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childItDungeonHIO_cFv = .text:0x8025D24C; // type:function size:0x48 scope:weak align:4 +__dt__29dSvBit_childItPerfectionHIO_cFv = .text:0x8025D294; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childSwOneZoneHIO_cFv = .text:0x8025D2DC; // type:function size:0x48 scope:weak align:4 +__dt__23dSvBit_childSwZoneHIO_cFv = .text:0x8025D324; // type:function size:0x48 scope:weak align:4 +__dt__26dSvBit_childSwDungeonHIO_cFv = .text:0x8025D36C; // type:function size:0x48 scope:weak align:4 +__dt__29dSvBit_childSwPerfectionHIO_cFv = .text:0x8025D3B4; // type:function size:0x48 scope:weak align:4 __sinit_d_save_HIO_cpp = .text:0x8025D3FC; // type:function size:0x100 scope:local align:4 -__dt__12dSvBit_HIO_cFv = .text:0x8025D4FC; // type:function size:0x178 scope:global align:4 -__dt__25dSvBit_childTreasureHIO_cFv = .text:0x8025D674; // type:function size:0x60 scope:global align:4 -__dt__21dSvBit_childItemHIO_cFv = .text:0x8025D6D4; // type:function size:0x9C scope:global align:4 -__dt__23dSvBit_childSwitchHIO_cFv = .text:0x8025D770; // type:function size:0x9C scope:global align:4 +__dt__12dSvBit_HIO_cFv = .text:0x8025D4FC; // type:function size:0x178 scope:weak align:4 +__dt__25dSvBit_childTreasureHIO_cFv = .text:0x8025D674; // type:function size:0x60 scope:weak align:4 +__dt__21dSvBit_childItemHIO_cFv = .text:0x8025D6D4; // type:function size:0x9C scope:weak align:4 +__dt__23dSvBit_childSwitchHIO_cFv = .text:0x8025D770; // type:function size:0x9C scope:weak align:4 _create__8dTimer_cFv = .text:0x8025D80C; // type:function size:0x4F8 scope:global align:4 _execute__8dTimer_cFv = .text:0x8025DD04; // type:function size:0x438 scope:global align:4 _draw__8dTimer_cFv = .text:0x8025E13C; // type:function size:0x80 scope:global align:4 @@ -10007,15 +10007,15 @@ draw__21dDlst_TimerScrnDraw_cFv = .text:0x80261490; // type:function size:0x418 checkStartAnimeEnd__21dDlst_TimerScrnDraw_cFv = .text:0x802618A8; // type:function size:0x2C scope:global align:4 playBckAnimation__21dDlst_TimerScrnDraw_cFf = .text:0x802618D4; // type:function size:0x80 scope:global align:4 drawPikari__21dDlst_TimerScrnDraw_cFi = .text:0x80261954; // type:function size:0x3B0 scope:global align:4 -dTimer_Draw__FP8dTimer_c = .text:0x80261D04; // type:function size:0x20 scope:global align:4 -dTimer_Execute__FP8dTimer_c = .text:0x80261D24; // type:function size:0x20 scope:global align:4 -dTimer_IsDelete__FP8dTimer_c = .text:0x80261D44; // type:function size:0x8 scope:global align:4 -dTimer_Delete__FP8dTimer_c = .text:0x80261D4C; // type:function size:0x20 scope:global align:4 -dTimer_Create__FP9msg_class = .text:0x80261D6C; // type:function size:0x20 scope:global align:4 +dTimer_Draw__FP8dTimer_c = .text:0x80261D04; // type:function size:0x20 scope:local align:4 +dTimer_Execute__FP8dTimer_c = .text:0x80261D24; // type:function size:0x20 scope:local align:4 +dTimer_IsDelete__FP8dTimer_c = .text:0x80261D44; // type:function size:0x8 scope:local align:4 +dTimer_Delete__FP8dTimer_c = .text:0x80261D4C; // type:function size:0x20 scope:local align:4 +dTimer_Create__FP9msg_class = .text:0x80261D6C; // type:function size:0x20 scope:local align:4 dTimer_createTimer__FlUlUcUcffff = .text:0x80261D8C; // type:function size:0xA8 scope:global align:4 dTimer_createStockTimer__Fv = .text:0x80261E34; // type:function size:0xCC scope:global align:4 dTimer_createGetIn2D__Fl4cXyz = .text:0x80261F00; // type:function size:0x88 scope:global align:4 -dTimer_createStart2D__FlUs = .text:0x80261F88; // type:function size:0x68 scope:global align:4 +dTimer_createStart2D__FlUs = .text:0x80261F88; // type:function size:0x68 scope:local align:4 dTimer_isStart__Fv = .text:0x80261FF0; // type:function size:0x54 scope:global align:4 dTimer_getRestTimeMs__Fv = .text:0x80262044; // type:function size:0x54 scope:global align:4 dTimer_show__Fv = .text:0x80262098; // type:function size:0x54 scope:global align:4 @@ -10023,20 +10023,20 @@ dTimer_hide__Fv = .text:0x802620EC; // type:function size:0x54 scope:global alig dTimer_isReadyFlag__Fv = .text:0x80262140; // type:function size:0x54 scope:global align:4 __dt__21dDlst_TimerScrnDraw_cFv = .text:0x80262194; // type:function size:0x48 scope:global align:4 createGetIn__8dTimer_cF4cXyz = .text:0x802621DC; // type:function size:0x40 scope:global align:4 -dkWmark_Create__FP12kankyo_class = .text:0x8026221C; // type:function size:0x224 scope:global align:4 +dkWmark_Create__FP12kankyo_class = .text:0x8026221C; // type:function size:0x224 scope:local align:4 __dt__9dkWmark_cFv = .text:0x80262440; // type:function size:0x5C scope:global align:4 -dkWmark_Delete__FP9dkWmark_c = .text:0x8026249C; // type:function size:0x28 scope:global align:4 +dkWmark_Delete__FP9dkWmark_c = .text:0x8026249C; // type:function size:0x28 scope:local align:4 setMatrix__9dkWmark_cFv = .text:0x802624C4; // type:function size:0x2A0 scope:global align:4 -dkWmark_Execute__FP9dkWmark_c = .text:0x80262764; // type:function size:0xB4 scope:global align:4 -dkWmark_Draw__FP9dkWmark_c = .text:0x80262818; // type:function size:0x13C scope:global align:4 +dkWmark_Execute__FP9dkWmark_c = .text:0x80262764; // type:function size:0xB4 scope:local align:4 +dkWmark_Draw__FP9dkWmark_c = .text:0x80262818; // type:function size:0x13C scope:local align:4 create__11dkWpillar_cFv = .text:0x80262954; // type:function size:0x3B0 scope:global align:4 -dkWpillar_Create__FP12kankyo_class = .text:0x80262D04; // type:function size:0x20 scope:global align:4 +dkWpillar_Create__FP12kankyo_class = .text:0x80262D04; // type:function size:0x20 scope:local align:4 __dt__11dkWpillar_cFv = .text:0x80262D24; // type:function size:0xC8 scope:global align:4 -dkWpillar_Delete__FP11dkWpillar_c = .text:0x80262DEC; // type:function size:0x28 scope:global align:4 +dkWpillar_Delete__FP11dkWpillar_c = .text:0x80262DEC; // type:function size:0x28 scope:local align:4 execute__11dkWpillar_cFv = .text:0x80262E14; // type:function size:0x94 scope:global align:4 -dkWpillar_Execute__FP11dkWpillar_c = .text:0x80262EA8; // type:function size:0x20 scope:global align:4 +dkWpillar_Execute__FP11dkWpillar_c = .text:0x80262EA8; // type:function size:0x20 scope:local align:4 draw__11dkWpillar_cFv = .text:0x80262EC8; // type:function size:0xE4 scope:global align:4 -dkWpillar_Draw__FP11dkWpillar_c = .text:0x80262FAC; // type:function size:0x20 scope:global align:4 +dkWpillar_Draw__FP11dkWpillar_c = .text:0x80262FAC; // type:function size:0x20 scope:local align:4 __dt__24DynamicModuleControlBaseFv = .text:0x80262FCC; // type:function size:0xB8 scope:global align:4 __ct__24DynamicModuleControlBaseFv = .text:0x80263084; // type:function size:0x4C scope:global align:4 link__24DynamicModuleControlBaseFv = .text:0x802630D0; // type:function size:0x94 scope:global align:4 @@ -10048,7 +10048,7 @@ __ct__20DynamicModuleControlFPCc = .text:0x80263460; // type:function size:0x70 mountCallback__20DynamicModuleControlFPv = .text:0x802634D0; // type:function size:0x8C scope:global align:4 initialize__20DynamicModuleControlFv = .text:0x8026355C; // type:function size:0x38 scope:global align:4 callback__20DynamicModuleControlFPv = .text:0x80263594; // type:function size:0x2C scope:global align:4 -calcSum2__FPCUsUl = .text:0x802635C0; // type:function size:0x28 scope:global align:4 +calcSum2__FPCUsUl = .text:0x802635C0; // type:function size:0x28 scope:local align:4 do_load__20DynamicModuleControlFv = .text:0x802635E8; // type:function size:0x314 scope:global align:4 do_load_async__20DynamicModuleControlFv = .text:0x802638FC; // type:function size:0xC8 scope:global align:4 do_unload__20DynamicModuleControlFv = .text:0x802639C4; // type:function size:0x48 scope:global align:4 @@ -10062,15 +10062,15 @@ ModuleEpilog = .text:0x80263E8C; // type:function size:0x4 scope:global align:4 ModuleUnresolved = .text:0x80263E90; // type:function size:0xBC scope:global align:4 ModuleConstructorsX = .text:0x80263F4C; // type:function size:0x44 scope:global align:4 ModuleDestructorsX = .text:0x80263F90; // type:function size:0x44 scope:global align:4 -do_link__24DynamicModuleControlBaseFv = .text:0x80263FD4; // type:function size:0x8 scope:global align:4 -do_load__24DynamicModuleControlBaseFv = .text:0x80263FDC; // type:function size:0x8 scope:global align:4 -do_unload__24DynamicModuleControlBaseFv = .text:0x80263FE4; // type:function size:0x8 scope:global align:4 -do_unlink__24DynamicModuleControlBaseFv = .text:0x80263FEC; // type:function size:0x8 scope:global align:4 -do_load_async__24DynamicModuleControlBaseFv = .text:0x80263FF4; // type:function size:0x8 scope:global align:4 -dump2__24DynamicModuleControlBaseFv = .text:0x80263FFC; // type:function size:0x4 scope:global align:4 -getModuleTypeString__24DynamicModuleControlBaseCFv = .text:0x80264000; // type:function size:0x10 scope:global align:4 -getModuleSize__24DynamicModuleControlBaseCFv = .text:0x80264010; // type:function size:0x8 scope:global align:4 -getModuleName__20DynamicModuleControlCFv = .text:0x80264018; // type:function size:0x8 scope:global align:4 +do_link__24DynamicModuleControlBaseFv = .text:0x80263FD4; // type:function size:0x8 scope:weak align:4 +do_load__24DynamicModuleControlBaseFv = .text:0x80263FDC; // type:function size:0x8 scope:weak align:4 +do_unload__24DynamicModuleControlBaseFv = .text:0x80263FE4; // type:function size:0x8 scope:weak align:4 +do_unlink__24DynamicModuleControlBaseFv = .text:0x80263FEC; // type:function size:0x8 scope:weak align:4 +do_load_async__24DynamicModuleControlBaseFv = .text:0x80263FF4; // type:function size:0x8 scope:weak align:4 +dump2__24DynamicModuleControlBaseFv = .text:0x80263FFC; // type:function size:0x4 scope:weak align:4 +getModuleTypeString__24DynamicModuleControlBaseCFv = .text:0x80264000; // type:function size:0x10 scope:weak align:4 +getModuleSize__24DynamicModuleControlBaseCFv = .text:0x80264010; // type:function size:0x8 scope:weak align:4 +getModuleName__20DynamicModuleControlCFv = .text:0x80264018; // type:function size:0x8 scope:weak align:4 init__3cMlFP7JKRHeap = .text:0x80264020; // type:function size:0x8 scope:global align:4 memalignB__3cMlFiUl = .text:0x80264028; // type:function size:0x38 scope:global align:4 free__3cMlFPv = .text:0x80264060; // type:function size:0x2C scope:global align:4 @@ -10144,16 +10144,16 @@ SetHit__10cCcD_ObjCoFP8cCcD_Obj = .text:0x802656D8; // type:function size:0x10 s ClrHit__10cCcD_ObjCoFv = .text:0x802656E8; // type:function size:0x18 scope:global align:4 SetIGrp__10cCcD_ObjCoFUl = .text:0x80265700; // type:function size:0x1C scope:global align:4 SetVsGrp__10cCcD_ObjCoFUl = .text:0x8026571C; // type:function size:0x1C scope:global align:4 -__dt__12cCcD_TriAttrFv = .text:0x80265738; // type:function size:0xA0 scope:global align:4 -CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz = .text:0x802657D8; // type:function size:0x8 scope:global align:4 -CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf = .text:0x802657E0; // type:function size:0x8 scope:global align:4 -ClrAt__9cCcD_SttsFv = .text:0x802657E8; // type:function size:0x4 scope:global align:4 -ClrTg__9cCcD_SttsFv = .text:0x802657EC; // type:function size:0xC scope:global align:4 +__dt__12cCcD_TriAttrFv = .text:0x80265738; // type:function size:0xA0 scope:weak align:4 +CrossAtTg__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrP4cXyz = .text:0x802657D8; // type:function size:0x8 scope:weak align:4 +CrossCo__14cCcD_ShapeAttrCFRC14cCcD_ShapeAttrPf = .text:0x802657E0; // type:function size:0x8 scope:weak align:4 +ClrAt__9cCcD_SttsFv = .text:0x802657E8; // type:function size:0x4 scope:weak align:4 +ClrTg__9cCcD_SttsFv = .text:0x802657EC; // type:function size:0xC scope:weak align:4 __sinit_c_cc_d_cpp = .text:0x802657F8; // type:function size:0x54 scope:local align:4 -@32@__dt__12cCcD_TriAttrFv = .text:0x8026584C; // type:function size:0x8 scope:local align:4 -@32@__dt__12cCcD_CpsAttrFv = .text:0x80265854; // type:function size:0x8 scope:local align:4 -@32@__dt__12cCcD_CylAttrFv = .text:0x8026585C; // type:function size:0x8 scope:local align:4 -@32@__dt__12cCcD_SphAttrFv = .text:0x80265864; // type:function size:0x8 scope:local align:4 +@32@__dt__12cCcD_TriAttrFv = .text:0x8026584C; // type:function size:0x8 scope:weak align:4 +@32@__dt__12cCcD_CpsAttrFv = .text:0x80265854; // type:function size:0x8 scope:weak align:4 +@32@__dt__12cCcD_CylAttrFv = .text:0x8026585C; // type:function size:0x8 scope:weak align:4 +@32@__dt__12cCcD_SphAttrFv = .text:0x80265864; // type:function size:0x8 scope:weak align:4 __ct__4cCcSFv = .text:0x8026586C; // type:function size:0x28 scope:global align:4 Ct__4cCcSFv = .text:0x80265894; // type:function size:0xCC scope:global align:4 Dt__4cCcSFv = .text:0x80265960; // type:function size:0x20 scope:global align:4 @@ -10277,13 +10277,13 @@ __dt__11cBgS_GndChkFv = .text:0x80268A94; // type:function size:0x78 scope:globa SetPos__11cBgS_GndChkFPC3Vec = .text:0x80268B0C; // type:function size:0x1C scope:global align:4 SetPos__11cBgS_GndChkFPC4cXyz = .text:0x80268B28; // type:function size:0x1C scope:global align:4 PreCheck__11cBgS_GndChkFv = .text:0x80268B44; // type:function size:0x10 scope:global align:4 -@20@__dt__11cBgS_GndChkFv = .text:0x80268B54; // type:function size:0x8 scope:local align:4 +@20@__dt__11cBgS_GndChkFv = .text:0x80268B54; // type:function size:0x8 scope:weak align:4 __ct__11cBgS_LinChkFv = .text:0x80268B5C; // type:function size:0x60 scope:global align:4 __dt__11cBgS_LinChkFv = .text:0x80268BBC; // type:function size:0x8C scope:global align:4 ct__11cBgS_LinChkFv = .text:0x80268C48; // type:function size:0x88 scope:global align:4 Set2__11cBgS_LinChkFPC4cXyzPC4cXyzUi = .text:0x80268CD0; // type:function size:0x70 scope:global align:4 PreCalc__11cBgS_LinChkFv = .text:0x80268D40; // type:function size:0x40 scope:global align:4 -@20@__dt__11cBgS_LinChkFv = .text:0x80268D80; // type:function size:0x8 scope:local align:4 +@20@__dt__11cBgS_LinChkFv = .text:0x80268D80; // type:function size:0x8 scope:weak align:4 __ct__13cBgS_ShdwDrawFv = .text:0x80268D88; // type:function size:0x48 scope:global align:4 __dt__13cBgS_ShdwDrawFv = .text:0x80268DD0; // type:function size:0x78 scope:global align:4 Set__13cBgS_ShdwDrawFR4cXyzR4cXyz = .text:0x80268E48; // type:function size:0x24 scope:global align:4 @@ -10304,7 +10304,7 @@ cBgW_CheckBGround__Ff = .text:0x80268FE4; // type:function size:0x18 scope:globa cBgW_CheckBRoof__Ff = .text:0x80268FFC; // type:function size:0x14 scope:global align:4 cBgW_CheckBWall__Ff = .text:0x80269010; // type:function size:0x50 scope:global align:4 cM2d_CrossCirLin__FR8cM2dGCirffffPfPf = .text:0x80269060; // type:function size:0x300 scope:global align:4 -cM3d_InDivPos1__FPC3VecPC3VecfP3Vec = .text:0x80269360; // type:function size:0x50 scope:global align:4 +cM3d_InDivPos1__FPC3VecPC3VecfP3Vec = .text:0x80269360; // type:function size:0x50 scope:local align:4 cM3d_InDivPos2__FPC3VecPC3VecfP3Vec = .text:0x802693B0; // type:function size:0x64 scope:global align:4 cM3d_Len2dSq__Fffff = .text:0x80269414; // type:function size:0x18 scope:global align:4 cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf = .text:0x8026942C; // type:function size:0xE4 scope:global align:4 @@ -10316,53 +10316,53 @@ cM3d_CalcPla__FPC3VecPC3VecPC3VecP3VecPf = .text:0x8026971C; // type:function si cM3d_Cross_AabAab__FPC8cM3dGAabPC8cM3dGAab = .text:0x802697E8; // type:function size:0x124 scope:global align:4 cM3d_Cross_AabCyl__FPC8cM3dGAabPC8cM3dGCyl = .text:0x8026990C; // type:function size:0xA8 scope:global align:4 cM3d_Cross_AabSph__FPC8cM3dGAabPC8cM3dGSph = .text:0x802699B4; // type:function size:0xA8 scope:global align:4 -cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf = .text:0x80269A5C; // type:function size:0x278 scope:global align:4 -cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec = .text:0x80269CD4; // type:function size:0x60 scope:global align:4 +cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf = .text:0x80269A5C; // type:function size:0x278 scope:local align:4 +cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec = .text:0x80269CD4; // type:function size:0x60 scope:local align:4 cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb = .text:0x80269D34; // type:function size:0x11C scope:global align:4 cM3d_Cross_MinMaxBoxLine__FPC3VecPC3VecPC3VecPC3Vec = .text:0x80269E50; // type:function size:0xBDC scope:global align:4 -cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf = .text:0x8026AA2C; // type:function size:0x138 scope:global align:4 -cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff = .text:0x8026AB64; // type:function size:0xB4 scope:global align:4 -cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026AC18; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026ADBC; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026AF60; // type:function size:0x184 scope:global align:4 +cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf = .text:0x8026AA2C; // type:function size:0x138 scope:local align:4 +cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff = .text:0x8026AB64; // type:function size:0xB4 scope:local align:4 +cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026AC18; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026ADBC; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossX_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026AF60; // type:function size:0x184 scope:local align:4 cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026B0E4; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026B288; // type:function size:0x184 scope:global align:4 +cM3d_CrossY_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026B288; // type:function size:0x184 scope:local align:4 cM3d_CrossY_Tri__FRC3VecRC3VecRC3VecRC8cM3dGPlaPC3Vec = .text:0x8026B40C; // type:function size:0x1AC scope:global align:4 cM3d_CrossY_Tri_Front__FRC3VecRC3VecRC3VecPC3Vec = .text:0x8026B5B8; // type:function size:0x108 scope:global align:4 -cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf = .text:0x8026B6C0; // type:function size:0x84 scope:global align:4 -cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026B744; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf = .text:0x8026B8E8; // type:function size:0xF0 scope:global align:4 -cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026B9D8; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026BB7C; // type:function size:0x1A4 scope:global align:4 -cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026BD20; // type:function size:0x184 scope:global align:4 +cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf = .text:0x8026B6C0; // type:function size:0x84 scope:local align:4 +cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026B744; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf = .text:0x8026B8E8; // type:function size:0xF0 scope:local align:4 +cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf = .text:0x8026B9D8; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vec = .text:0x8026BB7C; // type:function size:0x1A4 scope:local align:4 +cM3d_CrossZ_LinTri_proc__FPC8cM3dGTriPC3Vec = .text:0x8026BD20; // type:function size:0x184 scope:local align:4 cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb = .text:0x8026BEA4; // type:function size:0xD8 scope:global align:4 -cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec = .text:0x8026BF7C; // type:function size:0xBC scope:global align:4 -cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec = .text:0x8026C038; // type:function size:0x48 scope:global align:4 +cM3d_Cross_LinTri_Easy__FPC8cM3dGTriPC3Vec = .text:0x8026BF7C; // type:function size:0xBC scope:local align:4 +cM3d_Cross_SphPnt__FPC8cM3dGSphPC3Vec = .text:0x8026C038; // type:function size:0x48 scope:local align:4 cM3d_Cross_LinSph__FPC8cM3dGLinPC8cM3dGSphP3Vec = .text:0x8026C080; // type:function size:0x268 scope:global align:4 cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec = .text:0x8026C2E8; // type:function size:0x3BC scope:global align:4 cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf = .text:0x8026C6A4; // type:function size:0x1A4 scope:global align:4 cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf = .text:0x8026C848; // type:function size:0x234 scope:global align:4 cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf = .text:0x8026CA7C; // type:function size:0x80 scope:global align:4 -cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf = .text:0x8026CAFC; // type:function size:0x8C scope:global align:4 +cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf = .text:0x8026CAFC; // type:function size:0x8C scope:local align:4 cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphP3Vec = .text:0x8026CB88; // type:function size:0xD4 scope:global align:4 -cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec = .text:0x8026CC5C; // type:function size:0xA8 scope:global align:4 +cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec = .text:0x8026CC5C; // type:function size:0xA8 scope:local align:4 cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec = .text:0x8026CD04; // type:function size:0x328 scope:global align:4 cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf = .text:0x8026D02C; // type:function size:0x188 scope:global align:4 cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylP3Vec = .text:0x8026D1B4; // type:function size:0x21C scope:global align:4 cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec = .text:0x8026D3D0; // type:function size:0x374 scope:global align:4 cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec = .text:0x8026D744; // type:function size:0x700 scope:global align:4 -cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec = .text:0x8026DE44; // type:function size:0x6C scope:global align:4 -cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec = .text:0x8026DEB0; // type:function size:0x64 scope:global align:4 +cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec = .text:0x8026DE44; // type:function size:0x6C scope:local align:4 +cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec = .text:0x8026DEB0; // type:function size:0x64 scope:local align:4 cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec = .text:0x8026DF14; // type:function size:0x2C0 scope:global align:4 cM3d_Cross_CpsCyl__FRC8cM3dGCpsRC8cM3dGCylP3Vec = .text:0x8026E1D4; // type:function size:0x70C scope:global align:4 -cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec = .text:0x8026E8E0; // type:function size:0x15C scope:global align:4 +cM3d_Cross_CpsSph_CrossPos__FRC8cM3dGCpsRC8cM3dGSphRC3VecP3Vec = .text:0x8026E8E0; // type:function size:0x15C scope:local align:4 cM3d_Cross_CpsSph__FRC8cM3dGCpsRC8cM3dGSphP3Vec = .text:0x8026EA3C; // type:function size:0x1F0 scope:global align:4 cM3d_Cross_TriTri__FRC8cM3dGTriRC8cM3dGTriP3Vec = .text:0x8026EC2C; // type:function size:0x300 scope:global align:4 cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec = .text:0x8026EF2C; // type:function size:0x3D0 scope:global align:4 cM3d_CalcVecAngle__FRC3VecPsPs = .text:0x8026F2FC; // type:function size:0x74 scope:global align:4 cM3d_CalcVecZAngle__FRC3VecP5csXyz = .text:0x8026F370; // type:function size:0x154 scope:global align:4 -cM3d_PlaneCrossLineProcWork__FfffffffPfPf = .text:0x8026F4C4; // type:function size:0x2C scope:global align:4 -cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin = .text:0x8026F4F0; // type:function size:0x1B0 scope:global align:4 +cM3d_PlaneCrossLineProcWork__FfffffffPfPf = .text:0x8026F4C4; // type:function size:0x2C scope:local align:4 +cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin = .text:0x8026F4F0; // type:function size:0x1B0 scope:local align:4 cM3d_3PlaneCrossPos__FRC8cM3dGPlaRC8cM3dGPlaRC8cM3dGPlaP3Vec = .text:0x8026F6A0; // type:function size:0xE0 scope:global align:4 cM3d_lineVsPosSuisenCross__FPC8cM3dGLinPC3VecP3Vec = .text:0x8026F780; // type:function size:0xDC scope:global align:4 cM3d_lineVsPosSuisenCross__FRC3VecRC3VecRC3VecP3Vec = .text:0x8026F85C; // type:function size:0xDC scope:global align:4 @@ -10381,7 +10381,7 @@ SetMax__8cM3dGAabFRC4cXyz = .text:0x8026FBE4; // type:function size:0x40 scope:g CalcCenter__8cM3dGAabCFP4cXyz = .text:0x8026FC24; // type:function size:0x44 scope:global align:4 PlusR__8cM3dGAabFf = .text:0x8026FC68; // type:function size:0x4C scope:global align:4 __ct__8cM3dGCirFv = .text:0x8026FCB4; // type:function size:0x1C scope:global align:4 -__dt__8cM2dGCirFv = .text:0x8026FCD0; // type:function size:0x48 scope:global align:4 +__dt__8cM2dGCirFv = .text:0x8026FCD0; // type:function size:0x48 scope:weak align:4 __dt__8cM3dGCirFv = .text:0x8026FD18; // type:function size:0x5C scope:global align:4 Set__8cM3dGCirFffff = .text:0x8026FD74; // type:function size:0x14 scope:global align:4 __ct__8cM3dGCpsFv = .text:0x8026FD88; // type:function size:0x1C scope:global align:4 @@ -10500,7 +10500,7 @@ Xyz__7cSGlobeCFv = .text:0x802728B4; // type:function size:0x40 scope:global ali Polar__7cSGlobeCFP7cSPolar = .text:0x802728F4; // type:function size:0x3C scope:global align:4 Norm__7cSGlobeCFv = .text:0x80272930; // type:function size:0x4C scope:global align:4 Invert__7cSGlobeFv = .text:0x8027297C; // type:function size:0x2C scope:global align:4 -Adjust__6cAngleFfff = .text:0x802729A8; // type:function size:0x2C scope:global align:4 +Adjust__6cAngleFfff = .text:0x802729A8; // type:function size:0x2C scope:weak align:4 __sinit_c_angle_cpp = .text:0x802729D4; // type:function size:0xB8 scope:local align:4 sBs_FillArea_s__FPvUls = .text:0x80272A8C; // type:function size:0x20 scope:global align:4 sBs_ClearArea__FPvUl = .text:0x80272AAC; // type:function size:0x24 scope:global align:4 @@ -10510,7 +10510,7 @@ ctor_subroutine__10JFWDisplayFb = .text:0x80272E40; // type:function size:0xB8 s __ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb = .text:0x80272EF8; // type:function size:0x68 scope:global align:4 __dt__10JFWDisplayFv = .text:0x80272F60; // type:function size:0x7C scope:global align:4 createManager__10JFWDisplayFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumberb = .text:0x80272FDC; // type:function size:0x84 scope:global align:4 -callDirectDraw__Fv = .text:0x80273060; // type:function size:0x58 scope:global align:4 +callDirectDraw__Fv = .text:0x80273060; // type:function size:0x58 scope:local align:4 prepareCopyDisp__10JFWDisplayFv = .text:0x802730B8; // type:function size:0xF4 scope:global align:4 drawendXfb_single__10JFWDisplayFv = .text:0x802731AC; // type:function size:0x48 scope:global align:4 exchangeXfb_double__10JFWDisplayFv = .text:0x802731F4; // type:function size:0x108 scope:global align:4 @@ -10522,24 +10522,24 @@ beginRender__10JFWDisplayFv = .text:0x80273598; // type:function size:0x26C scop endRender__10JFWDisplayFv = .text:0x80273804; // type:function size:0xAC scope:global align:4 endFrame__10JFWDisplayFv = .text:0x802738B0; // type:function size:0x1B0 scope:global align:4 waitBlanking__10JFWDisplayFi = .text:0x80273A60; // type:function size:0x50 scope:global align:4 -waitForTick__FUlUs = .text:0x80273AB0; // type:function size:0x120 scope:global align:4 -JFWThreadAlarmHandler__FP7OSAlarmP9OSContext = .text:0x80273BD0; // type:function size:0x40 scope:global align:4 +waitForTick__FUlUs = .text:0x80273AB0; // type:function size:0x120 scope:local align:4 +JFWThreadAlarmHandler__FP7OSAlarmP9OSContext = .text:0x80273BD0; // type:function size:0x40 scope:local align:4 threadSleep__10JFWDisplayFx = .text:0x80273C10; // type:function size:0xA8 scope:global align:4 clearEfb_init__10JFWDisplayFv = .text:0x80273CB8; // type:function size:0x74 scope:global align:4 clearEfb__10JFWDisplayFv = .text:0x80273D2C; // type:function size:0x2C scope:global align:4 clearEfb__10JFWDisplayF8_GXColor = .text:0x80273D58; // type:function size:0x44 scope:global align:4 clearEfb__10JFWDisplayFiiii8_GXColor = .text:0x80273D9C; // type:function size:0x380 scope:global align:4 calcCombinationRatio__10JFWDisplayFv = .text:0x8027411C; // type:function size:0x8C scope:global align:4 -JFWDrawDoneAlarm__Fv = .text:0x802741A8; // type:function size:0xDC scope:global align:4 -JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext = .text:0x80274284; // type:function size:0x78 scope:global align:4 -diagnoseGpHang__Fv = .text:0x802742FC; // type:function size:0x1E0 scope:global align:4 +JFWDrawDoneAlarm__Fv = .text:0x802741A8; // type:function size:0xDC scope:local align:4 +JFWGXAbortAlarmHandler__FP7OSAlarmP9OSContext = .text:0x80274284; // type:function size:0x78 scope:local align:4 +diagnoseGpHang__Fv = .text:0x802742FC; // type:function size:0x1E0 scope:local align:4 __sinit_JFWDisplay_cpp = .text:0x802744DC; // type:function size:0x48 scope:local align:4 -__dt__18JSUList<8JFWAlarm>Fv = .text:0x80274524; // type:function size:0x54 scope:global align:4 +__dt__18JSUList<8JFWAlarm>Fv = .text:0x80274524; // type:function size:0x54 scope:weak align:4 init__11J3DUClipperFv = .text:0x80274578; // type:function size:0x14 scope:global align:4 calcViewFrustum__11J3DUClipperFv = .text:0x8027458C; // type:function size:0x170 scope:global align:4 clip__11J3DUClipperCFPA4_Cf3Vecf = .text:0x802746FC; // type:function size:0x148 scope:global align:4 clip__11J3DUClipperCFPA4_CfP3VecP3Vec = .text:0x80274844; // type:function size:0x3C4 scope:global align:4 -getUseMtxNum__11J3DShapeMtxCFv = .text:0x80274C08; // type:function size:0x8 scope:global align:4 +getUseMtxNum__11J3DShapeMtxCFv = .text:0x80274C08; // type:function size:0x8 scope:weak align:4 __ct__18JPAResourceManagerFPCvP7JKRHeap = .text:0x80274C10; // type:function size:0x58 scope:global align:4 getResource__18JPAResourceManagerCFUs = .text:0x80274C68; // type:function size:0x40 scope:global align:4 checkUserIndexDuplication__18JPAResourceManagerCFUs = .text:0x80274CA8; // type:function size:0x44 scope:global align:4 @@ -10561,7 +10561,7 @@ calcField__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80277 calcKey__11JPAResourceFP18JPAEmitterWorkData = .text:0x80277500; // type:function size:0x140 scope:global align:4 calcWorkData_c__11JPAResourceFP18JPAEmitterWorkData = .text:0x80277640; // type:function size:0x1CC scope:global align:4 calcWorkData_d__11JPAResourceFP18JPAEmitterWorkData = .text:0x8027780C; // type:function size:0x80 scope:global align:4 -prepare__12JPAFieldBaseFP18JPAEmitterWorkDataP13JPAFieldBlock = .text:0x8027788C; // type:function size:0x4 scope:global align:4 +prepare__12JPAFieldBaseFP18JPAEmitterWorkDataP13JPAFieldBlock = .text:0x8027788C; // type:function size:0x4 scope:weak align:4 JPASetPointSize__FP18JPAEmitterWorkData = .text:0x80277890; // type:function size:0x3C scope:global align:4 JPASetLineWidth__FP18JPAEmitterWorkData = .text:0x802778CC; // type:function size:0x3C scope:global align:4 JPASetPointSize__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80277908; // type:function size:0x44 scope:global align:4 @@ -10608,9 +10608,9 @@ JPACalcTexIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80278994; JPACalcTexIdxRandom__FP18JPAEmitterWorkData = .text:0x80278A0C; // type:function size:0x1C scope:global align:4 JPACalcTexIdxRandom__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80278A28; // type:function size:0x3C scope:global align:4 JPALoadPosMtxCam__FP18JPAEmitterWorkData = .text:0x80278A64; // type:function size:0x28 scope:global align:4 -noLoadPrj__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x80278A8C; // type:function size:0x4 scope:global align:4 +noLoadPrj__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x80278A8C; // type:function size:0x4 scope:local align:4 loadPrj__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x80278A90; // type:function size:0x38 scope:global align:4 -loadPrjAnm__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x80278AC8; // type:function size:0x1C0 scope:global align:4 +loadPrjAnm__FPC18JPAEmitterWorkDataPA4_Cf = .text:0x80278AC8; // type:function size:0x1C0 scope:local align:4 JPADrawBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80278C88; // type:function size:0xE8 scope:global align:4 JPADrawRotBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80278D70; // type:function size:0x118 scope:global align:4 JPADrawYBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80278E88; // type:function size:0xFC scope:global align:4 @@ -10620,13 +10620,13 @@ dirTypePos__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = . dirTypePosInv__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = .text:0x802790EC; // type:function size:0x34 scope:global align:4 dirTypeEmtrDir__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = .text:0x80279120; // type:function size:0x1C scope:global align:4 dirTypePrevPtcl__FPC18JPAEmitterWorkDataPC15JPABaseParticlePQ29JGeometry8TVec3 = .text:0x8027913C; // type:function size:0x98 scope:global align:4 -rotTypeY__FffRA3_A4_f = .text:0x802791D4; // type:function size:0x40 scope:global align:4 -rotTypeX__FffRA3_A4_f = .text:0x80279214; // type:function size:0x40 scope:global align:4 -rotTypeZ__FffRA3_A4_f = .text:0x80279254; // type:function size:0x40 scope:global align:4 -rotTypeXYZ__FffRA3_A4_f = .text:0x80279294; // type:function size:0x5C scope:global align:4 -basePlaneTypeXY__FPA4_fff = .text:0x802792F0; // type:function size:0x4C scope:global align:4 -basePlaneTypeXZ__FPA4_fff = .text:0x8027933C; // type:function size:0x4C scope:global align:4 -basePlaneTypeX__FPA4_fff = .text:0x80279388; // type:function size:0x70 scope:global align:4 +rotTypeY__FffRA3_A4_f = .text:0x802791D4; // type:function size:0x40 scope:local align:4 +rotTypeX__FffRA3_A4_f = .text:0x80279214; // type:function size:0x40 scope:local align:4 +rotTypeZ__FffRA3_A4_f = .text:0x80279254; // type:function size:0x40 scope:local align:4 +rotTypeXYZ__FffRA3_A4_f = .text:0x80279294; // type:function size:0x5C scope:local align:4 +basePlaneTypeXY__FPA4_fff = .text:0x802792F0; // type:function size:0x4C scope:local align:4 +basePlaneTypeXZ__FPA4_fff = .text:0x8027933C; // type:function size:0x4C scope:local align:4 +basePlaneTypeX__FPA4_fff = .text:0x80279388; // type:function size:0x70 scope:local align:4 JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x802793F8; // type:function size:0x39C scope:global align:4 JPADrawRotDirection__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80279794; // type:function size:0x414 scope:global align:4 JPADrawDBillboard__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x80279BA8; // type:function size:0x220 scope:global align:4 @@ -10639,7 +10639,7 @@ JPADrawStripe__FP18JPAEmitterWorkData = .text:0x8027A174; // type:function size: JPADrawStripeX__FP18JPAEmitterWorkData = .text:0x8027A76C; // type:function size:0xA6C scope:global align:4 JPADrawEmitterCallBackB__FP18JPAEmitterWorkData = .text:0x8027B1D8; // type:function size:0x3C scope:global align:4 JPADrawParticleCallBack__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027B214; // type:function size:0x40 scope:global align:4 -makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap = .text:0x8027B254; // type:function size:0x288 scope:global align:4 +makeColorTable__FPP8_GXColorPC16JPAClrAnmKeyDataUcsP7JKRHeap = .text:0x8027B254; // type:function size:0x288 scope:local align:4 __ct__12JPABaseShapeFPCUcP7JKRHeap = .text:0x8027B4DC; // type:function size:0x10C scope:global align:4 setGX__12JPABaseShapeCFP18JPAEmitterWorkData = .text:0x8027B5E8; // type:function size:0x130 scope:global align:4 JPACalcScaleX__FP18JPAEmitterWorkDataP15JPABaseParticle = .text:0x8027B718; // type:function size:0x78 scope:global align:4 @@ -10664,9 +10664,9 @@ JPAVolumePoint__FP18JPAEmitterWorkData = .text:0x8027BF44; // type:function size JPAVolumeLine__FP18JPAEmitterWorkData = .text:0x8027C020; // type:function size:0x11C scope:global align:4 JPAVolumeCircle__FP18JPAEmitterWorkData = .text:0x8027C13C; // type:function size:0x1AC scope:global align:4 JPAVolumeCube__FP18JPAEmitterWorkData = .text:0x8027C2E8; // type:function size:0x108 scope:global align:4 -JPAVolumeSphere__FP18JPAEmitterWorkData = .text:0x8027C3F0; // type:function size:0x28C scope:global align:4 -JPAVolumeCylinder__FP18JPAEmitterWorkData = .text:0x8027C67C; // type:function size:0x17C scope:global align:4 -JPAVolumeTorus__FP18JPAEmitterWorkData = .text:0x8027C7F8; // type:function size:0x120 scope:global align:4 +JPAVolumeSphere__FP18JPAEmitterWorkData = .text:0x8027C3F0; // type:function size:0x28C scope:local align:4 +JPAVolumeCylinder__FP18JPAEmitterWorkData = .text:0x8027C67C; // type:function size:0x17C scope:local align:4 +JPAVolumeTorus__FP18JPAEmitterWorkData = .text:0x8027C7F8; // type:function size:0x120 scope:local align:4 __ct__16JPADynamicsBlockFPCUc = .text:0x8027C918; // type:function size:0x34 scope:global align:4 init__16JPADynamicsBlockFv = .text:0x8027C94C; // type:function size:0x9C scope:global align:4 create__16JPADynamicsBlockFP18JPAEmitterWorkData = .text:0x8027C9E8; // type:function size:0x204 scope:global align:4 @@ -10690,16 +10690,16 @@ prepare__12JPAFieldSpinFP18JPAEmitterWorkDataP13JPAFieldBlock = .text:0x8027DC64 calc__12JPAFieldSpinFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle = .text:0x8027DDA8; // type:function size:0xE0 scope:global align:4 __ct__13JPAFieldBlockFPCUcP7JKRHeap = .text:0x8027DE88; // type:function size:0x38 scope:global align:4 init__13JPAFieldBlockFP7JKRHeap = .text:0x8027DEC0; // type:function size:0x2EC scope:global align:4 -__dt__12JPAFieldBaseFv = .text:0x8027E1AC; // type:function size:0x48 scope:global align:4 -__dt__12JPAFieldSpinFv = .text:0x8027E1F4; // type:function size:0x5C scope:global align:4 -__dt__12JPAFieldDragFv = .text:0x8027E250; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldRandomFv = .text:0x8027E2AC; // type:function size:0x5C scope:global align:4 -__dt__18JPAFieldConvectionFv = .text:0x8027E308; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldVortexFv = .text:0x8027E364; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldNewtonFv = .text:0x8027E3C0; // type:function size:0x5C scope:global align:4 -__dt__14JPAFieldMagnetFv = .text:0x8027E41C; // type:function size:0x5C scope:global align:4 -__dt__11JPAFieldAirFv = .text:0x8027E478; // type:function size:0x5C scope:global align:4 -__dt__15JPAFieldGravityFv = .text:0x8027E4D4; // type:function size:0x5C scope:global align:4 +__dt__12JPAFieldBaseFv = .text:0x8027E1AC; // type:function size:0x48 scope:weak align:4 +__dt__12JPAFieldSpinFv = .text:0x8027E1F4; // type:function size:0x5C scope:weak align:4 +__dt__12JPAFieldDragFv = .text:0x8027E250; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldRandomFv = .text:0x8027E2AC; // type:function size:0x5C scope:weak align:4 +__dt__18JPAFieldConvectionFv = .text:0x8027E308; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldVortexFv = .text:0x8027E364; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldNewtonFv = .text:0x8027E3C0; // type:function size:0x5C scope:weak align:4 +__dt__14JPAFieldMagnetFv = .text:0x8027E41C; // type:function size:0x5C scope:weak align:4 +__dt__11JPAFieldAirFv = .text:0x8027E478; // type:function size:0x5C scope:weak align:4 +__dt__15JPAFieldGravityFv = .text:0x8027E4D4; // type:function size:0x5C scope:weak align:4 __ct__11JPAKeyBlockFPCUc = .text:0x8027E530; // type:function size:0x10 scope:global align:4 calc__11JPAKeyBlockFf = .text:0x8027E540; // type:function size:0x94 scope:global align:4 __ct__10JPATextureFPCUc = .text:0x8027E5D4; // type:function size:0x68 scope:global align:4 @@ -10716,12 +10716,12 @@ forceDeleteEmitter__17JPAEmitterManagerFP14JPABaseEmitter = .text:0x8027F0D8; // entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc = .text:0x8027F144; // type:function size:0x10 scope:global align:4 clearResourceManager__17JPAEmitterManagerFUc = .text:0x8027F154; // type:function size:0xA0 scope:global align:4 calcYBBCam__17JPAEmitterManagerFv = .text:0x8027F1F4; // type:function size:0x128 scope:global align:4 -__ct__25JSUList<14JPABaseEmitter>Fv = .text:0x8027F31C; // type:function size:0x30 scope:global align:4 -__dt__26JPANode<15JPABaseParticle>Fv = .text:0x8027F34C; // type:function size:0x3C scope:global align:4 -__ct__26JPANode<15JPABaseParticle>Fv = .text:0x8027F388; // type:function size:0x10 scope:global align:4 -__dt__25JSUList<14JPABaseEmitter>Fv = .text:0x8027F398; // type:function size:0x54 scope:global align:4 -__dt__14JPABaseEmitterFv = .text:0x8027F3EC; // type:function size:0x60 scope:global align:4 -__ct__14JPABaseEmitterFv = .text:0x8027F44C; // type:function size:0x58 scope:global align:4 +__ct__25JSUList<14JPABaseEmitter>Fv = .text:0x8027F31C; // type:function size:0x30 scope:weak align:4 +__dt__26JPANode<15JPABaseParticle>Fv = .text:0x8027F34C; // type:function size:0x3C scope:weak align:4 +__ct__26JPANode<15JPABaseParticle>Fv = .text:0x8027F388; // type:function size:0x10 scope:weak align:4 +__dt__25JSUList<14JPABaseEmitter>Fv = .text:0x8027F398; // type:function size:0x54 scope:weak align:4 +__dt__14JPABaseEmitterFv = .text:0x8027F3EC; // type:function size:0x60 scope:weak align:4 +__ct__14JPABaseEmitterFv = .text:0x8027F44C; // type:function size:0x58 scope:weak align:4 __dt__18JPAEmitterCallBackFv = .text:0x8027F4A4; // type:function size:0x48 scope:global align:4 init__14JPABaseEmitterFP17JPAEmitterManagerP11JPAResource = .text:0x8027F4EC; // type:function size:0x354 scope:global align:4 createParticle__14JPABaseEmitterFv = .text:0x8027F840; // type:function size:0x120 scope:global align:4 @@ -10858,8 +10858,8 @@ __ct__Q37JStudio3ctb6TParseFPQ37JStudio3ctb8TControl = .text:0x8028215C; // type __dt__Q37JStudio3ctb6TParseFv = .text:0x8028217C; // type:function size:0x60 scope:global align:4 parseHeader_next__Q37JStudio3ctb6TParseFPPCvPUlUl = .text:0x802821DC; // type:function size:0x94 scope:global align:4 parseBlock_next__Q37JStudio3ctb6TParseFPPCvPUlUl = .text:0x80282270; // type:function size:0xE4 scope:global align:4 -__dt__Q37JStudio3ctb14TObject_TxyzRyFv = .text:0x80282354; // type:function size:0x60 scope:global align:4 -find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x802823B4; // type:function size:0x94 scope:global align:4 +__dt__Q37JStudio3ctb14TObject_TxyzRyFv = .text:0x80282354; // type:function size:0x60 scope:weak align:4 +find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x802823B4; // type:function size:0x94 scope:weak align:4 toFunction_outside__Q27JStudio14TFunctionValueFi = .text:0x80282448; // type:function size:0x48 scope:global align:4 __ct__Q27JStudio14TFunctionValueFv = .text:0x80282490; // type:function size:0x10 scope:global align:4 __dt__Q27JStudio14TFunctionValueFv = .text:0x802824A0; // type:function size:0x48 scope:global align:4 @@ -10926,31 +10926,31 @@ data_set__Q27JStudio22TFunctionValue_hermiteFPCfUlUl = .text:0x8028416C; // type initialize__Q27JStudio22TFunctionValue_hermiteFv = .text:0x802841BC; // type:function size:0x6C scope:global align:4 prepare__Q27JStudio22TFunctionValue_hermiteFv = .text:0x80284228; // type:function size:0x24 scope:global align:4 getValue__Q27JStudio22TFunctionValue_hermiteFd = .text:0x8028424C; // type:function size:0x124 scope:global align:4 -extrapolateParameter_raw__Q27JStudio13functionvalueFdd = .text:0x80284370; // type:function size:0x4 scope:global align:4 -extrapolateParameter_repeat__Q27JStudio13functionvalueFdd = .text:0x80284374; // type:function size:0x3C scope:global align:4 -extrapolateParameter_clamp__Q27JStudio13functionvalueFdd = .text:0x802843B0; // type:function size:0x2C scope:global align:4 -findUpperBound_binary_current__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCd = .text:0x802843DC; // type:function size:0x58 scope:global align:4 -findUpperBound_binary_current>__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80284434; // type:function size:0x224 scope:global align:4 -findUpperBound_binary_current__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCd = .text:0x80284658; // type:function size:0x70 scope:global align:4 -findUpperBound_binary_current>__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x802846C8; // type:function size:0x2FC scope:global align:4 -__dt__Q27JStudio22TFunctionValue_hermiteFv = .text:0x802849C4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio29TFunctionValue_list_parameterFv = .text:0x80284A24; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio19TFunctionValue_listFv = .text:0x80284A84; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio25TFunctionValue_transitionFv = .text:0x80284AE4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio23TFunctionValue_constantFv = .text:0x80284B44; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio24TFunctionValue_compositeFv = .text:0x80284BA4; // type:function size:0x80 scope:global align:4 -upper_bound>__3stdFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80284C24; // type:function size:0x94 scope:global align:4 -upper_bound>__3stdFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x80284CB8; // type:function size:0xC8 scope:global align:4 +extrapolateParameter_raw__Q27JStudio13functionvalueFdd = .text:0x80284370; // type:function size:0x4 scope:weak align:4 +extrapolateParameter_repeat__Q27JStudio13functionvalueFdd = .text:0x80284374; // type:function size:0x3C scope:weak align:4 +extrapolateParameter_clamp__Q27JStudio13functionvalueFdd = .text:0x802843B0; // type:function size:0x2C scope:weak align:4 +findUpperBound_binary_current__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCd = .text:0x802843DC; // type:function size:0x58 scope:local align:4 +findUpperBound_binary_current>__7JGadgetFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80284434; // type:function size:0x224 scope:local align:4 +findUpperBound_binary_current__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCd = .text:0x80284658; // type:function size:0x70 scope:local align:4 +findUpperBound_binary_current>__7JGadgetFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x802846C8; // type:function size:0x2FC scope:local align:4 +__dt__Q27JStudio22TFunctionValue_hermiteFv = .text:0x802849C4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio29TFunctionValue_list_parameterFv = .text:0x80284A24; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio19TFunctionValue_listFv = .text:0x80284A84; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio25TFunctionValue_transitionFv = .text:0x80284AE4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio23TFunctionValue_constantFv = .text:0x80284B44; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio24TFunctionValue_compositeFv = .text:0x80284BA4; // type:function size:0x80 scope:weak align:4 +upper_bound>__3stdFQ37JStudio29TFunctionValue_list_parameter15TIterator_data_Q37JStudio29TFunctionValue_list_parameter15TIterator_data_RCdQ23std7less = .text:0x80284C24; // type:function size:0x94 scope:weak align:4 +upper_bound>__3stdFQ37JStudio22TFunctionValue_hermite15TIterator_data_Q37JStudio22TFunctionValue_hermite15TIterator_data_RCdQ23std7less = .text:0x80284CB8; // type:function size:0xC8 scope:weak align:4 __dt__Q37JStudio3fvb7TObjectFv = .text:0x80284D80; // type:function size:0x48 scope:global align:4 prepare__Q37JStudio3fvb7TObjectFRCQ47JStudio3fvb4data13TParse_TBlockPQ37JStudio3fvb8TControl = .text:0x80284DC8; // type:function size:0x224 scope:global align:4 -getCompositeData_raw___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284FEC; // type:function size:0xC scope:global align:4 -getCompositeData_index___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284FF8; // type:function size:0xC scope:global align:4 -getCompositeData_parameter___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80285004; // type:function size:0xC scope:global align:4 -getCompositeData_add___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80285010; // type:function size:0xC scope:global align:4 -getCompositeData_subtract___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x8028501C; // type:function size:0xC scope:global align:4 -getCompositeData_multiply___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80285028; // type:function size:0xC scope:global align:4 -getCompositeData_divide___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80285034; // type:function size:0xC scope:global align:4 -getCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@FQ47JStudio3fvb4data11TEComposite = .text:0x80285040; // type:function size:0x14 scope:global align:4 +getCompositeData_raw___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284FEC; // type:function size:0xC scope:local align:4 +getCompositeData_index___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80284FF8; // type:function size:0xC scope:local align:4 +getCompositeData_parameter___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80285004; // type:function size:0xC scope:local align:4 +getCompositeData_add___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80285010; // type:function size:0xC scope:local align:4 +getCompositeData_subtract___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x8028501C; // type:function size:0xC scope:local align:4 +getCompositeData_multiply___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80285028; // type:function size:0xC scope:local align:4 +getCompositeData_divide___Q37JStudio3fvb17@unnamed@fvb_cpp@FPCv = .text:0x80285034; // type:function size:0xC scope:local align:4 +getCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@FQ47JStudio3fvb4data11TEComposite = .text:0x80285040; // type:function size:0x14 scope:local align:4 __ct__Q37JStudio3fvb17TObject_compositeFRCQ47JStudio3fvb4data13TParse_TBlock = .text:0x80285054; // type:function size:0x80 scope:global align:4 prepare_data___Q37JStudio3fvb17TObject_compositeFRCQ57JStudio3fvb4data17TParse_TParagraph5TDataPQ37JStudio3fvb8TControl = .text:0x802850D4; // type:function size:0x64 scope:global align:4 __ct__Q37JStudio3fvb16TObject_constantFRCQ47JStudio3fvb4data13TParse_TBlock = .text:0x80285138; // type:function size:0x80 scope:global align:4 @@ -10978,13 +10978,13 @@ __ct__Q37JStudio3fvb6TParseFPQ37JStudio3fvb8TControl = .text:0x802858DC; // type __dt__Q37JStudio3fvb6TParseFv = .text:0x802858FC; // type:function size:0x60 scope:global align:4 parseHeader_next__Q37JStudio3fvb6TParseFPPCvPUlUl = .text:0x8028595C; // type:function size:0x94 scope:global align:4 parseBlock_next__Q37JStudio3fvb6TParseFPPCvPUlUl = .text:0x802859F0; // type:function size:0xF4 scope:global align:4 -__dt__Q37JStudio3fvb15TObject_hermiteFv = .text:0x80285AE4; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb22TObject_list_parameterFv = .text:0x80285B68; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb12TObject_listFv = .text:0x80285BEC; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb18TObject_transitionFv = .text:0x80285C70; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb16TObject_constantFv = .text:0x80285CF4; // type:function size:0x84 scope:global align:4 -__dt__Q37JStudio3fvb17TObject_compositeFv = .text:0x80285D78; // type:function size:0xA0 scope:global align:4 -find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x80285E18; // type:function size:0x94 scope:global align:4 +__dt__Q37JStudio3fvb15TObject_hermiteFv = .text:0x80285AE4; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb22TObject_list_parameterFv = .text:0x80285B68; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb12TObject_listFv = .text:0x80285BEC; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb18TObject_transitionFv = .text:0x80285C70; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb16TObject_constantFv = .text:0x80285CF4; // type:function size:0x84 scope:weak align:4 +__dt__Q37JStudio3fvb17TObject_compositeFv = .text:0x80285D78; // type:function size:0xA0 scope:weak align:4 +find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x80285E18; // type:function size:0x94 scope:weak align:4 getData__Q47JStudio3fvb4data17TParse_TParagraphCFPQ57JStudio3fvb4data17TParse_TParagraph5TData = .text:0x80285EAC; // type:function size:0x68 scope:global align:4 __ct__Q27JStudio8TControlFv = .text:0x80285F14; // type:function size:0x98 scope:global align:4 __dt__Q27JStudio8TControlFv = .text:0x80285FAC; // type:function size:0x7C scope:global align:4 @@ -11063,25 +11063,25 @@ do_paragraph__Q27JStudio16TObject_particleFUlPCvUl = .text:0x802885A8; // type:f __dt__Q27JStudio14TAdaptor_soundFv = .text:0x8028893C; // type:function size:0x60 scope:global align:4 __ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound = .text:0x8028899C; // type:function size:0x3C scope:global align:4 do_paragraph__Q27JStudio13TObject_soundFUlPCvUl = .text:0x802889D8; // type:function size:0x32C scope:global align:4 -__dt__Q27JStudio13TObject_soundFv = .text:0x80288D04; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio16TObject_particleFv = .text:0x80288D64; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio15TObject_messageFv = .text:0x80288DC4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio13TObject_lightFv = .text:0x80288E24; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio11TObject_fogFv = .text:0x80288E84; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio14TObject_cameraFv = .text:0x80288EE4; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio20TObject_ambientLightFv = .text:0x80288F44; // type:function size:0x60 scope:global align:4 -__dt__Q27JStudio13TObject_actorFv = .text:0x80288FA4; // type:function size:0x60 scope:global align:4 +__dt__Q27JStudio13TObject_soundFv = .text:0x80288D04; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio16TObject_particleFv = .text:0x80288D64; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio15TObject_messageFv = .text:0x80288DC4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio13TObject_lightFv = .text:0x80288E24; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio11TObject_fogFv = .text:0x80288E84; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio14TObject_cameraFv = .text:0x80288EE4; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio20TObject_ambientLightFv = .text:0x80288F44; // type:function size:0x60 scope:weak align:4 +__dt__Q27JStudio13TObject_actorFv = .text:0x80288FA4; // type:function size:0x60 scope:weak align:4 __sinit_jstudio-object_cpp = .text:0x80289004; // type:function size:0x3D8 scope:local align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x802893DC; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_Fv = .text:0x8028943C; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028949C; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_Fv = .text:0x802894FC; // type:function size:0x60 scope:global align:4 -__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028955C; // type:function size:0x60 scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x802895BC; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x80289618; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x80289674; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x802896D0; // type:function size:0x5C scope:global align:4 -__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028972C; // type:function size:0x5C scope:global align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x802893DC; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_Fv = .text:0x8028943C; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028949C; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_Fv = .text:0x802894FC; // type:function size:0x60 scope:local align:4 +__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_Fv = .text:0x8028955C; // type:function size:0x60 scope:local align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x802895BC; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x80289618; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x80289674; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x802896D0; // type:function size:0x5C scope:weak align:4 +__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_CFfPQ27JStudio8TAdaptor = .text:0x8028972C; // type:function size:0x5C scope:weak align:4 isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData = .text:0x80289788; // type:function size:0xF0 scope:global align:4 __ct__Q37JStudio3stb7TObjectFUlPCvUl = .text:0x80289878; // type:function size:0x48 scope:global align:4 __ct__Q37JStudio3stb7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x802898C0; // type:function size:0x70 scope:global align:4 @@ -11098,7 +11098,7 @@ process_sequence___Q37JStudio3stb7TObjectFv = .text:0x80289C2C; // type:function process_paragraph_reserved___Q37JStudio3stb7TObjectFUlPCvUl = .text:0x80289D80; // type:function size:0xE8 scope:global align:4 __ct__Q37JStudio3stb15TObject_controlFPCvUl = .text:0x80289E68; // type:function size:0x4C scope:global align:4 __ct__Q37JStudio3stb8TControlFv = .text:0x80289EB4; // type:function size:0x80 scope:global align:4 -__dt__Q37JStudio3stb15TObject_controlFv = .text:0x80289F34; // type:function size:0x60 scope:global align:4 +__dt__Q37JStudio3stb15TObject_controlFv = .text:0x80289F34; // type:function size:0x60 scope:weak align:4 __dt__Q37JStudio3stb8TControlFv = .text:0x80289F94; // type:function size:0x94 scope:global align:4 appendObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject = .text:0x8028A028; // type:function size:0x50 scope:global align:4 removeObject__Q37JStudio3stb8TControlFPQ37JStudio3stb7TObject = .text:0x8028A078; // type:function size:0x38 scope:global align:4 @@ -11117,17 +11117,17 @@ parseBlock_next__Q37JStudio3stb6TParseFPPCvPUlUl = .text:0x8028A58C; // type:fun parseHeader__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data14TParse_THeaderUl = .text:0x8028A5E0; // type:function size:0x8 scope:global align:4 parseBlock_block__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data13TParse_TBlockUl = .text:0x8028A5E8; // type:function size:0x38 scope:global align:4 parseBlock_object__Q37JStudio3stb6TParseFRCQ47JStudio3stb4data20TParse_TBlock_objectUl = .text:0x8028A620; // type:function size:0x108 scope:global align:4 -find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x8028A728; // type:function size:0x94 scope:global align:4 +find_if8iterator,Q37JStudio6object18TPRObject_ID_equal>__3stdFQ37JGadget37TLinkList8iteratorQ37JGadget37TLinkList8iteratorQ37JStudio6object18TPRObject_ID_equal = .text:0x8028A728; // type:function size:0x94 scope:weak align:4 getData__Q47JStudio3stb4data16TParse_TSequenceCFPQ57JStudio3stb4data16TParse_TSequence5TData = .text:0x8028A7BC; // type:function size:0x4C scope:global align:4 getData__Q47JStudio3stb4data17TParse_TParagraphCFPQ57JStudio3stb4data17TParse_TParagraph5TData = .text:0x8028A808; // type:function size:0x78 scope:global align:4 getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TParse_TParagraph_data5TData = .text:0x8028A880; // type:function size:0x80 scope:global align:4 __dt__Q214JStudio_JStage13TCreateObjectFv = .text:0x8028A900; // type:function size:0x60 scope:global align:4 create__Q214JStudio_JStage13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x8028A960; // type:function size:0x184 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028AAE4; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028ABE8; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028ACEC; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028ADF0; // type:function size:0x104 scope:global align:4 -createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028AEF4; // type:function size:0x104 scope:global align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028AAE4; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028ABE8; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028ACEC; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028ADF0; // type:function size:0x104 scope:weak align:4 +createObject_JSG___Q214JStudio_JStage21@unnamed@control_cpp@FRCQ47JStudio3stb4data20TParse_TBlock_objectPQ26JStage7TObjectPCQ26JStage7TSystem = .text:0x8028AEF4; // type:function size:0x104 scope:weak align:4 transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl = .text:0x8028AFF8; // type:function size:0x98 scope:global align:4 transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl = .text:0x8028B090; // type:function size:0x98 scope:global align:4 transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl = .text:0x8028B128; // type:function size:0xA4 scope:global align:4 @@ -11159,11 +11159,11 @@ setJSG_ID___Q214JStudio_JStage14TAdaptor_actorFMQ26JStage6TActorFPCvPvUl_vQ37JSt setJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl = .text:0x8028BB38; // type:function size:0x194 scope:global align:4 getJSG_SRT___Q214JStudio_JStage14TAdaptor_actorFPCQ27JStudio8TControl = .text:0x8028BCCC; // type:function size:0x198 scope:global align:4 __cl__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_CFfPQ27JStudio8TAdaptor = .text:0x8028BE64; // type:function size:0xD4 scope:global align:4 -__dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv = .text:0x8028BF38; // type:function size:0x60 scope:global align:4 +__dt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_Fv = .text:0x8028BF38; // type:function size:0x60 scope:weak align:4 __sinit_object-actor_cpp = .text:0x8028BF98; // type:function size:0x3D0 scope:local align:4 -__ct__Q27JStudio14TVariableValueFv = .text:0x8028C368; // type:function size:0x18 scope:global align:4 -__dt__Q214JStudio_JStage81TVariableValueOutput_object_Fv = .text:0x8028C380; // type:function size:0x60 scope:global align:4 -__cl__Q214JStudio_JStage81TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028C3E0; // type:function size:0x30 scope:global align:4 +__ct__Q27JStudio14TVariableValueFv = .text:0x8028C368; // type:function size:0x18 scope:weak align:4 +__dt__Q214JStudio_JStage81TVariableValueOutput_object_Fv = .text:0x8028C380; // type:function size:0x60 scope:weak align:4 +__cl__Q214JStudio_JStage81TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028C3E0; // type:function size:0x30 scope:weak align:4 __ct__Q214JStudio_JStage21TAdaptor_ambientLightFPCQ26JStage7TSystemPQ26JStage13TAmbientLight = .text:0x8028C410; // type:function size:0x9C scope:global align:4 __dt__Q214JStudio_JStage21TAdaptor_ambientLightFv = .text:0x8028C4AC; // type:function size:0x74 scope:global align:4 adaptor_do_prepare__Q214JStudio_JStage21TAdaptor_ambientLightFv = .text:0x8028C520; // type:function size:0x4 scope:global align:4 @@ -11190,8 +11190,8 @@ getJSG_position___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl = .t setJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl = .text:0x8028CDBC; // type:function size:0xE0 scope:global align:4 getJSG_targetPosition___Q214JStudio_JStage15TAdaptor_cameraFPCQ27JStudio8TControl = .text:0x8028CE9C; // type:function size:0xE4 scope:global align:4 __sinit_object-camera_cpp = .text:0x8028CF80; // type:function size:0x364 scope:local align:4 -__dt__Q214JStudio_JStage83TVariableValueOutput_object_Fv = .text:0x8028D2E4; // type:function size:0x60 scope:global align:4 -__cl__Q214JStudio_JStage83TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028D344; // type:function size:0x30 scope:global align:4 +__dt__Q214JStudio_JStage83TVariableValueOutput_object_Fv = .text:0x8028D2E4; // type:function size:0x60 scope:weak align:4 +__cl__Q214JStudio_JStage83TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028D344; // type:function size:0x30 scope:weak align:4 __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog = .text:0x8028D374; // type:function size:0x9C scope:global align:4 __dt__Q214JStudio_JStage12TAdaptor_fogFv = .text:0x8028D410; // type:function size:0x74 scope:global align:4 adaptor_do_prepare__Q214JStudio_JStage12TAdaptor_fogFv = .text:0x8028D484; // type:function size:0x48 scope:global align:4 @@ -11200,8 +11200,8 @@ adaptor_do_end__Q214JStudio_JStage12TAdaptor_fogFv = .text:0x8028D5B4; // type:f adaptor_do_update__Q214JStudio_JStage12TAdaptor_fogFUl = .text:0x8028D608; // type:function size:0x78 scope:global align:4 adaptor_do_data__Q214JStudio_JStage12TAdaptor_fogFPCvUlPCvUl = .text:0x8028D680; // type:function size:0x24 scope:global align:4 __sinit_object-fog_cpp = .text:0x8028D6A4; // type:function size:0x21C scope:local align:4 -__dt__Q214JStudio_JStage77TVariableValueOutput_object_Fv = .text:0x8028D8C0; // type:function size:0x60 scope:global align:4 -__cl__Q214JStudio_JStage77TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028D920; // type:function size:0x30 scope:global align:4 +__dt__Q214JStudio_JStage77TVariableValueOutput_object_Fv = .text:0x8028D8C0; // type:function size:0x60 scope:weak align:4 +__cl__Q214JStudio_JStage77TVariableValueOutput_object_CFfPQ27JStudio8TAdaptor = .text:0x8028D920; // type:function size:0x30 scope:weak align:4 __ct__Q214JStudio_JStage14TAdaptor_lightFPCQ26JStage7TSystemPQ26JStage6TLight = .text:0x8028D950; // type:function size:0xA4 scope:global align:4 __dt__Q214JStudio_JStage14TAdaptor_lightFv = .text:0x8028D9F4; // type:function size:0x74 scope:global align:4 adaptor_do_prepare__Q214JStudio_JStage14TAdaptor_lightFv = .text:0x8028DA68; // type:function size:0x48 scope:global align:4 @@ -11212,16 +11212,16 @@ adaptor_do_data__Q214JStudio_JStage14TAdaptor_lightFPCvUlPCvUl = .text:0x8028DF8 adaptor_do_FACULTY__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl = .text:0x8028DFB0; // type:function size:0x78 scope:global align:4 adaptor_do_ENABLE__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl = .text:0x8028E028; // type:function size:0x24 scope:global align:4 __cl__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_CFfPQ27JStudio8TAdaptor = .text:0x8028E04C; // type:function size:0xC scope:global align:4 -__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv = .text:0x8028E058; // type:function size:0x60 scope:global align:4 +__dt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_Fv = .text:0x8028E058; // type:function size:0x60 scope:weak align:4 __sinit_object-light_cpp = .text:0x8028E0B8; // type:function size:0x298 scope:local align:4 __dt__Q215JStudio_JAudio213TCreateObjectFv = .text:0x8028E350; // type:function size:0x60 scope:global align:4 create__Q215JStudio_JAudio213TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x8028E3B0; // type:function size:0x74 scope:global align:4 createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject = .text:0x8028E424; // type:function size:0x104 scope:global align:4 -setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028E528; // type:function size:0x28 scope:global align:4 -setValue_PAN___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028E550; // type:function size:0x28 scope:global align:4 -setValue_PITCH___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028E578; // type:function size:0x28 scope:global align:4 -setValue_TEMPO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028E5A0; // type:function size:0x60 scope:global align:4 -setValue_ECHO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028E600; // type:function size:0x28 scope:global align:4 +setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028E528; // type:function size:0x28 scope:local align:4 +setValue_PAN___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028E550; // type:function size:0x28 scope:local align:4 +setValue_PITCH___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028E578; // type:function size:0x28 scope:local align:4 +setValue_TEMPO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028E5A0; // type:function size:0x60 scope:local align:4 +setValue_ECHO___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf = .text:0x8028E600; // type:function size:0x28 scope:local align:4 __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject = .text:0x8028E628; // type:function size:0xCC scope:global align:4 __dt__Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x8028E6F4; // type:function size:0xB0 scope:global align:4 adaptor_do_prepare__Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x8028E7A4; // type:function size:0xD0 scope:global align:4 @@ -11243,7 +11243,7 @@ __cl__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor prepareSound___Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x8028ED04; // type:function size:0xA0 scope:global align:4 beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv = .text:0x8028EDA4; // type:function size:0xB0 scope:global align:4 endSound_fadeOut___Q215JStudio_JAudio214TAdaptor_soundFUl = .text:0x8028EE54; // type:function size:0x40 scope:global align:4 -__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv = .text:0x8028EE94; // type:function size:0x60 scope:global align:4 +__dt__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_Fv = .text:0x8028EE94; // type:function size:0x60 scope:weak align:4 __sinit_object-sound_cpp = .text:0x8028EEF4; // type:function size:0x2AC scope:local align:4 __dt__Q217JStudio_JParticle13TCreateObjectFv = .text:0x8028F1A0; // type:function size:0x60 scope:global align:4 create__Q217JStudio_JParticle13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object = .text:0x8028F200; // type:function size:0x74 scope:global align:4 @@ -11251,7 +11251,7 @@ emitter_create__Q217JStudio_JParticle13TCreateObjectFUl = .text:0x8028F274; // t emitter_destroy__Q217JStudio_JParticle13TCreateObjectFP14JPABaseEmitter = .text:0x8028F2E4; // type:function size:0x24 scope:global align:4 createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject = .text:0x8028F308; // type:function size:0x104 scope:global align:4 __ct__Q217JStudio_JParticle17TAdaptor_particleFPQ217JStudio_JParticle13TCreateObject = .text:0x8028F40C; // type:function size:0xF4 scope:global align:4 -__dt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_Fv = .text:0x8028F500; // type:function size:0x60 scope:global align:4 +__dt__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_Fv = .text:0x8028F500; // type:function size:0x60 scope:weak align:4 __dt__Q217JStudio_JParticle17TAdaptor_particleFv = .text:0x8028F560; // type:function size:0xF0 scope:global align:4 adaptor_do_prepare__Q217JStudio_JParticle17TAdaptor_particleFv = .text:0x8028F650; // type:function size:0x12C scope:global align:4 adaptor_do_end__Q217JStudio_JParticle17TAdaptor_particleFv = .text:0x8028F77C; // type:function size:0x4 scope:global align:4 @@ -11313,11 +11313,11 @@ getCommandHeap__9JASKernelFv = .text:0x802918C8; // type:function size:0x8 scope setupAramHeap__9JASKernelFUlUl = .text:0x802918D0; // type:function size:0x38 scope:global align:4 getAramHeap__9JASKernelFv = .text:0x80291908; // type:function size:0xC scope:global align:4 __sinit_JASHeapCtrl_cpp = .text:0x80291914; // type:function size:0x40 scope:local align:4 -__dt__7JASHeapFv = .text:0x80291954; // type:function size:0x78 scope:global align:4 -onDispose__11JASDisposerFv = .text:0x802919CC; // type:function size:0x4 scope:global align:4 +__dt__7JASHeapFv = .text:0x80291954; // type:function size:0x78 scope:weak align:4 +onDispose__11JASDisposerFv = .text:0x802919CC; // type:function size:0x4 scope:weak align:4 getResSize__15JASResArcLoaderFPC10JKRArchiveUs = .text:0x802919D0; // type:function size:0x34 scope:global align:4 getResMaxSize__15JASResArcLoaderFPC10JKRArchive = .text:0x80291A04; // type:function size:0x78 scope:global align:4 -loadResourceCallback__15JASResArcLoaderFPv = .text:0x80291A7C; // type:function size:0x9C scope:global align:4 +loadResourceCallback__15JASResArcLoaderFPv = .text:0x80291A7C; // type:function size:0x9C scope:local align:4 loadResourceAsync__15JASResArcLoaderFP10JKRArchiveUsPUcUlPFUlUl_vUl = .text:0x80291B18; // type:function size:0x5C scope:global align:4 start__8JASProbeFPCc = .text:0x80291B74; // type:function size:0x50 scope:global align:4 stop__8JASProbeFv = .text:0x80291BC4; // type:function size:0x120 scope:global align:4 @@ -11328,7 +11328,7 @@ execAllCommand__10JASPortCmdFv = .text:0x80291E60; // type:function size:0x34 sc execCommandOnce__Q210JASPortCmd9TPortHeadFv = .text:0x80291E94; // type:function size:0x78 scope:global align:4 execCommandStay__Q210JASPortCmd9TPortHeadFv = .text:0x80291F0C; // type:function size:0x60 scope:global align:4 __sinit_JASCmdStack_cpp = .text:0x80291F6C; // type:function size:0x64 scope:local align:4 -__dt__Q210JASPortCmd9TPortHeadFv = .text:0x80291FD0; // type:function size:0x58 scope:global align:4 +__dt__Q210JASPortCmd9TPortHeadFv = .text:0x80291FD0; // type:function size:0x58 scope:weak align:4 __ct__8JASTrackFv = .text:0x80292028; // type:function size:0xF4 scope:global align:4 __dt__8JASTrackFv = .text:0x8029211C; // type:function size:0x128 scope:global align:4 setChannelMgrCount__8JASTrackFUl = .text:0x80292244; // type:function size:0x190 scope:global align:4 @@ -11419,7 +11419,7 @@ findIntr__10JASSeqCtrlFv = .text:0x80294928; // type:function size:0x50 scope:gl checkIntr__10JASSeqCtrlFv = .text:0x80294978; // type:function size:0x70 scope:global align:4 timerProcess__10JASSeqCtrlFv = .text:0x802949E8; // type:function size:0x84 scope:global align:4 __sinit_JASSeqCtrl_cpp = .text:0x80294A6C; // type:function size:0x40 scope:local align:4 -__dt__12JASSeqParserFv = .text:0x80294AAC; // type:function size:0x48 scope:global align:4 +__dt__12JASSeqParserFv = .text:0x80294AAC; // type:function size:0x48 scope:weak align:4 conditionCheck__12JASSeqParserFP8JASTrackQ212JASSeqParser15BranchCondition = .text:0x80294AF4; // type:function size:0xD0 scope:global align:4 writeReg__12JASSeqParserFP8JASTrackUlUl = .text:0x80294BC4; // type:function size:0x204 scope:global align:4 readReg__12JASSeqParserCFP8JASTrackUl = .text:0x80294DC8; // type:function size:0x1C0 scope:global align:4 @@ -11519,7 +11519,7 @@ updateChannel__13JASAramStreamFUlP10JASChannelPQ26JASDsp8TChannel = .text:0x8029 channelProc__13JASAramStreamFv = .text:0x802982AC; // type:function size:0x1AC scope:global align:4 channelStart__13JASAramStreamFv = .text:0x80298458; // type:function size:0x218 scope:global align:4 channelStop__13JASAramStreamFUs = .text:0x80298670; // type:function size:0x6C scope:global align:4 -__dt__38JASMemPool_MultiThreaded<10JASChannel>Fv = .text:0x802986DC; // type:function size:0x54 scope:global align:4 +__dt__38JASMemPool_MultiThreaded<10JASChannel>Fv = .text:0x802986DC; // type:function size:0x54 scope:weak align:4 noteOn__7JASBankFPC7JASBankiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv = .text:0x80298730; // type:function size:0x310 scope:global align:4 noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv = .text:0x80298A40; // type:function size:0x138 scope:global align:4 __ct__12JASBasicBankFv = .text:0x80298B78; // type:function size:0x2C scope:global align:4 @@ -11527,9 +11527,9 @@ newInstTable__12JASBasicBankFUcP7JKRHeap = .text:0x80298BA4; // type:function si getInstParam__12JASBasicBankCFiiiP12JASInstParam = .text:0x80298C00; // type:function size:0x68 scope:global align:4 setInst__12JASBasicBankFiP7JASInst = .text:0x80298C68; // type:function size:0x18 scope:global align:4 getInst__12JASBasicBankCFi = .text:0x80298C80; // type:function size:0x44 scope:global align:4 -__dt__7JASBankFv = .text:0x80298CC4; // type:function size:0x48 scope:global align:4 -__dt__12JASBasicBankFv = .text:0x80298D0C; // type:function size:0x5C scope:global align:4 -getType__12JASBasicBankCFv = .text:0x80298D68; // type:function size:0xC scope:global align:4 +__dt__7JASBankFv = .text:0x80298CC4; // type:function size:0x48 scope:weak align:4 +__dt__12JASBasicBankFv = .text:0x80298D0C; // type:function size:0x5C scope:weak align:4 +getType__12JASBasicBankCFv = .text:0x80298D68; // type:function size:0xC scope:weak align:4 getInstParam__12JASVoiceBankCFiiiP12JASInstParam = .text:0x80298D74; // type:function size:0x38 scope:global align:4 __dt__12JASVoiceBankFv = .text:0x80298DAC; // type:function size:0x5C scope:global align:4 getType__12JASVoiceBankCFv = .text:0x80298E08; // type:function size:0xC scope:global align:4 @@ -11540,9 +11540,9 @@ setKeyRegionCount__12JASBasicInstFUlP7JKRHeap = .text:0x80298F9C; // type:functi setOsc__12JASBasicInstFiPCQ213JASOscillator4Data = .text:0x8029901C; // type:function size:0x10 scope:global align:4 getKeyRegion__12JASBasicInstFi = .text:0x8029902C; // type:function size:0x24 scope:global align:4 __dt__Q212JASBasicInst7TKeymapFv = .text:0x80299050; // type:function size:0x3C scope:global align:4 -__dt__7JASInstFv = .text:0x8029908C; // type:function size:0x48 scope:global align:4 -__ct__Q212JASBasicInst7TKeymapFv = .text:0x802990D4; // type:function size:0xC scope:global align:4 -getType__12JASBasicInstCFv = .text:0x802990E0; // type:function size:0xC scope:global align:4 +__dt__7JASInstFv = .text:0x8029908C; // type:function size:0x48 scope:weak align:4 +__ct__Q212JASBasicInst7TKeymapFv = .text:0x802990D4; // type:function size:0xC scope:weak align:4 +getType__12JASBasicInstCFv = .text:0x802990E0; // type:function size:0xC scope:weak align:4 __ct__10JASDrumSetFv = .text:0x802990EC; // type:function size:0x28 scope:global align:4 __dt__10JASDrumSetFv = .text:0x80299114; // type:function size:0x5C scope:global align:4 newPercArray__10JASDrumSetFUcP7JKRHeap = .text:0x80299170; // type:function size:0x5C scope:global align:4 @@ -11553,7 +11553,7 @@ setRelease__Q210JASDrumSet5TPercFUl = .text:0x802992E4; // type:function size:0x getType__10JASDrumSetCFv = .text:0x802992EC; // type:function size:0xC scope:global align:4 __ct__16JASBasicWaveBankFv = .text:0x802992F8; // type:function size:0x60 scope:global align:4 __dt__16JASBasicWaveBankFv = .text:0x80299358; // type:function size:0x8C scope:global align:4 -__dt__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x802993E4; // type:function size:0x5C scope:global align:4 +__dt__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x802993E4; // type:function size:0x5C scope:weak align:4 getWaveGroup__16JASBasicWaveBankFUl = .text:0x80299440; // type:function size:0x24 scope:global align:4 setGroupCount__16JASBasicWaveBankFUlP7JKRHeap = .text:0x80299464; // type:function size:0xAC scope:global align:4 setWaveTableSize__16JASBasicWaveBankFUlP7JKRHeap = .text:0x80299510; // type:function size:0x80 scope:global align:4 @@ -11568,16 +11568,16 @@ onLoadDone__Q216JASBasicWaveBank10TWaveGroupFv = .text:0x80299904; // type:funct onEraseDone__Q216JASBasicWaveBank10TWaveGroupFv = .text:0x8029992C; // type:function size:0x28 scope:global align:4 getWaveID__Q216JASBasicWaveBank10TWaveGroupCFi = .text:0x80299954; // type:function size:0x10 scope:global align:4 getWavePtr__Q216JASBasicWaveBank11TWaveHandleCFv = .text:0x80299964; // type:function size:0x24 scope:global align:4 -__dt__11JASWaveBankFv = .text:0x80299988; // type:function size:0x48 scope:global align:4 -__dt__13JASWaveHandleFv = .text:0x802999D0; // type:function size:0x48 scope:global align:4 -__ct__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x80299A18; // type:function size:0x34 scope:global align:4 -__ct__Q216JASBasicWaveBank14TGroupWaveInfoFv = .text:0x80299A4C; // type:function size:0x18 scope:global align:4 -getWaveInfo__Q216JASBasicWaveBank11TWaveHandleCFv = .text:0x80299A64; // type:function size:0x8 scope:global align:4 -getWaveArc__16JASBasicWaveBankFUl = .text:0x80299A6C; // type:function size:0x20 scope:global align:4 -getArcCount__16JASBasicWaveBankCFv = .text:0x80299A8C; // type:function size:0x8 scope:global align:4 +__dt__11JASWaveBankFv = .text:0x80299988; // type:function size:0x48 scope:weak align:4 +__dt__13JASWaveHandleFv = .text:0x802999D0; // type:function size:0x48 scope:weak align:4 +__ct__Q216JASBasicWaveBank11TWaveHandleFv = .text:0x80299A18; // type:function size:0x34 scope:weak align:4 +__ct__Q216JASBasicWaveBank14TGroupWaveInfoFv = .text:0x80299A4C; // type:function size:0x18 scope:weak align:4 +getWaveInfo__Q216JASBasicWaveBank11TWaveHandleCFv = .text:0x80299A64; // type:function size:0x8 scope:weak align:4 +getWaveArc__16JASBasicWaveBankFUl = .text:0x80299A6C; // type:function size:0x20 scope:weak align:4 +getArcCount__16JASBasicWaveBankCFv = .text:0x80299A8C; // type:function size:0x8 scope:weak align:4 __ct__17JASSimpleWaveBankFv = .text:0x80299A94; // type:function size:0x60 scope:global align:4 __dt__17JASSimpleWaveBankFv = .text:0x80299AF4; // type:function size:0x90 scope:global align:4 -__dt__Q217JASSimpleWaveBank11TWaveHandleFv = .text:0x80299B84; // type:function size:0x5C scope:global align:4 +__dt__Q217JASSimpleWaveBank11TWaveHandleFv = .text:0x80299B84; // type:function size:0x5C scope:weak align:4 setWaveTableSize__17JASSimpleWaveBankFUlP7JKRHeap = .text:0x80299BE0; // type:function size:0x80 scope:global align:4 getWaveHandle__17JASSimpleWaveBankCFUl = .text:0x80299C60; // type:function size:0x24 scope:global align:4 setWaveInfo__17JASSimpleWaveBankFUlRC11JASWaveInfo = .text:0x80299C84; // type:function size:0x94 scope:global align:4 @@ -11586,20 +11586,20 @@ getWavePtr__Q217JASSimpleWaveBank11TWaveHandleCFv = .text:0x80299D38; // type:fu __ct__Q217JASSimpleWaveBank11TWaveHandleFv = .text:0x80299D5C; // type:function size:0x34 scope:global align:4 getWaveInfo__Q217JASSimpleWaveBank11TWaveHandleCFv = .text:0x80299D90; // type:function size:0x8 scope:global align:4 getArcCount__17JASSimpleWaveBankCFv = .text:0x80299D98; // type:function size:0x8 scope:global align:4 -onLoadDone__10JASWaveArcFv = .text:0x80299DA0; // type:function size:0x4 scope:global align:4 -onEraseDone__10JASWaveArcFv = .text:0x80299DA4; // type:function size:0x4 scope:global align:4 -@4@__dt__17JASSimpleWaveBankFv = .text:0x80299DA8; // type:function size:0x8 scope:local align:4 +onLoadDone__10JASWaveArcFv = .text:0x80299DA0; // type:function size:0x4 scope:weak align:4 +onEraseDone__10JASWaveArcFv = .text:0x80299DA4; // type:function size:0x4 scope:weak align:4 +@4@__dt__17JASSimpleWaveBankFv = .text:0x80299DA8; // type:function size:0x8 scope:weak align:4 getGroupCount__11JASWSParserFPCv = .text:0x80299DB0; // type:function size:0x28 scope:global align:4 createWaveBank__11JASWSParserFPCvP7JKRHeap = .text:0x80299DD8; // type:function size:0x5C scope:global align:4 createBasicWaveBank__11JASWSParserFPCvP7JKRHeap = .text:0x80299E34; // type:function size:0x230 scope:global align:4 createSimpleWaveBank__11JASWSParserFPCvP7JKRHeap = .text:0x8029A064; // type:function size:0x22C scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A290; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A2A8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A2C0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A2D8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A2F0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A308; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A320; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A290; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A2A8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A2C0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A2D8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A2F0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A308; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029A320; // type:function size:0x18 scope:weak align:4 createBank__12JASBNKParserFPCvP7JKRHeap = .text:0x8029A338; // type:function size:0x20 scope:global align:4 createBasicBank__12JASBNKParserFPCvP7JKRHeap = .text:0x8029A358; // type:function size:0xA8 scope:global align:4 findChunk__Q212JASBNKParser4Ver1FPCvUl = .text:0x8029A400; // type:function size:0x3C scope:global align:4 @@ -11607,13 +11607,13 @@ createBasicBank__Q212JASBNKParser4Ver1FPCvP7JKRHeap = .text:0x8029A43C; // type: createBasicBank__Q212JASBNKParser4Ver0FPCvP7JKRHeap = .text:0x8029A83C; // type:function size:0x42C scope:global align:4 findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc = .text:0x8029AC68; // type:function size:0x124 scope:global align:4 getOscTableEndPtr__Q212JASBNKParser4Ver0FPCQ213JASOscillator5Point = .text:0x8029AD8C; // type:function size:0x14 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029ADA0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029ADB8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029ADD0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029ADE8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029AE00; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029AE18; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8029AE30; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029ADA0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029ADB8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029ADD0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029ADE8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029AE00; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029AE18; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8029AE30; // type:function size:0x18 scope:weak align:4 __sinit_JASBNKParser_cpp = .text:0x8029AE48; // type:function size:0x58 scope:local align:4 getRootHeap__16JASWaveArcLoaderFv = .text:0x8029AEA0; // type:function size:0x30 scope:global align:4 setCurrentDir__16JASWaveArcLoaderFPCc = .text:0x8029AED0; // type:function size:0x60 scope:global align:4 @@ -11630,7 +11630,7 @@ erase__10JASWaveArcFv = .text:0x8029B440; // type:function size:0x24 scope:globa onDispose__10JASWaveArcFv = .text:0x8029B464; // type:function size:0x48 scope:global align:4 setEntryNum__10JASWaveArcFl = .text:0x8029B4AC; // type:function size:0x60 scope:global align:4 setFileName__10JASWaveArcFPCc = .text:0x8029B50C; // type:function size:0xAC scope:global align:4 -__dt__11JASDisposerFv = .text:0x8029B5B8; // type:function size:0x48 scope:global align:4 +__dt__11JASDisposerFv = .text:0x8029B5B8; // type:function size:0x48 scope:weak align:4 __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv = .text:0x8029B600; // type:function size:0x118 scope:global align:4 __dt__10JASChannelFv = .text:0x8029B718; // type:function size:0xD8 scope:global align:4 play__10JASChannelFv = .text:0x8029B7F0; // type:function size:0x70 scope:global align:4 @@ -11688,7 +11688,7 @@ stop__14JASAudioThreadFv = .text:0x8029DBC0; // type:function size:0x2C scope:gl run__14JASAudioThreadFv = .text:0x8029DBEC; // type:function size:0x17C scope:global align:4 DMACallback__14JASAudioThreadFv = .text:0x8029DD68; // type:function size:0x54 scope:global align:4 DSPCallback__14JASAudioThreadFPv = .text:0x8029DDBC; // type:function size:0x6C scope:global align:4 -__dt__14JASAudioThreadFv = .text:0x8029DE28; // type:function size:0x8C scope:global align:4 +__dt__14JASAudioThreadFv = .text:0x8029DE28; // type:function size:0x8C scope:weak align:4 __ct__15JASAudioReseterFv = .text:0x8029DEB4; // type:function size:0x48 scope:global align:4 __dt__15JASAudioReseterFv = .text:0x8029DEFC; // type:function size:0x3C scope:global align:4 start__15JASAudioReseterFUlb = .text:0x8029DF38; // type:function size:0x9C scope:global align:4 @@ -11758,27 +11758,27 @@ subframeCallback__9JASDriverFv = .text:0x8029F0A8; // type:function size:0x28 sc DSPSyncCallback__9JASDriverFv = .text:0x8029F0D0; // type:function size:0x28 scope:global align:4 updateDacCallback__9JASDriverFv = .text:0x8029F0F8; // type:function size:0x28 scope:global align:4 __sinit_JASDriverIF_cpp = .text:0x8029F120; // type:function size:0x80 scope:local align:4 -__ct__Q214JASCallbackMgr9TCallbackFv = .text:0x8029F1A0; // type:function size:0x10 scope:global align:4 +__ct__Q214JASCallbackMgr9TCallbackFv = .text:0x8029F1A0; // type:function size:0x10 scope:weak align:4 clamp__14JASSoundParamsFv = .text:0x8029F1B0; // type:function size:0xCC scope:global align:4 combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams = .text:0x8029F27C; // type:function size:0x5C scope:global align:4 DSPReleaseHalt2__FUl = .text:0x8029F2E0; // type:function size:0x48 scope:global align:4 -setup_callback__FUs = .text:0x8029F340; // type:function size:0xC scope:global align:4 +setup_callback__FUs = .text:0x8029F340; // type:function size:0xC scope:local align:4 DsetupTable__FUlUlUlUlUl = .text:0x8029F360; // type:function size:0x64 scope:global align:4 DsetMixerLevel__Ff = .text:0x8029F3E0; // type:function size:0x24 scope:global align:4 DsyncFrame2ch__FUlUlUl = .text:0x8029F420; // type:function size:0x54 scope:global align:4 DsyncFrame4ch__FUlUlUlUlUl = .text:0x8029F480; // type:function size:0x50 scope:global align:4 -DspHandShake__FPv = .text:0x8029F4E0; // type:function size:0x38 scope:global align:4 +DspHandShake__FPv = .text:0x8029F4E0; // type:function size:0x38 scope:local align:4 DspBoot__FPFPv_v = .text:0x8029F520; // type:function size:0xAC scope:global align:4 DSPSendCommands2__FPUlUlPFUs_v = .text:0x8029F5E0; // type:function size:0xE8 scope:global align:4 -DspInitWork__Fv = .text:0x8029F6E0; // type:function size:0x2C scope:global align:4 -DspStartWork__FUlPFUs_v = .text:0x8029F720; // type:function size:0x48 scope:global align:4 +DspInitWork__Fv = .text:0x8029F6E0; // type:function size:0x2C scope:local align:4 +DspStartWork__FUlPFUs_v = .text:0x8029F720; // type:function size:0x48 scope:local align:4 DspFinishWork__FUs = .text:0x8029F780; // type:function size:0x68 scope:global align:4 -DSPAddTask = .text:0x8029F800; // type:function size:0x84 scope:global align:4 +DSPAddTask = .text:0x8029F800; // type:function size:0x84 scope:weak align:4 DSPAddPriorTask__FP15STRUCT_DSP_TASK = .text:0x8029F8A0; // type:function size:0x7C scope:global align:4 __DSPHandler = .text:0x8029F920; // type:function size:0x304 scope:global align:4 DsyncFrame2__FUlUlUl = .text:0x8029FC40; // type:function size:0x50 scope:global align:4 -DsyncFrame3__FUlUlUlUlUl = .text:0x8029FCA0; // type:function size:0x58 scope:global align:4 -Dsp_Update_Request__Fv = .text:0x8029FD00; // type:function size:0x78 scope:global align:4 +DsyncFrame3__FUlUlUlUlUl = .text:0x8029FCA0; // type:function size:0x58 scope:local align:4 +Dsp_Update_Request__Fv = .text:0x8029FD00; // type:function size:0x78 scope:local align:4 Dsp_Running_Check__Fv = .text:0x8029FD80; // type:function size:0x14 scope:global align:4 Dsp_Running_Start__Fv = .text:0x8029FDA0; // type:function size:0xC scope:global align:4 __dt__10JAIAudibleFv = .text:0x8029FDAC; // type:function size:0x48 scope:global align:4 @@ -11800,19 +11800,19 @@ getTrack__5JAISeFv = .text:0x802A064C; // type:function size:0x8 scope:global al getChildTrack__5JAISeFi = .text:0x802A0654; // type:function size:0x10 scope:global align:4 asSe__5JAISeFv = .text:0x802A0664; // type:function size:0x4 scope:global align:4 getTempoMgr__5JAISeFv = .text:0x802A0668; // type:function size:0x8 scope:global align:4 -@16@JAISound_tryDie___5JAISeFv = .text:0x802A0670; // type:function size:0x8 scope:local align:4 -@16@getTempoMgr__5JAISeFv = .text:0x802A0678; // type:function size:0x8 scope:local align:4 -@16@getChildTrack__5JAISeFi = .text:0x802A0680; // type:function size:0x8 scope:local align:4 -@16@getTrack__5JAISeFv = .text:0x802A0688; // type:function size:0x8 scope:local align:4 -@16@asSe__5JAISeFv = .text:0x802A0690; // type:function size:0x8 scope:local align:4 -@16@releaseChild__5JAISeFi = .text:0x802A0698; // type:function size:0x8 scope:local align:4 -@16@getChild__5JAISeFi = .text:0x802A06A0; // type:function size:0x8 scope:local align:4 -@16@getNumChild__5JAISeCFv = .text:0x802A06A8; // type:function size:0x8 scope:local align:4 +@16@JAISound_tryDie___5JAISeFv = .text:0x802A0670; // type:function size:0x8 scope:weak align:4 +@16@getTempoMgr__5JAISeFv = .text:0x802A0678; // type:function size:0x8 scope:weak align:4 +@16@getChildTrack__5JAISeFi = .text:0x802A0680; // type:function size:0x8 scope:weak align:4 +@16@getTrack__5JAISeFv = .text:0x802A0688; // type:function size:0x8 scope:weak align:4 +@16@asSe__5JAISeFv = .text:0x802A0690; // type:function size:0x8 scope:weak align:4 +@16@releaseChild__5JAISeFi = .text:0x802A0698; // type:function size:0x8 scope:weak align:4 +@16@getChild__5JAISeFi = .text:0x802A06A0; // type:function size:0x8 scope:weak align:4 +@16@getNumChild__5JAISeCFv = .text:0x802A06A8; // type:function size:0x8 scope:weak align:4 isUsingSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion = .text:0x802A06B0; // type:function size:0x6C scope:global align:4 releaseSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion = .text:0x802A071C; // type:function size:0xA8 scope:global align:4 JAISeMgr_calc___16JAISeCategoryMgrFv = .text:0x802A07C4; // type:function size:0x16C scope:global align:4 JAISeMgr_freeDeadSe___16JAISeCategoryMgrFv = .text:0x802A0930; // type:function size:0x104 scope:global align:4 -__dt__18JASMemPool<5JAISe>Fv = .text:0x802A0A34; // type:function size:0x54 scope:global align:4 +__dt__18JASMemPool<5JAISe>Fv = .text:0x802A0A34; // type:function size:0x54 scope:weak align:4 JAISeMgr_acceptsNewSe___16JAISeCategoryMgrCFUl = .text:0x802A0A88; // type:function size:0xB8 scope:global align:4 sortByPriority___16JAISeCategoryMgrFv = .text:0x802A0B40; // type:function size:0xA0 scope:global align:4 stop__16JAISeCategoryMgrFUl = .text:0x802A0BE0; // type:function size:0x54 scope:global align:4 @@ -11835,9 +11835,9 @@ calc__8JAISeMgrFv = .text:0x802A1374; // type:function size:0x190 scope:global a mixOut__8JAISeMgrFv = .text:0x802A1504; // type:function size:0x64 scope:global align:4 startSound__8JAISeMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A1568; // type:function size:0x168 scope:global align:4 getNumActiveSe__8JAISeMgrCFv = .text:0x802A16D0; // type:function size:0x2C scope:global align:4 -__dt__8JAISeMgrFv = .text:0x802A16FC; // type:function size:0x98 scope:global align:4 -__ct__16JAISeCategoryMgrFv = .text:0x802A1794; // type:function size:0xD8 scope:global align:4 -JASTrack_isFreeOrStopped__20@unnamed@JAISeq_cpp@FP8JASTrack = .text:0x802A186C; // type:function size:0x20 scope:global align:4 +__dt__8JAISeMgrFv = .text:0x802A16FC; // type:function size:0x98 scope:weak align:4 +__ct__16JAISeCategoryMgrFv = .text:0x802A1794; // type:function size:0xD8 scope:weak align:4 +JASTrack_isFreeOrStopped__20@unnamed@JAISeq_cpp@FP8JASTrack = .text:0x802A186C; // type:function size:0x20 scope:local align:4 __ct__6JAISeqFP9JAISeqMgrP28JAISoundStrategyMgr<6JAISeq> = .text:0x802A188C; // type:function size:0xD8 scope:global align:4 JAISeqMgr_startID___6JAISeqF10JAISoundIDPCQ29JGeometry8TVec3P11JAIAudienceii = .text:0x802A1964; // type:function size:0xA0 scope:global align:4 playSeqData___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A1A04; // type:function size:0xA0 scope:global align:4 @@ -11847,7 +11847,7 @@ prepare_getSeqData___6JAISeqFv = .text:0x802A1CDC; // type:function size:0xB4 sc prepare___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A1D90; // type:function size:0xFC scope:global align:4 JAISeqMgr_calc___6JAISeqFv = .text:0x802A1E8C; // type:function size:0xF4 scope:global align:4 die___6JAISeqFv = .text:0x802A1F80; // type:function size:0xE8 scope:global align:4 -__dt__27JASMemPool<13JAISoundChild>Fv = .text:0x802A2068; // type:function size:0x54 scope:global align:4 +__dt__27JASMemPool<13JAISoundChild>Fv = .text:0x802A2068; // type:function size:0x54 scope:weak align:4 JAISound_tryDie___6JAISeqFv = .text:0x802A20BC; // type:function size:0x8C scope:global align:4 mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A2148; // type:function size:0x1B4 scope:global align:4 JAISeqMgr_mixOut___6JAISeqFRC14JASSoundParams16JAISoundActivity = .text:0x802A22FC; // type:function size:0x74 scope:global align:4 @@ -11864,7 +11864,7 @@ isUsingSeqData__9JAISeqMgrFRC16JAISeqDataRegion = .text:0x802A2604; // type:func releaseSeqData__9JAISeqMgrFRC16JAISeqDataRegion = .text:0x802A2670; // type:function size:0xA4 scope:global align:4 __ct__9JAISeqMgrFb = .text:0x802A2714; // type:function size:0xF4 scope:global align:4 freeDeadSeq___9JAISeqMgrFv = .text:0x802A2808; // type:function size:0xEC scope:global align:4 -__dt__19JASMemPool<6JAISeq>Fv = .text:0x802A28F4; // type:function size:0x54 scope:global align:4 +__dt__19JASMemPool<6JAISeq>Fv = .text:0x802A28F4; // type:function size:0x54 scope:weak align:4 startSound__9JAISeqMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A2948; // type:function size:0x148 scope:global align:4 calc__9JAISeqMgrFv = .text:0x802A2A90; // type:function size:0x16C scope:global align:4 stop__9JAISeqMgrFv = .text:0x802A2BFC; // type:function size:0x40 scope:global align:4 @@ -11873,7 +11873,7 @@ stopSoundID__9JAISeqMgrF10JAISoundID = .text:0x802A2C8C; // type:function size:0 mixOut__9JAISeqMgrFv = .text:0x802A2CFC; // type:function size:0x5C scope:global align:4 beginStartSeq___9JAISeqMgrFv = .text:0x802A2D58; // type:function size:0x90 scope:global align:4 endStartSeq___9JAISeqMgrFP6JAISeqP14JAISoundHandle = .text:0x802A2DE8; // type:function size:0x108 scope:global align:4 -__dt__9JAISeqMgrFv = .text:0x802A2EF0; // type:function size:0x94 scope:global align:4 +__dt__9JAISeqMgrFv = .text:0x802A2EF0; // type:function size:0x94 scope:weak align:4 releaseSound__14JAISoundHandleFv = .text:0x802A2F84; // type:function size:0x1C scope:global align:4 releaseHandle__8JAISoundFv = .text:0x802A2FA0; // type:function size:0x1C scope:global align:4 attachHandle__8JAISoundFP14JAISoundHandle = .text:0x802A2FBC; // type:function size:0x64 scope:global align:4 @@ -11908,7 +11908,7 @@ moveDolby__18JAISoundParamsMoveFfUl = .text:0x802A3D14; // type:function size:0x __ct__15JAISoundStarterFb = .text:0x802A3D6C; // type:function size:0x1C scope:global align:4 __dt__15JAISoundStarterFv = .text:0x802A3D88; // type:function size:0x64 scope:global align:4 startLevelSound__15JAISoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A3DEC; // type:function size:0xE8 scope:global align:4 -JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv = .text:0x802A3ED4; // type:function size:0x30 scope:global align:4 +JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv = .text:0x802A3ED4; // type:function size:0x30 scope:local align:4 __ct__9JAIStreamFP12JAIStreamMgrP31JAISoundStrategyMgr<9JAIStream> = .text:0x802A3F04; // type:function size:0x98 scope:global align:4 JAIStreamMgr_startID___9JAIStreamF10JAISoundIDlPCQ29JGeometry8TVec3P11JAIAudiencei = .text:0x802A3F9C; // type:function size:0x94 scope:global align:4 prepare_prepareStream___9JAIStreamFv = .text:0x802A4030; // type:function size:0x1C4 scope:global align:4 @@ -11930,7 +11930,7 @@ __dt__16JAIStreamAramMgrFv = .text:0x802A4920; // type:function size:0x48 scope: __ct__12JAIStreamMgrFb = .text:0x802A4968; // type:function size:0xD4 scope:global align:4 startSound__12JAIStreamMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802A4A3C; // type:function size:0x134 scope:global align:4 freeDeadStream___12JAIStreamMgrFv = .text:0x802A4B70; // type:function size:0xF8 scope:global align:4 -__dt__22JASMemPool<9JAIStream>Fv = .text:0x802A4C68; // type:function size:0x54 scope:global align:4 +__dt__22JASMemPool<9JAIStream>Fv = .text:0x802A4C68; // type:function size:0x54 scope:weak align:4 calc__12JAIStreamMgrFv = .text:0x802A4CBC; // type:function size:0x16C scope:global align:4 stop__12JAIStreamMgrFv = .text:0x802A4E28; // type:function size:0x40 scope:global align:4 stop__12JAIStreamMgrFUl = .text:0x802A4E68; // type:function size:0x50 scope:global align:4 @@ -11957,11 +11957,11 @@ readBSFT__17JAUAudioArcLoaderFPCv = .text:0x802A5768; // type:function size:0x28 beginBNKList__17JAUAudioArcLoaderFUlUl = .text:0x802A5790; // type:function size:0x24 scope:global align:4 endBNKList__17JAUAudioArcLoaderFv = .text:0x802A57B4; // type:function size:0x24 scope:global align:4 readMaxSeCategory__17JAUAudioArcLoaderFiii = .text:0x802A57D8; // type:function size:0x24 scope:global align:4 -__dt__17JAUAudioArcLoaderFv = .text:0x802A57FC; // type:function size:0x60 scope:global align:4 -__defctor__7JASHeapFv = .text:0x802A585C; // type:function size:0x24 scope:global align:4 +__dt__17JAUAudioArcLoaderFv = .text:0x802A57FC; // type:function size:0x60 scope:weak align:4 +__defctor__7JASHeapFv = .text:0x802A585C; // type:function size:0x24 scope:weak align:4 appendBankTable__22JAUBankTableDictionaryFP23JSULink<12JAUBankTable> = .text:0x802A5880; // type:function size:0x20 scope:global align:4 -getBank__12JAUBankTableCFUl = .text:0x802A58A0; // type:function size:0x24 scope:global align:4 -__ct__14JAISoundHandleFv = .text:0x802A58C4; // type:function size:0xC scope:global align:4 +getBank__12JAUBankTableCFUl = .text:0x802A58A0; // type:function size:0x24 scope:weak align:4 +__ct__14JAISoundHandleFv = .text:0x802A58C4; // type:function size:0xC scope:weak align:4 __ct__18JAU_JASInitializerFv = .text:0x802A58D0; // type:function size:0x58 scope:global align:4 initJASystem__18JAU_JASInitializerFP12JKRSolidHeap = .text:0x802A5928; // type:function size:0x214 scope:global align:4 __ct__18JAU_JAIInitializerFv = .text:0x802A5B3C; // type:function size:0x24 scope:global align:4 @@ -11990,7 +11990,7 @@ __ct__Q214JAUSectionHeap16TSectionHeapDataFv = .text:0x802A6BF4; // type:functio setSeqDataArchive__14JAUSectionHeapFP10JKRArchive = .text:0x802A6C60; // type:function size:0x60 scope:global align:4 loadDynamicSeq__14JAUSectionHeapF10JAISoundIDb = .text:0x802A6CC0; // type:function size:0x38 scope:global align:4 releaseIdleDynamicSeqDataBlock__14JAUSectionHeapFv = .text:0x802A6CF8; // type:function size:0x2C scope:global align:4 -JAUNewSectionHeap__FP12JKRSolidHeapb = .text:0x802A6D24; // type:function size:0x78 scope:global align:4 +JAUNewSectionHeap__FP12JKRSolidHeapb = .text:0x802A6D24; // type:function size:0x78 scope:local align:4 JAUNewSectionHeap__Fb = .text:0x802A6D9C; // type:function size:0x44 scope:global align:4 __ct__14JAUSectionHeapFP12JKRSolidHeapbl = .text:0x802A6DE0; // type:function size:0xB4 scope:global align:4 getOpenSection__14JAUSectionHeapFv = .text:0x802A6E94; // type:function size:0xC scope:global align:4 @@ -11998,18 +11998,18 @@ setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser = .text:0x802A6EA0; // type:f newDynamicSeqBlock__14JAUSectionHeapFUl = .text:0x802A6EAC; // type:function size:0x124 scope:global align:4 getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData = .text:0x802A6FD0; // type:function size:0xA0 scope:global align:4 releaseSeqData__14JAUSectionHeapFv = .text:0x802A7070; // type:function size:0x8 scope:global align:4 -__dt__14JAUSectionHeapFv = .text:0x802A7078; // type:function size:0x1C8 scope:global align:4 -getStreamFileEntry__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrF10JAISoundID = .text:0x802A7240; // type:function size:0x28 scope:global align:4 -__dt__10JAUSectionFv = .text:0x802A7268; // type:function size:0x10C scope:global align:4 -__dt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrFv = .text:0x802A7374; // type:function size:0x60 scope:global align:4 -set__Q23std16__bitset_base<8>FUlb = .text:0x802A73D4; // type:function size:0x40 scope:global align:4 -reset__Q23std16__bitset_base<8>FUl = .text:0x802A7414; // type:function size:0x20 scope:global align:4 -test__Q23std16__bitset_base<8>CFUl = .text:0x802A7434; // type:function size:0x28 scope:global align:4 -__ct__Q23std16__bitset_base<8>Fv = .text:0x802A745C; // type:function size:0x24 scope:global align:4 -@220@setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser = .text:0x802A7480; // type:function size:0x8 scope:local align:4 -@220@releaseSeqData__14JAUSectionHeapFv = .text:0x802A7488; // type:function size:0x8 scope:local align:4 -@220@getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData = .text:0x802A7490; // type:function size:0x8 scope:local align:4 -@220@__dt__14JAUSectionHeapFv = .text:0x802A7498; // type:function size:0x8 scope:local align:4 +__dt__14JAUSectionHeapFv = .text:0x802A7078; // type:function size:0x1C8 scope:weak align:4 +getStreamFileEntry__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrF10JAISoundID = .text:0x802A7240; // type:function size:0x28 scope:local align:4 +__dt__10JAUSectionFv = .text:0x802A7268; // type:function size:0x10C scope:weak align:4 +__dt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgrFv = .text:0x802A7374; // type:function size:0x60 scope:local align:4 +set__Q23std16__bitset_base<8>FUlb = .text:0x802A73D4; // type:function size:0x40 scope:weak align:4 +reset__Q23std16__bitset_base<8>FUl = .text:0x802A7414; // type:function size:0x20 scope:weak align:4 +test__Q23std16__bitset_base<8>CFUl = .text:0x802A7434; // type:function size:0x28 scope:weak align:4 +__ct__Q23std16__bitset_base<8>Fv = .text:0x802A745C; // type:function size:0x24 scope:weak align:4 +@220@setSeqDataUser__14JAUSectionHeapFP14JAISeqDataUser = .text:0x802A7480; // type:function size:0x8 scope:weak align:4 +@220@releaseSeqData__14JAUSectionHeapFv = .text:0x802A7488; // type:function size:0x8 scope:weak align:4 +@220@getSeqData__14JAUSectionHeapF10JAISoundIDP10JAISeqData = .text:0x802A7490; // type:function size:0x8 scope:weak align:4 +@220@__dt__14JAUSectionHeapFv = .text:0x802A7498; // type:function size:0x8 scope:weak align:4 __ct__16JAUSeqCollectionFv = .text:0x802A74A0; // type:function size:0xC scope:global align:4 init__16JAUSeqCollectionFPCv = .text:0x802A74AC; // type:function size:0x50 scope:global align:4 getSeqData__16JAUSeqCollectionFiiP10JAISeqData = .text:0x802A74FC; // type:function size:0x58 scope:global align:4 @@ -12029,7 +12029,7 @@ __ct__23JAUDynamicSeqDataBlocksFv = .text:0x802A7858; // type:function size:0x48 setSeqDataArchive__23JAUDynamicSeqDataBlocksFP10JKRArchive = .text:0x802A78A0; // type:function size:0x8 scope:global align:4 getSeqData__23JAUDynamicSeqDataBlocksF10JAISoundIDP14JAISeqDataUserP10JAISeqDatab = .text:0x802A78A8; // type:function size:0xE4 scope:global align:4 appendDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP15JAUSeqDataBlock = .text:0x802A798C; // type:function size:0x68 scope:global align:4 -JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl = .text:0x802A79F4; // type:function size:0x24 scope:global align:4 +JAUDynamicSeqDataBlocks_receiveLoaded___FUlUl = .text:0x802A79F4; // type:function size:0x24 scope:local align:4 loadDynamicSeq__23JAUDynamicSeqDataBlocksF10JAISoundIDbP14JAISeqDataUser = .text:0x802A7A18; // type:function size:0x130 scope:global align:4 releaseIdleDynamicSeqDataBlock__23JAUDynamicSeqDataBlocksFP14JAISeqDataUser = .text:0x802A7B48; // type:function size:0xB8 scope:global align:4 releaseIdleDynamicSeqDataBlock___23JAUDynamicSeqDataBlocksFP14JAISeqDataUserUl = .text:0x802A7C00; // type:function size:0xDC scope:global align:4 @@ -12045,7 +12045,7 @@ init__18JAUStreamFileTableFPCv = .text:0x802A822C; // type:function size:0x4C sc getNumFiles__18JAUStreamFileTableCFv = .text:0x802A8278; // type:function size:0xC scope:global align:4 getFilePath__18JAUStreamFileTableCFi = .text:0x802A8284; // type:function size:0x28 scope:global align:4 getStreamFileEntry__32JAUStreamDataMgr_StreamFileTableF10JAISoundID = .text:0x802A82AC; // type:function size:0x3C scope:global align:4 -__dt__32JAUStreamDataMgr_StreamFileTableFv = .text:0x802A82E8; // type:function size:0x60 scope:global align:4 +__dt__32JAUStreamDataMgr_StreamFileTableFv = .text:0x802A82E8; // type:function size:0x60 scope:weak align:4 __ct__Q28JMessage8TControlFv = .text:0x802A8348; // type:function size:0x44 scope:global align:4 __dt__Q28JMessage8TControlFv = .text:0x802A838C; // type:function size:0x48 scope:global align:4 reset__Q28JMessage8TControlFv = .text:0x802A83D4; // type:function size:0x60 scope:global align:4 @@ -12116,8 +12116,8 @@ process__Q28JMessage19TRenderingProcessorFPCc = .text:0x802A9920; // type:functi do_begin___Q28JMessage19TRenderingProcessorFPCvPCc = .text:0x802A99A4; // type:function size:0x4 scope:global align:4 do_end___Q28JMessage19TRenderingProcessorFv = .text:0x802A99A8; // type:function size:0x4 scope:global align:4 do_tag___Q28JMessage19TRenderingProcessorFUlPCvUl = .text:0x802A99AC; // type:function size:0x78 scope:global align:4 -on_message__Q28JMessage10TProcessorCFUl = .text:0x802A9A24; // type:function size:0x20 scope:global align:4 -getMessageText_messageCode__Q28JMessage10TProcessorCFUl = .text:0x802A9A44; // type:function size:0x98 scope:global align:4 +on_message__Q28JMessage10TProcessorCFUl = .text:0x802A9A24; // type:function size:0x20 scope:weak align:4 +getMessageText_messageCode__Q28JMessage10TProcessorCFUl = .text:0x802A9A44; // type:function size:0x98 scope:weak align:4 toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb = .text:0x802A9ADC; // type:function size:0x1E4 scope:global align:4 __ct__Q38JMessage18TResourceContainer10TCResourceFv = .text:0x802A9CC0; // type:function size:0x38 scope:global align:4 __dt__Q38JMessage18TResourceContainer10TCResourceFv = .text:0x802A9CF8; // type:function size:0x74 scope:global align:4 @@ -12133,7 +12133,7 @@ parseHeader_next__Q28JMessage6TParseFPPCvPUlUl = .text:0x802A9FB8; // type:funct parseBlock_next__Q28JMessage6TParseFPPCvPUlUl = .text:0x802AA0F4; // type:function size:0x19C scope:global align:4 parseCharacter_1Byte__Q28JMessage6localeFPPCc = .text:0x802AA290; // type:function size:0x18 scope:global align:4 parseCharacter_2Byte__Q28JMessage6localeFPPCc = .text:0x802AA2A8; // type:function size:0x2C scope:global align:4 -lower_bound__3stdFPCUlPCUlRCUl = .text:0x802AA2D4; // type:function size:0x54 scope:global align:4 +lower_bound__3stdFPCUlPCUlRCUl = .text:0x802AA2D4; // type:function size:0x54 scope:weak align:4 parseCharacter_ShiftJIS__Q28JMessage6localeFPPCc = .text:0x802AA328; // type:function size:0x64 scope:global align:4 parseCharacter_UTF8__Q28JMessage6localeFPPCc = .text:0x802AA38C; // type:function size:0x100 scope:global align:4 linearTransform__6Z2CalcFfffffb = .text:0x802AA48C; // type:function size:0x68 scope:global align:4 @@ -12147,7 +12147,7 @@ __ct__16Z2AudioArcLoaderFP10JAUSection = .text:0x802AA834; // type:function size readCommandMore__16Z2AudioArcLoaderFUl = .text:0x802AA870; // type:function size:0x58 scope:global align:4 readBFCA__16Z2AudioArcLoaderFPCv = .text:0x802AA8C8; // type:function size:0x8C scope:global align:4 readBSTN__16Z2AudioArcLoaderFPCvUl = .text:0x802AA954; // type:function size:0x4 scope:global align:4 -__dt__16Z2AudioArcLoaderFv = .text:0x802AA958; // type:function size:0x70 scope:global align:4 +__dt__16Z2AudioArcLoaderFv = .text:0x802AA958; // type:function size:0x70 scope:weak align:4 seqCallback__FP8JASTrackUs = .text:0x802AA9C8; // type:function size:0x2B8 scope:global align:4 __ct__10Z2SoundMgrFv = .text:0x802AAC80; // type:function size:0x68 scope:global align:4 startSound__10Z2SoundMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 = .text:0x802AACE8; // type:function size:0x2C8 scope:global align:4 @@ -12169,12 +12169,12 @@ startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3UlfffffUl = .text:0x802ABA3C; // type:function size:0x2A0 scope:global align:4 setPortData__14Z2SoundStarterFP14JAISoundHandleUlUsSc = .text:0x802ABCDC; // type:function size:0x98 scope:global align:4 getPortData__14Z2SoundStarterFP14JAISoundHandleUlSc = .text:0x802ABD74; // type:function size:0x7C scope:global align:4 -__dt__14Z2SoundStarterFv = .text:0x802ABDF0; // type:function size:0x8C scope:global align:4 +__dt__14Z2SoundStarterFv = .text:0x802ABDF0; // type:function size:0x8C scope:weak align:4 __ct__14Z2SoundHandlesFv = .text:0x802ABE7C; // type:function size:0x38 scope:global align:4 __dt__14Z2SoundHandlesFv = .text:0x802ABEB4; // type:function size:0x64 scope:global align:4 initHandlesPool__14Z2SoundHandlesFUc = .text:0x802ABF18; // type:function size:0x8 scope:global align:4 deleteHandlesPool__14Z2SoundHandlesFv = .text:0x802ABF20; // type:function size:0xE0 scope:global align:4 -__dt__31JASMemPool<17Z2SoundHandlePool>Fv = .text:0x802AC000; // type:function size:0x54 scope:global align:4 +__dt__31JASMemPool<17Z2SoundHandlePool>Fv = .text:0x802AC000; // type:function size:0x54 scope:weak align:4 getHandleSoundID__14Z2SoundHandlesF10JAISoundID = .text:0x802AC054; // type:function size:0x4C scope:global align:4 getHandleUserData__14Z2SoundHandlesFUl = .text:0x802AC0A0; // type:function size:0x38 scope:global align:4 getFreeHandle__14Z2SoundHandlesFv = .text:0x802AC0D8; // type:function size:0xF8 scope:global align:4 @@ -12326,11 +12326,11 @@ getStreamFilePath__11Z2SoundInfoF10JAISoundID = .text:0x802BC810; // type:functi getStreamFileEntry__11Z2SoundInfoF10JAISoundID = .text:0x802BC888; // type:function size:0x40 scope:global align:4 getSwBit__11Z2SoundInfoCF10JAISoundID = .text:0x802BC8C8; // type:function size:0x80 scope:global align:4 getSoundInfo___11Z2SoundInfoCF10JAISoundIDP8JAISound = .text:0x802BC948; // type:function size:0x98 scope:global align:4 -__dt__11Z2SoundInfoFv = .text:0x802BC9E0; // type:function size:0xDC scope:global align:4 -@4@getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID = .text:0x802BCABC; // type:function size:0x8 scope:local align:4 -@4@getAudibleSw__11Z2SoundInfoCF10JAISoundID = .text:0x802BCAC4; // type:function size:0x8 scope:local align:4 -@8@__dt__11Z2SoundInfoFv = .text:0x802BCACC; // type:function size:0x8 scope:local align:4 -@8@getStreamFileEntry__11Z2SoundInfoF10JAISoundID = .text:0x802BCAD4; // type:function size:0x8 scope:local align:4 +__dt__11Z2SoundInfoFv = .text:0x802BC9E0; // type:function size:0xDC scope:weak align:4 +@4@getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID = .text:0x802BCABC; // type:function size:0x8 scope:weak align:4 +@4@getAudibleSw__11Z2SoundInfoCF10JAISoundID = .text:0x802BCAC4; // type:function size:0x8 scope:weak align:4 +@8@__dt__11Z2SoundInfoFv = .text:0x802BCACC; // type:function size:0x8 scope:weak align:4 +@8@getStreamFileEntry__11Z2SoundInfoF10JAISoundID = .text:0x802BCAD4; // type:function size:0x8 scope:weak align:4 calc__15Z2AudibleAbsPosFRCQ29JGeometry8TVec3 = .text:0x802BCADC; // type:function size:0x3C scope:global align:4 init__15Z2AudibleAbsPosFPQ29JGeometry8TVec3RCQ29JGeometry8TVec3PCQ29JGeometry8TVec3 = .text:0x802BCB18; // type:function size:0x7C scope:global align:4 __ct__9Z2AudibleFRCQ29JGeometry8TVec3PCQ29JGeometry8TVec3Ulb = .text:0x802BCB94; // type:function size:0xE0 scope:global align:4 @@ -12362,7 +12362,7 @@ calcMicPriority__9Z2SpotMicFf = .text:0x802BDDE4; // type:function size:0x58 sco calcMicVolume__9Z2SpotMicFfif = .text:0x802BDE3C; // type:function size:0xF4 scope:global align:4 __ct__10Z2AudienceFv = .text:0x802BDF30; // type:function size:0xCC scope:global align:4 __dt__10Z2AudienceFv = .text:0x802BDFFC; // type:function size:0x8C scope:global align:4 -__dt__22JASMemPool<9Z2Audible>Fv = .text:0x802BE088; // type:function size:0x54 scope:global align:4 +__dt__22JASMemPool<9Z2Audible>Fv = .text:0x802BE088; // type:function size:0x54 scope:weak align:4 setAudioCamera__10Z2AudienceFPA4_fR3VecR3Vecffbib = .text:0x802BE0DC; // type:function size:0x5C scope:global align:4 newAudible__10Z2AudienceFRCQ29JGeometry8TVec310JAISoundIDPCQ29JGeometry8TVec3Ul = .text:0x802BE138; // type:function size:0x19C scope:global align:4 deleteAudible__10Z2AudienceFP10JAIAudible = .text:0x802BE2D4; // type:function size:0x3C scope:global align:4 @@ -12483,10 +12483,10 @@ framework__12Z2CreatureOIFUlSc = .text:0x802C3664; // type:function size:0x170 s startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc = .text:0x802C37D4; // type:function size:0x2B0 scope:global align:4 startTentacleSound__12Z2CreatureOIF10JAISoundIDUcUlSc = .text:0x802C3A84; // type:function size:0x50 scope:global align:4 startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc = .text:0x802C3AD4; // type:function size:0x10C scope:global align:4 -Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C3BE0; // type:function size:0x74 scope:global align:4 -Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl = .text:0x802C3C54; // type:function size:0x48 scope:global align:4 -Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C3C9C; // type:function size:0x48 scope:global align:4 -Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C3CE4; // type:function size:0x15C scope:global align:4 +Z2_E_sw_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C3BE0; // type:function size:0x74 scope:local align:4 +Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl = .text:0x802C3C54; // type:function size:0x48 scope:local align:4 +Z2_E_mm_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C3C9C; // type:function size:0x48 scope:local align:4 +Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl = .text:0x802C3CE4; // type:function size:0x15C scope:local align:4 __sinit_Z2Creature_cpp = .text:0x802C3E40; // type:function size:0x1DC scope:local align:4 setLinkGroupInfo__14Z2CreatureLinkFUc = .text:0x802C401C; // type:function size:0x4 scope:global align:4 setLinkHp__14Z2CreatureLinkFll = .text:0x802C4020; // type:function size:0x8 scope:global align:4 @@ -12494,7 +12494,7 @@ setLinkSwordType__14Z2CreatureLinkFll = .text:0x802C4028; // type:function size: setLinkShieldType__14Z2CreatureLinkFll = .text:0x802C408C; // type:function size:0x64 scope:global align:4 setLinkBootsType__14Z2CreatureLinkFl = .text:0x802C40F0; // type:function size:0x4C scope:global align:4 __ct__14Z2CreatureLinkFv = .text:0x802C413C; // type:function size:0x128 scope:global align:4 -__dt__18Z2LinkSoundStarterFv = .text:0x802C4264; // type:function size:0x9C scope:global align:4 +__dt__18Z2LinkSoundStarterFv = .text:0x802C4264; // type:function size:0x9C scope:weak align:4 __dt__14Z2CreatureLinkFv = .text:0x802C4300; // type:function size:0xF8 scope:global align:4 deleteObject__14Z2CreatureLinkFv = .text:0x802C43F8; // type:function size:0x40 scope:global align:4 init__14Z2CreatureLinkFP3VecP3VecP3Vec = .text:0x802C4438; // type:function size:0xD8 scope:global align:4 @@ -12517,7 +12517,7 @@ setResumeAttack__14Z2CreatureLinkFb = .text:0x802C56D8; // type:function size:0x __ct__18Z2LinkSoundStarterFv = .text:0x802C56E8; // type:function size:0x40 scope:global align:4 startSound__18Z2LinkSoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3UlfffffUl = .text:0x802C5728; // type:function size:0x6D4 scope:global align:4 __ct__14Z2CreatureRideFv = .text:0x802C5DFC; // type:function size:0x7C scope:global align:4 -__dt__18Z2RideSoundStarterFv = .text:0x802C5E78; // type:function size:0x9C scope:global align:4 +__dt__18Z2RideSoundStarterFv = .text:0x802C5E78; // type:function size:0x9C scope:weak align:4 __dt__14Z2CreatureRideFv = .text:0x802C5F14; // type:function size:0xD8 scope:global align:4 deleteObject__14Z2CreatureRideFv = .text:0x802C5FEC; // type:function size:0x20 scope:global align:4 init__14Z2CreatureRideFP3VecP3VecUcUc = .text:0x802C600C; // type:function size:0x20 scope:global align:4 @@ -12529,8 +12529,8 @@ init__15Z2SoundObjCoachFP3VecUc = .text:0x802C62FC; // type:function size:0x20 s startWheelSound__15Z2SoundObjCoachFf = .text:0x802C631C; // type:function size:0x1A4 scope:global align:4 startFireSound__15Z2SoundObjCoachFUs = .text:0x802C64C0; // type:function size:0x100 scope:global align:4 startSound__15Z2SoundObjCoachF10JAISoundIDUlSc = .text:0x802C65C0; // type:function size:0xCC scope:global align:4 -@144@__dt__14Z2CreatureLinkFv = .text:0x802C668C; // type:function size:0x8 scope:local align:4 -@144@__dt__14Z2CreatureRideFv = .text:0x802C6694; // type:function size:0x8 scope:local align:4 +@144@__dt__14Z2CreatureLinkFv = .text:0x802C668C; // type:function size:0x8 scope:weak align:4 +@144@__dt__14Z2CreatureRideFv = .text:0x802C6694; // type:function size:0x8 scope:weak align:4 __ct__11Z2EnvSeBaseFP3Vec = .text:0x802C669C; // type:function size:0x10 scope:global align:4 __dt__11Z2EnvSeBaseFv = .text:0x802C66AC; // type:function size:0x5C scope:global align:4 startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl = .text:0x802C6708; // type:function size:0x1AC scope:global align:4 @@ -12597,7 +12597,7 @@ startGuideMelody__13Z2WolfHowlMgrFb = .text:0x802CC888; // type:function size:0x skipCorrectDemo__13Z2WolfHowlMgrFv = .text:0x802CC958; // type:function size:0x24 scope:global align:4 __sinit_Z2WolfHowlMgr_cpp = .text:0x802CC97C; // type:function size:0xE4 scope:local align:4 __ct__12Z2SpeechMgr2Fv = .text:0x802CCA60; // type:function size:0x8C scope:global align:4 -__dt__15Z2SpeechStarterFv = .text:0x802CCAEC; // type:function size:0x9C scope:global align:4 +__dt__15Z2SpeechStarterFv = .text:0x802CCAEC; // type:function size:0x9C scope:weak align:4 setString__12Z2SpeechMgr2FPCUssUcUs = .text:0x802CCB88; // type:function size:0x1D8 scope:global align:4 setTextCount__12Z2SpeechMgr2Fs = .text:0x802CCD60; // type:function size:0x230 scope:global align:4 speakOneWord__12Z2SpeechMgr2Fb = .text:0x802CCF90; // type:function size:0x16C scope:global align:4 @@ -12777,8 +12777,8 @@ run__9JKRThreadFv = .text:0x802D2C14; // type:function size:0x8 scope:global ali draw__15JKRThreadSwitchFP14JKRThreadName_ = .text:0x802D2C1C; // type:function size:0x30 scope:global align:4 __dt__15JKRThreadSwitchFv = .text:0x802D2C4C; // type:function size:0x48 scope:global align:4 __sinit_JKRThread_cpp = .text:0x802D2C94; // type:function size:0x68 scope:local align:4 -__dt__17JSUList<7JKRTask>Fv = .text:0x802D2CFC; // type:function size:0x54 scope:global align:4 -__dt__19JSUList<9JKRThread>Fv = .text:0x802D2D50; // type:function size:0x54 scope:global align:4 +__dt__17JSUList<7JKRTask>Fv = .text:0x802D2CFC; // type:function size:0x54 scope:weak align:4 +__dt__19JSUList<9JKRThread>Fv = .text:0x802D2D50; // type:function size:0x54 scope:weak align:4 create__7JKRAramFUlUllll = .text:0x802D2DA4; // type:function size:0x9C scope:global align:4 __ct__7JKRAramFUlUll = .text:0x802D2E40; // type:function size:0x10C scope:global align:4 __dt__7JKRAramFv = .text:0x802D2F4C; // type:function size:0x90 scope:global align:4 @@ -12787,12 +12787,12 @@ checkOkAddress__7JKRAramFPUcUlP12JKRAramBlockUl = .text:0x802D3048; // type:func changeGroupIdIfNeed__7JKRAramFPUci = .text:0x802D30DC; // type:function size:0x60 scope:global align:4 mainRamToAram__7JKRAramFPUcUlUl15JKRExpandSwitchUlP7JKRHeapiPUl = .text:0x802D313C; // type:function size:0x278 scope:global align:4 aramToMainRam__7JKRAramFUlPUcUl15JKRExpandSwitchUlP7JKRHeapiPUl = .text:0x802D33B4; // type:function size:0x27C scope:global align:4 -JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl = .text:0x802D3630; // type:function size:0x170 scope:global align:4 -decompSZS_subroutine__FPUcPUc = .text:0x802D37A0; // type:function size:0x2A0 scope:local align:4 +JKRDecompressFromAramToMainRam__FUlPvUlUlUlPUl = .text:0x802D3630; // type:function size:0x170 scope:local align:4 +decompSZS_subroutine__FPUcPUc = .text:0x802D37A0; // type:function size:0x2A0 scope:global align:4 firstSrcData__Fv = .text:0x802D3A40; // type:function size:0xA4 scope:local align:4 nextSrcData__FPUc = .text:0x802D3AE4; // type:function size:0xC8 scope:local align:4 __sinit_JKRAram_cpp = .text:0x802D3BAC; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRAMCommand>Fv = .text:0x802D3BF0; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRAMCommand>Fv = .text:0x802D3BF0; // type:function size:0x54 scope:weak align:4 __ct__11JKRAramHeapFUlUl = .text:0x802D3C44; // type:function size:0xD0 scope:global align:4 __dt__11JKRAramHeapFv = .text:0x802D3D14; // type:function size:0xA8 scope:global align:4 alloc__11JKRAramHeapFUlQ211JKRAramHeap10EAllocMode = .text:0x802D3DBC; // type:function size:0x78 scope:global align:4 @@ -12802,7 +12802,7 @@ getFreeSize__11JKRAramHeapFv = .text:0x802D3F34; // type:function size:0x78 scop getTotalFreeSize__11JKRAramHeapFv = .text:0x802D3FAC; // type:function size:0x6C scope:global align:4 dump__11JKRAramHeapFv = .text:0x802D4018; // type:function size:0x54 scope:global align:4 __sinit_JKRAramHeap_cpp = .text:0x802D406C; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRAramBlock>Fv = .text:0x802D40B0; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRAramBlock>Fv = .text:0x802D40B0; // type:function size:0x54 scope:weak align:4 __ct__12JKRAramBlockFUlUlUlUcb = .text:0x802D4104; // type:function size:0x74 scope:global align:4 __dt__12JKRAramBlockFv = .text:0x802D4178; // type:function size:0xBC scope:global align:4 allocHead__12JKRAramBlockFUlUcP11JKRAramHeap = .text:0x802D4234; // type:function size:0x9C scope:global align:4 @@ -12827,7 +12827,7 @@ write_StreamToAram_Async__13JKRAramStreamFP18JSUFileInputStreamUlUlUlPUl = .text sync__13JKRAramStreamFP20JKRAramStreamCommandi = .text:0x802D4DA0; // type:function size:0x94 scope:global align:4 setTransBuffer__13JKRAramStreamFPUcUlP7JKRHeap = .text:0x802D4E34; // type:function size:0x54 scope:global align:4 __ct__20JKRAramStreamCommandFv = .text:0x802D4E88; // type:function size:0xC scope:global align:4 -getAvailable__20JSURandomInputStreamCFv = .text:0x802D4E94; // type:function size:0x5C scope:global align:4 +getAvailable__20JSURandomInputStreamCFv = .text:0x802D4E94; // type:function size:0x5C scope:weak align:4 __ct__13JKRFileLoaderFv = .text:0x802D4EF0; // type:function size:0x58 scope:global align:4 __dt__13JKRFileLoaderFv = .text:0x802D4F48; // type:function size:0x8C scope:global align:4 unmount__13JKRFileLoaderFv = .text:0x802D4FD4; // type:function size:0x50 scope:global align:4 @@ -12838,14 +12838,14 @@ detachResource__13JKRFileLoaderFPvP13JKRFileLoader = .text:0x802D51A0; // type:f findVolume__13JKRFileLoaderFPPCc = .text:0x802D5238; // type:function size:0x8C scope:global align:4 fetchVolumeName__13JKRFileLoaderFPclPCc = .text:0x802D52C4; // type:function size:0xDC scope:global align:4 __sinit_JKRFileLoader_cpp = .text:0x802D53A0; // type:function size:0x44 scope:local align:4 -__dt__24JSUList<13JKRFileLoader>Fv = .text:0x802D53E4; // type:function size:0x54 scope:global align:4 +__dt__24JSUList<13JKRFileLoader>Fv = .text:0x802D53E4; // type:function size:0x54 scope:weak align:4 __ct__12JKRArcFinderFP10JKRArchivell = .text:0x802D5438; // type:function size:0x8C scope:global align:4 findNextFile__12JKRArcFinderFv = .text:0x802D54C4; // type:function size:0xAC scope:global align:4 __ct__12JKRDvdFinderFPCc = .text:0x802D5570; // type:function size:0x84 scope:global align:4 __dt__12JKRDvdFinderFv = .text:0x802D55F4; // type:function size:0x80 scope:global align:4 findNextFile__12JKRDvdFinderFv = .text:0x802D5674; // type:function size:0x9C scope:global align:4 -__dt__13JKRFileFinderFv = .text:0x802D5710; // type:function size:0x48 scope:global align:4 -__dt__12JKRArcFinderFv = .text:0x802D5758; // type:function size:0x5C scope:global align:4 +__dt__13JKRFileFinderFv = .text:0x802D5710; // type:function size:0x48 scope:weak align:4 +__dt__12JKRArcFinderFv = .text:0x802D5758; // type:function size:0x5C scope:weak align:4 mount__12JKRFileCacheFPCcP7JKRHeapPCc = .text:0x802D57B4; // type:function size:0x100 scope:global align:4 __ct__12JKRFileCacheFPCcPCc = .text:0x802D58B4; // type:function size:0x1BC scope:global align:4 __dt__12JKRFileCacheFv = .text:0x802D5A70; // type:function size:0xD4 scope:global align:4 @@ -12929,7 +12929,7 @@ getAramAddress__14JKRAramArchiveFPCc = .text:0x802D861C; // type:function size:0 fetchResource_subroutine__14JKRAramArchiveFUlUlPUcUli = .text:0x802D8658; // type:function size:0xBC scope:global align:4 fetchResource_subroutine__14JKRAramArchiveFUlUlP7JKRHeapiPPUc = .text:0x802D8714; // type:function size:0x150 scope:global align:4 getExpandedResSize__14JKRAramArchiveCFPCv = .text:0x802D8864; // type:function size:0x12C scope:global align:4 -__dt__7JKRFileFv = .text:0x802D8990; // type:function size:0x60 scope:global align:4 +__dt__7JKRFileFv = .text:0x802D8990; // type:function size:0x60 scope:weak align:4 __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection = .text:0x802D89F0; // type:function size:0xA8 scope:global align:4 __dt__13JKRDvdArchiveFv = .text:0x802D8A98; // type:function size:0x11C scope:global align:4 open__13JKRDvdArchiveFl = .text:0x802D8BB4; // type:function size:0x29C scope:global align:4 @@ -12961,32 +12961,32 @@ sync__10JKRDvdFileFv = .text:0x802DA870; // type:function size:0x54 scope:global doneProcess__10JKRDvdFileFlP11DVDFileInfo = .text:0x802DA8C4; // type:function size:0x34 scope:global align:4 getFileSize__10JKRDvdFileCFv = .text:0x802DA8F8; // type:function size:0x8 scope:global align:4 __sinit_JKRDvdFile_cpp = .text:0x802DA900; // type:function size:0x44 scope:local align:4 -__dt__21JSUList<10JKRDvdFile>Fv = .text:0x802DA944; // type:function size:0x54 scope:global align:4 +__dt__21JSUList<10JKRDvdFile>Fv = .text:0x802DA944; // type:function size:0x54 scope:weak align:4 loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl = .text:0x802DA998; // type:function size:0xBC scope:global align:4 loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl = .text:0x802DAA54; // type:function size:0xBC scope:global align:4 loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl = .text:0x802DAB10; // type:function size:0x4D4 scope:global align:4 -JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl = .text:0x802DAFE4; // type:function size:0x178 scope:global align:4 +JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl = .text:0x802DAFE4; // type:function size:0x178 scope:local align:4 decompSZS_subroutine__FPUcPUc = .text:0x802DB15C; // type:function size:0x2B0 scope:local align:4 firstSrcData__Fv = .text:0x802DB40C; // type:function size:0xCC scope:local align:4 nextSrcData__FPUc = .text:0x802DB4D8; // type:function size:0xFC scope:local align:4 isErrorRetry__12JKRDvdRipperFv = .text:0x802DB5D4; // type:function size:0x8 scope:global align:4 __sinit_JKRDvdRipper_cpp = .text:0x802DB5DC; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRDMCommand>Fv = .text:0x802DB620; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRDMCommand>Fv = .text:0x802DB620; // type:function size:0x54 scope:weak align:4 loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl = .text:0x802DB674; // type:function size:0xA4 scope:global align:4 loadToAram__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchUlUlPUl = .text:0x802DB718; // type:function size:0xA8 scope:global align:4 loadToAram_Async__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchPFUl_vUlUlPUl = .text:0x802DB7C0; // type:function size:0xB4 scope:global align:4 callCommand_Async__16JKRDvdAramRipperFP12JKRADCommand = .text:0x802DB874; // type:function size:0x364 scope:global align:4 -__dt__18JSUFileInputStreamFv = .text:0x802DBBD8; // type:function size:0x70 scope:global align:4 +__dt__18JSUFileInputStreamFv = .text:0x802DBBD8; // type:function size:0x70 scope:weak align:4 syncAram__16JKRDvdAramRipperFP12JKRADCommandi = .text:0x802DBC48; // type:function size:0xD4 scope:global align:4 __ct__12JKRADCommandFv = .text:0x802DBD1C; // type:function size:0x40 scope:global align:4 __dt__12JKRADCommandFv = .text:0x802DBD5C; // type:function size:0x8C scope:global align:4 -JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl = .text:0x802DBDE8; // type:function size:0x178 scope:global align:4 -decompSZS_subroutine__FPUcUl = .text:0x802DBF60; // type:function size:0x288 scope:global align:4 +JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl = .text:0x802DBDE8; // type:function size:0x178 scope:local align:4 +decompSZS_subroutine__FPUcUl = .text:0x802DBF60; // type:function size:0x288 scope:local align:4 firstSrcData__Fv = .text:0x802DC1E8; // type:function size:0xB4 scope:local align:4 nextSrcData__FPUc = .text:0x802DC29C; // type:function size:0xE4 scope:local align:4 -dmaBufferFlush__FUl = .text:0x802DC380; // type:function size:0x68 scope:global align:4 +dmaBufferFlush__FUl = .text:0x802DC380; // type:function size:0x68 scope:local align:4 __sinit_JKRDvdAramRipper_cpp = .text:0x802DC3E8; // type:function size:0x44 scope:local align:4 -__dt__23JSUList<12JKRADCommand>Fv = .text:0x802DC42C; // type:function size:0x54 scope:global align:4 +__dt__23JSUList<12JKRADCommand>Fv = .text:0x802DC42C; // type:function size:0x54 scope:weak align:4 create__9JKRDecompFl = .text:0x802DC480; // type:function size:0x60 scope:global align:4 __ct__9JKRDecompFl = .text:0x802DC4E0; // type:function size:0x50 scope:global align:4 __dt__9JKRDecompFv = .text:0x802DC530; // type:function size:0x60 scope:global align:4 @@ -13045,9 +13045,9 @@ __ct__Q27JGadget20TVector_pointer_voidFRCQ27JGadget14TAllocator = .text:0x80 __dt__Q27JGadget20TVector_pointer_voidFv = .text:0x802DDAFC; // type:function size:0xA8 scope:global align:4 insert__Q27JGadget20TVector_pointer_voidFPPvRCPv = .text:0x802DDBA4; // type:function size:0x20 scope:global align:4 erase__Q27JGadget20TVector_pointer_voidFPPvPPv = .text:0x802DDBC4; // type:function size:0x58 scope:global align:4 -insert__Q27JGadget38TVector>FPPvUlRCPv = .text:0x802DDC1C; // type:function size:0x70 scope:global align:4 -Insert_raw__Q27JGadget38TVector>FPPvUl = .text:0x802DDC8C; // type:function size:0x2A4 scope:global align:4 -insert__Q27JGadget38TVector>FPPvRCPv = .text:0x802DDF30; // type:function size:0x58 scope:global align:4 +insert__Q27JGadget38TVector>FPPvUlRCPv = .text:0x802DDC1C; // type:function size:0x70 scope:weak align:4 +Insert_raw__Q27JGadget38TVector>FPPvUl = .text:0x802DDC8C; // type:function size:0x2A4 scope:weak align:4 +insert__Q27JGadget38TVector>FPPvRCPv = .text:0x802DDF30; // type:function size:0x58 scope:weak align:4 __ct__12JUTCacheFontFPC7ResFONTUlP7JKRHeap = .text:0x802DDF88; // type:function size:0x80 scope:global align:4 __dt__12JUTCacheFontFv = .text:0x802DE008; // type:function size:0x94 scope:global align:4 deleteMemBlocks_CacheFont__12JUTCacheFontFv = .text:0x802DE09C; // type:function size:0x84 scope:global align:4 @@ -13120,9 +13120,9 @@ isLeadByte__10JUTResFontCFi = .text:0x802E0BA4; // type:function size:0x34 scope getFontCode__10JUTResFontCFi = .text:0x802E0BD8; // type:function size:0x188 scope:global align:4 loadImage__10JUTResFontFi11_GXTexMapID = .text:0x802E0D60; // type:function size:0x164 scope:global align:4 convertSjis__10JUTResFontCFiPUs = .text:0x802E0EC4; // type:function size:0x44 scope:global align:4 -isLeadByte_1Byte__7JUTFontFi = .text:0x802E0F08; // type:function size:0x8 scope:global align:4 -isLeadByte_2Byte__7JUTFontFi = .text:0x802E0F10; // type:function size:0x8 scope:global align:4 -isLeadByte_ShiftJIS__7JUTFontFi = .text:0x802E0F18; // type:function size:0x30 scope:global align:4 +isLeadByte_1Byte__7JUTFontFi = .text:0x802E0F08; // type:function size:0x8 scope:weak align:4 +isLeadByte_2Byte__7JUTFontFi = .text:0x802E0F10; // type:function size:0x8 scope:weak align:4 +isLeadByte_ShiftJIS__7JUTFontFi = .text:0x802E0F18; // type:function size:0x30 scope:weak align:4 __ct__10JUTDbPrintFP7JUTFontP7JKRHeap = .text:0x802E0F48; // type:function size:0x48 scope:global align:4 start__10JUTDbPrintFP7JUTFontP7JKRHeap = .text:0x802E0F90; // type:function size:0x74 scope:global align:4 changeFont__10JUTDbPrintFP7JUTFont = .text:0x802E1004; // type:function size:0x18 scope:global align:4 @@ -13152,7 +13152,7 @@ clear__Q210JUTGamePad7CRumbleFv = .text:0x802E23B4; // type:function size:0x24 s clear__Q210JUTGamePad7CRumbleFP10JUTGamePad = .text:0x802E23D8; // type:function size:0x5C scope:global align:4 startMotor__Q210JUTGamePad7CRumbleFi = .text:0x802E2434; // type:function size:0x58 scope:global align:4 stopMotor__Q210JUTGamePad7CRumbleFib = .text:0x802E248C; // type:function size:0x6C scope:global align:4 -getNumBit__FPUci = .text:0x802E24F8; // type:function size:0x28 scope:global align:4 +getNumBit__FPUci = .text:0x802E24F8; // type:function size:0x28 scope:local align:4 update__Q210JUTGamePad7CRumbleFs = .text:0x802E2520; // type:function size:0x184 scope:global align:4 triggerPatternedRumble__Q210JUTGamePad7CRumbleFUl = .text:0x802E26A4; // type:function size:0x28 scope:global align:4 startPatternedRumble__Q210JUTGamePad7CRumbleFPvQ310JUTGamePad7CRumble7ERumbleUl = .text:0x802E26CC; // type:function size:0x7C scope:global align:4 @@ -13164,10 +13164,10 @@ setRepeat__Q210JUTGamePad7CButtonFUlUlUl = .text:0x802E287C; // type:function si recalibrate__10JUTGamePadFUl = .text:0x802E2898; // type:function size:0x64 scope:global align:4 checkCallback__19JUTGamePadLongPressFiUl = .text:0x802E28FC; // type:function size:0x64 scope:global align:4 __sinit_JUTGamePad_cpp = .text:0x802E2960; // type:function size:0xF4 scope:local align:4 -__dt__30JSUList<19JUTGamePadLongPress>Fv = .text:0x802E2A54; // type:function size:0x54 scope:global align:4 -__ct__Q210JUTGamePad6CStickFv = .text:0x802E2AA8; // type:function size:0x30 scope:global align:4 -__ct__Q210JUTGamePad7CButtonFv = .text:0x802E2AD8; // type:function size:0x30 scope:global align:4 -__dt__21JSUList<10JUTGamePad>Fv = .text:0x802E2B08; // type:function size:0x54 scope:global align:4 +__dt__30JSUList<19JUTGamePadLongPress>Fv = .text:0x802E2A54; // type:function size:0x54 scope:weak align:4 +__ct__Q210JUTGamePad6CStickFv = .text:0x802E2AA8; // type:function size:0x30 scope:weak align:4 +__ct__Q210JUTGamePad7CButtonFv = .text:0x802E2AD8; // type:function size:0x30 scope:weak align:4 +__dt__21JSUList<10JUTGamePad>Fv = .text:0x802E2B08; // type:function size:0x54 scope:weak align:4 __ct__12JUTExceptionFP14JUTDirectPrint = .text:0x802E2B5C; // type:function size:0xE4 scope:global align:4 create__12JUTExceptionFP14JUTDirectPrint = .text:0x802E2C40; // type:function size:0x68 scope:global align:4 run__12JUTExceptionFv = .text:0x802E2CA8; // type:function size:0x124 scope:global align:4 @@ -13178,7 +13178,7 @@ setFPException__12JUTExceptionFUl = .text:0x802E307C; // type:function size:0x48 showFloatSub__12JUTExceptionFif = .text:0x802E30C4; // type:function size:0x190 scope:global align:4 showFloat__12JUTExceptionFP9OSContext = .text:0x802E3254; // type:function size:0x124 scope:global align:4 searchPartialModule__12JUTExceptionFUlPUlPUlPUlPUl = .text:0x802E3378; // type:function size:0xC0 scope:global align:4 -search_name_part__FPUcPUci = .text:0x802E3438; // type:function size:0x78 scope:global align:4 +search_name_part__FPUcPUci = .text:0x802E3438; // type:function size:0x78 scope:local align:4 showStack__12JUTExceptionFP9OSContext = .text:0x802E34B0; // type:function size:0x100 scope:global align:4 showMainInfo__12JUTExceptionFUsP9OSContextUlUl = .text:0x802E35B0; // type:function size:0x2D4 scope:global align:4 showGPR__12JUTExceptionFP9OSContext = .text:0x802E3884; // type:function size:0xC0 scope:global align:4 @@ -13200,7 +13200,7 @@ createConsole__12JUTExceptionFPvUl = .text:0x802E4DEC; // type:function size:0xE __ct__13JUTExternalFBFP16_GXRenderModeObj8_GXGammaPvUl = .text:0x802E4ECC; // type:function size:0x20 scope:global align:4 __dt__12JUTExceptionFv = .text:0x802E4EEC; // type:function size:0x60 scope:global align:4 __sinit_JUTException_cpp = .text:0x802E4F4C; // type:function size:0x48 scope:local align:4 -__dt__39JSUListFv = .text:0x802E4F94; // type:function size:0x54 scope:global align:4 +__dt__39JSUListFv = .text:0x802E4F94; // type:function size:0x54 scope:weak align:4 __ct__14JUTDirectPrintFv = .text:0x802E4FE8; // type:function size:0x58 scope:global align:4 start__14JUTDirectPrintFv = .text:0x802E5040; // type:function size:0x48 scope:global align:4 erase__14JUTDirectPrintFiiii = .text:0x802E5088; // type:function size:0x94 scope:global align:4 @@ -13252,11 +13252,11 @@ bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor = .text adjustMeterLength__10JUTProcBarFUlPfffPi = .text:0x802E6AC4; // type:function size:0x144 scope:global align:4 draw__10JUTProcBarFv = .text:0x802E6C08; // type:function size:0x34 scope:global align:4 drawProcessBar__10JUTProcBarFv = .text:0x802E6C3C; // type:function size:0xF00 scope:global align:4 -addrToXPos__FPvi = .text:0x802E7B3C; // type:function size:0x68 scope:global align:4 -byteToXLen__Fii = .text:0x802E7BA4; // type:function size:0x68 scope:global align:4 -heapBar__FP7JKRHeapiiiii = .text:0x802E7C0C; // type:function size:0x194 scope:global align:4 +addrToXPos__FPvi = .text:0x802E7B3C; // type:function size:0x68 scope:local align:4 +byteToXLen__Fii = .text:0x802E7BA4; // type:function size:0x68 scope:local align:4 +heapBar__FP7JKRHeapiiiii = .text:0x802E7C0C; // type:function size:0x194 scope:local align:4 drawHeapBar__10JUTProcBarFv = .text:0x802E7DA0; // type:function size:0x3A0 scope:global align:4 -__ct__Q210JUTProcBar5CTimeFv = .text:0x802E8140; // type:function size:0x14 scope:global align:4 +__ct__Q210JUTProcBar5CTimeFv = .text:0x802E8140; // type:function size:0x14 scope:weak align:4 create__10JUTConsoleFUiUiP7JKRHeap = .text:0x802E8154; // type:function size:0x90 scope:global align:4 create__10JUTConsoleFUiPvUl = .text:0x802E81E4; // type:function size:0x88 scope:global align:4 __ct__10JUTConsoleFUiUib = .text:0x802E826C; // type:function size:0xF0 scope:global align:4 @@ -13306,10 +13306,10 @@ fillBox__14J2DGrafContextFRCQ29JGeometry8TBox2 = .text:0x802EA060; // type:fu drawFrame__14J2DGrafContextFRCQ29JGeometry8TBox2 = .text:0x802EA168; // type:function size:0x120 scope:global align:4 line__14J2DGrafContextFQ29JGeometry8TVec2Q29JGeometry8TVec2 = .text:0x802EA288; // type:function size:0xDC scope:global align:4 lineTo__14J2DGrafContextFQ29JGeometry8TVec2 = .text:0x802EA364; // type:function size:0x70 scope:global align:4 -__dt__14J2DGrafContextFv = .text:0x802EA3D4; // type:function size:0x48 scope:global align:4 -place__14J2DGrafContextFffff = .text:0x802EA41C; // type:function size:0x48 scope:global align:4 -getGrafType__14J2DGrafContextCFv = .text:0x802EA464; // type:function size:0x8 scope:global align:4 -setLookat__14J2DGrafContextFv = .text:0x802EA46C; // type:function size:0x4 scope:global align:4 +__dt__14J2DGrafContextFv = .text:0x802EA3D4; // type:function size:0x48 scope:weak align:4 +place__14J2DGrafContextFffff = .text:0x802EA41C; // type:function size:0x48 scope:weak align:4 +getGrafType__14J2DGrafContextCFv = .text:0x802EA464; // type:function size:0x8 scope:weak align:4 +setLookat__14J2DGrafContextFv = .text:0x802EA46C; // type:function size:0x4 scope:weak align:4 __ct__13J2DOrthoGraphFv = .text:0x802EA470; // type:function size:0x60 scope:global align:4 __ct__13J2DOrthoGraphFffffff = .text:0x802EA4D0; // type:function size:0xE4 scope:global align:4 setPort__13J2DOrthoGraphFv = .text:0x802EA5B4; // type:function size:0x58 scope:global align:4 @@ -13321,7 +13321,7 @@ J2DFillBox__FffffQ28JUtility6TColor = .text:0x802EA8C4; // type:function size:0x J2DFillBox__FRCQ29JGeometry8TBox2Q28JUtility6TColor = .text:0x802EA90C; // type:function size:0x90 scope:global align:4 J2DDrawFrame__FffffQ28JUtility6TColorUc = .text:0x802EA99C; // type:function size:0x4C scope:global align:4 J2DDrawFrame__FRCQ29JGeometry8TBox2Q28JUtility6TColorUc = .text:0x802EA9E8; // type:function size:0xA0 scope:global align:4 -getGrafType__13J2DOrthoGraphCFv = .text:0x802EAA88; // type:function size:0x8 scope:global align:4 +getGrafType__13J2DOrthoGraphCFv = .text:0x802EAA88; // type:function size:0x8 scope:weak align:4 load__9J2DTexMtxFUl = .text:0x802EAA90; // type:function size:0x34 scope:global align:4 calc__9J2DTexMtxFv = .text:0x802EAAC4; // type:function size:0x68 scope:global align:4 getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f = .text:0x802EAB2C; // type:function size:0x190 scope:global align:4 @@ -13330,21 +13330,21 @@ load__14J2DIndTevStageFUc = .text:0x802EAE44; // type:function size:0x54 scope:g load__12J2DIndTexMtxFUc = .text:0x802EAE98; // type:function size:0x34 scope:global align:4 load__19J2DIndTexCoordScaleFUc = .text:0x802EAECC; // type:function size:0x30 scope:global align:4 load__14J2DIndTexOrderFUc = .text:0x802EAEFC; // type:function size:0x30 scope:global align:4 -getTevSwapModeTable__11J2DTevBlockFUl = .text:0x802EAF2C; // type:function size:0x8 scope:global align:4 -getTevStage__11J2DTevBlockFUl = .text:0x802EAF34; // type:function size:0x8 scope:global align:4 -getTevColor__11J2DTevBlockFUl = .text:0x802EAF3C; // type:function size:0x8 scope:global align:4 -getTevOrder__11J2DTevBlockFUl = .text:0x802EAF44; // type:function size:0x8 scope:global align:4 -getTevKAlphaSel__11J2DTevBlockFUl = .text:0x802EAF4C; // type:function size:0x8 scope:global align:4 -getTevKColorSel__11J2DTevBlockFUl = .text:0x802EAF54; // type:function size:0x8 scope:global align:4 -getTevKColor__11J2DTevBlockFUl = .text:0x802EAF5C; // type:function size:0x8 scope:global align:4 -getFontNo__11J2DTevBlockCFv = .text:0x802EAF64; // type:function size:0xC scope:global align:4 -getTexNo__11J2DTevBlockCFUl = .text:0x802EAF70; // type:function size:0xC scope:global align:4 -getTevStageNum__11J2DTevBlockCFv = .text:0x802EAF7C; // type:function size:0x8 scope:global align:4 -getIndTevStage__11J2DTevBlockFUl = .text:0x802EAF84; // type:function size:0x8 scope:global align:4 -getIndTexCoordScale__11J2DIndBlockFUl = .text:0x802EAF8C; // type:function size:0x8 scope:global align:4 -getIndTexMtx__11J2DIndBlockFUl = .text:0x802EAF94; // type:function size:0x8 scope:global align:4 -getIndTexOrder__11J2DIndBlockFUl = .text:0x802EAF9C; // type:function size:0x8 scope:global align:4 -getIndTexStageNum__11J2DIndBlockCFv = .text:0x802EAFA4; // type:function size:0x8 scope:global align:4 +getTevSwapModeTable__11J2DTevBlockFUl = .text:0x802EAF2C; // type:function size:0x8 scope:weak align:4 +getTevStage__11J2DTevBlockFUl = .text:0x802EAF34; // type:function size:0x8 scope:weak align:4 +getTevColor__11J2DTevBlockFUl = .text:0x802EAF3C; // type:function size:0x8 scope:weak align:4 +getTevOrder__11J2DTevBlockFUl = .text:0x802EAF44; // type:function size:0x8 scope:weak align:4 +getTevKAlphaSel__11J2DTevBlockFUl = .text:0x802EAF4C; // type:function size:0x8 scope:weak align:4 +getTevKColorSel__11J2DTevBlockFUl = .text:0x802EAF54; // type:function size:0x8 scope:weak align:4 +getTevKColor__11J2DTevBlockFUl = .text:0x802EAF5C; // type:function size:0x8 scope:weak align:4 +getFontNo__11J2DTevBlockCFv = .text:0x802EAF64; // type:function size:0xC scope:weak align:4 +getTexNo__11J2DTevBlockCFUl = .text:0x802EAF70; // type:function size:0xC scope:weak align:4 +getTevStageNum__11J2DTevBlockCFv = .text:0x802EAF7C; // type:function size:0x8 scope:weak align:4 +getIndTevStage__11J2DTevBlockFUl = .text:0x802EAF84; // type:function size:0x8 scope:weak align:4 +getIndTexCoordScale__11J2DIndBlockFUl = .text:0x802EAF8C; // type:function size:0x8 scope:weak align:4 +getIndTexMtx__11J2DIndBlockFUl = .text:0x802EAF94; // type:function size:0x8 scope:weak align:4 +getIndTexOrder__11J2DIndBlockFUl = .text:0x802EAF9C; // type:function size:0x8 scope:weak align:4 +getIndTexStageNum__11J2DIndBlockCFv = .text:0x802EAFA4; // type:function size:0x8 scope:weak align:4 __ct__11J2DMaterialFv = .text:0x802EAFAC; // type:function size:0x120 scope:global align:4 __dt__11J2DMaterialFv = .text:0x802EB0CC; // type:function size:0xC0 scope:global align:4 setGX__11J2DMaterialFv = .text:0x802EB18C; // type:function size:0x84 scope:global align:4 @@ -13469,202 +13469,202 @@ initialize__15J2DIndBlockFullFv = .text:0x802F2464; // type:function size:0xCC s setGX__15J2DIndBlockFullFv = .text:0x802F2530; // type:function size:0xCC scope:global align:4 initialize__10J2DPEBlockFv = .text:0x802F25FC; // type:function size:0x44 scope:global align:4 setGX__10J2DPEBlockFv = .text:0x802F2640; // type:function size:0x60 scope:global align:4 -__ct__14J2DIndTevStageFv = .text:0x802F26A0; // type:function size:0x94 scope:global align:4 -__ct__19J2DTevSwapModeTableFv = .text:0x802F2734; // type:function size:0xC scope:global align:4 -__ct__11J2DTevStageFv = .text:0x802F2740; // type:function size:0x68 scope:global align:4 -setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F27A8; // type:function size:0x1C8 scope:global align:4 -__ct__11J2DTevOrderFv = .text:0x802F2970; // type:function size:0x20 scope:global align:4 -__ct__13J2DGXColorS10Fv = .text:0x802F2990; // type:function size:0x4 scope:global align:4 -getType__15J2DIndBlockFullFv = .text:0x802F2994; // type:function size:0xC scope:global align:4 -setIndTexStageNum__15J2DIndBlockFullFUc = .text:0x802F29A0; // type:function size:0x8 scope:global align:4 -getIndTexStageNum__15J2DIndBlockFullCFv = .text:0x802F29A8; // type:function size:0x8 scope:global align:4 -setIndTexOrder__15J2DIndBlockFullFUl14J2DIndTexOrder = .text:0x802F29B0; // type:function size:0x1C scope:global align:4 -getIndTexOrder__15J2DIndBlockFullFUl = .text:0x802F29CC; // type:function size:0x14 scope:global align:4 -setIndTexMtx__15J2DIndBlockFullFUl12J2DIndTexMtx = .text:0x802F29E0; // type:function size:0x58 scope:global align:4 -getIndTexMtx__15J2DIndBlockFullFUl = .text:0x802F2A38; // type:function size:0x14 scope:global align:4 -setIndTexCoordScale__15J2DIndBlockFullFUl19J2DIndTexCoordScale = .text:0x802F2A4C; // type:function size:0x1C scope:global align:4 -getIndTexCoordScale__15J2DIndBlockFullFUl = .text:0x802F2A68; // type:function size:0x14 scope:global align:4 -__dt__15J2DIndBlockFullFv = .text:0x802F2A7C; // type:function size:0x9C scope:global align:4 -getType__13J2DTevBlock16Fv = .text:0x802F2B18; // type:function size:0xC scope:global align:4 -getMaxStage__13J2DTevBlock16Fv = .text:0x802F2B24; // type:function size:0x8 scope:global align:4 -setTexNo__13J2DTevBlock16FUlUs = .text:0x802F2B2C; // type:function size:0x10 scope:global align:4 -getTexNo__13J2DTevBlock16CFUl = .text:0x802F2B3C; // type:function size:0x10 scope:global align:4 -setFontNo__13J2DTevBlock16FUs = .text:0x802F2B4C; // type:function size:0x8 scope:global align:4 -getFontNo__13J2DTevBlock16CFv = .text:0x802F2B54; // type:function size:0x8 scope:global align:4 -setTevOrder__13J2DTevBlock16FUl11J2DTevOrder = .text:0x802F2B5C; // type:function size:0x24 scope:global align:4 -getTevOrder__13J2DTevBlock16FUl = .text:0x802F2B80; // type:function size:0x14 scope:global align:4 -setTevColor__13J2DTevBlock16FUl13J2DGXColorS10 = .text:0x802F2B94; // type:function size:0x2C scope:global align:4 -getTevColor__13J2DTevBlock16FUl = .text:0x802F2BC0; // type:function size:0x14 scope:global align:4 -setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor = .text:0x802F2BD4; // type:function size:0x2C scope:global align:4 -getTevKColor__13J2DTevBlock16FUl = .text:0x802F2C00; // type:function size:0x14 scope:global align:4 -setTevKColorSel__13J2DTevBlock16FUlUc = .text:0x802F2C14; // type:function size:0xC scope:global align:4 -getTevKColorSel__13J2DTevBlock16FUl = .text:0x802F2C20; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__13J2DTevBlock16FUlUc = .text:0x802F2C2C; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__13J2DTevBlock16FUl = .text:0x802F2C38; // type:function size:0xC scope:global align:4 -setTevStageNum__13J2DTevBlock16FUc = .text:0x802F2C44; // type:function size:0x8 scope:global align:4 -getTevStageNum__13J2DTevBlock16CFv = .text:0x802F2C4C; // type:function size:0x8 scope:global align:4 -setTevStage__13J2DTevBlock16FUl11J2DTevStage = .text:0x802F2C54; // type:function size:0x3C scope:global align:4 -getTevStage__13J2DTevBlock16FUl = .text:0x802F2C90; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo = .text:0x802F2CA4; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable = .text:0x802F2CDC; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__13J2DTevBlock16FUl = .text:0x802F2CEC; // type:function size:0x10 scope:global align:4 -setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage = .text:0x802F2CFC; // type:function size:0x14 scope:global align:4 -getIndTevStage__13J2DTevBlock16FUl = .text:0x802F2D10; // type:function size:0x14 scope:global align:4 -insertTexture__13J2DTevBlock16FUlPC7ResTIMG = .text:0x802F2D24; // type:function size:0x30 scope:global align:4 -getTexture__13J2DTevBlock16FUl = .text:0x802F2D54; // type:function size:0x20 scope:global align:4 -getPalette__13J2DTevBlock16FUl = .text:0x802F2D74; // type:function size:0x20 scope:global align:4 -getFont__13J2DTevBlock16Fv = .text:0x802F2D94; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__13J2DTevBlock16FUc = .text:0x802F2D9C; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__13J2DTevBlock16Fv = .text:0x802F2DAC; // type:function size:0xC scope:global align:4 -getType__12J2DTevBlock8Fv = .text:0x802F2DB8; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock8Fv = .text:0x802F2DC4; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock8FUlUs = .text:0x802F2DCC; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock8CFUl = .text:0x802F2DDC; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock8FUs = .text:0x802F2DEC; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock8CFv = .text:0x802F2DF4; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock8FUl11J2DTevOrder = .text:0x802F2DFC; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock8FUl = .text:0x802F2E20; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock8FUl13J2DGXColorS10 = .text:0x802F2E34; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock8FUl = .text:0x802F2E60; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor = .text:0x802F2E74; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock8FUl = .text:0x802F2EA0; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock8FUlUc = .text:0x802F2EB4; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock8FUl = .text:0x802F2EC0; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock8FUlUc = .text:0x802F2ECC; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock8FUl = .text:0x802F2ED8; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock8FUc = .text:0x802F2EE4; // type:function size:0x8 scope:global align:4 -getTevStageNum__12J2DTevBlock8CFv = .text:0x802F2EEC; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock8FUl11J2DTevStage = .text:0x802F2EF4; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock8FUl = .text:0x802F2F30; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo = .text:0x802F2F44; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable = .text:0x802F2F7C; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock8FUl = .text:0x802F2F8C; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage = .text:0x802F2F9C; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock8FUl = .text:0x802F2FB0; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock8FUlPC7ResTIMG = .text:0x802F2FC4; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock8FUl = .text:0x802F2FF4; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock8FUl = .text:0x802F3014; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock8Fv = .text:0x802F3034; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock8FUc = .text:0x802F303C; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock8Fv = .text:0x802F304C; // type:function size:0xC scope:global align:4 -getType__12J2DTevBlock4Fv = .text:0x802F3058; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock4Fv = .text:0x802F3064; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock4FUlUs = .text:0x802F306C; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock4CFUl = .text:0x802F307C; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock4FUs = .text:0x802F308C; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock4CFv = .text:0x802F3094; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock4FUl11J2DTevOrder = .text:0x802F309C; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock4FUl = .text:0x802F30C0; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock4FUl13J2DGXColorS10 = .text:0x802F30D4; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock4FUl = .text:0x802F3100; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor = .text:0x802F3114; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock4FUl = .text:0x802F3140; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock4FUlUc = .text:0x802F3154; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock4FUl = .text:0x802F3160; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock4FUlUc = .text:0x802F316C; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock4FUl = .text:0x802F3178; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock4FUc = .text:0x802F3184; // type:function size:0x8 scope:global align:4 -getTevStageNum__12J2DTevBlock4CFv = .text:0x802F318C; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock4FUl11J2DTevStage = .text:0x802F3194; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock4FUl = .text:0x802F31D0; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo = .text:0x802F31E4; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable = .text:0x802F321C; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock4FUl = .text:0x802F322C; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage = .text:0x802F323C; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock4FUl = .text:0x802F3250; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock4FUlPC7ResTIMG = .text:0x802F3264; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock4FUl = .text:0x802F3294; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock4FUl = .text:0x802F32B4; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock4Fv = .text:0x802F32D4; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock4FUc = .text:0x802F32DC; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock4Fv = .text:0x802F32EC; // type:function size:0x10 scope:global align:4 -getType__12J2DTevBlock2Fv = .text:0x802F32FC; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock2Fv = .text:0x802F3308; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock2FUlUs = .text:0x802F3310; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock2CFUl = .text:0x802F3320; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock2FUs = .text:0x802F3330; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock2CFv = .text:0x802F3338; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock2FUl11J2DTevOrder = .text:0x802F3340; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock2FUl = .text:0x802F3364; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock2FUl13J2DGXColorS10 = .text:0x802F3378; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock2FUl = .text:0x802F33A4; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor = .text:0x802F33B8; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock2FUl = .text:0x802F33E4; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock2FUlUc = .text:0x802F33F8; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock2FUl = .text:0x802F3404; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock2FUlUc = .text:0x802F3410; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock2FUl = .text:0x802F341C; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock2FUc = .text:0x802F3428; // type:function size:0x8 scope:global align:4 -getTevStageNum__12J2DTevBlock2CFv = .text:0x802F3430; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock2FUl11J2DTevStage = .text:0x802F3438; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock2FUl = .text:0x802F3474; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo = .text:0x802F3488; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable = .text:0x802F34C0; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock2FUl = .text:0x802F34D0; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage = .text:0x802F34E0; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock2FUl = .text:0x802F34F4; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock2FUlPC7ResTIMG = .text:0x802F3508; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock2FUl = .text:0x802F3538; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock2FUl = .text:0x802F3558; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock2Fv = .text:0x802F3578; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock2FUc = .text:0x802F3580; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock2Fv = .text:0x802F3590; // type:function size:0x10 scope:global align:4 -getType__12J2DTevBlock1Fv = .text:0x802F35A0; // type:function size:0xC scope:global align:4 -getMaxStage__12J2DTevBlock1Fv = .text:0x802F35AC; // type:function size:0x8 scope:global align:4 -setTexNo__12J2DTevBlock1FUlUs = .text:0x802F35B4; // type:function size:0x10 scope:global align:4 -getTexNo__12J2DTevBlock1CFUl = .text:0x802F35C4; // type:function size:0x10 scope:global align:4 -setFontNo__12J2DTevBlock1FUs = .text:0x802F35D4; // type:function size:0x8 scope:global align:4 -getFontNo__12J2DTevBlock1CFv = .text:0x802F35DC; // type:function size:0x8 scope:global align:4 -setTevOrder__12J2DTevBlock1FUl11J2DTevOrder = .text:0x802F35E4; // type:function size:0x24 scope:global align:4 -getTevOrder__12J2DTevBlock1FUl = .text:0x802F3608; // type:function size:0x14 scope:global align:4 -setTevColor__12J2DTevBlock1FUl13J2DGXColorS10 = .text:0x802F361C; // type:function size:0x2C scope:global align:4 -getTevColor__12J2DTevBlock1FUl = .text:0x802F3648; // type:function size:0x14 scope:global align:4 -setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor = .text:0x802F365C; // type:function size:0x2C scope:global align:4 -getTevKColor__12J2DTevBlock1FUl = .text:0x802F3688; // type:function size:0x14 scope:global align:4 -setTevKColorSel__12J2DTevBlock1FUlUc = .text:0x802F369C; // type:function size:0xC scope:global align:4 -getTevKColorSel__12J2DTevBlock1FUl = .text:0x802F36A8; // type:function size:0xC scope:global align:4 -setTevKAlphaSel__12J2DTevBlock1FUlUc = .text:0x802F36B4; // type:function size:0xC scope:global align:4 -getTevKAlphaSel__12J2DTevBlock1FUl = .text:0x802F36C0; // type:function size:0xC scope:global align:4 -setTevStageNum__12J2DTevBlock1FUc = .text:0x802F36CC; // type:function size:0x4 scope:global align:4 -getTevStageNum__12J2DTevBlock1CFv = .text:0x802F36D0; // type:function size:0x8 scope:global align:4 -setTevStage__12J2DTevBlock1FUl11J2DTevStage = .text:0x802F36D8; // type:function size:0x3C scope:global align:4 -getTevStage__12J2DTevBlock1FUl = .text:0x802F3714; // type:function size:0x14 scope:global align:4 -setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo = .text:0x802F3728; // type:function size:0x38 scope:global align:4 -setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable = .text:0x802F3760; // type:function size:0x10 scope:global align:4 -getTevSwapModeTable__12J2DTevBlock1FUl = .text:0x802F3770; // type:function size:0x10 scope:global align:4 -setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage = .text:0x802F3780; // type:function size:0x14 scope:global align:4 -getIndTevStage__12J2DTevBlock1FUl = .text:0x802F3794; // type:function size:0x14 scope:global align:4 -insertTexture__12J2DTevBlock1FUlPC7ResTIMG = .text:0x802F37A8; // type:function size:0x30 scope:global align:4 -getTexture__12J2DTevBlock1FUl = .text:0x802F37D8; // type:function size:0x20 scope:global align:4 -getPalette__12J2DTevBlock1FUl = .text:0x802F37F8; // type:function size:0x20 scope:global align:4 -getFont__12J2DTevBlock1Fv = .text:0x802F3818; // type:function size:0x8 scope:global align:4 -setUndeleteFlag__12J2DTevBlock1FUc = .text:0x802F3820; // type:function size:0x10 scope:global align:4 -setFontUndeleteFlag__12J2DTevBlock1Fv = .text:0x802F3830; // type:function size:0x10 scope:global align:4 -initialize__11J2DTevBlockFv = .text:0x802F3840; // type:function size:0x4 scope:global align:4 -loadTexture__11J2DTevBlockF11_GXTexMapIDUl = .text:0x802F3844; // type:function size:0x4 scope:global align:4 -setFontNo__11J2DTevBlockFUs = .text:0x802F3848; // type:function size:0x4 scope:global align:4 -setTevOrder__11J2DTevBlockFUl11J2DTevOrder = .text:0x802F384C; // type:function size:0x4 scope:global align:4 -setTevKColorSel__11J2DTevBlockFUlUc = .text:0x802F3850; // type:function size:0x4 scope:global align:4 -setTevKAlphaSel__11J2DTevBlockFUlUc = .text:0x802F3854; // type:function size:0x4 scope:global align:4 -setTevStageNum__11J2DTevBlockFUc = .text:0x802F3858; // type:function size:0x4 scope:global align:4 -setTevStage__11J2DTevBlockFUl11J2DTevStage = .text:0x802F385C; // type:function size:0x4 scope:global align:4 -setTevSwapModeInfo__11J2DTevBlockFUl18J2DTevSwapModeInfo = .text:0x802F3860; // type:function size:0x4 scope:global align:4 -setTevSwapModeTable__11J2DTevBlockFUl19J2DTevSwapModeTable = .text:0x802F3864; // type:function size:0x4 scope:global align:4 -setIndTevStage__11J2DTevBlockFUl14J2DIndTevStage = .text:0x802F3868; // type:function size:0x4 scope:global align:4 -insertTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F386C; // type:function size:0x8 scope:global align:4 -insertTexture__11J2DTevBlockFUlPC7ResTIMGP10JUTPalette = .text:0x802F3874; // type:function size:0x8 scope:global align:4 -insertTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F387C; // type:function size:0x8 scope:global align:4 -setTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F3884; // type:function size:0x8 scope:global align:4 -setTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F388C; // type:function size:0x8 scope:global align:4 -removeTexture__11J2DTevBlockFUl = .text:0x802F3894; // type:function size:0x8 scope:global align:4 -setFont__11J2DTevBlockFP7JUTFont = .text:0x802F389C; // type:function size:0x8 scope:global align:4 -setFont__11J2DTevBlockFP7ResFONT = .text:0x802F38A4; // type:function size:0x8 scope:global align:4 -setPalette__11J2DTevBlockFUlPC7ResTLUT = .text:0x802F38AC; // type:function size:0x8 scope:global align:4 -prepareTexture__11J2DTevBlockFUc = .text:0x802F38B4; // type:function size:0x8 scope:global align:4 -getFont__11J2DTevBlockFv = .text:0x802F38BC; // type:function size:0x8 scope:global align:4 -shiftDeleteFlag__11J2DTevBlockFUcb = .text:0x802F38C4; // type:function size:0x4 scope:global align:4 -setUndeleteFlag__11J2DTevBlockFUc = .text:0x802F38C8; // type:function size:0x4 scope:global align:4 -setFontUndeleteFlag__11J2DTevBlockFv = .text:0x802F38CC; // type:function size:0x4 scope:global align:4 +__ct__14J2DIndTevStageFv = .text:0x802F26A0; // type:function size:0x94 scope:weak align:4 +__ct__19J2DTevSwapModeTableFv = .text:0x802F2734; // type:function size:0xC scope:weak align:4 +__ct__11J2DTevStageFv = .text:0x802F2740; // type:function size:0x68 scope:weak align:4 +setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F27A8; // type:function size:0x1C8 scope:weak align:4 +__ct__11J2DTevOrderFv = .text:0x802F2970; // type:function size:0x20 scope:weak align:4 +__ct__13J2DGXColorS10Fv = .text:0x802F2990; // type:function size:0x4 scope:weak align:4 +getType__15J2DIndBlockFullFv = .text:0x802F2994; // type:function size:0xC scope:weak align:4 +setIndTexStageNum__15J2DIndBlockFullFUc = .text:0x802F29A0; // type:function size:0x8 scope:weak align:4 +getIndTexStageNum__15J2DIndBlockFullCFv = .text:0x802F29A8; // type:function size:0x8 scope:weak align:4 +setIndTexOrder__15J2DIndBlockFullFUl14J2DIndTexOrder = .text:0x802F29B0; // type:function size:0x1C scope:weak align:4 +getIndTexOrder__15J2DIndBlockFullFUl = .text:0x802F29CC; // type:function size:0x14 scope:weak align:4 +setIndTexMtx__15J2DIndBlockFullFUl12J2DIndTexMtx = .text:0x802F29E0; // type:function size:0x58 scope:weak align:4 +getIndTexMtx__15J2DIndBlockFullFUl = .text:0x802F2A38; // type:function size:0x14 scope:weak align:4 +setIndTexCoordScale__15J2DIndBlockFullFUl19J2DIndTexCoordScale = .text:0x802F2A4C; // type:function size:0x1C scope:weak align:4 +getIndTexCoordScale__15J2DIndBlockFullFUl = .text:0x802F2A68; // type:function size:0x14 scope:weak align:4 +__dt__15J2DIndBlockFullFv = .text:0x802F2A7C; // type:function size:0x9C scope:weak align:4 +getType__13J2DTevBlock16Fv = .text:0x802F2B18; // type:function size:0xC scope:weak align:4 +getMaxStage__13J2DTevBlock16Fv = .text:0x802F2B24; // type:function size:0x8 scope:weak align:4 +setTexNo__13J2DTevBlock16FUlUs = .text:0x802F2B2C; // type:function size:0x10 scope:weak align:4 +getTexNo__13J2DTevBlock16CFUl = .text:0x802F2B3C; // type:function size:0x10 scope:weak align:4 +setFontNo__13J2DTevBlock16FUs = .text:0x802F2B4C; // type:function size:0x8 scope:weak align:4 +getFontNo__13J2DTevBlock16CFv = .text:0x802F2B54; // type:function size:0x8 scope:weak align:4 +setTevOrder__13J2DTevBlock16FUl11J2DTevOrder = .text:0x802F2B5C; // type:function size:0x24 scope:weak align:4 +getTevOrder__13J2DTevBlock16FUl = .text:0x802F2B80; // type:function size:0x14 scope:weak align:4 +setTevColor__13J2DTevBlock16FUl13J2DGXColorS10 = .text:0x802F2B94; // type:function size:0x2C scope:weak align:4 +getTevColor__13J2DTevBlock16FUl = .text:0x802F2BC0; // type:function size:0x14 scope:weak align:4 +setTevKColor__13J2DTevBlock16FUlQ28JUtility6TColor = .text:0x802F2BD4; // type:function size:0x2C scope:weak align:4 +getTevKColor__13J2DTevBlock16FUl = .text:0x802F2C00; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__13J2DTevBlock16FUlUc = .text:0x802F2C14; // type:function size:0xC scope:weak align:4 +getTevKColorSel__13J2DTevBlock16FUl = .text:0x802F2C20; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__13J2DTevBlock16FUlUc = .text:0x802F2C2C; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__13J2DTevBlock16FUl = .text:0x802F2C38; // type:function size:0xC scope:weak align:4 +setTevStageNum__13J2DTevBlock16FUc = .text:0x802F2C44; // type:function size:0x8 scope:weak align:4 +getTevStageNum__13J2DTevBlock16CFv = .text:0x802F2C4C; // type:function size:0x8 scope:weak align:4 +setTevStage__13J2DTevBlock16FUl11J2DTevStage = .text:0x802F2C54; // type:function size:0x3C scope:weak align:4 +getTevStage__13J2DTevBlock16FUl = .text:0x802F2C90; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__13J2DTevBlock16FUl18J2DTevSwapModeInfo = .text:0x802F2CA4; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__13J2DTevBlock16FUl19J2DTevSwapModeTable = .text:0x802F2CDC; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__13J2DTevBlock16FUl = .text:0x802F2CEC; // type:function size:0x10 scope:weak align:4 +setIndTevStage__13J2DTevBlock16FUl14J2DIndTevStage = .text:0x802F2CFC; // type:function size:0x14 scope:weak align:4 +getIndTevStage__13J2DTevBlock16FUl = .text:0x802F2D10; // type:function size:0x14 scope:weak align:4 +insertTexture__13J2DTevBlock16FUlPC7ResTIMG = .text:0x802F2D24; // type:function size:0x30 scope:weak align:4 +getTexture__13J2DTevBlock16FUl = .text:0x802F2D54; // type:function size:0x20 scope:weak align:4 +getPalette__13J2DTevBlock16FUl = .text:0x802F2D74; // type:function size:0x20 scope:weak align:4 +getFont__13J2DTevBlock16Fv = .text:0x802F2D94; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__13J2DTevBlock16FUc = .text:0x802F2D9C; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__13J2DTevBlock16Fv = .text:0x802F2DAC; // type:function size:0xC scope:weak align:4 +getType__12J2DTevBlock8Fv = .text:0x802F2DB8; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock8Fv = .text:0x802F2DC4; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock8FUlUs = .text:0x802F2DCC; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock8CFUl = .text:0x802F2DDC; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock8FUs = .text:0x802F2DEC; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock8CFv = .text:0x802F2DF4; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock8FUl11J2DTevOrder = .text:0x802F2DFC; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock8FUl = .text:0x802F2E20; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock8FUl13J2DGXColorS10 = .text:0x802F2E34; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock8FUl = .text:0x802F2E60; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock8FUlQ28JUtility6TColor = .text:0x802F2E74; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock8FUl = .text:0x802F2EA0; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock8FUlUc = .text:0x802F2EB4; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock8FUl = .text:0x802F2EC0; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock8FUlUc = .text:0x802F2ECC; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock8FUl = .text:0x802F2ED8; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock8FUc = .text:0x802F2EE4; // type:function size:0x8 scope:weak align:4 +getTevStageNum__12J2DTevBlock8CFv = .text:0x802F2EEC; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock8FUl11J2DTevStage = .text:0x802F2EF4; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock8FUl = .text:0x802F2F30; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock8FUl18J2DTevSwapModeInfo = .text:0x802F2F44; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock8FUl19J2DTevSwapModeTable = .text:0x802F2F7C; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock8FUl = .text:0x802F2F8C; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock8FUl14J2DIndTevStage = .text:0x802F2F9C; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock8FUl = .text:0x802F2FB0; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock8FUlPC7ResTIMG = .text:0x802F2FC4; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock8FUl = .text:0x802F2FF4; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock8FUl = .text:0x802F3014; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock8Fv = .text:0x802F3034; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock8FUc = .text:0x802F303C; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock8Fv = .text:0x802F304C; // type:function size:0xC scope:weak align:4 +getType__12J2DTevBlock4Fv = .text:0x802F3058; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock4Fv = .text:0x802F3064; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock4FUlUs = .text:0x802F306C; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock4CFUl = .text:0x802F307C; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock4FUs = .text:0x802F308C; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock4CFv = .text:0x802F3094; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock4FUl11J2DTevOrder = .text:0x802F309C; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock4FUl = .text:0x802F30C0; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock4FUl13J2DGXColorS10 = .text:0x802F30D4; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock4FUl = .text:0x802F3100; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock4FUlQ28JUtility6TColor = .text:0x802F3114; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock4FUl = .text:0x802F3140; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock4FUlUc = .text:0x802F3154; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock4FUl = .text:0x802F3160; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock4FUlUc = .text:0x802F316C; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock4FUl = .text:0x802F3178; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock4FUc = .text:0x802F3184; // type:function size:0x8 scope:weak align:4 +getTevStageNum__12J2DTevBlock4CFv = .text:0x802F318C; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock4FUl11J2DTevStage = .text:0x802F3194; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock4FUl = .text:0x802F31D0; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock4FUl18J2DTevSwapModeInfo = .text:0x802F31E4; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock4FUl19J2DTevSwapModeTable = .text:0x802F321C; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock4FUl = .text:0x802F322C; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock4FUl14J2DIndTevStage = .text:0x802F323C; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock4FUl = .text:0x802F3250; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock4FUlPC7ResTIMG = .text:0x802F3264; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock4FUl = .text:0x802F3294; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock4FUl = .text:0x802F32B4; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock4Fv = .text:0x802F32D4; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock4FUc = .text:0x802F32DC; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock4Fv = .text:0x802F32EC; // type:function size:0x10 scope:weak align:4 +getType__12J2DTevBlock2Fv = .text:0x802F32FC; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock2Fv = .text:0x802F3308; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock2FUlUs = .text:0x802F3310; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock2CFUl = .text:0x802F3320; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock2FUs = .text:0x802F3330; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock2CFv = .text:0x802F3338; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock2FUl11J2DTevOrder = .text:0x802F3340; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock2FUl = .text:0x802F3364; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock2FUl13J2DGXColorS10 = .text:0x802F3378; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock2FUl = .text:0x802F33A4; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock2FUlQ28JUtility6TColor = .text:0x802F33B8; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock2FUl = .text:0x802F33E4; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock2FUlUc = .text:0x802F33F8; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock2FUl = .text:0x802F3404; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock2FUlUc = .text:0x802F3410; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock2FUl = .text:0x802F341C; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock2FUc = .text:0x802F3428; // type:function size:0x8 scope:weak align:4 +getTevStageNum__12J2DTevBlock2CFv = .text:0x802F3430; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock2FUl11J2DTevStage = .text:0x802F3438; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock2FUl = .text:0x802F3474; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock2FUl18J2DTevSwapModeInfo = .text:0x802F3488; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock2FUl19J2DTevSwapModeTable = .text:0x802F34C0; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock2FUl = .text:0x802F34D0; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock2FUl14J2DIndTevStage = .text:0x802F34E0; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock2FUl = .text:0x802F34F4; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock2FUlPC7ResTIMG = .text:0x802F3508; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock2FUl = .text:0x802F3538; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock2FUl = .text:0x802F3558; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock2Fv = .text:0x802F3578; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock2FUc = .text:0x802F3580; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock2Fv = .text:0x802F3590; // type:function size:0x10 scope:weak align:4 +getType__12J2DTevBlock1Fv = .text:0x802F35A0; // type:function size:0xC scope:weak align:4 +getMaxStage__12J2DTevBlock1Fv = .text:0x802F35AC; // type:function size:0x8 scope:weak align:4 +setTexNo__12J2DTevBlock1FUlUs = .text:0x802F35B4; // type:function size:0x10 scope:weak align:4 +getTexNo__12J2DTevBlock1CFUl = .text:0x802F35C4; // type:function size:0x10 scope:weak align:4 +setFontNo__12J2DTevBlock1FUs = .text:0x802F35D4; // type:function size:0x8 scope:weak align:4 +getFontNo__12J2DTevBlock1CFv = .text:0x802F35DC; // type:function size:0x8 scope:weak align:4 +setTevOrder__12J2DTevBlock1FUl11J2DTevOrder = .text:0x802F35E4; // type:function size:0x24 scope:weak align:4 +getTevOrder__12J2DTevBlock1FUl = .text:0x802F3608; // type:function size:0x14 scope:weak align:4 +setTevColor__12J2DTevBlock1FUl13J2DGXColorS10 = .text:0x802F361C; // type:function size:0x2C scope:weak align:4 +getTevColor__12J2DTevBlock1FUl = .text:0x802F3648; // type:function size:0x14 scope:weak align:4 +setTevKColor__12J2DTevBlock1FUlQ28JUtility6TColor = .text:0x802F365C; // type:function size:0x2C scope:weak align:4 +getTevKColor__12J2DTevBlock1FUl = .text:0x802F3688; // type:function size:0x14 scope:weak align:4 +setTevKColorSel__12J2DTevBlock1FUlUc = .text:0x802F369C; // type:function size:0xC scope:weak align:4 +getTevKColorSel__12J2DTevBlock1FUl = .text:0x802F36A8; // type:function size:0xC scope:weak align:4 +setTevKAlphaSel__12J2DTevBlock1FUlUc = .text:0x802F36B4; // type:function size:0xC scope:weak align:4 +getTevKAlphaSel__12J2DTevBlock1FUl = .text:0x802F36C0; // type:function size:0xC scope:weak align:4 +setTevStageNum__12J2DTevBlock1FUc = .text:0x802F36CC; // type:function size:0x4 scope:weak align:4 +getTevStageNum__12J2DTevBlock1CFv = .text:0x802F36D0; // type:function size:0x8 scope:weak align:4 +setTevStage__12J2DTevBlock1FUl11J2DTevStage = .text:0x802F36D8; // type:function size:0x3C scope:weak align:4 +getTevStage__12J2DTevBlock1FUl = .text:0x802F3714; // type:function size:0x14 scope:weak align:4 +setTevSwapModeInfo__12J2DTevBlock1FUl18J2DTevSwapModeInfo = .text:0x802F3728; // type:function size:0x38 scope:weak align:4 +setTevSwapModeTable__12J2DTevBlock1FUl19J2DTevSwapModeTable = .text:0x802F3760; // type:function size:0x10 scope:weak align:4 +getTevSwapModeTable__12J2DTevBlock1FUl = .text:0x802F3770; // type:function size:0x10 scope:weak align:4 +setIndTevStage__12J2DTevBlock1FUl14J2DIndTevStage = .text:0x802F3780; // type:function size:0x14 scope:weak align:4 +getIndTevStage__12J2DTevBlock1FUl = .text:0x802F3794; // type:function size:0x14 scope:weak align:4 +insertTexture__12J2DTevBlock1FUlPC7ResTIMG = .text:0x802F37A8; // type:function size:0x30 scope:weak align:4 +getTexture__12J2DTevBlock1FUl = .text:0x802F37D8; // type:function size:0x20 scope:weak align:4 +getPalette__12J2DTevBlock1FUl = .text:0x802F37F8; // type:function size:0x20 scope:weak align:4 +getFont__12J2DTevBlock1Fv = .text:0x802F3818; // type:function size:0x8 scope:weak align:4 +setUndeleteFlag__12J2DTevBlock1FUc = .text:0x802F3820; // type:function size:0x10 scope:weak align:4 +setFontUndeleteFlag__12J2DTevBlock1Fv = .text:0x802F3830; // type:function size:0x10 scope:weak align:4 +initialize__11J2DTevBlockFv = .text:0x802F3840; // type:function size:0x4 scope:weak align:4 +loadTexture__11J2DTevBlockF11_GXTexMapIDUl = .text:0x802F3844; // type:function size:0x4 scope:weak align:4 +setFontNo__11J2DTevBlockFUs = .text:0x802F3848; // type:function size:0x4 scope:weak align:4 +setTevOrder__11J2DTevBlockFUl11J2DTevOrder = .text:0x802F384C; // type:function size:0x4 scope:weak align:4 +setTevKColorSel__11J2DTevBlockFUlUc = .text:0x802F3850; // type:function size:0x4 scope:weak align:4 +setTevKAlphaSel__11J2DTevBlockFUlUc = .text:0x802F3854; // type:function size:0x4 scope:weak align:4 +setTevStageNum__11J2DTevBlockFUc = .text:0x802F3858; // type:function size:0x4 scope:weak align:4 +setTevStage__11J2DTevBlockFUl11J2DTevStage = .text:0x802F385C; // type:function size:0x4 scope:weak align:4 +setTevSwapModeInfo__11J2DTevBlockFUl18J2DTevSwapModeInfo = .text:0x802F3860; // type:function size:0x4 scope:weak align:4 +setTevSwapModeTable__11J2DTevBlockFUl19J2DTevSwapModeTable = .text:0x802F3864; // type:function size:0x4 scope:weak align:4 +setIndTevStage__11J2DTevBlockFUl14J2DIndTevStage = .text:0x802F3868; // type:function size:0x4 scope:weak align:4 +insertTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F386C; // type:function size:0x8 scope:weak align:4 +insertTexture__11J2DTevBlockFUlPC7ResTIMGP10JUTPalette = .text:0x802F3874; // type:function size:0x8 scope:weak align:4 +insertTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F387C; // type:function size:0x8 scope:weak align:4 +setTexture__11J2DTevBlockFUlP10JUTTexture = .text:0x802F3884; // type:function size:0x8 scope:weak align:4 +setTexture__11J2DTevBlockFUlPC7ResTIMG = .text:0x802F388C; // type:function size:0x8 scope:weak align:4 +removeTexture__11J2DTevBlockFUl = .text:0x802F3894; // type:function size:0x8 scope:weak align:4 +setFont__11J2DTevBlockFP7JUTFont = .text:0x802F389C; // type:function size:0x8 scope:weak align:4 +setFont__11J2DTevBlockFP7ResFONT = .text:0x802F38A4; // type:function size:0x8 scope:weak align:4 +setPalette__11J2DTevBlockFUlPC7ResTLUT = .text:0x802F38AC; // type:function size:0x8 scope:weak align:4 +prepareTexture__11J2DTevBlockFUc = .text:0x802F38B4; // type:function size:0x8 scope:weak align:4 +getFont__11J2DTevBlockFv = .text:0x802F38BC; // type:function size:0x8 scope:weak align:4 +shiftDeleteFlag__11J2DTevBlockFUcb = .text:0x802F38C4; // type:function size:0x4 scope:weak align:4 +setUndeleteFlag__11J2DTevBlockFUc = .text:0x802F38C8; // type:function size:0x4 scope:weak align:4 +setFontUndeleteFlag__11J2DTevBlockFv = .text:0x802F38CC; // type:function size:0x4 scope:weak align:4 __ct__18J2DMaterialFactoryFRC16J2DMaterialBlock = .text:0x802F38D0; // type:function size:0x1C4 scope:global align:4 countStages__18J2DMaterialFactoryCFi = .text:0x802F3A94; // type:function size:0x88 scope:global align:4 create__18J2DMaterialFactoryCFP11J2DMaterialiUlP15J2DResReferenceP15J2DResReferenceP10JKRArchive = .text:0x802F3B1C; // type:function size:0x910 scope:global align:4 @@ -13691,23 +13691,23 @@ newIndTexCoordScale__18J2DMaterialFactoryCFii = .text:0x802F4D78; // type:functi newAlphaComp__18J2DMaterialFactoryCFi = .text:0x802F4DE0; // type:function size:0x7C scope:global align:4 newBlend__18J2DMaterialFactoryCFi = .text:0x802F4E5C; // type:function size:0x7C scope:global align:4 newDither__18J2DMaterialFactoryCFi = .text:0x802F4ED8; // type:function size:0x38 scope:global align:4 -__ct__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F4F10; // type:function size:0x60 scope:global align:4 -JSUConvertOffsetToPtr<12J2DBlendInfo>__FPCvPCv = .text:0x802F4F70; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J2DAlphaCompInfo>__FPCvPCv = .text:0x802F4F88; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J2DTevSwapModeTableInfo>__FPCvPCv = .text:0x802F4FA0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J2DTevSwapModeInfo>__FPCvPCv = .text:0x802F4FB8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J2DTevStageInfo>__FPCvPCv = .text:0x802F4FD0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<11_GXColorS10>__FPCvPCv = .text:0x802F4FE8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J2DTevOrderInfo>__FPCvPCv = .text:0x802F5000; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<13J2DTexMtxInfo>__FPCvPCv = .text:0x802F5018; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J2DTexCoordInfo>__FPCvPCv = .text:0x802F5030; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J2DColorChanInfo>__FPCvPCv = .text:0x802F5048; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F5060; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<8_GXColor>__FPCvPCv = .text:0x802F5078; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<11_GXCullMode>__FPCvPCv = .text:0x802F5090; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<14J2DIndInitData>__FPCvPCv = .text:0x802F50A8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F50C0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J2DMaterialInitData>__FPCvPCv = .text:0x802F50D8; // type:function size:0x18 scope:global align:4 +__ct__11J2DTevStageFRC15J2DTevStageInfo = .text:0x802F4F10; // type:function size:0x60 scope:weak align:4 +JSUConvertOffsetToPtr<12J2DBlendInfo>__FPCvPCv = .text:0x802F4F70; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J2DAlphaCompInfo>__FPCvPCv = .text:0x802F4F88; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J2DTevSwapModeTableInfo>__FPCvPCv = .text:0x802F4FA0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J2DTevSwapModeInfo>__FPCvPCv = .text:0x802F4FB8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J2DTevStageInfo>__FPCvPCv = .text:0x802F4FD0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<11_GXColorS10>__FPCvPCv = .text:0x802F4FE8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J2DTevOrderInfo>__FPCvPCv = .text:0x802F5000; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<13J2DTexMtxInfo>__FPCvPCv = .text:0x802F5018; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J2DTexCoordInfo>__FPCvPCv = .text:0x802F5030; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J2DColorChanInfo>__FPCvPCv = .text:0x802F5048; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F5060; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<8_GXColor>__FPCvPCv = .text:0x802F5078; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<11_GXCullMode>__FPCvPCv = .text:0x802F5090; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<14J2DIndInitData>__FPCvPCv = .text:0x802F50A8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x802F50C0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J2DMaterialInitData>__FPCvPCv = .text:0x802F50D8; // type:function size:0x18 scope:weak align:4 J2DPrint_print_alpha_va = .text:0x802F50F0; // type:function size:0xA4 scope:global align:4 __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor = .text:0x802F5194; // type:function size:0x8C scope:global align:4 __dt__8J2DPrintFv = .text:0x802F5220; // type:function size:0x48 scope:global align:4 @@ -13875,26 +13875,26 @@ setTexCoord__10J2DPictureFPQ29JGeometry8TVec2PC10JUTTexture10J2DBinding9J2DMi isUsed__10J2DPictureFPC7ResTIMG = .text:0x802FFE9C; // type:function size:0x64 scope:global align:4 getUsableTlut__10J2DPictureFUc = .text:0x802FFF00; // type:function size:0xD0 scope:global align:4 getTlutID__10J2DPictureFPC7ResTIMGUc = .text:0x802FFFD0; // type:function size:0x34 scope:global align:4 -__ct__Q29JGeometry8TVec2Fv = .text:0x80300004; // type:function size:0x4 scope:global align:4 -append__10J2DPictureFP10JUTTexturef = .text:0x80300008; // type:function size:0x30 scope:global align:4 -append__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x80300038; // type:function size:0x30 scope:global align:4 -load__10J2DPictureFUc = .text:0x80300068; // type:function size:0x34 scope:global align:4 -load__10J2DPictureF11_GXTexMapIDUc = .text:0x8030009C; // type:function size:0x4C scope:global align:4 -getTypeID__10J2DPictureCFv = .text:0x803000E8; // type:function size:0x8 scope:global align:4 -append__10J2DPictureFPCcP10JUTPalettef = .text:0x803000F0; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFP10JUTTexturef = .text:0x80300120; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPCcP10JUTPalettef = .text:0x80300150; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPCcf = .text:0x80300180; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x803001B0; // type:function size:0x30 scope:global align:4 -prepend__10J2DPictureFPC7ResTIMGf = .text:0x803001E0; // type:function size:0x30 scope:global align:4 -remove__10J2DPictureFv = .text:0x80300210; // type:function size:0x38 scope:global align:4 -draw__10J2DPictureFffUcbbb = .text:0x80300248; // type:function size:0x98 scope:global align:4 -draw__10J2DPictureFffbbb = .text:0x803002E0; // type:function size:0x44 scope:global align:4 -drawOut__10J2DPictureFffffffff = .text:0x80300324; // type:function size:0x64 scope:global align:4 -drawOut__10J2DPictureFffffff = .text:0x80300388; // type:function size:0xAC scope:global align:4 -getTextureCount__10J2DPictureCFv = .text:0x80300434; // type:function size:0x8 scope:global align:4 -isUsed__10J2DPictureFPC7ResFONT = .text:0x8030043C; // type:function size:0x20 scope:global align:4 -rewriteAlpha__10J2DPictureFv = .text:0x8030045C; // type:function size:0x4 scope:global align:4 +__ct__Q29JGeometry8TVec2Fv = .text:0x80300004; // type:function size:0x4 scope:weak align:4 +append__10J2DPictureFP10JUTTexturef = .text:0x80300008; // type:function size:0x30 scope:weak align:4 +append__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x80300038; // type:function size:0x30 scope:weak align:4 +load__10J2DPictureFUc = .text:0x80300068; // type:function size:0x34 scope:weak align:4 +load__10J2DPictureF11_GXTexMapIDUc = .text:0x8030009C; // type:function size:0x4C scope:weak align:4 +getTypeID__10J2DPictureCFv = .text:0x803000E8; // type:function size:0x8 scope:weak align:4 +append__10J2DPictureFPCcP10JUTPalettef = .text:0x803000F0; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFP10JUTTexturef = .text:0x80300120; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPCcP10JUTPalettef = .text:0x80300150; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPCcf = .text:0x80300180; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPC7ResTIMGP10JUTPalettef = .text:0x803001B0; // type:function size:0x30 scope:weak align:4 +prepend__10J2DPictureFPC7ResTIMGf = .text:0x803001E0; // type:function size:0x30 scope:weak align:4 +remove__10J2DPictureFv = .text:0x80300210; // type:function size:0x38 scope:weak align:4 +draw__10J2DPictureFffUcbbb = .text:0x80300248; // type:function size:0x98 scope:weak align:4 +draw__10J2DPictureFffbbb = .text:0x803002E0; // type:function size:0x44 scope:weak align:4 +drawOut__10J2DPictureFffffffff = .text:0x80300324; // type:function size:0x64 scope:weak align:4 +drawOut__10J2DPictureFffffff = .text:0x80300388; // type:function size:0xAC scope:weak align:4 +getTextureCount__10J2DPictureCFv = .text:0x80300434; // type:function size:0x8 scope:weak align:4 +isUsed__10J2DPictureFPC7ResFONT = .text:0x8030043C; // type:function size:0x20 scope:weak align:4 +rewriteAlpha__10J2DPictureFv = .text:0x8030045C; // type:function size:0x4 scope:weak align:4 __ct__10J2DTextBoxFv = .text:0x80300460; // type:function size:0x78 scope:global align:4 __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive = .text:0x803004D8; // type:function size:0x84 scope:global align:4 __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial = .text:0x8030055C; // type:function size:0x468 scope:global align:4 @@ -13956,7 +13956,7 @@ draw__11J2DWindowExFffff = .text:0x80304368; // type:function size:0x58 scope:gl setCullBack__11J2DWindowExFb = .text:0x803043C0; // type:function size:0x3C scope:global align:4 isUsed__11J2DWindowExFPC7ResFONT = .text:0x803043FC; // type:function size:0x20 scope:global align:4 setAnimation__11J2DWindowExFP10J2DAnmBase = .text:0x8030441C; // type:function size:0x20 scope:global align:4 -getColor__14J2DAnmVtxColorCFUcUsP8_GXColor = .text:0x8030443C; // type:function size:0x4 scope:global align:4 +getColor__14J2DAnmVtxColorCFUcUsP8_GXColor = .text:0x8030443C; // type:function size:0x4 scope:weak align:4 initiate__12J2DPictureExFPC7ResTIMGPC7ResTLUT = .text:0x80304440; // type:function size:0xAC scope:global align:4 __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial = .text:0x803044EC; // type:function size:0x250 scope:global align:4 __dt__12J2DPictureExFv = .text:0x8030473C; // type:function size:0x90 scope:global align:4 @@ -14090,22 +14090,22 @@ readAnmVisibility__20J2DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData = .text:0 setAnmVisibility__20J2DAnmFullLoader_v15FP20J2DAnmVisibilityFullPC24J3DAnmVisibilityFullData = .text:0x8030AFB8; // type:function size:0x7C scope:global align:4 readAnmVtxColor__20J2DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData = .text:0x8030B034; // type:function size:0x28 scope:global align:4 setAnmVtxColor__20J2DAnmFullLoader_v15FP18J2DAnmVtxColorFullPC22J3DAnmVtxColorFullData = .text:0x8030B05C; // type:function size:0xFC scope:global align:4 -__dt__14J2DAnmVtxColorFv = .text:0x8030B158; // type:function size:0x5C scope:global align:4 -__dt__20J2DAnmVisibilityFullFv = .text:0x8030B1B4; // type:function size:0x5C scope:global align:4 -__dt__12J2DAnmLoaderFv = .text:0x8030B210; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<25J3DAnmVisibilityFullTable>__FPCvPCv = .text:0x8030B258; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DAnmKRegKeyTable>__FPCvPCv = .text:0x8030B270; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DAnmCRegKeyTable>__FPCvPCv = .text:0x8030B288; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<25J3DAnmTexPatternFullTable>__FPCvPCv = .text:0x8030B2A0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<20J3DAnmColorFullTable>__FPCvPCv = .text:0x8030B2B8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<24J3DAnmTransformFullTable>__FPCvPCv = .text:0x8030B2D0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J3DAnmVtxColorIndexData>__FPCvPCv = .text:0x8030B2E8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J3DAnmColorKeyTable>__FPCvPCv = .text:0x8030B300; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<3Vec>__FPCvPCv = .text:0x8030B318; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<7ResNTAB>__FPCvPCv = .text:0x8030B330; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030B348; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030B360; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J3DAnmTransformKeyTable>__FPCvPCv = .text:0x8030B378; // type:function size:0x18 scope:global align:4 +__dt__14J2DAnmVtxColorFv = .text:0x8030B158; // type:function size:0x5C scope:weak align:4 +__dt__20J2DAnmVisibilityFullFv = .text:0x8030B1B4; // type:function size:0x5C scope:weak align:4 +__dt__12J2DAnmLoaderFv = .text:0x8030B210; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<25J3DAnmVisibilityFullTable>__FPCvPCv = .text:0x8030B258; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DAnmKRegKeyTable>__FPCvPCv = .text:0x8030B270; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DAnmCRegKeyTable>__FPCvPCv = .text:0x8030B288; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<25J3DAnmTexPatternFullTable>__FPCvPCv = .text:0x8030B2A0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<20J3DAnmColorFullTable>__FPCvPCv = .text:0x8030B2B8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<24J3DAnmTransformFullTable>__FPCvPCv = .text:0x8030B2D0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J3DAnmVtxColorIndexData>__FPCvPCv = .text:0x8030B2E8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J3DAnmColorKeyTable>__FPCvPCv = .text:0x8030B300; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<3Vec>__FPCvPCv = .text:0x8030B318; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<7ResNTAB>__FPCvPCv = .text:0x8030B330; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030B348; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x8030B360; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J3DAnmTransformKeyTable>__FPCvPCv = .text:0x8030B378; // type:function size:0x18 scope:weak align:4 getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo = .text:0x8030B390; // type:function size:0x56C scope:global align:4 calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo = .text:0x8030B8FC; // type:function size:0x428 scope:global align:4 searchUpdateMaterialID__11J2DAnmColorFP9J2DScreen = .text:0x8030BD24; // type:function size:0xA4 scope:global align:4 @@ -14123,16 +14123,16 @@ getVisibility__20J2DAnmVisibilityFullCFUsPUc = .text:0x8030CE48; // type:functio getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10 = .text:0x8030CEF0; // type:function size:0x2C4 scope:global align:4 getTevKonstReg__15J2DAnmTevRegKeyCFUsP8_GXColor = .text:0x8030D1B4; // type:function size:0x2C4 scope:global align:4 searchUpdateMaterialID__15J2DAnmTevRegKeyFP9J2DScreen = .text:0x8030D478; // type:function size:0x104 scope:global align:4 -J2DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs = .text:0x8030D57C; // type:function size:0x234 scope:global align:4 -J2DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf = .text:0x8030D7B0; // type:function size:0x17C scope:global align:4 +J2DGetKeyFrameInterpolations__FfP18J3DAnmKeyTableBasePs = .text:0x8030D57C; // type:function size:0x234 scope:global align:4 +J2DGetKeyFrameInterpolationf__FfP18J3DAnmKeyTableBasePf = .text:0x8030D7B0; // type:function size:0x17C scope:global align:4 __ct__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv = .text:0x8030D92C; // type:function size:0x10 scope:global align:4 __dt__Q216J2DAnmTexPattern27J2DAnmTexPatternTIMGPointerFv = .text:0x8030D93C; // type:function size:0x54 scope:global align:4 -__dt__16J2DAnmTexPatternFv = .text:0x8030D990; // type:function size:0x90 scope:global align:4 -__dt__17J2DAnmVtxColorKeyFv = .text:0x8030DA20; // type:function size:0x6C scope:global align:4 -__dt__18J2DAnmVtxColorFullFv = .text:0x8030DA8C; // type:function size:0x6C scope:global align:4 -__dt__15J2DAnmColorFullFv = .text:0x8030DAF8; // type:function size:0x84 scope:global align:4 -getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8030DB7C; // type:function size:0x30 scope:global align:4 -__dt__19J2DAnmTransformFullFv = .text:0x8030DBAC; // type:function size:0x6C scope:global align:4 +__dt__16J2DAnmTexPatternFv = .text:0x8030D990; // type:function size:0x90 scope:weak align:4 +__dt__17J2DAnmVtxColorKeyFv = .text:0x8030DA20; // type:function size:0x6C scope:weak align:4 +__dt__18J2DAnmVtxColorFullFv = .text:0x8030DA8C; // type:function size:0x6C scope:weak align:4 +__dt__15J2DAnmColorFullFv = .text:0x8030DAF8; // type:function size:0x84 scope:weak align:4 +getTransform__18J2DAnmTransformKeyCFUsP16J3DTransformInfo = .text:0x8030DB7C; // type:function size:0x30 scope:weak align:4 +__dt__19J2DAnmTransformFullFv = .text:0x8030DBAC; // type:function size:0x6C scope:weak align:4 get__13J2DDataManageFPCc = .text:0x8030DC18; // type:function size:0x64 scope:global align:4 get__13J2DDataManageFP14JSUInputStream = .text:0x8030DC7C; // type:function size:0x94 scope:global align:4 getResReference__15J2DResReferenceCFUs = .text:0x8030DD10; // type:function size:0x34 scope:global align:4 @@ -14264,25 +14264,25 @@ load__26J3DShapeMtxMultiConcatViewCFv = .text:0x80314DA4; // type:function size: loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUsPA4_f = .text:0x80314F9C; // type:function size:0x138 scope:global align:4 load__27J3DShapeMtxBBoardConcatViewCFv = .text:0x803150D4; // type:function size:0x110 scope:global align:4 load__28J3DShapeMtxYBBoardConcatViewCFv = .text:0x803151E4; // type:function size:0x13C scope:global align:4 -__dt__28J3DShapeMtxYBBoardConcatViewFv = .text:0x80315320; // type:function size:0x6C scope:global align:4 -getType__28J3DShapeMtxYBBoardConcatViewCFv = .text:0x8031538C; // type:function size:0xC scope:global align:4 -loadNrmMtx__21J3DShapeMtxConcatViewCFiUs = .text:0x80315398; // type:function size:0x4 scope:global align:4 -getUseMtxIndex__11J3DShapeMtxCFUs = .text:0x8031539C; // type:function size:0x8 scope:global align:4 -__dt__27J3DShapeMtxBBoardConcatViewFv = .text:0x803153A4; // type:function size:0x6C scope:global align:4 -getType__27J3DShapeMtxBBoardConcatViewCFv = .text:0x80315410; // type:function size:0xC scope:global align:4 -__dt__26J3DShapeMtxMultiConcatViewFv = .text:0x8031541C; // type:function size:0x6C scope:global align:4 -getType__26J3DShapeMtxMultiConcatViewCFv = .text:0x80315488; // type:function size:0xC scope:global align:4 -getUseMtxNum__26J3DShapeMtxMultiConcatViewCFv = .text:0x80315494; // type:function size:0x8 scope:global align:4 -getUseMtxIndex__26J3DShapeMtxMultiConcatViewCFUs = .text:0x8031549C; // type:function size:0x10 scope:global align:4 -loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUs = .text:0x803154AC; // type:function size:0x4 scope:global align:4 -__dt__16J3DShapeMtxMultiFv = .text:0x803154B0; // type:function size:0x5C scope:global align:4 -getType__16J3DShapeMtxMultiCFv = .text:0x8031550C; // type:function size:0xC scope:global align:4 -getUseMtxNum__16J3DShapeMtxMultiCFv = .text:0x80315518; // type:function size:0x8 scope:global align:4 -getUseMtxIndex__16J3DShapeMtxMultiCFUs = .text:0x80315520; // type:function size:0x10 scope:global align:4 -__dt__21J3DShapeMtxConcatViewFv = .text:0x80315530; // type:function size:0x5C scope:global align:4 -getType__21J3DShapeMtxConcatViewCFv = .text:0x8031558C; // type:function size:0xC scope:global align:4 -__dt__11J3DShapeMtxFv = .text:0x80315598; // type:function size:0x48 scope:global align:4 -getType__11J3DShapeMtxCFv = .text:0x803155E0; // type:function size:0xC scope:global align:4 +__dt__28J3DShapeMtxYBBoardConcatViewFv = .text:0x80315320; // type:function size:0x6C scope:weak align:4 +getType__28J3DShapeMtxYBBoardConcatViewCFv = .text:0x8031538C; // type:function size:0xC scope:weak align:4 +loadNrmMtx__21J3DShapeMtxConcatViewCFiUs = .text:0x80315398; // type:function size:0x4 scope:weak align:4 +getUseMtxIndex__11J3DShapeMtxCFUs = .text:0x8031539C; // type:function size:0x8 scope:weak align:4 +__dt__27J3DShapeMtxBBoardConcatViewFv = .text:0x803153A4; // type:function size:0x6C scope:weak align:4 +getType__27J3DShapeMtxBBoardConcatViewCFv = .text:0x80315410; // type:function size:0xC scope:weak align:4 +__dt__26J3DShapeMtxMultiConcatViewFv = .text:0x8031541C; // type:function size:0x6C scope:weak align:4 +getType__26J3DShapeMtxMultiConcatViewCFv = .text:0x80315488; // type:function size:0xC scope:weak align:4 +getUseMtxNum__26J3DShapeMtxMultiConcatViewCFv = .text:0x80315494; // type:function size:0x8 scope:weak align:4 +getUseMtxIndex__26J3DShapeMtxMultiConcatViewCFUs = .text:0x8031549C; // type:function size:0x10 scope:weak align:4 +loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUs = .text:0x803154AC; // type:function size:0x4 scope:weak align:4 +__dt__16J3DShapeMtxMultiFv = .text:0x803154B0; // type:function size:0x5C scope:weak align:4 +getType__16J3DShapeMtxMultiCFv = .text:0x8031550C; // type:function size:0xC scope:weak align:4 +getUseMtxNum__16J3DShapeMtxMultiCFv = .text:0x80315518; // type:function size:0x8 scope:weak align:4 +getUseMtxIndex__16J3DShapeMtxMultiCFUs = .text:0x80315520; // type:function size:0x10 scope:weak align:4 +__dt__21J3DShapeMtxConcatViewFv = .text:0x80315530; // type:function size:0x5C scope:weak align:4 +getType__21J3DShapeMtxConcatViewCFv = .text:0x8031558C; // type:function size:0xC scope:weak align:4 +__dt__11J3DShapeMtxFv = .text:0x80315598; // type:function size:0x48 scope:weak align:4 +getType__11J3DShapeMtxCFv = .text:0x803155E0; // type:function size:0xC scope:weak align:4 __sinit_J3DShapeMtx_cpp = .text:0x803155EC; // type:function size:0x138 scope:local align:4 countVertex__12J3DShapeDrawFUl = .text:0x80315724; // type:function size:0x50 scope:global align:4 addTexMtxIndexInDL__12J3DShapeDrawFUlUlUl = .text:0x80315774; // type:function size:0x148 scope:global align:4 @@ -14295,7 +14295,7 @@ addTexMtxIndexInVcd__8J3DShapeF7_GXAttr = .text:0x80315ABC; // type:function siz calcNBTScale__8J3DShapeFRC3VecPA3_A3_fPA3_A3_f = .text:0x80315BA8; // type:function size:0x80 scope:global align:4 countBumpMtxNum__8J3DShapeCFv = .text:0x80315C28; // type:function size:0x70 scope:global align:4 J3DLoadCPCmd__FUcUl = .text:0x80315C98; // type:function size:0x18 scope:global align:4 -J3DLoadArrayBasePtr__F7_GXAttrPv = .text:0x80315CB0; // type:function size:0x3C scope:global align:4 +J3DLoadArrayBasePtr__F7_GXAttrPv = .text:0x80315CB0; // type:function size:0x3C scope:local align:4 loadVtxArray__8J3DShapeCFv = .text:0x80315CEC; // type:function size:0x70 scope:global align:4 isSameVcdVatCmd__8J3DShapeFP8J3DShape = .text:0x80315D5C; // type:function size:0x3C scope:global align:4 makeVtxArrayCmd__8J3DShapeFv = .text:0x80315D98; // type:function size:0x2C8 scope:global align:4 @@ -14351,72 +14351,72 @@ diff__17J3DLockedMaterialFUl = .text:0x80317ECC; // type:function size:0x4 scope calc__17J3DLockedMaterialFPA4_Cf = .text:0x80317ED0; // type:function size:0x4 scope:global align:4 reset__17J3DLockedMaterialFv = .text:0x80317ED4; // type:function size:0x4 scope:global align:4 change__17J3DLockedMaterialFv = .text:0x80317ED8; // type:function size:0x4 scope:global align:4 -__dt__21J3DColorBlockLightOffFv = .text:0x80317EDC; // type:function size:0x5C scope:global align:4 -__dt__13J3DColorBlockFv = .text:0x80317F38; // type:function size:0x48 scope:global align:4 -__dt__21J3DTexGenBlockPatchedFv = .text:0x80317F80; // type:function size:0x5C scope:global align:4 -__dt__14J3DTexGenBlockFv = .text:0x80317FDC; // type:function size:0x48 scope:global align:4 -__dt__11J3DTevBlockFv = .text:0x80318024; // type:function size:0x48 scope:global align:4 -__dt__11J3DIndBlockFv = .text:0x8031806C; // type:function size:0x48 scope:global align:4 -__dt__10J3DPEBlockFv = .text:0x803180B4; // type:function size:0x48 scope:global align:4 -countDLSize__14J3DTexGenBlockFv = .text:0x803180FC; // type:function size:0x8 scope:global align:4 -countDLSize__13J3DColorBlockFv = .text:0x80318104; // type:function size:0x8 scope:global align:4 -countDLSize__11J3DTevBlockFv = .text:0x8031810C; // type:function size:0x8 scope:global align:4 -countDLSize__11J3DIndBlockFv = .text:0x80318114; // type:function size:0x8 scope:global align:4 -countDLSize__10J3DPEBlockFv = .text:0x8031811C; // type:function size:0x8 scope:global align:4 -load__13J3DColorBlockFv = .text:0x80318124; // type:function size:0x4 scope:global align:4 -getCullMode__13J3DColorBlockCFv = .text:0x80318128; // type:function size:0x8 scope:global align:4 -load__11J3DTevBlockFv = .text:0x80318130; // type:function size:0x4 scope:global align:4 -getNBTScale__14J3DTexGenBlockFv = .text:0x80318134; // type:function size:0x8 scope:global align:4 -patch__13J3DColorBlockFv = .text:0x8031813C; // type:function size:0x4 scope:global align:4 -diff__13J3DColorBlockFUl = .text:0x80318140; // type:function size:0x4 scope:global align:4 -diff__10J3DPEBlockFUl = .text:0x80318144; // type:function size:0x4 scope:global align:4 -reset__10J3DPEBlockFP10J3DPEBlock = .text:0x80318148; // type:function size:0x4 scope:global align:4 -reset__11J3DIndBlockFP11J3DIndBlock = .text:0x8031814C; // type:function size:0x4 scope:global align:4 -reset__11J3DTevBlockFP11J3DTevBlock = .text:0x80318150; // type:function size:0x4 scope:global align:4 -reset__14J3DTexGenBlockFP14J3DTexGenBlock = .text:0x80318154; // type:function size:0x4 scope:global align:4 -reset__13J3DColorBlockFP13J3DColorBlock = .text:0x80318158; // type:function size:0x4 scope:global align:4 -diffFog__10J3DPEBlockFv = .text:0x8031815C; // type:function size:0x4 scope:global align:4 -diffBlend__10J3DPEBlockFv = .text:0x80318160; // type:function size:0x4 scope:global align:4 -setFog__10J3DPEBlockFP6J3DFog = .text:0x80318164; // type:function size:0x4 scope:global align:4 -setFog__10J3DPEBlockF6J3DFog = .text:0x80318168; // type:function size:0x4 scope:global align:4 -setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp = .text:0x8031816C; // type:function size:0x4 scope:global align:4 -setBlend__10J3DPEBlockFPC8J3DBlend = .text:0x80318170; // type:function size:0x4 scope:global align:4 -setZMode__10J3DPEBlockFPC8J3DZMode = .text:0x80318174; // type:function size:0x4 scope:global align:4 -setZCompLoc__10J3DPEBlockFPCUc = .text:0x80318178; // type:function size:0x4 scope:global align:4 -setDither__10J3DPEBlockFUc = .text:0x8031817C; // type:function size:0x4 scope:global align:4 -setDither__10J3DPEBlockFPCUc = .text:0x80318180; // type:function size:0x4 scope:global align:4 -getDither__10J3DPEBlockCFv = .text:0x80318184; // type:function size:0x8 scope:global align:4 -getFogOffset__10J3DPEBlockCFv = .text:0x8031818C; // type:function size:0x8 scope:global align:4 -setFogOffset__10J3DPEBlockFUl = .text:0x80318194; // type:function size:0x4 scope:global align:4 -diff__15J3DIndBlockNullFUl = .text:0x80318198; // type:function size:0x4 scope:global align:4 -load__15J3DIndBlockNullFv = .text:0x8031819C; // type:function size:0x4 scope:global align:4 -reset__15J3DIndBlockNullFP11J3DIndBlock = .text:0x803181A0; // type:function size:0x4 scope:global align:4 -getType__15J3DIndBlockNullFv = .text:0x803181A4; // type:function size:0xC scope:global align:4 -__dt__15J3DIndBlockNullFv = .text:0x803181B0; // type:function size:0x5C scope:global align:4 -setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder = .text:0x8031820C; // type:function size:0x4 scope:global align:4 -setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder = .text:0x80318210; // type:function size:0x4 scope:global align:4 -setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx = .text:0x80318214; // type:function size:0x4 scope:global align:4 -setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale = .text:0x80318218; // type:function size:0x4 scope:global align:4 -setTexGenNum__14J3DTexGenBlockFPCUl = .text:0x8031821C; // type:function size:0x4 scope:global align:4 -setNBTScale__14J3DTexGenBlockF11J3DNBTScale = .text:0x80318220; // type:function size:0x4 scope:global align:4 -setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale = .text:0x80318224; // type:function size:0x4 scope:global align:4 -getTexMtxOffset__14J3DTexGenBlockCFv = .text:0x80318228; // type:function size:0x8 scope:global align:4 -setTexMtxOffset__14J3DTexGenBlockFUl = .text:0x80318230; // type:function size:0x4 scope:global align:4 -patchMatColor__13J3DColorBlockFv = .text:0x80318234; // type:function size:0x4 scope:global align:4 -diffAmbColor__13J3DColorBlockFv = .text:0x80318238; // type:function size:0x4 scope:global align:4 -diffMatColor__13J3DColorBlockFv = .text:0x8031823C; // type:function size:0x4 scope:global align:4 -diffColorChan__13J3DColorBlockFv = .text:0x80318240; // type:function size:0x4 scope:global align:4 -diffLightObj__13J3DColorBlockFUl = .text:0x80318244; // type:function size:0x4 scope:global align:4 -setMatColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x80318248; // type:function size:0x4 scope:global align:4 -setColorChanNum__13J3DColorBlockFPCUc = .text:0x8031824C; // type:function size:0x4 scope:global align:4 -setColorChan__13J3DColorBlockFUlPC12J3DColorChan = .text:0x80318250; // type:function size:0x4 scope:global align:4 -getLight__13J3DColorBlockFUl = .text:0x80318254; // type:function size:0x8 scope:global align:4 -setCullMode__13J3DColorBlockFUc = .text:0x8031825C; // type:function size:0x4 scope:global align:4 -setCullMode__13J3DColorBlockFPCUc = .text:0x80318260; // type:function size:0x4 scope:global align:4 -getMatColorOffset__13J3DColorBlockCFv = .text:0x80318264; // type:function size:0x8 scope:global align:4 -getColorChanOffset__13J3DColorBlockCFv = .text:0x8031826C; // type:function size:0x8 scope:global align:4 -setMatColorOffset__13J3DColorBlockFUl = .text:0x80318274; // type:function size:0x4 scope:global align:4 -setColorChanOffset__13J3DColorBlockFUl = .text:0x80318278; // type:function size:0x4 scope:global align:4 +__dt__21J3DColorBlockLightOffFv = .text:0x80317EDC; // type:function size:0x5C scope:weak align:4 +__dt__13J3DColorBlockFv = .text:0x80317F38; // type:function size:0x48 scope:weak align:4 +__dt__21J3DTexGenBlockPatchedFv = .text:0x80317F80; // type:function size:0x5C scope:weak align:4 +__dt__14J3DTexGenBlockFv = .text:0x80317FDC; // type:function size:0x48 scope:weak align:4 +__dt__11J3DTevBlockFv = .text:0x80318024; // type:function size:0x48 scope:weak align:4 +__dt__11J3DIndBlockFv = .text:0x8031806C; // type:function size:0x48 scope:weak align:4 +__dt__10J3DPEBlockFv = .text:0x803180B4; // type:function size:0x48 scope:weak align:4 +countDLSize__14J3DTexGenBlockFv = .text:0x803180FC; // type:function size:0x8 scope:weak align:4 +countDLSize__13J3DColorBlockFv = .text:0x80318104; // type:function size:0x8 scope:weak align:4 +countDLSize__11J3DTevBlockFv = .text:0x8031810C; // type:function size:0x8 scope:weak align:4 +countDLSize__11J3DIndBlockFv = .text:0x80318114; // type:function size:0x8 scope:weak align:4 +countDLSize__10J3DPEBlockFv = .text:0x8031811C; // type:function size:0x8 scope:weak align:4 +load__13J3DColorBlockFv = .text:0x80318124; // type:function size:0x4 scope:weak align:4 +getCullMode__13J3DColorBlockCFv = .text:0x80318128; // type:function size:0x8 scope:weak align:4 +load__11J3DTevBlockFv = .text:0x80318130; // type:function size:0x4 scope:weak align:4 +getNBTScale__14J3DTexGenBlockFv = .text:0x80318134; // type:function size:0x8 scope:weak align:4 +patch__13J3DColorBlockFv = .text:0x8031813C; // type:function size:0x4 scope:weak align:4 +diff__13J3DColorBlockFUl = .text:0x80318140; // type:function size:0x4 scope:weak align:4 +diff__10J3DPEBlockFUl = .text:0x80318144; // type:function size:0x4 scope:weak align:4 +reset__10J3DPEBlockFP10J3DPEBlock = .text:0x80318148; // type:function size:0x4 scope:weak align:4 +reset__11J3DIndBlockFP11J3DIndBlock = .text:0x8031814C; // type:function size:0x4 scope:weak align:4 +reset__11J3DTevBlockFP11J3DTevBlock = .text:0x80318150; // type:function size:0x4 scope:weak align:4 +reset__14J3DTexGenBlockFP14J3DTexGenBlock = .text:0x80318154; // type:function size:0x4 scope:weak align:4 +reset__13J3DColorBlockFP13J3DColorBlock = .text:0x80318158; // type:function size:0x4 scope:weak align:4 +diffFog__10J3DPEBlockFv = .text:0x8031815C; // type:function size:0x4 scope:weak align:4 +diffBlend__10J3DPEBlockFv = .text:0x80318160; // type:function size:0x4 scope:weak align:4 +setFog__10J3DPEBlockFP6J3DFog = .text:0x80318164; // type:function size:0x4 scope:weak align:4 +setFog__10J3DPEBlockF6J3DFog = .text:0x80318168; // type:function size:0x4 scope:weak align:4 +setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp = .text:0x8031816C; // type:function size:0x4 scope:weak align:4 +setBlend__10J3DPEBlockFPC8J3DBlend = .text:0x80318170; // type:function size:0x4 scope:weak align:4 +setZMode__10J3DPEBlockFPC8J3DZMode = .text:0x80318174; // type:function size:0x4 scope:weak align:4 +setZCompLoc__10J3DPEBlockFPCUc = .text:0x80318178; // type:function size:0x4 scope:weak align:4 +setDither__10J3DPEBlockFUc = .text:0x8031817C; // type:function size:0x4 scope:weak align:4 +setDither__10J3DPEBlockFPCUc = .text:0x80318180; // type:function size:0x4 scope:weak align:4 +getDither__10J3DPEBlockCFv = .text:0x80318184; // type:function size:0x8 scope:weak align:4 +getFogOffset__10J3DPEBlockCFv = .text:0x8031818C; // type:function size:0x8 scope:weak align:4 +setFogOffset__10J3DPEBlockFUl = .text:0x80318194; // type:function size:0x4 scope:weak align:4 +diff__15J3DIndBlockNullFUl = .text:0x80318198; // type:function size:0x4 scope:weak align:4 +load__15J3DIndBlockNullFv = .text:0x8031819C; // type:function size:0x4 scope:weak align:4 +reset__15J3DIndBlockNullFP11J3DIndBlock = .text:0x803181A0; // type:function size:0x4 scope:weak align:4 +getType__15J3DIndBlockNullFv = .text:0x803181A4; // type:function size:0xC scope:weak align:4 +__dt__15J3DIndBlockNullFv = .text:0x803181B0; // type:function size:0x5C scope:weak align:4 +setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder = .text:0x8031820C; // type:function size:0x4 scope:weak align:4 +setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder = .text:0x80318210; // type:function size:0x4 scope:weak align:4 +setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx = .text:0x80318214; // type:function size:0x4 scope:weak align:4 +setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale = .text:0x80318218; // type:function size:0x4 scope:weak align:4 +setTexGenNum__14J3DTexGenBlockFPCUl = .text:0x8031821C; // type:function size:0x4 scope:weak align:4 +setNBTScale__14J3DTexGenBlockF11J3DNBTScale = .text:0x80318220; // type:function size:0x4 scope:weak align:4 +setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale = .text:0x80318224; // type:function size:0x4 scope:weak align:4 +getTexMtxOffset__14J3DTexGenBlockCFv = .text:0x80318228; // type:function size:0x8 scope:weak align:4 +setTexMtxOffset__14J3DTexGenBlockFUl = .text:0x80318230; // type:function size:0x4 scope:weak align:4 +patchMatColor__13J3DColorBlockFv = .text:0x80318234; // type:function size:0x4 scope:weak align:4 +diffAmbColor__13J3DColorBlockFv = .text:0x80318238; // type:function size:0x4 scope:weak align:4 +diffMatColor__13J3DColorBlockFv = .text:0x8031823C; // type:function size:0x4 scope:weak align:4 +diffColorChan__13J3DColorBlockFv = .text:0x80318240; // type:function size:0x4 scope:weak align:4 +diffLightObj__13J3DColorBlockFUl = .text:0x80318244; // type:function size:0x4 scope:weak align:4 +setMatColor__13J3DColorBlockFUlPC10J3DGXColor = .text:0x80318248; // type:function size:0x4 scope:weak align:4 +setColorChanNum__13J3DColorBlockFPCUc = .text:0x8031824C; // type:function size:0x4 scope:weak align:4 +setColorChan__13J3DColorBlockFUlPC12J3DColorChan = .text:0x80318250; // type:function size:0x4 scope:weak align:4 +getLight__13J3DColorBlockFUl = .text:0x80318254; // type:function size:0x8 scope:weak align:4 +setCullMode__13J3DColorBlockFUc = .text:0x8031825C; // type:function size:0x4 scope:weak align:4 +setCullMode__13J3DColorBlockFPCUc = .text:0x80318260; // type:function size:0x4 scope:weak align:4 +getMatColorOffset__13J3DColorBlockCFv = .text:0x80318264; // type:function size:0x8 scope:weak align:4 +getColorChanOffset__13J3DColorBlockCFv = .text:0x8031826C; // type:function size:0x8 scope:weak align:4 +setMatColorOffset__13J3DColorBlockFUl = .text:0x80318274; // type:function size:0x4 scope:weak align:4 +setColorChanOffset__13J3DColorBlockFUl = .text:0x80318278; // type:function size:0x4 scope:weak align:4 initialize__21J3DColorBlockLightOffFv = .text:0x8031827C; // type:function size:0x60 scope:global align:4 initialize__22J3DColorBlockAmbientOnFv = .text:0x803182DC; // type:function size:0xA4 scope:global align:4 initialize__20J3DColorBlockLightOnFv = .text:0x80318380; // type:function size:0xC4 scope:global align:4 @@ -14888,8 +14888,8 @@ makeZModeTable__Fv = .text:0x803250A8; // type:function size:0x6C scope:global a makeTevSwapTable__Fv = .text:0x80325114; // type:function size:0x44 scope:global align:4 loadTexMtx__9J3DTexMtxCFUl = .text:0x80325158; // type:function size:0x64 scope:global align:4 loadPostTexMtx__9J3DTexMtxCFUl = .text:0x803251BC; // type:function size:0x60 scope:global align:4 -J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType = .text:0x8032521C; // type:function size:0x580 scope:global align:4 -J3DGDLoadPostTexMtxImm__FPA4_fUl = .text:0x8032579C; // type:function size:0x56C scope:global align:4 +J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType = .text:0x8032521C; // type:function size:0x580 scope:local align:4 +J3DGDLoadPostTexMtxImm__FPA4_fUl = .text:0x8032579C; // type:function size:0x56C scope:local align:4 initialize__13J3DDrawBufferFv = .text:0x80325D08; // type:function size:0x68 scope:global align:4 allocBuffer__13J3DDrawBufferFUl = .text:0x80325D70; // type:function size:0x98 scope:global align:4 __dt__13J3DDrawBufferFv = .text:0x80325E08; // type:function size:0x60 scope:global align:4 @@ -14920,7 +14920,7 @@ makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTabl findImportantMtxIndex__12J3DJointTreeFv = .text:0x80326A00; // type:function size:0xAC scope:global align:4 calc__12J3DJointTreeFP12J3DMtxBufferRC3VecRA3_A4_Cf = .text:0x80326AAC; // type:function size:0x70 scope:global align:4 setMtxBuffer__10J3DMtxCalcFP12J3DMtxBuffer = .text:0x80326B1C; // type:function size:0x8 scope:global align:4 -__dt__12J3DJointTreeFv = .text:0x80326B24; // type:function size:0x64 scope:global align:4 +__dt__12J3DJointTreeFv = .text:0x80326B24; // type:function size:0x64 scope:weak align:4 clear__12J3DModelDataFv = .text:0x80326B88; // type:function size:0x18 scope:global align:4 __ct__12J3DModelDataFv = .text:0x80326BA0; // type:function size:0x74 scope:global align:4 newSharedDisplayList__12J3DModelDataFUl = .text:0x80326C14; // type:function size:0xB4 scope:global align:4 @@ -14929,8 +14929,8 @@ makeSharedDL__12J3DModelDataFv = .text:0x80326D94; // type:function size:0x78 sc simpleCalcMaterial__12J3DModelDataFUsPA4_f = .text:0x80326E0C; // type:function size:0xC0 scope:global align:4 syncJ3DSysPointers__12J3DModelDataCFv = .text:0x80326ECC; // type:function size:0x2C scope:global align:4 syncJ3DSysFlags__12J3DModelDataCFv = .text:0x80326EF8; // type:function size:0x3C scope:global align:4 -__dt__13J3DShapeTableFv = .text:0x80326F34; // type:function size:0x48 scope:global align:4 -__dt__12J3DModelDataFv = .text:0x80326F7C; // type:function size:0x98 scope:global align:4 +__dt__13J3DShapeTableFv = .text:0x80326F34; // type:function size:0x48 scope:weak align:4 +__dt__12J3DModelDataFv = .text:0x80326F7C; // type:function size:0x98 scope:weak align:4 initialize__12J3DMtxBufferFv = .text:0x80327014; // type:function size:0x44 scope:global align:4 create__12J3DMtxBufferFP12J3DModelDataUl = .text:0x80327058; // type:function size:0x10C scope:global align:4 createAnmMtx__12J3DMtxBufferFP12J3DModelData = .text:0x80327164; // type:function size:0x8C scope:global align:4 @@ -14965,8 +14965,8 @@ calcNrmMtx__8J3DModelFv = .text:0x80328F90; // type:function size:0x24 scope:glo calcBumpMtx__8J3DModelFv = .text:0x80328FB4; // type:function size:0x104 scope:global align:4 calcBBoardMtx__8J3DModelFv = .text:0x803290B8; // type:function size:0x34 scope:global align:4 prepareShapePackets__8J3DModelFv = .text:0x803290EC; // type:function size:0x64 scope:global align:4 -__dt__8J3DModelFv = .text:0x80329150; // type:function size:0x64 scope:global align:4 -__dt__12J3DMtxBufferFv = .text:0x803291B4; // type:function size:0x48 scope:global align:4 +__dt__8J3DModelFv = .text:0x80329150; // type:function size:0x64 scope:weak align:4 +__dt__12J3DMtxBufferFv = .text:0x803291B4; // type:function size:0x48 scope:weak align:4 init__12J3DFrameCtrlFs = .text:0x803291FC; // type:function size:0x30 scope:global align:4 checkPass__12J3DFrameCtrlFf = .text:0x8032922C; // type:function size:0x5A0 scope:global align:4 update__12J3DFrameCtrlFv = .text:0x803297CC; // type:function size:0x474 scope:global align:4 @@ -15000,39 +15000,39 @@ getTevColorReg__15J3DAnmTevRegKeyCFUsP11_GXColorS10 = .text:0x8032BFF8; // type: getTevKonstReg__15J3DAnmTevRegKeyCFUsP8_GXColor = .text:0x8032C2BC; // type:function size:0x2C4 scope:global align:4 searchUpdateMaterialID__15J3DAnmTevRegKeyFP16J3DMaterialTable = .text:0x8032C580; // type:function size:0xFC scope:global align:4 searchUpdateMaterialID__15J3DAnmTevRegKeyFP12J3DModelData = .text:0x8032C67C; // type:function size:0x24 scope:global align:4 -J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs = .text:0x8032C6A0; // type:function size:0x234 scope:global align:4 -J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf = .text:0x8032C8D4; // type:function size:0x17C scope:global align:4 -__dt__14J3DAnmVtxColorFv = .text:0x8032CA50; // type:function size:0x5C scope:global align:4 -__dt__11J3DAnmColorFv = .text:0x8032CAAC; // type:function size:0x74 scope:global align:4 -__dt__16J3DAnmTexPatternFv = .text:0x8032CB20; // type:function size:0x74 scope:global align:4 -getKind__16J3DAnmTexPatternCFv = .text:0x8032CB94; // type:function size:0x8 scope:global align:4 -__dt__15J3DAnmTevRegKeyFv = .text:0x8032CB9C; // type:function size:0x88 scope:global align:4 -getKind__15J3DAnmTevRegKeyCFv = .text:0x8032CC24; // type:function size:0x8 scope:global align:4 -__dt__14J3DAnmColorKeyFv = .text:0x8032CC2C; // type:function size:0x84 scope:global align:4 -getKind__14J3DAnmColorKeyCFv = .text:0x8032CCB0; // type:function size:0x8 scope:global align:4 -__dt__15J3DAnmColorFullFv = .text:0x8032CCB8; // type:function size:0x84 scope:global align:4 -getKind__15J3DAnmColorFullCFv = .text:0x8032CD3C; // type:function size:0x8 scope:global align:4 -getKind__11J3DAnmColorCFv = .text:0x8032CD44; // type:function size:0x8 scope:global align:4 -getColor__11J3DAnmColorCFUsP8_GXColor = .text:0x8032CD4C; // type:function size:0x4 scope:global align:4 -__dt__17J3DAnmVtxColorKeyFv = .text:0x8032CD50; // type:function size:0x6C scope:global align:4 -getKind__17J3DAnmVtxColorKeyCFv = .text:0x8032CDBC; // type:function size:0x8 scope:global align:4 -__dt__18J3DAnmVtxColorFullFv = .text:0x8032CDC4; // type:function size:0x6C scope:global align:4 -getKind__18J3DAnmVtxColorFullCFv = .text:0x8032CE30; // type:function size:0x8 scope:global align:4 -getKind__14J3DAnmVtxColorCFv = .text:0x8032CE38; // type:function size:0x8 scope:global align:4 -getColor__14J3DAnmVtxColorCFUcUsP8_GXColor = .text:0x8032CE40; // type:function size:0x4 scope:global align:4 -__dt__16J3DAnmClusterKeyFv = .text:0x8032CE44; // type:function size:0x6C scope:global align:4 -getKind__16J3DAnmClusterKeyCFv = .text:0x8032CEB0; // type:function size:0x8 scope:global align:4 -__dt__13J3DAnmClusterFv = .text:0x8032CEB8; // type:function size:0x5C scope:global align:4 -getKind__13J3DAnmClusterCFv = .text:0x8032CF14; // type:function size:0x8 scope:global align:4 -getWeight__13J3DAnmClusterCFUs = .text:0x8032CF1C; // type:function size:0x8 scope:global align:4 -__dt__17J3DAnmClusterFullFv = .text:0x8032CF24; // type:function size:0x6C scope:global align:4 -getKind__17J3DAnmClusterFullCFv = .text:0x8032CF90; // type:function size:0x8 scope:global align:4 -__dt__19J3DAnmTextureSRTKeyFv = .text:0x8032CF98; // type:function size:0x88 scope:global align:4 -getKind__19J3DAnmTextureSRTKeyCFv = .text:0x8032D020; // type:function size:0x8 scope:global align:4 -__dt__27J3DAnmTransformFullWithLerpFv = .text:0x8032D028; // type:function size:0x7C scope:global align:4 -getKind__27J3DAnmTransformFullWithLerpCFv = .text:0x8032D0A4; // type:function size:0x8 scope:global align:4 -__dt__19J3DAnmTransformFullFv = .text:0x8032D0AC; // type:function size:0x6C scope:global align:4 -getKind__19J3DAnmTransformFullCFv = .text:0x8032D118; // type:function size:0x8 scope:global align:4 +J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs = .text:0x8032C6A0; // type:function size:0x234 scope:weak align:4 +J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf = .text:0x8032C8D4; // type:function size:0x17C scope:weak align:4 +__dt__14J3DAnmVtxColorFv = .text:0x8032CA50; // type:function size:0x5C scope:weak align:4 +__dt__11J3DAnmColorFv = .text:0x8032CAAC; // type:function size:0x74 scope:weak align:4 +__dt__16J3DAnmTexPatternFv = .text:0x8032CB20; // type:function size:0x74 scope:weak align:4 +getKind__16J3DAnmTexPatternCFv = .text:0x8032CB94; // type:function size:0x8 scope:weak align:4 +__dt__15J3DAnmTevRegKeyFv = .text:0x8032CB9C; // type:function size:0x88 scope:weak align:4 +getKind__15J3DAnmTevRegKeyCFv = .text:0x8032CC24; // type:function size:0x8 scope:weak align:4 +__dt__14J3DAnmColorKeyFv = .text:0x8032CC2C; // type:function size:0x84 scope:weak align:4 +getKind__14J3DAnmColorKeyCFv = .text:0x8032CCB0; // type:function size:0x8 scope:weak align:4 +__dt__15J3DAnmColorFullFv = .text:0x8032CCB8; // type:function size:0x84 scope:weak align:4 +getKind__15J3DAnmColorFullCFv = .text:0x8032CD3C; // type:function size:0x8 scope:weak align:4 +getKind__11J3DAnmColorCFv = .text:0x8032CD44; // type:function size:0x8 scope:weak align:4 +getColor__11J3DAnmColorCFUsP8_GXColor = .text:0x8032CD4C; // type:function size:0x4 scope:weak align:4 +__dt__17J3DAnmVtxColorKeyFv = .text:0x8032CD50; // type:function size:0x6C scope:weak align:4 +getKind__17J3DAnmVtxColorKeyCFv = .text:0x8032CDBC; // type:function size:0x8 scope:weak align:4 +__dt__18J3DAnmVtxColorFullFv = .text:0x8032CDC4; // type:function size:0x6C scope:weak align:4 +getKind__18J3DAnmVtxColorFullCFv = .text:0x8032CE30; // type:function size:0x8 scope:weak align:4 +getKind__14J3DAnmVtxColorCFv = .text:0x8032CE38; // type:function size:0x8 scope:weak align:4 +getColor__14J3DAnmVtxColorCFUcUsP8_GXColor = .text:0x8032CE40; // type:function size:0x4 scope:weak align:4 +__dt__16J3DAnmClusterKeyFv = .text:0x8032CE44; // type:function size:0x6C scope:weak align:4 +getKind__16J3DAnmClusterKeyCFv = .text:0x8032CEB0; // type:function size:0x8 scope:weak align:4 +__dt__13J3DAnmClusterFv = .text:0x8032CEB8; // type:function size:0x5C scope:weak align:4 +getKind__13J3DAnmClusterCFv = .text:0x8032CF14; // type:function size:0x8 scope:weak align:4 +getWeight__13J3DAnmClusterCFUs = .text:0x8032CF1C; // type:function size:0x8 scope:weak align:4 +__dt__17J3DAnmClusterFullFv = .text:0x8032CF24; // type:function size:0x6C scope:weak align:4 +getKind__17J3DAnmClusterFullCFv = .text:0x8032CF90; // type:function size:0x8 scope:weak align:4 +__dt__19J3DAnmTextureSRTKeyFv = .text:0x8032CF98; // type:function size:0x88 scope:weak align:4 +getKind__19J3DAnmTextureSRTKeyCFv = .text:0x8032D020; // type:function size:0x8 scope:weak align:4 +__dt__27J3DAnmTransformFullWithLerpFv = .text:0x8032D028; // type:function size:0x7C scope:weak align:4 +getKind__27J3DAnmTransformFullWithLerpCFv = .text:0x8032D0A4; // type:function size:0x8 scope:weak align:4 +__dt__19J3DAnmTransformFullFv = .text:0x8032D0AC; // type:function size:0x6C scope:weak align:4 +getKind__19J3DAnmTransformFullCFv = .text:0x8032D118; // type:function size:0x8 scope:weak align:4 initialize__14J3DMaterialAnmFv = .text:0x8032D120; // type:function size:0xA4 scope:global align:4 calc__14J3DMaterialAnmCFP11J3DMaterial = .text:0x8032D1C4; // type:function size:0x1E0 scope:global align:4 setMatColorAnm__14J3DMaterialAnmFiP14J3DMatColorAnm = .text:0x8032D3A4; // type:function size:0x40 scope:global align:4 @@ -15041,8 +15041,8 @@ setTexNoAnm__14J3DMaterialAnmFiP11J3DTexNoAnm = .text:0x8032D424; // type:functi setTevColorAnm__14J3DMaterialAnmFiP14J3DTevColorAnm = .text:0x8032D464; // type:function size:0x40 scope:global align:4 setTevKColorAnm__14J3DMaterialAnmFiP15J3DTevKColorAnm = .text:0x8032D4A4; // type:function size:0x40 scope:global align:4 __ct__12J3DSkinNListFv = .text:0x8032D4E4; // type:function size:0x20 scope:global align:4 -J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec = .text:0x8032D504; // type:function size:0xB8 scope:global align:4 -J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec = .text:0x8032D5BC; // type:function size:0xA0 scope:global align:4 +J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec = .text:0x8032D504; // type:function size:0xB8 scope:local align:4 +J3DPSWeightMTXMultVecSR__FPA4_ffP3VecP3Vec = .text:0x8032D5BC; // type:function size:0xA0 scope:local align:4 calcSkin_VtxPosF32__12J3DSkinNListFPA4_fPvPv = .text:0x8032D65C; // type:function size:0x88 scope:global align:4 calcSkin_VtxNrmF32__12J3DSkinNListFPA4_fPvPv = .text:0x8032D6E4; // type:function size:0x88 scope:global align:4 __ct__13J3DSkinDeformFv = .text:0x8032D76C; // type:function size:0x44 scope:global align:4 @@ -15135,47 +15135,47 @@ newZMode__18J3DMaterialFactoryCFi = .text:0x8033362C; // type:function size:0x60 newZCompLoc__18J3DMaterialFactoryCFi = .text:0x8033368C; // type:function size:0x38 scope:global align:4 newDither__18J3DMaterialFactoryCFi = .text:0x803336C4; // type:function size:0x38 scope:global align:4 newNBTScale__18J3DMaterialFactoryCFi = .text:0x803336FC; // type:function size:0xA4 scope:global align:4 -load__14J3DPEBlockNullFv = .text:0x803337A0; // type:function size:0x4 scope:global align:4 -getType__14J3DPEBlockNullFv = .text:0x803337A4; // type:function size:0xC scope:global align:4 -__dt__14J3DPEBlockNullFv = .text:0x803337B0; // type:function size:0x5C scope:global align:4 -reset__15J3DTevBlockNullFP11J3DTevBlock = .text:0x8033380C; // type:function size:0x4 scope:global align:4 -ptrToIndex__15J3DTevBlockNullFv = .text:0x80333810; // type:function size:0x4 scope:global align:4 -indexToPtr__15J3DTevBlockNullFv = .text:0x80333814; // type:function size:0x24 scope:global align:4 -getType__15J3DTevBlockNullFv = .text:0x80333838; // type:function size:0xC scope:global align:4 -__dt__15J3DTevBlockNullFv = .text:0x80333844; // type:function size:0x5C scope:global align:4 -calc__18J3DTexGenBlockNullFPA4_Cf = .text:0x803338A0; // type:function size:0x4 scope:global align:4 -calcWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x803338A4; // type:function size:0x4 scope:global align:4 -calcPostTexMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x803338A8; // type:function size:0x4 scope:global align:4 -calcPostTexMtxWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x803338AC; // type:function size:0x4 scope:global align:4 -load__18J3DTexGenBlockNullFv = .text:0x803338B0; // type:function size:0x4 scope:global align:4 -patch__18J3DTexGenBlockNullFv = .text:0x803338B4; // type:function size:0x4 scope:global align:4 -diff__18J3DTexGenBlockNullFUl = .text:0x803338B8; // type:function size:0x4 scope:global align:4 -diffTexMtx__18J3DTexGenBlockNullFv = .text:0x803338BC; // type:function size:0x4 scope:global align:4 -diffTexGen__18J3DTexGenBlockNullFv = .text:0x803338C0; // type:function size:0x4 scope:global align:4 -getType__18J3DTexGenBlockNullFv = .text:0x803338C4; // type:function size:0xC scope:global align:4 -__dt__18J3DTexGenBlockNullFv = .text:0x803338D0; // type:function size:0x5C scope:global align:4 -getType__17J3DColorBlockNullFv = .text:0x8033392C; // type:function size:0xC scope:global align:4 -__dt__17J3DColorBlockNullFv = .text:0x80333938; // type:function size:0x5C scope:global align:4 -__dt__11J3DMaterialFv = .text:0x80333994; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<17J3DCurrentMtxInfo>__FPCvPCv = .text:0x803339DC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DPatchingInfo>__FPCvPCv = .text:0x803339F4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DDisplayListInit>__FPCvPCv = .text:0x80333A0C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DNBTScaleInfo>__FPCvPCv = .text:0x80333A24; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<12J3DZModeInfo>__FPCvPCv = .text:0x80333A3C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<12J3DBlendInfo>__FPCvPCv = .text:0x80333A54; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DAlphaCompInfo>__FPCvPCv = .text:0x80333A6C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<10J3DFogInfo>__FPCvPCv = .text:0x80333A84; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<23J3DTevSwapModeTableInfo>__FPCvPCv = .text:0x80333A9C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<18J3DTevSwapModeInfo>__FPCvPCv = .text:0x80333AB4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DTevStageInfo>__FPCvPCv = .text:0x80333ACC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DTevOrderInfo>__FPCvPCv = .text:0x80333AE4; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<13J3DTexMtxInfo>__FPCvPCv = .text:0x80333AFC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DTexCoord2Info>__FPCvPCv = .text:0x80333B14; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<15J3DTexCoordInfo>__FPCvPCv = .text:0x80333B2C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<12J3DLightInfo>__FPCvPCv = .text:0x80333B44; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DColorChanInfo>__FPCvPCv = .text:0x80333B5C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<14J3DIndInitData>__FPCvPCv = .text:0x80333B74; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J3DMaterialInitData>__FPCvPCv = .text:0x80333B8C; // type:function size:0x18 scope:global align:4 +load__14J3DPEBlockNullFv = .text:0x803337A0; // type:function size:0x4 scope:weak align:4 +getType__14J3DPEBlockNullFv = .text:0x803337A4; // type:function size:0xC scope:weak align:4 +__dt__14J3DPEBlockNullFv = .text:0x803337B0; // type:function size:0x5C scope:weak align:4 +reset__15J3DTevBlockNullFP11J3DTevBlock = .text:0x8033380C; // type:function size:0x4 scope:weak align:4 +ptrToIndex__15J3DTevBlockNullFv = .text:0x80333810; // type:function size:0x4 scope:weak align:4 +indexToPtr__15J3DTevBlockNullFv = .text:0x80333814; // type:function size:0x24 scope:weak align:4 +getType__15J3DTevBlockNullFv = .text:0x80333838; // type:function size:0xC scope:weak align:4 +__dt__15J3DTevBlockNullFv = .text:0x80333844; // type:function size:0x5C scope:weak align:4 +calc__18J3DTexGenBlockNullFPA4_Cf = .text:0x803338A0; // type:function size:0x4 scope:weak align:4 +calcWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x803338A4; // type:function size:0x4 scope:weak align:4 +calcPostTexMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x803338A8; // type:function size:0x4 scope:weak align:4 +calcPostTexMtxWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf = .text:0x803338AC; // type:function size:0x4 scope:weak align:4 +load__18J3DTexGenBlockNullFv = .text:0x803338B0; // type:function size:0x4 scope:weak align:4 +patch__18J3DTexGenBlockNullFv = .text:0x803338B4; // type:function size:0x4 scope:weak align:4 +diff__18J3DTexGenBlockNullFUl = .text:0x803338B8; // type:function size:0x4 scope:weak align:4 +diffTexMtx__18J3DTexGenBlockNullFv = .text:0x803338BC; // type:function size:0x4 scope:weak align:4 +diffTexGen__18J3DTexGenBlockNullFv = .text:0x803338C0; // type:function size:0x4 scope:weak align:4 +getType__18J3DTexGenBlockNullFv = .text:0x803338C4; // type:function size:0xC scope:weak align:4 +__dt__18J3DTexGenBlockNullFv = .text:0x803338D0; // type:function size:0x5C scope:weak align:4 +getType__17J3DColorBlockNullFv = .text:0x8033392C; // type:function size:0xC scope:weak align:4 +__dt__17J3DColorBlockNullFv = .text:0x80333938; // type:function size:0x5C scope:weak align:4 +__dt__11J3DMaterialFv = .text:0x80333994; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<17J3DCurrentMtxInfo>__FPCvPCv = .text:0x803339DC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DPatchingInfo>__FPCvPCv = .text:0x803339F4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DDisplayListInit>__FPCvPCv = .text:0x80333A0C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DNBTScaleInfo>__FPCvPCv = .text:0x80333A24; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<12J3DZModeInfo>__FPCvPCv = .text:0x80333A3C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<12J3DBlendInfo>__FPCvPCv = .text:0x80333A54; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DAlphaCompInfo>__FPCvPCv = .text:0x80333A6C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<10J3DFogInfo>__FPCvPCv = .text:0x80333A84; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<23J3DTevSwapModeTableInfo>__FPCvPCv = .text:0x80333A9C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<18J3DTevSwapModeInfo>__FPCvPCv = .text:0x80333AB4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DTevStageInfo>__FPCvPCv = .text:0x80333ACC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DTevOrderInfo>__FPCvPCv = .text:0x80333AE4; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<13J3DTexMtxInfo>__FPCvPCv = .text:0x80333AFC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DTexCoord2Info>__FPCvPCv = .text:0x80333B14; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<15J3DTexCoordInfo>__FPCvPCv = .text:0x80333B2C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<12J3DLightInfo>__FPCvPCv = .text:0x80333B44; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DColorChanInfo>__FPCvPCv = .text:0x80333B5C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<14J3DIndInitData>__FPCvPCv = .text:0x80333B74; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J3DMaterialInitData>__FPCvPCv = .text:0x80333B8C; // type:function size:0x18 scope:weak align:4 __ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21 = .text:0x80333BA4; // type:function size:0x1E0 scope:global align:4 countUniqueMaterials__22J3DMaterialFactory_v21Fv = .text:0x80333D84; // type:function size:0x24 scope:global align:4 countTexGens__22J3DMaterialFactory_v21CFi = .text:0x80333DA8; // type:function size:0x38 scope:global align:4 @@ -15202,16 +15202,16 @@ newZMode__22J3DMaterialFactory_v21CFi = .text:0x80334DA4; // type:function size: newZCompLoc__22J3DMaterialFactory_v21CFi = .text:0x80334E04; // type:function size:0x38 scope:global align:4 newDither__22J3DMaterialFactory_v21CFi = .text:0x80334E3C; // type:function size:0x38 scope:global align:4 newNBTScale__22J3DMaterialFactory_v21CFi = .text:0x80334E74; // type:function size:0xA4 scope:global align:4 -JSUConvertOffsetToPtr<23J3DMaterialInitData_v21>__FPCvPCv = .text:0x80334F18; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr<23J3DMaterialInitData_v21>__FPCvPCv = .text:0x80334F18; // type:function size:0x18 scope:weak align:4 load__24J3DClusterLoaderDataBaseFPCv = .text:0x80334F30; // type:function size:0x9C scope:global align:4 __ct__20J3DClusterLoader_v15Fv = .text:0x80334FCC; // type:function size:0x1C scope:global align:4 __dt__20J3DClusterLoader_v15Fv = .text:0x80334FE8; // type:function size:0x5C scope:global align:4 load__20J3DClusterLoader_v15FPCv = .text:0x80335044; // type:function size:0xB4 scope:global align:4 readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock = .text:0x803350F8; // type:function size:0x304 scope:global align:4 -__dt__16J3DClusterLoaderFv = .text:0x803353FC; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<16J3DClusterVertex>__FPCvPCv = .text:0x80335444; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<13J3DClusterKey>__FPCvPCv = .text:0x8033545C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<10J3DCluster>__FPCvPCv = .text:0x80335474; // type:function size:0x18 scope:global align:4 +__dt__16J3DClusterLoaderFv = .text:0x803353FC; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DClusterVertex>__FPCvPCv = .text:0x80335444; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<13J3DClusterKey>__FPCvPCv = .text:0x8033545C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<10J3DCluster>__FPCvPCv = .text:0x80335474; // type:function size:0x18 scope:weak align:4 __ct__14J3DModelLoaderFv = .text:0x8033548C; // type:function size:0x30 scope:global align:4 load__22J3DModelLoaderDataBaseFPCvUl = .text:0x803354BC; // type:function size:0x124 scope:global align:4 load__14J3DModelLoaderFPCvUl = .text:0x803355E0; // type:function size:0x2DC scope:global align:4 @@ -15219,7 +15219,7 @@ loadMaterialTable__14J3DModelLoaderFPCv = .text:0x803358BC; // type:function siz loadBinaryDisplayList__14J3DModelLoaderFPCvUl = .text:0x80335A20; // type:function size:0x2C0 scope:global align:4 setupBBoardInfo__14J3DModelLoaderFv = .text:0x80335CE0; // type:function size:0x168 scope:global align:4 readInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl = .text:0x80335E48; // type:function size:0x15C scope:global align:4 -getFmtType__FP17_GXVtxAttrFmtList7_GXAttr = .text:0x80335FA4; // type:function size:0x2C scope:global align:4 +getFmtType__FP17_GXVtxAttrFmtList7_GXAttr = .text:0x80335FA4; // type:function size:0x2C scope:local align:4 readVertex__14J3DModelLoaderFPC14J3DVertexBlock = .text:0x80335FD0; // type:function size:0x220 scope:global align:4 readEnvelop__14J3DModelLoaderFPC16J3DEnvelopeBlock = .text:0x803361F0; // type:function size:0x90 scope:global align:4 readDraw__14J3DModelLoaderFPC12J3DDrawBlock = .text:0x80336280; // type:function size:0xB0 scope:global align:4 @@ -15234,30 +15234,30 @@ readTextureTable__14J3DModelLoaderFPC15J3DTextureBlock = .text:0x80336D5C; // ty readPatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80336E28; // type:function size:0x140 scope:global align:4 readMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl = .text:0x80336F68; // type:function size:0x1B4 scope:global align:4 modifyMaterial__14J3DModelLoaderFUl = .text:0x8033711C; // type:function size:0x7C scope:global align:4 -__dt__18J3DModelLoader_v26Fv = .text:0x80337198; // type:function size:0x5C scope:global align:4 -__dt__18J3DModelLoader_v21Fv = .text:0x803371F4; // type:function size:0x5C scope:global align:4 -__dt__14J3DModelLoaderFv = .text:0x80337250; // type:function size:0x48 scope:global align:4 -readMaterial_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x80337298; // type:function size:0x4 scope:global align:4 -readMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x8033729C; // type:function size:0x4 scope:global align:4 -readMaterialTable_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x803372A0; // type:function size:0x4 scope:global align:4 -readMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803372A4; // type:function size:0x4 scope:global align:4 -calcSizeMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803372A8; // type:function size:0x8 scope:global align:4 -calcSizeMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803372B0; // type:function size:0x8 scope:global align:4 -__dt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x803372B8; // type:function size:0x6C scope:global align:4 -init__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>FRC3VecRA3_A4_Cf = .text:0x80337324; // type:function size:0x48 scope:global align:4 -calc__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x8033736C; // type:function size:0x28 scope:global align:4 -__dt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80337394; // type:function size:0x6C scope:global align:4 -init__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>FRC3VecRA3_A4_Cf = .text:0x80337400; // type:function size:0x28 scope:global align:4 -calc__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80337428; // type:function size:0x28 scope:global align:4 -__ct__11J3DMaterialFv = .text:0x80337450; // type:function size:0x54 scope:global align:4 -__dt__10J3DTextureFv = .text:0x803374A4; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<7ResTIMG>__FPCvPCv = .text:0x803374EC; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x80337504; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvPCv = .text:0x8033751C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<17_GXVtxAttrFmtList>__FPCvPCv = .text:0x80337534; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<17J3DModelHierarchy>__FPCvPCv = .text:0x8033754C; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<16J3DShapeInitData>__FPCvUl = .text:0x80337564; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x8033757C; // type:function size:0x18 scope:global align:4 +__dt__18J3DModelLoader_v26Fv = .text:0x80337198; // type:function size:0x5C scope:weak align:4 +__dt__18J3DModelLoader_v21Fv = .text:0x803371F4; // type:function size:0x5C scope:weak align:4 +__dt__14J3DModelLoaderFv = .text:0x80337250; // type:function size:0x48 scope:weak align:4 +readMaterial_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x80337298; // type:function size:0x4 scope:weak align:4 +readMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x8033729C; // type:function size:0x4 scope:weak align:4 +readMaterialTable_v21__14J3DModelLoaderFPC20J3DMaterialBlock_v21Ul = .text:0x803372A0; // type:function size:0x4 scope:weak align:4 +readMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803372A4; // type:function size:0x4 scope:weak align:4 +calcSizeMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803372A8; // type:function size:0x8 scope:weak align:4 +calcSizeMaterialTable__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x803372B0; // type:function size:0x8 scope:weak align:4 +__dt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x803372B8; // type:function size:0x6C scope:weak align:4 +init__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>FRC3VecRA3_A4_Cf = .text:0x80337324; // type:function size:0x48 scope:weak align:4 +calc__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage>Fv = .text:0x8033736C; // type:function size:0x28 scope:weak align:4 +__dt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80337394; // type:function size:0x6C scope:weak align:4 +init__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>FRC3VecRA3_A4_Cf = .text:0x80337400; // type:function size:0x28 scope:weak align:4 +calc__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic>Fv = .text:0x80337428; // type:function size:0x28 scope:weak align:4 +__ct__11J3DMaterialFv = .text:0x80337450; // type:function size:0x54 scope:weak align:4 +__dt__10J3DTextureFv = .text:0x803374A4; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<7ResTIMG>__FPCvPCv = .text:0x803374EC; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x80337504; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvPCv = .text:0x8033751C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<17_GXVtxAttrFmtList>__FPCvPCv = .text:0x80337534; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<17J3DModelHierarchy>__FPCvPCv = .text:0x8033754C; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<16J3DShapeInitData>__FPCvUl = .text:0x80337564; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x8033757C; // type:function size:0x18 scope:weak align:4 countMaterialNum__14J3DModelLoaderFPCv = .text:0x80337594; // type:function size:0x40 scope:global align:4 calcLoadSize__14J3DModelLoaderFPCvUl = .text:0x803375D4; // type:function size:0x1CC scope:global align:4 calcLoadMaterialTableSize__14J3DModelLoaderFPCv = .text:0x803377A0; // type:function size:0xF8 scope:global align:4 @@ -15275,7 +15275,7 @@ calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl = .text:0x80337 calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl = .text:0x80337EA0; // type:function size:0xD8 scope:global align:4 __ct__15J3DJointFactoryFRC13J3DJointBlock = .text:0x80337F78; // type:function size:0x58 scope:global align:4 create__15J3DJointFactoryFi = .text:0x80337FD0; // type:function size:0x168 scope:global align:4 -JSUConvertOffsetToPtr<16J3DJointInitData>__FPCvUl = .text:0x80338138; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr<16J3DJointInitData>__FPCvUl = .text:0x80338138; // type:function size:0x18 scope:weak align:4 __ct__15J3DShapeFactoryFRC13J3DShapeBlock = .text:0x80338150; // type:function size:0xB0 scope:global align:4 create__15J3DShapeFactoryFiUlP14_GXVtxDescList = .text:0x80338200; // type:function size:0x1BC scope:global align:4 newShapeMtx__15J3DShapeFactoryCFUlii = .text:0x803383BC; // type:function size:0x290 scope:global align:4 @@ -15284,10 +15284,10 @@ allocVcdVatCmdBuffer__15J3DShapeFactoryFUl = .text:0x803386D8; // type:function calcSize__15J3DShapeFactoryFiUl = .text:0x80338744; // type:function size:0x94 scope:global align:4 calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl = .text:0x803387D8; // type:function size:0x10 scope:global align:4 calcSizeShapeMtx__15J3DShapeFactoryCFUlii = .text:0x803387E8; // type:function size:0xF8 scope:global align:4 -JSUConvertOffsetToPtr<20J3DShapeDrawInitData>__FPCvUl = .text:0x803388E0; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<19J3DShapeMtxInitData>__FPCvUl = .text:0x803388F8; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr__FPCvUl = .text:0x80338910; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<14_GXVtxDescList>__FPCvUl = .text:0x80338928; // type:function size:0x18 scope:global align:4 +JSUConvertOffsetToPtr<20J3DShapeDrawInitData>__FPCvUl = .text:0x803388E0; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<19J3DShapeMtxInitData>__FPCvUl = .text:0x803388F8; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr__FPCvUl = .text:0x80338910; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<14_GXVtxDescList>__FPCvUl = .text:0x80338928; // type:function size:0x18 scope:weak align:4 load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag = .text:0x80338940; // type:function size:0x5F4 scope:global align:4 setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv = .text:0x80338F34; // type:function size:0x334 scope:global align:4 __ct__20J3DAnmFullLoader_v15Fv = .text:0x80339268; // type:function size:0x1C scope:global align:4 @@ -15322,11 +15322,11 @@ readAnmTevReg__19J3DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData = .text:0x8033A258; setAnmTevReg__19J3DAnmKeyLoader_v15FP15J3DAnmTevRegKeyPC19J3DAnmTevRegKeyData = .text:0x8033A280; // type:function size:0x18C scope:global align:4 readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData = .text:0x8033A40C; // type:function size:0x28 scope:global align:4 setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData = .text:0x8033A434; // type:function size:0x168 scope:global align:4 -__dt__20J3DAnmVisibilityFullFv = .text:0x8033A59C; // type:function size:0x5C scope:global align:4 -getKind__20J3DAnmVisibilityFullCFv = .text:0x8033A5F8; // type:function size:0x8 scope:global align:4 -__dt__12J3DAnmLoaderFv = .text:0x8033A600; // type:function size:0x48 scope:global align:4 -JSUConvertOffsetToPtr<21J3DAnmClusterKeyTable>__FPCvPCv = .text:0x8033A648; // type:function size:0x18 scope:global align:4 -JSUConvertOffsetToPtr<22J3DAnmClusterFullTable>__FPCvPCv = .text:0x8033A660; // type:function size:0x18 scope:global align:4 +__dt__20J3DAnmVisibilityFullFv = .text:0x8033A59C; // type:function size:0x5C scope:weak align:4 +getKind__20J3DAnmVisibilityFullCFv = .text:0x8033A5F8; // type:function size:0x8 scope:weak align:4 +__dt__12J3DAnmLoaderFv = .text:0x8033A600; // type:function size:0x48 scope:weak align:4 +JSUConvertOffsetToPtr<21J3DAnmClusterKeyTable>__FPCvPCv = .text:0x8033A648; // type:function size:0x18 scope:weak align:4 +JSUConvertOffsetToPtr<22J3DAnmClusterFullTable>__FPCvPCv = .text:0x8033A660; // type:function size:0x18 scope:weak align:4 JMAEulerToQuat__FsssP10Quaternion = .text:0x8033A678; // type:function size:0xC0 scope:global align:4 JMAQuatLerp__FPC10QuaternionPC10QuaternionfP10Quaternion = .text:0x8033A738; // type:function size:0xF8 scope:global align:4 JMAFastVECNormalize__FPC3VecP3Vec = .text:0x8033A830; // type:function size:0x2C scope:global align:4 @@ -15334,7 +15334,7 @@ JMAVECScaleAdd__FPC3VecPC3VecP3Vecf = .text:0x8033A85C; // type:function size:0x JMAMTXApplyScale__FPA4_CfPA4_ffff = .text:0x8033A884; // type:function size:0x60 scope:global align:4 __ct__Q25JMath13TRandom_fast_FUl = .text:0x8033A8E4; // type:function size:0x8 scope:global align:4 __sinit_JMATrigonometric_cpp = .text:0x8033A8EC; // type:function size:0x1C4 scope:local align:4 -__ct__Q23std9pairFv = .text:0x8033AAB0; // type:function size:0x10 scope:global align:4 +__ct__Q23std9pairFv = .text:0x8033AAB0; // type:function size:0x10 scope:weak align:4 PPCMfmsr = .text:0x8033AAC0; // type:function size:0x8 scope:global align:4 PPCMtmsr = .text:0x8033AAC8; // type:function size:0x8 scope:global align:4 PPCMfhid0 = .text:0x8033AAD0; // type:function size:0x8 scope:global align:4 @@ -15359,17 +15359,17 @@ PPCDisableSpeculation = .text:0x8033ABA4; // type:function size:0x28 scope:globa PPCSetFpNonIEEEMode = .text:0x8033ABCC; // type:function size:0x8 scope:global align:4 __OSFPRInit = .text:0x8033ABD4; // type:function size:0x128 scope:global align:4 OSGetConsoleType = .text:0x8033ACFC; // type:function size:0x28 scope:global align:4 -InquiryCallback = .text:0x8033AD24; // type:function size:0x3C scope:global align:4 +InquiryCallback = .text:0x8033AD24; // type:function size:0x3C scope:local align:4 OSInit = .text:0x8033AD60; // type:function size:0x4E0 scope:global align:4 -OSExceptionInit = .text:0x8033B240; // type:function size:0x280 scope:global align:4 -__OSDBIntegrator = .text:0x8033B4C0; // type:function size:0x24 scope:global align:4 +OSExceptionInit = .text:0x8033B240; // type:function size:0x280 scope:local align:4 +__OSDBIntegrator = .text:0x8033B4C0; // type:function size:0x24 scope:local align:4 __OSDBINTSTART = .text:0x8033B4C0; // type:label scope:global align:4 -__OSDBJump = .text:0x8033B4E4; // type:function size:0x4 scope:global align:4 +__OSDBJump = .text:0x8033B4E4; // type:function size:0x4 scope:local align:4 __OSDBJUMPSTART = .text:0x8033B4E4; // type:label scope:global align:4 __OSSetExceptionHandler = .text:0x8033B4E8; // type:function size:0x1C scope:global align:4 __OSDBJUMPEND = .text:0x8033B4E8; // type:label scope:global align:4 __OSGetExceptionHandler = .text:0x8033B504; // type:function size:0x14 scope:global align:4 -OSExceptionVector = .text:0x8033B518; // type:function size:0x9C scope:global align:4 +OSExceptionVector = .text:0x8033B518; // type:function size:0x9C scope:local align:4 __OSEVStart = .text:0x8033B518; // type:label scope:global align:4 __DBVECTOR = .text:0x8033B570; // type:label scope:global align:4 data:4byte __OSEVSetNumber = .text:0x8033B580; // type:label scope:global align:4 data:4byte @@ -15380,14 +15380,14 @@ __OSGetDIConfig = .text:0x8033B660; // type:function size:0x14 scope:global alig OSRegisterVersion = .text:0x8033B674; // type:function size:0x2C scope:global align:4 OSInitAlarm = .text:0x8033B6A0; // type:function size:0x58 scope:global align:4 OSCreateAlarm = .text:0x8033B6F8; // type:function size:0x10 scope:global align:4 -InsertAlarm = .text:0x8033B708; // type:function size:0x250 scope:global align:4 +InsertAlarm = .text:0x8033B708; // type:function size:0x250 scope:local align:4 OSSetAlarm = .text:0x8033B958; // type:function size:0x68 scope:global align:4 OSSetPeriodicAlarm = .text:0x8033B9C0; // type:function size:0x7C scope:global align:4 OSCancelAlarm = .text:0x8033BA3C; // type:function size:0x11C scope:global align:4 -DecrementerExceptionCallback = .text:0x8033BB58; // type:function size:0x230 scope:global align:4 -DecrementerExceptionHandler = .text:0x8033BD88; // type:function size:0x50 scope:global align:4 +DecrementerExceptionCallback = .text:0x8033BB58; // type:function size:0x230 scope:local align:4 +DecrementerExceptionHandler = .text:0x8033BD88; // type:function size:0x50 scope:local align:4 OnReset = .text:0x8033BDD8; // type:function size:0xA0 scope:local align:4 -DLInsert = .text:0x8033BE78; // type:function size:0xAC scope:global align:4 +DLInsert = .text:0x8033BE78; // type:function size:0xAC scope:local align:4 OSFreeToHeap = .text:0x8033BF24; // type:function size:0x7C scope:global align:4 OSSetCurrentHeap = .text:0x8033BFA0; // type:function size:0x10 scope:global align:4 OSInitAlloc = .text:0x8033BFB0; // type:function size:0x70 scope:global align:4 @@ -15409,7 +15409,7 @@ DCZeroRange = .text:0x8033C464; // type:function size:0x2C scope:global align:4 ICInvalidateRange = .text:0x8033C490; // type:function size:0x34 scope:global align:4 ICFlashInvalidate = .text:0x8033C4C4; // type:function size:0x10 scope:global align:4 ICEnable = .text:0x8033C4D4; // type:function size:0x14 scope:global align:4 -__LCEnable = .text:0x8033C4E8; // type:function size:0xCC scope:global align:4 +__LCEnable = .text:0x8033C4E8; // type:function size:0xCC scope:local align:4 LCEnable = .text:0x8033C5B4; // type:function size:0x38 scope:global align:4 LCDisable = .text:0x8033C5EC; // type:function size:0x28 scope:global align:4 LCStoreBlocks = .text:0x8033C614; // type:function size:0x24 scope:global align:4 @@ -15418,8 +15418,8 @@ LCQueueWait = .text:0x8033C6E4; // type:function size:0x14 scope:global align:4 L2GlobalInvalidate = .text:0x8033C6F8; // type:function size:0x98 scope:global align:4 DMAErrorHandler = .text:0x8033C790; // type:function size:0x160 scope:global align:4 __OSCacheInit = .text:0x8033C8F0; // type:function size:0xF4 scope:global align:4 -__OSLoadFPUContext = .text:0x8033C9E4; // type:function size:0x124 scope:global align:4 -__OSSaveFPUContext = .text:0x8033CB08; // type:function size:0x128 scope:global align:4 +__OSLoadFPUContext = .text:0x8033C9E4; // type:function size:0x124 scope:local align:4 +__OSSaveFPUContext = .text:0x8033CB08; // type:function size:0x128 scope:local align:4 OSSaveFPUContext = .text:0x8033CC30; // type:function size:0x8 scope:global align:4 OSSetCurrentContext = .text:0x8033CC38; // type:function size:0x5C scope:global align:4 OSGetCurrentContext = .text:0x8033CC94; // type:function size:0xC scope:global align:4 @@ -15429,22 +15429,22 @@ OSGetStackPointer = .text:0x8033CDF8; // type:function size:0x8 scope:global ali OSClearContext = .text:0x8033CE00; // type:function size:0x24 scope:global align:4 OSInitContext = .text:0x8033CE24; // type:function size:0xBC scope:global align:4 OSDumpContext = .text:0x8033CEE0; // type:function size:0x2A8 scope:global align:4 -OSSwitchFPUContext = .text:0x8033D188; // type:function size:0x84 scope:global align:4 +OSSwitchFPUContext = .text:0x8033D188; // type:function size:0x84 scope:local align:4 __OSContextInit = .text:0x8033D20C; // type:function size:0x48 scope:global align:4 OSFillFPUContext = .text:0x8033D254; // type:function size:0x12C scope:global align:4 OSSetErrorHandler = .text:0x8033D380; // type:function size:0x218 scope:global align:4 __OSUnhandledException = .text:0x8033D598; // type:function size:0x2E8 scope:global align:4 -PackArgs = .text:0x8033D880; // type:function size:0x188 scope:global align:4 -Run = .text:0x8033DA08; // type:function size:0x3C scope:global align:4 -ReadDisc = .text:0x8033DA44; // type:function size:0x6C scope:global align:4 +PackArgs = .text:0x8033D880; // type:function size:0x188 scope:local align:4 +Run = .text:0x8033DA08; // type:function size:0x3C scope:local align:4 +ReadDisc = .text:0x8033DA44; // type:function size:0x6C scope:local align:4 Callback = .text:0x8033DAB0; // type:function size:0xC scope:local align:4 __OSGetExecParams = .text:0x8033DABC; // type:function size:0x40 scope:global align:4 -GetApploaderPosition = .text:0x8033DAFC; // type:function size:0xC4 scope:global align:4 +GetApploaderPosition = .text:0x8033DAFC; // type:function size:0xC4 scope:local align:4 __OSBootDolSimple = .text:0x8033DBC0; // type:function size:0x484 scope:global align:4 __OSBootDol = .text:0x8033E044; // type:function size:0x19C scope:global align:4 -GetFontCode = .text:0x8033E1E0; // type:function size:0x174 scope:global align:4 +GetFontCode = .text:0x8033E1E0; // type:function size:0x174 scope:local align:4 OSGetFontEncode = .text:0x8033E354; // type:function size:0x64 scope:global align:4 -ParseStringS = .text:0x8033E3B8; // type:function size:0x13C scope:global align:4 +ParseStringS = .text:0x8033E3B8; // type:function size:0x13C scope:local align:4 OSDisableInterrupts = .text:0x8033E4F4; // type:function size:0x14 scope:global align:4 __RAS_OSDisableInterrupts_begin = .text:0x8033E4F4; // type:label scope:global align:4 __RAS_OSDisableInterrupts_end = .text:0x8033E500; // type:label scope:global align:4 @@ -15453,19 +15453,19 @@ OSRestoreInterrupts = .text:0x8033E51C; // type:function size:0x24 scope:global __OSSetInterruptHandler = .text:0x8033E540; // type:function size:0x1C scope:global align:4 __OSGetInterruptHandler = .text:0x8033E55C; // type:function size:0x14 scope:global align:4 __OSInterruptInit = .text:0x8033E570; // type:function size:0x74 scope:global align:4 -SetInterruptMask = .text:0x8033E5E4; // type:function size:0x2D8 scope:global align:4 +SetInterruptMask = .text:0x8033E5E4; // type:function size:0x2D8 scope:local align:4 __OSMaskInterrupts = .text:0x8033E8BC; // type:function size:0x88 scope:global align:4 __OSUnmaskInterrupts = .text:0x8033E944; // type:function size:0x88 scope:global align:4 __OSDispatchInterrupt = .text:0x8033E9CC; // type:function size:0x344 scope:global align:4 -ExternalInterruptHandler = .text:0x8033ED10; // type:function size:0x50 scope:global align:4 +ExternalInterruptHandler = .text:0x8033ED10; // type:function size:0x50 scope:local align:4 OSNotifyLink = .text:0x8033ED60; // type:function size:0x4 scope:global align:4 OSNotifyUnlink = .text:0x8033ED64; // type:function size:0x4 scope:global align:4 OSSetStringTable = .text:0x8033ED68; // type:function size:0xC scope:global align:4 -Relocate = .text:0x8033ED74; // type:function size:0x2BC scope:global align:4 -Link = .text:0x8033F030; // type:function size:0x2E0 scope:global align:4 +Relocate = .text:0x8033ED74; // type:function size:0x2BC scope:local align:4 +Link = .text:0x8033F030; // type:function size:0x2E0 scope:local align:4 OSLink = .text:0x8033F310; // type:function size:0x24 scope:global align:4 OSLinkFixed = .text:0x8033F334; // type:function size:0x3C scope:global align:4 -Undo = .text:0x8033F370; // type:function size:0x238 scope:global align:4 +Undo = .text:0x8033F370; // type:function size:0x238 scope:local align:4 OSUnlink = .text:0x8033F5A8; // type:function size:0x1D4 scope:global align:4 __OSModuleInit = .text:0x8033F77C; // type:function size:0x18 scope:global align:4 OSInitMessageQueue = .text:0x8033F794; // type:function size:0x60 scope:global align:4 @@ -15473,11 +15473,11 @@ OSSendMessage = .text:0x8033F7F4; // type:function size:0xC8 scope:global align: OSReceiveMessage = .text:0x8033F8BC; // type:function size:0xDC scope:global align:4 OSJamMessage = .text:0x8033F998; // type:function size:0xD4 scope:global align:4 OnReset = .text:0x8033FA6C; // type:function size:0x3C scope:local align:4 -MEMIntrruptHandler = .text:0x8033FAA8; // type:function size:0x6C scope:global align:4 +MEMIntrruptHandler = .text:0x8033FAA8; // type:function size:0x6C scope:local align:4 OSProtectRange = .text:0x8033FB14; // type:function size:0xC4 scope:global align:4 -Config24MB = .text:0x8033FBD8; // type:function size:0x80 scope:global align:4 -Config48MB = .text:0x8033FC58; // type:function size:0x80 scope:global align:4 -RealMode = .text:0x8033FCD8; // type:function size:0x18 scope:global align:4 +Config24MB = .text:0x8033FBD8; // type:function size:0x80 scope:local align:4 +Config48MB = .text:0x8033FC58; // type:function size:0x80 scope:local align:4 +RealMode = .text:0x8033FCD8; // type:function size:0x18 scope:local align:4 __OSInitMemoryProtection = .text:0x8033FCF0; // type:function size:0x118 scope:global align:4 OSInitMutex = .text:0x8033FE08; // type:function size:0x38 scope:global align:4 OSLockMutex = .text:0x8033FE40; // type:function size:0xDC scope:global align:4 @@ -15495,20 +15495,20 @@ OSSetSaveRegion = .text:0x80340440; // type:function size:0xC scope:global align OSGetSaveRegion = .text:0x8034044C; // type:function size:0x14 scope:global align:4 OSRegisterResetFunction = .text:0x80340460; // type:function size:0x84 scope:global align:4 __OSCallResetFunctions = .text:0x803404E4; // type:function size:0xA8 scope:global align:4 -Reset = .text:0x8034058C; // type:function size:0x70 scope:global align:4 -KillThreads = .text:0x803405FC; // type:function size:0x68 scope:global align:4 +Reset = .text:0x8034058C; // type:function size:0x70 scope:local align:4 +KillThreads = .text:0x803405FC; // type:function size:0x68 scope:local align:4 __OSDoHotReset = .text:0x80340664; // type:function size:0x48 scope:global align:4 OSResetSystem = .text:0x803406AC; // type:function size:0x200 scope:global align:4 OSGetResetCode = .text:0x803408AC; // type:function size:0x38 scope:global align:4 __OSResetSWInterruptHandler = .text:0x803408E4; // type:function size:0xF4 scope:global align:4 OSGetResetButtonState = .text:0x803409D8; // type:function size:0x298 scope:global align:4 OSGetResetSwitchState = .text:0x80340C70; // type:function size:0x20 scope:global align:4 -WriteSramCallback = .text:0x80340C90; // type:function size:0x60 scope:global align:4 -WriteSram = .text:0x80340CF0; // type:function size:0x118 scope:global align:4 +WriteSramCallback = .text:0x80340C90; // type:function size:0x60 scope:local align:4 +WriteSram = .text:0x80340CF0; // type:function size:0x118 scope:local align:4 __OSInitSram = .text:0x80340E08; // type:function size:0x13C scope:global align:4 __OSLockSram = .text:0x80340F44; // type:function size:0x5C scope:global align:4 __OSLockSramEx = .text:0x80340FA0; // type:function size:0x5C scope:global align:4 -UnlockSram = .text:0x80340FFC; // type:function size:0x33C scope:global align:4 +UnlockSram = .text:0x80340FFC; // type:function size:0x33C scope:local align:4 __OSUnlockSram = .text:0x80341338; // type:function size:0x24 scope:global align:4 __OSUnlockSramEx = .text:0x8034135C; // type:function size:0x24 scope:global align:4 __OSSyncSram = .text:0x80341380; // type:function size:0x10 scope:global align:4 @@ -15521,11 +15521,11 @@ OSGetWirelessID = .text:0x80341634; // type:function size:0x84 scope:global alig OSSetWirelessID = .text:0x803416B8; // type:function size:0xAC scope:global align:4 OSGetGbsMode = .text:0x80341764; // type:function size:0x70 scope:global align:4 OSSetGbsMode = .text:0x803417D4; // type:function size:0xB8 scope:global align:4 -SystemCallVector = .text:0x8034188C; // type:function size:0x20 scope:global align:4 +SystemCallVector = .text:0x8034188C; // type:function size:0x20 scope:local align:4 __OSSystemCallVectorStart = .text:0x8034188C; // type:label scope:global align:4 __OSSystemCallVectorEnd = .text:0x803418A8; // type:label scope:global align:4 __OSInitSystemCall = .text:0x803418AC; // type:function size:0x64 scope:global align:4 -DefaultSwitchThreadCallback = .text:0x80341910; // type:function size:0x4 scope:global align:4 +DefaultSwitchThreadCallback = .text:0x80341910; // type:function size:0x4 scope:local align:4 OSSetSwitchThreadCallback = .text:0x80341914; // type:function size:0x74 scope:global align:4 __OSThreadInit = .text:0x80341988; // type:function size:0x158 scope:global align:4 OSInitThreadQueue = .text:0x80341AE0; // type:function size:0x10 scope:global align:4 @@ -15533,11 +15533,11 @@ OSGetCurrentThread = .text:0x80341AF0; // type:function size:0xC scope:global al OSIsThreadTerminated = .text:0x80341AFC; // type:function size:0x34 scope:global align:4 OSDisableScheduler = .text:0x80341B30; // type:function size:0x40 scope:global align:4 OSEnableScheduler = .text:0x80341B70; // type:function size:0x40 scope:global align:4 -UnsetRun = .text:0x80341BB0; // type:function size:0x68 scope:global align:4 +UnsetRun = .text:0x80341BB0; // type:function size:0x68 scope:local align:4 __OSGetEffectivePriority = .text:0x80341C18; // type:function size:0x3C scope:global align:4 -SetEffectivePriority = .text:0x80341C54; // type:function size:0x1C0 scope:global align:4 +SetEffectivePriority = .text:0x80341C54; // type:function size:0x1C0 scope:local align:4 __OSPromoteThread = .text:0x80341E14; // type:function size:0x50 scope:global align:4 -SelectThread = .text:0x80341E64; // type:function size:0x228 scope:global align:4 +SelectThread = .text:0x80341E64; // type:function size:0x228 scope:local align:4 __OSReschedule = .text:0x8034208C; // type:function size:0x30 scope:global align:4 OSYieldThread = .text:0x803420BC; // type:function size:0x3C scope:global align:4 OSCreateThread = .text:0x803420F8; // type:function size:0x1E8 scope:global align:4 @@ -15550,65 +15550,65 @@ OSSleepThread = .text:0x80342A18; // type:function size:0xEC scope:global align: OSWakeupThread = .text:0x80342B04; // type:function size:0x104 scope:global align:4 OSSetThreadPriority = .text:0x80342C08; // type:function size:0xC0 scope:global align:4 OSGetThreadPriority = .text:0x80342CC8; // type:function size:0x8 scope:global align:4 -CheckThreadQueue = .text:0x80342CD0; // type:function size:0x9C scope:global align:4 +CheckThreadQueue = .text:0x80342CD0; // type:function size:0x9C scope:local align:4 OSCheckActiveThreads = .text:0x80342D6C; // type:function size:0x750 scope:global align:4 OSClearStack = .text:0x803434BC; // type:function size:0xAC scope:global align:4 OSGetTime = .text:0x80343568; // type:function size:0x18 scope:global align:4 OSGetTick = .text:0x80343580; // type:function size:0x8 scope:global align:4 __OSGetSystemTime = .text:0x80343588; // type:function size:0x64 scope:global align:4 __OSTimeToSystemTime = .text:0x803435EC; // type:function size:0x58 scope:global align:4 -GetDates = .text:0x80343644; // type:function size:0x19C scope:global align:4 +GetDates = .text:0x80343644; // type:function size:0x19C scope:local align:4 OSTicksToCalendarTime = .text:0x803437E0; // type:function size:0x204 scope:global align:4 __init_user = .text:0x803439E4; // type:function size:0x20 scope:global align:4 __init_cpp = .text:0x80343A04; // type:function size:0x54 scope:global align:4 _ExitProcess = .text:0x80343A58; // type:function size:0x20 scope:global align:4 -SetExiInterruptMask = .text:0x80343A78; // type:function size:0xF4 scope:global align:4 +SetExiInterruptMask = .text:0x80343A78; // type:function size:0xF4 scope:local align:4 EXIImm = .text:0x80343B6C; // type:function size:0x25C scope:global align:4 EXIImmEx = .text:0x80343DC8; // type:function size:0xA0 scope:global align:4 EXIDma = .text:0x80343E68; // type:function size:0xEC scope:global align:4 EXISync = .text:0x80343F54; // type:function size:0x24C scope:global align:4 EXIClearInterrupts = .text:0x803441A0; // type:function size:0x48 scope:global align:4 EXISetExiCallback = .text:0x803441E8; // type:function size:0x7C scope:global align:4 -__EXIProbe = .text:0x80344264; // type:function size:0x174 scope:global align:4 +__EXIProbe = .text:0x80344264; // type:function size:0x174 scope:local align:4 EXIProbe = .text:0x803443D8; // type:function size:0x80 scope:global align:4 EXIProbeEx = .text:0x80344458; // type:function size:0xB4 scope:global align:4 EXIAttach = .text:0x8034450C; // type:function size:0x10C scope:global align:4 EXIDetach = .text:0x80344618; // type:function size:0xBC scope:global align:4 EXISelect = .text:0x803446D4; // type:function size:0x12C scope:global align:4 EXIDeselect = .text:0x80344800; // type:function size:0x110 scope:global align:4 -EXIIntrruptHandler = .text:0x80344910; // type:function size:0xC8 scope:global align:4 -TCIntrruptHandler = .text:0x803449D8; // type:function size:0x218 scope:global align:4 -EXTIntrruptHandler = .text:0x80344BF0; // type:function size:0xD0 scope:global align:4 +EXIIntrruptHandler = .text:0x80344910; // type:function size:0xC8 scope:local align:4 +TCIntrruptHandler = .text:0x803449D8; // type:function size:0x218 scope:local align:4 +EXTIntrruptHandler = .text:0x80344BF0; // type:function size:0xD0 scope:local align:4 EXIInit = .text:0x80344CC0; // type:function size:0x1D4 scope:global align:4 EXILock = .text:0x80344E94; // type:function size:0xF4 scope:global align:4 EXIUnlock = .text:0x80344F88; // type:function size:0xDC scope:global align:4 EXIGetState = .text:0x80345064; // type:function size:0x18 scope:global align:4 -UnlockedHandler = .text:0x8034507C; // type:function size:0x28 scope:global align:4 +UnlockedHandler = .text:0x8034507C; // type:function size:0x28 scope:local align:4 EXIGetID = .text:0x803450A4; // type:function size:0x3B0 scope:global align:4 -ProbeBarnacle = .text:0x80345454; // type:function size:0x18C scope:global align:4 +ProbeBarnacle = .text:0x80345454; // type:function size:0x18C scope:local align:4 __OSEnableBarnacle = .text:0x803455E0; // type:function size:0x1BC scope:global align:4 InitializeUART = .text:0x8034579C; // type:function size:0x70 scope:global align:4 WriteUARTN = .text:0x8034580C; // type:function size:0x200 scope:global align:4 SIBusy = .text:0x80345A0C; // type:function size:0x20 scope:global align:4 SIIsChanBusy = .text:0x80345A2C; // type:function size:0x3C scope:global align:4 -CompleteTransfer = .text:0x80345A68; // type:function size:0x2FC scope:global align:4 -SIInterruptHandler = .text:0x80345D64; // type:function size:0x344 scope:global align:4 -SIEnablePollingInterrupt = .text:0x803460A8; // type:function size:0x98 scope:global align:4 +CompleteTransfer = .text:0x80345A68; // type:function size:0x2FC scope:local align:4 +SIInterruptHandler = .text:0x80345D64; // type:function size:0x344 scope:local align:4 +SIEnablePollingInterrupt = .text:0x803460A8; // type:function size:0x98 scope:local align:4 SIRegisterPollingHandler = .text:0x80346140; // type:function size:0xCC scope:global align:4 SIUnregisterPollingHandler = .text:0x8034620C; // type:function size:0xF4 scope:global align:4 SIInit = .text:0x80346300; // type:function size:0xB4 scope:global align:4 -__SITransfer = .text:0x803463B4; // type:function size:0x20C scope:global align:4 +__SITransfer = .text:0x803463B4; // type:function size:0x20C scope:local align:4 SIGetStatus = .text:0x803465C0; // type:function size:0x7C scope:global align:4 SISetCommand = .text:0x8034663C; // type:function size:0x14 scope:global align:4 SITransferCommands = .text:0x80346650; // type:function size:0x10 scope:global align:4 SISetXY = .text:0x80346660; // type:function size:0x6C scope:global align:4 SIEnablePolling = .text:0x803466CC; // type:function size:0x9C scope:global align:4 SIDisablePolling = .text:0x80346768; // type:function size:0x6C scope:global align:4 -SIGetResponseRaw = .text:0x803467D4; // type:function size:0xD4 scope:global align:4 +SIGetResponseRaw = .text:0x803467D4; // type:function size:0xD4 scope:local align:4 SIGetResponse = .text:0x803468A8; // type:function size:0xC4 scope:global align:4 AlarmHandler = .text:0x8034696C; // type:function size:0x8C scope:local align:4 SITransfer = .text:0x803469F8; // type:function size:0x16C scope:global align:4 -GetTypeCallback = .text:0x80346B64; // type:function size:0x298 scope:global align:4 +GetTypeCallback = .text:0x80346B64; // type:function size:0x298 scope:local align:4 SIGetType = .text:0x80346DFC; // type:function size:0x1C4 scope:global align:4 SIGetTypeAsync = .text:0x80346FC0; // type:function size:0x13C scope:global align:4 SISetSamplingRate = .text:0x803470FC; // type:function size:0xE4 scope:global align:4 @@ -15624,7 +15624,7 @@ PSMTXConcat = .text:0x80347350; // type:function size:0xCC scope:global align:4 PSMTXInverse = .text:0x8034741C; // type:function size:0xF8 scope:global align:4 PSMTXRotRad = .text:0x80347514; // type:function size:0x70 scope:global align:4 PSMTXRotTrig = .text:0x80347584; // type:function size:0xB0 scope:global align:4 -__PSMTXRotAxisRadInternal = .text:0x80347634; // type:function size:0xB0 scope:global align:4 +__PSMTXRotAxisRadInternal = .text:0x80347634; // type:function size:0xB0 scope:local align:4 PSMTXRotAxisRad = .text:0x803476E4; // type:function size:0x70 scope:global align:4 PSMTXTrans = .text:0x80347754; // type:function size:0x34 scope:global align:4 PSMTXTransApply = .text:0x80347788; // type:function size:0x4C scope:global align:4 @@ -15658,9 +15658,9 @@ C_QUATSlerp = .text:0x8034836C; // type:function size:0x174 scope:global align:4 __DVDInitWA = .text:0x803484E0; // type:function size:0x40 scope:global align:4 __DVDInterruptHandler = .text:0x80348520; // type:function size:0x2E0 scope:global align:4 AlarmHandler = .text:0x80348800; // type:function size:0x84 scope:local align:4 -AlarmHandlerForTimeout = .text:0x80348884; // type:function size:0x70 scope:global align:4 -Read = .text:0x803488F4; // type:function size:0x110 scope:global align:4 -SeekTwiceBeforeRead = .text:0x80348A04; // type:function size:0x80 scope:global align:4 +AlarmHandlerForTimeout = .text:0x80348884; // type:function size:0x70 scope:local align:4 +Read = .text:0x803488F4; // type:function size:0x110 scope:local align:4 +SeekTwiceBeforeRead = .text:0x80348A04; // type:function size:0x80 scope:local align:4 DVDLowRead = .text:0x80348A84; // type:function size:0x298 scope:global align:4 DVDLowSeek = .text:0x80348D1C; // type:function size:0x94 scope:global align:4 DVDLowWaitCoverClose = .text:0x80348DB0; // type:function size:0x2C scope:global align:4 @@ -15681,47 +15681,47 @@ DVDConvertPathToEntrynum = .text:0x80349394; // type:function size:0x2F4 scope:g DVDFastOpen = .text:0x80349688; // type:function size:0x74 scope:global align:4 DVDOpen = .text:0x803496FC; // type:function size:0xC8 scope:global align:4 DVDClose = .text:0x803497C4; // type:function size:0x24 scope:global align:4 -entryToPath = .text:0x803497E8; // type:function size:0x160 scope:global align:4 -DVDConvertEntrynumToPath = .text:0x80349948; // type:function size:0x154 scope:global align:4 +entryToPath = .text:0x803497E8; // type:function size:0x160 scope:local align:4 +DVDConvertEntrynumToPath = .text:0x80349948; // type:function size:0x154 scope:local align:4 DVDGetCurrentDir = .text:0x80349A9C; // type:function size:0xC4 scope:global align:4 DVDChangeDir = .text:0x80349B60; // type:function size:0x60 scope:global align:4 DVDReadAsyncPrio = .text:0x80349BC0; // type:function size:0xC0 scope:global align:4 -cbForReadAsync = .text:0x80349C80; // type:function size:0x30 scope:global align:4 +cbForReadAsync = .text:0x80349C80; // type:function size:0x30 scope:local align:4 DVDReadPrio = .text:0x80349CB0; // type:function size:0x118 scope:global align:4 -cbForReadSync = .text:0x80349DC8; // type:function size:0x24 scope:global align:4 +cbForReadSync = .text:0x80349DC8; // type:function size:0x24 scope:local align:4 DVDOpenDir = .text:0x80349DEC; // type:function size:0xC0 scope:global align:4 DVDReadDir = .text:0x80349EAC; // type:function size:0xA4 scope:global align:4 DVDCloseDir = .text:0x80349F50; // type:function size:0x8 scope:global align:4 -defaultOptionalCommandChecker = .text:0x80349F58; // type:function size:0x4 scope:global align:4 +defaultOptionalCommandChecker = .text:0x80349F58; // type:function size:0x4 scope:local align:4 DVDInit = .text:0x80349F5C; // type:function size:0xD8 scope:global align:4 -stateReadingFST = .text:0x8034A034; // type:function size:0x94 scope:global align:4 -cbForStateReadingFST = .text:0x8034A0C8; // type:function size:0x80 scope:global align:4 -cbForStateError = .text:0x8034A148; // type:function size:0xAC scope:global align:4 -stateTimeout = .text:0x8034A1F4; // type:function size:0x34 scope:global align:4 -stateGettingError = .text:0x8034A228; // type:function size:0x28 scope:global align:4 -CategorizeError = .text:0x8034A250; // type:function size:0xB4 scope:global align:4 -cbForStateGettingError = .text:0x8034A304; // type:function size:0x264 scope:global align:4 -cbForUnrecoveredError = .text:0x8034A568; // type:function size:0x5C scope:global align:4 -cbForUnrecoveredErrorRetry = .text:0x8034A5C4; // type:function size:0x80 scope:global align:4 -stateGoToRetry = .text:0x8034A644; // type:function size:0x28 scope:global align:4 -cbForStateGoToRetry = .text:0x8034A66C; // type:function size:0x140 scope:global align:4 -stateCheckID = .text:0x8034A7AC; // type:function size:0xE0 scope:global align:4 -stateCheckID3 = .text:0x8034A88C; // type:function size:0x34 scope:global align:4 -stateCheckID2a = .text:0x8034A8C0; // type:function size:0x34 scope:global align:4 -cbForStateCheckID2a = .text:0x8034A8F4; // type:function size:0x68 scope:global align:4 -stateCheckID2 = .text:0x8034A95C; // type:function size:0x38 scope:global align:4 -cbForStateCheckID1 = .text:0x8034A994; // type:function size:0xFC scope:global align:4 -cbForStateCheckID2 = .text:0x8034AA90; // type:function size:0xD8 scope:global align:4 -cbForStateCheckID3 = .text:0x8034AB68; // type:function size:0xF0 scope:global align:4 +stateReadingFST = .text:0x8034A034; // type:function size:0x94 scope:local align:4 +cbForStateReadingFST = .text:0x8034A0C8; // type:function size:0x80 scope:local align:4 +cbForStateError = .text:0x8034A148; // type:function size:0xAC scope:local align:4 +stateTimeout = .text:0x8034A1F4; // type:function size:0x34 scope:local align:4 +stateGettingError = .text:0x8034A228; // type:function size:0x28 scope:local align:4 +CategorizeError = .text:0x8034A250; // type:function size:0xB4 scope:local align:4 +cbForStateGettingError = .text:0x8034A304; // type:function size:0x264 scope:local align:4 +cbForUnrecoveredError = .text:0x8034A568; // type:function size:0x5C scope:local align:4 +cbForUnrecoveredErrorRetry = .text:0x8034A5C4; // type:function size:0x80 scope:local align:4 +stateGoToRetry = .text:0x8034A644; // type:function size:0x28 scope:local align:4 +cbForStateGoToRetry = .text:0x8034A66C; // type:function size:0x140 scope:local align:4 +stateCheckID = .text:0x8034A7AC; // type:function size:0xE0 scope:local align:4 +stateCheckID3 = .text:0x8034A88C; // type:function size:0x34 scope:local align:4 +stateCheckID2a = .text:0x8034A8C0; // type:function size:0x34 scope:local align:4 +cbForStateCheckID2a = .text:0x8034A8F4; // type:function size:0x68 scope:local align:4 +stateCheckID2 = .text:0x8034A95C; // type:function size:0x38 scope:local align:4 +cbForStateCheckID1 = .text:0x8034A994; // type:function size:0xFC scope:local align:4 +cbForStateCheckID2 = .text:0x8034AA90; // type:function size:0xD8 scope:local align:4 +cbForStateCheckID3 = .text:0x8034AB68; // type:function size:0xF0 scope:local align:4 AlarmHandler = .text:0x8034AC58; // type:function size:0x44 scope:local align:4 -stateCoverClosed = .text:0x8034AC9C; // type:function size:0xD4 scope:global align:4 -stateCoverClosed_CMD = .text:0x8034AD70; // type:function size:0x30 scope:global align:4 -cbForStateCoverClosed = .text:0x8034ADA0; // type:function size:0x64 scope:global align:4 -stateMotorStopped = .text:0x8034AE04; // type:function size:0x28 scope:global align:4 -cbForStateMotorStopped = .text:0x8034AE2C; // type:function size:0xEC scope:global align:4 -stateReady = .text:0x8034AF18; // type:function size:0x2E8 scope:global align:4 -stateBusy = .text:0x8034B200; // type:function size:0x340 scope:global align:4 -cbForStateBusy = .text:0x8034B540; // type:function size:0x658 scope:global align:4 +stateCoverClosed = .text:0x8034AC9C; // type:function size:0xD4 scope:local align:4 +stateCoverClosed_CMD = .text:0x8034AD70; // type:function size:0x30 scope:local align:4 +cbForStateCoverClosed = .text:0x8034ADA0; // type:function size:0x64 scope:local align:4 +stateMotorStopped = .text:0x8034AE04; // type:function size:0x28 scope:local align:4 +cbForStateMotorStopped = .text:0x8034AE2C; // type:function size:0xEC scope:local align:4 +stateReady = .text:0x8034AF18; // type:function size:0x2E8 scope:local align:4 +stateBusy = .text:0x8034B200; // type:function size:0x340 scope:local align:4 +cbForStateBusy = .text:0x8034B540; // type:function size:0x658 scope:local align:4 DVDReadAbsAsyncPrio = .text:0x8034BB98; // type:function size:0xDC scope:global align:4 DVDReadAbsAsyncForBS = .text:0x8034BC74; // type:function size:0xD0 scope:global align:4 DVDReadDiskID = .text:0x8034BD44; // type:function size:0xD4 scope:global align:4 @@ -15734,7 +15734,7 @@ DVDSetAutoInvalidation = .text:0x8034C0E0; // type:function size:0x10 scope:glob DVDResume = .text:0x8034C0F0; // type:function size:0x50 scope:global align:4 DVDCancelAsync = .text:0x8034C140; // type:function size:0x27C scope:global align:4 DVDCancel = .text:0x8034C3BC; // type:function size:0xAC scope:global align:4 -cbForCancelSync = .text:0x8034C468; // type:function size:0x24 scope:global align:4 +cbForCancelSync = .text:0x8034C468; // type:function size:0x24 scope:local align:4 DVDGetCurrentDiskID = .text:0x8034C48C; // type:function size:0x8 scope:global align:4 DVDCheckDisk = .text:0x8034C494; // type:function size:0xF8 scope:global align:4 __DVDPrepareResetAsync = .text:0x8034C58C; // type:function size:0x11C scope:global align:4 @@ -15744,21 +15744,21 @@ __DVDPushWaitingQueue = .text:0x8034C718; // type:function size:0x68 scope:globa __DVDPopWaitingQueue = .text:0x8034C780; // type:function size:0xA0 scope:global align:4 __DVDCheckWaitingQueue = .text:0x8034C820; // type:function size:0x58 scope:global align:4 __DVDDequeueWaitingQueue = .text:0x8034C878; // type:function size:0x60 scope:global align:4 -ErrorCode2Num = .text:0x8034C8D8; // type:function size:0x11C scope:global align:4 +ErrorCode2Num = .text:0x8034C8D8; // type:function size:0x11C scope:local align:4 __DVDStoreErrorCode = .text:0x8034C9F4; // type:function size:0x7C scope:global align:4 DVDCompareDiskID = .text:0x8034CA70; // type:function size:0xF8 scope:global align:4 __DVDPrintFatalMessage = .text:0x8034CB68; // type:function size:0x30 scope:global align:4 -cb = .text:0x8034CB98; // type:function size:0xD8 scope:global align:4 +cb = .text:0x8034CB98; // type:function size:0xD8 scope:local align:4 __fstLoad = .text:0x8034CC70; // type:function size:0x168 scope:global align:4 -__VIRetraceHandler = .text:0x8034CDD8; // type:function size:0x274 scope:global align:4 +__VIRetraceHandler = .text:0x8034CDD8; // type:function size:0x274 scope:local align:4 VISetPreRetraceCallback = .text:0x8034D04C; // type:function size:0x44 scope:global align:4 VISetPostRetraceCallback = .text:0x8034D090; // type:function size:0x44 scope:global align:4 -getTiming = .text:0x8034D0D4; // type:function size:0xA8 scope:global align:4 +getTiming = .text:0x8034D0D4; // type:function size:0xA8 scope:local align:4 __VIInit = .text:0x8034D17C; // type:function size:0x204 scope:global align:4 VIInit = .text:0x8034D380; // type:function size:0x4B0 scope:global align:4 VIWaitForRetrace = .text:0x8034D830; // type:function size:0x54 scope:global align:4 -setFbbRegs = .text:0x8034D884; // type:function size:0x2D4 scope:global align:4 -setVerticalRegs = .text:0x8034DB58; // type:function size:0x1A0 scope:global align:4 +setFbbRegs = .text:0x8034D884; // type:function size:0x2D4 scope:local align:4 +setVerticalRegs = .text:0x8034DB58; // type:function size:0x1A0 scope:local align:4 VIConfigure = .text:0x8034DCF8; // type:function size:0x808 scope:global align:4 VIFlush = .text:0x8034E500; // type:function size:0x130 scope:global align:4 VISetNextFrameBuffer = .text:0x8034E630; // type:function size:0x6C scope:global align:4 @@ -15766,35 +15766,35 @@ VIGetNextFrameBuffer = .text:0x8034E69C; // type:function size:0x8 scope:global VIGetCurrentFrameBuffer = .text:0x8034E6A4; // type:function size:0x8 scope:global align:4 VISetBlack = .text:0x8034E6AC; // type:function size:0x7C scope:global align:4 VIGetRetraceCount = .text:0x8034E728; // type:function size:0x8 scope:global align:4 -GetCurrentDisplayPosition = .text:0x8034E730; // type:function size:0x3C scope:global align:4 -getCurrentFieldEvenOdd = .text:0x8034E76C; // type:function size:0x68 scope:global align:4 +GetCurrentDisplayPosition = .text:0x8034E730; // type:function size:0x3C scope:local align:4 +getCurrentFieldEvenOdd = .text:0x8034E76C; // type:function size:0x68 scope:local align:4 VIGetNextField = .text:0x8034E7D4; // type:function size:0x9C scope:global align:4 VIGetCurrentLine = .text:0x8034E870; // type:function size:0x98 scope:global align:4 VIGetTvFormat = .text:0x8034E908; // type:function size:0x68 scope:global align:4 __VIDisplayPositionToXY = .text:0x8034E970; // type:function size:0x21C scope:global align:4 __VIGetCurrentPosition = .text:0x8034EB8C; // type:function size:0x60 scope:global align:4 -ClampStick = .text:0x8034EBEC; // type:function size:0x130 scope:global align:4 -ClampCircle = .text:0x8034ED1C; // type:function size:0x1A8 scope:global align:4 +ClampStick = .text:0x8034EBEC; // type:function size:0x130 scope:local align:4 +ClampCircle = .text:0x8034ED1C; // type:function size:0x1A8 scope:local align:4 PADClamp = .text:0x8034EEC4; // type:function size:0x114 scope:global align:4 PADClampCircle = .text:0x8034EFD8; // type:function size:0x10C scope:global align:4 -UpdateOrigin = .text:0x8034F0E4; // type:function size:0x1A4 scope:global align:4 -PADOriginCallback = .text:0x8034F288; // type:function size:0xC4 scope:global align:4 -PADOriginUpdateCallback = .text:0x8034F34C; // type:function size:0xCC scope:global align:4 -PADProbeCallback = .text:0x8034F418; // type:function size:0xD8 scope:global align:4 -PADTypeAndStatusCallback = .text:0x8034F4F0; // type:function size:0x32C scope:global align:4 -PADReceiveCheckCallback = .text:0x8034F81C; // type:function size:0x140 scope:global align:4 +UpdateOrigin = .text:0x8034F0E4; // type:function size:0x1A4 scope:local align:4 +PADOriginCallback = .text:0x8034F288; // type:function size:0xC4 scope:local align:4 +PADOriginUpdateCallback = .text:0x8034F34C; // type:function size:0xCC scope:local align:4 +PADProbeCallback = .text:0x8034F418; // type:function size:0xD8 scope:local align:4 +PADTypeAndStatusCallback = .text:0x8034F4F0; // type:function size:0x32C scope:local align:4 +PADReceiveCheckCallback = .text:0x8034F81C; // type:function size:0x140 scope:local align:4 PADReset = .text:0x8034F95C; // type:function size:0x110 scope:global align:4 PADRecalibrate = .text:0x8034FA6C; // type:function size:0x114 scope:global align:4 PADInit = .text:0x8034FB80; // type:function size:0x150 scope:global align:4 PADRead = .text:0x8034FCD0; // type:function size:0x300 scope:global align:4 PADControlMotor = .text:0x8034FFD0; // type:function size:0xB8 scope:global align:4 PADSetSpec = .text:0x80350088; // type:function size:0x60 scope:global align:4 -SPEC0_MakeStatus = .text:0x803500E8; // type:function size:0x174 scope:global align:4 -SPEC1_MakeStatus = .text:0x8035025C; // type:function size:0x174 scope:global align:4 -SPEC2_MakeStatus = .text:0x803503D0; // type:function size:0x470 scope:global align:4 +SPEC0_MakeStatus = .text:0x803500E8; // type:function size:0x174 scope:local align:4 +SPEC1_MakeStatus = .text:0x8035025C; // type:function size:0x174 scope:local align:4 +SPEC2_MakeStatus = .text:0x803503D0; // type:function size:0x470 scope:local align:4 PADSetAnalogMode = .text:0x80350840; // type:function size:0x74 scope:global align:4 OnReset = .text:0x803508B4; // type:function size:0xBC scope:local align:4 -SamplingHandler = .text:0x80350970; // type:function size:0x60 scope:global align:4 +SamplingHandler = .text:0x80350970; // type:function size:0x60 scope:local align:4 PADSetSamplingCallback = .text:0x803509D0; // type:function size:0x54 scope:global align:4 __PADDisableRecalibration = .text:0x80350A24; // type:function size:0x7C scope:global align:4 AIRegisterDMACallback = .text:0x80350AA0; // type:function size:0x44 scope:global align:4 @@ -15805,27 +15805,27 @@ AISetStreamPlayState = .text:0x80350B9C; // type:function size:0xD8 scope:global AIGetStreamPlayState = .text:0x80350C74; // type:function size:0x10 scope:global align:4 AISetDSPSampleRate = .text:0x80350C84; // type:function size:0xE0 scope:global align:4 AIGetDSPSampleRate = .text:0x80350D64; // type:function size:0x14 scope:global align:4 -__AI_set_stream_sample_rate = .text:0x80350D78; // type:function size:0xD4 scope:global align:4 +__AI_set_stream_sample_rate = .text:0x80350D78; // type:function size:0xD4 scope:local align:4 AIGetStreamSampleRate = .text:0x80350E4C; // type:function size:0x10 scope:global align:4 AISetStreamVolLeft = .text:0x80350E5C; // type:function size:0x1C scope:global align:4 AIGetStreamVolLeft = .text:0x80350E78; // type:function size:0x10 scope:global align:4 AISetStreamVolRight = .text:0x80350E88; // type:function size:0x1C scope:global align:4 AIGetStreamVolRight = .text:0x80350EA4; // type:function size:0x10 scope:global align:4 AIInit = .text:0x80350EB4; // type:function size:0x16C scope:global align:4 -__AISHandler = .text:0x80351020; // type:function size:0x7C scope:global align:4 -__AIDHandler = .text:0x8035109C; // type:function size:0xAC scope:global align:4 -__AICallbackStackSwitch = .text:0x80351148; // type:function size:0x58 scope:global align:4 -__AI_SRC_INIT = .text:0x803511A0; // type:function size:0x1E4 scope:global align:4 +__AISHandler = .text:0x80351020; // type:function size:0x7C scope:local align:4 +__AIDHandler = .text:0x8035109C; // type:function size:0xAC scope:local align:4 +__AICallbackStackSwitch = .text:0x80351148; // type:function size:0x58 scope:local align:4 +__AI_SRC_INIT = .text:0x803511A0; // type:function size:0x1E4 scope:local align:4 ARRegisterDMACallback = .text:0x80351384; // type:function size:0x44 scope:global align:4 ARGetDMAStatus = .text:0x803513C8; // type:function size:0x3C scope:global align:4 ARStartDMA = .text:0x80351404; // type:function size:0xF0 scope:global align:4 ARAlloc = .text:0x803514F4; // type:function size:0x68 scope:global align:4 ARInit = .text:0x8035155C; // type:function size:0xC4 scope:global align:4 ARGetSize = .text:0x80351620; // type:function size:0x8 scope:global align:4 -__ARHandler = .text:0x80351628; // type:function size:0x78 scope:global align:4 +__ARHandler = .text:0x80351628; // type:function size:0x78 scope:local align:4 __ARClearInterrupt = .text:0x803516A0; // type:function size:0x20 scope:global align:4 __ARGetInterruptStatus = .text:0x803516C0; // type:function size:0x10 scope:global align:4 -__ARChecksize = .text:0x803516D0; // type:function size:0x17F4 scope:global align:4 +__ARChecksize = .text:0x803516D0; // type:function size:0x17F4 scope:local align:4 __ARQServiceQueueLo = .text:0x80352EC4; // type:function size:0x100 scope:global align:4 __ARQCallbackHack = .text:0x80352FC4; // type:function size:0x4 scope:global align:4 __ARQInterruptServiceRoutine = .text:0x80352FC8; // type:function size:0xCC scope:global align:4 @@ -15852,10 +15852,10 @@ __CARDEnableInterrupt = .text:0x80353BB4; // type:function size:0xC0 scope:globa __CARDReadStatus = .text:0x80353C74; // type:function size:0xF0 scope:global align:4 __CARDReadVendorID = .text:0x80353D64; // type:function size:0xF0 scope:global align:4 __CARDClearStatus = .text:0x80353E54; // type:function size:0xAC scope:global align:4 -TimeoutHandler = .text:0x80353F00; // type:function size:0xA4 scope:global align:4 -Retry = .text:0x80353FA4; // type:function size:0x2A0 scope:global align:4 -UnlockedCallback = .text:0x80354244; // type:function size:0x110 scope:global align:4 -__CARDStart = .text:0x80354354; // type:function size:0x224 scope:global align:4 +TimeoutHandler = .text:0x80353F00; // type:function size:0xA4 scope:local align:4 +Retry = .text:0x80353FA4; // type:function size:0x2A0 scope:local align:4 +UnlockedCallback = .text:0x80354244; // type:function size:0x110 scope:local align:4 +__CARDStart = .text:0x80354354; // type:function size:0x224 scope:local align:4 __CARDReadSegment = .text:0x80354578; // type:function size:0x134 scope:global align:4 __CARDWritePage = .text:0x803546AC; // type:function size:0x13C scope:global align:4 __CARDEraseSector = .text:0x803547E8; // type:function size:0x110 scope:global align:4 @@ -15868,15 +15868,15 @@ CARDFreeBlocks = .text:0x80354B00; // type:function size:0x150 scope:global alig __CARDSync = .text:0x80354C50; // type:function size:0x98 scope:global align:4 OnReset = .text:0x80354CE8; // type:function size:0x50 scope:local align:4 CARDGetFastMode = .text:0x80354D38; // type:function size:0x1C scope:global align:4 -bitrev = .text:0x80354D54; // type:function size:0x16C scope:global align:4 -ReadArrayUnlock = .text:0x80354EC0; // type:function size:0x144 scope:global align:4 -DummyLen = .text:0x80355004; // type:function size:0xC4 scope:global align:4 +bitrev = .text:0x80354D54; // type:function size:0x16C scope:local align:4 +ReadArrayUnlock = .text:0x80354EC0; // type:function size:0x144 scope:local align:4 +DummyLen = .text:0x80355004; // type:function size:0xC4 scope:local align:4 __CARDUnlock = .text:0x803550C8; // type:function size:0xB58 scope:global align:4 -InitCallback = .text:0x80355C20; // type:function size:0x70 scope:global align:4 -DoneCallback = .text:0x80355C90; // type:function size:0x324 scope:global align:4 -BlockReadCallback = .text:0x80355FB4; // type:function size:0xDC scope:global align:4 +InitCallback = .text:0x80355C20; // type:function size:0x70 scope:local align:4 +DoneCallback = .text:0x80355C90; // type:function size:0x324 scope:local align:4 +BlockReadCallback = .text:0x80355FB4; // type:function size:0xDC scope:local align:4 __CARDRead = .text:0x80356090; // type:function size:0x64 scope:global align:4 -BlockWriteCallback = .text:0x803560F4; // type:function size:0xE8 scope:global align:4 +BlockWriteCallback = .text:0x803560F4; // type:function size:0xE8 scope:local align:4 __CARDWrite = .text:0x803561DC; // type:function size:0x68 scope:global align:4 __CARDGetFatBlock = .text:0x80356244; // type:function size:0x8 scope:global align:4 WriteCallback = .text:0x8035624C; // type:function size:0xD4 scope:local align:4 @@ -15888,22 +15888,22 @@ WriteCallback = .text:0x803565B4; // type:function size:0xD0 scope:local align:4 EraseCallback = .text:0x80356684; // type:function size:0xC8 scope:local align:4 __CARDUpdateDir = .text:0x8035674C; // type:function size:0xC4 scope:global align:4 __CARDCheckSum = .text:0x80356810; // type:function size:0x1B0 scope:global align:4 -VerifyID = .text:0x803569C0; // type:function size:0x284 scope:global align:4 -VerifyDir = .text:0x80356C44; // type:function size:0x240 scope:global align:4 -VerifyFAT = .text:0x80356E84; // type:function size:0x284 scope:global align:4 +VerifyID = .text:0x803569C0; // type:function size:0x284 scope:local align:4 +VerifyDir = .text:0x80356C44; // type:function size:0x240 scope:local align:4 +VerifyFAT = .text:0x80356E84; // type:function size:0x284 scope:local align:4 __CARDVerify = .text:0x80357108; // type:function size:0x8C scope:global align:4 CARDCheckExAsync = .text:0x80357194; // type:function size:0x590 scope:global align:4 CARDCheck = .text:0x80357724; // type:function size:0x54 scope:global align:4 -IsCard = .text:0x80357778; // type:function size:0xCC scope:global align:4 +IsCard = .text:0x80357778; // type:function size:0xCC scope:local align:4 CARDProbe = .text:0x80357844; // type:function size:0x38 scope:global align:4 CARDProbeEx = .text:0x8035787C; // type:function size:0x17C scope:global align:4 -DoMount = .text:0x803579F8; // type:function size:0x454 scope:global align:4 +DoMount = .text:0x803579F8; // type:function size:0x454 scope:local align:4 __CARDMountCallback = .text:0x80357E4C; // type:function size:0x138 scope:global align:4 CARDMountAsync = .text:0x80357F84; // type:function size:0x1A0 scope:global align:4 CARDMount = .text:0x80358124; // type:function size:0x48 scope:global align:4 -DoUnmount = .text:0x8035816C; // type:function size:0x9C scope:global align:4 +DoUnmount = .text:0x8035816C; // type:function size:0x9C scope:local align:4 CARDUnmount = .text:0x80358208; // type:function size:0xAC scope:global align:4 -FormatCallback = .text:0x803582B4; // type:function size:0x144 scope:global align:4 +FormatCallback = .text:0x803582B4; // type:function size:0x144 scope:local align:4 __CARDFormatRegionAsync = .text:0x803583F8; // type:function size:0x658 scope:global align:4 CARDFormat = .text:0x80358A50; // type:function size:0x54 scope:global align:4 __CARDCompareFileName = .text:0x80358AA4; // type:function size:0x68 scope:global align:4 @@ -15912,29 +15912,29 @@ __CARDIsWritable = .text:0x80358BA0; // type:function size:0x134 scope:global al __CARDIsReadable = .text:0x80358CD4; // type:function size:0xF4 scope:global align:4 CARDOpen = .text:0x80358DC8; // type:function size:0x11C scope:global align:4 CARDClose = .text:0x80358EE4; // type:function size:0x54 scope:global align:4 -CreateCallbackFat = .text:0x80358F38; // type:function size:0x130 scope:global align:4 +CreateCallbackFat = .text:0x80358F38; // type:function size:0x130 scope:local align:4 CARDCreateAsync = .text:0x80359068; // type:function size:0x220 scope:global align:4 CARDCreate = .text:0x80359288; // type:function size:0x48 scope:global align:4 __CARDSeek = .text:0x803592D0; // type:function size:0x1B8 scope:global align:4 -ReadCallback = .text:0x80359488; // type:function size:0x130 scope:global align:4 +ReadCallback = .text:0x80359488; // type:function size:0x130 scope:local align:4 CARDReadAsync = .text:0x803595B8; // type:function size:0x144 scope:global align:4 CARDRead = .text:0x803596FC; // type:function size:0x48 scope:global align:4 WriteCallback = .text:0x80359744; // type:function size:0x170 scope:local align:4 EraseCallback = .text:0x803598B4; // type:function size:0xB0 scope:local align:4 CARDWriteAsync = .text:0x80359964; // type:function size:0x114 scope:global align:4 CARDWrite = .text:0x80359A78; // type:function size:0x48 scope:global align:4 -UpdateIconOffsets = .text:0x80359AC0; // type:function size:0x1F8 scope:global align:4 +UpdateIconOffsets = .text:0x80359AC0; // type:function size:0x1F8 scope:local align:4 CARDGetStatus = .text:0x80359CB8; // type:function size:0x114 scope:global align:4 CARDSetStatusAsync = .text:0x80359DCC; // type:function size:0x174 scope:global align:4 CARDSetStatus = .text:0x80359F40; // type:function size:0x48 scope:global align:4 CARDGetSerialNo = .text:0x80359F88; // type:function size:0xC4 scope:global align:4 -__GXDefaultTexRegionCallback = .text:0x8035A04C; // type:function size:0xFC scope:global align:4 -__GXDefaultTlutRegionCallback = .text:0x8035A148; // type:function size:0x24 scope:global align:4 -__GXShutdown = .text:0x8035A16C; // type:function size:0x190 scope:global align:4 +__GXDefaultTexRegionCallback = .text:0x8035A04C; // type:function size:0xFC scope:local align:4 +__GXDefaultTlutRegionCallback = .text:0x8035A148; // type:function size:0x24 scope:local align:4 +__GXShutdown = .text:0x8035A16C; // type:function size:0x190 scope:local align:4 __GXInitRevisionBits = .text:0x8035A2FC; // type:function size:0x1A4 scope:global align:4 GXInit = .text:0x8035A4A0; // type:function size:0x600 scope:global align:4 __GXInitGX = .text:0x8035AAA0; // type:function size:0x938 scope:global align:4 -GXCPInterruptHandler = .text:0x8035B3D8; // type:function size:0x134 scope:global align:4 +GXCPInterruptHandler = .text:0x8035B3D8; // type:function size:0x134 scope:local align:4 GXInitFifoBase = .text:0x8035B50C; // type:function size:0x6C scope:global align:4 GXInitFifoPtrs = .text:0x8035B578; // type:function size:0x70 scope:global align:4 GXInitFifoLimits = .text:0x8035B5E8; // type:function size:0xC scope:global align:4 @@ -15947,11 +15947,11 @@ GXGetFifoBase = .text:0x8035BA08; // type:function size:0x8 scope:global align:4 GXGetFifoSize = .text:0x8035BA10; // type:function size:0x8 scope:global align:4 GXSetBreakPtCallback = .text:0x8035BA18; // type:function size:0x44 scope:global align:4 __GXFifoInit = .text:0x8035BA5C; // type:function size:0x4C scope:global align:4 -__GXFifoReadEnable = .text:0x8035BAA8; // type:function size:0x24 scope:global align:4 -__GXFifoReadDisable = .text:0x8035BACC; // type:function size:0x24 scope:global align:4 -__GXFifoLink = .text:0x8035BAF0; // type:function size:0x34 scope:global align:4 -__GXWriteFifoIntEnable = .text:0x8035BB24; // type:function size:0x30 scope:global align:4 -__GXWriteFifoIntReset = .text:0x8035BB54; // type:function size:0x30 scope:global align:4 +__GXFifoReadEnable = .text:0x8035BAA8; // type:function size:0x24 scope:local align:4 +__GXFifoReadDisable = .text:0x8035BACC; // type:function size:0x24 scope:local align:4 +__GXFifoLink = .text:0x8035BAF0; // type:function size:0x34 scope:local align:4 +__GXWriteFifoIntEnable = .text:0x8035BB24; // type:function size:0x30 scope:local align:4 +__GXWriteFifoIntReset = .text:0x8035BB54; // type:function size:0x30 scope:local align:4 __GXCleanGPFifo = .text:0x8035BB84; // type:function size:0x100 scope:global align:4 GXSetCurrentGXThread = .text:0x8035BC84; // type:function size:0x4C scope:global align:4 GXGetCurrentGXThread = .text:0x8035BCD0; // type:function size:0x8 scope:global align:4 @@ -15986,9 +15986,9 @@ GXPokeDither = .text:0x8035D2B4; // type:function size:0x18 scope:global align:4 GXPokeZMode = .text:0x8035D2CC; // type:function size:0x20 scope:global align:4 GXPeekZ = .text:0x8035D2EC; // type:function size:0x24 scope:global align:4 GXSetDrawSyncCallback = .text:0x8035D310; // type:function size:0x44 scope:global align:4 -GXTokenInterruptHandler = .text:0x8035D354; // type:function size:0x88 scope:global align:4 +GXTokenInterruptHandler = .text:0x8035D354; // type:function size:0x88 scope:local align:4 GXSetDrawDoneCallback = .text:0x8035D3DC; // type:function size:0x44 scope:global align:4 -GXFinishInterruptHandler = .text:0x8035D420; // type:function size:0x80 scope:global align:4 +GXFinishInterruptHandler = .text:0x8035D420; // type:function size:0x80 scope:local align:4 __GXPEInit = .text:0x8035D4A0; // type:function size:0x74 scope:global align:4 __GXSetDirtyState = .text:0x8035D514; // type:function size:0x80 scope:global align:4 GXBegin = .text:0x8035D594; // type:function size:0xD0 scope:global align:4 @@ -16047,7 +16047,7 @@ GXInvalidateTexAll = .text:0x8035F494; // type:function size:0x48 scope:global a GXSetTexRegionCallback = .text:0x8035F4DC; // type:function size:0x14 scope:global align:4 GXSetTlutRegionCallback = .text:0x8035F4F0; // type:function size:0x14 scope:global align:4 GXSetTexCoordScaleManually = .text:0x8035F504; // type:function size:0x7C scope:global align:4 -__SetSURegs = .text:0x8035F580; // type:function size:0xA0 scope:global align:4 +__SetSURegs = .text:0x8035F580; // type:function size:0xA0 scope:local align:4 __GXSetSUTexRegs = .text:0x8035F620; // type:function size:0x17C scope:global align:4 __GXSetTmemConfig = .text:0x8035F79C; // type:function size:0x354 scope:global align:4 GXSetTevIndirect = .text:0x8035FAF0; // type:function size:0x6C scope:global align:4 @@ -16121,13 +16121,13 @@ __copy = .text:0x80362A6C; // type:function size:0x30 scope:global align:4 __destroy_new_array = .text:0x80362A9C; // type:function size:0x7C scope:global align:4 __destroy_arr = .text:0x80362B18; // type:function size:0x78 scope:global align:4 __construct_array = .text:0x80362B90; // type:function size:0xFC scope:global align:4 -__dt__26__partial_array_destructorFv = .text:0x80362C8C; // type:function size:0xB8 scope:global align:4 +__dt__26__partial_array_destructorFv = .text:0x80362C8C; // type:function size:0xB8 scope:weak align:4 __construct_new_array = .text:0x80362D44; // type:function size:0x104 scope:global align:4 __ptmf_test = .text:0x80362E48; // type:function size:0x30 scope:global align:4 __ptmf_cmpr = .text:0x80362E78; // type:function size:0x3C scope:global align:4 __ptmf_scall = .text:0x80362EB4; // type:function size:0x28 scope:global align:4 __cvt_fp2unsigned = .text:0x80362EDC; // type:function size:0x5C scope:global align:4 -__save_fpr = .text:0x80362F38; // type:function size:0x4C scope:global align:4 +__save_fpr = .text:0x80362F38; // type:function size:0x4C scope:local align:4 _savefpr_14 = .text:0x80362F38; // type:label scope:global _savefpr_15 = .text:0x80362F3C; // type:label scope:global _savefpr_16 = .text:0x80362F40; // type:label scope:global @@ -16146,7 +16146,7 @@ _savefpr_28 = .text:0x80362F70; // type:label scope:global align:4 _savefpr_29 = .text:0x80362F74; // type:label scope:global align:4 _savefpr_30 = .text:0x80362F78; // type:label scope:global _savefpr_31 = .text:0x80362F7C; // type:label scope:global -__restore_fpr = .text:0x80362F84; // type:function size:0x4C scope:global align:4 +__restore_fpr = .text:0x80362F84; // type:function size:0x4C scope:local align:4 _restfpr_14 = .text:0x80362F84; // type:label scope:global _restfpr_15 = .text:0x80362F88; // type:label scope:global _restfpr_16 = .text:0x80362F8C; // type:label scope:global @@ -16165,7 +16165,7 @@ _restfpr_28 = .text:0x80362FBC; // type:label scope:global align:4 _restfpr_29 = .text:0x80362FC0; // type:label scope:global align:4 _restfpr_30 = .text:0x80362FC4; // type:label scope:global _restfpr_31 = .text:0x80362FC8; // type:label scope:global -__save_gpr = .text:0x80362FD0; // type:function size:0x4C scope:global align:4 +__save_gpr = .text:0x80362FD0; // type:function size:0x4C scope:local align:4 _savegpr_14 = .text:0x80362FD0; // type:label scope:global align:4 _savegpr_15 = .text:0x80362FD4; // type:label scope:global align:4 _savegpr_16 = .text:0x80362FD8; // type:label scope:global align:4 @@ -16184,7 +16184,7 @@ _savegpr_28 = .text:0x80363008; // type:label scope:global align:4 _savegpr_29 = .text:0x8036300C; // type:label scope:global align:4 _savegpr_30 = .text:0x80363010; // type:label scope:global _savegpr_31 = .text:0x80363014; // type:label scope:global -__restore_gpr = .text:0x8036301C; // type:function size:0x4C scope:global align:4 +__restore_gpr = .text:0x8036301C; // type:function size:0x4C scope:local align:4 _restgpr_14 = .text:0x8036301C; // type:label scope:global align:4 _restgpr_15 = .text:0x80363020; // type:label scope:global align:4 _restgpr_16 = .text:0x80363024; // type:label scope:global align:4 @@ -16222,7 +16222,7 @@ abort = .text:0x803638EC; // type:function size:0x9C scope:global align:4 free = .text:0x80363988; // type:function size:0x70 scope:global align:4 __pool_free = .text:0x803639F8; // type:function size:0x58 scope:global align:4 deallocate_from_fixed_pools = .text:0x80363A50; // type:function size:0x158 scope:global align:4 -deallocate_from_var_pools = .text:0x80363BA8; // type:function size:0x294 scope:global align:4 +deallocate_from_var_pools = .text:0x80363BA8; // type:function size:0x294 scope:local align:4 __flush_all = .text:0x80363E3C; // type:function size:0x70 scope:global align:4 __close_all = .text:0x80363EAC; // type:function size:0xA8 scope:global align:4 __num2dec = .text:0x80363F54; // type:function size:0x1A4 scope:global align:4 @@ -16263,15 +16263,15 @@ vsnprintf = .text:0x803674C0; // type:function size:0x74 scope:global align:4 vprintf = .text:0x80367534; // type:function size:0x98 scope:global align:4 fprintf = .text:0x803675CC; // type:function size:0xE0 scope:global align:4 printf = .text:0x803676AC; // type:function size:0xE8 scope:global align:4 -__StringWrite = .text:0x80367794; // type:function size:0x6C scope:global align:4 -__FileWrite = .text:0x80367800; // type:function size:0x58 scope:global align:4 -__pformatter = .text:0x80367858; // type:function size:0x774 scope:global align:4 -float2str = .text:0x80367FCC; // type:function size:0x71C scope:global align:4 -round_decimal = .text:0x803686E8; // type:function size:0x12C scope:global align:4 -double2hex = .text:0x80368814; // type:function size:0x338 scope:global align:4 -longlong2str = .text:0x80368B4C; // type:function size:0x314 scope:global align:4 -long2str = .text:0x80368E60; // type:function size:0x258 scope:global align:4 -parse_format = .text:0x803690B8; // type:function size:0x504 scope:global align:4 +__StringWrite = .text:0x80367794; // type:function size:0x6C scope:local align:4 +__FileWrite = .text:0x80367800; // type:function size:0x58 scope:local align:4 +__pformatter = .text:0x80367858; // type:function size:0x774 scope:local align:4 +float2str = .text:0x80367FCC; // type:function size:0x71C scope:local align:4 +round_decimal = .text:0x803686E8; // type:function size:0x12C scope:local align:4 +double2hex = .text:0x80368814; // type:function size:0x338 scope:local align:4 +longlong2str = .text:0x80368B4C; // type:function size:0x314 scope:local align:4 +long2str = .text:0x80368E60; // type:function size:0x258 scope:local align:4 +parse_format = .text:0x803690B8; // type:function size:0x504 scope:local align:4 __StringRead = .text:0x803695BC; // type:function size:0x90 scope:global align:4 raise = .text:0x8036964C; // type:function size:0xC0 scope:global align:4 strrchr = .text:0x8036970C; // type:function size:0x48 scope:global align:4 @@ -16316,10 +16316,10 @@ exp = .text:0x8036D570; // type:function size:0x20 scope:global align:4 fmod = .text:0x8036D590; // type:function size:0x20 scope:global align:4 pow = .text:0x8036D5B0; // type:function size:0x20 scope:global align:4 __ieee754_sqrt = .text:0x8036D5D0; // type:function size:0x224 scope:global align:4 -tanf = .text:0x8036D7F4; // type:function size:0x24 scope:global align:4 -sinf = .text:0x8036D818; // type:function size:0x24 scope:global align:4 -cosf = .text:0x8036D83C; // type:function size:0x24 scope:global align:4 -acosf = .text:0x8036D860; // type:function size:0x24 scope:global align:4 +tanf = .text:0x8036D7F4; // type:function size:0x24 scope:weak align:4 +sinf = .text:0x8036D818; // type:function size:0x24 scope:weak align:4 +cosf = .text:0x8036D83C; // type:function size:0x24 scope:weak align:4 +acosf = .text:0x8036D860; // type:function size:0x24 scope:weak align:4 sqrt = .text:0x8036D884; // type:function size:0x20 scope:global align:4 strnicmp = .text:0x8036D8A4; // type:function size:0x20 scope:global align:4 stricmp = .text:0x8036D8C4; // type:function size:0x8C scope:global align:4 @@ -16386,9 +16386,9 @@ TRK_flush_cache = .text:0x80370378; // type:function size:0x38 scope:global alig TRK_fill_mem = .text:0x803703B0; // type:function size:0xB8 scope:global align:4 __TRK_get_MSR = .text:0x80370468; // type:function size:0x8 scope:global align:4 __TRK_set_MSR = .text:0x80370470; // type:function size:0x8 scope:global align:4 -TRK_ppc_memcpy = .text:0x80370478; // type:function size:0x3C scope:global align:4 +TRK_ppc_memcpy = .text:0x80370478; // type:function size:0x3C scope:local align:4 TRKInterruptHandler = .text:0x803704B4; // type:function size:0x194 scope:global align:4 -TRKExceptionHandler = .text:0x80370648; // type:function size:0x9C scope:global align:4 +TRKExceptionHandler = .text:0x80370648; // type:function size:0x9C scope:local align:4 TRKSwapAndGo = .text:0x803706E4; // type:function size:0xC4 scope:global align:4 TRKInterruptHandlerEnableInterrupts = .text:0x803707A8; // type:function size:0x54 scope:global align:4 ReadFPSCR = .text:0x803707FC; // type:function size:0x24 scope:global align:4 @@ -16446,15 +16446,15 @@ GetUseSerialIO = .text:0x80372FB0; // type:function size:0x10 scope:global align SetUseSerialIO = .text:0x80372FC0; // type:function size:0xC scope:global align:4 __TRK_write_console = .text:0x80372FCC; // type:function size:0xBC scope:global align:4 __read_console = .text:0x80373088; // type:function size:0xBC scope:global align:4 -udp_cc_post_stop = .text:0x80373144; // type:function size:0x8 scope:global align:4 -udp_cc_pre_continue = .text:0x8037314C; // type:function size:0x8 scope:global align:4 -udp_cc_peek = .text:0x80373154; // type:function size:0x8 scope:global align:4 -udp_cc_write = .text:0x8037315C; // type:function size:0x8 scope:global align:4 -udp_cc_read = .text:0x80373164; // type:function size:0x8 scope:global align:4 -udp_cc_close = .text:0x8037316C; // type:function size:0x8 scope:global align:4 -udp_cc_open = .text:0x80373174; // type:function size:0x8 scope:global align:4 -udp_cc_shutdown = .text:0x8037317C; // type:function size:0x8 scope:global align:4 -udp_cc_initialize = .text:0x80373184; // type:function size:0x8 scope:global align:4 +udp_cc_post_stop = .text:0x80373144; // type:function size:0x8 scope:weak align:4 +udp_cc_pre_continue = .text:0x8037314C; // type:function size:0x8 scope:weak align:4 +udp_cc_peek = .text:0x80373154; // type:function size:0x8 scope:weak align:4 +udp_cc_write = .text:0x8037315C; // type:function size:0x8 scope:weak align:4 +udp_cc_read = .text:0x80373164; // type:function size:0x8 scope:weak align:4 +udp_cc_close = .text:0x8037316C; // type:function size:0x8 scope:weak align:4 +udp_cc_open = .text:0x80373174; // type:function size:0x8 scope:weak align:4 +udp_cc_shutdown = .text:0x8037317C; // type:function size:0x8 scope:weak align:4 +udp_cc_initialize = .text:0x80373184; // type:function size:0x8 scope:weak align:4 ddh_cc_initinterrupts = .text:0x8037318C; // type:function size:0x24 scope:global align:4 ddh_cc_peek = .text:0x803731B0; // type:function size:0x70 scope:global align:4 ddh_cc_post_stop = .text:0x80373220; // type:function size:0x24 scope:global align:4 @@ -16498,13 +16498,13 @@ DBRead = .text:0x80373DC4; // type:function size:0x8C scope:global align:4 DBQueryData = .text:0x80373E50; // type:function size:0x9C scope:global align:4 DBInitInterrupts = .text:0x80373EEC; // type:function size:0x54 scope:global align:4 DBInitComm = .text:0x80373F40; // type:function size:0x78 scope:global align:4 -DBGHandler = .text:0x80373FB8; // type:function size:0x40 scope:global align:4 -MWCallback = .text:0x80373FF8; // type:function size:0x3C scope:global align:4 -DBGReadStatus = .text:0x80374034; // type:function size:0xAC scope:global align:4 -DBGWrite = .text:0x803740E0; // type:function size:0xDC scope:global align:4 -DBGRead = .text:0x803741BC; // type:function size:0xDC scope:global align:4 -DBGReadMailbox = .text:0x80374298; // type:function size:0xAC scope:global align:4 -DBGEXIImm = .text:0x80374344; // type:function size:0x298 scope:global align:4 +DBGHandler = .text:0x80373FB8; // type:function size:0x40 scope:local align:4 +MWCallback = .text:0x80373FF8; // type:function size:0x3C scope:local align:4 +DBGReadStatus = .text:0x80374034; // type:function size:0xAC scope:local align:4 +DBGWrite = .text:0x803740E0; // type:function size:0xDC scope:local align:4 +DBGRead = .text:0x803741BC; // type:function size:0xDC scope:local align:4 +DBGReadMailbox = .text:0x80374298; // type:function size:0xAC scope:local align:4 +DBGEXIImm = .text:0x80374344; // type:function size:0x298 scope:local align:4 Hu_IsStub = .text:0x803745DC; // type:function size:0x8 scope:global align:4 __init_cpp_exceptions_reference = .ctors:0x80374600; // type:object size:0x4 scope:global align:4 _ctors = .ctors:0x80374600; // type:label scope:global data:4byte @@ -16525,7 +16525,7 @@ fontdata$8287 = .rodata:0x80374F28; // type:object size:0x14 scope:local align:4 @stringBase0 = .rodata:0x80375238; // type:object size:0x9 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80375248; // type:object size:0xA5 scope:local align:4 data:string_table @stringBase0 = .rodata:0x803752F0; // type:object size:0x1DF scope:local align:4 data:string_table -DynamicNameTable = .rodata:0x803754D0; // type:object size:0x17A8 scope:global align:4 data:2byte +DynamicNameTable = .rodata:0x803754D0; // type:object size:0x17A8 scope:local align:4 data:2byte @stringBase0 = .rodata:0x80376C78; // type:object size:0x2A8F scope:local align:4 data:string_table @stringBase0 = .rodata:0x80379708; // type:object size:0x6 scope:local align:4 data:string_table @4932 = .rodata:0x80379710; // type:object size:0xC scope:local align:4 data:4byte @@ -16551,26 +16551,26 @@ m_data__12daItemBase_c = .rodata:0x8037A140; // type:object size:0x38 scope:glob mData__12daShopItem_c = .rodata:0x8037A178; // type:object size:0x450 scope:global align:4 @stringBase0 = .rodata:0x8037A5C8; // type:object size:0xBF scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037A688; // type:object size:0x46 scope:local align:4 data:string_table -l_texMtxInfo = .rodata:0x8037A6D0; // type:object size:0x64 scope:global align:4 +l_texMtxInfo = .rodata:0x8037A6D0; // type:object size:0x64 scope:local align:4 l_tevStageInfo$3774 = .rodata:0x8037A734; // type:object size:0x14 scope:local align:4 @stringBase0 = .rodata:0x8037A748; // type:object size:0x373 scope:local align:4 data:string_table data$3644 = .rodata:0x8037AAC0; // type:object size:0x1C scope:local align:4 @stringBase0 = .rodata:0x8037AADC; // type:object size:0x7 scope:local align:4 data:string_table -l_100x100BoxVertexList = .rodata:0x8037AAE8; // type:object size:0x30 scope:global align:4 +l_100x100BoxVertexList = .rodata:0x8037AAE8; // type:object size:0x30 scope:local align:4 l_treasureDispList$4524 = .rodata:0x8037AB18; // type:object size:0x30 scope:local align:4 data:byte l_treasureDispList$4606 = .rodata:0x8037AB48; // type:object size:0x84 scope:local align:4 data:byte l_iconPosData$4686 = .rodata:0x8037ABCC; // type:object size:0x20 scope:local align:4 data:float l_offset$4703 = .rodata:0x8037ABEC; // type:object size:0x24 scope:local align:4 @stringBase0 = .rodata:0x8037AC10; // type:object size:0x4E scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037AC60; // type:object size:0x17E scope:local align:4 data:string_table -DataFileName__29@unnamed@d_event_manager_cpp@ = .rodata:0x8037ADE0; // type:object size:0xF scope:global align:4 data:string +DataFileName__29@unnamed@d_event_manager_cpp@ = .rodata:0x8037ADE0; // type:object size:0xF scope:local align:4 data:string @stringBase0 = .rodata:0x8037ADF0; // type:object size:0x1A4 scope:local align:4 data:string_table @4065 = .rodata:0x8037AF98; // type:object size:0xC scope:local align:4 data:4byte @5691 = .rodata:0x8037AFA4; // type:object size:0xC scope:local align:4 data:4byte @6363 = .rodata:0x8037AFB0; // type:object size:0xC scope:local align:4 data:4byte @stringBase0 = .rodata:0x8037AFBC; // type:object size:0x4B scope:local align:4 data:string_table -l_drawlistSize$5656 = .rodata:0x8037B008; // type:object size:0x2A scope:local align:4 data:2byte -l_nonSortId$5662 = .rodata:0x8037B034; // type:object size:0x9 scope:local align:4 data:byte +l_drawlistSize = .rodata:0x8037B008; // type:object size:0x2A scope:local align:4 data:2byte +l_nonSortId = .rodata:0x8037B034; // type:object size:0x9 scope:local align:4 data:byte @stringBase0 = .rodata:0x8037B040; // type:object size:0xC scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037B050; // type:object size:0x1A4 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8037B1F8; // type:object size:0x153 scope:local align:4 data:string_table @@ -16609,18 +16609,20 @@ m_hitSeID__12dCcD_GObjInf = .rodata:0x8037B610; // type:object size:0x60 scope:g typeToTypeGroup__7dTres_c = .rodata:0x8037BF68; // type:object size:0x22 scope:global align:4 @stringBase0 = .rodata:0x8037BF90; // type:object size:0x2A scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8037BFC0; // type:label scope:local align:4 -black_tex = .rodata:0x8037BFC0; // type:object size:0x40 scope:global align:4 -msg_data = .rodata:0x8037C000; // type:object size:0x260 scope:global align:4 -msg_data_ge = .rodata:0x8037C260; // type:object size:0x280 scope:global align:4 -msg_data_fr = .rodata:0x8037C4E0; // type:object size:0x280 scope:global align:4 -msg_data_sp = .rodata:0x8037C760; // type:object size:0x240 scope:global align:4 -msg_data_it = .rodata:0x8037C9A0; // type:object size:0x240 scope:global align:4 -font_data = .rodata:0x8037CBE0; // type:object size:0x12260 scope:global align:4 noreloc +black_tex = .rodata:0x8037BFC0; // type:object size:0x40 scope:local align:4 +msg_data = .rodata:0x8037C000; // type:object size:0x260 scope:local align:4 +msg_data_ge = .rodata:0x8037C260; // type:object size:0x280 scope:local align:4 +msg_data_fr = .rodata:0x8037C4E0; // type:object size:0x280 scope:local align:4 +msg_data_sp = .rodata:0x8037C760; // type:object size:0x240 scope:local align:4 +msg_data_it = .rodata:0x8037C9A0; // type:object size:0x240 scope:local align:4 +font_data = .rodata:0x8037CBE0; // type:object size:0x12260 scope:local align:4 noreloc @stringBase0 = .rodata:0x8038EE40; // type:object size:0x13 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8038EE58; // type:label scope:local align:4 @3757 = .rodata:0x8038EE58; // type:object size:0xC scope:local align:4 m__19daAlinkHIO_basic_c0 = .rodata:0x8038EE64; // type:object size:0x58 scope:global align:4 +...rodata.0 = .rodata:0x8038EE64; // type:label scope:local m__18daAlinkHIO_move_c0 = .rodata:0x8038EEBC; // type:object size:0x58 scope:global align:4 +...rodata.0 = .rodata:0x8038EEBC; // type:label scope:local m__21daAlinkHIO_atnMove_c0 = .rodata:0x8038EF14; // type:object size:0x54 scope:global align:4 data:2byte m__26daAlinkHIO_noActAtnMove_c0 = .rodata:0x8038EF68; // type:object size:0x54 scope:global align:4 data:2byte m__23daAlinkHIO_frontRoll_c0 = .rodata:0x8038EFBC; // type:object size:0x70 scope:global align:4 data:2byte @@ -16900,7 +16902,9 @@ localBoomCatchPos$74910 = .rodata:0x80393888; // type:object size:0xC scope:loca ...rodata.0 = .rodata:0x80393E80; // type:label scope:local align:4 mCcDObjData__8daNpcT_c = .rodata:0x80393E80; // type:object size:0x30 scope:global align:4 data:4byte mCcDObj__11daBaseNpc_c = .rodata:0x80393EB0; // type:object size:0x30 scope:global align:4 +...rodata.0 = .rodata:0x80393EB0; // type:label scope:local mCcDObjInfo__8daNpcF_c = .rodata:0x80393EE0; // type:object size:0x30 scope:global align:4 +...rodata.0 = .rodata:0x80393EE0; // type:label scope:local @stringBase0 = .rodata:0x80393F10; // type:object size:0x302 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80394218; // type:label scope:local align:4 l_resMANa = .rodata:0x80394218; // type:object size:0x18 scope:local align:4 data:4byte @@ -16944,7 +16948,9 @@ a_jntNumTbl$4463 = .rodata:0x803947C4; // type:object size:0x24 scope:local alig ...rodata.0 = .rodata:0x80394A50; // type:label scope:local align:4 l_resMANa = .rodata:0x80394A50; // type:object size:0x18 scope:local align:4 data:4byte l_resMADa = .rodata:0x80394A68; // type:object size:0x18 scope:local align:4 data:4byte +...rodata.0 = .rodata:0x80394A68; // type:label scope:local l_resMCNa = .rodata:0x80394A80; // type:object size:0x18 scope:local align:4 data:4byte +...rodata.0 = .rodata:0x80394A80; // type:label scope:local l_resMONa = .rodata:0x80394A98; // type:object size:0x18 scope:local align:4 data:4byte l_resMANb = .rodata:0x80394AB0; // type:object size:0x18 scope:local align:4 data:4byte l_resMANc = .rodata:0x80394AC8; // type:object size:0x18 scope:local align:4 data:4byte @@ -17007,9 +17013,9 @@ txTVhide$3752 = .rodata:0x803961B0; // type:object size:0x28 scope:local align:4 @stringBase0 = .rodata:0x803961D8; // type:object size:0x18 scope:local align:4 data:string_table @stringBase0 = .rodata:0x803961F0; // type:object size:0x1C scope:local align:4 data:string_table corner_tag$3707 = .rodata:0x80396210; // type:object size:0x20 scope:local align:4 data:4byte -tag$4181 = .rodata:0x80396230; // type:object size:0x20 scope:local align:4 data:4byte -tag$4197 = .rodata:0x80396250; // type:object size:0x40 scope:local align:4 data:4byte -tag$4204 = .rodata:0x80396290; // type:object size:0x10 scope:local align:4 data:4byte +tag_4181$2161 = .rodata:0x80396230; // type:object size:0x20 scope:local align:4 data:4byte +tag_4197$2177 = .rodata:0x80396250; // type:object size:0x40 scope:local align:4 data:4byte +tag_4204$2184 = .rodata:0x80396290; // type:object size:0x10 scope:local align:4 data:4byte @stringBase0 = .rodata:0x803962A0; // type:object size:0x16D scope:local align:4 data:string_table @stringBase0 = .rodata:0x80396410; // type:object size:0x16 scope:local align:4 data:string_table @stringBase0 = .rodata:0x80396428; // type:object size:0x32 scope:local align:4 data:string_table @@ -17021,7 +17027,9 @@ tag$4204 = .rodata:0x80396290; // type:object size:0x10 scope:local align:4 data @stringBase0 = .rodata:0x80396770; // type:object size:0x1 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80396778; // type:label scope:local align:4 @3778 = .rodata:0x80396778; // type:object size:0xC scope:local align:4 +...rodata.0 = .rodata:0x80396784; // type:label scope:local text_sv$4768 = .rodata:0x80396788; // type:object size:0x18 scope:local align:4 +...rodata.0 = .rodata:0x80396788; // type:label scope:local text_op$4769 = .rodata:0x803967A0; // type:object size:0x18 scope:local align:4 ftext_sv$4770 = .rodata:0x803967B8; // type:object size:0x18 scope:local align:4 ftext_op$4771 = .rodata:0x803967D0; // type:object size:0x18 scope:local align:4 @@ -17064,7 +17072,7 @@ key_tag$5002 = .rodata:0x80396F30; // type:object size:0x18 scope:local align:4 item_tag$5040 = .rodata:0x80396F48; // type:object size:0x18 scope:local align:4 @stringBase0 = .rodata:0x80396F60; // type:object size:0xEB scope:local align:4 data:string_table ...rodata.0 = .rodata:0x80397060; // type:label scope:local align:4 -l_paletteDmap_m = .rodata:0x80397060; // type:object size:0xF0 scope:global align:4 noreloc +l_paletteDmap_m = .rodata:0x80397060; // type:object size:0xF0 scope:local align:4 noreloc l_dungeon_offColor$3841 = .rodata:0x80397150; // type:object size:0x24 scope:local align:4 l_dungeon_onColor$3842 = .rodata:0x80397174; // type:object size:0x24 scope:local align:4 l_dungeon_stayColor$3843 = .rodata:0x80397198; // type:object size:0x24 scope:local align:4 @@ -17151,7 +17159,7 @@ text_a_tag$5024 = .rodata:0x80398570; // type:object size:0x28 scope:local align text_b_tag$5025 = .rodata:0x80398598; // type:object size:0x28 scope:local align:4 data:4byte @stringBase0 = .rodata:0x803985C0; // type:object size:0xE8 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x803986A8; // type:label scope:local align:4 -dMo_soundMode = .rodata:0x803986A8; // type:object size:0xC scope:global align:4 +dMo_soundMode = .rodata:0x803986A8; // type:object size:0xC scope:local align:4 text_a_tag$3904 = .rodata:0x803986B8; // type:object size:0x28 scope:local align:4 data:string text_b_tag$3905 = .rodata:0x803986E0; // type:object size:0x28 scope:local align:4 data:string l_tagName012$3918 = .rodata:0x80398708; // type:object size:0x10 scope:local align:4 @@ -17291,7 +17299,7 @@ juji_m_tag$5270 = .rodata:0x8039A050; // type:object size:0x28 scope:local align tag_bigh$5851 = .rodata:0x8039A078; // type:object size:0x20 scope:local align:4 data:4byte tag_du$5852 = .rodata:0x8039A098; // type:object size:0x10 scope:local align:4 data:4byte tag$7361 = .rodata:0x8039A0A8; // type:object size:0x10 scope:local align:4 data:string -tag$7759 = .rodata:0x8039A0B8; // type:object size:0x18 scope:local align:4 data:string +tag_7759 = .rodata:0x8039A0B8; // type:object size:0x18 scope:local align:4 data:string @stringBase0 = .rodata:0x8039A0D0; // type:object size:0x1A7 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8039A278; // type:label scope:local align:4 black_color$4634 = .rodata:0x8039A278; // type:object size:0x94 scope:local align:4 @@ -17335,28 +17343,28 @@ t_tag$3763 = .rodata:0x8039B478; // type:object size:0x18 scope:local align:4 da @stringBase0 = .rodata:0x8039B4F8; // type:object size:0x13 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039B510; // type:object size:0x18 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039B528; // type:object size:0x3B0 scope:local align:4 data:string_table -l_preLoad_dylKeyTbl = .rodata:0x8039B8D8; // type:object size:0x1C scope:global align:4 +l_preLoad_dylKeyTbl = .rodata:0x8039B8D8; // type:object size:0x1C scope:local align:4 @stringBase0 = .rodata:0x8039B8F4; // type:object size:0x621 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039BF18; // type:object size:0x8B scope:local align:4 data:string_table -PreLoadInfoT = .rodata:0x8039BFA8; // type:object size:0x10 scope:global align:4 data:4byte +PreLoadInfoT = .rodata:0x8039BFA8; // type:object size:0x10 scope:local align:4 data:4byte @stringBase0 = .rodata:0x8039BFB8; // type:object size:0xA9 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039C068; // type:object size:0x4B scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039C0B8; // type:object size:0xAC scope:local align:4 data:string_table -kColor$localstatic3$draw__9dkWmark_cFv = .rodata:0x8039C168; // type:object size:0xC scope:local align:4 +kColor$localstatic3$draw__9dkWmark_cFv = .rodata:0x8039C168; // type:object size:0xC scope:weak align:4 @stringBase0 = .rodata:0x8039C174; // type:object size:0x6 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039C180; // type:object size:0x344 scope:local align:4 data:string_table -l_base = .rodata:0x8039C4C8; // type:object size:0x80 scope:global align:4 +l_base = .rodata:0x8039C4C8; // type:object size:0x80 scope:local align:4 @2299 = .rodata:0x8039C548; // type:object size:0xC scope:local align:4 data:4byte @stringBase0 = .rodata:0x8039C558; // type:object size:0xD0 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x8039C628; // type:label scope:local align:4 -@898 = .rodata:0x8039C628; // type:object size:0xC scope:local align:4 +unused$285 = .rodata:0x8039C628; // type:object size:0xC scope:local align:4 @899 = .rodata:0x8039C634; // type:object size:0xC scope:local align:4 @900 = .rodata:0x8039C640; // type:object size:0xC scope:local align:4 @901 = .rodata:0x8039C64C; // type:object size:0xC scope:local align:4 @902 = .rodata:0x8039C658; // type:object size:0xC scope:local align:4 @stringBase0 = .rodata:0x8039C664; // type:object size:0x65 scope:local align:4 data:string_table -gapfnExtrapolateParameter___Q27JStudio27@unnamed@functionvalue_cpp@ = .rodata:0x8039C6D0; // type:object size:0x10 scope:global align:4 data:4byte -saCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@ = .rodata:0x8039C6E0; // type:object size:0x40 scope:global align:4 +gapfnExtrapolateParameter___Q27JStudio27@unnamed@functionvalue_cpp@ = .rodata:0x8039C6D0; // type:object size:0x10 scope:local align:4 data:4byte +saCompositeOperation___Q37JStudio3fvb17@unnamed@fvb_cpp@ = .rodata:0x8039C6E0; // type:object size:0x40 scope:local align:4 @745 = .rodata:0x8039C720; // type:object size:0xC scope:local align:4 data:4byte @838 = .rodata:0x8039C72C; // type:object size:0xC scope:local align:4 data:4byte @1138 = .rodata:0x8039C738; // type:object size:0xC scope:local align:4 data:4byte @@ -17390,10 +17398,12 @@ __two_to_x$982 = .rodata:0x8039CC98; // type:object size:0x18 scope:local align: ...rodata.0 = .rodata:0x8039CCB0; // type:label scope:local align:4 sAdsTable__8JASTrack = .rodata:0x8039CCB0; // type:object size:0x18 scope:global align:4 data:2byte sEnvOsc__8JASTrack = .rodata:0x8039CCC8; // type:object size:0x18 scope:global align:4 data:float +...rodata.0 = .rodata:0x8039CCC8; // type:label scope:local sPitchEnvOsc__8JASTrack = .rodata:0x8039CCE0; // type:object size:0x18 scope:global align:4 +...rodata.0 = .rodata:0x8039CCE0; // type:label scope:local @stringBase0 = .rodata:0x8039CCF8; // type:object size:0x14A scope:local align:4 data:string_table -OSC_RELEASE_TABLE = .rodata:0x8039CE48; // type:object size:0xC scope:global align:4 -OSC_ENV = .rodata:0x8039CE54; // type:object size:0x18 scope:global align:4 +OSC_RELEASE_TABLE = .rodata:0x8039CE48; // type:object size:0xC scope:local align:4 +OSC_ENV = .rodata:0x8039CE54; // type:object size:0x18 scope:local align:4 OSC_RELEASE_TABLE$260 = .rodata:0x8039CE70; // type:object size:0xC scope:local align:4 OSC_ENV$261 = .rodata:0x8039CE7C; // type:object size:0x18 scope:local align:4 sOscData__12JASVoiceBank = .rodata:0x8039CE98; // type:object size:0x18 scope:global align:4 @@ -17412,7 +17422,7 @@ connect_table$463 = .rodata:0x8039D580; // type:object size:0x18 scope:local ali @stringBase0 = .rodata:0x8039D5D8; // type:object size:0x14 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039D5F0; // type:object size:0x3A scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039D630; // type:object size:0x69 scope:local align:4 data:string_table -cResetFilterTable = .rodata:0x8039D6A0; // type:object size:0x10 scope:global align:4 +cResetFilterTable = .rodata:0x8039D6A0; // type:object size:0x10 scope:local align:4 @stringBase0 = .rodata:0x8039D6B0; // type:object size:0x1D scope:local align:4 data:string_table @5054 = .rodata:0x8039D6D0; // type:object size:0xC scope:local align:4 data:4byte @5100 = .rodata:0x8039D6DC; // type:object size:0xC scope:local align:4 data:4byte @@ -17467,7 +17477,7 @@ sPrm__8Z2MdnPrm = .rodata:0x8039E66C; // type:object size:0xCC scope:global alig @stringBase0 = .rodata:0x8039EFD0; // type:object size:0x70 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039F040; // type:object size:0x29 scope:local align:4 data:string_table saoAboutEncoding___10JUTResFont = .rodata:0x8039F070; // type:object size:0xC scope:global align:4 -halftofull$726 = .rodata:0x8039F07C; // type:object size:0xBE scope:local align:4 +halftofull = .rodata:0x8039F07C; // type:object size:0xBE scope:local align:4 @stringBase0 = .rodata:0x8039F13C; // type:object size:0x34 scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039F170; // type:object size:0x50E scope:local align:4 data:string_table @stringBase0 = .rodata:0x8039F680; // type:object size:0x3 scope:local align:4 data:string_table @@ -17486,14 +17496,14 @@ j2dDefaultIndTevStageInfo = .rodata:0x803A38D4; // type:object size:0xC scope:gl @stringBase0 = .rodata:0x803A3938; // type:object size:0x3 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x803A3940; // type:label scope:local align:4 @1508 = .rodata:0x803A3940; // type:object size:0x10 scope:local align:4 data:4byte -@1557 = .rodata:0x803A3950; // type:object size:0x10 scope:local align:4 -@1566 = .rodata:0x803A3960; // type:object size:0x10 scope:local align:4 -@1575 = .rodata:0x803A3970; // type:object size:0x10 scope:local align:4 -@1581 = .rodata:0x803A3980; // type:object size:0x10 scope:local align:4 -@1587 = .rodata:0x803A3990; // type:object size:0x10 scope:local align:4 -@1596 = .rodata:0x803A39A0; // type:object size:0x10 scope:local align:4 -@1605 = .rodata:0x803A39B0; // type:object size:0x10 scope:local align:4 -@1612 = .rodata:0x803A39C0; // type:object size:0x10 scope:local align:4 +lit_1557 = .rodata:0x803A3950; // type:object size:0x10 scope:local align:4 +lit_1566 = .rodata:0x803A3960; // type:object size:0x10 scope:local align:4 +lit_1575 = .rodata:0x803A3970; // type:object size:0x10 scope:local align:4 +lit_1581 = .rodata:0x803A3980; // type:object size:0x10 scope:local align:4 +lit_1587 = .rodata:0x803A3990; // type:object size:0x10 scope:local align:4 +lit_1596 = .rodata:0x803A39A0; // type:object size:0x10 scope:local align:4 +lit_1605 = .rodata:0x803A39B0; // type:object size:0x10 scope:local align:4 +lit_1612 = .rodata:0x803A39C0; // type:object size:0x10 scope:local align:4 @2530 = .rodata:0x803A39D0; // type:object size:0x18 scope:local align:4 @2531 = .rodata:0x803A39E8; // type:object size:0x18 scope:local align:4 @2532 = .rodata:0x803A3A00; // type:object size:0x1E scope:local align:4 @@ -17539,32 +17549,32 @@ j3dDefaultNBTScaleInfo = .rodata:0x803A3CC8; // type:object size:0x10 scope:glob @stringBase0 = .rodata:0x803A3DE0; // type:object size:0x2C scope:local align:4 data:string_table @stringBase0 = .rodata:0x803A3E10; // type:object size:0x3D scope:local align:4 data:string_table ...rodata.0 = .rodata:0x803A3E50; // type:label scope:local align:4 -ClampRegion = .rodata:0x803A3E50; // type:object size:0xA scope:global align:4 data:byte +ClampRegion = .rodata:0x803A3E50; // type:object size:0xA scope:local align:4 data:byte __ptmf_null = .rodata:0x803A3E60; // type:object size:0xC scope:global align:4 data:4byte -__constants = .rodata:0x803A3E70; // type:object size:0x18 scope:global align:4 data:double +__constants = .rodata:0x803A3E70; // type:object size:0x18 scope:local align:4 data:double @55 = .rodata:0x803A3E88; // type:object size:0x36 scope:local align:4 data:string @56 = .rodata:0x803A3EC0; // type:object size:0x39 scope:local align:4 data:string -fix_pool_sizes = .rodata:0x803A3F00; // type:object size:0x18 scope:global align:4 data:4byte +fix_pool_sizes = .rodata:0x803A3F00; // type:object size:0x18 scope:local align:4 data:4byte @stringBase0 = .rodata:0x803A3F18; // type:object size:0xDD scope:local align:4 data:string_table @stringBase0 = .rodata:0x803A3FF8; // type:object size:0x25 scope:local align:4 data:string_table ...rodata.0 = .rodata:0x803A4020; // type:label scope:local align:4 -halF = .rodata:0x803A4020; // type:object size:0x10 scope:global align:4 -ln2HI = .rodata:0x803A4030; // type:object size:0x10 scope:global align:4 -ln2LO = .rodata:0x803A4040; // type:object size:0x10 scope:global align:4 -Zero = .rodata:0x803A4050; // type:object size:0x10 scope:global align:4 +halF = .rodata:0x803A4020; // type:object size:0x10 scope:local align:4 +ln2HI = .rodata:0x803A4030; // type:object size:0x10 scope:local align:4 +ln2LO = .rodata:0x803A4040; // type:object size:0x10 scope:local align:4 +Zero = .rodata:0x803A4050; // type:object size:0x10 scope:local align:4 ...rodata.0 = .rodata:0x803A4060; // type:label scope:local align:4 -bp = .rodata:0x803A4060; // type:object size:0x10 scope:global align:4 -dp_h = .rodata:0x803A4070; // type:object size:0x10 scope:global align:4 -dp_l = .rodata:0x803A4080; // type:object size:0x10 scope:global align:4 -two_over_pi = .rodata:0x803A4090; // type:object size:0x108 scope:global align:4 -npio2_hw = .rodata:0x803A4198; // type:object size:0x80 scope:global align:4 -init_jk = .rodata:0x803A4218; // type:object size:0x10 scope:global align:4 -PIo2 = .rodata:0x803A4228; // type:object size:0x40 scope:global align:4 data:double -T = .rodata:0x803A4268; // type:object size:0x68 scope:global align:4 data:double +bp = .rodata:0x803A4060; // type:object size:0x10 scope:local align:4 +dp_h = .rodata:0x803A4070; // type:object size:0x10 scope:local align:4 +dp_l = .rodata:0x803A4080; // type:object size:0x10 scope:local align:4 +two_over_pi = .rodata:0x803A4090; // type:object size:0x108 scope:local align:4 +npio2_hw = .rodata:0x803A4198; // type:object size:0x80 scope:local align:4 +init_jk = .rodata:0x803A4218; // type:object size:0x10 scope:local align:4 +PIo2 = .rodata:0x803A4228; // type:object size:0x40 scope:local align:4 data:double +T = .rodata:0x803A4268; // type:object size:0x68 scope:local align:4 data:double ...rodata.0 = .rodata:0x803A42D0; // type:label scope:local align:4 -atanhi = .rodata:0x803A42D0; // type:object size:0x20 scope:global align:4 -atanlo = .rodata:0x803A42F0; // type:object size:0x20 scope:global align:4 -aT = .rodata:0x803A4310; // type:object size:0x58 scope:global align:4 +atanhi = .rodata:0x803A42D0; // type:object size:0x20 scope:local align:4 +atanlo = .rodata:0x803A42F0; // type:object size:0x20 scope:local align:4 +aT = .rodata:0x803A4310; // type:object size:0x58 scope:local align:4 @133 = .rodata:0x803A4368; // type:object size:0x1B scope:local align:4 data:string @154 = .rodata:0x803A4384; // type:object size:0x10 scope:local align:4 data:string @98 = .rodata:0x803A4398; // type:object size:0x25 scope:local align:4 data:string @@ -17639,11 +17649,11 @@ EndofProgramInstruction$162 = .rodata:0x803A48E8; // type:object size:0x4 scope: @349 = .rodata:0x803A4B98; // type:object size:0x18 scope:local align:4 data:string ...data.0 = .data:0x803A4BC0; // type:label scope:local align:4 COPYDATE_STRING__7mDoMain = .data:0x803A4BC0; // type:object size:0x12 scope:global align:4 data:string -HeapCheckTable = .data:0x803A4BD4; // type:object size:0x20 scope:global align:4 +HeapCheckTable = .data:0x803A4BD4; // type:object size:0x20 scope:local align:4 desc1$3717 = .data:0x803A4BF4; // type:object size:0x14 scope:local align:4 desc2$3718 = .data:0x803A4C08; // type:object size:0x14 scope:local align:4 -__vt__17mDoAud_zelAudio_c = .data:0x803A4C20; // type:object size:0xC scope:global align:4 -__vt__12JAUSoundInfo = .data:0x803A4C2C; // type:object size:0x10 scope:global align:4 +__vt__17mDoAud_zelAudio_c = .data:0x803A4C20; // type:object size:0xC scope:weak align:4 +__vt__12JAUSoundInfo = .data:0x803A4C2C; // type:object size:0x10 scope:weak align:4 g_ntscZeldaIntDf = .data:0x803A4C40; // type:object size:0x3C scope:global align:4 g_ntscZeldaProg = .data:0x803A4C7C; // type:object size:0x3C scope:global align:4 g_mDoMtx_identity = .data:0x803A4CB8; // type:object size:0x30 scope:global align:4 @@ -17668,7 +17678,7 @@ __vt__25mDoExt_MtxCalcAnmBlendTbl = .data:0x803A50C4; // type:object size:0x2C s __vt__114J3DMtxCalcAnimation<64J3DMtxCalcAnimationAdaptorDefault<27J3DMtxCalcCalcTransformMaya>,24J3DMtxCalcJ3DSysInitMaya> = .data:0x803A50F0; // type:object size:0x2C scope:global align:4 __vt__17J3DMtxCalcAnmBase = .data:0x803A511C; // type:object size:0x2C scope:global align:4 __vt__10J3DMtxCalc = .data:0x803A5148; // type:object size:0x2C scope:global align:4 -__vt__11J3DUClipper = .data:0x803A5178; // type:object size:0xC scope:global align:4 +__vt__11J3DUClipper = .data:0x803A5178; // type:object size:0xC scope:weak align:4 __vt__21mDoDvdThd_toMainRam_c = .data:0x803A5188; // type:object size:0x10 scope:global align:4 __vt__25mDoDvdThd_mountXArchive_c = .data:0x803A5198; // type:object size:0x10 scope:global align:4 __vt__24mDoDvdThd_mountArchive_c = .data:0x803A51A8; // type:object size:0x10 scope:global align:4 @@ -17677,18 +17687,18 @@ __vt__19mDoDvdThd_command_c = .data:0x803A51C8; // type:object size:0x10 scope:g @3770 = .data:0x803A51D8; // type:object size:0x38 scope:local align:4 @3850 = .data:0x803A5210; // type:object size:0x38 scope:local align:4 __vt__24JPTraceParticleCallBack4 = .data:0x803A5248; // type:object size:0x14 scope:global align:4 -__vt__19JPAParticleCallBack = .data:0x803A525C; // type:object size:0x14 scope:global align:4 +__vt__19JPAParticleCallBack = .data:0x803A525C; // type:object size:0x14 scope:weak align:4 l_method$3807 = .data:0x803A5270; // type:object size:0xC scope:local align:4 __vt__11fapGm_HIO_c = .data:0x803A5280; // type:object size:0xC scope:global align:4 g_fopAc_Method = .data:0x803A5290; // type:object size:0x20 scope:global align:4 -__vt__11dEvt_info_c = .data:0x803A52B0; // type:object size:0xC scope:global align:4 +__vt__11dEvt_info_c = .data:0x803A52B0; // type:object size:0xC scope:weak align:4 g_fopAcTg_Queue = .data:0x803A52C0; // type:object size:0xC scope:global align:4 -l_cullSizeBox = .data:0x803A52D0; // type:object size:0x150 scope:global align:4 -l_cullSizeSphere = .data:0x803A5420; // type:object size:0x80 scope:global align:4 -__vt__8cM3dGPla = .data:0x803A54A0; // type:object size:0xC scope:global align:4 -__vt__15dBgS_ObjRoofChk = .data:0x803A54AC; // type:object size:0x30 scope:global align:4 -__vt__11dBgS_WtrChk = .data:0x803A54DC; // type:object size:0x30 scope:global align:4 -__vt__14dBgS_ObjGndChk = .data:0x803A550C; // type:object size:0x30 scope:global align:4 +l_cullSizeBox = .data:0x803A52D0; // type:object size:0x150 scope:local align:4 +l_cullSizeSphere = .data:0x803A5420; // type:object size:0x80 scope:local align:4 +__vt__8cM3dGPla = .data:0x803A54A0; // type:object size:0xC scope:weak align:4 +__vt__15dBgS_ObjRoofChk = .data:0x803A54AC; // type:object size:0x30 scope:weak align:4 +__vt__11dBgS_WtrChk = .data:0x803A54DC; // type:object size:0x30 scope:weak align:4 +__vt__14dBgS_ObjGndChk = .data:0x803A550C; // type:object size:0x30 scope:weak align:4 g_fopCam_Method = .data:0x803A5540; // type:object size:0x14 scope:global align:4 g_fopOvlp_Method = .data:0x803A5558; // type:object size:0x14 scope:global align:4 phaseMethod$2260 = .data:0x803A5570; // type:object size:0x20 scope:local align:4 @@ -17705,11 +17715,11 @@ g_fopMsg_Method = .data:0x803A5638; // type:object size:0x14 scope:global align: g_fpcCtTg_Queue = .data:0x803A5670; // type:object size:0xC scope:global align:4 g_fpcDtTg_Queue = .data:0x803A5680; // type:object size:0xC scope:global align:4 l_fpcLy_Crear = .data:0x803A5690; // type:object size:0x2C scope:global align:4 data:4byte -l_fpcLy_LayerList = .data:0x803A56BC; // type:object size:0xC scope:global align:4 data:4byte +l_fpcLy_LayerList = .data:0x803A56BC; // type:object size:0xC scope:local align:4 data:4byte g_fpcLf_Method = .data:0x803A56C8; // type:object size:0x14 scope:global align:4 crear$2239 = .data:0x803A56E0; // type:object size:0x1C scope:local align:4 data:4byte g_fpcNd_Method = .data:0x803A5700; // type:object size:0x14 scope:global align:4 -l_fpcNdRq_Queue = .data:0x803A5718; // type:object size:0xC scope:global align:4 data:4byte +l_fpcNdRq_Queue = .data:0x803A5718; // type:object size:0xC scope:local align:4 data:4byte clear$2359 = .data:0x803A5724; // type:object size:0x64 scope:local align:4 data:4byte methods$2376 = .data:0x803A5788; // type:object size:0x18 scope:local align:4 methods$2386 = .data:0x803A57A0; // type:object size:0x10 scope:local align:4 @@ -17717,7 +17727,7 @@ methods$2397 = .data:0x803A57B0; // type:object size:0xC scope:local align:4 submethod$2214 = .data:0x803A57C0; // type:object size:0xC scope:local align:4 submethod$2261 = .data:0x803A57D0; // type:object size:0xC scope:local align:4 method$2262 = .data:0x803A57DC; // type:object size:0x1C scope:local align:4 -l_objectName = .data:0x803A57F8; // type:object size:0x2AB4 scope:global align:4 +l_objectName = .data:0x803A57F8; // type:object size:0x2AB4 scope:local align:4 l_roomFuncTable$5052 = .data:0x803A82AC; // type:object size:0x30 scope:local align:4 l_layerFuncTable$5053 = .data:0x803A82DC; // type:object size:0x24 scope:local align:4 l_layerFuncTable$5131 = .data:0x803A8300; // type:object size:0x18 scope:local align:4 @@ -17733,50 +17743,50 @@ mMemoryBlock__20dStage_roomControl_c = .data:0x803A8600; // type:object size:0x4 mArcBank__20dStage_roomControl_c = .data:0x803A864C; // type:object size:0x140 scope:global align:4 __vt__15dStage_roomDt_c = .data:0x803A878C; // type:object size:0x174 scope:global align:4 __vt__16dStage_stageDt_c = .data:0x803A8900; // type:object size:0x174 scope:global align:4 -__vt__11dStage_dt_c = .data:0x803A8A74; // type:object size:0x174 scope:global align:4 +__vt__11dStage_dt_c = .data:0x803A8A74; // type:object size:0x174 scope:weak align:4 @3806 = .data:0x803A8BE8; // type:object size:0x20 scope:local align:4 @4259 = .data:0x803A8C08; // type:object size:0x44 scope:local align:4 @4694 = .data:0x803A8C4C; // type:object size:0x1C scope:local align:4 -__vt__12dDlst_base_c = .data:0x803A8C68; // type:object size:0xC scope:global align:4 -__vt__28dDrawPathWithNormalPattern_c = .data:0x803A8C74; // type:object size:0x40 scope:global align:4 -__vt__15dRenderingMap_c = .data:0x803A8CB4; // type:object size:0x5C scope:global align:4 +__vt__12dDlst_base_c = .data:0x803A8C68; // type:object size:0xC scope:weak align:4 +__vt__28dDrawPathWithNormalPattern_c = .data:0x803A8C74; // type:object size:0x40 scope:weak align:4 +__vt__15dRenderingMap_c = .data:0x803A8CB4; // type:object size:0x5C scope:weak align:4 __vt__6dMap_c = .data:0x803A8D10; // type:object size:0xC4 scope:global align:4 __vt__15renderingAmap_c = .data:0x803A8DD4; // type:object size:0xC4 scope:global align:4 l_method$5017 = .data:0x803A8E98; // type:object size:0xC scope:local align:4 l_method$5051 = .data:0x803A8EA4; // type:object size:0xC scope:local align:4 l_itemno$6402 = .data:0x803A8EB0; // type:object size:0x18 scope:local align:4 data:byte -__vt__25mDoExt_McaMorfCallBack1_c = .data:0x803A8EC8; // type:object size:0xC scope:global align:4 -__vt__12dCcMassS_Obj = .data:0x803A8ED4; // type:object size:0xC scope:global align:4 -__vt__15cCcD_DivideArea = .data:0x803A8EE0; // type:object size:0xC scope:global align:4 -__vt__8cM3dGCyl = .data:0x803A8EEC; // type:object size:0xC scope:global align:4 -__vt__8cM3dGAab = .data:0x803A8EF8; // type:object size:0xC scope:global align:4 -__vt__15cCcD_DivideInfo = .data:0x803A8F04; // type:object size:0xC scope:global align:4 -__vt__12dCcMassS_Mng = .data:0x803A8F10; // type:object size:0xC scope:global align:4 +__vt__25mDoExt_McaMorfCallBack1_c = .data:0x803A8EC8; // type:object size:0xC scope:weak align:4 +__vt__12dCcMassS_Obj = .data:0x803A8ED4; // type:object size:0xC scope:weak align:4 +__vt__15cCcD_DivideArea = .data:0x803A8EE0; // type:object size:0xC scope:weak align:4 +__vt__8cM3dGCyl = .data:0x803A8EEC; // type:object size:0xC scope:weak align:4 +__vt__8cM3dGAab = .data:0x803A8EF8; // type:object size:0xC scope:weak align:4 +__vt__15cCcD_DivideInfo = .data:0x803A8F04; // type:object size:0xC scope:weak align:4 +__vt__12dCcMassS_Mng = .data:0x803A8F10; // type:object size:0xC scope:weak align:4 ZeroQuat = .data:0x803A8F20; // type:object size:0x10 scope:global align:4 __vt__10CSTControl = .data:0x803A8F30; // type:object size:0x10 scope:global align:4 __vt__9STControl = .data:0x803A8F40; // type:object size:0x10 scope:global align:4 i_item_lst$4006 = .data:0x803A8F50; // type:object size:0x17 scope:local align:4 data:byte saveBitLabels__16dSv_event_flag_c = .data:0x803A8F68; // type:object size:0x66C scope:global align:4 -__vt__8cM3dGLin = .data:0x803A95D8; // type:object size:0xC scope:global align:4 -__vt__8cM3dGSph = .data:0x803A95E4; // type:object size:0xC scope:global align:4 +__vt__8cM3dGLin = .data:0x803A95D8; // type:object size:0xC scope:weak align:4 +__vt__8cM3dGSph = .data:0x803A95E4; // type:object size:0xC scope:weak align:4 __vt__16dDemo_particle_c = .data:0x803A95F0; // type:object size:0x18 scope:global align:4 __vt__17jmessage_tControl = .data:0x803A9608; // type:object size:0xC scope:global align:4 -__vt__Q27JStudio13TCreateObject = .data:0x803A9614; // type:object size:0x10 scope:global align:4 +__vt__Q27JStudio13TCreateObject = .data:0x803A9614; // type:object size:0x10 scope:weak align:4 __vt__14dDemo_system_c = .data:0x803A9624; // type:object size:0x50 scope:global align:4 __vt__11dDemo_fog_c = .data:0x803A9674; // type:object size:0x5C scope:global align:4 __vt__13dDemo_light_c = .data:0x803A96D0; // type:object size:0x6C scope:global align:4 __vt__15dDemo_ambient_c = .data:0x803A973C; // type:object size:0x44 scope:global align:4 __vt__14dDemo_camera_c = .data:0x803A9780; // type:object size:0x94 scope:global align:4 __vt__13dDemo_actor_c = .data:0x803A9814; // type:object size:0x8C scope:global align:4 -__vt__Q27JStudio16TAdaptor_message = .data:0x803A98A0; // type:object size:0x24 scope:global align:4 -__vt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_message = .data:0x803A98C4; // type:object size:0x10 scope:global align:4 -__vt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_message = .data:0x803A98D4; // type:object size:0x24 scope:global align:4 +__vt__Q27JStudio16TAdaptor_message = .data:0x803A98A0; // type:object size:0x24 scope:weak align:4 +__vt__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_message = .data:0x803A98C4; // type:object size:0x10 scope:local align:4 +__vt__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_message = .data:0x803A98D4; // type:object size:0x24 scope:local align:4 @4017 = .data:0x803A98F8; // type:object size:0x20 scope:local align:4 -__vt__10J3DAnmBase = .data:0x803A9918; // type:object size:0x10 scope:global align:4 -__vt__15J3DAnmTransform = .data:0x803A9928; // type:object size:0x14 scope:global align:4 -__vt__18mDoExt_transAnmBas = .data:0x803A993C; // type:object size:0x14 scope:global align:4 -__vt__18J3DAnmTransformKey = .data:0x803A9950; // type:object size:0x14 scope:global align:4 -__vt__11J3DTexNoAnm = .data:0x803A9964; // type:object size:0xC scope:global align:4 +__vt__10J3DAnmBase = .data:0x803A9918; // type:object size:0x10 scope:weak align:4 +__vt__15J3DAnmTransform = .data:0x803A9928; // type:object size:0x14 scope:weak align:4 +__vt__18mDoExt_transAnmBas = .data:0x803A993C; // type:object size:0x14 scope:weak align:4 +__vt__18J3DAnmTransformKey = .data:0x803A9950; // type:object size:0x14 scope:weak align:4 +__vt__11J3DTexNoAnm = .data:0x803A9964; // type:object size:0xC scope:weak align:4 __vt__18dRenderingFDAmap_c = .data:0x803A9970; // type:object size:0x68 scope:global align:4 __vt__11dDrawPath_c = .data:0x803A99D8; // type:object size:0x40 scope:global align:4 @4467 = .data:0x803A9A18; // type:object size:0x3C scope:local align:4 @@ -17785,7 +17795,7 @@ __vt__19renderingPlusDoor_c = .data:0x803A9A60; // type:object size:0xA4 scope:g __vt__28renderingPlusDoorAndCursor_c = .data:0x803A9B04; // type:object size:0xBC scope:global align:4 __vt__16renderingDAmap_c = .data:0x803A9BC0; // type:object size:0x98 scope:global align:4 @4719 = .data:0x803A9C58; // type:object size:0x38 scope:local align:4 -TelopData = .data:0x803A9C90; // type:object size:0x288 scope:global align:4 data:4byte +TelopData = .data:0x803A9C90; // type:object size:0x288 scope:local align:4 data:4byte @4398 = .data:0x803A9F18; // type:object size:0x34 scope:local align:4 soecial_names$3966 = .data:0x803A9F50; // type:object size:0x38 scope:local align:4 action_table$5100 = .data:0x803A9F88; // type:object size:0xC scope:local align:4 @@ -17799,7 +17809,9 @@ __vt__15dSmplMdl_draw_c = .data:0x803A9FD8; // type:object size:0xC scope:global ...data.0 = .data:0x803A9FE8; // type:label scope:local align:4 l_lifeBallColor = .data:0x803A9FE8; // type:object size:0xC scope:global align:4 data:byte effectIDTable$5499 = .data:0x803A9FF4; // type:object size:0x18 scope:local align:4 +...data.0 = .data:0x803A9FF4; // type:label scope:local ringID$5531 = .data:0x803AA00C; // type:object size:0x30 scope:local align:4 +...data.0 = .data:0x803AA00C; // type:label scope:local normalID$5532 = .data:0x803AA03C; // type:object size:0x30 scope:local align:4 __vt__28dPa_particleTracePcallBack_c = .data:0x803AA06C; // type:object size:0x14 scope:global align:4 data:2byte __vt__22dPa_hermiteEcallBack_c = .data:0x803AA080; // type:object size:0x24 scope:global align:4 @@ -17846,29 +17858,29 @@ m_typeFourData__8dPaPoF_c = .data:0x803AA3B0; // type:object size:0x3C scope:glo m_emitterFourData__8dPaPoF_c = .data:0x803AA428; // type:object size:0x3C scope:global align:4 data:4byte ...data.0 = .data:0x803AA480; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803AA480; // type:object size:0xC scope:local align:4 -l_frontZMat = .data:0x803AA4A0; // type:object size:0x3C scope:global align:32 -l_frontNoZSubMat = .data:0x803AA4E0; // type:object size:0x2A scope:global align:32 -l_shadowVolPos = .data:0x803AA50C; // type:object size:0x60 scope:global align:4 -l_shadowVolDL = .data:0x803AA580; // type:object size:0x3B scope:global align:32 -l_shadowProjMat = .data:0x803AA5C0; // type:object size:0x5A scope:global align:32 -l_shadowVolMat = .data:0x803AA620; // type:object size:0x5A scope:global align:32 noreloc -l_clearMat = .data:0x803AA680; // type:object size:0x55 scope:global align:32 -l_frontMat = .data:0x803AA6E0; // type:object size:0x55 scope:global align:32 -l_backSubMat = .data:0x803AA740; // type:object size:0x3C scope:global align:32 -l_simpleShadowPos = .data:0x803AA77C; // type:object size:0xA8 scope:global align:4 -l_shadowVolumeDL = .data:0x803AA840; // type:object size:0x58 scope:global align:32 -l_shadowSealTexDL = .data:0x803AA8A0; // type:object size:0x55 scope:global align:32 -l_shadowSealTex2DL = .data:0x803AA900; // type:object size:0x55 scope:global align:32 -l_shadowSealDL = .data:0x803AA960; // type:object size:0x69 scope:global align:32 +l_frontZMat = .data:0x803AA4A0; // type:object size:0x3C scope:local align:32 +l_frontNoZSubMat = .data:0x803AA4E0; // type:object size:0x2A scope:local align:32 +l_shadowVolPos = .data:0x803AA50C; // type:object size:0x60 scope:local align:4 +l_shadowVolDL = .data:0x803AA580; // type:object size:0x3B scope:local align:32 +l_shadowProjMat = .data:0x803AA5C0; // type:object size:0x5A scope:local align:32 +l_shadowVolMat = .data:0x803AA620; // type:object size:0x5A scope:local align:32 noreloc +l_clearMat = .data:0x803AA680; // type:object size:0x55 scope:local align:32 +l_frontMat = .data:0x803AA6E0; // type:object size:0x55 scope:local align:32 +l_backSubMat = .data:0x803AA740; // type:object size:0x3C scope:local align:32 +l_simpleShadowPos = .data:0x803AA77C; // type:object size:0xA8 scope:local align:4 +l_shadowVolumeDL = .data:0x803AA840; // type:object size:0x58 scope:local align:32 +l_shadowSealTexDL = .data:0x803AA8A0; // type:object size:0x55 scope:local align:32 +l_shadowSealTex2DL = .data:0x803AA900; // type:object size:0x55 scope:local align:32 +l_shadowSealDL = .data:0x803AA960; // type:object size:0x69 scope:local align:32 l_matDL$5404 = .data:0x803AA9E0; // type:object size:0x7B scope:local align:32 l_imageDrawColor$5405 = .data:0x803AAA5C; // type:object size:0x10 scope:local align:4 l_tevColorChan$5438 = .data:0x803AAA6C; // type:object size:0x10 scope:local align:4 mtx_adj$5842 = .data:0x803AAA7C; // type:object size:0x30 scope:local align:4 -__vt__18dDlst_shadowPoly_c = .data:0x803AAAAC; // type:object size:0x10 scope:global align:4 -__vt__22dDlst_shadowRealPoly_c = .data:0x803AAABC; // type:object size:0x10 scope:global align:4 -__vt__14ShdwDrawPoly_c = .data:0x803AAACC; // type:object size:0xC scope:global align:4 +__vt__18dDlst_shadowPoly_c = .data:0x803AAAAC; // type:object size:0x10 scope:weak align:4 +__vt__22dDlst_shadowRealPoly_c = .data:0x803AAABC; // type:object size:0x10 scope:weak align:4 +__vt__14ShdwDrawPoly_c = .data:0x803AAACC; // type:object size:0xC scope:weak align:4 __vt__18dDlst_effectLine_c = .data:0x803AAAD8; // type:object size:0xC scope:global align:4 -__vt__10J2DAnmBase = .data:0x803AAAE4; // type:object size:0x10 scope:global align:4 +__vt__10J2DAnmBase = .data:0x803AAAE4; // type:object size:0x10 scope:weak align:4 __vt__11dDlst_blo_c = .data:0x803AAAF4; // type:object size:0xC scope:global align:4 __vt__10dDlst_2D_c = .data:0x803AAB00; // type:object size:0xC scope:global align:4 __vt__12dDlst_2DMt_c = .data:0x803AAB0C; // type:object size:0xC scope:global align:4 @@ -17879,18 +17891,18 @@ __vt__11dDlst_2DT_c = .data:0x803AAB48; // type:object size:0xC scope:global ali __vt__15dDlst_2DPoint_c = .data:0x803AAB54; // type:object size:0xC scope:global align:4 __vt__14dDlst_2DQuad_c = .data:0x803AAB60; // type:object size:0xC scope:global align:4 __vt__13dDlst_2DTri_c = .data:0x803AAB6C; // type:object size:0xC scope:global align:4 -l_kydata_BloomInf_tbl = .data:0x803AAB78; // type:object size:0x300 scope:global align:4 -l_darkworld_tbl = .data:0x803AAE78; // type:object size:0x110 scope:global align:4 -l_light_size_tbl = .data:0x803AAF88; // type:object size:0x120 scope:global align:4 -l_light_size_tbl_tw = .data:0x803AB0A8; // type:object size:0x48 scope:global align:4 -l_maple_col = .data:0x803AB0F0; // type:object size:0x24 scope:global align:4 -l_time_attribute = .data:0x803AB114; // type:object size:0x84 scope:global align:4 -l_time_attribute_boss = .data:0x803AB198; // type:object size:0x84 scope:global align:4 -l_field_data = .data:0x803AB21C; // type:object size:0x340 scope:global align:4 -l_pselect_default = .data:0x803AB55C; // type:object size:0x18 scope:global align:4 -l_envr_default = .data:0x803AB574; // type:object size:0x82 scope:global align:4 -l_vr_box_data = .data:0x803AB5F8; // type:object size:0x17A scope:global align:4 -S_xfog_table_data = .data:0x803AB774; // type:object size:0x28 scope:global align:4 +l_kydata_BloomInf_tbl = .data:0x803AAB78; // type:object size:0x300 scope:local align:4 +l_darkworld_tbl = .data:0x803AAE78; // type:object size:0x110 scope:local align:4 +l_light_size_tbl = .data:0x803AAF88; // type:object size:0x120 scope:local align:4 +l_light_size_tbl_tw = .data:0x803AB0A8; // type:object size:0x48 scope:local align:4 +l_maple_col = .data:0x803AB0F0; // type:object size:0x24 scope:local align:4 +l_time_attribute = .data:0x803AB114; // type:object size:0x84 scope:local align:4 +l_time_attribute_boss = .data:0x803AB198; // type:object size:0x84 scope:local align:4 +l_field_data = .data:0x803AB21C; // type:object size:0x340 scope:local align:4 +l_pselect_default = .data:0x803AB55C; // type:object size:0x18 scope:local align:4 +l_envr_default = .data:0x803AB574; // type:object size:0x82 scope:local align:4 +l_vr_box_data = .data:0x803AB5F8; // type:object size:0x17A scope:local align:4 +S_xfog_table_data = .data:0x803AB774; // type:object size:0x28 scope:local align:4 __vt__19dKankyo_evil_Packet = .data:0x803AB7A0; // type:object size:0x14 scope:global align:4 __vt__18dKankyo_mud_Packet = .data:0x803AB7B4; // type:object size:0x14 scope:global align:4 __vt__20dKankyo_odour_Packet = .data:0x803AB7C8; // type:object size:0x14 scope:global align:4 @@ -17911,14 +17923,14 @@ act_type_tbl__12dAttention_c = .data:0x803AB8E4; // type:object size:0x14 scope: ftp_table$4417 = .data:0x803AB8F8; // type:object size:0x24 scope:local align:4 ang_table2$4419 = .data:0x803AB91C; // type:object size:0xC scope:local align:4 __vt__19dAttDraw_CallBack_c = .data:0x803AB928; // type:object size:0xC scope:global align:4 -__vt__15dAttDrawParam_c = .data:0x803AB934; // type:object size:0xC scope:global align:4 +__vt__15dAttDrawParam_c = .data:0x803AB934; // type:object size:0xC scope:weak align:4 __vt__11dAttParam_c = .data:0x803AB940; // type:object size:0xC scope:global align:4 dist_table__12dAttention_c = .data:0x803AB950; // type:object size:0x1998 scope:global align:4 __vt__4dBgS = .data:0x803AD2E8; // type:object size:0x14 scope:global align:4 __vt__4cBgS = .data:0x803AD2FC; // type:object size:0x14 scope:global align:4 __vt__11cBgS_ChkElm = .data:0x803AD310; // type:object size:0x10 scope:global align:4 __vt__9dBgS_Acch = .data:0x803AD320; // type:object size:0x24 scope:global align:4 -__vt__12dBgS_AcchCir = .data:0x803AD344; // type:object size:0xC scope:global align:4 +__vt__12dBgS_AcchCir = .data:0x803AD344; // type:object size:0xC scope:weak align:4 __vt__8dBgS_Chk = .data:0x803AD350; // type:object size:0x18 scope:global align:4 __vt__18dBgS_CamGndChk_Wtr = .data:0x803AD368; // type:object size:0x30 scope:global align:4 __vt__14dBgS_CamGndChk = .data:0x803AD398; // type:object size:0x30 scope:global align:4 @@ -17927,7 +17939,7 @@ __vt__18dBgS_ObjGndChk_Spl = .data:0x803AD3F8; // type:object size:0x30 scope:gl __vt__18dBgS_ObjGndChk_Wtr = .data:0x803AD428; // type:object size:0x30 scope:global align:4 __vt__11dBgS_GndChk = .data:0x803AD458; // type:object size:0x30 scope:global align:4 __vt__15dBgS_GrpPassChk = .data:0x803AD488; // type:object size:0xC scope:global align:4 -__vt__15cBgS_GrpPassChk = .data:0x803AD494; // type:object size:0xC scope:global align:4 +__vt__15cBgS_GrpPassChk = .data:0x803AD494; // type:object size:0xC scope:weak align:4 __vt__16dBgS_HorseLinChk = .data:0x803AD4A0; // type:object size:0x30 scope:global align:4 __vt__15dBgS_RopeLinChk = .data:0x803AD4D0; // type:object size:0x30 scope:global align:4 __vt__20dBgS_BoomerangLinChk = .data:0x803AD500; // type:object size:0x30 scope:global align:4 @@ -17942,17 +17954,17 @@ __vt__16dBgS_MoveBgActor = .data:0x803AD680; // type:object size:0x28 scope:glob __vt__11dBgS_SphChk = .data:0x803AD6A8; // type:object size:0x3C scope:global align:4 __vt__14dBgS_SplGrpChk = .data:0x803AD6E8; // type:object size:0x30 scope:global align:4 __vt__16dBgS_PolyPassChk = .data:0x803AD718; // type:object size:0xC scope:global align:4 -__vt__16cBgS_PolyPassChk = .data:0x803AD724; // type:object size:0xC scope:global align:4 +__vt__16cBgS_PolyPassChk = .data:0x803AD724; // type:object size:0xC scope:weak align:4 __vt__12dBgS_RoofChk = .data:0x803AD730; // type:object size:0x30 scope:global align:4 __vt__4dBgW = .data:0x803AD760; // type:object size:0x104 scope:global align:4 -__vt__8cM3dGTri = .data:0x803AD864; // type:object size:0xC scope:global align:4 +__vt__8cM3dGTri = .data:0x803AD864; // type:object size:0xC scope:weak align:4 __vt__11cBgW_GrpElm = .data:0x803AD870; // type:object size:0xC scope:global align:4 __vt__11cBgW_TriElm = .data:0x803AD87C; // type:object size:0xC scope:global align:4 __vt__4cBgW = .data:0x803AD888; // type:object size:0x104 scope:global align:4 __vt__13cBgW_NodeTree = .data:0x803AD98C; // type:object size:0xC scope:global align:4 __vt__11cBgW_RwgElm = .data:0x803AD998; // type:object size:0xC scope:global align:4 __vt__9dBgW_Base = .data:0x803AD9A8; // type:object size:0xF0 scope:global align:4 -__vt__9cBgW_BgId = .data:0x803ADA98; // type:object size:0xC scope:global align:4 +__vt__9cBgW_BgId = .data:0x803ADA98; // type:object size:0xC scope:weak align:4 __vt__8dBgWKCol = .data:0x803ADAA8; // type:object size:0xF0 scope:global align:4 __vt__6dBgWSv = .data:0x803ADB98; // type:object size:0x104 scope:global align:4 __vt__8dCcD_Sph = .data:0x803ADCA0; // type:object size:0x90 scope:global align:4 @@ -17974,23 +17986,24 @@ __vt__14cCcD_ObjHitInf = .data:0x803ADFB8; // type:object size:0xC scope:global __vt__9dCcD_Stts = .data:0x803ADFC4; // type:object size:0x2C scope:global align:4 __vt__10dCcD_GStts = .data:0x803ADFF0; // type:object size:0xC scope:global align:4 __vt__10cCcD_GStts = .data:0x803ADFFC; // type:object size:0xC scope:global align:4 -rank_tbl = .data:0x803AE008; // type:object size:0x79 scope:global align:4 +rank_tbl = .data:0x803AE008; // type:object size:0x79 scope:local align:4 m_mtrl_hit_tbl__4dCcS = .data:0x803AE084; // type:object size:0x40 scope:global align:4 __vt__4dCcS = .data:0x803AE0C4; // type:object size:0x34 scope:global align:4 -plCutLRC = .data:0x803AE0F8; // type:object size:0xE8 scope:global align:4 +plCutLRC = .data:0x803AE0F8; // type:object size:0xE8 scope:local align:4 __vt__11dCamSetup_c = .data:0x803AE1E0; // type:object size:0xC scope:global align:4 __vt__11dCamParam_c = .data:0x803AE1EC; // type:object size:0xC scope:global align:4 -__vt__9dCstick_c = .data:0x803AE1F8; // type:object size:0xC scope:global align:4 +__vt__9dCstick_c = .data:0x803AE1F8; // type:object size:0xC scope:weak align:4 @8754 = .data:0x803AE208; // type:object size:0x78 scope:local align:4 item_resource__10dItem_data = .data:0x803AE280; // type:object size:0x17E8 scope:global align:4 field_item_res__10dItem_data = .data:0x803AFA68; // type:object size:0xFF0 scope:global align:4 item_info__10dItem_data = .data:0x803B0A58; // type:object size:0x3FC scope:global align:4 -item_func_ptr = .data:0x803B0E58; // type:object size:0x400 scope:global align:4 -item_getcheck_func_ptr = .data:0x803B1258; // type:object size:0x400 scope:global align:4 +item_func_ptr = .data:0x803B0E58; // type:object size:0x400 scope:local align:4 +item_getcheck_func_ptr = .data:0x803B1258; // type:object size:0x400 scope:local align:4 __vt__6dMdl_c = .data:0x803B1658; // type:object size:0x14 scope:global align:4 ...data.0 = .data:0x803B1670; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B1670; // type:object size:0xC scope:local align:4 l_peepEventName = .data:0x803B167C; // type:object size:0xA scope:global align:4 data:string +...data.0 = .data:0x803B167C; // type:label scope:local @4422 = .data:0x803B1688; // type:object size:0xC scope:local align:4 @4423 = .data:0x803B1694; // type:object size:0xC scope:local align:4 @4424 = .data:0x803B16A0; // type:object size:0xC scope:local align:4 @@ -18403,8 +18416,11 @@ m_procInitTable__9daAlink_c = .data:0x803B2708; // type:object size:0x1600 scope @4830 = .data:0x803B3FA8; // type:object size:0xC scope:local align:4 @4831 = .data:0x803B3FB4; // type:object size:0xC scope:local align:4 m_demoInitTable__9daAlink_c = .data:0x803B3FC0; // type:object size:0x474 scope:global align:4 data:4byte +...data.0 = .data:0x803B42CC; // type:label scope:local l_cylSrc = .data:0x803B4434; // type:object size:0x44 scope:global align:4 +...data.0 = .data:0x803B4434; // type:label scope:local l_sphSrc = .data:0x803B4478; // type:object size:0x40 scope:global align:4 +...data.0 = .data:0x803B4478; // type:label scope:local l_atCylSrc = .data:0x803B44B8; // type:object size:0x44 scope:global align:4 l_atCpsSrc = .data:0x803B44FC; // type:object size:0x4C scope:global align:4 l_jntColPos0 = .data:0x803B4548; // type:object size:0x18 scope:global align:4 @@ -18471,12 +18487,14 @@ __vt__29dAlink_bottleWaterPcallBack_c = .data:0x803B5294; // type:object size:0x __vt__12dBgS_ObjAcch = .data:0x803B52A8; // type:object size:0x24 scope:global align:4 __vt__Q29daAlink_c14hsChainShape_c = .data:0x803B52CC; // type:object size:0x14 scope:global align:4 __vt__12daItemBase_c = .data:0x803B52F0; // type:object size:0x44 scope:global align:4 -daNocrm_METHODS = .data:0x803B5338; // type:object size:0x20 scope:global align:4 +daNocrm_METHODS = .data:0x803B5338; // type:object size:0x20 scope:local align:4 g_profile_NO_CHG_ROOM = .data:0x803B5358; // type:object size:0x30 scope:global align:4 ...data.0 = .data:0x803B5388; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B5388; // type:object size:0xC scope:local align:4 @5258 = .data:0x803B5394; // type:object size:0x24 scope:local align:4 +...data.0 = .data:0x803B5394; // type:label scope:local mCcDCyl__8daNpcT_c = .data:0x803B53B8; // type:object size:0x44 scope:global align:4 +...data.0 = .data:0x803B53B8; // type:label scope:local mCcDSph__8daNpcT_c = .data:0x803B53FC; // type:object size:0x40 scope:global align:4 mCcDCyl__11daBaseNpc_c = .data:0x803B543C; // type:object size:0x44 scope:global align:4 mCcDSph__11daBaseNpc_c = .data:0x803B5480; // type:object size:0x40 scope:global align:4 @@ -18507,15 +18525,17 @@ a_jntTbl_M$3905 = .data:0x803B5AC4; // type:object size:0xF00 scope:local align: a_prmTbl_M$3906 = .data:0x803B69C4; // type:object size:0x400 scope:local align:4 a_jntTbl_W$3907 = .data:0x803B6DC4; // type:object size:0xD20 scope:local align:4 a_prmTbl_W$3908 = .data:0x803B7AE4; // type:object size:0x380 scope:local align:4 -__vt__17daNpcCd_HIO_Jnt_c = .data:0x803B7E64; // type:object size:0xC scope:global align:4 -__vt__19daNpcCd_HIO_Child_c = .data:0x803B7E70; // type:object size:0xC scope:global align:4 -__vt__13daNpcCd_HIO_c = .data:0x803B7E7C; // type:object size:0xC scope:global align:4 -__vt__18fOpAcm_HIO_entry_c = .data:0x803B7E88; // type:object size:0xC scope:global align:4 -__vt__14mDoHIO_entry_c = .data:0x803B7E94; // type:object size:0xC scope:global align:4 +__vt__17daNpcCd_HIO_Jnt_c = .data:0x803B7E64; // type:object size:0xC scope:weak align:4 +__vt__19daNpcCd_HIO_Child_c = .data:0x803B7E70; // type:object size:0xC scope:weak align:4 +__vt__13daNpcCd_HIO_c = .data:0x803B7E7C; // type:object size:0xC scope:weak align:4 +__vt__18fOpAcm_HIO_entry_c = .data:0x803B7E88; // type:object size:0xC scope:weak align:4 +__vt__14mDoHIO_entry_c = .data:0x803B7E94; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803B7EA0; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803B7EA0; // type:object size:0xC scope:local align:4 l_resNameTbl = .data:0x803B7EAC; // type:object size:0x78 scope:local align:4 +...data.0 = .data:0x803B7EAC; // type:label scope:local l_bmdTbl = .data:0x803B7F24; // type:object size:0xF0 scope:local align:4 data:4byte +...data.0 = .data:0x803B7F24; // type:label scope:local l_bmdTWTbl = .data:0x803B8014; // type:object size:0xF0 scope:local align:4 data:4byte l_btpTbl = .data:0x803B8104; // type:object size:0xF0 scope:global align:4 data:4byte l_btpTWTbl = .data:0x803B81F4; // type:object size:0xF0 scope:global align:4 data:4byte @@ -18547,18 +18567,20 @@ mode_proc$4678 = .data:0x803BBAA4; // type:object size:0x18 scope:local align:4 @5248 = .data:0x803BBB6C; // type:object size:0xC scope:local align:4 mFuncPtr__8daItem_c = .data:0x803BBB78; // type:object size:0x78 scope:global align:4 data:4byte m_cyl_src__8daItem_c = .data:0x803BBBF0; // type:object size:0x44 scope:global align:4 -l_daItem_Method = .data:0x803BBC34; // type:object size:0x20 scope:global align:4 +l_daItem_Method = .data:0x803BBC34; // type:object size:0x20 scope:local align:4 g_profile_ITEM = .data:0x803BBC54; // type:object size:0x30 scope:global align:4 __vt__8daItem_c = .data:0x803BBC84; // type:object size:0x44 scope:global align:4 -__vt__9dInsect_c = .data:0x803BBD58; // type:object size:0xC scope:global align:4 +__vt__9dInsect_c = .data:0x803BBD58; // type:object size:0xC scope:weak align:4 __vt__14daObj_SSBase_c = .data:0x803BBD68; // type:object size:0x14 scope:global align:4 arcName$4622 = .data:0x803BBD80; // type:object size:0x20 scope:local align:4 -l_sightDL = .data:0x803BBDA0; // type:object size:0x89 scope:global align:4 noreloc +l_sightDL = .data:0x803BBDA0; // type:object size:0x89 scope:local align:4 noreloc __vt__18daPy_sightPacket_c = .data:0x803BBE2C; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BBE40; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BBE40; // type:object size:0xC scope:local align:4 @4478 = .data:0x803BBE4C; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803BBE4C; // type:label scope:local @4479 = .data:0x803BBE58; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803BBE58; // type:label scope:local @4480 = .data:0x803BBE64; // type:object size:0xC scope:local align:4 @4481 = .data:0x803BBE70; // type:object size:0xC scope:local align:4 @4482 = .data:0x803BBE7C; // type:object size:0xC scope:local align:4 @@ -18623,7 +18645,7 @@ g_profile_CAMERA = .data:0x803BC3D8; // type:object size:0x44 scope:global align g_profile_CAMERA2 = .data:0x803BC41C; // type:object size:0x44 scope:global align:4 __vt__14dBgS_CamSphChk = .data:0x803BC478; // type:object size:0x3C scope:global align:4 __vt__14d2DBSplinePath = .data:0x803BC4CC; // type:object size:0xC scope:global align:4 -l_dEnvSe_Method = .data:0x803BC4E8; // type:object size:0x14 scope:global align:4 +l_dEnvSe_Method = .data:0x803BC4E8; // type:object size:0x14 scope:local align:4 g_profile_ENVSE = .data:0x803BC4FC; // type:object size:0x28 scope:global align:4 ...data.0 = .data:0x803BC528; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BC528; // type:object size:0xC scope:local align:4 @@ -18631,9 +18653,9 @@ SelStartFrameTbl = .data:0x803BC534; // type:object size:0xC scope:local align:4 SelEndFrameTbl = .data:0x803BC540; // type:object size:0xC scope:local align:4 SelOpenStartFrameTbl = .data:0x803BC54C; // type:object size:0xC scope:local align:4 SelOpenEndFrameTbl = .data:0x803BC558; // type:object size:0xC scope:local align:4 -MenuSelStartFrameTbl = .data:0x803BC564; // type:object size:0xC scope:global align:4 -MenuSelEndFrameTbl = .data:0x803BC570; // type:object size:0xC scope:global align:4 -l_tagName13 = .data:0x803BC580; // type:object size:0x18 scope:global align:4 data:string +MenuSelStartFrameTbl = .data:0x803BC564; // type:object size:0xC scope:local align:4 +MenuSelEndFrameTbl = .data:0x803BC570; // type:object size:0xC scope:local align:4 +l_tagName13 = .data:0x803BC580; // type:object size:0x18 scope:local align:4 data:string @4172 = .data:0x803BC598; // type:object size:0xC scope:local align:4 @4173 = .data:0x803BC5A4; // type:object size:0xC scope:local align:4 @4174 = .data:0x803BC5B0; // type:object size:0xC scope:local align:4 @@ -18681,7 +18703,7 @@ l_tagName13 = .data:0x803BC580; // type:object size:0x18 scope:global align:4 da @4216 = .data:0x803BC7A8; // type:object size:0xC scope:local align:4 @4217 = .data:0x803BC7B4; // type:object size:0xC scope:local align:4 @4218 = .data:0x803BC7C0; // type:object size:0xC scope:local align:4 -DataSelProc = .data:0x803BC7CC; // type:object size:0x234 scope:global align:4 data:4byte +DataSelProc = .data:0x803BC7CC; // type:object size:0x234 scope:local align:4 data:4byte l_tagName101$5625 = .data:0x803BCA00; // type:object size:0x10 scope:local align:4 data:4byte l_numTex$5626 = .data:0x803BCA10; // type:object size:0xC scope:local align:4 l_tagName0$6522 = .data:0x803BCA20; // type:object size:0x18 scope:local align:4 data:string @@ -18740,7 +18762,7 @@ l_tagName011U$7086 = .data:0x803BCCB0; // type:object size:0x18 scope:local alig @7788 = .data:0x803BCDE8; // type:object size:0xC scope:local align:4 @7789 = .data:0x803BCDF4; // type:object size:0xC scope:local align:4 @7790 = .data:0x803BCE00; // type:object size:0xC scope:local align:4 -MemCardCheckProc = .data:0x803BCE0C; // type:object size:0x144 scope:global align:4 data:4byte +MemCardCheckProc = .data:0x803BCE0C; // type:object size:0x144 scope:local align:4 data:4byte @7802 = .data:0x803BCF50; // type:object size:0xC scope:local align:4 @7804 = .data:0x803BCF5C; // type:object size:0xC scope:local align:4 @7806 = .data:0x803BCF68; // type:object size:0xC scope:local align:4 @@ -18760,10 +18782,10 @@ __vt__17dDlst_FileSelYn_c = .data:0x803BD058; // type:object size:0x10 scope:glo __vt__17dDlst_FileSelCp_c = .data:0x803BD068; // type:object size:0x10 scope:global align:4 __vt__17dDlst_FileSelDt_c = .data:0x803BD078; // type:object size:0x10 scope:global align:4 __vt__15dDlst_FileSel_c = .data:0x803BD088; // type:object size:0x10 scope:global align:4 -__vt__15J2DAnmTransform = .data:0x803BD098; // type:object size:0x14 scope:global align:4 -__vt__10JUTNameTab = .data:0x803BD0BC; // type:object size:0xC scope:global align:4 +__vt__15J2DAnmTransform = .data:0x803BD098; // type:object size:0x14 scope:weak align:4 +__vt__10JUTNameTab = .data:0x803BD0BC; // type:object size:0xC scope:weak align:4 __vt__14dFile_select_c = .data:0x803BD0C8; // type:object size:0xC scope:global align:4 -__vt__9dFs_HIO_c = .data:0x803BD0E0; // type:object size:0xC scope:global align:4 +__vt__9dFs_HIO_c = .data:0x803BD0E0; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803BD0F0; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BD0F0; // type:object size:0xC scope:local align:4 @3805 = .data:0x803BD0FC; // type:object size:0xC scope:local align:4 @@ -18784,7 +18806,7 @@ __vt__12dFile_info_c = .data:0x803BD278; // type:object size:0xC scope:global al cNullVec__6Z2Calc = .data:0x803BD290; // type:object size:0xC scope:local align:4 @3797 = .data:0x803BD29C; // type:object size:0xC scope:local align:4 @3798 = .data:0x803BD2A8; // type:object size:0xC scope:local align:4 -brightChackProc = .data:0x803BD2B4; // type:object size:0x18 scope:global align:4 data:4byte +brightChackProc = .data:0x803BD2B4; // type:object size:0x18 scope:local align:4 data:4byte __vt__19dDlst_BrightCheck_c = .data:0x803BD2CC; // type:object size:0x10 scope:global align:4 __vt__14dBrightCheck_c = .data:0x803BD2DC; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803BD2F8; // type:label scope:local align:4 @@ -18792,13 +18814,13 @@ cNullVec__6Z2Calc = .data:0x803BD2F8; // type:object size:0xC scope:local align: @3693 = .data:0x803BD304; // type:object size:0xC scope:local align:4 @3694 = .data:0x803BD310; // type:object size:0xC scope:local align:4 @3695 = .data:0x803BD31C; // type:object size:0xC scope:local align:4 -init_process = .data:0x803BD328; // type:object size:0x24 scope:local align:4 data:4byte +init_process = .data:0x803BD328; // type:object size:0x24 scope:global align:4 data:4byte @3696 = .data:0x803BD34C; // type:object size:0xC scope:local align:4 @3697 = .data:0x803BD358; // type:object size:0xC scope:local align:4 @3698 = .data:0x803BD364; // type:object size:0xC scope:local align:4 -move_process = .data:0x803BD370; // type:object size:0x24 scope:local align:4 data:4byte +move_process = .data:0x803BD370; // type:object size:0x24 scope:global align:4 data:4byte __vt__8dScope_c = .data:0x803BD394; // type:object size:0x20 scope:global align:4 -__vt__11dMeterSub_c = .data:0x803BD3B4; // type:object size:0x20 scope:global align:4 +__vt__11dMeterSub_c = .data:0x803BD3B4; // type:object size:0x20 scope:weak align:4 ...data.0 = .data:0x803BD3E0; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BD3E0; // type:object size:0xC scope:local align:4 blo_name$3684 = .data:0x803BD3EC; // type:object size:0x10 scope:local align:4 @@ -18807,18 +18829,18 @@ bpk_name$3686 = .data:0x803BD40C; // type:object size:0x10 scope:local align:4 btk_name$3687 = .data:0x803BD41C; // type:object size:0x10 scope:local align:4 btk2_name$3688 = .data:0x803BD42C; // type:object size:0x10 scope:local align:4 __vt__16dSelect_cursor_c = .data:0x803BD46C; // type:object size:0x10 scope:global align:4 -__vt__19dSelect_cursorHIO_c = .data:0x803BD488; // type:object size:0xC scope:global align:4 -__vt__9dSi_HIO_c = .data:0x803BD498; // type:object size:0xC scope:global align:4 -cam_seira_shop = .data:0x803BD4A8; // type:object size:0x38 scope:global align:4 -cam_seira_evnt_before = .data:0x803BD4E0; // type:object size:0x38 scope:global align:4 -cam_seira_evnt_after = .data:0x803BD518; // type:object size:0x38 scope:global align:4 -shop_cam_data_tbl = .data:0x803BD550; // type:object size:0xC scope:global align:4 +__vt__19dSelect_cursorHIO_c = .data:0x803BD488; // type:object size:0xC scope:weak align:4 +__vt__9dSi_HIO_c = .data:0x803BD498; // type:object size:0xC scope:weak align:4 +cam_seira_shop = .data:0x803BD4A8; // type:object size:0x38 scope:local align:4 +cam_seira_evnt_before = .data:0x803BD4E0; // type:object size:0x38 scope:local align:4 +cam_seira_evnt_after = .data:0x803BD518; // type:object size:0x38 scope:local align:4 +shop_cam_data_tbl = .data:0x803BD550; // type:object size:0xC scope:local align:4 @3771 = .data:0x803BD55C; // type:object size:0xC scope:local align:4 data:4byte __vt__15dShopItemCtrl_c = .data:0x803BD568; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803BD578; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BD578; // type:object size:0xC scope:local align:4 -dShopSystem_itemActor = .data:0x803BD584; // type:object size:0x1C scope:global align:4 data:4byte -item_seira_shop = .data:0x803BD5A0; // type:object size:0x24 scope:global align:4 +dShopSystem_itemActor = .data:0x803BD584; // type:object size:0x1C scope:local align:4 data:4byte +item_seira_shop = .data:0x803BD5A0; // type:object size:0x24 scope:local align:4 @4056 = .data:0x803BD5C4; // type:object size:0xC scope:local align:4 @4057 = .data:0x803BD5D0; // type:object size:0xC scope:local align:4 @4058 = .data:0x803BD5DC; // type:object size:0xC scope:local align:4 @@ -18856,16 +18878,16 @@ init_process = .data:0x803BD8A8; // type:object size:0x6C scope:local align:4 da @3900 = .data:0x803BD974; // type:object size:0xC scope:local align:4 move_process = .data:0x803BD980; // type:object size:0x6C scope:local align:4 data:4byte offset$4331 = .data:0x803BD9EC; // type:object size:0x20 scope:local align:4 -l_dGameover_Method = .data:0x803BDA0C; // type:object size:0x14 scope:global align:4 +l_dGameover_Method = .data:0x803BDA0C; // type:object size:0x14 scope:local align:4 g_profile_GAMEOVER = .data:0x803BDA20; // type:object size:0x28 scope:global align:4 __vt__24dDlst_GameOverScrnDraw_c = .data:0x803BDA48; // type:object size:0x10 scope:global align:4 -__vt__12dMenu_save_c = .data:0x803BDA58; // type:object size:0xC scope:global align:4 -__vt__10dGov_HIO_c = .data:0x803BDA70; // type:object size:0xC scope:global align:4 +__vt__12dMenu_save_c = .data:0x803BDA58; // type:object size:0xC scope:weak align:4 +__vt__10dGov_HIO_c = .data:0x803BDA70; // type:object size:0xC scope:weak align:4 __vt__24dDlst_Gameover_CAPTURE_c = .data:0x803BDA88; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BDA98; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BDA98; // type:object size:0xC scope:local align:4 -lightStatusBase = .data:0x803BDAA4; // type:object size:0xE8 scope:global align:4 data:4byte -lightMaskData = .data:0x803BDB8C; // type:object size:0x10 scope:global align:4 data:2byte +lightStatusBase = .data:0x803BDAA4; // type:object size:0xE8 scope:local align:4 data:4byte +lightMaskData = .data:0x803BDB8C; // type:object size:0x10 scope:local align:4 data:2byte @4322 = .data:0x803BDB9C; // type:object size:0x40 scope:local align:4 @4364 = .data:0x803BDBDC; // type:object size:0x40 scope:local align:4 @4511 = .data:0x803BDC1C; // type:object size:0x1C scope:local align:4 @@ -18879,15 +18901,16 @@ now_shadow_alpha$5927 = .data:0x803BDCF0; // type:object size:0x18 scope:local a flush_col$7304 = .data:0x803BDD50; // type:object size:0x10 scope:local align:4 flush_col2$7305 = .data:0x803BDD60; // type:object size:0x10 scope:local align:4 flush_col3$7306 = .data:0x803BDD70; // type:object size:0x10 scope:local align:4 -l_dKy_Method = .data:0x803BDD80; // type:object size:0x14 scope:global align:4 +l_dKy_Method = .data:0x803BDD80; // type:object size:0x14 scope:local align:4 g_profile_KANKYO = .data:0x803BDD94; // type:object size:0x28 scope:global align:4 parcent_tabel$9036 = .data:0x803BDDBC; // type:object size:0x30 scope:local align:4 -__vt__18dScnKy_env_light_c = .data:0x803BDE1C; // type:object size:0xC scope:global align:4 -l_dKyeff_Method = .data:0x803BDE38; // type:object size:0x14 scope:global align:4 +dummy_padding_data_0x354 = .data:0x803BDDEC; // type:object size:0x30 scope:local +__vt__18dScnKy_env_light_c = .data:0x803BDE1C; // type:object size:0xC scope:weak align:4 +l_dKyeff_Method = .data:0x803BDE38; // type:object size:0x14 scope:local align:4 g_profile_KYEFF = .data:0x803BDE4C; // type:object size:0x28 scope:global align:4 -l_dKyeff2_Method = .data:0x803BDE78; // type:object size:0x14 scope:global align:4 +l_dKyeff2_Method = .data:0x803BDE78; // type:object size:0x14 scope:local align:4 g_profile_KYEFF2 = .data:0x803BDE8C; // type:object size:0x28 scope:global align:4 -l_dThunder_Method = .data:0x803BDEB8; // type:object size:0x14 scope:global align:4 +l_dThunder_Method = .data:0x803BDEB8; // type:object size:0x14 scope:local align:4 g_profile_KY_THUNDER = .data:0x803BDECC; // type:object size:0x28 scope:global align:4 __vt__19dDlst_KanteraIcon_c = .data:0x803BDEF8; // type:object size:0x10 scope:global align:4 __vt__15dKantera_icon_c = .data:0x803BDF08; // type:object size:0xC scope:global align:4 @@ -18908,10 +18931,13 @@ map_init_process = .data:0x803BDF6C; // type:object size:0x48 scope:local align: @3810 = .data:0x803BDFF0; // type:object size:0xC scope:local align:4 map_move_process = .data:0x803BDFFC; // type:object size:0x48 scope:local align:4 data:4byte __vt__19dMenu_Calibration_c = .data:0x803BE044; // type:object size:0x10 scope:global align:4 +__vt__20dummy_abstract_class = .data:0x803BE054; // type:object size:0xC scope:weak ...data.0 = .data:0x803BE060; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BE060; // type:object size:0xC scope:local align:4 @4422 = .data:0x803BE06C; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803BE06C; // type:label scope:local @4423 = .data:0x803BE078; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803BE078; // type:label scope:local @4424 = .data:0x803BE084; // type:object size:0xC scope:local align:4 @4425 = .data:0x803BE090; // type:object size:0xC scope:local align:4 @4426 = .data:0x803BE09C; // type:object size:0xC scope:local align:4 @@ -18977,13 +19003,13 @@ move_process = .data:0x803BE580; // type:object size:0x3C scope:local align:4 da @4873 = .data:0x803BE5D4; // type:object size:0xC scope:local align:4 @4874 = .data:0x803BE5E0; // type:object size:0xC scope:local align:4 @4875 = .data:0x803BE5EC; // type:object size:0xC scope:local align:4 -itemInfo_subProcess = .data:0x803BE5F8; // type:object size:0x3C scope:global align:4 data:4byte +itemInfo_subProcess = .data:0x803BE5F8; // type:object size:0x3C scope:local align:4 data:4byte @4876 = .data:0x803BE634; // type:object size:0xC scope:local align:4 @4877 = .data:0x803BE640; // type:object size:0xC scope:local align:4 -floor_init_process = .data:0x803BE64C; // type:object size:0x18 scope:global align:4 data:4byte +floor_init_process = .data:0x803BE64C; // type:object size:0x18 scope:local align:4 data:4byte @4878 = .data:0x803BE664; // type:object size:0xC scope:local align:4 @4879 = .data:0x803BE670; // type:object size:0xC scope:local align:4 -floor_move_process = .data:0x803BE67C; // type:object size:0x18 scope:global align:4 data:4byte +floor_move_process = .data:0x803BE67C; // type:object size:0x18 scope:local align:4 data:4byte @4880 = .data:0x803BE694; // type:object size:0xC scope:local align:4 @4881 = .data:0x803BE6A0; // type:object size:0xC scope:local align:4 @4882 = .data:0x803BE6AC; // type:object size:0xC scope:local align:4 @@ -18992,14 +19018,14 @@ map_init_process = .data:0x803BE6B8; // type:object size:0x24 scope:local align: @4884 = .data:0x803BE6E8; // type:object size:0xC scope:local align:4 @4885 = .data:0x803BE6F4; // type:object size:0xC scope:local align:4 map_move_process = .data:0x803BE700; // type:object size:0x24 scope:local align:4 data:4byte -__vt__15dMenu_DmapMap_c = .data:0x803BE7C0; // type:object size:0xC scope:global align:4 -__vt__20dMenu_StageMapCtrl_c = .data:0x803BE7CC; // type:object size:0x24 scope:global align:4 +__vt__15dMenu_DmapMap_c = .data:0x803BE7C0; // type:object size:0xC scope:weak align:4 +__vt__20dMenu_StageMapCtrl_c = .data:0x803BE7CC; // type:object size:0x24 scope:weak align:4 __vt__12dMenu_Dmap_c = .data:0x803BE7F0; // type:object size:0xC scope:global align:4 __vt__14dMenu_DmapBg_c = .data:0x803BE818; // type:object size:0x1C scope:global align:4 ...data.0 = .data:0x803BE840; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BE840; // type:object size:0xC scope:local align:4 @3798 = .data:0x803BE84C; // type:object size:0x44 scope:local align:4 -l_data = .data:0x803BE8A0; // type:object size:0xF4 scope:global align:4 noreloc +l_data = .data:0x803BE8A0; // type:object size:0xF4 scope:local align:4 noreloc @3922 = .data:0x803BE994; // type:object size:0xC scope:local align:4 @3923 = .data:0x803BE9A0; // type:object size:0xC scope:local align:4 @3924 = .data:0x803BE9AC; // type:object size:0xC scope:local align:4 @@ -19012,14 +19038,14 @@ init_process = .data:0x803BE9C4; // type:object size:0x30 scope:local align:4 da move_process = .data:0x803BEA24; // type:object size:0x30 scope:local align:4 data:4byte __vt__19dMenu_DmapMapCtrl_c = .data:0x803BEA54; // type:object size:0x28 scope:global align:4 __vt__15renderingDmap_c = .data:0x803BEB48; // type:object size:0xAC scope:global align:4 -map_icon_size = .data:0x803BEBF8; // type:object size:0x114 scope:global align:4 data:float +map_icon_size = .data:0x803BEBF8; // type:object size:0x114 scope:local align:4 data:float __vt__16dMenuMapCommon_c = .data:0x803BED0C; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803BED18; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BED18; // type:object size:0xC scope:local align:4 @3790 = .data:0x803BED24; // type:object size:0xC scope:local align:4 -map_init_process = .data:0x803BED30; // type:object size:0xC scope:local align:4 data:4byte +map_init_process = .data:0x803BED30; // type:object size:0xC scope:global align:4 data:4byte @3791 = .data:0x803BED3C; // type:object size:0xC scope:local align:4 -map_move_process = .data:0x803BED48; // type:object size:0xC scope:local align:4 data:4byte +map_move_process = .data:0x803BED48; // type:object size:0xC scope:global align:4 data:4byte __vt__15dMenu_Fishing_c = .data:0x803BED54; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BED70; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BED70; // type:object size:0xC scope:local align:4 @@ -19088,7 +19114,7 @@ move_process = .data:0x803BF1B4; // type:object size:0x168 scope:local align:4 d stage_name$7304 = .data:0x803BF31C; // type:object size:0x10 scope:local align:4 stage_name$7361 = .data:0x803BF32C; // type:object size:0x18 scope:local align:4 __vt__12dMenu_Fmap_c = .data:0x803BF344; // type:object size:0xC scope:global align:4 -__vt__9dMf_HIO_c = .data:0x803BF350; // type:object size:0xC scope:global align:4 +__vt__9dMf_HIO_c = .data:0x803BF350; // type:object size:0xC scope:weak align:4 __vt__15dMenu_FmapMap_c = .data:0x803BF360; // type:object size:0x68 scope:global align:4 __vt__15renderingFmap_c = .data:0x803BF3C8; // type:object size:0x68 scope:global align:4 __vt__17dMenu_Fmap2DTop_c = .data:0x803BF430; // type:object size:0x10 scope:global align:4 @@ -19173,13 +19199,13 @@ process = .data:0x803BF9B4; // type:object size:0x60 scope:local align:4 data:4b @3856 = .data:0x803BFA2C; // type:object size:0xC scope:local align:4 @3857 = .data:0x803BFA38; // type:object size:0xC scope:local align:4 @3858 = .data:0x803BFA44; // type:object size:0xC scope:local align:4 -tv_process = .data:0x803BFA50; // type:object size:0x3C scope:global align:4 data:4byte +tv_process = .data:0x803BFA50; // type:object size:0x3C scope:local align:4 data:4byte @3859 = .data:0x803BFA8C; // type:object size:0xC scope:local align:4 @3860 = .data:0x803BFA98; // type:object size:0xC scope:local align:4 @3861 = .data:0x803BFAA4; // type:object size:0xC scope:local align:4 @3862 = .data:0x803BFAB0; // type:object size:0xC scope:local align:4 @3863 = .data:0x803BFABC; // type:object size:0xC scope:local align:4 -calibration_process = .data:0x803BFAC8; // type:object size:0x3C scope:global align:4 +calibration_process = .data:0x803BFAC8; // type:object size:0x3C scope:local align:4 __vt__14dMenu_Option_c = .data:0x803BFB34; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BFB50; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803BFB50; // type:object size:0xC scope:local align:4 @@ -19187,12 +19213,12 @@ cNullVec__6Z2Calc = .data:0x803BFB50; // type:object size:0xC scope:local align: @3863 = .data:0x803BFB68; // type:object size:0xC scope:local align:4 @3864 = .data:0x803BFB74; // type:object size:0xC scope:local align:4 @3865 = .data:0x803BFB80; // type:object size:0xC scope:local align:4 -stick_init = .data:0x803BFB8C; // type:object size:0x30 scope:global align:4 data:4byte +stick_init = .data:0x803BFB8C; // type:object size:0x30 scope:local align:4 data:4byte @3866 = .data:0x803BFBBC; // type:object size:0xC scope:local align:4 @3867 = .data:0x803BFBC8; // type:object size:0xC scope:local align:4 @3868 = .data:0x803BFBD4; // type:object size:0xC scope:local align:4 @3869 = .data:0x803BFBE0; // type:object size:0xC scope:local align:4 -stick_proc = .data:0x803BFBEC; // type:object size:0x30 scope:global align:4 data:4byte +stick_proc = .data:0x803BFBEC; // type:object size:0x30 scope:local align:4 data:4byte @4795 = .data:0x803BFC1C; // type:object size:0x20 scope:local align:4 __vt__12dMenu_Ring_c = .data:0x803BFC3C; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803BFC58; // type:label scope:local align:4 @@ -19287,7 +19313,7 @@ MenuSaveProc = .data:0x803C0104; // type:object size:0x2E8 scope:global align:4 @4901 = .data:0x803C0438; // type:object size:0xC scope:local align:4 data:4byte __vt__16dDlst_MenuSave_c = .data:0x803C0444; // type:object size:0x10 scope:global align:4 __vt__23dDlst_MenuSaveExplain_c = .data:0x803C0454; // type:object size:0x10 scope:global align:4 -__vt__9dMs_HIO_c = .data:0x803C04AC; // type:object size:0xC scope:global align:4 +__vt__9dMs_HIO_c = .data:0x803C04AC; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803C04B8; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803C04B8; // type:object size:0xC scope:local align:4 @3795 = .data:0x803C04C4; // type:object size:0xC scope:local align:4 @@ -19302,12 +19328,14 @@ map_init_process = .data:0x803C04F4; // type:object size:0x30 scope:local align: map_move_process = .data:0x803C0554; // type:object size:0x30 scope:local align:4 data:4byte evt_id$4557 = .data:0x803C0584; // type:object size:0x1C scope:local align:4 __vt__13dMenu_Skill_c = .data:0x803C05A0; // type:object size:0x10 scope:global align:4 -__vt__10dMw_DHIO_c = .data:0x803C05C0; // type:object size:0xC scope:global align:4 -__vt__9dMw_HIO_c = .data:0x803C05CC; // type:object size:0xC scope:global align:4 +__vt__10dMw_DHIO_c = .data:0x803C05C0; // type:object size:0xC scope:weak align:4 +__vt__9dMw_HIO_c = .data:0x803C05CC; // type:object size:0xC scope:weak align:4 ...data.0 = .data:0x803C05D8; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803C05D8; // type:object size:0xC scope:local align:4 @4276 = .data:0x803C05E4; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803C05E4; // type:label scope:local @4277 = .data:0x803C05F0; // type:object size:0xC scope:local align:4 +...data.0 = .data:0x803C05F0; // type:label scope:local @4278 = .data:0x803C05FC; // type:object size:0xC scope:local align:4 @4279 = .data:0x803C0608; // type:object size:0xC scope:local align:4 @4280 = .data:0x803C0614; // type:object size:0xC scope:local align:4 @@ -19383,22 +19411,22 @@ move_proc = .data:0x803C0AD0; // type:object size:0x1A4 scope:global align:4 dat l_dMw_Method = .data:0x803C0D60; // type:object size:0x14 scope:global align:4 g_profile_MENUWINDOW = .data:0x803C0D74; // type:object size:0x28 scope:global align:4 __vt__20dDlst_MENU_CAPTURE_c = .data:0x803C0DB4; // type:object size:0x10 scope:global align:4 -__vt__18dMeter_cursorHIO_c = .data:0x803C0DC8; // type:object size:0xC scope:global align:4 +__vt__18dMeter_cursorHIO_c = .data:0x803C0DC8; // type:object size:0xC scope:weak align:4 __vt__16dMeter_fmapHIO_c = .data:0x803C0DD4; // type:object size:0xC scope:global align:4 -__vt__19dMeter_mapIconHIO_c = .data:0x803C0DE0; // type:object size:0xC scope:global align:4 -__vt__16dMeter_ringHIO_c = .data:0x803C0DEC; // type:object size:0xC scope:global align:4 -__vt__16dMeter_drawHIO_c = .data:0x803C0DF8; // type:object size:0xC scope:global align:4 -__vt__25dMeter_drawLightDropHIO_c = .data:0x803C0E04; // type:object size:0xC scope:global align:4 -__vt__24dMeter_drawMiniGameHIO_c = .data:0x803C0E10; // type:object size:0xC scope:global align:4 -__vt__25dMeter_drawEmpButtonHIO_c = .data:0x803C0E1C; // type:object size:0xC scope:global align:4 -__vt__21dMeter_drawSkillHIO_c = .data:0x803C0E28; // type:object size:0xC scope:global align:4 -__vt__27dMeter_drawCalibrationHIO_c = .data:0x803C0E34; // type:object size:0xC scope:global align:4 -__vt__22dMeter_drawInsectHIO_c = .data:0x803C0E40; // type:object size:0xC scope:global align:4 -__vt__23dMeter_drawFishingHIO_c = .data:0x803C0E4C; // type:object size:0xC scope:global align:4 -__vt__22dMeter_drawLetterHIO_c = .data:0x803C0E58; // type:object size:0xC scope:global align:4 -__vt__22dMeter_drawOptionHIO_c = .data:0x803C0E64; // type:object size:0xC scope:global align:4 -__vt__23dMeter_drawCollectHIO_c = .data:0x803C0E70; // type:object size:0xC scope:global align:4 -__vt__16dMeter_menuHIO_c = .data:0x803C0E7C; // type:object size:0xC scope:global align:4 +__vt__19dMeter_mapIconHIO_c = .data:0x803C0DE0; // type:object size:0xC scope:weak align:4 +__vt__16dMeter_ringHIO_c = .data:0x803C0DEC; // type:object size:0xC scope:weak align:4 +__vt__16dMeter_drawHIO_c = .data:0x803C0DF8; // type:object size:0xC scope:weak align:4 +__vt__25dMeter_drawLightDropHIO_c = .data:0x803C0E04; // type:object size:0xC scope:weak align:4 +__vt__24dMeter_drawMiniGameHIO_c = .data:0x803C0E10; // type:object size:0xC scope:weak align:4 +__vt__25dMeter_drawEmpButtonHIO_c = .data:0x803C0E1C; // type:object size:0xC scope:weak align:4 +__vt__21dMeter_drawSkillHIO_c = .data:0x803C0E28; // type:object size:0xC scope:weak align:4 +__vt__27dMeter_drawCalibrationHIO_c = .data:0x803C0E34; // type:object size:0xC scope:weak align:4 +__vt__22dMeter_drawInsectHIO_c = .data:0x803C0E40; // type:object size:0xC scope:weak align:4 +__vt__23dMeter_drawFishingHIO_c = .data:0x803C0E4C; // type:object size:0xC scope:weak align:4 +__vt__22dMeter_drawLetterHIO_c = .data:0x803C0E58; // type:object size:0xC scope:weak align:4 +__vt__22dMeter_drawOptionHIO_c = .data:0x803C0E64; // type:object size:0xC scope:weak align:4 +__vt__23dMeter_drawCollectHIO_c = .data:0x803C0E70; // type:object size:0xC scope:weak align:4 +__vt__16dMeter_menuHIO_c = .data:0x803C0E7C; // type:object size:0xC scope:weak align:4 @7807 = .data:0x803C0E88; // type:object size:0x58 scope:local align:4 @7858 = .data:0x803C0EE0; // type:object size:0x58 scope:local align:4 __vt__14dMeterButton_c = .data:0x803C0F38; // type:object size:0x10 scope:global align:4 @@ -19420,7 +19448,7 @@ tex_name$5183 = .data:0x803C14D4; // type:object size:0x28 scope:local align:4 letter_data__12dMenu_Letter = .data:0x803C14FC; // type:object size:0x200 scope:global align:4 data:2byte __vt__13dMeter2Info_c = .data:0x803C16FC; // type:object size:0xC scope:global align:4 @5038 = .data:0x803C1708; // type:object size:0x2C scope:local align:4 -l_dMeter2_Method = .data:0x803C1734; // type:object size:0x14 scope:global align:4 +l_dMeter2_Method = .data:0x803C1734; // type:object size:0x14 scope:local align:4 g_profile_METER2 = .data:0x803C1748; // type:object size:0x28 scope:global align:4 @4395 = .data:0x803C1770; // type:object size:0x118 scope:local align:4 @5000 = .data:0x803C1888; // type:object size:0x104 scope:local align:4 @@ -19453,7 +19481,7 @@ char_table$3795 = .data:0x803C1AD8; // type:object size:0x80 scope:local align:4 __vt__35jmessage_string_tRenderingProcessor = .data:0x803C25E8; // type:object size:0x40 scope:global align:4 __vt__34jmessage_string_tSequenceProcessor = .data:0x803C2628; // type:object size:0x58 scope:global align:4 __vt__33jmessage_string_tMeasureProcessor = .data:0x803C2680; // type:object size:0x40 scope:global align:4 -__vt__24jmessage_string_tControl = .data:0x803C26C0; // type:object size:0xC scope:global align:4 +__vt__24jmessage_string_tControl = .data:0x803C26C0; // type:object size:0xC scope:weak align:4 __vt__26jmessage_string_tReference = .data:0x803C26CC; // type:object size:0x10 scope:global align:4 __vt__28jmessage_tRenderingProcessor = .data:0x803C26DC; // type:object size:0x40 scope:global align:4 __vt__27jmessage_tSequenceProcessor = .data:0x803C271C; // type:object size:0x58 scope:global align:4 @@ -19474,7 +19502,7 @@ cNullVec__6Z2Calc = .data:0x803C28E0; // type:object size:0xC scope:local align: @3757 = .data:0x803C2910; // type:object size:0xC scope:local align:4 @3758 = .data:0x803C291C; // type:object size:0xC scope:local align:4 @3759 = .data:0x803C2928; // type:object size:0xC scope:local align:4 -process = .data:0x803C2934; // type:object size:0x48 scope:local align:4 data:4byte +process = .data:0x803C2934; // type:object size:0x48 scope:global align:4 data:4byte tag_n$4921 = .data:0x803C2980; // type:object size:0x18 scope:local align:4 __vt__17dMsgScrn3Select_c = .data:0x803C29C8; // type:object size:0xC scope:global align:4 __vt__15dMsgScrnArrow_c = .data:0x803C29D8; // type:object size:0xC scope:global align:4 @@ -19522,7 +19550,7 @@ __vt__14dMsgScrnHowl_c = .data:0x803C2E70; // type:object size:0x58 scope:global __vt__16dMsgScrnJimaku_c = .data:0x803C2EC8; // type:object size:0x58 scope:global align:4 __vt__16dMsgScrnKanban_c = .data:0x803C2F20; // type:object size:0x58 scope:global align:4 __vt__15dMsgScrnLight_c = .data:0x803C2F78; // type:object size:0xC scope:global align:4 -__vt__19dMsgScrnLight_HIO_c = .data:0x803C2F84; // type:object size:0xC scope:global align:4 +__vt__19dMsgScrnLight_HIO_c = .data:0x803C2F84; // type:object size:0xC scope:weak align:4 t_tag$3877 = .data:0x803C2F90; // type:object size:0x38 scope:local align:4 data:4byte __vt__15dMsgScrnPlace_c = .data:0x803C2FC8; // type:object size:0x58 scope:global align:4 t_tag$3752 = .data:0x803C3020; // type:object size:0x30 scope:local align:4 data:4byte @@ -19640,15 +19668,15 @@ mEventList__10dMsgFlow_c = .data:0x803C39AC; // type:object size:0x204 scope:glo __vt__10dMsgFlow_c = .data:0x803C3C20; // type:object size:0xC scope:global align:4 ...data.0 = .data:0x803C3C30; // type:label scope:local align:4 cNullVec__6Z2Calc = .data:0x803C3C30; // type:object size:0xC scope:local align:4 -l_mojiHira = .data:0x803C3C3C; // type:object size:0x104 scope:global align:4 -l_mojiHira2 = .data:0x803C3D40; // type:object size:0x104 scope:global align:4 -l_mojiHira3 = .data:0x803C3E44; // type:object size:0x104 scope:global align:4 -l_mojikata = .data:0x803C3F48; // type:object size:0x104 scope:global align:4 -l_mojikata2 = .data:0x803C404C; // type:object size:0x104 scope:global align:4 -l_mojikata3 = .data:0x803C4150; // type:object size:0x104 scope:global align:4 -l_mojiEisu = .data:0x803C4254; // type:object size:0x104 scope:global align:4 -l_mojiEisuPal_1 = .data:0x803C4358; // type:object size:0x104 scope:global align:4 -l_mojiEisuPal_2 = .data:0x803C445C; // type:object size:0x104 scope:global align:4 +l_mojiHira = .data:0x803C3C3C; // type:object size:0x104 scope:local align:4 +l_mojiHira2 = .data:0x803C3D40; // type:object size:0x104 scope:local align:4 +l_mojiHira3 = .data:0x803C3E44; // type:object size:0x104 scope:local align:4 +l_mojikata = .data:0x803C3F48; // type:object size:0x104 scope:local align:4 +l_mojikata2 = .data:0x803C404C; // type:object size:0x104 scope:local align:4 +l_mojikata3 = .data:0x803C4150; // type:object size:0x104 scope:local align:4 +l_mojiEisu = .data:0x803C4254; // type:object size:0x104 scope:local align:4 +l_mojiEisuPal_1 = .data:0x803C4358; // type:object size:0x104 scope:local align:4 +l_mojiEisuPal_2 = .data:0x803C445C; // type:object size:0x104 scope:local align:4 @3855 = .data:0x803C4560; // type:object size:0xC scope:local align:4 @3856 = .data:0x803C456C; // type:object size:0xC scope:local align:4 @3857 = .data:0x803C4578; // type:object size:0xC scope:local align:4 @@ -19658,7 +19686,7 @@ l_mojiEisuPal_2 = .data:0x803C445C; // type:object size:0x104 scope:global align @3861 = .data:0x803C45A8; // type:object size:0xC scope:local align:4 @3862 = .data:0x803C45B4; // type:object size:0xC scope:local align:4 @3863 = .data:0x803C45C0; // type:object size:0xC scope:local align:4 -SelProc = .data:0x803C45CC; // type:object size:0x6C scope:global align:4 data:4byte +SelProc = .data:0x803C45CC; // type:object size:0x6C scope:local align:4 data:4byte @4161 = .data:0x803C4638; // type:object size:0x34 scope:local align:4 l_cur0TagName$4723 = .data:0x803C4670; // type:object size:0x40 scope:local align:4 l_cur1TagName$4724 = .data:0x803C46B0; // type:object size:0x40 scope:local align:4 @@ -19674,9 +19702,9 @@ palMoji10$4766 = .data:0x803C4A40; // type:object size:0xD scope:local align:4 palMoji11$4767 = .data:0x803C4A50; // type:object size:0xD scope:local align:4 __vt__14dDlst_NameIN_c = .data:0x803C4A60; // type:object size:0x10 scope:global align:4 __vt__7dName_c = .data:0x803C4A8C; // type:object size:0xC scope:global align:4 -__vt__9dNm_HIO_c = .data:0x803C4AA4; // type:object size:0xC scope:global align:4 -__vt__16dNpcLib_lookat_c = .data:0x803C4AB0; // type:object size:0xC scope:global align:4 -l_dOvlpFd_Method = .data:0x803C4AC0; // type:object size:0x14 scope:global align:4 +__vt__9dNm_HIO_c = .data:0x803C4AA4; // type:object size:0xC scope:weak align:4 +__vt__16dNpcLib_lookat_c = .data:0x803C4AB0; // type:object size:0xC scope:weak align:4 +l_dOvlpFd_Method = .data:0x803C4AC0; // type:object size:0x14 scope:local align:4 g_profile_OVERLAP0 = .data:0x803C4AD4; // type:object size:0x28 scope:global align:4 g_profile_OVERLAP1 = .data:0x803C4AFC; // type:object size:0x28 scope:global align:4 g_profile_OVERLAP6 = .data:0x803C4B24; // type:object size:0x28 scope:global align:4 @@ -19689,18 +19717,18 @@ g_profile_OVERLAP11 = .data:0x803C4BEC; // type:object size:0x28 scope:global al @3721 = .data:0x803C4C24; // type:object size:0xC scope:local align:4 data:4byte @3736 = .data:0x803C4C30; // type:object size:0xC scope:local align:4 data:4byte @3765 = .data:0x803C4C3C; // type:object size:0xC scope:local align:4 data:4byte -l_dOvlpFd2_Method = .data:0x803C4C48; // type:object size:0x14 scope:global align:4 +l_dOvlpFd2_Method = .data:0x803C4C48; // type:object size:0x14 scope:local align:4 g_profile_OVERLAP2 = .data:0x803C4C5C; // type:object size:0x28 scope:global align:4 __vt__15dOvlpFd2_dlst_c = .data:0x803C4C84; // type:object size:0x10 scope:global align:4 @3812 = .data:0x803C4C98; // type:object size:0xC scope:local align:4 data:4byte @3857 = .data:0x803C4CA4; // type:object size:0xC scope:local align:4 data:4byte @3871 = .data:0x803C4CB0; // type:object size:0xC scope:local align:4 data:4byte @3898 = .data:0x803C4CBC; // type:object size:0xC scope:local align:4 data:4byte -l_dOvlpFd3_Method = .data:0x803C4CC8; // type:object size:0x14 scope:global align:4 +l_dOvlpFd3_Method = .data:0x803C4CC8; // type:object size:0x14 scope:local align:4 g_profile_OVERLAP3 = .data:0x803C4CDC; // type:object size:0x28 scope:global align:4 __vt__15dOvlpFd3_dlst_c = .data:0x803C4D04; // type:object size:0x10 scope:global align:4 __vt__16dDlst_snapShot_c = .data:0x803C4D14; // type:object size:0xC scope:global align:4 -__vt__10JSUIosBase = .data:0x803C4D20; // type:object size:0xC scope:global align:4 +__vt__10JSUIosBase = .data:0x803C4D20; // type:object size:0xC scope:weak align:4 __vt__8CPaneMgr = .data:0x803C4D2C; // type:object size:0x10 scope:global align:4 __vt__17CPaneMgrAlphaMorf = .data:0x803C4D40; // type:object size:0x10 scope:global align:4 __vt__13CPaneMgrAlpha = .data:0x803C4D50; // type:object size:0x10 scope:global align:4 @@ -19722,7 +19750,7 @@ cNullVec__6Z2Calc = .data:0x803C4D60; // type:object size:0xC scope:local align: @3748 = .data:0x803C4E08; // type:object size:0xC scope:local align:4 @3749 = .data:0x803C4E14; // type:object size:0xC scope:local align:4 @3750 = .data:0x803C4E20; // type:object size:0xC scope:local align:4 -l_execFunc = .data:0x803C4E2C; // type:object size:0xC0 scope:global align:4 data:4byte +l_execFunc = .data:0x803C4E2C; // type:object size:0xC0 scope:local align:4 data:4byte l_method$4634 = .data:0x803C4EEC; // type:object size:0xC scope:local align:4 choice$4682 = .data:0x803C4EF8; // type:object size:0x14 scope:local align:4 yes$4683 = .data:0x803C4F0C; // type:object size:0x14 scope:local align:4 @@ -19731,7 +19759,7 @@ prog$4685 = .data:0x803C4F34; // type:object size:0x14 scope:local align:4 intr$4686 = .data:0x803C4F48; // type:object size:0x14 scope:local align:4 warning$4687 = .data:0x803C4F5C; // type:object size:0x14 scope:local align:4 warningPs$4688 = .data:0x803C4F70; // type:object size:0x14 scope:local align:4 -l_dScnLogo_Method = .data:0x803C4F84; // type:object size:0x14 scope:global align:4 +l_dScnLogo_Method = .data:0x803C4F84; // type:object size:0x14 scope:local align:4 g_profile_LOGO_SCENE = .data:0x803C4F98; // type:object size:0x28 scope:global align:4 __vt__10dLog_HIO_c = .data:0x803C4FC0; // type:object size:0xC scope:global align:4 g_profile_MENU_SCENE = .data:0x803C4FD0; // type:object size:0x28 scope:global align:4 @@ -19743,51 +19771,51 @@ cNullVec__6Z2Calc = .data:0x803C4FF8; // type:object size:0xC scope:local align: @3995 = .data:0x803C5028; // type:object size:0xC scope:local align:4 @3996 = .data:0x803C5034; // type:object size:0xC scope:local align:4 @3997 = .data:0x803C5040; // type:object size:0xC scope:local align:4 -MainProc = .data:0x803C504C; // type:object size:0x48 scope:global align:4 data:4byte -l_dScnName_Method = .data:0x803C5094; // type:object size:0x14 scope:global align:4 +MainProc = .data:0x803C504C; // type:object size:0x48 scope:local align:4 data:4byte +l_dScnName_Method = .data:0x803C5094; // type:object size:0x14 scope:local align:4 g_profile_NAME_SCENE = .data:0x803C50A8; // type:object size:0x28 scope:global align:4 g_profile_NAMEEX_SCENE = .data:0x803C50D0; // type:object size:0x28 scope:global align:4 -__vt__17dScnName_camera_c = .data:0x803C50F8; // type:object size:0xC scope:global align:4 -__vt__9dSn_HIO_c = .data:0x803C5104; // type:object size:0xC scope:global align:4 +__vt__17dScnName_camera_c = .data:0x803C50F8; // type:object size:0xC scope:weak align:4 +__vt__9dSn_HIO_c = .data:0x803C5104; // type:object size:0xC scope:weak align:4 l_wipeType$4081 = .data:0x803C5110; // type:object size:0x2E scope:local align:4 camparamarc$4608 = .data:0x803C5140; // type:object size:0xA scope:local align:4 l_method$4860 = .data:0x803C514C; // type:object size:0x2C scope:local align:4 -l_dScnPly_Method = .data:0x803C5178; // type:object size:0x14 scope:global align:4 +l_dScnPly_Method = .data:0x803C5178; // type:object size:0x14 scope:local align:4 g_profile_PLAY_SCENE = .data:0x803C518C; // type:object size:0x28 scope:global align:4 g_profile_OPENING_SCENE = .data:0x803C51B4; // type:object size:0x28 scope:global align:4 -__vt__22dScnPly_env_debugHIO_c = .data:0x803C51DC; // type:object size:0xC scope:global align:4 -__vt__22dScnPly_env_otherHIO_c = .data:0x803C51E8; // type:object size:0xC scope:global align:4 -__vt__17dScnPly_env_HIO_c = .data:0x803C51F4; // type:object size:0xC scope:global align:4 -__vt__17dScnPly_reg_HIO_c = .data:0x803C5200; // type:object size:0xC scope:global align:4 -__vt__21dScnPly_preLoad_HIO_c = .data:0x803C520C; // type:object size:0xC scope:global align:4 +__vt__22dScnPly_env_debugHIO_c = .data:0x803C51DC; // type:object size:0xC scope:weak align:4 +__vt__22dScnPly_env_otherHIO_c = .data:0x803C51E8; // type:object size:0xC scope:weak align:4 +__vt__17dScnPly_env_HIO_c = .data:0x803C51F4; // type:object size:0xC scope:weak align:4 +__vt__17dScnPly_reg_HIO_c = .data:0x803C5200; // type:object size:0xC scope:weak align:4 +__vt__21dScnPly_preLoad_HIO_c = .data:0x803C520C; // type:object size:0xC scope:weak align:4 l_method$4056 = .data:0x803C5218; // type:object size:0x14 scope:local align:4 -l_dScnRoom_Method = .data:0x803C522C; // type:object size:0x14 scope:global align:4 +l_dScnRoom_Method = .data:0x803C522C; // type:object size:0x14 scope:local align:4 g_profile_ROOM_SCENE = .data:0x803C5240; // type:object size:0x28 scope:global align:4 g_profile_WARNING_SCENE = .data:0x803C5268; // type:object size:0x28 scope:global align:4 g_profile_WARNING2_SCENE = .data:0x803C5290; // type:object size:0x28 scope:global align:4 -__vt__22dSvBit_childOtherHIO_c = .data:0x803C52B8; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childTransformHIO_c = .data:0x803C52C4; // type:object size:0xC scope:global align:4 -__vt__25dSvBit_childDarknessHIO_c = .data:0x803C52D0; // type:object size:0xC scope:global align:4 -__vt__29dSvBit_childTbPerfectionHIO_c = .data:0x803C52DC; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childItOneZoneHIO_c = .data:0x803C52E8; // type:object size:0xC scope:global align:4 -__vt__23dSvBit_childItZoneHIO_c = .data:0x803C52F4; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childItDungeonHIO_c = .data:0x803C5300; // type:object size:0xC scope:global align:4 -__vt__29dSvBit_childItPerfectionHIO_c = .data:0x803C530C; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childSwOneZoneHIO_c = .data:0x803C5318; // type:object size:0xC scope:global align:4 -__vt__23dSvBit_childSwZoneHIO_c = .data:0x803C5324; // type:object size:0xC scope:global align:4 -__vt__26dSvBit_childSwDungeonHIO_c = .data:0x803C5330; // type:object size:0xC scope:global align:4 -__vt__29dSvBit_childSwPerfectionHIO_c = .data:0x803C533C; // type:object size:0xC scope:global align:4 -__vt__25dSvBit_childTreasureHIO_c = .data:0x803C5348; // type:object size:0xC scope:global align:4 -__vt__21dSvBit_childItemHIO_c = .data:0x803C5354; // type:object size:0xC scope:global align:4 -__vt__23dSvBit_childSwitchHIO_c = .data:0x803C5360; // type:object size:0xC scope:global align:4 -__vt__12dSvBit_HIO_c = .data:0x803C536C; // type:object size:0xC scope:global align:4 +__vt__22dSvBit_childOtherHIO_c = .data:0x803C52B8; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childTransformHIO_c = .data:0x803C52C4; // type:object size:0xC scope:weak align:4 +__vt__25dSvBit_childDarknessHIO_c = .data:0x803C52D0; // type:object size:0xC scope:weak align:4 +__vt__29dSvBit_childTbPerfectionHIO_c = .data:0x803C52DC; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childItOneZoneHIO_c = .data:0x803C52E8; // type:object size:0xC scope:weak align:4 +__vt__23dSvBit_childItZoneHIO_c = .data:0x803C52F4; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childItDungeonHIO_c = .data:0x803C5300; // type:object size:0xC scope:weak align:4 +__vt__29dSvBit_childItPerfectionHIO_c = .data:0x803C530C; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childSwOneZoneHIO_c = .data:0x803C5318; // type:object size:0xC scope:weak align:4 +__vt__23dSvBit_childSwZoneHIO_c = .data:0x803C5324; // type:object size:0xC scope:weak align:4 +__vt__26dSvBit_childSwDungeonHIO_c = .data:0x803C5330; // type:object size:0xC scope:weak align:4 +__vt__29dSvBit_childSwPerfectionHIO_c = .data:0x803C533C; // type:object size:0xC scope:weak align:4 +__vt__25dSvBit_childTreasureHIO_c = .data:0x803C5348; // type:object size:0xC scope:weak align:4 +__vt__21dSvBit_childItemHIO_c = .data:0x803C5354; // type:object size:0xC scope:weak align:4 +__vt__23dSvBit_childSwitchHIO_c = .data:0x803C5360; // type:object size:0xC scope:weak align:4 +__vt__12dSvBit_HIO_c = .data:0x803C536C; // type:object size:0xC scope:weak align:4 @5239 = .data:0x803C5378; // type:object size:0x24 scope:local align:4 -l_dTimer_Method = .data:0x803C539C; // type:object size:0x14 scope:global align:4 +l_dTimer_Method = .data:0x803C539C; // type:object size:0x14 scope:local align:4 g_profile_TIMER = .data:0x803C53B0; // type:object size:0x28 scope:global align:4 __vt__21dDlst_TimerScrnDraw_c = .data:0x803C53D8; // type:object size:0x10 scope:global align:4 -l_dkWmark_Method = .data:0x803C53E8; // type:object size:0x14 scope:global align:4 +l_dkWmark_Method = .data:0x803C53E8; // type:object size:0x14 scope:local align:4 g_profile_WMARK = .data:0x803C53FC; // type:object size:0x28 scope:global align:4 -l_dkWpillar_Method = .data:0x803C5428; // type:object size:0x14 scope:global align:4 +l_dkWpillar_Method = .data:0x803C5428; // type:object size:0x14 scope:local align:4 g_profile_WPILLAR = .data:0x803C543C; // type:object size:0x28 scope:global align:4 strings$4165 = .data:0x803C5468; // type:object size:0x10 scope:local align:4 __vt__20DynamicModuleControl = .data:0x803C5478; // type:object size:0x34 scope:global align:4 @@ -19800,30 +19828,31 @@ __vt__12cCcD_TriAttr = .data:0x803C5624; // type:object size:0x64 scope:global a __vt__14cCcD_ShapeAttr = .data:0x803C5688; // type:object size:0x58 scope:global align:4 __vt__9cCcD_Stts = .data:0x803C56E0; // type:object size:0x20 scope:global align:4 __vt__4cCcS = .data:0x803C5700; // type:object size:0x30 scope:global align:4 -atntable = .data:0x803C5730; // type:object size:0x802 scope:global align:4 +atntable = .data:0x803C5730; // type:object size:0x802 scope:local align:4 __vt__8cBgS_Chk = .data:0x803C5F38; // type:object size:0xC scope:global align:4 __vt__11cBgS_GndChk = .data:0x803C5F48; // type:object size:0x18 scope:global align:4 __vt__11cBgS_LinChk = .data:0x803C5F60; // type:object size:0x18 scope:global align:4 __vt__13cBgS_ShdwDraw = .data:0x803C5F78; // type:object size:0xC scope:global align:4 __vt__13cBgS_PolyInfo = .data:0x803C5F88; // type:object size:0xC scope:global align:4 __vt__8cM3dGCir = .data:0x803C5F98; // type:object size:0xC scope:global align:4 -__vt__8cM2dGCir = .data:0x803C5FA4; // type:object size:0xC scope:global align:4 +__vt__8cM2dGCir = .data:0x803C5FA4; // type:object size:0xC scope:weak align:4 __vt__8cM3dGCps = .data:0x803C5FB0; // type:object size:0xC scope:global align:4 -e_mtx = .data:0x803C5FC0; // type:object size:0x30 scope:global align:32 -clear_z_TX = .data:0x803C6000; // type:object size:0x40 scope:global align:32 +e_mtx = .data:0x803C5FC0; // type:object size:0x30 scope:local align:32 +clear_z_TX = .data:0x803C6000; // type:object size:0x40 scope:local align:32 __vt__10JFWDisplay = .data:0x803C6040; // type:object size:0x18 scope:global align:4 -jpa_pos = .data:0x803C6060; // type:object size:0x144 scope:global align:32 -jpa_crd = .data:0x803C61C0; // type:object size:0x20 scope:global align:4 +jpa_pos = .data:0x803C6060; // type:object size:0x144 scope:local align:32 +jpa_crd = .data:0x803C61C0; // type:object size:0x20 scope:local align:4 @2829 = .data:0x803C61E0; // type:object size:0x2C scope:local align:4 @2828 = .data:0x803C620C; // type:object size:0x2C scope:local align:4 @3454 = .data:0x803C6238; // type:object size:0x2C scope:local align:4 +jpa_resource_padding = .data:0x803C6264; // type:object size:0x1C scope:local ...data.0 = .data:0x803C6280; // type:label scope:local align:4 -jpa_dl = .data:0x803C6280; // type:object size:0x20 scope:global align:4 -jpa_dl_x = .data:0x803C62A0; // type:object size:0x20 scope:global align:4 -p_prj = .data:0x803C62C0; // type:object size:0xC scope:global align:4 -p_direction = .data:0x803C62CC; // type:object size:0x14 scope:global align:4 -p_rot = .data:0x803C62E0; // type:object size:0x14 scope:global align:4 -p_plane = .data:0x803C62F4; // type:object size:0xC scope:global align:4 +jpa_dl = .data:0x803C6280; // type:object size:0x20 scope:local align:4 +jpa_dl_x = .data:0x803C62A0; // type:object size:0x20 scope:local align:4 +p_prj = .data:0x803C62C0; // type:object size:0xC scope:local align:4 +p_direction = .data:0x803C62CC; // type:object size:0x14 scope:local align:4 +p_rot = .data:0x803C62E0; // type:object size:0x14 scope:local align:4 +p_plane = .data:0x803C62F4; // type:object size:0xC scope:local align:4 st_bm__12JPABaseShape = .data:0x803C6300; // type:object size:0xC scope:global align:4 st_bf__12JPABaseShape = .data:0x803C630C; // type:object size:0x28 scope:global align:4 st_lo__12JPABaseShape = .data:0x803C6334; // type:object size:0x40 scope:global align:4 @@ -19833,7 +19862,7 @@ st_ca__12JPABaseShape = .data:0x803C63A4; // type:object size:0x60 scope:global st_aa__12JPABaseShape = .data:0x803C6404; // type:object size:0x20 scope:global align:4 @2631 = .data:0x803C6428; // type:object size:0x1C scope:local align:4 @3259 = .data:0x803C6448; // type:object size:0x24 scope:local align:4 -__vt__12JPAFieldBase = .data:0x803C646C; // type:object size:0x14 scope:global align:4 +__vt__12JPAFieldBase = .data:0x803C646C; // type:object size:0x14 scope:weak align:4 __vt__12JPAFieldSpin = .data:0x803C6480; // type:object size:0x14 scope:global align:4 __vt__12JPAFieldDrag = .data:0x803C6494; // type:object size:0x14 scope:global align:4 __vt__14JPAFieldRandom = .data:0x803C64A8; // type:object size:0x14 scope:global align:4 @@ -19852,18 +19881,18 @@ __vt__Q26JStage6TLight = .data:0x803C6718; // type:object size:0x6C scope:global __vt__Q26JStage7TObject = .data:0x803C6788; // type:object size:0x3C scope:global align:4 __vt__Q26JStage7TSystem = .data:0x803C67C8; // type:object size:0x50 scope:global align:4 __vt__Q37JStudio3ctb6TParse = .data:0x803C6818; // type:object size:0x14 scope:global align:4 -__vt__Q37JGadget6binary19TParse_header_block = .data:0x803C682C; // type:object size:0x14 scope:global align:4 +__vt__Q37JGadget6binary19TParse_header_block = .data:0x803C682C; // type:object size:0x14 scope:weak align:4 __vt__Q37JStudio3ctb8TFactory = .data:0x803C6840; // type:object size:0x14 scope:global align:4 __vt__Q37JStudio3ctb8TControl = .data:0x803C6854; // type:object size:0xC scope:global align:4 __vt__Q37JStudio3ctb14TObject_TxyzRy = .data:0x803C6860; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio3ctb7TObject = .data:0x803C6870; // type:object size:0x10 scope:global align:4 +__vt__Q37JStudio3ctb7TObject = .data:0x803C6870; // type:object size:0x10 scope:weak align:4 __vt__Q27JStudio22TFunctionValue_hermite = .data:0x803C6880; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio29TFunctionValue_list_parameter = .data:0x803C68A0; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio19TFunctionValue_list = .data:0x803C68C0; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio25TFunctionValue_transition = .data:0x803C68E0; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio23TFunctionValue_constant = .data:0x803C6900; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio24TFunctionValue_composite = .data:0x803C6920; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TFunctionValue = .data:0x803C6940; // type:object size:0x20 scope:global align:4 +__vt__Q27JStudio14TFunctionValue = .data:0x803C6940; // type:object size:0x20 scope:weak align:4 @838 = .data:0x803C6960; // type:object size:0x5C scope:local align:4 __vt__Q37JStudio3fvb6TParse = .data:0x803C69BC; // type:object size:0x14 scope:global align:4 __vt__Q37JStudio3fvb8TFactory = .data:0x803C69D0; // type:object size:0x14 scope:global align:4 @@ -19874,7 +19903,7 @@ __vt__Q37JStudio3fvb12TObject_list = .data:0x803C6A10; // type:object size:0x10 __vt__Q37JStudio3fvb18TObject_transition = .data:0x803C6A20; // type:object size:0x10 scope:global align:4 __vt__Q37JStudio3fvb16TObject_constant = .data:0x803C6A30; // type:object size:0x10 scope:global align:4 __vt__Q37JStudio3fvb17TObject_composite = .data:0x803C6A40; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio3fvb7TObject = .data:0x803C6A50; // type:object size:0x10 scope:global align:4 +__vt__Q37JStudio3fvb7TObject = .data:0x803C6A50; // type:object size:0x10 scope:weak align:4 __vt__Q27JStudio6TParse = .data:0x803C6A60; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio8TFactory = .data:0x803C6A80; // type:object size:0x14 scope:global align:4 __vt__Q27JStudio8TControl = .data:0x803C6A94; // type:object size:0xC scope:global align:4 @@ -19945,33 +19974,33 @@ __vt__Q27JStudio8TControl = .data:0x803C6A94; // type:object size:0xC scope:glob @1800 = .data:0x803C71C4; // type:object size:0xC scope:local align:4 @1831 = .data:0x803C71D0; // type:object size:0x10C scope:local align:4 __vt__Q27JStudio13TObject_sound = .data:0x803C72DC; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TAdaptor_sound = .data:0x803C72FC; // type:object size:0x50 scope:global align:4 +__vt__Q27JStudio14TAdaptor_sound = .data:0x803C72FC; // type:object size:0x50 scope:weak align:4 __vt__Q27JStudio16TObject_particle = .data:0x803C734C; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio17TAdaptor_particle = .data:0x803C736C; // type:object size:0x4C scope:global align:4 +__vt__Q27JStudio17TAdaptor_particle = .data:0x803C736C; // type:object size:0x4C scope:weak align:4 __vt__Q27JStudio15TObject_message = .data:0x803C73B8; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio13TObject_light = .data:0x803C73FC; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TAdaptor_light = .data:0x803C741C; // type:object size:0x28 scope:global align:4 +__vt__Q27JStudio14TAdaptor_light = .data:0x803C741C; // type:object size:0x28 scope:weak align:4 __vt__Q27JStudio11TObject_fog = .data:0x803C7444; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio12TAdaptor_fog = .data:0x803C7464; // type:object size:0x20 scope:global align:4 +__vt__Q27JStudio12TAdaptor_fog = .data:0x803C7464; // type:object size:0x20 scope:weak align:4 __vt__Q27JStudio14TObject_camera = .data:0x803C7484; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio15TAdaptor_camera = .data:0x803C74A4; // type:object size:0x3C scope:global align:4 +__vt__Q27JStudio15TAdaptor_camera = .data:0x803C74A4; // type:object size:0x3C scope:weak align:4 __vt__Q27JStudio20TObject_ambientLight = .data:0x803C74E0; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio21TAdaptor_ambientLight = .data:0x803C7500; // type:object size:0x20 scope:global align:4 +__vt__Q27JStudio21TAdaptor_ambientLight = .data:0x803C7500; // type:object size:0x20 scope:weak align:4 __vt__Q27JStudio13TObject_actor = .data:0x803C7520; // type:object size:0x20 scope:global align:4 -__vt__Q27JStudio14TAdaptor_actor = .data:0x803C7540; // type:object size:0x50 scope:global align:4 +__vt__Q27JStudio14TAdaptor_actor = .data:0x803C7540; // type:object size:0x50 scope:weak align:4 __vt__Q27JStudio7TObject = .data:0x803C7590; // type:object size:0x20 scope:global align:4 __vt__Q27JStudio8TAdaptor = .data:0x803C75B0; // type:object size:0x20 scope:global align:4 __vt__Q37JStudio14TVariableValue13TOutput_none_ = .data:0x803C75D0; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio14TVariableValue7TOutput = .data:0x803C75E0; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C75F0; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_ = .data:0x803C7600; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C7610; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_ = .data:0x803C7620; // type:object size:0x10 scope:global align:4 -__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C7630; // type:object size:0x10 scope:global align:4 +__vt__Q37JStudio14TVariableValue7TOutput = .data:0x803C75E0; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C75F0; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@57TOutputVariableValue_BOOL_ = .data:0x803C7600; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C7610; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@55TOutputVariableValue_BOOL_ = .data:0x803C7620; // type:object size:0x10 scope:weak align:4 +__vt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_ = .data:0x803C7630; // type:object size:0x10 scope:weak align:4 __vt__Q37JStudio3stb6TParse = .data:0x803C7640; // type:object size:0x20 scope:global align:4 __vt__Q37JStudio3stb8TFactory = .data:0x803C7660; // type:object size:0x14 scope:global align:4 __vt__Q37JStudio3stb8TControl = .data:0x803C7674; // type:object size:0xC scope:global align:4 -__vt__Q37JStudio3stb15TObject_control = .data:0x803C7680; // type:object size:0x20 scope:global align:4 +__vt__Q37JStudio3stb15TObject_control = .data:0x803C7680; // type:object size:0x20 scope:weak align:4 __vt__Q37JStudio3stb7TObject = .data:0x803C76A0; // type:object size:0x20 scope:global align:4 __vt__Q214JStudio_JStage13TCreateObject = .data:0x803C76C0; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803C76D0; // type:label scope:local align:4 @@ -19988,7 +20017,7 @@ __vt__Q214JStudio_JStage13TCreateObject = .data:0x803C76C0; // type:object size: @1098 = .data:0x803C7748; // type:object size:0xC scope:local align:4 __vt__Q314JStudio_JStage14TAdaptor_actor26TVVOutput_ANIMATION_FRAME_ = .data:0x803C7754; // type:object size:0x10 scope:global align:4 __vt__Q214JStudio_JStage14TAdaptor_actor = .data:0x803C7764; // type:object size:0x50 scope:global align:4 -__vt__Q214JStudio_JStage81TVariableValueOutput_object_ = .data:0x803C7804; // type:object size:0x10 scope:global align:4 +__vt__Q214JStudio_JStage81TVariableValueOutput_object_ = .data:0x803C7804; // type:object size:0x10 scope:weak align:4 __vt__Q214JStudio_JStage21TAdaptor_ambientLight = .data:0x803C7828; // type:object size:0x20 scope:global align:4 ...data.0 = .data:0x803C7848; // type:label scope:local align:4 @1014 = .data:0x803C7848; // type:object size:0xC scope:local align:4 data:4byte @@ -20000,14 +20029,14 @@ __vt__Q214JStudio_JStage21TAdaptor_ambientLight = .data:0x803C7828; // type:obje @1029 = .data:0x803C7890; // type:object size:0xC scope:local align:4 @1030 = .data:0x803C789C; // type:object size:0xC scope:local align:4 __vt__Q214JStudio_JStage15TAdaptor_camera = .data:0x803C78A8; // type:object size:0x3C scope:global align:4 -__vt__Q214JStudio_JStage83TVariableValueOutput_object_ = .data:0x803C7920; // type:object size:0x10 scope:global align:4 +__vt__Q214JStudio_JStage83TVariableValueOutput_object_ = .data:0x803C7920; // type:object size:0x10 scope:weak align:4 ...data.0 = .data:0x803C7940; // type:label scope:local align:4 @844 = .data:0x803C7940; // type:object size:0xC scope:local align:4 data:4byte @845 = .data:0x803C794C; // type:object size:0xC scope:local align:4 @849 = .data:0x803C7958; // type:object size:0xC scope:local align:4 @850 = .data:0x803C7964; // type:object size:0xC scope:local align:4 __vt__Q214JStudio_JStage12TAdaptor_fog = .data:0x803C7970; // type:object size:0x20 scope:global align:4 -__vt__Q214JStudio_JStage77TVariableValueOutput_object_ = .data:0x803C79B0; // type:object size:0x10 scope:global align:4 +__vt__Q214JStudio_JStage77TVariableValueOutput_object_ = .data:0x803C79B0; // type:object size:0x10 scope:weak align:4 __vt__Q314JStudio_JStage14TAdaptor_light20TVVOutput_direction_ = .data:0x803C79D0; // type:object size:0x10 scope:global align:4 __vt__Q214JStudio_JStage14TAdaptor_light = .data:0x803C79E0; // type:object size:0x28 scope:global align:4 __vt__Q215JStudio_JAudio213TCreateObject = .data:0x803C7A08; // type:object size:0x10 scope:global align:4 @@ -20088,29 +20117,29 @@ sExtCmdInfo__12JASSeqParser = .data:0x803C842C; // type:object size:0xFF0 scope: __vt__12JASSeqParser = .data:0x803C95F0; // type:object size:0x20 scope:global align:4 @613 = .data:0x803C9610; // type:object size:0x34 scope:local align:4 __vt__12JASBasicBank = .data:0x803C9648; // type:object size:0x14 scope:global align:4 -__vt__7JASBank = .data:0x803C965C; // type:object size:0x14 scope:global align:4 +__vt__7JASBank = .data:0x803C965C; // type:object size:0x14 scope:weak align:4 __vt__12JASVoiceBank = .data:0x803C9670; // type:object size:0x14 scope:global align:4 __vt__12JASBasicInst = .data:0x803C9688; // type:object size:0x14 scope:global align:4 -__vt__7JASInst = .data:0x803C969C; // type:object size:0x14 scope:global align:4 +__vt__7JASInst = .data:0x803C969C; // type:object size:0x14 scope:weak align:4 __vt__10JASDrumSet = .data:0x803C96B0; // type:object size:0x14 scope:global align:4 __vt__Q216JASBasicWaveBank11TWaveHandle = .data:0x803C96C8; // type:object size:0x14 scope:global align:4 __vt__Q216JASBasicWaveBank10TWaveGroup = .data:0x803C96DC; // type:object size:0x18 scope:global align:4 -__vt__13JASWaveHandle = .data:0x803C96F4; // type:object size:0x14 scope:global align:4 +__vt__13JASWaveHandle = .data:0x803C96F4; // type:object size:0x14 scope:weak align:4 __vt__16JASBasicWaveBank = .data:0x803C9708; // type:object size:0x18 scope:global align:4 -__vt__11JASWaveBank = .data:0x803C9720; // type:object size:0x18 scope:global align:4 +__vt__11JASWaveBank = .data:0x803C9720; // type:object size:0x18 scope:weak align:4 __vt__Q217JASSimpleWaveBank11TWaveHandle = .data:0x803C9738; // type:object size:0x14 scope:global align:4 __vt__17JASSimpleWaveBank = .data:0x803C974C; // type:object size:0x30 scope:global align:4 sCurrentDir__16JASWaveArcLoader = .data:0x803C9780; // type:object size:0x40 scope:global align:4 __vt__10JASWaveArc = .data:0x803C97C0; // type:object size:0x18 scope:global align:4 -__vt__11JASDisposer = .data:0x803C97D8; // type:object size:0x10 scope:global align:4 +__vt__11JASDisposer = .data:0x803C97D8; // type:object size:0x10 scope:weak align:4 @662 = .data:0x803C97E8; // type:object size:0x1C scope:local align:4 @977 = .data:0x803C9804; // type:object size:0x20 scope:local align:4 @974 = .data:0x803C9824; // type:object size:0x20 scope:local align:4 -table_list$151 = .data:0x803C9848; // type:object size:0x10 scope:local align:4 +table_list = .data:0x803C9848; // type:object size:0x10 scope:local align:4 history$267 = .data:0x803C9858; // type:object size:0x28 scope:local align:4 data:4byte __vt__14JASAudioThread = .data:0x803C9880; // type:object size:0x10 scope:global align:4 SEND_TABLE__6JASDsp = .data:0x803C9890; // type:object size:0x18 scope:global align:4 -jdsp = .data:0x803C98C0; // type:object size:0x1F00 scope:global align:4 noreloc +jdsp = .data:0x803C98C0; // type:object size:0x1F00 scope:local align:4 noreloc __vt__10JAIAudible = .data:0x803CB7C0; // type:object size:0x14 scope:global align:4 __vt__11JAIAudience = .data:0x803CB7D8; // type:object size:0x20 scope:global align:4 __vt__5JAISe = .data:0x803CB7F8; // type:object size:0x58 scope:global align:4 @@ -20130,9 +20159,9 @@ __vt__16JAIStreamDataMgr = .data:0x803CB9BC; // type:object size:0x10 scope:glob __vt__22JAUAudioArcInterpreter = .data:0x803CB9D0; // type:object size:0x44 scope:global align:4 __vt__17JAUAudioArcLoader = .data:0x803CBA18; // type:object size:0x44 scope:global align:4 __vt__14JAUSectionHeap = .data:0x803CBA60; // type:object size:0x34 scope:global align:4 -__vt__16JAUBankTableLink = .data:0x803CBA94; // type:object size:0x14 scope:global align:4 -__vt__12JAUBankTable = .data:0x803CBAA8; // type:object size:0xC scope:global align:4 -__vt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgr = .data:0x803CBAB4; // type:object size:0x10 scope:global align:4 +__vt__16JAUBankTableLink = .data:0x803CBA94; // type:object size:0x14 scope:weak align:4 +__vt__12JAUBankTable = .data:0x803CBAA8; // type:object size:0xC scope:weak align:4 +__vt__Q228@unnamed@JAUSectionHeap_cpp@14TStreamDataMgr = .data:0x803CBAB4; // type:object size:0x10 scope:weak align:4 __vt__10JAUSection = .data:0x803CBAC4; // type:object size:0x10 scope:global align:4 __vt__27JAUSeqDataMgr_SeqCollection = .data:0x803CBAD8; // type:object size:0x18 scope:global align:4 __vt__32JAUStreamDataMgr_StreamFileTable = .data:0x803CBAF0; // type:object size:0x10 scope:global align:4 @@ -20145,7 +20174,7 @@ __vt__Q28JMessage10TReference = .data:0x803CBC0C; // type:object size:0x10 scope sapfnParseCharacter___Q28JMessage18TResourceContainer = .data:0x803CBC20; // type:object size:0x14 scope:global align:4 __vt__Q28JMessage6TParse = .data:0x803CBC34; // type:object size:0x14 scope:global align:4 __vt__Q38JMessage18TResourceContainer10TCResource = .data:0x803CBC48; // type:object size:0x14 scope:global align:4 -__vt__Q27JGadget42TLinkList_factory = .data:0x803CBC5C; // type:object size:0x14 scope:global align:4 +__vt__Q27JGadget42TLinkList_factory = .data:0x803CBC5C; // type:object size:0x14 scope:weak align:4 __vt__16Z2AudioArcLoader = .data:0x803CBC70; // type:object size:0x44 scope:global align:4 @3690 = .data:0x803CBCB8; // type:object size:0x58 scope:local align:4 __vt__10Z2SoundMgr = .data:0x803CBD10; // type:object size:0xC scope:global align:4 @@ -20205,15 +20234,15 @@ __vt__14Z2CreatureLink = .data:0x803CD920; // type:object size:0x48 scope:global @5074 = .data:0x803CDB68; // type:object size:0x28 scope:local align:4 @5259 = .data:0x803CDB90; // type:object size:0x38 scope:local align:4 @5258 = .data:0x803CDBC8; // type:object size:0x28 scope:local align:4 -sHowlUmakusa = .data:0x803CDBF0; // type:object size:0xC scope:global align:4 -sHowlZeldaSong = .data:0x803CDBFC; // type:object size:0xC scope:global align:4 -sHowlLightPrelude = .data:0x803CDC08; // type:object size:0xC scope:global align:4 -sHowlSoulRequiem = .data:0x803CDC14; // type:object size:0xC scope:global align:4 -sHealingSong = .data:0x803CDC20; // type:object size:0xC scope:global align:4 -sNewSong1 = .data:0x803CDC2C; // type:object size:0xE scope:global align:4 -sNewSong2 = .data:0x803CDC3C; // type:object size:0x10 scope:global align:4 -sNewSong3 = .data:0x803CDC4C; // type:object size:0x12 scope:global align:4 -sGuideData = .data:0x803CDC60; // type:object size:0x48 scope:global align:4 +sHowlUmakusa = .data:0x803CDBF0; // type:object size:0xC scope:local align:4 +sHowlZeldaSong = .data:0x803CDBFC; // type:object size:0xC scope:local align:4 +sHowlLightPrelude = .data:0x803CDC08; // type:object size:0xC scope:local align:4 +sHowlSoulRequiem = .data:0x803CDC14; // type:object size:0xC scope:local align:4 +sHealingSong = .data:0x803CDC20; // type:object size:0xC scope:local align:4 +sNewSong1 = .data:0x803CDC2C; // type:object size:0xE scope:local align:4 +sNewSong2 = .data:0x803CDC3C; // type:object size:0x10 scope:local align:4 +sNewSong3 = .data:0x803CDC4C; // type:object size:0x12 scope:local align:4 +sGuideData = .data:0x803CDC60; // type:object size:0x48 scope:local align:4 @3729 = .data:0x803CDCA8; // type:object size:0x1C8 scope:local align:4 @3839 = .data:0x803CDE70; // type:object size:0x54 scope:local align:4 __vt__15Z2SpeechStarter = .data:0x803CDEC4; // type:object size:0x14 scope:global align:4 @@ -20238,11 +20267,11 @@ __vt__13JKRAramStream = .data:0x803CE158; // type:object size:0x10 scope:global __vt__13JKRFileLoader = .data:0x803CE168; // type:object size:0x3C scope:global align:4 __vt__12JKRDvdFinder = .data:0x803CE1A8; // type:object size:0x10 scope:global align:4 __vt__12JKRArcFinder = .data:0x803CE1B8; // type:object size:0x10 scope:global align:4 -__vt__13JKRFileFinder = .data:0x803CE1C8; // type:object size:0x10 scope:global align:4 +__vt__13JKRFileFinder = .data:0x803CE1C8; // type:object size:0x10 scope:weak align:4 __vt__12JKRFileCache = .data:0x803CE1D8; // type:object size:0x4C scope:global align:4 __vt__10JKRArchive = .data:0x803CE228; // type:object size:0x50 scope:global align:4 __vt__13JKRMemArchive = .data:0x803CE278; // type:object size:0x50 scope:global align:4 -__vt__7JKRFile = .data:0x803CE2C8; // type:object size:0x20 scope:global align:4 +__vt__7JKRFile = .data:0x803CE2C8; // type:object size:0x20 scope:weak align:4 __vt__14JKRAramArchive = .data:0x803CE2E8; // type:object size:0x50 scope:global align:4 __vt__13JKRDvdArchive = .data:0x803CE338; // type:object size:0x50 scope:global align:4 __vt__14JKRCompArchive = .data:0x803CE388; // type:object size:0x50 scope:global align:4 @@ -20258,17 +20287,17 @@ __vt__12JUTCacheFont = .data:0x803CE4E0; // type:object size:0x4C scope:global a __vt__12JUTGraphFifo = .data:0x803CE530; // type:object size:0xC scope:global align:4 __vt__10JUTResFont = .data:0x803CE540; // type:object size:0x4C scope:global align:4 sChannelMask__Q210JUTGamePad7CRumble = .data:0x803CE590; // type:object size:0x10 scope:global align:4 -channel_mask = .data:0x803CE5A0; // type:object size:0x10 scope:global align:4 +channel_mask = .data:0x803CE5A0; // type:object size:0x10 scope:local align:4 __vt__10JUTGamePad = .data:0x803CE5B0; // type:object size:0xC scope:global align:4 sMessageQueue__12JUTException = .data:0x803CE5C0; // type:object size:0x20 scope:global align:4 -c3bcnt = .data:0x803CE5E0; // type:object size:0x20 scope:global align:4 data:4byte +c3bcnt = .data:0x803CE5E0; // type:object size:0x20 scope:local align:4 data:4byte sCpuExpName__12JUTException = .data:0x803CE600; // type:object size:0x44 scope:global align:4 __vt__12JUTException = .data:0x803CE644; // type:object size:0x10 scope:global align:4 ...data.0 = .data:0x803CE658; // type:label scope:local align:4 sAsciiTable__14JUTDirectPrint = .data:0x803CE658; // type:object size:0x80 scope:global align:4 sFontData__14JUTDirectPrint = .data:0x803CE6D8; // type:object size:0x100 scope:global align:4 noreloc sFontData2__14JUTDirectPrint = .data:0x803CE7D8; // type:object size:0x134 scope:global align:4 noreloc -twiceBit$371 = .data:0x803CE90C; // type:object size:0x10 scope:local align:4 +twiceBit = .data:0x803CE90C; // type:object size:0x10 scope:local align:4 __vt__8JUTVideo = .data:0x803CE920; // type:object size:0xC scope:global align:4 __vt__8JUTFader = .data:0x803CE930; // type:object size:0x18 scope:global align:4 __vt__10JUTConsole = .data:0x803CE948; // type:object size:0xC scope:global align:4 @@ -20299,9 +20328,9 @@ __vt__12J2DPictureEx = .data:0x803CF458; // type:object size:0x14C scope:global __vt__12J2DTextBoxEx = .data:0x803CF5A8; // type:object size:0xBC scope:global align:4 __vt__20J2DAnmFullLoader_v15 = .data:0x803CF668; // type:object size:0x14 scope:global align:4 __vt__19J2DAnmKeyLoader_v15 = .data:0x803CF67C; // type:object size:0x14 scope:global align:4 -__vt__12J2DAnmLoader = .data:0x803CF690; // type:object size:0x14 scope:global align:4 -__vt__20J2DAnmVisibilityFull = .data:0x803CF6A4; // type:object size:0x10 scope:global align:4 -__vt__14J2DAnmVtxColor = .data:0x803CF6B4; // type:object size:0x14 scope:global align:4 +__vt__12J2DAnmLoader = .data:0x803CF690; // type:object size:0x14 scope:weak align:4 +__vt__20J2DAnmVisibilityFull = .data:0x803CF6A4; // type:object size:0x10 scope:weak align:4 +__vt__14J2DAnmVtxColor = .data:0x803CF6B4; // type:object size:0x14 scope:weak align:4 __vt__15J2DAnmTevRegKey = .data:0x803CF6C8; // type:object size:0x10 scope:global align:4 __vt__16J2DAnmTexPattern = .data:0x803CF6D8; // type:object size:0x10 scope:global align:4 __vt__19J2DAnmTextureSRTKey = .data:0x803CF6E8; // type:object size:0x10 scope:global align:4 @@ -20315,12 +20344,12 @@ __vt__19J2DAnmTransformFull = .data:0x803CF774; // type:object size:0x14 scope:g @899 = .data:0x803CF788; // type:object size:0x44 scope:local align:4 @951 = .data:0x803CF7CC; // type:object size:0x54 scope:local align:4 c2r$1302 = .data:0x803CF820; // type:object size:0x10 scope:local align:4 -NullTexData = .data:0x803CF840; // type:object size:0x10 scope:global align:4 -j3dIdentityMtx = .data:0x803CF850; // type:object size:0x30 scope:global align:4 -IndMtx = .data:0x803CF880; // type:object size:0x18 scope:global align:4 +NullTexData = .data:0x803CF840; // type:object size:0x10 scope:local align:4 +j3dIdentityMtx = .data:0x803CF850; // type:object size:0x30 scope:local align:4 +IndMtx = .data:0x803CF880; // type:object size:0x18 scope:local align:4 PSMulUnit01 = .data:0x803CF898; // type:object size:0x8 scope:global align:4 -sDifferedRegister = .data:0x803CF8A0; // type:object size:0x20 scope:global align:4 -sSizeOfDiffered = .data:0x803CF8C0; // type:object size:0x20 scope:global align:4 +sDifferedRegister = .data:0x803CF8A0; // type:object size:0x20 scope:local align:4 +sSizeOfDiffered = .data:0x803CF8C0; // type:object size:0x20 scope:local align:4 __vt__14J3DShapePacket = .data:0x803CF8E0; // type:object size:0x14 scope:global align:4 __vt__12J3DMatPacket = .data:0x803CF8F4; // type:object size:0x14 scope:global align:4 __vt__13J3DDrawPacket = .data:0x803CF908; // type:object size:0x14 scope:global align:4 @@ -20357,11 +20386,11 @@ __vt__8J3DShape = .data:0x803CFC18; // type:object size:0x18 scope:global align: __vt__17J3DLockedMaterial = .data:0x803CFC30; // type:object size:0x30 scope:global align:4 __vt__18J3DPatchedMaterial = .data:0x803CFC60; // type:object size:0x30 scope:global align:4 __vt__11J3DMaterial = .data:0x803CFC90; // type:object size:0x30 scope:global align:4 -__vt__10J3DPEBlock = .data:0x803CFCC0; // type:object size:0x7C scope:global align:4 -__vt__15J3DIndBlockNull = .data:0x803CFD3C; // type:object size:0x4C scope:global align:4 -__vt__11J3DIndBlock = .data:0x803CFD88; // type:object size:0x4C scope:global align:4 -__vt__14J3DTexGenBlock = .data:0x803CFDD4; // type:object size:0x6C scope:global align:4 -__vt__13J3DColorBlock = .data:0x803CFE40; // type:object size:0x90 scope:global align:4 +__vt__10J3DPEBlock = .data:0x803CFCC0; // type:object size:0x7C scope:weak align:4 +__vt__15J3DIndBlockNull = .data:0x803CFD3C; // type:object size:0x4C scope:weak align:4 +__vt__11J3DIndBlock = .data:0x803CFD88; // type:object size:0x4C scope:weak align:4 +__vt__14J3DTexGenBlock = .data:0x803CFDD4; // type:object size:0x6C scope:weak align:4 +__vt__13J3DColorBlock = .data:0x803CFE40; // type:object size:0x90 scope:weak align:4 @5062 = .data:0x803CFED0; // type:object size:0x30 scope:local align:4 @5110 = .data:0x803CFF00; // type:object size:0x30 scope:local align:4 @5150 = .data:0x803CFF30; // type:object size:0x30 scope:local align:4 @@ -20403,43 +20432,43 @@ sortFuncTable__13J3DDrawBuffer = .data:0x803D0BD0; // type:object size:0x48 scop drawFuncTable__13J3DDrawBuffer = .data:0x803D0C30; // type:object size:0x18 scope:global align:4 data:4byte @871 = .data:0x803D0C48; // type:object size:0x4C scope:local align:4 __vt__12J3DJointTree = .data:0x803D0C94; // type:object size:0x10 scope:global align:4 -__vt__13J3DShapeTable = .data:0x803D0CA8; // type:object size:0xC scope:global align:4 -__vt__12J3DModelData = .data:0x803D0CB4; // type:object size:0xC scope:global align:4 +__vt__13J3DShapeTable = .data:0x803D0CA8; // type:object size:0xC scope:weak align:4 +__vt__12J3DModelData = .data:0x803D0CB4; // type:object size:0xC scope:weak align:4 __vt__8J3DModel = .data:0x803D0CC0; // type:object size:0x24 scope:global align:4 -__vt__12J3DMtxBuffer = .data:0x803D0CE4; // type:object size:0xC scope:global align:4 -__vt__16J3DAnmTexPattern = .data:0x803D0CF0; // type:object size:0x10 scope:global align:4 -__vt__15J3DAnmTevRegKey = .data:0x803D0D00; // type:object size:0x10 scope:global align:4 +__vt__12J3DMtxBuffer = .data:0x803D0CE4; // type:object size:0xC scope:weak align:4 +__vt__16J3DAnmTexPattern = .data:0x803D0CF0; // type:object size:0x10 scope:weak align:4 +__vt__15J3DAnmTevRegKey = .data:0x803D0D00; // type:object size:0x10 scope:weak align:4 __vt__14J3DAnmColorKey = .data:0x803D0D10; // type:object size:0x14 scope:global align:4 __vt__15J3DAnmColorFull = .data:0x803D0D24; // type:object size:0x14 scope:global align:4 -__vt__11J3DAnmColor = .data:0x803D0D38; // type:object size:0x14 scope:global align:4 +__vt__11J3DAnmColor = .data:0x803D0D38; // type:object size:0x14 scope:weak align:4 __vt__17J3DAnmVtxColorKey = .data:0x803D0D4C; // type:object size:0x14 scope:global align:4 __vt__18J3DAnmVtxColorFull = .data:0x803D0D60; // type:object size:0x14 scope:global align:4 -__vt__14J3DAnmVtxColor = .data:0x803D0D74; // type:object size:0x14 scope:global align:4 +__vt__14J3DAnmVtxColor = .data:0x803D0D74; // type:object size:0x14 scope:weak align:4 __vt__16J3DAnmClusterKey = .data:0x803D0D88; // type:object size:0x14 scope:global align:4 -__vt__13J3DAnmCluster = .data:0x803D0D9C; // type:object size:0x14 scope:global align:4 +__vt__13J3DAnmCluster = .data:0x803D0D9C; // type:object size:0x14 scope:weak align:4 __vt__17J3DAnmClusterFull = .data:0x803D0DB0; // type:object size:0x14 scope:global align:4 -__vt__19J3DAnmTextureSRTKey = .data:0x803D0DC4; // type:object size:0x10 scope:global align:4 +__vt__19J3DAnmTextureSRTKey = .data:0x803D0DC4; // type:object size:0x10 scope:weak align:4 __vt__27J3DAnmTransformFullWithLerp = .data:0x803D0DD4; // type:object size:0x14 scope:global align:4 __vt__19J3DAnmTransformFull = .data:0x803D0DE8; // type:object size:0x14 scope:global align:4 __vt__14J3DMaterialAnm = .data:0x803D0E00; // type:object size:0x10 scope:global align:4 __vt__13J3DSkinDeform = .data:0x803D0E10; // type:object size:0x10 scope:global align:4 __vt__16J3DMaterialTable = .data:0x803D0E20; // type:object size:0xC scope:global align:4 -__vt__14J3DPEBlockNull = .data:0x803D0E30; // type:object size:0x7C scope:global align:4 -__vt__15J3DTevBlockNull = .data:0x803D0EAC; // type:object size:0xDC scope:global align:4 -__vt__18J3DTexGenBlockNull = .data:0x803D0F88; // type:object size:0x6C scope:global align:4 -__vt__17J3DColorBlockNull = .data:0x803D0FF4; // type:object size:0x90 scope:global align:4 +__vt__14J3DPEBlockNull = .data:0x803D0E30; // type:object size:0x7C scope:weak align:4 +__vt__15J3DTevBlockNull = .data:0x803D0EAC; // type:object size:0xDC scope:weak align:4 +__vt__18J3DTexGenBlockNull = .data:0x803D0F88; // type:object size:0x6C scope:weak align:4 +__vt__17J3DColorBlockNull = .data:0x803D0FF4; // type:object size:0x90 scope:weak align:4 __vt__20J3DClusterLoader_v15 = .data:0x803D1088; // type:object size:0x10 scope:global align:4 -__vt__16J3DClusterLoader = .data:0x803D1098; // type:object size:0x10 scope:global align:4 +__vt__16J3DClusterLoader = .data:0x803D1098; // type:object size:0x10 scope:weak align:4 __vt__18J3DModelLoader_v21 = .data:0x803D10A8; // type:object size:0x44 scope:global align:4 __vt__18J3DModelLoader_v26 = .data:0x803D10EC; // type:object size:0x44 scope:global align:4 -__vt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage> = .data:0x803D1130; // type:object size:0x2C scope:global align:4 -__vt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic> = .data:0x803D115C; // type:object size:0x2C scope:global align:4 -__vt__10J3DTexture = .data:0x803D1188; // type:object size:0xC scope:global align:4 +__vt__83J3DMtxCalcNoAnm<32J3DMtxCalcCalcTransformSoftimage,29J3DMtxCalcJ3DSysInitSoftimage> = .data:0x803D1130; // type:object size:0x2C scope:weak align:4 +__vt__75J3DMtxCalcNoAnm<28J3DMtxCalcCalcTransformBasic,25J3DMtxCalcJ3DSysInitBasic> = .data:0x803D115C; // type:object size:0x2C scope:weak align:4 +__vt__10J3DTexture = .data:0x803D1188; // type:object size:0xC scope:weak align:4 __vt__14J3DModelLoader = .data:0x803D1194; // type:object size:0x44 scope:global align:4 __vt__19J3DAnmKeyLoader_v15 = .data:0x803D11D8; // type:object size:0x14 scope:global align:4 __vt__20J3DAnmFullLoader_v15 = .data:0x803D11EC; // type:object size:0x14 scope:global align:4 -__vt__12J3DAnmLoader = .data:0x803D1200; // type:object size:0x14 scope:global align:4 -__vt__20J3DAnmVisibilityFull = .data:0x803D1214; // type:object size:0x10 scope:global align:4 +__vt__12J3DAnmLoader = .data:0x803D1200; // type:object size:0x14 scope:weak align:4 +__vt__20J3DAnmVisibilityFull = .data:0x803D1214; // type:object size:0x10 scope:weak align:4 ...data.0 = .data:0x803D1228; // type:label scope:local align:4 @1 = .data:0x803D1228; // type:object size:0x44 scope:local align:4 data:string @105 = .data:0x803D126C; // type:object size:0xD scope:local align:4 data:string @@ -20455,13 +20484,13 @@ __vt__20J3DAnmVisibilityFull = .data:0x803D1214; // type:object size:0x10 scope: @115 = .data:0x803D1308; // type:object size:0x19 scope:local align:4 data:string @117 = .data:0x803D1324; // type:object size:0xE scope:local align:4 data:string @118 = .data:0x803D1334; // type:object size:0x15 scope:local align:4 data:string -__OSExceptionLocations = .data:0x803D134C; // type:object size:0x3C scope:global align:4 +__OSExceptionLocations = .data:0x803D134C; // type:object size:0x3C scope:local align:4 @152 = .data:0x803D1388; // type:object size:0x1B scope:local align:4 data:string @153 = .data:0x803D13A4; // type:object size:0x2E scope:local align:4 data:string @154 = .data:0x803D13D4; // type:object size:0x2F scope:local align:4 data:string @155 = .data:0x803D1404; // type:object size:0x1B scope:local align:4 data:string ResetFunctionInfo = .data:0x803D1420; // type:object size:0x10 scope:local align:4 -DSPInitCode = .data:0x803D1430; // type:object size:0x80 scope:global align:4 +DSPInitCode = .data:0x803D1430; // type:object size:0x80 scope:local align:4 ...data.0 = .data:0x803D14B0; // type:label scope:local align:4 @63 = .data:0x803D14B0; // type:object size:0x29 scope:local align:4 data:string @84 = .data:0x803D14DC; // type:object size:0x18 scope:local align:4 data:string @@ -20509,9 +20538,9 @@ DSPInitCode = .data:0x803D1430; // type:object size:0x80 scope:global align:4 @86 = .data:0x803D1B5C; // type:object size:0x35 scope:local align:4 data:string @87 = .data:0x803D1B94; // type:object size:0x40 scope:local align:4 @115 = .data:0x803D1BD8; // type:object size:0xB scope:local align:4 data:string -HankakuToCode = .data:0x803D1BE8; // type:object size:0x180 scope:global align:4 -Zenkaku2Code = .data:0x803D1D68; // type:object size:0x98A scope:global align:4 -InterruptPrioTable = .data:0x803D26F8; // type:object size:0x2C scope:global align:4 data:4byte +HankakuToCode = .data:0x803D1BE8; // type:object size:0x180 scope:local align:4 +Zenkaku2Code = .data:0x803D1D68; // type:object size:0x98A scope:local align:4 +InterruptPrioTable = .data:0x803D26F8; // type:object size:0x2C scope:local align:4 data:4byte @62 = .data:0x803D2728; // type:object size:0x25 scope:local align:4 data:string @189 = .data:0x803D2750; // type:object size:0x27 scope:local align:4 data:string ResetFunctionInfo = .data:0x803D2778; // type:object size:0x10 scope:local align:4 @@ -20542,8 +20571,8 @@ ResetFunctionInfo = .data:0x803D2778; // type:object size:0x10 scope:local align @854 = .data:0x803D2EF8; // type:object size:0x67 scope:local align:4 data:string @855 = .data:0x803D2F60; // type:object size:0x45 scope:local align:4 data:string @856 = .data:0x803D2FA8; // type:object size:0x3D scope:local align:4 data:string -YearDays = .data:0x803D2FE8; // type:object size:0x30 scope:global align:4 -LeapYearDays = .data:0x803D3018; // type:object size:0x30 scope:global align:4 +YearDays = .data:0x803D2FE8; // type:object size:0x30 scope:local align:4 +LeapYearDays = .data:0x803D3018; // type:object size:0x30 scope:local align:4 ...data.0 = .data:0x803D3048; // type:label scope:local align:4 @1 = .data:0x803D3048; // type:object size:0x45 scope:local align:4 data:string @473 = .data:0x803D3090; // type:object size:0xF scope:local align:4 data:string @@ -20560,7 +20589,7 @@ LeapYearDays = .data:0x803D3018; // type:object size:0x30 scope:global align:4 @490 = .data:0x803D3144; // type:object size:0xE scope:local align:4 data:string ...data.0 = .data:0x803D3158; // type:label scope:local align:4 @1 = .data:0x803D3158; // type:object size:0x44 scope:local align:4 data:string -Si = .data:0x803D319C; // type:object size:0x14 scope:global align:4 data:4byte +Si = .data:0x803D319C; // type:object size:0x14 scope:local align:4 data:4byte Type = .data:0x803D31B0; // type:object size:0x10 scope:local align:4 @457 = .data:0x803D31C0; // type:object size:0xC scope:local align:4 data:string @459 = .data:0x803D31CC; // type:object size:0xF scope:local align:4 data:string @@ -20574,8 +20603,8 @@ Type = .data:0x803D31B0; // type:object size:0x10 scope:local align:4 @467 = .data:0x803D3254; // type:object size:0x9 scope:local align:4 data:string @468 = .data:0x803D3260; // type:object size:0x9 scope:local align:4 data:string ...data.0 = .data:0x803D3270; // type:label scope:local align:4 -XYNTSC = .data:0x803D3270; // type:object size:0x30 scope:global align:4 -XYPAL = .data:0x803D32A0; // type:object size:0x30 scope:global align:4 +XYNTSC = .data:0x803D3270; // type:object size:0x30 scope:local align:4 +XYPAL = .data:0x803D32A0; // type:object size:0x30 scope:local align:4 @16 = .data:0x803D32D0; // type:object size:0x33 scope:local align:4 data:string @9 = .data:0x803D3308; // type:object size:0x18 scope:local align:4 data:string @119 = .data:0x803D3320; // type:object size:0xC8 scope:local align:4 data:string @@ -20588,11 +20617,11 @@ XYPAL = .data:0x803D32A0; // type:object size:0x30 scope:global align:4 @18 = .data:0x803D3508; // type:object size:0xA scope:local align:4 data:string @24 = .data:0x803D3514; // type:object size:0x34 scope:local align:4 data:string @359 = .data:0x803D3548; // type:object size:0x44 scope:local align:4 -ImmCommand = .data:0x803D358C; // type:object size:0xC scope:global align:4 data:4byte +ImmCommand = .data:0x803D358C; // type:object size:0xC scope:local align:4 data:4byte @789 = .data:0x803D3598; // type:object size:0x41 scope:local align:4 data:string @956 = .data:0x803D35DC; // type:object size:0x34 scope:local align:4 @1060 = .data:0x803D3610; // type:object size:0x34 scope:local align:4 -ErrorTable = .data:0x803D3648; // type:object size:0x48 scope:global align:4 data:4byte +ErrorTable = .data:0x803D3648; // type:object size:0x48 scope:local align:4 data:4byte ...data.0 = .data:0x803D3690; // type:label scope:local align:4 @38 = .data:0x803D3690; // type:object size:0x1A scope:local align:4 data:string @39 = .data:0x803D36AC; // type:object size:0x16 scope:local align:4 data:string @@ -20601,8 +20630,8 @@ ErrorTable = .data:0x803D3648; // type:object size:0x48 scope:global align:4 dat @44 = .data:0x803D36EC; // type:object size:0x14 scope:local align:4 data:string ...data.0 = .data:0x803D3700; // type:label scope:local align:4 @1 = .data:0x803D3700; // type:object size:0x44 scope:local align:4 data:string -timing = .data:0x803D3744; // type:object size:0x17C scope:global align:4 -taps = .data:0x803D38C0; // type:object size:0x32 scope:global align:4 +timing = .data:0x803D3744; // type:object size:0x17C scope:local align:4 +taps = .data:0x803D38C0; // type:object size:0x32 scope:local align:4 @101 = .data:0x803D38F4; // type:object size:0x7C scope:local align:4 @355 = .data:0x803D3970; // type:object size:0x29 scope:local align:4 data:string @356 = .data:0x803D399C; // type:object size:0x29 scope:local align:4 data:string @@ -20637,16 +20666,16 @@ ResetFunctionInfo = .data:0x803D3B30; // type:object size:0x10 scope:local align ...data.0 = .data:0x803D3DD8; // type:label scope:local align:4 @1 = .data:0x803D3DD8; // type:object size:0x46 scope:local align:4 data:string ResetFunctionInfo = .data:0x803D3E20; // type:object size:0x10 scope:local align:4 -CardData = .data:0x803D3E40; // type:object size:0x160 scope:global align:4 -SectorSizeTable = .data:0x803D3FA0; // type:object size:0x20 scope:global align:4 -LatencyTable = .data:0x803D3FC0; // type:object size:0x20 scope:global align:4 +CardData = .data:0x803D3E40; // type:object size:0x160 scope:local align:4 +SectorSizeTable = .data:0x803D3FA0; // type:object size:0x20 scope:local align:4 +LatencyTable = .data:0x803D3FC0; // type:object size:0x20 scope:local align:4 ...data.0 = .data:0x803D3FE0; // type:label scope:local align:4 @1 = .data:0x803D3FE0; // type:object size:0x44 scope:local align:4 data:string -DefaultTexData = .data:0x803D4040; // type:object size:0x20 scope:global align:4 -GXDefaultVATList = .data:0x803D4060; // type:object size:0xD0 scope:global align:4 -GXDefaultProjData = .data:0x803D4130; // type:object size:0x1C scope:global align:4 -GXTexRegionAddrTable = .data:0x803D414C; // type:object size:0xC0 scope:global align:4 data:4byte -GXResetFuncInfo = .data:0x803D420C; // type:object size:0x10 scope:global align:4 +DefaultTexData = .data:0x803D4040; // type:object size:0x20 scope:local align:4 +GXDefaultVATList = .data:0x803D4060; // type:object size:0xD0 scope:local align:4 +GXDefaultProjData = .data:0x803D4130; // type:object size:0x1C scope:local align:4 +GXTexRegionAddrTable = .data:0x803D414C; // type:object size:0xC0 scope:local align:4 data:4byte +GXResetFuncInfo = .data:0x803D420C; // type:object size:0x10 scope:local align:4 @176 = .data:0x803D4220; // type:object size:0x68 scope:local align:4 @223 = .data:0x803D4288; // type:object size:0x68 scope:local align:4 @476 = .data:0x803D42F0; // type:object size:0x44 scope:local align:4 @@ -20663,10 +20692,10 @@ GXEurgb60Hz480IntDf = .data:0x803D44D8; // type:object size:0x3C scope:global al @145 = .data:0x803D462C; // type:object size:0xF4 scope:local align:4 @224 = .data:0x803D4720; // type:object size:0x3C scope:local align:4 ...data.0 = .data:0x803D4760; // type:label scope:local align:4 -TEVCOpTableST0 = .data:0x803D4760; // type:object size:0x14 scope:global align:4 -TEVCOpTableST1 = .data:0x803D4774; // type:object size:0x14 scope:global align:4 -TEVAOpTableST0 = .data:0x803D4788; // type:object size:0x14 scope:global align:4 -TEVAOpTableST1 = .data:0x803D479C; // type:object size:0x14 scope:global align:4 +TEVCOpTableST0 = .data:0x803D4760; // type:object size:0x14 scope:local align:4 +TEVCOpTableST1 = .data:0x803D4774; // type:object size:0x14 scope:local align:4 +TEVAOpTableST0 = .data:0x803D4788; // type:object size:0x14 scope:local align:4 +TEVAOpTableST1 = .data:0x803D479C; // type:object size:0x14 scope:local align:4 c2r$334 = .data:0x803D47B0; // type:object size:0x24 scope:local align:4 p2f$358 = .data:0x803D47D8; // type:object size:0x20 scope:local align:4 @182 = .data:0x803D47F8; // type:object size:0x5C scope:local align:4 @@ -20686,24 +20715,24 @@ __upper_map = .data:0x803D4DB8; // type:object size:0x100 scope:global align:4 @499 = .data:0x803D51A0; // type:object size:0x1C scope:local align:4 @536 = .data:0x803D51BC; // type:object size:0x1C scope:local align:4 gTRKRestoreFlags = .data:0x803D51D8; // type:object size:0x9 scope:global align:4 data:byte -gTRKExceptionStatus = .data:0x803D51E4; // type:object size:0x10 scope:global align:4 data:4byte -gTRKStepStatus = .data:0x803D51F4; // type:object size:0x14 scope:global align:4 data:4byte -TRK_ISR_OFFSETS = .data:0x803D5208; // type:object size:0x3C scope:global align:4 data:4byte +gTRKExceptionStatus = .data:0x803D51E4; // type:object size:0x10 scope:local align:4 data:4byte +gTRKStepStatus = .data:0x803D51F4; // type:object size:0x14 scope:local align:4 data:4byte +TRK_ISR_OFFSETS = .data:0x803D5208; // type:object size:0x3C scope:local align:4 data:4byte gDBCommTable = .data:0x803D5248; // type:object size:0x28 scope:global align:4 data:4byte ...bss.0 = .bss:0x803D5280; // type:label scope:local align:4 -RootHeapCheck = .bss:0x803D5280; // type:object size:0x28 scope:global align:4 data:4byte -SystemHeapCheck = .bss:0x803D52A8; // type:object size:0x28 scope:global align:4 data:4byte -ZeldaHeapCheck = .bss:0x803D52D0; // type:object size:0x28 scope:global align:4 data:4byte -GameHeapCheck = .bss:0x803D52F8; // type:object size:0x28 scope:global align:4 data:4byte -ArchiveHeapCheck = .bss:0x803D5320; // type:object size:0x28 scope:global align:4 data:4byte -J2dHeapCheck = .bss:0x803D5348; // type:object size:0x28 scope:global align:4 data:4byte -HostioHeapCheck = .bss:0x803D5370; // type:object size:0x28 scope:global align:4 data:4byte -CommandHeapCheck = .bss:0x803D5398; // type:object size:0x28 scope:global align:4 data:4byte -mainThreadStack = .bss:0x803D53C0; // type:object size:0x8000 scope:global align:4 -mainThread = .bss:0x803DD3C0; // type:object size:0x318 scope:global align:4 -mDoPrintf_FiberStack = .bss:0x803DD6E0; // type:object size:0x800 scope:global align:4 +RootHeapCheck = .bss:0x803D5280; // type:object size:0x28 scope:local align:4 data:4byte +SystemHeapCheck = .bss:0x803D52A8; // type:object size:0x28 scope:local align:4 data:4byte +ZeldaHeapCheck = .bss:0x803D52D0; // type:object size:0x28 scope:local align:4 data:4byte +GameHeapCheck = .bss:0x803D52F8; // type:object size:0x28 scope:local align:4 data:4byte +ArchiveHeapCheck = .bss:0x803D5320; // type:object size:0x28 scope:local align:4 data:4byte +J2dHeapCheck = .bss:0x803D5348; // type:object size:0x28 scope:local align:4 data:4byte +HostioHeapCheck = .bss:0x803D5370; // type:object size:0x28 scope:local align:4 data:4byte +CommandHeapCheck = .bss:0x803D5398; // type:object size:0x28 scope:local align:4 data:4byte +mainThreadStack = .bss:0x803D53C0; // type:object size:0x8000 scope:local align:4 +mainThread = .bss:0x803DD3C0; // type:object size:0x318 scope:local align:4 +mDoPrintf_FiberStack = .bss:0x803DD6E0; // type:object size:0x800 scope:local align:4 @3620 = .bss:0x803DDEE0; // type:object size:0xC scope:local align:4 -g_mDoAud_zelAudio = .bss:0x803DDEEC; // type:object size:0x138C scope:global align:4 +g_mDoAud_zelAudio = .bss:0x803DDEEC; // type:object size:0x138C scope:local align:4 m_gamePad__8mDoCPd_c = .bss:0x803DF278; // type:object size:0x10 scope:global align:4 data:4byte m_cpadInfo__8mDoCPd_c = .bss:0x803DF288; // type:object size:0x100 scope:global align:4 data:float mFrameBufferTexObj__13mDoGph_gInf_c = .bss:0x803DF388; // type:object size:0x20 scope:global align:4 @@ -20715,24 +20744,25 @@ now__14mDoMtx_stack_c = .bss:0x803DF410; // type:object size:0x30 scope:global a buffer__14mDoMtx_stack_c = .bss:0x803DF440; // type:object size:0x300 scope:global align:4 @4048 = .bss:0x803DF740; // type:object size:0xC scope:local align:4 @4078 = .bss:0x803DF74C; // type:object size:0xC scope:local align:4 -mDoMtx_quatStack = .bss:0x803DF758; // type:object size:0x11C scope:global align:4 +mDoMtx_quatStack = .bss:0x803DF758; // type:object size:0x11C scope:local align:4 @3727 = .bss:0x803DF878; // type:object size:0xC scope:local align:4 mClipper__14mDoLib_clipper = .bss:0x803DF884; // type:object size:0x5C scope:global align:4 data:4byte ...bss.0 = .bss:0x803DF8E0; // type:label scope:local align:4 l_thread__9mDoDvdThd = .bss:0x803DF8E0; // type:object size:0x318 scope:global align:4 l_threadStack__9mDoDvdThd = .bss:0x803DFC00; // type:object size:0x1000 scope:global align:4 l_param__9mDoDvdThd = .bss:0x803E0C00; // type:object size:0x48 scope:global align:4 +padding = .bss:0x803E0C48; // type:object size:0x18 scope:local ...bss.0 = .bss:0x803E0C60; // type:label scope:local align:4 -DvdErr_thread = .bss:0x803E0C60; // type:object size:0x318 scope:global align:4 -DvdErr_stack = .bss:0x803E0F80; // type:object size:0xC00 scope:global align:4 +DvdErr_thread = .bss:0x803E0C60; // type:object size:0x318 scope:local align:4 +DvdErr_stack = .bss:0x803E0F80; // type:object size:0xC00 scope:local align:4 Alarm = .bss:0x803E1B80; // type:object size:0x28 scope:local align:4 -MemCardStack = .bss:0x803E1BC0; // type:object size:0x1000 scope:global align:4 -MemCardThread = .bss:0x803E2BC0; // type:object size:0x318 scope:global align:4 -MemCardWorkArea0 = .bss:0x803E2EE0; // type:object size:0xA000 scope:global align:4 +MemCardStack = .bss:0x803E1BC0; // type:object size:0x1000 scope:local align:4 +MemCardThread = .bss:0x803E2BC0; // type:object size:0x318 scope:local align:4 +MemCardWorkArea0 = .bss:0x803E2EE0; // type:object size:0xA000 scope:local align:4 g_mDoMemCd_control = .bss:0x803ECEE0; // type:object size:0x2000 scope:global align:4 -sTmpBuf = .bss:0x803EEEE0; // type:object size:0x4000 scope:global align:4 data:4byte +sTmpBuf = .bss:0x803EEEE0; // type:object size:0x4000 scope:local align:4 data:4byte @3741 = .bss:0x803F2EE0; // type:object size:0xC scope:local align:4 -DMC = .bss:0x803F2EF0; // type:object size:0xC60 scope:global align:4 +DMC = .bss:0x803F2EF0; // type:object size:0xC60 scope:local align:4 @3691 = .bss:0x803F3B50; // type:object size:0xC scope:local align:4 g_HIO = .bss:0x803F3B5C; // type:object size:0x40 scope:global align:4 ...bss.0 = .bss:0x803F3BA0; // type:label scope:local align:4 @@ -20749,22 +20779,22 @@ mGndCheck__11fopAcM_gc_c = .bss:0x803F3C64; // type:object size:0x54 scope:globa mRoofCheck__11fopAcM_rc_c = .bss:0x803F3CC4; // type:object size:0x50 scope:global align:4 @6519 = .bss:0x803F3D14; // type:object size:0xC scope:local align:4 mWaterCheck__11fopAcM_wt_c = .bss:0x803F3D20; // type:object size:0x54 scope:global align:4 -l_fopCamM_id = .bss:0x803F3D78; // type:object size:0x10 scope:global align:4 -l_fopOvlpM_Request = .bss:0x803F3D88; // type:object size:0x28 scope:global align:4 +l_fopCamM_id = .bss:0x803F3D78; // type:object size:0x10 scope:local align:4 +l_fopOvlpM_Request = .bss:0x803F3D88; // type:object size:0x28 scope:local align:4 lists$2216 = .bss:0x803F3DB0; // type:object size:0x2EE0 scope:local align:4 -l_fpcLn_Line = .bss:0x803F6C90; // type:object size:0xC0 scope:global align:4 +l_fpcLn_Line = .bss:0x803F6C90; // type:object size:0xC0 scope:local align:4 rootlayer$3716 = .bss:0x803F6D50; // type:object size:0x2C scope:local align:4 queue$3717 = .bss:0x803F6D7C; // type:object size:0x78 scope:local align:4 -l_fpcPi_Queue = .bss:0x803F6DF8; // type:object size:0xC scope:global align:4 +l_fpcPi_Queue = .bss:0x803F6DF8; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x803F6E08; // type:label scope:local align:4 @3926 = .bss:0x803F6E08; // type:object size:0xC scope:local align:4 -DoorInfo = .bss:0x803F6E14; // type:object size:0x904 scope:global align:4 data:4byte +DoorInfo = .bss:0x803F6E14; // type:object size:0x904 scope:local align:4 data:4byte @3981 = .bss:0x803F7718; // type:object size:0xC scope:local align:4 -l_RoomKeepDoorInfo = .bss:0x803F7724; // type:object size:0x904 scope:global align:4 data:4byte +l_RoomKeepDoorInfo = .bss:0x803F7724; // type:object size:0x904 scope:local align:4 data:4byte @5376 = .bss:0x803F8028; // type:object size:0xC scope:local align:4 mStatus__20dStage_roomControl_c = .bss:0x803F8034; // type:object size:0x10100 scope:global align:4 data:4byte mDemoArcName__20dStage_roomControl_c = .bss:0x80408134; // type:object size:0xA scope:global align:4 data:byte -dComIfG_mTimerInfo = .bss:0x80408140; // type:object size:0x14 scope:global align:4 data:4byte +dComIfG_mTimerInfo = .bss:0x80408140; // type:object size:0x14 scope:local align:4 data:4byte @5065 = .bss:0x80408154; // type:object size:0xC scope:local align:4 g_dComIfG_gameInfo = .bss:0x80408160; // type:object size:0x1DE10 scope:global align:4 data:2byte buf$7371 = .bss:0x80425F70; // type:object size:0x20 scope:local align:4 @@ -20793,12 +20823,14 @@ m_texObjAgg__8dMpath_n = .bss:0x80426624; // type:object size:0x1C scope:global map_tool_name$4449 = .bss:0x80426640; // type:object size:0x11 scope:local align:4 map_tool_name$4498 = .bss:0x80426654; // type:object size:0x11 scope:local align:4 map_tool_name$4511 = .bss:0x80426668; // type:object size:0x11 scope:local align:4 -l_startAction = .bss:0x80426680; // type:object size:0x18 scope:global align:4 data:4byte -l_runAction = .bss:0x80426698; // type:object size:0x18 scope:global align:4 data:4byte +l_startAction = .bss:0x80426680; // type:object size:0x18 scope:local align:4 data:4byte +l_runAction = .bss:0x80426698; // type:object size:0x18 scope:local align:4 data:4byte ...bss.0 = .bss:0x804266B0; // type:label scope:local align:4 @4053 = .bss:0x804266B0; // type:object size:0xC scope:local align:4 @4054 = .bss:0x804266BC; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x804266BC; // type:label scope:local pos$4424 = .bss:0x804266C8; // type:object size:0xC scope:local align:4 data:float +...bss.0 = .bss:0x804266C8; // type:label scope:local @4723 = .bss:0x804266D4; // type:object size:0xC scope:local align:4 @4724 = .bss:0x804266E0; // type:object size:0xC scope:local align:4 @4725 = .bss:0x804266EC; // type:object size:0xC scope:local align:4 @@ -20862,9 +20894,9 @@ l_wcsbuf = .bss:0x80426F34; // type:object size:0x3F0 scope:local align:4 data:f vtx_tbl$5950 = .bss:0x80427324; // type:object size:0x24 scope:local align:4 data:float ...bss.0 = .bss:0x80427348; // type:label scope:local align:4 @4202 = .bss:0x80427348; // type:object size:0xC scope:local align:4 -WolfAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x80427354; // type:object size:0xC scope:global align:4 data:float +WolfAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x80427354; // type:object size:0xC scope:local align:4 data:float @4203 = .bss:0x80427360; // type:object size:0xC scope:local align:4 -MidnaAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x8042736C; // type:object size:0xC scope:global align:4 data:float +MidnaAdditionVec__25@unnamed@d_ev_camera_cpp@ = .bss:0x8042736C; // type:object size:0xC scope:local align:4 data:float @5852 = .bss:0x80427378; // type:object size:0xC scope:local align:4 DefaultGap$5851 = .bss:0x80427384; // type:object size:0xC scope:local align:4 data:float @6756 = .bss:0x80427390; // type:object size:0xC scope:local align:4 @@ -20877,7 +20909,9 @@ mTypeGroupListAll__7dTres_c = .bss:0x804273D8; // type:object size:0xCC scope:gl ...bss.0 = .bss:0x804274A8; // type:label scope:local align:4 @4409 = .bss:0x804274A8; // type:object size:0xC scope:local align:4 l_waitBaseAnime = .bss:0x804274B4; // type:object size:0xC scope:global align:4 data:float +...bss.0 = .bss:0x804274B4; // type:label scope:local @4410 = .bss:0x804274C0; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x804274C0; // type:label scope:local l_ironBallBaseAnime = .bss:0x804274CC; // type:object size:0xC scope:global align:4 data:float @4411 = .bss:0x804274D8; // type:object size:0xC scope:local align:4 l_halfAtnWaitBaseAnime = .bss:0x804274E4; // type:object size:0xC scope:global align:4 data:float @@ -20956,7 +20990,9 @@ a_eyeOfsTbl$4079 = .bss:0x8042A448; // type:object size:0x168 scope:local align: ...bss.0 = .bss:0x8042A5B0; // type:label scope:local align:4 @3982 = .bss:0x8042A5B0; // type:object size:0xC scope:local align:4 l_Cd2_HIO = .bss:0x8042A5BC; // type:object size:0x400C scope:global align:4 +...bss.0 = .bss:0x8042A5BC; // type:label scope:local @4290 = .bss:0x8042E5C8; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x8042E5C8; // type:label scope:local @4293 = .bss:0x8042E5D4; // type:object size:0xC scope:local align:4 @4294 = .bss:0x8042E5E0; // type:object size:0xC scope:local align:4 @4295 = .bss:0x8042E5EC; // type:object size:0xC scope:local align:4 @@ -20990,33 +21026,35 @@ a_eyeOfsTbl$4289 = .bss:0x8042E730; // type:object size:0x168 scope:local align: ...bss.0 = .bss:0x8042E898; // type:label scope:local align:4 specialType__22@unnamed@d_camera_cpp@ = .bss:0x8042E898; // type:object size:0xA8 scope:global align:4 data:4byte @9808 = .bss:0x8042E940; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x8042E940; // type:label scope:local @14159 = .bss:0x8042E94C; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x8042E94C; // type:label scope:local @14615 = .bss:0x8042E958; // type:object size:0xC scope:local align:4 @14964 = .bss:0x8042E964; // type:object size:0xC scope:local align:4 @14968 = .bss:0x8042E970; // type:object size:0xC scope:local align:4 @3812 = .bss:0x8042E980; // type:object size:0xC scope:local align:4 -g_fsHIO = .bss:0x8042E98C; // type:object size:0x40 scope:global align:4 +g_fsHIO = .bss:0x8042E98C; // type:object size:0x44 scope:local align:4 @3648 = .bss:0x8042E9D0; // type:object size:0xC scope:local align:4 @3882 = .bss:0x8042E9E0; // type:object size:0xC scope:local align:4 -l_HIO = .bss:0x8042E9EC; // type:object size:0x1C scope:global align:4 +l_HIO = .bss:0x8042E9EC; // type:object size:0x1C scope:local align:4 ...bss.0 = .bss:0x8042EA08; // type:label scope:local align:4 @4112 = .bss:0x8042EA08; // type:object size:0xC scope:local align:4 g_env_light = .bss:0x8042EA14; // type:object size:0x1310 scope:global align:4 @4113 = .bss:0x8042FD24; // type:object size:0xC scope:local align:4 g_mEnvSeMgr = .bss:0x8042FD30; // type:object size:0x30C scope:global align:4 -lightStatusData = .bss:0x8043003C; // type:object size:0x740 scope:global align:4 data:float +lightStatusData = .bss:0x8043003C; // type:object size:0x740 scope:local align:4 data:float @7485 = .bss:0x8043077C; // type:object size:0xC scope:local align:4 S_old_cameye$7484 = .bss:0x80430788; // type:object size:0xC scope:local align:4 @7489 = .bss:0x80430794; // type:object size:0xC scope:local align:4 S_old_camctr$7488 = .bss:0x804307A0; // type:object size:0xC scope:local align:4 @3816 = .bss:0x804307B0; // type:object size:0xC scope:local align:4 @3818 = .bss:0x804307BC; // type:object size:0xC scope:local align:4 -l_offsetPos$localstatic3$draw__10dThunder_cFv = .bss:0x804307C8; // type:object size:0xC scope:local align:4 data:float -l_scale$localstatic5$draw__10dThunder_cFv = .bss:0x804307D4; // type:object size:0xC scope:local align:4 data:float +l_offsetPos$localstatic3$draw__10dThunder_cFv = .bss:0x804307C8; // type:object size:0xC scope:weak align:4 data:float +l_scale$localstatic5$draw__10dThunder_cFv = .bss:0x804307D4; // type:object size:0xC scope:weak align:4 data:float @3989 = .bss:0x804307E0; // type:object size:0xC scope:local align:4 -g_fmHIO = .bss:0x804307EC; // type:object size:0x14 scope:global align:4 +g_fmHIO = .bss:0x804307EC; // type:object size:0x14 scope:local align:4 @3785 = .bss:0x80430800; // type:object size:0xC scope:local align:4 -g_msHIO = .bss:0x8043080C; // type:object size:0x10 scope:global align:4 +g_msHIO = .bss:0x8043080C; // type:object size:0x10 scope:local align:4 ...bss.0 = .bss:0x80430820; // type:label scope:local align:4 @3773 = .bss:0x80430820; // type:object size:0xC scope:local align:4 g_mwHIO = .bss:0x8043082C; // type:object size:0x130 scope:global align:4 @@ -21040,10 +21078,10 @@ g_MsgObject_HIO_c = .bss:0x8043224C; // type:object size:0x410 scope:global alig arcName$6106 = .bss:0x8043265C; // type:object size:0x16 scope:local align:4 @3640 = .bss:0x80432678; // type:object size:0xC scope:local align:4 @3735 = .bss:0x80432688; // type:object size:0xC scope:local align:4 -g_MsgScrnLight_HIO_c = .bss:0x80432694; // type:object size:0x50 scope:global align:4 +g_MsgScrnLight_HIO_c = .bss:0x80432694; // type:object size:0x50 scope:local align:4 @3660 = .bss:0x804326E8; // type:object size:0xC scope:local align:4 -g_nmHIO = .bss:0x804326F4; // type:object size:0x14 scope:global align:4 -static_mBounds = .bss:0x80432708; // type:object size:0x10 scope:global align:4 data:float +g_nmHIO = .bss:0x804326F4; // type:object size:0x14 scope:local align:4 +static_mBounds = .bss:0x80432708; // type:object size:0x10 scope:local align:4 data:float @3702 = .bss:0x80432718; // type:object size:0xC scope:local align:4 @3827 = .bss:0x80432728; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x80432738; // type:label scope:local align:4 @@ -21054,7 +21092,7 @@ g_envHIO = .bss:0x8043275C; // type:object size:0x44 scope:global align:4 data:4 @3659 = .bss:0x804327A0; // type:object size:0xC scope:local align:4 g_save_bit_HIO = .bss:0x804327AC; // type:object size:0x4A0 scope:global align:4 data:4byte @3644 = .bss:0x80432C50; // type:object size:0xC scope:local align:4 -wolfFootScale$localstatic3$create__9dkWmark_cFv = .bss:0x80432C5C; // type:object size:0xC scope:local align:4 data:float +wolfFootScale$localstatic3$create__9dkWmark_cFv = .bss:0x80432C5C; // type:object size:0xC scope:weak align:4 data:float @2414 = .bss:0x80432C68; // type:object size:0xC scope:local align:4 m_virtual_center__14cCcD_ShapeAttr = .bss:0x80432C74; // type:object size:0xC scope:global align:4 data:float @2492 = .bss:0x80432C80; // type:object size:0xC scope:local align:4 @@ -21078,7 +21116,7 @@ BaseYZ__4cXyz = .bss:0x80432D44; // type:object size:0xC scope:global align:4 @2457 = .bss:0x80432D50; // type:object size:0xC scope:local align:4 BaseXYZ__4cXyz = .bss:0x80432D5C; // type:object size:0xC scope:global align:4 @262 = .bss:0x80432D68; // type:object size:0xC scope:local align:4 -mtx = .bss:0x80432D78; // type:object size:0x1E0 scope:global align:4 +mtx = .bss:0x80432D78; // type:object size:0x1E0 scope:local align:4 ...bss.0 = .bss:0x80432F58; // type:label scope:local align:4 @2401 = .bss:0x80432F58; // type:object size:0xC scope:local align:4 @2402 = .bss:0x80432F64; // type:object size:0xC scope:local align:4 @@ -21087,34 +21125,34 @@ mtx = .bss:0x80432D78; // type:object size:0x1E0 scope:global align:4 @2405 = .bss:0x80432F88; // type:object size:0xC scope:local align:4 @2184 = .bss:0x80432F98; // type:object size:0xC scope:local align:4 sList__8JFWAlarm = .bss:0x80432FA4; // type:object size:0xC scope:global align:4 -clear_z_tobj = .bss:0x80432FB0; // type:object size:0x20 scope:global align:4 +clear_z_tobj = .bss:0x80432FB0; // type:object size:0x20 scope:local align:4 ...bss.0 = .bss:0x80432FD0; // type:label scope:local align:4 @744 = .bss:0x80432FD0; // type:object size:0xC scope:local align:4 -soovv_actor_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80432FDC; // type:object size:0x10 scope:global align:4 data:4byte +soovv_actor_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80432FDC; // type:object size:0x10 scope:local align:4 data:4byte @747 = .bss:0x80432FEC; // type:object size:0xC scope:local align:4 -soovv_actor_RELATION_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80432FF8; // type:object size:0x10 scope:global align:4 data:4byte +soovv_actor_RELATION_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80432FF8; // type:object size:0x10 scope:local align:4 data:4byte @750 = .bss:0x80433008; // type:object size:0xC scope:local align:4 -soovv_camera_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80433014; // type:object size:0x10 scope:global align:4 data:4byte +soovv_camera_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80433014; // type:object size:0x10 scope:local align:4 data:4byte @753 = .bss:0x80433024; // type:object size:0xC scope:local align:4 -soovv_camera_TARGET_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80433030; // type:object size:0x10 scope:global align:4 data:4byte +soovv_camera_TARGET_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80433030; // type:object size:0x10 scope:local align:4 data:4byte @756 = .bss:0x80433040; // type:object size:0xC scope:local align:4 -soovv_light_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8043304C; // type:object size:0x10 scope:global align:4 data:4byte +soovv_light_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8043304C; // type:object size:0x10 scope:local align:4 data:4byte @759 = .bss:0x8043305C; // type:object size:0xC scope:local align:4 -soovv_particle_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80433068; // type:object size:0x10 scope:global align:4 +soovv_particle_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80433068; // type:object size:0x10 scope:local align:4 @762 = .bss:0x80433078; // type:object size:0xC scope:local align:4 -soovv_particle_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80433084; // type:object size:0x10 scope:global align:4 +soovv_particle_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80433084; // type:object size:0x10 scope:local align:4 @765 = .bss:0x80433094; // type:object size:0xC scope:local align:4 -soovv_particle_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804330A0; // type:object size:0x10 scope:global align:4 +soovv_particle_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804330A0; // type:object size:0x10 scope:local align:4 @768 = .bss:0x804330B0; // type:object size:0xC scope:local align:4 -soovv_sound_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804330BC; // type:object size:0x10 scope:global align:4 +soovv_sound_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804330BC; // type:object size:0x10 scope:local align:4 @771 = .bss:0x804330CC; // type:object size:0xC scope:local align:4 -soovv_sound_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804330D8; // type:object size:0x10 scope:global align:4 +soovv_sound_REPEAT___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804330D8; // type:object size:0x10 scope:local align:4 @774 = .bss:0x804330E8; // type:object size:0xC scope:local align:4 -soovv_sound_CONTINUOUS___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804330F4; // type:object size:0x10 scope:global align:4 +soovv_sound_CONTINUOUS___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x804330F4; // type:object size:0x10 scope:local align:4 @777 = .bss:0x80433104; // type:object size:0xC scope:local align:4 -soovv_sound_LOCATED___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80433110; // type:object size:0x10 scope:global align:4 +soovv_sound_LOCATED___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x80433110; // type:object size:0x10 scope:local align:4 @780 = .bss:0x80433120; // type:object size:0xC scope:local align:4 -soovv_sound_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8043312C; // type:object size:0x10 scope:global align:4 +soovv_sound_ON_EXIT_NOT_END___Q27JStudio28@unnamed@jstudio_object_cpp@ = .bss:0x8043312C; // type:object size:0x10 scope:local align:4 @819 = .bss:0x8043313C; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x80433148; // type:label scope:local align:4 @1087 = .bss:0x80433148; // type:object size:0xC scope:local align:4 @@ -21157,7 +21195,7 @@ aoData$1265 = .bss:0x80433500; // type:object size:0x90 scope:local align:4 data @313 = .bss:0x80433590; // type:object size:0xC scope:local align:4 audioAramHeap__9JASKernel = .bss:0x8043359C; // type:object size:0x44 scope:global align:4 sProbeTable__8JASProbe = .bss:0x804335E0; // type:object size:0x40 scope:global align:4 -sMutex = .bss:0x80433620; // type:object size:0x18 scope:global align:4 +sMutex = .bss:0x80433620; // type:object size:0x18 scope:local align:4 ...bss.0 = .bss:0x80433638; // type:label scope:local align:4 @80 = .bss:0x80433638; // type:object size:0xC scope:local align:4 sCommandListOnce__10JASPortCmd = .bss:0x80433644; // type:object size:0xC scope:global align:4 @@ -21166,7 +21204,9 @@ sCommandListStay__10JASPortCmd = .bss:0x8043365C; // type:object size:0xC scope: ...bss.0 = .bss:0x80433668; // type:label scope:local align:4 @431 = .bss:0x80433668; // type:object size:0xC scope:local align:4 sDefaultBankTable__8JASTrack = .bss:0x80433674; // type:object size:0x40C scope:global align:4 data:4byte +...bss.0 = .bss:0x80433674; // type:label scope:local @433 = .bss:0x80433A80; // type:object size:0xC scope:local align:4 +...bss.0 = .bss:0x80433A80; // type:label scope:local sTrackList__8JASTrack = .bss:0x80433A8C; // type:object size:0x10 scope:global align:4 data:4byte @470 = .bss:0x80433A9C; // type:object size:0xC scope:local align:4 @476 = .bss:0x80433AA8; // type:object size:0xC scope:local align:4 @@ -21190,10 +21230,10 @@ sDmaDacBuffer__9JASDriver = .bss:0x80433C18; // type:object size:0xC scope:globa sDspSyncCallback__9JASDriver = .bss:0x80433C38; // type:object size:0x100 scope:global align:4 sSubFrameCallback__9JASDriver = .bss:0x80433D38; // type:object size:0x100 scope:global align:4 sUpdateDacCallback__9JASDriver = .bss:0x80433E38; // type:object size:0x100 scope:global align:4 -audio_task = .bss:0x80433F40; // type:object size:0x50 scope:global align:4 -AUDIO_YIELD_BUFFER = .bss:0x80433FA0; // type:object size:0x2000 scope:global align:4 -taskwork = .bss:0x80435FA0; // type:object size:0x80 scope:global align:4 -sync_stack = .bss:0x80436020; // type:object size:0x14 scope:global align:4 data:4byte +audio_task = .bss:0x80433F40; // type:object size:0x50 scope:local align:4 +AUDIO_YIELD_BUFFER = .bss:0x80433FA0; // type:object size:0x2000 scope:local align:4 +taskwork = .bss:0x80435FA0; // type:object size:0x80 scope:local align:4 +sync_stack = .bss:0x80436020; // type:object size:0x14 scope:local align:4 data:4byte @744 = .bss:0x80436038; // type:object size:0xC scope:local align:4 memPool_$localstatic3$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .bss:0x80436044; // type:object size:0x10 scope:weak align:4 @716 = .bss:0x80436058; // type:object size:0xC scope:local align:4 @@ -21216,9 +21256,9 @@ memPool_$localstatic3$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = @1539 = .bss:0x80436198; // type:object size:0xC scope:local align:4 memPool_$localstatic3$getMemPool___30JASPoolAllocObject<9Z2Audible>Fv = .bss:0x804361A4; // type:object size:0x10 scope:weak align:4 ...bss.0 = .bss:0x804361B8; // type:label scope:local align:4 -sCorrectPhrase = .bss:0x804361B8; // type:object size:0x24 scope:global align:4 data:4byte -sWindStoneSound = .bss:0x804361DC; // type:object size:0x24 scope:global align:4 data:4byte -sCorrectDuo = .bss:0x80436200; // type:object size:0x24 scope:global align:4 data:4byte +sCorrectPhrase = .bss:0x804361B8; // type:object size:0x24 scope:local align:4 data:4byte +sWindStoneSound = .bss:0x804361DC; // type:object size:0x24 scope:local align:4 data:4byte +sCorrectDuo = .bss:0x80436200; // type:object size:0x24 scope:local align:4 data:4byte @3779 = .bss:0x80436228; // type:object size:0xC scope:local align:4 @3783 = .bss:0x80436234; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x80436240; // type:label scope:local align:4 @@ -21254,12 +21294,12 @@ mPadMStick__10JUTGamePad = .bss:0x804364A0; // type:object size:0x40 scope:globa mPadSStick__10JUTGamePad = .bss:0x804364E0; // type:object size:0x40 scope:global align:4 @1373 = .bss:0x80436520; // type:object size:0xC scope:local align:4 sPatternList__19JUTGamePadLongPress = .bss:0x8043652C; // type:object size:0xC scope:global align:4 data:4byte -exCallbackObject = .bss:0x80436538; // type:object size:0x14 scope:global align:4 data:4byte +exCallbackObject = .bss:0x80436538; // type:object size:0x14 scope:local align:4 data:4byte @2182 = .bss:0x8043654C; // type:object size:0xC scope:local align:4 sMapFileList__12JUTException = .bss:0x80436558; // type:object size:0xC scope:global align:4 data:4byte context$2230 = .bss:0x80436568; // type:object size:0x2C8 scope:local align:4 -sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x80436830; // type:object size:0x40 scope:global align:4 -sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x80436870; // type:object size:0x100 scope:global align:4 +sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x80436830; // type:object size:0x40 scope:local align:4 +sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .bss:0x80436870; // type:object size:0x100 scope:local align:4 static_mBounds__7J2DPane = .bss:0x80436970; // type:object size:0x10 scope:global align:4 data:float p_name$494 = .bss:0x80436980; // type:object size:0x101 scope:local align:4 data:byte j3dSys = .bss:0x80436A88; // type:object size:0x11C scope:global align:4 @@ -21269,7 +21309,7 @@ mParentS__6J3DSys = .bss:0x80436BE0; // type:object size:0xC scope:global align: sTexCoordScaleTable__6J3DSys = .bss:0x80436BEC; // type:object size:0x40 scope:global align:4 data:2byte sGDLObj__17J3DDisplayListObj = .bss:0x80436C30; // type:object size:0x10 scope:global align:4 data:4byte sMtxLoadCache__11J3DShapeMtx = .bss:0x80436C40; // type:object size:0x14 scope:global align:4 data:2byte -j3dTexCoordTable = .bss:0x80436C58; // type:object size:0x1DC7 scope:global align:4 +j3dTexCoordTable = .bss:0x80436C58; // type:object size:0x1DC7 scope:local align:4 j3dTevSwapTableTable = .bss:0x80438A20; // type:object size:0x400 scope:global align:4 data:byte j3dAlphaCmpTable = .bss:0x80438E20; // type:object size:0x300 scope:global align:4 j3dZModeTable = .bss:0x80439120; // type:object size:0x60 scope:global align:4 @@ -21282,99 +21322,99 @@ sincosTable___5JMath = .bss:0x8043B9E0; // type:object size:0x10000 scope:global atanTable___5JMath = .bss:0x8044B9E0; // type:object size:0x1020 scope:global align:4 data:float asinAcosTable___5JMath = .bss:0x8044CA00; // type:object size:0x1020 scope:global align:4 data:float ...bss.0 = .bss:0x8044DA20; // type:label scope:local align:4 -DriveInfo = .bss:0x8044DA20; // type:object size:0x20 scope:global align:4 -DriveBlock = .bss:0x8044DA40; // type:object size:0x30 scope:global align:4 +DriveInfo = .bss:0x8044DA20; // type:object size:0x20 scope:local align:4 +DriveBlock = .bss:0x8044DA40; // type:object size:0x30 scope:local align:4 __OSRebootParams = .bss:0x8044DA70; // type:object size:0x1C scope:global align:4 data:4byte ...bss.0 = .bss:0x8044DA90; // type:label scope:local align:4 __OSErrorTable = .bss:0x8044DA90; // type:object size:0x44 scope:global align:4 data:4byte ...bss.0 = .bss:0x8044DAE0; // type:label scope:local align:4 -Scb = .bss:0x8044DAE0; // type:object size:0x54 scope:global align:4 data:4byte +Scb = .bss:0x8044DAE0; // type:object size:0x54 scope:local align:4 data:4byte ...bss.0 = .bss:0x8044DB38; // type:label scope:local align:4 -RunQueue = .bss:0x8044DB38; // type:object size:0x100 scope:global align:4 data:4byte -IdleThread = .bss:0x8044DC38; // type:object size:0x318 scope:global align:4 -DefaultThread = .bss:0x8044DF50; // type:object size:0x318 scope:global align:4 -IdleContext = .bss:0x8044E268; // type:object size:0x2C8 scope:global align:4 -Ecb = .bss:0x8044E530; // type:object size:0xC0 scope:global align:4 data:4byte +RunQueue = .bss:0x8044DB38; // type:object size:0x100 scope:local align:4 data:4byte +IdleThread = .bss:0x8044DC38; // type:object size:0x318 scope:local align:4 +DefaultThread = .bss:0x8044DF50; // type:object size:0x318 scope:local align:4 +IdleContext = .bss:0x8044E268; // type:object size:0x2C8 scope:local align:4 +Ecb = .bss:0x8044E530; // type:object size:0xC0 scope:local align:4 data:4byte ...bss.0 = .bss:0x8044E5F0; // type:label scope:local align:4 -Packet = .bss:0x8044E5F0; // type:object size:0x80 scope:global align:4 data:4byte +Packet = .bss:0x8044E5F0; // type:object size:0x80 scope:local align:4 data:4byte Alarm = .bss:0x8044E670; // type:object size:0xA0 scope:local align:4 -TypeTime = .bss:0x8044E710; // type:object size:0x20 scope:global align:4 -XferTime = .bss:0x8044E730; // type:object size:0x20 scope:global align:4 -TypeCallback = .bss:0x8044E750; // type:object size:0x40 scope:global align:4 -RDSTHandler = .bss:0x8044E790; // type:object size:0x10 scope:global align:4 data:4byte -InputBufferValid = .bss:0x8044E7A0; // type:object size:0x10 scope:global align:4 -InputBuffer = .bss:0x8044E7B0; // type:object size:0x20 scope:global align:4 -InputBufferVcount = .bss:0x8044E7D0; // type:object size:0x10 scope:global align:4 +TypeTime = .bss:0x8044E710; // type:object size:0x20 scope:local align:4 +XferTime = .bss:0x8044E730; // type:object size:0x20 scope:local align:4 +TypeCallback = .bss:0x8044E750; // type:object size:0x40 scope:local align:4 +RDSTHandler = .bss:0x8044E790; // type:object size:0x10 scope:local align:4 data:4byte +InputBufferValid = .bss:0x8044E7A0; // type:object size:0x10 scope:local align:4 +InputBuffer = .bss:0x8044E7B0; // type:object size:0x20 scope:local align:4 +InputBufferVcount = .bss:0x8044E7D0; // type:object size:0x10 scope:local align:4 cmdFixDevice$327 = .bss:0x8044E7E0; // type:object size:0x10 scope:local align:4 ...bss.0 = .bss:0x8044E7F0; // type:label scope:local align:4 -CommandList = .bss:0x8044E7F0; // type:object size:0x3C scope:global align:4 data:4byte -AlarmForWA = .bss:0x8044E830; // type:object size:0x28 scope:global align:4 -AlarmForTimeout = .bss:0x8044E858; // type:object size:0x28 scope:global align:4 -AlarmForBreak = .bss:0x8044E880; // type:object size:0x28 scope:global align:4 -Prev = .bss:0x8044E8A8; // type:object size:0xC scope:global align:4 -Curr = .bss:0x8044E8B4; // type:object size:0xC scope:global align:4 +CommandList = .bss:0x8044E7F0; // type:object size:0x3C scope:local align:4 data:4byte +AlarmForWA = .bss:0x8044E830; // type:object size:0x28 scope:local align:4 +AlarmForTimeout = .bss:0x8044E858; // type:object size:0x28 scope:local align:4 +AlarmForBreak = .bss:0x8044E880; // type:object size:0x28 scope:local align:4 +Prev = .bss:0x8044E8A8; // type:object size:0xC scope:local align:4 +Curr = .bss:0x8044E8B4; // type:object size:0xC scope:local align:4 ...bss.0 = .bss:0x8044E8C0; // type:label scope:local align:4 -BB2 = .bss:0x8044E8C0; // type:object size:0x20 scope:global align:4 -CurrDiskID = .bss:0x8044E8E0; // type:object size:0x20 scope:global align:4 -DummyCommandBlock = .bss:0x8044E900; // type:object size:0x30 scope:global align:4 -ResetAlarm = .bss:0x8044E930; // type:object size:0x28 scope:global align:4 +BB2 = .bss:0x8044E8C0; // type:object size:0x20 scope:local align:4 +CurrDiskID = .bss:0x8044E8E0; // type:object size:0x20 scope:local align:4 +DummyCommandBlock = .bss:0x8044E900; // type:object size:0x30 scope:local align:4 +ResetAlarm = .bss:0x8044E930; // type:object size:0x28 scope:local align:4 ...bss.0 = .bss:0x8044E958; // type:label scope:local align:4 -WaitingQueue = .bss:0x8044E958; // type:object size:0x20 scope:global align:4 data:4byte -bb2Buf = .bss:0x8044E978; // type:object size:0x3F scope:global align:4 +WaitingQueue = .bss:0x8044E958; // type:object size:0x20 scope:local align:4 data:4byte +bb2Buf = .bss:0x8044E978; // type:object size:0x3F scope:local align:4 block$18 = .bss:0x8044E9B8; // type:object size:0x30 scope:local align:4 ...bss.0 = .bss:0x8044E9E8; // type:label scope:local align:4 -regs = .bss:0x8044E9E8; // type:object size:0x76 scope:global align:4 data:2byte -shdwRegs = .bss:0x8044EA60; // type:object size:0x76 scope:global align:4 -HorVer = .bss:0x8044EAD8; // type:object size:0x58 scope:global align:4 data:2byte +regs = .bss:0x8044E9E8; // type:object size:0x76 scope:local align:4 data:2byte +shdwRegs = .bss:0x8044EA60; // type:object size:0x76 scope:local align:4 +HorVer = .bss:0x8044EAD8; // type:object size:0x58 scope:local align:4 data:2byte ...bss.0 = .bss:0x8044EB30; // type:label scope:local align:4 Type = .bss:0x8044EB30; // type:object size:0x10 scope:local align:4 -Origin = .bss:0x8044EB40; // type:object size:0x30 scope:global align:4 -CmdProbeDevice = .bss:0x8044EB70; // type:object size:0x10 scope:global align:4 +Origin = .bss:0x8044EB40; // type:object size:0x30 scope:local align:4 +CmdProbeDevice = .bss:0x8044EB70; // type:object size:0x10 scope:local align:4 ...bss.0 = .bss:0x8044EB80; // type:label scope:local align:4 __CARDBlock = .bss:0x8044EB80; // type:object size:0x220 scope:global align:4 data:4byte __CARDDiskNone = .bss:0x8044EDA0; // type:object size:0x20 scope:global align:4 ...bss.0 = .bss:0x8044EDC0; // type:label scope:local align:4 -FifoObj = .bss:0x8044EDC0; // type:object size:0x80 scope:global align:4 -gxData = .bss:0x8044EE40; // type:object size:0x5B0 scope:global align:4 -fragmentinfo = .bss:0x8044F3F0; // type:object size:0xC scope:global align:4 data:4byte -__atexit_funcs = .bss:0x8044F400; // type:object size:0x100 scope:global align:4 +FifoObj = .bss:0x8044EDC0; // type:object size:0x80 scope:local align:4 +gxData = .bss:0x8044EE40; // type:object size:0x5B0 scope:local align:4 +fragmentinfo = .bss:0x8044F3F0; // type:object size:0xC scope:local align:4 data:4byte +__atexit_funcs = .bss:0x8044F400; // type:object size:0x100 scope:local align:4 protopool$192 = .bss:0x8044F500; // type:object size:0x38 scope:local align:4 -stderr_buff = .bss:0x8044F538; // type:object size:0x100 scope:global align:4 -stdout_buff = .bss:0x8044F638; // type:object size:0x100 scope:global align:4 -stdin_buff = .bss:0x8044F738; // type:object size:0x100 scope:global align:4 +stderr_buff = .bss:0x8044F538; // type:object size:0x100 scope:local align:4 +stdout_buff = .bss:0x8044F638; // type:object size:0x100 scope:local align:4 +stdin_buff = .bss:0x8044F738; // type:object size:0x100 scope:local align:4 signal_funcs = .bss:0x8044F838; // type:object size:0x18 scope:global align:4 gTRKEventQueue = .bss:0x8044F850; // type:object size:0x28 scope:global align:4 gTRKBigEndian = .bss:0x8044F878; // type:object size:0x4 scope:global align:4 data:4byte gTRKMsgBufs = .bss:0x8044F880; // type:object size:0x19B0 scope:global align:4 -gTRKFramingState = .bss:0x80451230; // type:object size:0x14 scope:global align:4 data:4byte -IsTRKConnected = .bss:0x80451248; // type:object size:0x4 scope:global align:4 data:4byte -TRK_saved_exceptionID = .bss:0x80451250; // type:object size:0x2 scope:global align:4 data:2byte +gTRKFramingState = .bss:0x80451230; // type:object size:0x14 scope:local align:4 data:4byte +IsTRKConnected = .bss:0x80451248; // type:object size:0x4 scope:local align:4 data:4byte +TRK_saved_exceptionID = .bss:0x80451250; // type:object size:0x2 scope:local align:4 data:2byte gTRKState = .bss:0x80451254; // type:object size:0xA4 scope:global align:4 data:4byte gTRKCPUState = .bss:0x804512F8; // type:object size:0x430 scope:global align:4 gTRKSaveState = .bss:0x80451728; // type:object size:0x94 scope:global align:4 data:4byte TRKvalue128_temp = .bss:0x804517BC; // type:object size:0x10 scope:global align:4 -lc_base = .bss:0x804517D0; // type:object size:0x4 scope:global align:4 data:4byte -TRK_mainError = .bss:0x804517D8; // type:object size:0x4 scope:global align:4 data:4byte +lc_base = .bss:0x804517D0; // type:object size:0x4 scope:local align:4 data:4byte +TRK_mainError = .bss:0x804517D8; // type:object size:0x4 scope:local align:4 data:4byte TRK_Use_BBA = .bss:0x804517E0; // type:object size:0x1 scope:global data:byte _MetroTRK_Has_Framing = .bss:0x804517E4; // type:object size:0x4 scope:global align:4 -useSerialIO = .bss:0x804517E8; // type:object size:0x1 data:byte +useSerialIO = .bss:0x804517E8; // type:object size:0x1 scope:local data:byte gRecvBuf = .bss:0x804517F0; // type:object size:0x800 scope:local align:4 gRecvCB = .bss:0x80451FF0; // type:object size:0x1C scope:local align:4 gRecvBuf = .bss:0x80452010; // type:object size:0x500 scope:local align:4 gRecvCB = .bss:0x80452510; // type:object size:0x1C scope:local align:4 developmentMode__7mDoMain = .sdata:0x80452540; // type:object size:0x1 data:byte memMargin__7mDoMain = .sdata:0x80452544; // type:object size:0x4 scope:global align:4 data:4byte -mHeapBriefType__7mDoMain = .sdata:0x80452548; // type:object size:0x1 data:byte +mHeapBriefType = .sdata:0x80452548; // type:object size:0x1 data:byte mBackColor__13mDoGph_gInf_c = .sdata:0x80452550; // type:object size:0x4 scope:global align:4 data:byte mFadeColor__13mDoGph_gInf_c = .sdata:0x80452554; // type:object size:0x4 scope:global align:4 data:4byte l_tevColor0$4208 = .sdata:0x80452558; // type:object size:0x8 scope:local align:4 data:4byte mRenderModeObj__15mDoMch_render_c = .sdata:0x80452560; // type:object size:0x4 scope:global align:4 data:4byte next__14mDoMtx_stack_c = .sdata:0x80452568; // type:object size:0x4 scope:global align:4 data:4byte end__14mDoMtx_stack_c = .sdata:0x8045256C; // type:object size:0x4 scope:global align:4 data:4byte -l_fopOvlpM_overlap = .sdata:0x80452570; // type:object size:0x4 scope:global align:4 data:4byte -l_scnRqID = .sdata:0x80452578; // type:object size:0x4 scope:global align:4 data:4byte +l_fopOvlpM_overlap = .sdata:0x80452570; // type:object size:0x4 scope:local align:4 data:4byte +l_scnRqID = .sdata:0x80452578; // type:object size:0x4 scope:local align:4 data:4byte m_name$3788 = .sdata:0x80452580; // type:object size:0x4 scope:local align:4 -i_msgID = .sdata:0x80452588; // type:object size:0x4 scope:global align:4 data:4byte +i_msgID = .sdata:0x80452588; // type:object size:0x4 scope:local align:4 data:4byte g_fopDwTg_Queue = .sdata:0x80452590; // type:object size:0x8 scope:global align:4 data:4byte g_fpcLn_Queue = .sdata:0x80452598; // type:object size:0x8 scope:global align:4 g_fpcNd_IsCheckOfDeleteTiming = .sdata:0x804525A0; // type:object size:0x4 scope:global align:4 data:4byte @@ -21391,11 +21431,11 @@ m_branchId__7dDemo_c = .sdata:0x804525E0; // type:object size:0x2 scope:global a l_texCoordInfo$3772 = .sdata:0x804525E8; // type:object size:0x4 scope:local align:4 data:4byte l_tevOrderInfo$3773 = .sdata:0x804525EC; // type:object size:0x4 scope:local align:4 data:4byte mNextRoomNo__10dMapInfo_c = .sdata:0x804525F0; // type:object size:0x4 scope:global align:4 data:4byte -lbl_804525F4 = .sdata:0x804525F4; // type:object size:0x1 data:byte -lbl_804525F5 = .sdata:0x804525F5; // type:object size:0x1 data:byte -lbl_804525F6 = .sdata:0x804525F6; // type:object size:0x1 data:byte +mBottomFloorNo__8dMpath_c = .sdata:0x804525F4; // type:object size:0x1 data:byte +mTopFloorNo__8dMpath_c = .sdata:0x804525F5; // type:object size:0x1 data:byte +data_80450636 = .sdata:0x804525F6; // type:object size:0x1 scope:local data:byte l_cursorColor$4709 = .sdata:0x804525F8; // type:object size:0x4 scope:local align:4 data:4byte -numTelopData = .sdata:0x80452600; // type:object size:0x4 scope:global align:4 data:4byte +numTelopData = .sdata:0x80452600; // type:object size:0x4 scope:local align:4 data:4byte l_color$4033 = .sdata:0x80452608; // type:object size:0x4 scope:local align:4 data:4byte l_color$5004 = .sdata:0x8045260C; // type:object size:0x4 scope:local align:4 data:4byte l_color$5326 = .sdata:0x80452610; // type:object size:0x4 scope:local align:4 data:4byte @@ -21406,10 +21446,10 @@ loc_type_num__12dAttention_c = .sdata:0x80452620; // type:object size:0x4 scope: act_type_num__12dAttention_c = .sdata:0x80452624; // type:object size:0x4 scope:global align:4 data:4byte chk_type_tbl__12dAttention_c = .sdata:0x80452628; // type:object size:0x4 scope:global align:4 data:2byte chk_type_num__12dAttention_c = .sdata:0x8045262C; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80452630 = .sdata:0x80452630; // type:object size:0x1 data:byte +attn_opt_hold = .sdata:0x80452630; // type:object size:0x1 scope:local data:byte ang_table$4418 = .sdata:0x80452634; // type:object size:0x6 scope:local align:4 -data_80450680 = .sdata:0x80452640; // type:object size:0x1 data:byte -data_80450688 = .sdata:0x80452648; // type:object size:0x1 data:byte +data_80450680 = .sdata:0x80452640; // type:object size:0x1 scope:local data:byte +l_captureAlpha = .sdata:0x80452648; // type:object size:0x1 scope:local data:byte l_autoUpHeight = .sdata:0x80452650; // type:object size:0x4 scope:global align:4 data:float l_autoDownHeight = .sdata:0x80452654; // type:object size:0x4 scope:global align:4 data:float l_ladderAnmBaseTransY = .sdata:0x80452658; // type:object size:0x4 scope:global align:4 data:float @@ -21418,34 +21458,34 @@ nColor0$42525 = .sdata:0x80452664; // type:object size:0x4 scope:local align:4 d m_timer_max__8daItem_c = .sdata:0x80452668; // type:object size:0x4 scope:global align:4 data:4byte YnSelStartFrameTbl = .sdata:0x80452670; // type:object size:0x8 scope:local align:4 YnSelEndFrameTbl = .sdata:0x80452678; // type:object size:0x8 scope:local align:4 -msgTbl = .sdata:0x80452680; // type:object size:0x6 scope:global align:4 +msgTbl = .sdata:0x80452680; // type:object size:0x6 scope:local align:4 l_msgNum2$7007 = .sdata:0x80452688; // type:object size:0x2 scope:local align:4 l_msgNum$7087 = .sdata:0x8045268C; // type:object size:0x3 scope:local align:4 data:string fontsize$7235 = .sdata:0x80452690; // type:object size:0x8 scope:local align:4 linespace$7236 = .sdata:0x80452698; // type:object size:0x8 scope:local align:4 charspace$7237 = .sdata:0x804526A0; // type:object size:0x8 scope:local align:4 -dShopSystem_itemNo = .sdata:0x804526A8; // type:object size:0x7 scope:global align:4 data:byte -dShopSystem_cameraActor = .sdata:0x804526B0; // type:object size:0x8 scope:global align:4 data:4byte -shop_item_pos_data_tbl = .sdata:0x804526B8; // type:object size:0x4 scope:global align:4 data:4byte -lightMask = .sdata:0x804526C0; // type:object size:0x2 scope:global align:4 data:2byte -lightStatusPt = .sdata:0x804526C4; // type:object size:0x4 scope:global align:4 data:4byte -l_zmodeUpEnable = .sdata:0x804526C8; // type:object size:0x4 scope:global align:4 data:byte -l_zmodeUpDisable = .sdata:0x804526CC; // type:object size:0x4 scope:global align:4 data:byte -l_alphaCompInfoOPA = .sdata:0x804526D0; // type:object size:0x8 scope:global align:4 data:byte -l_alphaCompInfo = .sdata:0x804526D8; // type:object size:0x8 scope:global align:4 data:byte +dShopSystem_itemNo = .sdata:0x804526A8; // type:object size:0x7 scope:local align:4 data:byte +dShopSystem_cameraActor = .sdata:0x804526B0; // type:object size:0x8 scope:local align:4 data:4byte +shop_item_pos_data_tbl = .sdata:0x804526B8; // type:object size:0x4 scope:local align:4 data:4byte +lightMask = .sdata:0x804526C0; // type:object size:0x2 scope:local align:4 data:2byte +lightStatusPt = .sdata:0x804526C4; // type:object size:0x4 scope:local align:4 data:4byte +l_zmodeUpEnable = .sdata:0x804526C8; // type:object size:0x4 scope:local align:4 data:byte +l_zmodeUpDisable = .sdata:0x804526CC; // type:object size:0x4 scope:local align:4 data:byte +l_alphaCompInfoOPA = .sdata:0x804526D0; // type:object size:0x8 scope:local align:4 data:byte +l_alphaCompInfo = .sdata:0x804526D8; // type:object size:0x8 scope:local align:4 data:byte mViewOffsetY__17dMenu_Collect3D_c = .sdata:0x804526E0; // type:object size:0x4 scope:global align:4 data:float black$4166 = .sdata:0x804526E8; // type:object size:0x4 scope:local align:4 data:byte -OptYnSelStartFrameTbl = .sdata:0x804526F0; // type:object size:0x8 scope:global align:4 -OptYnSelEndFrameTbl = .sdata:0x804526F8; // type:object size:0x8 scope:global align:4 +OptYnSelStartFrameTbl = .sdata:0x804526F0; // type:object size:0x8 scope:local align:4 +OptYnSelEndFrameTbl = .sdata:0x804526F8; // type:object size:0x8 scope:local align:4 l_msgNum0$3868 = .sdata:0x80452700; // type:object size:0x2 scope:local align:4 l_msgNum$3881 = .sdata:0x80452704; // type:object size:0x2 scope:local align:4 data:string m_cloth_item$3797 = .sdata:0x80452708; // type:object size:0x3 scope:local align:4 data:byte m_sword_item$3798 = .sdata:0x8045270C; // type:object size:0x4 scope:local align:4 data:byte m_shield_item$3799 = .sdata:0x80452710; // type:object size:0x3 scope:local align:4 data:byte l_method$3856 = .sdata:0x80452718; // type:object size:0x8 scope:local align:4 -T_JOINT_resName = .sdata:0x80452720; // type:object size:0x4 scope:global align:4 -lbl_80452724 = .sdata:0x80452724; // type:object size:0x1 data:byte -lbl_80452725 = .sdata:0x80452725; // type:object size:0x1 data:byte +T_JOINT_resName = .sdata:0x80452720; // type:object size:0x4 scope:local align:4 +preLoadNo = .sdata:0x80452724; // type:object size:0x1 scope:local data:byte +doPreLoad = .sdata:0x80452725; // type:object size:0x1 scope:local data:byte calc_mtx = .sdata:0x80452728; // type:object size:0x4 scope:global align:4 data:4byte maxStdHeaps__Q29JFWSystem11CSetUpParam = .sdata:0x80452730; // type:object size:0x4 scope:global align:4 data:4byte sysHeapSize__Q29JFWSystem11CSetUpParam = .sdata:0x80452734; // type:object size:0x4 scope:global align:4 data:4byte @@ -21458,15 +21498,15 @@ aPiecePriority__Q29JFWSystem11CSetUpParam = .sdata:0x8045274C; // type:object si systemFontRes__Q29JFWSystem11CSetUpParam = .sdata:0x80452750; // type:object size:0x4 scope:global align:4 data:4byte renderMode__Q29JFWSystem11CSetUpParam = .sdata:0x80452754; // type:object size:0x4 scope:global align:4 data:4byte exConsoleBufferSize__Q29JFWSystem11CSetUpParam = .sdata:0x80452758; // type:object size:0x4 scope:global align:4 data:4byte -p_dl = .sdata:0x80452760; // type:object size:0x8 scope:global align:4 -data_804507A8 = .sdata:0x80452768; // type:object size:0x1 data:byte +p_dl = .sdata:0x80452760; // type:object size:0x8 scope:local align:4 +data_804507A8 = .sdata:0x80452768; // type:object size:0x1 scope:local data:byte sMixMode__9JASDriver = .sdata:0x8045276C; // type:object size:0x4 scope:global align:4 data:4byte sDacRate__9JASDriver = .sdata:0x80452770; // type:object size:0x4 scope:global align:4 data:float sSubFrames__9JASDriver = .sdata:0x80452774; // type:object size:0x4 scope:global align:4 data:4byte one__11JASWaveInfo = .sdata:0x80452778; // type:object size:0x4 scope:global align:4 MAX_MIXERLEVEL__9JASDriver = .sdata:0x80452780; // type:object size:0x2 scope:global align:4 data:2byte JAS_SYSTEM_OUTPUT_MODE__9JASDriver = .sdata:0x80452784; // type:object size:0x4 scope:global align:4 data:4byte -DSP_MIXERLEVEL = .sdata:0x80452788; // type:object size:0x2 scope:global align:4 data:2byte +DSP_MIXERLEVEL = .sdata:0x80452788; // type:object size:0x2 scope:local align:4 data:2byte @2588 = .sdata:0x80452790; // type:object size:0x4 scope:local align:4 data:4byte DISTANCE_MAX__7Z2Param = .sdata:0x80452798; // type:object size:0x4 scope:global align:4 data:float MAX_VOLUME_DISTANCE__7Z2Param = .sdata:0x8045279C; // type:object size:0x4 scope:global align:4 data:float @@ -21515,26 +21555,26 @@ ENDING_BLOW_VOL_LOWER_TIME__7Z2Param = .sdata:0x80452829; // type:object size:0x ENDING_BLOW_VOL_LOWER_RECOVER_TIME__7Z2Param = .sdata:0x8045282A; // type:object size:0x1 data:byte ENDING_BLOW_MIN_FINISH_TIME__7Z2Param = .sdata:0x8045282B; // type:object size:0x1 data:byte data_8045086C = .sdata:0x8045282C; // type:object size:0x1 data:byte -sDeathMtBottom = .sdata:0x80452830; // type:object size:0x4 scope:global align:4 data:float -sDeathMtTop = .sdata:0x80452834; // type:object size:0x4 scope:global align:4 data:float -sUnderWaterDepthMax = .sdata:0x80452838; // type:object size:0x4 scope:global align:4 data:float -cPitchDown = .sdata:0x80452840; // type:object size:0x4 scope:global align:4 data:float -cPitchCenter = .sdata:0x80452844; // type:object size:0x4 scope:global align:4 data:float -cPitchUp = .sdata:0x80452848; // type:object size:0x4 scope:global align:4 data:float -lbl_8045284C = .sdata:0x8045284C; // type:object size:0x1 data:byte -lbl_8045284D = .sdata:0x8045284D; // type:object size:0x1 data:byte -lbl_8045284E = .sdata:0x8045284E; // type:object size:0x1 data:byte -cR_FlatWidth = .sdata:0x80452850; // type:object size:0x4 scope:global align:4 data:float -lbl_80452854 = .sdata:0x80452854; // type:object size:0x1 data:byte -lbl_80452855 = .sdata:0x80452855; // type:object size:0x1 data:byte -sStickHigh = .sdata:0x80452858; // type:object size:0x4 scope:global align:4 data:float -sStickCenter = .sdata:0x8045285C; // type:object size:0x4 scope:global align:4 data:float -sHowlTobikusa = .sdata:0x80452860; // type:object size:0x8 scope:global align:4 +sDeathMtBottom = .sdata:0x80452830; // type:object size:0x4 scope:local align:4 data:float +sDeathMtTop = .sdata:0x80452834; // type:object size:0x4 scope:local align:4 data:float +sUnderWaterDepthMax = .sdata:0x80452838; // type:object size:0x4 scope:local align:4 data:float +cPitchDown = .sdata:0x80452840; // type:object size:0x4 scope:local align:4 data:float +cPitchCenter = .sdata:0x80452844; // type:object size:0x4 scope:local align:4 data:float +cPitchUp = .sdata:0x80452848; // type:object size:0x4 scope:local align:4 data:float +struct_8045088C = .sdata:0x8045284C; // type:object size:0x1 scope:local data:byte +struct_8045088D = .sdata:0x8045284D; // type:object size:0x1 scope:local data:byte +cBeginHowlTime = .sdata:0x8045284E; // type:object size:0x1 scope:local data:byte +cR_FlatWidth = .sdata:0x80452850; // type:object size:0x4 scope:local align:4 data:float +struct_80450894 = .sdata:0x80452854; // type:object size:0x1 scope:local data:byte +struct_80450895 = .sdata:0x80452855; // type:object size:0x1 scope:local data:byte +sStickHigh = .sdata:0x80452858; // type:object size:0x4 scope:local align:4 data:float +sStickCenter = .sdata:0x8045285C; // type:object size:0x4 scope:local align:4 data:float +sHowlTobikusa = .sdata:0x80452860; // type:object size:0x8 scope:local align:4 cm2hw$539 = .sdata:0x80452868; // type:object size:0x4 scope:local align:4 data_804508B0 = .sdata:0x80452870; // type:object size:0x1 data:byte sSZSBufferSize__7JKRAram = .sdata:0x80452878; // type:object size:0x4 scope:global align:4 data:4byte -rootPath$2498 = .sdata:0x80452880; // type:object size:0x2 scope:local align:4 data:string -errorRetry = .sdata:0x80452888; // type:object size:0x1 data:byte +rootPath = .sdata:0x80452880; // type:object size:0x2 scope:local align:4 data:string +errorRetry = .sdata:0x80452888; // type:object size:0x1 scope:local data:byte sSZSBufferSize__12JKRDvdRipper = .sdata:0x8045288C; // type:object size:0x4 scope:global align:4 data:4byte errorRetry__16JKRDvdAramRipper = .sdata:0x80452890; // type:object size:0x1 data:byte sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x80452894; // type:object size:0x4 scope:global align:4 data:4byte @@ -21546,66 +21586,66 @@ sResetPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804528A8; // type:object sResetMaskPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804528AC; // type:object size:0x4 scope:global align:4 data:4byte sMessageBuffer__12JUTException = .sdata:0x804528B0; // type:object size:0x4 scope:global align:4 sAssertVisible = .sdata:0x804528B8; // type:object size:0x1 data:byte -oneFrameRate = .sdata:0x804528C0; // type:object size:0x4 scope:global align:4 data:float -oneFrameRateUser = .sdata:0x804528C4; // type:object size:0x4 scope:global align:4 data:float +oneFrameRate = .sdata:0x804528C0; // type:object size:0x4 scope:local align:4 data:float +oneFrameRateUser = .sdata:0x804528C4; // type:object size:0x4 scope:local align:4 data:float cm2hw$552 = .sdata:0x804528C8; // type:object size:0x4 scope:local align:4 -J3DGDTexMode0Ids = .sdata:0x804528CC; // type:object size:0x8 scope:global align:4 -J3DGDTexMode1Ids = .sdata:0x804528D4; // type:object size:0x8 scope:global align:4 -J3DGDTexImage0Ids = .sdata:0x804528DC; // type:object size:0x8 scope:global align:4 -J3DGDTexImage3Ids = .sdata:0x804528E4; // type:object size:0x8 scope:global align:4 -J3DGDTexTlutIds = .sdata:0x804528EC; // type:object size:0x8 scope:global align:4 +J3DGDTexMode0Ids = .sdata:0x804528CC; // type:object size:0x8 scope:local align:4 +J3DGDTexMode1Ids = .sdata:0x804528D4; // type:object size:0x8 scope:local align:4 +J3DGDTexImage0Ids = .sdata:0x804528DC; // type:object size:0x8 scope:local align:4 +J3DGDTexImage3Ids = .sdata:0x804528E4; // type:object size:0x8 scope:local align:4 +J3DGDTexTlutIds = .sdata:0x804528EC; // type:object size:0x8 scope:local align:4 GX2HWFiltConv = .sdata:0x804528F4; // type:object size:0x6 scope:local align:4 -J3DTexImage1Ids = .sdata:0x804528FC; // type:object size:0x8 scope:global align:4 -J3DTexImage2Ids = .sdata:0x80452904; // type:object size:0x8 scope:global align:4 -ColorBlack = .sdata:0x80452910; // type:object size:0x4 scope:global align:4 data:4byte -ColorWhite = .sdata:0x80452914; // type:object size:0x4 scope:global align:4 data:4byte +J3DTexImage1Ids = .sdata:0x804528FC; // type:object size:0x8 scope:local align:4 +J3DTexImage2Ids = .sdata:0x80452904; // type:object size:0x8 scope:local align:4 +ColorBlack = .sdata:0x80452910; // type:object size:0x4 scope:local align:4 data:4byte +ColorWhite = .sdata:0x80452914; // type:object size:0x4 scope:local align:4 data:4byte Unit01 = .sdata:0x80452918; // type:object size:0x8 scope:local align:4 SizeOfLoadMatColors = .sdata:0x80452920; // type:object size:0x4 scope:global align:4 data:4byte SizeOfLoadAmbColors = .sdata:0x80452924; // type:object size:0x4 scope:global align:4 data:4byte SizeOfLoadColorChans = .sdata:0x80452928; // type:object size:0x4 scope:global align:4 data:4byte sNoUseDrawMtxPtr__12J3DMtxBuffer = .sdata:0x80452930; // type:object size:0x4 scope:global align:4 sNoUseNrmMtxPtr__12J3DMtxBuffer = .sdata:0x80452934; // type:object size:0x4 scope:global align:4 -J3DUnit01 = .sdata:0x80452938; // type:object size:0x8 scope:global align:4 +J3DUnit01 = .sdata:0x80452938; // type:object size:0x8 scope:local align:4 __OSVersion = .sdata:0x80452940; // type:object size:0x4 scope:global align:4 data:4byte @116 = .sdata:0x80452944; // type:object size:0x6 scope:local align:4 data:string @163 = .sdata:0x8045294C; // type:object size:0x4 scope:local align:4 data:string __OSCurrHeap = .sdata:0x80452950; // type:object size:0x4 scope:global align:4 data:4byte -__OSArenaLo = .sdata:0x80452958; // type:object size:0x4 scope:global align:4 data:4byte +__OSArenaLo = .sdata:0x80452958; // type:object size:0x4 scope:local align:4 data:4byte __OSFpscrEnableBits = .sdata:0x80452960; // type:object size:0x4 scope:global align:4 data:4byte @76 = .sdata:0x80452964; // type:object size:0x2 scope:local align:4 data:string @213 = .sdata:0x80452968; // type:object size:0x3 scope:local align:4 data:string -FontEncode = .sdata:0x80452970; // type:object size:0x2 scope:global align:4 data:2byte -SwitchThreadCallback = .sdata:0x80452978; // type:object size:0x4 scope:global align:4 data:4byte +FontEncode = .sdata:0x80452970; // type:object size:0x2 scope:local align:4 data:2byte +SwitchThreadCallback = .sdata:0x80452978; // type:object size:0x4 scope:local align:4 data:4byte @833 = .sdata:0x8045297C; // type:object size:0x1 scope:local align:4 __EXIVersion = .sdata:0x80452980; // type:object size:0x4 scope:global align:4 data:4byte __SIVersion = .sdata:0x80452988; // type:object size:0x4 scope:global align:4 data:4byte Unit01 = .sdata:0x80452990; // type:object size:0x8 scope:local align:4 -FirstRead = .sdata:0x80452998; // type:object size:0x4 scope:global align:4 data:4byte +FirstRead = .sdata:0x80452998; // type:object size:0x4 scope:local align:4 data:4byte @118 = .sdata:0x804529A0; // type:object size:0x8 scope:local align:4 data:string __DVDVersion = .sdata:0x804529A8; // type:object size:0x4 scope:global align:4 data:4byte -autoInvalidation = .sdata:0x804529AC; // type:object size:0x4 scope:global align:4 data:4byte -checkOptionalCommand = .sdata:0x804529B0; // type:object size:0x4 scope:global align:4 data:4byte +autoInvalidation = .sdata:0x804529AC; // type:object size:0x4 scope:local align:4 data:4byte +checkOptionalCommand = .sdata:0x804529B0; // type:object size:0x4 scope:local align:4 data:4byte @23 = .sdata:0x804529B4; // type:object size:0x6 scope:local align:4 data:string -DmaCommand = .sdata:0x804529BC; // type:object size:0x4 scope:global align:4 data:4byte +DmaCommand = .sdata:0x804529BC; // type:object size:0x4 scope:local align:4 data:4byte @37 = .sdata:0x804529C0; // type:object size:0x2 scope:local align:4 data:string @42 = .sdata:0x804529C4; // type:object size:0x4 scope:local align:4 data:string @43 = .sdata:0x804529C8; // type:object size:0x3 scope:local align:4 data:string __VIVersion = .sdata:0x804529D0; // type:object size:0x4 scope:global align:4 data:4byte @537 = .sdata:0x804529D4; // type:object size:0x5 scope:local align:4 data:string __PADVersion = .sdata:0x804529E0; // type:object size:0x4 scope:global align:4 data:4byte -ResettingChan = .sdata:0x804529E4; // type:object size:0x4 scope:global align:4 data:4byte -XPatchBits = .sdata:0x804529E8; // type:object size:0x4 scope:global align:4 data:4byte -AnalogMode = .sdata:0x804529EC; // type:object size:0x4 scope:global align:4 data:4byte -Spec = .sdata:0x804529F0; // type:object size:0x4 scope:global align:4 data:4byte -MakeStatus = .sdata:0x804529F4; // type:object size:0x4 scope:global align:4 data:4byte -CmdReadOrigin = .sdata:0x804529F8; // type:object size:0x4 scope:global align:4 -CmdCalibrate = .sdata:0x804529FC; // type:object size:0x4 scope:global align:4 +ResettingChan = .sdata:0x804529E4; // type:object size:0x4 scope:local align:4 data:4byte +XPatchBits = .sdata:0x804529E8; // type:object size:0x4 scope:local align:4 data:4byte +AnalogMode = .sdata:0x804529EC; // type:object size:0x4 scope:local align:4 data:4byte +Spec = .sdata:0x804529F0; // type:object size:0x4 scope:local align:4 data:4byte +MakeStatus = .sdata:0x804529F4; // type:object size:0x4 scope:local align:4 data:4byte +CmdReadOrigin = .sdata:0x804529F8; // type:object size:0x4 scope:local align:4 +CmdCalibrate = .sdata:0x804529FC; // type:object size:0x4 scope:local align:4 __AIVersion = .sdata:0x80452A00; // type:object size:0x4 scope:global align:4 data:4byte __ARVersion = .sdata:0x80452A08; // type:object size:0x4 scope:global align:4 data:4byte __ARQVersion = .sdata:0x80452A10; // type:object size:0x4 scope:global align:4 data:4byte __DSPVersion = .sdata:0x80452A18; // type:object size:0x4 scope:global align:4 data:4byte __CARDVersion = .sdata:0x80452A20; // type:object size:0x4 scope:global align:4 data:4byte -next = .sdata:0x80452A28; // type:object size:0x4 scope:global align:4 data:4byte +next = .sdata:0x80452A28; // type:object size:0x4 scope:local align:4 data:4byte __CARDVendorID = .sdata:0x80452A30; // type:object size:0x2 scope:global align:4 data:2byte __CARDPermMask = .sdata:0x80452A32; // type:object size:0x1 data:byte __GXVersion = .sdata:0x80452A38; // type:object size:0x4 scope:global align:4 data:4byte @@ -21620,25 +21660,25 @@ GXTexImage2Ids = .sdata:0x80452A70; // type:object size:0x8 scope:global align:4 GXTexImage3Ids = .sdata:0x80452A78; // type:object size:0x8 scope:global align:4 GXTexTlutIds = .sdata:0x80452A80; // type:object size:0x8 scope:global align:4 GX2HWFiltConv = .sdata:0x80452A88; // type:object size:0x6 scope:local align:4 -fragmentID = .sdata:0x80452A90; // type:object size:0x4 scope:global align:4 data:4byte +fragmentID = .sdata:0x80452A90; // type:object size:0x4 scope:local align:4 data:4byte @wstringBase0 = .sdata:0x80452A98; // type:object size:0x2 scope:local align:4 __float_nan = .sdata:0x80452AA0; // type:object size:0x4 scope:global align:4 data:float __float_huge = .sdata:0x80452AA4; // type:object size:0x4 scope:global align:4 data:float __float_max = .sdata:0x80452AA8; // type:object size:0x4 scope:global align:4 data:float __float_epsilon = .sdata:0x80452AAC; // type:object size:0x4 scope:global align:4 data:float -SendCount = .sdata:0x80452AB0; // type:object size:0x1 data:byte -fillcheck_check_frame = .sbss:0x80452AC0; // type:object size:0x1 data:byte +SendCount = .sdata:0x80452AB0; // type:object size:0x1 scope:local data:byte +fillcheck_check_frame = .sbss:0x80452AC0; // type:object size:0x1 scope:local data:byte sPowerOnTime__7mDoMain = .sbss:0x80452AC8; // type:object size:0x8 scope:global align:4 data:4byte sHungUpTime__7mDoMain = .sbss:0x80452AD0; // type:object size:0x8 scope:global align:4 data:4byte -mDisplayHeapSize = .sbss:0x80452AD8; // type:object size:0x1 data:byte -mSelectHeapBar = .sbss:0x80452AD9; // type:object size:0x1 data:byte -mCheckHeap = .sbss:0x80452ADA; // type:object size:0x1 data:byte +mDisplayHeapSize = .sbss:0x80452AD8; // type:object size:0x1 scope:local data:byte +mSelectHeapBar = .sbss:0x80452AD9; // type:object size:0x1 scope:local data:byte +mCheckHeap = .sbss:0x80452ADA; // type:object size:0x1 scope:local data:byte console_position_x$3776 = .sbss:0x80452ADC; // type:object size:0x4 scope:local align:4 data:float -console_x_init$1588 = .sbss:0x80452AE0; // type:object size:0x1 data:byte +init$1809 = .sbss:0x80452AE0; // type:object size:0x1 scope:local data:byte console_position_y$3779 = .sbss:0x80452AE4; // type:object size:0x4 scope:local align:4 data:float -console_y_init$1590 = .sbss:0x80452AE8; // type:object size:0x1 data:byte +init$1812 = .sbss:0x80452AE8; // type:object size:0x1 scope:local data:byte console_scroll$3782 = .sbss:0x80452AEC; // type:object size:0x4 scope:local align:4 data:float -console_scroll_init$1592 = .sbss:0x80452AF0; // type:object size:0x1 data:byte +init$1815 = .sbss:0x80452AF0; // type:object size:0x1 scope:local data:byte frame$3939 = .sbss:0x80452AF4; // type:object size:0x4 scope:local align:4 data:4byte sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .sbss:0x80452AF8; // type:object size:0x4 scope:global align:4 data:4byte sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .sbss:0x80452AFC; // type:object size:0x4 scope:global align:4 data:4byte @@ -21668,19 +21708,19 @@ __OSReport_Error_disable = .sbss:0x80452B59; // type:object size:0x1 data:byte __OSReport_Warning_disable = .sbss:0x80452B5A; // type:object size:0x1 data:byte __OSReport_System_disable = .sbss:0x80452B5B; // type:object size:0x1 data:byte __OSReport_enable = .sbss:0x80452B5C; // type:object size:0x1 data:byte -__OSReport_MonopolyThread = .sbss:0x80452B60; // type:object size:0x4 scope:global align:4 data:4byte +__OSReport_MonopolyThread = .sbss:0x80452B60; // type:object size:0x4 scope:local align:4 data:4byte print_counts = .sbss:0x80452B64; // type:object size:0x4 scope:global align:4 data:4byte print_errors = .sbss:0x80452B68; // type:object size:0x4 scope:global align:4 data:4byte print_warings = .sbss:0x80452B6C; // type:object size:0x4 scope:global align:4 data:4byte print_systems = .sbss:0x80452B70; // type:object size:0x4 scope:global align:4 data:4byte print_initialized = .sbss:0x80452B74; // type:object size:0x1 data:byte -lbl_80452B75 = .sbss:0x80452B75; // type:object size:0x1 data:byte +data_80450BB5 = .sbss:0x80452B75; // type:object size:0x1 scope:local data:byte mInitFlag__17mDoAud_zelAudio_c = .sbss:0x80452B78; // type:object size:0x1 data:byte mResetFlag__17mDoAud_zelAudio_c = .sbss:0x80452B79; // type:object size:0x1 data:byte mBgmSet__17mDoAud_zelAudio_c = .sbss:0x80452B7A; // type:object size:0x1 data:byte g_mDoAud_audioHeap = .sbss:0x80452B7C; // type:object size:0x4 scope:global align:4 data:4byte -l_affCommand = .sbss:0x80452B80; // type:object size:0x4 scope:global align:4 data:4byte -l_arcCommand = .sbss:0x80452B84; // type:object size:0x4 scope:global align:4 data:4byte +l_affCommand = .sbss:0x80452B80; // type:object size:0x4 scope:local align:4 data:4byte +l_arcCommand = .sbss:0x80452B84; // type:object size:0x4 scope:local align:4 data:4byte mFader__13mDoGph_gInf_c = .sbss:0x80452B88; // type:object size:0x4 scope:global align:4 data:4byte mFrameBufferTimg__13mDoGph_gInf_c = .sbss:0x80452B8C; // type:object size:0x4 scope:global align:4 data:4byte mFrameBufferTex__13mDoGph_gInf_c = .sbss:0x80452B90; // type:object size:0x4 scope:global align:4 data:4byte @@ -21692,20 +21732,20 @@ mBlureFlag__13mDoGph_gInf_c = .sbss:0x80452BA4; // type:object size:0x1 data:byt mBlureRate__13mDoGph_gInf_c = .sbss:0x80452BA5; // type:object size:0x1 data:byte mFade__13mDoGph_gInf_c = .sbss:0x80452BA6; // type:object size:0x1 data:byte mAutoForcus__13mDoGph_gInf_c = .sbss:0x80452BA7; // type:object size:0x1 data:byte -lbl_80452BA8 = .sbss:0x80452BA8; // type:object size:0x8 data:byte -lbl_80452BB0 = .sbss:0x80452BB0; // type:object size:0x1 data:byte -solidHeapErrors = .sbss:0x80452BB4; // type:object size:0x4 scope:global align:4 data:4byte -gameHeapErrors = .sbss:0x80452BB8; // type:object size:0x4 scope:global align:4 data:4byte -zeldaHeapErrors = .sbss:0x80452BBC; // type:object size:0x4 scope:global align:4 data:4byte -commandHeapErrors = .sbss:0x80452BC0; // type:object size:0x4 scope:global align:4 data:4byte -archiveHeapErrors = .sbss:0x80452BC4; // type:object size:0x4 scope:global align:4 data:4byte -unknownHeapErrors = .sbss:0x80452BC8; // type:object size:0x4 scope:global align:4 data:4byte -heapErrors = .sbss:0x80452BCC; // type:object size:0x4 scope:global align:4 data:4byte +data_80450BE8 = .sbss:0x80452BA8; // type:object size:0x1 scope:local align:1 data:byte +mDebugFill__6mDoMch = .sbss:0x80452BB0; // type:object size:0x1 data:byte +solidHeapErrors = .sbss:0x80452BB4; // type:object size:0x4 scope:local align:4 data:4byte +gameHeapErrors = .sbss:0x80452BB8; // type:object size:0x4 scope:local align:4 data:4byte +zeldaHeapErrors = .sbss:0x80452BBC; // type:object size:0x4 scope:local align:4 data:4byte +commandHeapErrors = .sbss:0x80452BC0; // type:object size:0x4 scope:local align:4 data:4byte +archiveHeapErrors = .sbss:0x80452BC4; // type:object size:0x4 scope:local align:4 data:4byte +unknownHeapErrors = .sbss:0x80452BC8; // type:object size:0x4 scope:local align:4 data:4byte +heapErrors = .sbss:0x80452BCC; // type:object size:0x4 scope:local align:4 data:4byte tmpString$3651 = .sbss:0x80452BD0; // type:object size:0x5 scope:local align:4 data:byte -lbl_80452BD5 = .sbss:0x80452BD5; // type:object size:0x1 data:byte -lbl_80452BD6 = .sbss:0x80452BD6; // type:object size:0x1 data:byte -lbl_80452BD7 = .sbss:0x80452BD7; // type:object size:0x1 data:byte -mDoMtx_stack = .sbss:0x80452BD8; // type:object size:0x1 scope:global align:4 +key_link$1217 = .sbss:0x80452BD5; // type:object size:0x1 scope:local data:byte +key_ganon$1218 = .sbss:0x80452BD6; // type:object size:0x1 scope:local data:byte +key_zelda$1219 = .sbss:0x80452BD7; // type:object size:0x1 scope:local data:byte +mDoMtx_stack = .sbss:0x80452BD8; // type:object size:0x1 scope:local align:4 AssertHeap = .sbss:0x80452BE0; // type:object size:0x4 scope:global align:4 data:4byte DbPrintHeap = .sbss:0x80452BE4; // type:object size:0x4 scope:global align:4 data:4byte gameHeap = .sbss:0x80452BE8; // type:object size:0x4 scope:global align:4 data:4byte @@ -21729,9 +21769,9 @@ mSystemFar__14mDoLib_clipper = .sbss:0x80452C30; // type:object size:0x4 scope:g mFovyRate__14mDoLib_clipper = .sbss:0x80452C34; // type:object size:0x4 scope:global align:4 data:float mResetData__6mDoRst = .sbss:0x80452C38; // type:object size:0x4 scope:global align:4 data:4byte SyncWidthSound__9mDoDvdThd = .sbss:0x80452C40; // type:object size:0x1 data:byte -sDefaultDirection = .sbss:0x80452C41; // type:object size:0x7 data:byte +sDefaultDirection = .sbss:0x80452C41; // type:object size:0x1 data:byte mDoDvdErr_initialized = .sbss:0x80452C48; // type:object size:0x1 data:byte -sConsole = .sbss:0x80452C50; // type:object size:0x4 scope:global align:4 data:4byte +sConsole = .sbss:0x80452C50; // type:object size:0x4 scope:local align:4 data:4byte cDmr_SkipInfo = .sbss:0x80452C58; // type:object size:0x1 data_80450C99 = .sbss:0x80452C59; // type:object size:0x1 data_80450C9A = .sbss:0x80452C5A; // type:object size:0x1 @@ -21740,40 +21780,40 @@ data_80450C9C = .sbss:0x80452C5C; // type:object size:0x1 data_80450C9D = .sbss:0x80452C5D; // type:object size:0x1 data_80450C9E = .sbss:0x80452C5E; // type:object size:0x1 cDmr_FishingWether = .sbss:0x80452C5F; // type:object size:0x1 -data_80450CA0 = .sbss:0x80452C60; // type:object size:0x4 +data_80450CA0 = .sbss:0x80452C60; // type:object size:0x1 scope:global align:1 data:byte JPTracePCB4 = .sbss:0x80452C64; // type:object size:0x4 scope:global align:4 data:4byte -DMC_initialized = .sbss:0x80452C68; // type:object size:0x1 data:byte -cDyl_Initialized = .sbss:0x80452C6C; // type:object size:0x4 scope:global align:4 data:4byte -cDyl_DVD = .sbss:0x80452C70; // type:object size:0x4 scope:global align:4 data:4byte +DMC_initialized = .sbss:0x80452C68; // type:object size:0x1 scope:local data:byte +cDyl_Initialized = .sbss:0x80452C6C; // type:object size:0x4 scope:local align:4 data:4byte +cDyl_DVD = .sbss:0x80452C70; // type:object size:0x4 scope:local align:4 data:4byte g_fopAc_type = .sbss:0x80452C78; // type:object size:0x4 scope:global align:4 data:4byte stopStatus__10fopAc_ac_c = .sbss:0x80452C7C; // type:object size:0x4 scope:global align:4 data:4byte sInstance__35JASGlobalInstance<14JAUSectionHeap> = .sbss:0x80452C80; // type:object size:0x4 scope:global align:4 data:4byte HeapAdjustEntry__6fopAcM = .sbss:0x80452C88; // type:object size:0x1 data:byte -HeapAdjustVerbose__6fopAcM = .sbss:0x80452C89; // type:object size:0x1 data:byte -l_hio = .sbss:0x80452C8C; // type:object size:0x1 scope:global align:4 +HeapAdjustUnk__6fopAcM = .sbss:0x80452C89; // type:object size:0x1 data:byte +l_hio = .sbss:0x80452C8C; // type:object size:0x1 scope:local align:4 mGroundY__11fopAcM_gc_c = .sbss:0x80452C90; // type:object size:0x4 scope:global align:4 data:float mRoofY__11fopAcM_rc_c = .sbss:0x80452C94; // type:object size:0x4 scope:global align:4 data:float mWaterY__11fopAcM_wt_c = .sbss:0x80452C98; // type:object size:0x4 scope:global align:4 data:float -l_fopScnRq_IsUsingOfOverlap = .sbss:0x80452CA0; // type:object size:0x4 scope:global align:4 data:4byte -fopKy_KANKYO_TYPE = .sbss:0x80452CA8; // type:object size:0x4 scope:global align:4 -fopMsg_MSG_TYPE = .sbss:0x80452CB0; // type:object size:0x4 scope:global align:4 -l_fopDwTg_id = .sbss:0x80452CB8; // type:object size:0x4 scope:global align:4 data:4byte +l_fopScnRq_IsUsingOfOverlap = .sbss:0x80452CA0; // type:object size:0x4 scope:local align:4 data:4byte +fopKy_KANKYO_TYPE = .sbss:0x80452CA8; // type:object size:0x4 scope:local align:4 +fopMsg_MSG_TYPE = .sbss:0x80452CB0; // type:object size:0x4 scope:local align:4 +l_fopDwTg_id = .sbss:0x80452CB8; // type:object size:0x4 scope:local align:4 data:4byte g_fpcBs_type = .sbss:0x80452CC0; // type:object size:0x4 scope:global align:4 t_type$2207 = .sbss:0x80452CC4; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80452CC8 = .sbss:0x80452CC8; // type:object size:0x1 data:byte +init$1210 = .sbss:0x80452CC8; // type:object size:0x1 scope:local data:byte process_id$2216 = .sbss:0x80452CCC; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80452CD0 = .sbss:0x80452CD0; // type:object size:0x1 data:byte -l_fpcLy_CurrLayer_p = .sbss:0x80452CD8; // type:object size:0x4 scope:global align:4 data:4byte +init$1219 = .sbss:0x80452CD0; // type:object size:0x1 scope:local data:byte +l_fpcLy_CurrLayer_p = .sbss:0x80452CD8; // type:object size:0x4 scope:local align:4 data:4byte IsInitOfLayerList$2308 = .sbss:0x80452CDC; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80452CE0 = .sbss:0x80452CE0; // type:object size:0x1 data:byte +init$123 = .sbss:0x80452CE0; // type:object size:0x1 scope:local data:byte layer_id$2311 = .sbss:0x80452CE4; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80452CE8 = .sbss:0x80452CE8; // type:object size:0x1 data:byte +init$126 = .sbss:0x80452CE8; // type:object size:0x1 scope:local data:byte g_fpcLf_type = .sbss:0x80452CF0; // type:object size:0x4 scope:global align:4 data:4byte -l_dvdError$1434 = .sbss:0x80452CF8; // type:object size:0x1 data:byte -init$1435 = .sbss:0x80452CF9; // type:object size:0x1 data:byte +l_dvdError$1618 = .sbss:0x80452CF8; // type:object size:0x1 scope:local data:byte +init$1619 = .sbss:0x80452CF9; // type:object size:0x1 scope:local data:byte g_fpcNd_type = .sbss:0x80452D00; // type:object size:0x4 scope:global align:4 data:4byte request_id$2360 = .sbss:0x80452D08; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80452D0C = .sbss:0x80452D0C; // type:object size:0x1 data:byte +init$337 = .sbss:0x80452D0C; // type:object size:0x1 scope:local data:byte g_fpcPf_ProfileList_p = .sbss:0x80452D10; // type:object size:0x4 scope:global align:4 data:4byte tmp_name$4456 = .sbss:0x80452D18; // type:object size:0x8 scope:local align:4 mProcID__20dStage_roomControl_c = .sbss:0x80452D20; // type:object size:0x4 scope:global align:4 data:4byte @@ -21808,11 +21848,11 @@ mSttsFlag__12daObjCarry_c = .sbss:0x80452D84; // type:object size:0x5 scope:glob mRoomNo__12daObjCarry_c = .sbss:0x80452D8C; // type:object size:0x5 scope:global align:4 m_diffTime__11dLib_time_c = .sbss:0x80452D98; // type:object size:0x8 scope:global align:4 data:4byte m_stopTime__11dLib_time_c = .sbss:0x80452DA0; // type:object size:0x8 scope:global align:4 data:4byte -lbl_80452DA8 = .sbss:0x80452DA8; // type:object size:0x8 data:byte -init$1622 = .sbss:0x80452DB0; // type:object size:0x1 data:byte -init$1637 = .sbss:0x80452DB1; // type:object size:0x1 data:byte -init$1650 = .sbss:0x80452DB2; // type:object size:0x1 data:byte -init$1663 = .sbss:0x80452DB3; // type:object size:0x1 data:byte +m_timeStopped__11dLib_time_c = .sbss:0x80452DA8; // type:object size:0x1 data:byte +init$1737 = .sbss:0x80452DB0; // type:object size:0x1 scope:local data:byte +init$1752 = .sbss:0x80452DB1; // type:object size:0x1 scope:local data:byte +init$1765 = .sbss:0x80452DB2; // type:object size:0x1 scope:local data:byte +init$1778 = .sbss:0x80452DB3; // type:object size:0x1 scope:local data:byte m_top__12daTagHstop_c = .sbss:0x80452DB8; // type:object size:0x4 scope:global align:4 data:4byte m_system__7dDemo_c = .sbss:0x80452DC0; // type:object size:0x4 scope:global align:4 data:4byte m_control__7dDemo_c = .sbss:0x80452DC4; // type:object size:0x4 scope:global align:4 data:4byte @@ -21832,10 +21872,10 @@ m_mode__7dDemo_c = .sbss:0x80452DF8; // type:object size:0x4 scope:global align: m_status__7dDemo_c = .sbss:0x80452DFC; // type:object size:0x4 scope:global align:4 data:4byte m_branchType__7dDemo_c = .sbss:0x80452E00; // type:object size:0x2 scope:global align:4 data:2byte m_branchData__7dDemo_c = .sbss:0x80452E04; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80452E08 = .sbss:0x80452E08; // type:object size:0x1 data:byte -lbl_80452E09 = .sbss:0x80452E09; // type:object size:0x1 data:byte +init$2096 = .sbss:0x80452E08; // type:object size:0x1 scope:local align:1 data:byte +init$2099 = .sbss:0x80452E09; // type:object size:0x1 scope:local align:1 data:byte it$4206 = .sbss:0x80452E0C; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80452E10 = .sbss:0x80452E10; // type:object size:0x8 data:byte +init$1672 = .sbss:0x80452E10; // type:object size:0x1 scope:local align:1 data:byte mNowStayFloorNo__10dMapInfo_c = .sbss:0x80452E18; // type:object size:0x1 data:byte mNowStayRoomNo__10dMapInfo_c = .sbss:0x80452E1C; // type:object size:0x4 scope:global align:4 data:4byte mNowStayFloorNoDecisionFlg__10dMapInfo_c = .sbss:0x80452E20; // type:object size:0x1 data:byte @@ -21848,7 +21888,7 @@ mAllCenterX__8dMpath_c = .sbss:0x80452E38; // type:object size:0x4 scope:global mAllCenterZ__8dMpath_c = .sbss:0x80452E3C; // type:object size:0x4 scope:global align:4 data:float mAllSizeX__8dMpath_c = .sbss:0x80452E40; // type:object size:0x4 scope:global align:4 data:float mAllSizeZ__8dMpath_c = .sbss:0x80452E44; // type:object size:0x4 scope:global align:4 data:float -lbl_80452E48 = .sbss:0x80452E48; // type:object size:0x1 data:byte +data_80450E88 = .sbss:0x80452E48; // type:object size:0x1 scope:local data:byte mEcallback__18dPa_modelEcallBack = .sbss:0x80452E50; // type:object size:0x4 scope:global align:4 data:4byte mPcallback__18dPa_modelEcallBack = .sbss:0x80452E54; // type:object size:0x4 scope:global align:4 data:4byte mModel__18dPa_modelEcallBack = .sbss:0x80452E58; // type:object size:0x4 scope:global align:4 data:4byte @@ -21869,59 +21909,59 @@ mParticleTracePCB__13dPa_control_c = .sbss:0x80452E88; // type:object size:0x4 s mWipe__12dDlst_list_c = .sbss:0x80452E90; // type:object size:0x1 data:byte mWipeRate__12dDlst_list_c = .sbss:0x80452E94; // type:object size:0x4 scope:global align:4 data:float mWipeSpeed__12dDlst_list_c = .sbss:0x80452E98; // type:object size:0x4 scope:global align:4 data:float -lbl_80452EA0 = .sbss:0x80452EA0; // type:object size:0x1 data:byte +init$2986 = .sbss:0x80452EA0; // type:object size:0x1 scope:local data:byte S_parcent_bak$4131 = .sbss:0x80452EA8; // type:object size:0x4 scope:local align:4 data:float -lbl_80452EAC = .sbss:0x80452EAC; // type:object size:0x1 data:byte +init$2011 = .sbss:0x80452EAC; // type:object size:0x1 scope:local data:byte S_rot_work1$7554 = .sbss:0x80452EAE; // type:object size:0x2 scope:local align:2 data:2byte -lbl_80452EB0 = .sbss:0x80452EB0; // type:object size:0x1 data:byte +init$5257 = .sbss:0x80452EB0; // type:object size:0x1 scope:local data:byte S_rot_work2$7557 = .sbss:0x80452EB2; // type:object size:0x2 scope:local align:2 data:2byte -lbl_80452EB4 = .sbss:0x80452EB4; // type:object size:0x1 data:byte +init$5260 = .sbss:0x80452EB4; // type:object size:0x1 scope:local data:byte rot$7919 = .sbss:0x80452EB8; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80452EBC = .sbss:0x80452EBC; // type:object size:0x1 data:byte -lbl_80452EBD = .sbss:0x80452EBD; // type:object size:0x1 data:byte +init$5609 = .sbss:0x80452EBC; // type:object size:0x1 scope:local data:byte +init$5641 = .sbss:0x80452EBD; // type:object size:0x1 scope:local data:byte rot$8366 = .sbss:0x80452EC0; // type:object size:0x4 scope:local align:4 data:float -lbl_80452EC4 = .sbss:0x80452EC4; // type:object size:0x1 data:byte +init$6001 = .sbss:0x80452EC4; // type:object size:0x1 scope:local data:byte rot$8936 = .sbss:0x80452EC8; // type:object size:0x4 scope:local align:4 data:float -lbl_80452ECC = .sbss:0x80452ECC; // type:object size:0x1 data:byte -lbl_80452ECD = .sbss:0x80452ECD; // type:object size:0x1 data:byte +init$6536 = .sbss:0x80452ECC; // type:object size:0x1 scope:local data:byte +init$6542 = .sbss:0x80452ECD; // type:object size:0x1 scope:local data:byte S_fubuki_ratio$8948 = .sbss:0x80452ED0; // type:object size:0x4 scope:local align:4 data:float -lbl_80452ED4 = .sbss:0x80452ED4; // type:object size:0x1 data:byte +init$6548 = .sbss:0x80452ED4; // type:object size:0x1 scope:local data:byte rot$9421 = .sbss:0x80452ED8; // type:object size:0x4 scope:local align:4 data:float -lbl_80452EDC = .sbss:0x80452EDC; // type:object size:0x1 data:byte -lbl_80452EDD = .sbss:0x80452EDD; // type:object size:0x1 data:byte +init$6981 = .sbss:0x80452EDC; // type:object size:0x1 scope:local data:byte +init$6985 = .sbss:0x80452EDD; // type:object size:0x1 scope:local data:byte rot$9847 = .sbss:0x80452EE0; // type:object size:0x4 scope:local align:4 data:float -lbl_80452EE4 = .sbss:0x80452EE4; // type:object size:0x1 data:byte +init$7391 = .sbss:0x80452EE4; // type:object size:0x1 scope:local data:byte howa_loop_cnt$10108 = .sbss:0x80452EE8; // type:object size:0x4 scope:local align:4 data:float -lbl_80452EEC = .sbss:0x80452EEC; // type:object size:0x1 data:byte +init$7637 = .sbss:0x80452EEC; // type:object size:0x1 scope:local data:byte rot$10882 = .sbss:0x80452EF0; // type:object size:0x4 scope:local align:4 data:float -lbl_80452EF4 = .sbss:0x80452EF4; // type:object size:0x1 data:byte +init$8377 = .sbss:0x80452EF4; // type:object size:0x1 scope:local data:byte rot$11307 = .sbss:0x80452EF8; // type:object size:0x4 scope:local align:4 data:float -lbl_80452EFC = .sbss:0x80452EFC; // type:object size:0x1 data:byte +init$8768 = .sbss:0x80452EFC; // type:object size:0x1 scope:local data:byte rot$11586 = .sbss:0x80452F00; // type:object size:0x4 scope:local align:4 data:float -lbl_80452F04 = .sbss:0x80452F04; // type:object size:0x1 data:byte +init$9000 = .sbss:0x80452F04; // type:object size:0x1 scope:local data:byte rot$11958 = .sbss:0x80452F08; // type:object size:0x4 scope:local align:4 data:float -lbl_80452F0C = .sbss:0x80452F0C; // type:object size:0x1 data:byte +init$9319 = .sbss:0x80452F0C; // type:object size:0x1 scope:local data:byte data$3831 = .sbss:0x80452F10; // type:object size:0x8 scope:local align:4 -l_isFinalBossStg = .sbss:0x80452F18; // type:object size:0x1 data:byte -l_SetCounter = .sbss:0x80452F20; // type:object size:0x4 scope:global align:4 data:4byte -init$1735 = .sbss:0x80452F28; // type:object size:0x1 data:byte +l_isFinalBossStg = .sbss:0x80452F18; // type:object size:0x1 scope:local data:byte +l_SetCounter = .sbss:0x80452F20; // type:object size:0x4 scope:local align:4 data:4byte +init$1850 = .sbss:0x80452F28; // type:object size:0x1 scope:local data:byte m_name__16dBgS_MoveBgActor = .sbss:0x80452F30; // type:object size:0x4 scope:global align:4 data:4byte m_dzb_id__16dBgS_MoveBgActor = .sbss:0x80452F34; // type:object size:0x4 scope:global align:4 data:4byte m_set_func__16dBgS_MoveBgActor = .sbss:0x80452F38; // type:object size:0x4 scope:global align:4 data:4byte -l_start = .sbss:0x80452F40; // type:object size:0x4 scope:global align:4 data:4byte -l_wcsbuf_num = .sbss:0x80452F44; // type:object size:0x4 scope:global align:4 data:4byte -init$3272 = .sbss:0x80452F48; // type:object size:0x1 data:byte -init$4178 = .sbss:0x80452F49; // type:object size:0x1 data:byte -init$4774 = .sbss:0x80452F4A; // type:object size:0x1 data:byte -init$7903 = .sbss:0x80452F4B; // type:object size:0x1 data:byte +l_start = .sbss:0x80452F40; // type:object size:0x4 scope:local align:4 data:4byte +l_wcsbuf_num = .sbss:0x80452F44; // type:object size:0x4 scope:local align:4 data:4byte +init$3387 = .sbss:0x80452F48; // type:object size:0x1 scope:local data:byte +init$4295 = .sbss:0x80452F49; // type:object size:0x1 scope:local data:byte +init$4891 = .sbss:0x80452F4A; // type:object size:0x1 scope:local data:byte +init$8022 = .sbss:0x80452F4B; // type:object size:0x1 scope:local data:byte mData__12dEnemyItem_c = .sbss:0x80452F50; // type:object size:0x4 scope:global align:4 data:4byte mTypeGroupData__7dTres_c = .sbss:0x80452F58; // type:object size:0x4 scope:global align:4 data:4byte mNum__7dTres_c = .sbss:0x80452F5C; // type:object size:0x2 scope:global align:4 data:2byte m_myObj__10dMdl_mng_c = .sbss:0x80452F60; // type:object size:0x4 scope:global align:4 data:4byte m_obj__12dEyeHL_mng_c = .sbss:0x80452F68; // type:object size:0x4 scope:global align:4 data:4byte -l_dvdError$1792 = .sbss:0x80452F70; // type:object size:0x1 data:byte -l_texCopied$1815 = .sbss:0x80452F71; // type:object size:0x1 data:byte -init$1816 = .sbss:0x80452F72; // type:object size:0x6 data:byte +l_dvdError$1948 = .sbss:0x80452F70; // type:object size:0x1 scope:local data:byte +l_texCopied$1971 = .sbss:0x80452F71; // type:object size:0x1 scope:local data:byte +init$1972 = .sbss:0x80452F72; // type:object size:0x1 scope:local data:byte init$11179 = .sbss:0x80452F78; // type:object size:0x1 data:byte init$11183 = .sbss:0x80452F79; // type:object size:0x1 data:byte init$11187 = .sbss:0x80452F7A; // type:object size:0x1 data:byte @@ -21943,11 +21983,11 @@ mFindCount__8daNpcT_c = .sbss:0x80452F9C; // type:object size:0x4 scope:global a m_name__23daBaseNpc_moveBgActor_c = .sbss:0x80452FA0; // type:object size:0x4 scope:global align:4 data:4byte m_dzb_id__23daBaseNpc_moveBgActor_c = .sbss:0x80452FA4; // type:object size:0x4 scope:global align:4 data:4byte m_set_func__23daBaseNpc_moveBgActor_c = .sbss:0x80452FA8; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80452FAC = .sbss:0x80452FAC; // type:object size:0x1 data:byte +init$7278 = .sbss:0x80452FAC; // type:object size:0x1 data:byte mFindCount__8daNpcF_c = .sbss:0x80452FB0; // type:object size:0x4 scope:global align:4 data:4byte mSrchActorName__8daNpcF_c = .sbss:0x80452FB4; // type:object size:0x2 scope:global align:4 data:2byte init$1851 = .sbss:0x80452FB8; // type:object size:0x1 scope:local align:1 data:byte -lbl_80452FC0 = .sbss:0x80452FC0; // type:object size:0x1 data:byte +init$1834 = .sbss:0x80452FC0; // type:object size:0x1 data:byte target = .sbss:0x80452FC4; // type:object size:0x4 scope:global align:4 data:4byte targetWay = .sbss:0x80452FC8; // type:object size:0x4 scope:global align:4 data:float wolfAngle = .sbss:0x80452FCC; // type:object size:0x2 scope:global align:4 data:2byte @@ -21957,33 +21997,33 @@ m_dropAngleY__20daPy_boomerangMove_c = .sbss:0x80452FDC; // type:object size:0x2 m_eventKeepFlg__20daPy_boomerangMove_c = .sbss:0x80452FDE; // type:object size:0x2 scope:global align:2 data:2byte Stage__22@unnamed@d_camera_cpp@ = .sbss:0x80452FE0; // type:object size:0x4 scope:global align:4 data:4byte prev_plat1$8536 = .sbss:0x80452FE4; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80452FE8 = .sbss:0x80452FE8; // type:object size:0x1 data:byte +init$8537 = .sbss:0x80452FE8; // type:object size:0x1 data:byte prev_plat2$8539 = .sbss:0x80452FEC; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80452FF0 = .sbss:0x80452FF0; // type:object size:0x1 data:byte +init$8540 = .sbss:0x80452FF0; // type:object size:0x1 data:byte JumpCushion$9801 = .sbss:0x80452FF4; // type:object size:0x4 scope:local align:4 data:float -lbl_80452FF8 = .sbss:0x80452FF8; // type:object size:0x1 data:byte -lbl_80452FF9 = .sbss:0x80452FF9; // type:object size:0x1 data:byte +init$9802 = .sbss:0x80452FF8; // type:object size:0x1 data:byte +init$9803 = .sbss:0x80452FF9; // type:object size:0x1 data:byte LatitudeLimitMax$9807 = .sbss:0x80452FFC; // type:object size:0x2 scope:local align:4 -lbl_80452FFE = .sbss:0x80452FFE; // type:object size:0x1 data:byte +init$14160 = .sbss:0x80452FFE; // type:object size:0x1 data:byte _120$14158 = .sbss:0x80453000; // type:object size:0x2 scope:local align:4 data:2byte -lbl_80453002 = .sbss:0x80453002; // type:object size:0x1 data:byte +init$14616 = .sbss:0x80453002; // type:object size:0x1 data:byte _120$14614 = .sbss:0x80453004; // type:object size:0x2 scope:local align:4 data:2byte -lbl_80453006 = .sbss:0x80453006; // type:object size:0x1 data:byte +init$14965 = .sbss:0x80453006; // type:object size:0x1 data:byte LatMin$14963 = .sbss:0x80453008; // type:object size:0x2 scope:local align:4 data:2byte -lbl_8045300A = .sbss:0x8045300A; // type:object size:0x1 data:byte +init$14969 = .sbss:0x8045300A; // type:object size:0x1 data:byte LatMax$14967 = .sbss:0x8045300C; // type:object size:0x2 scope:local align:4 data:2byte -g_siHIO = .sbss:0x80453010; // type:object size:0x8 scope:global align:4 -dShopSystem_sellItemMax = .sbss:0x80453018; // type:object size:0x1 data:byte -dShopSystem_item_count = .sbss:0x8045301C; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80453020 = .sbss:0x80453020; // type:object size:0x1 data:byte -dShopSystem_camera_count = .sbss:0x80453024; // type:object size:0x4 scope:global align:4 data:4byte +g_siHIO = .sbss:0x80453010; // type:object size:0x8 scope:local align:4 +dShopSystem_sellItemMax = .sbss:0x80453018; // type:object size:0x1 scope:local data:byte +dShopSystem_item_count = .sbss:0x8045301C; // type:object size:0x4 scope:local align:4 data:4byte +data_80451060 = .sbss:0x80453020; // type:object size:0x1 scope:local data:byte +dShopSystem_camera_count = .sbss:0x80453024; // type:object size:0x4 scope:local align:4 data:4byte S_fuwan_sin$5904 = .sbss:0x80453028; // type:object size:0x2 scope:local align:4 data:2byte -init$4995 = .sbss:0x8045302A; // type:object size:0x1 data:byte -init$4999 = .sbss:0x8045302B; // type:object size:0x1 data:byte -init$localstatic4$draw__10dThunder_cFv = .sbss:0x80453030; // type:object size:0x1 data:byte -init$localstatic6$draw__10dThunder_cFv = .sbss:0x80453031; // type:object size:0x1 data:byte -player_px = .sbss:0x80453038; // type:object size:0x4 scope:global align:4 data:float -player_py = .sbss:0x8045303C; // type:object size:0x4 scope:global align:4 data:float +init$5117 = .sbss:0x8045302A; // type:object size:0x1 scope:local data:byte +init$5121 = .sbss:0x8045302B; // type:object size:0x1 scope:local data:byte +init$localstatic4$draw__10dThunder_cFv = .sbss:0x80453030; // type:object size:0x1 scope:weak data:byte +init$localstatic6$draw__10dThunder_cFv = .sbss:0x80453031; // type:object size:0x1 scope:weak data:byte +player_px = .sbss:0x80453038; // type:object size:0x4 scope:local align:4 data:float +player_py = .sbss:0x8045303C; // type:object size:0x4 scope:local align:4 data:float myclass__12dMenu_Dmap_c = .sbss:0x80453040; // type:object size:0x4 scope:global align:4 data:4byte m_res__22dMdm_HIO_prm_res_dst_s = .sbss:0x80453048; // type:object size:0x4 scope:global align:4 data:4byte m_zoomCenterMinX__20dMenu_StageMapCtrl_c = .sbss:0x8045304C; // type:object size:0x4 scope:global align:4 data:float @@ -21995,40 +22035,40 @@ virtual_stage$3999 = .sbss:0x80453064; // type:object size:0x8 scope:local align MyClass__12dMenu_Fmap_c = .sbss:0x8045306C; // type:object size:0x4 scope:global align:4 data:4byte g_menuHIO = .sbss:0x80453070; // type:object size:0x8 scope:global align:4 tex_name$5188 = .sbss:0x80453078; // type:object size:0x4 scope:local align:4 data:4byte -lbl_8045307C = .sbss:0x8045307C; // type:object size:0x1 data:byte +init$3157 = .sbss:0x8045307C; // type:object size:0x1 scope:local data:byte mMoji$3770 = .sbss:0x80453080; // type:object size:0x3 scope:local align:4 data:byte s_groupID = .sbss:0x80453088; // type:object size:0x2 scope:global align:4 data:2byte g_msg_unit = .sbss:0x80453090; // type:object size:0x4 scope:global align:4 l_lightCount = .sbss:0x80453098; // type:object size:0x1 scope:local align:1 data:byte -dOvlpFd_execute_f = .sbss:0x804530A0; // type:object size:0x4 scope:global align:4 data:4byte -g_LogHIO = .sbss:0x804530A8; // type:object size:0x8 scope:global align:4 -g_snHIO = .sbss:0x804530B0; // type:object size:0x8 scope:global align:4 -mBmgStatus = .sbss:0x804530B8; // type:object size:0x4 scope:global align:4 data:4byte -resPhase = .sbss:0x804530C0; // type:object size:0x8 scope:global align:4 -dylPhase = .sbss:0x804530C8; // type:object size:0x8 scope:global align:4 -dylPreLoadTime1 = .sbss:0x804530D0; // type:object size:0x8 scope:global align:4 data:4byte -resPreLoadTime0 = .sbss:0x804530D8; // type:object size:0x8 scope:global align:4 data:4byte -resPreLoadTime1 = .sbss:0x804530E0; // type:object size:0x8 scope:global align:4 data:4byte -g_preLoadHIO = .sbss:0x804530E8; // type:object size:0x4 scope:global align:4 data:4byte +dOvlpFd_execute_f = .sbss:0x804530A0; // type:object size:0x4 scope:local align:4 data:4byte +g_LogHIO = .sbss:0x804530A8; // type:object size:0x8 scope:local align:4 +g_snHIO = .sbss:0x804530B0; // type:object size:0x8 scope:local align:4 +mBmgStatus = .sbss:0x804530B8; // type:object size:0x4 scope:local align:4 data:4byte +resPhase = .sbss:0x804530C0; // type:object size:0x8 scope:local align:4 +dylPhase = .sbss:0x804530C8; // type:object size:0x8 scope:local align:4 +dylPreLoadTime1 = .sbss:0x804530D0; // type:object size:0x8 scope:local align:4 data:4byte +resPreLoadTime0 = .sbss:0x804530D8; // type:object size:0x8 scope:local align:4 data:4byte +resPreLoadTime1 = .sbss:0x804530E0; // type:object size:0x8 scope:local align:4 data:4byte +g_preLoadHIO = .sbss:0x804530E8; // type:object size:0x4 scope:local align:4 data:4byte pauseTimer__9dScnPly_c = .sbss:0x804530EC; // type:object size:0x1 data:byte nextPauseTimer__9dScnPly_c = .sbss:0x804530ED; // type:object size:0x1 data:byte -g_regHIO = .sbss:0x804530F0; // type:object size:0x4 scope:global align:4 data:4byte +g_regHIO = .sbss:0x804530F0; // type:object size:0x8 scope:global align:4 data:4byte m_nowID__9dkWmark_c = .sbss:0x804530F8; // type:object size:0x4 scope:global align:4 data:4byte -lbl_804530FC = .sbss:0x804530FC; // type:object size:0x1 data:byte +init$localstatic4$create__9dkWmark_cFv = .sbss:0x804530FC; // type:object size:0x1 scope:weak data:byte mFirst__24DynamicModuleControlBase = .sbss:0x80453100; // type:object size:0x4 scope:global align:4 data:4byte mLast__24DynamicModuleControlBase = .sbss:0x80453104; // type:object size:0x4 scope:global align:4 data:4byte sAllocBytes__20DynamicModuleControl = .sbss:0x80453108; // type:object size:0x4 scope:global align:4 data:4byte sArchive__20DynamicModuleControl = .sbss:0x8045310C; // type:object size:0x4 scope:global align:4 data:4byte sFileCache__20DynamicModuleControl = .sbss:0x80453110; // type:object size:0x4 scope:global align:4 data:4byte Heap__3cMl = .sbss:0x80453118; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80453120 = .sbss:0x80453120; // type:object size:0x1 data:byte +init$304 = .sbss:0x80453120; // type:object size:0x1 scope:local data:byte Zero__5csXyz = .sbss:0x80453128; // type:object size:0x6 scope:global align:4 -r0 = .sbss:0x80453130; // type:object size:0x4 scope:global align:4 data:4byte -r1 = .sbss:0x80453134; // type:object size:0x4 scope:global align:4 data:4byte -r2 = .sbss:0x80453138; // type:object size:0x4 scope:global align:4 data:4byte -r02 = .sbss:0x8045313C; // type:object size:0x4 scope:global align:4 data:4byte -r12 = .sbss:0x80453140; // type:object size:0x4 scope:global align:4 data:4byte -r22 = .sbss:0x80453144; // type:object size:0x4 scope:global align:4 data:4byte +r0 = .sbss:0x80453130; // type:object size:0x4 scope:local align:4 data:4byte +r1 = .sbss:0x80453134; // type:object size:0x4 scope:local align:4 data:4byte +r2 = .sbss:0x80453138; // type:object size:0x4 scope:local align:4 data:4byte +r02 = .sbss:0x8045313C; // type:object size:0x4 scope:local align:4 data:4byte +r12 = .sbss:0x80453140; // type:object size:0x4 scope:local align:4 data:4byte +r22 = .sbss:0x80453144; // type:object size:0x4 scope:local align:4 data:4byte G_CM3D_F_ABS_MIN = .sbss:0x80453148; // type:object size:0x4 scope:global align:4 data:float _0__7cSAngle = .sbss:0x80453150; // type:object size:0x2 scope:global align:4 data:2byte _1__7cSAngle = .sbss:0x80453154; // type:object size:0x2 scope:global align:4 @@ -22045,44 +22085,44 @@ systemConsole__9JFWSystem = .sbss:0x80453180; // type:object size:0x4 scope:glob sInitCalled__9JFWSystem = .sbss:0x80453184; // type:object size:0x1 scope:global align:1 data:byte sManager__10JFWDisplay = .sbss:0x80453188; // type:object size:0x4 scope:global align:4 data:4byte prevFrame$2597 = .sbss:0x8045318C; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80453190 = .sbss:0x80453190; // type:object size:0x8 data:byte +init$741 = .sbss:0x80453190; // type:object size:0x1 scope:local data:byte nextTick$2642 = .sbss:0x80453198; // type:object size:0x8 scope:local align:4 data:4byte -lbl_804531A0 = .sbss:0x804531A0; // type:object size:0x1 data:byte +init$784 = .sbss:0x804531A0; // type:object size:0x1 scope:local data:byte nextCount$2650 = .sbss:0x804531A4; // type:object size:0x4 scope:local align:4 data:4byte -lbl_804531A8 = .sbss:0x804531A8; // type:object size:0x1 data:byte +init$792 = .sbss:0x804531A8; // type:object size:0x1 scope:local data:byte @569 = .sbss:0x804531B0; // type:object size:0x1 scope:local align:4 data:byte soOutput_none___Q27JStudio14TVariableValue = .sbss:0x804531B8; // type:object size:0x4 scope:global align:4 data:4byte -init$502 = .sbss:0x804531C0; // type:object size:0x8 data:byte -init$442 = .sbss:0x804531C8; // type:object size:0x1 data:byte +init$594 = .sbss:0x804531C0; // type:object size:0x1 scope:local data:byte +init$538 = .sbss:0x804531C8; // type:object size:0x1 scope:local data:byte sThread__6JASDvd = .sbss:0x804531D0; // type:object size:0x4 scope:global align:4 data:4byte JASDram = .sbss:0x804531D8; // type:object size:0x4 scope:global align:4 data:4byte sAramBase__9JASKernel = .sbss:0x804531DC; // type:object size:0x4 scope:global align:4 data:4byte sSystemHeap__9JASKernel = .sbss:0x804531E0; // type:object size:0x4 scope:global align:4 data:4byte sCommandHeap__9JASKernel = .sbss:0x804531E4; // type:object size:0x4 scope:global align:4 data:4byte -sBuffer = .sbss:0x804531E8; // type:object size:0x4 scope:global align:4 data:4byte -sLineMax = .sbss:0x804531EC; // type:object size:0x4 scope:global align:4 data:4byte -sLineCount = .sbss:0x804531F0; // type:object size:0x4 scope:global align:4 data:4byte -sTop = .sbss:0x804531F4; // type:object size:0x4 scope:global align:4 data:4byte +sBuffer = .sbss:0x804531E8; // type:object size:0x4 scope:local align:4 data:4byte +sLineMax = .sbss:0x804531EC; // type:object size:0x4 scope:local align:4 data:4byte +sLineCount = .sbss:0x804531F0; // type:object size:0x4 scope:local align:4 data:4byte +sTop = .sbss:0x804531F4; // type:object size:0x4 scope:local align:4 data:4byte init$localstatic4$getMemPool__58JASPoolAllocObject_MultiThreadedFv = .sbss:0x804531F8; // type:object size:0x1 scope:global data:byte init$localstatic4$getMemPool__43JASPoolAllocObject_MultiThreaded<8JASTrack>Fv = .sbss:0x804531F9; // type:object size:0x1 scope:global data:byte sDefaultParser__10JASSeqCtrl = .sbss:0x80453200; // type:object size:0x4 scope:global align:4 data:4byte sCallBackFunc__12JASSeqParser = .sbss:0x80453208; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8045320C = .sbss:0x8045320C; // type:object size:0x1 data:byte +init$990 = .sbss:0x8045320C; // type:object size:0x1 scope:local data:byte oRandom$1099 = .sbss:0x80453210; // type:object size:0x4 scope:local align:4 data:4byte sLoadThread__13JASAramStream = .sbss:0x80453218; // type:object size:0x4 scope:global align:4 data:4byte sReadBuffer__13JASAramStream = .sbss:0x8045321C; // type:object size:0x4 scope:global align:4 data:4byte sBlockSize__13JASAramStream = .sbss:0x80453220; // type:object size:0x4 scope:global align:4 data:4byte sChannelMax__13JASAramStream = .sbss:0x80453224; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80453228 = .sbss:0x80453228; // type:object size:0x1 data:byte -lbl_80453229 = .sbss:0x80453229; // type:object size:0x1 data:byte -init$localstatic4$getMemPool__46JASPoolAllocObject_MultiThreaded<10JASChannel>Fv = .sbss:0x8045322A; // type:object size:0x1 scope:global align:1 data:byte +struct_80451260 = .sbss:0x80453228; // type:object size:0x1 data:byte +struct_80451261 = .sbss:0x80453229; // type:object size:0x1 data:byte +init$localstatic4$getMemPool__46JASPoolAllocObject_MultiThreaded<10JASChannel>Fv = .sbss:0x8045322A; // type:object size:0x1 scope:weak align:1 data:byte sOscTable__12JASVoiceBank = .sbss:0x80453230; // type:object size:0x4 scope:global align:4 data:4byte oscp$214 = .sbss:0x80453238; // type:object size:0x4 scope:local align:4 data:4byte -lbl_8045323C = .sbss:0x8045323C; // type:object size:0x1 data:byte +data_80451274$0 = .sbss:0x8045323C; // type:object size:0x1 scope:local align:1 data:byte mNoLoad__16JASBasicWaveBank = .sbss:0x80453240; // type:object size:0x4 scope:global align:4 sUsedHeapSize__11JASWSParser = .sbss:0x80453248; // type:object size:0x4 scope:global align:4 data:4byte sUsedHeapSize__12JASBNKParser = .sbss:0x80453250; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80453254 = .sbss:0x80453254; // type:object size:0x1 data:byte +__init__memPool___46JASPoolAllocObject_MultiThreaded<10JASChannel> = .sbss:0x80453254; // type:object size:0x1 scope:weak data:byte sAramHeap__16JASWaveArcLoader = .sbss:0x80453258; // type:object size:0x4 scope:global align:4 data:4byte sBankDisposeListSize__10JASChannel = .sbss:0x80453260; // type:object size:0x4 scope:global align:4 data:4byte sDspDacBuffer__9JASDriver = .sbss:0x80453268; // type:object size:0x4 scope:global align:4 data:4byte @@ -22096,36 +22136,36 @@ extMixCallback__9JASDriver = .sbss:0x80453284; // type:object size:0x4 scope:glo sOutputRate__9JASDriver = .sbss:0x80453288; // type:object size:0x4 scope:global align:4 data:4byte sSubFrameCounter__9JASDriver = .sbss:0x8045328C; // type:object size:0x4 scope:global align:4 data:4byte dacp$239 = .sbss:0x80453290; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80453294 = .sbss:0x80453294; // type:object size:0x1 data:byte +init$348 = .sbss:0x80453294; // type:object size:0x1 scope:local data:byte old_time$264 = .sbss:0x80453298; // type:object size:0x4 scope:local align:4 data:4byte -lbl_8045329C = .sbss:0x8045329C; // type:object size:0x1 data:byte +init$374 = .sbss:0x8045329C; // type:object size:0x1 scope:local data:byte snIntCount__14JASAudioThread = .sbss:0x804532A0; // type:object size:0x4 scope:global align:4 data:4byte sDspChannels__13JASDSPChannel = .sbss:0x804532A8; // type:object size:0x4 scope:global align:4 data:4byte CH_BUF__6JASDsp = .sbss:0x804532B0; // type:object size:0x4 scope:global align:4 data:4byte FX_BUF__6JASDsp = .sbss:0x804532B4; // type:object size:0x4 scope:global align:4 data:4byte sDSPVolume__6JASDsp = .sbss:0x804532B8; // type:object size:0x4 scope:global align:4 data:float -lbl_804532BC = .sbss:0x804532BC; // type:object size:0x1 data:byte -lbl_804532BD = .sbss:0x804532BD; // type:object size:0x1 data:byte -flag = .sbss:0x804532C0; // type:object size:0x4 scope:global align:4 data:4byte -taskreadp = .sbss:0x804532C8; // type:object size:0x4 scope:global align:4 data:4byte -taskwritep = .sbss:0x804532CC; // type:object size:0x4 scope:global align:4 data:4byte -struct_80451308 = .sbss:0x804532D0; // type:object size:0x1 data:byte -struct_80451309 = .sbss:0x804532D1; // type:object size:0x1 data:byte +data_804512F4$264 = .sbss:0x804532BC; // type:object size:0x1 scope:local data:byte +init$26 = .sbss:0x804532BD; // type:object size:0x1 scope:local align:1 data:byte +flag = .sbss:0x804532C0; // type:object size:0x4 scope:local align:4 data:4byte +taskreadp = .sbss:0x804532C8; // type:object size:0x4 scope:local align:4 data:4byte +taskwritep = .sbss:0x804532CC; // type:object size:0x4 scope:local align:4 data:4byte +struct_80451308 = .sbss:0x804532D0; // type:object size:0x1 scope:local data:byte +struct_80451309 = .sbss:0x804532D1; // type:object size:0x1 scope:local data:byte DSP_prior_task = .sbss:0x804532D4; // type:object size:0x4 scope:global align:4 data:4byte -init$localstatic4$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .sbss:0x804532D8; // type:object size:0x8 data:byte -init$localstatic4$getMemPool___35JASPoolAllocObject<13JAISoundChild>Fv = .sbss:0x804532E0; // type:object size:0x8 data:byte -init$localstatic4$getMemPool___27JASPoolAllocObject<6JAISeq>Fv = .sbss:0x804532E8; // type:object size:0x8 data:byte -init$localstatic4$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .sbss:0x804532F0; // type:object size:0x8 data:byte -init$80 = .sbss:0x804532F8; // type:object size:0x1 data:byte +init$localstatic4$getMemPool___26JASPoolAllocObject<5JAISe>Fv = .sbss:0x804532D8; // type:object size:0x1 scope:weak data:byte +init$localstatic4$getMemPool___35JASPoolAllocObject<13JAISoundChild>Fv = .sbss:0x804532E0; // type:object size:0x1 scope:weak data:byte +init$localstatic4$getMemPool___27JASPoolAllocObject<6JAISeq>Fv = .sbss:0x804532E8; // type:object size:0x1 scope:weak data:byte +init$localstatic4$getMemPool___30JASPoolAllocObject<9JAIStream>Fv = .sbss:0x804532F0; // type:object size:0x1 scope:weak data:byte +init$95 = .sbss:0x804532F8; // type:object size:0x1 scope:local data:byte oRandom$401 = .sbss:0x804532FC; // type:object size:0x4 scope:local align:4 data:4byte MIN_DISTANCE_VOLUME__7Z2Param = .sbss:0x80453300; // type:object size:0x4 scope:global align:4 data:float ENEMY_LASTHIT_MUTE_VOLUME__7Z2Param = .sbss:0x80453304; // type:object size:0x4 scope:global align:4 data:float DARK_SE_FILTER_ON__7Z2Param = .sbss:0x80453308; // type:object size:0x1 data:byte DARK_SE_LOW_PASS_FILTER_SETTING__7Z2Param = .sbss:0x80453309; // type:object size:0x1 data:byte SYSTEM_SE_USE_DARK_SE_SETTING__7Z2Param = .sbss:0x8045330A; // type:object size:0x1 data:byte -init$localstatic4$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = .sbss:0x80453310; // type:object size:0x1 scope:global align:1 data:byte -cNearFarRatio = .sbss:0x80453318; // type:object size:0x4 scope:global align:4 data:float -init$localstatic4$getMemPool___30JASPoolAllocObject<9Z2Audible>Fv = .sbss:0x8045331C; // type:object size:0x1 scope:global data:byte +init$localstatic4$getMemPool___39JASPoolAllocObject<17Z2SoundHandlePool>Fv = .sbss:0x80453310; // type:object size:0x1 scope:weak align:1 data:byte +cNearFarRatio = .sbss:0x80453318; // type:object size:0x4 scope:local align:4 data:float +init$localstatic4$getMemPool___30JASPoolAllocObject<9Z2Audible>Fv = .sbss:0x8045331C; // type:object size:0x1 scope:weak data:byte data_80451358 = .sbss:0x80453320; // type:object size:0x1 scope:global data:byte data_80451359 = .sbss:0x80453321; // type:object size:0x1 scope:global data:byte mLinkPtr__14Z2CreatureLink = .sbss:0x80453328; // type:object size:0x4 scope:global align:4 data:4byte @@ -22134,20 +22174,21 @@ sSystemHeap__7JKRHeap = .sbss:0x80453338; // type:object size:0x4 scope:global a sCurrentHeap__7JKRHeap = .sbss:0x8045333C; // type:object size:0x4 scope:global align:4 data:4byte sRootHeap__7JKRHeap = .sbss:0x80453340; // type:object size:0x4 scope:global align:4 data:4byte mErrorHandler__7JKRHeap = .sbss:0x80453344; // type:object size:0x4 scope:global align:4 data:4byte -data_80451380 = .sbss:0x80453348; // type:object size:0x1 data:byte +data_80451380 = .sbss:0x80453348; // type:object size:0x1 scope:local data:byte mCodeStart__7JKRHeap = .sbss:0x8045334C; // type:object size:0x4 scope:global align:4 data:4byte mCodeEnd__7JKRHeap = .sbss:0x80453350; // type:object size:0x4 scope:global align:4 data:4byte mUserRamStart__7JKRHeap = .sbss:0x80453354; // type:object size:0x4 scope:global align:4 data:4byte mUserRamEnd__7JKRHeap = .sbss:0x80453358; // type:object size:0x4 scope:global align:4 data:4byte mMemorySize__7JKRHeap = .sbss:0x8045335C; // type:object size:0x4 scope:global align:4 data:4byte -DBfoundSize = .sbss:0x80453360; // type:object size:0x4 scope:global align:4 data:4byte -DBfoundOffset = .sbss:0x80453364; // type:object size:0x4 scope:global align:4 data:4byte -DBfoundBlock = .sbss:0x80453368; // type:object size:0x4 scope:global align:4 data:4byte -DBnewFreeBlock = .sbss:0x8045336C; // type:object size:0x4 scope:global align:4 data:4byte -DBnewUsedBlock = .sbss:0x80453370; // type:object size:0x4 scope:global align:4 data:4byte +DBfoundSize = .sbss:0x80453360; // type:object size:0x4 scope:local align:4 data:4byte +DBfoundOffset = .sbss:0x80453364; // type:object size:0x4 scope:local align:4 data:4byte +DBfoundBlock = .sbss:0x80453368; // type:object size:0x4 scope:local align:4 data:4byte +DBnewFreeBlock = .sbss:0x8045336C; // type:object size:0x4 scope:local align:4 data:4byte +DBnewUsedBlock = .sbss:0x80453370; // type:object size:0x4 scope:local align:4 data:4byte sManager__15JKRThreadSwitch = .sbss:0x80453378; // type:object size:0x4 scope:global align:4 data:4byte sTotalCount__15JKRThreadSwitch = .sbss:0x8045337C; // type:object size:0x4 scope:global align:4 data:4byte -sTotalStart__15JKRThreadSwitch = .sbss:0x80453380; // type:object size:0x8 scope:global align:4 data:4byte +sTotalStart__15JKRThreadSwitch = .sbss:0x80453380; // type:object size:0x4 scope:global align:4 data:4byte +data_804513BC = .sbss:0x80453384; // type:object size:0x4 scope:local align:4 data:4byte mUserPreCallback__15JKRThreadSwitch = .sbss:0x80453388; // type:object size:0x4 scope:global align:4 data:4byte mUserPostCallback__15JKRThreadSwitch = .sbss:0x8045338C; // type:object size:0x4 scope:global align:4 data:4byte sAramObject__7JKRAram = .sbss:0x80453390; // type:object size:0x4 scope:global align:4 data:4byte @@ -22159,11 +22200,11 @@ refCurrent = .sbss:0x804533A4; // type:object size:0x4 scope:local align:4 data: srcOffset = .sbss:0x804533A8; // type:object size:0x4 scope:local align:4 data:4byte transLeft = .sbss:0x804533AC; // type:object size:0x4 scope:local align:4 data:4byte srcLimit = .sbss:0x804533B0; // type:object size:0x4 scope:local align:4 data:4byte -srcAddress = .sbss:0x804533B4; // type:object size:0x4 scope:global align:4 data:4byte +srcAddress = .sbss:0x804533B4; // type:object size:0x4 scope:local align:4 data:4byte fileOffset = .sbss:0x804533B8; // type:object size:0x4 scope:local align:4 data:4byte readCount = .sbss:0x804533BC; // type:object size:0x4 scope:local align:4 data:4byte maxDest = .sbss:0x804533C0; // type:object size:0x4 scope:local align:4 data:4byte -lbl_804533C4 = .sbss:0x804533C4; // type:object size:0x1 data:byte +s_is_decompress_mutex_initialized = .sbss:0x804533C4; // type:object size:0x1 scope:local data:byte tsPtr = .sbss:0x804533C8; // type:object size:0x4 scope:local align:4 data:4byte tsArea = .sbss:0x804533CC; // type:object size:0x4 scope:local align:4 data:4byte sAramStreamObject__13JKRAramStream = .sbss:0x804533D0; // type:object size:0x4 scope:global align:4 data:4byte @@ -22184,7 +22225,7 @@ srcFile = .sbss:0x80453410; // type:object size:0x4 scope:local align:4 data:4by fileOffset = .sbss:0x80453414; // type:object size:0x4 scope:local align:4 data:4byte readCount = .sbss:0x80453418; // type:object size:0x4 scope:local align:4 data:4byte maxDest = .sbss:0x8045341C; // type:object size:0x4 scope:local align:4 data:4byte -data_80451458 = .sbss:0x80453420; // type:object size:0x1 data:byte +data_80451458 = .sbss:0x80453420; // type:object size:0x1 scope:local data:byte tsPtr = .sbss:0x80453424; // type:object size:0x4 scope:local align:4 data:4byte tsArea = .sbss:0x80453428; // type:object size:0x4 scope:local align:4 data:4byte szpBuf = .sbss:0x80453430; // type:object size:0x4 scope:local align:4 data:4byte @@ -22192,9 +22233,9 @@ szpEnd = .sbss:0x80453434; // type:object size:0x4 scope:local align:4 data:4byt refBuf = .sbss:0x80453438; // type:object size:0x4 scope:local align:4 data:4byte refEnd = .sbss:0x8045343C; // type:object size:0x4 scope:local align:4 data:4byte refCurrent = .sbss:0x80453440; // type:object size:0x4 scope:local align:4 data:4byte -dmaBuf = .sbss:0x80453444; // type:object size:0x4 scope:global align:4 data:4byte -dmaEnd = .sbss:0x80453448; // type:object size:0x4 scope:global align:4 data:4byte -dmaCurrent = .sbss:0x8045344C; // type:object size:0x4 scope:global align:4 data:4byte +dmaBuf = .sbss:0x80453444; // type:object size:0x4 scope:local align:4 data:4byte +dmaEnd = .sbss:0x80453448; // type:object size:0x4 scope:local align:4 data:4byte +dmaCurrent = .sbss:0x8045344C; // type:object size:0x4 scope:local align:4 data:4byte srcOffset = .sbss:0x80453450; // type:object size:0x4 scope:local align:4 data:4byte transLeft = .sbss:0x80453454; // type:object size:0x4 scope:local align:4 data:4byte srcLimit = .sbss:0x80453458; // type:object size:0x4 scope:local align:4 data:4byte @@ -22202,11 +22243,11 @@ srcFile = .sbss:0x8045345C; // type:object size:0x4 scope:local align:4 data:4by fileOffset = .sbss:0x80453460; // type:object size:0x4 scope:local align:4 data:4byte readCount = .sbss:0x80453464; // type:object size:0x4 scope:local align:4 data:4byte maxDest = .sbss:0x80453468; // type:object size:0x4 scope:local align:4 data:4byte -lbl_8045346C = .sbss:0x8045346C; // type:object size:0x1 data:byte +data_804514A4 = .sbss:0x8045346C; // type:object size:0x1 scope:local data:byte tsPtr = .sbss:0x80453470; // type:object size:0x4 scope:local align:4 data:4byte tsArea = .sbss:0x80453474; // type:object size:0x4 scope:local align:4 data:4byte sDecompObject__9JKRDecomp = .sbss:0x80453478; // type:object size:0x4 scope:global align:4 data:4byte -data_804514B8 = .sbss:0x80453480; // type:object size:0x1 data:byte +data_804514B8 = .sbss:0x80453480; // type:object size:0x1 scope:local data:byte sCurrentFifo__12JUTGraphFifo = .sbss:0x80453484; // type:object size:0x4 scope:global align:4 data:4byte mGpStatus__12JUTGraphFifo = .sbss:0x80453488; // type:object size:0x5 scope:global align:4 sDebugPrint__10JUTDbPrint = .sbss:0x80453490; // type:object size:0x4 scope:global align:4 data:4byte @@ -22232,26 +22273,26 @@ sConsole__12JUTException = .sbss:0x804534E4; // type:object size:0x4 scope:globa msr__12JUTException = .sbss:0x804534E8; // type:object size:0x4 scope:global align:4 data:4byte fpscr__12JUTException = .sbss:0x804534EC; // type:object size:0x4 scope:global align:4 data:4byte sDirectPrint__14JUTDirectPrint = .sbss:0x804534F0; // type:object size:0x4 scope:global align:4 data:4byte -sMessageLife__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x804534F8; // type:object size:0x4 scope:global align:4 data:4byte +sMessageLife__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x804534F8; // type:object size:0x4 scope:local align:4 data:4byte sManager__8JUTVideo = .sbss:0x80453500; // type:object size:0x4 scope:global align:4 data:4byte sVideoLastTick__8JUTVideo = .sbss:0x80453504; // type:object size:0x4 scope:global align:4 data:4byte sVideoInterval__8JUTVideo = .sbss:0x80453508; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8045350C = .sbss:0x8045350C; // type:object size:0x1 data:byte +data_80451544 = .sbss:0x8045350C; // type:object size:0x1 scope:local data:byte frameBuffer$2222 = .sbss:0x80453510; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80453514 = .sbss:0x80453514; // type:object size:0x1 data:byte +init$296 = .sbss:0x80453514; // type:object size:0x1 scope:local data:byte sManager__6JUTXfb = .sbss:0x80453518; // type:object size:0x4 scope:global align:4 data:4byte sManager__10JUTProcBar = .sbss:0x80453520; // type:object size:0x4 scope:global align:4 data:4byte cnt$2330 = .sbss:0x80453524; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80453528 = .sbss:0x80453528; // type:object size:0x1 data:byte +init$491 = .sbss:0x80453528; // type:object size:0x1 scope:local data:byte cntUser$2379 = .sbss:0x8045352C; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80453530 = .sbss:0x80453530; // type:object size:0x1 data:byte +init$540 = .sbss:0x80453530; // type:object size:0x1 scope:local data:byte sManager__17JUTConsoleManager = .sbss:0x80453538; // type:object size:0x4 scope:global align:4 data:4byte -sReportConsole = .sbss:0x8045353C; // type:object size:0x4 scope:global align:4 data:4byte -sWarningConsole = .sbss:0x80453540; // type:object size:0x4 scope:global align:4 data:4byte +sReportConsole = .sbss:0x8045353C; // type:object size:0x4 scope:local align:4 data:4byte +sWarningConsole = .sbss:0x80453540; // type:object size:0x4 scope:local align:4 data:4byte mStrBuff__8J2DPrint = .sbss:0x80453548; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8045354C = .sbss:0x8045354C; // type:object size:0x1 data:byte +sStrBufInitialized = .sbss:0x8045354C; // type:object size:0x1 scope:local data:byte mStrBuffSize__8J2DPrint = .sbss:0x80453550; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80453554 = .sbss:0x80453554; // type:object size:0x1 data:byte +data_8045158C = .sbss:0x80453554; // type:object size:0x4 scope:local data:4byte mDataManage__9J2DScreen = .sbss:0x80453558; // type:object size:0x4 scope:global align:4 data:4byte j3dDefaultViewNo = .sbss:0x80453560; // type:object size:0x4 scope:global align:4 sInterruptFlag__17J3DDisplayListObj = .sbss:0x80453568; // type:object size:0x4 scope:global align:4 data:4byte @@ -22264,216 +22305,216 @@ sMtxPtrTbl__21J3DShapeMtxConcatView = .sbss:0x80453580; // type:object size:0x8 sTexGenBlock__17J3DDifferedTexMtx = .sbss:0x80453588; // type:object size:0x4 scope:global align:4 data:4byte sTexMtxObj__17J3DDifferedTexMtx = .sbss:0x8045358C; // type:object size:0x4 scope:global align:4 data:4byte sInterruptFlag$903 = .sbss:0x80453590; // type:object size:0x4 scope:local align:4 data:4byte -lbl_80453594 = .sbss:0x80453594; // type:object size:0x1 data:byte +init$470 = .sbss:0x80453594; // type:object size:0x1 scope:local data:byte sOldVcdVatCmd__8J3DShape = .sbss:0x80453598; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8045359C = .sbss:0x8045359C; // type:object size:0x1 data:byte +sEnvelopeFlag__8J3DShape = .sbss:0x8045359C; // type:object size:0x1 data:byte SizeOfJ3DColorBlockLightOffLoad = .sbss:0x804535A0; // type:object size:0x4 scope:global align:4 data:4byte SizeOfJ3DColorBlockAmbientOnLoad = .sbss:0x804535A4; // type:object size:0x4 scope:global align:4 data:4byte entryNum__13J3DDrawBuffer = .sbss:0x804535A8; // type:object size:0x4 scope:global align:4 data:4byte sInterruptFlag$965 = .sbss:0x804535B0; // type:object size:0x4 scope:local align:4 data:4byte -lbl_804535B4 = .sbss:0x804535B4; // type:object size:0x1 data:byte +init$461 = .sbss:0x804535B4; // type:object size:0x1 scope:local data:byte mMtxBuffer__10J3DMtxCalc = .sbss:0x804535B8; // type:object size:0x4 scope:global align:4 data:4byte mJoint__10J3DMtxCalc = .sbss:0x804535BC; // type:object size:0x4 scope:global align:4 data:4byte mCurrentMtxCalc__8J3DJoint = .sbss:0x804535C0; // type:object size:0x4 scope:global align:4 data:4byte BootInfo = .sbss:0x804535C8; // type:object size:0x4 scope:local align:4 data:4byte -BI2DebugFlag = .sbss:0x804535CC; // type:object size:0x4 scope:global align:4 data:4byte -BI2DebugFlagHolder = .sbss:0x804535D0; // type:object size:0x4 scope:global align:4 data:4byte -__OSIsGcam = .sbss:0x804535D4; // type:object size:0x4 scope:global align:4 data:4byte +BI2DebugFlag = .sbss:0x804535CC; // type:object size:0x4 scope:local align:4 data:4byte +BI2DebugFlagHolder = .sbss:0x804535D0; // type:object size:0x4 scope:local align:4 data:4byte +__OSIsGcam = .sbss:0x804535D4; // type:object size:0x4 scope:weak align:4 data:4byte ZeroF = .sbss:0x804535D8; // type:object size:0x8 scope:global align:4 data:double ZeroPS = .sbss:0x804535E0; // type:object size:0x8 scope:global align:4 AreWeInitialized = .sbss:0x804535E8; // type:object size:0x4 scope:global align:4 data:4byte OSExceptionTable = .sbss:0x804535EC; // type:object size:0x4 scope:global align:4 data:4byte __OSInIPL = .sbss:0x804535F0; // type:object size:0x4 scope:global align:4 data:4byte __OSStartTime = .sbss:0x804535F8; // type:object size:0x8 scope:global align:4 data:4byte -AlarmQueue = .sbss:0x80453600; // type:object size:0x8 scope:global align:4 data:4byte -HeapArray = .sbss:0x80453608; // type:object size:0x4 scope:global align:4 data:4byte -NumHeaps = .sbss:0x8045360C; // type:object size:0x4 scope:global align:4 data:4byte -ArenaStart = .sbss:0x80453610; // type:object size:0x4 scope:global align:4 data:4byte -ArenaEnd = .sbss:0x80453614; // type:object size:0x4 scope:global align:4 data:4byte -__OSArenaHi = .sbss:0x80453618; // type:object size:0x4 scope:global align:4 data:4byte -Prepared = .sbss:0x80453620; // type:object size:0x4 scope:global align:4 data:4byte +AlarmQueue = .sbss:0x80453600; // type:object size:0x8 scope:local align:4 data:4byte +HeapArray = .sbss:0x80453608; // type:object size:0x4 scope:local align:4 data:4byte +NumHeaps = .sbss:0x8045360C; // type:object size:0x4 scope:local align:4 data:4byte +ArenaStart = .sbss:0x80453610; // type:object size:0x4 scope:local align:4 data:4byte +ArenaEnd = .sbss:0x80453614; // type:object size:0x4 scope:local align:4 data:4byte +__OSArenaHi = .sbss:0x80453618; // type:object size:0x4 scope:local align:4 data:4byte +Prepared = .sbss:0x80453620; // type:object size:0x4 scope:local align:4 data:4byte apploaderPosition$69 = .sbss:0x80453624; // type:object size:0x4 scope:local align:4 data:4byte -FontDataAnsi = .sbss:0x80453628; // type:object size:0x4 scope:global align:4 data:4byte -FontDataSjis = .sbss:0x8045362C; // type:object size:0x4 scope:global align:4 data:4byte -ParseString = .sbss:0x80453630; // type:object size:0x4 scope:global align:4 data:4byte -InterruptHandlerTable = .sbss:0x80453638; // type:object size:0x4 scope:global align:4 data:4byte +FontDataAnsi = .sbss:0x80453628; // type:object size:0x4 scope:local align:4 data:4byte +FontDataSjis = .sbss:0x8045362C; // type:object size:0x4 scope:local align:4 data:4byte +ParseString = .sbss:0x80453630; // type:object size:0x4 scope:local align:4 data:4byte +InterruptHandlerTable = .sbss:0x80453638; // type:object size:0x4 scope:local align:4 data:4byte __OSLastInterruptSrr0 = .sbss:0x8045363C; // type:object size:0x4 scope:global align:4 data:4byte __OSLastInterrupt = .sbss:0x80453640; // type:object size:0x2 scope:global align:4 data:2byte __OSLastInterruptTime = .sbss:0x80453648; // type:object size:0x8 scope:global align:4 data:4byte -SaveStart = .sbss:0x80453650; // type:object size:0x4 scope:global align:4 data:4byte -SaveEnd = .sbss:0x80453654; // type:object size:0x4 scope:global align:4 data:4byte -ResetFunctionQueue = .sbss:0x80453658; // type:object size:0x8 scope:global align:4 data:4byte -bootThisDol = .sbss:0x80453660; // type:object size:0x4 scope:global align:4 data:4byte -ResetCallback = .sbss:0x80453668; // type:object size:0x4 scope:global align:4 data:4byte -Down = .sbss:0x8045366C; // type:object size:0x4 scope:global align:4 data:4byte +SaveStart = .sbss:0x80453650; // type:object size:0x4 scope:local align:4 data:4byte +SaveEnd = .sbss:0x80453654; // type:object size:0x4 scope:local align:4 data:4byte +ResetFunctionQueue = .sbss:0x80453658; // type:object size:0x8 scope:local align:4 data:4byte +bootThisDol = .sbss:0x80453660; // type:object size:0x4 scope:local align:4 data:4byte +ResetCallback = .sbss:0x80453668; // type:object size:0x4 scope:local align:4 data:4byte +Down = .sbss:0x8045366C; // type:object size:0x4 scope:local align:4 data:4byte LastState = .sbss:0x80453670; // type:object size:0x4 scope:local align:4 data:4byte -HoldUp = .sbss:0x80453678; // type:object size:0x8 scope:global align:4 data:4byte -HoldDown = .sbss:0x80453680; // type:object size:0x8 scope:global align:4 data:4byte -RunQueueBits = .sbss:0x80453688; // type:object size:0x4 scope:global align:4 data:4byte -RunQueueHint = .sbss:0x8045368C; // type:object size:0x4 scope:global align:4 data:4byte -Reschedule = .sbss:0x80453690; // type:object size:0x4 scope:global align:4 data:4byte +HoldUp = .sbss:0x80453678; // type:object size:0x8 scope:local align:4 data:4byte +HoldDown = .sbss:0x80453680; // type:object size:0x8 scope:local align:4 data:4byte +RunQueueBits = .sbss:0x80453688; // type:object size:0x4 scope:local align:4 data:4byte +RunQueueHint = .sbss:0x8045368C; // type:object size:0x4 scope:local align:4 data:4byte +Reschedule = .sbss:0x80453690; // type:object size:0x4 scope:local align:4 data:4byte Debug_BBA = .sbss:0x80453698; // type:object size:0x1 scope:global align:8 data:byte -IDSerialPort1 = .sbss:0x804536A0; // type:object size:0x4 scope:global align:4 data:4byte -Chan = .sbss:0x804536A8; // type:object size:0x4 scope:global align:4 data:4byte -Dev = .sbss:0x804536AC; // type:object size:0x4 scope:global align:4 data:4byte -Enabled = .sbss:0x804536B0; // type:object size:0x4 scope:global align:4 data:4byte -BarnacleEnabled = .sbss:0x804536B4; // type:object size:0x4 scope:global align:4 data:4byte +IDSerialPort1 = .sbss:0x804536A0; // type:object size:0x4 scope:local align:4 data:4byte +Chan = .sbss:0x804536A8; // type:object size:0x4 scope:local align:4 data:4byte +Dev = .sbss:0x804536AC; // type:object size:0x4 scope:local align:4 data:4byte +Enabled = .sbss:0x804536B0; // type:object size:0x4 scope:local align:4 data:4byte +BarnacleEnabled = .sbss:0x804536B4; // type:object size:0x4 scope:local align:4 data:4byte cmdTypeAndStatus$78 = .sbss:0x804536B8; // type:object size:0x4 scope:local align:4 cmdTypeAndStatus$372 = .sbss:0x804536BC; // type:object size:0x4 scope:local align:4 __PADFixBits = .sbss:0x804536C0; // type:object size:0x4 scope:global align:4 data:4byte -SamplingRate = .sbss:0x804536C8; // type:object size:0x4 scope:global align:4 data:4byte +SamplingRate = .sbss:0x804536C8; // type:object size:0x4 scope:local align:4 data:4byte __DBInterface = .sbss:0x804536D0; // type:object size:0x4 scope:global align:4 data:4byte DBVerbose = .sbss:0x804536D4; // type:object size:0x4 scope:global align:4 data:4byte -StopAtNextInt = .sbss:0x804536D8; // type:object size:0x4 scope:global align:4 data:4byte -LastLength = .sbss:0x804536DC; // type:object size:0x4 scope:global align:4 data:4byte +StopAtNextInt = .sbss:0x804536D8; // type:object size:0x4 scope:local align:4 data:4byte +LastLength = .sbss:0x804536DC; // type:object size:0x4 scope:local align:4 data:4byte Callback = .sbss:0x804536E0; // type:object size:0x4 scope:local align:4 data:4byte -ResetCoverCallback = .sbss:0x804536E4; // type:object size:0x4 scope:global align:4 data:4byte -LastResetEnd = .sbss:0x804536E8; // type:object size:0x8 scope:global align:4 data:4byte -ResetOccurred = .sbss:0x804536F0; // type:object size:0x4 scope:global align:4 data:4byte -WaitingCoverClose = .sbss:0x804536F4; // type:object size:0x4 scope:global align:4 data:4byte -Breaking = .sbss:0x804536F8; // type:object size:0x4 scope:global align:4 data:4byte -WorkAroundType = .sbss:0x804536FC; // type:object size:0x4 scope:global align:4 data:4byte -WorkAroundSeekLocation = .sbss:0x80453700; // type:object size:0x4 scope:global align:4 data:4byte -LastReadFinished = .sbss:0x80453708; // type:object size:0x8 scope:global align:4 data:4byte -LastReadIssued = .sbss:0x80453710; // type:object size:0x8 scope:global align:4 data:4byte -LastCommandWasRead = .sbss:0x80453718; // type:object size:0x4 scope:global align:4 data:4byte -NextCommandNumber = .sbss:0x8045371C; // type:object size:0x4 scope:global align:4 data:4byte +ResetCoverCallback = .sbss:0x804536E4; // type:object size:0x4 scope:local align:4 data:4byte +LastResetEnd = .sbss:0x804536E8; // type:object size:0x8 scope:local align:4 data:4byte +ResetOccurred = .sbss:0x804536F0; // type:object size:0x4 scope:local align:4 data:4byte +WaitingCoverClose = .sbss:0x804536F4; // type:object size:0x4 scope:local align:4 data:4byte +Breaking = .sbss:0x804536F8; // type:object size:0x4 scope:local align:4 data:4byte +WorkAroundType = .sbss:0x804536FC; // type:object size:0x4 scope:local align:4 data:4byte +WorkAroundSeekLocation = .sbss:0x80453700; // type:object size:0x4 scope:local align:4 data:4byte +LastReadFinished = .sbss:0x80453708; // type:object size:0x8 scope:local align:4 data:4byte +LastReadIssued = .sbss:0x80453710; // type:object size:0x8 scope:local align:4 data:4byte +LastCommandWasRead = .sbss:0x80453718; // type:object size:0x4 scope:local align:4 data:4byte +NextCommandNumber = .sbss:0x8045371C; // type:object size:0x4 scope:local align:4 data:4byte BootInfo = .sbss:0x80453720; // type:object size:0x4 scope:local align:4 data:4byte -FstStart = .sbss:0x80453724; // type:object size:0x4 scope:global align:4 data:4byte -FstStringStart = .sbss:0x80453728; // type:object size:0x4 scope:global align:4 data:4byte -MaxEntryNum = .sbss:0x8045372C; // type:object size:0x4 scope:global align:4 data:4byte -currentDirectory = .sbss:0x80453730; // type:object size:0x4 scope:global align:4 data:4byte +FstStart = .sbss:0x80453724; // type:object size:0x4 scope:local align:4 data:4byte +FstStringStart = .sbss:0x80453728; // type:object size:0x4 scope:local align:4 data:4byte +MaxEntryNum = .sbss:0x8045372C; // type:object size:0x4 scope:local align:4 data:4byte +currentDirectory = .sbss:0x80453730; // type:object size:0x4 scope:local align:4 data:4byte __DVDLongFileNameFlag = .sbss:0x80453734; // type:object size:0x4 scope:global align:4 data:4byte __DVDThreadQueue = .sbss:0x80453738; // type:object size:0x8 scope:global align:4 -executing = .sbss:0x80453740; // type:object size:0x4 scope:global align:4 data:4byte -IDShouldBe = .sbss:0x80453744; // type:object size:0x4 scope:global align:4 data:4byte -bootInfo = .sbss:0x80453748; // type:object size:0x4 scope:global align:4 data:4byte -PauseFlag = .sbss:0x8045374C; // type:object size:0x4 scope:global align:4 data:4byte -PausingFlag = .sbss:0x80453750; // type:object size:0x4 scope:global align:4 data:4byte -AutoFinishing = .sbss:0x80453754; // type:object size:0x4 scope:global align:4 data:4byte -FatalErrorFlag = .sbss:0x80453758; // type:object size:0x4 scope:global align:4 data:4byte -CurrCommand = .sbss:0x8045375C; // type:object size:0x4 scope:global align:4 data:4byte -Canceling = .sbss:0x80453760; // type:object size:0x4 scope:global align:4 data:4byte -CancelCallback = .sbss:0x80453764; // type:object size:0x4 scope:global align:4 data:4byte -ResumeFromHere = .sbss:0x80453768; // type:object size:0x4 scope:global align:4 data:4byte -CancelLastError = .sbss:0x8045376C; // type:object size:0x4 scope:global align:4 data:4byte -LastError = .sbss:0x80453770; // type:object size:0x4 scope:global align:4 data:4byte -NumInternalRetry = .sbss:0x80453774; // type:object size:0x4 scope:global align:4 data:4byte -ResetRequired = .sbss:0x80453778; // type:object size:0x4 scope:global align:4 data:4byte -FirstTimeInBootrom = .sbss:0x8045377C; // type:object size:0x4 scope:global align:4 data:4byte -MotorState = .sbss:0x80453780; // type:object size:0x4 scope:global align:4 data:4byte -DVDInitialized = .sbss:0x80453784; // type:object size:0x4 scope:global align:4 data:4byte -LastState = .sbss:0x80453788; // type:object size:0x4 scope:local align:4 data:4byte -FatalFunc = .sbss:0x80453790; // type:object size:0x4 scope:global align:4 data:4byte -status = .sbss:0x80453798; // type:object size:0x4 scope:global align:4 data:4byte -bb2 = .sbss:0x8045379C; // type:object size:0x4 scope:global align:4 data:4byte -idTmp = .sbss:0x804537A0; // type:object size:0x4 scope:global align:4 data:4byte -IsInitialized = .sbss:0x804537A8; // type:object size:0x4 scope:global align:4 data:4byte -retraceCount = .sbss:0x804537AC; // type:object size:0x4 scope:global align:4 data:4byte -flushFlag = .sbss:0x804537B0; // type:object size:0x4 scope:global align:4 data:4byte -retraceQueue = .sbss:0x804537B4; // type:object size:0x8 scope:global align:4 -PreCB = .sbss:0x804537BC; // type:object size:0x4 scope:global align:4 data:4byte -PostCB = .sbss:0x804537C0; // type:object size:0x4 scope:global align:4 data:4byte -PositionCallback = .sbss:0x804537C4; // type:object size:0x4 scope:global align:4 data:4byte -encoderType = .sbss:0x804537C8; // type:object size:0x4 scope:global align:4 data:4byte -displayOffsetH = .sbss:0x804537CC; // type:object size:0x2 scope:global align:2 data:2byte -displayOffsetV = .sbss:0x804537CE; // type:object size:0x2 scope:global align:2 data:2byte -changeMode = .sbss:0x804537D0; // type:object size:0x4 scope:global align:4 data:4byte -changed = .sbss:0x804537D8; // type:object size:0x8 scope:global align:4 data:4byte -shdwChangeMode = .sbss:0x804537E0; // type:object size:0x4 scope:global align:4 data:4byte -shdwChanged = .sbss:0x804537E8; // type:object size:0x8 scope:global align:4 data:4byte -CurrTiming = .sbss:0x804537F0; // type:object size:0x4 scope:global align:4 data:4byte -CurrTvMode = .sbss:0x804537F4; // type:object size:0x4 scope:global align:4 data:4byte -NextBufAddr = .sbss:0x804537F8; // type:object size:0x4 scope:global align:4 data:4byte -CurrBufAddr = .sbss:0x804537FC; // type:object size:0x4 scope:global align:4 data:4byte -FBSet = .sbss:0x80453800; // type:object size:0x4 scope:global align:4 data:4byte -timingExtra = .sbss:0x80453804; // type:object size:0x4 scope:global align:4 data:4byte +executing = .sbss:0x80453740; // type:object size:0x4 scope:local align:4 data:4byte +IDShouldBe = .sbss:0x80453744; // type:object size:0x4 scope:local align:4 data:4byte +bootInfo = .sbss:0x80453748; // type:object size:0x4 scope:local align:4 data:4byte +PauseFlag = .sbss:0x8045374C; // type:object size:0x4 scope:local align:4 data:4byte +PausingFlag = .sbss:0x80453750; // type:object size:0x4 scope:local align:4 data:4byte +AutoFinishing = .sbss:0x80453754; // type:object size:0x4 scope:local align:4 data:4byte +FatalErrorFlag = .sbss:0x80453758; // type:object size:0x4 scope:local align:4 data:4byte +CurrCommand = .sbss:0x8045375C; // type:object size:0x4 scope:local align:4 data:4byte +Canceling = .sbss:0x80453760; // type:object size:0x4 scope:local align:4 data:4byte +CancelCallback = .sbss:0x80453764; // type:object size:0x4 scope:local align:4 data:4byte +ResumeFromHere = .sbss:0x80453768; // type:object size:0x4 scope:local align:4 data:4byte +CancelLastError = .sbss:0x8045376C; // type:object size:0x4 scope:local align:4 data:4byte +LastError = .sbss:0x80453770; // type:object size:0x4 scope:local align:4 data:4byte +NumInternalRetry = .sbss:0x80453774; // type:object size:0x4 scope:local align:4 data:4byte +ResetRequired = .sbss:0x80453778; // type:object size:0x4 scope:local align:4 data:4byte +FirstTimeInBootrom = .sbss:0x8045377C; // type:object size:0x4 scope:local align:4 data:4byte +MotorState = .sbss:0x80453780; // type:object size:0x4 scope:local align:4 data:4byte +DVDInitialized = .sbss:0x80453784; // type:object size:0x4 scope:local align:4 data:4byte +LastState = .sbss:0x80453788; // type:object size:0x4 scope:global align:4 data:4byte +FatalFunc = .sbss:0x80453790; // type:object size:0x4 scope:local align:4 data:4byte +status = .sbss:0x80453798; // type:object size:0x4 scope:local align:4 data:4byte +bb2 = .sbss:0x8045379C; // type:object size:0x4 scope:local align:4 data:4byte +idTmp = .sbss:0x804537A0; // type:object size:0x4 scope:local align:4 data:4byte +IsInitialized = .sbss:0x804537A8; // type:object size:0x4 scope:local align:4 data:4byte +retraceCount = .sbss:0x804537AC; // type:object size:0x4 scope:local align:4 data:4byte +flushFlag = .sbss:0x804537B0; // type:object size:0x4 scope:local align:4 data:4byte +retraceQueue = .sbss:0x804537B4; // type:object size:0x8 scope:local align:4 +PreCB = .sbss:0x804537BC; // type:object size:0x4 scope:local align:4 data:4byte +PostCB = .sbss:0x804537C0; // type:object size:0x4 scope:local align:4 data:4byte +PositionCallback = .sbss:0x804537C4; // type:object size:0x4 scope:local align:4 data:4byte +encoderType = .sbss:0x804537C8; // type:object size:0x4 scope:local align:4 data:4byte +displayOffsetH = .sbss:0x804537CC; // type:object size:0x2 scope:local align:2 data:2byte +displayOffsetV = .sbss:0x804537CE; // type:object size:0x2 scope:local align:2 data:2byte +changeMode = .sbss:0x804537D0; // type:object size:0x4 scope:local align:4 data:4byte +changed = .sbss:0x804537D8; // type:object size:0x8 scope:local align:4 data:4byte +shdwChangeMode = .sbss:0x804537E0; // type:object size:0x4 scope:local align:4 data:4byte +shdwChanged = .sbss:0x804537E8; // type:object size:0x8 scope:local align:4 data:4byte +CurrTiming = .sbss:0x804537F0; // type:object size:0x4 scope:local align:4 data:4byte +CurrTvMode = .sbss:0x804537F4; // type:object size:0x4 scope:local align:4 data:4byte +NextBufAddr = .sbss:0x804537F8; // type:object size:0x4 scope:local align:4 data:4byte +CurrBufAddr = .sbss:0x804537FC; // type:object size:0x4 scope:local align:4 data:4byte +FBSet = .sbss:0x80453800; // type:object size:0x4 scope:local align:4 data:4byte +timingExtra = .sbss:0x80453804; // type:object size:0x4 scope:local align:4 data:4byte message$351 = .sbss:0x80453808; // type:object size:0x4 scope:local align:4 data:4byte -Initialized = .sbss:0x80453810; // type:object size:0x4 scope:global align:4 data:4byte -EnabledBits = .sbss:0x80453814; // type:object size:0x4 scope:global align:4 data:4byte -ResettingBits = .sbss:0x80453818; // type:object size:0x4 scope:global align:4 data:4byte -RecalibrateBits = .sbss:0x8045381C; // type:object size:0x4 scope:global align:4 data:4byte -WaitingBits = .sbss:0x80453820; // type:object size:0x4 scope:global align:4 data:4byte -CheckingBits = .sbss:0x80453824; // type:object size:0x4 scope:global align:4 data:4byte -PendingBits = .sbss:0x80453828; // type:object size:0x4 scope:global align:4 data:4byte -BarrelBits = .sbss:0x8045382C; // type:object size:0x4 scope:global align:4 data:4byte -SamplingCallback = .sbss:0x80453830; // type:object size:0x4 scope:global align:4 data:4byte +Initialized = .sbss:0x80453810; // type:object size:0x4 scope:local align:4 data:4byte +EnabledBits = .sbss:0x80453814; // type:object size:0x4 scope:local align:4 data:4byte +ResettingBits = .sbss:0x80453818; // type:object size:0x4 scope:local align:4 data:4byte +RecalibrateBits = .sbss:0x8045381C; // type:object size:0x4 scope:local align:4 data:4byte +WaitingBits = .sbss:0x80453820; // type:object size:0x4 scope:local align:4 data:4byte +CheckingBits = .sbss:0x80453824; // type:object size:0x4 scope:local align:4 data:4byte +PendingBits = .sbss:0x80453828; // type:object size:0x4 scope:local align:4 data:4byte +BarrelBits = .sbss:0x8045382C; // type:object size:0x4 scope:local align:4 data:4byte +SamplingCallback = .sbss:0x80453830; // type:object size:0x4 scope:local align:4 data:4byte recalibrated$388 = .sbss:0x80453834; // type:object size:0x4 scope:local align:4 data:4byte __PADSpec = .sbss:0x80453838; // type:object size:0x4 scope:global align:4 data:4byte -__AIS_Callback = .sbss:0x80453840; // type:object size:0x4 scope:global align:4 data:4byte -__AID_Callback = .sbss:0x80453844; // type:object size:0x4 scope:global align:4 data:4byte -__CallbackStack = .sbss:0x80453848; // type:object size:0x4 scope:global align:4 data:4byte -__OldStack = .sbss:0x8045384C; // type:object size:0x4 scope:global align:4 data:4byte -__AI_init_flag = .sbss:0x80453850; // type:object size:0x4 scope:global align:4 data:4byte -__AID_Active = .sbss:0x80453854; // type:object size:0x4 scope:global align:4 data:4byte -bound_32KHz = .sbss:0x80453858; // type:object size:0x8 scope:global align:4 data:4byte -bound_48KHz = .sbss:0x80453860; // type:object size:0x8 scope:global align:4 data:4byte -min_wait = .sbss:0x80453868; // type:object size:0x8 scope:global align:4 data:4byte -max_wait = .sbss:0x80453870; // type:object size:0x8 scope:global align:4 data:4byte -buffer = .sbss:0x80453878; // type:object size:0x8 scope:global align:4 data:4byte -__AR_Callback = .sbss:0x80453880; // type:object size:0x4 scope:global align:4 data:4byte -__AR_Size = .sbss:0x80453884; // type:object size:0x4 scope:global align:4 data:4byte -__AR_InternalSize = .sbss:0x80453888; // type:object size:0x4 scope:global align:4 data:4byte -__AR_ExpansionSize = .sbss:0x8045388C; // type:object size:0x4 scope:global align:4 data:4byte -__AR_StackPointer = .sbss:0x80453890; // type:object size:0x4 scope:global align:4 data:4byte -__AR_FreeBlocks = .sbss:0x80453894; // type:object size:0x4 scope:global align:4 data:4byte -__AR_BlockLength = .sbss:0x80453898; // type:object size:0x4 scope:global align:4 data:4byte -__AR_init_flag = .sbss:0x8045389C; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestQueueHi = .sbss:0x804538A0; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestTailHi = .sbss:0x804538A4; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestQueueLo = .sbss:0x804538A8; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestTailLo = .sbss:0x804538AC; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestPendingHi = .sbss:0x804538B0; // type:object size:0x4 scope:global align:4 data:4byte -__ARQRequestPendingLo = .sbss:0x804538B4; // type:object size:0x4 scope:global align:4 data:4byte -__ARQCallbackHi = .sbss:0x804538B8; // type:object size:0x4 scope:global align:4 data:4byte -__ARQCallbackLo = .sbss:0x804538BC; // type:object size:0x4 scope:global align:4 data:4byte -__ARQChunkSize = .sbss:0x804538C0; // type:object size:0x4 scope:global align:4 data:4byte -__ARQ_init_flag = .sbss:0x804538C4; // type:object size:0x4 scope:global align:4 data:4byte -__DSP_init_flag = .sbss:0x804538C8; // type:object size:0x4 scope:global align:4 data:4byte +__AIS_Callback = .sbss:0x80453840; // type:object size:0x4 scope:local align:4 data:4byte +__AID_Callback = .sbss:0x80453844; // type:object size:0x4 scope:local align:4 data:4byte +__CallbackStack = .sbss:0x80453848; // type:object size:0x4 scope:local align:4 data:4byte +__OldStack = .sbss:0x8045384C; // type:object size:0x4 scope:local align:4 data:4byte +__AI_init_flag = .sbss:0x80453850; // type:object size:0x4 scope:local align:4 data:4byte +__AID_Active = .sbss:0x80453854; // type:object size:0x4 scope:local align:4 data:4byte +bound_32KHz = .sbss:0x80453858; // type:object size:0x8 scope:local align:4 data:4byte +bound_48KHz = .sbss:0x80453860; // type:object size:0x8 scope:local align:4 data:4byte +min_wait = .sbss:0x80453868; // type:object size:0x8 scope:local align:4 data:4byte +max_wait = .sbss:0x80453870; // type:object size:0x8 scope:local align:4 data:4byte +buffer = .sbss:0x80453878; // type:object size:0x8 scope:local align:4 data:4byte +__AR_Callback = .sbss:0x80453880; // type:object size:0x4 scope:local align:4 data:4byte +__AR_Size = .sbss:0x80453884; // type:object size:0x4 scope:local align:4 data:4byte +__AR_InternalSize = .sbss:0x80453888; // type:object size:0x4 scope:local align:4 data:4byte +__AR_ExpansionSize = .sbss:0x8045388C; // type:object size:0x4 scope:local align:4 data:4byte +__AR_StackPointer = .sbss:0x80453890; // type:object size:0x4 scope:local align:4 data:4byte +__AR_FreeBlocks = .sbss:0x80453894; // type:object size:0x4 scope:local align:4 data:4byte +__AR_BlockLength = .sbss:0x80453898; // type:object size:0x4 scope:local align:4 data:4byte +__AR_init_flag = .sbss:0x8045389C; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestQueueHi = .sbss:0x804538A0; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestTailHi = .sbss:0x804538A4; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestQueueLo = .sbss:0x804538A8; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestTailLo = .sbss:0x804538AC; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestPendingHi = .sbss:0x804538B0; // type:object size:0x4 scope:local align:4 data:4byte +__ARQRequestPendingLo = .sbss:0x804538B4; // type:object size:0x4 scope:local align:4 data:4byte +__ARQCallbackHi = .sbss:0x804538B8; // type:object size:0x4 scope:local align:4 data:4byte +__ARQCallbackLo = .sbss:0x804538BC; // type:object size:0x4 scope:local align:4 data:4byte +__ARQChunkSize = .sbss:0x804538C0; // type:object size:0x4 scope:local align:4 data:4byte +__ARQ_init_flag = .sbss:0x804538C4; // type:object size:0x4 scope:local align:4 data:4byte +__DSP_init_flag = .sbss:0x804538C8; // type:object size:0x4 scope:local align:4 data:4byte __DSP_tmp_task = .sbss:0x804538D0; // type:object size:0x4 scope:global align:4 data:4byte __DSP_last_task = .sbss:0x804538D4; // type:object size:0x4 scope:global align:4 data:4byte __DSP_first_task = .sbss:0x804538D8; // type:object size:0x4 scope:global align:4 data:4byte __DSP_curr_task = .sbss:0x804538DC; // type:object size:0x4 scope:global align:4 data:4byte -__CARDEncode = .sbss:0x804538E0; // type:object size:0x2 scope:global align:2 data:2byte -__CARDFastMode = .sbss:0x804538E2; // type:object size:0x2 scope:global align:2 data:2byte +__CARDEncode = .sbss:0x804538E0; // type:object size:0x2 scope:local align:2 data:2byte +__CARDFastMode = .sbss:0x804538E2; // type:object size:0x2 scope:local align:2 data:2byte __piReg = .sbss:0x804538E8; // type:object size:0x4 scope:global align:4 data:4byte __cpReg = .sbss:0x804538EC; // type:object size:0x4 scope:global align:4 data:4byte __peReg = .sbss:0x804538F0; // type:object size:0x4 scope:global align:4 data:4byte __memReg = .sbss:0x804538F4; // type:object size:0x4 scope:global align:4 data:4byte -peCount$35 = .sbss:0x804538F8; // type:object size:0x4 scope:local align:4 data:4byte -time$36 = .sbss:0x80453900; // type:object size:0x8 scope:local align:4 data:4byte -calledOnce$37 = .sbss:0x80453908; // type:object size:0x4 scope:local align:4 data:4byte -resetFuncRegistered$145 = .sbss:0x8045390C; // type:object size:0x4 scope:local align:4 data:4byte -CPUFifo = .sbss:0x80453910; // type:object size:0x4 scope:global align:4 data:4byte -GPFifo = .sbss:0x80453914; // type:object size:0x4 scope:global align:4 data:4byte -__GXCurrentThread = .sbss:0x80453918; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8045391C = .sbss:0x8045391C; // type:object size:0x1 data:byte -GXOverflowSuspendInProgress = .sbss:0x80453920; // type:object size:0x4 scope:global align:4 data:4byte -BreakPointCB = .sbss:0x80453924; // type:object size:0x4 scope:global align:4 data:4byte -__GXOverflowCount = .sbss:0x80453928; // type:object size:0x4 scope:global align:4 data:4byte -TokenCB = .sbss:0x80453930; // type:object size:0x4 scope:global align:4 data:4byte -DrawDoneCB = .sbss:0x80453934; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80453938 = .sbss:0x80453938; // type:object size:0x1 data:byte -FinishQueue = .sbss:0x8045393C; // type:object size:0x8 scope:global align:4 +peCount = .sbss:0x804538F8; // type:object size:0x4 scope:global align:4 data:4byte +time = .sbss:0x80453900; // type:object size:0x8 scope:global align:4 data:4byte +calledOnce = .sbss:0x80453908; // type:object size:0x4 scope:global align:4 data:4byte +resetFuncRegistered = .sbss:0x8045390C; // type:object size:0x4 scope:global align:4 data:4byte +CPUFifo = .sbss:0x80453910; // type:object size:0x4 scope:local align:4 data:4byte +GPFifo = .sbss:0x80453914; // type:object size:0x4 scope:local align:4 data:4byte +__GXCurrentThread = .sbss:0x80453918; // type:object size:0x4 scope:local align:4 data:4byte +CPGPLinked = .sbss:0x8045391C; // type:object size:0x1 scope:local data:byte +GXOverflowSuspendInProgress = .sbss:0x80453920; // type:object size:0x4 scope:local align:4 data:4byte +BreakPointCB = .sbss:0x80453924; // type:object size:0x4 scope:local align:4 data:4byte +__GXOverflowCount = .sbss:0x80453928; // type:object size:0x4 scope:local align:4 data:4byte +TokenCB = .sbss:0x80453930; // type:object size:0x4 scope:local align:4 data:4byte +DrawDoneCB = .sbss:0x80453934; // type:object size:0x4 scope:local align:4 data:4byte +DrawDone = .sbss:0x80453938; // type:object size:0x1 scope:local data:byte +FinishQueue = .sbss:0x8045393C; // type:object size:0x8 scope:local align:4 __GDCurrentDL = .sbss:0x80453948; // type:object size:0x4 scope:global align:4 data:4byte -overflowcb = .sbss:0x8045394C; // type:object size:0x4 scope:global align:4 data:4byte +overflowcb = .sbss:0x8045394C; // type:object size:0x4 scope:local align:4 data:4byte __global_destructor_chain = .sbss:0x80453950; // type:object size:0x4 scope:global align:4 data:4byte -__aborting = .sbss:0x80453958; // type:object size:0x4 scope:global align:4 data:4byte -__atexit_curr_func = .sbss:0x8045395C; // type:object size:0x4 scope:global align:4 data:4byte +__aborting = .sbss:0x80453958; // type:object size:0x4 scope:local align:4 data:4byte +__atexit_curr_func = .sbss:0x8045395C; // type:object size:0x4 scope:local align:4 data:4byte __stdio_exit = .sbss:0x80453960; // type:object size:0x4 scope:global align:4 data:4byte -__console_exit = .sbss:0x80453964; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80453968 = .sbss:0x80453968; // type:object size:0x1 data:byte +__console_exit = .sbss:0x80453964; // type:object size:0x4 scope:local align:4 data:4byte +init$49 = .sbss:0x80453968; // type:object size:0x1 scope:local align:1 data:byte errno = .sbss:0x80453970; // type:object size:0x4 scope:global align:4 data:4byte initialized$60 = .sbss:0x80453978; // type:object size:0x4 scope:local align:4 data:4byte gTRKInputPendingPtr = .sbss:0x80453980; // type:object size:0x4 scope:global align:4 data:4byte gIsInitialized = .sbss:0x80453988; // type:object size:0x4 scope:local align:4 data:4byte gIsInitialized = .sbss:0x80453990; // type:object size:0x4 scope:local align:4 data:4byte -MTRCallback = .sbss:0x80453998; // type:object size:0x4 scope:global align:4 data:4byte -DBGCallback = .sbss:0x8045399C; // type:object size:0x4 scope:global align:4 data:4byte -SendMailData = .sbss:0x804539A0; // type:object size:0x4 scope:global align:4 data:4byte -RecvDataLeng = .sbss:0x804539A4; // type:object size:0x4 scope:global align:4 data:4byte -pEXIInputFlag = .sbss:0x804539A8; // type:object size:0x4 scope:global align:4 data:4byte -lbl_804539AC = .sbss:0x804539AC; // type:object size:0x1 data:byte +MTRCallback = .sbss:0x80453998; // type:object size:0x4 scope:local align:4 data:4byte +DBGCallback = .sbss:0x8045399C; // type:object size:0x4 scope:local align:4 data:4byte +SendMailData = .sbss:0x804539A0; // type:object size:0x4 scope:local align:4 data:4byte +RecvDataLeng = .sbss:0x804539A4; // type:object size:0x4 scope:local align:4 data:4byte +pEXIInputFlag = .sbss:0x804539A8; // type:object size:0x4 scope:local align:4 data:4byte +EXIInputFlag = .sbss:0x804539AC; // type:object size:0x1 scope:local data:byte @3884 = .sdata2:0x804539C0; // type:object size:0x4 scope:local align:4 data:float @3885 = .sdata2:0x804539C4; // type:object size:0x4 scope:local align:4 data:float @3886 = .sdata2:0x804539C8; // type:object size:0x4 scope:local align:4 data:float @@ -22692,22 +22733,22 @@ l_mapBaseColor$4239 = .sdata2:0x80453E08; // type:object size:0x4 scope:local al @4264 = .sdata2:0x80453E0C; // type:object size:0x4 scope:local align:4 data:float @4265 = .sdata2:0x80453E10; // type:object size:0x4 scope:local align:4 data:float @4266 = .sdata2:0x80453E14; // type:object size:0x4 scope:local align:4 data:float -l_doorWhite = .sdata2:0x80453E18; // type:object size:0x4 scope:global align:4 data:4byte -l_doorWhiteNoStay = .sdata2:0x80453E1C; // type:object size:0x4 scope:global align:4 data:4byte -l_doorWhite2 = .sdata2:0x80453E20; // type:object size:0x4 scope:global align:4 data:4byte -l_doorWhiteNoStay2 = .sdata2:0x80453E24; // type:object size:0x4 scope:global align:4 data:4byte +l_doorWhite = .sdata2:0x80453E18; // type:object size:0x4 scope:local align:4 data:4byte +l_doorWhiteNoStay = .sdata2:0x80453E1C; // type:object size:0x4 scope:local align:4 data:4byte +l_doorWhite2 = .sdata2:0x80453E20; // type:object size:0x4 scope:local align:4 data:4byte +l_doorWhiteNoStay2 = .sdata2:0x80453E24; // type:object size:0x4 scope:local align:4 data:4byte l_tex0$4406 = .sdata2:0x80453E28; // type:object size:0x8 scope:local align:4 @4484 = .sdata2:0x80453E30; // type:object size:0x4 scope:local align:4 data:float -l_entranceStartColor = .sdata2:0x80453E34; // type:object size:0x4 scope:global align:4 -l_entranceLv8StartColor = .sdata2:0x80453E38; // type:object size:0x4 scope:global align:4 -l_treasureStartColor = .sdata2:0x80453E3C; // type:object size:0x4 scope:global align:4 data:byte -l_smallKeyStartColor = .sdata2:0x80453E40; // type:object size:0x4 scope:global align:4 -l_bossStartColor = .sdata2:0x80453E44; // type:object size:0x4 scope:global align:4 -l_npc0StartColor = .sdata2:0x80453E48; // type:object size:0x4 scope:global align:4 -l_destinationStartColor = .sdata2:0x80453E4C; // type:object size:0x4 scope:global align:4 -l_npcYkmStartColor = .sdata2:0x80453E50; // type:object size:0x4 scope:global align:4 -l_npcYkwStartColor = .sdata2:0x80453E54; // type:object size:0x4 scope:global align:4 -l_tksStartColor = .sdata2:0x80453E58; // type:object size:0x4 scope:global align:4 +l_entranceStartColor = .sdata2:0x80453E34; // type:object size:0x4 scope:local align:4 +l_entranceLv8StartColor = .sdata2:0x80453E38; // type:object size:0x4 scope:local align:4 +l_treasureStartColor = .sdata2:0x80453E3C; // type:object size:0x4 scope:local align:4 data:byte +l_smallKeyStartColor = .sdata2:0x80453E40; // type:object size:0x4 scope:local align:4 +l_bossStartColor = .sdata2:0x80453E44; // type:object size:0x4 scope:local align:4 +l_npc0StartColor = .sdata2:0x80453E48; // type:object size:0x4 scope:local align:4 +l_destinationStartColor = .sdata2:0x80453E4C; // type:object size:0x4 scope:local align:4 +l_npcYkmStartColor = .sdata2:0x80453E50; // type:object size:0x4 scope:local align:4 +l_npcYkwStartColor = .sdata2:0x80453E54; // type:object size:0x4 scope:local align:4 +l_tksStartColor = .sdata2:0x80453E58; // type:object size:0x4 scope:local align:4 l_iconTex0$4523 = .sdata2:0x80453E5C; // type:object size:0x8 scope:local align:4 tboxNotStayColor$4542 = .sdata2:0x80453E64; // type:object size:0x4 scope:local align:4 data:byte @4600 = .sdata2:0x80453E68; // type:object size:0x4 scope:local align:4 data:float @@ -22819,7 +22860,7 @@ particleID$5076 = .sdata2:0x80453F50; // type:object size:0x4 scope:local align: @5551 = .sdata2:0x80454078; // type:object size:0x4 scope:local align:4 data:float @5552 = .sdata2:0x8045407C; // type:object size:0x4 scope:local align:4 data:float @5553 = .sdata2:0x80454080; // type:object size:0x4 scope:local align:4 data:float -l_zSortId$5668 = .sdata2:0x80454084; // type:object size:0x6 scope:local align:4 data:byte +l_zSortId = .sdata2:0x80454084; // type:object size:0x6 scope:local align:4 data:byte @5747 = .sdata2:0x8045408C; // type:object size:0x4 scope:local align:4 data:float @5809 = .sdata2:0x80454090; // type:object size:0x4 scope:local align:4 data:float @5810 = .sdata2:0x80454094; // type:object size:0x4 scope:local align:4 data:float @@ -25448,7 +25489,7 @@ i_expID$6473 = .sdata2:0x804563FC; // type:object size:0x8 scope:local align:4 @3936 = .sdata2:0x80456EE0; // type:object size:0x4 scope:local align:4 data:float @3937 = .sdata2:0x80456EE4; // type:object size:0x4 scope:local align:4 data:float @3939 = .sdata2:0x80456EE8; // type:object size:0x8 scope:local align:4 data:double -T_JOINT_dylKeyTbl = .sdata2:0x80456EF0; // type:object size:0x2 scope:global align:4 +T_JOINT_dylKeyTbl = .sdata2:0x80456EF0; // type:object size:0x2 scope:local align:4 @4055 = .sdata2:0x80456EF4; // type:object size:0x4 scope:local align:4 data:float @4066 = .sdata2:0x80456EF8; // type:object size:0x4 scope:local align:4 data:float @4067 = .sdata2:0x80456EFC; // type:object size:0x4 scope:local align:4 data:float @@ -25551,32 +25592,32 @@ l_arcName = .sdata2:0x80456FC8; // type:object size:0x7 scope:local align:4 data @2259 = .sdata2:0x80457108; // type:object size:0x8 scope:local align:4 data:double @2273 = .sdata2:0x80457110; // type:object size:0x4 scope:local align:4 data:float @2346 = .sdata2:0x80457114; // type:object size:0x4 scope:local align:4 data:float -BPCP_OUTCODE0 = .sdata2:0x80457118; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE1 = .sdata2:0x8045711C; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE4 = .sdata2:0x80457120; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE5 = .sdata2:0x80457124; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE2 = .sdata2:0x80457128; // type:object size:0x4 scope:global align:4 data:4byte -BPCP_OUTCODE3 = .sdata2:0x8045712C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE0 = .sdata2:0x80457130; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE1 = .sdata2:0x80457134; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE2 = .sdata2:0x80457138; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE3 = .sdata2:0x8045713C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE4 = .sdata2:0x80457140; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE5 = .sdata2:0x80457144; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE6 = .sdata2:0x80457148; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE7 = .sdata2:0x8045714C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE8 = .sdata2:0x80457150; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE9 = .sdata2:0x80457154; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE10 = .sdata2:0x80457158; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL2D_OUTCODE11 = .sdata2:0x8045715C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE0 = .sdata2:0x80457160; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE1 = .sdata2:0x80457164; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE2 = .sdata2:0x80457168; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE3 = .sdata2:0x8045716C; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE4 = .sdata2:0x80457170; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE5 = .sdata2:0x80457174; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE6 = .sdata2:0x80457178; // type:object size:0x4 scope:global align:4 data:4byte -BEVEL3D_OUTCODE7 = .sdata2:0x8045717C; // type:object size:0x4 scope:global align:4 data:4byte +BPCP_OUTCODE0 = .sdata2:0x80457118; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE1 = .sdata2:0x8045711C; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE4 = .sdata2:0x80457120; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE5 = .sdata2:0x80457124; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE2 = .sdata2:0x80457128; // type:object size:0x4 scope:local align:4 data:4byte +BPCP_OUTCODE3 = .sdata2:0x8045712C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE0 = .sdata2:0x80457130; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE1 = .sdata2:0x80457134; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE2 = .sdata2:0x80457138; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE3 = .sdata2:0x8045713C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE4 = .sdata2:0x80457140; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE5 = .sdata2:0x80457144; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE6 = .sdata2:0x80457148; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE7 = .sdata2:0x8045714C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE8 = .sdata2:0x80457150; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE9 = .sdata2:0x80457154; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE10 = .sdata2:0x80457158; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL2D_OUTCODE11 = .sdata2:0x8045715C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE0 = .sdata2:0x80457160; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE1 = .sdata2:0x80457164; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE2 = .sdata2:0x80457168; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE3 = .sdata2:0x8045716C; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE4 = .sdata2:0x80457170; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE5 = .sdata2:0x80457174; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE6 = .sdata2:0x80457178; // type:object size:0x4 scope:local align:4 data:4byte +BEVEL3D_OUTCODE7 = .sdata2:0x8045717C; // type:object size:0x4 scope:local align:4 data:4byte @3082 = .sdata2:0x80457180; // type:object size:0x4 scope:local align:4 data:float @3205 = .sdata2:0x80457184; // type:object size:0x4 scope:local align:4 data:float @3229 = .sdata2:0x80457188; // type:object size:0x4 scope:local align:4 data:float @@ -25717,7 +25758,7 @@ sauVariableValue_2_DISTANCE_NEAR_FAR__Q27JStudio15TAdaptor_camera = .sdata2:0x80 sauVariableValue_2_RANGE_BEGIN_END__Q27JStudio12TAdaptor_fog = .sdata2:0x80457490; // type:object size:0x8 scope:global align:4 sauVariableValue_2_DIRECTION_THETA_PHI__Q27JStudio14TAdaptor_light = .sdata2:0x80457498; // type:object size:0x8 scope:global align:4 @1967 = .sdata2:0x804574A0; // type:object size:0x4 scope:local align:4 data:float -gu32Mask_TSequence_value_signExpansion__Q37JStudio3stb4data = .sdata2:0x804574A8; // type:object size:0x4 scope:global align:4 data:4byte +gu32Mask_TSequence_value_signExpansion__Q37JStudio3stb4data = .sdata2:0x804574A8; // type:object size:0x4 scope:local align:4 data:4byte ga4cSignature__Q37JStudio3stb4data = .sdata2:0x804574B0; // type:object size:0x4 scope:global align:4 data:string @1081 = .sdata2:0x804574B8; // type:object size:0x4 scope:local align:4 data:float @846 = .sdata2:0x804574C0; // type:object size:0x4 scope:local align:4 data:float diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h index 234e8a5390..ee54335886 100644 --- a/include/JSystem/JKernel/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive.h @@ -131,7 +131,6 @@ protected: JKRArchive(s32, EMountMode); public: - virtual ~JKRArchive(); bool getDirEntry(SDirEntry*, u32) const; void* getIdxResource(u32); void* getResource(u16); @@ -167,6 +166,7 @@ public: /* vt[17] */ virtual void* fetchResource(void*, u32, SDIFileEntry*, u32*) = 0; /* vt[18] */ virtual void setExpandSize(SDIFileEntry*, u32); /* vt[19] */ virtual u32 getExpandSize(SDIFileEntry*) const; + virtual ~JKRArchive(); u32 countFile() const { return mArcInfoBlock->num_file_entries; } s32 countDirectory() const { return mArcInfoBlock->num_nodes; } diff --git a/include/d/actor/d_a_obj_tornado2.h b/include/d/actor/d_a_obj_tornado2.h index 6d208576fb..1cc3a75a7a 100644 --- a/include/d/actor/d_a_obj_tornado2.h +++ b/include/d/actor/d_a_obj_tornado2.h @@ -49,7 +49,7 @@ public: /* 0x73C */ WIND_INFLUENCE mWindInfluence; /* 0x768 */ f32 mDefaultRadius; /* 0x76C */ f32 mDefaultLength; - /* 0x770 */ int mTimer; + /* 0x770 */ s32 mTimer; /* 0x774 */ f32 mWindPower; /* 0x778 */ bool mColumnOn; /* 0x778 */ JPABaseEmitter* mParticles[3]; diff --git a/include/d/actor/d_a_tag_kago_fall.h b/include/d/actor/d_a_tag_kago_fall.h index 95fc3a8624..34dd042340 100644 --- a/include/d/actor/d_a_tag_kago_fall.h +++ b/include/d/actor/d_a_tag_kago_fall.h @@ -13,7 +13,7 @@ public: int create(); int execute(); - void setActionMode(ActionMode mode, u8 state); + void setActionMode(u8 mode, u8 state); void actionWaitRiver(); void actionWaitFall(); int _delete(); diff --git a/include/d/d_s_logo.h b/include/d/d_s_logo.h index 6512a45b2d..0a611b83c3 100644 --- a/include/d/d_s_logo.h +++ b/include/d/d_s_logo.h @@ -15,6 +15,8 @@ class dLog_HIO_c { public: dLog_HIO_c(); virtual ~dLog_HIO_c(); + + u8 field_0x4[0x8 - 0x4]; }; // Size: 0x8 class dScnLogo_c : public scene_class { diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 6aa780fdfe..6256c376af 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -295,8 +295,6 @@ static u32 SizeOfLoadAmbColors = 13; static u32 SizeOfLoadColorChans = 21; -static u8 sdata_padding[4] = {}; - static u32 SizeOfJ3DColorBlockLightOffLoad = SizeOfLoadMatColors + SizeOfLoadColorChans; void J3DColorBlockLightOff::load() { diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/src/JSystem/JAudio2/JASDrumSet.cpp index 9f9ec63059..1aca5e0cf8 100644 --- a/src/JSystem/JAudio2/JASDrumSet.cpp +++ b/src/JSystem/JAudio2/JASDrumSet.cpp @@ -21,13 +21,11 @@ void JASDrumSet::newPercArray(u8 param_0, JKRHeap* param_1) { } } -static JASOscillator::Data osc; - -static JASOscillator::Data* oscp; - -static s8 data_80451274[4]; - bool JASDrumSet::getParam(int param_0, int param_1, JASInstParam* param_2) const { + static JASOscillator::Data osc; + static JASOscillator::Data* oscp; + static s8 data_80451274; + if (field_0x4 == NULL) { return false; } @@ -54,9 +52,9 @@ bool JASDrumSet::getParam(int param_0, int param_1, JASInstParam* param_2) const osc.mScale = 1.0f; osc._14 = 0.0f; - if (data_80451274[0] == 0) { + if (data_80451274 == 0) { oscp = &osc; - data_80451274[0] = 1; + data_80451274 = 1; } param_2->field_0x14 = &oscp; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c index 7c34f725b3..3ed7a41667 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c @@ -83,7 +83,6 @@ typedef struct mem_pool_obj { } mem_pool_obj; mem_pool_obj __malloc_pool; -static int initialized = 0; static SubBlock* SubBlock_merge_prev(SubBlock*, SubBlock**); static void SubBlock_merge_next(SubBlock*, SubBlock**); diff --git a/src/d/actor/d_a_alink_crawl.inc b/src/d/actor/d_a_alink_crawl.inc index dc7d4b5f8f..f456c70b67 100644 --- a/src/d/actor/d_a_alink_crawl.inc +++ b/src/d/actor/d_a_alink_crawl.inc @@ -24,8 +24,8 @@ f32 daAlink_c::getCrawlMoveSpeed() { } void daAlink_c::setCrawlMoveDirectionArrow() { - static const u8 data_80452F38[1] = {1}; - static const u8 data_80452F39[1] = {4}; + static const u8 data_80452F38 = 1; + static const u8 data_80452F39 = 4; u8 direction = 0; camera_class* camera = (camera_class*)dComIfGp_getCamera(field_0x317c); @@ -33,17 +33,17 @@ void daAlink_c::setCrawlMoveDirectionArrow() { if (field_0x3198 & 4) { if (!bvar) { - direction = *data_80452F38; + direction |= data_80452F38; } else { - direction = *data_80452F39; + direction |= data_80452F39; } } if (field_0x3198 & 8) { if (!bvar) { - direction |= *data_80452F39; + direction |= data_80452F39; } else { - direction |= *data_80452F38; + direction |= data_80452F38; } } diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 50ec729841..45927b3f49 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -1444,11 +1444,11 @@ static void demo_camera(b_bq_class* i_this) { i_this->mDemoCamEyeTarget.set(240.0f, 274.0f, 2075.0f); i_this->field_0x1288.x = - fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); + std::fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); i_this->field_0x1288.y = - fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); + std::fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); i_this->field_0x1288.z = - fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); + std::fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); } spFC.set(0.0f, 0.0f, 1700.0f); @@ -1478,16 +1478,16 @@ static void demo_camera(b_bq_class* i_this) { i_this->mDemoCamCenterTarget.set(76.0f, 204.0f, 1782.0f); i_this->mDemoCamEyeTarget.set(-41.0f, 261.0f, 2095.0f); - i_this->field_0x127c.x = fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); - i_this->field_0x127c.y = fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); - i_this->field_0x127c.z = fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); + i_this->field_0x127c.x = std::fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); + i_this->field_0x127c.y = std::fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); + i_this->field_0x127c.z = std::fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); i_this->field_0x1288.x = - fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); + std::fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); i_this->field_0x1288.y = - fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); + std::fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); i_this->field_0x1288.z = - fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); + std::fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); i_this->field_0x129c = 0.0f; i_this->mDemoMode = 12; @@ -1584,16 +1584,16 @@ static void demo_camera(b_bq_class* i_this) { i_this->mDemoCamCenterTarget.set(0.0f, 278.0f, 1252.0f); i_this->mDemoCamEyeTarget.set(0.0f, 86.0f, 2167.0f); - i_this->field_0x127c.x = fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); - i_this->field_0x127c.y = fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); - i_this->field_0x127c.z = fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); + i_this->field_0x127c.x = std::fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); + i_this->field_0x127c.y = std::fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); + i_this->field_0x127c.z = std::fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); i_this->field_0x1288.x = - fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); + std::fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); i_this->field_0x1288.y = - fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); + std::fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); i_this->field_0x1288.z = - fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); + std::fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); i_this->field_0x129c = 0.0f; i_this->mDemoMode = 14; @@ -1741,16 +1741,16 @@ static void demo_camera(b_bq_class* i_this) { i_this->mDemoCamCenterTarget.set(-2243.0f, 1340.0f, 977.0f); i_this->mDemoCamEyeTarget.set(-1226.0f, 980.0f, 1350.0f); - i_this->field_0x127c.x = fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); - i_this->field_0x127c.y = fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); - i_this->field_0x127c.z = fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); + i_this->field_0x127c.x = std::fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); + i_this->field_0x127c.y = std::fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); + i_this->field_0x127c.z = std::fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); i_this->field_0x1288.x = - fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); + std::fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); i_this->field_0x1288.y = - fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); + std::fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); i_this->field_0x1288.z = - fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); + std::fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); i_this->field_0x129c = 0.0f; i_this->mDemoMode = 34; @@ -1814,9 +1814,9 @@ static void demo_camera(b_bq_class* i_this) { i_this->mDemoCamEye.set(95.0f, 50.0f, 2800.0f); i_this->mDemoCamEyeTarget.set(72.0f, 52.0f, 2153.0f); - i_this->field_0x127c.x = fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); - i_this->field_0x127c.y = fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); - i_this->field_0x127c.z = fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); + i_this->field_0x127c.x = std::fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); + i_this->field_0x127c.y = std::fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); + i_this->field_0x127c.z = std::fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); i_this->field_0x1288.set(0.0f, 0.0f, 0.0f); i_this->field_0x129c = 0.0f; @@ -1973,18 +1973,18 @@ static void demo_camera(b_bq_class* i_this) { i_this->mDemoCamEyeTarget.set(1214.0f, 350.0f, 2696.0f); i_this->field_0x127c.x = - fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); + std::fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); i_this->field_0x127c.y = - fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); + std::fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); i_this->field_0x127c.z = - fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); + std::fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); i_this->field_0x1288.x = - fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); + std::fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); i_this->field_0x1288.y = - fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); + std::fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); i_this->field_0x1288.z = - fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); + std::fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); i_this->field_0x129c = 0.0f; } else if (i_this->mDemoModeTimer < 140) { @@ -1993,18 +1993,18 @@ static void demo_camera(b_bq_class* i_this) { i_this->mDemoCamEyeTarget.set(23.0f, 108.0f, 2155.0f); i_this->field_0x127c.x = - fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); + std::fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); i_this->field_0x127c.y = - fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); + std::fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); i_this->field_0x127c.z = - fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); + std::fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); i_this->field_0x1288.x = - fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); + std::fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); i_this->field_0x1288.y = - fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); + std::fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); i_this->field_0x1288.z = - fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); + std::fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); } cam_3d_morf(i_this, 0.1f); @@ -2042,18 +2042,18 @@ static void demo_camera(b_bq_class* i_this) { i_this->mDemoCamEyeTarget.set(953.0f, 997.0f, -36.0f); i_this->field_0x127c.x = - fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); + std::fabsf(i_this->mDemoCamEyeTarget.x - i_this->mDemoCamEye.x); i_this->field_0x127c.y = - fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); + std::fabsf(i_this->mDemoCamEyeTarget.y - i_this->mDemoCamEye.y); i_this->field_0x127c.z = - fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); + std::fabsf(i_this->mDemoCamEyeTarget.z - i_this->mDemoCamEye.z); i_this->field_0x1288.x = - fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); + std::fabsf(i_this->mDemoCamCenterTarget.x - i_this->mDemoCamCenter.x); i_this->field_0x1288.y = - fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); + std::fabsf(i_this->mDemoCamCenterTarget.y - i_this->mDemoCamCenter.y); i_this->field_0x1288.z = - fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); + std::fabsf(i_this->mDemoCamCenterTarget.z - i_this->mDemoCamCenter.z); cXyz pos(0.0f, 0.0f, 0.0f); for (int i = 0; i < 5; i++) { diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index b3e1e19328..a6dcbf5e42 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -1553,7 +1553,7 @@ bool daB_TN_c::checkMoveAngle() { } void daB_TN_c::setAttackBlurEffect(int i_data) { - static u16 blur_effect_id_5997[4] = { + static u16 blur_effect_id[4] = { 0x87DA, 0x87DB, 0x87DC, @@ -1562,7 +1562,7 @@ void daB_TN_c::setAttackBlurEffect(int i_data) { if (i_data != 0) { for (int i = 0; i < 4; i++) { - mParticleKeys[i] = dComIfGp_particle_set(mParticleKeys[i], blur_effect_id_5997[i], + mParticleKeys[i] = dComIfGp_particle_set(mParticleKeys[i], blur_effect_id[i], ¤t.pos, &tevStr); JPABaseEmitter* mBaseEmitter = dComIfGp_particle_getEmitter(mParticleKeys[i]); @@ -1574,7 +1574,7 @@ void daB_TN_c::setAttackBlurEffect(int i_data) { } void daB_TN_c::setArmorBreakEffect(int i_idx) { - static u16 blur_effect_id_6035[3] = {0x87DE, 0x87DF, 0x87E0}; + static u16 blur_effect_id[3] = {0x87DE, 0x87DF, 0x87E0}; cXyz sp24(l_HIO.mScale, l_HIO.mScale, l_HIO.mScale); cXyz sp30; @@ -1582,7 +1582,7 @@ void daB_TN_c::setArmorBreakEffect(int i_idx) { mDoMtx_stack_c::multVecZero(&sp30); for (int i = 0; i < 3; i++) { - dComIfGp_particle_set(blur_effect_id_6035[i], &sp30, &tevStr, &shape_angle, &sp24); + dComIfGp_particle_set(blur_effect_id[i], &sp30, &tevStr, &shape_angle, &sp24); } } diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index 74ddce445c..0803abd9c7 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -51,9 +51,9 @@ char* daKnob20_c::getDummyBmd() { static char* l_bmd_base_name = "door-knob_"; -static char l_bmdName[32]; - char* daKnob20_c::getBmd() { + static char l_bmdName[32]; + sprintf(l_bmdName, "%s%02d.bmd", l_bmd_base_name, knob_param_c::getDoorModel(this)); return l_bmdName; } @@ -192,17 +192,17 @@ void daKnob20_c::setActionFromFlow() { } } -static char* ev_name_table[7] = { - "DEFAULT_KNOB_DOOR_F_OPEN", - "DEFAULT_KNOB_DOOR_B_OPEN", - "DEFAULT_KNOB_TALK", - "DEFAULT_KNOB_TALK_B", - "DEFAULT_KNOB_TALK_F_OPEN", - "DEFAULT_KNOB_TALK_B_OPEN", - "DEFAULT_KNOB_TALK", -}; - void daKnob20_c::setEventId() { + static char* ev_name_table[7] = { + "DEFAULT_KNOB_DOOR_F_OPEN", + "DEFAULT_KNOB_DOOR_B_OPEN", + "DEFAULT_KNOB_TALK", + "DEFAULT_KNOB_TALK_B", + "DEFAULT_KNOB_TALK_F_OPEN", + "DEFAULT_KNOB_TALK_B_OPEN", + "DEFAULT_KNOB_TALK", + }; + for (int i = 0; i < 7; i++) { field_0x5b2[i] = 0xff; field_0x5a4[i] = @@ -294,26 +294,26 @@ int daKnob20_c::frontCheck() { return 1; } -static char* action_table[16] = { - "WAIT", - "SETSTART", - "SETANGLE", - "ADJUSTMENT", - "OPEN_PUSH", - "OPEN_PULL", - "OPEN_PUSH2", - "OPEN_PULL2", - "OPEN_PUSH_STOP", - "OPEN_PULL_STOP", - "TALK", - "TALK_END", - "SETSTART_PUSH", - "SETSTART_PULL", - "DEMO_OPEN", - "DEMO_CLOSE", -}; - int daKnob20_c::getDemoAction() { + static char* action_table[16] = { + "WAIT", + "SETSTART", + "SETANGLE", + "ADJUSTMENT", + "OPEN_PUSH", + "OPEN_PULL", + "OPEN_PUSH2", + "OPEN_PULL2", + "OPEN_PUSH_STOP", + "OPEN_PULL_STOP", + "TALK", + "TALK_END", + "SETSTART_PUSH", + "SETSTART_PULL", + "DEMO_OPEN", + "DEMO_CLOSE", + }; + return dComIfGp_evmng_getMyActIdx(field_0x5bc, action_table, 16, 0, 0); } @@ -461,14 +461,14 @@ int daKnob20_c::adjustmentProc() { return 0; } -static char* bck_table[4] = { - "FDoorA.bck", - "FDoorB.bck", - "FDoorA.bck", - "FDoorB.bck", -}; - int daKnob20_c::openInit(int param_1) { + static char* bck_table[4] = { + "FDoorA.bck", + "FDoorB.bck", + "FDoorA.bck", + "FDoorB.bck", + }; + J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), bck_table[param_1]); JUT_ASSERT(937, anm != NULL); diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index 4d348b0db4..82634f0585 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -228,9 +228,9 @@ void daDoorPush_c::actionEvent() { demoProc(); } -static char* action_table[3] = {"WAIT", "OPEN", "SCENE_CHG"}; - int daDoorPush_c::demoProc() { + static char* action_table[3] = {"WAIT", "OPEN", "SCENE_CHG"}; + daPy_py_c* player = daPy_getPlayerActorClass(); field_0x644 = dComIfGp_evmng_getMyStaffId("pdoor", NULL, 0); diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index 3cbb299229..556a1cd70e 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -1340,11 +1340,11 @@ static void anm_se_set(e_dd_class* i_this) { if ((i_this->mAnm == BCK_DD_FIRE_A && i_this->mpModelMorf->getFrame() >= 44.0f) || i_this->mAnm == BCK_DD_FIRE_B) { for (int i = 0; i < 4; i++) { - static u16 fire_eff_name_0[4] = { + static u16 fire_eff_name[4] = { 0x846C, 0x846D, 0x846E, 0x846F, }; - i_this->field_0xe68[i] = dComIfGp_particle_set(i_this->field_0xe68[i], fire_eff_name_0[i], &a_this->current.pos, NULL, NULL); + i_this->field_0xe68[i] = dComIfGp_particle_set(i_this->field_0xe68[i], fire_eff_name[i], &a_this->current.pos, NULL, NULL); JPABaseEmitter* fire_emitter = dComIfGp_particle_getEmitter(i_this->field_0xe68[i]); if (fire_emitter != NULL) { fire_emitter->setGlobalSRTMatrix(i_this->mpModelMorf->getModel()->getAnmMtx(JNT_NECK)); @@ -1362,11 +1362,11 @@ static void anm_se_set(e_dd_class* i_this) { if (i_this->mAnm == BCK_DD_FIRE_A) { for (int i = 0; i < 2; i++) { - static u16 fire_eff_name_1[2] = { + static u16 fire_eff_name[2] = { 0x8471, 0x8472, }; - i_this->field_0xe7c[i] = dComIfGp_particle_set(i_this->field_0xe7c[i], fire_eff_name_1[i], &a_this->current.pos, NULL, NULL); + i_this->field_0xe7c[i] = dComIfGp_particle_set(i_this->field_0xe7c[i], fire_eff_name[i], &a_this->current.pos, NULL, NULL); JPABaseEmitter* emitter_4 = dComIfGp_particle_getEmitter(i_this->field_0xe7c[i]); if (emitter_4 != NULL) { emitter_4->setGlobalSRTMatrix(i_this->mpModelMorf->getModel()->getAnmMtx(i + 10)); @@ -1620,15 +1620,15 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 1; } +static s16 ya[5] = { + -0x4000, 0x4000, 0x0000, -0x8000, 0x0000, +}; + +static s16 xa[5] = { + -0x4000, -0x4000, -0x4000, -0x4000, -0x8000, +}; + static int kabe_initial_pos_set(e_dd_class* i_this) { - static s16 ya[5] = { - -0x4000, 0x4000, 0x0000, -0x8000, 0x0000, - }; - - static s16 xa[5] = { - -0x4000, -0x4000, -0x4000, -0x4000, -0x8000, - }; - fopAc_ac_c* a_this = &i_this->actor; dBgS_LinChk lin_chk; cXyz sp98, start, end; diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index 9a36c2d66f..e27eb54b09 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -43,7 +43,7 @@ enum E_DK_RES_FILE_ID { /* 0x1B */ BTK_DK_WAIT, }; - +namespace { static dCcD_SrcSph cc_dk_src = { { // mObjInf { 0x0, { { 0, 0, { 0 } }, { (s32)0xd8fbbddf, { 3 } }, { { 0x75 } } } }, // mObj @@ -73,6 +73,7 @@ static dCcD_SrcSph cc_dk_core_src = { }, { { { 0.0f, 0.0f, 0.0f }, 40.0f, } } // mSphAttr }; +} daE_DK_HIO_c::daE_DK_HIO_c() { field_0x4 = -1; diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index d7af586cf9..6b549a19f6 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -175,41 +175,42 @@ static int daE_OctBg_Delete(daE_OctBg_c* i_this) { /* 8073A14C 0024+01 data_8073A14C l_HIO */ /* 8073A171 0001+00 data_8073A171 None */ /* 8073A172 0002+00 data_8073A172 None */ -static daE_OctBg_HIO_c struct_8073A14C; -static u8 struct_8073A14C_field_0x23; -static u8 struct_8073A14C_field_0x24; -static u8 struct_8073A14C_field_0x25; -static u8 struct_8073A14C_field_0x26; +static daE_OctBg_HIO_c l_HIO; + +u8 unk_bss_78; +u8 unk_bss_79; +u8 unk_bss_7A; +u8 unk_bss_7B; void daE_OctBg_c::cc_set() { cXyz cStack_1c; cXyz cStack_28; J3DModel* model = field_0x5b4->getModel(); mDoMtx_stack_c::copy(model->getAnmMtx(0)); - cStack_1c.set(0.0f, struct_8073A14C.field_0x18 * 25.0f, 0.0f); + cStack_1c.set(0.0f, l_HIO.field_0x18 * 25.0f, 0.0f); mDoMtx_stack_c::multVec(&cStack_1c, &eyePos); attention_info.position = eyePos; - attention_info.position.y += struct_8073A14C.field_0x18 * 25.0f; + attention_info.position.y += l_HIO.field_0x18 * 25.0f; mDoMtx_stack_c::copy(model->getAnmMtx(0)); - cStack_1c.set(0.0f, struct_8073A14C.field_0x18 * 25.0f, 0.0f); + cStack_1c.set(0.0f, l_HIO.field_0x18 * 25.0f, 0.0f); mDoMtx_stack_c::multVec(&cStack_1c, &cStack_28); field_0x8c0.SetC(cStack_28); - field_0x8c0.SetR(struct_8073A14C.field_0x18 * 35.0f); + field_0x8c0.SetR(l_HIO.field_0x18 * 35.0f); dComIfG_Ccsp()->Set(&field_0x8c0); mDoMtx_stack_c::copy(model->getAnmMtx(0)); - cStack_1c.set(0.0f, struct_8073A14C.field_0x18 * 25.0f, struct_8073A14C.field_0x18 * 20.0f); + cStack_1c.set(0.0f, l_HIO.field_0x18 * 25.0f, l_HIO.field_0x18 * 20.0f); mDoMtx_stack_c::multVec(&cStack_1c, &cStack_28); field_0x9f8.SetC(cStack_28); - field_0x9f8.SetR(struct_8073A14C.field_0x18 * 20.0f); + field_0x9f8.SetR(l_HIO.field_0x18 * 20.0f); dComIfG_Ccsp()->Set(&field_0x9f8); } void daE_OctBg_c::mtx_set() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); - mDoMtx_stack_c::transM(0.0f, struct_8073A14C.field_0x18 * 25.0f, 0.0f); + mDoMtx_stack_c::transM(0.0f, l_HIO.field_0x18 * 25.0f, 0.0f); mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); - mDoMtx_stack_c::transM(0.0f, struct_8073A14C.field_0x18 * -25.0f, 0.0f); - mDoMtx_stack_c::scaleM(struct_8073A14C.field_0x18, struct_8073A14C.field_0x18, struct_8073A14C.field_0x18); + mDoMtx_stack_c::transM(0.0f, l_HIO.field_0x18 * -25.0f, 0.0f); + mDoMtx_stack_c::scaleM(l_HIO.field_0x18, l_HIO.field_0x18, l_HIO.field_0x18); J3DModel* model = field_0x5b4->getModel(); model->setBaseTRMtx(mDoMtx_stack_c::get()); for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) { @@ -226,9 +227,9 @@ bool daE_OctBg_c::checkNormalAttack() { if (dComIfGp_event_runCheck() != 0) { return false; } - if (struct_8073A14C_field_0x25 < struct_8073A14C.field_0x20 && - home.pos.absXZ(player->current.pos) < struct_8073A14C.field_0x08 && - player->current.pos.y < struct_8073A14C.field_0x0c && + if (unk_bss_7A < l_HIO.field_0x20 && + home.pos.absXZ(player->current.pos) < l_HIO.field_0x08 && + player->current.pos.y < l_HIO.field_0x0c && !fopAcM_otherBgCheck(this, player)) { s16 targetAngle = cLib_targetAngleY(¤t.pos, &player->current.pos); @@ -242,12 +243,12 @@ bool daE_OctBg_c::checkNormalAttack() { bool daE_OctBg_c::checkChase() { if (field_0xbac == 0) { return false; - } + } fopAc_ac_c* actor; if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &actor) == 0 || actor == NULL) { field_0xbac = 0; - struct_8073A14C_field_0x24--; + unk_bss_79--; return false; } return true; @@ -290,7 +291,7 @@ void daE_OctBg_c::swim() { if (field_0xb70 == 0) { field_0xb8c = 0; field_0xb82 = 0xc00; - if (current.pos.absXZ(home.pos) < (struct_8073A14C.field_0x08 - 100.0f)) { + if (current.pos.absXZ(home.pos) < (l_HIO.field_0x08 - 100.0f)) { field_0xb96 = current.angle.y - 0x8000 + cM_rndFX(16384.0f); } else { field_0xb96 = cLib_targetAngleY(¤t.pos, &home.pos) + cM_rndFX(8192.0f); @@ -307,7 +308,7 @@ void daE_OctBg_c::swim() { if (checkNormalAttack()) { setAction(&daE_OctBg_c::normal_attack); } else { - if (field_0x660.y > (home.pos.y + struct_8073A14C.field_0x0c) - 100.0f) { + if (field_0x660.y > (home.pos.y + l_HIO.field_0x0c) - 100.0f) { field_0x660.y = current.pos.y - cM_rndF(2000.0f); } cXyz cStack_58(current.pos); @@ -325,14 +326,14 @@ void daE_OctBg_c::swim() { field_0xb8c = field_0xb96 - current.angle.y; cLib_addCalcAngleS(&field_0xb80, 0x1000, 0x20, 0x400, 0x80); field_0xb7c += field_0xb80; - if (struct_8073A14C_field_0x26 != 0 && - struct_8073A14C_field_0x24 < struct_8073A14C_field_0x23 >> 1) + if (unk_bss_7B != 0 && + unk_bss_79 < unk_bss_78 >> 1) { field_0xbac = 1; - struct_8073A14C_field_0x24++; + unk_bss_79++; setAction(&daE_OctBg_c::chase_core); - if (struct_8073A14C_field_0x24 >= struct_8073A14C_field_0x23 >> 1) { - struct_8073A14C_field_0x26 = 0; + if (unk_bss_79 >= unk_bss_78 >> 1) { + unk_bss_7B = 0; } } else if (field_0xbac != 0 && !dComIfGp_event_runCheck()) { setAction(&daE_OctBg_c::chase_core); @@ -354,16 +355,16 @@ bool daE_OctBg_c::checkCoreFishAttack() { fopAc_ac_c* actor; if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &actor) == 0 || actor == NULL) { return false; - } + } if (fopAcM_CheckStatus(actor, 0x100000) == 0) { return false; - } + } return true; } void daE_OctBg_c::chase_core() { if (field_0xb70 == 0) { - setChasePos(field_0x660, cM_rndF(struct_8073A14C.field_0x10)); + setChasePos(field_0x660, cM_rndF(l_HIO.field_0x10)); field_0xbaf = cM_rndFX(20.0f) + 100.0f; field_0xb70++; } else if (field_0xb70 != -1) { @@ -372,9 +373,9 @@ void daE_OctBg_c::chase_core() { if (fopAcM_SearchByID(fopAcM_GetLinkId(this), &local_6c) == 0 || local_6c == NULL) { setAction(&daE_OctBg_c::swim); } else { - if (local_6c->current.pos.y < home.pos.y + struct_8073A14C.field_0x14) { + if (local_6c->current.pos.y < home.pos.y + l_HIO.field_0x14) { acStack_2c = local_6c->current.pos + field_0x660; - acStack_2c.y = (home.pos.y + struct_8073A14C.field_0x14) + cM_rndF(200.0f); + acStack_2c.y = (home.pos.y + l_HIO.field_0x14) + cM_rndF(200.0f); } else { acStack_2c = local_6c->current.pos + field_0x660; } @@ -383,7 +384,7 @@ void daE_OctBg_c::chase_core() { if (abs(current.angle.y - field_0xb96) > 0x4000) { cLib_chaseAngleS(¤t.angle.y, field_0xb96, 0x400); cLib_chaseAngleS(¤t.angle.x, -cLib_targetAngleX(¤t.pos, &acStack_2c), 0x400); - if (current.pos.abs(acStack_2c) < struct_8073A14C.field_0x10 - 100.0f) { + if (current.pos.abs(acStack_2c) < l_HIO.field_0x10 - 100.0f) { cLib_chaseF(&speedF, cM_scos(current.angle.x) * 8.0f, 0.2f); cLib_chaseF(&speed.y, cM_ssin(current.angle.x) * -8.0f, 0.2f); cLib_addCalcAngleS(&field_0xb80, 0xc00, 0x20, 0x400, 0x80); @@ -393,7 +394,7 @@ void daE_OctBg_c::chase_core() { cLib_chaseAngleS(¤t.angle.x, -cLib_targetAngleX(¤t.pos, &acStack_2c), 0x200); ; - if (current.pos.abs(acStack_2c) > struct_8073A14C.field_0x10 - 100.0f) { + if (current.pos.abs(acStack_2c) > l_HIO.field_0x10 - 100.0f) { cLib_chaseF(&speedF, 18.0f * cM_scos(current.angle.x), 0.4f); cLib_chaseF(&speed.y, (-18.0f * cM_ssin(current.angle.x)), 0.4f); cLib_addCalcAngleS(&field_0xb80, 0x2400, 0x20, 0x400, 0x80); @@ -405,7 +406,7 @@ void daE_OctBg_c::chase_core() { } else if (dComIfGp_event_runCheck()) { setAction(&daE_OctBg_c::swim); } else if (field_0xbaf == 0) { - setChasePos(field_0x660, cM_rndF(struct_8073A14C.field_0x10)); + setChasePos(field_0x660, cM_rndF(l_HIO.field_0x10)); field_0xbaf = cM_rndFX(20.0f) + 100.0f; } } @@ -416,12 +417,12 @@ void daE_OctBg_c::normal_attack() { daPy_py_c* player = daPy_getPlayerActorClass(); if (field_0xb70 == 0) { field_0xb74 = true; - struct_8073A14C_field_0x25++; + unk_bss_7A++; field_0xbae = cM_rndFX(20.0f) + 60.0f; field_0xb70++; } else if (field_0xb70 == -1) { field_0xb74 = false; - struct_8073A14C_field_0x25--; + unk_bss_7A--; } else if (field_0xb70 == 1) { cXyz acStack_34; acStack_34 = player->current.pos; @@ -462,7 +463,7 @@ void daE_OctBg_c::normal_attack() { field_0xb8c = fopAcM_searchPlayerAngleY(this) - current.angle.y; cLib_addCalcAngleS(&field_0xb80, 0x2400, 0x20, 0x400, 0x80); field_0xb7c = field_0xb7c + field_0xb80; - if (home.pos.absXZ(player->current.pos) >= struct_8073A14C.field_0x08 && player->current.pos.y >= struct_8073A14C.field_0x0c) { + if (home.pos.absXZ(player->current.pos) >= l_HIO.field_0x08 && player->current.pos.y >= l_HIO.field_0x0c) { setAction(&daE_OctBg_c::swim); } else { if (dComIfGp_event_runCheck() || field_0xbae == 0) { @@ -781,10 +782,10 @@ int daE_OctBg_c::CreateHeap() { field_0x5b8 = new mDoExt_brkAnm(); if (field_0x5b8 == NULL) { return 0; - } + } if (!field_0x5b8->init(model->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("E_bg", 13), 1, 0, 1.0f, 0, -1)) { return 0; - } + } return 1; } @@ -796,12 +797,12 @@ int daE_OctBg_c::create() { OS_REPORT("///////////// E_OctBg ////////////////\n"); if (fopAcM_entrySolidHeap(this, useHeapInit, 0x10e0) == 0) { return cPhs_ERROR_e; - } + } OS_REPORT("//////////// E_OctBg SET OK //////////\n"); if (struct_8073A13D == 0) { struct_8073A13D = 1; field_0xbb3 = 1; - struct_8073A14C.field_0x04 = -1; + l_HIO.field_0x04 = -1; } attention_info.flags = fopAc_AttnFlag_BATTLE_e; onWolfNoLock(); @@ -810,8 +811,8 @@ int daE_OctBg_c::create() { fopAcM_SetMax(this, 50.0f, 50.0f, 50.0f); field_0x6ac.Set(fopAcM_GetPosition_p(this), fopAcM_GetOldPosition_p(this), this, 1, &field_0x66c, fopAcM_GetSpeed_p(this), NULL, NULL); - field_0x66c.SetWall(struct_8073A14C.field_0x18 * 10.0f, - struct_8073A14C.field_0x18 * 20.0f); + field_0x66c.SetWall(l_HIO.field_0x18 * 10.0f, + l_HIO.field_0x18 * 20.0f); health = 10; field_0x560 = 10; field_0x884.Init(100, 0, this); @@ -827,13 +828,13 @@ int daE_OctBg_c::create() { attention_info.distances[fopAc_attn_BATTLE_e] = 4; field_0xb74 = false; field_0xbac = fopAcM_GetID(this) & 1; - struct_8073A14C_field_0x23++; + unk_bss_78++; if (field_0xbac != 0) { - struct_8073A14C_field_0x24++; + unk_bss_79++; } setAction(&daE_OctBg_c::born_swim); daE_OctBg_Execute(this); - + } return rv; } @@ -868,15 +869,15 @@ static int daE_OctBg_Draw(daE_OctBg_c* i_this) { } static int daE_OctBg_IsDelete(daE_OctBg_c* i_this) { - struct_8073A14C_field_0x23--; + unk_bss_78--; if (i_this->getChaseFlag() != 0) { - struct_8073A14C_field_0x24--; - if (struct_8073A14C_field_0x24 < struct_8073A14C_field_0x23 >> 2) { - struct_8073A14C_field_0x26 = 1; + unk_bss_79--; + if (unk_bss_79 < unk_bss_78 >> 2) { + unk_bss_7B = 1; } - } + } if (i_this->checkNormalAttk()) { - struct_8073A14C_field_0x25--; + unk_bss_7A--; } return 1; } diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp index 01df06d016..71de575d63 100644 --- a/src/d/actor/d_a_e_sg.cpp +++ b/src/d/actor/d_a_e_sg.cpp @@ -104,7 +104,7 @@ static int daE_SG_Draw(e_sg_class* i_this) { return 1; } -static bool hio_init; +static bool hio_set; static daE_SG_HIO_c l_HIO; @@ -1105,7 +1105,7 @@ static int daE_SG_Delete(e_sg_class* i_this) { dComIfG_resDelete(&i_this->mPhaseReq, "E_sg"); if (i_this->mHioInit) { - hio_init = false; + hio_set = false; } if (i_this->heap != NULL) { @@ -1170,9 +1170,9 @@ static int daE_SG_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (hio_init == false) { + if (hio_set == false) { a_this->mHioInit = true; - hio_init = true; + hio_set = true; l_HIO.mUnk0 = -1; } diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index 06263e632d..6b8c949127 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -673,19 +673,19 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 1; } -static dCcD_SrcSph cc_sph_src = { - { - {0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - static int daE_TK_Create(fopAc_ac_c* i_this) { + static dCcD_SrcSph cc_sph_src = { + { + {0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr + }; + fopAcM_ct(i_this, e_tk_class); e_tk_class* const a_this = static_cast(i_this); diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index ef82742b36..3a8ad757b0 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -486,19 +486,19 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 1; } -static dCcD_SrcSph cc_sph_src = { - { - {0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - static int daE_TK2_Create(fopAc_ac_c* i_this) { + static dCcD_SrcSph cc_sph_src = { + { + {0x0, {{0x0, 0x0, 0xd}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr + }; + fopAcM_ct(i_this, e_tk2_class); e_tk2_class* a_this = static_cast(i_this); diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp index 804c86c977..2942bc4556 100644 --- a/src/d/actor/d_a_e_tk_ball.cpp +++ b/src/d/actor/d_a_e_tk_ball.cpp @@ -227,7 +227,7 @@ static void e_tk_ball_drop(e_tk_ball_class* i_this) { static void action(e_tk_ball_class* i_this) { fopAc_ac_c* actor = i_this; - static u16 e_id[4] = {0x819D, 0x819E, 0x819A, 0x0000}; + static u16 e_id[3] = {0x819D, 0x819E, 0x819A}; s8 is_moving = true; switch (i_this->mAction) { diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index 6bf2590e6a..042af178ab 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -189,7 +189,7 @@ static void damage_check(e_yd_class* i_this) { } } -static u8 data_807F7D68; +static u8 hio_set; static daE_YD_HIO_c l_HIO; @@ -1300,7 +1300,7 @@ static int daE_YD_IsDelete(e_yd_class* i_this) { static int daE_YD_Delete(e_yd_class* i_this) { dComIfG_resDelete(&i_this->field_0x5ac, "E_yd"); if (i_this->field_0x1268 != 0) { - data_807F7D68 = 0; + hio_set = 0; } if (i_this->actor.heap != NULL) { i_this->mpMorf->stopZelAnime(); @@ -1423,9 +1423,9 @@ static int daE_YD_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////E_YD SET 2 !!\n"); - if (data_807F7D68 == 0) { + if (hio_set == 0) { ((e_yd_class*)i_this)->field_0x1268 = 1; - data_807F7D68 = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index 77cd789eb5..78a92833f0 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -53,7 +53,7 @@ daE_YK_HIO_c::daE_YK_HIO_c() { mChargeSpeed = 40.0f; } -static u8 data_80807EF8; +static u8 hio_set; static daE_YK_HIO_c l_HIO; @@ -327,8 +327,6 @@ static void damage_check(e_yk_class* i_this) { } } -static u8 check_index[255]; - /** * @brief Checks visibility and accessibility of path points for Shadow Keese navigation * @@ -349,6 +347,8 @@ static u8 check_index[255]; * and maintain valid flight paths. */ static int path_check(e_yk_class* i_this) { + static u8 check_index[255]; + if (i_this->mpPath) { dBgS_LinChk lin_chk; @@ -1388,7 +1388,7 @@ static int daE_YK_Delete(e_yk_class* i_this) { dComIfG_resDelete(&i_this->mPhase,"E_YK"); if (i_this->mIsFirstSpawn != 0) { - data_80807EF8 = 0; + hio_set = 0; } if (i_this->heap) { @@ -1499,9 +1499,9 @@ static int daE_YK_Create(fopAc_ac_c* i_this) { } } - if (data_80807EF8 == 0) { + if (hio_set == 0) { yk->mIsFirstSpawn = 1; - data_80807EF8 = 1; + hio_set = 1; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index ef4f89a986..9333b1617f 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -33,22 +33,22 @@ static int daHitobj_Delete(hitobj_class* i_this) { return 1; } -static dCcD_SrcSph cc_sph_src = { - { - {0, {{0, 0, 0x13}, {0, 3}, 0}}, - {dCcD_SE_NONE, 0, 0, 0, {0}}, - {dCcD_SE_NONE, 0, 0, 0, {0}}, - {0}, - }, - { - { - {0.0f, 0.0f, 0.0f}, - 100.0f, - }, - } -}; - static int daHitobj_Create(fopAc_ac_c* i_this) { + static dCcD_SrcSph cc_sph_src = { + { + {0, {{0, 0, 0x13}, {0, 3}, 0}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {dCcD_SE_NONE, 0, 0, 0, {0}}, + {0}, + }, + { + { + {0.0f, 0.0f, 0.0f}, + 100.0f, + }, + } + }; + hitobj_class* hitobj = (hitobj_class*)i_this; fopAcM_ct(i_this, hitobj_class); diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp index 654007dd94..238aadc051 100644 --- a/src/d/actor/d_a_hozelda.cpp +++ b/src/d/actor/d_a_hozelda.cpp @@ -40,10 +40,8 @@ const daHoZelda_hio_c1 daHoZelda_hio_c0::m = { 4000.0f, }; -#if VERSION != VERSION_GCN_PAL u8 daHoZelda_matAnm_c::mEyeMoveFlg; u8 daHoZelda_matAnm_c::mMorfFrame; -#endif void daHoZelda_matAnm_c::init() { field_0xf4 = 0.0f; diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index b1850215f5..4bb6ee25ed 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -125,10 +125,8 @@ daMidna_hio_c1 const daMidna_hio_c0::m = { 25.0f, }; -#if VERSION != VERSION_GCN_PAL bool daMidna_matAnm_c::sEyeMoveFlg; u8 daMidna_matAnm_c::sMorfFrame; -#endif void daMidna_matAnm_c::init() { mOldTransX = 0.0f; diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index 043b1aa540..9f353db664 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -504,8 +504,6 @@ static BOOL message(npc_du_class* i_this) { static bool hio_set; -static u8 lit_3757[12]; - static daNpc_Du_HIO_c l_HIO; static int daNpc_Du_Execute(npc_du_class* i_this) { diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index 128ab10a68..c8517c3ff6 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -11,12 +11,6 @@ #include "d/actor/d_a_npc_lf.h" #include "f_op/f_op_camera_mng.h" -static f32 wp[3] = { - 0.5f, - 1.0f, - 2.5f -}; - daNPC_LF_HIO_c::daNPC_LF_HIO_c() { field_0x04 = -1; field_0x08 = 1.0f; @@ -70,7 +64,7 @@ static int daNPC_LF_Draw(npc_lf_class* i_this) { return 1; } -static u8 data_80A6AA90; +static u8 hio_set; static daNPC_LF_HIO_c l_HIO; @@ -155,6 +149,12 @@ static void npc_lf_move(fopAc_ac_c* param_0, lf_s* pFish) { } static void action(fopAc_ac_c* param_0, lf_s* pFish) { + static f32 wp[3] = { + 0.5f, + 1.0f, + 2.5f + }; + cXyz pos; pFish->field_0x18++; @@ -231,7 +231,7 @@ static int daNPC_LF_Delete(npc_lf_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "NPC_LF"); if (i_this->field_0x1fc0 != 0) { - data_80A6AA90 = 0; + hio_set = 0; } return 1; @@ -293,9 +293,9 @@ static cPhs__Step daNPC_LF_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (data_80A6AA90 == 0) { + if (hio_set == 0) { a_this->field_0x1fc0 = 1; - data_80A6AA90 = 1; + hio_set = 1; l_HIO.field_0x04 = -1; } diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 804b37fbfe..d0c8e12edc 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -247,7 +247,7 @@ static s16 m_near_angle; static fopAc_ac_c* m_near_actor; -static u8 g_isHioChildInitted; +static u8 hio_set; static daNPC_TK_HIO_c l_HIO; @@ -3089,7 +3089,7 @@ static int daNPC_TK_IsDelete(daNPC_TK_c* i_this) { int daNPC_TK_c::_delete() { dComIfG_resDelete(&mPhase, "Npc_tk"); if (field_0xb40) { - g_isHioChildInitted = 0; + hio_set = 0; } if (heap != NULL) { @@ -3218,9 +3218,9 @@ int daNPC_TK_c::create() { return cPhs_ERROR_e; } - if (g_isHioChildInitted == 0) { + if (hio_set == 0) { field_0xb40 = 1; - g_isHioChildInitted = 1; + hio_set = 1; l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("鷹", &l_HIO); // hawk } diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp index 3ee829e5a4..e41ece6b77 100644 --- a/src/d/actor/d_a_npc_tr.cpp +++ b/src/d/actor/d_a_npc_tr.cpp @@ -55,7 +55,7 @@ static f32 dummyLiterals() { return dummy; } -static u8 data_80B26678; +static u8 hio_set; static daNPC_TR_HIO_c l_HIO; @@ -194,7 +194,7 @@ static int daNPC_TR_Delete(npc_tr_class* npc_tr) { dComIfG_resDelete(&npc_tr->mPhaseReq, "NPC_TR"); if (npc_tr->field_0x600) { - data_80B26678 = 0; + hio_set = 0; } return 1; @@ -231,9 +231,9 @@ static int daNPC_TR_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!data_80B26678) { + if (!hio_set) { npc_tr->field_0x600 = 1; - data_80B26678 = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index 36b93c75ca..5a9e8dcdba 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -142,19 +142,18 @@ static dCcD_SrcCyl l_cc_cyl_src = { } // mCyl }; -static u16 l_offsetAngle[4] = { - 0x0, 0xC000, 0x8000, 0x4000, -}; - void daObjYtaihou_c::setNextAngle() { + static u16 l_offsetAngle[4] = { + 0x0, 0xC000, 0x8000, 0x4000, + }; + current.angle.z = home.angle.y + l_offsetAngle[field_0x775]; } -static f32 l_wheelMinR; - -static u8 lbl_396_bss_4C; - void daObjYtaihou_c::setMtx() { + static f32 l_wheelMinR; + static u8 lbl_396_bss_4C; + home.angle.z += (s16) ((s16)(shape_angle.y - old.angle.y) * 0.8f); if ((s8)lbl_396_bss_4C == 0) { l_wheelMinR = cM_scos(0xccc) * 60.0f; diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index 332de76033..71ed8871ba 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -12,8 +12,6 @@ static daBarDesk_HIO_c l_HIO; -static u8 data_80BA9D2C[4]; - dCcD_SrcGObjInf const daBarDesk_c::mCcDObjInfo = { {0, {{0, 0, 0}, {0xD8FAFDBF, 0x11}, {0}}}, {1, 0, 0, 0, 0}, diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index 9bf33d30e8..90c0e7d7fd 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -37,16 +37,6 @@ static dCcD_SrcCyl l_ccDCyl = { static char* l_resName = "H_BouMato"; -static Vec jntCoOffset[2] = { - {0.0f, 0.0f, 0.0f}, - {0.0f, 300.0f, 0.0f}, -}; - -// /* 80BBC58C-80BBC598 -00001 000C+00 1/1 0/0 0/0 .data jntCoData$4045 */ -static dJntColData_c jntCoData = { - 1, 1, 0, 4.0f, jntCoOffset, -}; - daObj_BouMato_c::~daObj_BouMato_c() { OS_REPORT("|%06d:%x|daObj_BouMato_c -> デストラクト\n", g_Counter.mCounter0, this); dComIfG_resDelete(&mPhase, getResName()); @@ -89,6 +79,16 @@ int daObj_BouMato_c::create() { } int daObj_BouMato_c::CreateHeap() { + static Vec jntCoOffset[2] = { + {0.0f, 0.0f, 0.0f}, + {0.0f, 300.0f, 0.0f}, + }; + + // /* 80BBC58C-80BBC598 -00001 000C+00 1/1 0/0 0/0 .data jntCoData$4045 */ + static dJntColData_c jntCoData = { + 1, 1, 0, 4.0f, jntCoOffset, + }; + J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), 4); JUT_ASSERT(374, NULL != mdlData_p); mModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index a766ce284e..23b862399d 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -148,13 +148,13 @@ static int daObj_Cb_IsDelete(obj_cb_class* param_0) { return 1; } -static u8 data_80BC58F8; +static u8 hio_set; static int daObj_Cb_Delete(obj_cb_class* i_this) { fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhase, "Obj_cb"); if (i_this->field_0x978 != 0) { - data_80BC58F8 = 0; + hio_set = 0; } if (i_this->mBgW != NULL) { dComIfG_Bgsp().Release(i_this->mBgW); @@ -211,9 +211,9 @@ static int daObj_Cb_Create(fopAc_ac_c* actor) { return cPhs_ERROR_e; } } - if (data_80BC58F8 == 0) { + if (hio_set == 0) { i_this->field_0x978 = 1; - data_80BC58F8 = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } fopAcM_SetMtx(i_this, i_this->mModel->getBaseTRMtx()); diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index a27a36bb3c..1575a759ff 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -44,10 +44,6 @@ static cXyz l_chainOffset(0.0f, 105.0f, 30.0f); static cXyz l_smokeSetOffset(0.0f, 0.0f, -200.0f); -#if !DEBUG -static s32 unused_bss_70 = 0; -#endif - static cull_box const l_cull_box = { {-250.0f, 0.0f, -450.0f}, {250.0f, 250.0f, 400.0f}, diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp index b452393052..87679188a3 100644 --- a/src/d/actor/d_a_obj_crope.cpp +++ b/src/d/actor/d_a_obj_crope.cpp @@ -36,13 +36,6 @@ static dCcD_SrcSph l_sphSrc = { } // mSphAttr }; -static GXColor color = { - 0x00, - 0x00, - 0x00, - 0xFF, -}; - int daObjCrope_c::create() { fopAcM_ct(this, daObjCrope_c); int rv = dComIfG_resLoad(&mPhase, l_arcName); @@ -360,6 +353,13 @@ static int daObjCrope_Execute(daObjCrope_c* i_this) { } int daObjCrope_c::draw() { + static GXColor color = { + 0x00, + 0x00, + 0x00, + 0xFF, + }; + g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); mLineMat.update(100, 5.0f, color, 0, &tevStr); dComIfGd_set3DlineMat(&mLineMat); diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index ae8794603c..58b7ec352f 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -22,7 +22,7 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2 daPy_py_c* pdVar1 = daPy_getPlayerActorClass(); if (fopAcM_CheckStatus(param_2, 0x400) != 0 && fopAcM_GetName(param_2) == 0xfd) { - static cXyz l_push_check_pos0[4] = { + static cXyz l_push_check_pos[4] = { cXyz(-50.0f, 0.0f, -50.0f), cXyz(50.0f, 0.0f, -50.0f), cXyz(50.0f, 0.0f, 50.0f), @@ -33,10 +33,10 @@ static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2 mDoMtx_stack_c::YrotS(-param_1->current.angle.y); mDoMtx_stack_c::multVec(&local_2c, &local_2c); - if (l_push_check_pos0[0].x <= local_2c.x) { - if (l_push_check_pos0[2].x >= local_2c.x) { - if (l_push_check_pos0[0].z <= local_2c.z) { - if (l_push_check_pos0[2].z >= local_2c.z) { + if (l_push_check_pos[0].x <= local_2c.x) { + if (l_push_check_pos[2].x >= local_2c.x) { + if (l_push_check_pos[0].z <= local_2c.z) { + if (l_push_check_pos[2].z >= local_2c.z) { if ((pdVar1->checkEquipHeavyBoots())) { pthis->field_0x632 = 1; pthis->field_0x634 = 1; diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index 4bd7128eae..61aa595b8c 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -255,21 +255,21 @@ void daObjFan_c::action() { } } -static Vec l_offset_posM[4] = { - {-150.0f, 150.0f, 0.0f}, - {-150.0f, -150.0f, 0.0f}, - {150.0f, 150.0f, 0.0f}, - {150.0f, -150.0f, 0.0f}, -}; - -static Vec l_offset_posL[4] = { - {-300.0f, 300.0f, 0.0f}, - {-300.0f, -300.0f, 0.0f}, - {300.0f, 300.0f, 0.0f}, - {300.0f, -300.0f, 0.0f}, -}; - void daObjFan_c::setCollision() { + static Vec l_offset_posM[4] = { + {-150.0f, 150.0f, 0.0f}, + {-150.0f, -150.0f, 0.0f}, + {150.0f, 150.0f, 0.0f}, + {150.0f, -150.0f, 0.0f}, + }; + + static Vec l_offset_posL[4] = { + {-300.0f, 300.0f, 0.0f}, + {-300.0f, -300.0f, 0.0f}, + {300.0f, 300.0f, 0.0f}, + {300.0f, -300.0f, 0.0f}, + }; + if (field_0xad4 == 0) { return; } diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index fe8aa0ceb7..884e4ac59b 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -13,6 +13,8 @@ #include "d/d_bg_w.h" #include "f_op/f_op_actor_mng.h" +namespace daObjLadder { +namespace { struct Attr { /* 0x00 */ f32 field_0x00; /* 0x04 */ f32 field_0x04; @@ -40,7 +42,7 @@ inline static const Attr& attr() { return L_attr; } -char const daObjLadder::Act_c::M_arcname[5] = "Mhsg"; +char const Act_c::M_arcname[5] = "Mhsg"; struct AttrType { /* 0x0 */ s16 field_0x0; @@ -57,18 +59,18 @@ static AttrType L_attr_type[6] = { { 0x06, 0x0E, 300.0f}, }; -static inline const AttrType& attr_type(daObjLadder::Act_c::Type_e type) { +static inline const AttrType& attr_type(Act_c::Type_e type) { return L_attr_type[type]; } -int daObjLadder::Act_c::CreateHeap() { +int Act_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, attr_type(mType).field_0x0); JUT_ASSERT(382, model_data != NULL); mModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); return mModel != NULL; } -int daObjLadder::Act_c::Create() { +int Act_c::Create() { fopAcM_SetMtx(this, mModel->getBaseTRMtx()); init_mtx(); fopAcM_setCullSizeBox(this, -55.0f, -1.0f, -10.0f, 55.0f, attr_type(mType).field_0x4 + 41.0f, @@ -96,7 +98,7 @@ int daObjLadder::Act_c::Create() { return 1; } -int daObjLadder::Act_c::Mthd_Create() { +int Act_c::Mthd_Create() { fopAcM_ct(this, Act_c); int phase_state = dComIfG_resLoad(&mPhase, M_arcname); if (phase_state == cPhs_COMPLEATE_e) { @@ -108,39 +110,39 @@ int daObjLadder::Act_c::Mthd_Create() { return phase_state; } -int daObjLadder::Act_c::Delete() { +int Act_c::Delete() { return 1; } -int daObjLadder::Act_c::Mthd_Delete() { +int Act_c::Mthd_Delete() { int rv = MoveBGDelete(); dComIfG_resDelete(&mPhase, M_arcname); return rv; } -void daObjLadder::Act_c::demo_end_reset() { +void Act_c::demo_end_reset() { if (mInDemo && dComIfGp_evmng_endCheck(mEventIdx)) { dComIfGp_event_reset(); mInDemo = false; } } -void daObjLadder::Act_c::mode_wait_init() { +void Act_c::mode_wait_init() { mMode = MODE_WAIT; } -void daObjLadder::Act_c::mode_wait() { +void Act_c::mode_wait() { if (fopAcM_isSwitch(this, prm_get_swSave())) { mode_demoreq_init(); } } -void daObjLadder::Act_c::mode_demoreq_init() { +void Act_c::mode_demoreq_init() { mMode = MODE_DEMOREQ; mInDemo = false; } -void daObjLadder::Act_c::mode_demoreq() { +void Act_c::mode_demoreq() { bool isDemo = false; if (dComIfGp_evmng_existence(mEventIdx)) { if (eventInfo.checkCommandDemoAccrpt()) { @@ -158,14 +160,14 @@ void daObjLadder::Act_c::mode_demoreq() { } } -void daObjLadder::Act_c::mode_vib_init() { +void Act_c::mode_vib_init() { mVibrationTimer = attr().vibrationTimer; field_0x610 = 0; field_0x612 = 0; mMode = MODE_VIB; } -void daObjLadder::Act_c::mode_vib() { +void Act_c::mode_vib() { field_0x610 += attr().field_0x16; field_0x612 += attr().field_0x18; field_0x614 = cM_scos(field_0x610) * attr().field_0x1c; @@ -175,14 +177,14 @@ void daObjLadder::Act_c::mode_vib() { } } -void daObjLadder::Act_c::mode_drop_init() { +void Act_c::mode_drop_init() { gravity = -5.0f; speed.set(cXyz::Zero); field_0x5b6 = attr().field_0x10; mMode = MODE_DROP; } -void daObjLadder::Act_c::mode_drop() { +void Act_c::mode_drop() { daObj::posMoveF_stream(this, NULL, &cXyz::Zero, attr().field_0x04, attr().field_0x08); if (current.pos.y < mHeight) { if (field_0x5b6 == attr().field_0x10) { @@ -214,16 +216,16 @@ void daObjLadder::Act_c::mode_drop() { } } -void daObjLadder::Act_c::mode_fell_init() { +void Act_c::mode_fell_init() { mMode = MODE_FELL; } -void daObjLadder::Act_c::mode_fell() { +void Act_c::mode_fell() { } -Mtx daObjLadder::Act_c::M_tmp_mtx; +Mtx Act_c::M_tmp_mtx; -void daObjLadder::Act_c::set_mtx() { +void Act_c::set_mtx() { mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z); cMtx_copy(mDoMtx_stack_c::get(), M_tmp_mtx); @@ -231,16 +233,16 @@ void daObjLadder::Act_c::set_mtx() { mModel->setBaseTRMtx(mDoMtx_stack_c::get()); } -void daObjLadder::Act_c::init_mtx() { +void Act_c::init_mtx() { mModel->setBaseScale(scale); set_mtx(); } -int daObjLadder::Act_c::Execute(f32 (**param_1)[3][4]) { - static const daObjLadder::Act_c::modeProc mode_proc[5] = { - &daObjLadder::Act_c::mode_wait, &daObjLadder::Act_c::mode_demoreq, - &daObjLadder::Act_c::mode_vib, &daObjLadder::Act_c::mode_drop, - &daObjLadder::Act_c::mode_fell, +int Act_c::Execute(f32 (**param_1)[3][4]) { + static const Act_c::modeProc mode_proc[5] = { + &Act_c::mode_wait, &Act_c::mode_demoreq, + &Act_c::mode_vib, &Act_c::mode_drop, + &Act_c::mode_fell, }; demo_end_reset(); @@ -251,7 +253,7 @@ int daObjLadder::Act_c::Execute(f32 (**param_1)[3][4]) { return 1; } -int daObjLadder::Act_c::Draw() { +int Act_c::Draw() { g_env_light.settingTevStruct(0x10, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); dComIfGd_setListBG(); @@ -261,24 +263,24 @@ int daObjLadder::Act_c::Draw() { return 1; } -static int Mthd_Create(daObjLadder::Act_c* i_this) { - return i_this->Mthd_Create(); +static int Mthd_Create(void* i_this) { + return ((Act_c*)i_this)->Mthd_Create(); } -static int Mthd_Delete(daObjLadder::Act_c* i_this) { - return i_this->Mthd_Delete(); +static int Mthd_Delete(void* i_this) { + return ((Act_c*)i_this)->Mthd_Delete(); } -static int Mthd_Execute(daObjLadder::Act_c* i_this) { - return i_this->MoveBGExecute(); +static int Mthd_Execute(void* i_this) { + return ((Act_c*)i_this)->MoveBGExecute(); } -static int Mthd_Draw(daObjLadder::Act_c* i_this) { - return i_this->MoveBGDraw(); +static int Mthd_Draw(void* i_this) { + return ((Act_c*)i_this)->MoveBGDraw(); } -static int Mthd_IsDelete(daObjLadder::Act_c* i_this) { - return i_this->MoveBGIsDelete(); +static int Mthd_IsDelete(void* i_this) { + return ((Act_c*)i_this)->MoveBGIsDelete(); } static actor_method_class Mthd_Table = { @@ -289,6 +291,9 @@ static actor_method_class Mthd_Table = { (process_method_func)Mthd_Draw, }; +} +} + extern actor_process_profile_definition g_profile_Obj_Ladder = { fpcLy_CURRENT_e, // mLayerID 3, // mListID @@ -300,7 +305,7 @@ extern actor_process_profile_definition g_profile_Obj_Ladder = { 0, // mParameters &g_fopAc_Method.base, // sub_method 23, // mPriority - &Mthd_Table, // sub_method + &daObjLadder::Mthd_Table, // sub_method 0x00040100, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_CUSTOM_e, // cullType diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index 005ffa3cae..8f23621e2c 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -11,19 +11,7 @@ #include "f_op/f_op_actor_mng.h" #include "m_Do/m_Do_hostIO.h" -static dCcD_SrcSph cc_sph_src = { - { - {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - -static u8 data_80C540E8; +static u8 hio_set; static daObj_Lbox_HIO_c l_HIO; @@ -116,7 +104,7 @@ static int daObj_Lbox_Delete(obj_lbox_class* i_this) { fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhaseReq, "Obj_lbox"); if (i_this->field_0xa8c != 0) { - data_80C540E8 = 0; + hio_set = 0; } dComIfG_Bgsp().Release(i_this->mpBgW); return 1; @@ -147,6 +135,18 @@ static int useHeapInit(fopAc_ac_c* i_this) { } static cPhs__Step daObj_Lbox_Create(fopAc_ac_c* i_this) { + static dCcD_SrcSph cc_sph_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x0}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x2}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr + }; + obj_lbox_class* a_this = static_cast(i_this); fopAcM_ct(a_this, obj_lbox_class); cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&a_this->mPhaseReq, "Obj_lbox"); @@ -165,9 +165,9 @@ static cPhs__Step daObj_Lbox_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (data_80C540E8 == 0) { + if (hio_set == 0) { a_this->field_0xa8c = 1; - data_80C540E8 = 1; + hio_set = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp index 38f2ac8963..346bb1e648 100644 --- a/src/d/actor/d_a_obj_myogan.cpp +++ b/src/d/actor/d_a_obj_myogan.cpp @@ -28,7 +28,7 @@ static int daObj_Myogan_Draw(obj_myogan_class* i_this) { return 1; } -static bool initialized; +static bool hio_set; static daObj_Myogan_HIO_c l_HIO; @@ -74,7 +74,7 @@ static int daObj_Myogan_IsDelete(obj_myogan_class* i_this) { static int daObj_Myogan_Delete(obj_myogan_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "S_YOGAN"); if (i_this->mInitialized) { - initialized = false; + hio_set = false; } dComIfG_Bgsp().Release(i_this->mpBgW); @@ -142,9 +142,9 @@ static int daObj_Myogan_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!initialized) { + if (!hio_set) { a_this->mInitialized = 1; - initialized = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index 10cc59d483..597cce820e 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -573,12 +573,12 @@ int daObjNAN_c::execute() { return 1; } -static u8 l_hio_init; +static u8 hio_set; int daObjNAN_c::_delete() { dComIfG_resDelete(&mPhase, "I_Nan"); if (field_0x7fd != 0) { - l_hio_init = 0; + hio_set = 0; } if (heap != NULL) { mMorf->stopZelAnime(); @@ -686,8 +686,8 @@ int daObjNAN_c::create() { return cPhs_ERROR_e; } OS_REPORT("/////////////// I_NAN SET OK //////////\n"); - if (l_hio_init == 0) { - l_hio_init = 1; + if (hio_set == 0) { + hio_set = 1; field_0x7fd = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index 1f49c3870c..dc2565daad 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -28,23 +28,23 @@ static char* l_arcName[1] = { "Octhashi" }; -static dCcD_SrcCyl ccCylSrc = { - { - {0x0, {{0x0, 0x0, 0xd}, {0x104002, 0x1f}, 0x75}}, // mObj - {dCcD_SE_STONE, 0x2, 0x0, 0x0, 0x1}, // mGObjAt - {dCcD_SE_STONE, 0x2, 0x0, 0x0, 0x1}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 400.0f, // mRadius - 0.0f // mHeight - } // mCyl -}; - static s8 l_cyl_height_init = 0; void daObjOCTHASHI_c::initCcCylinder() { + static dCcD_SrcCyl ccCylSrc = { + { + {0x0, {{0x0, 0x0, 0xd}, {0x104002, 0x1f}, 0x75}}, // mObj + {dCcD_SE_STONE, 0x2, 0x0, 0x0, 0x1}, // mGObjAt + {dCcD_SE_STONE, 0x2, 0x0, 0x0, 0x1}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 400.0f, // mRadius + 0.0f // mHeight + } // mCyl + }; + if (l_cyl_height_init == 0) { ccCylSrc.mCyl.mHeight = (f32)(mPieceNum + 1) * 800.0f - 100.f; l_cyl_height_init = 1; diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index ecf841b3f6..81ad137d34 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -103,7 +103,7 @@ void daObjRIVERROCK_c::CheckBG() { field_0x5d0 = particlePos; } -static bool mHIOInitialized; +static bool hio_set; static daObjRIVERROCK_HIO_c l_HIO; @@ -244,8 +244,8 @@ int daObjRIVERROCK_c::create() { } else { field_0x5c4.set(1.0f, 1.0f, 1.0f); } - if (!mHIOInitialized) { - mHIOInitialized = true; + if (!hio_set) { + hio_set = true; mHIONeedDelete = true; l_HIO.field_0x4 = -1; } @@ -304,7 +304,7 @@ int daObjRIVERROCK_c::Draw() { int daObjRIVERROCK_c::Delete() { dComIfG_resDelete(&mPhase, l_arcName); if (mHIONeedDelete) { - mHIOInitialized = false; + hio_set = false; } mSoundObj.deleteObject(); return 1; diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp index 072bf8bbee..2301852a13 100644 --- a/src/d/actor/d_a_obj_rock.cpp +++ b/src/d/actor/d_a_obj_rock.cpp @@ -89,19 +89,19 @@ static int set_pos_check(obj_rock_class* i_this, int target_index) { return TRUE; } -static dCcD_SrcSph cc_sph_src = { - { - {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}}, // mObj - {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt - {dCcD_SE_METAL, 0x2, 0x0, 0x0, 0x3}, // mGObjTg - {0x0}, // mGObjCo - }, // mObjInf - { - {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph - } // mSphAttr -}; - static int daObj_Rock_Create(fopAc_ac_c* i_this) { + static dCcD_SrcSph cc_sph_src = { + { + {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x11}, 0x79}}, // mObj + {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt + {dCcD_SE_METAL, 0x2, 0x0, 0x0, 0x3}, // mGObjTg + {0x0}, // mGObjCo + }, // mObjInf + { + {{0.0f, 0.0f, 0.0f}, 40.0f} // mSph + } // mSphAttr + }; + obj_rock_class* a_this = static_cast(i_this); fopAcM_ct(a_this, obj_rock_class); diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 921f8b74ab..ebf7648909 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -877,7 +877,7 @@ static void demo_camera(obj_so_class* i_this) { } } -static u8 data_80CE3C90; +static u8 hio_set; static daObj_So_HIO_c l_HIO; @@ -909,8 +909,8 @@ static int daObj_So_Delete(obj_so_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "Obj_so"); if (i_this->field_0x1bcc != 0) { - data_80CE3C90 = 0; - mDoHIO_DELETE_CHILD(data_80CE3C90); + hio_set = 0; + mDoHIO_DELETE_CHILD(hio_set); } for (int i = 0; i < 2; i++) { @@ -1027,9 +1027,9 @@ static int daObj_So_Create(fopAc_ac_c* a_this) { } } - if (data_80CE3C90 == 0) { + if (hio_set == 0) { i_this->field_0x1bcc = 1; - data_80CE3C90 = 1; + hio_set = 1; mDoHIO_CREATE_CHILD("猿オリＯＢＪ", &l_HIO); // Monkey jail OBJ l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 0cfb3c3e61..729f3ac8a9 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -615,12 +615,12 @@ void daObjTEN_c::Z_BufferChk() { field_0x618 = ((near + ((far * near) / local_5c.z)) / (far - near) + 1.0f) * 16777215.0f; } -static u8 data_80D0BAB8; +static u8 hio_set; int daObjTEN_c::Delete() { dComIfG_resDelete(&mPhase, "I_Ten"); if (field_0xa64 != 0) { - data_80D0BAB8 = 0; + hio_set = 0; } mCreature.deleteObject(); return 1; @@ -722,8 +722,8 @@ int daObjTEN_c::create() { if (fopAcM_entrySolidHeap(this, useHeapInit, 0xbc0) == 0) { return cPhs_ERROR_e; } - if (data_80D0BAB8 == 0) { - data_80D0BAB8 = 1; + if (hio_set == 0) { + hio_set = 1; field_0xa64 = 1; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp index 470ca3536f..e9182f827b 100644 --- a/src/d/actor/d_a_obj_web0.cpp +++ b/src/d/actor/d_a_obj_web0.cpp @@ -157,13 +157,13 @@ static int daObj_Web0_IsDelete(obj_web0_class* i_this) { return 1; } -static u8 data_80D35290; +static u8 hio_set; static int daObj_Web0_Delete(obj_web0_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "Obj_web0"); if (i_this->field_0x739) { - data_80D35290 = 0; + hio_set = 0; } dComIfG_Bgsp().Release(i_this->mpBgW); @@ -251,9 +251,9 @@ static int daObj_Web0_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!data_80D35290) { + if (!hio_set) { _this->field_0x739 = 1; - data_80D35290 = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index bf3fb86dbc..ac5020f8d6 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -181,13 +181,13 @@ static int daObj_Web1_IsDelete(obj_web1_class* i_this) { return 1; } -static u8 data_80D361F8; +static u8 hio_set; static int daObj_Web1_Delete(obj_web1_class* i_this) { dComIfG_resDelete(&i_this->mPhase, "Obj_web1"); if (i_this->field_0x76c) { - data_80D361F8 = 0; + hio_set = 0; } dComIfG_Bgsp().Release(i_this->mpBgW); @@ -279,9 +279,9 @@ static int daObj_Web1_Create(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - if (!data_80D361F8) { + if (!hio_set) { _this->field_0x76c = 1; - data_80D361F8 = true; + hio_set = true; l_HIO.field_0x4 = -1; } diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index 979934f296..7c35664b04 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -27,10 +27,10 @@ static int daObj_Wflag_Draw(obj_wflag_class* i_this) { return 1; } -static f32 pd[19] = {1.0f, 0.9f, 0.8f, 0.7f, 0.6f, 0.5f, 0.4f, 0.3f, 0.2f, 0.2f, - 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f}; - static void tail_control(fopAc_ac_c* param_1, wf_tail_s* param_2) { + static f32 pd[19] = {1.0f, 0.9f, 0.8f, 0.7f, 0.6f, 0.5f, 0.4f, 0.3f, 0.2f, 0.2f, + 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f, 0.2f}; + cXyz local_74; cXyz cStack_80; int i; diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index 7b0681700a..d94f5e702d 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -19,18 +19,6 @@ static char const* l_arcName[7] = { "MirrorB", }; -static char const* l_stageName[9] = { - "D_MN05A", - "D_MN04A", - "D_MN01A", - "D_MN10A", - "D_MN11A", - "D_MN06A", - "D_MN07A", - "D_MN01A", - "D_MN01A", -}; - static int const l_bmdIndex[7] = {4, 4, 4, 9, 9, 10, 11}; static int const l_brkIndex[3] = {7, 7, 7}; @@ -38,6 +26,18 @@ static int const l_brkIndex[3] = {7, 7, 7}; static int const l_btkIndex[7] = {14, 14, 14, 14, 14, 15, 16}; static int getNowLevel() { + static char const* l_stageName[9] = { + "D_MN05A", + "D_MN04A", + "D_MN01A", + "D_MN10A", + "D_MN11A", + "D_MN06A", + "D_MN07A", + "D_MN01A", + "D_MN01A", + }; + for (int i = 0; i < 9; i++) { if (!strcmp(dComIfGp_getStartStageName(), l_stageName[i])) { return i + 1; diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp index d3b90f3458..5f5435761b 100644 --- a/src/d/actor/d_a_tag_kago_fall.cpp +++ b/src/d/actor/d_a_tag_kago_fall.cpp @@ -56,7 +56,7 @@ int daTagKagoFall_c::execute() { return TRUE; } -void daTagKagoFall_c::setActionMode(ActionMode mode, u8 state) { +void daTagKagoFall_c::setActionMode(u8 mode, u8 state) { mActionMode = mode; mActionState = state; } diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index 538420e3ff..a0d4f694c3 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -241,33 +241,33 @@ void daTagStatue_c::actionDead() { /* empty function */ } -static char* action_table[3] = { - "WAIT", - "ST_MOVE", - "ITEM" -}; - -// Saved positions of Owl Statues for cutscenes -static Vec l_statue_pos[6] = { - {-17312.3007812f, -349.100006104f, -20523.1992188f}, // Faron Woods - {-17312.3007812f, -349.100006104f, -20523.1992188f}, // Gerudo Desert - {-9675.59960938f, -4800.0f, 39693.8984375f}, // Kakariko Gorge - {33345.6015625f, -75.5999984741f, -36331.1015625f}, // Great Eldin Bridge - {-94009.5f, -5440.10009766f, 18534.9003906f}, // Lake Hylia - {-81451.296875f, -1654.09997559f, 20832.1992188} // Ruined Theatre -}; - -// Saved y orientations of Owl Statues for cutscenes -static s16 l_statue_ang[6] = { - 16384, // Faron Woods - 16384, // Gerudo Desert - 8485, // Kakariko Gorge - 16384, // Great Eldin Bridge - 16384, // Lake Hylia - 16384 // Ruined Theatre -}; - int daTagStatue_c::demoProc() { + static char* action_table[3] = { + "WAIT", + "ST_MOVE", + "ITEM" + }; + + // Saved positions of Owl Statues for cutscenes + static Vec l_statue_pos[6] = { + {-17312.3007812f, -349.100006104f, -20523.1992188f}, // Faron Woods + {-17312.3007812f, -349.100006104f, -20523.1992188f}, // Gerudo Desert + {-9675.59960938f, -4800.0f, 39693.8984375f}, // Kakariko Gorge + {33345.6015625f, -75.5999984741f, -36331.1015625f}, // Great Eldin Bridge + {-94009.5f, -5440.10009766f, 18534.9003906f}, // Lake Hylia + {-81451.296875f, -1654.09997559f, 20832.1992188} // Ruined Theatre + }; + + // Saved y orientations of Owl Statues for cutscenes + static s16 l_statue_ang[6] = { + 16384, // Faron Woods + 16384, // Gerudo Desert + 8485, // Kakariko Gorge + 16384, // Great Eldin Bridge + 16384, // Lake Hylia + 16384 // Ruined Theatre + }; + int act_id = dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZEU(action_table), 0, 0); if(dComIfGp_evmng_getIsAddvance(mStaffId)) { diff --git a/src/d/d_msg_scrn_staff.cpp b/src/d/d_msg_scrn_staff.cpp index aeeae95c0d..cbba48b164 100644 --- a/src/d/d_msg_scrn_staff.cpp +++ b/src/d/d_msg_scrn_staff.cpp @@ -11,11 +11,11 @@ #include "d/d_msg_object.h" #include "d/d_pane_class.h" -static u64 t_tag[6] = { - 'right_s', 'right', 'center_s', 'center', 'left_s', 'left', -}; - dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) { + static u64 t_tag[6] = { + 'right_s', 'right', 'center_s', 'center', 'left_s', 'left', + }; + init(); field_0xd0 = 0.0f; From 3feb1e90980369d4b3bf5fee1055e3dbfa6c0e56 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 23 Dec 2025 00:55:51 -0500 Subject: [PATCH 07/35] Add missing RVL .init splits (#2989) * Fix Debug_BBA being in the wrong split for GCN * Add .init splits/symbols for Wii versions * Fix incorrect relocations detected to __check_pad3 for Wii * Add .init splits and fix __check_pad3 for Shield versions --- .vscode/tasks.json | 2 +- config/GZ2E01/splits.txt | 9 +++++---- config/GZ2E01/symbols.txt | 2 +- config/GZ2J01/splits.txt | 9 +++++---- config/GZ2J01/symbols.txt | 2 +- config/GZ2P01/splits.txt | 9 +++++---- config/GZ2P01/symbols.txt | 2 +- config/RZDE01_00/config.yml | 4 ++++ config/RZDE01_00/splits.txt | 13 ++++++++++++- config/RZDE01_02/config.yml | 4 ++++ config/RZDE01_02/splits.txt | 13 ++++++++++++- config/RZDJ01/config.yml | 4 ++++ config/RZDJ01/splits.txt | 13 ++++++++++++- config/RZDJ01/symbols.txt | 18 +++++++++--------- config/RZDP01/config.yml | 4 ++++ config/RZDP01/splits.txt | 13 ++++++++++++- config/RZDP01/symbols.txt | 17 +++++++++-------- config/Shield/config.yml | 4 ++++ config/Shield/splits.txt | 11 ++++++++++- config/ShieldD/config.yml | 2 ++ config/ShieldD/splits.txt | 11 ++++++++++- configure.py | 3 ++- src/dolphin/os/OSThread.c | 4 ---- src/dolphin/os/__start.c | 2 ++ 24 files changed, 131 insertions(+), 44 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a2c434e915..0e26bc0455 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -12,7 +12,7 @@ "GZ2J01", // GCN JPN "RZDE01_00", // Wii USA Rev 0 "RZDE01_02", // Wii USA Rev 2 - //"RZDP01", // Wii PAL + "RZDP01", // Wii PAL "RZDJ01", // Wii JPN //"RZDK01", // Wii KOR //"DZDE01", // Wii USA Kiosk Demo diff --git a/config/GZ2E01/splits.txt b/config/GZ2E01/splits.txt index 57e3ef80c8..35ca40d130 100644 --- a/config/GZ2E01/splits.txt +++ b/config/GZ2E01/splits.txt @@ -3027,7 +3027,7 @@ dolphin/os/OSThread.c: .data start:0x803D0838 end:0x803D1048 .bss start:0x8044BB78 end:0x8044C570 .sdata start:0x804509B8 end:0x804509C0 - .sbss start:0x804516C0 end:0x804516D8 + .sbss start:0x804516C0 end:0x804516D0 dolphin/os/OSTime.c: .text start:0x803426FC end:0x80342B78 @@ -3036,6 +3036,10 @@ dolphin/os/OSTime.c: dolphin/os/__ppc_eabi_init.cpp: .text start:0x80342B78 end:0x80342C0C +dolphin/os/__start.c: + .init start:0x80003100 end:0x80003458 + .sbss start:0x804516D0 end:0x804516D8 + dolphin/exi/EXIBios.c: .text start:0x80342C0C end:0x803445E8 .data start:0x803D10A8 end:0x803D11B8 @@ -3603,9 +3607,6 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c: TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c: .text start:0x8036F548 end:0x8036F580 -dolphin/os/__start.c: - .init start:0x80003100 end:0x80003458 - PowerPC_EABI_Support/Runtime/Src/__mem.c: .init start:0x80003458 end:0x80003590 diff --git a/config/GZ2E01/symbols.txt b/config/GZ2E01/symbols.txt index 6470afbf9d..70d988a893 100644 --- a/config/GZ2E01/symbols.txt +++ b/config/GZ2E01/symbols.txt @@ -22311,7 +22311,7 @@ HoldDown = .sbss:0x804516B8; // type:object size:0x8 scope:local align:8 data:4b RunQueueBits = .sbss:0x804516C0; // type:object size:0x4 scope:local align:4 data:4byte RunQueueHint = .sbss:0x804516C4; // type:object size:0x4 scope:local align:4 data:4byte Reschedule = .sbss:0x804516C8; // type:object size:0x4 scope:local align:4 data:4byte -Debug_BBA = .sbss:0x804516D0; // type:object size:0x1 scope:global align:8 data:byte +Debug_BBA = .sbss:0x804516D0; // type:object size:0x1 scope:local data:byte IDSerialPort1 = .sbss:0x804516D8; // type:object size:0x4 scope:local align:4 data:4byte Chan = .sbss:0x804516E0; // type:object size:0x4 scope:local align:4 data:4byte Dev = .sbss:0x804516E4; // type:object size:0x4 scope:local align:4 data:4byte diff --git a/config/GZ2J01/splits.txt b/config/GZ2J01/splits.txt index 757dcccb4a..5feaac606a 100644 --- a/config/GZ2J01/splits.txt +++ b/config/GZ2J01/splits.txt @@ -2955,7 +2955,7 @@ dolphin/os/OSThread.c: .data start:0x803CA978 end:0x803CB188 .bss start:0x80445CB8 end:0x804466B0 .sdata start:0x8044AAF8 end:0x8044AB00 - .sbss start:0x8044B800 end:0x8044B818 + .sbss start:0x8044B800 end:0x8044B810 dolphin/os/OSTime.c: .text start:0x80344B98 end:0x80345014 @@ -2964,6 +2964,10 @@ dolphin/os/OSTime.c: dolphin/os/__ppc_eabi_init.cpp: .text start:0x80345014 end:0x803450A8 +dolphin/os/__start.c: + .init start:0x80003100 end:0x80003458 + .sbss start:0x8044B810 end:0x8044B818 + dolphin/exi/EXIBios.c: .text start:0x803450A8 end:0x80346A84 .data start:0x803CB1E8 end:0x803CB2F8 @@ -3531,9 +3535,6 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c: TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c: .text start:0x803719E4 end:0x80371A1C -dolphin/os/__start.c: - .init start:0x80003100 end:0x80003458 - PowerPC_EABI_Support/Runtime/Src/__mem.c: .init start:0x80003458 end:0x80003590 diff --git a/config/GZ2J01/symbols.txt b/config/GZ2J01/symbols.txt index ccae3db9ec..c3a1d8e1b3 100644 --- a/config/GZ2J01/symbols.txt +++ b/config/GZ2J01/symbols.txt @@ -22340,7 +22340,7 @@ HoldDown = .sbss:0x8044B7F8; // type:object size:0x8 scope:local align:4 data:4b RunQueueBits = .sbss:0x8044B800; // type:object size:0x4 scope:local align:4 data:4byte RunQueueHint = .sbss:0x8044B804; // type:object size:0x4 scope:local align:4 data:4byte Reschedule = .sbss:0x8044B808; // type:object size:0x4 scope:local align:4 data:4byte -Debug_BBA = .sbss:0x8044B810; // type:object size:0x1 scope:global align:8 data:byte +Debug_BBA = .sbss:0x8044B810; // type:object size:0x1 scope:local data:byte IDSerialPort1 = .sbss:0x8044B818; // type:object size:0x4 scope:local align:4 data:4byte Chan = .sbss:0x8044B820; // type:object size:0x4 scope:local align:4 data:4byte Dev = .sbss:0x8044B824; // type:object size:0x4 scope:local align:4 data:4byte diff --git a/config/GZ2P01/splits.txt b/config/GZ2P01/splits.txt index 0c0107c9e7..1ec2860617 100644 --- a/config/GZ2P01/splits.txt +++ b/config/GZ2P01/splits.txt @@ -2955,7 +2955,7 @@ dolphin/os/OSThread.c: .data start:0x803D27D8 end:0x803D2FE8 .bss start:0x8044DB38 end:0x8044E530 .sdata start:0x80452978 end:0x80452980 - .sbss start:0x80453688 end:0x804536A0 + .sbss start:0x80453688 end:0x80453698 dolphin/os/OSTime.c: .text start:0x80343568 end:0x803439E4 @@ -2964,6 +2964,10 @@ dolphin/os/OSTime.c: dolphin/os/__ppc_eabi_init.cpp: .text start:0x803439E4 end:0x80343A78 +dolphin/os/__start.c: + .init start:0x80003100 end:0x80003458 + .sbss start:0x80453698 end:0x804536A0 + dolphin/exi/EXIBios.c: .text start:0x80343A78 end:0x80345454 .data start:0x803D3048 end:0x803D3158 @@ -3531,9 +3535,6 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c: TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c: .text start:0x80370378 end:0x803703B0 -dolphin/os/__start.c: - .init start:0x80003100 end:0x80003458 - PowerPC_EABI_Support/Runtime/Src/__mem.c: .init start:0x80003458 end:0x80003590 diff --git a/config/GZ2P01/symbols.txt b/config/GZ2P01/symbols.txt index 14389374c0..fc60314826 100644 --- a/config/GZ2P01/symbols.txt +++ b/config/GZ2P01/symbols.txt @@ -22353,7 +22353,7 @@ HoldDown = .sbss:0x80453680; // type:object size:0x8 scope:local align:4 data:4b RunQueueBits = .sbss:0x80453688; // type:object size:0x4 scope:local align:4 data:4byte RunQueueHint = .sbss:0x8045368C; // type:object size:0x4 scope:local align:4 data:4byte Reschedule = .sbss:0x80453690; // type:object size:0x4 scope:local align:4 data:4byte -Debug_BBA = .sbss:0x80453698; // type:object size:0x1 scope:global align:8 data:byte +Debug_BBA = .sbss:0x80453698; // type:object size:0x1 scope:local data:byte IDSerialPort1 = .sbss:0x804536A0; // type:object size:0x4 scope:local align:4 data:4byte Chan = .sbss:0x804536A8; // type:object size:0x4 scope:local align:4 data:4byte Dev = .sbss:0x804536AC; // type:object size:0x4 scope:local align:4 data:4byte diff --git a/config/RZDE01_00/config.yml b/config/RZDE01_00/config.yml index dc7a5962b1..70a4a964fa 100644 --- a/config/RZDE01_00/config.yml +++ b/config/RZDE01_00/config.yml @@ -13,6 +13,10 @@ force_active: [ _MetroTRK_Has_Framing, ] +block_relocations: +- source: .text:0x80344978 +- source: .text:0x803449f0 + modules: - object: files/RELS.arc:rels/mmem/f_pc_profile_lst.rel hash: 40511841f108b688f4885b19bf8ecf07781aab67 diff --git a/config/RZDE01_00/splits.txt b/config/RZDE01_00/splits.txt index 22e241bf62..08be85c1e4 100644 --- a/config/RZDE01_00/splits.txt +++ b/config/RZDE01_00/splits.txt @@ -3209,7 +3209,11 @@ revolution/os/OSStateTM.c: .text start:0x8034FB88 end:0x8035027C .data start:0x8043D210 end:0x8043D2D8 .bss start:0x804EBB60 end:0x804EBC20 - .sbss start:0x8053B4E0 end:0x8053B508 + .sbss start:0x8053B4E0 end:0x8053B500 + +revolution/os/__start.c: + .init start:0x80004000 end:0x800042E0 + .sbss start:0x8053B500 end:0x8053B508 revolution/os/OSPlayRecord.c: .text start:0x8035027C end:0x80350954 @@ -3223,6 +3227,7 @@ revolution/os/OSStateFlags.c: .bss start:0x804EBE20 end:0x804EBE40 revolution/os/__ppc_eabi_init.cpp: + .init start:0x800042E0 end:0x80004338 .text start:0x80350B4C end:0x80350C00 revolution/exi/EXIBios.c: @@ -3963,6 +3968,7 @@ revolution/gd/GDGeometry.c: .data start:0x804492A8 end:0x80449310 PowerPC_EABI_Support/Runtime/Src/__mem.c: + .init start:0x80004338 end:0x8000446C .text start:0x803BDB38 end:0x803BDB54 PowerPC_EABI_Support/Runtime/Src/__va_arg.c: @@ -4305,6 +4311,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache. .text start:0x803CA918 end:0x803CA950 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c: + .init start:0x8000446C end:0x800044C0 .text start:0x803CA950 end:0x803CAA08 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c: @@ -4325,7 +4332,11 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c: .text start:0x803CC7D0 end:0x803CC948 +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s: + .init start:0x800044C0 end:0x800063F4 + TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c: + .init start:0x800063F4 end:0x80006420 .text start:0x803CC948 end:0x803CCC64 .data start:0x80449AE0 end:0x80449B20 .bss start:0x80536FE0 end:0x80536FE8 diff --git a/config/RZDE01_02/config.yml b/config/RZDE01_02/config.yml index 8247d238de..cabb79264c 100644 --- a/config/RZDE01_02/config.yml +++ b/config/RZDE01_02/config.yml @@ -13,6 +13,10 @@ force_active: [ _MetroTRK_Has_Framing, ] +block_relocations: +- source: .text:0x8032f348 +- source: .text:0x8032f3c0 + modules: - object: files/RELS.arc:rels/mmem/f_pc_profile_lst.rel hash: a7f24646c20b174199613be4780a362c29ffec9a diff --git a/config/RZDE01_02/splits.txt b/config/RZDE01_02/splits.txt index 739f5b328b..32899e9801 100644 --- a/config/RZDE01_02/splits.txt +++ b/config/RZDE01_02/splits.txt @@ -3171,7 +3171,11 @@ revolution/os/OSStateTM.c: .text start:0x8033A5C0 end:0x8033ACB4 .data start:0x804246D8 end:0x804247A0 .bss start:0x804D1BE0 end:0x804D1CA0 - .sbss start:0x805214D8 end:0x80521500 + .sbss start:0x805214D8 end:0x805214F8 + +revolution/os/__start.c: + .init start:0x80004000 end:0x800042E0 + .sbss start:0x805214F8 end:0x80521500 revolution/os/OSPlayRecord.c: .text start:0x8033ACB4 end:0x8033B38C @@ -3185,6 +3189,7 @@ revolution/os/OSStateFlags.c: .bss start:0x804D1EA0 end:0x804D1EC0 revolution/os/__ppc_eabi_init.cpp: + .init start:0x800042E0 end:0x80004338 .text start:0x8033B584 end:0x8033B638 revolution/exi/EXIBios.c: @@ -3922,6 +3927,7 @@ revolution/gd/GDGeometry.c: .data start:0x80430788 end:0x804307F0 PowerPC_EABI_Support/Runtime/Src/__mem.c: + .init start:0x80004338 end:0x8000446C .text start:0x803A8570 end:0x803A858C PowerPC_EABI_Support/Runtime/Src/__va_arg.c: @@ -4263,6 +4269,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache. .text start:0x803B5350 end:0x803B5388 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c: + .init start:0x8000446C end:0x800044C0 .text start:0x803B5388 end:0x803B5440 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c: @@ -4283,7 +4290,11 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c: .text start:0x803B7210 end:0x803B7388 +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s: + .init start:0x800044C0 end:0x800063F4 + TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c: + .init start:0x800063F4 end:0x80006420 .text start:0x803B7388 end:0x803B76A4 .data start:0x80430FC0 end:0x80431000 .bss start:0x8051D060 end:0x8051D068 diff --git a/config/RZDJ01/config.yml b/config/RZDJ01/config.yml index c1cbeb5ec3..7cd94dd0b4 100644 --- a/config/RZDJ01/config.yml +++ b/config/RZDJ01/config.yml @@ -13,6 +13,10 @@ force_active: [ _MetroTRK_Has_Framing, ] +block_relocations: +- source: .text:0x80330e68 +- source: .text:0x80330ee0 + modules: - object: files/RELS.arc:rels/mmem/f_pc_profile_lst.rel hash: 8392f1c2b842a02891ee30481ed96aa107e8d300 diff --git a/config/RZDJ01/splits.txt b/config/RZDJ01/splits.txt index 4f9583ea9e..05732471f7 100644 --- a/config/RZDJ01/splits.txt +++ b/config/RZDJ01/splits.txt @@ -3167,7 +3167,11 @@ revolution/os/OSStateTM.c: .text start:0x8033C078 end:0x8033C76C .data start:0x80422558 end:0x80422620 .bss start:0x804CFA60 end:0x804CFB20 - .sbss start:0x8051F348 end:0x8051F370 + .sbss start:0x8051F348 end:0x8051F368 + +revolution/os/__start.c: + .init start:0x80004000 end:0x800042E0 + .sbss start:0x8051F368 end:0x8051F370 revolution/os/OSPlayRecord.c: .text start:0x8033C76C end:0x8033CE44 @@ -3181,6 +3185,7 @@ revolution/os/OSStateFlags.c: .bss start:0x804CFD20 end:0x804CFD40 revolution/os/__ppc_eabi_init.cpp: + .init start:0x800042E0 end:0x80004338 .text start:0x8033D03C end:0x8033D0F0 revolution/exi/EXIBios.c: @@ -3918,6 +3923,7 @@ revolution/gd/GDGeometry.c: .data start:0x8042E608 end:0x8042E670 PowerPC_EABI_Support/Runtime/Src/__mem.c: + .init start:0x80004338 end:0x8000446C .text start:0x803AA028 end:0x803AA044 PowerPC_EABI_Support/Runtime/Src/__va_arg.c: @@ -4260,6 +4266,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache. .text start:0x803B6E08 end:0x803B6E40 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c: + .init start:0x8000446C end:0x800044C0 .text start:0x803B6E40 end:0x803B6EF8 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c: @@ -4277,7 +4284,11 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c: .text start:0x803B8CC0 end:0x803B8E38 +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s: + .init start:0x800044C0 end:0x800063F4 + TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c: + .init start:0x800063F4 end:0x80006420 .text start:0x803B8E38 end:0x803B9154 .data start:0x8042EE40 end:0x8042EE80 .bss start:0x8051AEE0 end:0x8051AEE8 diff --git a/config/RZDJ01/symbols.txt b/config/RZDJ01/symbols.txt index bc482734ce..83f6d7e6e7 100644 --- a/config/RZDJ01/symbols.txt +++ b/config/RZDJ01/symbols.txt @@ -1,20 +1,21 @@ __check_pad3 = .init:0x80004000; // type:function size:0x28 scope:local __set_debug_bba = .init:0x80004028; // type:function size:0xC scope:local -__get_debug_bba = .init:0x80004034; // type:function scope:local +__get_debug_bba = .init:0x80004034; // type:function size:0x8 scope:local __start = .init:0x8000403C; // type:function size:0x16C scope:weak __init_registers = .init:0x800041A8; // type:function size:0x90 scope:local __init_data = .init:0x80004238; // type:function size:0xA8 scope:local __init_hardware = .init:0x800042E0; // type:function size:0x24 scope:global -__flush_cache = .init:0x80004304; // type:function scope:global -memcpy = .init:0x80004338; // type:function scope:global -__fill_mem = .init:0x80004388; // type:function scope:global +__flush_cache = .init:0x80004304; // type:function size:0x34 scope:global +memcpy = .init:0x80004338; // type:function size:0x50 scope:global +__fill_mem = .init:0x80004388; // type:function size:0xB4 scope:global memset = .init:0x8000443C; // type:function size:0x30 scope:global -lbl_8000446C = .init:0x8000446C; // type:label -lbl_8000449C = .init:0x8000449C; // type:label -lbl_800044C0 = .init:0x800044C0; // type:label +TRK_memset = .init:0x8000446C; // type:function size:0x30 scope:global align:4 +TRK_memcpy = .init:0x8000449C; // type:function size:0x24 scope:global align:4 +gTRKInterruptVectorTable = .init:0x800044C0; // type:label scope:global lbl_80004600 = .init:0x80004600; // type:label lbl_80005400 = .init:0x80005400; // type:label -lbl_800063F4 = .init:0x800063F4; // type:label +__TRK_reset = .init:0x800063F4; // type:function size:0x2C scope:global align:4 +gTRKInterruptVectorTableEnd = .init:0x800063F4; // type:label scope:global _rom_copy_info = .init:0x80006420; // type:object size:0x84 scope:global data:4byte _bss_init_info = .init:0x800064A4; // type:object size:0x20 scope:global data:4byte @etb_800064E0 = extab:0x800064E0; // type:object size:0x18 scope:local hidden @@ -16164,7 +16165,6 @@ OSExceptionInit = .text:0x8033116C; // type:function size:0x280 scope:global ali __OSDBIntegrator = .text:0x803313EC; // type:function size:0x24 scope:global align:4 __OSDBINTSTART = .text:0x803313EC; // type:label scope:global __OSDBJump = .text:0x80331410; // type:function size:0x4 scope:global align:4 -__OSDBINTEND = .text:0x80331410; // type:label scope:global __OSDBJUMPSTART = .text:0x80331410; // type:label scope:global align:4 __OSSetExceptionHandler = .text:0x80331414; // type:function size:0x14 scope:global align:4 __OSDBJUMPEND = .text:0x80331414; // type:label scope:global diff --git a/config/RZDP01/config.yml b/config/RZDP01/config.yml index 1348dd55c4..2439a78d64 100644 --- a/config/RZDP01/config.yml +++ b/config/RZDP01/config.yml @@ -13,6 +13,10 @@ force_active: [ _MetroTRK_Has_Framing, ] +block_relocations: +- source: .text:0x8032f778 +- source: .text:0x8032f7f0 + modules: - object: files/RELS.arc:mmem/f_pc_profile_lst.rel hash: 55347a0f55d15a6901d297ee3e198b76cb8242ee diff --git a/config/RZDP01/splits.txt b/config/RZDP01/splits.txt index 72593255ea..51998fba6d 100644 --- a/config/RZDP01/splits.txt +++ b/config/RZDP01/splits.txt @@ -3167,7 +3167,11 @@ revolution/os/OSStateTM.c: .text start:0x8033A9F0 end:0x8033B0E4 .data start:0x80424FE8 end:0x804250B0 .bss start:0x804D24E0 end:0x804D25A0 - .sbss start:0x80521C98 end:0x80521CC0 + .sbss start:0x80521C98 end:0x80521CB8 + +revolution/os/__start.c: + .init start:0x80004000 end:0x800042E0 + .sbss start:0x80521CB8 end:0x80521CC0 revolution/os/OSPlayRecord.c: .text start:0x8033B0E4 end:0x8033B7BC @@ -3181,6 +3185,7 @@ revolution/os/OSStateFlags.c: .bss start:0x804D27A0 end:0x804D27C0 revolution/os/__ppc_eabi_init.cpp: + .init start:0x800042E0 end:0x80004338 .text start:0x8033B9B4 end:0x8033BA68 revolution/exi/EXIBios.c: @@ -3918,6 +3923,7 @@ revolution/gd/GDGeometry.c: .data start:0x80431088 end:0x804310F0 PowerPC_EABI_Support/Runtime/Src/__mem.c: + .init start:0x80004338 end:0x8000446C .text start:0x803A89F4 end:0x803A8A10 PowerPC_EABI_Support/Runtime/Src/__va_arg.c: @@ -4260,6 +4266,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache. .text start:0x803B57D4 end:0x803B580C TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c: + .init start:0x8000446C end:0x800044C0 .text start:0x803B580C end:0x803B58C4 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c: @@ -4280,7 +4287,11 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c: .text start:0x803B7690 end:0x803B7808 +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s: + .init start:0x800044C0 end:0x800063F4 + TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c: + .init start:0x800063F4 end:0x80006420 .text start:0x803B7808 end:0x803B7B24 .data start:0x804318C0 end:0x80431900 .bss start:0x8051D960 end:0x8051D968 diff --git a/config/RZDP01/symbols.txt b/config/RZDP01/symbols.txt index 694c5b2595..570d80796b 100644 --- a/config/RZDP01/symbols.txt +++ b/config/RZDP01/symbols.txt @@ -1,20 +1,21 @@ __check_pad3 = .init:0x80004000; // type:function size:0x28 scope:local __set_debug_bba = .init:0x80004028; // type:function size:0xC scope:local -__get_debug_bba = .init:0x80004034; // type:function scope:local +__get_debug_bba = .init:0x80004034; // type:function size:0x8 scope:local __start = .init:0x8000403C; // type:function size:0x16C scope:weak __init_registers = .init:0x800041A8; // type:function size:0x90 scope:local __init_data = .init:0x80004238; // type:function size:0xA8 scope:local __init_hardware = .init:0x800042E0; // type:function size:0x24 scope:global -__flush_cache = .init:0x80004304; // type:function scope:global -memcpy = .init:0x80004338; // type:function scope:global -__fill_mem = .init:0x80004388; // type:function scope:global +__flush_cache = .init:0x80004304; // type:function size:0x34 scope:global +memcpy = .init:0x80004338; // type:function size:0x50 scope:global +__fill_mem = .init:0x80004388; // type:function size:0xB4 scope:global memset = .init:0x8000443C; // type:function size:0x30 scope:global -lbl_8000446C = .init:0x8000446C; // type:label -lbl_8000449C = .init:0x8000449C; // type:label -lbl_800044C0 = .init:0x800044C0; // type:label +TRK_memset = .init:0x8000446C; // type:function size:0x30 scope:global align:4 +TRK_memcpy = .init:0x8000449C; // type:function size:0x24 scope:global align:4 +gTRKInterruptVectorTable = .init:0x800044C0; // type:label scope:global lbl_80004600 = .init:0x80004600; // type:label lbl_80005400 = .init:0x80005400; // type:label -lbl_800063F4 = .init:0x800063F4; // type:label +__TRK_reset = .init:0x800063F4; // type:function size:0x2C scope:global align:4 +gTRKInterruptVectorTableEnd = .init:0x800063F4; // type:label scope:global _rom_copy_info = .init:0x80006420; // type:object size:0x84 scope:global data:4byte _bss_init_info = .init:0x800064A4; // type:object size:0x20 scope:global data:4byte @etb_800064E0 = extab:0x800064E0; // type:object size:0x18 scope:local hidden diff --git a/config/Shield/config.yml b/config/Shield/config.yml index 7221eb5274..5f199784df 100644 --- a/config/Shield/config.yml +++ b/config/Shield/config.yml @@ -17,6 +17,10 @@ ldscript_template: config/Shield/ldscript.tpl # target: buffer__14mDoMtx_stack_c # addend: 0x300 +block_relocations: +- source: .text:0x803f56fc +- source: .text:0x803f5764 + modules: - object: files/RELS.arc:rels/mmem/f_pc_profile_lst.rel hash: 6fde21e7ca31044cd9f5a94b922ca44535328134 diff --git a/config/Shield/splits.txt b/config/Shield/splits.txt index 268911265e..b39be061f7 100644 --- a/config/Shield/splits.txt +++ b/config/Shield/splits.txt @@ -3307,9 +3307,13 @@ revolution/os/OSIpc.c: revolution/os/OSStateTM.c: .text start:0x804014D0 end:0x80401C50 .data start:0x804F6738 end:0x804F6800 - .sbss start:0x805095E0 end:0x80509608 + .sbss start:0x805095E0 end:0x80509600 .bss start:0x805977A0 end:0x80597860 +revolution/os/__start.c: + .init start:0x80004000 end:0x80004360 + .sbss start:0x80509600 end:0x80509608 + revolution/os/OSPlayRecord.c: .text start:0x80401C50 end:0x80402370 .data start:0x804F6800 end:0x804F6848 @@ -3349,6 +3353,7 @@ revolution/os/OSLaunch.c: .text start:0x80403660 end:0x80403870 revolution/os/__ppc_eabi_init.cpp: + .init start:0x80004360 end:0x800043C4 .text start:0x80403870 end:0x80403930 revolution/exi/EXIBios.c: @@ -4071,6 +4076,7 @@ revolution/gd/GDGeometry.c: .data start:0x80503EB0 end:0x80503F18 PowerPC_EABI_Support/Runtime/Src/__mem.c: + .init start:0x800043C4 end:0x80004744 .text start:0x8047AA94 end:0x8047AAB0 PowerPC_EABI_Support/Runtime/Src/__va_arg.c: @@ -4451,3 +4457,6 @@ NdevExi2A/DebuggerDriver.c: NdevExi2A/exi2.c: .text start:0x8048DDA8 end:0x8048E534 + +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s: + .init start:0x80004744 end:0x80006678 diff --git a/config/ShieldD/config.yml b/config/ShieldD/config.yml index 9695d1f945..d30978c5d5 100644 --- a/config/ShieldD/config.yml +++ b/config/ShieldD/config.yml @@ -17,6 +17,8 @@ block_relocations: end: .text:0x8055029C - source: .text:0x80550314 end: .text:0x8055031C +- source: .text:0x805b727c + end: .text:0x805b7284 add_relocations: - source: .sdata:0x8073f3f4 type: abs diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index 8c2109d6d1..3ca0497923 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -4071,9 +4071,13 @@ revolution/os/OSIpc.c: revolution/os/OSStateTM.c: .text start:0x805C6CD0 end:0x805C7490 .data start:0x8072B550 end:0x8072B6F8 - .sbss start:0x8074D258 end:0x8074D280 + .sbss start:0x8074D258 end:0x8074D278 .bss start:0x807FA2C0 end:0x807FA380 +revolution/os/__start.c: + .init start:0x80004000 end:0x80004400 + .sbss start:0x8074D278 end:0x8074D280 + revolution/os/OSPlayRecord.c: .text start:0x805C7490 end:0x805C7C40 .data start:0x8072B6F8 end:0x8072B740 @@ -4109,6 +4113,7 @@ revolution/os/OSLaunch.c: .text start:0x805C95C0 end:0x805C9810 revolution/os/__ppc_eabi_init.cpp: + .init start:0x80004400 end:0x80004464 .text start:0x805C9810 end:0x805C9920 revolution/exi/EXIBios.c: @@ -4496,6 +4501,7 @@ revolution/gd/GDGeometry.c: .data start:0x8073E268 end:0x8073E500 PowerPC_EABI_Support/Runtime/Src/__mem.c: + .init start:0x80004464 end:0x800047E4 .text start:0x8061B4D8 end:0x8061B4F4 PowerPC_EABI_Support/Runtime/Src/__va_arg.c: @@ -4888,3 +4894,6 @@ NdevExi2AD/DebuggerDriver.c: NdevExi2AD/exi2.c: .text start:0x8062F1EC end:0x8062F7C0 + +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/exception.s: + .init start:0x800047E4 end:0x80006718 diff --git a/configure.py b/configure.py index da2d7ca241..d775928b80 100755 --- a/configure.py +++ b/configure.py @@ -1524,6 +1524,7 @@ config.libs = [ RevolutionLib( "os", [ + Object(NonMatching, "revolution/os/__start.c"), Object(MatchingFor("ShieldD"), "revolution/os/OS.c"), Object(MatchingFor("ShieldD"), "revolution/os/OSAddress.c"), Object(MatchingFor("ShieldD"), "revolution/os/OSAlarm.c"), @@ -1557,7 +1558,7 @@ config.libs = [ Object(MatchingFor("ShieldD"), "revolution/os/OSNandbootInfo.c"), Object(MatchingFor("ShieldD"), "revolution/os/OSPlayTime.c"), Object(MatchingFor("ShieldD"), "revolution/os/OSLaunch.c"), - Object(MatchingFor("ShieldD"), "revolution/os/__ppc_eabi_init.cpp"), + Object(NonMatching, "revolution/os/__ppc_eabi_init.cpp"), ], ), RevolutionLib( diff --git a/src/dolphin/os/OSThread.c b/src/dolphin/os/OSThread.c index 81e57afe72..62db9ff2d2 100644 --- a/src/dolphin/os/OSThread.c +++ b/src/dolphin/os/OSThread.c @@ -873,7 +873,3 @@ void* OSGetThreadSpecific(s32 index) { return NULL; } - -#include "global.h" -extern u8 Debug_BBA; -u8 Debug_BBA ATTRIBUTE_ALIGN(8); diff --git a/src/dolphin/os/__start.c b/src/dolphin/os/__start.c index 110e7e5b3a..dea700fdbb 100644 --- a/src/dolphin/os/__start.c +++ b/src/dolphin/os/__start.c @@ -1,6 +1,8 @@ #include #include "__ppc_eabi_linker.h" +static u8 Debug_BBA; + extern void InitMetroTRK(); extern void exit(int); extern int main(int argc, char* argv[]); From 46d53ab65f737486ffcde47257f260e753eb6109 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Tue, 23 Dec 2025 10:20:32 -0800 Subject: [PATCH 08/35] MSL_C header cleanup (#2988) * msl_c header cleanup * math header cleanup * fix rest of shieldD configs * cleanup cflag configs a bit * fix shield build --- config/ShieldD/splits.txt | 50 ++-- configure.py | 283 +++++++++++++----- include/JSystem/J2DGraph/J2DPrint.h | 2 +- include/JSystem/JGeometry.h | 2 +- include/JSystem/JMath/JMath.h | 2 +- .../JSystem/JStudio/JStudio/jstudio-math.h | 2 +- .../JSystem/JStudio/JStudio/jstudio-object.h | 4 +- include/JSystem/JStudio/JStudio/stb.h | 2 +- include/JSystem/JUtility/JUTConsole.h | 2 +- include/JSystem/JUtility/JUTDirectPrint.h | 2 +- include/JSystem/JUtility/JUTException.h | 2 +- include/SSystem/SComponent/c_m3d.h | 2 +- include/SSystem/SComponent/c_xyz.h | 2 +- include/d/actor/d_a_obj_dust.h | 2 +- include/d/d_menu_dmap_map.h | 2 +- include/d/dolzel_base.pch | 6 +- include/dolphin/ar.h | 7 + include/dolphin/os.h | 2 +- include/dolphin/{fake_tgmath.h => sdk_math.h} | 8 +- include/dolphin/types.h | 2 +- include/global.h | 5 +- include/revolution/aralt.h | 15 + include/revolution/os.h | 2 +- include/revolution/private/iosrestypes.h | 5 +- include/revolution/private/iostypes.h | 5 +- .../revolution/{fake_tgmath.h => sdk_math.h} | 8 +- include/revolution/types.h | 2 +- src/DynamicLink.cpp | 2 +- src/JSystem/J2DGraph/J2DTevs.cpp | 30 +- src/JSystem/J3DU/J3DUClipper.cpp | 2 +- src/JSystem/JAudio2/JASReport.cpp | 2 +- src/JSystem/JAudio2/JASWaveArcLoader.cpp | 2 +- src/JSystem/JHostIO/JHIMccBuf.cpp | 7 +- src/JSystem/JHostIO/JHIRMcc.cpp | 19 +- src/JSystem/JKernel/JKRAramArchive.cpp | 2 +- src/JSystem/JKernel/JKRAramHeap.cpp | 2 +- src/JSystem/JKernel/JKRCompArchive.cpp | 2 +- src/JSystem/JKernel/JKRDvdArchive.cpp | 2 +- src/JSystem/JKernel/JKRThread.cpp | 2 +- src/JSystem/JMath/JMATrigonometric.cpp | 2 +- src/JSystem/JStage/JSGCamera.cpp | 2 +- src/JSystem/JStage/JSGFog.cpp | 2 +- src/JSystem/JStudio/JStudio/functionvalue.cpp | 6 +- src/JSystem/JStudio/JStudio/fvb.cpp | 10 +- src/JSystem/JStudio/JStudio/jstudio-math.cpp | 14 +- src/JSystem/JStudio/JStudio/stb.cpp | 34 +-- .../JStudio/JStudio_JStage/object-light.cpp | 8 +- src/JSystem/JSupport/JSUOutputStream.cpp | 2 +- src/JSystem/JUtility/JUTAssert.cpp | 2 +- src/JSystem/JUtility/JUTDbPrint.cpp | 2 +- src/JSystem/JUtility/JUTDirectPrint.cpp | 2 +- .../MSL_Common/Include/limits.h | 41 +-- .../MSL/MSL_C/MSL_Common/Include/FILE_POS.h | 4 +- .../MSL/MSL_C/MSL_Common/Include/alloc.h | 3 +- .../MSL/MSL_C/MSL_Common/Include/ansi_files.h | 7 +- .../MSL/MSL_C/MSL_Common/Include/ansi_fp.h | 14 +- .../MSL/MSL_C/MSL_Common/Include/buffer_io.h | 4 +- .../MSL/MSL_C/MSL_Common/Include/char_io.h | 4 +- .../MSL/MSL_C/MSL_Common/Include/climits.h | 37 +++ .../MSL/MSL_C/MSL_Common/Include/cmath.h | 150 +++++++--- .../MSL/MSL_C/MSL_Common/Include/cstdarg.h | 6 + .../MSL/MSL_C/MSL_Common/Include/cstddef.h | 25 ++ .../MSL/MSL_C/MSL_Common/Include/cstdio.h | 16 + .../MSL/MSL_C/MSL_Common/Include/cstdlib.h | 8 + .../MSL/MSL_C/MSL_Common/Include/cstring.h | 48 +-- .../MSL/MSL_C/MSL_Common/Include/direct_io.h | 4 +- .../MSL/MSL_C/MSL_Common/Include/extras.h | 5 +- .../MSL/MSL_C/MSL_Common/Include/file_io.h | 4 +- .../MSL/MSL_C/MSL_Common/Include/float.h | 2 +- .../MSL/MSL_C/MSL_Common/Include/math.h | 154 +++------- .../MSL/MSL_C/MSL_Common/Include/mbstring.h | 4 +- .../MSL/MSL_C/MSL_Common/Include/mem_funcs.h | 4 +- .../MSL/MSL_C/MSL_Common/Include/printf.h | 11 +- .../MSL/MSL_C/MSL_Common/Include/scanf.h | 2 +- .../MSL/MSL_C/MSL_Common/Include/stdarg.h | 18 ++ .../MSL/MSL_C/MSL_Common/Include/stddef.h | 23 +- .../MSL/MSL_C/MSL_Common/Include/stdio.h | 32 +- .../MSL/MSL_C/MSL_Common/Include/stdlib.h | 28 +- .../MSL/MSL_C/MSL_Common/Include/string.h | 56 ++-- .../MSL/MSL_C/MSL_Common/Include/strtoul.h | 4 +- .../MSL_C/MSL_Common/Include/va_list.h} | 8 +- .../MSL/MSL_C/MSL_Common/Include/wchar_io.h | 8 +- .../MSL/MSL_C/MSL_Common/Src/abort_exit.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/alloc.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/mbstring.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/mem.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/printf.c | 4 +- .../MSL/MSL_C/MSL_Common/Src/string.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/strtoul.c | 2 +- .../Math/Double_precision/e_acos.c | 4 +- .../Math/Double_precision/e_asin.c | 4 +- .../Math/Double_precision/e_pow.c | 4 +- .../Math/Double_precision/e_rem_pio2.c | 4 +- .../Math/Double_precision/e_sqrt.c | 4 +- .../Math/Double_precision/k_tan.c | 4 +- .../Math/Double_precision/s_ldexp.c | 4 +- .../MSL_C/MSL_Common_Embedded/Src/ansi_fp.c | 2 +- .../Runtime/Inc/MWCPlusLib.h | 2 +- .../Runtime/Src/__va_arg.c | 4 +- src/SSystem/SComponent/c_math.cpp | 2 +- .../MetroTRK/Os/dolphin/dolphin_trk.c | 1 - .../embedded/MetroTRK/Portable/msghndlr.c | 2 +- .../embedded/MetroTRK/Portable/support.c | 2 +- .../MetroTRK/Processor/ppc/Generic/targimpl.c | 2 +- src/d/actor/d_a_b_bq.cpp | 2 +- src/d/actor/d_a_b_tn.cpp | 2 +- src/d/actor/d_a_b_zant.cpp | 2 +- src/d/actor/d_a_b_zant_magic.cpp | 2 +- src/d/actor/d_a_b_zant_mobile.cpp | 2 +- src/d/actor/d_a_bg_obj.cpp | 2 +- src/d/actor/d_a_e_dk.cpp | 2 +- src/d/actor/d_a_e_sw.cpp | 2 +- src/d/actor/d_a_e_vt.cpp | 2 +- src/d/actor/d_a_e_ws.cpp | 2 +- src/d/actor/d_a_e_ymb.cpp | 2 +- src/d/actor/d_a_horse.cpp | 2 +- src/d/actor/d_a_kago.cpp | 2 +- src/d/actor/d_a_mg_rod.cpp | 2 +- src/d/actor/d_a_mirror.cpp | 2 +- src/d/actor/d_a_npc_henna.cpp | 2 +- src/d/actor/d_a_obj_bhbridge.cpp | 2 +- src/d/actor/d_a_obj_carry.cpp | 2 +- src/d/actor/d_a_obj_cwall.cpp | 2 +- src/d/actor/d_a_obj_digsnow.cpp | 2 +- src/d/actor/d_a_obj_drop.cpp | 2 +- src/d/actor/d_a_obj_gra2_soldier.inc | 2 +- src/d/actor/d_a_obj_ice_l.cpp | 2 +- src/d/actor/d_a_obj_ice_s.cpp | 2 +- src/d/actor/d_a_obj_kanban2.cpp | 2 +- src/d/actor/d_a_obj_lv4chandelier.cpp | 4 +- src/d/actor/d_a_obj_lv4digsand.cpp | 2 +- src/d/actor/d_a_obj_pdoor.cpp | 2 +- src/d/actor/d_a_obj_shield.cpp | 2 +- src/d/actor/d_a_obj_stone.cpp | 2 +- src/d/actor/d_a_obj_swturn.cpp | 2 +- src/d/actor/d_a_obj_wdStick.cpp | 2 +- src/d/actor/d_a_set_bgobj.cpp | 2 +- src/d/actor/d_a_tag_camera.cpp | 2 +- src/d/actor/d_a_tag_chkpoint.cpp | 2 +- src/d/actor/d_a_tag_firewall.cpp | 2 +- src/d/actor/d_a_tag_sppath.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 2 +- src/d/d_bg_w_kcol.cpp | 2 +- src/d/d_camera.cpp | 8 +- src/d/d_com_inf_game.cpp | 2 +- src/d/d_com_static.cpp | 2 +- src/d/d_error_msg.cpp | 2 +- src/d/d_event_manager.cpp | 2 +- src/d/d_file_sel_info.cpp | 2 +- src/d/d_kankyo.cpp | 16 +- src/d/d_kankyo_rain.cpp | 10 - src/d/d_menu_dmap_map.cpp | 2 +- src/d/d_menu_fmap.cpp | 2 +- src/d/d_menu_insect.cpp | 2 +- src/d/d_menu_item_explain.cpp | 2 +- src/d/d_menu_letter.cpp | 2 +- src/d/d_menu_ring.cpp | 2 +- src/d/d_menu_save.cpp | 2 +- src/d/d_meter2_draw.cpp | 2 +- src/d/d_msg_object.cpp | 2 +- src/d/d_msg_scrn_3select.cpp | 2 +- src/d/d_msg_scrn_base.cpp | 2 +- src/d/d_msg_scrn_explain.cpp | 2 +- src/d/d_msg_unit.cpp | 2 +- src/d/d_name.cpp | 2 +- src/d/d_particle.cpp | 2 +- src/d/d_s_menu.cpp | 4 +- src/d/d_s_room.cpp | 2 +- src/d/d_save.cpp | 8 +- src/d/d_stage.cpp | 2 +- src/d/d_vibration.cpp | 2 +- src/dolphin/G2D/G2D.c | 2 +- src/dolphin/ar/ar.c | 2 +- src/dolphin/ax/AXVPB.c | 2 +- src/dolphin/axart/axartlpf.c | 2 +- src/dolphin/axfx/reverb_hi.c | 2 +- src/dolphin/axfx/reverb_hi_4ch.c | 2 +- src/dolphin/axfx/reverb_std.c | 2 +- src/dolphin/card/CARDUnlock.c | 2 +- src/dolphin/demo/DEMOAVX.c | 2 +- src/dolphin/dsp/dsp.c | 2 +- src/dolphin/dsp/dsp_task.c | 2 +- src/dolphin/gd/GDLight.c | 2 +- src/dolphin/gx/GXDisplayList.c | 2 +- src/dolphin/gx/GXDraw.c | 2 +- src/dolphin/gx/GXFifo.c | 2 +- src/dolphin/gx/GXGeometry.c | 2 +- src/dolphin/gx/GXInit.c | 2 +- src/dolphin/gx/GXLight.c | 2 +- src/dolphin/gx/GXMisc.c | 2 +- src/dolphin/gx/GXPixel.c | 2 +- src/dolphin/gx/GXTexture.c | 2 +- src/dolphin/gx/GXVerifRAS.c | 2 +- src/dolphin/gx/GXVerifXF.c | 2 +- src/dolphin/mtx/mtx.c | 2 +- src/dolphin/mtx/mtx44.c | 2 +- src/dolphin/mtx/mtx44vec.c | 2 +- src/dolphin/mtx/mtxstack.c | 2 +- src/dolphin/mtx/mtxvec.c | 2 +- src/dolphin/mtx/psmtx.c | 2 +- src/dolphin/mtx/quat.c | 2 +- src/dolphin/mtx/vec.c | 2 +- src/dolphin/os/OSError.c | 2 +- src/dolphin/os/__ppc_eabi_init.c | 2 +- src/dolphin/pad/Padclamp.c | 2 +- src/dolphin/perf/perf.c | 2 +- src/dolphin/perf/perfdraw.c | 2 +- src/dolphin/syn/syn.c | 2 +- src/dolphin/syn/synctrl.c | 2 +- src/dolphin/syn/synenv.c | 4 +- src/dolphin/syn/synlfo.c | 2 +- src/dolphin/syn/synmix.c | 2 +- src/dolphin/syn/synpitch.c | 2 +- src/dolphin/syn/synsample.c | 2 +- src/dolphin/syn/synvoice.c | 2 +- src/dolphin/syn/synwt.c | 2 +- src/m_Do/m_Do_ext.cpp | 2 +- src/m_Do/m_Do_main.cpp | 2 +- src/m_Do/m_Do_printf.cpp | 2 +- src/revolution/aralt/aralt.c | 4 +- src/revolution/card/CARDUnlock.c | 2 +- src/revolution/dsp/dsp.c | 2 +- src/revolution/dsp/dsp_task.c | 2 +- src/revolution/dvd/dvd.c | 2 +- src/revolution/dvd/dvdidutils.c | 2 +- src/revolution/fs/fs.c | 2 +- src/revolution/gd/GDLight.c | 2 +- src/revolution/gx/GXDisplayList.c | 2 +- src/revolution/gx/GXDraw.c | 2 +- src/revolution/gx/GXGeometry.c | 2 +- src/revolution/gx/GXInit.c | 2 +- src/revolution/gx/GXLight.c | 2 +- src/revolution/gx/GXMisc.c | 2 +- src/revolution/gx/GXPixel.c | 2 +- src/revolution/gx/GXTexture.c | 2 +- src/revolution/gx/GXVerifRAS.c | 2 +- src/revolution/gx/GXVerifXF.c | 2 +- .../nw4hbm/lyt/lyt_animation.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_common.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_group.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_material.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_pane.cpp | 2 +- .../homebuttonLib/nw4hbm/math/arithmetic.h | 2 +- .../homebuttonLib/nw4hbm/math/triangular.h | 2 +- .../homebuttonLib/nw4hbm/snd/AxVoice.h | 2 +- .../homebuttonLib/nw4hbm/snd/Channel.h | 2 +- .../homebuttonLib/nw4hbm/ut/LinkList.h | 2 +- .../homebuttonLib/nw4hbm/ut/TextWriterBase.h | 2 +- src/revolution/homebuttonLib/sound/synenv.cpp | 2 +- src/revolution/ipc/ipcProfile.c | 2 +- src/revolution/ipc/ipcclt.c | 2 +- src/revolution/mtx/mtx.c | 2 +- src/revolution/mtx/mtx44.c | 2 +- src/revolution/mtx/mtx44vec.c | 2 +- src/revolution/mtx/mtxstack.c | 2 +- src/revolution/mtx/mtxvec.c | 2 +- src/revolution/mtx/psmtx.c | 2 +- src/revolution/mtx/quat.c | 2 +- src/revolution/mtx/vec.c | 2 +- src/revolution/nand/NANDCore.c | 2 +- src/revolution/nand/NANDLogging.c | 2 +- src/revolution/nand/nand.c | 2 +- src/revolution/os/OS.c | 2 +- src/revolution/os/OSAudioSystem.c | 2 +- src/revolution/os/OSError.c | 2 +- src/revolution/os/OSExec.c | 2 +- src/revolution/os/OSFatal.c | 2 +- src/revolution/os/OSInterrupt.c | 2 +- src/revolution/os/OSLaunch.c | 2 +- src/revolution/os/OSLink.c | 2 +- src/revolution/os/OSPlayTime.c | 2 +- src/revolution/os/OSReset.c | 2 +- src/revolution/os/OSStateFlags.c | 2 +- src/revolution/os/OSSync.c | 2 +- src/revolution/os/OSTime.c | 2 +- src/revolution/pad/Pad.c | 2 +- src/revolution/sc/scapi_prdinfo.c | 2 +- src/revolution/sc/scsystem.c | 2 +- src/revolution/wenc/wenc.c | 2 +- src/revolution/wpad/WPAD.c | 2 +- 281 files changed, 987 insertions(+), 792 deletions(-) rename include/dolphin/{fake_tgmath.h => sdk_math.h} (91%) rename include/revolution/{fake_tgmath.h => sdk_math.h} (91%) rename src/PowerPC_EABI_Support/MSL/{MSL_C => MSL_C++}/MSL_Common/Include/limits.h (73%) create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h rename src/PowerPC_EABI_Support/{Runtime/Inc/__va_arg.h => MSL/MSL_C/MSL_Common/Include/va_list.h} (87%) diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index 3ca0497923..65b2639c8d 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -4787,105 +4787,105 @@ PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt. PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c: .text start:0x80629B50 end:0x80629BF4 -TRK_Hollywood_Revolution/metrotrk/targsupp.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Export/targsupp.s: .text start:0x80629BF4 end:0x80629C14 -TRK_Hollywood_Revolution/metrotrk/custconn/cc_gdev.c: +TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c: .text start:0x80629C14 end:0x80629E8C .sbss start:0x8074D6D8 end:0x8074D6E0 .bss start:0x8080E8A8 end:0x8080EDC8 -TRK_Hollywood_Revolution/metrotrk/custconn/MWCriticalSection_gc.c: +TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c: .text start:0x80629E8C end:0x80629EC8 -TRK_Hollywood_Revolution/metrotrk/custconn/CircleBuffer.c: +TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c: .text start:0x80629EC8 end:0x8062A104 -TRK_Hollywood_Revolution/metrotrk/flush_cache.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/flush_cache.c: .text start:0x8062A104 end:0x8062A13C -TRK_Hollywood_Revolution/metrotrk/main_TRK.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/main_TRK.c: .text start:0x8062A13C end:0x8062A178 .sbss start:0x8074D6E0 end:0x8074D6E8 -TRK_Hollywood_Revolution/metrotrk/mainloop.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mainloop.c: .text start:0x8062A178 end:0x8062A264 -TRK_Hollywood_Revolution/metrotrk/mem_TRK.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c: .text start:0x8062A264 end:0x8062A4C8 -TRK_Hollywood_Revolution/metrotrk/dispatch.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c: .text start:0x8062A4C8 end:0x8062A5E8 .data start:0x8073EE40 end:0x8073EEB0 -TRK_Hollywood_Revolution/metrotrk/dolphin_trk.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c: .text start:0x8062A5E8 end:0x8062A90C .data start:0x8073EEB0 end:0x8073EEF0 .sbss start:0x8074D6E8 end:0x8074D6F4 -TRK_Hollywood_Revolution/metrotrk/dolphin_trk_glue.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c: .text start:0x8062A90C end:0x8062ACA8 .data start:0x8073EEF0 end:0x8073EFD8 .sbss start:0x8074D6F4 end:0x8074D6F8 .sdata2 start:0x80753480 end:0x80753484 .bss start:0x8080EDC8 end:0x8080EDF0 -TRK_Hollywood_Revolution/metrotrk/notify.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/notify.c: .text start:0x8062ACA8 end:0x8062AD38 -TRK_Hollywood_Revolution/metrotrk/nubevent.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubevent.c: .text start:0x8062AD38 end:0x8062AED4 .data start:0x8073EFD8 end:0x8073EFF8 .bss start:0x8080EDF0 end:0x8080EE18 -TRK_Hollywood_Revolution/metrotrk/nubinit.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/nubinit.c: .text start:0x8062AED4 end:0x8062B024 .data start:0x8073EFF8 end:0x8073F018 .sbss start:0x8074D6F8 end:0x8074D700 -TRK_Hollywood_Revolution/metrotrk/serpoll.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c: .text start:0x8062B024 end:0x8062B16C .sbss start:0x8074D700 end:0x8074D708 -TRK_Hollywood_Revolution/metrotrk/string_TRK.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c: .text start:0x8062B16C end:0x8062B188 -TRK_Hollywood_Revolution/metrotrk/support.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c: .text start:0x8062B188 end:0x8062B7AC .data start:0x8073F018 end:0x8073F060 -TRK_Hollywood_Revolution/metrotrk/targcont.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c: .text start:0x8062B7AC end:0x8062B7E0 -TRK_Hollywood_Revolution/metrotrk/mpc_7xx_603e.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/mpc_7xx_603e.c: .text start:0x8062B7E0 end:0x8062BB08 -TRK_Hollywood_Revolution/metrotrk/msg.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c: .text start:0x8062BB08 end:0x8062BB6C .data start:0x8073F060 end:0x8073F088 .sbss start:0x8074D708 end:0x8074D710 -TRK_Hollywood_Revolution/metrotrk/msgbuf.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c: .text start:0x8062BB6C end:0x8062C378 .data start:0x8073F088 end:0x8073F0B0 .bss start:0x8080EE18 end:0x808107C0 -TRK_Hollywood_Revolution/metrotrk/msghndlr.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c: .text start:0x8062C378 end:0x8062D2FC .data start:0x8073F0B0 end:0x8073F118 .sbss start:0x8074D710 end:0x8074D718 -TRK_Hollywood_Revolution/metrotrk/mslsupp.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c: .text start:0x8062D2FC end:0x8062D488 -TRK_Hollywood_Revolution/metrotrk/targimpl.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c: .text start:0x8062D488 end:0x8062ECAC .rodata start:0x8065FF00 end:0x8065FF88 .data start:0x8073F118 end:0x8073F128 .sbss start:0x8074D718 end:0x8074D728 .bss start:0x808107C0 end:0x80810D68 -TRK_Hollywood_Revolution/metrotrk/target_options.c: +TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c: .text start:0x8062ECAC end:0x8062ECBC NdevExi2AD/DebuggerDriver.c: diff --git a/configure.py b/configure.py index d775928b80..e97f5cc659 100755 --- a/configure.py +++ b/configure.py @@ -239,16 +239,19 @@ cflags_base = [ "-fp hardware", "-Cpp_exceptions off", # "-W all", + "-O4,p", + "-inline auto", '-pragma "cats off"', '-pragma "warn_notinlined off"', "-maxerrors 1", "-nosyspath", + "-RTTI off", "-fp_contract on", + "-str reuse", "-i include", f"-i build/{config.version}/include", f"-i assets/{config.version}", "-i src", - "-ir src/dolphin", "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include", "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include", "-i src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include", @@ -260,15 +263,10 @@ cflags_base = [ "-D__GEKKO__", ] -if config.version == "ShieldD": - cflags_base.extend(["-O0", "-inline off", "-RTTI on", "-str reuse", "-enc SJIS", "-DDEBUG=1", "-DWIDESCREEN_SUPPORT=1"]) -elif config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield"]: - cflags_base.extend(["-O4,p", "-inline auto", "-ipa file", "-RTTI on", "-str reuse", "-enc SJIS", "-DWIDESCREEN_SUPPORT=1"]) +if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield", "ShieldD"]: + cflags_base.extend(["-enc SJIS"]) else: - cflags_base.extend(["-O4,p", "-inline auto", "-RTTI off", "-str reuse", "-multibyte"]) - -if config.version in ["RZDE01_00", "ShieldD"] or args.debug or args.reghio: - cflags_base.extend(["-DENABLE_REGHIO=1"]) + cflags_base.extend(["-multibyte"]) USE_REVOLUTION_SDK_VERSIONS = [ "RZDE01_00", # Wii USA Rev 0 @@ -290,6 +288,8 @@ if config.version in USE_REVOLUTION_SDK_VERSIONS: if args.debug: # Or -sym dwarf-2 for Wii compilers cflags_base.extend(["-sym on", "-DDEBUG=1", "-DDEBUG_DEFINED=1", "-DNDEBUG_DEFINED=0"]) +elif config.version == "ShieldD": + cflags_base.extend(["-DDEBUG=1", "-DDEBUG_DEFINED=1", "-DNDEBUG_DEFINED=0"]) else: cflags_base.extend(["-DNDEBUG=1", "-DNDEBUG_DEFINED=1", "-DDEBUG_DEFINED=0"]) @@ -301,11 +301,6 @@ elif args.warn == "off": elif args.warn == "error": cflags_base.append("-W error") -cflags_noopt = cflags_base[:] - -if config.version != "ShieldD": - cflags_noopt.remove("-O4,p") - # Metrowerks library flags cflags_runtime = [ *cflags_base, @@ -313,9 +308,10 @@ cflags_runtime = [ "-str reuse,pool,readonly", "-common off", "-char signed", + # "-inline deferred,auto" ] -if config.version != "ShieldD": +if config.version not in ["ShieldD", "Shield"]: cflags_runtime.extend(["-inline deferred,auto"]) cflags_trk = [ @@ -333,81 +329,35 @@ cflags_trk = [ # Dolphin library flags cflags_dolphin = [ - "-nodefaults", - "-proc gekko", - "-align powerpc", - "-enum int", - "-fp hardware", - "-Cpp_exceptions off", - '-pragma "cats off"', - '-pragma "warn_notinlined off"', - "-maxerrors 1", - "-nosyspath", - "-char unsigned", - "-O4,p", - "-sym on", - "-inline auto", - "-i include", - f"-i build/{config.version}/include", + *cflags_base, "-ir src/dolphin", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/Runtime/Inc", - "-i src/PowerPC_EABI_Support/MetroTRK", - "-i include/dolphin", - f"-DVERSION={version_num}", - "-D__GEKKO__", + "-fp_contract off", + "-char unsigned", + "-sym on", "-DSDK_REVISION=2", ] # Revolution library flags cflags_revolution_base = [ - "-nodefaults", - "-proc gekko", - "-align powerpc", - "-enum int", - "-fp hardware", - "-Cpp_exceptions off", - '-pragma "cats off"', - '-pragma "warn_notinlined off"', - "-maxerrors 1", - "-nosyspath", - #"-char unsigned", + *cflags_base, + "-ir src/revolution", + "-fp_contract off", "-sym on", "-inline auto", "-ipa file", - "-i include", - f"-i build/{config.version}/include", - "-ir src/revolution", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Include", - "-i src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include", - "-i src/PowerPC_EABI_Support/Runtime/Inc", - "-i src/PowerPC_EABI_Support/MetroTRK", "-i include/revolution", - f"-DVERSION={version_num}", - "-D__GEKKO__", "-D__REVOLUTION_SDK__", ] cflags_revolution_retail = [ *cflags_revolution_base, "-O4,p", - "-DNDEBUG=1", - "-DNDEBUG_DEFINED=1", - "-DDEBUG_DEFINED=0", ] cflags_revolution_debug = [ *cflags_revolution_base, "-opt off", "-inline off", - "-DDEBUG=1", - "-DDEBUG_DEFINED=1", - "-DNDEBUG_DEFINED=0", ] # Framework flags @@ -419,6 +369,20 @@ cflags_framework = [ "-fp_contract off", ] +# for specific sdk libs +cflags_noopt = cflags_base[:] +if config.version != "ShieldD": + cflags_noopt.remove("-O4,p") + + +if config.version == "ShieldD": + cflags_framework.extend(["-O0", "-inline off", "-RTTI on", "-DDEBUG=1", "-DWIDESCREEN_SUPPORT=1"]) +elif config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield"]: + cflags_framework.extend(["-ipa file", "-RTTI on", "-DWIDESCREEN_SUPPORT=1"]) + +if config.version in ["RZDE01_00", "ShieldD"] or args.debug or args.reghio: + cflags_framework.extend(["-DENABLE_REGHIO=1"]) + if config.version != "ShieldD": if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield"]: # TODO: whats the correct inlining flag? deferred looks better in some places, others not. something else wrong? @@ -429,6 +393,7 @@ if config.version != "ShieldD": if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01"]: cflags_framework.extend(["-DSDK_SEP2006"]) + # REL flags cflags_rel = [ *cflags_framework, @@ -465,6 +430,7 @@ def MWVersion(cfg_version: str | None) -> str: case _: return "GC/2.7" +# Wii versions specifically need linker GC/3.0a5 if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01"]: config.linker_version = "GC/3.0a5" else: @@ -597,6 +563,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "m_Do/m_Do_machine.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_mtx.cpp"), Object(Equivalent, "m_Do/m_Do_ext.cpp"), # weak func order + Object(NonMatching, "m_Do/m_Do_ext2.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_lib.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_Reset.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_dvd_thread.cpp"), @@ -633,6 +600,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_op/f_op_actor_iter.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_actor_tag.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_camera.cpp"), + Object(NonMatching, "f_op/f_op_actor_map.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_actor_mng.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_camera_mng.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_overlap.cpp"), @@ -740,7 +708,9 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bg_plc.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s_acch.cpp"), + Object(NonMatching, "d/d_bg_s_capt_poly.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bg_s_chk.cpp"), + Object(NonMatching, "d/d_bg_s_func.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s_gnd_chk.cpp"), # debug weak func order Object(MatchingFor(ALL_GCN), "d/d_bg_s_grp_pass_chk.cpp"), # debug weak func order Object(MatchingFor(ALL_GCN), "d/d_bg_s_lin_chk.cpp"), @@ -752,6 +722,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_bg_s_wtr_chk.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w_base.cpp"), + Object(NonMatching, "d/d_bg_w_deform.cpp"), + Object(NonMatching, "d/d_bg_w_hf.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w_kcol.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w_sv.cpp"), Object(Equivalent, "d/d_cc_d.cpp"), # weak func order (cCcD_ShapeAttr::GetCoCP) @@ -760,6 +732,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "d/d_cc_uty.cpp"), Object(MatchingFor(ALL_GCN), "d/d_cam_param.cpp"), Object(MatchingFor(ALL_GCN), "d/d_ev_camera.cpp"), + Object(NonMatching, "d/d_jcam_editor.cpp"), + Object(NonMatching, "d/d_jpreviewer.cpp"), Object(MatchingFor(ALL_GCN), "d/d_spline_path.cpp"), Object(MatchingFor(ALL_GCN), "d/d_item_data.cpp"), Object(MatchingFor(ALL_GCN), "d/d_item.cpp"), @@ -768,6 +742,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "d/d_eye_hl.cpp"), Object(MatchingFor(ALL_GCN), "d/d_error_msg.cpp"), Object(Equivalent, "d/d_debug_viewer.cpp"), # debug weak func order + Object(NonMatching, "d/d_debug_pad.cpp"), Object(NonMatching, "d/d_debug_camera.cpp"), Object(Equivalent, "d/actor/d_a_alink.cpp"), # weak func order, vtable order Object(MatchingFor(ALL_GCN), "d/actor/d_a_itembase.cpp"), @@ -810,6 +785,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "d/d_menu_item_explain.cpp"), Object(MatchingFor(ALL_GCN), "d/d_menu_letter.cpp"), Object(MatchingFor(ALL_GCN), "d/d_menu_option.cpp"), + Object(NonMatching, "d/d_menu_quit.cpp"), Object(MatchingFor(ALL_GCN), "d/d_menu_ring.cpp"), Object(MatchingFor(ALL_GCN), "d/d_menu_save.cpp"), Object(MatchingFor(ALL_GCN), "d/d_menu_skill.cpp"), @@ -846,6 +822,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "d/d_msg_string.cpp"), Object(MatchingFor(ALL_GCN), "d/d_msg_flow.cpp"), Object(MatchingFor(ALL_GCN), "d/d_name.cpp"), + Object(NonMatching, "d/d_npc.cpp"), Object(MatchingFor(ALL_GCN), "d/d_npc_lib.cpp"), Object(MatchingFor(ALL_GCN), "d/d_ovlp_fade.cpp"), Object(MatchingFor(ALL_GCN), "d/d_ovlp_fade2.cpp"), @@ -944,8 +921,13 @@ config.libs = [ JSystemLib( "J3DU", [ + Object(NonMatching, "JSystem/J3DU/J3DUPerf.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DU/J3DUClipper.cpp"), + Object(NonMatching, "JSystem/J3DU/J3DUMotion.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "JSystem/J3DU/J3DUDL.cpp"), + Object(NonMatching, "JSystem/J3DU/J3DUFur.cpp"), + Object(NonMatching, "JSystem/J3DU/J3DUShadow.cpp"), + Object(NonMatching, "JSystem/J3DU/J3DUMtxCache.cpp"), ], ), JSystemLib( @@ -1025,6 +1007,37 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio_JParticle/object-particle.cpp"), ], ), + JSystemLib( + "JStudioCameraEditor", + [ + Object(NonMatching, "JSystem/JStudio/JStudioCameraEditor/control.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioCameraEditor/csb.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioCameraEditor/csb-data.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioCameraEditor/sequence.cpp"), + ], + ), + JSystemLib( + "JStudioPreviewer", + [ + Object(NonMatching, "JSystem/JStudio/JStudioPreviewer/control.cpp"), + ], + ), + JSystemLib( + "JStudioToolLibrary", + [ + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/anchor.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/console.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/controlset.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/controlset-anchor.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/controlset-preview.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/interface.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/scroll.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/visual.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/xml.cpp"), + Object(NonMatching, "JSystem/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp"), + ], + ), JSystemLib( "JAudio2", [ @@ -1036,6 +1049,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASResArcLoader.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASProbe.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASReport.cpp"), + Object(NonMatching, "JSystem/JAudio2/JASWaveFile.cpp"), + Object(NonMatching, "JSystem/JAudio2/JASWaveFileWav.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASCmdStack.cpp"), Object(Equivalent, "JSystem/JAudio2/JASTrack.cpp"), # weak func order Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASTrackPort.cpp"), @@ -1044,6 +1059,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASSeqParser.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASSeqReader.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASAramStream.cpp"), + Object(NonMatching, "JSystem/JAudio2/JASMidi.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASBank.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASBasicBank.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JAudio2/JASVoiceBank.cpp"), @@ -1051,6 +1067,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASDrumSet.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASBasicWaveBank.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASSimpleWaveBank.cpp"), + Object(NonMatching, "JSystem/JAudio2/JASInstRand.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASWSParser.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASBNKParser.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASWaveArcLoader.cpp"), @@ -1084,6 +1101,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAIStream.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAIStreamDataMgr.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAIStreamMgr.cpp"), + Object(NonMatching, "JSystem/JAudio2/JAUAudience.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUAudioArcInterpreter.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUAudioArcLoader.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUAudioMgr.cpp"), @@ -1094,8 +1112,12 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSeqCollection.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSeqDataBlockMgr.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSoundAnimator.cpp"), + Object(NonMatching, "JSystem/JAudio2/JAUSoundMgr.cpp"), + Object(NonMatching, "JSystem/JAudio2/JAUSoundObject.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUSoundTable.cpp"), + Object(NonMatching, "JSystem/JAudio2/JAUStdSoundInfo.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JAUStreamFileTable.cpp"), + Object(NonMatching, "JSystem/JAudio2/JAUWaveFilePlayer.cpp"), ], ), JSystemLib( @@ -1109,24 +1131,62 @@ config.libs = [ ], ), JSystemLib( - "JAHostIO", + "JAWWinLib", [ - Object(Matching, "JSystem/JAHostIO/JAHioMessage.cpp"), - Object(NonMatching, "JSystem/JAHostIO/JAHioMgr.cpp"), - Object(NonMatching, "JSystem/JAHostIO/JAHioNode.cpp"), - Object(NonMatching, "JSystem/JAHostIO/JAHioUtil.cpp"), - ] + Object(NonMatching, "JSystem/JAWWinLib/JAWSeqEdit.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWSoundTable.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWBankView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWHioBankEdit.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWHioReceiver.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWMidiTerm.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWSysMemView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWChView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWVolume.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWReportView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWPlayerChView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWPlaySeView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWEntrySeView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWTrackView.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWSpeAna.cpp"), + Object(NonMatching, "JSystem/JAWWinLib/JAWSectionHeapView.cpp"), + ], ), JSystemLib( "JMessage", [ Object(MatchingFor(ALL_GCN), "JSystem/JMessage/control.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JMessage/data.cpp"), + Object(NonMatching, "JSystem/JMessage/data-parse.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JMessage/processor.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JMessage/resource.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JMessage/locale.cpp"), ], ), + JSystemLib( + "JAHostIO", + [ + Object(Matching, "JSystem/JAHostIO/JAHioMessage.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHioMgr.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHioNode.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHioUtil.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHFrameNode.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHVirtualNode.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHUAsnData.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHUTableEdit.cpp"), + Object(NonMatching, "JSystem/JAHostIO/JAHUFx.cpp"), + ], + ), + JSystemLib( + "JAHNodeLib", + [ + Object(NonMatching, "JSystem/JAHNodeLib/JAHAudienceSettingNode.cpp"), + Object(NonMatching, "JSystem/JAHNodeLib/JAHConductNode.cpp"), + Object(NonMatching, "JSystem/JAHNodeLib/JAHIDSwapNode.cpp"), + Object(NonMatching, "JSystem/JAHNodeLib/JAHSoundPlayerNode.cpp"), + Object(NonMatching, "JSystem/JAHNodeLib/JAHViewerSys.cpp"), + Object(NonMatching, "JSystem/JAHNodeLib/JAHViewerApp.cpp"), + ], + ), { "lib": "Z2AudioLib", "mw_version": MWVersion(config.version), @@ -1156,25 +1216,47 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "Z2AudioLib/Z2SpeechMgr2.cpp"), Object(Equivalent, "Z2AudioLib/Z2AudioMgr.cpp"), # weak func order Object(NonMatching, "Z2AudioLib/Z2DebugSys.cpp"), + Object(NonMatching, "Z2AudioLib/Z2F1TestWindow.cpp"), Object(NonMatching, "Z2AudioLib/Z2SoundPlayer.cpp"), + Object(NonMatching, "Z2AudioLib/Z2WaveArcLoader.cpp"), + Object(NonMatching, "Z2AudioLib/Z2SeView.cpp"), + Object(NonMatching, "Z2AudioLib/Z2TrackView.cpp"), + ], + }, + { + "lib": "Z2AudioCSD", + "mw_version": MWVersion(config.version), + "cflags": cflags_framework, + "progress_category": "core", + "host": True, + "objects": [ + Object(NonMatching, "Z2AudioCSD/SpkSpeakerCtrl.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkSystem.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkMixingBuffer.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkWave.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkTable.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkData.cpp"), + Object(NonMatching, "Z2AudioCSD/SpkSound.cpp"), + Object(NonMatching, "Z2AudioCSD/Z2AudioCS.cpp"), ], }, { "lib": "gf", "mw_version": MWVersion(config.version), - "cflags": cflags_noopt, + "cflags": [*cflags_noopt, "-O3"], "progress_category": "sdk", "objects": [ - Object(MatchingFor(ALL_GCN), "dolphin/gf/GFGeometry.cpp", extra_cflags=["-O3"]), - Object(MatchingFor(ALL_GCN), "dolphin/gf/GFLight.cpp", extra_cflags=["-O3"]), - Object(MatchingFor(ALL_GCN), "dolphin/gf/GFPixel.cpp", extra_cflags=["-O3"]), - Object(MatchingFor(ALL_GCN), "dolphin/gf/GFTev.cpp", extra_cflags=["-O3"]), + Object(MatchingFor(ALL_GCN), "dolphin/gf/GFGeometry.cpp"), + Object(MatchingFor(ALL_GCN), "dolphin/gf/GFLight.cpp"), + Object(MatchingFor(ALL_GCN), "dolphin/gf/GFPixel.cpp"), + Object(MatchingFor(ALL_GCN), "dolphin/gf/GFTev.cpp"), ], }, JSystemLib( "JKernel", [ Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRHeap.cpp"), + Object(NonMatching, "JSystem/JKernel/JKRStdHeap.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRExpHeap.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRSolidHeap.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRAssertHeap.cpp"), @@ -1196,6 +1278,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRCompArchive.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRFile.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRDvdFile.cpp"), + Object(NonMatching, "JSystem/JKernel/JKRRelocation.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRDvdRipper.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRDvdAramRipper.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JKernel/JKRDecomp.cpp"), @@ -1214,9 +1297,18 @@ config.libs = [ JSystemLib( "JGadget", [ + Object(NonMatching, "JSystem/JGadget/define.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JGadget/binary.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JGadget/linklist.cpp"), + Object(NonMatching, "JSystem/JGadget/search.cpp"), + Object(NonMatching, "JSystem/JGadget/textreader.cpp"), + Object(NonMatching, "JSystem/JGadget/xml-scanner.cpp"), + Object(NonMatching, "JSystem/JGadget/std-list.cpp"), + Object(NonMatching, "JSystem/JGadget/std-stream.cpp"), + Object(NonMatching, "JSystem/JGadget/std-streambuf.cpp"), + Object(NonMatching, "JSystem/JGadget/std-string.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JGadget/std-vector.cpp"), + Object(NonMatching, "JSystem/JGadget/dolphin-stream-JORFile.cpp"), ], ), JSystemLib( @@ -1242,6 +1334,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JUtility/JUTConsole.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JUtility/JUTDirectFile.cpp"), Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp"), + Object(NonMatching, "JSystem/JUtility/JUTFontData_Ascfont_fix16.cpp"), ], ), JSystemLib( @@ -1263,6 +1356,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DPictureEx.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DTextBoxEx.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DAnmLoader.cpp"), + Object(NonMatching, "JSystem/J2DGraph/J2DAnmSaver.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DAnimation.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J2DGraph/J2DManage.cpp"), ], @@ -1308,11 +1402,14 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DMaterialFactory.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DClusterLoader.cpp"), + Object(NonMatching, "JSystem/J3DGraphLoader/J3DBinaryFormat.cpp"), + Object(NonMatching, "JSystem/J3DGraphLoader/J3DSaverUtility.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DModelLoader.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DJointFactory.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DShapeFactory.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/J3DGraphLoader/J3DAnmLoader.cpp"), + Object(NonMatching, "JSystem/J3DGraphLoader/J3DModelSaver.cpp"), ], ), JSystemLib( @@ -1378,7 +1475,7 @@ config.libs = [ { "lib": "exi", "mw_version": "GC/1.2.5n", - "cflags": cflags_noopt, + "cflags": [*cflags_noopt, "-ir src/dolphin"], "progress_category": "sdk", "objects": [ Object(MatchingFor(ALL_GCN), "dolphin/exi/EXIBios.c", extra_cflags=["-O3,p"]), @@ -1796,6 +1893,7 @@ config.libs = [ "progress_category": "sdk", "host": False, "objects": [ + Object(NonMatching, "PowerPC_EABI_Support/Runtime/Src/GCN_mem_alloc.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/Runtime/Src/__mem.c"), Object(MatchingFor(ALL_GCN, "Shield"), "PowerPC_EABI_Support/Runtime/Src/__va_arg.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/Runtime/Src/global_destructor_chain.c"), @@ -1820,31 +1918,41 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/errno.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c"), Object(MatchingFor(ALL_GCN, "Shield"), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/buffer_io.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/critical_regions.gamecube.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/misc_io.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/uart_console_io_gcn.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_atan2.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_exp.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_cos.c"), @@ -1866,8 +1974,10 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_atan2.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_exp.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_fmod.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_pow.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c"), + Object(NonMatching, "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_sqrt.c"), Object(MatchingFor(ALL_GCN), "PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c"), @@ -1887,6 +1997,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msg.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/serpoll.c", extra_cflags=["-sdata 8"]), + Object(NonMatching, "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/string_TRK.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/usr_put.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/dispatch.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c"), @@ -1912,6 +2023,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/CircleBuffer.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c", extra_cflags=["-sdata 8"]), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/common/MWTrace.c"), + Object(NonMatching, "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/cc_gdev.c"), Object(MatchingFor(ALL_GCN), "TRK_MINNOW_DOLPHIN/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.c"), ], }, @@ -1945,6 +2057,17 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "odenotstub/odenotstub.c"), ], }, + { + "lib": "NdevExi2AD", + "mw_version": MWVersion(config.version), + "cflags": cflags_dolphin, + "progress_category": "sdk", + "host": False, + "objects": [ + Object(NonMatching, "NdevExi2AD/DebuggerDriver.c"), + Object(NonMatching, "NdevExi2AD/exi2.c"), + ], + }, { "lib": "lingcod", "mw_version": MWVersion(config.version), diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index 1bb748a80d..234f1c0c29 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -2,7 +2,7 @@ #define J2DPRINT_H #include "JSystem/J2DGraph/J2DTextBox.h" -#include "__va_arg.h" +#include class JUTFont; class J2DPrint; diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index 9fd352a04b..f080c91f72 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -2,7 +2,7 @@ #define JGEOMETRY_H #include "dolphin/mtx.h" -#include "math.h" +#include #include "JSystem/JMath/JMath.h" namespace JGeometry { diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index ee31b6e541..35cde38bef 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -2,7 +2,7 @@ #define JMATH_H #include "dolphin/mtx.h" -#include "math.h" +#include void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32); void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3); diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/include/JSystem/JStudio/JStudio/jstudio-math.h index 73635c990e..109d17230d 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-math.h +++ b/include/JSystem/JStudio/JStudio/jstudio-math.h @@ -2,7 +2,7 @@ #define JSTUDIO_MATH_H #include "dolphin/mtx.h" -#include "math.h" +#include namespace JStudio { namespace math { diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 3f42a456b5..6bca78c4c0 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -3,8 +3,8 @@ #include "JSystem/JStudio/JStudio/jstudio-control.h" #include "global.h" -#include "limits.h" -#include "math.h" +#include +#include typedef struct _GXColor GXColor; diff --git a/include/JSystem/JStudio/JStudio/stb.h b/include/JSystem/JStudio/JStudio/stb.h index 1b8c3d497d..d61bfda06c 100644 --- a/include/JSystem/JStudio/JStudio/stb.h +++ b/include/JSystem/JStudio/JStudio/stb.h @@ -163,7 +163,7 @@ private: /* 0x04 */ u32 _4; /* 0x08 */ u32 _8; /* 0x0C */ TFactory* pFactory; - /* 0x10 */ JGadget::TLinkList mObjectContainer; + /* 0x10 */ JGadget::TLinkList ocObject_; /* 0x1C */ u32 mStatus; /* 0x20 */ TObject_control mObject_control; /* 0x54 */ s32 _54; diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index cb65d1091c..6f9194b837 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -4,7 +4,7 @@ #include "JSystem/JGadget/linklist.h" #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JUtility/JUTFont.h" -#include "__va_arg.h" +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index 8d85ba5982..d856510ff3 100644 --- a/include/JSystem/JUtility/JUTDirectPrint.h +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -2,7 +2,7 @@ #define JUTDIRECTPRINT_H #include "JSystem/JUtility/TColor.h" -#include "__va_arg.h" +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 923349a089..197936ed81 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTGamePad.h" -#include "__va_arg.h" +#include #include #include #include "global.h" diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index ed26298701..4c4d947100 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -1,7 +1,7 @@ #ifndef C_M3D_H_ #define C_M3D_H_ -#include "math.h" +#include #include "dolphin/mtx.h" class cM3dGAab; diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index 976fc0faf7..bf2008cfdb 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -2,7 +2,7 @@ #define C_XYZ_H #include "dolphin/mtx.h" -#include "math.h" +#include struct cXyz : Vec { static const cXyz Zero; diff --git a/include/d/actor/d_a_obj_dust.h b/include/d/actor/d_a_obj_dust.h index 023a811d1f..8adb5133b8 100644 --- a/include/d/actor/d_a_obj_dust.h +++ b/include/d/actor/d_a_obj_dust.h @@ -11,7 +11,7 @@ #include "d/d_resorce.h" #include "d/d_s_play.h" -#include +#include /** * @ingroup actors-objects diff --git a/include/d/d_menu_dmap_map.h b/include/d/d_menu_dmap_map.h index 8c23a3b0eb..ca8b26f15e 100644 --- a/include/d/d_menu_dmap_map.h +++ b/include/d/d_menu_dmap_map.h @@ -2,7 +2,7 @@ #define D_MENU_D_MENU_DMAP_MAP_H #include "d/d_menu_dmap.h" -#include +#include class dMenu_DmapMap_c { public: diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index 22d34b855e..00fb5c3445 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -5,13 +5,13 @@ #include "weak_bss_1109_to_1009.h" // IWYU pragma: export // Fixes weak .data -#include "math.h" // IWYU pragma: export +#include "cmath.h" // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export #include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export // Fixes weak function ordering -#include "cmath.h" // IWYU pragma: export -#include "string.h" // IWYU pragma: export +#include "math.h" // IWYU pragma: export +#include "cstring.h" // IWYU pragma: export #include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export #include "JSystem/JHostIO/JORReflexible.h" // IWYU pragma: export diff --git a/include/dolphin/ar.h b/include/dolphin/ar.h index d65a282811..0a5d781a8f 100644 --- a/include/dolphin/ar.h +++ b/include/dolphin/ar.h @@ -1,6 +1,9 @@ #ifndef _DOLPHIN_AR_H_ #define _DOLPHIN_AR_H_ +#ifdef __REVOLUTION_SDK__ +#include +#else #include #ifdef __cplusplus @@ -64,8 +67,12 @@ void ARQSetChunkSize(u32 size); u32 ARQGetChunkSize(void); BOOL ARQCheckInit(void); +u16 __ARGetInterruptStatus(void); +void __ARClearInterrupt(void); + #ifdef __cplusplus } #endif #endif +#endif diff --git a/include/dolphin/os.h b/include/dolphin/os.h index 989324d7fc..1abc59108f 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -1,7 +1,7 @@ #ifndef _DOLPHIN_OS_H_ #define _DOLPHIN_OS_H_ -#include +#include #ifdef __REVOLUTION_SDK__ #include diff --git a/include/dolphin/fake_tgmath.h b/include/dolphin/sdk_math.h similarity index 91% rename from include/dolphin/fake_tgmath.h rename to include/dolphin/sdk_math.h index 41a982106d..cb59311411 100644 --- a/include/dolphin/fake_tgmath.h +++ b/include/dolphin/sdk_math.h @@ -1,4 +1,4 @@ -#pragma cplusplus on +// fake MSL_C math for sdk specifically since it differs from game MSL_C math extern inline float sqrtf(float x) { static const double _half=.5; @@ -46,6 +46,10 @@ extern inline float fabsf(float x) { } extern float cosf(float); +extern float sinf(float); +extern float tanf(float); +extern float acosf(float); + extern inline float cos(float x) { return cosf(x); } @@ -62,5 +66,3 @@ inline float floor(float x) { // x < 0 -> int conversion of x above rounded toward zero(so decrement) return (float)i; } - -#pragma cplusplus reset diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 411bb8ec27..53ba266cbe 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -82,7 +82,7 @@ typedef unsigned int uint; #define __REGISTER #endif -#include +#include #endif #endif diff --git a/include/global.h b/include/global.h index 5176f8021e..4f2b7a60ad 100644 --- a/include/global.h +++ b/include/global.h @@ -1,8 +1,7 @@ #ifndef _global_h_ #define _global_h_ -#include "dolphin/types.h" - +// Version ordering defined in configure.py #define VERSION_GCN_USA 0 #define VERSION_GCN_PAL 1 #define VERSION_GCN_JPN 2 @@ -49,8 +48,6 @@ #define decltype __decltype__ #endif -#define JUT_EXPECT(...) - #define _SDA_BASE_(dummy) 0 #define _SDA2_BASE_(dummy) 0 diff --git a/include/revolution/aralt.h b/include/revolution/aralt.h index 8a699bb857..74d3c4751b 100644 --- a/include/revolution/aralt.h +++ b/include/revolution/aralt.h @@ -40,14 +40,29 @@ typedef struct ARQRequest ARQRequest; // AR ARQCallback ARRegisterDMACallback(ARQCallback callback); +u32 ARGetDMAStatus(void); void ARStartDMA(u32 type, u32 mainmem_addr, u32 aram_addr, u32 length); u32 ARAlloc(u32 length); +u32 ARFree(u32* length); +BOOL ARCheckInit(void); u32 ARInit(u32* stack_index_addr, u32 num_entries); +void ARReset(void); +void ARSetSize(void); u32 ARGetBaseAddress(void); u32 ARGetSize(void); +u32 ARGetInternalSize(void); +void ARClear(u32 flag); // ARQ void ARQInit(void); +void ARQReset(void); +void ARQPostRequest(ARQRequest* request, u32 owner, u32 type, u32 priority, u32 source, u32 dest, u32 length, ARQCallback callback); +void ARQRemoveRequest(ARQRequest* request); +void ARQRemoveOwnerRequest(u32 owner); +void ARQFlushQueue(void); +void ARQSetChunkSize(u32 size); +u32 ARQGetChunkSize(void); +BOOL ARQCheckInit(void); #ifdef __cplusplus } diff --git a/include/revolution/os.h b/include/revolution/os.h index 7ab36c7361..351615ee52 100644 --- a/include/revolution/os.h +++ b/include/revolution/os.h @@ -1,7 +1,7 @@ #ifndef _REVOLUTION_OS_H_ #define _REVOLUTION_OS_H_ -#include +#include #include #include diff --git a/include/revolution/private/iosrestypes.h b/include/revolution/private/iosrestypes.h index 9f7502bd1b..a8766f4083 100644 --- a/include/revolution/private/iosrestypes.h +++ b/include/revolution/private/iosrestypes.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _REVOLUTION_IOSRESTYPES_H_ +#define _REVOLUTION_IOSRESTYPES_H_ #include @@ -87,3 +88,5 @@ typedef struct { IOSResourceIoctlv ioctlv; } args; } IOSResourceRequest; + +#endif diff --git a/include/revolution/private/iostypes.h b/include/revolution/private/iostypes.h index 6c57627407..9e4d7ce048 100644 --- a/include/revolution/private/iostypes.h +++ b/include/revolution/private/iostypes.h @@ -1,4 +1,5 @@ -#pragma once +#ifndef _REVOLUTION_IOSTYPES_H_ +#define _REVOLUTION_IOSTYPES_H_ #include @@ -41,3 +42,5 @@ typedef struct { IOSCSigDummy dummy; IOSCName issuer; } IOSCSigRsa2048; + +#endif diff --git a/include/revolution/fake_tgmath.h b/include/revolution/sdk_math.h similarity index 91% rename from include/revolution/fake_tgmath.h rename to include/revolution/sdk_math.h index 41a982106d..cb59311411 100644 --- a/include/revolution/fake_tgmath.h +++ b/include/revolution/sdk_math.h @@ -1,4 +1,4 @@ -#pragma cplusplus on +// fake MSL_C math for sdk specifically since it differs from game MSL_C math extern inline float sqrtf(float x) { static const double _half=.5; @@ -46,6 +46,10 @@ extern inline float fabsf(float x) { } extern float cosf(float); +extern float sinf(float); +extern float tanf(float); +extern float acosf(float); + extern inline float cos(float x) { return cosf(x); } @@ -62,5 +66,3 @@ inline float floor(float x) { // x < 0 -> int conversion of x above rounded toward zero(so decrement) return (float)i; } - -#pragma cplusplus reset diff --git a/include/revolution/types.h b/include/revolution/types.h index fc9c6f4315..65fbba9203 100644 --- a/include/revolution/types.h +++ b/include/revolution/types.h @@ -79,6 +79,6 @@ typedef unsigned int uint; #define __REGISTER #endif -#include +#include #endif diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 1697151b55..9a70147dc0 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRFileCache.h" #include "JSystem/JUtility/JUTConsole.h" -#include "stdio.h" +#include #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp index 18281a0092..69234af65f 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/src/JSystem/J2DGraph/J2DTevs.cpp @@ -6,7 +6,7 @@ #include "JSystem/J2DGraph/J2DTevs.h" #include "JSystem/J2DGraph/J2DMatBlock.h" -#include "math.h" +#include #include "dolphin/gx.h" void J2DTexMtx::load(u32 mtxIdx) { @@ -24,15 +24,15 @@ void J2DTexMtx::calc() { void J2DTexMtx::getTextureMtx(J2DTextureSRTInfo const& param_0, Vec param_1, Mtx param_2) { float f31 = (param_0.mRotationDeg * M_PI) / 180.0f; - param_2[0][0] = param_0.mScaleX * i_cosf(f31); - param_2[0][1] = -param_0.mScaleX * i_sinf(f31); + param_2[0][0] = param_0.mScaleX * cosf(f31); + param_2[0][1] = -param_0.mScaleX * sinf(f31); param_2[0][2] = 0.0f; - param_2[0][3] = -param_0.mScaleX * i_cosf(f31) * param_1.x + param_1.y * (param_0.mScaleX * i_sinf(f31)) + + param_2[0][3] = -param_0.mScaleX * cosf(f31) * param_1.x + param_1.y * (param_0.mScaleX * sinf(f31)) + param_1.x + param_0.mTranslationX; - param_2[1][0] = param_0.mScaleY * i_sinf(f31); - param_2[1][1] = param_0.mScaleY * i_cosf(f31); + param_2[1][0] = param_0.mScaleY * sinf(f31); + param_2[1][1] = param_0.mScaleY * cosf(f31); param_2[1][2] = 0.0f; - param_2[1][3] = -param_0.mScaleY * i_sinf(f31) * param_1.x - param_1.y * (param_0.mScaleY * i_cosf(f31)) + + param_2[1][3] = -param_0.mScaleY * sinf(f31) * param_1.x - param_1.y * (param_0.mScaleY * cosf(f31)) + param_1.y + param_0.mTranslationY; param_2[2][0] = 0.0f; param_2[2][1] = 0.0f; @@ -42,16 +42,16 @@ void J2DTexMtx::getTextureMtx(J2DTextureSRTInfo const& param_0, Vec param_1, Mtx void J2DTexMtx::getTextureMtxMaya(J2DTextureSRTInfo const& param_0, Mtx param_1) { float f31 = (param_0.mRotationDeg * M_PI) / 180.0f; - param_1[0][0] = param_0.mScaleX * i_cosf(f31); - param_1[0][1] = param_0.mScaleY * i_sinf(f31); + param_1[0][0] = param_0.mScaleX * cosf(f31); + param_1[0][1] = param_0.mScaleY * sinf(f31); param_1[0][2] = 0.0f; - param_1[0][3] = (param_0.mTranslationX - 0.5f) * i_cosf(f31) - - (param_0.mTranslationY - 0.5f + param_0.mScaleY) * i_sinf(f31) + 0.5f; - param_1[1][0] = -param_0.mScaleX * i_sinf(f31); - param_1[1][1] = param_0.mScaleY * i_cosf(f31); + param_1[0][3] = (param_0.mTranslationX - 0.5f) * cosf(f31) - + (param_0.mTranslationY - 0.5f + param_0.mScaleY) * sinf(f31) + 0.5f; + param_1[1][0] = -param_0.mScaleX * sinf(f31); + param_1[1][1] = param_0.mScaleY * cosf(f31); param_1[1][2] = 0.0f; - param_1[1][3] = -(param_0.mTranslationX - 0.5f) * i_sinf(f31) - - (param_0.mTranslationY - 0.5f + param_0.mScaleY) * i_cosf(f31) + 0.5f; + param_1[1][3] = -(param_0.mTranslationX - 0.5f) * sinf(f31) - + (param_0.mTranslationY - 0.5f + param_0.mScaleY) * cosf(f31) + 0.5f; param_1[2][0] = 0.0f; param_1[2][1] = 0.0f; param_1[2][2] = 1.0f; diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/src/JSystem/J3DU/J3DUClipper.cpp index b25841914d..04edda6427 100644 --- a/src/JSystem/J3DU/J3DUClipper.cpp +++ b/src/JSystem/J3DU/J3DUClipper.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J3DU/J3DUClipper.h" -#include "math.h" +#include void J3DUClipper::init() { mNear = 1.0f; diff --git a/src/JSystem/JAudio2/JASReport.cpp b/src/JSystem/JAudio2/JASReport.cpp index f0983ae257..744bc69eaf 100644 --- a/src/JSystem/JAudio2/JASReport.cpp +++ b/src/JSystem/JAudio2/JASReport.cpp @@ -8,7 +8,7 @@ #include "JSystem/JAudio2/JASCalc.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRHeap.h" -#include "stdio.h" +#include static OSMutex sMutex; diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp index 9c35789833..03525f9199 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -5,7 +5,7 @@ #include "JSystem/JAudio2/JASTaskThread.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" -#include "cstring.h" +#include "string.h" #include "dolphin/os.h" #include diff --git a/src/JSystem/JHostIO/JHIMccBuf.cpp b/src/JSystem/JHostIO/JHIMccBuf.cpp index 0e539630ce..0e2e8a2f4c 100644 --- a/src/JSystem/JHostIO/JHIMccBuf.cpp +++ b/src/JSystem/JHostIO/JHIMccBuf.cpp @@ -3,11 +3,8 @@ #include "JSystem/JHostIO/JHIMccBuf.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JHostIO/JHIRMcc.h" -#include -#include - -extern "C" int HIO2Read(u32, u32, void*, u32); -extern "C" int HIO2Write(u32, u32, void*, u32); +#include +#include void JHIReport(const char* fmt, ...) {} diff --git a/src/JSystem/JHostIO/JHIRMcc.cpp b/src/JSystem/JHostIO/JHIRMcc.cpp index de7ee3194a..b22a19d365 100644 --- a/src/JSystem/JHostIO/JHIRMcc.cpp +++ b/src/JSystem/JHostIO/JHIRMcc.cpp @@ -1,20 +1,9 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JHostIO/JHIMccBuf.h" +#include -enum HIO2DeviceType { - DEVICE_INVALID = -1, -}; - -typedef BOOL (*HIO2EnumCallback)(HIO2DeviceType); -typedef void (*HIO2DisconnectCallback)(s32); - -extern "C" BOOL HIO2Init(); -extern "C" BOOL HIO2EnumDevices(HIO2EnumCallback); -extern "C" BOOL HIO2Close(s32); -extern "C" s32 HIO2Open(HIO2DeviceType, int, HIO2DisconnectCallback); - -HIO2DeviceType gExiDevice = DEVICE_INVALID; +HIO2DeviceType gExiDevice = HIO2_DEVICE_INVALID; u8 data_8074bd04 = 1; s32 ghHIO2; @@ -29,7 +18,7 @@ BOOL JHIhio2CallbackEnum(HIO2DeviceType type) { } void JHIhio2DisconnectCallback(s32) { - gExiDevice = DEVICE_INVALID; + gExiDevice = HIO2_DEVICE_INVALID; } u32 JHIInitInterface() { @@ -45,7 +34,7 @@ u32 JHIInitInterface() { data_8074bd04 = 0; } - if (gExiDevice == DEVICE_INVALID) { + if (gExiDevice == HIO2_DEVICE_INVALID) { return 0; } diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 08652656b0..251821acf4 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -7,7 +7,7 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "math.h" +#include #include "string.h" JKRAramArchive::JKRAramArchive(s32 entryNumber, JKRArchive::EMountDirection mountDirection) diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/src/JSystem/JKernel/JKRAramHeap.cpp index 91fea19b00..960e3aedfa 100644 --- a/src/JSystem/JKernel/JKRAramHeap.cpp +++ b/src/JSystem/JKernel/JKRAramHeap.cpp @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRAramHeap.h" #include "JSystem/JKernel/JKRHeap.h" #include "global.h" -#include +#include JSUList JKRAramHeap::sAramList; diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index 4c02d4ed8b..7a5c813085 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -10,7 +10,7 @@ #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "math.h" +#include #include "string.h" #include diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index f5ec5aed60..5436e7a808 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -6,7 +6,7 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "math.h" +#include #include "string.h" #include "global.h" #include diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index 510ccd3132..da157b43b1 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" -#include "stdio.h" +#include #include "global.h" #include diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/src/JSystem/JMath/JMATrigonometric.cpp index e037400994..605353736d 100644 --- a/src/JSystem/JMath/JMATrigonometric.cpp +++ b/src/JSystem/JMath/JMATrigonometric.cpp @@ -2,7 +2,7 @@ // don't include header until this "zero" mess is figured out // #include "JSystem/JMath/JMATrigonometric.h" -#include "math.h" +#include #include "global.h" static f32 dummy() { diff --git a/src/JSystem/JStage/JSGCamera.cpp b/src/JSystem/JStage/JSGCamera.cpp index caf5865873..19a16cf5b5 100644 --- a/src/JSystem/JStage/JSGCamera.cpp +++ b/src/JSystem/JStage/JSGCamera.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JStage/JSGCamera.h" -#include "limits.h" +#include JStage::TCamera::~TCamera() {} diff --git a/src/JSystem/JStage/JSGFog.cpp b/src/JSystem/JStage/JSGFog.cpp index b0fd300031..0f63fedd7e 100644 --- a/src/JSystem/JStage/JSGFog.cpp +++ b/src/JSystem/JStage/JSGFog.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JStage/JSGFog.h" -#include "limits.h" +#include JStage::TFog::~TFog() {} diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index 7ca04c6252..818d891b90 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -5,9 +5,9 @@ #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JGadget/linklist.h" -#include "math.h" -#include "stdlib.h" -#include "limits.h" +#include +#include +#include namespace JStudio { diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp index b2922f2be3..ce703f62dc 100644 --- a/src/JSystem/JStudio/JStudio/fvb.cpp +++ b/src/JSystem/JStudio/JStudio/fvb.cpp @@ -249,7 +249,7 @@ void TObject_transition::prepare_data_(const data::TParse_TParagraph::TData& rDa ASSERT(rData.u32Type == data::PARAGRAPH_DATA); u32 u32Size = rData.u32Size; - JUT_EXPECT(u32size == 8); + JGADGET_ASSERTWARN(0, u32Size == 8); const f32* pContent = static_cast(rData.pContent); ASSERT(pContent != NULL); @@ -263,7 +263,7 @@ void TObject_list::prepare_data_(const data::TParse_TParagraph::TData& rData, TC ASSERT(rData.u32Type == data::PARAGRAPH_DATA); u32 u32Size = rData.u32Size; - JUT_EXPECT(u32size >= 8); + JGADGET_ASSERTWARN(0, u32Size >= 8); const ListData* pContent = static_cast(rData.pContent); ASSERT(pContent != NULL); @@ -280,7 +280,7 @@ void TObject_list_parameter::prepare_data_(const data::TParse_TParagraph::TData& ASSERT(rData.u32Type == data::PARAGRAPH_DATA); u32 u32Size = rData.u32Size; - JUT_EXPECT(u32size >= 8); + JGADGET_ASSERTWARN(0, u32Size >= 8); const ListData* pContent = static_cast(rData.pContent); ASSERT(pContent != NULL); @@ -295,7 +295,7 @@ void TObject_hermite::prepare_data_(const data::TParse_TParagraph::TData& rData, ASSERT(rData.u32Type == data::PARAGRAPH_DATA); u32 u32Size = rData.u32Size; - JUT_EXPECT(u32size >= 8); + JGADGET_ASSERTWARN(0, u32Size >= 8); const ListData* pContent = static_cast(rData.pContent); ASSERT(pContent != NULL); @@ -306,7 +306,7 @@ void TObject_hermite::prepare_data_(const data::TParse_TParagraph::TData& rData, TControl::TControl() : pFactory(NULL) {} TControl::~TControl() { - JUT_EXPECT(ocObject_.empty()); + JGADGET_ASSERTWARN(0, ocObject_.empty()); } void TControl::appendObject(TObject* object) { diff --git a/src/JSystem/JStudio/JStudio/jstudio-math.cpp b/src/JSystem/JStudio/JStudio/jstudio-math.cpp index a2faada02a..e6c5403b64 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-math.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-math.cpp @@ -3,15 +3,15 @@ #include "JSystem/JStudio/JStudio/jstudio-math.h" #include "JSystem/JGeometry.h" #include "JSystem/TPosition3.h" -#include "math.h" +#include void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) { - f32 cosx = i_cosf(DEG_TO_RAD(x)); - f32 sinx = i_sinf(DEG_TO_RAD(x)); - f32 cosy = i_cosf(DEG_TO_RAD(y)); - f32 siny = i_sinf(DEG_TO_RAD(y)); - f32 cosz = i_cosf(DEG_TO_RAD(z)); - f32 sinz = i_sinf(DEG_TO_RAD(z)); + f32 cosx = cosf(DEG_TO_RAD(x)); + f32 sinx = sinf(DEG_TO_RAD(x)); + f32 cosy = cosf(DEG_TO_RAD(y)); + f32 siny = sinf(DEG_TO_RAD(y)); + f32 cosz = cosf(DEG_TO_RAD(z)); + f32 sinz = sinf(DEG_TO_RAD(z)); f32 cosxcosz = cosx * cosz; f32 cosxsinz = cosx * sinz; f32 sinxcosz = sinx * cosz; diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp index c7270facf1..a84ad897ed 100644 --- a/src/JSystem/JStudio/JStudio/stb.cpp +++ b/src/JSystem/JStudio/JStudio/stb.cpp @@ -46,7 +46,7 @@ TObject::TObject(const data::TParse_TBlock_object& object) pSequence_next(object.getContent()), u32Wait_(0), mStatus(STATUS_STILL) {} TObject::~TObject() { - JUT_EXPECT(getControl() == NULL); + JGADGET_ASSERTWARN(0, getControl() == NULL); } void TObject::setFlag_operation(u8 op, int val) { @@ -205,26 +205,26 @@ void TObject::process_sequence_() { switch (type) { case 0: - JUT_EXPECT(u32Value == 0); - JUT_EXPECT(pContent == NULL); + JGADGET_ASSERTWARN(0, u32Value == 0); + JGADGET_ASSERTWARN(0, pContent == NULL); break; case 1: - JUT_EXPECT(pContent == NULL); + JGADGET_ASSERTWARN(0, pContent == NULL); setFlag_operation_(u32Value); break; case 2: - JUT_EXPECT(pContent == NULL); + JGADGET_ASSERTWARN(0, pContent == NULL); setWait(u32Value); break; case 3: { - JUT_EXPECT(pContent == NULL); + JGADGET_ASSERTWARN(0, pContent == NULL); s32 off = toInt32FromUInt24_(u32Value); void* nextseq = (void*)getSequence_offset(off); setSequence_next(nextseq); break; } case 4: { - JUT_EXPECT(pContent == NULL); + JGADGET_ASSERTWARN(0, pContent == NULL); u32 val = toInt32FromUInt24_(u32Value); suspend(val); break; @@ -246,7 +246,7 @@ void TObject::process_sequence_() { p = (void*)para_dat.next; ASSERT(p != NULL); } - JUT_EXPECT(p == pNext); + JGADGET_ASSERTWARN(0, p == pNext); break; } default: @@ -302,19 +302,19 @@ TControl::TControl() : _4(0), _8(0), pFactory(NULL), mObject_control(NULL, 0), _ TControl::~TControl() { mObject_control.setControl_(NULL); - JUT_EXPECT(ocObject_.empty()); + JGADGET_ASSERTWARN(0, ocObject_.empty()); } void TControl::appendObject(TObject* p) { p->setControl_(this); - mObjectContainer.Push_back(p); + ocObject_.Push_back(p); } void TControl::removeObject(TObject* p) { ASSERT(p != NULL); ASSERT(p->getControl() == this); p->setControl_(NULL); - mObjectContainer.Erase(p); + ocObject_.Erase(p); } void TControl::destroyObject(TObject* p) { @@ -324,15 +324,15 @@ void TControl::destroyObject(TObject* p) { } void TControl::destroyObject_all() { - while (!mObjectContainer.empty()) { - destroyObject(&mObjectContainer.back()); + while (!ocObject_.empty()) { + destroyObject(&ocObject_.back()); } } // NONMATCHING - TPRObject_ID_equal copy issue TObject* TControl::getObject(void const* param_0, u32 param_1) { - JGadget::TLinkList::iterator begin = mObjectContainer.begin(); - JGadget::TLinkList::iterator end = mObjectContainer.end(); + JGadget::TLinkList::iterator begin = ocObject_.begin(); + JGadget::TLinkList::iterator end = ocObject_.end(); JGadget::TLinkList::iterator local_50 = std::find_if(begin, end, object::TPRObject_ID_equal(param_0, param_1)); if ((local_50 != end) != false) { return &*local_50; @@ -343,7 +343,7 @@ TObject* TControl::getObject(void const* param_0, u32 param_1) { void TControl::reset() { resetStatus_(); mObject_control.reset(); - JGadget::TContainerEnumerator > aTStack_18(mObjectContainer); + JGadget::TContainerEnumerator > aTStack_18(ocObject_); while (aTStack_18) { (*aTStack_18).reset(); } @@ -354,7 +354,7 @@ bool TControl::forward(u32 param_0) { bool rv = mObject_control.forward(param_0); int uVar7 = 0xf; int uVar6 = 0; - JGadget::TContainerEnumerator > aTStack_38(mObjectContainer); + JGadget::TContainerEnumerator > aTStack_38(ocObject_); while (aTStack_38) { JStudio::stb::TObject& this_00 = *aTStack_38; rv = this_00.forward(param_0) || rv; diff --git a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp b/src/JSystem/JStudio/JStudio_JStage/object-light.cpp index a3291af3fb..a50643a30f 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-light.cpp @@ -93,12 +93,12 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) { f32 dVar10 = adaptor_getVariableValue(10)->getValue(); f32 dVar11 = adaptor_getVariableValue(11)->getValue(); f32 temp = MTXDegToRad(dVar11); - f32 dVar12 = i_cosf(temp); - f32 sinVal = i_sinf(temp); + f32 dVar12 = cosf(temp); + f32 sinVal = sinf(temp); f32 temp2 = MTXDegToRad(dVar10); - VStack_198.direction.x = dVar12 * i_sinf(temp2); + VStack_198.direction.x = dVar12 * sinf(temp2); VStack_198.direction.y = sinVal; - VStack_198.direction.z = dVar12 * i_cosf(temp2); + VStack_198.direction.z = dVar12 * cosf(temp2); break; } case 2: diff --git a/src/JSystem/JSupport/JSUOutputStream.cpp b/src/JSystem/JSupport/JSUOutputStream.cpp index 046ab59bda..3732397523 100644 --- a/src/JSystem/JSupport/JSUOutputStream.cpp +++ b/src/JSystem/JSupport/JSUOutputStream.cpp @@ -3,7 +3,7 @@ #include "JSystem/JSupport/JSUOutputStream.h" #include "JSystem/JSupport/JSURandomOutputStream.h" #include -#include +#include JSUOutputStream::~JSUOutputStream() { if (!isGood()) { diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/src/JSystem/JUtility/JUTAssert.cpp index 1f52ba1178..16029f3036 100644 --- a/src/JSystem/JUtility/JUTAssert.cpp +++ b/src/JSystem/JUtility/JUTAssert.cpp @@ -4,7 +4,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTDirectPrint.h" -#include "stdio.h" +#include #include bool sAssertVisible = true; diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index 73fdb28545..5537b321f7 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" -#include "stdio.h" +#include JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { mFont = pFont; diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp index 9f270696b3..799d8ae78b 100644 --- a/src/JSystem/JUtility/JUTDirectPrint.cpp +++ b/src/JSystem/JUtility/JUTDirectPrint.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTDirectPrint.h" -#include "stdio.h" +#include #include #include "global.h" diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/limits.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h similarity index 73% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/limits.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h index e8f381874e..91c3dedf0e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/limits.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h @@ -1,39 +1,8 @@ -#ifndef _STD_LIMITS_H -#define _STD_LIMITS_H +#ifndef _MSL_LIMITS_H +#define _MSL_LIMITS_H -#include "float.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define CHAR_BIT 8 - -#define SCHAR_MIN (-0x7F - 1) -#define SCHAR_MAX 0x7F -#define UCHAR_MAX 0xFF - -#define CHAR_MIN 0 -#define CHAR_MAX SCHAR_MAX - -#define SHRT_MIN (-0x7FFF - 1) -#define SHRT_MAX 0x7FFF -#define USHRT_MAX 0xFFFF - -#define INT_MIN (-0x7FFFFFFF - 1) -#define INT_MAX 0x7FFFFFFF -#define UINT_MAX 0xFFFFFFFF - -#define LONG_MIN (-0x7FFFFFFFL - 1) -#define LONG_MAX 0x7FFFFFFFL -#define ULONG_MAX 0xFFFFFFFFUL - -#define LLONG_MIN (-0x7FFFFFFFFFFFFFFFLL - 1) -#define LLONG_MAX 0x7FFFFFFFFFFFFFFFLL -#define ULLONG_MAX 0xFFFFFFFFFFFFFFFFULL - -#ifdef __cplusplus -} +#include +#include namespace std { template @@ -119,5 +88,5 @@ public: #endif } // namespace std -#endif + #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h index 2ea0a31a6a..4eac9e7a1b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/FILE_POS.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_FILE_POS_H #define _MSL_COMMON_FILE_POS_H -#include "ansi_files.h" +#include #ifdef __cplusplus extern "C" { @@ -15,4 +15,4 @@ long ftell(FILE* file); } #endif -#endif /* _MSL_COMMON_FILE_POS_H */ \ No newline at end of file +#endif /* _MSL_COMMON_FILE_POS_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h index 7a6673a312..1207adcd07 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/alloc.h @@ -1,7 +1,6 @@ #ifndef _MSL_COMMON_ALLOC_H #define _MSL_COMMON_ALLOC_H - #ifdef __cplusplus extern "C" { #endif @@ -12,4 +11,4 @@ void free(void* ptr); } #endif -#endif /* _MSL_COMMON_ALLOC_H */ \ No newline at end of file +#endif /* _MSL_COMMON_ALLOC_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h index 6e399f5365..6ad791a935 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_ANSI_FILES_H #define _MSL_COMMON_ANSI_FILES_H -#include "stddef.h" +#include #ifdef __cplusplus extern "C" { @@ -13,9 +13,6 @@ extern "C" { typedef unsigned long __file_handle; typedef unsigned long fpos_t; -#ifndef __cplusplus -typedef unsigned short wchar_t; -#endif #define set_error(file) \ do { \ @@ -126,4 +123,4 @@ void __close_all(void); }; #endif -#endif /* _MSL_COMMON_ANSI_FILES_H */ \ No newline at end of file +#endif /* _MSL_COMMON_ANSI_FILES_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h index 1c04922944..8c781b46b5 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_fp.h @@ -1,7 +1,6 @@ #ifndef _MSL_COMMON_ANSI_FP_H #define _MSL_COMMON_ANSI_FP_H - #define SIGDIGLEN 36 typedef struct decimal { @@ -21,15 +20,4 @@ typedef struct decform { short digits; } decform; -/* void __ull2dec(decimal*, u64); -void __timesdec(decimal*, const decimal*, const decimal*); -void __str2dec(decimal*, const char*, short); -void __two_exp(decimal*, s32); -BOOL __equals_dec(const decimal*, const decimal*); -BOOL __less_dec(const decimal*, const decimal*); -void __minus_dec(decimal*, const decimal*, const decimal*); -void __num2dec_internal(decimal*, f64); -void __num2dec(const decform*, f64, decimal*); -f64 __dec2num(const decimal*); */ - -#endif \ No newline at end of file +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h index a764ac297f..eabc120a1c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h @@ -1,11 +1,11 @@ #ifndef _MSL_COMMON_BUFFER_IO_H #define _MSL_COMMON_BUFFER_IO_H -#include "ansi_files.h" +#include enum { __align_buffer, __dont_align_buffer }; void __prep_buffer(FILE* file); int __flush_buffer(FILE* file, size_t* bytes_flushed); -#endif /* _MSL_COMMON_BUFFER_IO_H */ \ No newline at end of file +#endif /* _MSL_COMMON_BUFFER_IO_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h index 5ac7be5cca..e495416680 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/char_io.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_CHAR_IO_H #define _MSL_COMMON_CHAR_IO_H -#include "ansi_files.h" +#include #ifdef __cplusplus extern "C" { @@ -14,4 +14,4 @@ int __put_char(int c, FILE* stream); } #endif -#endif /* _MSL_COMMON_CHAR_IO_H */ \ No newline at end of file +#endif /* _MSL_COMMON_CHAR_IO_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h new file mode 100644 index 0000000000..bae336179e --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h @@ -0,0 +1,37 @@ +#ifndef _MSL_CLIMITS_H +#define _MSL_CLIMITS_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define CHAR_BIT 8 + +#define SCHAR_MIN (-0x7F - 1) +#define SCHAR_MAX 0x7F +#define UCHAR_MAX 0xFF + +#define CHAR_MIN 0 +#define CHAR_MAX SCHAR_MAX + +#define SHRT_MIN (-0x7FFF - 1) +#define SHRT_MAX 0x7FFF +#define USHRT_MAX 0xFFFF + +#define INT_MIN (-0x7FFFFFFF - 1) +#define INT_MAX 0x7FFFFFFF +#define UINT_MAX 0xFFFFFFFF + +#define LONG_MIN (-0x7FFFFFFFL - 1) +#define LONG_MAX 0x7FFFFFFFL +#define ULONG_MAX 0xFFFFFFFFUL + +#define LLONG_MIN (-0x7FFFFFFFFFFFFFFFLL - 1) +#define LLONG_MAX 0x7FFFFFFFFFFFFFFFLL +#define ULLONG_MAX 0xFFFFFFFFFFFFFFFFULL + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h index 419e57fec5..ad501c896f 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h @@ -1,60 +1,126 @@ -#ifndef STD_CMATH_H_ -#define STD_CMATH_H_ +#ifndef MSL_CMATH_H_ +#define MSL_CMATH_H_ -namespace std { -template -inline double fabs(T x) { - return ::fabs(x); +#include + +#define NAN (*(float*) __float_nan) +#define HUGE_VALF (*(float*) __float_huge) + +#define M_PI 3.14159265358979323846f +#define M_SQRT3 1.73205f + +#define DEG_TO_RAD(degrees) (degrees * (M_PI / 180.0f)) +#define RAD_TO_DEG(radians) (radians * (180.0f / M_PI)) + +#ifdef __cplusplus +extern "C" { +#endif + +extern double __frsqrte(double); +extern float __fres(float); +extern double __fabs(double); +extern float __fabsf(float); + +int abs(int); +double acos(double); +float acosf(float); +double asin(double); +double atan(double); +double atan2(double, double); +double ceil(double); +double copysign(double, double); +double cos(double); +float cosf(float); +double exp(double); +double floor(double); +double fmod(double, double); +double frexp(double, int*); +double ldexp(double, int); +double modf(double, double*); +double pow(double, double); +float powf(float, float); +double sin(double); +float sinf(float); +double sqrt(double); +double tan(double); +float tanf(float); + +inline float expf(float x) { + return exp(x); } -inline float fabs(float num) { - return ::fabsf(num); +inline float ceilf(float num) { + return ceil(num); } -inline float fabsf(float num) { - return ::fabsf(num); +inline double fabs(double f) { + return __fabs(f); } -inline float sqrt(float x) { - return ::sqrtf(x); +inline float fabsf(float f) { + return (float)fabs((double)f); } -inline float abs(float x) { - return ::fabsf(x); +inline float floorf(float num) { + return floor(num); } -inline float fmod(float x, float y) { - return ::fmod(x, y); +inline float fmodf(float f1, float f2) { + return fmod(f1, f2); } -inline float ceil(float num) { - return ::ceilf(num); +#include "global.h" +#if PLATFORM_WII || PLATFORM_SHIELD +inline float sqrtf(float mag) { + return sqrt(mag); +} +#else +#ifdef DECOMPCTX +// Hack to mitigate fake mismatches when building from decompctx output +// (which doesn't support precompiled headers). +// +// When built without a PCH, these constants would end up .rodata instead of .data +// which causes a variety of knock-on effects in individual functions' assembly. +// +// Making them into globals is a bit of a hack, but it generally fixes later +// .data and .rodata offsets and allows individual functions to match. +static double _half = 0.5; +static double _three = 3.0; +#endif +inline float sqrtf(float mag) { +#ifndef DECOMPCTX + // part of the same hack, these are defined outside of the function when using decompctx + static const double _half = 0.5; + static const double _three = 3.0; +#endif + if (mag > 0.0f) { + double dmag = (double)mag; + double tmpd = __frsqrte(dmag); + tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); + tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); + tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); + return (float)(dmag * tmpd); + } else if (mag < 0.0) { + return NAN; + } else if (isnan(mag)) { + return NAN; + } else { + return mag; + } +} +#endif + +inline float atan2f(float y, float x) { + return (float)atan2(y, x); } -inline float floor(float num) { - return ::floorf(num); -} +inline float sinf(float x) { return sin(x); } +inline float cosf(float x) { return cos(x); } +inline float tanf(float x) { return tan(x); } +inline float acosf(float x) { return acos(x); } -inline float tan(float num) { - return ::i_tanf(num); -} - -inline float tanf(float num) { - return ::i_tanf(num); -} - -inline float acos(float num) { - return ::acosf(num); -} - -inline float pow(float x, float y) { - return ::pow(x, y); -} - -inline float pow(float x, int y) { - // FIXME: Needs to use powf - return ::pow(x, y); -} -} // namespace std +#ifdef __cplusplus +}; +#endif #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h new file mode 100644 index 0000000000..5f54f9a6f9 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h @@ -0,0 +1,6 @@ +#ifndef _MSL_CSTDARG_H_ +#define _MSL_CSTDARG_H_ + +#include + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h new file mode 100644 index 0000000000..cd142bcf60 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h @@ -0,0 +1,25 @@ +#ifndef _MSL_CSTDDEF_H_ +#define _MSL_CSTDDEF_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define offsetof(type, member) ((size_t)&(((type*)0)->member)) + +#ifndef NULL +#define NULL 0 +#endif + +typedef unsigned long size_t; +typedef long ptrdiff_t; + +#ifndef __cplusplus +typedef unsigned short wchar_t; +#endif + +#ifdef __cplusplus +}; +#endif + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h new file mode 100644 index 0000000000..2a966f076a --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h @@ -0,0 +1,16 @@ +#ifndef MSL_CSTDIO_H_ +#define MSL_CSTDIO_H_ + +#include +#include +#include +#include +#include +#include +#include + +#define stdin (&__files._stdin) +#define stdout (&__files._stdout) +#define stderr (&__files._stderr) + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h new file mode 100644 index 0000000000..ae12232293 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h @@ -0,0 +1,8 @@ +#ifndef MSL_CSTDLIB_H_ +#define MSL_CSTDLIB_H_ + +#include +#include +#include + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h index 39088020e5..2290c183cb 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h @@ -1,23 +1,31 @@ -#ifndef STD_CSTRING_H_ -#define STD_CSTRING_H_ +#ifndef _MSL_CSTRING_H +#define _MSL_CSTRING_H -#include "string.h" - -namespace std { -using ::strlen; -using ::strcpy; -using ::wcslen; -using ::strncpy; -using ::strcmp; -using ::strncmp; -using ::strcat; - -using ::memset; -using ::memcpy; - -inline char* strchr(char* str, int c) { - return ::strchr(str, c); -} -}; // namespace std +#include +#include +#include +#ifdef __cplusplus +extern "C" { #endif + +void* memcpy(void* dst, const void* src, size_t n); +void* memset(void* dst, int val, size_t n); +int memcmp(const void* lhs, const void* rhs, size_t count); +void* __memrchr(const void* ptr, int ch, size_t count); +void* memchr(const void* ptr, int ch, size_t count); +void* memmove(void* dst, const void* src, size_t n); +char* strrchr(const char* str, int c); +char* strchr(const char* str, int c); +int strncmp(const char* str1, const char* str2, size_t n); +int strcmp(const char* str1, const char* str2); +char* strcat(char* dst, const char* src); +char* strncpy(char* dst, const char* src, size_t n); +char* strcpy(char* dst, const char* src); +size_t strlen(const char* str); + +#ifdef __cplusplus +}; +#endif + +#endif /* _MSL_COMMON_STRING_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h index 2f293cbaff..c7f5a1b12e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/direct_io.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_DIRECT_IO_H #define _MSL_COMMON_DIRECT_IO_H -#include "ansi_files.h" +#include #ifdef __cplusplus extern "C" { @@ -14,4 +14,4 @@ size_t fwrite(const void* buffer, size_t size, size_t count, FILE* stream); } #endif -#endif /* _MSL_COMMON_DIRECT_IO_H */ \ No newline at end of file +#endif /* _MSL_COMMON_DIRECT_IO_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h index e6417f07b1..7adcede674 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h @@ -1,15 +1,18 @@ #ifndef _MSL_COMMON_EXTRAS_H #define _MSL_COMMON_EXTRAS_H +#include + #ifdef __cplusplus extern "C" { #endif int strnicmp(const char* str1, const char* str2, int n); int stricmp(const char* str1, const char* str2); +size_t wcslen(const wchar_t* s); #ifdef __cplusplus } #endif -#endif /* _MSL_COMMON_EXTRAS_H */ \ No newline at end of file +#endif /* _MSL_COMMON_EXTRAS_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h index a71bc4232b..34cd0ce33a 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/file_io.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_FILE_IO_H #define _MSL_COMMON_FILE_IO_H -#include "ansi_files.h" +#include #ifdef __cplusplus extern "C" { @@ -15,4 +15,4 @@ int fclose(FILE* file); } #endif -#endif /* _MSL_COMMON_FILE_IO_H */ \ No newline at end of file +#endif /* _MSL_COMMON_FILE_IO_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h index 418b52a88e..ad2e24f96d 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_FLOAT_H #define _MSL_COMMON_FLOAT_H -#include "fdlibm.h" +#include #define FP_SNAN 0 #define FP_QNAN 1 diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h index dcfd960ab2..ad27789b8b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h @@ -1,130 +1,62 @@ #ifndef MSL_MATH_H_ #define MSL_MATH_H_ -#include "global.h" -#include "float.h" +#include -#define NAN (*(float*) __float_nan) -#define HUGE_VALF (*(float*) __float_huge) - -#define M_PI 3.14159265358979323846f -#define M_SQRT3 1.73205f - -#define DEG_TO_RAD(degrees) (degrees * (M_PI / 180.0f)) -#define RAD_TO_DEG(radians) (radians * (180.0f / M_PI)) - -#ifdef __cplusplus -extern "C" { -#endif - -int abs(int); -double acos(double); -float acosf(float); -double asin(double); -double atan(double); -double atan2(double, double); - -double ceil(double); -inline float ceilf(float num) { - return ceil(num); +namespace std { +template +inline double fabs(T x) { + return ::fabs(x); } -double copysign(double, double); -double cos(double); -float cosf(float); -double exp(double); - -inline float expf(float x) { - return exp(x); +inline float fabs(float num) { + return ::fabsf(num); } -extern double __frsqrte(double); -extern float __fres(float); - -extern double __fabs(double); -extern float __fabsf(float); -inline double fabs(double f) { - return __fabs(f); -} -inline double fabsf2(float f) { - return __fabsf(f); -} -inline float fabsf(float f) { - return fabsf2(f); +inline float fabsf(float num) { + return ::fabsf(num); } -double floor(double); -inline float floorf(float num) { - return floor(num); +inline float sqrt(float x) { + return ::sqrtf(x); } -double fmod(double, double); -inline float fmodf(float f1, float f2) { - return fmod(f1, f2); +inline float abs(float x) { + return ::fabsf(x); } -double frexp(double, int*); -double ldexp(double, int); -double modf(double, double*); -double pow(double, double); -float powf(float, float); -double sin(double); -float sinf(float); -double sqrt(double); -double tan(double); -float tanf(float); - -#if PLATFORM_WII || PLATFORM_SHIELD -inline float sqrtf(float mag) { - return sqrt(mag); -} -#else -#ifdef DECOMPCTX -// Hack to mitigate fake mismatches when building from decompctx output -// (which doesn't support precompiled headers). -// -// When built without a PCH, these constants would end up .rodata instead of .data -// which causes a variety of knock-on effects in individual functions' assembly. -// -// Making them into globals is a bit of a hack, but it generally fixes later -// .data and .rodata offsets and allows individual functions to match. -static double _half = 0.5; -static double _three = 3.0; -#endif -inline float sqrtf(float mag) { -#ifndef DECOMPCTX - // part of the same hack, these are defined outside of the function when using decompctx - static const double _half = 0.5; - static const double _three = 3.0; -#endif - if (mag > 0.0f) { - double dmag = (double)mag; - double tmpd = __frsqrte(dmag); - tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); - tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); - tmpd = _half * tmpd * (_three - tmpd * tmpd * dmag); - return (float)(dmag * tmpd); - } else if (mag < 0.0) { - return NAN; - } else if (isnan(mag)) { - return NAN; - } else { - return mag; - } -} -#endif - -inline float atan2f(float y, float x) { - return (float)atan2(y, x); +inline float fmod(float x, float y) { + return ::fmod(x, y); } -inline float i_sinf(float x) { return sin(x); } -inline float i_cosf(float x) { return cos(x); } -inline float i_tanf(float x) { return tan(x); } -inline float i_acosf(float x) { return acos(x); } +inline float ceil(float num) { + return ::ceilf(num); +} -#ifdef __cplusplus -}; -#endif +inline float floor(float num) { + return ::floorf(num); +} + +inline float tan(float num) { + return ::tanf(num); +} + +inline float tanf(float num) { + return ::tanf(num); +} + +inline float acos(float num) { + return ::acosf(num); +} + +inline float pow(float x, float y) { + return ::pow(x, y); +} + +inline float pow(float x, int y) { + // FIXME: Needs to use powf + return ::pow(x, y); +} +} // namespace std #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h index d999b6ea1f..8b0a236ec0 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_MBSTRING_H #define _MSL_COMMON_MBSTRING_H -#include "wchar_io.h" +#include #ifdef __cplusplus extern "C" { @@ -13,4 +13,4 @@ size_t wcstombs(char* dst, const wchar_t* src, size_t n); } #endif -#endif /* _MSL_COMMON_MBSTRING_H */ \ No newline at end of file +#endif /* _MSL_COMMON_MBSTRING_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h index d9ee49d96c..94f32a9e35 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_MEM_FUNCS_H #define _MSL_COMMON_MEM_FUNCS_H -#include "stddef.h" +#include #ifdef __cplusplus extern "C" { @@ -16,4 +16,4 @@ void __copy_longs_aligned(void* dst, const void* src, size_t n); } #endif -#endif /* _MSL_COMMON_MEM_FUNCS_H */ \ No newline at end of file +#endif /* _MSL_COMMON_MEM_FUNCS_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h index 0e2bb9673b..9c76f61882 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h @@ -1,8 +1,8 @@ #ifndef _MSL_COMMON_PRINTF_H #define _MSL_COMMON_PRINTF_H -#include "ansi_files.h" -#include "__va_arg.h" +#include +#include #ifdef __cplusplus extern "C" { @@ -18,13 +18,6 @@ int vprintf(const char* format, va_list arg); int vswprintf(wchar_t* s, size_t n, const wchar_t* format, va_list arg); -#if defined(__cplusplus) -namespace std { - extern "C" { using ::vsnprintf; } - extern "C" { using ::vswprintf; } -} -#endif - #ifdef __cplusplus } #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h index 53543a129a..434386eb91 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/scanf.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_SCANF_H #define _MSL_COMMON_SCANF_H -#include "ansi_files.h" +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h new file mode 100644 index 0000000000..849ca8be5a --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h @@ -0,0 +1,18 @@ +#ifndef _MSL_STDARG_H_ +#define _MSL_STDARG_H_ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +namespace std { + using ::va_list; +} + +#ifdef __cplusplus +}; +#endif + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h index 7a3e963fcc..69fc7cf83f 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h @@ -1,23 +1,16 @@ -#ifndef _STDDEF_H_ -#define _STDDEF_H_ +#ifndef _MSL_STDDEF_H_ +#define _MSL_STDDEF_H_ + +#include #ifdef __cplusplus extern "C" { #endif -#if defined __INTELLISENSE__ -typedef unsigned int size_t; -typedef int ptrdiff_t; -#else -typedef unsigned long size_t; -typedef long ptrdiff_t; -#endif - -#define offsetof(type, member) ((size_t)&(((type*)0)->member)) - -#ifndef NULL -#define NULL (0) -#endif +namespace std { + using ::ptrdiff_t; + using ::size_t; +} #ifdef __cplusplus }; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h index d6d4016944..950bead4cc 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h @@ -1,14 +1,30 @@ #ifndef MSL_STDIO_H_ #define MSL_STDIO_H_ -#include "char_io.h" -#include "file_io.h" -#include "printf.h" -#include "extras.h" -#include "scanf.h" +#include +#include +#include -#define stdin (&__files._stdin) -#define stdout (&__files._stdout) -#define stderr (&__files._stderr) +#ifdef __cplusplus +extern "C" { +#endif + +namespace std { + using ::fputs; + using ::fflush; + using ::fclose; + using ::fprintf; + using ::printf; + using ::sprintf; + using ::snprintf; + using ::vsnprintf; + using ::vprintf; + using ::vswprintf; + using ::sscanf; +} + +#ifdef __cplusplus +}; +#endif #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h index a96b8f1799..409d5598f8 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h @@ -1,8 +1,24 @@ -#ifndef MSL_STDLIB_H_ -#define MSL_STDLIB_H_ +#ifndef _MSL_STDLIB_H_ +#define _MSL_STDLIB_H_ -#include "abort_exit.h" -#include "arith.h" -#include "strtoul.h" +#include -#endif \ No newline at end of file +#ifdef __cplusplus +extern "C" { +#endif + +namespace std { + using ::strtol; + using ::strtoul; + using ::div; + using ::exit; + using ::abort; + using ::atoi; + using ::atof; +} + +#ifdef __cplusplus +}; +#endif + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h index 311cd44fb2..e478d7e8eb 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h @@ -1,32 +1,30 @@ -#ifndef _MSL_COMMON_STRING_H -#define _MSL_COMMON_STRING_H +#ifndef MSL_STRING_H_ +#define MSL_STRING_H_ -#include "stddef.h" -#include "ansi_files.h" +#include + +namespace std { +using ::memcpy; +using ::memset; +using ::memcmp; +using ::memchr; +using ::memmove; + +using ::strrchr; +using ::strlen; +using ::strncmp; +using ::strcmp; +using ::strcat; +using ::strncpy; +using ::strcpy; + +using ::strnicmp; +using ::stricmp; +using ::wcslen; + +inline char* strchr(char* str, int c) { + return ::strchr(str, c); +} +}; // namespace std -#ifdef __cplusplus -extern "C" { #endif - -void* memcpy(void* dst, const void* src, size_t n); -void* memset(void* dst, int val, size_t n); -int memcmp(const void* lhs, const void* rhs, size_t count); -void* __memrchr(const void* ptr, int ch, size_t count); -void* memchr(const void* ptr, int ch, size_t count); -void* memmove(void* dst, const void* src, size_t n); -char* strrchr(const char* str, int c); -char* strchr(const char* str, int c); -int strncmp(const char* str1, const char* str2, size_t n); -int strcmp(const char* str1, const char* str2); -char* strcat(char* dst, const char* src); -char* strncpy(char* dst, const char* src, size_t n); -char* strcpy(char* dst, const char* src); -size_t strlen(const char* str); - -size_t wcslen(const wchar_t* s); - -#ifdef __cplusplus -}; -#endif - -#endif /* _MSL_COMMON_STRING_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h index e504b9552e..7d637f763b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h @@ -9,9 +9,11 @@ long strtol(const char* str, char** end, int base); unsigned long strtoul(const char* str, char** end, int base); unsigned long __strtoul(int base, int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned, int* negative, int* overflow); +int atoi(const char* str); +float atof(const char* str); #ifdef __cplusplus } #endif -#endif /* _MSL_COMMON_STRTOUL_H */ \ No newline at end of file +#endif /* _MSL_COMMON_STRTOUL_H */ diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list.h similarity index 87% rename from src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list.h index 4867f2d25a..04a8cfe7fc 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/__va_arg.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list.h @@ -1,5 +1,5 @@ -#ifndef __VA_ARG_H -#define __VA_ARG_H +#ifndef MSL_VA_LIST_H +#define MSL_VA_LIST_H #ifdef __cplusplus extern "C" { @@ -35,10 +35,6 @@ void* __va_arg(_va_list_struct*, int); #define __va_copy(a, b) (*(a) = *(b)) -#if defined(__cplusplus) -namespace std { extern "C" { using ::va_list; } } -#endif - #ifdef __cplusplus } #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h index 999db81171..a8437db767 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wchar_io.h @@ -1,12 +1,8 @@ #ifndef _MSL_COMMON_WCHAR_IO_H #define _MSL_COMMON_WCHAR_IO_H -#include "ansi_files.h" - -#ifndef __cplusplus -typedef unsigned short wchar_t; -#endif +#include int fwide(FILE* file, int mode); -#endif /* _MSL_COMMON_WCHAR_IO_H */ \ No newline at end of file +#endif /* _MSL_COMMON_WCHAR_IO_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c index 3c49dff88d..230f504a6f 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c @@ -1,6 +1,6 @@ #include "abort_exit.h" #include "critical_regions.h" -#include "stddef.h" +#include "cstddef.h" extern void (*_dtors[])(void); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c index 3ed7a41667..c06fb26075 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c @@ -1,6 +1,6 @@ #include "alloc.h" #include "critical_regions.h" -#include +#include typedef struct Block { struct Block* prev; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c index 83e6ef90e4..d4daab1605 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c @@ -1,5 +1,5 @@ #include "mbstring.h" -#include "string.h" +#include "cstring.h" inline static int unicode_to_UTF8(char* s, wchar_t wchar) { int number_of_bytes; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c index 2676978173..07f69f33b4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c @@ -1,4 +1,4 @@ -#include "string.h" +#include "cstring.h" void* memmove(void* dst, const void* src, size_t n) { unsigned char* csrc; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c index 183eb71775..a737596dd9 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c @@ -3,8 +3,8 @@ #include "critical_regions.h" #include "ctype.h" #include "scanf.h" -#include "stdio.h" -#include "string.h" +#include "cstdio.h" +#include "cstring.h" #include "wchar_io.h" #define TARGET_FLOAT_BITS 64 diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c index 1025b855fa..ccfd0550c0 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c @@ -1,4 +1,4 @@ -#include "string.h" +#include "cstring.h" #define K1 0x80808080 #define K2 0xFEFEFEFF diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c index 212dc341d1..cfc907320c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c @@ -1,7 +1,7 @@ #include "strtoul.h" #include "ctype.h" #include "errno.h" -#include "limits.h" +#include "climits.h" #include "scanf.h" enum scan_states { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c index d246b33d12..7e970a81d0 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c @@ -34,7 +34,7 @@ * Function needed: sqrt */ -#include "math.h" +#include "cmath.h" #ifdef __STDC__ static const double @@ -101,4 +101,4 @@ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ w = r*s+c; return 2.0*(df+w); } -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c index 3e73711aff..4058af145d 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c @@ -40,7 +40,7 @@ * */ -#include "math.h" +#include "cmath.h" #ifdef __STDC__ static const double @@ -112,4 +112,4 @@ double __ieee754_asin(x) double x; return t; else return -t; -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c index fb139480c6..59b8ffe201 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c @@ -112,7 +112,7 @@ #include "types.h" #include "errno.h" -#include "math.h" +#include "cmath.h" #ifndef _DOUBLE_IS_32BITS @@ -404,4 +404,4 @@ double __ieee754_pow(x, y) double x, y; #endif /* defined(_DOUBLE_IS_32BITS) */ -// EOF e_pow.c \ No newline at end of file +// EOF e_pow.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c index b179a8ee66..7902352ff5 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c @@ -17,7 +17,7 @@ * use __kernel_rem_pio2() */ -#include "math.h" +#include "cmath.h" /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi @@ -176,4 +176,4 @@ int __ieee754_rem_pio2(x, y) double x, y[]; return -n; } return n; -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c index 162bd7c284..b3db70acde 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c @@ -81,7 +81,7 @@ */ #include "errno.h" -#include "math.h" +#include "cmath.h" #ifdef __STDC__ static const double one = 1.0, tiny = 1.0e-300; @@ -458,4 +458,4 @@ B. sqrt(x) by Reciproot Iteration (4) Special cases (see (4) of Section A). - */ \ No newline at end of file + */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c index e90d19fde1..c7eb4edc5d 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c @@ -99,7 +99,7 @@ * = 1 - 2*(tan(y) - (tan(y)^2)/(1+tan(y))) */ -#include "math.h" +#include "cmath.h" static const double one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ pio4 = 7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */ pio4lo = 3.06161699786838301793e-17, /* 0x3C81A626, 0x33145C07 */ @@ -177,4 +177,4 @@ double __kernel_tan(double x, double y, int iy) } } -// EOF k_tan.c \ No newline at end of file +// EOF k_tan.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c index fb238872dd..de906d1ef4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c @@ -11,7 +11,7 @@ * ==================================================== */ -#include "math.h" /* for isfinite macro */ +#include "cmath.h" /* for isfinite macro */ static const double two54 @@ -55,4 +55,4 @@ double ldexp(double x, int n) k += 54; /* subnormal result */ __HI(x) = (hx & 0x800fffff) | (k << 20); return x * twom54; -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c index 85120d1a0b..2e1e641266 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c @@ -1,6 +1,6 @@ #include "ansi_fp.h" #include "ansi_fp.h" -#include "limits.h" +#include "climits.h" #include "float.h" static int __count_trailing_zerol(unsigned long x) { diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h b/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h index 7ec6b8f736..36b6f440dd 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h +++ b/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h @@ -1,7 +1,7 @@ #ifndef MWCPLUSLIB_H #define MWCPLUSLIB_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c index 5db5c5d080..badb510ee8 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c +++ b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c @@ -1,5 +1,5 @@ -#include "__va_arg.h" -#include +#include +#include #undef __va_arg diff --git a/src/SSystem/SComponent/c_math.cpp b/src/SSystem/SComponent/c_math.cpp index 38d6cbdff1..49866b3684 100644 --- a/src/SSystem/SComponent/c_math.cpp +++ b/src/SSystem/SComponent/c_math.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_m3d.h" -#include +#include s16 cM_rad2s(f32 rad) { s32 s = (std::fmod(rad, 2 * M_PI) * (0x8000 / M_PI)); diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c index 63fc445363..6bb12f9928 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c @@ -4,7 +4,6 @@ #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include #include "global.h" -#include "__ar.h" extern u32 _db_stack_addr; diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c index cc0f89a25d..094ec4c2bd 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c @@ -2,7 +2,7 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include "trk.h" -#include +#include static BOOL IsTRKConnected; diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c index bef5bf5a7e..1afc4a68cc 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c @@ -1,7 +1,7 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/support.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h" -#include +#include DSError TRKSuppAccessFile(u32 file_handle, u8* data, size_t* count, DSIOResult* io_result, BOOL need_reply, BOOL read) { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c index 5c7afeaced..76fef30a46 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c @@ -1,7 +1,7 @@ #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include -#include +#include typedef struct memRange { u8* start; diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 45927b3f49..7e6762e02d 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -16,7 +16,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -#include "cmath.h" +#include enum B_bq_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index a6dcbf5e42..69eda8177a 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_tn.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_nbomb.h" diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index f8092cfa85..7d0516f467 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -17,7 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" -#include +#include enum Joint { /* 0x00 */ JNT_CENTER, diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index 21c814b1f9..426984d84b 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" -#include +#include int daB_ZANTM_c::draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 4bec7cbca0..16c0160a35 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -11,7 +11,7 @@ #include "d/d_cc_uty.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" -#include +#include namespace { dCcD_SrcSph cc_zant_src = { diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 49727d8cab..6b16768d0d 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_bg_obj.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" -#include "stdio.h" +#include #include "dolphin/os.h" #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index e27eb54b09..0290422504 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include +#include #define ACTION_MODE_WAIT 0 #define ACTION_MODE_CHASE 1 diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index a18ca69d99..d9e95a80b7 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" #include "d/d_bomb.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" class daE_SW_HIO_c { diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 141c8ee117..11c74e8cfc 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -9,7 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -#include "cmath.h" +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 8708d5c321..ac4e851412 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_e_ws.h" #include "d/actor/d_a_obj_carry.h" -#include +#include #include "f_op/f_op_actor_enemy.h" class daE_WS_HIO_c : public JORReflexible { diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index a2db2014fa..a01a3f1981 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_camera_mng.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" struct daE_YMB_HIO_c { diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index ffca6690cd..73c2af65eb 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -17,7 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" -#include +#include #define ANM_HS_BACK_WALK 6 #define ANM_HS_WALK_START 7 diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index d6068ff672..501c036429 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_msg_object.h" -#include +#include #include "d/actor/d_a_balloon_2D.h" #include "d/actor/d_a_e_ym.h" diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 24c177007b..4d0b3c64a3 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -22,7 +22,7 @@ #include "c/c_damagereaction.h" #include "SSystem/SComponent/c_counter.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include class dmg_rod_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 18011da632..4c4787c8b3 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -322,7 +322,7 @@ void dMirror_packet_c::mainDraw() { } f32 aspect = view->aspect; - f32 temp_f0_2 = i_tanf(MTXDegToRad(view->fovy * 0.5f)); + f32 temp_f0_2 = tanf(MTXDegToRad(view->fovy * 0.5f)); view_port_class* view_port = dComIfGd_getViewport(); f32 var_f3; diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 61212d3c96..846cc6b1a1 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -11,7 +11,7 @@ #include "SSystem/SComponent/c_m3d_g_pla.h" #include "Z2AudioLib/Z2Instances.h" #include "c/c_damagereaction.h" -#include "cmath.h" +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_mg_fshop.h" diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index b6118f3af3..58b3433774 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" -#include +#include void daObjBhbridge_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 param_4) { cLib_addCalcAngleS(¶m_1, param_3 * (param_2 / param_4), 1, 0x100, 1); diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index b26e2d48dc..02dd9b8d92 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" -#include +#include #include "d/d_com_inf_game.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_obj_swBallA.h" diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 06d96b3b45..0717bc4942 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -12,7 +12,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -#include "cmath.h" +#include void daObjCwall_c::initBaseMtx() { mWallModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 318780b5e3..1fa9f10c73 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_digsnow.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include +#include void daObjDigSnow_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index e317b9cdfc..bf88385049 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_drop.h" #include "SSystem/SComponent/c_math.h" -#include "cmath.h" +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index 086487c869..36b2da6d0e 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -1,7 +1,7 @@ #include "d/actor/d_a_obj_gra2.h" #include "d/d_camera.h" #include "d/actor/d_a_tag_gra.h" -#include +#include f32 daObj_GrA_c::getSrchCircleR() { f32 srchCircleR; diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 3e390e98d4..e3839c5c1b 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" #include "d/d_s_play.h" -#include +#include f32 dummyLiteral() { return 0.0f; diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index da3c4778b5..326bb0b7c8 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -12,7 +12,7 @@ #include "d/d_s_play.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" -#include +#include class daOBJ_ICE_S_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index e4ab3ac050..1a72f1b34b 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_npc_tk.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include #define PARTS_ALL 0x3FFFF #define PART_TOP_LEFT_UNDER (1 << 0) diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index a4cc3b7526..e039ff3417 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -95,7 +95,7 @@ void daObjLv4Chan_c::setMtxChain(daObjLv4Chan_c::ChainPos* i_chains, dMdl_obj_c* f32 dVar10 = VECDotProduct(&cStack_7c, &::cXyz::BaseZ); if (!cM3d_IsZero(cStack_88.getSquareMag()) && -1.0f <= dVar10 && dVar10 <= 1.0f) { cStack_88.normalize(); - f32 fVar11 = i_acosf(dVar10); + f32 fVar11 = acosf(dVar10); i_chains[i].field_0x24 = fVar11 - M_PI / 2; MTXRotAxisRad(afStack_70, &cStack_88, fVar11); } else { @@ -133,7 +133,7 @@ void daObjLv4Chan_c::setMtx() { f32 dVar9 = VECDotProduct(&local_78, &::cXyz::BaseY); if (!cM3d_IsZero(cStack_84.getSquareMag()) && -1.0f <= dVar9 && dVar9 <= 1.0f) { cStack_84.normalize(); - MTXRotAxisRad(afStack_68, &cStack_84, i_acosf(dVar9)); + MTXRotAxisRad(afStack_68, &cStack_84, acosf(dVar9)); local_78 *= -150.0f; } else { MTXIdentity(afStack_68); diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index e846622e57..1680da93f4 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_item.h" -#include +#include void daObjL4DigSand_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index 2938cbf4b7..e3a21183b5 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" -#include "cmath.h" +#include #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index ba531cd92f..e177c63278 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_cc_d.h" #include "d/d_item_data.h" -#include "cmath.h" +#include const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 54038f2b6e..36ff9973b6 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "global.h" #include "SSystem/SComponent/c_math.h" -#include "cmath.h" +#include const static int l_bmdIdx[2] = {3, 3}; diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 832b274748..024ed40ce3 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -11,7 +11,7 @@ #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -#include "cmath.h" +#include static u32 const l_bmd[2] = { 4, 4, diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index aa9a5e0822..b3d1627306 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -10,7 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_kankyo_mng.h" -#include +#include static daWdStick_HIO_c l_HIO; diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index f9456a4c25..e13945e7ae 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_set_bgobj.h" -#include "stdio.h" +#include #include "f_op/f_op_actor_mng.h" static const char l_specName[] = "spec.dat"; diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index 20cc72700e..ca33e67b0c 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -1,7 +1,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_camera.h" -#include "cmath.h" +#include #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_horse.h" diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index 0aa8b7fdd0..f66cdb59e2 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_chkpoint.h" -#include +#include #include "d/actor/d_a_player.h" int daTag_Chk_c::execute() { diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index cafd66d876..02838ccdac 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_firewall.h" -#include "cmath.h" +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_bomb.h" diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 1309de896b..0ada92d5d8 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_sppath.h" #include "d/actor/d_a_player.h" -#include "math.h" +#include static dCcD_SrcCyl l_cylSrc = { { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index fcbdbd8c25..faed410404 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_camera_mng.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include static const f32 l_cull_size_box[6] = { -150.0f, -10.0f, -150.0f, 150.0f, 300.0f, 100.0f }; diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index b41b5a4d87..91e9884f24 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -6,7 +6,7 @@ #include "d/d_bg_s_cap_poly.h" #include -#include +#include #include "SSystem/SComponent/c_bg_s_shdw_draw.h" #include "SSystem/SComponent/c_m2d.h" diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 0b4a9ba890..b6ca10750e 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -3,7 +3,7 @@ #include "d/d_camera.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" -#include "cmath.h" +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_horse.h" @@ -21,7 +21,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#include "math.h" +#include namespace { @@ -2111,10 +2111,10 @@ f32 dCamera_c::radiusActorInSight(fopAc_ac_c* i_actor1, fopAc_ac_c* i_actor2, cX f32 local_12c = 1.0f; f32 local_130 = 1.0f; if (bVar2 & 5) { - local_12c = i_tanf(fVar7); + local_12c = tanf(fVar7); } if (bVar2 & 0xA) { - local_130 = i_tanf(fVar8); + local_130 = tanf(fVar8); } if (bVar2 & 1) { diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index bd451371c0..2f22a58de1 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -22,7 +22,7 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "stdio.h" +#include void dComIfG_play_c::ct() { mWindowNum = 0; diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 3620b8cf4f..794a663f61 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_tag_magne.h" #include "d/actor/d_a_tag_mist.h" #include "d/actor/d_a_tag_stream.h" -#include "stdio.h" +#include void daSus_c::data_c::set(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3, u8 param_4, u8 i_type) { diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 13302cafd0..5cf7749878 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -5,7 +5,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPicture.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index 90c3110e0d..abe589b4c4 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -13,7 +13,7 @@ #include "d/d_demo.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_counter.h" -#include +#include #if DEBUG static dEvM_HIO_c l_HIO; diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index 97e27fcbe2..c723c99376 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" #include "d/d_pane_class_alpha.h" -#include "stdio.h" +#include dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { mArchive = i_archive; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 47fee86cc8..227a2b54ad 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -24,26 +24,12 @@ #include "f_op/f_op_kankyo.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" - -#if DEBUG -extern "C" int atoi(const char* str); -extern "C" f32 atof(const char* str); -#endif +#include static void GxXFog_set(); struct sub_kankyo__class : public kankyo_class {}; -// setSunpos calls these functions as inlines somehow -// these need to be moved to MSL_C once an appropriate solution is found -inline float sinf(float x) { - return sin(x); -} - -inline float cosf(float x) { - return cos(x); -} - static LightStatus lightStatusBase = { {-36384.5f, 29096.699f, 17422.199f}, {377.0f, 5207.3999f, 1220.4f}, diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 0676ae8ec2..4b740c6652 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -4528,16 +4528,6 @@ void drawCloudShadow(Mtx drawMtx, u8** tex) { } } -// drawVrkumo calls these functions as inlines somehow -// these need to be moved to MSL_C once an appropriate solution is found -inline float sinf(float x) { - return sin(x); -} - -inline float cosf(float x) { - return cos(x); -} - void drawVrkumo(Mtx drawMtx, GXColor& color, u8** tex) { dKankyo_sun_Packet* sun_packet = g_env_light.mpSunPacket; dScnKy_env_light_c* envlight = dKy_getEnvlight(); diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp index 9043a5657e..80278dda50 100644 --- a/src/d/d_menu_dmap_map.cpp +++ b/src/d/d_menu_dmap_map.cpp @@ -4,7 +4,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "d/d_com_inf_game.h" #include "d/d_map_path_dmap.h" #include "d/d_menu_dmap.h" diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 8827242e73..bfe946f726 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -5,7 +5,7 @@ #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include "stdio.h" +#include #include "f_op/f_op_msg_mng.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 11de75c964..6b847ef8ee 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -19,7 +19,7 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "stdio.h" +#include typedef void (dMenu_Insect_c::*initFunc)(); static initFunc map_init_process[] = { diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index edf85dcd11..8ef451074a 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -9,7 +9,7 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTTexture.h" -#include "stdio.h" +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index 86afe871b5..65abead063 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include "stdio.h" +#include #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index d1c1d452cb..48747da384 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -27,7 +27,7 @@ #include "m_Do/m_Do_graphic.h" #include "string.h" -#include "stdio.h" +#include typedef void (dMenu_Ring_c::*initFunc)(); static initFunc stick_init[] = { diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 0c2f0bc332..1faa35b2ed 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -3,7 +3,7 @@ #include "d/d_menu_save.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include "stdio.h" +#include #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index f97608cc18..aed3bf7fe1 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -20,7 +20,7 @@ #include "d/d_msg_class.h" #include "d/d_msg_object.h" #include "d/d_pane_class.h" -#include "cstring.h" +#include "string.h" dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { OS_REPORT("enter dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n"); diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 9f078e0065..42301e6507 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -22,7 +22,7 @@ #include "d/d_meter2.h" #include "d/actor/d_a_midna.h" #include "f_op/f_op_msg_mng.h" -#include "stdio.h" +#include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index 0c6ca29e81..bfd268aab6 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -10,7 +10,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" -#include "cstring.h" +#include "string.h" #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" #include "d/d_msg_object.h" diff --git a/src/d/d_msg_scrn_base.cpp b/src/d/d_msg_scrn_base.cpp index ab1f4484ca..11bbadf7c5 100644 --- a/src/d/d_msg_scrn_base.cpp +++ b/src/d/d_msg_scrn_base.cpp @@ -6,7 +6,7 @@ #include "d/d_msg_object.h" #include "d/d_msg_out_font.h" #include "d/d_pane_class.h" -#include "cstring.h" +#include "string.h" dMsgScrnBase_c::dMsgScrnBase_c() { init(); diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index be5ce1f4a2..8ffd59b5de 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -11,7 +11,7 @@ #include "d/d_msg_string.h" #include "d/d_pane_class.h" #include "m_Do/m_Do_controller_pad.h" -#include "stdio.h" +#include #if VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index 9e641220c8..1b1dfcad4a 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -2,7 +2,7 @@ #include "d/d_msg_unit.h" #include "d/d_com_inf_game.h" -#include "stdio.h" +#include #include "d/d_kankyo.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 81afdfd48a..9dcb14d00a 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -6,7 +6,7 @@ #include "d/d_lib.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_controller_pad.h" -#include "stdio.h" +#include #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index a53af78ae9..bd1c524b8b 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -17,7 +17,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JMath/JMATrigonometric.h" #include "d/d_s_play.h" -#include "stdio.h" +#include #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 0955876024..6f8ef0d3f3 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -19,11 +19,9 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTReport.h" -#include +#include #if DEBUG -extern "C" int atoi(const char* str); - void dScnMenu_setItem(int i_slotNo, u8 i_itemNo); void dScnMenu_setPlayerDebugMode(); void dScnMenu_setPlayerItemReset(); diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 84f8bf1204..46c4ac3b67 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -10,7 +10,7 @@ #include "d/d_s_play.h" #include "d/d_s_room.h" #include "m_Do/m_Do_Reset.h" -#include "stdio.h" +#include static int dScnRoom_Draw(room_of_scene_class* i_this) { return 1; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index bc82bb05d1..f5ecb91470 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -13,7 +13,11 @@ #include "d/d_save.h" #include "d/d_save_init.h" #include "f_op/f_op_scene_mng.h" -#include "stdio.h" +#include + +#if PLATFORM_WII || PLATFORM_SHIELD +#include +#endif #if VERSION == VERSION_SHIELD #include "lingcod/lingcod.h" @@ -967,8 +971,6 @@ void dSv_player_info_c::init() { } } -extern "C" u8 SCGetLanguage(); - void dSv_player_config_c::init() { #if VERSION == VERSION_GCN_JPN unk0 = 0; diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 55f2b24244..d323df4abf 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -17,7 +17,7 @@ #include "f_op/f_op_scene_mng.h" #include "global.h" #include "m_Do/m_Do_Reset.h" -#include "stdio.h" +#include void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe, u8 i_speed) { diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index b0d80c85b8..6b5a96362d 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -5,7 +5,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "SSystem/SComponent/c_math.h" -#include +#include #define RESET_FRAME -99 diff --git a/src/dolphin/G2D/G2D.c b/src/dolphin/G2D/G2D.c index 92302f4ef9..f34c0d4136 100644 --- a/src/dolphin/G2D/G2D.c +++ b/src/dolphin/G2D/G2D.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" static G2DGlob glob; diff --git a/src/dolphin/ar/ar.c b/src/dolphin/ar/ar.c index 5f5d6b1b60..c76acd2e71 100644 --- a/src/dolphin/ar/ar.c +++ b/src/dolphin/ar/ar.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__ar.h" diff --git a/src/dolphin/ax/AXVPB.c b/src/dolphin/ax/AXVPB.c index 6bf7f4ae6e..e8cf663470 100644 --- a/src/dolphin/ax/AXVPB.c +++ b/src/dolphin/ax/AXVPB.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__ax.h" diff --git a/src/dolphin/axart/axartlpf.c b/src/dolphin/axart/axartlpf.c index c2aecfa9f8..107ce3f4ea 100644 --- a/src/dolphin/axart/axartlpf.c +++ b/src/dolphin/axart/axartlpf.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" static u16 __coefs[48] = { 0x6A09, 0x15F6, 0x6871, 0x178E, 0x6463, 0x1B9C, diff --git a/src/dolphin/axfx/reverb_hi.c b/src/dolphin/axfx/reverb_hi.c index 44f8d3c04e..21cb3bfc50 100644 --- a/src/dolphin/axfx/reverb_hi.c +++ b/src/dolphin/axfx/reverb_hi.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__axfx.h" diff --git a/src/dolphin/axfx/reverb_hi_4ch.c b/src/dolphin/axfx/reverb_hi_4ch.c index f7770c9959..22cef85079 100644 --- a/src/dolphin/axfx/reverb_hi_4ch.c +++ b/src/dolphin/axfx/reverb_hi_4ch.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__axfx.h" diff --git a/src/dolphin/axfx/reverb_std.c b/src/dolphin/axfx/reverb_std.c index ef74a8d1e7..2261b3424c 100644 --- a/src/dolphin/axfx/reverb_std.c +++ b/src/dolphin/axfx/reverb_std.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__axfx.h" diff --git a/src/dolphin/card/CARDUnlock.c b/src/dolphin/card/CARDUnlock.c index 63313c5098..124e0c2069 100644 --- a/src/dolphin/card/CARDUnlock.c +++ b/src/dolphin/card/CARDUnlock.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/demo/DEMOAVX.c b/src/dolphin/demo/DEMOAVX.c index 927c09661c..39f5d8f554 100644 --- a/src/dolphin/demo/DEMOAVX.c +++ b/src/dolphin/demo/DEMOAVX.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" static s16 __AVX_internal_buffer[3200] ATTRIBUTE_ALIGN(32); diff --git a/src/dolphin/dsp/dsp.c b/src/dolphin/dsp/dsp.c index 2737aaa229..085cde1f6d 100644 --- a/src/dolphin/dsp/dsp.c +++ b/src/dolphin/dsp/dsp.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/dsp/dsp_task.c b/src/dolphin/dsp/dsp_task.c index 236950cddf..b1651a0de3 100644 --- a/src/dolphin/dsp/dsp_task.c +++ b/src/dolphin/dsp/dsp_task.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gd/GDLight.c b/src/dolphin/gd/GDLight.c index 96e08a447d..b96b7ac264 100644 --- a/src/dolphin/gd/GDLight.c +++ b/src/dolphin/gd/GDLight.c @@ -1,5 +1,5 @@ #include -#include +#include void GDSetLightAttn(GXLightID light, f32 a0, f32 a1, f32 a2, f32 k0, f32 k1, f32 k2) { GDWriteXFCmdHdr(__GDLightID2Offset(light) + XF_LIGHT_ATTN_ID, 6); diff --git a/src/dolphin/gx/GXDisplayList.c b/src/dolphin/gx/GXDisplayList.c index 667b31df40..356cfcb4a9 100644 --- a/src/dolphin/gx/GXDisplayList.c +++ b/src/dolphin/gx/GXDisplayList.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXDraw.c b/src/dolphin/gx/GXDraw.c index 0ea0d0beb5..a8ec028127 100644 --- a/src/dolphin/gx/GXDraw.c +++ b/src/dolphin/gx/GXDraw.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXFifo.c b/src/dolphin/gx/GXFifo.c index 1085da461b..8acdac3688 100644 --- a/src/dolphin/gx/GXFifo.c +++ b/src/dolphin/gx/GXFifo.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/dolphin/gx/GXGeometry.c b/src/dolphin/gx/GXGeometry.c index b41b70be23..cbd7a19c40 100644 --- a/src/dolphin/gx/GXGeometry.c +++ b/src/dolphin/gx/GXGeometry.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXInit.c b/src/dolphin/gx/GXInit.c index 53f7f0cc1a..aceef9f9b5 100644 --- a/src/dolphin/gx/GXInit.c +++ b/src/dolphin/gx/GXInit.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXLight.c b/src/dolphin/gx/GXLight.c index 78418c02c2..51928937ba 100644 --- a/src/dolphin/gx/GXLight.c +++ b/src/dolphin/gx/GXLight.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXMisc.c b/src/dolphin/gx/GXMisc.c index 3c30698560..2138303882 100644 --- a/src/dolphin/gx/GXMisc.c +++ b/src/dolphin/gx/GXMisc.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/dolphin/gx/GXPixel.c b/src/dolphin/gx/GXPixel.c index 027276cf0a..4e4be47c8c 100644 --- a/src/dolphin/gx/GXPixel.c +++ b/src/dolphin/gx/GXPixel.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXTexture.c b/src/dolphin/gx/GXTexture.c index ba5829901a..8efb2ec06c 100644 --- a/src/dolphin/gx/GXTexture.c +++ b/src/dolphin/gx/GXTexture.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__gx.h" diff --git a/src/dolphin/gx/GXVerifRAS.c b/src/dolphin/gx/GXVerifRAS.c index f1aa96678b..4492385851 100644 --- a/src/dolphin/gx/GXVerifRAS.c +++ b/src/dolphin/gx/GXVerifRAS.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/dolphin/gx/GXVerifXF.c b/src/dolphin/gx/GXVerifXF.c index 1e45aabdb8..70498a3fdd 100644 --- a/src/dolphin/gx/GXVerifXF.c +++ b/src/dolphin/gx/GXVerifXF.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/dolphin/mtx/mtx.c b/src/dolphin/mtx/mtx.c index 888246b1f1..82adf3dc12 100644 --- a/src/dolphin/mtx/mtx.c +++ b/src/dolphin/mtx/mtx.c @@ -1,6 +1,6 @@ #include #include -#include +#include static f32 Unit01[2] = { 0.0f, diff --git a/src/dolphin/mtx/mtx44.c b/src/dolphin/mtx/mtx44.c index 8c6526833b..669bfa5806 100644 --- a/src/dolphin/mtx/mtx44.c +++ b/src/dolphin/mtx/mtx44.c @@ -1,6 +1,6 @@ #include #include -#include +#include static f32 mtxUnit[] = {0.0f, 1.0f, 0.5f, 3.0f}; diff --git a/src/dolphin/mtx/mtx44vec.c b/src/dolphin/mtx/mtx44vec.c index 19b03894a7..a27034aa40 100644 --- a/src/dolphin/mtx/mtx44vec.c +++ b/src/dolphin/mtx/mtx44vec.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" void C_MTX44MultVec(const Mtx44 m, const Vec* src, Vec* dst) { Vec vTmp; diff --git a/src/dolphin/mtx/mtxstack.c b/src/dolphin/mtx/mtxstack.c index 5502b2e9d4..37fd9b3ca7 100644 --- a/src/dolphin/mtx/mtxstack.c +++ b/src/dolphin/mtx/mtxstack.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" void MTXInitStack(MTXStack* sPtr, u32 numMtx) { ASSERTMSGLINE(74, sPtr, "MTXInitStack(): NULL MtxStackPtr 'sPtr' "); diff --git a/src/dolphin/mtx/mtxvec.c b/src/dolphin/mtx/mtxvec.c index 61cb3ae6ad..0d62e36469 100644 --- a/src/dolphin/mtx/mtxvec.c +++ b/src/dolphin/mtx/mtxvec.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_MTXMultVec(const Mtx m, const Vec* src, Vec* dst) { Vec vTmp; diff --git a/src/dolphin/mtx/psmtx.c b/src/dolphin/mtx/psmtx.c index cc75ea8b3d..fb2a5bf419 100644 --- a/src/dolphin/mtx/psmtx.c +++ b/src/dolphin/mtx/psmtx.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" asm void PSMTXReorder(const __REGISTER Mtx src, __REGISTER ROMtx dest) { psq_l f0, 0(src), 0, 0 diff --git a/src/dolphin/mtx/quat.c b/src/dolphin/mtx/quat.c index cf00deb3df..e5dd44855a 100644 --- a/src/dolphin/mtx/quat.c +++ b/src/dolphin/mtx/quat.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_QUATAdd(const Quaternion* p, const Quaternion* q, Quaternion* r) { ASSERTMSGLINE(77, p, "QUATAdd(): NULL QuaternionPtr 'p' "); diff --git a/src/dolphin/mtx/vec.c b/src/dolphin/mtx/vec.c index c501097268..c07de9a61e 100644 --- a/src/dolphin/mtx/vec.c +++ b/src/dolphin/mtx/vec.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_VECAdd(const Vec* a, const Vec* b, Vec* ab) { ASSERTMSGLINE(108, a, "VECAdd(): NULL VecPtr 'a' "); diff --git a/src/dolphin/os/OSError.c b/src/dolphin/os/OSError.c index f01258fca2..8e0ff3dce5 100644 --- a/src/dolphin/os/OSError.c +++ b/src/dolphin/os/OSError.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/os/__ppc_eabi_init.c b/src/dolphin/os/__ppc_eabi_init.c index 9c0054a4c7..5aef392edc 100644 --- a/src/dolphin/os/__ppc_eabi_init.c +++ b/src/dolphin/os/__ppc_eabi_init.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/pad/Padclamp.c b/src/dolphin/pad/Padclamp.c index 960e38880c..ee9e1561b4 100644 --- a/src/dolphin/pad/Padclamp.c +++ b/src/dolphin/pad/Padclamp.c @@ -1,4 +1,4 @@ -#include "fake_tgmath.h" +#include "sdk_math.h" #include #include diff --git a/src/dolphin/perf/perf.c b/src/dolphin/perf/perf.c index a5529239bb..fdb380c885 100644 --- a/src/dolphin/perf/perf.c +++ b/src/dolphin/perf/perf.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__perf.h" #include "../gx/__gx.h" diff --git a/src/dolphin/perf/perfdraw.c b/src/dolphin/perf/perfdraw.c index 2e23517082..87a8813dea 100644 --- a/src/dolphin/perf/perfdraw.c +++ b/src/dolphin/perf/perfdraw.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__perf.h" diff --git a/src/dolphin/syn/syn.c b/src/dolphin/syn/syn.c index 8dd2771166..8005f11b8a 100644 --- a/src/dolphin/syn/syn.c +++ b/src/dolphin/syn/syn.c @@ -3,7 +3,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synctrl.c b/src/dolphin/syn/synctrl.c index 8c96fb8368..1a97a18f8d 100644 --- a/src/dolphin/syn/synctrl.c +++ b/src/dolphin/syn/synctrl.c @@ -2,7 +2,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synenv.c b/src/dolphin/syn/synenv.c index 7d7f15fe8a..5e27c97ab2 100644 --- a/src/dolphin/syn/synenv.c +++ b/src/dolphin/syn/synenv.c @@ -1,8 +1,8 @@ #include #include #include -#include "fake_tgmath.h" -#include "cmath.h" +#include "sdk_math.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synlfo.c b/src/dolphin/syn/synlfo.c index 9625c3b176..83d8bfab85 100644 --- a/src/dolphin/syn/synlfo.c +++ b/src/dolphin/syn/synlfo.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synmix.c b/src/dolphin/syn/synmix.c index bfa9fdd49a..240ffb89b4 100644 --- a/src/dolphin/syn/synmix.c +++ b/src/dolphin/syn/synmix.c @@ -2,7 +2,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synpitch.c b/src/dolphin/syn/synpitch.c index ce38a83114..e493239345 100644 --- a/src/dolphin/syn/synpitch.c +++ b/src/dolphin/syn/synpitch.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synsample.c b/src/dolphin/syn/synsample.c index e1c1f05ac1..d7cadcb55d 100644 --- a/src/dolphin/syn/synsample.c +++ b/src/dolphin/syn/synsample.c @@ -1,7 +1,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synvoice.c b/src/dolphin/syn/synvoice.c index ec6ea4437b..d2fa1bbe09 100644 --- a/src/dolphin/syn/synvoice.c +++ b/src/dolphin/syn/synvoice.c @@ -2,7 +2,7 @@ #include #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/dolphin/syn/synwt.c b/src/dolphin/syn/synwt.c index 8b29c511a8..d1f6bcf46b 100644 --- a/src/dolphin/syn/synwt.c +++ b/src/dolphin/syn/synwt.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" #include "__syn.h" diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 4cba9026ba..b1c6ab26ce 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -21,7 +21,7 @@ #include "global.h" #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_mtx.h" -#include "stdio.h" +#include static void mDoExt_setJ3DData(Mtx mtx, const J3DTransformInfo* transformInfo, u16 param_2) { bool local_28; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 2962ed5a88..53f955b453 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -33,7 +33,7 @@ #include "m_Do/m_Do_printf.h" #include "m_Do/m_Do_ext2.h" #include "SSystem/SComponent/c_counter.h" -#include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 70b15a7238..3f6ca18008 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -4,7 +4,7 @@ */ #include "m_Do/m_Do_printf.h" -#include "stdio.h" +#include #include #include "m_Do/m_Do_ext.h" diff --git a/src/revolution/aralt/aralt.c b/src/revolution/aralt/aralt.c index 8dfd3e2139..1ec72ba63f 100644 --- a/src/revolution/aralt/aralt.c +++ b/src/revolution/aralt/aralt.c @@ -1,8 +1,8 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" -#include +#include #include "__ar.h" diff --git a/src/revolution/card/CARDUnlock.c b/src/revolution/card/CARDUnlock.c index 63313c5098..124e0c2069 100644 --- a/src/revolution/card/CARDUnlock.c +++ b/src/revolution/card/CARDUnlock.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dsp/dsp.c b/src/revolution/dsp/dsp.c index a023089b59..f7c03c9cc9 100644 --- a/src/revolution/dsp/dsp.c +++ b/src/revolution/dsp/dsp.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dsp/dsp_task.c b/src/revolution/dsp/dsp_task.c index 7ea99ba8e6..fb1455477f 100644 --- a/src/revolution/dsp/dsp_task.c +++ b/src/revolution/dsp/dsp_task.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dvd/dvd.c b/src/revolution/dvd/dvd.c index d000b71429..13b692f260 100644 --- a/src/revolution/dvd/dvd.c +++ b/src/revolution/dvd/dvd.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include "os/__os.h" #include "__dvd.h" diff --git a/src/revolution/dvd/dvdidutils.c b/src/revolution/dvd/dvdidutils.c index 2742086b58..e08209f021 100644 --- a/src/revolution/dvd/dvdidutils.c +++ b/src/revolution/dvd/dvdidutils.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__dvd.h" diff --git a/src/revolution/fs/fs.c b/src/revolution/fs/fs.c index 5ea6eecd54..bf3af1a1da 100644 --- a/src/revolution/fs/fs.c +++ b/src/revolution/fs/fs.c @@ -1,6 +1,6 @@ #include #include -#include +#include static IOSFd __fsFd = -1; static u32 __fsInitialized = FALSE; diff --git a/src/revolution/gd/GDLight.c b/src/revolution/gd/GDLight.c index 15e6a64233..a1c038a5f2 100644 --- a/src/revolution/gd/GDLight.c +++ b/src/revolution/gd/GDLight.c @@ -1,5 +1,5 @@ #include -#include +#include void GDSetLightAttn(GXLightID light, f32 a0, f32 a1, f32 a2, f32 k0, f32 k1, f32 k2) { GDWriteXFCmdHdr(__GDLightID2Offset(light) + XF_LIGHT_ATTN_ID, 6); diff --git a/src/revolution/gx/GXDisplayList.c b/src/revolution/gx/GXDisplayList.c index 747f9749bf..50d4a6d339 100644 --- a/src/revolution/gx/GXDisplayList.c +++ b/src/revolution/gx/GXDisplayList.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXDraw.c b/src/revolution/gx/GXDraw.c index 30557b0dc6..f9cb1d4c68 100644 --- a/src/revolution/gx/GXDraw.c +++ b/src/revolution/gx/GXDraw.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXGeometry.c b/src/revolution/gx/GXGeometry.c index f585938fa1..a7c00a4483 100644 --- a/src/revolution/gx/GXGeometry.c +++ b/src/revolution/gx/GXGeometry.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXInit.c b/src/revolution/gx/GXInit.c index e7ecba2b8b..50b5d4026d 100644 --- a/src/revolution/gx/GXInit.c +++ b/src/revolution/gx/GXInit.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXLight.c b/src/revolution/gx/GXLight.c index b371eb1fae..48d8da5b37 100644 --- a/src/revolution/gx/GXLight.c +++ b/src/revolution/gx/GXLight.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXMisc.c b/src/revolution/gx/GXMisc.c index 46980ceeb4..fe757ab0f7 100644 --- a/src/revolution/gx/GXMisc.c +++ b/src/revolution/gx/GXMisc.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/revolution/gx/GXPixel.c b/src/revolution/gx/GXPixel.c index a68a119305..cb3f9ce051 100644 --- a/src/revolution/gx/GXPixel.c +++ b/src/revolution/gx/GXPixel.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXTexture.c b/src/revolution/gx/GXTexture.c index 532294078b..97abcfda02 100644 --- a/src/revolution/gx/GXTexture.c +++ b/src/revolution/gx/GXTexture.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__gx.h" diff --git a/src/revolution/gx/GXVerifRAS.c b/src/revolution/gx/GXVerifRAS.c index cdb935069b..190647818e 100644 --- a/src/revolution/gx/GXVerifRAS.c +++ b/src/revolution/gx/GXVerifRAS.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/revolution/gx/GXVerifXF.c b/src/revolution/gx/GXVerifXF.c index 8784888afd..ec2cde4f6d 100644 --- a/src/revolution/gx/GXVerifXF.c +++ b/src/revolution/gx/GXVerifXF.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp index a940cd5483..a1a86b1603 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp @@ -5,7 +5,7 @@ #include "pane.h" #include "new.h" -#include +#include namespace { // pretend this is nw4hbm::lyt diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp index 7b87676dce..9e26b3bdb4 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp @@ -2,7 +2,7 @@ #include "layout.h" -#include +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp index a9e8932053..ab04812226 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp @@ -1,6 +1,6 @@ #include "drawInfo.h" -#include +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp index 727498c328..ef44a5abab 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp @@ -3,7 +3,7 @@ #include "common.h" #include "layout.h" -#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp index ce5f620b29..ac44e57e51 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp @@ -6,7 +6,7 @@ #include -#include +#include static const GXColorS10 DefaultBlackColor = {0, 0, 0, 0}; diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp index 68d086334d..a56cf35c0f 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp @@ -3,7 +3,7 @@ #include "common.h" #include "layout.h" -#include +#include namespace { // pretend this is nw4hbm::lyt diff --git a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h b/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h index edec2fc1e5..5a7485eb0a 100644 --- a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h +++ b/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h @@ -2,7 +2,7 @@ #define NW4HBM_MATH_ARITHMETIC_H #include -#include +#include #include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h b/src/revolution/homebuttonLib/nw4hbm/math/triangular.h index 3a96e81205..f260a5ceeb 100644 --- a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h +++ b/src/revolution/homebuttonLib/nw4hbm/math/triangular.h @@ -2,7 +2,7 @@ #define NW4HBM_MATH_TRIANGULAR_H #include -#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h b/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h index 3ac1890723..65ac357af8 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h @@ -4,7 +4,7 @@ #include #include #include "DisposeCallbackManager.h" -#include "limits.h" +#include "climits.h" #include "snd_global.h" #include "snd_types.h" diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h b/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h index 4d842a64f7..49185de63d 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h @@ -1,7 +1,7 @@ #ifndef NW4HBM_SND_CHANNEL_H #define NW4HBM_SND_CHANNEL_H -#include // USHRT_MAX +#include // USHRT_MAX #include diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h b/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h index f6aa2fa059..751d69846b 100644 --- a/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h +++ b/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h @@ -6,7 +6,7 @@ #include "inlines.h" #include "../db/assert.h" -#include "stddef.h" +#include namespace nw4hbm { namespace ut { diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h b/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h index 7d24112e84..fc21259462 100644 --- a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h +++ b/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h @@ -6,7 +6,7 @@ #include "CharWriter.h" #include "Rect.h" -#include +#include #include #include "TagProcessorBase.h" diff --git a/src/revolution/homebuttonLib/sound/synenv.cpp b/src/revolution/homebuttonLib/sound/synenv.cpp index 2e7c27d8f9..ec524ec197 100644 --- a/src/revolution/homebuttonLib/sound/synenv.cpp +++ b/src/revolution/homebuttonLib/sound/synenv.cpp @@ -1,7 +1,7 @@ #include "synprivate.h" -#include +#include #include #include diff --git a/src/revolution/ipc/ipcProfile.c b/src/revolution/ipc/ipcProfile.c index 60bf758a75..ff963a44e5 100644 --- a/src/revolution/ipc/ipcProfile.c +++ b/src/revolution/ipc/ipcProfile.c @@ -1,5 +1,5 @@ #include -#include +#include static u32 IpcReqPtrArray[96] = {0}; static u32 IpcReqArray[0x300] = {0}; diff --git a/src/revolution/ipc/ipcclt.c b/src/revolution/ipc/ipcclt.c index 39bc8b2f69..36cd1c1ada 100644 --- a/src/revolution/ipc/ipcclt.c +++ b/src/revolution/ipc/ipcclt.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include /* macro for matching __ipcQueueRequest */ #define diff(a, b) \ diff --git a/src/revolution/mtx/mtx.c b/src/revolution/mtx/mtx.c index 5388c29669..0660061145 100644 --- a/src/revolution/mtx/mtx.c +++ b/src/revolution/mtx/mtx.c @@ -1,6 +1,6 @@ #include #include -#include +#include static f32 Unit01[2] = { 0.0f, diff --git a/src/revolution/mtx/mtx44.c b/src/revolution/mtx/mtx44.c index 3cfedb61b3..e4e2b51332 100644 --- a/src/revolution/mtx/mtx44.c +++ b/src/revolution/mtx/mtx44.c @@ -1,6 +1,6 @@ #include #include -#include +#include f32 mtxUnit[] = {0.0f, 1.0f, 0.5f, 3.0f}; diff --git a/src/revolution/mtx/mtx44vec.c b/src/revolution/mtx/mtx44vec.c index da92c17ea7..cd58cb55df 100644 --- a/src/revolution/mtx/mtx44vec.c +++ b/src/revolution/mtx/mtx44vec.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" void C_MTX44MultVec(const Mtx44 m, const Vec* src, Vec* dst) { Vec vTmp; diff --git a/src/revolution/mtx/mtxstack.c b/src/revolution/mtx/mtxstack.c index af7956f4f7..d9ea8f3d90 100644 --- a/src/revolution/mtx/mtxstack.c +++ b/src/revolution/mtx/mtxstack.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" void MTXInitStack(MTXStack* sPtr, u32 numMtx) { ASSERTMSGLINE(74, sPtr, "MTXInitStack(): NULL MtxStackPtr 'sPtr' "); diff --git a/src/revolution/mtx/mtxvec.c b/src/revolution/mtx/mtxvec.c index 99c5a71a75..7cd8d5a11e 100644 --- a/src/revolution/mtx/mtxvec.c +++ b/src/revolution/mtx/mtxvec.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_MTXMultVec(const Mtx m, const Vec* src, Vec* dst) { Vec vTmp; diff --git a/src/revolution/mtx/psmtx.c b/src/revolution/mtx/psmtx.c index ab9aac13db..01af03ed45 100644 --- a/src/revolution/mtx/psmtx.c +++ b/src/revolution/mtx/psmtx.c @@ -1,6 +1,6 @@ #include #include -#include "fake_tgmath.h" +#include "sdk_math.h" asm void PSMTXReorder(const __REGISTER Mtx src, __REGISTER ROMtx dest) { psq_l f0, 0(src), 0, 0 diff --git a/src/revolution/mtx/quat.c b/src/revolution/mtx/quat.c index 14964d9bfb..e1ed76de74 100644 --- a/src/revolution/mtx/quat.c +++ b/src/revolution/mtx/quat.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_QUATAdd(const Quaternion* p, const Quaternion* q, Quaternion* r) { ASSERTMSGLINE(77, p, "QUATAdd(): NULL QuaternionPtr 'p' "); diff --git a/src/revolution/mtx/vec.c b/src/revolution/mtx/vec.c index d2ef0675a1..12595bf5ab 100644 --- a/src/revolution/mtx/vec.c +++ b/src/revolution/mtx/vec.c @@ -1,6 +1,6 @@ #include #include -#include +#include void C_VECAdd(const Vec* a, const Vec* b, Vec* ab) { ASSERTMSGLINE(114, a, "VECAdd(): NULL VecPtr 'a' "); diff --git a/src/revolution/nand/NANDCore.c b/src/revolution/nand/NANDCore.c index 575ebecb40..35235c0b3f 100644 --- a/src/revolution/nand/NANDCore.c +++ b/src/revolution/nand/NANDCore.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #ifdef SDK_AUG2010 #define BUILD_DATE "Aug 23 2010" diff --git a/src/revolution/nand/NANDLogging.c b/src/revolution/nand/NANDLogging.c index 7d0d862c81..3106fde878 100644 --- a/src/revolution/nand/NANDLogging.c +++ b/src/revolution/nand/NANDLogging.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include static IOSFd s_fd = -255; diff --git a/src/revolution/nand/nand.c b/src/revolution/nand/nand.c index c81f226f84..8e445ca37c 100644 --- a/src/revolution/nand/nand.c +++ b/src/revolution/nand/nand.c @@ -2,7 +2,7 @@ #include #include -#include +#include static BOOL nandInspectPermission(u8); static void nandSplitPerm(u8, u32*, u32*, u32*); diff --git a/src/revolution/os/OS.c b/src/revolution/os/OS.c index 006870ca43..57872a3b0e 100644 --- a/src/revolution/os/OS.c +++ b/src/revolution/os/OS.c @@ -9,7 +9,7 @@ #include "__os.h" #include "__dvd.h" -#include +#include #define NOP 0x60000000 diff --git a/src/revolution/os/OSAudioSystem.c b/src/revolution/os/OSAudioSystem.c index a16bf21954..a426d869d1 100644 --- a/src/revolution/os/OSAudioSystem.c +++ b/src/revolution/os/OSAudioSystem.c @@ -1,7 +1,7 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSError.c b/src/revolution/os/OSError.c index c3698d1533..771dc4f661 100644 --- a/src/revolution/os/OSError.c +++ b/src/revolution/os/OSError.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/os/OSExec.c b/src/revolution/os/OSExec.c index 50441daab8..35bdc46f6b 100644 --- a/src/revolution/os/OSExec.c +++ b/src/revolution/os/OSExec.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "__os.h" #include "__dvd.h" diff --git a/src/revolution/os/OSFatal.c b/src/revolution/os/OSFatal.c index 0f7dae7555..cc395e090a 100644 --- a/src/revolution/os/OSFatal.c +++ b/src/revolution/os/OSFatal.c @@ -4,7 +4,7 @@ #include #include "__os.h" -#include +#include typedef struct OSFatalParam { GXColor fg; diff --git a/src/revolution/os/OSInterrupt.c b/src/revolution/os/OSInterrupt.c index 6250a07300..939e943533 100644 --- a/src/revolution/os/OSInterrupt.c +++ b/src/revolution/os/OSInterrupt.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSLaunch.c b/src/revolution/os/OSLaunch.c index 77bc9f8572..8165e04f11 100644 --- a/src/revolution/os/OSLaunch.c +++ b/src/revolution/os/OSLaunch.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSLink.c b/src/revolution/os/OSLink.c index 4abc2f64c2..ec3bde8938 100644 --- a/src/revolution/os/OSLink.c +++ b/src/revolution/os/OSLink.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSPlayTime.c b/src/revolution/os/OSPlayTime.c index 78a10b2ca8..16fcb7938c 100644 --- a/src/revolution/os/OSPlayTime.c +++ b/src/revolution/os/OSPlayTime.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSReset.c b/src/revolution/os/OSReset.c index 1685475a18..e3ac6c5c52 100644 --- a/src/revolution/os/OSReset.c +++ b/src/revolution/os/OSReset.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "__os.h" #include "__dvd.h" diff --git a/src/revolution/os/OSStateFlags.c b/src/revolution/os/OSStateFlags.c index da4b199cd5..959949fab5 100644 --- a/src/revolution/os/OSStateFlags.c +++ b/src/revolution/os/OSStateFlags.c @@ -1,6 +1,6 @@ #include #include -#include +#include static OSStateFlags StateFlags ATTRIBUTE_ALIGN(32); diff --git a/src/revolution/os/OSSync.c b/src/revolution/os/OSSync.c index 094efbe1ba..e21499a765 100644 --- a/src/revolution/os/OSSync.c +++ b/src/revolution/os/OSSync.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSTime.c b/src/revolution/os/OSTime.c index a7c2538160..7d7ce67fa0 100644 --- a/src/revolution/os/OSTime.c +++ b/src/revolution/os/OSTime.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/pad/Pad.c b/src/revolution/pad/Pad.c index 81105f2b8f..e887b188d1 100644 --- a/src/revolution/pad/Pad.c +++ b/src/revolution/pad/Pad.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include "__si.h" diff --git a/src/revolution/sc/scapi_prdinfo.c b/src/revolution/sc/scapi_prdinfo.c index 820d24a4be..862666d428 100644 --- a/src/revolution/sc/scapi_prdinfo.c +++ b/src/revolution/sc/scapi_prdinfo.c @@ -1,6 +1,6 @@ #include #include -#include +#include typedef struct { s8 area; diff --git a/src/revolution/sc/scsystem.c b/src/revolution/sc/scsystem.c index 9ddc1fb5c1..21e090c5db 100644 --- a/src/revolution/sc/scsystem.c +++ b/src/revolution/sc/scsystem.c @@ -1,6 +1,6 @@ #include #include -#include +#include // #include #ifdef SDK_AUG2010 diff --git a/src/revolution/wenc/wenc.c b/src/revolution/wenc/wenc.c index 570106c1e8..a30c7b7c13 100644 --- a/src/revolution/wenc/wenc.c +++ b/src/revolution/wenc/wenc.c @@ -1,5 +1,5 @@ #include -#include +#include typedef struct { s32 nXN; // size 0x04, offset 0x00 diff --git a/src/revolution/wpad/WPAD.c b/src/revolution/wpad/WPAD.c index 27ca0b8559..af5cc1d99c 100644 --- a/src/revolution/wpad/WPAD.c +++ b/src/revolution/wpad/WPAD.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include "__wpad.h" From 889dc157abad33cbad1302c3ace1b0e625436810 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Tue, 23 Dec 2025 10:23:09 -0800 Subject: [PATCH 09/35] JAudio2 debug (#2990) --- include/JSystem/JAudio2/JASBasicInst.h | 7 +- include/JSystem/JAudio2/JASChannel.h | 3 +- include/JSystem/JAudio2/JASCmdStack.h | 9 +- include/JSystem/JAudio2/JASDrumSet.h | 6 +- include/JSystem/JAudio2/JASHeapCtrl.h | 43 +++-- include/JSystem/JAudio2/JASOscillator.h | 2 +- include/JSystem/JAudio2/JASResArcLoader.h | 46 ++--- include/JSystem/JAudio2/JASTrack.h | 22 ++- include/JSystem/JSupport/JSUList.h | 4 +- src/JSystem/JAudio2/JAISe.cpp | 8 +- src/JSystem/JAudio2/JAISeq.cpp | 4 +- src/JSystem/JAudio2/JASAramStream.cpp | 109 ++++++++---- src/JSystem/JAudio2/JASBNKParser.cpp | 6 +- src/JSystem/JAudio2/JASBasicInst.cpp | 23 ++- src/JSystem/JAudio2/JASCalc.cpp | 2 +- src/JSystem/JAudio2/JASCmdStack.cpp | 28 ++- src/JSystem/JAudio2/JASDrumSet.cpp | 81 ++++++--- src/JSystem/JAudio2/JASHeapCtrl.cpp | 51 +++++- src/JSystem/JAudio2/JASOscillator.cpp | 10 +- src/JSystem/JAudio2/JASResArcLoader.cpp | 22 ++- src/JSystem/JAudio2/JASTrack.cpp | 207 ++++++++++++++-------- 21 files changed, 464 insertions(+), 229 deletions(-) diff --git a/include/JSystem/JAudio2/JASBasicInst.h b/include/JSystem/JAudio2/JASBasicInst.h index c8054c4fd6..5fe6b84db4 100644 --- a/include/JSystem/JAudio2/JASBasicInst.h +++ b/include/JSystem/JAudio2/JASBasicInst.h @@ -6,6 +6,8 @@ struct JKRHeap; +const int OSC_MAX = 2; + /** * @ingroup jsystem-jaudio * @@ -46,6 +48,7 @@ struct JASBasicInst : public JASInst { struct TKeymap { ~TKeymap(); TKeymap() { mHighKey = -1; } + s32 getHighKey() const { return mHighKey; } void setHighKey(int key) { mHighKey = key; } /* 0x0 */ s32 mHighKey; @@ -59,6 +62,7 @@ struct JASBasicInst : public JASInst { void setKeyRegionCount(u32, JKRHeap*); void setOsc(int, JASOscillator::Data const*); TKeymap* getKeyRegion(int); + TKeymap* getKeyRegion(int) const; virtual ~JASBasicInst(); virtual bool getParam(int, int, JASInstParam*) const; @@ -66,10 +70,11 @@ struct JASBasicInst : public JASInst { void setVolume(f32 volume) { mVolume = volume; } void setPitch(f32 pitch) { mPitch = pitch; } + u32 getKeyRegionCount() const { return mKeymapCount; } /* 0x04 */ f32 mVolume; /* 0x08 */ f32 mPitch; - /* 0x0C */ JASOscillator::Data const* field_0xc[2]; + /* 0x0C */ JASOscillator::Data const* field_0xc[OSC_MAX]; /* 0x10 */ u32 mKeymapCount; /* 0x14 */ TKeymap* mKeymap; }; diff --git a/include/JSystem/JAudio2/JASChannel.h b/include/JSystem/JAudio2/JASChannel.h index b54bb428ed..6cd2d4c0de 100644 --- a/include/JSystem/JAudio2/JASChannel.h +++ b/include/JSystem/JAudio2/JASChannel.h @@ -52,6 +52,7 @@ public: class JASChannel : public JASPoolAllocObject_MultiThreaded { public: typedef void (*Callback)(u32, JASChannel*, JASDsp::TChannel*, void*); + static const int BUSOUT_CPUCH = 6; enum CallbackType { /* 0 */ CB_PLAY, @@ -140,7 +141,7 @@ public: /* 0x1C */ JASOscillator mOscillators[2]; /* 0x5C */ JASLfo mVibrate; /* 0x74 */ JASLfo mTremolo; - /* 0x8C */ MixConfig mMixConfig[6]; + /* 0x8C */ MixConfig mMixConfig[BUSOUT_CPUCH]; /* 0x98 */ u16 mPriority; /* 0x9C */ JASChannelParams mParams; /* 0xB4 */ JASSoundParams mSoundParams; diff --git a/include/JSystem/JAudio2/JASCmdStack.h b/include/JSystem/JAudio2/JASCmdStack.h index 22664962b6..c35a1146cb 100644 --- a/include/JSystem/JAudio2/JASCmdStack.h +++ b/include/JSystem/JAudio2/JASCmdStack.h @@ -42,10 +42,15 @@ struct JASPortCmd : JSULink { void execCommandStay(); }; + bool addPortCmdOnce(); + bool setPortCmd(Command func, JASPortArgs*); static void execAllCommand(); - Command _10; - JASPortArgs* _14; + Command getFunc() { return mFunc; } + JASPortArgs* getArgs() { return mArgs; } + + Command mFunc; + JASPortArgs* mArgs; static TPortHead sCommandListOnce; static TPortHead sCommandListStay; diff --git a/include/JSystem/JAudio2/JASDrumSet.h b/include/JSystem/JAudio2/JASDrumSet.h index 4fed94c985..8e5c8df244 100644 --- a/include/JSystem/JAudio2/JASDrumSet.h +++ b/include/JSystem/JAudio2/JASDrumSet.h @@ -32,10 +32,12 @@ struct JASDrumSet : public JASInst { void newPercArray(u8, JKRHeap*); virtual bool getParam(int, int, JASInstParam*) const; void setPerc(int, JASDrumSet::TPerc*); + JASDrumSet::TPerc* getPerc(int); + JASDrumSet::TPerc* getPerc(int) const; virtual u32 getType() const; - /* 0x4 */ TPerc** field_0x4; - /* 0x8 */ u8 field_0x8; + /* 0x4 */ TPerc** mPercArray; + /* 0x8 */ u8 mPercNumMax; }; #endif /* JASDRUMSET_H */ diff --git a/include/JSystem/JAudio2/JASHeapCtrl.h b/include/JSystem/JAudio2/JASHeapCtrl.h index 5a7b2550f8..af04892178 100644 --- a/include/JSystem/JAudio2/JASHeapCtrl.h +++ b/include/JSystem/JAudio2/JASHeapCtrl.h @@ -22,13 +22,15 @@ public: bool alloc(JASHeap*, u32); bool allocTail(JASHeap*, u32); bool free(); + u32 getTotalFreeSize(); + u32 getFreeSize(); void insertChild(JASHeap*, JASHeap*, void*, u32, bool); JASHeap* getTailHeap(); u32 getTailOffset(); u32 getCurOffset(); void* getBase() { return mBase; } - bool isAllocated() { return mBase; } + bool isAllocated() const { return mBase; } u32 getSize() const { return mSize; } /* 0x00 */ JSUTree mTree; @@ -180,7 +182,7 @@ class JASMemChunkPool : public T >::ObjectLevelLoc mNextChunk = chunk; } - u32 getFreeSize() { + u32 getFreeSize() const { return ChunkSize - mUsedSize; } @@ -201,27 +203,22 @@ public: } bool createNewChunk() { - bool uVar2; if (field_0x18 != NULL && field_0x18->isEmpty()) { field_0x18->revive(); - uVar2 = 1; - } else { - MemoryChunk* pMVar4 = field_0x18; - field_0x18 = new (JASKernel::getSystemHeap(), 0) MemoryChunk(pMVar4); - if (field_0x18 != NULL) { - uVar2 = 1; - } else { - JUT_WARN(428, "%s", "Not enough JASSystemHeap"); - field_0x18 = new (JKRHeap::getSystemHeap(), 0) MemoryChunk(pMVar4); - if (field_0x18 != NULL) { - uVar2 = 1; - } else { - field_0x18 = pMVar4; - uVar2 = 0; - } - } + return true; } - return uVar2; + MemoryChunk* pMVar4 = field_0x18; + field_0x18 = new (JASKernel::getSystemHeap(), 0) MemoryChunk(pMVar4); + if (field_0x18 != NULL) { + return true; + } + JUT_WARN(428, "%s", "Not enough JASSystemHeap"); + field_0x18 = new (JKRHeap::getSystemHeap(), 0) MemoryChunk(pMVar4); + if (field_0x18 != NULL) { + return true; + } + field_0x18 = pMVar4; + return false; } void* alloc(u32 size) { @@ -269,6 +266,8 @@ namespace JASKernel { JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* getCommandHeap(); void setupAramHeap(u32, u32); JASHeap* getAramHeap(); + u32 getAramFreeSize(); + u32 getAramSize(); extern JASHeap audioAramHeap; extern u32 sAramBase; @@ -348,14 +347,14 @@ class JASPoolAllocObject_MultiThreaded { public: static void* operator new(size_t n) { JASMemPool_MultiThreaded& memPool_ = getMemPool(); - return memPool_.alloc(sizeof(T)); + return memPool_.alloc(n); } static void* operator new(size_t n, void* ptr) { return ptr; } static void operator delete(void* ptr, size_t n) { JASMemPool_MultiThreaded& memPool_ = getMemPool(); - memPool_.free(ptr, sizeof(T)); + memPool_.free(ptr, n); } static void newMemPool(int n) { diff --git a/include/JSystem/JAudio2/JASOscillator.h b/include/JSystem/JAudio2/JASOscillator.h index ac7f58c3a5..bfff094f5c 100644 --- a/include/JSystem/JAudio2/JASOscillator.h +++ b/include/JSystem/JAudio2/JASOscillator.h @@ -38,7 +38,7 @@ struct JASOscillator { /* 0x00 */ u32 mTarget; /* 0x04 */ f32 _04; /* 0x08 */ const Point* mTable; - /* 0x0C */ const Point* _0C; + /* 0x0C */ const Point* rel_table; /* 0x10 */ f32 mScale; /* 0x14 */ f32 _14; }; diff --git a/include/JSystem/JAudio2/JASResArcLoader.h b/include/JSystem/JAudio2/JASResArcLoader.h index b5602633f8..1b375e798e 100644 --- a/include/JSystem/JAudio2/JASResArcLoader.h +++ b/include/JSystem/JAudio2/JASResArcLoader.h @@ -9,37 +9,39 @@ namespace JASResArcLoader { size_t getResMaxSize(JKRArchive const*); static void loadResourceCallback(void*); int loadResourceAsync(JKRArchive*, u16, u8*, u32, void (*)(u32, u32), u32); + + // from pikmin2 + typedef void (*LoadCallback)(u32, u32); + + struct TLoadResInfo { + inline TLoadResInfo(JKRArchive* archive, u16 id, void* buf, u32 size) + : mArchive(archive) + , mID(id) + , mBuffer(buf) + , mBufferSize(size) + , mCallback(0) + , mCallbackArg(0) + , mQueue(0) + { + } + + JKRArchive* mArchive; // _00 + u16 mID; // _04 + void* mBuffer; // _08 + u32 mBufferSize; // _0C + LoadCallback mCallback; // _10 + u32 mCallbackArg; // _14, arg to pass to mCallback along with readResource result + OSMessageQueue* mQueue; // _18 + }; }; class JKRArchive; -// from pikmin2 -typedef void (*LoadCallback)(u32, u32); - enum ResArcMessage { RESARCMSG_Error = -1, RESARCMSG_Success = 0, }; -struct CallbackArgs { - inline CallbackArgs(u16 id, u8* buf, u32 size, JKRArchive* archive) - : mArchive(archive) - , mID(id) - , mBuffer(buf) - , mBufferSize(size) - , mCallback(0) - , mCallbackArg(0) - , mQueue(0) - { - } - JKRArchive* mArchive; // _00 - u16 mID; // _04 - u8* mBuffer; // _08 - u32 mBufferSize; // _0C - LoadCallback mCallback; // _10 - u32 mCallbackArg; // _14, arg to pass to mCallback along with readResource result - OSMessageQueue* mQueue; // _18 -}; #endif /* JASRESARCLOADER_H */ diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h index b749e87471..4b0d3ea0fa 100644 --- a/include/JSystem/JAudio2/JASTrack.h +++ b/include/JSystem/JAudio2/JASTrack.h @@ -22,10 +22,14 @@ namespace JASDsp { * */ struct JASTrack : public JASPoolAllocObject_MultiThreaded { + static const int CHANNEL_MGR_MAX = 4; + static const int TIMED_PARAMS = 6; + static const int OSC_NUM = 2; + enum Status { STATUS_FREE, STATUS_RUN, - STATUS_STOP, + STATUS_STOPPED, }; struct TChannelMgr : public JASPoolAllocObject_MultiThreaded { @@ -82,6 +86,11 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded { void closeChild(u32); JASTrack* openChild(u32); void connectBus(int, int); + f32 getVolume() const; + f32 getPitch() const; + f32 getPan() const; + f32 getFxmix() const; + f32 getDolby() const; void setLatestKey(u8); JASChannel* channelStart(JASTrack::TChannelMgr*, u32, u32, u32); int noteOn(u32, u32, u32); @@ -115,6 +124,7 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded { void setTimebase(u16); void updateChannel(JASChannel*, JASDsp::TChannel*); JASTrack* getRootTrack(); + int getChannelCount() const; int tickProc(); int seqMain(); @@ -191,7 +201,7 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded { MoveParam_ dolby; MoveParam_ distFilter; } params; - MoveParam_ array[6]; + MoveParam_ array[TIMED_PARAMS]; } mMoveParam; #else /* 0x09C */ union MoveParam_u { @@ -203,17 +213,17 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded { MoveParam_ dolby; MoveParam_ distFilter; } params; - MoveParam_ array[6]; + MoveParam_ array[TIMED_PARAMS]; MoveParam_u() {} } mMoveParam; #endif - /* 0x0e4 */ JASOscillator::Data mOscParam[2]; + /* 0x0e4 */ JASOscillator::Data mOscParam[OSC_NUM]; /* 0x114 */ JASOscillator::Point mOscPoint[4]; /* 0x12C */ JASTrack* mParent; /* 0x130 */ JASTrack* mChildren[MAX_CHILDREN]; - /* 0x170 */ TChannelMgr* mChannelMgrs[4]; + /* 0x170 */ TChannelMgr* mChannelMgrs[CHANNEL_MGR_MAX]; /* 0x180 */ TChannelMgr mDefaultChannelMgr; - /* 0x1D0 */ int mChannelMgrCount; + /* 0x1D0 */ u32 mChannelMgrCount; /* 0x1D4 */ const JASDefaultBankTable* mBankTable; /* 0x1D8 */ f32 field_0x1d8; /* 0x1DC */ f32 field_0x1dc; diff --git a/include/JSystem/JSupport/JSUList.h b/include/JSystem/JSupport/JSUList.h index a2bb967cc3..7b31430276 100644 --- a/include/JSystem/JSupport/JSUList.h +++ b/include/JSystem/JSupport/JSUList.h @@ -230,7 +230,7 @@ public: T* getObject() const { return this->mTree->getObject(); } - bool operator==(JSUTree* other) { return this->mTree == other; } + bool operator==(const JSUTree* other) const { return this->mTree == other; } bool operator!=(const JSUTree* other) const { return this->mTree != other; } @@ -245,7 +245,7 @@ public: return *this; } - T* operator*() { return this->getObject(); } + T* operator*() const { return this->getObject(); } T* operator->() const { return this->getObject(); } diff --git a/src/JSystem/JAudio2/JAISe.cpp b/src/JSystem/JAudio2/JAISe.cpp index b3c1df38fd..fd75e9b7b7 100644 --- a/src/JSystem/JAudio2/JAISe.cpp +++ b/src/JSystem/JAudio2/JAISe.cpp @@ -36,7 +36,7 @@ void JAISe::stopTrack_() { case JASTrack::STATUS_RUN: inner_.track.stopSeq(); break; - case JASTrack::STATUS_STOP: + case JASTrack::STATUS_STOPPED: break; } } @@ -44,7 +44,7 @@ void JAISe::stopTrack_() { void JAISe::startTrack_(const JASSoundParams& params) { JUT_ASSERT(72, inner_.track.getStatus() != JASTrack::STATUS_RUN); - if (inner_.track.getStatus() == JASTrack::STATUS_STOP) { + if (inner_.track.getStatus() == JASTrack::STATUS_STOPPED) { inner_.track.init(); } @@ -69,7 +69,7 @@ void JAISe::JAISeCategoryMgr_mixOut_(bool param_0, const JASSoundParams& params, if (status_.isPlaying()) { if (inner_.field_0x26c) { switch (inner_.track.getStatus()) { - case JASTrack::STATUS_STOP: + case JASTrack::STATUS_STOPPED: if (status_.field_0x1.flags.flag1) { startTrack_(params); } else { @@ -116,7 +116,7 @@ void JAISe::JAISeCategoryMgr_calc_() { bool JAISe::JAISound_tryDie_() { switch (inner_.track.getStatus()) { case JASTrack::STATUS_FREE: - case JASTrack::STATUS_STOP: + case JASTrack::STATUS_STOPPED: if (inner_.field_0x278) { inner_.mSoundStrategyMgr->virtual4(inner_.field_0x278); inner_.field_0x278 = NULL; diff --git a/src/JSystem/JAudio2/JAISeq.cpp b/src/JSystem/JAudio2/JAISeq.cpp index cd42f1d70a..f54c0ee242 100644 --- a/src/JSystem/JAudio2/JAISeq.cpp +++ b/src/JSystem/JAudio2/JAISeq.cpp @@ -10,7 +10,7 @@ namespace { static bool JASTrack_isFreeOrStopped(JASTrack* track) { u32 status = track->getStatus(); - return status == JASTrack::STATUS_FREE || status == JASTrack::STATUS_STOP; + return status == JASTrack::STATUS_FREE || status == JASTrack::STATUS_STOPPED; } } // namespace @@ -151,7 +151,7 @@ bool JAISeq::prepare_(const JASSoundParams& params, JAISoundActivity activity) { } void JAISeq::JAISeqMgr_calc_() { - if (inner_.outputTrack.getStatus() == JASTrack::STATUS_STOP || (inner_.outputTrack.getStatus() == JASTrack::STATUS_FREE && status_.state.unk == 2)) { + if (inner_.outputTrack.getStatus() == JASTrack::STATUS_STOPPED || (inner_.outputTrack.getStatus() == JASTrack::STATUS_FREE && status_.state.unk == 2)) { die_(); return; } diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp index 878962671e..072e7c1766 100644 --- a/src/JSystem/JAudio2/JASAramStream.cpp +++ b/src/JSystem/JAudio2/JASAramStream.cpp @@ -25,14 +25,21 @@ u32 JASAramStream::sChannelMax; bool struct_80451260; bool struct_80451261; -void JASAramStream::initSystem(u32 i_blockSize, u32 i_channelMax) { - if (JASDriver::registerSubFrameCallback(dvdErrorCheck, NULL)) { +void JASAramStream::initSystem(u32 block_size, u32 channel_max) { + JUT_ASSERT(66, block_size % 32 == 0); + JUT_ASSERT(67, block_size % 9 == 0); + JUT_ASSERT(68, channel_max > 0 && channel_max <= CHANNEL_MAX); + JUT_ASSERT(69, sReadBuffer == 0); + if (!JASDriver::registerSubFrameCallback(dvdErrorCheck, NULL)) { + JUT_WARN(72, "%s", "registerSubFrameCallback Failed"); + } else { if (sLoadThread == NULL) { sLoadThread = JASDvd::getThreadPointer(); } - sReadBuffer = new (JASDram, 0x20) u8[(i_blockSize + 0x20) * i_channelMax]; - sBlockSize = i_blockSize; - sChannelMax = i_channelMax; + sReadBuffer = new (JASDram, 0x20) u8[(block_size + 0x20) * channel_max]; + JUT_ASSERT(79, sReadBuffer); + sBlockSize = block_size; + sChannelMax = channel_max; struct_80451260 = false; struct_80451261 = false; } @@ -85,6 +92,7 @@ JASAramStream::JASAramStream() { } void JASAramStream::init(u32 param_0, u32 param_1, StreamCallback i_callback, void* i_callbackData) { + JUT_ASSERT(153, sReadBuffer != 0); field_0x148 = param_0; field_0x14c = param_1; field_0x0c8 = 0.0f; @@ -110,9 +118,11 @@ void JASAramStream::init(u32 param_0, u32 param_1, StreamCallback i_callback, vo bool JASAramStream::prepare(s32 param_0, int param_1) { if (!DVDFastOpen(param_0, &mDvdFileInfo)) { + JUT_WARN(240, "%s", "DVDFastOpen Failed"); return false; } if (!JASDriver::registerSubFrameCallback(channelProcCallback, this)) { + JUT_WARN(245, "%s", "registerSubFrameCallback Failed"); return false; } TaskData data; @@ -120,6 +130,7 @@ bool JASAramStream::prepare(s32 param_0, int param_1) { data.field_0x4 = field_0x14c; data.field_0x8 = param_1; if (!sLoadThread->sendCmdMsg(headerLoadTask, &data, 0xc)) { + JUT_WARN(254, "%s", "sendCmdMsg headerLoadTask Failed"); JASDriver::rejectCallback(channelProcCallback, this); return false; } @@ -127,21 +138,25 @@ bool JASAramStream::prepare(s32 param_0, int param_1) { } bool JASAramStream::start() { - return OSSendMessage(&field_0x000, (OSMessage)0, OS_MESSAGE_NOBLOCK); + if (!OSSendMessage(&field_0x000, (OSMessage)0, OS_MESSAGE_NOBLOCK)) { + JUT_WARN(273, "%s", "OSSendMessage Failed") + return false; + } + return true; } bool JASAramStream::stop(u16 param_0) { - return OSSendMessage(&field_0x000, (OSMessage)(param_0 << 0x10 | 1), OS_MESSAGE_NOBLOCK); + if (!OSSendMessage(&field_0x000, (OSMessage)(param_0 << 0x10 | 1), OS_MESSAGE_NOBLOCK)) { + JUT_WARN(290, "%s", "OSSendMessage Failed"); + return false; + } + return true; } bool JASAramStream::pause(bool param_0) { - OSMessage msg; - if (param_0) { - msg = (OSMessage)2; - } else { - msg = (OSMessage)3; - } + OSMessage msg = param_0 ? (OSMessage)2 : (OSMessage)3; if (!OSSendMessage(&field_0x000, msg, OS_MESSAGE_NOBLOCK)) { + JUT_WARN(308, "%s", "OSSendMessage Failed"); return false; } return true; @@ -149,14 +164,15 @@ bool JASAramStream::pause(bool param_0) { bool JASAramStream::cancel() { field_0x114 = 1; - return sLoadThread->sendCmdMsg(finishTask, this); + if (!sLoadThread->sendCmdMsg(finishTask, this)) { + JUT_WARN(326, "%s", "sendCmdMsg finishTask Failed"); + return false; + } + return true; } u32 JASAramStream::getBlockSamples() const { - if (field_0x158 == 0) { - return (sBlockSize << 4) / 9; - } - return sBlockSize >> 1; + return field_0x158 == 0 ? (sBlockSize << 4) / 9 : sBlockSize >> 1; } void JASAramStream::headerLoadTask(void* i_data) { @@ -174,6 +190,7 @@ void JASAramStream::firstLoadTask(void* i_data) { data->field_0x8--; if (data->field_0x8 == 0) { if (!sLoadThread->sendCmdMsg(prepareFinishTask, _this)) { + JUT_WARN(364, "%s", "sendCmdMsg prepareFinishTask Failed"); struct_80451261 = true; } } @@ -181,6 +198,7 @@ void JASAramStream::firstLoadTask(void* i_data) { if (data->field_0x4 != 0) { data->field_0x4--; if (!sLoadThread->sendCmdMsg(firstLoadTask, data, 0xc)) { + JUT_WARN(372, "%s", "sendCmdMsg firstLoadTask Failed"); struct_80451261 = true; } JASCriticalSection cs; @@ -189,12 +207,15 @@ void JASAramStream::firstLoadTask(void* i_data) { } void JASAramStream::loadToAramTask(void* i_this) { - ((JASAramStream*)i_this)->load(); + JASAramStream* stream = (JASAramStream*)i_this; + stream->load(); } void JASAramStream::finishTask(void* i_this) { JASAramStream* _this = (JASAramStream*)i_this; - JASDriver::rejectCallback(channelProcCallback, _this); + if (!JASDriver::rejectCallback(channelProcCallback, _this)) { + JUT_WARN(392, "%s", "rejectSubFrameCallback Failed"); + } if (_this->mCallback != NULL) { _this->mCallback(CB_START, _this, _this->mCallbackData); _this->mCallback = NULL; @@ -217,10 +238,16 @@ bool JASAramStream::headerLoad(u32 param_0, int param_1) { return false; } if (DVDReadPrio(&mDvdFileInfo, sReadBuffer, sizeof(Header), 0, 1) < 0) { + JUT_WARN(420, "%s", "DVDReadPrio Failed"); struct_80451261 = true; return false; } Header* header = (Header*)sReadBuffer; + JUT_ASSERT(426, header->tag == 'STRM'); + JUT_ASSERT(427, header->format <= 1); + JUT_ASSERT(428, header->bits == 16); + JUT_ASSERT(429, header->channels <= sChannelMax); + JUT_ASSERT(430, header->block_size == sBlockSize); field_0x158 = header->format; mChannelNum = header->channels; field_0x164 = header->field_0x10; @@ -233,9 +260,16 @@ bool JASAramStream::headerLoad(u32 param_0, int param_1) { field_0x10c = 0; field_0x160 = (param_0 / sBlockSize) / header->channels; mBufCount = field_0x160; + JUT_ASSERT(445, mBufCount > 0); mBufCount--; + if (mBufCount < 3) { + JUT_WARN(449, "%s", "Too few Buffer-Size"); + } field_0x108 = mBufCount; - getBlockSamples(); + u32 local_2c = (mLoopEnd - 1) / getBlockSamples(); + if (local_2c <= mBufCount && mLoop) { + JUT_WARN(458, "%s", "Too few samples for Loop-buffer"); + } if (param_1 < 0 || param_1 > field_0x108) { param_1 = field_0x108; } @@ -247,6 +281,7 @@ bool JASAramStream::headerLoad(u32 param_0, int param_1) { data.field_0x4 = field_0x108 - 1; data.field_0x8 = param_1; if (!sLoadThread->sendCmdMsg(firstLoadTask, &data, 0xc)) { + JUT_WARN(472, "%s", "sendCmdMsg firstLoadTask Failed"); struct_80451261 = true; return false; } @@ -331,11 +366,13 @@ bool JASAramStream::load() { } s32 JASAramStream::channelProcCallback(void* i_this) { - return ((JASAramStream*)i_this)->channelProc(); + JASAramStream* stream = (JASAramStream*)i_this; + return stream->channelProc(); } s32 JASAramStream::dvdErrorCheck(void* param_0) { - switch (DVDGetDriveStatus()) { + s32 status = DVDGetDriveStatus(); + switch (status) { case DVD_STATE_END: struct_80451260 = false; break; @@ -359,7 +396,8 @@ s32 JASAramStream::dvdErrorCheck(void* param_0) { void JASAramStream::channelCallback(u32 i_callbackType, JASChannel* i_channel, JASDsp::TChannel* i_dspChannel, void* i_this) { - ((JASAramStream*)i_this)->updateChannel(i_callbackType, i_channel, i_dspChannel); + JASAramStream* stream = (JASAramStream*)i_this; + stream->updateChannel(i_callbackType, i_channel, i_dspChannel); } void JASAramStream::updateChannel(u32 i_callbackType, JASChannel* i_channel, @@ -632,18 +670,21 @@ void JASAramStream::channelStart() { // probably a fake match, this should be set in the JASWaveInfo constructor static u32 const one = 1; wave_info.field_0x20 = &one; - JASChannel* channel = new JASChannel(channelCallback, this); - channel->setPriority(0x7f7f); + JASChannel* jc = new JASChannel(channelCallback, this); + JUT_ASSERT(963, jc); + jc->setPriority(0x7f7f); for (u32 j = 0; j < 6; j++) { - channel->setMixConfig(j, field_0x1dc[j]); + jc->setMixConfig(j, field_0x1dc[j]); } - channel->setInitPitch(field_0x164 / JASDriver::getDacRate()); - channel->setOscInit(0, &OSC_ENV); - channel->field_0xdc.field_0x4 = wave_info; - channel->field_0x104 = field_0x148 + sBlockSize * field_0x160 * i; - channel->field_0xdc.field_0x0 = 0; - channel->playForce(); - mChannels[i] = channel; + jc->setInitPitch(field_0x164 / JASDriver::getDacRate()); + jc->setOscInit(0, &OSC_ENV); + jc->field_0xdc.field_0x4 = wave_info; + jc->field_0x104 = field_0x148 + sBlockSize * field_0x160 * i; + jc->field_0xdc.field_0x0 = 0; + int ret = jc->playForce(); + JUT_ASSERT(977, ret); + JUT_ASSERT_MSG(979, mChannels[i] == NULL, "channelStart for already playing channel"); + mChannels[i] = jc; } field_0x0a8 = NULL; } diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp index 0df05ca9b8..30de594808 100644 --- a/src/JSystem/JAudio2/JASBNKParser.cpp +++ b/src/JSystem/JAudio2/JASBNKParser.cpp @@ -79,7 +79,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h data->mScale = osc->mScale; data->_14 = osc->_18; data->mTable = (JASOscillator::Point*)(envt + osc->mTableOffset); - data->_0C = (JASOscillator::Point*)(envt + osc->_10); + data->rel_table = (JASOscillator::Point*)(envt + osc->_10); } bank->newInstTable(list_chunk->mCount, heap); @@ -208,9 +208,9 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h JASOscillator::Point* table = new (heap, 0) JASOscillator::Point[size]; JUT_ASSERT(409, table != NULL); JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point)); - osc->_0C = table; + osc->rel_table = table; } else { - osc->_0C = NULL; + osc->rel_table = NULL; } osc->mScale = tosc->mScale; diff --git a/src/JSystem/JAudio2/JASBasicInst.cpp b/src/JSystem/JAudio2/JASBasicInst.cpp index 4071060f4b..716e6b1963 100644 --- a/src/JSystem/JAudio2/JASBasicInst.cpp +++ b/src/JSystem/JAudio2/JASBasicInst.cpp @@ -49,19 +49,32 @@ bool JASBasicInst::getParam(int param_0, int param_1, JASInstParam* param_2) con void JASBasicInst::setKeyRegionCount(u32 count, JKRHeap* param_1) { delete [] mKeymap; mKeymap = new (param_1, 0) TKeymap[count]; + JUT_ASSERT(114, mKeymap != 0); mKeymapCount = count; } -void JASBasicInst::setOsc(int param_0, JASOscillator::Data const* param_1) { - field_0xc[param_0] = param_1; +void JASBasicInst::setOsc(int index, JASOscillator::Data const* param_1) { + JUT_ASSERT(128, index < OSC_MAX); + JUT_ASSERT(129, index >= 0); + field_0xc[index] = param_1; } -JASBasicInst::TKeymap* JASBasicInst::getKeyRegion(int param_0) { - if (param_0 >= mKeymapCount) { +JASBasicInst::TKeymap* JASBasicInst::getKeyRegion(int index) { + JUT_ASSERT(146, index >= 0); + if (index >= mKeymapCount) { return NULL; } - return mKeymap + param_0; + return mKeymap + index; +} + +JASBasicInst::TKeymap* JASBasicInst::getKeyRegion(int index) const { + JUT_ASSERT(155, index >= 0); + if (index >= mKeymapCount) { + return NULL; + } + + return mKeymap + index; } JASBasicInst::TKeymap::~TKeymap() { diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/src/JSystem/JAudio2/JASCalc.cpp index 0578810cd6..99695d6498 100644 --- a/src/JSystem/JAudio2/JASCalc.cpp +++ b/src/JSystem/JAudio2/JASCalc.cpp @@ -322,7 +322,7 @@ f32 JASCalc::pow2(f32 x) { template <> s16 JASCalc::clamp(s32 x) { - if (std::numeric_limits::min() >= x) + if (x <= std::numeric_limits::min()) return std::numeric_limits::min(); if (x >= std::numeric_limits::max()) return std::numeric_limits::max(); diff --git a/src/JSystem/JAudio2/JASCmdStack.cpp b/src/JSystem/JAudio2/JASCmdStack.cpp index 9a4fb55916..8d214151cc 100644 --- a/src/JSystem/JAudio2/JASCmdStack.cpp +++ b/src/JSystem/JAudio2/JASCmdStack.cpp @@ -5,32 +5,48 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASCmdStack.h" +#include "JSystem/JAudio2/JASCriticalSection.h" #include "dolphin/os.h" JASPortCmd::TPortHead JASPortCmd::sCommandListOnce; JASPortCmd::TPortHead JASPortCmd::sCommandListStay; +bool JASPortCmd::addPortCmdOnce() { + JASCriticalSection cs; + return sCommandListOnce.append(this); +} + +bool JASPortCmd::setPortCmd(Command func, JASPortArgs* args) { + JUT_ASSERT(81, func != 0); + if (getSupervisor()) { + return false; + } + mFunc = func; + mArgs = args; + return true; +} + void JASPortCmd::execAllCommand() { sCommandListOnce.execCommandOnce(); sCommandListStay.execCommandStay(); } void JASPortCmd::TPortHead::execCommandOnce() { - volatile BOOL interrupts = OSDisableInterrupts(); + JASCriticalSection cs; JSULink* next; for (JSULink* link = getFirst(); link != NULL; link = next) { next = link->getNext(); - link->getObject()->_10(link->getObject()->_14); + JASPortCmd* cmd = link->getObject(); + cmd->getFunc()(cmd->getArgs()); remove(link); } - OSRestoreInterrupts(interrupts); } void JASPortCmd::TPortHead::execCommandStay() { - volatile int interrupts = OSDisableInterrupts(); + JASCriticalSection cs; for (JSULink* link = getFirst(); link != NULL; link = link->getNext()) { - link->getObject()->_10(link->getObject()->_14); + JASPortCmd* cmd = link->getObject(); + cmd->getFunc()(cmd->getArgs()); } - OSRestoreInterrupts(interrupts); } diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/src/JSystem/JAudio2/JASDrumSet.cpp index 1aca5e0cf8..bf9e90383c 100644 --- a/src/JSystem/JAudio2/JASDrumSet.cpp +++ b/src/JSystem/JAudio2/JASDrumSet.cpp @@ -6,35 +6,34 @@ JASDrumSet::JASDrumSet() { - field_0x4 = NULL; - field_0x8 = 0; + mPercArray = NULL; + mPercNumMax = 0; } JASDrumSet::~JASDrumSet() { } -void JASDrumSet::newPercArray(u8 param_0, JKRHeap* param_1) { - if (param_0) { - field_0x8 = param_0; - field_0x4 = new (param_1, 0) TPerc*[field_0x8]; - JASCalc::bzero(field_0x4, field_0x8 * sizeof(TPerc*)); +void JASDrumSet::newPercArray(u8 num, JKRHeap* heap) { + if (num) { + JUT_ASSERT(39, num <= 128); + mPercNumMax = num; + mPercArray = new (heap, 0) TPerc*[mPercNumMax]; + JASCalc::bzero(mPercArray, mPercNumMax * sizeof(TPerc*)); } } -bool JASDrumSet::getParam(int param_0, int param_1, JASInstParam* param_2) const { - static JASOscillator::Data osc; - static JASOscillator::Data* oscp; - static s8 data_80451274; - - if (field_0x4 == NULL) { +bool JASDrumSet::getParam(int key, int param_1, JASInstParam* param_2) const { + JUT_ASSERT(48, key >= 0); + if (mPercArray == NULL) { return false; } - if (param_0 >= field_0x8) { + if (key >= mPercNumMax) { + JUT_WARN(54, "JASDrumSet: key %d >= PERC_MAX %d\n", key, mPercNumMax); return false; } - TPerc* perc = field_0x4[param_0]; + TPerc* perc = mPercArray[key]; if (perc == NULL) { return false; } @@ -44,31 +43,60 @@ bool JASDrumSet::getParam(int param_0, int param_1, JASInstParam* param_2) const param_2->mVolume = perc->mVolume; param_2->mPitch = perc->mPitch; param_2->mPan = perc->mPan; - param_2->field_0x18 = perc->field_0xc; + param_2->field_0x18 = u16(perc->field_0xc); + + static JASOscillator::Data osc; + osc.mTarget = 0; osc._04 = 1.0f; osc.mTable = NULL; - osc._0C = NULL; + osc.rel_table = NULL; osc.mScale = 1.0f; osc._14 = 0.0f; - if (data_80451274 == 0) { - oscp = &osc; - data_80451274 = 1; - } + static JASOscillator::Data* oscp = &osc; param_2->field_0x14 = &oscp; param_2->field_0x1d = 1; param_2->mVolume *= perc->field_0x10; param_2->mPitch *= perc->field_0x14; - param_2->field_0x1a = perc->field_0xe; + param_2->field_0x1a = u16(perc->field_0xe); return true; } -void JASDrumSet::setPerc(int param_0, JASDrumSet::TPerc* param_1) { - field_0x4[param_0] = param_1; +void JASDrumSet::setPerc(int index, JASDrumSet::TPerc* param_1) { + JUT_ASSERT(123, index >= 0); + JUT_ASSERT(125, index < mPercNumMax); + JUT_ASSERT(126, mPercArray); + JUT_ASSERT(127, mPercArray[index] == 0); + mPercArray[index] = param_1; } +JASDrumSet::TPerc* JASDrumSet::getPerc(int index) { + if (index < 0) { + return NULL; + } + if (index >= mPercNumMax) { + return NULL; + } + if (!mPercArray) { + return NULL; + } + return mPercArray[index]; +} + +JASDrumSet::TPerc* JASDrumSet::getPerc(int index) const { + if (index < 0) { + return NULL; + } + if (index >= mPercNumMax) { + return NULL; + } + if (!mPercArray) { + return NULL; + } + return mPercArray[index]; +} JASDrumSet::TPerc::TPerc() { mVolume = 1.0f; @@ -77,8 +105,9 @@ JASDrumSet::TPerc::TPerc() { field_0xc = 1000; } -void JASDrumSet::TPerc::setRelease(u32 param_0) { - field_0xc = param_0; +void JASDrumSet::TPerc::setRelease(u32 release) { + JUT_ASSERT(224, release < 0x10000); + field_0xc = release; } u32 JASDrumSet::getType() const { return 'PERC'; } diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp index af2c9b953a..43da2531ec 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp @@ -6,6 +6,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "JSystem/JUtility/JUTAssert.h" +#include "dolphin/ar.h" JASHeap::JASHeap(JASDisposer* disposer) : mTree(this) { mDisposer = disposer; @@ -45,7 +46,8 @@ bool JASHeap::alloc(JASHeap* mother, u32 param_1) { bool local_43 = false; JASHeap* local_30 = NULL; void* local_34; - for (JSUTreeIterator it = mother->mTree.getFirstChild(); it != mother->mTree.getEndChild(); it++) { + JSUTreeIterator it; + for (it = mother->mTree.getFirstChild(); it != mother->mTree.getEndChild(); it++) { if (r29 >= mother->mBase + local_2c) { break; } @@ -77,8 +79,10 @@ bool JASHeap::alloc(JASHeap* mother, u32 param_1) { } bool JASHeap::allocTail(JASHeap* mother, u32 size) { + JUT_ASSERT(208, mother != NULL); JASMutexLock lock(&mMutex); if (isAllocated()) { + OS_REPORT("[JASHeap::alloc] すでにヒープは確保されています。初期化してからにしてください。\n"); return false; } if (!mother->isAllocated()) { @@ -128,6 +132,39 @@ bool JASHeap::free() { return true; } +u32 JASHeap::getTotalFreeSize() { + JASMutexLock lock(&mMutex); + u8* r28 = mBase; + u32 r29 = 0; + for (JSUTreeIterator it = mTree.getFirstChild(); it != mTree.getEndChild(); it++) { + r29 += it->mBase - r28; + u32 r26 = it->mSize; + r28 = it->mBase + r26; + } + r29 += mBase + mSize - r28; + return r29; +} + +u32 JASHeap::getFreeSize() { + JASMutexLock lock(&mMutex); + u8* r27 = mBase; + u32 r29 = 0; + u32 r28; + for (JSUTreeIterator it = mTree.getFirstChild(); it != mTree.getEndChild(); it++) { + r28 = it->mBase - r27; + if (r28 > r29) { + r29 = r28; + } + u32 r25 = it->mSize; + r27 = it->mBase + r25; + } + r28 = mBase + mSize - r27; + if (r28 > r29) { + r29 = r28; + } + return r29; +} + void JASHeap::insertChild(JASHeap* heap, JASHeap* next, void* param_2, u32 param_3, bool param_4) { JUT_ASSERT(513, heap != NULL); JUT_ASSERT(514, next == NULL || &mTree == next->mTree.getParent()); @@ -260,6 +297,10 @@ JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>* JASKernel::getCom JASHeap JASKernel::audioAramHeap; void JASKernel::setupAramHeap(u32 param_0, u32 param_1) { +#if !PLATFORM_GCN + OSReport("setupAramHeap %x, %x, %x\n", param_0, ARGetBaseAddress(), param_1); + param_0 = ARGetBaseAddress(); +#endif sAramBase = param_0; audioAramHeap.initRootHeap((void*)sAramBase, param_1); } @@ -267,3 +308,11 @@ void JASKernel::setupAramHeap(u32 param_0, u32 param_1) { JASHeap* JASKernel::getAramHeap() { return &audioAramHeap; } + +u32 JASKernel::getAramFreeSize() { + audioAramHeap.getFreeSize(); +} + +u32 JASKernel::getAramSize() { + audioAramHeap.getSize(); +} diff --git a/src/JSystem/JAudio2/JASOscillator.cpp b/src/JSystem/JAudio2/JASOscillator.cpp index 537ef7e598..41a1d0a018 100644 --- a/src/JSystem/JAudio2/JASOscillator.cpp +++ b/src/JSystem/JAudio2/JASOscillator.cpp @@ -56,7 +56,7 @@ f32 JASOscillator::getValue() const { } void JASOscillator::release() { - if (mData->_0C == NULL && mDirectRelease == 0) { + if (mData->rel_table == NULL && mDirectRelease == 0) { stop(); return; } @@ -72,12 +72,12 @@ void JASOscillator::release() { return; } - if (mData->mTable != mData->_0C) { + if (mData->mTable != mData->rel_table) { _04 = 0.0f; _0C = _08; - _10 = mData->_0C[0]._4 / 32768.0f; + _10 = mData->rel_table[0]._4 / 32768.0f; _14 = 0; - _18 = mData->_0C[0]._0; + _18 = mData->rel_table[0]._0; } _1C = 3; @@ -102,7 +102,7 @@ void JASOscillator::update() { if (_1C == 1) { psVar1 = mData->mTable; } else { - psVar1 = mData->_0C; + psVar1 = mData->rel_table; } if (psVar1 == NULL) { diff --git a/src/JSystem/JAudio2/JASResArcLoader.cpp b/src/JSystem/JAudio2/JASResArcLoader.cpp index a931ad9239..7fb2aff736 100644 --- a/src/JSystem/JAudio2/JASResArcLoader.cpp +++ b/src/JSystem/JAudio2/JASResArcLoader.cpp @@ -23,8 +23,8 @@ size_t JASResArcLoader::getResSize(JKRArchive const* i_archiveP, u16 i_resourceI size_t JASResArcLoader::getResMaxSize(JKRArchive const* i_archiveP) { u32 maxSize, index; u32 fileEntries = i_archiveP->countFile(); - - for (maxSize = 0, index = 0; index < fileEntries; index++) { + maxSize = 0; + for (index = 0; index < fileEntries; index++) { JKRArchive::SDIFileEntry* file = i_archiveP->findIdxResource(index); if (file) { if (maxSize < file->data_size) { @@ -37,7 +37,7 @@ size_t JASResArcLoader::getResMaxSize(JKRArchive const* i_archiveP) { } static void JASResArcLoader::loadResourceCallback(void* args) { - CallbackArgs* castedArgs = static_cast(args); + TLoadResInfo* castedArgs = static_cast(args); u32 readResult = castedArgs->mArchive->readResource(castedArgs->mBuffer, castedArgs->mBufferSize, castedArgs->mID); if (castedArgs->mCallback) { castedArgs->mCallback(readResult, castedArgs->mCallbackArg); @@ -47,19 +47,23 @@ static void JASResArcLoader::loadResourceCallback(void* args) { if (castedArgs->mQueue) { OSSendMessage(castedArgs->mQueue, (void*)RESARCMSG_Error, OS_MESSAGE_BLOCK); } - } else { - if (castedArgs->mQueue) { - OSSendMessage(castedArgs->mQueue, (void*)RESARCMSG_Success, OS_MESSAGE_BLOCK); - } + return; + } + if (castedArgs->mQueue) { + OSSendMessage(castedArgs->mQueue, (void*)RESARCMSG_Success, OS_MESSAGE_BLOCK); } } int JASResArcLoader::loadResourceAsync(JKRArchive* archive, u16 id, u8* buffer, u32 size, LoadCallback callback, u32 cbArg) { - CallbackArgs args(id, buffer, size, archive); + TLoadResInfo args(archive, id, buffer, size); args.mCallback = callback; args.mCallbackArg = cbArg; - return JASDvd::getThreadPointer()->sendCmdMsg(&loadResourceCallback, (void*)&args, sizeof(CallbackArgs)); + int r31 = JASDvd::getThreadPointer()->sendCmdMsg(&loadResourceCallback, (void*)&args, sizeof(TLoadResInfo)); + if (!r31) { + JUT_WARN(160, "%s", "sendCmdMsg loadResourceCallback Failed"); + } + return r31; } diff --git a/src/JSystem/JAudio2/JASTrack.cpp b/src/JSystem/JAudio2/JASTrack.cpp index 6f557f38e3..e6bedccd69 100644 --- a/src/JSystem/JAudio2/JASTrack.cpp +++ b/src/JSystem/JAudio2/JASTrack.cpp @@ -21,18 +21,22 @@ JASTrack::TList JASTrack::sTrackList; // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations JASTrack::~JASTrack() { + JUT_ASSERT(70, mStatus != STATUS_RUN); for (int i = 1; i < 4; i++) { delete mChannelMgrs[i]; } } // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations -void JASTrack::setChannelMgrCount(u32 i_count) { +void JASTrack::setChannelMgrCount(u32 count) { + JUT_ASSERT(79, mStatus != STATUS_RUN); + JUT_ASSERT(80, count >= 1 && count <= CHANNEL_MGR_MAX); mChannelMgrCount = 1; - for (int i = 1; i < i_count; i++) { + for (int i = 1; i < count; i++) { if (mChannelMgrs[i] == NULL) { mChannelMgrs[i] = new TChannelMgr(this); if (mChannelMgrs[i] == NULL) { + JUT_WARN(87, "%s", "Not enough JASTrackChannelMgr\n"); return; } } @@ -59,6 +63,7 @@ JASOscillator::Data const JASTrack::sPitchEnvOsc = {1, 1.0f, NULL, NULL, 1.0f, 0 // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations void JASTrack::init() { + JUT_ASSERT(104, mStatus == STATUS_FREE || mStatus == STATUS_STOPPED); mSeqCtrl.init(); mTrackPort.init(); initTimed(); @@ -126,7 +131,7 @@ void JASTrack::init() { mFlags.autoDelete = false; mFlags.flag4 = false; mFlags.flag6 = false; - mStatus = 0; + mStatus = STATUS_FREE; } void JASTrack::initTimed() { @@ -161,18 +166,22 @@ void JASTrack::inherit(JASTrack const& i_parent) { } } -void JASTrack::assignExtBuffer(u32 i_index, JASSoundParams* i_soundParams) { - mChannelMgrs[i_index]->mSoundParams = i_soundParams; +void JASTrack::assignExtBuffer(u32 index, JASSoundParams* i_soundParams) { + JUT_ASSERT(249, index < mChannelMgrCount); + mChannelMgrs[index]->mSoundParams = i_soundParams; } void JASTrack::setSeqData(void* param_0, u32 param_1) { + JUT_ASSERT(257, mStatus == STATUS_FREE); mSeqCtrl.start(param_0, param_1); } void JASTrack::startSeq() { + JUT_ASSERT(265, mParent == 0); + JUT_ASSERT(266, mStatus == STATUS_FREE); JASCriticalSection critical_section; sTrackList.append(this); - mStatus = 1; + mStatus = STATUS_RUN; } void JASTrack::stopSeq() { @@ -181,7 +190,9 @@ void JASTrack::stopSeq() { } void JASTrack::start() { - mStatus = 1; + JUT_ASSERT(289, mParent != 0); + JUT_ASSERT(290, mStatus == STATUS_FREE); + mStatus = STATUS_RUN; } void JASTrack::close() { @@ -201,66 +212,77 @@ void JASTrack::close() { } } mParent = NULL; - mStatus = 2; + mStatus = STATUS_STOPPED; } -bool JASTrack::connectChild(u32 i_index, JASTrack* i_child) { - if (mChildren[i_index] != NULL) { +bool JASTrack::connectChild(u32 track_no, JASTrack* i_child) { + JUT_ASSERT(326, track_no < MAX_CHILDREN); + if (mChildren[track_no] != NULL) { return false; } i_child->mParent = this; - mChildren[i_index] = i_child; + mChildren[track_no] = i_child; return true; } -void JASTrack::closeChild(u32 i_index) { - JASTrack* child = mChildren[i_index]; +void JASTrack::closeChild(u32 track_no) { + JUT_ASSERT(340, track_no < MAX_CHILDREN); + JASTrack* child = mChildren[track_no]; if (child != NULL) { getRootTrack()->updateSeq(false, 1.0f); child->close(); if (child->mFlags.autoDelete) { delete child; - mChildren[i_index] = NULL; + mChildren[track_no] = NULL; } } } // NONMATCHING JASPoolAllocObject_MultiThreaded<_> locations -JASTrack* JASTrack::openChild(u32 i_index) { - JASTrack* child = mChildren[i_index]; +JASTrack* JASTrack::openChild(u32 trk_no) { + JUT_ASSERT(358, trk_no < MAX_CHILDREN); + JASTrack* child = mChildren[trk_no]; if (child != NULL) { switch (child->mStatus) { - case 0: + case STATUS_FREE: break; - case 1: + case STATUS_RUN: getRootTrack()->updateSeq(false, 1.0f); child->close(); // no break - case 2: + case STATUS_STOPPED: bool auto_delete = child->mFlags.autoDelete; child->init(); child->mFlags.autoDelete = auto_delete; - mChildren[i_index] = NULL; - connectChild(i_index, child); + mChildren[trk_no] = NULL; + connectChild(trk_no, child); break; } } else { child = new JASTrack(); if (child == NULL) { + JUT_WARN(388, "%s", "Not enough JASTrack\n"); return NULL; } child->mFlags.autoDelete = true; - connectChild(i_index, child); + connectChild(trk_no, child); } child->setChannelMgrCount(mChannelMgrCount); child->inherit(*this); return child; } -void JASTrack::connectBus(int param_0, int param_1) { - mMixConfig[param_0] = param_1; +void JASTrack::connectBus(int line, int param_1) { + JUT_ASSERT(404, line < JASChannel::BUSOUT_CPUCH); + mMixConfig[line] = param_1; } +f32 JASTrack::getVolume() const { return mMoveParam.params.volume.mValue; } +f32 JASTrack::getPitch() const { return mMoveParam.params.pitch.mValue; } +f32 JASTrack::getPan() const { return mMoveParam.params.pan.mValue; } +f32 JASTrack::getFxmix() const { return mMoveParam.params.fxmix.mValue; } +f32 JASTrack::getDolby() const { return mMoveParam.params.dolby.mValue; } + void JASTrack::setLatestKey(u8 param_0) { field_0x22b = param_0; field_0x22b += getTransposeTotal(); @@ -293,7 +315,8 @@ JASChannel* JASTrack::channelStart(JASTrack::TChannelMgr* i_channelMgr, u32 para return channel; } -int JASTrack::noteOn(u32 i_noteID, u32 param_1, u32 param_2) { +int JASTrack::noteOn(u32 noteid, u32 param_1, u32 param_2) { + JUT_ASSERT(486, noteid != 0 && noteid < TChannelMgr::CHANNEL_MAX); if (isMute()) { return 0; } @@ -301,12 +324,12 @@ int JASTrack::noteOn(u32 i_noteID, u32 param_1, u32 param_2) { param_1 += getTransposeTotal(); for (u32 i = 0; i < mChannelMgrCount; i++) { if (mChannelMgrs[i] != NULL) { - mChannelMgrs[i]->noteOff(i_noteID, 0); + mChannelMgrs[i]->noteOff(noteid, 0); JASChannel* channel = channelStart(mChannelMgrs[i], param_1, param_2, 0); if (channel == NULL) { ret = 0; } - mChannelMgrs[i]->mChannels[i_noteID] = channel; + mChannelMgrs[i]->mChannels[noteid] = channel; } } return ret; @@ -337,9 +360,9 @@ int JASTrack::gateOn(u32 param_0, u32 i_velocity, f32 i_time, u32 i_flags) { } else { JASChannel* channel = channel_mgr->mChannels[0]; if (channel != NULL) { - channel->mKey = uvar7 - channel->field_0xdc.field_0x4.field_0x01; - channel->mVelocity = i_velocity; - channel->mUpdateTimer = update_timer; + channel->setKey(uvar7 - channel->field_0xdc.field_0x4.field_0x01); + channel->setVelocity(i_velocity); + channel->setUpdateTimer(update_timer); } } if ((i_flags & 1) && channel_mgr->mChannels[0] != NULL) { @@ -352,11 +375,12 @@ int JASTrack::gateOn(u32 param_0, u32 i_velocity, f32 i_time, u32 i_flags) { return 1; } -int JASTrack::noteOff(u32 i_noteID, u16 param_1) { +int JASTrack::noteOff(u32 noteid, u16 param_1) { + JUT_ASSERT(563, noteid < TChannelMgr::CHANNEL_MAX); int ret = 1; for (u32 i = 0; i < mChannelMgrCount; i++) { if (mChannelMgrs[i] != NULL) { - if (!mChannelMgrs[i]->noteOff(i_noteID, param_1)) { + if (!mChannelMgrs[i]->noteOff(noteid, param_1)) { ret = 0; } } @@ -364,10 +388,14 @@ int JASTrack::noteOff(u32 i_noteID, u16 param_1) { return ret; } -bool JASTrack::checkNoteStop(u32 i_noteID) const { +bool JASTrack::checkNoteStop(u32 noteid) const { + JUT_ASSERT(581, noteid < TChannelMgr::CHANNEL_MAX); for (u32 i = 0; i < mChannelMgrCount; i++) { - if (mChannelMgrs[i] != NULL && mChannelMgrs[i]->mChannels[i_noteID] != NULL) { - return false; + if (mChannelMgrs[i] != NULL) { + JASChannel* channel = mChannelMgrs[i]->mChannels[noteid]; + if (channel != NULL) { + return false; + } } } return true; @@ -376,13 +404,14 @@ bool JASTrack::checkNoteStop(u32 i_noteID) const { void JASTrack::overwriteOsc(JASChannel* i_channel) { for (u32 i = 0; i < 2; i++) { if (mOscParam[i].mTable != NULL) { + JUT_ASSERT(599, mOscParam[i].rel_table == 0); i_channel->setOscInit(i, &mOscParam[i]); } } } void JASTrack::updateTimedParam() { - for (u32 i = 0; i < 6; i++) { + for (int i = 0; i < 6; i++) { MoveParam_* param = &mMoveParam.array[i]; if (param->mCount != 0) { param->mValue += (param->mTarget - param->mValue) / param->mCount; @@ -403,13 +432,12 @@ void JASTrack::updateTrack(f32 param_0) { f32 pan = (mMoveParam.params.pan.mValue - 0.5f) * mPanPower; f32 fxmix = mMoveParam.params.fxmix.mValue; f32 dolby = mMoveParam.params.dolby.mValue; - JASSoundParams* sound_params = channel_mgr->mSoundParams; - if (sound_params != NULL) { - volume *= sound_params->mVolume; - pitch *= sound_params->mPitch; - pan += sound_params->mPan - 0.5f; - fxmix += sound_params->mFxMix; - dolby += sound_params->mDolby; + if (channel_mgr->mSoundParams != NULL) { + volume *= channel_mgr->mSoundParams->mVolume; + pitch *= channel_mgr->mSoundParams->mPitch; + pan += channel_mgr->mSoundParams->mPan - 0.5f; + fxmix += channel_mgr->mSoundParams->mFxMix; + dolby += channel_mgr->mSoundParams->mDolby; } pan *= param_0; if (mParent == NULL) { @@ -456,25 +484,26 @@ void JASTrack::updateSeq(bool param_0, f32 param_1) { } f32 fvar1 = param_1 * mPanPower; for (int i = 0; i < 16; i++) { - if (mChildren[i] != NULL && mChildren[i]->mStatus == 1) { - mChildren[i]->updateSeq(param_0, fvar1); + JASTrack* child = mChildren[i]; + if (child != NULL && child->mStatus == STATUS_RUN) { + child->updateSeq(param_0, fvar1); } } } u32 JASTrack::seqTimeToDspTime(f32 i_seqTime) { - f32 dsp_time; if (mFlags.flag2) { - dsp_time = i_seqTime / field_0x1dc; + i_seqTime = i_seqTime / field_0x1dc; } else { - dsp_time = i_seqTime * (120.0f / mTimebase); - dsp_time *= JASDriver::getSubFrames() / 10.0f; + i_seqTime = i_seqTime * (120.0f / mTimebase); + i_seqTime *= JASDriver::getSubFrames() / 10.0f; } - return dsp_time; + return i_seqTime; } -void JASTrack::setParam(u32 i_index, f32 i_target, u32 i_count) { - MoveParam_* param = &mMoveParam.array[i_index]; +void JASTrack::setParam(u32 target, f32 i_target, u32 i_count) { + JUT_ASSERT(739, target < TIMED_PARAMS); + MoveParam_* param = &mMoveParam.array[target]; param->mTarget = i_target; if (i_count == 0) { param->mValue = param->mTarget; @@ -487,8 +516,9 @@ void JASTrack::noteOffAll(u16 param_0) { noteOff(i, param_0); } for (int i = 0; i < 16; i++) { - if (mChildren[i] != NULL && mChildren[i]->mStatus == 1) { - mChildren[i]->noteOffAll(param_0); + JASTrack* child = mChildren[i]; + if (child != NULL && child->mStatus == STATUS_RUN) { + child->noteOffAll(param_0); } } } @@ -500,14 +530,16 @@ void JASTrack::mute(bool i_mute) { } } -void JASTrack::setOscScale(u32 i_oscNo, f32 i_scale) { - mOscParam[i_oscNo].mScale = i_scale; +void JASTrack::setOscScale(u32 osc_no, f32 i_scale) { + JUT_ASSERT(792, osc_no < OSC_NUM); + mOscParam[osc_no].mScale = i_scale; } -void JASTrack::setOscTable(u32 i_oscNo, JASOscillator::Point const* i_table) { - mOscParam[i_oscNo].mTable = i_table; - if (i_oscNo != 0) { - mOscParam[i_oscNo]._0C = NULL; +void JASTrack::setOscTable(u32 osc_no, JASOscillator::Point const* i_table) { + JUT_ASSERT(799, osc_no < OSC_NUM) + mOscParam[osc_no].mTable = i_table; + if (osc_no != 0) { + mOscParam[osc_no].rel_table = NULL; } } @@ -547,9 +579,9 @@ void JASTrack::writePortSelf(u32 param_0, u16 param_1) { } void JASTrack::writePort(u32 param_0, u16 param_1) { + JASSeqCtrl::IntrType intr; mTrackPort.writeImport(param_0, param_1); if (param_0 == 0 || param_0 == 1) { - JASSeqCtrl::IntrType intr; if (param_0 == 0) { intr = JASSeqCtrl::INTRTYPE_VALUE_2; } else { @@ -565,13 +597,15 @@ u16 JASTrack::readPort(u32 param_0) { void JASTrack::setChannelPauseFlag(bool i_pause) { for (u32 i = 0; i < mChannelMgrCount; i++) { - if (mChannelMgrs[i] != NULL) { - mChannelMgrs[i]->setPauseFlag(i_pause); + TChannelMgr* mgr = mChannelMgrs[i]; + if (mgr != NULL) { + mgr->setPauseFlag(i_pause); } } for (int i = 0; i < 16; i++) { - if (mChildren[i] != NULL) { - mChildren[i]->setChannelPauseFlag(i_pause); + JASTrack* child = mChildren[i]; + if (child != NULL) { + child->setChannelPauseFlag(i_pause); } } } @@ -601,18 +635,21 @@ bool JASTrack::isMute() const { } void JASTrack::setTempo(u16 i_tempo) { + JUT_ASSERT(961, mParent == 0); mTempo = i_tempo; mFlags.flag5 = true; updateTempo(); } void JASTrack::setTempoRate(f32 i_tempoRate) { + JUT_ASSERT(969, mParent == 0); mTempoRate = i_tempoRate; mFlags.flag5 = true; updateTempo(); } void JASTrack::setTimebase(u16 i_timebase) { + JUT_ASSERT(977, mParent == 0); mTimebase = i_timebase; mFlags.flag5 = true; updateTempo(); @@ -639,7 +676,7 @@ void JASTrack::channelUpdateCallback(u32 param_0, JASChannel* param_1, switch (param_0) { case 0: case 1: - param_1->mParams = channel_mgr->mParams; + param_1->setParams(channel_mgr->mParams); track->updateChannel(param_1, param_2); break; case 3: @@ -658,6 +695,21 @@ void JASTrack::channelUpdateCallback(u32 param_0, JASChannel* param_1, } } +int JASTrack::getChannelCount() const { + JASCriticalSection cs; + int count = 0; + for (int i = 0; i < mChannelMgrCount; i++) { + if (mChannelMgrs[i]) { + for (int j = 0; j < 8; j++) { + if (mChannelMgrs[i]->mChannels[j]) { + count++; + } + } + } + } + return count; +} + JASTrack* JASTrack::getRootTrack() { JASTrack* track = this; while (track->mParent != NULL) { @@ -678,7 +730,8 @@ int JASTrack::tickProc() { } for (int i = 0; i < 16; i++) { JASTrack* child = mChildren[i]; - if (child != NULL && child->mStatus == 1) { + if (child != NULL && child->mStatus == STATUS_RUN) { + JUT_ASSERT(1090, this == child->mParent); ret = child->tickProc(); if (ret < 0) { getRootTrack()->updateSeq(false, 1.0f); @@ -694,6 +747,7 @@ int JASTrack::tickProc() { } int JASTrack::seqMain() { + JUT_ASSERT(1108, mStatus == STATUS_RUN); if (mFlags.flag6) { updateSeq(true, 1.0f); close(); @@ -701,7 +755,8 @@ int JASTrack::seqMain() { } else { while (field_0x1d8 >= 1.0f) { field_0x1d8 -= 1.0f; - if (tickProc() < 0) { + int ret = tickProc(); + if (ret < 0) { updateSeq(false, 1.0f); close(); return -1; @@ -714,13 +769,15 @@ int JASTrack::seqMain() { } s32 JASTrack::TList::cbSeqMain(void* i_this) { - static_cast(i_this)->seqMain(); + JASTrack::TList* list = static_cast(i_this); + list->seqMain(); return 0; } void JASTrack::TList::append(JASTrack* i_track) { if (!mCallbackRegistered) { if (!JASDriver::registerSubFrameCallback(cbSeqMain, this)) { + JUT_WARN(1157, "%s", "Failed: registerSubFrameCallback"); return; } mCallbackRegistered = true; @@ -796,8 +853,9 @@ void JASTrack::TChannelMgr::releaseAll() { } } -bool JASTrack::TChannelMgr::noteOff(u32 i_channel, u16 param_1) { - JASChannel* channel = mChannels[i_channel]; +bool JASTrack::TChannelMgr::noteOff(u32 noteid, u16 param_1) { + JUT_ASSERT(1224, noteid < CHANNEL_MAX); + JASChannel* channel = mChannels[noteid]; if (channel == NULL) { return false; } @@ -807,14 +865,15 @@ bool JASTrack::TChannelMgr::noteOff(u32 i_channel, u16 param_1) { channel->release(param_1); } channel->free(); - mChannels[i_channel] = NULL; + mChannels[noteid] = NULL; return true; } void JASTrack::TChannelMgr::setPauseFlag(bool i_pause) { for (int i = 0; i < 8; i++) { - if (mChannels[i] != NULL) { - mChannels[i]->setPauseFlag(i_pause); + JASChannel* channel = mChannels[i]; + if (channel != NULL) { + channel->setPauseFlag(i_pause); } } } From e8c70fb18ff451b7347b239698422124542705c9 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Tue, 23 Dec 2025 18:53:10 -0500 Subject: [PATCH 10/35] Clean up code, remove fakematches, add UNUSED, enable warnings (#2992) * Remove NDEBUG_DEFINED fakematch, clean up getName temps * Fix ifdef * Fix bad JSystem pch ifdef breaking decomp.me * Remove Acch Chk fakematches * Private Acch fields * Fix some clangd errors in headers * Add UNUSED macro for matching debug parameters * Enable clangd unused-parameter warning * Remove extern from initializers Probably added by dol2asm? * Fix process profile definitions * Remove leftover dol2asm address comments * Remove some unnecessary double casts * Enable some more clangd warnings * Fix missing usages of fopAcM_ct * Fix wrong enum usage * Fix more fakematches --- .clangd | 10 +++- .vscode/settings.json | 1 + configure.py | 6 +-- include/JSystem/JGadget/linklist.h | 4 ++ include/JSystem/JSystem.h | 2 +- include/JSystem/JUtility/JUTResFont.h | 4 +- include/SSystem/SComponent/c_cc_d.h | 36 +++++++------- include/SSystem/SComponent/c_cc_s.h | 2 +- .../MetroTRK/Portable/mem_TRK.h | 4 ++ .../MetroTRK/Portable/msgbuf.h | 19 ++++++++ .../MetroTRK/Portable/mutex_TRK.h | 1 + include/d/actor/d_a_npc_cdn3.h | 2 +- include/d/actor/d_a_npc_tk.h | 8 ---- include/d/actor/d_a_obj_lv6SwGate.h | 1 - include/d/actor/d_a_obj_stone.h | 2 +- include/d/d_bg_s_acch.h | 4 +- include/d/d_com_inf_game.h | 2 +- include/d/d_debug_camera.h | 2 +- include/d/d_menu_fmap.h | 1 + include/d/d_menu_fmap_map.h | 6 +-- include/d/d_meter2_info.h | 10 +--- include/d/d_stage.h | 48 ++++++++++--------- include/f_op/f_op_actor_mng.h | 2 +- include/f_op/f_op_scene.h | 9 +++- include/global.h | 5 ++ include/m_Do/m_Do_audio.h | 2 +- src/JSystem/J2DGraph/J2DGrafContext.cpp | 3 -- src/JSystem/J2DGraph/J2DMaterialFactory.cpp | 3 -- src/JSystem/J2DGraph/J2DPrint.cpp | 8 +--- src/JSystem/J2DGraph/J2DTevs.cpp | 30 ++++++------ src/JSystem/J2DGraph/J2DTextBox.cpp | 3 -- src/JSystem/J2DGraph/J2DWindow.cpp | 3 -- src/JSystem/J3DGraphAnimator/J3DJointTree.cpp | 3 -- src/JSystem/J3DGraphBase/J3DGD.cpp | 12 ----- src/JSystem/J3DGraphBase/J3DShapeMtx.cpp | 3 -- src/JSystem/J3DGraphBase/J3DTevs.cpp | 43 ++++++++--------- src/JSystem/J3DGraphBase/J3DTransform.cpp | 8 ++-- src/JSystem/JAudio2/JASAramStream.cpp | 3 -- src/JSystem/JAudio2/JASBNKParser.cpp | 3 -- src/JSystem/JAudio2/osdsp_task.cpp | 2 - src/JSystem/JGadget/linklist.cpp | 6 --- src/JSystem/JKernel/JKRDvdRipper.cpp | 9 ---- src/JSystem/JKernel/JKRExpHeap.cpp | 3 -- src/JSystem/JMessage/processor.cpp | 3 -- src/JSystem/JParticle/JPAEmitterManager.cpp | 3 -- src/JSystem/JStudio/JStudio/functionvalue.cpp | 35 -------------- src/JSystem/JStudio/JStudio/fvb-data.cpp | 2 +- src/JSystem/JStudio/JStudio/jstudio-data.cpp | 2 +- .../JStudio/JStudio/jstudio-object.cpp | 48 ------------------- .../JStudio/JStudio_JAudio2/control.cpp | 6 --- .../JStudio/JStudio_JAudio2/object-sound.cpp | 18 ------- .../JStudio/JStudio_JParticle/control.cpp | 6 --- .../JStudio_JParticle/object-particle.cpp | 33 ------------- .../JStudio/JStudio_JStage/control.cpp | 3 -- .../JStudio/JStudio_JStage/object-actor.cpp | 27 ----------- .../JStudio/JStudio_JStage/object-camera.cpp | 18 ------- src/JSystem/JStudio/JStudio_JStage/object.cpp | 15 ------ src/JSystem/JUtility/JUTCacheFont.cpp | 3 -- .../JUtility/JUTFontData_Ascfont_fix12.cpp | 3 +- src/JSystem/JUtility/JUTGamePad.cpp | 2 - src/SSystem/SComponent/c_cc_s.cpp | 9 ---- .../MetroTRK/Os/dolphin/dolphin_trk.c | 1 + .../embedded/MetroTRK/Portable/msgbuf.c | 1 + src/Z2AudioLib/Z2Audience.cpp | 3 -- src/Z2AudioLib/Z2Creature.cpp | 2 - src/Z2AudioLib/Z2Param.cpp | 3 -- src/Z2AudioLib/Z2SoundObject.cpp | 4 +- src/Z2AudioLib/Z2WolfHowlMgr.cpp | 2 +- src/d/actor/d_a_L7demo_dr.cpp | 2 +- src/d/actor/d_a_L7low_dr.cpp | 2 +- src/d/actor/d_a_L7op_demo_dr.cpp | 2 +- src/d/actor/d_a_alink.cpp | 2 +- src/d/actor/d_a_alldie.cpp | 2 +- src/d/actor/d_a_andsw.cpp | 2 +- src/d/actor/d_a_andsw2.cpp | 2 +- src/d/actor/d_a_arrow.cpp | 2 +- src/d/actor/d_a_b_bh.cpp | 3 +- src/d/actor/d_a_b_bq.cpp | 2 +- src/d/actor/d_a_b_dr.cpp | 3 +- src/d/actor/d_a_b_dre.cpp | 2 +- src/d/actor/d_a_b_ds.cpp | 6 +-- src/d/actor/d_a_b_gg.cpp | 4 +- src/d/actor/d_a_b_gm.cpp | 2 +- src/d/actor/d_a_b_gnd.cpp | 2 +- src/d/actor/d_a_b_go.cpp | 2 +- src/d/actor/d_a_b_gos.cpp | 2 +- src/d/actor/d_a_b_mgn.cpp | 2 +- src/d/actor/d_a_b_ob.cpp | 2 +- src/d/actor/d_a_b_oh.cpp | 3 +- src/d/actor/d_a_b_oh2.cpp | 2 +- src/d/actor/d_a_b_tn.cpp | 3 +- src/d/actor/d_a_b_yo.cpp | 3 +- src/d/actor/d_a_b_yo_ice.cpp | 2 +- src/d/actor/d_a_b_zant.cpp | 3 +- src/d/actor/d_a_b_zant_magic.cpp | 2 +- src/d/actor/d_a_b_zant_mobile.cpp | 2 +- src/d/actor/d_a_b_zant_sima.cpp | 2 +- src/d/actor/d_a_balloon_2D.cpp | 2 +- src/d/actor/d_a_bd.cpp | 3 +- src/d/actor/d_a_bg.cpp | 2 +- src/d/actor/d_a_bg_obj.cpp | 2 +- src/d/actor/d_a_boomerang.cpp | 2 +- src/d/actor/d_a_bullet.cpp | 2 +- src/d/actor/d_a_canoe.cpp | 2 +- src/d/actor/d_a_coach_2D.cpp | 2 +- src/d/actor/d_a_coach_fire.cpp | 2 +- src/d/actor/d_a_cow.cpp | 11 ++--- src/d/actor/d_a_crod.cpp | 2 +- src/d/actor/d_a_cstaF.cpp | 2 +- src/d/actor/d_a_cstatue.cpp | 2 +- src/d/actor/d_a_demo00.cpp | 4 +- src/d/actor/d_a_demo_item.cpp | 2 +- src/d/actor/d_a_disappear.cpp | 2 +- src/d/actor/d_a_dmidna.cpp | 2 +- src/d/actor/d_a_do.cpp | 3 +- src/d/actor/d_a_door_boss.cpp | 2 +- src/d/actor/d_a_door_bossL1.cpp | 2 +- src/d/actor/d_a_door_bossL5.cpp | 2 +- src/d/actor/d_a_door_dbdoor00.cpp | 2 +- src/d/actor/d_a_door_knob00.cpp | 2 +- src/d/actor/d_a_door_mbossL1.cpp | 2 +- src/d/actor/d_a_door_push.cpp | 2 +- src/d/actor/d_a_door_shutter.cpp | 2 +- src/d/actor/d_a_door_spiral.cpp | 2 +- src/d/actor/d_a_dshutter.cpp | 2 +- src/d/actor/d_a_e_ai.cpp | 2 +- src/d/actor/d_a_e_arrow.cpp | 2 +- src/d/actor/d_a_e_ba.cpp | 2 +- src/d/actor/d_a_e_bee.cpp | 3 +- src/d/actor/d_a_e_bg.cpp | 2 +- src/d/actor/d_a_e_bi.cpp | 4 +- src/d/actor/d_a_e_bi_leaf.cpp | 2 +- src/d/actor/d_a_e_bs.cpp | 2 +- src/d/actor/d_a_e_bu.cpp | 2 +- src/d/actor/d_a_e_bug.cpp | 6 +-- src/d/actor/d_a_e_cr.cpp | 2 +- src/d/actor/d_a_e_cr_egg.cpp | 2 +- src/d/actor/d_a_e_db.cpp | 2 +- src/d/actor/d_a_e_db_leaf.cpp | 2 +- src/d/actor/d_a_e_dd.cpp | 4 +- src/d/actor/d_a_e_df.cpp | 2 +- src/d/actor/d_a_e_dk.cpp | 2 +- src/d/actor/d_a_e_dn.cpp | 3 +- src/d/actor/d_a_e_dt.cpp | 3 +- src/d/actor/d_a_e_fb.cpp | 2 +- src/d/actor/d_a_e_fk.cpp | 4 +- src/d/actor/d_a_e_fm.cpp | 3 +- src/d/actor/d_a_e_fs.cpp | 3 +- src/d/actor/d_a_e_fz.cpp | 2 +- src/d/actor/d_a_e_ga.cpp | 2 +- src/d/actor/d_a_e_gb.cpp | 4 +- src/d/actor/d_a_e_ge.cpp | 2 +- src/d/actor/d_a_e_gi.cpp | 2 +- src/d/actor/d_a_e_gm.cpp | 12 +---- src/d/actor/d_a_e_gob.cpp | 3 +- src/d/actor/d_a_e_gs.cpp | 2 +- src/d/actor/d_a_e_hb.cpp | 2 +- src/d/actor/d_a_e_hb_leaf.cpp | 2 +- src/d/actor/d_a_e_hm.cpp | 2 +- src/d/actor/d_a_e_hp.cpp | 3 +- src/d/actor/d_a_e_hz.cpp | 2 +- src/d/actor/d_a_e_hzelda.cpp | 2 +- src/d/actor/d_a_e_is.cpp | 2 +- src/d/actor/d_a_e_kg.cpp | 2 +- src/d/actor/d_a_e_kk.cpp | 2 +- src/d/actor/d_a_e_kr.cpp | 2 +- src/d/actor/d_a_e_mb.cpp | 3 +- src/d/actor/d_a_e_md.cpp | 2 +- src/d/actor/d_a_e_mf.cpp | 2 +- src/d/actor/d_a_e_mk.cpp | 16 +++---- src/d/actor/d_a_e_mk_bo.cpp | 2 +- src/d/actor/d_a_e_mm.cpp | 2 +- src/d/actor/d_a_e_mm_mt.cpp | 6 +-- src/d/actor/d_a_e_ms.cpp | 7 ++- src/d/actor/d_a_e_nest.cpp | 2 +- src/d/actor/d_a_e_nz.cpp | 2 +- src/d/actor/d_a_e_oc.cpp | 2 +- src/d/actor/d_a_e_oct_bg.cpp | 6 +-- src/d/actor/d_a_e_ot.cpp | 5 +- src/d/actor/d_a_e_ph.cpp | 2 +- src/d/actor/d_a_e_pm.cpp | 3 +- src/d/actor/d_a_e_po.cpp | 2 +- src/d/actor/d_a_e_pz.cpp | 5 +- src/d/actor/d_a_e_rb.cpp | 2 +- src/d/actor/d_a_e_rd.cpp | 3 +- src/d/actor/d_a_e_rdb.cpp | 2 +- src/d/actor/d_a_e_rdy.cpp | 2 +- src/d/actor/d_a_e_s1.cpp | 2 +- src/d/actor/d_a_e_sb.cpp | 5 +- src/d/actor/d_a_e_sf.cpp | 2 +- src/d/actor/d_a_e_sg.cpp | 2 +- src/d/actor/d_a_e_sh.cpp | 2 +- src/d/actor/d_a_e_sm.cpp | 4 +- src/d/actor/d_a_e_sm2.cpp | 2 +- src/d/actor/d_a_e_st.cpp | 2 +- src/d/actor/d_a_e_st_line.cpp | 2 +- src/d/actor/d_a_e_sw.cpp | 8 +--- src/d/actor/d_a_e_th.cpp | 2 +- src/d/actor/d_a_e_th_ball.cpp | 2 +- src/d/actor/d_a_e_tk.cpp | 2 +- src/d/actor/d_a_e_tk2.cpp | 2 +- src/d/actor/d_a_e_tk_ball.cpp | 2 +- src/d/actor/d_a_e_tt.cpp | 2 +- src/d/actor/d_a_e_vt.cpp | 3 +- src/d/actor/d_a_e_warpappear.cpp | 2 +- src/d/actor/d_a_e_wb.cpp | 2 +- src/d/actor/d_a_e_ws.cpp | 2 +- src/d/actor/d_a_e_ww.cpp | 4 +- src/d/actor/d_a_e_yc.cpp | 2 +- src/d/actor/d_a_e_yd.cpp | 2 +- src/d/actor/d_a_e_yd_leaf.cpp | 2 +- src/d/actor/d_a_e_yg.cpp | 2 +- src/d/actor/d_a_e_yh.cpp | 2 +- src/d/actor/d_a_e_yk.cpp | 3 +- src/d/actor/d_a_e_ym.cpp | 2 +- src/d/actor/d_a_e_ym_tag.cpp | 2 +- src/d/actor/d_a_e_ymb.cpp | 9 +--- src/d/actor/d_a_e_yr.cpp | 2 +- src/d/actor/d_a_e_zh.cpp | 5 +- src/d/actor/d_a_e_zm.cpp | 4 +- src/d/actor/d_a_e_zs.cpp | 2 +- src/d/actor/d_a_econt.cpp | 2 +- src/d/actor/d_a_ep.cpp | 2 +- src/d/actor/d_a_formation_mng.cpp | 2 +- src/d/actor/d_a_fr.cpp | 4 +- src/d/actor/d_a_grass.cpp | 2 +- src/d/actor/d_a_guard_mng.cpp | 2 +- src/d/actor/d_a_hitobj.cpp | 2 +- src/d/actor/d_a_horse.cpp | 16 +++---- src/d/actor/d_a_hozelda.cpp | 4 +- src/d/actor/d_a_izumi_gate.cpp | 2 +- src/d/actor/d_a_kago.cpp | 10 ++-- src/d/actor/d_a_kytag00.cpp | 2 +- src/d/actor/d_a_kytag01.cpp | 4 +- src/d/actor/d_a_kytag02.cpp | 2 +- src/d/actor/d_a_kytag03.cpp | 2 +- src/d/actor/d_a_kytag04.cpp | 2 +- src/d/actor/d_a_kytag05.cpp | 2 +- src/d/actor/d_a_kytag06.cpp | 2 +- src/d/actor/d_a_kytag07.cpp | 2 +- src/d/actor/d_a_kytag08.cpp | 2 +- src/d/actor/d_a_kytag09.cpp | 2 +- src/d/actor/d_a_kytag10.cpp | 2 +- src/d/actor/d_a_kytag11.cpp | 2 +- src/d/actor/d_a_kytag12.cpp | 2 +- src/d/actor/d_a_kytag13.cpp | 2 +- src/d/actor/d_a_kytag14.cpp | 2 +- src/d/actor/d_a_kytag15.cpp | 2 +- src/d/actor/d_a_kytag16.cpp | 2 +- src/d/actor/d_a_kytag17.cpp | 2 +- src/d/actor/d_a_mant.cpp | 5 +- src/d/actor/d_a_mg_fish.cpp | 9 ++-- src/d/actor/d_a_mg_fshop.cpp | 2 +- src/d/actor/d_a_mg_rod.cpp | 3 +- src/d/actor/d_a_midna.cpp | 2 +- src/d/actor/d_a_mirror.cpp | 2 +- src/d/actor/d_a_movie_player.cpp | 2 +- src/d/actor/d_a_myna.cpp | 2 +- src/d/actor/d_a_nbomb.cpp | 2 +- src/d/actor/d_a_ni.cpp | 2 +- src/d/actor/d_a_no_chg_room.cpp | 2 +- src/d/actor/d_a_npc2.cpp | 10 +--- src/d/actor/d_a_npc_aru.cpp | 2 +- src/d/actor/d_a_npc_ash.cpp | 4 +- src/d/actor/d_a_npc_ashB.cpp | 2 +- src/d/actor/d_a_npc_bans.cpp | 2 +- src/d/actor/d_a_npc_besu.cpp | 2 +- src/d/actor/d_a_npc_blue_ns.cpp | 2 +- src/d/actor/d_a_npc_bou.cpp | 2 +- src/d/actor/d_a_npc_bouS.cpp | 2 +- src/d/actor/d_a_npc_cd.cpp | 4 -- src/d/actor/d_a_npc_cdn3.cpp | 2 +- src/d/actor/d_a_npc_chat.cpp | 7 +-- src/d/actor/d_a_npc_chin.cpp | 2 +- src/d/actor/d_a_npc_clerka.cpp | 2 +- src/d/actor/d_a_npc_clerkb.cpp | 2 +- src/d/actor/d_a_npc_clerkt.cpp | 2 +- src/d/actor/d_a_npc_coach.cpp | 2 +- src/d/actor/d_a_npc_df.cpp | 2 +- src/d/actor/d_a_npc_doc.cpp | 2 +- src/d/actor/d_a_npc_doorboy.cpp | 2 +- src/d/actor/d_a_npc_drainSol.cpp | 2 +- src/d/actor/d_a_npc_du.cpp | 2 +- src/d/actor/d_a_npc_fairy.cpp | 3 +- src/d/actor/d_a_npc_fairy_seirei.cpp | 2 +- src/d/actor/d_a_npc_fguard.cpp | 2 +- src/d/actor/d_a_npc_fish.cpp | 2 +- src/d/actor/d_a_npc_gnd.cpp | 2 +- src/d/actor/d_a_npc_gra.cpp | 12 ++--- src/d/actor/d_a_npc_grc.cpp | 2 +- src/d/actor/d_a_npc_grd.cpp | 2 +- src/d/actor/d_a_npc_grm.cpp | 2 +- src/d/actor/d_a_npc_grmc.cpp | 2 +- src/d/actor/d_a_npc_gro.cpp | 2 +- src/d/actor/d_a_npc_grr.cpp | 2 +- src/d/actor/d_a_npc_grs.cpp | 2 +- src/d/actor/d_a_npc_grz.cpp | 2 +- src/d/actor/d_a_npc_guard.cpp | 2 +- src/d/actor/d_a_npc_gwolf.cpp | 2 +- src/d/actor/d_a_npc_hanjo.cpp | 2 +- src/d/actor/d_a_npc_henna.cpp | 10 ++-- src/d/actor/d_a_npc_henna0.cpp | 2 +- src/d/actor/d_a_npc_hoz.cpp | 2 +- src/d/actor/d_a_npc_impal.cpp | 4 +- src/d/actor/d_a_npc_inko.cpp | 2 +- src/d/actor/d_a_npc_ins.cpp | 2 +- src/d/actor/d_a_npc_jagar.cpp | 2 +- src/d/actor/d_a_npc_kakashi.cpp | 2 +- src/d/actor/d_a_npc_kasi_hana.cpp | 2 +- src/d/actor/d_a_npc_kasi_kyu.cpp | 4 +- src/d/actor/d_a_npc_kasi_mich.cpp | 4 +- src/d/actor/d_a_npc_kdk.cpp | 2 +- src/d/actor/d_a_npc_kkri.cpp | 2 +- src/d/actor/d_a_npc_kn.cpp | 2 +- src/d/actor/d_a_npc_knj.cpp | 2 +- src/d/actor/d_a_npc_kolin.cpp | 2 +- src/d/actor/d_a_npc_kolinb.cpp | 2 +- src/d/actor/d_a_npc_ks.cpp | 2 +- src/d/actor/d_a_npc_kyury.cpp | 2 +- src/d/actor/d_a_npc_len.cpp | 2 +- src/d/actor/d_a_npc_lf.cpp | 2 +- src/d/actor/d_a_npc_lud.cpp | 2 +- src/d/actor/d_a_npc_maro.cpp | 2 +- src/d/actor/d_a_npc_midp.cpp | 2 +- src/d/actor/d_a_npc_mk.cpp | 2 +- src/d/actor/d_a_npc_moi.cpp | 2 +- src/d/actor/d_a_npc_moir.cpp | 2 +- src/d/actor/d_a_npc_myna2.cpp | 2 +- src/d/actor/d_a_npc_ne.cpp | 5 +- src/d/actor/d_a_npc_p2.cpp | 2 +- src/d/actor/d_a_npc_pachi_besu.cpp | 2 +- src/d/actor/d_a_npc_pachi_maro.cpp | 2 +- src/d/actor/d_a_npc_pachi_taro.cpp | 2 +- src/d/actor/d_a_npc_passer.cpp | 2 +- src/d/actor/d_a_npc_passer2.cpp | 2 +- src/d/actor/d_a_npc_post.cpp | 2 +- src/d/actor/d_a_npc_pouya.cpp | 2 +- src/d/actor/d_a_npc_prayer.cpp | 2 +- src/d/actor/d_a_npc_raca.cpp | 2 +- src/d/actor/d_a_npc_rafrel.cpp | 2 +- src/d/actor/d_a_npc_saru.cpp | 2 +- src/d/actor/d_a_npc_seib.cpp | 2 +- src/d/actor/d_a_npc_seic.cpp | 2 +- src/d/actor/d_a_npc_seid.cpp | 2 +- src/d/actor/d_a_npc_seira.cpp | 2 +- src/d/actor/d_a_npc_seira2.cpp | 2 +- src/d/actor/d_a_npc_seirei.cpp | 2 +- src/d/actor/d_a_npc_shad.cpp | 2 +- src/d/actor/d_a_npc_shaman.cpp | 2 +- src/d/actor/d_a_npc_shoe.cpp | 4 +- src/d/actor/d_a_npc_shop0.cpp | 2 +- src/d/actor/d_a_npc_shop_maro.cpp | 2 +- src/d/actor/d_a_npc_soldierA.cpp | 2 +- src/d/actor/d_a_npc_soldierB.cpp | 2 +- src/d/actor/d_a_npc_sq.cpp | 2 +- src/d/actor/d_a_npc_taro.cpp | 2 +- src/d/actor/d_a_npc_the.cpp | 2 +- src/d/actor/d_a_npc_theB.cpp | 2 +- src/d/actor/d_a_npc_tk.cpp | 3 +- src/d/actor/d_a_npc_tkc.cpp | 2 +- src/d/actor/d_a_npc_tkj.cpp | 2 +- src/d/actor/d_a_npc_tkj2.cpp | 2 +- src/d/actor/d_a_npc_tks.cpp | 6 +-- src/d/actor/d_a_npc_toby.cpp | 2 +- src/d/actor/d_a_npc_tr.cpp | 2 +- src/d/actor/d_a_npc_uri.cpp | 2 +- src/d/actor/d_a_npc_worm.cpp | 2 +- src/d/actor/d_a_npc_wrestler.cpp | 2 +- src/d/actor/d_a_npc_yamid.cpp | 2 +- src/d/actor/d_a_npc_yamis.cpp | 2 +- src/d/actor/d_a_npc_yamit.cpp | 2 +- src/d/actor/d_a_npc_yelia.cpp | 9 ++-- src/d/actor/d_a_npc_ykm.cpp | 2 +- src/d/actor/d_a_npc_ykw.cpp | 2 +- src/d/actor/d_a_npc_zanb.cpp | 2 +- src/d/actor/d_a_npc_zant.cpp | 4 +- src/d/actor/d_a_npc_zelR.cpp | 4 +- src/d/actor/d_a_npc_zelRo.cpp | 2 +- src/d/actor/d_a_npc_zelda.cpp | 2 +- src/d/actor/d_a_npc_zra.cpp | 2 +- src/d/actor/d_a_npc_zra.inc | 1 - src/d/actor/d_a_npc_zrc.cpp | 2 +- src/d/actor/d_a_npc_zrz.cpp | 2 +- src/d/actor/d_a_obj_Lv5Key.cpp | 2 +- src/d/actor/d_a_obj_Turara.cpp | 2 +- src/d/actor/d_a_obj_TvCdlst.cpp | 2 +- src/d/actor/d_a_obj_Y_taihou.cpp | 2 +- src/d/actor/d_a_obj_amiShutter.cpp | 2 +- src/d/actor/d_a_obj_ari.cpp | 2 +- src/d/actor/d_a_obj_automata.cpp | 2 +- src/d/actor/d_a_obj_avalanche.cpp | 2 +- src/d/actor/d_a_obj_balloon.cpp | 2 +- src/d/actor/d_a_obj_barDesk.cpp | 2 +- src/d/actor/d_a_obj_batta.cpp | 2 +- src/d/actor/d_a_obj_bbox.cpp | 2 +- src/d/actor/d_a_obj_bed.cpp | 2 +- src/d/actor/d_a_obj_bemos.cpp | 2 +- src/d/actor/d_a_obj_bhashi.cpp | 2 +- src/d/actor/d_a_obj_bhbridge.cpp | 2 +- src/d/actor/d_a_obj_bk_leaf.cpp | 2 +- src/d/actor/d_a_obj_bkdoor.cpp | 2 +- src/d/actor/d_a_obj_bky_rock.cpp | 2 +- src/d/actor/d_a_obj_bmWindow.cpp | 2 +- src/d/actor/d_a_obj_bmshutter.cpp | 2 +- src/d/actor/d_a_obj_bombf.cpp | 2 +- src/d/actor/d_a_obj_bosswarp.cpp | 2 +- src/d/actor/d_a_obj_boumato.cpp | 3 +- src/d/actor/d_a_obj_brakeeff.cpp | 2 +- src/d/actor/d_a_obj_brg.cpp | 3 +- src/d/actor/d_a_obj_bsGate.cpp | 2 +- src/d/actor/d_a_obj_bubblePilar.cpp | 2 +- src/d/actor/d_a_obj_burnbox.cpp | 2 +- src/d/actor/d_a_obj_carry.cpp | 2 +- src/d/actor/d_a_obj_catdoor.cpp | 2 +- src/d/actor/d_a_obj_cb.cpp | 2 +- src/d/actor/d_a_obj_cblock.cpp | 2 +- src/d/actor/d_a_obj_cboard.cpp | 2 +- src/d/actor/d_a_obj_cdoor.cpp | 2 +- src/d/actor/d_a_obj_chandelier.cpp | 2 +- src/d/actor/d_a_obj_chest.cpp | 2 +- src/d/actor/d_a_obj_cho.cpp | 2 +- src/d/actor/d_a_obj_cowdoor.cpp | 2 +- src/d/actor/d_a_obj_crope.cpp | 2 +- src/d/actor/d_a_obj_crvfence.cpp | 2 +- src/d/actor/d_a_obj_crvgate.cpp | 2 +- src/d/actor/d_a_obj_crvhahen.cpp | 2 +- src/d/actor/d_a_obj_crvlh_down.cpp | 2 +- src/d/actor/d_a_obj_crvlh_up.cpp | 2 +- src/d/actor/d_a_obj_crvsteel.cpp | 2 +- src/d/actor/d_a_obj_crystal.cpp | 2 +- src/d/actor/d_a_obj_cwall.cpp | 2 +- src/d/actor/d_a_obj_damCps.cpp | 2 +- src/d/actor/d_a_obj_dan.cpp | 2 +- src/d/actor/d_a_obj_digholl.cpp | 2 +- src/d/actor/d_a_obj_digplace.cpp | 2 +- src/d/actor/d_a_obj_digsnow.cpp | 2 +- src/d/actor/d_a_obj_dmelevator.cpp | 2 +- src/d/actor/d_a_obj_drop.cpp | 2 +- src/d/actor/d_a_obj_dust.cpp | 2 +- src/d/actor/d_a_obj_eff.cpp | 2 +- src/d/actor/d_a_obj_enemy_create.cpp | 2 +- src/d/actor/d_a_obj_fallobj.cpp | 2 +- src/d/actor/d_a_obj_fan.cpp | 2 +- src/d/actor/d_a_obj_fchain.cpp | 2 +- src/d/actor/d_a_obj_fireWood.cpp | 2 +- src/d/actor/d_a_obj_fireWood2.cpp | 2 +- src/d/actor/d_a_obj_firepillar.cpp | 2 +- src/d/actor/d_a_obj_firepillar2.cpp | 2 +- src/d/actor/d_a_obj_flag.cpp | 2 +- src/d/actor/d_a_obj_flag2.cpp | 2 +- src/d/actor/d_a_obj_flag3.cpp | 2 +- src/d/actor/d_a_obj_fmobj.cpp | 2 +- src/d/actor/d_a_obj_food.cpp | 2 +- src/d/actor/d_a_obj_fw.cpp | 2 +- src/d/actor/d_a_obj_gadget.cpp | 2 +- src/d/actor/d_a_obj_ganonwall.cpp | 2 +- src/d/actor/d_a_obj_ganonwall2.cpp | 2 +- src/d/actor/d_a_obj_gb.cpp | 2 +- src/d/actor/d_a_obj_geyser.cpp | 2 +- src/d/actor/d_a_obj_glowSphere.cpp | 4 +- src/d/actor/d_a_obj_gm.cpp | 2 +- src/d/actor/d_a_obj_goGate.cpp | 2 +- src/d/actor/d_a_obj_gomikabe.cpp | 2 +- src/d/actor/d_a_obj_gpTaru.cpp | 2 +- src/d/actor/d_a_obj_gra2.cpp | 2 +- src/d/actor/d_a_obj_graWall.cpp | 2 +- src/d/actor/d_a_obj_gra_rock.cpp | 2 +- src/d/actor/d_a_obj_grave_stone.cpp | 2 +- src/d/actor/d_a_obj_groundwater.cpp | 2 +- src/d/actor/d_a_obj_grz_rock.cpp | 2 +- src/d/actor/d_a_obj_h_saku.cpp | 2 +- src/d/actor/d_a_obj_hakai_brl.cpp | 2 +- src/d/actor/d_a_obj_hakai_ftr.cpp | 2 +- src/d/actor/d_a_obj_hasu2.cpp | 4 +- src/d/actor/d_a_obj_hata.cpp | 2 +- src/d/actor/d_a_obj_hb.cpp | 2 +- src/d/actor/d_a_obj_hbombkoya.cpp | 2 +- src/d/actor/d_a_obj_heavySw.cpp | 2 +- src/d/actor/d_a_obj_hfuta.cpp | 2 +- src/d/actor/d_a_obj_hhashi.cpp | 2 +- src/d/actor/d_a_obj_hsTarget.cpp | 2 +- src/d/actor/d_a_obj_ice_l.cpp | 4 +- src/d/actor/d_a_obj_ice_s.cpp | 4 +- src/d/actor/d_a_obj_iceblock.cpp | 6 +-- src/d/actor/d_a_obj_iceleaf.cpp | 2 +- src/d/actor/d_a_obj_ihasi.cpp | 2 +- src/d/actor/d_a_obj_ikada.cpp | 2 +- src/d/actor/d_a_obj_inobone.cpp | 2 +- src/d/actor/d_a_obj_ita.cpp | 4 +- src/d/actor/d_a_obj_itamato.cpp | 2 +- src/d/actor/d_a_obj_item.cpp | 2 +- src/d/actor/d_a_obj_ito.cpp | 2 +- src/d/actor/d_a_obj_kabuto.cpp | 2 +- src/d/actor/d_a_obj_kag.cpp | 2 +- src/d/actor/d_a_obj_kage.cpp | 2 +- src/d/actor/d_a_obj_kago.cpp | 3 +- src/d/actor/d_a_obj_kaisou.cpp | 2 +- src/d/actor/d_a_obj_kamakiri.cpp | 2 +- src/d/actor/d_a_obj_kanban2.cpp | 3 +- src/d/actor/d_a_obj_kantera.cpp | 2 +- src/d/actor/d_a_obj_katatsumuri.cpp | 3 +- src/d/actor/d_a_obj_kazeneko.cpp | 2 +- src/d/actor/d_a_obj_kbacket.cpp | 3 +- src/d/actor/d_a_obj_kbox.cpp | 2 +- src/d/actor/d_a_obj_key.cpp | 2 +- src/d/actor/d_a_obj_keyhole.cpp | 3 +- src/d/actor/d_a_obj_kgate.cpp | 2 +- src/d/actor/d_a_obj_ki.cpp | 2 +- src/d/actor/d_a_obj_kiPot.cpp | 2 +- src/d/actor/d_a_obj_kita.cpp | 2 +- src/d/actor/d_a_obj_kjgjs.cpp | 3 +- src/d/actor/d_a_obj_kkanban.cpp | 2 +- src/d/actor/d_a_obj_klift00.cpp | 2 +- src/d/actor/d_a_obj_knBullet.cpp | 2 +- src/d/actor/d_a_obj_kshutter.cpp | 2 +- src/d/actor/d_a_obj_ktOnFire.cpp | 2 +- src/d/actor/d_a_obj_kuwagata.cpp | 2 +- src/d/actor/d_a_obj_kwheel00.cpp | 2 +- src/d/actor/d_a_obj_kwheel01.cpp | 6 +-- src/d/actor/d_a_obj_kznkarm.cpp | 2 +- src/d/actor/d_a_obj_ladder.cpp | 2 +- src/d/actor/d_a_obj_laundry.cpp | 2 +- src/d/actor/d_a_obj_laundry_rope.cpp | 2 +- src/d/actor/d_a_obj_lbox.cpp | 4 +- src/d/actor/d_a_obj_life_container.cpp | 2 +- src/d/actor/d_a_obj_lp.cpp | 2 +- src/d/actor/d_a_obj_lv1Candle00.cpp | 2 +- src/d/actor/d_a_obj_lv1Candle01.cpp | 2 +- src/d/actor/d_a_obj_lv2Candle.cpp | 2 +- src/d/actor/d_a_obj_lv3Candle.cpp | 2 +- src/d/actor/d_a_obj_lv3Water.cpp | 2 +- src/d/actor/d_a_obj_lv3Water2.cpp | 2 +- src/d/actor/d_a_obj_lv3WaterB.cpp | 2 +- src/d/actor/d_a_obj_lv3saka00.cpp | 2 +- src/d/actor/d_a_obj_lv3waterEff.cpp | 2 +- src/d/actor/d_a_obj_lv4CandleDemoTag.cpp | 2 +- src/d/actor/d_a_obj_lv4CandleTag.cpp | 2 +- src/d/actor/d_a_obj_lv4EdShutter.cpp | 2 +- src/d/actor/d_a_obj_lv4Gate.cpp | 2 +- src/d/actor/d_a_obj_lv4HsTarget.cpp | 2 +- src/d/actor/d_a_obj_lv4PoGate.cpp | 2 +- src/d/actor/d_a_obj_lv4RailWall.cpp | 2 +- src/d/actor/d_a_obj_lv4SlideWall.cpp | 2 +- src/d/actor/d_a_obj_lv4bridge.cpp | 2 +- src/d/actor/d_a_obj_lv4chandelier.cpp | 2 +- src/d/actor/d_a_obj_lv4digsand.cpp | 2 +- src/d/actor/d_a_obj_lv4floor.cpp | 2 +- src/d/actor/d_a_obj_lv4gear.cpp | 2 +- src/d/actor/d_a_obj_lv4prelvtr.cpp | 2 +- src/d/actor/d_a_obj_lv4prwall.cpp | 2 +- src/d/actor/d_a_obj_lv4sand.cpp | 2 +- src/d/actor/d_a_obj_lv5FloorBoard.cpp | 2 +- src/d/actor/d_a_obj_lv5IceWall.cpp | 2 +- src/d/actor/d_a_obj_lv5SwIce.cpp | 2 +- src/d/actor/d_a_obj_lv5ychndlr.cpp | 2 +- src/d/actor/d_a_obj_lv5yiblltray.cpp | 2 +- src/d/actor/d_a_obj_lv6ChangeGate.cpp | 2 +- src/d/actor/d_a_obj_lv6FurikoTrap.cpp | 2 +- src/d/actor/d_a_obj_lv6Lblock.cpp | 2 +- src/d/actor/d_a_obj_lv6SwGate.cpp | 2 +- src/d/actor/d_a_obj_lv6SzGate.cpp | 2 +- src/d/actor/d_a_obj_lv6Tenbin.cpp | 6 +-- src/d/actor/d_a_obj_lv6TogeRoll.cpp | 2 +- src/d/actor/d_a_obj_lv6TogeTrap.cpp | 2 +- src/d/actor/d_a_obj_lv6bemos.cpp | 2 +- src/d/actor/d_a_obj_lv6bemos2.cpp | 2 +- src/d/actor/d_a_obj_lv6egate.cpp | 2 +- src/d/actor/d_a_obj_lv6elevta.cpp | 2 +- src/d/actor/d_a_obj_lv6swturn.cpp | 4 +- src/d/actor/d_a_obj_lv7BsGate.cpp | 2 +- src/d/actor/d_a_obj_lv7PropellerY.cpp | 2 +- src/d/actor/d_a_obj_lv7bridge.cpp | 2 +- src/d/actor/d_a_obj_lv8KekkaiTrap.cpp | 2 +- src/d/actor/d_a_obj_lv8Lift.cpp | 2 +- src/d/actor/d_a_obj_lv8OptiLift.cpp | 2 +- src/d/actor/d_a_obj_lv8UdFloor.cpp | 2 +- src/d/actor/d_a_obj_lv9SwShutter.cpp | 2 +- src/d/actor/d_a_obj_magLift.cpp | 2 +- src/d/actor/d_a_obj_magLiftRot.cpp | 2 +- src/d/actor/d_a_obj_magne_arm.cpp | 2 +- src/d/actor/d_a_obj_maki.cpp | 2 +- src/d/actor/d_a_obj_master_sword.cpp | 2 +- src/d/actor/d_a_obj_mato.cpp | 2 +- src/d/actor/d_a_obj_metalbox.cpp | 2 +- src/d/actor/d_a_obj_mgate.cpp | 2 +- src/d/actor/d_a_obj_mhole.cpp | 2 +- src/d/actor/d_a_obj_mie.cpp | 2 +- src/d/actor/d_a_obj_mirror_6pole.cpp | 2 +- src/d/actor/d_a_obj_mirror_chain.cpp | 2 +- src/d/actor/d_a_obj_mirror_sand.cpp | 2 +- src/d/actor/d_a_obj_mirror_screw.cpp | 2 +- src/d/actor/d_a_obj_mirror_table.cpp | 2 +- src/d/actor/d_a_obj_movebox.cpp | 6 +-- src/d/actor/d_a_obj_msima.cpp | 4 +- src/d/actor/d_a_obj_mvstair.cpp | 2 +- src/d/actor/d_a_obj_myogan.cpp | 2 +- src/d/actor/d_a_obj_nagaisu.cpp | 2 +- src/d/actor/d_a_obj_nameplate.cpp | 9 +--- src/d/actor/d_a_obj_nan.cpp | 2 +- src/d/actor/d_a_obj_ndoor.cpp | 2 +- src/d/actor/d_a_obj_nougu.cpp | 2 +- src/d/actor/d_a_obj_octhashi.cpp | 2 +- src/d/actor/d_a_obj_oiltubo.cpp | 2 +- src/d/actor/d_a_obj_onsen.cpp | 2 +- src/d/actor/d_a_obj_onsenFire.cpp | 2 +- src/d/actor/d_a_obj_onsenTaru.cpp | 2 +- src/d/actor/d_a_obj_ornament_cloth.cpp | 2 +- src/d/actor/d_a_obj_pdoor.cpp | 2 +- src/d/actor/d_a_obj_pdtile.cpp | 2 +- src/d/actor/d_a_obj_pdwall.cpp | 2 +- src/d/actor/d_a_obj_picture.cpp | 2 +- src/d/actor/d_a_obj_pillar.cpp | 2 +- src/d/actor/d_a_obj_pleaf.cpp | 2 +- src/d/actor/d_a_obj_poCandle.cpp | 2 +- src/d/actor/d_a_obj_poFire.cpp | 2 +- src/d/actor/d_a_obj_poTbox.cpp | 2 +- src/d/actor/d_a_obj_prop.cpp | 2 +- src/d/actor/d_a_obj_pumpkin.cpp | 2 +- src/d/actor/d_a_obj_rcircle.cpp | 2 +- src/d/actor/d_a_obj_rfHole.cpp | 2 +- src/d/actor/d_a_obj_rgate.cpp | 2 +- src/d/actor/d_a_obj_riverrock.cpp | 2 +- src/d/actor/d_a_obj_rock.cpp | 2 +- src/d/actor/d_a_obj_rope_bridge.cpp | 2 +- src/d/actor/d_a_obj_rotBridge.cpp | 2 +- src/d/actor/d_a_obj_rotTrap.cpp | 2 +- src/d/actor/d_a_obj_roten.cpp | 2 +- src/d/actor/d_a_obj_rstair.cpp | 2 +- src/d/actor/d_a_obj_rw.cpp | 2 +- src/d/actor/d_a_obj_sWallShutter.cpp | 2 +- src/d/actor/d_a_obj_saidan.cpp | 2 +- src/d/actor/d_a_obj_sakuita.cpp | 2 +- src/d/actor/d_a_obj_sakuita_rope.cpp | 2 +- src/d/actor/d_a_obj_scannon.cpp | 2 +- src/d/actor/d_a_obj_scannon_crs.cpp | 2 +- src/d/actor/d_a_obj_scannon_ten.cpp | 2 +- src/d/actor/d_a_obj_sekidoor.cpp | 2 +- src/d/actor/d_a_obj_sekizo.cpp | 2 +- src/d/actor/d_a_obj_sekizoa.cpp | 2 +- src/d/actor/d_a_obj_shield.cpp | 2 +- src/d/actor/d_a_obj_sm_door.cpp | 2 +- src/d/actor/d_a_obj_smallkey.cpp | 2 +- src/d/actor/d_a_obj_smgdoor.cpp | 2 +- src/d/actor/d_a_obj_smoke.cpp | 2 +- src/d/actor/d_a_obj_smtile.cpp | 2 +- src/d/actor/d_a_obj_smw_stone.cpp | 2 +- src/d/actor/d_a_obj_snowEffTag.cpp | 2 +- src/d/actor/d_a_obj_snow_soup.cpp | 2 +- src/d/actor/d_a_obj_so.cpp | 2 +- src/d/actor/d_a_obj_spinLift.cpp | 2 +- src/d/actor/d_a_obj_ss_drink.cpp | 2 +- src/d/actor/d_a_obj_ss_item.cpp | 2 +- src/d/actor/d_a_obj_stairBlock.cpp | 2 +- src/d/actor/d_a_obj_stick.cpp | 6 +-- src/d/actor/d_a_obj_stone.cpp | 16 +++---- src/d/actor/d_a_obj_stoneMark.cpp | 2 +- src/d/actor/d_a_obj_stopper.cpp | 2 +- src/d/actor/d_a_obj_stopper2.cpp | 2 +- src/d/actor/d_a_obj_suisya.cpp | 2 +- src/d/actor/d_a_obj_sw.cpp | 2 +- src/d/actor/d_a_obj_swBallA.cpp | 2 +- src/d/actor/d_a_obj_swBallB.cpp | 2 +- src/d/actor/d_a_obj_swBallC.cpp | 2 +- src/d/actor/d_a_obj_swLight.cpp | 6 +-- src/d/actor/d_a_obj_swchain.cpp | 6 +-- src/d/actor/d_a_obj_swhang.cpp | 2 +- src/d/actor/d_a_obj_sword.cpp | 2 +- src/d/actor/d_a_obj_swpropeller.cpp | 2 +- src/d/actor/d_a_obj_swpush.cpp | 9 ++-- src/d/actor/d_a_obj_swpush2.cpp | 4 +- src/d/actor/d_a_obj_swpush5.cpp | 2 +- src/d/actor/d_a_obj_swspinner.cpp | 2 +- src/d/actor/d_a_obj_swturn.cpp | 2 +- src/d/actor/d_a_obj_syRock.cpp | 2 +- src/d/actor/d_a_obj_szbridge.cpp | 2 +- src/d/actor/d_a_obj_taFence.cpp | 2 +- src/d/actor/d_a_obj_table.cpp | 4 +- src/d/actor/d_a_obj_takaraDai.cpp | 2 +- src/d/actor/d_a_obj_tatigi.cpp | 2 +- src/d/actor/d_a_obj_ten.cpp | 2 +- src/d/actor/d_a_obj_testcube.cpp | 2 +- src/d/actor/d_a_obj_tgake.cpp | 2 +- src/d/actor/d_a_obj_thashi.cpp | 2 +- src/d/actor/d_a_obj_thdoor.cpp | 2 +- src/d/actor/d_a_obj_timeFire.cpp | 2 +- src/d/actor/d_a_obj_timer.cpp | 8 +--- src/d/actor/d_a_obj_tks.cpp | 2 +- src/d/actor/d_a_obj_tmoon.cpp | 2 +- src/d/actor/d_a_obj_toaru_maki.cpp | 2 +- src/d/actor/d_a_obj_toby.cpp | 4 +- src/d/actor/d_a_obj_tobyhouse.cpp | 2 +- src/d/actor/d_a_obj_togeTrap.cpp | 2 +- src/d/actor/d_a_obj_tombo.cpp | 2 +- src/d/actor/d_a_obj_tornado.cpp | 2 +- src/d/actor/d_a_obj_tornado2.cpp | 2 +- src/d/actor/d_a_obj_tp.cpp | 2 +- src/d/actor/d_a_obj_treesh.cpp | 2 +- src/d/actor/d_a_obj_twGate.cpp | 2 +- src/d/actor/d_a_obj_udoor.cpp | 2 +- src/d/actor/d_a_obj_usaku.cpp | 2 +- src/d/actor/d_a_obj_vground.cpp | 2 +- src/d/actor/d_a_obj_volcball.cpp | 2 +- src/d/actor/d_a_obj_volcbom.cpp | 12 ++--- src/d/actor/d_a_obj_warp_kbrg.cpp | 2 +- src/d/actor/d_a_obj_warp_obrg.cpp | 2 +- src/d/actor/d_a_obj_waterGate.cpp | 2 +- src/d/actor/d_a_obj_waterPillar.cpp | 2 +- src/d/actor/d_a_obj_waterfall.cpp | 2 +- src/d/actor/d_a_obj_wchain.cpp | 2 +- src/d/actor/d_a_obj_wdStick.cpp | 2 +- src/d/actor/d_a_obj_web0.cpp | 2 +- src/d/actor/d_a_obj_web1.cpp | 2 +- src/d/actor/d_a_obj_well_cover.cpp | 2 +- src/d/actor/d_a_obj_wflag.cpp | 2 +- src/d/actor/d_a_obj_wind_stone.cpp | 2 +- src/d/actor/d_a_obj_window.cpp | 2 +- src/d/actor/d_a_obj_wood_pendulum.cpp | 2 +- src/d/actor/d_a_obj_wood_statue.cpp | 2 +- src/d/actor/d_a_obj_wsword.cpp | 2 +- src/d/actor/d_a_obj_yel_bag.cpp | 2 +- src/d/actor/d_a_obj_yobikusa.cpp | 2 +- src/d/actor/d_a_obj_yousei.cpp | 4 +- src/d/actor/d_a_obj_ystone.cpp | 2 +- src/d/actor/d_a_obj_zcloth.cpp | 2 +- src/d/actor/d_a_obj_zdoor.cpp | 2 +- src/d/actor/d_a_obj_zrTurara.cpp | 2 +- src/d/actor/d_a_obj_zrTuraraRock.cpp | 6 +-- src/d/actor/d_a_obj_zraMark.cpp | 2 +- src/d/actor/d_a_obj_zra_freeze.cpp | 2 +- src/d/actor/d_a_obj_zra_rock.cpp | 2 +- src/d/actor/d_a_passer_mng.cpp | 2 +- src/d/actor/d_a_path_line.cpp | 2 +- src/d/actor/d_a_peru.cpp | 2 +- src/d/actor/d_a_player.cpp | 2 - src/d/actor/d_a_ppolamp.cpp | 2 +- src/d/actor/d_a_scene_exit.cpp | 2 +- src/d/actor/d_a_scene_exit2.cpp | 2 +- src/d/actor/d_a_set_bgobj.cpp | 2 +- src/d/actor/d_a_shop_item.cpp | 2 +- src/d/actor/d_a_skip_2D.cpp | 2 +- src/d/actor/d_a_spinner.cpp | 2 +- src/d/actor/d_a_sq.cpp | 2 +- src/d/actor/d_a_startAndGoal.cpp | 2 +- src/d/actor/d_a_suspend.cpp | 2 +- src/d/actor/d_a_swBall.cpp | 2 +- src/d/actor/d_a_swLBall.cpp | 2 +- src/d/actor/d_a_swTime.cpp | 2 +- src/d/actor/d_a_swc00.cpp | 2 +- src/d/actor/d_a_swhit0.cpp | 2 +- src/d/actor/d_a_tag_CstaSw.cpp | 2 +- src/d/actor/d_a_tag_Lv6Gate.cpp | 6 +-- src/d/actor/d_a_tag_Lv7Gate.cpp | 6 +-- src/d/actor/d_a_tag_Lv8Gate.cpp | 2 +- src/d/actor/d_a_tag_TWgate.cpp | 2 +- src/d/actor/d_a_tag_ajnot.cpp | 2 +- src/d/actor/d_a_tag_allmato.cpp | 2 +- src/d/actor/d_a_tag_arena.cpp | 2 +- src/d/actor/d_a_tag_assistance.cpp | 2 +- src/d/actor/d_a_tag_attack_item.cpp | 2 +- src/d/actor/d_a_tag_attention.cpp | 2 +- src/d/actor/d_a_tag_bottle_item.cpp | 2 +- src/d/actor/d_a_tag_camera.cpp | 2 +- src/d/actor/d_a_tag_chgrestart.cpp | 2 +- src/d/actor/d_a_tag_chkpoint.cpp | 2 +- src/d/actor/d_a_tag_csw.cpp | 2 +- src/d/actor/d_a_tag_escape.cpp | 2 +- src/d/actor/d_a_tag_event.cpp | 2 +- src/d/actor/d_a_tag_evt.cpp | 2 +- src/d/actor/d_a_tag_evtarea.cpp | 2 +- src/d/actor/d_a_tag_evtmsg.cpp | 2 +- src/d/actor/d_a_tag_firewall.cpp | 2 +- src/d/actor/d_a_tag_gra.cpp | 2 +- src/d/actor/d_a_tag_gstart.cpp | 2 +- src/d/actor/d_a_tag_guard.cpp | 2 +- src/d/actor/d_a_tag_hinit.cpp | 2 +- src/d/actor/d_a_tag_hjump.cpp | 2 +- src/d/actor/d_a_tag_howl.cpp | 2 +- src/d/actor/d_a_tag_hstop.cpp | 2 +- src/d/actor/d_a_tag_instruction.cpp | 2 +- src/d/actor/d_a_tag_kago_fall.cpp | 2 +- src/d/actor/d_a_tag_kmsg.cpp | 34 ++++++++----- src/d/actor/d_a_tag_lantern.cpp | 5 +- src/d/actor/d_a_tag_lightball.cpp | 2 +- src/d/actor/d_a_tag_lv2prchk.cpp | 2 +- src/d/actor/d_a_tag_lv5soup.cpp | 2 +- src/d/actor/d_a_tag_lv6CstaSw.cpp | 2 +- src/d/actor/d_a_tag_magne.cpp | 2 +- src/d/actor/d_a_tag_mhint.cpp | 2 +- src/d/actor/d_a_tag_mist.cpp | 2 +- src/d/actor/d_a_tag_mmsg.cpp | 2 +- src/d/actor/d_a_tag_msg.cpp | 5 +- src/d/actor/d_a_tag_mstop.cpp | 2 +- src/d/actor/d_a_tag_mwait.cpp | 2 +- src/d/actor/d_a_tag_myna2.cpp | 2 +- src/d/actor/d_a_tag_myna_light.cpp | 2 +- src/d/actor/d_a_tag_pachi.cpp | 2 +- src/d/actor/d_a_tag_poFire.cpp | 2 +- src/d/actor/d_a_tag_push.cpp | 2 +- src/d/actor/d_a_tag_qs.cpp | 2 +- src/d/actor/d_a_tag_ret_room.cpp | 2 +- src/d/actor/d_a_tag_river_back.cpp | 3 +- src/d/actor/d_a_tag_rmbit_sw.cpp | 2 +- src/d/actor/d_a_tag_schedule.cpp | 2 +- src/d/actor/d_a_tag_setBall.cpp | 2 +- src/d/actor/d_a_tag_setrestart.cpp | 2 +- src/d/actor/d_a_tag_shop_camera.cpp | 2 +- src/d/actor/d_a_tag_shop_item.cpp | 2 +- src/d/actor/d_a_tag_smk_emt.cpp | 2 +- src/d/actor/d_a_tag_spinner.cpp | 2 +- src/d/actor/d_a_tag_sppath.cpp | 2 +- src/d/actor/d_a_tag_spring.cpp | 2 +- src/d/actor/d_a_tag_ss_drink.cpp | 2 +- src/d/actor/d_a_tag_statue_evt.cpp | 2 +- src/d/actor/d_a_tag_stream.cpp | 2 +- src/d/actor/d_a_tag_telop.cpp | 2 +- src/d/actor/d_a_tag_theB_hint.cpp | 2 +- src/d/actor/d_a_tag_wara_howl.cpp | 2 +- src/d/actor/d_a_tag_watchge.cpp | 2 +- src/d/actor/d_a_tag_waterfall.cpp | 2 +- src/d/actor/d_a_tag_wljump.cpp | 2 +- src/d/actor/d_a_tag_yami.cpp | 2 +- src/d/actor/d_a_talk.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 2 +- src/d/actor/d_a_tbox2.cpp | 2 +- src/d/actor/d_a_tboxSw.cpp | 2 +- src/d/actor/d_a_title.cpp | 2 +- src/d/actor/d_a_vrbox.cpp | 2 +- src/d/actor/d_a_vrbox2.cpp | 5 +- src/d/actor/d_a_warp_bug.cpp | 2 +- src/d/actor/d_a_ykgr.cpp | 2 +- src/d/d_a_obj.cpp | 3 -- src/d/d_attention.cpp | 10 +--- src/d/d_bg_s_acch.cpp | 3 +- src/d/d_bg_s_movebg_actor.cpp | 3 -- src/d/d_bg_w.cpp | 4 -- src/d/d_camera.cpp | 23 ++++----- src/d/d_cc_s.cpp | 12 ----- src/d/d_com_static.cpp | 7 --- src/d/d_debug_viewer.cpp | 2 +- src/d/d_demo.cpp | 6 --- src/d/d_envse.cpp | 2 +- src/d/d_ev_camera.cpp | 8 +--- src/d/d_gameover.cpp | 30 +++++++----- src/d/d_k_wmark.cpp | 2 +- src/d/d_k_wpillar.cpp | 2 +- src/d/d_kankyo.cpp | 19 ++------ src/d/d_ky_thunder.cpp | 2 +- src/d/d_kyeff.cpp | 2 +- src/d/d_kyeff2.cpp | 2 +- src/d/d_map_path_dmap.cpp | 2 - src/d/d_menu_fmap.cpp | 5 +- src/d/d_menu_fmap2D.cpp | 2 +- src/d/d_menu_window.cpp | 2 +- src/d/d_meter2.cpp | 4 +- src/d/d_meter2_draw.cpp | 9 ---- src/d/d_meter2_info.cpp | 3 -- src/d/d_meter_HIO.cpp | 2 +- src/d/d_msg_class.cpp | 9 ++-- src/d/d_msg_object.cpp | 2 +- src/d/d_msg_string_base.cpp | 3 -- src/d/d_ovlp_fade.cpp | 16 +++---- src/d/d_ovlp_fade2.cpp | 2 +- src/d/d_ovlp_fade3.cpp | 2 +- src/d/d_pane_class.cpp | 3 -- src/d/d_particle.cpp | 21 -------- src/d/d_particle_copoly.cpp | 3 -- src/d/d_s_logo.cpp | 16 +++---- src/d/d_s_menu.cpp | 10 ++-- src/d/d_s_name.cpp | 10 ++-- src/d/d_s_play.cpp | 8 ++-- src/d/d_s_room.cpp | 4 +- src/d/d_s_title.cpp | 4 +- src/d/d_save.cpp | 4 +- src/d/d_shop_camera.cpp | 6 --- src/d/d_stage.cpp | 24 ++++------ src/d/d_timer.cpp | 4 +- src/f_op/f_op_actor.cpp | 34 ++++++------- src/f_op/f_op_actor_mng.cpp | 5 ++ src/f_op/f_op_scene.cpp | 8 ++-- src/f_pc/f_pc_debug_sv.cpp | 2 +- src/f_pc/f_pc_layer.cpp | 2 +- src/m_Do/m_Do_audio.cpp | 3 -- src/m_Do/m_Do_ext.cpp | 18 ------- src/m_Do/m_Do_graphic.cpp | 10 ++-- src/m_Do/m_Do_main.cpp | 3 -- src/m_Do/m_Do_mtx.cpp | 2 +- src/revolution/dvd/dvdidutils.c | 2 +- 887 files changed, 1174 insertions(+), 1727 deletions(-) diff --git a/.clangd b/.clangd index 2d315f9d48..86f64c3e3a 100644 --- a/.clangd +++ b/.clangd @@ -1,10 +1,18 @@ CompileFlags: Add: [ "-Wno-c++11-compat-deprecated-writable-strings", - "-Wno-extern-initializer", "-Wno-multichar", "-fdeclspec", "-Wno-c++11-extensions", + "-Wuninitialized", + "-Wsometimes-uninitialized", + "-Wlogical-op-parentheses", + "-Wbitwise-op-parentheses", + # "-Wunused-variable", + # "-Wunused-but-set-variable", + "-Wunused-parameter", + "-Wunused-but-set-parameter", + "-Wself-assign", ] Diagnostics: Suppress: diff --git a/.vscode/settings.json b/.vscode/settings.json index 7ade75da5a..a4ee63fb46 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -49,6 +49,7 @@ "clangd.arguments": [ "--function-arg-placeholders=0", "-header-insertion=never", + // "--log=verbose", ], "clangd.detectExtensionConflicts": true, } diff --git a/configure.py b/configure.py index e97f5cc659..1cdcf6c728 100755 --- a/configure.py +++ b/configure.py @@ -287,11 +287,9 @@ if config.version in USE_REVOLUTION_SDK_VERSIONS: # Debug flags if args.debug: # Or -sym dwarf-2 for Wii compilers - cflags_base.extend(["-sym on", "-DDEBUG=1", "-DDEBUG_DEFINED=1", "-DNDEBUG_DEFINED=0"]) + cflags_base.extend(["-sym on", "-DDEBUG=1"]) elif config.version == "ShieldD": - cflags_base.extend(["-DDEBUG=1", "-DDEBUG_DEFINED=1", "-DNDEBUG_DEFINED=0"]) -else: - cflags_base.extend(["-DNDEBUG=1", "-DNDEBUG_DEFINED=1", "-DDEBUG_DEFINED=0"]) + cflags_base.extend(["-DDEBUG=1"]) # Warning flags if args.warn == "all": diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index 2fcb281f06..47a438ddb8 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -270,7 +270,11 @@ struct TLinkList_factory : public TLinkList { template TLinkList_factory::~TLinkList_factory() { +#ifdef __MWERKS__ JGADGET_ASSERTWARN(934, empty()); +#else + JGADGET_ASSERTWARN(934, this->empty()); +#endif } template diff --git a/include/JSystem/JSystem.h b/include/JSystem/JSystem.h index 82231fe4d4..2b2f1143d0 100644 --- a/include/JSystem/JSystem.h +++ b/include/JSystem/JSystem.h @@ -1,7 +1,7 @@ #ifndef JSYSTEM_H #define JSYSTEM_H -#ifdef __MWERKS__ +#if __MWERKS__ && !defined(DECOMPCTX) #include "JSystem/JSystem.mch" // IWYU pragma: export #else #include "JSystem/JSystem.pch" // IWYU pragma: export diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 819c77c05e..473a8e8f99 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -79,7 +79,7 @@ public: /* 0x6C */ const IsLeadByte_func* mIsLeadByte; }; -extern u8 const JUTResFONT_Ascfont_fix12[16736]; -extern u8 const JUTResFONT_Ascfont_fix16[16736]; +extern u8 const JUTResFONT_Ascfont_fix12[]; +extern u8 const JUTResFONT_Ascfont_fix16[]; #endif /* JUTRESFONT_H */ diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index f8802dfc25..0ad2f717a7 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -403,24 +403,24 @@ public: virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const { return false; } - /* vt[4] */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const = 0; - /* vt[5] */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const = 0; - /* vt[6] */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const = 0; - /* vt[7] */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const = 0; - /* vt[8] */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const = 0; - /* vt[9] */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const = 0; - /* 802649E0 vt[10]*/ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const { return false; } - /* vt[11]*/ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const = 0; - /* vt[12]*/ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const = 0; - /* vt[13]*/ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const = 0; - /* vt[14]*/ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const = 0; - /* vt[15]*/ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const = 0; - /* vt[16]*/ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const = 0; - /* 80084E38 vt[17]*/ virtual const cXyz& GetCoCP() const { return m_virtual_center; } - /* 80084E2C vt[18]*/ virtual cXyz& GetCoCP() { return m_virtual_center; } - /* vt[19]*/ virtual void CalcAabBox() = 0; - /* vt[20]*/ virtual bool GetNVec(cXyz const&, cXyz*) const = 0; - /* 80263A64 vt[21]*/ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; + /* vt[4] */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const = 0; + /* vt[5] */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const = 0; + /* vt[6] */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const = 0; + /* vt[7] */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const = 0; + /* vt[8] */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const = 0; + /* vt[9] */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const = 0; + /* vt[10]*/ virtual bool CrossCo(cCcD_ShapeAttr const&, f32*) const { return false; } + /* vt[11]*/ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const = 0; + /* vt[12]*/ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const = 0; + /* vt[13]*/ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const = 0; + /* vt[14]*/ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const = 0; + /* vt[15]*/ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const = 0; + /* vt[16]*/ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const = 0; + /* vt[17]*/ virtual const cXyz& GetCoCP() const { return m_virtual_center; } + /* vt[18]*/ virtual cXyz& GetCoCP() { return m_virtual_center; } + /* vt[19]*/ virtual void CalcAabBox() = 0; + /* vt[20]*/ virtual bool GetNVec(cXyz const&, cXyz*) const = 0; + /* vt[21]*/ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; cM3dGAab& GetWorkAab() { return mAab; } cM3dGAab const& GetWorkAab() const { return mAab; } diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h index b82cd29a33..334f7351d8 100644 --- a/include/SSystem/SComponent/c_cc_s.h +++ b/include/SSystem/SComponent/c_cc_s.h @@ -46,7 +46,7 @@ public: virtual void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*); void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*); void SetCoCommonHitInf(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); - /* 80265750 vt[3]*/ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); + /* vt[3]*/ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32); void CalcArea(); void Move(); void DrawClear(); diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h index 740ce2cfdb..135e1275b1 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h @@ -3,4 +3,8 @@ #include "dolphin/types.h" +void* TRK_memset(void* dest, int val, size_t count); +void* TRK_memcpy(void* dest, const void* src, size_t count); +void TRK_fill_mem(void* dest, int val, size_t count); + #endif /* METROTRK_PORTABLE_MEM_TRK_H */ diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h index d06794c1e7..ff14b43261 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h @@ -11,6 +11,25 @@ DSError TRKSetBufferPosition(TRKBuffer* msg, u32 pos); void* TRKGetBuffer(int); void TRKResetBuffer(TRKBuffer* msg, BOOL keepData); +DSError TRKAppendBuffer1_ui16(TRKBuffer* buffer, const u16 data); +DSError TRKAppendBuffer1_ui32(TRKBuffer* buffer, const u32 data); +DSError TRKAppendBuffer1_ui64(TRKBuffer* buffer, const u64 data); + +DSError TRKAppendBuffer_ui8(TRKBuffer* buffer, const u8* data, int count); +DSError TRKAppendBuffer_ui16(TRKBuffer* buffer, const u16* data, int count); +DSError TRKAppendBuffer_ui32(TRKBuffer* buffer, const u32* data, int count); +DSError TRKAppendBuffer_ui64(TRKBuffer* buffer, const u64* data, int count); + +DSError TRKReadBuffer1_ui8(TRKBuffer* buffer, u8* data); +DSError TRKReadBuffer1_ui16(TRKBuffer* buffer, u16* data); +DSError TRKReadBuffer1_ui32(TRKBuffer* buffer, u32* data); +DSError TRKReadBuffer1_ui64(TRKBuffer* buffer, u64* data); + +DSError TRKReadBuffer_ui8(TRKBuffer* buffer, u8* data, int count); +DSError TRKReadBuffer_ui16(TRKBuffer* buffer, u16* data, int count); +DSError TRKReadBuffer_ui32(TRKBuffer* buffer, u32* data, int count); +DSError TRKReadBuffer_ui64(TRKBuffer* buffer, u64* data, int count); + #ifdef __cplusplus } #endif diff --git a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h index 9f112f2e64..d491ced086 100644 --- a/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h +++ b/include/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h @@ -1,6 +1,7 @@ #ifndef METROTRK_PORTABLE_MUTEX_TRK_H #define METROTRK_PORTABLE_MUTEX_TRK_H +#include "revolution/types.h" u8 TRKReleaseMutex(); u8 TRKAcquireMutex(); diff --git a/include/d/actor/d_a_npc_cdn3.h b/include/d/actor/d_a_npc_cdn3.h index d20ddfdce5..890f362862 100644 --- a/include/d/actor/d_a_npc_cdn3.h +++ b/include/d/actor/d_a_npc_cdn3.h @@ -137,7 +137,7 @@ public: } void setSpeed(f32 param_0, f32 param_1, f32* param_2, int param_3) { - (void)param_3; + UNUSED(param_3); f32 target = field_0xb5c * (param_1 * field_0xb5c); f32 step = field_0xb5c * (param_0 * field_0xb5c); if (param_1 < target) { diff --git a/include/d/actor/d_a_npc_tk.h b/include/d/actor/d_a_npc_tk.h index 15489c9284..34833f7e0d 100644 --- a/include/d/actor/d_a_npc_tk.h +++ b/include/d/actor/d_a_npc_tk.h @@ -29,33 +29,26 @@ public: void setActionMode(int); f32 setAddCalcSpeedXZ(cXyz&, cXyz const&, f32, f32, f32); cXyz chaseTargetPos(cXyz, f32, f32, s16); - /* 80B01D84 */ fopAc_ac_c* getMasterPointer(); void setMasterShoulder(cXyz*); void setAwayAction(int); void setFlySE(); void executeFly(); void initPerchDemo(int); - /* 80B02B5C */ bool executePerchDemo(int); void executePerch(); void executeHandOn(); - /* 80B039A8 */ bool checkWaterSurface(f32); void executeAttack(); void executeAway(); void setCarryActorMtx(); - /* 80B04F64 */ f32 getTakePosY(); - /* 80B04FA8 */ f32 getTakeOffPosY(); void executeBack(); - /* 80B05BD0 */ cXyz getHanjoHandPos(); void executeStayHanjo(); void executeAttackLink(); void executeBackHanjo(); - /* 80B07114 */ bool checkAttackDemo(); void executeAttackDemo(); void executeBackHanjoDemo(); @@ -74,7 +67,6 @@ public: void cc_set(); int execute(); int _delete(); - /* 80B0B9AC */ int ctrlJoint(J3DJoint*, J3DModel*); static int JointCallBack(J3DJoint*, int); int CreateHeap(); diff --git a/include/d/actor/d_a_obj_lv6SwGate.h b/include/d/actor/d_a_obj_lv6SwGate.h index 9809cbcd63..964c073c1d 100644 --- a/include/d/actor/d_a_obj_lv6SwGate.h +++ b/include/d/actor/d_a_obj_lv6SwGate.h @@ -57,7 +57,6 @@ STATIC_ASSERT(sizeof(daLv6SwGate_c) == 0x14f8); class daLv6SwGate_HIO_c : public fOpAcm_HIO_entry_c { public: - /* 80C73F0C */ daLv6SwGate_HIO_c(); void genMessage(JORMContext*); diff --git a/include/d/actor/d_a_obj_stone.h b/include/d/actor/d_a_obj_stone.h index bad3bb5d61..b5f4da8c39 100644 --- a/include/d/actor/d_a_obj_stone.h +++ b/include/d/actor/d_a_obj_stone.h @@ -81,7 +81,7 @@ private: /* 0x094E */ bool mIsInWater; /* 0x094F */ u8 field_0x094f; /* 0x0950 */ u8 field_0x0950; - /* 0x0951 */ u8 field_0x0951; + /* 0x0951 */ bool field_0x0951; /* 0x0954 */ u32 field_0x0954; /* 0x0954 */ u32 field_0x0958; /* 0x0954 */ u32 field_0x095c; diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index f5d7579c97..712aa3c47a 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -195,7 +195,7 @@ public: f32 GetCx() const { return pm_pos->x; } f32 GetCz() const { return pm_pos->z; } -public: +private: /* 0x02C */ u32 m_flags; /* 0x030 */ cXyz* pm_pos; /* 0x034 */ cXyz* pm_old_pos; @@ -231,9 +231,11 @@ public: /* 0x0E4 */ cXyz unk_0xe4; #endif /* 0x0D8 */ f32 field_0xd8; +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_com_inf_game.h b/include/d/d_com_inf_game.h index 388e2d6a4d..df64a28249 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -840,7 +840,7 @@ public: ~dComIfG_inf_c() {} void ct(); void createBaseCsr(); - dComIfG_play_c& getPlay() { return play; } + dComIfG_play_c& getPlay() { return play; } // fake inline #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG class baseCsr_c : public mDoGph_gInf_c::csr_c { diff --git a/include/d/d_debug_camera.h b/include/d/d_debug_camera.h index 51d11fd0e5..854cf0ecfa 100644 --- a/include/d/d_debug_camera.h +++ b/include/d/d_debug_camera.h @@ -24,7 +24,7 @@ public: /* 0x1C */ f32 mBank; struct { /* 0x20 */ fpc_ProcID id; - /* 0x24 */ char name[8]; + /* 0x24 */ char name[dStage_NAME_LENGTH]; } mActorInfo; /* 0x2C */ int mAction; /* 0x30 */ int mTimer; diff --git a/include/d/d_menu_fmap.h b/include/d/d_menu_fmap.h index bd95772c59..2b450aa577 100644 --- a/include/d/d_menu_fmap.h +++ b/include/d/d_menu_fmap.h @@ -1,6 +1,7 @@ #ifndef D_MENU_D_MENU_FMAP_H #define D_MENU_D_MENU_FMAP_H +#include "JSystem/JHostIO/JORReflexible.h" #include "SSystem/SComponent/c_xyz.h" #include "d/d_menu_map_common.h" #include "d/d_msg_flow.h" diff --git a/include/d/d_menu_fmap_map.h b/include/d/d_menu_fmap_map.h index dfb1197848..2879d03d02 100644 --- a/include/d/d_menu_fmap_map.h +++ b/include/d/d_menu_fmap_map.h @@ -141,13 +141,13 @@ public: virtual void genMessage(JORMContext*); virtual u32 addString(char* param_1, u32 param_2, u32 param_3) { return field_0xc.addString(param_1, param_2, param_3); } virtual u32 addData(char* param_1, u32 param_2, u32 param_3) { - (void)param_2; - (void)param_3; + UNUSED(param_2); + UNUSED(param_3); memcpy(param_1, dMfm_HIO_prm_res_dst_s::m_res, 366); return 366; } virtual void copyReadBufToData(const char* param_1, s32 param_2) { - (void)param_2; + UNUSED(param_2); field_0xc.copyBufToHio(param_1); } virtual u32 addStringBinary(char* param_1, u32 param_2, u32 param_3) { return field_0xc.addStringBinary(param_1, param_2, param_3); } diff --git a/include/d/d_meter2_info.h b/include/d/d_meter2_info.h index 45f165341b..4738c7faf6 100644 --- a/include/d/d_meter2_info.h +++ b/include/d/d_meter2_info.h @@ -124,10 +124,7 @@ public: void resetPauseStatus() { mPauseStatus = 0; } u8 getPauseStatus() { return mPauseStatus; } bool isGameStatus(int i_status) { return (mGameStatus & (u16)i_status) != 0 ? true : false; } - bool isTouchKeyCheck(int i_status) { return mTouchKeyCheck & (1 << i_status); } - - // fake function, should be isTouchKeyCheck - bool isTouchKeyCheck_alt(int i_status) { return (mTouchKeyCheck >> i_status) & 1; } + bool isTouchKeyCheck(int i_status) { return mTouchKeyCheck & (u16)(1 << i_status) ? true : false; } void setMapKeyDirection(u16 i_direction) { mMapKeyDirection = i_direction; } bool isSub2DStatus(int i_flag) { return (mSub2DStatus & (u16)(1 << i_flag)) != 0 ? true : false; } @@ -486,11 +483,6 @@ inline bool dMeter2Info_isTouchKeyCheck(int i_status) { return g_meter2_info.isTouchKeyCheck(i_status); } -// fake function, should be dMeter2Info_isTouchKeyCheck -inline bool dMeter2Info_isTouchKeyCheck_alt(int i_status) { - return g_meter2_info.isTouchKeyCheck_alt(i_status); -} - inline void dMeter2Info_setMapKeyDirection(u16 i_direction) { g_meter2_info.setMapKeyDirection(i_direction); } diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 848e7bd21e..4afb1e9afb 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -586,7 +586,7 @@ public: /* vt[38] */ virtual void setVrboxcolNumInfo(int i_VrboxcolNumInfo) { mVrboxcolNumInfo = i_VrboxcolNumInfo; } /* vt[39] */ virtual int getVrboxcolNumInfo(void) const { return mVrboxcolNumInfo; } /* vt[42] */ virtual void setLightVecInfo(stage_pure_lightvec_info_class* i_LightVecInfo) { - (void)i_LightVecInfo; + UNUSED(i_LightVecInfo); dStage_SetErrorStage(); OSReport("stage non LightVec data !!\n"); JUT_ASSERT(3003, FALSE); @@ -597,7 +597,7 @@ public: return NULL; } /* vt[44] */ virtual void setLightVecInfoNum(int i_LightVecInfoNum) { - (void)i_LightVecInfoNum; + UNUSED(i_LightVecInfoNum); dStage_SetErrorStage(); OSReport("stage non LightVecNum data !!\n"); JUT_ASSERT(3014, FALSE); @@ -628,7 +628,7 @@ public: /* vt[62] */ virtual void setMapEventInfo(dStage_MapEventInfo_c* i_MapEventInfo) { mMapEventInfo = i_MapEventInfo; } /* vt[63] */ virtual dStage_MapEventInfo_c* getMapEventInfo(void) const { return mMapEventInfo; } /* vt[64] */ virtual void setFileList2Info(dStage_FileList2_dt_c* list) { - (void)list; + UNUSED(list); dStage_SetErrorStage(); OSReport("stage non filelist2 data!\n"); JUT_ASSERT(3123, FALSE); @@ -639,7 +639,7 @@ public: return NULL; } /* vt[66] */ virtual void setFileListInfo(dStage_FileList_dt_c* list) { - (void)list; + UNUSED(list); dStage_SetErrorStage(); OSReport("stage non filelist data!\n"); JUT_ASSERT(3138, FALSE); @@ -661,7 +661,7 @@ public: /* vt[77] */ virtual void resetOldMulti(void); /* vt[78] */ virtual dStage_Multi_c* getOldMulti(void) const { return mOldMulti; } /* vt[79] */ virtual void setLbnk(dStage_Lbnk_c* lbnk) { - (void)lbnk; + UNUSED(lbnk); dStage_SetErrorStage(); OSReport("stage non Lbnk data!\n"); JUT_ASSERT(3231, FALSE); @@ -746,7 +746,7 @@ public: virtual void setPlayerNum(u16 i_PlayerNum) { mPlayerNum = i_PlayerNum; } virtual u16 getPlayerNum(void) const { return mPlayerNum; } virtual void setRoom(roomRead_class* i_Room) { - (void)i_Room; + UNUSED(i_Room); dStage_SetErrorRoom(); OSReport("Room non room data !!\n"); JUT_ASSERT(2095, FALSE); @@ -762,7 +762,7 @@ public: virtual void setMapInfoBase(stage_map_info_dummy_class* i_MapInfoBase) { mMapInfoBase = i_MapInfoBase; } virtual stage_map_info_dummy_class* getMapInfoBase(void) const { return mMapInfoBase; } virtual void setPaletteInfo(stage_palette_info_class* i_PaletteInfo) { - (void)i_PaletteInfo; + UNUSED(i_PaletteInfo); dStage_SetErrorRoom(); OSReport("Room non palet data !!\n"); JUT_ASSERT(2126, FALSE); @@ -773,7 +773,7 @@ public: return NULL; } virtual void setPselectInfo(stage_pselect_info_class* i_PselectInfo) { - (void)i_PselectInfo; + UNUSED(i_PselectInfo); dStage_SetErrorRoom(); OSReport("Room non pselect data !!\n"); JUT_ASSERT(2137, FALSE); @@ -784,7 +784,7 @@ public: return NULL; } virtual void setEnvrInfo(stage_envr_info_class* i_EnvrInfo) { - (void)i_EnvrInfo; + UNUSED(i_EnvrInfo); dStage_SetErrorRoom(); OSReport("Room non envr data !!\n"); JUT_ASSERT(2148, FALSE); @@ -799,7 +799,7 @@ public: virtual void setVrboxcolInfo(stage_vrboxcol_info_class* i_VrboxcolInfo) { mVrboxcolInfo = i_VrboxcolInfo; } virtual stage_vrboxcol_info_class* getVrboxcolInfo(void) const { return mVrboxcolInfo; } virtual void setPlightInfo(stage_plight_info_class* i_PlightInfo) { - (void)i_PlightInfo; + UNUSED(i_PlightInfo); dStage_SetErrorRoom(); OSReport("Room non plight data !!\n"); JUT_ASSERT(2174, FALSE); @@ -810,7 +810,7 @@ public: return NULL; } virtual void setPaletteNumInfo(int i_PaletteNumInfo) { - (void)i_PaletteNumInfo; + UNUSED(i_PaletteNumInfo); dStage_SetErrorRoom(); OSReport("Room non palette num data !!\n"); JUT_ASSERT(2186, FALSE); @@ -821,7 +821,7 @@ public: return NULL; } virtual void setPselectNumInfo(int i_PselectNumInfo) { - (void)i_PselectNumInfo; + UNUSED(i_PselectNumInfo); dStage_SetErrorRoom(); OSReport("Room non pselect num data !!\n"); JUT_ASSERT(2197, FALSE); @@ -832,7 +832,7 @@ public: return NULL; } virtual void setEnvrNumInfo(int i_EnvrNumInfo) { - (void)i_EnvrNumInfo; + UNUSED(i_EnvrNumInfo); dStage_SetErrorRoom(); OSReport("Room non envr num data !!\n"); JUT_ASSERT(2208, FALSE); @@ -847,7 +847,7 @@ public: virtual void setVrboxcolNumInfo(int i_VrboxcolNumInfo) { mVrboxcolNumInfo = i_VrboxcolNumInfo; } virtual int getVrboxcolNumInfo(void) const { return mVrboxcolNumInfo; } virtual void setPlightNumInfo(int i_PlightNumInfo) { - (void)i_PlightNumInfo; + UNUSED(i_PlightNumInfo); dStage_SetErrorRoom(); OSReport("Room non plight num data !!\n"); JUT_ASSERT(2223, FALSE); @@ -862,7 +862,7 @@ public: virtual void setLightVecInfoNum(int i_LightVecInfoNum) { mLightVecInfoNum = i_LightVecInfoNum; } virtual int getLightVecInfoNum(void) const { return mLightVecInfoNum; } virtual void setStagInfo(stage_stag_info_class* i_StagInfo) { - (void)i_StagInfo; + UNUSED(i_StagInfo); dStage_SetErrorRoom(); OSReport("Room non stag data !!\n"); JUT_ASSERT(2256, FALSE); @@ -875,7 +875,7 @@ public: virtual void setSclsInfo(stage_scls_info_dummy_class* i_SclsInfo) { mSclsInfo = i_SclsInfo; } virtual stage_scls_info_dummy_class* getSclsInfo(void) const { return mSclsInfo; } virtual void setPntInfo(dStage_dPnt_c* i_PntInfo) { - (void)i_PntInfo; + UNUSED(i_PntInfo); dStage_SetErrorRoom(); OSReport("Room non Pnt data !\n"); JUT_ASSERT(2281, FALSE); @@ -886,7 +886,7 @@ public: return NULL; } virtual void setPathInfo(dStage_dPath_c* i_PathInfo) { - (void)i_PathInfo; + UNUSED(i_PathInfo); dStage_SetErrorRoom(); OSReport("Room non Path data !\n"); JUT_ASSERT(2292, FALSE); @@ -913,7 +913,7 @@ public: virtual void setFloorInfo(dStage_FloorInfo_c* i_FloorInfo) { mFloorInfo = i_FloorInfo; } virtual dStage_FloorInfo_c* getFloorInfo(void) const { return mFloorInfo; } virtual void setMemoryConfig(dStage_MemoryConfig_c* i_MemoryConfig) { - (void)i_MemoryConfig; + UNUSED(i_MemoryConfig); OSReport("Room non memory config data!\n"); JUT_ASSERT(2414, FALSE); } @@ -923,7 +923,7 @@ public: return NULL; } virtual void setMemoryMap(dStage_MemoryMap_c* i_MemoryMap) { - (void)i_MemoryMap; + UNUSED(i_MemoryMap); OSReport("Room non memory map data!\n"); JUT_ASSERT(2433, FALSE); } @@ -933,7 +933,7 @@ public: return NULL; } virtual void setMulti(dStage_Multi_c* i_Multi) { - (void)i_Multi; + UNUSED(i_Multi); OSReport("Room non multi data!\n"); JUT_ASSERT(2452, FALSE); } @@ -960,7 +960,7 @@ public: virtual void setTresure(stage_tresure_class* i_Tresure) { mTresure = i_Tresure; } virtual stage_tresure_class* getTresure(void) const { return mTresure; } virtual void setDMap(dStage_DMap_c* i_DMap) { - (void)i_DMap; + UNUSED(i_DMap); OS_REPORT("Room non DMap data\n"); JUT_ASSERT(2508, FALSE); } @@ -974,7 +974,7 @@ public: virtual void setDoor(stage_tgsc_class* i_Door) { mDoor = i_Door; } virtual stage_tgsc_class* getDoor(void) const { return mDoor; } virtual void setMapPath(void* i_MapPath) { - (void)i_MapPath; + UNUSED(i_MapPath); OSReport("stage non 2d map path data !!\n"); JUT_ASSERT(2557, FALSE); } @@ -984,7 +984,7 @@ public: return NULL; } virtual void setElst(dStage_Elst_c* i_Elst) { - (void)i_Elst; + UNUSED(i_Elst); dStage_SetErrorRoom(); OSReport("Room non envLayserSet data\n"); JUT_ASSERT(2572, FALSE); @@ -1323,6 +1323,8 @@ void dStage_dt_c_roomLoader(void* i_data, dStage_dt_c* stageDt, int param_2); dStage_KeepDoorInfo* dStage_GetKeepDoorInfo(); dStage_KeepDoorInfo* dStage_GetRoomKeepDoorInfo(); void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage); + +#define dStage_NAME_LENGTH 8 const char* dStage_getName(s16 procName, s8 argument); #if VERSION == VERSION_WII_USA_R0 diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index b5a11a6beb..dbf01d374d 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -842,7 +842,7 @@ void fopAcM_showAssert_f(const fopAc_ac_c*, const char*, int, const char*, ...); #define fopAcM_setWarningMessage(...) #endif -void fopAcM_getNameString(const fopAc_ac_c*, char*); +BOOL fopAcM_getNameString(const fopAc_ac_c*, char*); class fopAcM_lc_c { public: diff --git a/include/f_op/f_op_scene.h b/include/f_op/f_op_scene.h index 2da8e5e9ba..a42eee7211 100644 --- a/include/f_op/f_op_scene.h +++ b/include/f_op/f_op_scene.h @@ -2,20 +2,25 @@ #define F_F_OP_SCENE_H_ #include "f_op/f_op_scene_tag.h" +#include "f_pc/f_pc_leaf.h" struct request_of_phase_process_class; class mDoDvdThd_command_c; +struct scene_method_class { + /* 0x00 */ leafdraw_method_class base; +}; + typedef struct scene_process_profile_definition { /* 0x00 */ node_process_profile_definition nase; - /* 0x20 */ process_method_class* submethod; // Subclass methods + /* 0x20 */ scene_method_class* submethod; // Subclass methods /* 0x24 */ u32 unk_0x24; // padding? } scene_process_profile_definition; class scene_class { public: /* 0x000 */ process_node_class base; - /* 0x1AC */ process_method_class* submethod; + /* 0x1AC */ scene_method_class* submethod; /* 0x1B0 */ scene_tag_class scene_tag; }; diff --git a/include/global.h b/include/global.h index 4f2b7a60ad..bd726e2e07 100644 --- a/include/global.h +++ b/include/global.h @@ -44,6 +44,10 @@ #define ROUND(n, a) (((u32)(n) + (a)-1) & ~((a)-1)) #define TRUNC(n, a) (((u32)(n)) & ~((a)-1)) +// Silence unused parameter warnings. +// Necessary for debug matches. +#define UNUSED(x) ((void)(x)) + #ifndef decltype #define decltype __decltype__ #endif @@ -68,6 +72,7 @@ // Silence clangd errors about MWCC PPC intrinsics by declaring them here. extern int __cntlzw(unsigned int); extern int __rlwimi(int, int, int, int, int); +extern void __dcbf(void*, int); extern void __dcbz(void*, int); extern void __sync(); extern int __abs(int); diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h index 5cd89860fb..e558bd7b98 100644 --- a/include/m_Do/m_Do_audio.h +++ b/include/m_Do/m_Do_audio.h @@ -314,7 +314,7 @@ inline void mDoAud_loadStaticWaves() { inline int mDoAud_monsSeStart(u32 i_soundId, const Vec* i_pos, u32 i_actorId, u32 param_3, s8 i_reverb) { - (void)i_actorId; + UNUSED(i_actorId); return Z2GetAudioMgr()->seStart(i_soundId, i_pos, param_3, i_reverb, 1.0f, 1.0f, -1.0f, -1.0f, 0); } diff --git a/src/JSystem/J2DGraph/J2DGrafContext.cpp b/src/JSystem/J2DGraph/J2DGrafContext.cpp index 05a1d89cf5..3f920bc407 100644 --- a/src/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/src/JSystem/J2DGraph/J2DGrafContext.cpp @@ -93,9 +93,6 @@ void J2DGrafContext::place(JGeometry::TBox2 const& bounds) { mScissorBounds = bounds; } -/* 802E9118-802E9234 2E3A58 011C+00 1/1 4/4 0/0 .text - * setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor - */ void J2DGrafContext::setColor(JUtility::TColor colorTL, JUtility::TColor colorTR, JUtility::TColor colorBR, JUtility::TColor colorBL) { mColorTL = colorTL; diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp index 024adef56f..a0229abb69 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -60,9 +60,6 @@ u32 J2DMaterialFactory::countStages(int param_0) const { return uVar3; } -/* 802F2D1C-802F362C 2ED65C 0910+00 0/0 1/1 0/0 .text - * create__18J2DMaterialFactoryCFP11J2DMaterialiUlP15J2DResReferenceP15J2DResReferenceP10JKRArchive - */ J2DMaterial* J2DMaterialFactory::create(J2DMaterial* param_0, int index, u32 param_2, J2DResReference* param_3, J2DResReference* param_4, JKRArchive* param_5) const { diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index 93d2db9c11..9dfb3954d2 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -34,9 +34,6 @@ J2DPrint::J2DPrint(JUTFont* pFont, JUtility::TColor charColor, JUtility::TColor private_initiate(pFont, 0.0f, 0.0f, charColor, gradColor, 0, 0xFFFFFFFF, true); } -/* 802F4394-802F4420 2EECD4 008C+00 0/0 6/6 0/0 .text - * __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor - */ J2DPrint::J2DPrint(JUTFont* pFont, f32 charSpacing, f32 lineSpacing, JUtility::TColor charColor, JUtility::TColor gradColor, JUtility::TColor blackColor, JUtility::TColor whiteColor) { private_initiate(pFont, charSpacing, lineSpacing, charColor, gradColor, blackColor, whiteColor, false); @@ -50,9 +47,6 @@ void J2DPrint::initiate() { } } -/* 802F4468-802F4658 2EEDA8 01F0+00 1/1 0/0 0/0 .text - * private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb - */ void J2DPrint::private_initiate(JUTFont* pFont, f32 charSpacing, f32 lineSpacing, JUtility::TColor charColor, JUtility::TColor gradColor, JUtility::TColor blackColor, JUtility::TColor whiteColor, bool param_7) { @@ -317,7 +311,7 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3, } else { if (param_6) { if (param_3 != NULL) { - mFont->drawChar_scale(mCursorH + (f32)(s16)param_3[someIndex], mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true); + mFont->drawChar_scale(mCursorH + (s16)param_3[someIndex], mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true); } else { mFont->drawChar_scale(mCursorH, mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true); } diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp index 69234af65f..cfd68821e5 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/src/JSystem/J2DGraph/J2DTevs.cpp @@ -108,48 +108,48 @@ J2DTexMtxInfo const j2dDefaultTexMtxInfo = {1, 1, 255, 255, 0.5f, 0.5f, J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo = {{0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f}, 1}; -extern J2DTevStageInfo const j2dDefaultTevStageInfo = { +J2DTevStageInfo const j2dDefaultTevStageInfo = { 4, GX_CC_RASC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_CPREV, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV, GX_CA_RASA, GX_CA_ZERO, GX_CA_ZERO, GX_CA_APREV, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV}; -extern const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = { +const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = { GX_INDTEXSTAGE0, GX_ITB_NONE, GX_ITB_NONE, GX_ITM_OFF, GX_ITW_OFF, GX_ITW_OFF, 0, 0, GX_ITBA_OFF, }; -extern const GXColor j2dDefaultColInfo = {255, 255, 255, 255}; +const GXColor j2dDefaultColInfo = {255, 255, 255, 255}; -extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull = { +const J2DTevOrderInfo j2dDefaultTevOrderInfoNull = { GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR_NULL, 0}; -extern const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = { +const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = { GX_TEXCOORD_NULL, GX_TEXMAP_NULL, }; -extern const GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255}; +const GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255}; -extern const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = { +const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = { GX_ITS_1, GX_ITS_1, }; -extern const GXColor j2dDefaultTevKColor = {255, 255, 255, 255}; +const GXColor j2dDefaultTevKColor = {255, 255, 255, 255}; -extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0}; +const J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0}; -extern const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = { +const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = { GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA}; -extern const J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, +const J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP}; -extern const u8 j2dDefaultPEBlockDither = 0; +const u8 j2dDefaultPEBlockDither = 0; -extern const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0}; +const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0}; -extern const u8 j2dDefaultTevSwapTableID = 0x1B; +const u8 j2dDefaultTevSwapTableID = 0x1B; -extern const u16 j2dDefaultAlphaCmp = 0x00E7; +const u16 j2dDefaultAlphaCmp = 0x00E7; diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/src/JSystem/J2DGraph/J2DTextBox.cpp index 2370cbf41a..d82fd37586 100644 --- a/src/JSystem/J2DGraph/J2DTextBox.cpp +++ b/src/JSystem/J2DGraph/J2DTextBox.cpp @@ -109,9 +109,6 @@ J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 para mTextFontOwned = true; } -/* 802FFBC4-802FFC58 2FA504 0094+00 0/0 1/1 0/0 .text - * __ct__10J2DTextBoxFUxRCQ29JGeometry8TBox2PC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding - */ J2DTextBox::J2DTextBox(u64 tag, JGeometry::TBox2 const& bounds, ResFONT const* p_font, char const* string, s16 strLength, J2DTextBoxHBinding hBind, J2DTextBoxVBinding vBind) diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/src/JSystem/J2DGraph/J2DWindow.cpp index 4ea29be479..8e02439053 100644 --- a/src/JSystem/J2DGraph/J2DWindow.cpp +++ b/src/JSystem/J2DGraph/J2DWindow.cpp @@ -423,9 +423,6 @@ void J2DWindow::resize(f32 param_0, f32 param_1) { } } -/* 802FB12C-802FB1D8 2F5A6C 00AC+00 1/1 0/0 0/0 .text - * setContentsColor__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor - */ void J2DWindow::setContentsColor(JUtility::TColor param_0, JUtility::TColor param_1, JUtility::TColor param_2, JUtility::TColor param_3) { field_0x128.set(param_0); diff --git a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp index 5d657c773a..3dc289a73d 100644 --- a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp @@ -20,9 +20,6 @@ J3DJointTree::J3DJointTree() mWEvlpMixMtxIndex(0), mWEvlpMixWeight(0), mInvJointMtx(NULL), mWEvlpImportantMtxIdx(0), field_0x40(0), mJointName(NULL) {} -/* 80325A9C-80325C00 3203DC 0164+00 1/0 2/2 0/0 .text - * makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTableP13J3DShapeTable - */ void J3DJointTree::makeHierarchy(J3DJoint* pJoint, const J3DModelHierarchy** pHierarchy, J3DMaterialTable* pMaterialTable, J3DShapeTable* pShapeTable) { J3D_ASSERT_NULLPTR(95, pHierarchy != NULL); diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/src/JSystem/J3DGraphBase/J3DGD.cpp index 4a4c08105a..de18c40798 100644 --- a/src/JSystem/J3DGraphBase/J3DGD.cpp +++ b/src/JSystem/J3DGraphBase/J3DGD.cpp @@ -335,9 +335,6 @@ static u8 GX2HWFiltConv[6] = { 0x00, 0x04, 0x01, 0x05, 0x02, 0x06, }; -/* 8030E438-8030E5D4 308D78 019C+00 0/0 1/1 0/0 .text - * J3DGDSetTexLookupMode__F11_GXTexMapID14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilterfffUcUc13_GXAnisotropy - */ void J3DGDSetTexLookupMode(GXTexMapID id, GXTexWrapMode wrap_s, GXTexWrapMode wrap_t, GXTexFilter min_filt, GXTexFilter mag_filt, f32 min_lod, f32 max_lod, @@ -435,9 +432,6 @@ void J3DGDSetIndTexMtx(GXIndTexMtxID mtx_id, f32 offset[2][3], s8 scale_exp) { )); } -/* 8030EE10-8030EF08 309750 00F8+00 0/0 2/2 0/0 .text - * J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale - */ void J3DGDSetIndTexCoordScale(GXIndTexStageID indStageEven, GXIndTexScale scaleS0, GXIndTexScale scaleT0, GXIndTexScale scaleS1, GXIndTexScale scaleT1) { @@ -451,9 +445,6 @@ void J3DGDSetIndTexCoordScale(GXIndTexStageID indStageEven, GXIndTexScale scaleS )); } -/* 8030EF08-8030F108 309848 0200+00 0/0 2/2 0/0 .text - * J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID - */ void J3DGDSetIndTexOrder(u32 count, GXTexCoordID texCoord0, GXTexMapID texMap0, GXTexCoordID texCoord1, GXTexMapID texMap1, GXTexCoordID texCoord2, GXTexMapID texMap2, @@ -492,9 +483,6 @@ void J3DGDSetIndTexOrder(u32 count, GXTexCoordID texCoord0, GXTexMapID texMap0, J3DGDWriteBPCmd(BP_IND_MASK(mask, 0xF)); } -/* 8030F108-8030F294 309A48 018C+00 0/0 9/9 0/0 .text - * J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID - */ void J3DGDSetTevOrder(GXTevStageID evenStage, GXTexCoordID coord0, GXTexMapID map0, GXChannelID color0, GXTexCoordID coord1, GXTexMapID map1, GXChannelID color1) { diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp index 1f678df4be..acbd78b1b9 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp +++ b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp @@ -67,11 +67,8 @@ u32 J3DShapeMtx::sCurrentPipeline; u8* J3DShapeMtx::sCurrentScaleFlag; -// This below is technically part of J3DScaleFlag. -/* 804515B0 0001+00 data_804515B0 None */ bool J3DShapeMtx::sNBTFlag; -/* 804515B1 0003+00 data_804515B1 None */ bool J3DShapeMtx::sLODFlag; u32 J3DShapeMtx::sTexMtxLoadType; diff --git a/src/JSystem/J3DGraphBase/J3DTevs.cpp b/src/JSystem/J3DGraphBase/J3DTevs.cpp index 86183ea6f0..c7cceac95c 100644 --- a/src/JSystem/J3DGraphBase/J3DTevs.cpp +++ b/src/JSystem/J3DGraphBase/J3DTevs.cpp @@ -315,7 +315,7 @@ void loadNBTScale(J3DNBTScale& NBTScale) { } } -extern const J3DLightInfo j3dDefaultLightInfo = { +const J3DLightInfo j3dDefaultLightInfo = { 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, 0xff, 0xff, 0xff, 0xff, @@ -323,14 +323,14 @@ extern const J3DLightInfo j3dDefaultLightInfo = { 1.0f, 0.0f, 0.0f, }; -extern J3DTexCoordInfo const j3dDefaultTexCoordInfo[8] = { +J3DTexCoordInfo const j3dDefaultTexCoordInfo[8] = { {GX_MTX2x4, GX_TG_TEX0, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX1, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX2, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX3, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX4, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX5, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX6, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX7, GX_IDENTITY, 0}, }; -extern J3DTexMtxInfo const j3dDefaultTexMtxInfo = { +J3DTexMtxInfo const j3dDefaultTexMtxInfo = { 0x01, 0x00, 0xFF, @@ -341,27 +341,27 @@ extern J3DTexMtxInfo const j3dDefaultTexMtxInfo = { 1.0f}, }; -extern J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo = { +J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo = { 0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 1 }; -extern J3DTevStageInfo const j3dDefaultTevStageInfo = { +J3DTevStageInfo const j3dDefaultTevStageInfo = { 0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, }; -extern J3DIndTevStageInfo const j3dDefaultIndTevStageInfo = { +J3DIndTevStageInfo const j3dDefaultIndTevStageInfo = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -extern J3DFogInfo const j3dDefaultFogInfo = { +J3DFogInfo const j3dDefaultFogInfo = { 0x00, 0x00, 0x0140, 0.0f, 0.0f, 0.1f, 10000.0f, 0xFF, 0xFF, 0xFF, 0x00, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, }; -extern J3DNBTScaleInfo const j3dDefaultNBTScaleInfo = { +J3DNBTScaleInfo const j3dDefaultNBTScaleInfo = { 0x00, 1.0f, 1.0f, 1.0f, }; @@ -413,7 +413,6 @@ void makeAlphaCmpTable() { } } -extern u8 j3dZModeTable[96]; u8 j3dZModeTable[96]; void makeZModeTable() { @@ -492,43 +491,43 @@ static void J3DGDLoadPostTexMtxImm(f32 (*param_1)[4], u32 param_2) { J3DGDWrite_f32(param_1[2][3]); } -extern const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF}; +const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF}; -extern const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32}; +const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32}; -extern const u8 j3dDefaultNumChans = 1; +const u8 j3dDefaultNumChans = 1; -extern const J3DTevOrderInfo j3dDefaultTevOrderInfoNull = {0xFF, 0xFF, 0xFF, 0x00}; +const J3DTevOrderInfo j3dDefaultTevOrderInfoNull = {0xFF, 0xFF, 0xFF, 0x00}; -extern const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull = {0xFF, 0xFF, 0x00, 0x00}; +const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull = {0xFF, 0xFF, 0x00, 0x00}; -extern const GXColorS10 j3dDefaultTevColor = {0xFF, 0xFF, 0xFF, 0xFF}; +const GXColorS10 j3dDefaultTevColor = {0xFF, 0xFF, 0xFF, 0xFF}; -extern const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo = { +const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo = { 0x00, 0x00, 0x00, 0x00, }; -extern const GXColor j3dDefaultTevKColor = {0xFF, 0xFF, 0xFF, 0xFF}; +const GXColor j3dDefaultTevKColor = {0xFF, 0xFF, 0xFF, 0xFF}; -extern J3DTevSwapModeInfo const j3dDefaultTevSwapMode = { +J3DTevSwapModeInfo const j3dDefaultTevSwapMode = { 0x00, 0x00, 0x00, 0x00, }; -extern const J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable = {0x00, 0x01, 0x02, 0x03}; +const J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable = {0x00, 0x01, 0x02, 0x03}; -extern const J3DBlendInfo j3dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP}; +const J3DBlendInfo j3dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP}; -extern const J3DColorChanInfo j3dDefaultColorChanInfo = { +const J3DColorChanInfo j3dDefaultColorChanInfo = { 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0xFF, 0xFF, }; -extern const u8 j3dDefaultTevSwapTableID = 0x1B; +const u8 j3dDefaultTevSwapTableID = 0x1B; const u16 j3dDefaultAlphaCmpID = 0x00E7; diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/src/JSystem/J3DGraphBase/J3DTransform.cpp index cdc744c272..c1a246d104 100644 --- a/src/JSystem/J3DGraphBase/J3DTransform.cpp +++ b/src/JSystem/J3DGraphBase/J3DTransform.cpp @@ -70,12 +70,12 @@ void J3DCalcBBoardMtx(__REGISTER Mtx mtx) { mtx[2][2] = z; } -extern J3DTransformInfo const j3dDefaultTransformInfo = { +J3DTransformInfo const j3dDefaultTransformInfo = { {1.0f, 1.0f, 1.0f}, {0, 0, 0}, {0.0f, 0.0f, 0.0f}}; -extern Vec const j3dDefaultScale = {1.0f, 1.0f, 1.0f}; +Vec const j3dDefaultScale = {1.0f, 1.0f, 1.0f}; -extern Mtx const j3dDefaultMtx = { +Mtx const j3dDefaultMtx = { {1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}}; void J3DCalcYBBoardMtx(Mtx mtx) { @@ -541,7 +541,7 @@ loop: } #endif // clang-format on -extern f32 const PSMulUnit01[] = { +f32 const PSMulUnit01[] = { 0.0f, -1.0f, }; diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp index 072e7c1766..616c8f3671 100644 --- a/src/JSystem/JAudio2/JASAramStream.cpp +++ b/src/JSystem/JAudio2/JASAramStream.cpp @@ -19,9 +19,6 @@ u32 JASAramStream::sBlockSize; u32 JASAramStream::sChannelMax; -/* 80451260 0001+00 data_80451260 None */ -/* 80451261 0001+00 data_80451261 None */ -/* 80451262 0006+00 data_80451262 None */ bool struct_80451260; bool struct_80451261; diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp index 30de594808..ec57df253a 100644 --- a/src/JSystem/JAudio2/JASBNKParser.cpp +++ b/src/JSystem/JAudio2/JASBNKParser.cpp @@ -270,9 +270,6 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h return bank; } -/* 80299E68-80299F8C 2947A8 0124+00 1/1 0/0 0/0 .text - * findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc - */ JASOscillator::Data* JASBNKParser::Ver0::findOscPtr(JASBasicBank* bank, THeader const* header, TOsc const* osc) { TOffsetData const* data = &header->mOffsets; diff --git a/src/JSystem/JAudio2/osdsp_task.cpp b/src/JSystem/JAudio2/osdsp_task.cpp index 520e1cd446..b1eae52efb 100644 --- a/src/JSystem/JAudio2/osdsp_task.cpp +++ b/src/JSystem/JAudio2/osdsp_task.cpp @@ -12,8 +12,6 @@ extern "C" void __DSP_remove_task(DSPTaskInfo* task); static void Dsp_Update_Request(); -/* 80451308 0001+00 data_80451308 None */ -/* 80451309 0003+00 data_80451309 None */ static vu8 struct_80451308; static u8 struct_80451309; diff --git a/src/JSystem/JGadget/linklist.cpp b/src/JSystem/JGadget/linklist.cpp index 2bbe15f882..4a705dd5e7 100644 --- a/src/JSystem/JGadget/linklist.cpp +++ b/src/JSystem/JGadget/linklist.cpp @@ -22,9 +22,6 @@ JGadget::TNodeLinkList::erase(JGadget::TNodeLinkList::iterator it) { return erase(it, next); } -/* 802DCAA0-802DCB08 2D73E0 0068+00 1/1 0/0 0/0 .text - * erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorQ37JGadget13TNodeLinkList8iterator - */ JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::erase(iterator a, iterator b) { TLinkListNode* cur = a.node; TLinkListNode* end = b.node; @@ -38,9 +35,6 @@ JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::erase(iterator a, itera return b; } -/* 802DCB08-802DCBA8 2D7448 00A0+00 1/1 0/0 0/0 .text - * splice__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorRQ27JGadget13TNodeLinkListQ37JGadget13TNodeLinkList8iterator - */ void JGadget::TNodeLinkList::splice(iterator it, TNodeLinkList& rSrc, iterator itSrc) { iterator itSrcNext = itSrc; ++itSrcNext; diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp index 15a0ad5fe4..2a7a15609a 100644 --- a/src/JSystem/JKernel/JKRDvdRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdRipper.cpp @@ -18,9 +18,6 @@ static int decompSZS_subroutine(u8*, u8*); static u8* firstSrcData(); static u8* nextSrcData(u8*); -/* 802D9B98-802D9C54 2D44D8 00BC+00 0/0 1/1 0/0 .text - * loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl - */ void* JKRDvdRipper::loadToMainRAM(char const* name, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection, u32 offset, @@ -33,9 +30,6 @@ void* JKRDvdRipper::loadToMainRAM(char const* name, u8* dst, JKRExpandSwitch exp pCompression, param_8); } -/* 802D9C54-802D9D10 2D4594 00BC+00 0/0 9/9 0/0 .text - * loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl - */ void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection, u32 offset, @@ -50,9 +44,6 @@ void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expa static u8 errorRetry = 0x01; -/* 802D9D10-802DA1E4 2D4650 04D4+00 2/2 0/0 0/0 .text - * loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl - */ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection, u32 offset, diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp index bffe0680ef..f3678cb81b 100644 --- a/src/JSystem/JKernel/JKRExpHeap.cpp +++ b/src/JSystem/JKernel/JKRExpHeap.cpp @@ -564,9 +564,6 @@ void JKRExpHeap::appendUsedList(JKRExpHeap::CMemBlock* newblock) { newblock->mNext = NULL; } -/* 802CFE68-802CFEB4 2CA7A8 004C+00 5/5 0/0 0/0 .text - * setFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlock - */ void JKRExpHeap::setFreeBlock(CMemBlock* block, CMemBlock* prev, CMemBlock* next) { if (prev == NULL) { mHeadFreeList = block; diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp index f110012717..58400bc70d 100644 --- a/src/JSystem/JMessage/processor.cpp +++ b/src/JSystem/JMessage/processor.cpp @@ -402,9 +402,6 @@ void JMessage::TSequenceProcessor::on_jump(void const* pEntry, char const* pszTe do_jump(pEntry, pszText); } -/* 802A8690-802A86A0 2A2FD0 0010+00 1/1 0/0 0/0 .text - * on_branch_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessorUl_PCvPCvUl - */ void JMessage::TSequenceProcessor::on_branch_register(JMessage::TSequenceProcessor::branchPfn pfn, void const* pTarget, u32 uTarget) { JUT_ASSERT(669, eStatus_==STATUS_NORMAL); diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/src/JSystem/JParticle/JPAEmitterManager.cpp index 8a61d9f4dc..51e95a46ad 100644 --- a/src/JSystem/JParticle/JPAEmitterManager.cpp +++ b/src/JSystem/JParticle/JPAEmitterManager.cpp @@ -39,9 +39,6 @@ JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHea JUT_ASSERT(67, pWd); } -/* 8027DEBC-8027DFA0 2787FC 00E4+00 0/0 3/3 0/0 .text - * createSimpleEmitterID__17JPAEmitterManagerFRCQ29JGeometry8TVec3UsUcUcP18JPAEmitterCallBackP19JPAParticleCallBack - */ JPABaseEmitter* JPAEmitterManager::createSimpleEmitterID(JGeometry::TVec3 const& pos, u16 resID, u8 group_id, u8 res_mgr_id, JPAEmitterCallBack* emtrCB, diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index 818d891b90..3aada44eb1 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -189,8 +189,6 @@ void TFunctionValueAttribute_range::range_set(f64 begin, f64 end) { JUT_ASSERT(458, fDifference_>=TValue(0)); } -// /* 80281A08-80281D18 27C348 0310+00 2/2 0/0 0/0 .text -// * range_getParameter__Q27JStudio29TFunctionValueAttribute_rangeCFddd */ f64 TFunctionValueAttribute_range::range_getParameter(f64 arg1, f64 arg2, f64 arg3) const { f64 progress = range_getParameter_progress(arg1); TFunctionValue::TEAdjust adjust = range_getAdjust(); @@ -256,9 +254,6 @@ f64 TFunctionValue_composite::getValue(f64 arg1) { return pfn_(arg1, container, data_getData()); } -/* 80281E5C-80281EC8 27C79C 006C+00 0/0 1/0 0/0 .text - * composite_raw__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_raw(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { u32 index = param_2.get_unsignedInteger(); @@ -273,9 +268,6 @@ f64 TFunctionValue_composite::composite_raw(TVector_pointer con } -/* 80281EC8-8028202C 27C808 0164+00 0/0 1/0 0/0 .text - * composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_index(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { s32 size = param_1.size(); @@ -337,9 +329,6 @@ struct TContainerEnumerator_const_TVector : public JGadget::TEnumerator(param_1.begin(), param_1.end()) {} }; -/* 8028202C-80282094 27C96C 0068+00 0/0 1/0 0/0 .text - * composite_parameter__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_parameter(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { @@ -353,9 +342,6 @@ TFunctionValue_composite::composite_parameter(TVector_pointer c return dVar4; } -/* 80282094-80282118 27C9D4 0084+00 0/0 1/0 0/0 .text - * composite_add__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_add(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { f64 dVar4 = param_2.get_value(); @@ -369,9 +355,6 @@ f64 TFunctionValue_composite::composite_add(TVector_pointer con return dVar4; } -/* 80282118-80282200 27CA58 00E8+00 0/0 1/0 0/0 .text - * composite_subtract__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_subtract(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { u32 size = param_1.size(); @@ -394,9 +377,6 @@ f64 TFunctionValue_composite::composite_subtract(TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_multiply(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { f64 dVar4 = param_2.get_value(); @@ -410,9 +390,6 @@ f64 TFunctionValue_composite::composite_multiply(TVector_pointerRCQ37JStudio24TFunctionValue_composite5TDatad - */ f64 TFunctionValue_composite::composite_divide(TVector_pointer const& param_1, TData const& param_2, f64 param_3) { u32 size = param_1.size(); @@ -633,9 +610,6 @@ f64 TFunctionValue_list::update_INTERPOLATE_LINEAR_(const TFunctionValue_list& r rThis._44[data._10 + 1]); } -/* 80282C58-80282CA8 27D598 0050+00 1/1 0/0 0/0 .text - * update_INTERPOLATE_PLATEAU___Q27JStudio19TFunctionValue_listFRCQ27JStudio19TFunctionValue_listRCQ37JStudio19TFunctionValue_list11TIndexData_ - */ f64 TFunctionValue_list::update_INTERPOLATE_PLATEAU_(const TFunctionValue_list& rThis, const TIndexData_& data) { const f32* arr = rThis._44; @@ -645,9 +619,6 @@ f64 TFunctionValue_list::update_INTERPOLATE_PLATEAU_(const TFunctionValue_list& } -/* 80282CA8-80282D34 27D5E8 008C+00 1/1 0/0 0/0 .text - * update_INTERPOLATE_BSPLINE_dataMore3___Q27JStudio19TFunctionValue_listFRCQ27JStudio19TFunctionValue_listRCQ37JStudio19TFunctionValue_list11TIndexData_ - */ f64 TFunctionValue_list::update_INTERPOLATE_BSPLINE_dataMore3_( TFunctionValue_list const& rThis, TFunctionValue_list::TIndexData_ const& param_2) { f64 dVar11 = rThis._44[param_2._10]; @@ -770,9 +741,6 @@ f64 TFunctionValue_list_parameter::update_INTERPOLATE_LINEAR_( return functionvalue::interpolateValue_linear(d, a[-2], a[-1], a[0], a[1]); } -/* 80283024-80283060 27D964 003C+00 1/1 0/0 0/0 .text - * update_INTERPOLATE_PLATEAU___Q27JStudio29TFunctionValue_list_parameterFRCQ27JStudio29TFunctionValue_list_parameterd - */ f64 TFunctionValue_list_parameter::update_INTERPOLATE_PLATEAU_( const TFunctionValue_list_parameter& rThis, f64 d) { const f32* a = rThis.dat3.get(); @@ -780,9 +748,6 @@ f64 TFunctionValue_list_parameter::update_INTERPOLATE_PLATEAU_( } -/* 80283060-802832C4 27D9A0 0264+00 1/1 0/0 0/0 .text - * update_INTERPOLATE_BSPLINE_dataMore3___Q27JStudio29TFunctionValue_list_parameterFRCQ27JStudio29TFunctionValue_list_parameterd - */ f64 TFunctionValue_list_parameter::update_INTERPOLATE_BSPLINE_dataMore3_( TFunctionValue_list_parameter const& rThis, f64 param_2) { JUT_ASSERT(1457, rThis.uData_>=3) diff --git a/src/JSystem/JStudio/JStudio/fvb-data.cpp b/src/JSystem/JStudio/JStudio/fvb-data.cpp index bae0a903ea..deee81198e 100644 --- a/src/JSystem/JStudio/JStudio/fvb-data.cpp +++ b/src/JSystem/JStudio/JStudio/fvb-data.cpp @@ -2,4 +2,4 @@ #include "JSystem/JStudio/JStudio/fvb-data.h" -extern const char JStudio::fvb::data::ga4cSignature[4] = "FVB"; +const char JStudio::fvb::data::ga4cSignature[4] = "FVB"; diff --git a/src/JSystem/JStudio/JStudio/jstudio-data.cpp b/src/JSystem/JStudio/JStudio/jstudio-data.cpp index 52e38a09f2..c6f90bc45f 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-data.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-data.cpp @@ -2,4 +2,4 @@ #include "JSystem/JStudio/JStudio/jstudio-data.h" -extern const char JStudio::data::ga8cSignature[8] = "jstudio"; +const char JStudio::data::ga8cSignature[8] = "jstudio"; diff --git a/src/JSystem/JStudio/JStudio/jstudio-object.cpp b/src/JSystem/JStudio/JStudio/jstudio-object.cpp index 5d6cb6c443..8e23477cc8 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-object.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-object.cpp @@ -120,9 +120,6 @@ void JStudio::TAdaptor::adaptor_do_data(void const* param_0, u32 param_1, void c /* empty function */ } -/* 8028602C-802860CC 28096C 00A0+00 8/7 0/0 0/0 .text - * adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue(JStudio::TControl* pControl, u32 param_2, JStudio::data::TEOperationData param_3, void const* param_4, u32 param_5) { @@ -152,9 +149,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue(JStudio::TControl* pControl, u3 } -/* 802860CC-802861C0 280A0C 00F4+00 7/7 0/0 0/0 .text - * adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_n(JStudio::TControl* pControl, u32 const* param_2, u32 param_3, JStudio::data::TEOperationData param_4, @@ -190,9 +184,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_n(JStudio::TControl* pControl, } } -/* 802861C0-80286204 280B00 0044+00 0/0 2/2 0/0 .text - * adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate - */ void JStudio::TAdaptor::adaptor_setVariableValue_immediate( JStudio::TAdaptor::TSetVariableValue_immediate const* p) { JUT_ASSERT(388, p!=NULL); @@ -244,9 +235,6 @@ void JStudio::TAdaptor::adaptor_updateVariableValue(JStudio::TControl* pControl, } } -/* 8028656C-80286584 280EAC 0018+00 2/2 0/0 0/0 .text - * adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_VOID_(JStudio::TAdaptor* param_1, JStudio::TControl* param_2, u32 param_3, void const* param_4, u32 uSize) { @@ -254,9 +242,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_VOID_(JStudio::TAdaptor* param_ param_1->pValue_[param_3].setValue_none(); } -/* 80286584-802865B0 280EC4 002C+00 2/2 0/0 0/0 .text - * adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor* param_1, JStudio::TControl* param_2, u32 param_3, void const* param_4, u32 param_5) { @@ -264,9 +249,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor* p value->setValue_immediate(*(f32*)param_4); } -/* 802865B0-802865DC 280EF0 002C+00 2/2 0/0 0/0 .text - * adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_TIME_(JStudio::TAdaptor* param_1, JStudio::TControl* param_2, u32 param_3, void const* param_4, u32 param_5) { @@ -274,9 +256,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_TIME_(JStudio::TAdaptor* param_ value->setValue_time(*(f32*)param_4); } -/* 802865DC-80286648 280F1C 006C+00 1/1 0/0 0/0 .text - * adaptor_setVariableValue_FVR_NAME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor* param_1, JStudio::TControl* param_2, u32 param_3, void const* param_4, u32 param_5) { @@ -284,9 +263,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor* pa value->setValue_functionValue(param_2->getFunctionValue(param_4,param_5)); } -/* 80286648-802866B0 280F88 0068+00 2/2 0/0 0/0 .text - * adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl - */ void JStudio::TAdaptor::adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor* param_1, JStudio::TControl* param_2, u32 param_3, void const* param_4, u32 param_5) { @@ -339,9 +315,6 @@ JStudio::TObject::TObject(JStudio::stb::data::TParse_TBlock_object const& param_ JStudio::TAdaptor_actor::~TAdaptor_actor() { } -/* 80286910-8028694C 281250 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio13TObject_actorFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_actor - */ JStudio::TObject_actor::TObject_actor(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_actor* param_1) : TObject(param_0, param_1) { @@ -495,9 +468,6 @@ fun: JStudio::TAdaptor_ambientLight::~TAdaptor_ambientLight() {} -/* 80286CFC-80286D38 28163C 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio20TObject_ambientLightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio21TAdaptor_ambientLight - */ JStudio::TObject_ambientLight::TObject_ambientLight( JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_ambientLight* param_1) : TObject(param_0, param_1) { @@ -560,9 +530,6 @@ value_n: JStudio::TAdaptor_camera::~TAdaptor_camera() {} -/* 80286E7C-80286EB8 2817BC 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio14TObject_cameraFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio15TAdaptor_camera - */ JStudio::TObject_camera::TObject_camera(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_camera* param_1) : TObject(param_0, param_1) {} @@ -695,9 +662,6 @@ fun: JStudio::TAdaptor_fog::~TAdaptor_fog() {} -/* 802871DC-80287218 281B1C 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio11TObject_fogFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio12TAdaptor_fog - */ JStudio::TObject_fog::TObject_fog(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_fog* param_1) : TObject(param_0, param_1) {} @@ -771,9 +735,6 @@ value_n: JStudio::TAdaptor_light::~TAdaptor_light() {} -/* 80287368-802873A4 281CA8 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio13TObject_lightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_light - */ JStudio::TObject_light::TObject_light(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_light* param_1) : TObject(param_0, param_1) {} @@ -910,9 +871,6 @@ fun: JStudio::TAdaptor_message::~TAdaptor_message() {} -/* 80287640-8028767C 281F80 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio15TObject_messageFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio16TAdaptor_message - */ JStudio::TObject_message::TObject_message(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_message* param_1) : TObject(param_0, param_1) {} @@ -939,9 +897,6 @@ void JStudio::TObject_message::do_paragraph(u32 param_1, void const* param_2, u3 JStudio::TAdaptor_particle::~TAdaptor_particle() {} -/* 8028776C-802877A8 2820AC 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio16TObject_particleFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio17TAdaptor_particle - */ JStudio::TObject_particle::TObject_particle( JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_particle* param_1) : TObject(param_0, param_1) {} @@ -1140,9 +1095,6 @@ fun: JStudio::TAdaptor_sound::~TAdaptor_sound() {} -/* 80287B9C-80287BD8 2824DC 003C+00 0/0 1/1 0/0 .text - * __ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound - */ JStudio::TObject_sound::TObject_sound(JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_sound* param_1) : TObject(param_0, param_1) {} diff --git a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp index d53afdf8d6..6fc661ddcd 100644 --- a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp +++ b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp @@ -9,9 +9,6 @@ JStudio_JAudio2::TCreateObject::~TCreateObject() {} -/* 8028D5B0-8028D624 287EF0 0074+00 1/0 0/0 0/0 .text - * create__Q215JStudio_JAudio213TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object - */ bool JStudio_JAudio2::TCreateObject::create( JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) { JUT_ASSERT(40, ppObject!=NULL); @@ -27,9 +24,6 @@ bool JStudio_JAudio2::TCreateObject::create( return 1; } -/* 8028D624-8028D728 287F64 0104+00 1/1 0/0 0/0 .text - * createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject - */ JStudio::TObject* JStudio_JAudio2::TCreateObject::createObject_JAI_SOUND_( JStudio::stb::data::TParse_TBlock_object const& param_1, JStudio_JAudio2::TCreateObject* param_2) { diff --git a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp index 756e4ee0a9..95bd769eae 100644 --- a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp +++ b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp @@ -166,9 +166,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN(JStudio::data::TEOperatio } } -/* 8028DC88-8028DCD0 2885C8 0048+00 1/0 0/0 0/0 .text - * adaptor_do_BEGIN_FADE_IN__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN_FADE_IN( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { @@ -190,9 +187,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END(JStudio::data::TEOperationD } } -/* 8028DD00-8028DD48 288640 0048+00 1/0 0/0 0/0 .text - * adaptor_do_END_FADE_OUT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END_FADE_OUT( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { @@ -222,9 +216,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT( } } -/* 8028DDB4-8028DE34 2886F4 0080+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_NODE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -246,9 +237,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOp } } -/* 8028DE34-8028DE50 288774 001C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_ENABLE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_ENABLE( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -267,9 +255,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_REPEAT(JStudio::data::TEOperati } } -/* 8028DE6C-8028DE88 2887AC 001C+00 1/0 0/0 0/0 .text - * adaptor_do_CONTINUOUS__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -292,9 +277,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperat } } -/* 8028DEB0-8028DECC 2887F0 001C+00 1/0 0/0 0/0 .text - * adaptor_do_ON_EXIT_NOT_END__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { diff --git a/src/JSystem/JStudio/JStudio_JParticle/control.cpp b/src/JSystem/JStudio/JStudio_JParticle/control.cpp index 0d240bb15f..1f25f43f66 100644 --- a/src/JSystem/JStudio/JStudio_JParticle/control.cpp +++ b/src/JSystem/JStudio/JStudio_JParticle/control.cpp @@ -10,9 +10,6 @@ JStudio_JParticle::TCreateObject::~TCreateObject() {} -/* 8028E400-8028E474 288D40 0074+00 1/0 1/0 0/0 .text - * create__Q217JStudio_JParticle13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object - */ bool JStudio_JParticle::TCreateObject::create(JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) { @@ -41,9 +38,6 @@ void JStudio_JParticle::TCreateObject::emitter_destroy(JPABaseEmitter* pEmitter) pJPAEmitterManager_->forceDeleteEmitter(pEmitter); } -/* 8028E508-8028E60C 288E48 0104+00 1/1 0/0 0/0 .text - * createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject - */ JStudio::TObject* JStudio_JParticle::TCreateObject::createObject_JPA_PARTICLE_( JStudio::stb::data::TParse_TBlock_object const& param_1, JStudio_JParticle::TCreateObject* param_2) { diff --git a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp index 532d51ab1a..0346ccd812 100644 --- a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp +++ b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp @@ -99,9 +99,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) { } } -/* 8028EA68-8028EA7C 2893A8 0014+00 1/0 0/0 0/0 .text - * adaptor_do_PARTICLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x19) { @@ -111,9 +108,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE( } } -/* 8028EA7C-8028EAB0 2893BC 0034+00 1/0 0/0 0/0 .text - * adaptor_do_BEGIN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -124,9 +118,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN(JStudio::data::TEOpe } } -/* 8028EAB0-8028EAF8 2893F0 0048+00 1/0 0/0 0/0 .text - * adaptor_do_BEGIN_FADE_IN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN_FADE_IN( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -146,9 +137,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END(JStudio::data::TEOpera } } -/* 8028EB24-8028EB6C 289464 0048+00 1/0 0/0 0/0 .text - * adaptor_do_END_FADE_OUT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -160,9 +148,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT( } } -/* 8028EB6C-8028EBD8 2894AC 006C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -181,9 +166,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT( } } -/* 8028EBD8-8028EC58 289518 0080+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_NODE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { @@ -205,9 +187,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE( } } -/* 8028EC58-8028EC74 289598 001C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_ENABLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -217,9 +196,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::dat } } -/* 8028EC74-8028EC88 2895B4 0014+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_FUNCTION__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -229,9 +205,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::d } } -/* 8028EC88-8028ECA4 2895C8 001C+00 1/0 0/0 0/0 .text - * adaptor_do_REPEAT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -241,9 +214,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOp } } -/* 8028ECA4-8028ECC0 2895E4 001C+00 1/0 0/0 0/0 .text - * adaptor_do_ON_EXIT_NOT_END__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { @@ -332,9 +302,6 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmit } } -/* 8028F060-8028F098 2899A0 0038+00 1/0 0/0 0/0 .text - * executeAfter__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter - */ void JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::executeAfter(JPABaseEmitter* pJPAEmitter) { if (pOld != NULL) { diff --git a/src/JSystem/JStudio/JStudio_JStage/control.cpp b/src/JSystem/JStudio/JStudio_JStage/control.cpp index b27bb05780..5ba81c8fc9 100644 --- a/src/JSystem/JStudio/JStudio_JStage/control.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/control.cpp @@ -9,9 +9,6 @@ JStudio_JStage::TCreateObject::~TCreateObject() {} -/* 80289B60-80289CE4 2844A0 0184+00 1/0 0/0 0/0 .text - * create__Q214JStudio_JStage13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object - */ bool JStudio_JStage::TCreateObject::create( JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& rParse) { JUT_ASSERT(83, ppObject!=NULL); diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp index 435c06e2aa..40d36d80a1 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -92,9 +92,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION(JStudio::data::TEOpera } -/* 8028AA48-8028AA5C 285388 0014+00 1/0 0/0 0/0 .text - * adaptor_do_ANIMATION_MODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -106,17 +103,11 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TE } } -/* 8028AA5C-8028AAB4 28539C 0058+00 1/0 0/0 0/0 .text - * adaptor_do_TEXTURE_ANIMATION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData operation, void const* param_2, u32 param_3) { setJSG_ID_(&JStage::TActor::JSGSetTextureAnimation, operation, param_2, param_3); } -/* 8028AAB4-8028AAC8 2853F4 0014+00 1/0 0/0 0/0 .text - * adaptor_do_TEXTURE_ANIMATION_MODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION_MODE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -139,9 +130,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT( } } -/* 8028AB0C-8028AB68 28544C 005C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_NODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -158,9 +146,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE( } } -/* 8028AB68-8028ABF0 2854A8 0088+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_ENABLE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -188,9 +173,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE( } } -/* 8028ABF0-8028AC04 285530 0014+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_FUNCTION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_FUNCTION( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -213,9 +195,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION( } } -/* 8028AC48-8028ACA4 285588 005C+00 1/0 0/0 0/0 .text - * adaptor_do_RELATION_NODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -232,9 +211,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE( } } -/* 8028ACA4-8028ACFC 2855E4 0058+00 1/0 0/0 0/0 .text - * adaptor_do_RELATION_ENABLE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { @@ -246,9 +222,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE( } } -/* 8028ACFC-8028AD38 28563C 003C+00 3/3 0/0 0/0 .text - * setJSG_ID___Q214JStudio_JStage14TAdaptor_actorFMQ26JStage6TActorFPCvPvUl_vQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_actor::setJSG_ID_(void (JStage::TActor::*function)(u32), JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { diff --git a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp index 9620b880f5..1a3a96b345 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp @@ -88,9 +88,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT(JStudio::data::TEOperati } } -/* 8028BC14-8028BC70 286554 005C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { @@ -107,9 +104,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOp } } -/* 8028BC70-8028BCEC 2865B0 007C+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { @@ -136,9 +130,6 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOpera } } -/* 8028BCEC-8028BD00 28662C 0014+00 1/0 0/0 0/0 .text - * adaptor_do_PARENT_FUNCTION__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { @@ -151,9 +142,6 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOpe } } -/* 8028BD00-8028BD44 286640 0044+00 1/0 0/0 0/0 .text - * adaptor_do_TARGET_PARENT__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch(param_1) { @@ -165,9 +153,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT( } } -/* 8028BD44-8028BDA0 286684 005C+00 1/0 0/0 0/0 .text - * adaptor_do_TARGET_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { @@ -184,9 +169,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE( } } -/* 8028BDA0-8028BDBC 2866E0 001C+00 1/0 0/0 0/0 .text - * adaptor_do_TARGET_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_ENABLE( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch(param_1) { diff --git a/src/JSystem/JStudio/JStudio_JStage/object.cpp b/src/JSystem/JStudio/JStudio_JStage/object.cpp index d7f048fc14..968b102f0d 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object.cpp @@ -6,9 +6,6 @@ #include "JSystem/JStudio/JStudio_JStage/object.h" -/* 8028A1F8-8028A290 284B38 0098+00 0/0 2/2 0/0 .text - * transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl - */ bool JStudio_JStage::transform_toGlobalFromLocal( f32 (*param_1)[4], JStudio::TControl::TTransform_translation_rotation_scaling const& param_2, JStage::TObject const* param_3, u32 param_4) { @@ -26,9 +23,6 @@ bool JStudio_JStage::transform_toGlobalFromLocal( return true; } -/* 8028A290-8028A328 284BD0 0098+00 0/0 3/3 0/0 .text - * transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl - */ bool JStudio_JStage::transform_toGlobalFromLocal( f32 (*param_1)[4], JStudio::TControl::TTransform_position const& param_2, JStage::TObject const* param_3, u32 param_4) { @@ -45,9 +39,6 @@ bool JStudio_JStage::transform_toGlobalFromLocal( return true; } -/* 8028A328-8028A3CC 284C68 00A4+00 0/0 1/1 0/0 .text - * transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl - */ bool JStudio_JStage::transform_toLocalFromGlobal( f32 (*param_1)[4], JStudio::TControl::TTransform_translation_rotation_scaling const& param_2, JStage::TObject const* param_3, u32 param_4) { @@ -67,9 +58,6 @@ bool JStudio_JStage::transform_toLocalFromGlobal( return true; } -/* 8028A3CC-8028A470 284D0C 00A4+00 0/0 2/2 0/0 .text - * transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl - */ bool JStudio_JStage::transform_toLocalFromGlobal( f32 (*param_1)[4], JStudio::TControl::TTransform_position const& param_2, JStage::TObject const* param_3, u32 param_4) { @@ -118,9 +106,6 @@ s32 JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObjectNode_( return param_1->JSGFindNodeID(param_2); } -/* 8028A550-8028A5F0 284E90 00A0+00 0/0 1/1 0/0 .text - * adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TEOperationDataPCvUl - */ void JStudio_JStage::TAdaptor_object_::adaptor_object_ENABLE_(JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index b1202d6e78..f460f315db 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -339,9 +339,6 @@ JUTCacheFont::TGlyphCacheInfo* JUTCacheFont::determineBlankPage() { return NULL; } -/* 802DDBBC-802DDCE4 2D84FC 0128+00 1/1 0/0 0/0 .text - * getGlyphFromAram__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfoPQ212JUTCacheFont10TCachePagePiPi - */ void JUTCacheFont::getGlyphFromAram(JUTCacheFont::TGlyphCacheInfo* param_0, JUTCacheFont::TCachePage* pCachePage, int* param_2, int* param_3) { TGlyphCacheInfo* pGylphCacheInfo = pCachePage; diff --git a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp b/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp index a413a6751a..f37bad6200 100644 --- a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp +++ b/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp @@ -1,9 +1,10 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep +#include "JSystem/JUtility/JUTResFont.h" #include #include "global.h" -extern u8 const JUTResFONT_Ascfont_fix12[16736] ATTRIBUTE_ALIGN(32) = { +u8 const JUTResFONT_Ascfont_fix12[] ATTRIBUTE_ALIGN(32) = { 0x46, 0x4F, 0x4E, 0x54, 0x62, 0x66, 0x6E, 0x31, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x4E, 0x46, 0x31, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C, diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp index c705bcab66..ea3709594a 100644 --- a/src/JSystem/JUtility/JUTGamePad.cpp +++ b/src/JSystem/JUtility/JUTGamePad.cpp @@ -172,10 +172,8 @@ void* JUTGamePad::C3ButtonReset::sCallbackArg; OSTime JUTGamePad::C3ButtonReset::sThreshold = (OSTime)(OS_TIMER_CLOCK / 60) * 30; -/* 80451500 0001+00 data_80451500 None */ bool JUTGamePad::C3ButtonReset::sResetSwitchPushing; -/* 80451501 0003+00 data_80451501 None */ bool JUTGamePad::C3ButtonReset::sResetOccurred; s32 JUTGamePad::C3ButtonReset::sResetOccurredPort; diff --git a/src/SSystem/SComponent/c_cc_s.cpp b/src/SSystem/SComponent/c_cc_s.cpp index 4b47620d78..5fdd9ea1f8 100644 --- a/src/SSystem/SComponent/c_cc_s.cpp +++ b/src/SSystem/SComponent/c_cc_s.cpp @@ -489,16 +489,10 @@ void cCcS::DrawClear() { void cCcS::SetCoGCorrectProc(cCcD_Obj* pco1_obj, cCcD_Obj* pco2_obj) {} -/* 80265DF8-80265DFC 260738 0004+00 1/0 0/0 0/0 .text - * SetCoGObjInf__4cCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts - */ void cCcS::SetCoGObjInf(bool co2_set, bool co1_set, cCcD_GObjInf* pco1_gobj, cCcD_GObjInf* pco2_gobj, cCcD_Stts* pco1_stts, cCcD_Stts* pco2_stts, cCcD_GStts* pco1_gstts, cCcD_GStts* pco2_gstts) {} -/* 80265DFC-80265E00 26073C 0004+00 1/0 0/0 0/0 .text - * SetAtTgGObjInf__4cCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz - */ void cCcS::SetAtTgGObjInf(bool param_0, bool param_1, cCcD_Obj* pat_obj, cCcD_Obj* ptg_obj, cCcD_GObjInf* pat_gobj, cCcD_GObjInf* ptg_gobj, cCcD_Stts* pat_stts, cCcD_Stts* ptg_stts, cCcD_GStts* pat_gstts, cCcD_GStts* ptg_gstts, @@ -509,9 +503,6 @@ bool cCcS::ChkNoHitGAtTg(const cCcD_GObjInf* pat_gobj, const cCcD_GObjInf* ptg_g return false; } -/* 80265E08-80265E10 260748 0008+00 1/0 0/0 0/0 .text - * ChkAtTgHitAfterCross__4cCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts - */ bool cCcS::ChkAtTgHitAfterCross(bool param_0, bool param_1, const cCcD_GObjInf* pat_gobj, const cCcD_GObjInf* ptg_gobj, cCcD_Stts* pat_stts, cCcD_Stts* ptg_stts, cCcD_GStts* pat_gstts, cCcD_GStts* ptg_gstts) { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c index 6bb12f9928..d881cbad20 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk.c @@ -1,5 +1,6 @@ #include "TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.h" #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.h" +#include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h" #include "TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.h" #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c index 55e298a88a..2b94656ef1 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msgbuf.c @@ -1,5 +1,6 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h" #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.h" +#include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mutex_TRK.h" TRKBuffer gTRKMsgBufs[3]; diff --git a/src/Z2AudioLib/Z2Audience.cpp b/src/Z2AudioLib/Z2Audience.cpp index fa466f962b..26f79ebbe4 100644 --- a/src/Z2AudioLib/Z2Audience.cpp +++ b/src/Z2AudioLib/Z2Audience.cpp @@ -778,9 +778,6 @@ u32 Z2Audience::calcDeltaPriority_(f32 param_0, int distVolBit, bool param_2) co return mSetting.field_0xac[distVolBit] * (param_0 - mSetting.field_0x3c); } -/* 802BDCB0-802BDD00 2B85F0 0050+00 1/1 0/0 0/0 .text - * calcPitchDoppler___10Z2AudienceCFRCQ29JGeometry8TVec3RCQ29JGeometry8TVec3RCQ29JGeometry8TVec3f - */ f32 Z2Audience::calcPitchDoppler_(const JGeometry::TVec3& param_0, const JGeometry::TVec3& param_1, const JGeometry::TVec3& param_2, f32 param_3) const { diff --git a/src/Z2AudioLib/Z2Creature.cpp b/src/Z2AudioLib/Z2Creature.cpp index db9f521507..e02d1abcd5 100644 --- a/src/Z2AudioLib/Z2Creature.cpp +++ b/src/Z2AudioLib/Z2Creature.cpp @@ -8,8 +8,6 @@ static void Z2_E_ms_modVol(Z2SoundHandlePool*, u32); static void Z2_E_mm_modPitch(Z2SoundHandlePool*, u32); static void Z2_B_zan_modPitch(Z2SoundHandlePool*, u32); -/* 80451358 0001+00 data_80451358 None */ -/* 80451359 0007+00 data_80451359 None */ s8 data_80451358; s8 data_80451359; diff --git a/src/Z2AudioLib/Z2Param.cpp b/src/Z2AudioLib/Z2Param.cpp index 201f6f5e89..064a1e0521 100644 --- a/src/Z2AudioLib/Z2Param.cpp +++ b/src/Z2AudioLib/Z2Param.cpp @@ -103,11 +103,8 @@ f32 Z2Param::MIN_DISTANCE_VOLUME; f32 Z2Param::ENEMY_LASTHIT_MUTE_VOLUME; -/* 80451340 0001+00 data_80451340 None */ u8 Z2Param::DARK_SE_FILTER_ON; -/* 80451341 0001+00 data_80451341 None */ u8 Z2Param::DARK_SE_LOW_PASS_FILTER_SETTING; -/* 80451342 0006+00 data_80451342 None */ u8 Z2Param::SYSTEM_SE_USE_DARK_SE_SETTING; diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp index b2738d2549..bc92476846 100644 --- a/src/Z2AudioLib/Z2SoundObject.cpp +++ b/src/Z2AudioLib/Z2SoundObject.cpp @@ -528,8 +528,8 @@ u32 Z2SoundObjAnime::getSoundID(const JAUSoundAnimationSound* animationSound, bool Z2SoundObjAnime::playsSound(const JAUSoundAnimationSound* animationSound, const JGeometry::TVec3& param_1, f32 param_2) { - (void)param_1; - (void)param_2; + UNUSED(param_1); + UNUSED(param_2); if (animationSound->playsOnlyOnce()) { if (field_0x3c != animationSound->field_0x16) { diff --git a/src/Z2AudioLib/Z2WolfHowlMgr.cpp b/src/Z2AudioLib/Z2WolfHowlMgr.cpp index 2350c90129..5f34fab19c 100644 --- a/src/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/src/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -206,7 +206,7 @@ f32 Z2WolfHowlMgr::getNowInputValue() { } void Z2WolfHowlMgr::calcPitchMod(f32 param_0, f32 param_1) { - (void)param_0; + UNUSED(param_0); f32 pitch = 1.0f; field_0x20 = getNowPitch(); diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index a969977cb1..a5fe1caeaf 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -407,7 +407,7 @@ static actor_method_class l_daDr_Method = { (process_method_func)daDr_Draw, }; -extern actor_process_profile_definition g_profile_DR = { +actor_process_profile_definition g_profile_DR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp index f4d4868849..0e546a4eab 100644 --- a/src/d/actor/d_a_L7low_dr.cpp +++ b/src/d/actor/d_a_L7low_dr.cpp @@ -197,7 +197,7 @@ static actor_method_class l_daL7lowDr_Method = { (process_method_func)daL7lowDr_Draw, }; -extern actor_process_profile_definition g_profile_L7lowDr = { +actor_process_profile_definition g_profile_L7lowDr = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index 2a94a9a9f3..f6051370b1 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -839,7 +839,7 @@ static actor_method_class l_daL7ODR_Method = { (process_method_func)daL7ODR_Draw, }; -extern actor_process_profile_definition g_profile_L7ODR = { +actor_process_profile_definition g_profile_L7ODR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index ce09ff1f35..02bd952e3e 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -18882,7 +18882,7 @@ static actor_method_class l_daAlink_Method = { (process_method_func)daAlink_Draw, }; -extern actor_process_profile_definition g_profile_ALINK = { +actor_process_profile_definition g_profile_ALINK = { fpcLy_CURRENT_e, 5, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 93bea23526..9ad4e41b03 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -187,7 +187,7 @@ static actor_method_class l_daAlldie_Method = { (process_method_func)daAlldie_Draw, }; -extern actor_process_profile_definition g_profile_ALLDIE = { +actor_process_profile_definition g_profile_ALLDIE = { fpcLy_CURRENT_e, 2, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 12d93d0b62..01e50a0a9b 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -111,7 +111,7 @@ static actor_method_class l_daAndsw_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_ANDSW = { +actor_process_profile_definition g_profile_ANDSW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 10c8609932..9ad44d4877 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -342,7 +342,7 @@ static actor_method_class l_daAndsw2_Method = { (process_method_func)daAndsw2_Execute, }; -extern actor_process_profile_definition g_profile_ANDSW2 = { +actor_process_profile_definition g_profile_ANDSW2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index d0b6a7b226..fc26f70eb7 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -1220,7 +1220,7 @@ static actor_method_class l_daArrowMethodTable = { (process_method_func)daArrow_draw, }; -extern actor_process_profile_definition g_profile_ARROW = { +actor_process_profile_definition g_profile_ARROW = { fpcLy_CURRENT_e, // mLayerID 9, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index e4531267cd..a114328562 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -94,7 +94,6 @@ static int daB_BH_Draw(b_bh_class* i_this) { return 1; } -/* 805B33ED 0003+00 data_805B33ED None */ static u8 hio_set; static daB_BH_HIO_c l_HIO; @@ -1577,7 +1576,7 @@ static actor_method_class l_daB_BH_Method = { (process_method_func)daB_BH_Draw, }; -extern actor_process_profile_definition g_profile_B_BH = { +actor_process_profile_definition g_profile_B_BH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 7e6762e02d..9339260a1c 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -2672,7 +2672,7 @@ static actor_method_class l_daB_BQ_Method = { (process_method_func)daB_BQ_Draw, }; -extern actor_process_profile_definition g_profile_B_BQ = { +actor_process_profile_definition g_profile_B_BQ = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index b651124000..bad6772369 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -281,7 +281,6 @@ daB_DR_HIO_c::daB_DR_HIO_c() { breath_feint2_OFF = true; } -/* 805C78FD 0003+00 hio_set None */ static u8 hio_set; static daB_DR_HIO_c l_HIO; @@ -4287,7 +4286,7 @@ static actor_method_class l_daB_DR_Method = { (process_method_func)daB_DR_Draw, }; -extern actor_process_profile_definition g_profile_B_DR = { +actor_process_profile_definition g_profile_B_DR = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index d7fa5a7114..b501877178 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -943,7 +943,7 @@ static actor_method_class l_daB_DRE_Method = { (process_method_func)daB_DRE_Draw, }; -extern actor_process_profile_definition g_profile_B_DRE = { +actor_process_profile_definition g_profile_B_DRE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 2a24597c0c..5335844544 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -203,13 +203,9 @@ static bool hio_set; static daB_DS_HIO_c l_HIO; -/* 805DDB0C 0002+00 data_805DDB0C handL_ang */ -/* 805DDB0E 0002+00 data_805DDB0E handR_ang */ static s16 handL_ang; static s16 handR_ang; -/* 805DDB10 0002+00 data_805DDB10 handX_ang */ -/* 805DDB12 0002+00 breathTimerBase None */ static s16 handX_ang; static u8 breathTimerBase; @@ -5686,7 +5682,7 @@ static actor_method_class l_daB_DS_Method = { (process_method_func)daB_DS_Draw, }; -extern actor_process_profile_definition g_profile_B_DS = { +actor_process_profile_definition g_profile_B_DS = { fpcLy_CURRENT_e, 4, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index d8699bcd21..013ed52d62 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -543,10 +543,8 @@ static s16 s_TargetAngle; static cXyz s_centerpos(217.0f, 1275.0f, -57.0f); -/* 805ED74C 0002+00 data_805ED74C s_M_Action__22@unnamed@d_a_b_gg_cpp@ */ static s16 s_M_Action; -/* 805ED74E 0002+00 data_805ED74E s_W_Action__22@unnamed@d_a_b_gg_cpp@ */ static s16 s_W_Action; } @@ -4458,7 +4456,7 @@ static actor_method_class l_daB_GG_Method = { (process_method_func)daB_GG_Draw, }; -extern actor_process_profile_definition g_profile_B_GG = { +actor_process_profile_definition g_profile_B_GG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 78b33acb7c..7228df2ca5 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -2231,7 +2231,7 @@ static actor_method_class l_daB_GM_Method = { (process_method_func)daB_GM_Draw, }; -extern actor_process_profile_definition g_profile_B_GM = { +actor_process_profile_definition g_profile_B_GM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 838ef2cbd0..2fb9403d8d 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -4956,7 +4956,7 @@ static actor_method_class l_daB_GND_Method = { (process_method_func)daB_GND_Draw, }; -extern actor_process_profile_definition g_profile_B_GND = { +actor_process_profile_definition g_profile_B_GND = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_go.cpp b/src/d/actor/d_a_b_go.cpp index 4fd4ad4817..6f593b1597 100644 --- a/src/d/actor/d_a_b_go.cpp +++ b/src/d/actor/d_a_b_go.cpp @@ -290,7 +290,7 @@ static actor_method_class l_daB_GO_Method = { (process_method_func)daB_GO_Draw, }; -extern actor_process_profile_definition g_profile_B_GO = { +actor_process_profile_definition g_profile_B_GO = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index 4291a91ce2..190baad085 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -415,7 +415,7 @@ static actor_method_class l_daB_GOS_Method = { (process_method_func)daB_GOS_Draw, }; -extern actor_process_profile_definition g_profile_B_GOS = { +actor_process_profile_definition g_profile_B_GOS = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index 1c83092489..97575825d3 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -3584,7 +3584,7 @@ static actor_method_class l_daB_MGN_Method = { (process_method_func)daB_MGN_Draw, }; -extern actor_process_profile_definition g_profile_B_MGN = { +actor_process_profile_definition g_profile_B_MGN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 32220b7988..9c34171cae 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -3648,7 +3648,7 @@ static actor_method_class l_daB_OB_Method = { (process_method_func)daB_OB_Draw, }; -extern actor_process_profile_definition g_profile_B_OB = { +actor_process_profile_definition g_profile_B_OB = { fpcLy_CURRENT_e, 4, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_oh.cpp b/src/d/actor/d_a_b_oh.cpp index 53e537f80d..aded45eee3 100644 --- a/src/d/actor/d_a_b_oh.cpp +++ b/src/d/actor/d_a_b_oh.cpp @@ -118,7 +118,6 @@ static int daB_OH_Draw(b_oh_class* i_this) { return 1; } -/* 8061DBB5 0003+00 data_8061DBB5 None */ static u8 data_8061DBB5; static daB_OH_HIO_c l_HIO; @@ -831,7 +830,7 @@ static actor_method_class l_daB_OH_Method = { (process_method_func)daB_OH_Draw, }; -extern actor_process_profile_definition g_profile_B_OH = { +actor_process_profile_definition g_profile_B_OH = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_oh2.cpp b/src/d/actor/d_a_b_oh2.cpp index 22e049f97c..b69e0cde42 100644 --- a/src/d/actor/d_a_b_oh2.cpp +++ b/src/d/actor/d_a_b_oh2.cpp @@ -299,7 +299,7 @@ static actor_method_class l_daB_OH2_Method = { (process_method_func)daB_OH2_Draw, }; -extern actor_process_profile_definition g_profile_B_OH2 = { +actor_process_profile_definition g_profile_B_OH2 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 69eda8177a..f768a4f875 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -342,7 +342,6 @@ void daB_TN_c::calcWaistAngle() { cLib_addCalcAngleS2(&mWaistAngle, sVar1, 4, 0x1000); } -/* 8062F01D 0003+00 data_8062F01D None */ static u8 hio_set; static daB_TN_HIO_c l_HIO; @@ -5174,7 +5173,7 @@ static actor_method_class l_daB_TN_Method = { (process_method_func)daB_TN_Draw, }; -extern actor_process_profile_definition g_profile_B_TN = { +actor_process_profile_definition g_profile_B_TN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index 1129892346..ccb33ce32d 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -122,7 +122,6 @@ enum L5_R50_RES_FIL_ID { /* 0x0A */ DZB_R50_P2, }; -/* 80639F74 0001+00 data_80639F74 @1009 */ static bool hio_set; static daB_YO_HIO_c l_HIO; @@ -3432,7 +3431,7 @@ static actor_method_class l_daB_YO_Method = { (process_method_func)daB_YO_Draw, }; -extern actor_process_profile_definition g_profile_B_YO = { +actor_process_profile_definition g_profile_B_YO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index 58a2133e02..c716d4a73b 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -1093,7 +1093,7 @@ static actor_method_class l_daB_YOI_Method = { (process_method_func)daB_YOI_Draw, }; -extern actor_process_profile_definition g_profile_B_YOI = { +actor_process_profile_definition g_profile_B_YOI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index 7d0516f467..e7e2fd146e 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -399,7 +399,6 @@ void daB_ZANT_c::setDamageSe(dCcD_Sph* i_hitSph, int i_dmgAmount) { } } -/* 8064F5F5 0003+00 hio_set None */ static u8 hio_set; static daB_ZANT_HIO_c l_HIO; @@ -5598,7 +5597,7 @@ static actor_method_class l_daB_ZANT_Method = { (process_method_func)daB_ZANT_Draw, }; -extern actor_process_profile_definition g_profile_B_ZANT = { +actor_process_profile_definition g_profile_B_ZANT = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index 426984d84b..d94326b6b2 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -276,7 +276,7 @@ static actor_method_class l_daB_ZANTM_Method = { (process_method_func)daB_ZANTM_Draw, }; -extern actor_process_profile_definition g_profile_B_ZANTM = { +actor_process_profile_definition g_profile_B_ZANTM = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 16c0160a35..64d09f788e 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -506,7 +506,7 @@ static actor_method_class l_daB_ZANTZ_Method = { (process_method_func)daB_ZANTZ_Draw, }; -extern actor_process_profile_definition g_profile_B_ZANTZ = { +actor_process_profile_definition g_profile_B_ZANTZ = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_b_zant_sima.cpp b/src/d/actor/d_a_b_zant_sima.cpp index 95d436f98c..60639516ef 100644 --- a/src/d/actor/d_a_b_zant_sima.cpp +++ b/src/d/actor/d_a_b_zant_sima.cpp @@ -227,7 +227,7 @@ static actor_method_class l_daB_ZANTS_Method = { (process_method_func)daB_ZANTS_Draw, }; -extern actor_process_profile_definition g_profile_B_ZANTS = { +actor_process_profile_definition g_profile_B_ZANTS = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index 925f53776e..a580f46e6b 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -717,7 +717,7 @@ static actor_method_class daBalloon2D_METHODS = { (process_method_func)daBalloon2D_draw, }; -extern actor_process_profile_definition g_profile_BALLOON2D = { +actor_process_profile_definition g_profile_BALLOON2D = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 786ff431cb..a97746ce2a 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -1003,7 +1003,6 @@ static int daBd_Create(fopAc_ac_c* i_act_this) { i_act_this->field_0x560 = 1; i_this->mStts.Init(100, 0, i_act_this); - /* 804DA234-804DA274 0002AC 0040+00 1/1 0/0 0/0 .data cc_sph_src$4956 */ static dCcD_SrcSph cc_sph_src = { { {0x0, {{0x0, 0x0, 0x0}, {0xd8fbfdff, 0x3}, 0x75}}, // mObj @@ -1054,7 +1053,7 @@ static actor_method_class l_daBd_Method = { (process_method_func)daBd_Draw, }; -extern actor_process_profile_definition g_profile_BD = { +actor_process_profile_definition g_profile_BD = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index d69d589785..be8960fc51 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -623,7 +623,7 @@ static actor_method_class l_daBg_Method = { (process_method_func)daBg_Draw, }; -extern actor_process_profile_definition2 g_profile_BG = { +actor_process_profile_definition2 g_profile_BG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 6b16768d0d..f6491ef290 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -1359,7 +1359,7 @@ static actor_method_class daBgObj_METHODS = { (process_method_func)daBgObj_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_BG_OBJ = { +actor_process_profile_definition g_profile_BG_OBJ = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 1d085066d3..83cff8be3f 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -1494,7 +1494,7 @@ static actor_method_class l_daBoomerang_Method = { (process_method_func)daBoomerang_Draw, }; -extern actor_process_profile_definition g_profile_BOOMERANG = { +actor_process_profile_definition g_profile_BOOMERANG = { fpcLy_CURRENT_e, // mLayerID 6, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_bullet.cpp b/src/d/actor/d_a_bullet.cpp index c166293f76..cf488e347d 100644 --- a/src/d/actor/d_a_bullet.cpp +++ b/src/d/actor/d_a_bullet.cpp @@ -250,7 +250,7 @@ static actor_method_class daBullet_MethodTable = { (process_method_func)daBullet_Draw, }; -extern actor_process_profile_definition g_profile_BULLET = { +actor_process_profile_definition g_profile_BULLET = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index 93e8359fdb..588b0318e6 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -914,7 +914,7 @@ static actor_method_class l_daCanoe_Method = { (process_method_func)daCanoe_Draw, }; -extern actor_process_profile_definition g_profile_CANOE = { +actor_process_profile_definition g_profile_CANOE = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index 2cf5d224a0..fd21f2dac0 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -354,7 +354,7 @@ static actor_method_class daCoach2D_METHODS = { (process_method_func)daCoach2D_draw, }; -extern actor_process_profile_definition g_profile_COACH2D = { +actor_process_profile_definition g_profile_COACH2D = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp index 2f6d2ea51c..80433c573e 100644 --- a/src/d/actor/d_a_coach_fire.cpp +++ b/src/d/actor/d_a_coach_fire.cpp @@ -163,7 +163,7 @@ static actor_method_class l_daCoachFire_Method = { (process_method_func)daCoachFire_Draw, }; -extern actor_process_profile_definition g_profile_COACH_FIRE = { +actor_process_profile_definition g_profile_COACH_FIRE = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index 0dc61d0bb8..df44ba3924 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -59,7 +59,7 @@ static f32 l_CowRoomPosX[20] = {-10600.0f, -10600.0f, -10800.0f, -10800.0f, -110 static f32 l_CowRoomPosZ[2] = {-19646.0f, -20926.0f}; #define N_WOLF_BUSTERS 3 -extern fpc_ProcID gWolfBustersID[N_WOLF_BUSTERS] = {fpcM_ERROR_PROCESS_ID_e, fpcM_ERROR_PROCESS_ID_e, fpcM_ERROR_PROCESS_ID_e}; +fpc_ProcID gWolfBustersID[N_WOLF_BUSTERS] = {fpcM_ERROR_PROCESS_ID_e, fpcM_ERROR_PROCESS_ID_e, fpcM_ERROR_PROCESS_ID_e}; } // namespace @@ -431,10 +431,8 @@ void daCow_c::setGroundAngle() { static f32 m_near_dist; -/* 806634F8 0002+00 data_806634F8 m_view_angle_wide */ static s16 m_view_angle_wide; -/* 806634FA 0002+00 data_806634FA m_view_angle */ static s16 m_view_angle; #define IS_COW(actor) (fopAcM_GetName((actor)) == PROC_COW) @@ -3116,10 +3114,7 @@ u8 daCow_c::initialize() { } int daCow_c::create() { - if (!fopAcM_CheckCondition(this, 8)) { - new (this) daCow_c(); - fopAcM_OnCondition(this, 8); - } + fopAcM_ct(this, daCow_c); mPrm0 = fopAcM_GetParam(this); if (mPrm0 == (u8)-1 || mPrm0 >= 5) { @@ -3280,7 +3275,7 @@ static actor_method_class daCow_MethodTable = { daCow_Create, daCow_Delete, daCow_Execute, daCow_IsDelete, daCow_Draw, }; -extern actor_process_profile_definition g_profile_COW = { +actor_process_profile_definition g_profile_COW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_crod.cpp b/src/d/actor/d_a_crod.cpp index 405c2255a7..25f41b7714 100644 --- a/src/d/actor/d_a_crod.cpp +++ b/src/d/actor/d_a_crod.cpp @@ -382,7 +382,7 @@ static actor_method_class l_daCrod_Method = { (process_method_func)daCrod_Draw, }; -extern actor_process_profile_definition g_profile_CROD = { +actor_process_profile_definition g_profile_CROD = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 99ad3813cc..c07eca7aff 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -576,7 +576,7 @@ static actor_method_class l_daCstaF_Method = { (process_method_func)daCstaF_Draw, }; -extern actor_process_profile_definition g_profile_CSTAF = { +actor_process_profile_definition g_profile_CSTAF = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index af480cb457..3c8b7ce917 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -1212,7 +1212,7 @@ static actor_method_class l_daCstatue_Method = { (process_method_func)daCstatue_Draw, }; -extern actor_process_profile_definition g_profile_CSTATUE = { +actor_process_profile_definition g_profile_CSTATUE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index ba2020af60..e3e56e9d66 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -1373,7 +1373,7 @@ static void teduna_ganon_hand_set(J3DModel* i_model, int param_2, int param_3) { } static void ke_control(daDemo00_c* i_this, demo_s1_ke_s* param_2, int param_3, f32 param_4) { - param_3; + UNUSED(param_3); fopAc_ac_c* actor = i_this; int i; cXyz sp4C, sp40; @@ -1892,7 +1892,7 @@ static actor_method_class l_daDemo00_Method = { (process_method_func)daDemo00_Draw, }; -extern actor_process_profile_definition g_profile_DEMO00 = { +actor_process_profile_definition g_profile_DEMO00 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index 4e6b70d020..aaac0e030b 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -559,7 +559,7 @@ static actor_method_class l_daDitem_Method = { (process_method_func)daDitem_Draw, }; -extern actor_process_profile_definition g_profile_Demo_Item = { +actor_process_profile_definition g_profile_Demo_Item = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index d098009ede..48efd5a3ce 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -122,7 +122,7 @@ static actor_method_class l_daDisappear_Method = { (process_method_func)daDisappear_Draw, }; -extern actor_process_profile_definition g_profile_DISAPPEAR = { +actor_process_profile_definition g_profile_DISAPPEAR = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_dmidna.cpp b/src/d/actor/d_a_dmidna.cpp index cd6d496a35..dbe02cdf85 100644 --- a/src/d/actor/d_a_dmidna.cpp +++ b/src/d/actor/d_a_dmidna.cpp @@ -88,7 +88,7 @@ static actor_method_class l_daDmidna_Method = { (process_method_func)daDmidna_Draw, }; -extern actor_process_profile_definition g_profile_DMIDNA = { +actor_process_profile_definition g_profile_DMIDNA = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index 2d02b3fe40..9e6fb93316 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -16,7 +16,6 @@ #include "m_Do/m_Do_controller_pad.h" #include "Z2AudioLib/Z2Instances.h" -/* 8066F2B6 0002+00 data_8066F2B6 None */ static bool noFallCheck; static bool hio_set; @@ -2500,7 +2499,7 @@ static actor_method_class l_daDo_Method = { (process_method_func)daDo_Draw, }; -extern actor_process_profile_definition g_profile_DO = { +actor_process_profile_definition g_profile_DO = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_boss.cpp b/src/d/actor/d_a_door_boss.cpp index 6024869822..8bc8cee3f8 100644 --- a/src/d/actor/d_a_door_boss.cpp +++ b/src/d/actor/d_a_door_boss.cpp @@ -416,7 +416,7 @@ static actor_method_class l_daBdoor_Method = { (process_method_func)daBdoor_Draw, }; -extern actor_process_profile_definition g_profile_BOSS_DOOR = { +actor_process_profile_definition g_profile_BOSS_DOOR = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index 90c442e206..83e9454a61 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -975,7 +975,7 @@ static actor_method_class l_daBdoorL1_Method = { (process_method_func)daBdoorL1_Draw, }; -extern actor_process_profile_definition g_profile_L1BOSS_DOOR = { +actor_process_profile_definition g_profile_L1BOSS_DOOR = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp index fecc69d36f..e78bc00e7b 100644 --- a/src/d/actor/d_a_door_bossL5.cpp +++ b/src/d/actor/d_a_door_bossL5.cpp @@ -502,7 +502,7 @@ static actor_method_class l_daBdoorL5_Method = { (process_method_func)daBdoorL5_Draw, }; -extern actor_process_profile_definition g_profile_L5BOSS_DOOR = { +actor_process_profile_definition g_profile_L5BOSS_DOOR = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index 11b42526f7..4c1e8e8c5e 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -414,7 +414,7 @@ static actor_method_class l_daDbdoor00_Method = { (process_method_func)daDbdoor00_Draw, }; -extern actor_process_profile_definition g_profile_DBDOOR = { +actor_process_profile_definition g_profile_DBDOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index 0803abd9c7..dec122fa0c 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -699,7 +699,7 @@ static actor_method_class l_daKnob20_Method = { (process_method_func)daKnob20_Draw, }; -extern actor_process_profile_definition g_profile_KNOB20 = { +actor_process_profile_definition g_profile_KNOB20 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index 88937986bc..d752b14ba3 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -1727,7 +1727,7 @@ static actor_method_class l_daMBdoorL1_Method = { (process_method_func)daMBdoorL1_Draw, }; -extern actor_process_profile_definition g_profile_L1MBOSS_DOOR = { +actor_process_profile_definition g_profile_L1MBOSS_DOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index 82634f0585..29f6e6f18e 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -366,7 +366,7 @@ static actor_method_class daDoorPush_METHODS = { (process_method_func)daDoorPush_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_PushDoor = { +actor_process_profile_definition g_profile_PushDoor = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 633b2e2b43..06be94937c 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -2145,7 +2145,7 @@ static actor_method_class l_daDoor20_Method = { (process_method_func)daDoor20_Draw, }; -extern actor_process_profile_definition g_profile_DOOR20 = { +actor_process_profile_definition g_profile_DOOR20 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp index 83b8fe063c..61562d0fb3 100644 --- a/src/d/actor/d_a_door_spiral.cpp +++ b/src/d/actor/d_a_door_spiral.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_door_spiral.h" #include "f_op/f_op_actor.h" -extern actor_process_profile_definition g_profile_SPIRAL_DOOR = { +actor_process_profile_definition g_profile_SPIRAL_DOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp index ea3c0f5319..78d5ca6f0d 100644 --- a/src/d/actor/d_a_dshutter.cpp +++ b/src/d/actor/d_a_dshutter.cpp @@ -245,7 +245,7 @@ static actor_method_class l_daDsh_Method = { (process_method_func)daDsh_Draw, }; -extern actor_process_profile_definition2 g_profile_DSHUTTER = { +actor_process_profile_definition2 g_profile_DSHUTTER = { { fpcLy_CURRENT_e, // mLayerID 7, // mListID diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index 5852c7858e..8e8841ffc2 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -948,7 +948,7 @@ static actor_method_class l_daE_AI_Method = { (process_method_func)daE_AI_Draw, }; -extern actor_process_profile_definition g_profile_E_AI = { +actor_process_profile_definition g_profile_E_AI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index 81fc58142a..9827237349 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -753,7 +753,7 @@ static actor_method_class l_daE_ARROW_Method = { (process_method_func)daE_ARROW_Draw, }; -extern actor_process_profile_definition g_profile_E_ARROW = { +actor_process_profile_definition g_profile_E_ARROW = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index 9e91eb2808..2c6134559d 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -1104,7 +1104,7 @@ static actor_method_class l_daE_BA_Method = { (process_method_func)daE_BA_Draw, }; -extern actor_process_profile_definition g_profile_E_BA = { +actor_process_profile_definition g_profile_E_BA = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index e518312df7..529ca90348 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -15,7 +15,6 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" -/* 80685675 0003+00 data_80685675 None */ static bool hio_set; static daE_Bee_HIO_c l_HIO; @@ -814,7 +813,7 @@ static actor_method_class l_daE_Bee_Method = { (process_method_func)daE_Bee_Draw, }; -extern actor_process_profile_definition g_profile_E_BEE = { +actor_process_profile_definition g_profile_E_BEE = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index 317653b21f..e0c963bb86 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -1422,7 +1422,7 @@ static actor_method_class l_daE_BG_Method = { (process_method_func)daE_BG_Draw, }; -extern actor_process_profile_definition g_profile_E_BG = { +actor_process_profile_definition g_profile_E_BG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index 47be524d05..c120f8a19f 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -181,8 +181,6 @@ static void damage_check(e_bi_class* i_this) { } } -/* 8068DB1C 0001+00 data_8068DB1C @1009 */ -/* 8068DB1D 0003+00 data_8068DB1D None */ static u8 hio_set; static daE_BI_HIO_c l_HIO; @@ -994,7 +992,7 @@ static actor_method_class l_daE_BI_Method = { (process_method_func)daE_BI_Draw, }; -extern actor_process_profile_definition g_profile_E_BI = { +actor_process_profile_definition g_profile_E_BI = { fpcLy_CURRENT_e, // mLayerID 9, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp index 8dd49e1444..c273b36b42 100644 --- a/src/d/actor/d_a_e_bi_leaf.cpp +++ b/src/d/actor/d_a_e_bi_leaf.cpp @@ -122,7 +122,7 @@ static actor_method_class l_daE_BI_LEAF_Method = { (process_method_func)daE_BI_LEAF_Draw, }; -extern actor_process_profile_definition g_profile_E_BI_LEAF = { +actor_process_profile_definition g_profile_E_BI_LEAF = { fpcLy_CURRENT_e, 9, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index 3f40108d5c..a8ff9d589d 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -928,7 +928,7 @@ static actor_method_class l_daE_BS_Method = { (process_method_func)daE_BS_Draw, }; -extern actor_process_profile_definition g_profile_E_BS = { +actor_process_profile_definition g_profile_E_BS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index 3bcab8c744..2bb44da4ba 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -1136,7 +1136,7 @@ static actor_method_class l_daE_BU_Method = { (process_method_func)daE_BU_Draw, }; -extern actor_process_profile_definition g_profile_E_BU = { +actor_process_profile_definition g_profile_E_BU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index 1e57cd2415..51b0561706 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -23,16 +23,12 @@ daE_Bug_HIO_c::daE_Bug_HIO_c() { field_0xc = 1.0f; } -/* 80697E6C 0001+00 data_80697E6C @1009 */ -/* 80697E6D 0003+00 data_80697E6D None */ static u8 hio_set; static daE_Bug_HIO_c l_HIO; -/* 80697E8C 0001+00 data_80697E8C None */ static s8 l_roomNo; -/* 80697E8D 0003+00 data_80697E8D None */ static s8 data_80697E8D; static int daE_Bug_Draw(e_bug_class* i_this) { @@ -904,7 +900,7 @@ static actor_method_class l_daE_Bug_Method = { (process_method_func)daE_Bug_Draw, }; -extern actor_process_profile_definition g_profile_E_BUG = { +actor_process_profile_definition g_profile_E_BUG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index 509b2b691d..d606d9eaaf 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -545,7 +545,7 @@ static actor_method_class l_daE_CR_Method = { (process_method_func)daE_CR_Draw, }; -extern actor_process_profile_definition g_profile_E_CR = { +actor_process_profile_definition g_profile_E_CR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp index 7afb24af11..8db1b18c37 100644 --- a/src/d/actor/d_a_e_cr_egg.cpp +++ b/src/d/actor/d_a_e_cr_egg.cpp @@ -223,7 +223,7 @@ static actor_method_class l_daE_CR_EGG_Method = { (process_method_func)daE_CR_EGG_Draw, }; -extern actor_process_profile_definition g_profile_E_CR_EGG = { +actor_process_profile_definition g_profile_E_CR_EGG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index 1698612837..8b6bb55690 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -2205,7 +2205,7 @@ static actor_method_class l_daE_DB_Method = { (process_method_func)daE_DB_Draw, }; -extern actor_process_profile_definition g_profile_E_DB = { +actor_process_profile_definition g_profile_E_DB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_db_leaf.cpp b/src/d/actor/d_a_e_db_leaf.cpp index 1fa30ffdb4..0fe9346bf5 100644 --- a/src/d/actor/d_a_e_db_leaf.cpp +++ b/src/d/actor/d_a_e_db_leaf.cpp @@ -67,7 +67,7 @@ static actor_method_class l_daE_DB_LEAF_Method = { (process_method_func)daE_DB_LEAF_Draw, }; -extern actor_process_profile_definition g_profile_E_DB_LEAF = { +actor_process_profile_definition g_profile_E_DB_LEAF = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index 556a1cd70e..867d6a1335 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -1775,7 +1775,7 @@ static cPhs__Step daE_DD_Create(fopAc_ac_c* a_this) { return phase; } -extern actor_method_class l_daE_DD_Method = { +actor_method_class l_daE_DD_Method = { (process_method_func)daE_DD_Create, (process_method_func)daE_DD_Delete, (process_method_func)daE_DD_Execute, @@ -1783,7 +1783,7 @@ extern actor_method_class l_daE_DD_Method = { (process_method_func)daE_DD_Draw, }; -extern actor_process_profile_definition g_profile_E_DD = { +actor_process_profile_definition g_profile_E_DD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index 5e5376bc66..ac61d6deed 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -714,7 +714,7 @@ static actor_method_class l_daE_DF_Method = { (process_method_func)daE_DF_Draw, }; -extern actor_process_profile_definition g_profile_E_DF = { +actor_process_profile_definition g_profile_E_DF = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index 0290422504..0f13d897a4 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -1081,7 +1081,7 @@ static actor_method_class l_daE_DK_Method = { (process_method_func)daE_DK_Draw, }; -extern actor_process_profile_definition g_profile_E_DK = { +actor_process_profile_definition g_profile_E_DK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index 2c95e4759e..24b19326f8 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -354,7 +354,6 @@ static BOOL other_bg_check2(e_dn_class* i_this, cXyz* i_pos) { return FALSE; } -/* 804EEF2D 0003+00 data_804EEF2D None */ u8 hio_set; daE_DN_HIO_c l_HIO; @@ -3500,7 +3499,7 @@ static actor_method_class l_daE_DN_Method = { (process_method_func)daE_DN_Draw, }; -extern actor_process_profile_definition g_profile_E_DN = { +actor_process_profile_definition g_profile_E_DN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 548b763633..7411529a63 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -156,7 +156,6 @@ dCcD_SrcSph E_DT_n::cc_dt_tongue_src = { } // mSphAttr }; -/* 806B629D 0003+00 data_806B629D None */ static bool hio_set; static daE_DT_HIO_c l_HIO; @@ -2561,7 +2560,7 @@ static actor_method_class l_daE_DT_Method = { (process_method_func)daE_DT_Draw, }; -extern actor_process_profile_definition g_profile_E_DT = { +actor_process_profile_definition g_profile_E_DT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index 4e0888721e..a17e1f024f 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -1007,7 +1007,7 @@ static actor_method_class l_daE_FB_Method = { (process_method_func)daE_FB_Draw, }; -extern actor_process_profile_definition g_profile_E_FB = { +actor_process_profile_definition g_profile_E_FB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index 0ceb54aca4..8a3c406c3d 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -434,10 +434,8 @@ bool daE_FK_c::checkViewArea() { } namespace { -/* 806BB974 0002+00 data_806BB974 s_HorseAngle__22@unnamed@d_a_e_fk_cpp@ */ static s16 s_HorseAngle; -/* 806BB976 0002+00 data_806BB976 s_AttackChk__22@unnamed@d_a_e_fk_cpp@ */ static s16 s_AttackChk; } @@ -813,7 +811,7 @@ static actor_method_class l_daE_FK_Method = { (process_method_func)daE_FK_Draw, }; -extern actor_process_profile_definition g_profile_E_FK = { +actor_process_profile_definition g_profile_E_FK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 2b81b30437..b6386d3f00 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -234,7 +234,6 @@ static void* s_fmobj_del(void* i_actor, void* i_data) { return NULL; } -/* 804FAE95 0003+00 data_804FAE95 None */ static u8 hio_set; static daE_FM_HIO_c l_HIO; @@ -3880,7 +3879,7 @@ static actor_method_class l_daE_FM_Method = { (process_method_func)daE_FM_Draw, }; -extern actor_process_profile_definition g_profile_E_FM = { +actor_process_profile_definition g_profile_E_FM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 4e0188535c..397ace06ad 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -67,7 +67,6 @@ enum Joint { namespace { -/* 806BE79E 0002+00 data_806BE79E s_AtCount__22@unnamed@d_a_e_fs_cpp@ */ static s16 s_AtCount; } // namespace @@ -850,7 +849,7 @@ static actor_method_class l_daE_Fs_Method = { (process_method_func)daE_Fs_Draw, }; -extern actor_process_profile_definition g_profile_E_FS = { +actor_process_profile_definition g_profile_E_FS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp index 28bf0a6c2b..ad11594686 100644 --- a/src/d/actor/d_a_e_fz.cpp +++ b/src/d/actor/d_a_e_fz.cpp @@ -1040,7 +1040,7 @@ static actor_method_class l_daE_FZ_Method = { (process_method_func)daE_FZ_Draw, }; -extern actor_process_profile_definition g_profile_E_FZ = { +actor_process_profile_definition g_profile_E_FZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp index 0878eb9688..00fa54d706 100644 --- a/src/d/actor/d_a_e_ga.cpp +++ b/src/d/actor/d_a_e_ga.cpp @@ -264,7 +264,7 @@ static actor_method_class l_daE_Ga_Method = { (process_method_func)daE_Ga_Draw, }; -extern actor_process_profile_definition g_profile_E_GA = { +actor_process_profile_definition g_profile_E_GA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index c343855360..a7cd49b80f 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -670,7 +670,7 @@ static void kuki_control3(e_gb_class* i_this) { } static void* s_b_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && dBomb_c::checkBombActor((fopAc_ac_c*)i_actor) && !((dBomb_c*)i_actor)->checkStateExplode()) { cXyz sp28 = ((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->home.pos; @@ -1724,7 +1724,7 @@ static actor_method_class l_daE_GB_Method = { (process_method_func)daE_GB_Draw, }; -extern actor_process_profile_definition g_profile_E_GB = { +actor_process_profile_definition g_profile_E_GB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index 2cdce165c6..e47c48cdb8 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -1376,7 +1376,7 @@ static actor_method_class l_daE_GE_Method = { (process_method_func)daE_GE_Draw, }; -extern actor_process_profile_definition g_profile_E_GE = { +actor_process_profile_definition g_profile_E_GE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index 1bf8685e98..4dac5344b4 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -1111,7 +1111,7 @@ static actor_method_class l_daE_GI_Method = { (process_method_func)daE_GI_Draw, }; -extern actor_process_profile_definition g_profile_E_GI = { +actor_process_profile_definition g_profile_E_GI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index a8ac1c38fb..228779b6ea 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -90,13 +90,10 @@ public: }; namespace { - /* 806D7B34-806D7B38 000038 0004+00 2/3 0/0 0/0 .data l_hitActorID__22@unnamed@d_a_e_gm_cpp@ */ static fpc_ProcID l_hitActorID = fpcM_ERROR_PROCESS_ID_e; - /* 806D7B38-806D7B3C 00003C 0004+00 2/4 0/0 0/0 .data l_coreActorID__22@unnamed@d_a_e_gm_cpp@ */ static fpc_ProcID l_coreActorID = fpcM_ERROR_PROCESS_ID_e; - /* 806D7B3C-806D7B7C 000040 0040+00 0/1 0/0 0/0 .data cc_sph_src__22@unnamed@d_a_e_gm_cpp@ */ static dCcD_SrcSph cc_sph_src = { { {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0xD}, {0xDAFBFDFF, 0x3}, 0x75}}, @@ -139,26 +136,19 @@ static u8 hio_set; static daE_GM_HIO_c l_HIO; namespace { - /* 806D7EF8-806D7F04 000088 000C+00 0/3 0/0 0/0 .bss l_corePos__22@unnamed@d_a_e_gm_cpp@ */ static cXyz l_corePos(0.0f, 0.0f, 0.0f); - /* 806D7F10-806D7F18 0000A0 0006+02 0/3 0/0 0/0 .bss l_coreAngle__22@unnamed@d_a_e_gm_cpp@ */ static csXyz l_coreAngle; - /* 806D7F18-806D7F1C 0000A8 0004+00 0/2 0/0 0/0 .bss l_coreSpeedF__22@unnamed@d_a_e_gm_cpp@ */ static f32 l_coreSpeedF; } // namespace -/* 806D7F1C -00001 0004+00 11/14 0/0 0/0 .bss None */ static u8 lbl_195_bss_AC; -/* 806D7F1D 0001+00 data_806D7F1D None */ static u8 lbl_195_bss_AD; -/* 806D7F1E 0001+00 data_806D7F1E None */ static u8 lbl_195_bss_AE; -/* 806D7F1F 0001+00 data_806D7F1F None */ static u8 lbl_195_bss_AF; void daE_GM_c::action() { @@ -1833,7 +1823,7 @@ static actor_method_class l_daE_GM_Method = { (process_method_func)daE_GM_Draw, }; -extern actor_process_profile_definition g_profile_E_GM = { +actor_process_profile_definition g_profile_E_GM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index cb36237df5..f70008fd83 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -276,7 +276,6 @@ static void damage_check(e_gob_class* i_this) { } } -/* 806DF2C5 0003+00 data_806DF2C5 None */ static u8 hio_set; static daE_GOB_HIO_c l_HIO; @@ -2403,7 +2402,7 @@ static actor_method_class l_daE_GOB_Method = { (process_method_func)daE_GOB_Draw, }; -extern actor_process_profile_definition g_profile_E_GOB = { +actor_process_profile_definition g_profile_E_GOB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index a678880082..a9683523e6 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -232,7 +232,7 @@ static actor_method_class l_daE_GS_Method = { (process_method_func)daE_GS_Draw, }; -extern actor_process_profile_definition g_profile_E_GS = { +actor_process_profile_definition g_profile_E_GS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index ac087a09ca..3aa28fb726 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -1510,7 +1510,7 @@ static actor_method_class l_daE_HB_Method = { (process_method_func)daE_HB_Draw, }; -extern actor_process_profile_definition g_profile_E_HB = { +actor_process_profile_definition g_profile_E_HB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_hb_leaf.cpp b/src/d/actor/d_a_e_hb_leaf.cpp index 78d68a54b7..4a28434d3c 100644 --- a/src/d/actor/d_a_e_hb_leaf.cpp +++ b/src/d/actor/d_a_e_hb_leaf.cpp @@ -86,7 +86,7 @@ static actor_method_class l_daE_HB_LEAF_Method = { (process_method_func)daE_HB_LEAF_Draw, }; -extern actor_process_profile_definition g_profile_E_HB_LEAF = { +actor_process_profile_definition g_profile_E_HB_LEAF = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index 781ee1ad77..4c6e5d37da 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -1602,7 +1602,7 @@ static actor_method_class l_daE_HM_Method = { (process_method_func)daE_HM_Draw, }; -extern actor_process_profile_definition g_profile_E_HM = { +actor_process_profile_definition g_profile_E_HM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index e37042a121..90338615e6 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -169,7 +169,6 @@ static bool hio_set; static daE_HP_HIO_c l_HIO; int daE_HP_c::draw() { - /* 806EA3E8-806EA3EC 000100 0004+00 1/1 0/0 0/0 .data particleNmaeDt$4030 */ static u16 particleNmaeDt[2] = { 0x8789, 0x878A, @@ -1328,7 +1327,7 @@ static actor_method_class l_daE_HP_Method = { (process_method_func)daE_HP_Draw, }; -extern actor_process_profile_definition g_profile_E_HP = { +actor_process_profile_definition g_profile_E_HP = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index d9be18d622..7b1bc09e81 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -2092,7 +2092,7 @@ static actor_method_class l_daE_HZ_Method = { (process_method_func)daE_HZ_Draw, }; -extern actor_process_profile_definition g_profile_E_HZ = { +actor_process_profile_definition g_profile_E_HZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index c0b066b933..6402b7f5ef 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -1534,7 +1534,7 @@ static actor_method_class l_daE_HZELDA_Method = { (process_method_func)daE_HZELDA_Draw, }; -extern actor_process_profile_definition g_profile_E_HZELDA = { +actor_process_profile_definition g_profile_E_HZELDA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index 82ba88099c..f95bba1755 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -752,7 +752,7 @@ static actor_method_class l_daE_IS_Method = { (process_method_func)daE_IS_Draw, }; -extern actor_process_profile_definition g_profile_E_IS = { +actor_process_profile_definition g_profile_E_IS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_kg.cpp b/src/d/actor/d_a_e_kg.cpp index a9f4060e5c..570944ff21 100644 --- a/src/d/actor/d_a_e_kg.cpp +++ b/src/d/actor/d_a_e_kg.cpp @@ -743,7 +743,7 @@ static actor_method_class l_daE_KG_Method = { (process_method_func)daE_KG_Draw, }; -extern actor_process_profile_definition g_profile_E_KG = { +actor_process_profile_definition g_profile_E_KG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index d9a3f49a77..a2838ee4da 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -1490,7 +1490,7 @@ static actor_method_class l_daE_KK_Method = { (process_method_func)daE_KK_Draw, }; -extern actor_process_profile_definition g_profile_E_KK = { +actor_process_profile_definition g_profile_E_KK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index dcf169de9e..4001092815 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -2390,7 +2390,7 @@ static actor_method_class l_daE_Kr_Method = { (process_method_func)daE_Kr_Draw, }; -extern actor_process_profile_definition g_profile_E_KR = { +actor_process_profile_definition g_profile_E_KR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index d7b11024a4..f99e754c62 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -89,7 +89,6 @@ static int daE_MB_Draw(e_mb_class* i_this) { return 1; } -/* 80708C2D 0003+00 data_80708C2D None */ static u8 hio_set; static daE_MB_HIO_c l_HIO; @@ -743,7 +742,7 @@ static actor_method_class l_daE_MB_Method = { (process_method_func)daE_MB_Draw, }; -extern actor_process_profile_definition g_profile_E_MB = { +actor_process_profile_definition g_profile_E_MB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index 034bf6b943..863482cd7e 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -455,7 +455,7 @@ static actor_method_class l_daE_MD_Method = { (process_method_func)daE_MD_Draw, }; -extern actor_process_profile_definition g_profile_E_MD = { +actor_process_profile_definition g_profile_E_MD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index e91a974fd9..3374b2a919 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -3271,7 +3271,7 @@ actor_method_class l_daE_MF_Method = { (process_method_func)daE_MF_Draw, }; -extern actor_process_profile_definition g_profile_E_MF = { +actor_process_profile_definition g_profile_E_MF = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 342145b851..50a598f172 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -115,7 +115,7 @@ static int daE_MK_Draw(e_mk_class* i_this) { } static void* s_obj_delete(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor)) { fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; @@ -137,10 +137,8 @@ static cXyz demo_jump_pos_3(2400.0f, 1115.0f, -1850.0f); static cXyz STAGE_CENTER_POS; -/* 8071CB08 0002+00 data_8071CB08 STAGE_ANGLE_Y */ static s16 STAGE_ANGLE_Y; -/* 8071CB0A 0001+00 .bss */ u8 hio_set; static daE_MK_HIO_c l_HIO; @@ -150,7 +148,7 @@ static void* target_info[20]; static int target_info_count; static void* s_h_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_Pillar) && target_info_count < 20) { target_info[target_info_count] = (daPillar_c*)i_actor; @@ -219,7 +217,7 @@ static daPillar_c* search_hasira(e_mk_class* i_this) { } static void* s_d_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_DB)) { e_db_class* actor = (e_db_class*)i_actor; @@ -1942,7 +1940,7 @@ static void demo_camera_end(e_mk_class* i_this) { } static void* s_ks_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if ((fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_KS) && static_cast(i_actor)->set_id == 0) { return i_actor; @@ -1952,7 +1950,7 @@ static void* s_ks_sub(void* i_actor, void* i_data) { } static void* s_brg_sub(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { static_cast(i_actor)->field_0xaef4 = VREG_F(11) + 500.0f; @@ -1963,7 +1961,7 @@ static void* s_brg_sub(void* i_actor, void* i_data) { } static void* s_brg_sub2(void* i_actor, void* i_data) { - i_data; + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { static_cast(i_actor)->mType &= ~0x4 & 0xFFFFFFFB; @@ -2952,7 +2950,7 @@ static actor_method_class l_daE_MK_Method = { (process_method_func)daE_MK_Draw, }; -extern actor_process_profile_definition g_profile_E_MK = { +actor_process_profile_definition g_profile_E_MK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mk_bo.cpp b/src/d/actor/d_a_e_mk_bo.cpp index 4ba7dde5ce..8d4c430fa7 100644 --- a/src/d/actor/d_a_e_mk_bo.cpp +++ b/src/d/actor/d_a_e_mk_bo.cpp @@ -812,7 +812,7 @@ static actor_method_class l_daE_MK_BO_Method = { (process_method_func)daE_MK_BO_Draw, }; -extern actor_process_profile_definition g_profile_E_MK_BO = { +actor_process_profile_definition g_profile_E_MK_BO = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index b6c19b78af..dcca056461 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -1139,7 +1139,7 @@ static actor_method_class l_daE_MM_Method = { (process_method_func)daE_MM_Draw, }; -extern actor_process_profile_definition g_profile_E_MM = { +actor_process_profile_definition g_profile_E_MM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_mm_mt.cpp b/src/d/actor/d_a_e_mm_mt.cpp index 9c5ec2d38f..61976863ce 100644 --- a/src/d/actor/d_a_e_mm_mt.cpp +++ b/src/d/actor/d_a_e_mm_mt.cpp @@ -261,8 +261,6 @@ static void e_mm_mt_carry(e_mm_mt_class* i_this) { cLib_addCalcAngleS2(&i_this->m_carryAngleSpeed, 0x2000, 1, 0x100); } -// /* 807239CC-80723B70 000ACC 01A4+00 1/1 0/0 0/0 .text wall_angle_get__FP13e_mm_mt_class -// */ static s16 wall_angle_get(e_mm_mt_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; cXyz vec1, vec2, vec3[2]; @@ -603,7 +601,7 @@ static void action(e_mm_mt_class* i_this) { daPy_getPlayerActorClass()->getCutType() == 24) { actor->speedF = cM_rndF(10.0f) + 40.0f + TREG_F(16); i_this->m_spin = (s16)(cM_rndF(2000.0f) + 5500.0f); - i_this->field_0x69C = (f32)(s16)(cM_rndF(1000.0f) + 5000.0f); + i_this->field_0x69C = (s16)(cM_rndF(1000.0f) + 5000.0f); } else { actor->speedF = TREG_F(17) + 30.0f; i_this->m_spin = (s16)cM_rndFX(3000.0f); @@ -850,7 +848,7 @@ static actor_method_class l_daE_MM_MT_Method = { (process_method_func)daE_MM_MT_Draw, }; -extern actor_process_profile_definition g_profile_E_MM_MT = { +actor_process_profile_definition g_profile_E_MM_MT = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index b8595f2ce5..a70515fe13 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -67,7 +67,7 @@ static int daE_MS_Draw(e_ms_class* i_this) { cXyz shadow_pos(i_this->current.pos.x, i_this->current.pos.y + 100.0f, i_this->current.pos.z); i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &shadow_pos, 400.0f, 40.0f, - i_this->current.pos.y, i_this->mAcch.m_ground_h, i_this->mAcch.m_gnd, + i_this->current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); return 1; @@ -79,7 +79,7 @@ static void sibuki_set(e_ms_class* i_this) { cXyz pos(i_this->current.pos); pos.y = i_this->field_0x690; fopKyM_createWpillar(&pos, 1.0f, 0); - if (i_this->field_0x690 - i_this->mAcch.m_ground_h > 50.0f) { + if (i_this->field_0x690 - i_this->mAcch.GetGroundH() > 50.0f) { i_this->mSound.startCreatureSound(Z2SE_CM_BODYFALL_ASASE_S, 0, -1); } else { i_this->mSound.startCreatureSound(Z2SE_EN_MS_FALLWATER, 0, -1); @@ -108,7 +108,6 @@ static void ms_disappear(e_ms_class* i_this) { } } -/* 807297FD 0003+00 data_807297FD None */ static u8 hio_set; static daE_MS_HIO_c l_HIO; @@ -1062,7 +1061,7 @@ static actor_method_class l_daE_MS_Method = { (process_method_func)daE_MS_Draw, }; -extern actor_process_profile_definition g_profile_E_MS = { +actor_process_profile_definition g_profile_E_MS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 319811a76b..44fa483e6e 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -1071,7 +1071,7 @@ static actor_method_class l_daE_Nest_Method = { (process_method_func)daE_Nest_Draw, }; -extern actor_process_profile_definition g_profile_E_NEST = { +actor_process_profile_definition g_profile_E_NEST = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index 5c98407484..7918dfe541 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -745,7 +745,7 @@ static actor_method_class l_daE_NZ_Method = { (process_method_func)daE_NZ_Draw, }; -extern actor_process_profile_definition g_profile_E_NZ = { +actor_process_profile_definition g_profile_E_NZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 30d4fb52d0..6a266cb87a 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -2803,7 +2803,7 @@ static actor_method_class l_daE_OC_Method = { (process_method_func)daE_OC_Draw, }; -extern actor_process_profile_definition g_profile_E_OC = { +actor_process_profile_definition g_profile_E_OC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index 6b549a19f6..b2edcdea7e 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -154,7 +154,6 @@ void daE_OctBg_c::action() { } } -/* 8073A13D 0003+00 data_8073A13D None */ static u8 struct_8073A13D; int daE_OctBg_c::_delete() { @@ -172,9 +171,6 @@ static int daE_OctBg_Delete(daE_OctBg_c* i_this) { return i_this->_delete(); } -/* 8073A14C 0024+01 data_8073A14C l_HIO */ -/* 8073A171 0001+00 data_8073A171 None */ -/* 8073A172 0002+00 data_8073A172 None */ static daE_OctBg_HIO_c l_HIO; u8 unk_bss_78; @@ -890,7 +886,7 @@ static actor_method_class l_daE_OctBg_Method = { (process_method_func)daE_OctBg_Draw, }; -extern actor_process_profile_definition g_profile_E_OctBg = { +actor_process_profile_definition g_profile_E_OctBg = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index 8ef12705d1..ac7ed366f7 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -86,13 +86,10 @@ static dCcD_SrcSph cc_ot_at_src = { } // namespace -/* 8073D2AD 0003+00 data_8073D2AD None */ static bool hio_set; static daE_OT_HIO_c l_HIO; -/* 8073D2DC 0001+00 data_8073D2DC None */ -/* 8073D2DD 0003+00 data_8073D2DD None */ static u8 data_8073D2DC; static u8 data_8073D2DD; @@ -840,7 +837,7 @@ static actor_method_class l_daE_OT_Method = { (process_method_func)daE_OT_Draw, }; -extern actor_process_profile_definition g_profile_E_OT = { +actor_process_profile_definition g_profile_E_OT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index 1e4e8c2028..63365ee1ce 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -1296,7 +1296,7 @@ static actor_method_class l_daE_PH_Method = { (process_method_func)daE_PH_Draw, }; -extern actor_process_profile_definition g_profile_E_PH = { +actor_process_profile_definition g_profile_E_PH = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 44012d42c8..aa134b2820 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -128,7 +128,6 @@ enum Mode { /* 0x07 */ Mode7, }; -/* 8074C385 0003+00 data_8074C385 None */ static bool hio_set; static daE_PM_HIO_c l_HIO; @@ -2868,7 +2867,7 @@ static actor_method_class l_daE_PM_Method = { (process_method_func)daE_PM_Draw, }; -extern actor_process_profile_definition g_profile_E_PM = { +actor_process_profile_definition g_profile_E_PM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index d8fa2eb877..cd6099ef04 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -3171,7 +3171,7 @@ static actor_method_class l_daE_PO_Method = { (process_method_func)daE_PO_Draw, }; -extern actor_process_profile_definition g_profile_E_PO = { +actor_process_profile_definition g_profile_E_PO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index aced6e3cab..2cf270e694 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -182,13 +182,10 @@ void daE_PZ_c::mEntrySUB(bool param_0) { } } -/* 80761DFD 0003+00 hio_set None */ static u8 hio_set; -/* 80761E0C 001C+01 data_80761E0C l_HIO */ static daE_PZ_HIO_c l_HIO; -/* 80761E29 0003+00 data_80761E29 None */ static u8 lbl_222_bss_70; static u8 lbl_222_bss_71; @@ -2655,7 +2652,7 @@ static actor_method_class l_daE_PZ_Method = { (process_method_func)daE_PZ_Draw, }; -extern actor_process_profile_definition g_profile_E_PZ = { +actor_process_profile_definition g_profile_E_PZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index d60287ceec..bf8e917245 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -869,7 +869,7 @@ static actor_method_class l_daE_RB_Method = { (process_method_func)daE_RB_Draw, }; -extern actor_process_profile_definition g_profile_E_RB = { +actor_process_profile_definition g_profile_E_RB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 186ca6bab6..89904ae397 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -585,7 +585,6 @@ static u8 hio_set; static daE_RD_HIO_c l_HIO; -/* 805191E4 0002+00 data_805191E4 S_find */ static s16 S_find; static s8 lbl_70_bss_AE; @@ -7372,7 +7371,7 @@ static actor_method_class l_daE_RD_Method = { (process_method_func)daE_RD_Draw, }; -extern actor_process_profile_definition g_profile_E_RD = { +actor_process_profile_definition g_profile_E_RD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index cd7842fb99..c3a8b87d77 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1917,7 +1917,7 @@ static actor_method_class l_daE_RDB_Method = { (process_method_func)daE_RDB_Draw, }; -extern actor_process_profile_definition g_profile_E_RDB = { +actor_process_profile_definition g_profile_E_RDB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index e3192621f7..4227cae259 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -4995,7 +4995,7 @@ static actor_method_class l_daE_RDY_Method = { (process_method_func)daE_RDY_Draw, }; -extern actor_process_profile_definition g_profile_E_RDY = { +actor_process_profile_definition g_profile_E_RDY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index b7280cec47..a50615874e 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -2246,7 +2246,7 @@ static actor_method_class l_daE_S1_Method = { (process_method_func)daE_S1_Draw, }; -extern actor_process_profile_definition g_profile_E_S1 = { +actor_process_profile_definition g_profile_E_S1 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index 30b28d03a0..9b793f4a6d 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -257,11 +257,8 @@ static u8 hio_set; static daE_SB_HIO_c l_HIO; namespace { - /* 80784FC4-80784FC8 000094 0004+00 2/2 0/0 0/0 .bss s_Bomb__22@unnamed@d_a_e_sb_cpp@ */ static fopAc_ac_c* s_Bomb; - /* 80784FC8-80784FCC 000098 0002+02 3/5 0/0 0/0 .bss s_TargetAngle__22@unnamed@d_a_e_sb_cpp@ */ static s16 s_TargetAngle; - /* 80784FCC-80784FD0 00009C 0004+00 5/7 0/0 0/0 .bss s_LinkPos__22@unnamed@d_a_e_sb_cpp@ */ static cXyz* s_LinkPos; } @@ -1169,7 +1166,7 @@ static actor_method_class l_daE_SB_Method = { (process_method_func)daE_SB_Draw, }; -extern actor_process_profile_definition g_profile_E_SB = { +actor_process_profile_definition g_profile_E_SB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index fe1b32491c..7fb4012ee7 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -1883,7 +1883,7 @@ static actor_method_class l_daE_SF_Method = { (process_method_func)daE_SF_Draw, }; -extern actor_process_profile_definition g_profile_E_SF = { +actor_process_profile_definition g_profile_E_SF = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp index 71de575d63..f65b058eb4 100644 --- a/src/d/actor/d_a_e_sg.cpp +++ b/src/d/actor/d_a_e_sg.cpp @@ -1252,7 +1252,7 @@ static actor_method_class l_daE_SG_Method = { (process_method_func)daE_SG_Draw, }; -extern actor_process_profile_definition g_profile_E_SG = { +actor_process_profile_definition g_profile_E_SG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index aae75bcccf..bda0eb701b 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -1262,7 +1262,7 @@ static actor_method_class l_daE_SH_Method = { (process_method_func)daE_SH_Draw, }; -extern actor_process_profile_definition g_profile_E_SH = { +actor_process_profile_definition g_profile_E_SH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index 77d12e8b86..a00d3a2f62 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -461,10 +461,8 @@ static u8 hio_set; static daE_Sm_HIO_c l_HIO; namespace { - /* 807989E0-807989E4 000068 0004+00 3/4 0/0 0/0 .bss s_Dis__22@unnamed@d_a_e_sm_cpp@ */ static f32 s_Dis; - /* 807989E4-807989E8 00006C 0002+02 9/10 0/0 0/0 .bss s_TargetAngle__22@unnamed@d_a_e_sm_cpp@ */ static s16 s_TargetAngle; }; @@ -2018,7 +2016,7 @@ static actor_method_class l_daE_SM_Method = { (process_method_func)daE_SM_Draw, }; -extern actor_process_profile_definition g_profile_E_SM = { +actor_process_profile_definition g_profile_E_SM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index 09b2dcf99c..9c02533746 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -1634,7 +1634,7 @@ static actor_method_class l_daE_SM2_Method = { (process_method_func)daE_SM2_Draw, }; -extern actor_process_profile_definition g_profile_E_SM2 = { +actor_process_profile_definition g_profile_E_SM2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index f9e054df78..41c9d2a143 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -3166,7 +3166,7 @@ static actor_method_class l_daE_ST_Method = { (process_method_func)daE_ST_Draw, }; -extern actor_process_profile_definition g_profile_E_ST = { +actor_process_profile_definition g_profile_E_ST = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_st_line.cpp b/src/d/actor/d_a_e_st_line.cpp index 873e70cca0..bc832b7a57 100644 --- a/src/d/actor/d_a_e_st_line.cpp +++ b/src/d/actor/d_a_e_st_line.cpp @@ -122,7 +122,7 @@ static actor_method_class l_daE_ST_LINE_Method = { (process_method_func)daE_ST_LINE_Draw, }; -extern actor_process_profile_definition g_profile_E_ST_LINE = { +actor_process_profile_definition g_profile_E_ST_LINE = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index d9e95a80b7..6f2ccf382c 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -184,23 +184,17 @@ void daE_SW_c::setHideEffect() { } namespace { - /* 807B01F8-807B01FC 000048 0004+00 1/2 0/0 0/0 .bss target_info__22@unnamed@d_a_e_sw_cpp@ */ static fopAc_ac_c* target_info; - /* 807B01FC-807B0200 00004C 0004+00 1/2 0/0 0/0 .bss target_dist__22@unnamed@d_a_e_sw_cpp@ */ static f32 target_dist; }; -/* 807B0200 */ static u8 data_807B0200; -/* 807B0201 */ static u8 data_807B0201; -/* 807B0202 */ static u8 data_807B0202; -/* 807B0203 0001+00 data_807B0203 None */ static u8 hio_set; void daE_SW_c::setActionMode(s16 i_actionMode, s16 i_moveMode) { @@ -1808,7 +1802,7 @@ static actor_method_class l_daE_SW_Method = { (process_method_func)daE_SW_Draw, }; -extern actor_process_profile_definition g_profile_E_SW = { +actor_process_profile_definition g_profile_E_SW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index f62aa40fbd..896a465ea1 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -1307,7 +1307,7 @@ static actor_method_class l_daE_TH_Method = { (process_method_func)daE_TH_Draw, }; -extern actor_process_profile_definition g_profile_E_TH = { +actor_process_profile_definition g_profile_E_TH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp index b53ba952ce..a6fad3bbaa 100644 --- a/src/d/actor/d_a_e_th_ball.cpp +++ b/src/d/actor/d_a_e_th_ball.cpp @@ -1123,7 +1123,7 @@ static actor_method_class l_daE_TH_BALL_Method = { (process_method_func)daE_TH_BALL_Draw, }; -extern actor_process_profile_definition g_profile_E_TH_BALL = { +actor_process_profile_definition g_profile_E_TH_BALL = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index 6b8c949127..1531055bee 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -747,7 +747,7 @@ static actor_method_class l_daE_TK_Method = { (process_method_func)daE_TK_Draw, }; -extern actor_process_profile_definition g_profile_E_TK = { +actor_process_profile_definition g_profile_E_TK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index 3a8ad757b0..9c85a529c6 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -551,7 +551,7 @@ static actor_method_class l_daE_TK2_Method = { (process_method_func)daE_TK2_Draw, }; -extern actor_process_profile_definition g_profile_E_TK2 = { +actor_process_profile_definition g_profile_E_TK2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp index 2942bc4556..4429670d69 100644 --- a/src/d/actor/d_a_e_tk_ball.cpp +++ b/src/d/actor/d_a_e_tk_ball.cpp @@ -436,7 +436,7 @@ static actor_method_class l_daE_TK_BALL_Method = { (process_method_func)daE_TK_BALL_Draw, }; -extern actor_process_profile_definition g_profile_E_TK_BALL = { +actor_process_profile_definition g_profile_E_TK_BALL = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index d4baf9725f..45e95c5690 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -1319,7 +1319,7 @@ static actor_method_class l_daE_TT_Method = { (process_method_func)daE_TT_Draw, }; -extern actor_process_profile_definition g_profile_E_TT = { +actor_process_profile_definition g_profile_E_TT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 11c74e8cfc..98edc800bc 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -204,7 +204,6 @@ daE_VA_HIO_c::daE_VA_HIO_c() { mKRegLightA = 210.0f; } -/* 807CF4B5 0003+00 data_807CF4B5 None */ #pragma push #pragma force_active on static u8 hio_set; @@ -3901,7 +3900,7 @@ static actor_method_class l_daE_VA_Method = { (process_method_func)daE_VA_Draw, }; -extern actor_process_profile_definition g_profile_E_VT = { +actor_process_profile_definition g_profile_E_VT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index 9b466bc1d2..07a7b71d11 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -895,7 +895,7 @@ static actor_method_class l_daE_Warpappear_Method = { (process_method_func)daE_Warpappear_Draw, }; -extern actor_process_profile_definition g_profile_E_WAP = { +actor_process_profile_definition g_profile_E_WAP = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index f6b24f569c..055e882782 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -5819,7 +5819,7 @@ static actor_method_class l_daE_WB_Method = { (process_method_func)daE_WB_Draw, }; -extern actor_process_profile_definition g_profile_E_WB = { +actor_process_profile_definition g_profile_E_WB = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index ac4e851412..2a9920ddd4 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -984,7 +984,7 @@ static actor_method_class l_daE_WS_Method = { (process_method_func)daE_WS_Draw, }; -extern actor_process_profile_definition g_profile_E_WS = { +actor_process_profile_definition g_profile_E_WS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index d57f6c23cc..dc750410a2 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -118,7 +118,6 @@ public: }; namespace { - /* 807EF904-807EF944 000038 0040+00 1/1 0/0 0/0 .data cc_ww_src__22@unnamed@d_a_e_ww_cpp@ */ dCcD_SrcSph cc_ww_src = { { {0x0, {{0x400, 0x1, 0xC}, {0x0, 0x0}, 0x75}}, // mObj @@ -131,7 +130,6 @@ namespace { } // mSphAttr }; - /* 807EF944-807EF984 000078 0040+00 1/1 0/0 0/0 .data cc_ww_tg_src__22@unnamed@d_a_e_ww_cpp@ */ dCcD_SrcSph cc_ww_tg_src = { { {0x0, {{0x0, 0x1, 0x0}, {0xD8FBFDFF, 0x43}, 0x0}}, // mObj @@ -2306,7 +2304,7 @@ static actor_method_class l_daE_WW_Method = { (process_method_func)daE_WW_Draw, }; -extern actor_process_profile_definition g_profile_E_WW = { +actor_process_profile_definition g_profile_E_WW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index 8395641bca..7dc53234c4 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -834,7 +834,7 @@ static actor_method_class l_daE_YC_Method = { (process_method_func)daE_YC_Draw, }; -extern actor_process_profile_definition g_profile_E_YC = { +actor_process_profile_definition g_profile_E_YC = { fpcLy_CURRENT_e, 4, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index 042af178ab..bd54664088 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -1492,7 +1492,7 @@ static actor_method_class l_daE_YD_Method = { (process_method_func)daE_YD_Draw, }; -extern actor_process_profile_definition g_profile_E_YD = { +actor_process_profile_definition g_profile_E_YD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_yd_leaf.cpp b/src/d/actor/d_a_e_yd_leaf.cpp index 31e26716a1..dbcc9a2f93 100644 --- a/src/d/actor/d_a_e_yd_leaf.cpp +++ b/src/d/actor/d_a_e_yd_leaf.cpp @@ -94,7 +94,7 @@ static actor_method_class l_daE_YD_LEAF_Method = { (process_method_func)daE_YD_LEAF_Draw, }; -extern actor_process_profile_definition g_profile_E_YD_LEAF = { +actor_process_profile_definition g_profile_E_YD_LEAF = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp index 45e10382fe..7bc63dfba9 100644 --- a/src/d/actor/d_a_e_yg.cpp +++ b/src/d/actor/d_a_e_yg.cpp @@ -1446,7 +1446,7 @@ static actor_method_class l_daE_YG_Method = { (process_method_func)daE_YG_Draw, }; -extern actor_process_profile_definition g_profile_E_YG = { +actor_process_profile_definition g_profile_E_YG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 93bb9e7f5d..79d344eb51 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -2257,7 +2257,7 @@ static actor_method_class l_daE_YH_Method = { (process_method_func)daE_YH_Draw, }; -extern actor_process_profile_definition g_profile_E_YH = { +actor_process_profile_definition g_profile_E_YH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index 78a92833f0..33d293d5f7 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -158,7 +158,6 @@ static int daE_YK_Draw(e_yk_class* i_this) { * Used by the Shadow Keese's wind state to determine if it should be affected * by a charged boomerang's wind effect. */ - /* 80804B38-80804BB0 0003F8 0078+00 1/1 0/0 0/0 .text shot_b_sub__FPvPv */ static void* shot_b_sub(void* i_actor, void* param_1) { if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_BOOMERANG && !dComIfGp_checkPlayerStatus0(0,0x80000) && @@ -1558,7 +1557,7 @@ static actor_method_class l_daE_YK_Method = { (process_method_func)daE_YK_Draw, }; -extern actor_process_profile_definition g_profile_E_YK = { +actor_process_profile_definition g_profile_E_YK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index c96dc6865e..81a24edf3a 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -3503,7 +3503,7 @@ static actor_method_class l_daE_YM_Method = { (process_method_func)daE_YM_Draw, }; -extern actor_process_profile_definition g_profile_E_YM = { +actor_process_profile_definition g_profile_E_YM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ym_tag.cpp b/src/d/actor/d_a_e_ym_tag.cpp index 0674464aa7..fd607a778e 100644 --- a/src/d/actor/d_a_e_ym_tag.cpp +++ b/src/d/actor/d_a_e_ym_tag.cpp @@ -68,7 +68,7 @@ static actor_method_class l_daE_YM_TAG_Method = { (process_method_func)daE_YM_TAG_Draw }; -extern actor_process_profile_definition g_profile_E_YM_TAG = { +actor_process_profile_definition g_profile_E_YM_TAG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index a01a3f1981..0bbc284203 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -170,7 +170,6 @@ enum Particle { }; namespace { - /* 80821B30-80821B70 000020 0040+00 0/1 0/0 0/0 .data cc_ymb_src__23@unnamed@d_a_e_ymb_cpp@ */ static dCcD_SrcSph cc_ymb_src = { {{0x0, {{AT_TYPE_CSTATUE_SWING, 0x2, 0xD}, {0xD8FBFDFF, 0x3}, 0x75}}, // mObj {dCcD_SE_METAL, 0x0, 0x1, 0x7, 0x0}, // mGObjAt @@ -182,7 +181,6 @@ namespace { } // mSphAttr }; - /* 80821B70-80821BB0 000060 0040+00 0/1 0/0 0/0 .data cc_ymb_at_src__23@unnamed@d_a_e_ymb_cpp@ */ static dCcD_SrcSph cc_ymb_at_src = { {{0x0, {{AT_TYPE_CSTATUE_SWING, 0x2, 0xD}, {0xD8FBFDFF, 0x0}, 0x0}}, // mObj {dCcD_SE_METAL, 0x0, 0x1, 0x7, 0x0}, // mGObjAt @@ -194,7 +192,6 @@ namespace { } // mSphAttr }; - /* 80821BB0-80821BF0 0000A0 0040+00 0/1 0/0 0/0 .data cc_ymb_eye_src__23@unnamed@d_a_e_ymb_cpp@ */ static dCcD_SrcSph cc_ymb_eye_src = { {{0x0, {{AT_TYPE_0, 0x0, 0x0}, {0x80000000, 0x3}, 0x0}}, // mObj {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -206,7 +203,6 @@ namespace { } // mSphAttr }; - /* 80821BF0-80821C30 0000E0 0040+00 0/1 0/0 0/0 .data cc_ymb_tube_src__23@unnamed@d_a_e_ymb_cpp@ */ static dCcD_SrcSph cc_ymb_tube_src = { {{0x0, {{AT_TYPE_0, 0x0, 0x0}, {0xD8FBFDFF, 0x2}, 0x75}}, // mObj {dCcD_SE_METAL, 0x0, 0x0, 0x0, 0x0}, // mGObjAt @@ -217,12 +213,10 @@ namespace { } // mSphAttr }; - /* 80821C30-80821C48 000120 0018+00 3/4 0/0 0/0 .data YMB_DOWN_ATT_JNT__23@unnamed@d_a_e_ymb_cpp@ */ static int YMB_DOWN_ATT_JNT[6] = { JNT_TUBE_LC2, JNT_TUBE_RA2, JNT_TUBE_LB2, JNT_TUBE_RC2, JNT_TUBE_LA2, JNT_TUBE_RB2, }; - /* 80821C48-80821C54 000138 000C+00 0/0 0/0 0/0 .data YMB_DROP_JNT__23@unnamed@d_a_e_ymb_cpp@ */ static int YMB_DROP_JNT[3] = { JNT_TUBE_LC2, JNT_TUBE_RA2, JNT_BODY1, }; @@ -625,7 +619,6 @@ void daE_YMB_c::setElecEffect2() { } namespace { - /* 80821F38-80821FEC 000128 00B4+00 4/5 0/0 0/0 .bss YMB_DOWN_POS__23@unnamed@d_a_e_ymb_cpp@ */ static cXyz YMB_DOWN_POS[15] = { cXyz(-88457.0f, -18786.0f, 42166.0f), cXyz(-89307.0f, -18786.0f, 41366.0f), @@ -3252,7 +3245,7 @@ static actor_method_class l_daE_YMB_Method = { (process_method_func)daE_YMB_Draw, }; -extern actor_process_profile_definition g_profile_E_YMB = { +actor_process_profile_definition g_profile_E_YMB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index a2af66423f..379df6c34d 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -2569,7 +2569,7 @@ static actor_method_class l_daE_Yr_Method = { (process_method_func)daE_Yr_Draw, }; -extern actor_process_profile_definition g_profile_E_YR = { +actor_process_profile_definition g_profile_E_YR = { (u32)fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 5ad7c499ae..6451a2ac38 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -84,7 +84,6 @@ namespace { } }; - /* 8082F480-8082F4C4 000060 0044+00 0/1 0/0 0/0 .data cc_zhCyl_src__22@unnamed@d_a_e_zh_cpp@ */ static dCcD_SrcCyl cc_zhCyl_src = { { {0, {{AT_TYPE_0, 0, 0}, {0xD84860BA, 3}, 0x15}}, @@ -97,7 +96,6 @@ namespace { } }; - /* 8082F4C4-8082F508 0000A4 0044+00 0/1 0/0 0/0 .data cc_zhCyl_at_src__22@unnamed@d_a_e_zh_cpp@ */ static dCcD_SrcCyl cc_zhCyl_at_src = { { {0, {{AT_TYPE_CSTATUE_SWING, 4, 0xD}, {0, 0}, 0}}, @@ -121,7 +119,6 @@ daE_ZH_HIO_c::daE_ZH_HIO_c() { dungeon_bit_check = 0; } -/* 8082F725 0003+00 data_8082F725 None */ static u8 hio_set; static daE_ZH_HIO_c l_HIO; @@ -2333,7 +2330,7 @@ static actor_method_class l_daE_ZH_Method = { (process_method_func)daE_ZH_Draw, }; -extern actor_process_profile_definition g_profile_E_ZH = { +actor_process_profile_definition g_profile_E_ZH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index d1c3287dc2..8fa15b01f4 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -70,7 +70,6 @@ static u8 hio_set; static daE_ZM_HIO_c l_HIO; namespace { - /* 80832DFC-80832E40 000038 0044+00 1/1 0/0 0/0 .data cc_zm_src__22@unnamed@d_a_e_zm_cpp@ */ static dCcD_SrcCyl cc_zm_src = { { {0, {{AT_TYPE_0, 0, 0}, {0xD8FBFDFF, 0x43}, 0x45}}, @@ -83,7 +82,6 @@ namespace { }, }; - /* 80832E40-80832E80 00007C 0040+00 1/1 0/0 0/0 .data cc_zm_at_src__22@unnamed@d_a_e_zm_cpp@ */ static dCcD_SrcSph cc_zm_at_src = { { {0, {{AT_TYPE_CSTATUE_SWING, 2, 0xD}, {0xD8FBFDFF, 0x43}, 0}}, @@ -1032,7 +1030,7 @@ static actor_method_class l_daE_ZM_Method = { (process_method_func)daE_ZM_Draw, }; -extern actor_process_profile_definition g_profile_E_ZM = { +actor_process_profile_definition g_profile_E_ZM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index ad7d54b790..cba87d9373 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -567,7 +567,7 @@ static actor_method_class l_daE_ZS_Method = { (process_method_func)daE_ZS_Draw, }; -extern actor_process_profile_definition g_profile_E_ZS = { +actor_process_profile_definition g_profile_E_ZS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_econt.cpp b/src/d/actor/d_a_econt.cpp index 1d2fd1c680..cdfe48bc51 100644 --- a/src/d/actor/d_a_econt.cpp +++ b/src/d/actor/d_a_econt.cpp @@ -79,7 +79,7 @@ static actor_method_class l_daEcont_Method = { (process_method_func)daEcont_Draw }; -extern actor_process_profile_definition g_profile_ECONT = { +actor_process_profile_definition g_profile_ECONT = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 926304e509..f2a1c2aae1 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -954,7 +954,7 @@ static actor_method_class l_daEp_Method = { (process_method_func)daEp_Draw, }; -extern actor_process_profile_definition g_profile_EP = { +actor_process_profile_definition g_profile_EP = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp index cd9cf50107..531172731b 100644 --- a/src/d/actor/d_a_formation_mng.cpp +++ b/src/d/actor/d_a_formation_mng.cpp @@ -394,7 +394,7 @@ static actor_method_class l_daFmtMng_Method = { (process_method_func)daFmtMng_Draw, }; -extern actor_process_profile_definition g_profile_FORMATION_MNG = { +actor_process_profile_definition g_profile_FORMATION_MNG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index 905f49b16e..4dbe0d2a74 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -83,7 +83,7 @@ static void sibuki_set(fr_class* i_this) { } static void* s_wd_sub(void* param_1, void* param_2) { - (void)param_2; + UNUSED(param_2); if (fopAcM_IsActor(param_1) && fopAcM_GetName(param_1) == PROC_OBJ_LP) { return param_1; } @@ -739,7 +739,7 @@ static actor_method_class l_daFr_Method = { (process_method_func)daFr_Draw, }; -extern actor_process_profile_definition g_profile_FR = { +actor_process_profile_definition g_profile_FR = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 937522c05c..83fe7c78d2 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -400,7 +400,7 @@ static actor_method_class daGrass_METHODS = { (process_method_func)daGrass_draw, }; -extern actor_process_profile_definition g_profile_GRASS = { +actor_process_profile_definition g_profile_GRASS = { fpcLy_CURRENT_e, // mLayerID 11, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_guard_mng.cpp b/src/d/actor/d_a_guard_mng.cpp index c104f603ce..e70f82388f 100644 --- a/src/d/actor/d_a_guard_mng.cpp +++ b/src/d/actor/d_a_guard_mng.cpp @@ -66,7 +66,7 @@ static actor_method_class l_daGuardMng_Method = { (process_method_func)daGuardMng_IsDelete }; -extern actor_process_profile_definition g_profile_GUARD_MNG = { +actor_process_profile_definition g_profile_GUARD_MNG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index 9333b1617f..1e39edf37f 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -73,7 +73,7 @@ static actor_method_class l_daHitobj_Method = { (process_method_func)daHitobj_Draw }; -extern actor_process_profile_definition g_profile_HITOBJ = { +actor_process_profile_definition g_profile_HITOBJ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 73c2af65eb..688e997f13 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -351,21 +351,21 @@ void daHorse_c::coHitCallbackCowHit(fopAc_ac_c* i_hitActor) { static void daHorse_coHitCallbackBoarJump(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) { - (void)i_coObjInfA; - (void)i_coObjInfB; + UNUSED(i_coObjInfA); + UNUSED(i_coObjInfB); ((daHorse_c*)i_coActorA)->coHitCallbackBoarJump(i_coActorB); } static void daHorse_coHitCallbackCowHit(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) { - (void)i_coObjInfA; - (void)i_coObjInfB; + UNUSED(i_coObjInfA); + UNUSED(i_coObjInfB); ((daHorse_c*)i_coActorA)->coHitCallbackCowHit(i_coActorB); } static void daHorse_coHitCallbackAll(fopAc_ac_c* i_coActorA, dCcD_GObjInf* i_coObjInfA, fopAc_ac_c* i_coActorB, dCcD_GObjInf* i_coObjInfB) { - (void)i_coObjInfA; + UNUSED(i_coObjInfA); daHorse_c* a_this = (daHorse_c*)i_coActorA; a_this->coHitCallbackBoarJump(i_coActorB); @@ -2159,7 +2159,7 @@ void daHorse_c::setMatrix() { var_f30 = 0.5f + ((0.5f * speedF) / m_lashMaxSpeedF); } - var_r29 = 4.0f * var_f30 * ((500.0f / (f32)field_0x16c2) * (f32)(s16)(field_0x16e8 - shape_angle.y)); + var_r29 = 4.0f * var_f30 * ((500.0f / (f32)field_0x16c2) * (s16)(field_0x16e8 - shape_angle.y)); var_r27 = -var_r29; } @@ -4218,7 +4218,7 @@ void daHorse_c::searchSceneChangeArea(fopAc_ac_c* i_scnChg) { } static void* daHorse_searchSceneChangeArea(fopAc_ac_c* i_actor, void* i_data) { - (void)i_data; + UNUSED(i_data); dComIfGp_getHorseActor()->searchSceneChangeArea(i_actor); return NULL; } @@ -4546,7 +4546,7 @@ static actor_method_class l_daHorse_Method = { (process_method_func)daHorse_Draw, }; -extern actor_process_profile_definition g_profile_HORSE = { +actor_process_profile_definition g_profile_HORSE = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp index 238aadc051..3364fd3989 100644 --- a/src/d/actor/d_a_hozelda.cpp +++ b/src/d/actor/d_a_hozelda.cpp @@ -23,7 +23,7 @@ void daHoZelda_hio_c::genMessage(JORMContext* context) { #endif static void* daHoZelda_searchGanon(fopAc_ac_c* i_actor, void* i_data) { - (void)i_data; + UNUSED(i_data); if (fopAcM_GetName(i_actor) == PROC_B_GND) { return i_actor; } @@ -938,7 +938,7 @@ static actor_method_class l_daHoZelda_Method = { (process_method_func)daHoZelda_Draw, }; -extern actor_process_profile_definition g_profile_HOZELDA = { +actor_process_profile_definition g_profile_HOZELDA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_izumi_gate.cpp b/src/d/actor/d_a_izumi_gate.cpp index 56fb335851..a7b79021df 100644 --- a/src/d/actor/d_a_izumi_gate.cpp +++ b/src/d/actor/d_a_izumi_gate.cpp @@ -92,7 +92,7 @@ static actor_method_class l_daIzumiGate_Method = { (process_method_func)daIzumiGate_Draw, }; -extern actor_process_profile_definition g_profile_Izumi_Gate = { +actor_process_profile_definition g_profile_Izumi_Gate = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 501c036429..494f85bd72 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -1740,8 +1740,12 @@ void daKago_c::initPerchDemo() { } cXyz cStack_54 = dPath_GetPnt(mpPath2, local_80)->m_position; - s16 temp = (s16)sVar5 - cLib_targetAngleY(¤t.pos, &cStack_48); - sVar5 = temp < 0 ? (s16)((s16)sVar5 - 0x1000) : (s16)((s16)sVar5 + 0x1000); // fakematch + s16 sp08 = cLib_targetAngleY(¤t.pos, &cStack_48); + if ((s16)(sVar5 - sp08) < 0) { + sVar5 = sVar5 - 0x1000; + } else { + sVar5 = sVar5 + 0x1000; + } shape_angle.y = current.angle.y = sVar5; shape_angle.x = shape_angle.z = 0; @@ -3892,7 +3896,7 @@ static actor_method_class l_daKago_Method = { (process_method_func)daKago_Draw, }; -extern actor_process_profile_definition g_profile_KAGO = { +actor_process_profile_definition g_profile_KAGO = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index d47ff1d337..00416444ed 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -465,7 +465,7 @@ static actor_method_class l_daKytag00_Method = { (process_method_func)daKytag00_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG00 = { +actor_process_profile_definition g_profile_KYTAG00 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index cf4a87022c..2025f6acf1 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -81,7 +81,7 @@ static void mist_tag_move(kytag01_class* i_this) { s16 var_r29_2 = cM_atan2s(sp98.x, sp98.z); s16 var_r26 = cM_atan2s(spA4.x, spA4.z); - f32 temp_f2_2 = 1.0f - ((f32)(s16)abs((s16)(var_r29_2 - var_r26)) / 32768.0f); + f32 temp_f2_2 = 1.0f - ((s16)abs((s16)(var_r29_2 - var_r26)) / 32768.0f); temp_f2_2 *= temp_f2_2 * temp_f2_2 * temp_f2_2; f32 var_f3 = 1.0f - temp_f2_2; @@ -221,7 +221,7 @@ static actor_method_class l_daKytag01_Method = { (process_method_func)daKytag01_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG01 = { +actor_process_profile_definition g_profile_KYTAG01 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index 76e9bd75f1..c8df0868b6 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -136,7 +136,7 @@ static actor_method_class l_daKytag02_Method = { (process_method_func)daKytag02_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG02 = { +actor_process_profile_definition g_profile_KYTAG02 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index b56751e054..b1a5c745ea 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -456,7 +456,7 @@ static actor_method_class l_daKytag03_Method = { (process_method_func)daKytag03_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG03 = { +actor_process_profile_definition g_profile_KYTAG03 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 093ba53aa7..173564854a 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -359,7 +359,7 @@ static actor_method_class l_daKytag04_Method = { (process_method_func)daKytag04_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG04 = { +actor_process_profile_definition g_profile_KYTAG04 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 52ec6d912a..fe66630bdd 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -46,7 +46,7 @@ static actor_method_class l_daKytag05_Method = { (process_method_func)daKytag05_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG05 = { +actor_process_profile_definition g_profile_KYTAG05 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 35e3ba1803..7271bcf924 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -1193,7 +1193,7 @@ static actor_method_class l_daKytag06_Method = { (process_method_func)daKytag06_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG06 = { +actor_process_profile_definition g_profile_KYTAG06 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index 1ad9c00095..aa98dea057 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -67,7 +67,7 @@ static actor_method_class l_daKytag07_Method = { (process_method_func)daKytag07_Execute, (process_method_func)daKytag07_IsDelete, (process_method_func)daKytag07_Draw}; -extern actor_process_profile_definition g_profile_KYTAG07 = { +actor_process_profile_definition g_profile_KYTAG07 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp index a72b3480ce..3343b08c7e 100644 --- a/src/d/actor/d_a_kytag08.cpp +++ b/src/d/actor/d_a_kytag08.cpp @@ -273,7 +273,7 @@ static actor_method_class l_daKytag08_Method = { (process_method_func)daKytag08_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG08 = { +actor_process_profile_definition g_profile_KYTAG08 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag09.cpp b/src/d/actor/d_a_kytag09.cpp index c94700f27c..39a6edbed7 100644 --- a/src/d/actor/d_a_kytag09.cpp +++ b/src/d/actor/d_a_kytag09.cpp @@ -144,7 +144,7 @@ static actor_method_class l_daKytag09_Method = { (process_method_func)daKytag09_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG09 = { +actor_process_profile_definition g_profile_KYTAG09 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp index 003443f6dd..57db98a16e 100644 --- a/src/d/actor/d_a_kytag10.cpp +++ b/src/d/actor/d_a_kytag10.cpp @@ -206,7 +206,7 @@ static actor_method_class l_daKytag10_Method = { (process_method_func)daKytag10_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG10 = { +actor_process_profile_definition g_profile_KYTAG10 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag11.cpp b/src/d/actor/d_a_kytag11.cpp index 65b1b1ee68..baa4776485 100644 --- a/src/d/actor/d_a_kytag11.cpp +++ b/src/d/actor/d_a_kytag11.cpp @@ -113,7 +113,7 @@ static actor_method_class l_daKytag11_Method = { (process_method_func)daKytag11_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG11 = { +actor_process_profile_definition g_profile_KYTAG11 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index 3b46a25c20..4cea546573 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -1026,7 +1026,7 @@ static actor_method_class l_daKytag12_Method = { (process_method_func)daKytag12_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG12 = { +actor_process_profile_definition g_profile_KYTAG12 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index 82b840b6f0..7af7ae597d 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -387,7 +387,7 @@ static actor_method_class l_daKytag13_Method = { (process_method_func)daKytag13_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG13 = { +actor_process_profile_definition g_profile_KYTAG13 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp index faee63a4e4..66343d2656 100644 --- a/src/d/actor/d_a_kytag14.cpp +++ b/src/d/actor/d_a_kytag14.cpp @@ -108,7 +108,7 @@ static actor_method_class l_daKytag14_Method = { (process_method_func)daKytag14_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG14 = { +actor_process_profile_definition g_profile_KYTAG14 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp index acef46bd3d..dd5abd20a6 100644 --- a/src/d/actor/d_a_kytag15.cpp +++ b/src/d/actor/d_a_kytag15.cpp @@ -128,7 +128,7 @@ static actor_method_class l_daKytag15_Method = { (process_method_func)daKytag15_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG15 = { +actor_process_profile_definition g_profile_KYTAG15 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp index ad150e18e9..9e05cd5778 100644 --- a/src/d/actor/d_a_kytag16.cpp +++ b/src/d/actor/d_a_kytag16.cpp @@ -165,7 +165,7 @@ static actor_method_class l_daKytag16_Method = { (process_method_func)daKytag16_Draw, }; -extern actor_process_profile_definition g_profile_KYTAG16 = { +actor_process_profile_definition g_profile_KYTAG16 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_kytag17.cpp b/src/d/actor/d_a_kytag17.cpp index ac5f775c7c..128763f2c2 100644 --- a/src/d/actor/d_a_kytag17.cpp +++ b/src/d/actor/d_a_kytag17.cpp @@ -39,7 +39,7 @@ static actor_method_class l_daKytag17_Method = { (process_method_func)daKytag17_Execute, (process_method_func)daKytag17_IsDelete, (process_method_func)daKytag17_Draw}; -extern actor_process_profile_definition g_profile_KYTAG17 = { +actor_process_profile_definition g_profile_KYTAG17 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 302a110843..af433d0a77 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -151,9 +151,6 @@ static u32 l_normal[3] = { 0x00000000, 0x3F800000, 0x00000000, }; -// /* 8086BF70-8086BF74 000000 0004+00 3/3 0/0 0/0 .bss None */ -// static u8 data_8086BF70[4]; - static u32 l_texCoord[338] = { 0x00000000, 0x3F6AAAB0, 0x3DAAAA7E, 0x3F6AAAB0, 0x3DAAAA7E, 0x3F800000, 0x00000000, 0x3F800000, @@ -811,7 +808,7 @@ static actor_method_class l_daMant_Method = { (process_method_func)daMant_Draw, }; -extern actor_process_profile_definition g_profile_MANT = { +actor_process_profile_definition g_profile_MANT = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index c5ed70b740..c06414c452 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -673,7 +673,7 @@ s32 daMg_Fish_Draw(mg_fish_class* i_this) { i_this->actor.current.pos.z); i_this->mShadowId = dComIfGd_setShadow(i_this->mShadowId, 1, i_model, &pos, 600.0f * i_this->mJointScale, 0.0f, - i_this->actor.current.pos.y, i_this->mAcch.m_ground_h, i_this->mAcch.m_gnd, + i_this->actor.current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->actor.tevStr, 0, 1.0f, &dDlst_shadowControl_c::mSimpleTexObj); } if (i_this->mKind2 == 3) { @@ -1039,7 +1039,7 @@ static void mf_away(mg_fish_class* i_this) { break; case 5: if (i_this->mGedouKind < GEDOU_KIND_BG) { - if ((i_this->mAcch.m_flags & (1 << 4)) != 0) { + if (i_this->mAcch.ChkWallHit()) { if (i_this->field_0x624[1] == 0) { i_this->mActionPhase = 0; i_this->field_0x624[1] = 40; @@ -1982,7 +1982,7 @@ static void mf_jump(mg_fish_class* i_this) { i_this->mMaxStep = 0x600; i_this->actor.current.pos += i_this->field_0x5e0; i_this->field_0x5e0.y = i_this->field_0x5e0.y - 2.0f; - if ((i_this->mAcch.m_flags & 0x20) != 0) { + if (i_this->mAcch.ChkGroundHit()) { i_this->actor.current.pos.x = i_this->actor.old.pos.x; i_this->actor.current.pos.y = i_this->actor.old.pos.y; i_this->actor.current.pos.z = i_this->actor.old.pos.z; @@ -3760,7 +3760,6 @@ static int useHeapImg_fisht(fopAc_ac_c* i_actor) { } static int daMg_Fish_Create(fopAc_ac_c* i_this) { - /* 805369FC-80536A40 000558 0044+00 0/1 0/0 0/0 .data cc_cyl_src$8395 */ static dCcD_SrcCyl cc_cyl_src = { { { 0x0, { { 0x0, 0x0, 0x0 }, { 0x0, 0x0 }, 0x75 } }, // mObj @@ -4059,7 +4058,7 @@ static actor_method_class l_daMg_Fish_Method = { (process_method_func)daMg_Fish_Draw, }; -extern actor_process_profile_definition g_profile_MG_FISH = { +actor_process_profile_definition g_profile_MG_FISH = { (uint)fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index 99af4761d4..995979031c 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -1680,7 +1680,7 @@ static actor_method_class l_daFshop_Method = { (process_method_func)daFshop_Draw, }; -extern actor_process_profile_definition g_profile_FSHOP = { +actor_process_profile_definition g_profile_FSHOP = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 4d0b3c64a3..aa85bfcfdb 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -519,7 +519,6 @@ static void rod_main(dmg_rod_class* i_this) { static npc_henna_class* henna; -/* 804BBBD4 0001+00 data_804BBBD4 None */ static u8 data_804BBBD4; static u8 hio_set; @@ -6353,7 +6352,7 @@ static actor_method_class l_dmg_rod_Method = { (process_method_func)dmg_rod_Draw, }; -extern actor_process_profile_definition g_profile_MG_ROD = { +actor_process_profile_definition g_profile_MG_ROD = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 4bb6ee25ed..a906af3f97 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -3597,7 +3597,7 @@ static actor_method_class l_daMidna_Method = { (process_method_func)daMidna_Draw, }; -extern actor_process_profile_definition g_profile_MIDNA = { +actor_process_profile_definition g_profile_MIDNA = { fpcLy_CURRENT_e, 6, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 4c4787c8b3..a15d2fd2ce 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -617,7 +617,7 @@ static actor_method_class daMirror_METHODS = { (process_method_func)daMirror_draw, }; -extern actor_process_profile_definition g_profile_MIRROR = { +actor_process_profile_definition g_profile_MIRROR = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 0356df3dae..fbee0d4fa5 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -4195,7 +4195,7 @@ static actor_method_class daMP_METHODS = { (process_method_func)daMP_c::daMP_c_Callback_Draw, }; -extern actor_process_profile_definition g_profile_MOVIE_PLAYER = { +actor_process_profile_definition g_profile_MOVIE_PLAYER = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index d698b5b92d..4289833173 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -1813,7 +1813,7 @@ static actor_method_class daMyna_MethodTable = { (process_method_func)daMyna_Draw, }; -extern actor_process_profile_definition g_profile_MYNA = { +actor_process_profile_definition g_profile_MYNA = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 13deb6780d..6e1f937010 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -1683,7 +1683,7 @@ static actor_method_class l_daNbombMethod = { (process_method_func)daNbomb_Draw, }; -extern actor_process_profile_definition g_profile_NBOMB = { +actor_process_profile_definition g_profile_NBOMB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index b06b8964ed..982276ff8b 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -1996,7 +1996,7 @@ static actor_method_class l_daNi_Method = { (process_method_func)daNi_Draw, }; -extern actor_process_profile_definition g_profile_NI = { +actor_process_profile_definition g_profile_NI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp index 1ae276a6a2..f2ec6e4b82 100644 --- a/src/d/actor/d_a_no_chg_room.cpp +++ b/src/d/actor/d_a_no_chg_room.cpp @@ -156,7 +156,7 @@ static actor_method_class daNocrm_METHODS = { (process_method_func)daNocrm_draw, }; -extern actor_process_profile_definition g_profile_NO_CHG_ROOM = { +actor_process_profile_definition g_profile_NO_CHG_ROOM = { fpcLy_CURRENT_e, 2, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index 7573fbeb54..6f5b85bc0f 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -263,12 +263,7 @@ void daBaseNpc_lookat_c::limitter(s16 i_value, s16* o_value_p, s16 i_max, s16 i_ } if (i_min < i_value) { - //TODO: fakematch -#if VERSION == VERSION_SHIELD_DEBUG - *o_value_p -= tmp - i_min; -#else - *o_value_p -= tmp - (s16)i_min; -#endif + *o_value_p = *o_value_p - (tmp - i_min); return; } @@ -734,9 +729,6 @@ int daBaseNpc_moveBgActor_c::MoveBGCreateHeap() { return 1; } -/* 8014F60C-8014F6FC 149F4C 00F0+00 0/0 0/0 1/1 .text - * MoveBGCreate__23daBaseNpc_moveBgActor_cFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUl - */ int daBaseNpc_moveBgActor_c::MoveBGCreate(char const* i_arcName, int i_dzbId, MoveBGActor_SetFunc i_setFunc, u32 i_heapSize) { int unusedInt1 = 1; diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index 6d77b5a3c8..e6881a106c 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -2068,7 +2068,7 @@ static actor_method_class daNpc_Aru_MethodTable = { (process_method_func)daNpc_Aru_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ARU = { +actor_process_profile_definition g_profile_NPC_ARU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index 60f2f00468..423817b1ac 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -107,7 +107,7 @@ BOOL daNpcAsh_c::chkFindPlayer() { bool daNpcAsh_c::step(s16 i_angY, bool i_animate) { if (mTurnMode == 0) { if (i_animate) { - if ((s32)fabsf(cM_sht2d((f32)(s16)(i_angY - mCurAngle.y))) > 40) { + if ((s32)fabsf(cM_sht2d((s16)(i_angY - mCurAngle.y))) > 40) { setExpression(EXPR_NONE, -1.0f); setMotion(MOT_STEP, -1.0f, false); } @@ -1334,7 +1334,7 @@ static actor_method_class daNpcAsh_MethodTable = { (process_method_func)daNpcAsh_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ASH = { +actor_process_profile_definition g_profile_NPC_ASH = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 6658577cb0..75421ce2e0 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -1204,7 +1204,7 @@ static actor_method_class daNpcAshB_MethodTable = { (process_method_func)daNpcAshB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ASHB = { +actor_process_profile_definition g_profile_NPC_ASHB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 4f6ea12fc8..b083ecdcbc 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -1876,7 +1876,7 @@ static actor_method_class daNpc_Bans_MethodTable = { (process_method_func)daNpc_Bans_Draw, }; -extern actor_process_profile_definition g_profile_NPC_BANS = { +actor_process_profile_definition g_profile_NPC_BANS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index d7d5056d81..5fd697742d 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -3006,7 +3006,7 @@ static actor_method_class daNpc_Besu_MethodTable = { (process_method_func)daNpc_Besu_Draw, }; -extern actor_process_profile_definition g_profile_NPC_BESU = { +actor_process_profile_definition g_profile_NPC_BESU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index c0f4d5f032..d214ade475 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -1404,7 +1404,7 @@ static actor_method_class daNpcBlueNS_MethodTable = { (process_method_func)daNpcBlueNS_Draw, }; -extern actor_process_profile_definition g_profile_NPC_BLUENS = { +actor_process_profile_definition g_profile_NPC_BLUENS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index 2486ba8547..9e0a753c10 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -1639,7 +1639,7 @@ static actor_method_class daNpc_Bou_MethodTable = { (process_method_func)daNpc_Bou_Draw, }; -extern actor_process_profile_definition g_profile_NPC_BOU = { +actor_process_profile_definition g_profile_NPC_BOU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index 4300c85670..e1e2a1e726 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -1606,7 +1606,7 @@ static actor_method_class daNpcBouS_MethodTable = { (process_method_func)daNpcBouS_Draw, }; -extern actor_process_profile_definition g_profile_NPC_BOU_S = { +actor_process_profile_definition g_profile_NPC_BOU_S = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index 33ec805406..dde66fd193 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -561,7 +561,6 @@ J3DModelData* daNpcCd_c::getObjMdlDataP(int param_1) { } daNpcCd_HIO_c::daNpcCd_HIO_c() { - /* 803B3DE4-803B4CE4 010F04 0F00+00 0/1 0/0 0/0 .data a_jntTbl_M$3905 */ static u8 a_jntTbl_M[16][12][20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -821,7 +820,6 @@ daNpcCd_HIO_c::daNpcCd_HIO_c() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; - /* 803B4CE4-803B50E4 011E04 0400+00 0/1 0/0 0/0 .data a_prmTbl_M$3906 */ static u8 a_prmTbl_M[1024] = { 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, @@ -894,7 +892,6 @@ daNpcCd_HIO_c::daNpcCd_HIO_c() { 0x42, 0x0C, 0x00, 0x00, }; - /* 803B50E4-803B5E04 012204 0D20+00 0/1 0/0 0/0 .data a_jntTbl_W$3907 */ static u8 a_jntTbl_W[14][12][20] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1122,7 +1119,6 @@ daNpcCd_HIO_c::daNpcCd_HIO_c() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; - /* 803B5E04-803B6184 012F24 0380+00 0/1 0/0 0/0 .data a_prmTbl_W$3908 */ static u8 a_prmTbl_W[896] = { 0xC9, 0x50, 0x27, 0x10, 0xB9, 0xB0, 0xD8, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA0, 0x3A, 0x98, 0xE0, 0xC0, 0xC5, 0x68, 0x3F, 0x80, 0x00, 0x00, 0x00, 0xC8, diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index 735926a60b..6f7a28e6a3 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -1739,7 +1739,7 @@ static actor_method_class daNpcCdn3_METHODS = { (process_method_func)daNpcCdn3_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CD3 = { +actor_process_profile_definition g_profile_NPC_CD3 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 94295c8996..f4e73ffa9e 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -2660,10 +2660,7 @@ inline f32 CylH(int type) { } cPhs__Step daNpcChat_c::Create() { - if (!fopAcM_CheckCondition(this, fopAcCnd_INIT_e)) { - new (this) daNpcChat_c(); - fopAcM_OnCondition(this, fopAcCnd_INIT_e); - } + fopAcM_ct(this, daNpcChat_c); mTwilight = dKy_darkworld_check(); mType = getType(); @@ -4128,7 +4125,7 @@ static actor_method_class daNpcChat_MethodTable = { (process_method_func)daNpcChat_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CHAT = { +actor_process_profile_definition g_profile_NPC_CHAT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 423192b4c5..553a6e8abb 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -2119,7 +2119,7 @@ static actor_method_class daNpcChin_MethodTable = { (process_method_func)daNpcChin_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CHIN = { +actor_process_profile_definition g_profile_NPC_CHIN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index 020fc6bc0c..20e61bd91d 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -788,7 +788,7 @@ static actor_method_class daNpc_clerkA_MethodTable = { (process_method_func)daNpc_clerkA_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CLERKA = { +actor_process_profile_definition g_profile_NPC_CLERKA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index 1f21f35fa0..9b22c324f7 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -940,7 +940,7 @@ static actor_method_class daNpc_clerkB_MethodTable = { (process_method_func)daNpc_clerkB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CLERKB = { +actor_process_profile_definition g_profile_NPC_CLERKB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index 3add3daa81..0ca1ee24ee 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -701,7 +701,7 @@ static actor_method_class daNpcClerkt_MethodTable = { (process_method_func)daNpcClerkt_Draw, }; -extern actor_process_profile_definition g_profile_NPC_CLERKT = { +actor_process_profile_definition g_profile_NPC_CLERKT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 6958626c34..43600c6ae2 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -2173,7 +2173,7 @@ static actor_method_class l_daNpcCoach_Method = { (process_method_func)daNpcCoach_Draw, }; -extern actor_process_profile_definition g_profile_NPC_COACH = { +actor_process_profile_definition g_profile_NPC_COACH = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index 00c3eb5fdf..08d6ab6108 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -421,7 +421,7 @@ static actor_method_class l_daNpc_Df_Method = { (process_method_func)daNpc_Df_Draw, }; -extern actor_process_profile_definition g_profile_NPC_DF = { +actor_process_profile_definition g_profile_NPC_DF = { fpcLy_CURRENT_e, // mLayerID 9, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 9033238475..d7ac07b853 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -879,7 +879,7 @@ static actor_method_class daNpc_Doc_MethodTable = { (process_method_func)daNpc_Doc_Draw, }; -extern actor_process_profile_definition g_profile_NPC_DOC = { +actor_process_profile_definition g_profile_NPC_DOC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index 66d5c726a5..550f03aea6 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -864,7 +864,7 @@ static actor_method_class daNpcDoorBoy_MethodTable = { (process_method_func)daNpcDoorBoy_Draw, }; -extern actor_process_profile_definition g_profile_NPC_DOORBOY = { +actor_process_profile_definition g_profile_NPC_DOORBOY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp index ba66a02084..f7f8d8469a 100644 --- a/src/d/actor/d_a_npc_drainSol.cpp +++ b/src/d/actor/d_a_npc_drainSol.cpp @@ -444,7 +444,7 @@ static actor_method_class daNpcDrSol_MethodTable = { (process_method_func)daNpcDrSol_Draw, }; -extern actor_process_profile_definition g_profile_NPC_DRSOL = { +actor_process_profile_definition g_profile_NPC_DRSOL = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index 9f353db664..591d594adc 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -702,7 +702,7 @@ static actor_method_class l_daNpc_Du_Method = { (process_method_func)daNpc_Du_Draw, }; -extern actor_process_profile_definition g_profile_NPC_DU = { +actor_process_profile_definition g_profile_NPC_DU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index be4f8be689..f35d28ef42 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -1358,7 +1358,6 @@ int daNpc_Fairy_c::cutAppear_10F_01(int i_staffId) { return _cutAppear_10F_01_Main(*cutId); } -/* 809B46E0-809B48C4 002CC0 01E4+00 1/1 0/0 0/0 .text _cutAppear_10F_01_Init__13daNpc_Fairy_cFRCi*/ int daNpc_Fairy_c::_cutAppear_10F_01_Init(int const& i_cutId) { int rv = 0; @@ -3063,7 +3062,7 @@ static actor_method_class daNpc_Fairy_MethodTable = { (process_method_func)daNpc_Fairy_Draw, }; -extern actor_process_profile_definition g_profile_NPC_FAIRY = { +actor_process_profile_definition g_profile_NPC_FAIRY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index 062db6fe34..e3457d0919 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -394,7 +394,7 @@ static actor_method_class daNpc_FairySeirei_MethodTable = { daNpc_FairySeirei_IsDelete, daNpc_FairySeirei_Draw, }; -extern actor_process_profile_definition g_profile_NPC_FAIRY_SEIREI = { +actor_process_profile_definition g_profile_NPC_FAIRY_SEIREI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_fguard.cpp b/src/d/actor/d_a_npc_fguard.cpp index 0f58c48228..69a087156a 100644 --- a/src/d/actor/d_a_npc_fguard.cpp +++ b/src/d/actor/d_a_npc_fguard.cpp @@ -208,7 +208,7 @@ static actor_method_class daNpcFgd_METHODS = { (process_method_func)daNpcFgd_Draw, }; -extern actor_process_profile_definition g_profile_NPC_FGUARD = { +actor_process_profile_definition g_profile_NPC_FGUARD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index 82101de714..64a8f81e01 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -151,7 +151,7 @@ static actor_method_class l_daNpc_Fish_Method = { (process_method_func)daNpc_Fish_Draw, }; -extern actor_process_profile_definition g_profile_NPC_FISH = { +actor_process_profile_definition g_profile_NPC_FISH = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index eb5f96293a..8856e476d0 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -683,7 +683,7 @@ static actor_method_class daNpc_Gnd_MethodTable = { (process_method_func)daNpc_Gnd_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GND = { +actor_process_profile_definition g_profile_NPC_GND = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 11b84dfd41..aa00f9cf7d 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -94,10 +94,6 @@ static int l_bckGetParamList[][2] = { 0x07, 0x0F, }; -/* 809CA7F4 809CA874 0080 -00 -/1 0/0 -.data l_btpGetParamList */ static int l_btpGetParamList[][2] = { 0x1C, 0x00, 0x1F, 0x00, @@ -642,7 +638,7 @@ bool daNpc_grA_c::checkTagGraSub2(fopAc_ac_c* i_this) { } static void* s_subShop(void* i_actor, void* i_this) { - (void)i_this; + UNUSED(i_this); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_GRM) { return i_actor; } @@ -650,7 +646,7 @@ static void* s_subShop(void* i_actor, void* i_this) { } static void* s_subGRD(void* i_actor, void* i_this) { - (void)i_this; + UNUSED(i_this); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_NPC_WRESTLER) { return i_actor; } @@ -658,7 +654,7 @@ static void* s_subGRD(void* i_actor, void* i_this) { } static void *s_subOnsenTaru(void* i_actor, void* i_this) { - (void)i_this; + UNUSED(i_this); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_Obj_OnsenTaru && !fpcM_IsCreating(fopAcM_GetID((i_actor)))) { @@ -4115,7 +4111,7 @@ static actor_method_class daNpc_grA_MethodTable = { (process_method_func)daNpc_grA_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRA = { +actor_process_profile_definition g_profile_NPC_GRA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 5a507f7764..577763adab 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -1547,7 +1547,7 @@ static actor_method_class daNpc_grC_MethodTable = { (process_method_func)daNpc_grC_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRC = { +actor_process_profile_definition g_profile_NPC_GRC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index 5e4cb8a474..f81e422472 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -1248,7 +1248,7 @@ static actor_method_class daNpc_Grd_MethodTable = { (process_method_func)daNpc_Grd_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRD = { +actor_process_profile_definition g_profile_NPC_GRD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index cb9635f0d2..f0a53d4428 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -802,7 +802,7 @@ static actor_method_class daNpc_grM_MethodTable = { (process_method_func)daNpc_grM_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRM = { +actor_process_profile_definition g_profile_NPC_GRM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index 621dc26fe3..fd9671e4e0 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -791,7 +791,7 @@ static actor_method_class daNpc_grMC_MethodTable = { (process_method_func)daNpc_grMC_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRMC = { +actor_process_profile_definition g_profile_NPC_GRMC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index e7a9d12317..71e5f7367a 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -1903,7 +1903,7 @@ static actor_method_class daNpc_grO_MethodTable = { (process_method_func)daNpc_grO_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRO = { +actor_process_profile_definition g_profile_NPC_GRO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index c2619aa657..c8eb2daf26 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -1433,7 +1433,7 @@ static actor_method_class daNpc_grR_MethodTable = { (process_method_func)daNpc_grR_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRR = { +actor_process_profile_definition g_profile_NPC_GRR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 77baa5480d..06e9bf36b1 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -1298,7 +1298,7 @@ static actor_method_class daNpc_grS_MethodTable = { (process_method_func)daNpc_grS_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRS = { +actor_process_profile_definition g_profile_NPC_GRS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 1fb7bf9135..39fb696106 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -2508,7 +2508,7 @@ static actor_method_class daNpc_Grz_MethodTable = { (process_method_func)daNpc_Grz_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GRZ = { +actor_process_profile_definition g_profile_NPC_GRZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index 813ca5e215..ab82f88ee9 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -609,7 +609,7 @@ static actor_method_class daNpcGuard_METHODS = { (process_method_func)daNpcGuard_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GUARD = { +actor_process_profile_definition g_profile_NPC_GUARD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index 9ac8c14951..cc4395c1c1 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -1896,7 +1896,7 @@ static actor_method_class daNpc_GWolf_MethodTable = { (process_method_func)daNpc_GWolf_Draw, }; -extern actor_process_profile_definition g_profile_NPC_GWOLF = { +actor_process_profile_definition g_profile_NPC_GWOLF = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index 3d37511191..b5522ac0fa 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -1932,7 +1932,7 @@ static actor_method_class daNpc_Hanjo_MethodTable = { (process_method_func)daNpc_Hanjo_Draw, }; -extern actor_process_profile_definition g_profile_NPC_HANJO = { +actor_process_profile_definition g_profile_NPC_HANJO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 846cc6b1a1..072a3be72f 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -221,7 +221,7 @@ static void* s_npc_sub(void* param_0, void* param_1) { } static void* s_piro_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_NPC_INKO) { return param_0; } @@ -239,7 +239,7 @@ static void* s_du_sub(void* param_0, void* param_1) { } static void* s_shop_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_FSHOP && (s32)(fopAcM_GetParam(param_0) & 0xff) < 35) { @@ -249,7 +249,7 @@ static void* s_shop_sub(void* param_0, void* param_1) { } static void* s_koro2ball_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0)) { if (fopAcM_GetName(param_0) == PROC_FSHOP && (fopAcM_GetParam(param_0) & 0xff) == 35) { return param_0; @@ -402,7 +402,7 @@ static void henna_shop(npc_henna_class* i_this) { } static void* s_rod_sub(void* param_0, void* param_1) { - (void)param_1; // debug match + UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_MG_ROD) { return param_0; } @@ -2833,7 +2833,7 @@ static actor_method_class l_daNpc_Henna_Method = { (process_method_func)daNpc_Henna_Draw, }; -extern actor_process_profile_definition g_profile_NPC_HENNA = { +actor_process_profile_definition g_profile_NPC_HENNA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_henna0.cpp b/src/d/actor/d_a_npc_henna0.cpp index 54885d8c41..78b2dae150 100644 --- a/src/d/actor/d_a_npc_henna0.cpp +++ b/src/d/actor/d_a_npc_henna0.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_henna0.h" -extern actor_process_profile_definition g_profile_NPC_HENNA0 = { +actor_process_profile_definition g_profile_NPC_HENNA0 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index 5abf670fc5..081b398098 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -1667,7 +1667,7 @@ static actor_method_class daNpc_Hoz_MethodTable = { (process_method_func)daNpc_Hoz_Draw, }; -extern actor_process_profile_definition g_profile_NPC_HOZ = { +actor_process_profile_definition g_profile_NPC_HOZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 0d797f2773..b3449f4303 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -299,7 +299,7 @@ void daNpcImpal_c::setExpressionTalkAfter() { int daNpcImpal_c::step(s16 i_angle, int i_animate) { if (mTurnMode == 0) { if (i_animate) { - if ((s32)fabsf(cM_sht2d((f32)(s16)(i_angle - mCurAngle.y))) > 40) { + if ((s32)fabsf(cM_sht2d((s16)(i_angle - mCurAngle.y))) > 40) { setExpression(EXPR_7, -1.0f); setMotion(MOT_6, -1.0f, false); } @@ -1236,7 +1236,7 @@ static actor_method_class daNpcImpal_MethodTable = { (process_method_func)daNpcImpal_Draw, }; -extern actor_process_profile_definition g_profile_NPC_IMPAL = { +actor_process_profile_definition g_profile_NPC_IMPAL = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp index a69dcc8f8f..a1ad459fdc 100644 --- a/src/d/actor/d_a_npc_inko.cpp +++ b/src/d/actor/d_a_npc_inko.cpp @@ -471,7 +471,7 @@ static actor_method_class l_daNpc_Inko_Method = { (process_method_func)daNpc_Inko_Draw, }; -extern actor_process_profile_definition g_profile_NPC_INKO = { +actor_process_profile_definition g_profile_NPC_INKO = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index 1e8cc049bf..3ef01d3cf5 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -1788,7 +1788,7 @@ static actor_method_class daNpcIns_MethodTable = { (process_method_func)daNpcIns_Draw, }; -extern actor_process_profile_definition g_profile_NPC_INS = { +actor_process_profile_definition g_profile_NPC_INS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 1c780a12ff..240203087a 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -1790,7 +1790,7 @@ static actor_method_class daNpc_Jagar_MethodTable = { (process_method_func)daNpc_Jagar_Draw, }; -extern actor_process_profile_definition g_profile_NPC_JAGAR = { +actor_process_profile_definition g_profile_NPC_JAGAR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index 134f68b1d0..0b7d665fae 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -1145,7 +1145,7 @@ static actor_method_class daNpc_Kakashi_MethodTable = { (process_method_func)daNpc_Kakashi_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KAKASHI = { +actor_process_profile_definition g_profile_NPC_KAKASHI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 7aefa40ac8..011f504abe 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -2320,7 +2320,7 @@ static actor_method_class daNpcKasiHana_MethodTable = { (process_method_func)daNpcKasiHana_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KASIHANA = { +actor_process_profile_definition g_profile_NPC_KASIHANA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 77bf43fa33..64ce7ef027 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -349,8 +349,6 @@ daTagEscape_c* daNpcKasiKyu_c::mTargetTag; f32 daNpcKasiKyu_c::mTargetTagDist; -/* 80A26068 0002+00 data_80A26068 mWolfAngle__14daNpcKasiKyu_c */ -/* 80A2606A 0002+00 data_80A2606A None */ s16 daNpcKasiKyu_c::mWolfAngle; BOOL daNpcKasiKyu_c::main() { @@ -1427,7 +1425,7 @@ static actor_method_class daNpcKasiKyu_MethodTable = { (process_method_func)daNpcKasiKyu_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KASIKYU = { +actor_process_profile_definition g_profile_NPC_KASIKYU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index d217e50df9..5b15b65834 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -349,8 +349,6 @@ daTagEscape_c* daNpcKasiMich_c::mTargetTag; f32 daNpcKasiMich_c::mTargetTagDist; -/* 80A2A7F8 0002+00 data_80A2A7F8 mWolfAngle__15daNpcKasiMich_c */ -/* 80A2A7FA 0002+00 data_80A2A7FA None */ s16 daNpcKasiMich_c::mWolfAngle; BOOL daNpcKasiMich_c::main() { @@ -1414,7 +1412,7 @@ static actor_method_class daNpcKasiMich_MethodTable = { (process_method_func)daNpcKasiMich_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KASIMICH = { +actor_process_profile_definition g_profile_NPC_KASIMICH = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kdk.cpp b/src/d/actor/d_a_npc_kdk.cpp index 9496798711..1522311e8b 100644 --- a/src/d/actor/d_a_npc_kdk.cpp +++ b/src/d/actor/d_a_npc_kdk.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_npc_kdk.h" -extern actor_process_profile_definition g_profile_NPC_KDK = { +actor_process_profile_definition g_profile_NPC_KDK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 1003ab7053..bdd4b635a0 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -1219,7 +1219,7 @@ static actor_method_class daNpc_Kkri_MethodTable = { (process_method_func)daNpc_Kkri_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KKRI = { +actor_process_profile_definition g_profile_NPC_KKRI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index e39128192c..ab87d87d6a 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -5279,7 +5279,7 @@ static actor_method_class daNpc_Kn_MethodTable = { (process_method_func)daNpc_Kn_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KN = { +actor_process_profile_definition g_profile_NPC_KN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index 2f8f8c77d1..7a6993223f 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -532,7 +532,7 @@ static actor_method_class daNpc_Knj_MethodTable = { (process_method_func)daNpc_Knj_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KNJ = { +actor_process_profile_definition g_profile_NPC_KNJ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index 5a63a56ad8..f6c24e9ad7 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -2225,7 +2225,7 @@ static actor_method_class daNpc_Kolin_MethodTable = { (process_method_func)daNpc_Kolin_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KOLIN = { +actor_process_profile_definition g_profile_NPC_KOLIN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index fcf881e7f4..0f55b887e3 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -917,7 +917,7 @@ static actor_method_class daNpc_Kolinb_MethodTable = { (process_method_func)daNpc_Kolinb_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KOLINB = { +actor_process_profile_definition g_profile_NPC_KOLINB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index df3fa31072..5e6e00844a 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -7465,7 +7465,7 @@ static actor_method_class l_daNpc_Ks_Method = { (process_method_func)daNpc_Ks_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KS = { +actor_process_profile_definition g_profile_NPC_KS = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 055cd56d9a..4a94648eb4 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -876,7 +876,7 @@ static actor_method_class daNpc_Kyury_MethodTable = { (process_method_func)daNpc_Kyury_Draw, }; -extern actor_process_profile_definition g_profile_NPC_KYURY = { +actor_process_profile_definition g_profile_NPC_KYURY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 1a4cf2b58c..6d3586be20 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -1295,7 +1295,7 @@ static actor_method_class daNpc_Len_MethodTable = { (process_method_func)daNpc_Len_Draw, }; -extern actor_process_profile_definition g_profile_NPC_LEN = { +actor_process_profile_definition g_profile_NPC_LEN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index c8517c3ff6..43ea8362f3 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -332,7 +332,7 @@ static actor_method_class l_daNPC_LF_Method = { (process_method_func)daNPC_LF_Draw, }; -extern actor_process_profile_definition g_profile_NPC_LF = { +actor_process_profile_definition g_profile_NPC_LF = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index 8701ef64a7..b15297f89d 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -1511,7 +1511,7 @@ static actor_method_class daNpc_Lud_MethodTable = { (process_method_func)daNpc_Lud_Draw, }; -extern actor_process_profile_definition g_profile_NPC_LUD = { +actor_process_profile_definition g_profile_NPC_LUD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 086e5eb6ce..2576375bbc 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -3391,7 +3391,7 @@ static actor_method_class daNpc_Maro_MethodTable = { (process_method_func)daNpc_Maro_Draw, }; -extern actor_process_profile_definition g_profile_NPC_MARO = { +actor_process_profile_definition g_profile_NPC_MARO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index caa6462764..2ef3eb0a52 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -619,7 +619,7 @@ static actor_method_class daNpc_midP_MethodTable = { (process_method_func)daNpc_midP_Draw, }; -extern actor_process_profile_definition g_profile_NPC_MIDP = { +actor_process_profile_definition g_profile_NPC_MIDP = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index c279c03664..d9775816f8 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -35,7 +35,7 @@ static actor_method_class daNpc_Mk_MethodTable = { (process_method_func)daNpc_Mk_Draw, }; -extern actor_process_profile_definition g_profile_NPC_MK = { +actor_process_profile_definition g_profile_NPC_MK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index cacf6e2368..13f2e9749b 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -1976,7 +1976,7 @@ static actor_method_class daNpc_Moi_MethodTable = { (process_method_func)daNpc_Moi_Draw, }; -extern actor_process_profile_definition g_profile_NPC_MOI = { +actor_process_profile_definition g_profile_NPC_MOI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index 13f879df14..de4fcee8dc 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -2018,7 +2018,7 @@ static actor_method_class daNpcMoiR_MethodTable = { (process_method_func)daNpcMoiR_Draw, }; -extern actor_process_profile_definition g_profile_NPC_MOIR = { +actor_process_profile_definition g_profile_NPC_MOIR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index 2ac5933d2f..96b0e67bf1 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -1335,7 +1335,7 @@ static actor_method_class daNpc_myna2_MethodTable = { (process_method_func)daNpc_myna2_Draw, }; -extern actor_process_profile_definition g_profile_MYNA2 = { +actor_process_profile_definition g_profile_MYNA2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 496e90a3c1..3aa0c95b08 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -300,7 +300,6 @@ static s16 climb_angle_get(npc_ne_class* i_this) { return 0; } -/* 80A92AC5 0003+00 data_80A92AC5 None */ static bool hio_set; static daNpc_Ne_HIO_c l_HIO; @@ -3177,7 +3176,6 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { i_this->health = 1; _this->field_0x560 = 1; - /* 80A92950-80A92990 000360 0040+00 1/1 0/0 0/0 .data cc_sph_src$7518 */ static dCcD_SrcSph cc_sph_src = { { {0x0, {{0x0, 0x0, 0x0}, {0x0, 0x0}, 0x75}}, // mObj @@ -3190,7 +3188,6 @@ static cPhs__Step daNpc_Ne_Create(fopAc_ac_c* i_this) { } // mSphAttr }; - /* 80A92990-80A929D0 0003A0 0040+00 1/1 0/0 0/0 .data at_sph_src$7519 */ static dCcD_SrcSph at_sph_src = { { {0x0, {{AT_TYPE_CSTATUE_SWING, 0x1, 0x1f}, {0x0, 0x0}, 0x0}}, // mObj @@ -3257,7 +3254,7 @@ static actor_method_class l_daNpc_Ne_Method = { (process_method_func)daNpc_Ne_Draw, }; -extern actor_process_profile_definition g_profile_NPC_NE = { +actor_process_profile_definition g_profile_NPC_NE = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index 4b2edf7db0..181cf352b0 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -35,7 +35,7 @@ static actor_method_class daNpc_P2MethodTable = { (process_method_func)daNpc_P2Draw, }; -extern actor_process_profile_definition g_profile_NPC_P2 = { +actor_process_profile_definition g_profile_NPC_P2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index a4e02c2211..8fbdd03c22 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -1544,7 +1544,7 @@ static actor_method_class daNpc_Pachi_Besu_MethodTable = { (process_method_func)daNpc_Pachi_Besu_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PACHI_BESU = { +actor_process_profile_definition g_profile_NPC_PACHI_BESU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index f392fc6717..0685272d75 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -1663,7 +1663,7 @@ static actor_method_class daNpc_Pachi_Maro_MethodTable = { (process_method_func)daNpc_Pachi_Maro_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PACHI_MARO = { +actor_process_profile_definition g_profile_NPC_PACHI_MARO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 8b7c1cc658..9ca34144e4 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -2556,7 +2556,7 @@ static actor_method_class daNpc_Pachi_Taro_MethodTable = { (process_method_func)daNpc_Pachi_Taro_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PACHI_TARO = { +actor_process_profile_definition g_profile_NPC_PACHI_TARO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_passer.cpp b/src/d/actor/d_a_npc_passer.cpp index f9c4599a4f..144542d9d6 100644 --- a/src/d/actor/d_a_npc_passer.cpp +++ b/src/d/actor/d_a_npc_passer.cpp @@ -1159,7 +1159,7 @@ static actor_method_class daNpcPasser_METHODS = { (process_method_func)daNpcPasser_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PASSER = { +actor_process_profile_definition g_profile_NPC_PASSER = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_passer2.cpp b/src/d/actor/d_a_npc_passer2.cpp index 848693890f..4889cb7398 100644 --- a/src/d/actor/d_a_npc_passer2.cpp +++ b/src/d/actor/d_a_npc_passer2.cpp @@ -378,7 +378,7 @@ static actor_method_class daNpcPasser2_METHODS = { (process_method_func)daNpcPasser2_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PASSER2 = { +actor_process_profile_definition g_profile_NPC_PASSER2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index 07f65ecd49..f82ef91e57 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -1561,7 +1561,7 @@ static actor_method_class daNpc_Post_MethodTable = { (process_method_func)daNpc_Post_Draw, }; -extern actor_process_profile_definition g_profile_NPC_POST = { +actor_process_profile_definition g_profile_NPC_POST = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index c031090c8f..2129c5c52f 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -1197,7 +1197,7 @@ static actor_method_class daNpc_Pouya_MethodTable = { (process_method_func)daNpc_Pouya_Draw, }; -extern actor_process_profile_definition g_profile_NPC_POUYA = { +actor_process_profile_definition g_profile_NPC_POUYA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index d8f17fa771..57fcebbc69 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -824,7 +824,7 @@ static actor_method_class daNpcPray_MethodTable = { (process_method_func)daNpcPray_Draw, }; -extern actor_process_profile_definition g_profile_NPC_PRAYER = { +actor_process_profile_definition g_profile_NPC_PRAYER = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index 2fe7966305..8452338247 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -825,7 +825,7 @@ static actor_method_class daNpc_Raca_MethodTable = { (process_method_func)daNpc_Raca_Draw, }; -extern actor_process_profile_definition g_profile_NPC_RACA = { +actor_process_profile_definition g_profile_NPC_RACA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index c9a1166a07..e35c843276 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -1776,7 +1776,7 @@ static actor_method_class daNpcRafrel_MethodTable = { (process_method_func)daNpcRafrel_Draw, }; -extern actor_process_profile_definition g_profile_NPC_RAFREL = { +actor_process_profile_definition g_profile_NPC_RAFREL = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 735152b035..6096224406 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -1210,7 +1210,7 @@ static actor_method_class daNpc_Saru_MethodTable = { (process_method_func)daNpc_Saru_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SARU = { +actor_process_profile_definition g_profile_NPC_SARU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 6544919b9a..129ae3fb7e 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -531,7 +531,7 @@ static actor_method_class daNpc_seiB_MethodTable = { (process_method_func)daNpc_seiB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SEIB = { +actor_process_profile_definition g_profile_NPC_SEIB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index 6c32627cf8..1fca422939 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -486,7 +486,7 @@ static actor_method_class daNpc_seiC_MethodTable = { (process_method_func)daNpc_seiC_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SEIC = { +actor_process_profile_definition g_profile_NPC_SEIC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index 431cac1c9a..f5ae798253 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -484,7 +484,7 @@ static actor_method_class daNpc_seiD_MethodTable = { (process_method_func)daNpc_seiD_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SEID = { +actor_process_profile_definition g_profile_NPC_SEID = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index ed6f43831d..7bf59cff96 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -1382,7 +1382,7 @@ static actor_method_class daNpc_Seira_MethodTable = { (process_method_func)daNpc_Seira_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SEIRA = { +actor_process_profile_definition g_profile_NPC_SEIRA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 902dacf90c..692d74d1cf 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -1097,7 +1097,7 @@ static actor_method_class daNpc_Seira2_MethodTable = { (process_method_func)daNpc_Seira2_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SERA2 = { +actor_process_profile_definition g_profile_NPC_SERA2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index 6fd3d7152d..d9984b9047 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -797,7 +797,7 @@ static actor_method_class daNpc_Seirei_MethodTable = { (process_method_func)daNpc_Seirei_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SEIREI = { +actor_process_profile_definition g_profile_NPC_SEIREI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 9fac537355..9ee4e08486 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -2645,7 +2645,7 @@ static actor_method_class daNpcShad_MethodTable = { (process_method_func)daNpcShad_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SHAD = { +actor_process_profile_definition g_profile_NPC_SHAD = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index 2fd65efc6d..d54e922857 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -1253,7 +1253,7 @@ static actor_method_class daNpc_Sha_MethodTable = { (process_method_func)daNpc_Sha_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SHAMAN = { +actor_process_profile_definition g_profile_NPC_SHAMAN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index eb2db6c90b..40d70575c3 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -158,7 +158,7 @@ cPhs__Step daNpcShoe_c::Create() { mCcCyl.SetTgSPrm(0); mGndChk = mAcch.m_gnd; - mGroundH = mAcch.m_ground_h; + mGroundH = mAcch.GetGroundH(); gravity = mpHIO->m.common.gravity; setEnvTevColor(); @@ -742,7 +742,7 @@ static actor_method_class daNpcShoe_MethodTable = { (process_method_func)daNpcShoe_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SHOE = { +actor_process_profile_definition g_profile_NPC_SHOE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 4a17fb849b..3be79434ac 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -347,7 +347,7 @@ static actor_method_class daNpc_Shop0_MethodTable = { daNpc_Shop0_Create, daNpc_Shop0_Delete, daNpc_Shop0_Execute, daNpc_Shop0_IsDelete, daNpc_Shop0_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SHOP0 = { +actor_process_profile_definition g_profile_NPC_SHOP0 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_shop_maro.cpp b/src/d/actor/d_a_npc_shop_maro.cpp index fb404f1bb5..13133a1355 100644 --- a/src/d/actor/d_a_npc_shop_maro.cpp +++ b/src/d/actor/d_a_npc_shop_maro.cpp @@ -41,7 +41,7 @@ static actor_method_class daNpc_shopMaro_MethodTable = { (process_method_func)daNpc_shopMaro_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SMARO = { +actor_process_profile_definition g_profile_NPC_SMARO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index 6379d31539..80dabacb74 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -1149,7 +1149,7 @@ static actor_method_class daNpc_SoldierA_MethodTable = { (process_method_func)daNpc_SoldierA_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SOLDIERa = { +actor_process_profile_definition g_profile_NPC_SOLDIERa = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index 4e86992e73..deacd75f6a 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -977,7 +977,7 @@ static actor_method_class daNpc_SoldierB_MethodTable = { (process_method_func)daNpc_SoldierB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SOLDIERb = { +actor_process_profile_definition g_profile_NPC_SOLDIERb = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index e51ad61dc1..834cd33476 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -389,7 +389,7 @@ static actor_method_class l_daNpc_Sq_Method = { (process_method_func)daNpc_Sq_Draw, }; -extern actor_process_profile_definition g_profile_NPC_SQ = { +actor_process_profile_definition g_profile_NPC_SQ = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 1a8072004e..6585bbd22c 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -3382,7 +3382,7 @@ static actor_method_class daNpc_Taro_MethodTable = { (process_method_func)daNpc_Taro_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TARO = { +actor_process_profile_definition g_profile_NPC_TARO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index cd1e0c7b63..c02974579d 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -1345,7 +1345,7 @@ static actor_method_class daNpcThe_MethodTable = { (process_method_func)daNpcThe_Draw, }; -extern actor_process_profile_definition g_profile_NPC_THE = { +actor_process_profile_definition g_profile_NPC_THE = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 26f68b50fa..31261fd91a 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -1575,7 +1575,7 @@ static actor_method_class daNpcTheB_MethodTable = { (process_method_func)daNpcTheB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_THEB = { +actor_process_profile_definition g_profile_NPC_THEB = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index d0c8e12edc..61e4884bdf 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -3194,7 +3194,6 @@ static int useHeapInit(fopAc_ac_c* i_this) { } int daNPC_TK_c::create() { - /* 80B0C4D4-80B0C514 0000E0 0040+00 1/1 0/0 0/0 .data cc_sph_src$8096 */ static dCcD_SrcSph cc_sph_src = { { {0x0, {{AT_TYPE_THROW_OBJ, 0x1, 0x1f}, {0x0, 0x0}, 0x69}}, // mObj @@ -3264,7 +3263,7 @@ static actor_method_class l_daNPC_TK_Method = { (process_method_func)daNPC_TK_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TK = { +actor_process_profile_definition g_profile_NPC_TK = { fpcLy_CURRENT_e, // mLayerID 6, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index 1ec8a25c18..91ba23f714 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -1387,7 +1387,7 @@ static actor_method_class daNpcTkc_MethodTable = { (process_method_func)daNpcTkc_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TKC = { +actor_process_profile_definition g_profile_NPC_TKC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index 46c57e776d..3127a4a338 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -664,7 +664,7 @@ static actor_method_class daNpc_Tkj_MethodTable = { (process_method_func)daNpc_Tkj_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TKJ = { +actor_process_profile_definition g_profile_NPC_TKJ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 616b263fde..9387988865 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -1156,7 +1156,7 @@ static actor_method_class l_daNpc_Tkj2_Method = { (process_method_func)daNpc_Tkj2_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TKJ2 = { +actor_process_profile_definition g_profile_NPC_TKJ2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index ce20c8387b..b60efb4595 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -1035,7 +1035,7 @@ void daNpcTks_c::waitNude() { if (fVar1 > -200.0f && fVar1 < 150.0f && fopAcM_searchPlayerDistanceXZ(this) <= 300.0f) { if (!fopAcM_otherBgCheck(this, daPy_getPlayerActorClass())) { - eventInfo.onCondition(dEvtCmd_INTALK_e); + eventInfo.onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 0, 0); } } @@ -1089,7 +1089,7 @@ void daNpcTks_c::waitLv6() { if (current.pos.y - fopAcM_GetPosition_p(daPy_getPlayerActorClass())->y < 100.0f && fopAcM_searchPlayerDistanceXZ(this) <= 400.0f) { attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e; - eventInfo.onCondition(dEvtCmd_INTALK_e); + eventInfo.onCondition(dEvtCnd_CANTALK_e); fopAcM_orderSpeakEvent(this, 0, 0); } @@ -3019,7 +3019,7 @@ static actor_method_class daNpcTks_MethodTable = { (process_method_func)daNpcTks_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TKS = { +actor_process_profile_definition g_profile_NPC_TKS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index e8d9eeaf6e..c47fd622e3 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -2231,7 +2231,7 @@ static actor_method_class daNpc_Toby_MethodTable = { (process_method_func)daNpc_Toby_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TOBY = { +actor_process_profile_definition g_profile_NPC_TOBY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp index e41ece6b77..cc30258dcd 100644 --- a/src/d/actor/d_a_npc_tr.cpp +++ b/src/d/actor/d_a_npc_tr.cpp @@ -253,7 +253,7 @@ static actor_method_class l_daNPC_TR_Method = { (process_method_func)daNPC_TR_Draw, }; -extern actor_process_profile_definition g_profile_NPC_TR = { +actor_process_profile_definition g_profile_NPC_TR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index 19bd6160bc..0482eeeb79 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -1905,7 +1905,7 @@ static actor_method_class daNpc_Uri_MethodTable = { (process_method_func)daNpc_Uri_Draw, }; -extern actor_process_profile_definition g_profile_NPC_URI = { +actor_process_profile_definition g_profile_NPC_URI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index cba5eaa209..50789f2e80 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -400,7 +400,7 @@ static actor_method_class l_daNPC_WORM_Method = { (process_method_func)daNPC_WORM_Draw, }; -extern actor_process_profile_definition g_profile_NPC_WORM = { +actor_process_profile_definition g_profile_NPC_WORM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 10d86a5df1..008133fc49 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -5219,7 +5219,7 @@ static actor_method_class daNpcWrestler_MethodTable = { (process_method_func)daNpcWrestler_Draw, }; -extern actor_process_profile_definition g_profile_NPC_WRESTLER = { +actor_process_profile_definition g_profile_NPC_WRESTLER = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index 3018f1415c..cfa98ce53f 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -794,7 +794,7 @@ static actor_method_class daNpc_yamiD_MethodTable = { (process_method_func)daNpc_yamiD_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YAMID = { +actor_process_profile_definition g_profile_NPC_YAMID = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index 021fef2f9c..4eafe9a6e3 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -725,7 +725,7 @@ static actor_method_class daNpc_yamiS_MethodTable = { (process_method_func)daNpc_yamiS_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YAMIS = { +actor_process_profile_definition g_profile_NPC_YAMIS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index 400752c649..c281758b95 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -754,7 +754,7 @@ static actor_method_class daNpc_yamiT_MethodTable = { (process_method_func)daNpc_yamiT_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YAMIT = { +actor_process_profile_definition g_profile_NPC_YAMIT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index 0327d88d6b..ecb987c996 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -348,11 +348,8 @@ daNpc_Yelia_c::~daNpc_Yelia_c() { } cPhs__Step daNpc_Yelia_c::create() { - if (!fopAcM_CheckCondition(this, fopAcCnd_INIT_e)) { - new (this) daNpc_Yelia_c(l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, - l_motionSequenceData, 4, l_evtList, l_resNameList); - fopAcM_OnCondition(this, fopAcCnd_INIT_e); - } + daNpcT_ct(this, daNpc_Yelia_c, l_faceMotionAnmData, l_motionAnmData, l_faceMotionSequenceData, 4, + l_motionSequenceData, 4, l_evtList, l_resNameList); mType = getType(); mFlowNodeNo = getFlowNodeNo(); @@ -1559,7 +1556,7 @@ static actor_method_class daNpc_Yelia_MethodTable = { (process_method_func)daNpc_Yelia_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YELIA = { +actor_process_profile_definition g_profile_NPC_YELIA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 543e3f5559..44793b7c8f 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -3746,7 +3746,7 @@ static actor_method_class daNpc_ykM_MethodTable = { (process_method_func)daNpc_ykM_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YKM = { +actor_process_profile_definition g_profile_NPC_YKM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index db9f8bdb69..24dcf7a925 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -3042,7 +3042,7 @@ static actor_method_class daNpc_ykW_MethodTable = { (process_method_func)daNpc_ykW_Draw, }; -extern actor_process_profile_definition g_profile_NPC_YKW = { +actor_process_profile_definition g_profile_NPC_YKW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index 03285707f5..072467a470 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -711,7 +711,7 @@ static actor_method_class daNpc_zanB_MethodTable = { (process_method_func)daNpc_zanB_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZANB = { +actor_process_profile_definition g_profile_NPC_ZANB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index bab7bd7d70..0a385505c2 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -105,7 +105,7 @@ int daNpc_Zant_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; - mGroundH = mAcch.m_ground_h; + mGroundH = mAcch.GetGroundH(); if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); @@ -532,7 +532,7 @@ static actor_method_class daNpc_Zant_MethodTable = { (process_method_func)daNpc_Zant_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZANT = { +actor_process_profile_definition g_profile_NPC_ZANT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index 8d1362e9d5..ce17fc78c4 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -148,7 +148,7 @@ int daNpc_ZelR_c::create() { mAcch.Set(¤t.pos, &old.pos, this, 1, &mAcchCir, &speed, ¤t.angle, &shape_angle); mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; - mGroundH = mAcch.m_ground_h; + mGroundH = mAcch.GetGroundH(); setEnvTevColor(); setRoomNo(); @@ -603,7 +603,7 @@ static actor_method_class daNpc_ZelR_MethodTable = { (process_method_func)daNpc_ZelR_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZELR = { +actor_process_profile_definition g_profile_NPC_ZELR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index a80d0770bb..dd042dbb28 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -661,7 +661,7 @@ static actor_method_class daNpc_ZelRo_MethodTable = { (process_method_func)daNpc_ZelRo_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZELRO = { +actor_process_profile_definition g_profile_NPC_ZELRO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index e3c3239c5b..0010b053ef 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -795,7 +795,7 @@ static actor_method_class daNpc_Zelda_MethodTable = { (process_method_func)daNpc_Zelda_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZELDA = { +actor_process_profile_definition g_profile_NPC_ZELDA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index 75547eef93..9631856f8a 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -2319,7 +2319,7 @@ static actor_method_class daNpc_zrA_MethodTable = { (process_method_func)daNpc_zrA_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZRA = { +actor_process_profile_definition g_profile_NPC_ZRA = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_npc_zra.inc b/src/d/actor/d_a_npc_zra.inc index 05503f3087..4fa5b46b87 100644 --- a/src/d/actor/d_a_npc_zra.inc +++ b/src/d/actor/d_a_npc_zra.inc @@ -1,4 +1,3 @@ -/* 80B7F8C4-80B7FD10 0074A4 044C+00 3/0 0/0 0/0 .text wait__11daNpc_zrA_cFPv */ BOOL daNpc_zrA_c::wait(void* param_0) { switch (mMode) { case 0: diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index 52dd101dd5..c6245ebae9 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -1769,7 +1769,7 @@ static actor_method_class daNpc_zrC_MethodTable = { (process_method_func)daNpc_zrC_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZRC = { +actor_process_profile_definition g_profile_NPC_ZRC = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index 4efb47ccc3..62cf3a6b8f 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -2423,7 +2423,7 @@ static actor_method_class daNpc_zrZ_MethodTable = { (process_method_func)daNpc_zrZ_Draw, }; -extern actor_process_profile_definition g_profile_NPC_ZRZ = { +actor_process_profile_definition g_profile_NPC_ZRZ = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp index 43845629dd..f6251271d4 100644 --- a/src/d/actor/d_a_obj_Lv5Key.cpp +++ b/src/d/actor/d_a_obj_Lv5Key.cpp @@ -339,7 +339,7 @@ static actor_method_class l_daObjLv5Key_Method = { (process_method_func)daObjLv5Key_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv5Key = { +actor_process_profile_definition g_profile_Obj_Lv5Key = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index b1fffc09ee..c847b96223 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -416,7 +416,7 @@ static actor_method_class l_daTurara_Method = { (process_method_func)daTurara_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Turara = { +actor_process_profile_definition g_profile_Obj_Turara = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index 7c44b64ff7..8f07b81887 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -220,7 +220,7 @@ static actor_method_class l_daTvCdlst_Method = { (process_method_func)daTvCdlst_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TvCdlst = { +actor_process_profile_definition g_profile_Obj_TvCdlst = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index 5a9e8dcdba..cf51e021af 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -379,7 +379,7 @@ static actor_method_class daObjYtaihou_METHODS = { (process_method_func)daObjYtaihou_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Ytaihou = { +actor_process_profile_definition g_profile_Obj_Ytaihou = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index 9eed1d4c4b..a6554a9d8a 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -297,7 +297,7 @@ actor_method_class l_daAmiShutter_Method = { }; -extern actor_process_profile_definition g_profile_Obj_AmiShutter = { +actor_process_profile_definition g_profile_Obj_AmiShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index ee0c02efd4..0250f14643 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -738,7 +738,7 @@ static actor_method_class l_daObjARI_Method = { (process_method_func)daObjARI_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Ari = { +actor_process_profile_definition g_profile_Obj_Ari = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index a8a9090ede..aecb349f3e 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -309,7 +309,7 @@ static actor_method_class daObj_AutoMata_MethodTable = { (process_method_func)daObj_AutoMata_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_AUTOMATA = { +actor_process_profile_definition g_profile_OBJ_AUTOMATA = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index 013ace1dc1..23b4daf8fa 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -298,7 +298,7 @@ static actor_method_class daObjAvalanche_METHODS = { (process_method_func)daObjAvalanche_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Avalanche = { +actor_process_profile_definition g_profile_Obj_Avalanche = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_balloon.cpp b/src/d/actor/d_a_obj_balloon.cpp index fcbea2b3cb..94e24bf3dc 100644 --- a/src/d/actor/d_a_obj_balloon.cpp +++ b/src/d/actor/d_a_obj_balloon.cpp @@ -295,7 +295,7 @@ static actor_method_class l_daObj_Balloon_Method = { (process_method_func)daObj_Balloon_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_BALLOON = { +actor_process_profile_definition g_profile_OBJ_BALLOON = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index 71ed8871ba..28ba74c407 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -158,7 +158,7 @@ static actor_method_class l_daBarDesk_Method = { (process_method_func)daBarDesk_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BarDesk = { +actor_process_profile_definition g_profile_Obj_BarDesk = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 120c05a999..a790bc19c6 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -695,7 +695,7 @@ static actor_method_class l_daObjBATTA_Method = { (process_method_func)daObjBATTA_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Batta = { +actor_process_profile_definition g_profile_Obj_Batta = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp index 861209be5b..89c373c168 100644 --- a/src/d/actor/d_a_obj_bbox.cpp +++ b/src/d/actor/d_a_obj_bbox.cpp @@ -133,7 +133,7 @@ static actor_method_class daObjBBox_METHODS = { (process_method_func)daObjBBox_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_BBox = { +actor_process_profile_definition g_profile_Obj_BBox = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp index b5d776f286..d2248c3b55 100644 --- a/src/d/actor/d_a_obj_bed.cpp +++ b/src/d/actor/d_a_obj_bed.cpp @@ -180,7 +180,7 @@ static actor_method_class daObj_Bed_MethodTable = { (process_method_func)daObj_Bed_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_BED = { +actor_process_profile_definition g_profile_OBJ_BED = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 8e3ef9a5a8..788e24e294 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -1907,7 +1907,7 @@ static actor_method_class daObjBm_METHODS = { (process_method_func)daObjBm_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Bemos = { +actor_process_profile_definition g_profile_Obj_Bemos = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index fc436642b1..a5b7a104ca 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -500,7 +500,7 @@ static actor_method_class l_daObjBHASHI_Method = { (process_method_func)daObjBHASHI_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BHASHI = { +actor_process_profile_definition g_profile_Obj_BHASHI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index 58b3433774..0697f830c3 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -198,7 +198,7 @@ static actor_method_class l_daObjBhbridge_Method = { (process_method_func)daObjBhbridge_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Bhbridge = { +actor_process_profile_definition g_profile_Obj_Bhbridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp index fddca4fb8e..e5f6a56994 100644 --- a/src/d/actor/d_a_obj_bk_leaf.cpp +++ b/src/d/actor/d_a_obj_bk_leaf.cpp @@ -159,7 +159,7 @@ static actor_method_class l_daBkLeaf_Method = { (process_method_func)daBkLeaf_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BkLeaf = {fpcLy_CURRENT_e, +actor_process_profile_definition g_profile_Obj_BkLeaf = {fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, PROC_Obj_BkLeaf, diff --git a/src/d/actor/d_a_obj_bkdoor.cpp b/src/d/actor/d_a_obj_bkdoor.cpp index d07d39db5d..b7eb850ade 100644 --- a/src/d/actor/d_a_obj_bkdoor.cpp +++ b/src/d/actor/d_a_obj_bkdoor.cpp @@ -204,7 +204,7 @@ static actor_method_class daObjBkDoor_METHODS = { (process_method_func)daObjBkDoor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_BkDoor = { +actor_process_profile_definition g_profile_Obj_BkDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index e99526ae5d..fae6153ae1 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -421,7 +421,7 @@ static actor_method_class daBkyRock_METHODS = { (process_method_func)daBkyRock_draw, }; -extern actor_process_profile_definition g_profile_BkyRock = { +actor_process_profile_definition g_profile_BkyRock = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index 432e7f9bfe..f913dfecbf 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -330,7 +330,7 @@ static actor_method_class l_daBmWindow_Method = { (process_method_func)daBmWindow_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BmWindow = { +actor_process_profile_definition g_profile_Obj_BmWindow = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp index 2de8fa71be..ace4baefe3 100644 --- a/src/d/actor/d_a_obj_bmshutter.cpp +++ b/src/d/actor/d_a_obj_bmshutter.cpp @@ -296,7 +296,7 @@ static actor_method_class l_daObjBmSh_Method = { (process_method_func)daObjBmSh_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BoomShutter = { +actor_process_profile_definition g_profile_Obj_BoomShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bombf.cpp b/src/d/actor/d_a_obj_bombf.cpp index 0a294e9a52..6e837134bc 100644 --- a/src/d/actor/d_a_obj_bombf.cpp +++ b/src/d/actor/d_a_obj_bombf.cpp @@ -113,7 +113,7 @@ static actor_method_class l_daObjBombf_Method = { (process_method_func)daObjBombf_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Bombf = { +actor_process_profile_definition g_profile_Obj_Bombf = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index bec7a64cbb..a743466f7a 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -669,7 +669,7 @@ static actor_method_class l_daObjBossWarp_Method = { (process_method_func)daObjBossWarp_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BossWarp = { +actor_process_profile_definition g_profile_Obj_BossWarp = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index 90c0e7d7fd..df2ecc9a70 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -84,7 +84,6 @@ int daObj_BouMato_c::CreateHeap() { {0.0f, 300.0f, 0.0f}, }; - // /* 80BBC58C-80BBC598 -00001 000C+00 1/1 0/0 0/0 .data jntCoData$4045 */ static dJntColData_c jntCoData = { 1, 1, 0, 4.0f, jntCoOffset, }; @@ -340,7 +339,7 @@ static actor_method_class daObj_BouMato_MethodTable = { (process_method_func)daObj_BouMato_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_BOUMATO = { +actor_process_profile_definition g_profile_OBJ_BOUMATO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp index 553c731e48..cf8a2b06b0 100644 --- a/src/d/actor/d_a_obj_brakeeff.cpp +++ b/src/d/actor/d_a_obj_brakeeff.cpp @@ -235,7 +235,7 @@ actor_method_class l_daObj_Brakeeff_Method = { (process_method_func)daObj_Brakeeff_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_BEF = { +actor_process_profile_definition g_profile_OBJ_BEF = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index 24e6142181..c82fb96e7c 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -353,7 +353,6 @@ static int daObj_Brg_Draw(obj_brg_class* i_this) { return 1; } -/* 80BC2526 0002+00 data_80BC2526 wy */ static s16 wy; static void control1(obj_brg_class* i_this, br_s* i_part) { @@ -1825,7 +1824,7 @@ static actor_method_class l_daObj_Brg_Method = { (process_method_func)daObj_Brg_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_BRG = { +actor_process_profile_definition g_profile_OBJ_BRG = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_bsGate.cpp b/src/d/actor/d_a_obj_bsGate.cpp index a150763be3..e74892cfe9 100644 --- a/src/d/actor/d_a_obj_bsGate.cpp +++ b/src/d/actor/d_a_obj_bsGate.cpp @@ -170,7 +170,7 @@ static actor_method_class l_daBsGate_Method = { (process_method_func)daBsGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_BsGate = { +actor_process_profile_definition g_profile_Obj_BsGate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index c90a88799c..fd4d53a350 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -224,7 +224,7 @@ static actor_method_class l_daBubbPilar_Method = { (process_method_func)daBubbPilar_Draw, }; -extern actor_process_profile_definition g_profile_Obj_awaPlar = { +actor_process_profile_definition g_profile_Obj_awaPlar = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp index 8d4c9ac2b5..70b6ce41c6 100644 --- a/src/d/actor/d_a_obj_burnbox.cpp +++ b/src/d/actor/d_a_obj_burnbox.cpp @@ -190,7 +190,7 @@ actor_method_class daObjBurnBox_METHODS = { (process_method_func) daObjBurnBox_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_BurnBox = { +actor_process_profile_definition g_profile_Obj_BurnBox = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index 02dd9b8d92..8363d91bbe 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -4299,7 +4299,7 @@ static actor_method_class l_daObjCarry_Method = { (process_method_func)daObjCarry_Execute, (process_method_func)NULL, (process_method_func)daObjCarry_Draw}; -extern actor_process_profile_definition g_profile_Obj_Carry = { +actor_process_profile_definition g_profile_Obj_Carry = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_catdoor.cpp b/src/d/actor/d_a_obj_catdoor.cpp index 2812e19c66..d60831b6d2 100644 --- a/src/d/actor/d_a_obj_catdoor.cpp +++ b/src/d/actor/d_a_obj_catdoor.cpp @@ -181,7 +181,7 @@ static actor_method_class l_daObjCatDoor_Method = { (process_method_func)daObjCatDoor_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CatDoor = { +actor_process_profile_definition g_profile_Obj_CatDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index 23b862399d..9744a71b1e 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -233,7 +233,7 @@ static actor_method_class l_daObj_Cb_Method = { (process_method_func)daObj_Cb_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_CB = { +actor_process_profile_definition g_profile_OBJ_CB = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index 1575a759ff..fc4a336e62 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -407,7 +407,7 @@ static actor_method_class l_daObjCBlk_Method = { (process_method_func)daObjCBlk_Draw, }; -extern actor_process_profile_definition g_profile_Obj_ChainBlock = { +actor_process_profile_definition g_profile_Obj_ChainBlock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_cboard.cpp b/src/d/actor/d_a_obj_cboard.cpp index 0bf662fb78..a918613f4a 100644 --- a/src/d/actor/d_a_obj_cboard.cpp +++ b/src/d/actor/d_a_obj_cboard.cpp @@ -156,7 +156,7 @@ static actor_method_class daObjBoard_METHODS = { (process_method_func)daObjBoard_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Cboard = { +actor_process_profile_definition g_profile_Obj_Cboard = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cdoor.cpp b/src/d/actor/d_a_obj_cdoor.cpp index 089c9838e8..d98333c8dd 100644 --- a/src/d/actor/d_a_obj_cdoor.cpp +++ b/src/d/actor/d_a_obj_cdoor.cpp @@ -296,7 +296,7 @@ static actor_method_class l_daObjCdoor_Method = { (process_method_func)daObjCdoor_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Cdoor = { +actor_process_profile_definition g_profile_Obj_Cdoor = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp index c45fde1122..9a344acb0c 100644 --- a/src/d/actor/d_a_obj_chandelier.cpp +++ b/src/d/actor/d_a_obj_chandelier.cpp @@ -256,7 +256,7 @@ static actor_method_class daObjChandelier_METHODS = { (process_method_func)daObjChandelier_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Chandelier = { +actor_process_profile_definition g_profile_Obj_Chandelier = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp index a770f2ab71..8e74fad3e3 100644 --- a/src/d/actor/d_a_obj_chest.cpp +++ b/src/d/actor/d_a_obj_chest.cpp @@ -246,7 +246,7 @@ static actor_method_class l_daObjChest_Method = { (process_method_func)daObjChest_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Chest = { +actor_process_profile_definition g_profile_Obj_Chest = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index 51d47ec630..24874778d5 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -605,7 +605,7 @@ static actor_method_class l_daObjCHO_Method = { (process_method_func)daObjCHO_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Cho = { +actor_process_profile_definition g_profile_Obj_Cho = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp index d54b9459c3..da2151d4d1 100644 --- a/src/d/actor/d_a_obj_cowdoor.cpp +++ b/src/d/actor/d_a_obj_cowdoor.cpp @@ -91,7 +91,7 @@ static actor_method_class l_daCowdoor_Method = { (process_method_func)daCowdoor_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Cowdoor = { +actor_process_profile_definition g_profile_Obj_Cowdoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp index 87679188a3..d19a478842 100644 --- a/src/d/actor/d_a_obj_crope.cpp +++ b/src/d/actor/d_a_obj_crope.cpp @@ -378,7 +378,7 @@ static actor_method_class l_daObjCrope_Method = { (process_method_func)daObjCrope_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Crope = { +actor_process_profile_definition g_profile_Obj_Crope = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp index 6e7d602dc2..b0bd21ba57 100644 --- a/src/d/actor/d_a_obj_crvfence.cpp +++ b/src/d/actor/d_a_obj_crvfence.cpp @@ -423,7 +423,7 @@ static actor_method_class l_daObjCRVFENCE_Method = { (process_method_func)daObjCRVFENCE_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVFENCE = { +actor_process_profile_definition g_profile_Obj_CRVFENCE = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index 98072faa6c..f8ac63adfe 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -834,7 +834,7 @@ static actor_method_class l_daObjCRVGATE_Method = { (process_method_func)daObjCRVGATE_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVGATE = { +actor_process_profile_definition g_profile_Obj_CRVGATE = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index 8522d99bf2..abc9aef6aa 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -243,7 +243,7 @@ static actor_method_class l_daObjCRVHAHEN_Method = { (process_method_func)daObjCRVHAHEN_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVHAHEN = { +actor_process_profile_definition g_profile_Obj_CRVHAHEN = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index f8d498da82..2be8d83865 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -237,7 +237,7 @@ static actor_method_class l_daObjCRVLH_DW_Method = { (process_method_func)daObjCRVLH_DW_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVLH_DW = { +actor_process_profile_definition g_profile_Obj_CRVLH_DW = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvlh_up.cpp b/src/d/actor/d_a_obj_crvlh_up.cpp index faeb027cd5..3facb4d696 100644 --- a/src/d/actor/d_a_obj_crvlh_up.cpp +++ b/src/d/actor/d_a_obj_crvlh_up.cpp @@ -198,7 +198,7 @@ static actor_method_class l_daObjCRVLH_UP_Method = { (process_method_func)daObjCRVLH_UP_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVLH_UP = { +actor_process_profile_definition g_profile_Obj_CRVLH_UP = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp index 36caeb4880..5e5e4216a5 100644 --- a/src/d/actor/d_a_obj_crvsteel.cpp +++ b/src/d/actor/d_a_obj_crvsteel.cpp @@ -148,7 +148,7 @@ static actor_method_class l_daObjCRVSTEEL_Method = { (process_method_func)daObjCRVSTEEL_Draw, }; -extern actor_process_profile_definition g_profile_Obj_CRVSTEEL = { +actor_process_profile_definition g_profile_Obj_CRVSTEEL = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp index 434a4e8a17..bca278b944 100644 --- a/src/d/actor/d_a_obj_crystal.cpp +++ b/src/d/actor/d_a_obj_crystal.cpp @@ -136,7 +136,7 @@ static actor_method_class l_daObjCrystal_Method = { (process_method_func)daObjCrystal_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Crystal = { +actor_process_profile_definition g_profile_Obj_Crystal = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 0717bc4942..418de6547e 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -830,7 +830,7 @@ static actor_method_class daObjCwall_METHODS = { (process_method_func)daObjCwall_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_ChainWall = { +actor_process_profile_definition g_profile_Obj_ChainWall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp index 2bdbdf644a..8434e43d05 100644 --- a/src/d/actor/d_a_obj_damCps.cpp +++ b/src/d/actor/d_a_obj_damCps.cpp @@ -199,7 +199,7 @@ static actor_method_class l_daObjDamCps_Method = { }; #endif -extern actor_process_profile_definition g_profile_Obj_DamCps = { +actor_process_profile_definition g_profile_Obj_DamCps = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 78f200f9e8..ed3d319128 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -601,7 +601,7 @@ static actor_method_class l_daObjDAN_Method = { (process_method_func)daObjDAN_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Dan = { +actor_process_profile_definition g_profile_Obj_Dan = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_digholl.cpp b/src/d/actor/d_a_obj_digholl.cpp index 6633135f43..0e9aca1f7c 100644 --- a/src/d/actor/d_a_obj_digholl.cpp +++ b/src/d/actor/d_a_obj_digholl.cpp @@ -101,7 +101,7 @@ static actor_method_class l_daObjDigholl_Method = { (process_method_func)daObjDigholl_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Digholl = { +actor_process_profile_definition g_profile_Obj_Digholl = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_digplace.cpp b/src/d/actor/d_a_obj_digplace.cpp index 85b588165d..8e3eee9fe3 100644 --- a/src/d/actor/d_a_obj_digplace.cpp +++ b/src/d/actor/d_a_obj_digplace.cpp @@ -175,7 +175,7 @@ static actor_method_class l_daObjDigpl_Method = { (process_method_func)daObjDigpl_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Digpl = { +actor_process_profile_definition g_profile_Obj_Digpl = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 1fa9f10c73..9a1335844d 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -179,7 +179,7 @@ static actor_method_class daObjDigSnow_METHODS = { (process_method_func)daObjDigSnow_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_DigSnow = { +actor_process_profile_definition g_profile_Obj_DigSnow = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index 58b7ec352f..3f9a1bdb12 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -683,7 +683,7 @@ static actor_method_class daObjDmElevator_METHODS = { (process_method_func)daObjDmElevator_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Elevator = { +actor_process_profile_definition g_profile_Obj_Elevator = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index bf88385049..85f5564e4c 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -583,7 +583,7 @@ static actor_method_class l_daObjDrop_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Obj_Drop = { +actor_process_profile_definition g_profile_Obj_Drop = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp index 5233819eee..7cab7b9fa5 100644 --- a/src/d/actor/d_a_obj_dust.cpp +++ b/src/d/actor/d_a_obj_dust.cpp @@ -250,7 +250,7 @@ static actor_method_class l_daObjDust_Method = { }; -extern actor_process_profile_definition g_profile_Obj_DUST = { +actor_process_profile_definition g_profile_Obj_DUST = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index 4724a92643..8284980e8f 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -55,7 +55,7 @@ static actor_method_class Mthd_Table = { }; }; // namespace daObjEff -extern actor_process_profile_definition g_profile_Obj_Eff = { +actor_process_profile_definition g_profile_Obj_Eff = { fpcLy_CURRENT_e, 9, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp index 2bad4cf956..c85d1c8f94 100644 --- a/src/d/actor/d_a_obj_enemy_create.cpp +++ b/src/d/actor/d_a_obj_enemy_create.cpp @@ -253,7 +253,7 @@ static actor_method_class l_daObjE_CREATE_Method = { (process_method_func)daObjE_CREATE_Draw, }; -extern actor_process_profile_definition g_profile_Obj_E_CREATE = { +actor_process_profile_definition g_profile_Obj_E_CREATE = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index 3387a97f3d..063df5327a 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -412,7 +412,7 @@ static actor_method_class daObjFallObj_METHODS = { (process_method_func)daObjFallObj_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_FallObj = { +actor_process_profile_definition g_profile_Obj_FallObj = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index 61aa595b8c..52f864d150 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -335,7 +335,7 @@ static actor_method_class daObjFan_METHODS = { (process_method_func)daObjFan_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Fan = { +actor_process_profile_definition g_profile_Obj_Fan = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index 6a991bb89b..390e1ab36b 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -309,7 +309,7 @@ static actor_method_class l_daObjFchain_Method = { (process_method_func)daObjFchain_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Fchain = { +actor_process_profile_definition g_profile_Obj_Fchain = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp index 4ab9eac175..aab5c4406e 100644 --- a/src/d/actor/d_a_obj_fireWood.cpp +++ b/src/d/actor/d_a_obj_fireWood.cpp @@ -188,7 +188,7 @@ static actor_method_class l_daFireWood_Method = { (process_method_func)daFireWood_Draw, }; -extern actor_process_profile_definition g_profile_Obj_FireWood = { +actor_process_profile_definition g_profile_Obj_FireWood = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp index 9f192fc03f..26df7b03a3 100644 --- a/src/d/actor/d_a_obj_fireWood2.cpp +++ b/src/d/actor/d_a_obj_fireWood2.cpp @@ -272,7 +272,7 @@ static actor_method_class l_daFireWood2_Method = { (process_method_func)daFireWood2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_FireWood2 = { +actor_process_profile_definition g_profile_Obj_FireWood2 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp index 6c32453b01..6e84d02107 100644 --- a/src/d/actor/d_a_obj_firepillar.cpp +++ b/src/d/actor/d_a_obj_firepillar.cpp @@ -221,7 +221,7 @@ static actor_method_class l_daObjFPillar_Method = { (process_method_func)daObjFPillar_Draw, }; -extern actor_process_profile_definition g_profile_Obj_FirePillar = { +actor_process_profile_definition g_profile_Obj_FirePillar = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp index cd699e8f3d..a61b60bf5b 100644 --- a/src/d/actor/d_a_obj_firepillar2.cpp +++ b/src/d/actor/d_a_obj_firepillar2.cpp @@ -503,7 +503,7 @@ static actor_method_class l_daObjFPillar2_Method = { (process_method_func)daObjFPillar2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_FirePillar2 = { +actor_process_profile_definition g_profile_Obj_FirePillar2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_flag.cpp b/src/d/actor/d_a_obj_flag.cpp index 5fbb14e0a2..1a4f266c2d 100644 --- a/src/d/actor/d_a_obj_flag.cpp +++ b/src/d/actor/d_a_obj_flag.cpp @@ -306,7 +306,7 @@ static actor_method_class l_daObjFlag_Method = { (process_method_func)daObjFlag_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Flag = { +actor_process_profile_definition g_profile_Obj_Flag = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index c7ae1b0070..ab824c1328 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -507,7 +507,7 @@ static actor_method_class l_daObjFlag2_Method = { (process_method_func)daObjFlag2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Flag2 = { +actor_process_profile_definition g_profile_Obj_Flag2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index 8f2683aa3a..cd69f4b407 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -514,7 +514,7 @@ static actor_method_class l_daObjFlag3_Method = { (process_method_func)daObjFlag3_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Flag3 = { +actor_process_profile_definition g_profile_Obj_Flag3 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_fmobj.cpp b/src/d/actor/d_a_obj_fmobj.cpp index 1f44709e73..e3de14f9b4 100644 --- a/src/d/actor/d_a_obj_fmobj.cpp +++ b/src/d/actor/d_a_obj_fmobj.cpp @@ -118,7 +118,7 @@ static actor_method_class l_daObj_Fmobj_Method = { (process_method_func)daObj_Fmobj_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_FMOBJ = { +actor_process_profile_definition g_profile_OBJ_FMOBJ = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp index 31dde10a02..3135d7a444 100644 --- a/src/d/actor/d_a_obj_food.cpp +++ b/src/d/actor/d_a_obj_food.cpp @@ -502,7 +502,7 @@ static actor_method_class l_daObj_Food_Method = { (process_method_func)daObj_Food_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_FOOD = { +actor_process_profile_definition g_profile_OBJ_FOOD = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp index 0242c01f92..79304a02c3 100644 --- a/src/d/actor/d_a_obj_fw.cpp +++ b/src/d/actor/d_a_obj_fw.cpp @@ -305,7 +305,7 @@ static actor_method_class l_daObj_Fw_Method = { (process_method_func)daObj_Fw_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_FW = { +actor_process_profile_definition g_profile_OBJ_FW = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 5f73a4fa86..3ce3d54be9 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -615,7 +615,7 @@ static actor_method_class daObj_Gadget_MethodTable = { (process_method_func)daObj_Gadget_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_GADGET = { +actor_process_profile_definition g_profile_OBJ_GADGET = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index 3d5a21ccd3..d2f04ddbb1 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -187,7 +187,7 @@ static actor_method_class l_daObjGWall_Method = { (process_method_func)daObjGWall_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GanonWall = { +actor_process_profile_definition g_profile_Obj_GanonWall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index 4718146d44..7ab8705d3a 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -173,7 +173,7 @@ static actor_method_class daObjGWall2_METHODS = { (process_method_func)daObjGWall2_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_GanonWall2 = { +actor_process_profile_definition g_profile_Obj_GanonWall2 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 5618aed1b4..238099a0f6 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -228,7 +228,7 @@ static actor_method_class l_daObj_Gb_Method = { (process_method_func)daObj_Gb_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_GB = { +actor_process_profile_definition g_profile_OBJ_GB = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp index 3b8dfee27c..ee0a774e4a 100644 --- a/src/d/actor/d_a_obj_geyser.cpp +++ b/src/d/actor/d_a_obj_geyser.cpp @@ -689,7 +689,7 @@ static actor_method_class daObjGeyser_METHODS = { (process_method_func)daObjGeyser_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Geyser = { +actor_process_profile_definition g_profile_Obj_Geyser = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_glowSphere.cpp b/src/d/actor/d_a_obj_glowSphere.cpp index 437a94f0cc..045d5ec784 100644 --- a/src/d/actor/d_a_obj_glowSphere.cpp +++ b/src/d/actor/d_a_obj_glowSphere.cpp @@ -415,10 +415,8 @@ BOOL _GlSph_Mng_c::_chkAllGet_main() { return TRUE; } -/* 80BFAFE8 0002+00 data_80BFAFE8 mSphSe__12_GlSph_Mng_c */ u16 _GlSph_Mng_c::mSphSe; -/* 80BFAFEA 0002+00 data_80BFAFEA mSeClrTmr__12_GlSph_Mng_c */ s16 _GlSph_Mng_c::mSeClrTmr; void _GlSph_Mng_c::SphSeProc() { @@ -464,7 +462,7 @@ static actor_method_class l_daGlwSph_Method = { (process_method_func)daGlwSph_Draw, }; -extern actor_process_profile_definition g_profile_Obj_glowSphere = { +actor_process_profile_definition g_profile_Obj_glowSphere = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp index 33d4ccc6a0..a5fd980fc0 100644 --- a/src/d/actor/d_a_obj_gm.cpp +++ b/src/d/actor/d_a_obj_gm.cpp @@ -726,7 +726,7 @@ static actor_method_class l_daObj_Gm_Method = { (process_method_func)daObj_Gm_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_GM = { +actor_process_profile_definition g_profile_OBJ_GM = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_goGate.cpp b/src/d/actor/d_a_obj_goGate.cpp index 4ab9916f1d..fba08ce0ea 100644 --- a/src/d/actor/d_a_obj_goGate.cpp +++ b/src/d/actor/d_a_obj_goGate.cpp @@ -176,7 +176,7 @@ static actor_method_class l_daGoGate_Method = { (process_method_func)daGoGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GoGate = { +actor_process_profile_definition g_profile_Obj_GoGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 6d5cbfbe62..cfe0a19aca 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -393,7 +393,7 @@ static actor_method_class l_daObjGOMIKABE_Method = { (process_method_func)daObjGOMIKABE_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GOMIKABE = { +actor_process_profile_definition g_profile_Obj_GOMIKABE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 969073afda..08b879ad16 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -587,7 +587,7 @@ static actor_method_class l_daGpTaru_Method = { (process_method_func)daGpTaru_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GpTaru = { +actor_process_profile_definition g_profile_Obj_GpTaru = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index b849f33d21..06ae7700c7 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -2136,7 +2136,7 @@ static actor_method_class daObj_GrA_MethodTable = { (process_method_func)daObj_GrA_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_GRA = { +actor_process_profile_definition g_profile_OBJ_GRA = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp index c82892ef52..ee5911eea5 100644 --- a/src/d/actor/d_a_obj_graWall.cpp +++ b/src/d/actor/d_a_obj_graWall.cpp @@ -101,7 +101,7 @@ static actor_method_class l_daObjGraWall_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_GRA_WALL = { +actor_process_profile_definition g_profile_GRA_WALL = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index b27c929840..230e26e297 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -304,7 +304,7 @@ static actor_method_class l_daObjGraRock_Method = { (process_method_func)daObjGraRock_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GraRock = { +actor_process_profile_definition g_profile_Obj_GraRock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp index 078d1db4f0..b5a3c9e105 100644 --- a/src/d/actor/d_a_obj_grave_stone.cpp +++ b/src/d/actor/d_a_obj_grave_stone.cpp @@ -221,7 +221,7 @@ static actor_method_class l_daGraveStone_Method = { (process_method_func)daGraveStone_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GraveStone = { +actor_process_profile_definition g_profile_Obj_GraveStone = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp index 75da32b6a8..918d179444 100644 --- a/src/d/actor/d_a_obj_groundwater.cpp +++ b/src/d/actor/d_a_obj_groundwater.cpp @@ -343,7 +343,7 @@ static actor_method_class l_daGrdWater_Method = { (process_method_func)daGrdWater_Draw, }; -extern actor_process_profile_definition g_profile_GRDWATER = { +actor_process_profile_definition g_profile_GRDWATER = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_grz_rock.cpp b/src/d/actor/d_a_obj_grz_rock.cpp index 3fa62de98b..3d75b738c9 100644 --- a/src/d/actor/d_a_obj_grz_rock.cpp +++ b/src/d/actor/d_a_obj_grz_rock.cpp @@ -161,7 +161,7 @@ static actor_method_class l_daObjGrzRock_Method = { (process_method_func)daObjGrzRock_Draw, }; -extern actor_process_profile_definition g_profile_Obj_GrzRock = { +actor_process_profile_definition g_profile_Obj_GrzRock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp index 84f07b814b..04877443cd 100644 --- a/src/d/actor/d_a_obj_h_saku.cpp +++ b/src/d/actor/d_a_obj_h_saku.cpp @@ -302,7 +302,7 @@ static actor_method_class l_daObjH_Saku_Method = { (process_method_func)daObjH_Saku_Draw, }; -extern actor_process_profile_definition g_profile_Obj_H_Saku = { +actor_process_profile_definition g_profile_Obj_H_Saku = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index 851c2be7ed..3d8d31f782 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -195,7 +195,7 @@ static actor_method_class daObjHBarrel_METHODS = { (process_method_func)daObjHBarrel_draw, }; -extern actor_process_profile_definition g_profile_Obj_HBarrel = { +actor_process_profile_definition g_profile_Obj_HBarrel = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index 0ab4db6415..63c0a93b99 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -205,7 +205,7 @@ static actor_method_class daObjHFtr_METHODS = { (process_method_func)daObjHFtr_draw, }; -extern actor_process_profile_definition g_profile_Obj_HFtr = { +actor_process_profile_definition g_profile_Obj_HFtr = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hasu2.cpp b/src/d/actor/d_a_obj_hasu2.cpp index fc4707c2c6..67f98dcfcc 100644 --- a/src/d/actor/d_a_obj_hasu2.cpp +++ b/src/d/actor/d_a_obj_hasu2.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_hasu2.h" static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - (void)param_0; + UNUSED(param_0); if (fopAcM_GetName(param_2) == PROC_ALINK) { nObjMHasu::daObjMHasu_c* hasu = (nObjMHasu::daObjMHasu_c*)(param_1); hasu->setRideFlag(true); @@ -184,7 +184,7 @@ actor_method_class daObjMHasu_METHODS = { (process_method_func)&daObjMHasu_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_MHasu = { +actor_process_profile_definition g_profile_Obj_MHasu = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hata.cpp b/src/d/actor/d_a_obj_hata.cpp index bd55c8b7c8..2135eb42b1 100644 --- a/src/d/actor/d_a_obj_hata.cpp +++ b/src/d/actor/d_a_obj_hata.cpp @@ -180,7 +180,7 @@ static actor_method_class daObjHata_METHODS = { (process_method_func)daObjHata_draw, }; -extern actor_process_profile_definition g_profile_Obj_Hata = { +actor_process_profile_definition g_profile_Obj_Hata = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hb.cpp b/src/d/actor/d_a_obj_hb.cpp index 1e74d83437..331bb831af 100644 --- a/src/d/actor/d_a_obj_hb.cpp +++ b/src/d/actor/d_a_obj_hb.cpp @@ -716,7 +716,7 @@ static actor_method_class l_daOBJ_HB_Method = { (process_method_func)daOBJ_HB_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_HB = { +actor_process_profile_definition g_profile_OBJ_HB = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp index 7f54e51963..ceb8a96a30 100644 --- a/src/d/actor/d_a_obj_hbombkoya.cpp +++ b/src/d/actor/d_a_obj_hbombkoya.cpp @@ -270,7 +270,7 @@ static actor_method_class daObjHBombkoya_METHODS = { (process_method_func)daObjHBombkoya_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_HBombkoya = { +actor_process_profile_definition g_profile_Obj_HBombkoya = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_heavySw.cpp b/src/d/actor/d_a_obj_heavySw.cpp index 1fd6a8cbc3..a6c4dfd7d1 100644 --- a/src/d/actor/d_a_obj_heavySw.cpp +++ b/src/d/actor/d_a_obj_heavySw.cpp @@ -289,7 +289,7 @@ static actor_method_class l_daHeavySw_Method = { (process_method_func)daHeavySw_Draw, }; -extern actor_process_profile_definition g_profile_Obj_HeavySw = { +actor_process_profile_definition g_profile_Obj_HeavySw = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hfuta.cpp b/src/d/actor/d_a_obj_hfuta.cpp index 056cdc2909..b3b2edf4e7 100644 --- a/src/d/actor/d_a_obj_hfuta.cpp +++ b/src/d/actor/d_a_obj_hfuta.cpp @@ -196,7 +196,7 @@ static actor_method_class daObjFuta_METHODS = { (process_method_func)daObjFuta_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Hfuta = { +actor_process_profile_definition g_profile_Obj_Hfuta = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 923a498c17..05ff5a8298 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -379,7 +379,7 @@ static actor_method_class l_daObjHHASHI_Method = { (process_method_func)daObjHHASHI_Draw, }; -extern actor_process_profile_definition g_profile_Obj_HHASHI = { +actor_process_profile_definition g_profile_Obj_HHASHI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp index ad894c4975..4ee973f8f3 100644 --- a/src/d/actor/d_a_obj_hsTarget.cpp +++ b/src/d/actor/d_a_obj_hsTarget.cpp @@ -94,7 +94,7 @@ static actor_method_class l_daHsTarget_Method = { (process_method_func)daHsTarget_Draw, }; -extern actor_process_profile_definition g_profile_Obj_HsTarget = { +actor_process_profile_definition g_profile_Obj_HsTarget = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index e3839c5c1b..46ddd0ed60 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -67,7 +67,7 @@ void daObjIce_l_c::setBaseMtx() { } static void rideCallBack(dBgW* param_0, fopAc_ac_c* param_1, fopAc_ac_c* param_2) { - (void)param_0; + UNUSED(param_0); daObjIce_l_c* ice_p = (daObjIce_l_c*)param_1; daPy_py_c* player_p = daPy_getPlayerActorClass(); cXyz* ball_pos = player_p->getIronBallCenterPos(); @@ -255,7 +255,7 @@ static actor_method_class l_daObjIce_l_Method = { (process_method_func)daObjIce_l_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Ice_l = { +actor_process_profile_definition g_profile_Obj_Ice_l = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index 326bb0b7c8..f58db9592b 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -118,7 +118,7 @@ void daObjIce_s_c::setBaseMtx() { } static void rideCallBack(dBgW* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3) { - (void)param_1; + UNUSED(param_1); daObjIce_s_c* ice = (daObjIce_s_c*)param_2; daPy_py_c* player = daPy_getPlayerActorClass(); cXyz* playerPos = &fopAcM_GetPosition(player); @@ -301,7 +301,7 @@ static actor_method_class l_daObjIce_s_Method = { (process_method_func)daObjIce_s_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Ice_s = { +actor_process_profile_definition g_profile_Obj_Ice_s = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 93c7062220..836f68d71d 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -739,7 +739,7 @@ void daObjIceBlk_c::actionWait() { if (mMode == MODE_PROC_WALK_e && mWalkType == WALK_PUSH) { setAction(ACTION_ORDER_EVENT_e); fopAcM_orderPotentialEvent(this, 2, 0, 0); - eventInfo.onCondition(fopAcCnd_NOEXEC_e); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } } @@ -752,7 +752,7 @@ void daObjIceBlk_c::actionOrderEvent() { camera->mCamera.SetTrimSize(1); } else if (mMode == MODE_PROC_WALK_e) { fopAcM_orderPotentialEvent(this, 2, 0, 0); - eventInfo.onCondition(fopAcCnd_NOEXEC_e); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } else { setAction(ACTION_WAIT_e); } @@ -833,7 +833,7 @@ static actor_method_class daObjIceBlk_METHODS = { (process_method_func)daObjIceBlk_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_IceBlock = { +actor_process_profile_definition g_profile_Obj_IceBlock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index 1bfaf8bb4d..e5fd929932 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -409,7 +409,7 @@ static actor_method_class l_daObjIceLeaf_Method = { (process_method_func)daObjIceLeaf_Draw, }; -extern actor_process_profile_definition g_profile_Obj_IceLeaf = { +actor_process_profile_definition g_profile_Obj_IceLeaf = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index a3f6eb0b3f..64a79899d2 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -221,7 +221,7 @@ static actor_method_class l_daObj_Ihasi_Method = { (process_method_func)daObj_Ihasi_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_IHASI = { +actor_process_profile_definition g_profile_OBJ_IHASI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index e749c6e56d..a6bc5f2cf1 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -204,7 +204,7 @@ static actor_method_class l_daObjIkada_Method = { (process_method_func)daObjIkada_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Ikada = { +actor_process_profile_definition g_profile_Obj_Ikada = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index bf0965748e..ab7e95e1c4 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -281,7 +281,7 @@ static actor_method_class l_daObjIBone_Method = { (process_method_func)daObjIBone_Draw, }; -extern actor_process_profile_definition g_profile_Obj_InoBone = { +actor_process_profile_definition g_profile_Obj_InoBone = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp index f5b49cac7e..d163fe19a3 100644 --- a/src/d/actor/d_a_obj_ita.cpp +++ b/src/d/actor/d_a_obj_ita.cpp @@ -53,10 +53,8 @@ f32 daObjIta_c::dummy2() { static daObj_ITA_HIO_c l_HIO; namespace { - /* 80C293F4-80C293F8 00002C 0004+00 2/2 0/0 0/0 .bss e_ymb__25@unnamed@d_a_obj_ita_cpp@ */ static daE_YMB_c* e_ymb; - /* 80C293F8-80C293FC 000030 0004+00 2/2 0/0 0/0 .bss e_ymb_Pos__25@unnamed@d_a_obj_ita_cpp@ */ static cXyz* e_ymb_Pos; } // namespace @@ -286,7 +284,7 @@ static actor_method_class l_daObjIta_Method = { (process_method_func)daObjIta_Draw, }; -extern actor_process_profile_definition g_profile_Obj_ITA = { +actor_process_profile_definition g_profile_Obj_ITA = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index 234c330232..65f1de8765 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -502,7 +502,7 @@ static actor_method_class daObj_ItaMato_MethodTable = { (process_method_func)daObj_ItaMato_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_ITAMATO = { +actor_process_profile_definition g_profile_OBJ_ITAMATO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index ffa1a3b5f6..9170050135 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -1237,7 +1237,7 @@ static actor_method_class l_daItem_Method = { (process_method_func)daItem_Draw, }; -extern actor_process_profile_definition g_profile_ITEM = { +actor_process_profile_definition g_profile_ITEM = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp index 1e78250bb4..c17ac611dc 100644 --- a/src/d/actor/d_a_obj_ito.cpp +++ b/src/d/actor/d_a_obj_ito.cpp @@ -690,7 +690,7 @@ static actor_method_class l_daObj_Ito_Method = { (process_method_func)daObj_Ito_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_ITO = { +actor_process_profile_definition g_profile_OBJ_ITO = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index e3dbeee34b..ddfaedaa41 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -862,7 +862,7 @@ static actor_method_class l_daObjKABUTO_Method = { (process_method_func)daObjKABUTO_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kabuto = { +actor_process_profile_definition g_profile_Obj_Kabuto = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index 6ea9116146..e265521494 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -767,7 +767,7 @@ static actor_method_class l_daObjKAG_Method = { (process_method_func)daObjKAG_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kag = { +actor_process_profile_definition g_profile_Obj_Kag = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kage.cpp b/src/d/actor/d_a_obj_kage.cpp index df3688c22a..b7b794a2be 100644 --- a/src/d/actor/d_a_obj_kage.cpp +++ b/src/d/actor/d_a_obj_kage.cpp @@ -129,7 +129,7 @@ static actor_method_class l_daObj_Kage_Method = { (process_method_func)daObj_Kage_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KAGE = { +actor_process_profile_definition g_profile_OBJ_KAGE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index 1f1af993c1..9f573a1bdd 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -28,7 +28,6 @@ daObj_Kago_Param_c::Data const daObj_Kago_Param_c::m = { 10.0f, }; -// /* 80C33CAC-80C33CDC 00002C 0030+00 0/0 0/0 0/0 .rodata l_ccDObjData */ const dCcD_SrcGObjInf l_ccDObjData = { {0, // mFlags { @@ -656,7 +655,7 @@ static actor_method_class daObj_Kago_MethodTable = { (process_method_func)daObj_Kago_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KAGO = { +actor_process_profile_definition g_profile_OBJ_KAGO = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index 6d825948ec..3b809ccc52 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -300,7 +300,7 @@ static actor_method_class l_daObjKaisou_Method = { (process_method_func)daObjKaisou_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kaisou = { +actor_process_profile_definition g_profile_Obj_Kaisou = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index 052283761a..91139f6587 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -903,7 +903,7 @@ static actor_method_class l_daObjKAM_Method = { (process_method_func)daObjKAM_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kam = { +actor_process_profile_definition g_profile_Obj_Kam = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 1a72f1b34b..7621643c09 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -691,7 +691,6 @@ void daObj_Kanban2_c::setSmokeEffect(cXyz i_pos) { fopAcM_effSmokeSet1(&field_0x9e0, &field_0x9e4, &i_pos, NULL, 0.02 * field_0x600, &tevStr, 1); } -/* 80585CB5 0003+00 hio_set None */ static u8 hio_set; static daObj_Kanban2_HIO_c l_HIO; @@ -1791,7 +1790,7 @@ static actor_method_class l_daObj_Kanban2_Method = { (process_method_func)daObj_Kanban2_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KANBAN2 = { +actor_process_profile_definition g_profile_OBJ_KANBAN2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index c06f02b123..c558db9b7b 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -260,7 +260,7 @@ static actor_method_class l_daItemKantera_Method = { (process_method_func)daItemKantera_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kantera = { +actor_process_profile_definition g_profile_Obj_Kantera = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index e0a649a674..ea1ff0633b 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -30,7 +30,6 @@ static u8 const l_kat_itemno[2] = { }; void daObjKAT_c::InitCcSph() { - /* 80C3C67C-80C3C6BC 000008 0040+00 1/1 0/0 0/0 .rodata ccSphSrc$3779 */ const static dCcD_SrcSph ccSphSrc = { { {0x0, {{0x0, 0x0, 0x0}, {0x14002, 0x11}, 0x0}}, // mObj @@ -856,7 +855,7 @@ static actor_method_class l_daObjKAT_Method = { (process_method_func)daObjKAT_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kat = { +actor_process_profile_definition g_profile_Obj_Kat = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index b6b178cc39..f964e7eac8 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -225,7 +225,7 @@ static actor_method_class l_daObjKazeNeko_Method = { (process_method_func)daObjKazeNeko_Draw, }; -extern actor_process_profile_definition g_profile_Obj_KazeNeko = { +actor_process_profile_definition g_profile_Obj_KazeNeko = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 31ec1836ea..586cf56ccd 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -635,7 +635,6 @@ void daObj_KBacket_c::setSmokePrtcl() { } void daObj_KBacket_c::setWaterPrtcl() { - /* 80587EF0-80587EF8 000078 0008+00 1/1 0/0 0/0 .data emttrId$4670 */ static u16 emttrId[4] = { 0x01B8, 0x01B9, @@ -686,7 +685,7 @@ static actor_method_class daObj_KBacket_MethodTable = { (process_method_func)daObj_KBacket_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KBACKET = { +actor_process_profile_definition g_profile_OBJ_KBACKET = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 205b0e2bc4..1e5f101003 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -528,7 +528,7 @@ static actor_method_class l_daObj_Kbox_Method = { (process_method_func)daObj_Kbox_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KBOX = { +actor_process_profile_definition g_profile_OBJ_KBOX = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index a1e8f5b110..873b1f71e9 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -648,7 +648,7 @@ static actor_method_class l_daObj_Key_Method = { (process_method_func)daObj_Key_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KEY = { +actor_process_profile_definition g_profile_OBJ_KEY = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index 7ca8611077..73733ebfed 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -253,7 +253,6 @@ static void chain_control3(obj_keyhole_class* i_this, kh_chain_s* i_chain_s, int } } -/* 80C43CE5 0003+00 data_80C43CE5 None */ static u8 hio_set; static daObj_Keyhole_HIO_c l_HIO; @@ -842,7 +841,7 @@ static actor_method_class l_daObj_Keyhole_Method = { (process_method_func)daObj_Keyhole_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KEYHOLE = { +actor_process_profile_definition g_profile_OBJ_KEYHOLE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 1af514b6ee..909a14616b 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -985,7 +985,7 @@ static actor_method_class daObjKGate_METHODS = { (process_method_func)daObjKGate_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KkrGate = { +actor_process_profile_definition g_profile_Obj_KkrGate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index 5922cb1ad0..f8a8192a42 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -224,7 +224,7 @@ static actor_method_class l_daObj_Ki_Method = { (process_method_func)daObj_Ki_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KI = { +actor_process_profile_definition g_profile_OBJ_KI = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp index cbbf33e408..e7964f2b52 100644 --- a/src/d/actor/d_a_obj_kiPot.cpp +++ b/src/d/actor/d_a_obj_kiPot.cpp @@ -114,7 +114,7 @@ static actor_method_class l_daKiPot_Method = { (process_method_func)daKiPot_Draw, }; -extern actor_process_profile_definition g_profile_Obj_KiPot = { +actor_process_profile_definition g_profile_Obj_KiPot = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 2aa8b20005..04473a2838 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -264,7 +264,7 @@ static actor_method_class l_daObj_Kita_Method = { (process_method_func)daObj_Kita_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_KITA = { +actor_process_profile_definition g_profile_OBJ_KITA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kjgjs.cpp b/src/d/actor/d_a_obj_kjgjs.cpp index 7c2b458306..40e8514875 100644 --- a/src/d/actor/d_a_obj_kjgjs.cpp +++ b/src/d/actor/d_a_obj_kjgjs.cpp @@ -96,7 +96,6 @@ static int daObjKJgjs_MoveBGDelete(daObjKJgjs_c* i_this) { return static_cast(i_this)->MoveBGDelete(); } -/* 80C46480-80C464A0 000460 0020+00 1/0 0/0 0/0 .text daObjKJgjs_MoveBGExecute__FP12daObjKJgjs_c*/ static int daObjKJgjs_MoveBGExecute(daObjKJgjs_c* i_this) { return static_cast(i_this)->MoveBGExecute(); } @@ -113,7 +112,7 @@ static actor_method_class daObjKJgjs_METHODS = { (process_method_func)daObjKJgjs_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KJgjs = { +actor_process_profile_definition g_profile_Obj_KJgjs = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp index 722d922282..fbd4e58223 100644 --- a/src/d/actor/d_a_obj_kkanban.cpp +++ b/src/d/actor/d_a_obj_kkanban.cpp @@ -154,7 +154,7 @@ static actor_method_class daObjKKanban_METHODS = { (process_method_func)daObjKKanban_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KKanban = { +actor_process_profile_definition g_profile_Obj_KKanban = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index 8476751b42..1723ab03c5 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -493,7 +493,7 @@ static actor_method_class daObjKLift00_METHODS = { (process_method_func)daObjKLift00_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KLift00 = { +actor_process_profile_definition g_profile_Obj_KLift00 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_knBullet.cpp b/src/d/actor/d_a_obj_knBullet.cpp index 9f63965cb7..88ebf33240 100644 --- a/src/d/actor/d_a_obj_knBullet.cpp +++ b/src/d/actor/d_a_obj_knBullet.cpp @@ -202,7 +202,7 @@ static actor_method_class l_daObjKnBullet_Method = { (process_method_func)daObjKnBullet_Draw, }; -extern actor_process_profile_definition g_profile_KN_BULLET = { +actor_process_profile_definition g_profile_KN_BULLET = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index 1bd2b6711f..96c3711ca3 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -972,7 +972,7 @@ static actor_method_class daObjKshtr_METHODS = { (process_method_func)daObjKshtr_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Kshutter = { +actor_process_profile_definition g_profile_Obj_Kshutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp index 082dc1341b..e9608f761e 100644 --- a/src/d/actor/d_a_obj_ktOnFire.cpp +++ b/src/d/actor/d_a_obj_ktOnFire.cpp @@ -200,7 +200,7 @@ static actor_method_class l_daKtOnFire_Method = { (process_method_func)daKtOnFire_Draw, }; -extern actor_process_profile_definition g_profile_Tag_KtOnFire = { +actor_process_profile_definition g_profile_Tag_KtOnFire = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 761cee8f8d..9898f83085 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -900,7 +900,7 @@ static actor_method_class l_daObjKUW_Method = { (process_method_func)daObjKUW_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Kuw = { +actor_process_profile_definition g_profile_Obj_Kuw = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp index 7512f46ad1..f067d99670 100644 --- a/src/d/actor/d_a_obj_kwheel00.cpp +++ b/src/d/actor/d_a_obj_kwheel00.cpp @@ -355,7 +355,7 @@ static actor_method_class daObjKWheel00_METHODS = { (process_method_func)daObjKWheel00_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KWheel00 = { +actor_process_profile_definition g_profile_Obj_KWheel00 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index a786bb5312..67ea5579c0 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -183,11 +183,11 @@ int daObjKWheel01_c::Create() { } static void* searchKWheel00(void* param_0, void* i_this) { - i_this; // Needed to bring closer to matching debug REL + UNUSED(i_this); if(param_0 && fopAcM_IsActor(param_0) && fopAcM_GetProfName(param_0) == PROC_Obj_KWheel00) { daObjKWheel00_c* const kWheel00 = static_cast(param_0); if(kWheel00->getType() == daObjKWheel00_c::TYPE_LARGE_GOLD) { - return kWheel00; + return param_0; } } @@ -335,7 +335,7 @@ static actor_method_class daObjKWheel01_METHODS = { (process_method_func)daObjKWheel01_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KWheel01 = { +actor_process_profile_definition g_profile_Obj_KWheel01 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp index 7ea35c1e2e..059cb6601a 100644 --- a/src/d/actor/d_a_obj_kznkarm.cpp +++ b/src/d/actor/d_a_obj_kznkarm.cpp @@ -451,7 +451,7 @@ static actor_method_class l_daObjKznkarm_Method = { (process_method_func)daObjKznkarm_Draw, }; -extern actor_process_profile_definition g_profile_Obj_KznkArm = { +actor_process_profile_definition g_profile_Obj_KznkArm = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index 884e4ac59b..9f49f2b73c 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -294,7 +294,7 @@ static actor_method_class Mthd_Table = { } } -extern actor_process_profile_definition g_profile_Obj_Ladder = { +actor_process_profile_definition g_profile_Obj_Ladder = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index 24ea9eab26..49d47d1f8e 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -281,7 +281,7 @@ static actor_method_class l_daObjLdy_Method = { (process_method_func)daObjLdy_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Laundry = { +actor_process_profile_definition g_profile_Obj_Laundry = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp index f147a088c1..f23271db21 100644 --- a/src/d/actor/d_a_obj_laundry_rope.cpp +++ b/src/d/actor/d_a_obj_laundry_rope.cpp @@ -288,7 +288,7 @@ static actor_method_class l_daObjLndRope_Method = { (process_method_func)daObjLndRope_Draw, }; -extern actor_process_profile_definition g_profile_Obj_LndRope = { +actor_process_profile_definition g_profile_Obj_LndRope = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index 8f23621e2c..cbd2c361a5 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -52,7 +52,7 @@ static void action(obj_lbox_class* i_this) { i_this->speed.y -= 0.1f; } i_this->current.pos.y += i_this->speed.y; - if (i_this->mObjAcch.m_flags & 0x20) { + if (i_this->mObjAcch.ChkGroundHit()) { dComIfGp_getVibration().StartShock(5, 15, cXyz(0.0f, 1.0f, 0.0f)); fopAcM_seStart(i_this, Z2SE_EN_FM_FOOTNOTE, 0); i_this->field_0x57a = 2; @@ -195,7 +195,7 @@ static actor_method_class l_daObj_Lbox_Method = { (process_method_func)daObj_Lbox_Execute, (process_method_func)daObj_Lbox_IsDelete, (process_method_func)daObj_Lbox_Draw}; -extern actor_process_profile_definition g_profile_OBJ_LBOX = { +actor_process_profile_definition g_profile_OBJ_LBOX = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 45cf09f03b..4924d14d85 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -507,7 +507,7 @@ static actor_method_class l_daObjLife_Method = { (process_method_func)daObjLife_Draw, }; -extern actor_process_profile_definition g_profile_Obj_LifeContainer = { +actor_process_profile_definition g_profile_Obj_LifeContainer = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index aff7b4de82..5148a8a6e2 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -493,7 +493,7 @@ static actor_method_class l_daObj_Lp_Method = { (process_method_func)daObj_Lp_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_LP = { +actor_process_profile_definition g_profile_OBJ_LP = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp index 33eeb9c3c4..7b328b5059 100644 --- a/src/d/actor/d_a_obj_lv1Candle00.cpp +++ b/src/d/actor/d_a_obj_lv1Candle00.cpp @@ -273,7 +273,7 @@ static actor_method_class l_daLv1Cdl00_Method = { (process_method_func)daLv1Cdl00_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = { +actor_process_profile_definition g_profile_Obj_Lv1Cdl00 = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index c0c6a1f859..e5558ed550 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -227,7 +227,7 @@ static actor_method_class l_daLv1Cdl01_Method = { (process_method_func)daLv1Cdl01_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = { +actor_process_profile_definition g_profile_Obj_Lv1Cdl01 = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp index 2f38049f01..28d7f1cb58 100644 --- a/src/d/actor/d_a_obj_lv2Candle.cpp +++ b/src/d/actor/d_a_obj_lv2Candle.cpp @@ -392,7 +392,7 @@ static actor_method_class l_daLv2Candle_Method = { (process_method_func)daLv2Candle_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv2Candle = { +actor_process_profile_definition g_profile_Obj_Lv2Candle = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv3Candle.cpp b/src/d/actor/d_a_obj_lv3Candle.cpp index d38da29adc..6f48136279 100644 --- a/src/d/actor/d_a_obj_lv3Candle.cpp +++ b/src/d/actor/d_a_obj_lv3Candle.cpp @@ -218,7 +218,7 @@ static actor_method_class l_daLv3Candle_Method = { (process_method_func)daLv3Candle_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv3Candle = { +actor_process_profile_definition g_profile_Obj_Lv3Candle = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv3Water.cpp b/src/d/actor/d_a_obj_lv3Water.cpp index a3c733e0a3..02b5941151 100644 --- a/src/d/actor/d_a_obj_lv3Water.cpp +++ b/src/d/actor/d_a_obj_lv3Water.cpp @@ -404,7 +404,7 @@ static actor_method_class l_daLv3Water_Method = { (process_method_func)daLv3Water_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv3Water = { +actor_process_profile_definition g_profile_Obj_Lv3Water = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp index 35a2ca0ef3..d572411b09 100644 --- a/src/d/actor/d_a_obj_lv3Water2.cpp +++ b/src/d/actor/d_a_obj_lv3Water2.cpp @@ -52,7 +52,7 @@ static actor_method_class l_daLv3Water2_Method = { (process_method_func)daLv3Water2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv3Water2 = { +actor_process_profile_definition g_profile_Obj_Lv3Water2 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp index 4126100671..43a3e3d76f 100644 --- a/src/d/actor/d_a_obj_lv3WaterB.cpp +++ b/src/d/actor/d_a_obj_lv3WaterB.cpp @@ -204,7 +204,7 @@ static actor_method_class l_daObj_Lv3waterB_Method = { (process_method_func)daObj_Lv3waterB_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_LV3WATERB = { +actor_process_profile_definition g_profile_OBJ_LV3WATERB = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp index e927138514..b6e1a5ce70 100644 --- a/src/d/actor/d_a_obj_lv3saka00.cpp +++ b/src/d/actor/d_a_obj_lv3saka00.cpp @@ -138,7 +138,7 @@ static actor_method_class daObjLv3saka_METHODS = { (process_method_func)daObjLv3saka_MoveBGExecute, (process_method_func)NULL, (process_method_func)daObjLv3saka_MoveBGDraw}; -extern actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { +actor_process_profile_definition g_profile_Obj_Lv3R10Saka = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv3waterEff.cpp b/src/d/actor/d_a_obj_lv3waterEff.cpp index c500d876a6..fd8b50a979 100644 --- a/src/d/actor/d_a_obj_lv3waterEff.cpp +++ b/src/d/actor/d_a_obj_lv3waterEff.cpp @@ -91,7 +91,7 @@ static actor_method_class l_daObjWaterEff_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Obj_WaterEff = { +actor_process_profile_definition g_profile_Obj_WaterEff = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp index d10ba0d3be..ea74e61b26 100644 --- a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp @@ -194,7 +194,7 @@ static actor_method_class l_dalv4CandleDemoTag_Method = { (process_method_func)dalv4CandleDemoTag_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv4CandleDm = { +actor_process_profile_definition g_profile_Tag_Lv4CandleDm = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4CandleTag.cpp b/src/d/actor/d_a_obj_lv4CandleTag.cpp index c3fa9e5483..8f924aa186 100644 --- a/src/d/actor/d_a_obj_lv4CandleTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleTag.cpp @@ -148,7 +148,7 @@ static actor_method_class l_dalv4CandleTag_Method = { (process_method_func)dalv4CandleTag_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv4Candle = { +actor_process_profile_definition g_profile_Tag_Lv4Candle = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp index 389e2960c9..edc31c8641 100644 --- a/src/d/actor/d_a_obj_lv4EdShutter.cpp +++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp @@ -222,7 +222,7 @@ static actor_method_class l_daLv4EdShutter_Method = { (process_method_func)daLv4EdShutter_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4EdShutter = { +actor_process_profile_definition g_profile_Obj_Lv4EdShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4Gate.cpp b/src/d/actor/d_a_obj_lv4Gate.cpp index c5424c2882..82e5300225 100644 --- a/src/d/actor/d_a_obj_lv4Gate.cpp +++ b/src/d/actor/d_a_obj_lv4Gate.cpp @@ -179,7 +179,7 @@ static actor_method_class l_daLv4Gate_Method = { (process_method_func)daLv4Gate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Gate = { +actor_process_profile_definition g_profile_Obj_Lv4Gate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4HsTarget.cpp b/src/d/actor/d_a_obj_lv4HsTarget.cpp index 1534cd5175..320b6e4d49 100644 --- a/src/d/actor/d_a_obj_lv4HsTarget.cpp +++ b/src/d/actor/d_a_obj_lv4HsTarget.cpp @@ -90,7 +90,7 @@ static actor_method_class l_daLv4HsTarget_Method = { (process_method_func)daLv4HsTarget_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { +actor_process_profile_definition g_profile_Obj_Lv4HsTarget = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4PoGate.cpp b/src/d/actor/d_a_obj_lv4PoGate.cpp index ba99c61da9..4c9a72d40e 100644 --- a/src/d/actor/d_a_obj_lv4PoGate.cpp +++ b/src/d/actor/d_a_obj_lv4PoGate.cpp @@ -259,7 +259,7 @@ static actor_method_class l_daLv4PoGate_Method = { (process_method_func)daLv4PoGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4PoGate = { +actor_process_profile_definition g_profile_Obj_Lv4PoGate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4RailWall.cpp b/src/d/actor/d_a_obj_lv4RailWall.cpp index 339d6da31d..7df09f85b3 100644 --- a/src/d/actor/d_a_obj_lv4RailWall.cpp +++ b/src/d/actor/d_a_obj_lv4RailWall.cpp @@ -249,7 +249,7 @@ static actor_method_class daObjLv4Wall_METHODS = { (process_method_func)daObjLv4Wall_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4RailWall = { +actor_process_profile_definition g_profile_Obj_Lv4RailWall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4SlideWall.cpp b/src/d/actor/d_a_obj_lv4SlideWall.cpp index 9e89c7b56d..26efe7a77e 100644 --- a/src/d/actor/d_a_obj_lv4SlideWall.cpp +++ b/src/d/actor/d_a_obj_lv4SlideWall.cpp @@ -175,7 +175,7 @@ static actor_method_class l_daSldWall_Method = { (process_method_func)daSldWall_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { +actor_process_profile_definition g_profile_Obj_Lv4SlideWall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp index 8331c5f41a..3a1e293dd1 100644 --- a/src/d/actor/d_a_obj_lv4bridge.cpp +++ b/src/d/actor/d_a_obj_lv4bridge.cpp @@ -170,7 +170,7 @@ static actor_method_class daObjLv4Brg_METHODS = { (process_method_func)daObjLv4Brg_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Bridge = { +actor_process_profile_definition g_profile_Obj_Lv4Bridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index e039ff3417..07b2b90775 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -873,7 +873,7 @@ static actor_method_class daObjLv4Chan_METHODS = { (process_method_func)daObjLv4Chan_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Chan = { +actor_process_profile_definition g_profile_Obj_Lv4Chan = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 1680da93f4..8b90c751a2 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -179,7 +179,7 @@ static actor_method_class daObjL4DigSand_METHODS = { (process_method_func)daObjL4DigSand_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4DigSand = { +actor_process_profile_definition g_profile_Obj_Lv4DigSand = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4floor.cpp b/src/d/actor/d_a_obj_lv4floor.cpp index a951b8cb09..b4122862b8 100644 --- a/src/d/actor/d_a_obj_lv4floor.cpp +++ b/src/d/actor/d_a_obj_lv4floor.cpp @@ -140,7 +140,7 @@ static actor_method_class daObjLv4Floor_METHODS = { (process_method_func)daObjLv4Floor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Floor = { +actor_process_profile_definition g_profile_Obj_Lv4Floor = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_lv4gear.cpp b/src/d/actor/d_a_obj_lv4gear.cpp index 686c651e2e..75f19496a4 100644 --- a/src/d/actor/d_a_obj_lv4gear.cpp +++ b/src/d/actor/d_a_obj_lv4gear.cpp @@ -160,7 +160,7 @@ static actor_method_class l_daObjLv4Gear_Method = { (process_method_func)daObjLv4Gear_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Gear = { +actor_process_profile_definition g_profile_Obj_Lv4Gear = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4prelvtr.cpp b/src/d/actor/d_a_obj_lv4prelvtr.cpp index 49b60eeba5..5cbc543dd6 100644 --- a/src/d/actor/d_a_obj_lv4prelvtr.cpp +++ b/src/d/actor/d_a_obj_lv4prelvtr.cpp @@ -115,7 +115,7 @@ static actor_method_class daObjPRElvtr_METHODS = { (process_method_func)daObjPRElvtr_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_PRElvtr = { +actor_process_profile_definition g_profile_Obj_PRElvtr = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp index 44a554808e..d904dc5771 100644 --- a/src/d/actor/d_a_obj_lv4prwall.cpp +++ b/src/d/actor/d_a_obj_lv4prwall.cpp @@ -302,7 +302,7 @@ static actor_method_class daObjLv4PRwall_METHODS = { (process_method_func)daObjLv4PRwall_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4PRwall = { +actor_process_profile_definition g_profile_Obj_Lv4PRwall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp index f49ac3edc9..6552b64759 100644 --- a/src/d/actor/d_a_obj_lv4sand.cpp +++ b/src/d/actor/d_a_obj_lv4sand.cpp @@ -170,7 +170,7 @@ static actor_method_class daObjLv4Sand_METHODS = { (process_method_func)daObjLv4Sand_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv4Sand = { +actor_process_profile_definition g_profile_Obj_Lv4Sand = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index 7cffaf0a2b..f94f8ba986 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -187,7 +187,7 @@ static actor_method_class l_daFlorBoad_Method = { (process_method_func)daFlorBoad_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv5FBoard = { +actor_process_profile_definition g_profile_Obj_Lv5FBoard = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index 7dfe4e3134..36c21f56d6 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -293,7 +293,7 @@ static actor_method_class l_daIceWall_Method = { (process_method_func)daIceWall_Draw, }; -extern actor_process_profile_definition g_profile_Obj_IceWall = { +actor_process_profile_definition g_profile_Obj_IceWall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index e2065e2bb9..da91936bfa 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -197,7 +197,7 @@ static actor_method_class l_daLv5SwIce_Method = { (process_method_func)daLv5SwIce_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv5SwIce = { +actor_process_profile_definition g_profile_Obj_Lv5SwIce = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index f9def42d2a..eeeecdc351 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -356,7 +356,7 @@ static actor_method_class daObjYchndlr_METHODS = { (process_method_func)daObjYchndlr_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Ychndlr = { +actor_process_profile_definition g_profile_Obj_Ychndlr = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index d5393d6379..f0400aa04d 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -578,7 +578,7 @@ static actor_method_class daObjYIblltray_METHODS = { (process_method_func)daObjYIblltray_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_YIblltray = { +actor_process_profile_definition g_profile_Obj_YIblltray = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index bc43006fe6..d0ffff13f1 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -308,7 +308,7 @@ static actor_method_class l_daLv6ChangeGate_Method = { (process_method_func)daLv6ChangeGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { +actor_process_profile_definition g_profile_Obj_Lv6ChgGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp index 79bf3a8438..c469229944 100644 --- a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp +++ b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp @@ -193,7 +193,7 @@ static actor_method_class l_daLv6FurikoTrap_Method = { (process_method_func)daLv6FurikoTrap_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6FuriTrap = { +actor_process_profile_definition g_profile_Obj_Lv6FuriTrap = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp index 813a9fb366..7d18d28af3 100644 --- a/src/d/actor/d_a_obj_lv6Lblock.cpp +++ b/src/d/actor/d_a_obj_lv6Lblock.cpp @@ -179,7 +179,7 @@ static actor_method_class l_daLv6Lblock_Method = { (process_method_func)daLv6Lblock_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6Lblock = { +actor_process_profile_definition g_profile_Obj_Lv6Lblock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index c8002190f3..c7ddba314e 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -313,7 +313,7 @@ static actor_method_class l_daLv6SwGate_Method = { (process_method_func)daLv6SwGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6SwGate = { +actor_process_profile_definition g_profile_Obj_Lv6SwGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp index b683f3618d..c8e0d05efc 100644 --- a/src/d/actor/d_a_obj_lv6SzGate.cpp +++ b/src/d/actor/d_a_obj_lv6SzGate.cpp @@ -256,7 +256,7 @@ static actor_method_class l_daLv6SzGate_Method = { (process_method_func)daLv6SzGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6SzGate = { +actor_process_profile_definition g_profile_Obj_Lv6SzGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 151f070fab..659f116c4d 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -155,7 +155,7 @@ int daTenbin_c::create() { } void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* i_act2) { - (void)i_dBgW; + UNUSED(i_dBgW); daTenbin_c* i_tenbin = (daTenbin_c*)i_act1; daPy_py_c* player = dComIfGp_getLinkPlayer(); if (fopAcM_GetName(i_act2) == PROC_SPINNER) { @@ -187,7 +187,7 @@ void daTenbin_c::rideCallBackRight(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* } void daTenbin_c::rideCallBackLeft(dBgW* i_dBgW, fopAc_ac_c* i_act1, fopAc_ac_c* i_act2) { - (void)i_dBgW; + UNUSED(i_dBgW); daTenbin_c* i_tenbin = (daTenbin_c*)i_act1; daPy_py_c* player = dComIfGp_getLinkPlayer(); if (fopAcM_GetName(i_act2) == PROC_SPINNER) { @@ -355,7 +355,7 @@ static actor_method_class l_daTenbin_Method = { (process_method_func)daTenbin_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6Tenbin = { +actor_process_profile_definition g_profile_Obj_Lv6Tenbin = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6TogeRoll.cpp b/src/d/actor/d_a_obj_lv6TogeRoll.cpp index 3a18fbeafa..9fe1438399 100644 --- a/src/d/actor/d_a_obj_lv6TogeRoll.cpp +++ b/src/d/actor/d_a_obj_lv6TogeRoll.cpp @@ -438,7 +438,7 @@ static actor_method_class l_daTogeRoll_Method = { (process_method_func)daTogeRoll_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6TogeRoll = { +actor_process_profile_definition g_profile_Obj_Lv6TogeRoll = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index a80598ca88..71d741a290 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -770,7 +770,7 @@ static actor_method_class l_daLv6TogeTrap_Method = { (process_method_func)daLv6TogeTrap_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6TogeTrap = { +actor_process_profile_definition g_profile_Obj_Lv6TogeTrap = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index f048c74f21..40f7fddbb2 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -415,7 +415,7 @@ static actor_method_class daObjL6Bm_METHODS = { (process_method_func)daObjL6Bm_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6bemos = { +actor_process_profile_definition g_profile_Obj_Lv6bemos = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index 7711f18f5b..acb172e98a 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -1172,7 +1172,7 @@ static actor_method_class daObjLv6Bm_METHODS = { (process_method_func)daObjLv6Bm_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6bemos2 = { +actor_process_profile_definition g_profile_Obj_Lv6bemos2 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index 92a80c9d3d..9b0e2029d5 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -210,7 +210,7 @@ static actor_method_class daObjLv6EGate_METHODS = { (process_method_func)daObjLv6EGate_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6EGate = { +actor_process_profile_definition g_profile_Obj_Lv6EGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6elevta.cpp b/src/d/actor/d_a_obj_lv6elevta.cpp index 1810a8e865..2c9cbf0f15 100644 --- a/src/d/actor/d_a_obj_lv6elevta.cpp +++ b/src/d/actor/d_a_obj_lv6elevta.cpp @@ -272,7 +272,7 @@ static actor_method_class daObjLv6ElevtA_METHODS = { (process_method_func)daObjLv6ElevtA_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6ElevtA = { +actor_process_profile_definition g_profile_Obj_Lv6ElevtA = { fpcLy_CURRENT_e, // mLayerID 2, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index 92484685f7..f2694b715e 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -30,7 +30,7 @@ void daObjLv6SwTurn_HIO_c::genMessage(JORMContext* context) { static fopAc_ac_c* PPCallBack(fopAc_ac_c* actor1, fopAc_ac_c* actor2, s16 param_2, dBgW_Base::PushPullLabel pushPull) { - (void)param_2; // needed to match debug + UNUSED(param_2); dBgW_Base::PushPullLabel pushPull_3 = cLib_checkBit(pushPull, dBgW_Base::PPLABEL_3); daObjLv6SwTurn_c* swTurnActor1 = (daObjLv6SwTurn_c*)actor1; daObjLv6SwTurn_c* swTurnActor2 = (daObjLv6SwTurn_c*)actor2; @@ -351,7 +351,7 @@ static actor_method_class daObjLv6SwTurn_METHODS = { (process_method_func)daObjLv6SwTurn_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv6SwTurn = { +actor_process_profile_definition g_profile_Obj_Lv6SwTurn = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv7BsGate.cpp b/src/d/actor/d_a_obj_lv7BsGate.cpp index d7bb8c2815..a3335f2bd1 100644 --- a/src/d/actor/d_a_obj_lv7BsGate.cpp +++ b/src/d/actor/d_a_obj_lv7BsGate.cpp @@ -207,7 +207,7 @@ static actor_method_class l_daLv7BsGate_Method = { (process_method_func)daLv7BsGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv7BsGate = { +actor_process_profile_definition g_profile_Obj_Lv7BsGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv7PropellerY.cpp b/src/d/actor/d_a_obj_lv7PropellerY.cpp index 9593ac84a1..1725cd5bec 100644 --- a/src/d/actor/d_a_obj_lv7PropellerY.cpp +++ b/src/d/actor/d_a_obj_lv7PropellerY.cpp @@ -297,7 +297,7 @@ static actor_method_class l_daPropY_Method = { (process_method_func)daPropY_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv7PropY = { +actor_process_profile_definition g_profile_Obj_Lv7PropY = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 73fc13ca86..08e6f62d1d 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -472,7 +472,7 @@ static actor_method_class daObjLv7Brg_METHODS = { (process_method_func)daObjLv7Brg_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Lv7Bridge = { +actor_process_profile_definition g_profile_Obj_Lv7Bridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp index a980d06f7d..f74ca42dc2 100644 --- a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp +++ b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp @@ -211,7 +211,7 @@ static actor_method_class l_daKekaiTrap_Method = { (process_method_func)daKekaiTrap_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = { +actor_process_profile_definition g_profile_Obj_Lv8KekkaiTrap = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv8Lift.cpp b/src/d/actor/d_a_obj_lv8Lift.cpp index ae41f36554..4542c6f41e 100644 --- a/src/d/actor/d_a_obj_lv8Lift.cpp +++ b/src/d/actor/d_a_obj_lv8Lift.cpp @@ -444,7 +444,7 @@ static actor_method_class l_daL8Lift_Method = { (process_method_func)daL8Lift_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv8Lift = { +actor_process_profile_definition g_profile_Obj_Lv8Lift = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv8OptiLift.cpp b/src/d/actor/d_a_obj_lv8OptiLift.cpp index dc35898871..b8a040c615 100644 --- a/src/d/actor/d_a_obj_lv8OptiLift.cpp +++ b/src/d/actor/d_a_obj_lv8OptiLift.cpp @@ -476,7 +476,7 @@ static actor_method_class l_daOptiLift_Method = { (process_method_func)daOptiLift_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv8OptiLift = { +actor_process_profile_definition g_profile_Obj_Lv8OptiLift = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv8UdFloor.cpp b/src/d/actor/d_a_obj_lv8UdFloor.cpp index 8426b5aa8f..3015e52846 100644 --- a/src/d/actor/d_a_obj_lv8UdFloor.cpp +++ b/src/d/actor/d_a_obj_lv8UdFloor.cpp @@ -287,7 +287,7 @@ static actor_method_class l_daUdFloor_Method = { (process_method_func)daUdFloor_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv8UdFloor = { +actor_process_profile_definition g_profile_Obj_Lv8UdFloor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_lv9SwShutter.cpp b/src/d/actor/d_a_obj_lv9SwShutter.cpp index 1e5d6f6365..9f49edaa40 100644 --- a/src/d/actor/d_a_obj_lv9SwShutter.cpp +++ b/src/d/actor/d_a_obj_lv9SwShutter.cpp @@ -193,7 +193,7 @@ static actor_method_class l_daLv9SwShutter_Method = { (process_method_func)daLv9SwShutter_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Lv9SwShutter = { +actor_process_profile_definition g_profile_Obj_Lv9SwShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_magLift.cpp b/src/d/actor/d_a_obj_magLift.cpp index 062a6d10ce..9f82a8f8c4 100644 --- a/src/d/actor/d_a_obj_magLift.cpp +++ b/src/d/actor/d_a_obj_magLift.cpp @@ -242,7 +242,7 @@ static actor_method_class l_daMagLift_Method = { (process_method_func) daMagLift_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MagLift = { +actor_process_profile_definition g_profile_Obj_MagLift = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp index a4f09b2d49..ca5970915a 100644 --- a/src/d/actor/d_a_obj_magLiftRot.cpp +++ b/src/d/actor/d_a_obj_magLiftRot.cpp @@ -363,7 +363,7 @@ static actor_method_class l_daMagLiftRot_Method = { (process_method_func)daMagLiftRot_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MagLiftRot = { +actor_process_profile_definition g_profile_Obj_MagLiftRot = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp index ffba4604bd..2557777987 100644 --- a/src/d/actor/d_a_obj_magne_arm.cpp +++ b/src/d/actor/d_a_obj_magne_arm.cpp @@ -1098,7 +1098,7 @@ static actor_method_class daObjMarm_METHODS = { (process_method_func)daObjMarm_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_MagneArm = { +actor_process_profile_definition g_profile_Obj_MagneArm = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index dba1c62a8b..c20b7f3004 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -242,7 +242,7 @@ actor_method_class l_daObj_Maki_Method = { (process_method_func)daObj_Maki_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_MAKI = { +actor_process_profile_definition g_profile_OBJ_MAKI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 629ef7b826..1704dc2605 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -242,7 +242,7 @@ static actor_method_class l_daObjMasterSword_Method = { (process_method_func)daObjMasterSword_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MasterSword = { +actor_process_profile_definition g_profile_Obj_MasterSword = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp index 0cdbd235fa..8a5a431e6e 100644 --- a/src/d/actor/d_a_obj_mato.cpp +++ b/src/d/actor/d_a_obj_mato.cpp @@ -371,7 +371,7 @@ static actor_method_class l_daObjMATO_Method = { (process_method_func)daObjMATO_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Mato = { +actor_process_profile_definition g_profile_Obj_Mato = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_metalbox.cpp b/src/d/actor/d_a_obj_metalbox.cpp index 86241d83d1..c769c8af8e 100644 --- a/src/d/actor/d_a_obj_metalbox.cpp +++ b/src/d/actor/d_a_obj_metalbox.cpp @@ -106,7 +106,7 @@ static actor_method_class l_daObjMBox_Method = { (process_method_func)daObjMBox_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MetalBox = { +actor_process_profile_definition g_profile_Obj_MetalBox = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_mgate.cpp b/src/d/actor/d_a_obj_mgate.cpp index 923faa6e3c..e8a56dff01 100644 --- a/src/d/actor/d_a_obj_mgate.cpp +++ b/src/d/actor/d_a_obj_mgate.cpp @@ -241,7 +241,7 @@ static actor_method_class daObjMGate_METHODS = { (process_method_func)daObjMGate_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_MGate = { +actor_process_profile_definition g_profile_Obj_MGate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index 69baaea558..73b707e5b0 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -382,7 +382,7 @@ static actor_method_class l_daObjMHole_Method = { (process_method_func)daObjMHole_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MHole = { +actor_process_profile_definition g_profile_Obj_MHole = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index 2ed126eb06..c2e85e7290 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -521,7 +521,7 @@ static actor_method_class daObj_Mie_MethodTable = { (process_method_func)daObj_Mie_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_MIE = { +actor_process_profile_definition g_profile_OBJ_MIE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp index c29220e154..9d596501ad 100644 --- a/src/d/actor/d_a_obj_mirror_6pole.cpp +++ b/src/d/actor/d_a_obj_mirror_6pole.cpp @@ -172,7 +172,7 @@ static actor_method_class l_daObjMirror6Pole_Method = { (process_method_func)daObjMirror6Pole_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Mirror6Pole = { +actor_process_profile_definition g_profile_Obj_Mirror6Pole = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp index 5612a9ddc3..65cd8c533a 100644 --- a/src/d/actor/d_a_obj_mirror_chain.cpp +++ b/src/d/actor/d_a_obj_mirror_chain.cpp @@ -504,7 +504,7 @@ static actor_method_class l_daObjMirrorChain_Method = { (process_method_func)daObjMirrorChain_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MirrorChain = { +actor_process_profile_definition g_profile_Obj_MirrorChain = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_sand.cpp b/src/d/actor/d_a_obj_mirror_sand.cpp index 3fcb48c5ed..112d2f69c0 100644 --- a/src/d/actor/d_a_obj_mirror_sand.cpp +++ b/src/d/actor/d_a_obj_mirror_sand.cpp @@ -169,7 +169,7 @@ static actor_method_class l_daObjMirrorSand_Method = { (process_method_func)daObjMirrorSand_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MirrorSand = { +actor_process_profile_definition g_profile_Obj_MirrorSand = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp index b289b74685..a261c08cce 100644 --- a/src/d/actor/d_a_obj_mirror_screw.cpp +++ b/src/d/actor/d_a_obj_mirror_screw.cpp @@ -260,7 +260,7 @@ static actor_method_class l_daObjMirrorScrew_Method = { (process_method_func)daObjMirrorScrew_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MirrorScrew = { +actor_process_profile_definition g_profile_Obj_MirrorScrew = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index ea651144ae..c366e2dae3 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -461,7 +461,7 @@ static actor_method_class l_daObjMirrorTable_Method = { (process_method_func)daObjMirrorTable_Draw, }; -extern actor_process_profile_definition g_profile_Obj_MirrorTable = { +actor_process_profile_definition g_profile_Obj_MirrorTable = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 64e91865ef..dccfd84bf3 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -643,7 +643,7 @@ int daObjMovebox::Act_c::CreateHeap() { } void daObjMovebox::Act_c::RideCallBack(dBgW* i_bgw, fopAc_ac_c* i_actor, fopAc_ac_c* i_rideActor) { - (void)i_bgw; + UNUSED(i_bgw); Act_c* a_this = (Act_c*)i_actor; if (a_this->field_0x5ac == 2) { @@ -697,7 +697,7 @@ enum MOVE_DIR { fopAc_ac_c* daObjMovebox::Act_c::PPCallBack(fopAc_ac_c* i_bgActor, fopAc_ac_c* i_pushActor, s16 i_angle, dBgW_Base::PushPullLabel pp_label) { - (void)i_pushActor; + UNUSED(i_pushActor); dBgW::PushPullLabel var_r26 = cLib_checkBit( pp_label, (dBgW::PushPullLabel)(dBgW::PPLABEL_PUSH | dBgW::PPLABEL_PULL)); @@ -1410,7 +1410,7 @@ static actor_method_class Mthd_Table = { }; // namespace }; // namespace daObjMovebox -extern actor_process_profile_definition g_profile_Obj_Movebox = { +actor_process_profile_definition g_profile_Obj_Movebox = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index d98ee17945..fadf316c4a 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -86,8 +86,6 @@ static void msima_start(obj_msima_class* i_this) { i_this->field_0x59a = 0x708; } -/* 80C9CEA4 0001+00 data_80C9CEA4 @1009 */ -/* 80C9CEA5 0003+00 data_80C9CEA5 None */ static bool hio_set; static daObj_Msima_HIO_c l_HIO; @@ -514,7 +512,7 @@ static actor_method_class l_daObj_Msima_Method = { (process_method_func)daObj_Msima_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_MSIMA = { +actor_process_profile_definition g_profile_OBJ_MSIMA = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_mvstair.cpp b/src/d/actor/d_a_obj_mvstair.cpp index 08cde715cb..e2525d22a7 100644 --- a/src/d/actor/d_a_obj_mvstair.cpp +++ b/src/d/actor/d_a_obj_mvstair.cpp @@ -462,7 +462,7 @@ static actor_method_class daObjStair_METHODS = { (process_method_func)daObjStair_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_MvStair = { +actor_process_profile_definition g_profile_Obj_MvStair = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp index 346bb1e648..2c7e7ee191 100644 --- a/src/d/actor/d_a_obj_myogan.cpp +++ b/src/d/actor/d_a_obj_myogan.cpp @@ -167,7 +167,7 @@ static actor_method_class l_daObj_Myogan_Method = { (process_method_func)daObj_Myogan_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_MYOGAN = { +actor_process_profile_definition g_profile_OBJ_MYOGAN = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index 6cee9cf7b0..4eb368f552 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -318,7 +318,7 @@ static actor_method_class daObjNagaisu_METHODS = { (process_method_func)daObjNagaisu_draw, }; -extern actor_process_profile_definition g_profile_Obj_Nagaisu = { +actor_process_profile_definition g_profile_Obj_Nagaisu = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index 13980a228b..9c8a043a87 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -67,7 +67,6 @@ void daObjNameplate_c::setBaseMtx() { } void daObjNameplate_c::initCcSphere() { - /* 80594EB4-80594EF4 000040 0040+00 1/1 0/0 0/0 .rodata ccSphSrc$3700 */ const static dCcD_SrcSph ccSphSrc = { { {0x0, {{0x0, 0x0, 0x0}, {0x1607a, 0x11}, 0x99}}, // mObj @@ -263,9 +262,6 @@ static int daObjNameplate_Draw(daObjNameplate_c* i_this) { return i_this->draw(); } -/* 80594A6C-80594AB4 000A4C 0048+00 1/0 0/0 0/0 .text - * daObjNameplate_Execute__FP16daObjNameplate_c - */ static int daObjNameplate_Execute(daObjNameplate_c* i_this) { i_this->calcAngle(); i_this->setBaseMtx(); @@ -279,9 +275,6 @@ static int daObjNameplate_IsDelete(daObjNameplate_c* i_this) { return 1; } -/* 80594ABC-80594BF8 000A9C 013C+00 1/0 0/0 0/0 .text - * daObjNameplate_Delete__FP16daObjNameplate_c - */ static int daObjNameplate_Delete(daObjNameplate_c* i_this) { i_this->~daObjNameplate_c(); return 1; @@ -314,7 +307,7 @@ static actor_method_class l_daObjNameplate_Method = { (process_method_func)daObjNameplate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_NamePlate = { +actor_process_profile_definition g_profile_Obj_NamePlate = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index 597cce820e..03284cf3d9 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -727,7 +727,7 @@ static actor_method_class l_daObjNAN_Method = { (process_method_func)daObjNAN_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Nan = { +actor_process_profile_definition g_profile_Obj_Nan = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ndoor.cpp b/src/d/actor/d_a_obj_ndoor.cpp index 770e7311f9..f6bed90cc3 100644 --- a/src/d/actor/d_a_obj_ndoor.cpp +++ b/src/d/actor/d_a_obj_ndoor.cpp @@ -131,7 +131,7 @@ static actor_method_class l_daObj_Ndoor_Method = { (process_method_func)daObj_Ndoor_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_NDOOR = { +actor_process_profile_definition g_profile_OBJ_NDOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_nougu.cpp b/src/d/actor/d_a_obj_nougu.cpp index 2c65db643f..37e50a7a5b 100644 --- a/src/d/actor/d_a_obj_nougu.cpp +++ b/src/d/actor/d_a_obj_nougu.cpp @@ -209,7 +209,7 @@ static actor_method_class daObj_Nougu_MethodTable = { (process_method_func)daObj_Nougu_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_NOUGU = { +actor_process_profile_definition g_profile_OBJ_NOUGU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index dc2565daad..c0f2f3eb8f 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -381,7 +381,7 @@ static actor_method_class l_daObjOCTHASHI_Method = { (process_method_func)daObjOCTHASHI_Draw, }; -extern actor_process_profile_definition g_profile_OCTHASHI = { +actor_process_profile_definition g_profile_OCTHASHI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index fb89e3ac97..1d8873d462 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -288,7 +288,7 @@ static actor_method_class daObj_Oiltubo_MethodTable = { (process_method_func)daObj_Oiltubo_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_OILTUBO = { +actor_process_profile_definition g_profile_OBJ_OILTUBO = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_onsen.cpp b/src/d/actor/d_a_obj_onsen.cpp index 605b7e2b88..ac339bb52f 100644 --- a/src/d/actor/d_a_obj_onsen.cpp +++ b/src/d/actor/d_a_obj_onsen.cpp @@ -127,7 +127,7 @@ static actor_method_class daObjOnsen_METHODS = { (process_method_func)daObjOnsen_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Onsen = { +actor_process_profile_definition g_profile_Obj_Onsen = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_onsenFire.cpp b/src/d/actor/d_a_obj_onsenFire.cpp index a5c521a599..f9540a3681 100644 --- a/src/d/actor/d_a_obj_onsenFire.cpp +++ b/src/d/actor/d_a_obj_onsenFire.cpp @@ -44,7 +44,7 @@ static actor_method_class l_daObjOnsenFire_Method = { (process_method_func)daObjOnsenFire_Execute }; -extern actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = { +actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index 47092de050..32da9d72fa 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -383,7 +383,7 @@ static actor_method_class l_daOnsTaru_Method = { (process_method_func)daOnsTaru_Draw, }; -extern actor_process_profile_definition g_profile_Obj_OnsenTaru = { +actor_process_profile_definition g_profile_Obj_OnsenTaru = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index 085b1e6fcf..9ec1f9e86a 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -333,7 +333,7 @@ static actor_method_class l_daObjOnCloth_Method = { (process_method_func)daObjOnCloth_Draw, }; -extern actor_process_profile_definition g_profile_Obj_OnCloth = { +actor_process_profile_definition g_profile_Obj_OnCloth = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index e3a21183b5..fe71c9fca2 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -278,7 +278,7 @@ static actor_method_class daObjPDoor_METHODS = { (process_method_func)daObjPDoor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_PushDoor = { +actor_process_profile_definition g_profile_Obj_PushDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index 4bef0fb00e..911d9ac999 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -520,7 +520,7 @@ static actor_method_class daObjPDtile_METHODS = { (process_method_func)daObjPDtile_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_PDtile = { +actor_process_profile_definition g_profile_Obj_PDtile = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index e33ee4e5b0..6132e10d7c 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -198,7 +198,7 @@ static actor_method_class daObjPDwall_METHODS = { (process_method_func)daObjPDwall_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_PDwall = { +actor_process_profile_definition g_profile_Obj_PDwall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 0e56c045d3..1fae189c54 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -554,7 +554,7 @@ static actor_method_class daObjPicture_METHODS = { (process_method_func)daObjPicture_draw, }; -extern actor_process_profile_definition g_profile_Obj_Picture = { +actor_process_profile_definition g_profile_Obj_Picture = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index 2b94b225b6..d991879540 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -484,7 +484,7 @@ static actor_method_class daPillar_METHODS = { (process_method_func)daPillar_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Pillar = { +actor_process_profile_definition g_profile_Obj_Pillar = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_pleaf.cpp b/src/d/actor/d_a_obj_pleaf.cpp index c76c4ccfad..fac9e4b42e 100644 --- a/src/d/actor/d_a_obj_pleaf.cpp +++ b/src/d/actor/d_a_obj_pleaf.cpp @@ -150,7 +150,7 @@ static actor_method_class daObj_Pleaf_MethodTable = { (process_method_func)daObj_Pleaf_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_PLEAF = { +actor_process_profile_definition g_profile_OBJ_PLEAF = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_poCandle.cpp b/src/d/actor/d_a_obj_poCandle.cpp index 2604a19296..0b477c49b0 100644 --- a/src/d/actor/d_a_obj_poCandle.cpp +++ b/src/d/actor/d_a_obj_poCandle.cpp @@ -249,7 +249,7 @@ static actor_method_class l_daPoCandle_Method = { (process_method_func)daPoCandle_Draw, }; -extern actor_process_profile_definition g_profile_Obj_poCandle = { +actor_process_profile_definition g_profile_Obj_poCandle = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index 25a1094276..1fd555dd57 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -438,7 +438,7 @@ static actor_method_class l_daPoFire_Method = { (process_method_func)daPoFire_Draw, }; -extern actor_process_profile_definition g_profile_Obj_poFire = { +actor_process_profile_definition g_profile_Obj_poFire = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp index c1b0a5c56b..74a4f89de3 100644 --- a/src/d/actor/d_a_obj_poTbox.cpp +++ b/src/d/actor/d_a_obj_poTbox.cpp @@ -303,7 +303,7 @@ static actor_method_class l_daPoTbox_Method = { (process_method_func)daPoTbox_Draw, }; -extern actor_process_profile_definition g_profile_Obj_poTbox = { +actor_process_profile_definition g_profile_Obj_poTbox = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp index 709d8837dc..166752ad62 100644 --- a/src/d/actor/d_a_obj_prop.cpp +++ b/src/d/actor/d_a_obj_prop.cpp @@ -101,7 +101,7 @@ static actor_method_class daObjProp_METHODS = { (process_method_func)daObjProp_draw, }; -extern actor_process_profile_definition g_profile_Obj_Prop = { +actor_process_profile_definition g_profile_Obj_Prop = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index f13a30ef89..61346b493f 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -886,7 +886,7 @@ static actor_method_class daObj_Pumpkin_MethodTable = { (process_method_func)daObj_Pumpkin_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_PUMPKIN = { +actor_process_profile_definition g_profile_OBJ_PUMPKIN = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rcircle.cpp b/src/d/actor/d_a_obj_rcircle.cpp index 4836748dd1..9da3f620f7 100644 --- a/src/d/actor/d_a_obj_rcircle.cpp +++ b/src/d/actor/d_a_obj_rcircle.cpp @@ -122,7 +122,7 @@ static actor_method_class daObjRCircle_METHODS = { (process_method_func)daObjRCircle_draw, }; -extern actor_process_profile_definition g_profile_Obj_RCircle = { +actor_process_profile_definition g_profile_Obj_RCircle = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp index 5667750d46..02d1883cd1 100644 --- a/src/d/actor/d_a_obj_rfHole.cpp +++ b/src/d/actor/d_a_obj_rfHole.cpp @@ -201,7 +201,7 @@ static actor_method_class l_daRfHole_Method = { (process_method_func)daRfHole_Draw, }; -extern actor_process_profile_definition g_profile_Obj_RfHole = { +actor_process_profile_definition g_profile_Obj_RfHole = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 2194493de3..26ca7f138b 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -876,7 +876,7 @@ static actor_method_class daObjRgate_METHODS = { (process_method_func)daObjRgate_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_RiderGate = { +actor_process_profile_definition g_profile_Obj_RiderGate = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index 81ad137d34..69bea987c6 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -318,7 +318,7 @@ static actor_method_class l_daObjRIVERROCK_Method = { (process_method_func)daObjRIVERROCK_Draw, }; -extern actor_process_profile_definition g_profile_Obj_RIVERROCK = { +actor_process_profile_definition g_profile_Obj_RIVERROCK = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp index 2301852a13..65fe8a4493 100644 --- a/src/d/actor/d_a_obj_rock.cpp +++ b/src/d/actor/d_a_obj_rock.cpp @@ -200,7 +200,7 @@ static actor_method_class l_daObj_Rock_Method = { (process_method_func)daObj_Rock_Execute, (process_method_func)daObj_Rock_IsDelete, (process_method_func)daObj_Rock_Draw}; -extern actor_process_profile_definition g_profile_OBJ_ROCK = { +actor_process_profile_definition g_profile_OBJ_ROCK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index 4d28591b5a..c50e0ed155 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -636,7 +636,7 @@ static actor_method_class daObjRBridge_METHODS = { (process_method_func)daObjRBridge_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_RopeBridge = { +actor_process_profile_definition g_profile_Obj_RopeBridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index ec3bdb1113..cdc6e7fb42 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -260,7 +260,7 @@ static actor_method_class l_daRotBridge_Method = { (process_method_func)daRotBridge_Draw, }; -extern actor_process_profile_definition g_profile_Obj_RotBridge = { +actor_process_profile_definition g_profile_Obj_RotBridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index 3bdc7bb769..bcd0f60079 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -317,7 +317,7 @@ static actor_method_class l_daRotTrap_Method = { (process_method_func)daRotTrap_Draw, }; -extern actor_process_profile_definition g_profile_Obj_RotTrap = { +actor_process_profile_definition g_profile_Obj_RotTrap = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index fa3048b733..1e5d6ebc69 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -177,7 +177,7 @@ static actor_method_class daObj_Roten_MethodTable = { (process_method_func)daObj_Roten_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_ROTEN = { +actor_process_profile_definition g_profile_OBJ_ROTEN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp index 803f9f365b..32112c3135 100644 --- a/src/d/actor/d_a_obj_rstair.cpp +++ b/src/d/actor/d_a_obj_rstair.cpp @@ -362,7 +362,7 @@ static actor_method_class daObjRotStair_METHODS = { (process_method_func)daObjRotStair_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_RotStair = { +actor_process_profile_definition g_profile_Obj_RotStair = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index e0f7332d6d..eff67a34b7 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -392,7 +392,7 @@ static actor_method_class l_daOBJ_RW_Method = { (process_method_func)daOBJ_RW_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_RW = { +actor_process_profile_definition g_profile_OBJ_RW = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sWallShutter.cpp b/src/d/actor/d_a_obj_sWallShutter.cpp index 1572b883f6..6f54f9ee57 100644 --- a/src/d/actor/d_a_obj_sWallShutter.cpp +++ b/src/d/actor/d_a_obj_sWallShutter.cpp @@ -237,7 +237,7 @@ static actor_method_class l_daSwShutter_Method = { (process_method_func)daSwShutter_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SwallShutter = { +actor_process_profile_definition g_profile_Obj_SwallShutter = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_saidan.cpp b/src/d/actor/d_a_obj_saidan.cpp index 0ded1a1fc8..fcbbbb9e6f 100644 --- a/src/d/actor/d_a_obj_saidan.cpp +++ b/src/d/actor/d_a_obj_saidan.cpp @@ -154,7 +154,7 @@ static actor_method_class l_daSaidan_Method = { (process_method_func)daSaidan_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Saidan = { +actor_process_profile_definition g_profile_Obj_Saidan = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index 05a8cfbf91..655f87a9ab 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -220,7 +220,7 @@ static actor_method_class l_daObjSakuita_Method = { (process_method_func)daObjSakuita_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Sakuita = { +actor_process_profile_definition g_profile_Obj_Sakuita = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index 60b096d963..12ce066a39 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -386,7 +386,7 @@ static actor_method_class l_daObjItaRope_Method = { (process_method_func)daObjItaRope_Draw, }; -extern actor_process_profile_definition g_profile_Obj_ItaRope = { +actor_process_profile_definition g_profile_Obj_ItaRope = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index c6f6354d7d..362d540850 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -849,7 +849,7 @@ static actor_method_class daSCannon_METHODS = { (process_method_func)daSCannon_draw, }; -extern actor_process_profile_definition g_profile_Obj_SCannon = { +actor_process_profile_definition g_profile_Obj_SCannon = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index 0e913238fe..27b0e80533 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -516,7 +516,7 @@ static actor_method_class daSCannonCrs_METHODS = { (process_method_func)daSCannonCrs_draw, }; -extern actor_process_profile_definition g_profile_Obj_SCannonCrs = { +actor_process_profile_definition g_profile_Obj_SCannonCrs = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index 44880af3b6..560fe14948 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -465,7 +465,7 @@ static actor_method_class daObjSCannonTen_METHODS = { (process_method_func)daObjSCannonTen_draw, }; -extern actor_process_profile_definition g_profile_Obj_SCannonTen = { +actor_process_profile_definition g_profile_Obj_SCannonTen = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sekidoor.cpp b/src/d/actor/d_a_obj_sekidoor.cpp index 78619c266f..44d54ccffd 100644 --- a/src/d/actor/d_a_obj_sekidoor.cpp +++ b/src/d/actor/d_a_obj_sekidoor.cpp @@ -257,7 +257,7 @@ static actor_method_class daObj_SekiDoor_MethodTable = { (process_method_func)daObj_SekiDoor_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { +actor_process_profile_definition g_profile_OBJ_SEKIDOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sekizo.cpp b/src/d/actor/d_a_obj_sekizo.cpp index c2303e6b78..ad9cdeb4d6 100644 --- a/src/d/actor/d_a_obj_sekizo.cpp +++ b/src/d/actor/d_a_obj_sekizo.cpp @@ -132,7 +132,7 @@ static actor_method_class daObj_Sekizo_MethodTable = { (process_method_func)daObj_Sekizo_Execute, (process_method_func)daObj_Sekizo_IsDelete, (process_method_func)daObj_Sekizo_Draw}; -extern actor_process_profile_definition g_profile_OBJ_SEKIZO = { +actor_process_profile_definition g_profile_OBJ_SEKIZO = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index 20c8bfb288..edf15095fd 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -2418,7 +2418,7 @@ static actor_method_class daObj_Sekizoa_MethodTable = { daObj_Sekizoa_IsDelete, daObj_Sekizoa_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SEKIZOA = { +actor_process_profile_definition g_profile_OBJ_SEKIZOA = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index e177c63278..d2105d38b0 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -364,7 +364,7 @@ static actor_method_class l_daItemShield_Method = { (process_method_func)daItemShield_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Shield = { +actor_process_profile_definition g_profile_Obj_Shield = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sm_door.cpp b/src/d/actor/d_a_obj_sm_door.cpp index 18e6ec5186..fffd8a6f4e 100644 --- a/src/d/actor/d_a_obj_sm_door.cpp +++ b/src/d/actor/d_a_obj_sm_door.cpp @@ -292,7 +292,7 @@ static actor_method_class l_daObjSM_DOOR_Method = { (process_method_func)daObjSM_DOOR_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SM_DOOR = { +actor_process_profile_definition g_profile_Obj_SM_DOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index 9e78e78c40..49953d0084 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -554,7 +554,7 @@ static actor_method_class l_daKey_Method = { (process_method_func)daKey_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SmallKey = { +actor_process_profile_definition g_profile_Obj_SmallKey = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index 88cc4b30ac..2bd117f1ea 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -425,7 +425,7 @@ static actor_method_class daObjSmgDoor_METHODS = { (process_method_func)daObjSmgDoor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SmgDoor = { +actor_process_profile_definition g_profile_Obj_SmgDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_smoke.cpp b/src/d/actor/d_a_obj_smoke.cpp index d23c8acbb4..7edb5fe4c8 100644 --- a/src/d/actor/d_a_obj_smoke.cpp +++ b/src/d/actor/d_a_obj_smoke.cpp @@ -72,7 +72,7 @@ static actor_method_class l_daObjSmoke_Method = { (process_method_func)daObjSmoke_Execute, }; -extern actor_process_profile_definition g_profile_Obj_Smoke = { +actor_process_profile_definition g_profile_Obj_Smoke = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp index a3d3963b8d..57586d252e 100644 --- a/src/d/actor/d_a_obj_smtile.cpp +++ b/src/d/actor/d_a_obj_smtile.cpp @@ -323,7 +323,7 @@ static actor_method_class daObj_SMTile_MethodTable = { (process_method_func)daObj_SMTile_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SMTILE = { +actor_process_profile_definition g_profile_OBJ_SMTILE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_smw_stone.cpp b/src/d/actor/d_a_obj_smw_stone.cpp index 169d79749e..e243a6f17a 100644 --- a/src/d/actor/d_a_obj_smw_stone.cpp +++ b/src/d/actor/d_a_obj_smw_stone.cpp @@ -195,7 +195,7 @@ static actor_method_class daSmWStone_METHODS = { (process_method_func)daSmWStone_draw, }; -extern actor_process_profile_definition g_profile_Obj_SmWStone = { +actor_process_profile_definition g_profile_Obj_SmWStone = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_snowEffTag.cpp b/src/d/actor/d_a_obj_snowEffTag.cpp index e06e2b0083..eef00f6a5e 100644 --- a/src/d/actor/d_a_obj_snowEffTag.cpp +++ b/src/d/actor/d_a_obj_snowEffTag.cpp @@ -130,7 +130,7 @@ static actor_method_class l_daSnowEffTag_Method = { (process_method_func)daSnowEffTag_Draw, }; -extern actor_process_profile_definition g_profile_Tag_SnowEff = { +actor_process_profile_definition g_profile_Tag_SnowEff = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp index 9fb1a611c7..f911d9cc90 100644 --- a/src/d/actor/d_a_obj_snow_soup.cpp +++ b/src/d/actor/d_a_obj_snow_soup.cpp @@ -192,7 +192,7 @@ static actor_method_class daObjSnowSoup_METHODS = { (process_method_func)daObjSnowSoup_draw, }; -extern actor_process_profile_definition g_profile_Obj_SnowSoup = { +actor_process_profile_definition g_profile_Obj_SnowSoup = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index ebf7648909..68ae4dc357 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -1085,7 +1085,7 @@ static actor_method_class l_daObj_So_Method = { (process_method_func)daObj_So_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SO = { +actor_process_profile_definition g_profile_OBJ_SO = { fpcLy_CURRENT_e, // mLayerID 2, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index 4e2f3120c9..6f76e114b0 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -278,7 +278,7 @@ static actor_method_class l_daSpinLift_Method = { (process_method_func)daSpinLift_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SpinLift = { +actor_process_profile_definition g_profile_Obj_SpinLift = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index 899d8c92d5..9230868e47 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -493,7 +493,7 @@ static actor_method_class daObj_SSDrink_MethodTable = { (process_method_func)daObj_SSDrink_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SSDRINK = { +actor_process_profile_definition g_profile_OBJ_SSDRINK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ss_item.cpp b/src/d/actor/d_a_obj_ss_item.cpp index ceb32622f6..d395c234bb 100644 --- a/src/d/actor/d_a_obj_ss_item.cpp +++ b/src/d/actor/d_a_obj_ss_item.cpp @@ -371,7 +371,7 @@ static actor_method_class daObj_SSItem_MethodTable = { (process_method_func)daObj_SSItem_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SSITEM = { +actor_process_profile_definition g_profile_OBJ_SSITEM = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_stairBlock.cpp b/src/d/actor/d_a_obj_stairBlock.cpp index 99c5f04d43..377d3438b8 100644 --- a/src/d/actor/d_a_obj_stairBlock.cpp +++ b/src/d/actor/d_a_obj_stairBlock.cpp @@ -174,7 +174,7 @@ static actor_method_class l_daStairBlock_Method = { (process_method_func)daStairBlock_Draw, }; -extern actor_process_profile_definition g_profile_Obj_StairBlock = { +actor_process_profile_definition g_profile_Obj_StairBlock = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_stick.cpp b/src/d/actor/d_a_obj_stick.cpp index b868cc59c1..b4abdbea94 100644 --- a/src/d/actor/d_a_obj_stick.cpp +++ b/src/d/actor/d_a_obj_stick.cpp @@ -60,7 +60,7 @@ int daObj_Stick_c::create() { mSph.SetStts(&mStts); mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; - mGroundHeight = mAcch.m_ground_h; + mGroundHeight = mAcch.GetGroundH(); if(mGroundHeight != -G_CM3D_F_INF) { setEnvTevColor(); @@ -96,7 +96,7 @@ int daObj_Stick_c::Execute() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; - mGroundHeight = mAcch.m_ground_h; + mGroundHeight = mAcch.GetGroundH(); if (mGroundHeight != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); @@ -198,7 +198,7 @@ static actor_method_class daObj_Stick_MethodTable = { (process_method_func)daObj_Stick_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_STICK = { +actor_process_profile_definition g_profile_OBJ_STICK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 36ff9973b6..bea118ce80 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -318,11 +318,11 @@ void daObjStone_c::mode_proc_call() { if (mCollider.ChkAtHit()) { init_modeBreak(); } - bool isGroundLanding = mChkObj.ChkGroundLanding() != 0; - u32 isWallhit = mChkObj.m_flags & dBgS_Acch::WALL_HIT; - bool isGroundHit = mChkObj.ChkGroundHit() != 0; - bool isWaterHit = mChkObj.ChkWaterHit() != 0; - bool isWaterIn = mChkObj.ChkWaterIn() != 0; + bool isGroundLanding = mChkObj.ChkGroundLanding(); + u32 isWallhit = mChkObj.ChkWallHit(); + bool isGroundHit = mChkObj.ChkGroundHit(); + bool isWaterHit = mChkObj.ChkWaterHit(); + bool isWaterIn = mChkObj.ChkWaterIn(); if (field_0x0907 == 1) { if (isGroundLanding && !isWaterIn) { speed.x = speedF * cM_ssin(current.angle.y); @@ -336,7 +336,7 @@ void daObjStone_c::mode_proc_call() { speedF = speed.absXZ(); current.angle.y = cM_atan2s(speed.x, speed.z); } else { - if (isWallhit && field_0x0951 == 0 && isWaterIn) { + if (isWallhit && !field_0x0951 && isWaterIn) { speed.x = speedF * cM_ssin(current.angle.y); speed.z = speedF * cM_scos(current.angle.y); speed.y = mLastSpeedY; @@ -489,7 +489,7 @@ void daObjStone_c::mode_proc_call() { } (this->*(l_func[field_0x0907]))(); CrrPos(); - field_0x0951 = isWallhit != 0; + field_0x0951 = isWallhit; } void daObjStone_c::init_modePutWait() { @@ -1022,7 +1022,7 @@ static actor_method_class l_daObjStone_Method = { (process_method_func)daObjStone_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Stone = { +actor_process_profile_definition g_profile_Obj_Stone = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_stoneMark.cpp b/src/d/actor/d_a_obj_stoneMark.cpp index 2fc0713860..e8f08bc5f9 100644 --- a/src/d/actor/d_a_obj_stoneMark.cpp +++ b/src/d/actor/d_a_obj_stoneMark.cpp @@ -83,7 +83,7 @@ static actor_method_class l_daObjSMark_Method = { (process_method_func)daObjSMark_Draw, }; -extern actor_process_profile_definition g_profile_Obj_StoneMark = { +actor_process_profile_definition g_profile_Obj_StoneMark = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp index a8ef3e2c54..557f02c22a 100644 --- a/src/d/actor/d_a_obj_stopper.cpp +++ b/src/d/actor/d_a_obj_stopper.cpp @@ -514,7 +514,7 @@ static actor_method_class l_daObjStopper_Method = { (process_method_func)daObjStopper_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Stopper = { +actor_process_profile_definition g_profile_Obj_Stopper = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_stopper2.cpp b/src/d/actor/d_a_obj_stopper2.cpp index 97641f7e7e..5375998958 100644 --- a/src/d/actor/d_a_obj_stopper2.cpp +++ b/src/d/actor/d_a_obj_stopper2.cpp @@ -307,7 +307,7 @@ static actor_method_class l_daObjStopper2_Method = { (process_method_func)daObjStopper2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Stopper2 = { +actor_process_profile_definition g_profile_Obj_Stopper2 = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_suisya.cpp b/src/d/actor/d_a_obj_suisya.cpp index 69fa4f8325..ee3a3fa56b 100644 --- a/src/d/actor/d_a_obj_suisya.cpp +++ b/src/d/actor/d_a_obj_suisya.cpp @@ -104,7 +104,7 @@ static actor_method_class l_daObj_Suisya_Method = { (process_method_func)daObj_Suisya_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SUISYA = { +actor_process_profile_definition g_profile_OBJ_SUISYA = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index 8721eb5eef..b5beb5d2e3 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -818,7 +818,7 @@ static actor_method_class l_daObj_Sw_Method = { (process_method_func)daObj_Sw_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_SW = { +actor_process_profile_definition g_profile_OBJ_SW = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp index 44ebafa0a8..ffed7cbaa2 100644 --- a/src/d/actor/d_a_obj_swBallA.cpp +++ b/src/d/actor/d_a_obj_swBallA.cpp @@ -347,7 +347,7 @@ static actor_method_class l_daObjSwBallA_Method = { (process_method_func)daObjSwBallA_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SwBallA = { +actor_process_profile_definition g_profile_Obj_SwBallA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swBallB.cpp b/src/d/actor/d_a_obj_swBallB.cpp index 691d00ec72..94c837e986 100644 --- a/src/d/actor/d_a_obj_swBallB.cpp +++ b/src/d/actor/d_a_obj_swBallB.cpp @@ -410,7 +410,7 @@ static actor_method_class l_daObjSwBallB_Method = { (process_method_func)daObjSwBallB_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SwBallB = { +actor_process_profile_definition g_profile_Obj_SwBallB = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index bee4c46181..7461739c8e 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -410,7 +410,7 @@ static actor_method_class l_daObjSwBallC_Method = { (process_method_func)daObjSwBallC_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SwBallC = { +actor_process_profile_definition g_profile_Obj_SwBallC = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 025314b0bb..3d419b2e16 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -12,8 +12,8 @@ #if DEBUG class daObjSwLight_HIO_c : public mDoHIO_entry_c { public: - /* 811CF8C0 */ daObjSwLight_HIO_c(); - /* 811CF920 */ void genMessage(JORMContext*); + daObjSwLight_HIO_c(); + void genMessage(JORMContext*); /* 0x06 */ u8 field_0x06; /* 0x08 */ f32 mLightMaxRadius; @@ -474,7 +474,7 @@ static actor_method_class daObjSwLight_METHODS = { (process_method_func)daObjSwLight_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SwLight = { +actor_process_profile_definition g_profile_Obj_SwLight = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index 49d6576b35..8dfb91bab4 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -15,8 +15,8 @@ #if DEBUG class daObjSwChain_HIO_c : public mDoHIO_entry_c { public: - /* 811C8DE0 */ daObjSwChain_HIO_c(); - /* 811C8EE0 */ void genMessage(JORMContext*); + daObjSwChain_HIO_c(); + void genMessage(JORMContext*); /* 0x06 */ u8 field_0x06; /* 0x08 */ f32 mGravity; @@ -1196,7 +1196,7 @@ static actor_method_class l_daObjSwChain_Method = { (process_method_func)daObjSwChain_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SwChain = { +actor_process_profile_definition g_profile_Obj_SwChain = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index 4387d35e7a..8b75c9b5db 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -500,7 +500,7 @@ static actor_method_class daObjSwHang_METHODS = { (process_method_func)daObjSwHang_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SwHang = { +actor_process_profile_definition g_profile_Obj_SwHang = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp index 5762fccd9d..ba7aa3c439 100644 --- a/src/d/actor/d_a_obj_sword.cpp +++ b/src/d/actor/d_a_obj_sword.cpp @@ -146,7 +146,7 @@ static actor_method_class l_daObjSword_Method = { (process_method_func)daObjSword_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Sword = { +actor_process_profile_definition g_profile_Obj_Sword = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index 43c5b6ba23..ea190d0ba2 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -328,7 +328,7 @@ static actor_method_class l_daObjSwPr_Method = { (process_method_func)daObjSwPr_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Swpropeller = { +actor_process_profile_definition g_profile_Obj_Swpropeller = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index d7a82cc7e3..901b3f4210 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -675,7 +675,7 @@ void daObjSwpush::Act_c::demo_reqPause_init() { if (mDemoMode == DEMO_MODE_NON) { mDemoMode = DEMO_MODE_REQ_PAUSE; fopAcM_orderPotentialEvent(this, 2, 0, 0); - eventInfo.onCondition(fopAcCnd_NOEXEC_e); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } } @@ -718,7 +718,7 @@ void daObjSwpush::Act_c::demo_reqSw_init() { demo_stop_puase(); mDemoMode = DEMO_MODE_REQ_SW; fopAcM_orderOtherEventId(this, mEventID, prm_get_evId(), 0xFFFF, 0, 1); - eventInfo.onCondition(fopAcCnd_NOEXEC_e); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } } @@ -727,7 +727,7 @@ void daObjSwpush::Act_c::demo_reqSw() { demo_runSw_init(); } else { fopAcM_orderOtherEventId(this, mEventID, prm_get_evId(), 0xFFFF, 0, 1); - eventInfo.onCondition(fopAcCnd_NOEXEC_e); + eventInfo.onCondition(dEvtCnd_CANDEMO_e); } } @@ -852,7 +852,6 @@ namespace { return 1; } - /* 80484F88-80484FA8 -00001 0020+00 1/0 0/0 0/0 .data Mthd_Table__Q211daObjSwpush28@unnamed@d_a_obj_swpush_cpp@ */ static actor_method_class Mthd_Table = { (process_method_func)Mthd_Create, (process_method_func)Mthd_Delete, @@ -865,7 +864,7 @@ namespace { AUDIO_INSTANCES; -extern actor_process_profile_definition g_profile_Obj_Swpush = { +actor_process_profile_definition g_profile_Obj_Swpush = { fpcLy_CURRENT_e, // mLayerID 2, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swpush2.cpp b/src/d/actor/d_a_obj_swpush2.cpp index 23c16ed0ae..58a3286517 100644 --- a/src/d/actor/d_a_obj_swpush2.cpp +++ b/src/d/actor/d_a_obj_swpush2.cpp @@ -351,7 +351,7 @@ void daObjSwpush2::Act_c::init_mtx() { } void daObjSwpush2::Act_c::rideCB(dBgW* i_bgw, fopAc_ac_c* i_this, fopAc_ac_c* i_rideActor) { - (void)i_bgw; + UNUSED(i_bgw); daObjSwpush2::Act_c* a_this = (daObjSwpush2::Act_c*)i_this; if (fopAcM_CheckStatus(i_rideActor, 0x400)) { @@ -714,7 +714,7 @@ actor_method_class Mthd_Table = { } } -extern actor_process_profile_definition g_profile_Obj_Swpush2 = { +actor_process_profile_definition g_profile_Obj_Swpush2 = { fpcLy_CURRENT_e, // mLayerID 2, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp index 38e8b0f4e8..b3b5fad08f 100644 --- a/src/d/actor/d_a_obj_swpush5.cpp +++ b/src/d/actor/d_a_obj_swpush5.cpp @@ -417,7 +417,7 @@ static actor_method_class l_daObjSw5_Method = { (process_method_func)daObjSw5_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Swpush5 = { +actor_process_profile_definition g_profile_Obj_Swpush5 = { fpcLy_CURRENT_e, // mLayerID 2, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swspinner.cpp b/src/d/actor/d_a_obj_swspinner.cpp index ef05a2e449..bb72938ba9 100644 --- a/src/d/actor/d_a_obj_swspinner.cpp +++ b/src/d/actor/d_a_obj_swspinner.cpp @@ -224,7 +224,7 @@ static actor_method_class daObjSwSpinner_METHODS = { (process_method_func)daObjSwSpinner_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SwSpinner = { +actor_process_profile_definition g_profile_Obj_SwSpinner = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 024ed40ce3..3d2f64299d 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -436,7 +436,7 @@ static actor_method_class daObjSwTurn_METHODS = { (process_method_func)daObjSwTurn_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SwTurn = { +actor_process_profile_definition g_profile_Obj_SwTurn = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp index 3214bcf364..cd053b8791 100644 --- a/src/d/actor/d_a_obj_syRock.cpp +++ b/src/d/actor/d_a_obj_syRock.cpp @@ -520,7 +520,7 @@ static actor_method_class l_daSyRock_Method = { (process_method_func)daSyRock_Draw, }; -extern actor_process_profile_definition g_profile_Obj_SyRock = { +actor_process_profile_definition g_profile_Obj_SyRock = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_szbridge.cpp b/src/d/actor/d_a_obj_szbridge.cpp index cf3e70897e..d12efae324 100644 --- a/src/d/actor/d_a_obj_szbridge.cpp +++ b/src/d/actor/d_a_obj_szbridge.cpp @@ -172,7 +172,7 @@ static actor_method_class daObjSZbridge_METHODS = { (process_method_func)daObjSZbridge_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_SZbridge = { +actor_process_profile_definition g_profile_Obj_SZbridge = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index fc03e4f7b4..999c7b3122 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -413,7 +413,7 @@ static actor_method_class l_daTaFence_Method = { (process_method_func)daTaFence_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TaFence = { +actor_process_profile_definition g_profile_Obj_TaFence = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index 3928dfcff3..fdd92a010a 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -144,7 +144,7 @@ int daObjTable_c::Execute(Mtx** i_mtx) { if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (mMsgFlow.doFlow(this, NULL, 0) != 0) { - gameInfo.getPlay().getEvent().reset(this); // Fake match? + gameInfo.play.getEvent().reset(this); // Fake match? eventInfo.setArchiveName("Table"); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = dComIfGp_getEventManager().getEventIdx(this, "TABLE_MAP", -1); @@ -193,7 +193,7 @@ static actor_method_class l_daObjTable_Method = { (process_method_func)daObjTable_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Table = { +actor_process_profile_definition g_profile_Obj_Table = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_takaraDai.cpp b/src/d/actor/d_a_obj_takaraDai.cpp index 2f88fe7993..c57060c4b5 100644 --- a/src/d/actor/d_a_obj_takaraDai.cpp +++ b/src/d/actor/d_a_obj_takaraDai.cpp @@ -202,7 +202,7 @@ static actor_method_class l_daTkraDai_Method = { (process_method_func)daTkraDai_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TakaraDai = { +actor_process_profile_definition g_profile_Obj_TakaraDai = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index ff49667c98..5c19b7f286 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -212,7 +212,7 @@ static actor_method_class l_daObj_Tatigi_Method = { (process_method_func)daObj_Tatigi_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_TATIGI = { +actor_process_profile_definition g_profile_OBJ_TATIGI = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 729f3ac8a9..82a24672c5 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -808,7 +808,7 @@ static actor_method_class l_daObjTEN_Method = { (process_method_func)daObjTEN_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Ten = { +actor_process_profile_definition g_profile_Obj_Ten = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_testcube.cpp b/src/d/actor/d_a_obj_testcube.cpp index 84e5087771..0406c17416 100644 --- a/src/d/actor/d_a_obj_testcube.cpp +++ b/src/d/actor/d_a_obj_testcube.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_testcube.h" -extern actor_process_profile_definition g_profile_Obj_TestCube = { +actor_process_profile_definition g_profile_Obj_TestCube = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tgake.cpp b/src/d/actor/d_a_obj_tgake.cpp index 295b7f1c32..4e2074b56b 100644 --- a/src/d/actor/d_a_obj_tgake.cpp +++ b/src/d/actor/d_a_obj_tgake.cpp @@ -131,7 +131,7 @@ static actor_method_class daObjGake_METHODS = { (process_method_func)daObjGake_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Gake = { +actor_process_profile_definition g_profile_Obj_Gake = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index a63d633047..fe1d9d33d6 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -245,7 +245,7 @@ static actor_method_class l_daObjTHASHI_Method = { (process_method_func)daObjTHASHI_Draw, }; -extern actor_process_profile_definition g_profile_Obj_THASHI = { +actor_process_profile_definition g_profile_Obj_THASHI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 868bdce1fa..5bb8d461e1 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -361,7 +361,7 @@ static actor_method_class daObjThDoor_METHODS = { (process_method_func)daObjThDoor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_TDoor = { +actor_process_profile_definition g_profile_Obj_TDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_timeFire.cpp b/src/d/actor/d_a_obj_timeFire.cpp index 8f3e95a855..e86e092cdd 100644 --- a/src/d/actor/d_a_obj_timeFire.cpp +++ b/src/d/actor/d_a_obj_timeFire.cpp @@ -154,7 +154,7 @@ static actor_method_class l_daTimeFire_Method = { (process_method_func)daTimeFire_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TimeFire = { +actor_process_profile_definition g_profile_Obj_TimeFire = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index da06396c0a..3f5bd30269 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -100,32 +100,26 @@ bool daObjTimer::Act_c::_execute() { namespace daObjTimer { namespace { - /* 804855A4-804855C0 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Create */ int Mthd_Create(void* i_this) { return static_cast(i_this)->_create(); } - /* 804855C4-804855E4 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Delete */ int Mthd_Delete(void* i_this) { return static_cast(i_this)->_delete(); } - /* 804855E8-80485608 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Execute */ int Mthd_Execute(void* i_this) { return static_cast(i_this)->_execute(); } - /* 8048560C-80485610 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_Draw */ int Mthd_Draw(void* i_this) { return 1; } - /* 80485614-80485618 .text daObjTimer::@unnamed@d_a_obj_timer_cpp@::Mthd_IsDelete */ int Mthd_IsDelete(void* i_this) { return 1; } - /* 80485698-804856B8 -00001 0020+00 1/0 0/0 0/0 .data Mthd_Table__Q210daObjTimer27@unnamed@d_a_obj_timer_cpp@ */ actor_method_class l_daTimer_Method = { (process_method_func)Mthd_Create, (process_method_func)Mthd_Delete, @@ -137,7 +131,7 @@ namespace { }; // namespace daObjTimer -extern actor_process_profile_definition g_profile_Obj_Timer = { +actor_process_profile_definition g_profile_Obj_Timer = { fpcLy_CURRENT_e, // mLayerID 10, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index 9ce58995a0..942ad5b3f0 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -882,7 +882,7 @@ static actor_method_class daObjTks_MethodTable = { (process_method_func)daObjTks_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_TKS = { +actor_process_profile_definition g_profile_OBJ_TKS = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tmoon.cpp b/src/d/actor/d_a_obj_tmoon.cpp index ee4c1e14a7..d7ffe9fbdb 100644 --- a/src/d/actor/d_a_obj_tmoon.cpp +++ b/src/d/actor/d_a_obj_tmoon.cpp @@ -101,7 +101,7 @@ static actor_method_class l_daObjTMoon_Method = { (process_method_func)daObjTMoon_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TMoon = { +actor_process_profile_definition g_profile_Obj_TMoon = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_toaru_maki.cpp b/src/d/actor/d_a_obj_toaru_maki.cpp index 475cfe423f..17ee50cfcc 100644 --- a/src/d/actor/d_a_obj_toaru_maki.cpp +++ b/src/d/actor/d_a_obj_toaru_maki.cpp @@ -128,7 +128,7 @@ static actor_method_class daObjToaruMaki_METHODS = { (process_method_func)daObjToaruMaki_draw, }; -extern actor_process_profile_definition g_profile_Obj_ToaruMaki = { +actor_process_profile_definition g_profile_Obj_ToaruMaki = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index b457f617cd..6e98282eb1 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -138,8 +138,6 @@ static void* shot_b_sub(void* param_1, void* param_2) { return NULL; } -/* 80D158F4 0001+00 data_80D158F4 @1009 */ -/* 80D158F5 0003+00 data_80D158F5 None */ static u8 hio_set; static daObj_Toby_HIO_c l_HIO; @@ -705,7 +703,7 @@ static actor_method_class l_daObj_Toby_Method = { (process_method_func)daObj_Toby_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_TOBY = { +actor_process_profile_definition g_profile_OBJ_TOBY = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index da5fc97992..3c7540b530 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -603,7 +603,7 @@ static actor_method_class daObjTobyHouse_METHODS = { (process_method_func)daObjTobyHouse_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_TobyHouse = { +actor_process_profile_definition g_profile_Obj_TobyHouse = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index 335ce5b8a3..adef7a2c8b 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -299,7 +299,7 @@ static actor_method_class l_daTogeTrap_Method = { (process_method_func)daTogeTrap_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TogeTrap = { +actor_process_profile_definition g_profile_Obj_TogeTrap = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 1252922559..574a3cb274 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -683,7 +683,7 @@ static actor_method_class l_daObjTOMBO_Method = { (process_method_func)daObjTOMBO_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Tombo = { +actor_process_profile_definition g_profile_Obj_Tombo = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tornado.cpp b/src/d/actor/d_a_obj_tornado.cpp index 16f5b4c8e4..3b6c837f73 100644 --- a/src/d/actor/d_a_obj_tornado.cpp +++ b/src/d/actor/d_a_obj_tornado.cpp @@ -226,7 +226,7 @@ static actor_method_class l_daObjTrnd_Method = { (process_method_func)daObjTrnd_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Tornado = { +actor_process_profile_definition g_profile_Obj_Tornado = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tornado2.cpp b/src/d/actor/d_a_obj_tornado2.cpp index 704ac0c9d1..460459fa32 100644 --- a/src/d/actor/d_a_obj_tornado2.cpp +++ b/src/d/actor/d_a_obj_tornado2.cpp @@ -398,7 +398,7 @@ static actor_method_class l_daObjTrnd2_Method = { (process_method_func)daObjTrnd2_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Tornado2 = { +actor_process_profile_definition g_profile_Obj_Tornado2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index 285b9f6448..d23976dc5a 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -488,7 +488,7 @@ static actor_method_class l_daObj_Tp_Method = { (process_method_func)daObj_Tp_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_TP = { +actor_process_profile_definition g_profile_OBJ_TP = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp index de87cf879b..29cd0a83af 100644 --- a/src/d/actor/d_a_obj_treesh.cpp +++ b/src/d/actor/d_a_obj_treesh.cpp @@ -159,7 +159,7 @@ static actor_method_class daTreeSh_METHODS = { (process_method_func)daTreeSh_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_TREESH = { +actor_process_profile_definition g_profile_TREESH = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index 50d769f82c..733451be37 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -219,7 +219,7 @@ static actor_method_class l_daTwGate_Method = { (process_method_func)daTwGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_TwGate = { +actor_process_profile_definition g_profile_Obj_TwGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp index 0a23727f5b..4cdc971875 100644 --- a/src/d/actor/d_a_obj_udoor.cpp +++ b/src/d/actor/d_a_obj_udoor.cpp @@ -164,7 +164,7 @@ static actor_method_class l_daObj_Udoor_Method = { (process_method_func)daObj_Udoor_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_UDOOR = { +actor_process_profile_definition g_profile_OBJ_UDOOR = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_usaku.cpp b/src/d/actor/d_a_obj_usaku.cpp index dd411b050a..acf8b1c5ab 100644 --- a/src/d/actor/d_a_obj_usaku.cpp +++ b/src/d/actor/d_a_obj_usaku.cpp @@ -116,7 +116,7 @@ static actor_method_class l_daObj_Usaku_Method = { (process_method_func)daObj_Usaku_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_USAKU = { +actor_process_profile_definition g_profile_OBJ_USAKU = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp index 8ba4c3d282..9940fcfb93 100644 --- a/src/d/actor/d_a_obj_vground.cpp +++ b/src/d/actor/d_a_obj_vground.cpp @@ -135,7 +135,7 @@ static actor_method_class l_daObjVGnd_Method = { (process_method_func)daObjVGnd_Draw, }; -extern actor_process_profile_definition g_profile_Obj_VolcGnd = { +actor_process_profile_definition g_profile_Obj_VolcGnd = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index d1b90b6493..faad909e12 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -612,7 +612,7 @@ static actor_method_class l_daObjVolcBall_Method = { (process_method_func)daObjVolcBall_Draw, }; -extern actor_process_profile_definition g_profile_Obj_VolcanicBall = { +actor_process_profile_definition g_profile_Obj_VolcanicBall = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 6280b5a703..7711aefa25 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -598,15 +598,13 @@ void daObjVolcBom_c::actionWait() { } daMidna_c* midna = daPy_py_c::getMidnaActor(); - daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass(); + daPy_py_c* player = daPy_getPlayerActorClass(); - // Probably fake match since ebug calls different manager functions - dEvent_manager_c& evtMgr = g_dComIfG_gameInfo.play.getEvtManager(); - if (evtMgr.startCheck(mEventId)) { - if (strcmp(evtMgr.getRunEventName(), "PORTAL_WARP_BIGVOLC") == 0) { + if (dComIfGp_evmng_startCheck(mEventId)) { + if (strcmp(dComIfGp_getEventManager().getRunEventName(), "PORTAL_WARP_BIGVOLC") == 0) { player->onWarpObjDemo(); dComIfGp_getEvent().setPt2(this); - mStaffId = evtMgr.getMyStaffId(l_staff_name, 0, 0); + mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); setAction(ACTION_WARP_EVENT); demoProc(); } @@ -882,7 +880,7 @@ static actor_method_class daObjVolcBom_METHODS = { (process_method_func)daObjVolcBom_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_VolcanicBomb = { +actor_process_profile_definition g_profile_Obj_VolcanicBomb = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 166fc1e18f..e3c20eb359 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -822,7 +822,7 @@ static actor_method_class daObjWarpKBrg_METHODS = { (process_method_func)daObjWarpKBrg_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_KakarikoBrg = { +actor_process_profile_definition g_profile_Obj_KakarikoBrg = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index 3e32c628d6..38773c9e91 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -600,7 +600,7 @@ static actor_method_class daObjWarpOBrg_METHODS = { (process_method_func)daObjWarpOBrg_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_OrdinBrg = { +actor_process_profile_definition g_profile_Obj_OrdinBrg = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp index 83731e4b54..d5b98afc33 100644 --- a/src/d/actor/d_a_obj_waterGate.cpp +++ b/src/d/actor/d_a_obj_waterGate.cpp @@ -214,7 +214,7 @@ static actor_method_class l_daWtGate_Method = { (process_method_func)daWtGate_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WtGate = { +actor_process_profile_definition g_profile_Obj_WtGate = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp index 719a04db84..5dd8545e19 100644 --- a/src/d/actor/d_a_obj_waterPillar.cpp +++ b/src/d/actor/d_a_obj_waterPillar.cpp @@ -575,7 +575,7 @@ actor_method_class l_daWtPillar_Method = { (process_method_func)daWtPillar_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WaterPillar = { +actor_process_profile_definition g_profile_Obj_WaterPillar = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp index 9fb2f92b00..9eb4abe824 100644 --- a/src/d/actor/d_a_obj_waterfall.cpp +++ b/src/d/actor/d_a_obj_waterfall.cpp @@ -225,7 +225,7 @@ static actor_method_class l_daObjWaterFall_Method = { (process_method_func)daObjWaterFall_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WaterFall = { +actor_process_profile_definition g_profile_Obj_WaterFall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp index 6fc56d3add..f3555cdff7 100644 --- a/src/d/actor/d_a_obj_wchain.cpp +++ b/src/d/actor/d_a_obj_wchain.cpp @@ -383,7 +383,7 @@ static actor_method_class l_daObjWchain_Method = { (process_method_func)daObjWchain_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Wchain = { +actor_process_profile_definition g_profile_Obj_Wchain = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index b3d1627306..1949c2f395 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -507,7 +507,7 @@ static actor_method_class l_daWdStick_Method = { (process_method_func)daWdStick_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WdStick = { +actor_process_profile_definition g_profile_Obj_WdStick = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp index e9182f827b..58a002058c 100644 --- a/src/d/actor/d_a_obj_web0.cpp +++ b/src/d/actor/d_a_obj_web0.cpp @@ -286,7 +286,7 @@ static actor_method_class l_daObj_Web0_Method = { (process_method_func)daObj_Web0_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_WEB0 = { +actor_process_profile_definition g_profile_OBJ_WEB0 = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index ac5020f8d6..5b28d3a5a2 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -313,7 +313,7 @@ static actor_method_class l_daObj_Web1_Method = { (process_method_func)daObj_Web1_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_WEB1 = { +actor_process_profile_definition g_profile_OBJ_WEB1 = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_well_cover.cpp b/src/d/actor/d_a_obj_well_cover.cpp index 954dc3291b..a39b7d73f3 100644 --- a/src/d/actor/d_a_obj_well_cover.cpp +++ b/src/d/actor/d_a_obj_well_cover.cpp @@ -146,7 +146,7 @@ static actor_method_class l_daObjWCover_Method = { (process_method_func)daObjWCover_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WellCover = { +actor_process_profile_definition g_profile_Obj_WellCover = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index 7c35664b04..7fea4e50df 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -214,7 +214,7 @@ static actor_method_class l_daObj_Wflag_Method = { (process_method_func)daObj_Wflag_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_WFLAG = { +actor_process_profile_definition g_profile_OBJ_WFLAG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index 7fdf27847e..cd055d895f 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -247,7 +247,7 @@ static actor_method_class daWindStone_METHODS = { (process_method_func)daWindStone_draw, }; -extern actor_process_profile_definition g_profile_Obj_WindStone = { +actor_process_profile_definition g_profile_Obj_WindStone = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index c15f97e3cf..915abc25db 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -175,7 +175,7 @@ static actor_method_class daObjWindow_METHODS = { (process_method_func)daObjWindow_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_Window = { +actor_process_profile_definition g_profile_Obj_Window = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_wood_pendulum.cpp b/src/d/actor/d_a_obj_wood_pendulum.cpp index c724e7380f..8cf29afb59 100644 --- a/src/d/actor/d_a_obj_wood_pendulum.cpp +++ b/src/d/actor/d_a_obj_wood_pendulum.cpp @@ -168,7 +168,7 @@ static actor_method_class l_daObjWPndlm_Method = { (process_method_func)daObjWPndlm_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WoodPendulum = { +actor_process_profile_definition g_profile_Obj_WoodPendulum = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index 0a13402949..eb03316072 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -469,7 +469,7 @@ static actor_method_class l_daObjWStatue_Method = { (process_method_func)daObjWStatue_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WoodStatue = { +actor_process_profile_definition g_profile_Obj_WoodStatue = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp index 7f3008e76f..908074e456 100644 --- a/src/d/actor/d_a_obj_wsword.cpp +++ b/src/d/actor/d_a_obj_wsword.cpp @@ -112,7 +112,7 @@ static actor_method_class l_daObjWSword_Method = { (process_method_func)daObjWSword_Draw, }; -extern actor_process_profile_definition g_profile_Obj_WoodenSword = { +actor_process_profile_definition g_profile_Obj_WoodenSword = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index d9a4b4b2a0..67f6f1b15e 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -514,7 +514,7 @@ static actor_method_class daObj_YBag_MethodTable = { (process_method_func)daObj_YBag_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_YBAG = { +actor_process_profile_definition g_profile_OBJ_YBAG = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp index 73074aead3..1981d5aeaa 100644 --- a/src/d/actor/d_a_obj_yobikusa.cpp +++ b/src/d/actor/d_a_obj_yobikusa.cpp @@ -416,7 +416,7 @@ static actor_method_class l_daObjYobikusa_Method = { (process_method_func)daObjYobikusa_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Yobikusa = { +actor_process_profile_definition g_profile_Obj_Yobikusa = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_yousei.cpp b/src/d/actor/d_a_obj_yousei.cpp index 133e29fe62..20555536f1 100644 --- a/src/d/actor/d_a_obj_yousei.cpp +++ b/src/d/actor/d_a_obj_yousei.cpp @@ -187,10 +187,8 @@ void daObjYOUSEI_c::BinAction() { field_0x608 = dComIfGp_particle_set(field_0x608, 0x731, ¤t.pos, &tevStr, &shape_angle, NULL, 0xFF, NULL, -1, NULL, NULL, NULL); } -/* 804D1830 0001+00 data_804D1830 None */ static u8 data_804D1830; -/* 804D1831 0003+00 data_804D1831 None */ static u8 data_804D1831; void daObjYOUSEI_c::LinkChk() { @@ -861,7 +859,7 @@ static actor_method_class l_daObjYOUSEI_Method = { (process_method_func)daObjYOUSEI_Draw, }; -extern actor_process_profile_definition g_profile_Obj_Yousei = { +actor_process_profile_definition g_profile_Obj_Yousei = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index d94f5e702d..93f752a986 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -293,7 +293,7 @@ static actor_method_class l_daObj_Ystone_Method = { (process_method_func)daObj_Ystone_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_YSTONE = { +actor_process_profile_definition g_profile_OBJ_YSTONE = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp index a8b4388d42..363ebe28ab 100644 --- a/src/d/actor/d_a_obj_zcloth.cpp +++ b/src/d/actor/d_a_obj_zcloth.cpp @@ -86,7 +86,7 @@ static actor_method_class l_daObjZCloth_Method = { (process_method_func)daObjZCloth_Draw, }; -extern actor_process_profile_definition g_profile_Obj_ZoraCloth = { +actor_process_profile_definition g_profile_Obj_ZoraCloth = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index b5f4f4ecb4..bd616d5be4 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -380,7 +380,7 @@ static actor_method_class daZdoor_METHODS = { (process_method_func)daZdoor_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_Obj_ZDoor = { +actor_process_profile_definition g_profile_Obj_ZDoor = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index 480dc394ef..63191c70cf 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -258,7 +258,7 @@ static actor_method_class l_daZrTurara_Method = { (process_method_func)daZrTurara_Draw, }; -extern actor_process_profile_definition g_profile_Obj_zrTurara = { +actor_process_profile_definition g_profile_Obj_zrTurara = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zrTuraraRock.cpp b/src/d/actor/d_a_obj_zrTuraraRock.cpp index 538227d539..90fc794a69 100644 --- a/src/d/actor/d_a_obj_zrTuraraRock.cpp +++ b/src/d/actor/d_a_obj_zrTuraraRock.cpp @@ -125,8 +125,8 @@ void daZrTuraRc_c::modeDrop() { } void daZrTuraRc_c::bgCheck() { - // this should be ChkGroundHit but that doesn't match - if (mAcch.m_flags >> 5 & 1) { + bool r31 = mAcch.ChkGroundHit(); + if (r31) { init_modeDropEnd(); } } @@ -177,7 +177,7 @@ static actor_method_class l_daZrTuraRc_Method = { (process_method_func)daZrTuraRc_Draw, }; -extern actor_process_profile_definition g_profile_Obj_zrTuraraRc = { +actor_process_profile_definition g_profile_Obj_zrTuraraRc = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp index 02f593e25f..bf93888f74 100644 --- a/src/d/actor/d_a_obj_zraMark.cpp +++ b/src/d/actor/d_a_obj_zraMark.cpp @@ -535,7 +535,7 @@ static actor_method_class l_daObjZraMark_Method = { (process_method_func)daObjZraMark_Draw, }; -extern actor_process_profile_definition g_profile_ZRA_MARK = { +actor_process_profile_definition g_profile_ZRA_MARK = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_obj_zra_freeze.cpp b/src/d/actor/d_a_obj_zra_freeze.cpp index faf0234e79..833fd4317b 100644 --- a/src/d/actor/d_a_obj_zra_freeze.cpp +++ b/src/d/actor/d_a_obj_zra_freeze.cpp @@ -199,7 +199,7 @@ static actor_method_class l_daZraFreeze_Method = { (process_method_func)daZraFreeze_Draw, }; -extern actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = { +actor_process_profile_definition g_profile_OBJ_ZRAFREEZE = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_obj_zra_rock.cpp b/src/d/actor/d_a_obj_zra_rock.cpp index 0f8ed50ac9..01613adc52 100644 --- a/src/d/actor/d_a_obj_zra_rock.cpp +++ b/src/d/actor/d_a_obj_zra_rock.cpp @@ -149,7 +149,7 @@ static actor_method_class l_daObjZraRock_Method = { }; -extern actor_process_profile_definition g_profile_Obj_ZraRock = { +actor_process_profile_definition g_profile_Obj_ZraRock = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index fc7836276b..c48a9e76ad 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -601,7 +601,7 @@ static actor_method_class l_daPasserMng_Method = { (process_method_func)daPasserMng_IsDelete, }; -extern actor_process_profile_definition g_profile_PASSER_MNG = { +actor_process_profile_definition g_profile_PASSER_MNG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_path_line.cpp b/src/d/actor/d_a_path_line.cpp index 0f17d4d256..3a4cc4ef60 100644 --- a/src/d/actor/d_a_path_line.cpp +++ b/src/d/actor/d_a_path_line.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_path_line.h" #include "f_op/f_op_actor_mng.h" -extern actor_process_profile_definition2 g_profile_PATH_LINE = { +actor_process_profile_definition2 g_profile_PATH_LINE = { fpcLy_CURRENT_e, // mLayerID 9, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index bbb9142154..764901c3a9 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -1217,7 +1217,7 @@ static actor_method_class daPeru_MethodTable = { (process_method_func)daPeru_Draw, }; -extern actor_process_profile_definition g_profile_PERU = { +actor_process_profile_definition g_profile_PERU = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 855ee03690..dacbcd0735 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -67,10 +67,8 @@ void daPy_boomerangMove_c::initOffset(cXyz const* i_offset) { daMidna_c* daPy_py_c::m_midnaActor; -/* 8045101C 0002+00 data_8045101C m_dropAngleY__20daPy_boomerangMove_c */ s16 daPy_boomerangMove_c::m_dropAngleY; -/* 8045101E 0002+00 data_8045101E m_eventKeepFlg__20daPy_boomerangMove_c */ s16 daPy_boomerangMove_c::m_eventKeepFlg; int daPy_boomerangMove_c::posMove(cXyz* param_0, s16* param_1, fopAc_ac_c* param_2, s16 param_3) { diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index 0b9d0cca4d..e760171d4e 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -177,7 +177,7 @@ static actor_method_class daPPolamp_METHODS = { (process_method_func)daPPolamp_draw, }; -extern actor_process_profile_definition g_profile_PPolamp = { +actor_process_profile_definition g_profile_PPolamp = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_scene_exit.cpp b/src/d/actor/d_a_scene_exit.cpp index d220a3a512..846b833faa 100644 --- a/src/d/actor/d_a_scene_exit.cpp +++ b/src/d/actor/d_a_scene_exit.cpp @@ -104,7 +104,7 @@ static actor_method_class l_daScex_Method = { (process_method_func)daScex_Execute, }; -extern actor_process_profile_definition2 g_profile_SCENE_EXIT = { +actor_process_profile_definition2 g_profile_SCENE_EXIT = { fpcLy_CURRENT_e, // mLayerID 10, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_scene_exit2.cpp b/src/d/actor/d_a_scene_exit2.cpp index 49cff71bd5..a9defc6591 100644 --- a/src/d/actor/d_a_scene_exit2.cpp +++ b/src/d/actor/d_a_scene_exit2.cpp @@ -172,7 +172,7 @@ static actor_method_class l_daScExit_Method = { (process_method_func)daScExit_Draw, }; -extern actor_process_profile_definition g_profile_SCENE_EXIT2 = { +actor_process_profile_definition g_profile_SCENE_EXIT2 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index e13945e7ae..9aafaa6e2f 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -55,7 +55,7 @@ static actor_method_class l_daSetBgObj_Method = { (process_method_func)daSetBgObj_Delete, }; -extern actor_process_profile_definition g_profile_SET_BG_OBJ = { +actor_process_profile_definition g_profile_SET_BG_OBJ = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 2adae1cce4..64748a1dae 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -274,7 +274,7 @@ static actor_method_class daShopItemMethodTable = { (process_method_func)daShopItem_Draw, }; -extern actor_process_profile_definition g_profile_ShopItem = { +actor_process_profile_definition g_profile_ShopItem = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_skip_2D.cpp b/src/d/actor/d_a_skip_2D.cpp index e90975a6eb..d1e91a366f 100644 --- a/src/d/actor/d_a_skip_2D.cpp +++ b/src/d/actor/d_a_skip_2D.cpp @@ -78,7 +78,7 @@ static actor_method_class daSkip2D_MethodTable = { (process_method_func)daSkip2D_Draw, }; -extern actor_process_profile_definition g_profile_SKIP2D = { +actor_process_profile_definition g_profile_SKIP2D = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index 15473a148a..e0b3e7e0ff 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -934,7 +934,7 @@ static actor_method_class l_daSpinner_Method = { (process_method_func)daSpinner_Draw, }; -extern actor_process_profile_definition g_profile_SPINNER = { +actor_process_profile_definition g_profile_SPINNER = { fpcLy_CURRENT_e, // mLayerID 4, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index ba29686f2e..5fa3f83750 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -583,7 +583,7 @@ static actor_method_class l_daSq_Method = { (process_method_func)daSq_Draw, }; -extern actor_process_profile_definition g_profile_SQ = { +actor_process_profile_definition g_profile_SQ = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp index c27b839a89..66ef5a6de6 100644 --- a/src/d/actor/d_a_startAndGoal.cpp +++ b/src/d/actor/d_a_startAndGoal.cpp @@ -188,7 +188,7 @@ static actor_method_class l_daStartAndGoal_Method = { (process_method_func)daStartAndGoal_Draw, }; -extern actor_process_profile_definition g_profile_START_AND_GOAL = { +actor_process_profile_definition g_profile_START_AND_GOAL = { fpcLy_CURRENT_e, 9, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_suspend.cpp b/src/d/actor/d_a_suspend.cpp index 74f07e4750..3c4a01a318 100644 --- a/src/d/actor/d_a_suspend.cpp +++ b/src/d/actor/d_a_suspend.cpp @@ -42,7 +42,7 @@ static actor_method_class daSus_METHODS = { (process_method_func)daSus_create, NULL, NULL, NULL, NULL, }; -extern actor_process_profile_definition g_profile_SUSPEND = { +actor_process_profile_definition g_profile_SUSPEND = { fpcLy_CURRENT_e, 11, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_swBall.cpp b/src/d/actor/d_a_swBall.cpp index 7416f25cab..f12c06a2f7 100644 --- a/src/d/actor/d_a_swBall.cpp +++ b/src/d/actor/d_a_swBall.cpp @@ -276,7 +276,7 @@ static actor_method_class l_daSwBall_Method = { (process_method_func)daSwBall_Execute, }; -extern actor_process_profile_definition g_profile_SwBall = { +actor_process_profile_definition g_profile_SwBall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_swLBall.cpp b/src/d/actor/d_a_swLBall.cpp index 0940fd6d45..a2b3cb55f1 100644 --- a/src/d/actor/d_a_swLBall.cpp +++ b/src/d/actor/d_a_swLBall.cpp @@ -254,7 +254,7 @@ static actor_method_class l_daSwLBall_Method = { NULL, }; -extern actor_process_profile_definition g_profile_SwLBall = { +actor_process_profile_definition g_profile_SwLBall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_swTime.cpp b/src/d/actor/d_a_swTime.cpp index 6064cb669b..949c60b239 100644 --- a/src/d/actor/d_a_swTime.cpp +++ b/src/d/actor/d_a_swTime.cpp @@ -58,7 +58,7 @@ static actor_method_class l_daSwTime_Method = { (process_method_func)daSwTime_Execute }; -extern actor_process_profile_definition g_profile_SwTime = { +actor_process_profile_definition g_profile_SwTime = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 89d319ae89..35b4cb9f50 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -336,7 +336,7 @@ static actor_method_class l_daSwc00_Method = { #endif }; -extern actor_process_profile_definition g_profile_SWC00 = { +actor_process_profile_definition g_profile_SWC00 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index 7d6a9dc14a..040e698754 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -476,7 +476,7 @@ static actor_method_class l_daSwhit0_Method = { (process_method_func)daSwhit0_Draw, }; -extern actor_process_profile_definition g_profile_SWHIT0 = { +actor_process_profile_definition g_profile_SWHIT0 = { fpcLy_CURRENT_e, // mLayerID 8, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_CstaSw.cpp b/src/d/actor/d_a_tag_CstaSw.cpp index a2997806d1..9d24b13c50 100644 --- a/src/d/actor/d_a_tag_CstaSw.cpp +++ b/src/d/actor/d_a_tag_CstaSw.cpp @@ -94,7 +94,7 @@ static actor_method_class l_daTagCstaSw_Method = { (process_method_func)daTagCstaSw_Draw, }; -extern actor_process_profile_definition g_profile_Tag_CstaSw = { +actor_process_profile_definition g_profile_Tag_CstaSw = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index 66332e1789..d2b2b729a5 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -116,8 +116,8 @@ inline bool daTagLv6Gate_c::checkOpenArea() { } inline int daTagLv6Gate_c::execute() { - dComIfG_inf_c& game_info = g_dComIfG_gameInfo; // Fake match? - + // TODO: gameInfo fake match to force reuse of pointer + dComIfG_inf_c& game_info = g_dComIfG_gameInfo; if (game_info.getPlay().getEvent().runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 cut_index = eventManager.getMyStaffId(l_arcName, NULL, 0); @@ -372,7 +372,7 @@ static actor_method_class l_daTagLv6Gate_Method = { (process_method_func)daTagLv6Gate_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv6Gate = { +actor_process_profile_definition g_profile_Tag_Lv6Gate = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp index 0f40c60b9c..4ef355cc28 100644 --- a/src/d/actor/d_a_tag_Lv7Gate.cpp +++ b/src/d/actor/d_a_tag_Lv7Gate.cpp @@ -218,8 +218,8 @@ void daTagLv7Gate_c::flyAnime() { } int daTagLv7Gate_c::execute() { - // Fakematch - dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); + // TODO: gameInfo fake match to force reuse of pointer + dComIfG_play_c& play = g_dComIfG_gameInfo.play; if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { dEvent_manager_c& evtMgr = dComIfGp_getEventManager(); s32 cut_index = evtMgr.getMyStaffId(l_arcName, NULL, 0); @@ -374,7 +374,7 @@ static actor_method_class l_daTagLv7Gate_Method = { (process_method_func)daTagLv7Gate_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv7Gate = { +actor_process_profile_definition g_profile_Tag_Lv7Gate = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index 714d8dfe46..4bed7e7b61 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -234,7 +234,7 @@ static actor_method_class l_daTagLv8Gate_Method = { (process_method_func)daTagLv8Gate_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv8Gate = { +actor_process_profile_definition g_profile_Tag_Lv8Gate = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index 9d4e465ceb..62e8d72bf2 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -1045,7 +1045,7 @@ static actor_method_class l_daTagTWGate_Method = { (process_method_func)daTagTWGate_Draw, }; -extern actor_process_profile_definition g_profile_Tag_TWGate = { +actor_process_profile_definition g_profile_Tag_TWGate = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_ajnot.cpp b/src/d/actor/d_a_tag_ajnot.cpp index 20792436e8..cc5cc9155a 100644 --- a/src/d/actor/d_a_tag_ajnot.cpp +++ b/src/d/actor/d_a_tag_ajnot.cpp @@ -62,7 +62,7 @@ static actor_method_class l_daTagAJnot_Method = { (process_method_func)daTagAJnot_Draw, }; -extern actor_process_profile_definition g_profile_Tag_AJnot = { +actor_process_profile_definition g_profile_Tag_AJnot = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index 545889075c..27a4533eab 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -584,7 +584,7 @@ static actor_method_class daTag_AllMato_MethodTable = { (process_method_func)daTag_AllMato_Draw }; -extern actor_process_profile_definition g_profile_TAG_ALLMATO = { +actor_process_profile_definition g_profile_TAG_ALLMATO = { fpcLy_CURRENT_e, // mLayerID 10, // mListID fpcPi_CURRENT_e, // mListPri diff --git a/src/d/actor/d_a_tag_arena.cpp b/src/d/actor/d_a_tag_arena.cpp index bf510a2d09..bdaa2dc16a 100644 --- a/src/d/actor/d_a_tag_arena.cpp +++ b/src/d/actor/d_a_tag_arena.cpp @@ -22,7 +22,7 @@ static actor_method_class l_daTagArena_Method = { (process_method_func)daTagArena_Delete, }; -extern actor_process_profile_definition g_profile_Tag_Arena = { +actor_process_profile_definition g_profile_Tag_Arena = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_assistance.cpp b/src/d/actor/d_a_tag_assistance.cpp index 2f894ea23b..8fce57e12e 100644 --- a/src/d/actor/d_a_tag_assistance.cpp +++ b/src/d/actor/d_a_tag_assistance.cpp @@ -32,7 +32,7 @@ static actor_method_class l_daTagAssist_Method = { (process_method_func)daTagAssist_IsDelete }; -extern actor_process_profile_definition g_profile_Tag_Assist = { +actor_process_profile_definition g_profile_Tag_Assist = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp index 78e97941fd..8924b628f7 100644 --- a/src/d/actor/d_a_tag_attack_item.cpp +++ b/src/d/actor/d_a_tag_attack_item.cpp @@ -150,7 +150,7 @@ static actor_method_class l_daTagAtkItem_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_AttackItem = { +actor_process_profile_definition g_profile_Tag_AttackItem = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index 79936139ef..29a1fa5279 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -150,7 +150,7 @@ static actor_method_class l_daAttp_Method = { (process_method_func)daAttp_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Attp = { +actor_process_profile_definition g_profile_Tag_Attp = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp index 2a26995e22..c876ce8588 100644 --- a/src/d/actor/d_a_tag_bottle_item.cpp +++ b/src/d/actor/d_a_tag_bottle_item.cpp @@ -192,7 +192,7 @@ static actor_method_class daTag_BottleItem_MethodTable = { (process_method_func)daTag_BottleItem_Draw }; -extern actor_process_profile_definition g_profile_TAG_BTLITM = { +actor_process_profile_definition g_profile_TAG_BTLITM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPri diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index ca33e67b0c..99c2c69f6b 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -297,7 +297,7 @@ static actor_method_class l_daTag_Cam_Method = { (process_method_func)daTag_Cam_Draw, }; -extern actor_process_profile_definition g_profile_TAG_CAMERA = { +actor_process_profile_definition g_profile_TAG_CAMERA = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_chgrestart.cpp b/src/d/actor/d_a_tag_chgrestart.cpp index f7c17fbf5b..c2eb2260b9 100644 --- a/src/d/actor/d_a_tag_chgrestart.cpp +++ b/src/d/actor/d_a_tag_chgrestart.cpp @@ -104,7 +104,7 @@ static actor_method_class l_daTagChgRestart_Method = { (process_method_func)daTagChgRestart_Execute, }; -extern actor_process_profile_definition g_profile_Tag_ChgRestart = { +actor_process_profile_definition g_profile_Tag_ChgRestart = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index f66cdb59e2..a033afdfe0 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -101,7 +101,7 @@ static actor_method_class l_daTag_Chk_Method = { (process_method_func)daTag_Chk_Execute, (process_method_func)daTag_Chk_IsDelete, (process_method_func)daTag_Chk_Draw}; -extern actor_process_profile_definition g_profile_TAG_CHKPOINT = { +actor_process_profile_definition g_profile_TAG_CHKPOINT = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index 674959ab27..baea03d037 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -505,7 +505,7 @@ static actor_method_class l_daTagCsw_Method = { (process_method_func)daTagCsw_Draw, }; -extern actor_process_profile_definition g_profile_TAG_CSW = { +actor_process_profile_definition g_profile_TAG_CSW = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_escape.cpp b/src/d/actor/d_a_tag_escape.cpp index 6f318f7ee1..268f3e3ed1 100644 --- a/src/d/actor/d_a_tag_escape.cpp +++ b/src/d/actor/d_a_tag_escape.cpp @@ -26,7 +26,7 @@ static actor_method_class l_daTagEscape_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Escape = { +actor_process_profile_definition g_profile_Tag_Escape = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index b7071829e3..019cfb6583 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -330,7 +330,7 @@ static actor_method_class l_daTag_Event_Method = { (process_method_func)daTag_Event_Draw, }; -extern actor_process_profile_definition g_profile_TAG_EVENT = { +actor_process_profile_definition g_profile_TAG_EVENT = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index 414a68a3d8..131bde5f2a 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -232,7 +232,7 @@ static actor_method_class daTag_Evt_MethodTable = { (process_method_func)daTag_Evt_Draw, }; -extern actor_process_profile_definition g_profile_TAG_EVT = { +actor_process_profile_definition g_profile_TAG_EVT = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_evtarea.cpp b/src/d/actor/d_a_tag_evtarea.cpp index 84c36219f2..5833296ffe 100644 --- a/src/d/actor/d_a_tag_evtarea.cpp +++ b/src/d/actor/d_a_tag_evtarea.cpp @@ -230,7 +230,7 @@ static actor_method_class daTag_EvtArea_MethodTable = { (process_method_func)daTag_EvtArea_Draw, }; -extern actor_process_profile_definition g_profile_TAG_EVTAREA = { +actor_process_profile_definition g_profile_TAG_EVTAREA = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_evtmsg.cpp b/src/d/actor/d_a_tag_evtmsg.cpp index 084e7198e2..5b18a10ef8 100644 --- a/src/d/actor/d_a_tag_evtmsg.cpp +++ b/src/d/actor/d_a_tag_evtmsg.cpp @@ -234,7 +234,7 @@ static actor_method_class daTag_EvtMsg_MethodTable = { (process_method_func)daTag_EvtMsg_Draw, }; -extern actor_process_profile_definition g_profile_TAG_EVTMSG = { +actor_process_profile_definition g_profile_TAG_EVTMSG = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index 02838ccdac..7b77433fbb 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -213,7 +213,7 @@ static actor_method_class l_daTag_FWall_Method = { (process_method_func)daTag_FWall_Draw, }; -extern actor_process_profile_definition g_profile_Tag_FWall = { +actor_process_profile_definition g_profile_Tag_FWall = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_gra.cpp b/src/d/actor/d_a_tag_gra.cpp index cf22e4a191..083aca0aa4 100644 --- a/src/d/actor/d_a_tag_gra.cpp +++ b/src/d/actor/d_a_tag_gra.cpp @@ -22,7 +22,7 @@ static actor_method_class l_daTagGra_Method = { (process_method_func)daTagGra_Delete }; -extern actor_process_profile_definition g_profile_TAG_GRA = { +actor_process_profile_definition g_profile_TAG_GRA = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_gstart.cpp b/src/d/actor/d_a_tag_gstart.cpp index d525baba31..7a05742d52 100644 --- a/src/d/actor/d_a_tag_gstart.cpp +++ b/src/d/actor/d_a_tag_gstart.cpp @@ -58,7 +58,7 @@ static actor_method_class l_daTagGstart_Method = { (process_method_func)daTagGstart_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Gstart = { +actor_process_profile_definition g_profile_Tag_Gstart = { fpcLy_CURRENT_e, 2, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_guard.cpp b/src/d/actor/d_a_tag_guard.cpp index 8ce2487596..f07448bc8d 100644 --- a/src/d/actor/d_a_tag_guard.cpp +++ b/src/d/actor/d_a_tag_guard.cpp @@ -61,7 +61,7 @@ static actor_method_class l_daTagGuard_Method = { (process_method_func)daTagGuard_Delete, }; -extern actor_process_profile_definition g_profile_TAG_GUARD = { +actor_process_profile_definition g_profile_TAG_GUARD = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_hinit.cpp b/src/d/actor/d_a_tag_hinit.cpp index b11458bdb0..db98089988 100644 --- a/src/d/actor/d_a_tag_hinit.cpp +++ b/src/d/actor/d_a_tag_hinit.cpp @@ -70,7 +70,7 @@ static actor_method_class l_daTagHinit_Method = { }; -extern actor_process_profile_definition g_profile_Tag_Hinit = { +actor_process_profile_definition g_profile_Tag_Hinit = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_hjump.cpp b/src/d/actor/d_a_tag_hjump.cpp index 8e42bf334a..0e49eb14de 100644 --- a/src/d/actor/d_a_tag_hjump.cpp +++ b/src/d/actor/d_a_tag_hjump.cpp @@ -186,7 +186,7 @@ static actor_method_class l_daTagHjump_Method = { (process_method_func)daTagHjump_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Hjump = { +actor_process_profile_definition g_profile_Tag_Hjump = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_howl.cpp b/src/d/actor/d_a_tag_howl.cpp index 246205421a..3480d4acc4 100644 --- a/src/d/actor/d_a_tag_howl.cpp +++ b/src/d/actor/d_a_tag_howl.cpp @@ -95,7 +95,7 @@ static actor_method_class daTag_Howl_MethodTable = { }; -extern actor_process_profile_definition g_profile_TAG_HOWL = { +actor_process_profile_definition g_profile_TAG_HOWL = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_hstop.cpp b/src/d/actor/d_a_tag_hstop.cpp index c7d8b4c256..5692f6fa5f 100644 --- a/src/d/actor/d_a_tag_hstop.cpp +++ b/src/d/actor/d_a_tag_hstop.cpp @@ -177,7 +177,7 @@ static actor_method_class l_daTagHstop_Method = { (process_method_func)daTagHstop_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Hstop = { +actor_process_profile_definition g_profile_Tag_Hstop = { fpcLy_CURRENT_e, 3, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_instruction.cpp b/src/d/actor/d_a_tag_instruction.cpp index 3bbabb540c..e6493d0358 100644 --- a/src/d/actor/d_a_tag_instruction.cpp +++ b/src/d/actor/d_a_tag_instruction.cpp @@ -26,7 +26,7 @@ static actor_method_class l_daTagInst_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Instruction = { +actor_process_profile_definition g_profile_Tag_Instruction = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp index 5f5435761b..973394d90d 100644 --- a/src/d/actor/d_a_tag_kago_fall.cpp +++ b/src/d/actor/d_a_tag_kago_fall.cpp @@ -278,7 +278,7 @@ static actor_method_class l_daTagKagoFall_Method = { (process_method_func)daTagKagoFall_Execute, }; -extern actor_process_profile_definition g_profile_Tag_KagoFall = { +actor_process_profile_definition g_profile_Tag_KagoFall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index 2737dc370f..6e51a28c7f 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -263,19 +263,27 @@ static int daTag_KMsg_IsDelete(void* param_0) { return 1; } -static void* daTag_KMsg_MethodTable[8] = { - (void*)daTag_KMsg_Create, - (void*)daTag_KMsg_Delete, - (void*)daTag_KMsg_Execute, - (void*)daTag_KMsg_IsDelete, - (void*)daTag_KMsg_Draw, +static actor_method_class daTag_KMsg_MethodTable = { + (process_method_func)daTag_KMsg_Create, + (process_method_func)daTag_KMsg_Delete, + (process_method_func)daTag_KMsg_Execute, + (process_method_func)daTag_KMsg_IsDelete, + (process_method_func)daTag_KMsg_Draw, }; -extern void* g_profile_TAG_KMSG[12] = { - (void*)0xFFFFFFFD, (void*)0x0008FFFD, - (void*)0x02EB0000, (void*)&g_fpcLf_Method, - (void*)0x000005CC, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01220000, (void*)&daTag_KMsg_MethodTable, - (void*)0x00044000, (void*)0x000E0000, +actor_process_profile_definition g_profile_TAG_KMSG = { + fpcLy_CURRENT_e, + 8, + fpcPi_CURRENT_e, + PROC_TAG_KMSG, + &g_fpcLf_Method.base, + sizeof(daTag_KMsg_c), + 0, + 0, + &g_fopAc_Method.base, + 0x122, + &daTag_KMsg_MethodTable, + 0x44000, + fopAc_ACTOR_e, + fopAc_CULLBOX_CUSTOM_e, }; diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index f3057743ff..e04fe2ecd3 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -22,7 +22,8 @@ int daTag_Lantern_c::Delete() { } int daTag_Lantern_c::Execute() { - dComIfG_play_c& play = g_dComIfG_gameInfo.getPlay(); // fake match + // TODO: gameInfo fake match to force reuse of pointer + dComIfG_play_c& play = g_dComIfG_gameInfo.play; if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { @@ -110,7 +111,7 @@ static actor_method_class daTag_Lantern_MethodTable = { (process_method_func)daTag_Lantern_Draw, }; -extern actor_process_profile_definition g_profile_TAG_LANTERN = { +actor_process_profile_definition g_profile_TAG_LANTERN = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_lightball.cpp b/src/d/actor/d_a_tag_lightball.cpp index 6d628ccbe0..f524503921 100644 --- a/src/d/actor/d_a_tag_lightball.cpp +++ b/src/d/actor/d_a_tag_lightball.cpp @@ -115,7 +115,7 @@ static actor_method_class l_daTagLightBall_Method = { (process_method_func)daTagLightBall_Draw, }; -extern actor_process_profile_definition g_profile_Tag_LightBall = { +actor_process_profile_definition g_profile_Tag_LightBall = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_lv2prchk.cpp b/src/d/actor/d_a_tag_lv2prchk.cpp index a0a16af039..bb7e7d186b 100644 --- a/src/d/actor/d_a_tag_lv2prchk.cpp +++ b/src/d/actor/d_a_tag_lv2prchk.cpp @@ -177,7 +177,7 @@ static actor_method_class l_daTagLv2PrChk_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Lv2PrChk = { +actor_process_profile_definition g_profile_Tag_Lv2PrChk = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_lv5soup.cpp b/src/d/actor/d_a_tag_lv5soup.cpp index 2a280630b4..2c000a0b92 100644 --- a/src/d/actor/d_a_tag_lv5soup.cpp +++ b/src/d/actor/d_a_tag_lv5soup.cpp @@ -81,7 +81,7 @@ static actor_method_class daTag_Lv5Soup_MethodTable = { (process_method_func)daTag_Lv5Soup_Draw, }; -extern actor_process_profile_definition g_profile_TAG_LV5SOUP = { +actor_process_profile_definition g_profile_TAG_LV5SOUP = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_lv6CstaSw.cpp b/src/d/actor/d_a_tag_lv6CstaSw.cpp index b110597add..2e1ba6105d 100644 --- a/src/d/actor/d_a_tag_lv6CstaSw.cpp +++ b/src/d/actor/d_a_tag_lv6CstaSw.cpp @@ -96,7 +96,7 @@ static actor_method_class l_daLv6CstaSw_Method = { (process_method_func)daLv6CstaSw_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Lv6CstaSw = { +actor_process_profile_definition g_profile_Tag_Lv6CstaSw = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_magne.cpp b/src/d/actor/d_a_tag_magne.cpp index 086b0ccae5..8d292552e8 100644 --- a/src/d/actor/d_a_tag_magne.cpp +++ b/src/d/actor/d_a_tag_magne.cpp @@ -56,7 +56,7 @@ static actor_method_class l_daTagMagne_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Magne = { +actor_process_profile_definition g_profile_Tag_Magne = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp index 2fae8c8102..1844169355 100644 --- a/src/d/actor/d_a_tag_mhint.cpp +++ b/src/d/actor/d_a_tag_mhint.cpp @@ -234,7 +234,7 @@ static actor_method_class l_daTagMhint_Method = { (process_method_func)daTagMhint_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Mhint = { +actor_process_profile_definition g_profile_Tag_Mhint = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mist.cpp b/src/d/actor/d_a_tag_mist.cpp index ad7168eed1..c73f347840 100644 --- a/src/d/actor/d_a_tag_mist.cpp +++ b/src/d/actor/d_a_tag_mist.cpp @@ -146,7 +146,7 @@ static actor_method_class l_daTagMist_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Mist = { +actor_process_profile_definition g_profile_Tag_Mist = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_mmsg.cpp b/src/d/actor/d_a_tag_mmsg.cpp index 00f4201ad2..05f86f48cc 100644 --- a/src/d/actor/d_a_tag_mmsg.cpp +++ b/src/d/actor/d_a_tag_mmsg.cpp @@ -96,7 +96,7 @@ static actor_method_class l_daTagMmsg_Method = { (process_method_func)daTagMmsg_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Mmsg = { +actor_process_profile_definition g_profile_Tag_Mmsg = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 2a9c59d708..25e2469c8e 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -66,7 +66,8 @@ int daTag_Msg_c::execute() { eyePos.set(current.pos.x, current.pos.y + 150.0f, current.pos.z); attention_info.position = eyePos; - dComIfG_play_c& play = g_dComIfG_gameInfo.play; // FAKE, event inlines need to be fixed + // TODO: gameInfo fake match to force reuse of pointer + dComIfG_play_c& play = g_dComIfG_gameInfo.play; if (play.getEvent().runCheck()) { set_event = false; @@ -238,7 +239,7 @@ static actor_method_class daTag_Msg_MethodTable = { (process_method_func)daTag_Msg_Draw, }; -extern actor_process_profile_definition g_profile_TAG_MSG = { +actor_process_profile_definition g_profile_TAG_MSG = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_mstop.cpp b/src/d/actor/d_a_tag_mstop.cpp index 4a6d974a2e..377f5ee39c 100644 --- a/src/d/actor/d_a_tag_mstop.cpp +++ b/src/d/actor/d_a_tag_mstop.cpp @@ -176,7 +176,7 @@ static actor_method_class l_daTagMstop_Method = { (process_method_func)daTagMstop_Create, (process_method_func)daTagMstop_Delete, (process_method_func)daTagMstop_Execute, NULL, (process_method_func)daTagMstop_Draw}; -extern actor_process_profile_definition g_profile_Tag_Mstop = { +actor_process_profile_definition g_profile_Tag_Mstop = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_mwait.cpp b/src/d/actor/d_a_tag_mwait.cpp index 2fd9cfa7b9..fcb85b51ee 100644 --- a/src/d/actor/d_a_tag_mwait.cpp +++ b/src/d/actor/d_a_tag_mwait.cpp @@ -155,7 +155,7 @@ static actor_method_class l_daTagMwait_Method = { (process_method_func)daTagMwait_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Mwait = { +actor_process_profile_definition g_profile_Tag_Mwait = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_myna2.cpp b/src/d/actor/d_a_tag_myna2.cpp index f1984096c3..fd84d698e2 100644 --- a/src/d/actor/d_a_tag_myna2.cpp +++ b/src/d/actor/d_a_tag_myna2.cpp @@ -70,7 +70,7 @@ static actor_method_class l_daTagMyna2_Method = { (process_method_func)daTagMyna2_Execute, }; -extern actor_process_profile_definition g_profile_TAG_MYNA2 = { +actor_process_profile_definition g_profile_TAG_MYNA2 = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_myna_light.cpp b/src/d/actor/d_a_tag_myna_light.cpp index c62fcd84e7..11ab9df604 100644 --- a/src/d/actor/d_a_tag_myna_light.cpp +++ b/src/d/actor/d_a_tag_myna_light.cpp @@ -159,7 +159,7 @@ static actor_method_class daTag_MynaLight_MethodTable = { (process_method_func)daTag_MynaLight_Draw, }; -extern actor_process_profile_definition g_profile_TAG_MNLIGHT = { +actor_process_profile_definition g_profile_TAG_MNLIGHT = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index 63a1c8d297..530d796043 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -66,7 +66,7 @@ static actor_method_class l_daTagPati_Method = { (process_method_func)daTagPati_Execute, }; -extern actor_process_profile_definition g_profile_TAG_PATI = { +actor_process_profile_definition g_profile_TAG_PATI = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_poFire.cpp b/src/d/actor/d_a_tag_poFire.cpp index 76e0c30ddd..5cbdb87a5a 100644 --- a/src/d/actor/d_a_tag_poFire.cpp +++ b/src/d/actor/d_a_tag_poFire.cpp @@ -67,7 +67,7 @@ static actor_method_class l_daTagPoFire_Method = { (process_method_func)daTagPoFire_Draw, }; -extern actor_process_profile_definition g_profile_Tag_poFire = { +actor_process_profile_definition g_profile_Tag_poFire = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_push.cpp b/src/d/actor/d_a_tag_push.cpp index 49dc2230e5..a6bed6cfa4 100644 --- a/src/d/actor/d_a_tag_push.cpp +++ b/src/d/actor/d_a_tag_push.cpp @@ -156,7 +156,7 @@ static actor_method_class daTag_Push_MethodTable = { (process_method_func)daTag_Push_Draw, }; -extern actor_process_profile_definition g_profile_TAG_PUSH = { +actor_process_profile_definition g_profile_TAG_PUSH = { fpcLy_CURRENT_e, 8, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp index 3e57df3334..8061311d57 100644 --- a/src/d/actor/d_a_tag_qs.cpp +++ b/src/d/actor/d_a_tag_qs.cpp @@ -234,7 +234,7 @@ static actor_method_class l_daTagQs_Method = { (process_method_func)daTagQs_Draw, }; -extern actor_process_profile_definition g_profile_TAG_QS = { +actor_process_profile_definition g_profile_TAG_QS = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_ret_room.cpp b/src/d/actor/d_a_tag_ret_room.cpp index 6d336fb945..f22cbd4f55 100644 --- a/src/d/actor/d_a_tag_ret_room.cpp +++ b/src/d/actor/d_a_tag_ret_room.cpp @@ -90,7 +90,7 @@ static actor_method_class daTagRetRm_METHODS = { }; -extern actor_process_profile_definition g_profile_Tag_RetRoom = { +actor_process_profile_definition g_profile_Tag_RetRoom = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp index 60f3931618..c902f125a7 100644 --- a/src/d/actor/d_a_tag_river_back.cpp +++ b/src/d/actor/d_a_tag_river_back.cpp @@ -51,7 +51,6 @@ static char* l_staffName = "rvback"; void daTagRiverBack_c::event_proc_call() { typedef void (daTagRiverBack_c::*actionFunc)(); - /* 80D5F9DC-80D5FA0C 00005C 0030+00 0/1 0/0 0/0 .data l_func$3711 */ static actionFunc l_func[] = {&daTagRiverBack_c::actionWait, &daTagRiverBack_c::actionOrderEvent, &daTagRiverBack_c::actionEvent, &daTagRiverBack_c::actionDead}; @@ -155,7 +154,7 @@ static actor_method_class l_daTagRiverBack_Method = {(process_method_func)daTagR (process_method_func)daTagRiverBack_Delete, (process_method_func)daTagRiverBack_Execute}; -extern actor_process_profile_definition g_profile_Tag_RiverBack = { +actor_process_profile_definition g_profile_Tag_RiverBack = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_rmbit_sw.cpp b/src/d/actor/d_a_tag_rmbit_sw.cpp index 24608dc1a8..5ea0480999 100644 --- a/src/d/actor/d_a_tag_rmbit_sw.cpp +++ b/src/d/actor/d_a_tag_rmbit_sw.cpp @@ -121,7 +121,7 @@ static actor_method_class daTagRmbitSw_METHODS = { }; -extern actor_process_profile_definition g_profile_Tag_RmbitSw = { +actor_process_profile_definition g_profile_Tag_RmbitSw = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_schedule.cpp b/src/d/actor/d_a_tag_schedule.cpp index ba2fa83032..8b8df4d1f5 100644 --- a/src/d/actor/d_a_tag_schedule.cpp +++ b/src/d/actor/d_a_tag_schedule.cpp @@ -22,7 +22,7 @@ static actor_method_class l_daTagSchedule_Method = { (process_method_func)daTagSchedule_Delete }; -extern actor_process_profile_definition g_profile_Tag_Schedule = { +actor_process_profile_definition g_profile_Tag_Schedule = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_setBall.cpp b/src/d/actor/d_a_tag_setBall.cpp index e395c5a7af..57d7038dec 100644 --- a/src/d/actor/d_a_tag_setBall.cpp +++ b/src/d/actor/d_a_tag_setBall.cpp @@ -58,7 +58,7 @@ static actor_method_class l_daTagSetBall_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_SetBall = { +actor_process_profile_definition g_profile_Tag_SetBall = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_setrestart.cpp b/src/d/actor/d_a_tag_setrestart.cpp index ab3d6ff7c5..d96fc0ac01 100644 --- a/src/d/actor/d_a_tag_setrestart.cpp +++ b/src/d/actor/d_a_tag_setrestart.cpp @@ -106,7 +106,7 @@ static actor_method_class l_daTagRestart_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Restart = { +actor_process_profile_definition g_profile_Tag_Restart = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_shop_camera.cpp b/src/d/actor/d_a_tag_shop_camera.cpp index 32a89a6176..07c8d931ba 100644 --- a/src/d/actor/d_a_tag_shop_camera.cpp +++ b/src/d/actor/d_a_tag_shop_camera.cpp @@ -60,7 +60,7 @@ static actor_method_class daTag_ShopCamera_MethodTable = { (process_method_func)daTag_ShopCamera_Draw, }; -extern actor_process_profile_definition g_profile_TAG_SHOPCAM = { +actor_process_profile_definition g_profile_TAG_SHOPCAM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index be9557c131..a9f0ea9171 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -177,7 +177,7 @@ static actor_method_class daTag_ShopItem_MethodTable = { (process_method_func)daTag_ShopItem_Draw, }; -extern actor_process_profile_definition g_profile_TAG_SHOPITM = { +actor_process_profile_definition g_profile_TAG_SHOPITM = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp index ba2d60e688..035a667e2d 100644 --- a/src/d/actor/d_a_tag_smk_emt.cpp +++ b/src/d/actor/d_a_tag_smk_emt.cpp @@ -83,7 +83,7 @@ static actor_method_class daTagSmkEmt_METHODS = { (process_method_func)daTagSmkEmt_draw }; -extern actor_process_profile_definition g_profile_Tag_SmkEmt = { +actor_process_profile_definition g_profile_Tag_SmkEmt = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_spinner.cpp b/src/d/actor/d_a_tag_spinner.cpp index 2459ad8caf..d3c928cb3e 100644 --- a/src/d/actor/d_a_tag_spinner.cpp +++ b/src/d/actor/d_a_tag_spinner.cpp @@ -99,7 +99,7 @@ static actor_method_class l_daTagSpinner_Method = { }; -extern actor_process_profile_definition g_profile_Tag_Spinner = { +actor_process_profile_definition g_profile_Tag_Spinner = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 0ada92d5d8..62121c7c71 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -200,7 +200,7 @@ static actor_method_class l_daTagSppath_Method = { (process_method_func)daTagSppath_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Sppath = { +actor_process_profile_definition g_profile_Tag_Sppath = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_spring.cpp b/src/d/actor/d_a_tag_spring.cpp index 2236440fda..afc26df117 100644 --- a/src/d/actor/d_a_tag_spring.cpp +++ b/src/d/actor/d_a_tag_spring.cpp @@ -93,7 +93,7 @@ static actor_method_class l_daTagSpring_Method = { (process_method_func)NULL, }; -extern actor_process_profile_definition g_profile_Tag_Spring = { +actor_process_profile_definition g_profile_Tag_Spring = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp index 0c6ab21804..b41ef6e33d 100644 --- a/src/d/actor/d_a_tag_ss_drink.cpp +++ b/src/d/actor/d_a_tag_ss_drink.cpp @@ -264,7 +264,7 @@ static actor_method_class daTag_SSDrink_MethodTable = { (process_method_func)daTag_SSDrink_Draw, }; -extern actor_process_profile_definition g_profile_TAG_SSDRINK = { +actor_process_profile_definition g_profile_TAG_SSDRINK = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index a0d4f694c3..eac78855db 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -466,7 +466,7 @@ NULL, reinterpret_cast(daTagStatue_Draw), }; -extern actor_process_profile_definition g_profile_Tag_Statue = { +actor_process_profile_definition g_profile_Tag_Statue = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_stream.cpp b/src/d/actor/d_a_tag_stream.cpp index ab8a611eb1..d681a130bb 100644 --- a/src/d/actor/d_a_tag_stream.cpp +++ b/src/d/actor/d_a_tag_stream.cpp @@ -108,7 +108,7 @@ static actor_method_class l_daTagStream_Method = { (process_method_func)daTagStream_Draw }; -extern actor_process_profile_definition g_profile_Tag_Stream = { +actor_process_profile_definition g_profile_Tag_Stream = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_telop.cpp b/src/d/actor/d_a_tag_telop.cpp index 9f0fcff0ee..76a27ed0e0 100644 --- a/src/d/actor/d_a_tag_telop.cpp +++ b/src/d/actor/d_a_tag_telop.cpp @@ -66,7 +66,7 @@ static actor_method_class l_daTag_Telop_Method = { (process_method_func)daTag_Telop_Draw, }; -extern actor_process_profile_definition g_profile_TAG_TELOP = { +actor_process_profile_definition g_profile_TAG_TELOP = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_theB_hint.cpp b/src/d/actor/d_a_tag_theB_hint.cpp index 65058ab6cd..25acc4361e 100644 --- a/src/d/actor/d_a_tag_theB_hint.cpp +++ b/src/d/actor/d_a_tag_theB_hint.cpp @@ -26,7 +26,7 @@ static actor_method_class l_daTagTheBHint_Method = { (process_method_func)daTagTheBHint_Execute }; -extern actor_process_profile_definition g_profile_Tag_TheBHint = { +actor_process_profile_definition g_profile_Tag_TheBHint = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_wara_howl.cpp b/src/d/actor/d_a_tag_wara_howl.cpp index fa3732ee29..0a4afbeb29 100644 --- a/src/d/actor/d_a_tag_wara_howl.cpp +++ b/src/d/actor/d_a_tag_wara_howl.cpp @@ -82,7 +82,7 @@ static actor_method_class daTagWrHowl_METHODS = { (process_method_func)daTagWrHowl_draw, }; -extern actor_process_profile_definition g_profile_Tag_WaraHowl = { +actor_process_profile_definition g_profile_Tag_WaraHowl = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp index 92102c77a0..7c1b06a5c1 100644 --- a/src/d/actor/d_a_tag_watchge.cpp +++ b/src/d/actor/d_a_tag_watchge.cpp @@ -90,7 +90,7 @@ static actor_method_class l_daTagWatchGe_Method = { (process_method_func)daTagWatchGe_Draw }; -extern actor_process_profile_definition g_profile_Tag_WatchGe = { +actor_process_profile_definition g_profile_Tag_WatchGe = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index 6bffd89a36..066936d634 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -239,7 +239,7 @@ static actor_method_class l_daTagWaterFall_Method = { (process_method_func)daTagWaterFall_Draw, }; -extern actor_process_profile_definition g_profile_Tag_WaterFall = { +actor_process_profile_definition g_profile_Tag_WaterFall = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_wljump.cpp b/src/d/actor/d_a_tag_wljump.cpp index c896c2406e..0c229719ac 100644 --- a/src/d/actor/d_a_tag_wljump.cpp +++ b/src/d/actor/d_a_tag_wljump.cpp @@ -240,7 +240,7 @@ static actor_method_class l_daTagWljump_Method = { (process_method_func)daTagWljump_Draw, }; -extern actor_process_profile_definition g_profile_Tag_Wljump = { +actor_process_profile_definition g_profile_Tag_Wljump = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index 8708b8d395..7420bd48dc 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -125,7 +125,7 @@ static actor_method_class l_daTagYami_Method = { (process_method_func)daTagYami_Execute, }; -extern actor_process_profile_definition g_profile_TAG_YAMI = { +actor_process_profile_definition g_profile_TAG_YAMI = { fpcLy_CURRENT_e, // mLayerID 3, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp index 82132b589b..071f53ba74 100644 --- a/src/d/actor/d_a_talk.cpp +++ b/src/d/actor/d_a_talk.cpp @@ -107,7 +107,7 @@ static actor_method_class l_daTalk_Method = { (process_method_func)daTalk_Draw, }; -extern actor_process_profile_definition g_profile_TALK = { +actor_process_profile_definition g_profile_TALK = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index faed410404..bb12fd1886 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -1900,7 +1900,7 @@ static actor_method_class daTbox_METHODS = { (process_method_func)daTbox_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_TBOX = { +actor_process_profile_definition g_profile_TBOX = { fpcLy_CURRENT_e, 4, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index f844bff156..06f0ac9aa4 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -452,7 +452,7 @@ static actor_method_class daTbox2_METHODS = { (process_method_func)daTbox2_MoveBGDraw, }; -extern actor_process_profile_definition g_profile_TBOX2 = { +actor_process_profile_definition g_profile_TBOX2 = { fpcLy_CURRENT_e, 4, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_tboxSw.cpp b/src/d/actor/d_a_tboxSw.cpp index 1e4a0d788b..e0d13dfe7f 100644 --- a/src/d/actor/d_a_tboxSw.cpp +++ b/src/d/actor/d_a_tboxSw.cpp @@ -62,7 +62,7 @@ static actor_method_class l_daTboxSw_Method = { (process_method_func)daTboxSw_Draw, }; -extern actor_process_profile_definition g_profile_TBOX_SW = { +actor_process_profile_definition g_profile_TBOX_SW = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 6e08dd431b..22d39a7bbb 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -371,7 +371,7 @@ static actor_method_class l_daTitle_Method = { (process_method_func)daTitle_Draw, }; -extern actor_process_profile_definition g_profile_TITLE = { +actor_process_profile_definition g_profile_TITLE = { fpcLy_CURRENT_e, // mLayerID 7, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index fa7682526f..681ed0ed92 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -148,7 +148,7 @@ static actor_method_class l_daVrbox_Method = { (process_method_func)daVrbox_Draw, }; -extern actor_process_profile_definition g_profile_VRBOX = { +actor_process_profile_definition g_profile_VRBOX = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 815a33dd63..94cd1510de 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -180,7 +180,6 @@ static int daVrbox2_Draw(vrbox2_class* i_this) { if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) { - /* 80499B78-80499B7C 000000 0002+02 1/1 0/0 0/0 .bss mangZ$3688 */ static s16 mangZ; sp14 = sun_p->mPos[0]; @@ -387,7 +386,7 @@ static int daVrbox2_color_set(vrbox2_class* i_this) { } static int daVrbox2_Execute(vrbox2_class* i_this) { - i_this = i_this; // ?? fakematch? only needed for debug + UNUSED(i_this); if (g_env_light.daytime > 255.0f) { i_this->mSunBtk.play(); @@ -454,7 +453,7 @@ static actor_method_class l_daVrbox2_Method = { (process_method_func)daVrbox2_Draw, }; -extern actor_process_profile_definition g_profile_VRBOX2 = { +actor_process_profile_definition g_profile_VRBOX2 = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index ea16657ddd..2e0a1bc089 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -158,7 +158,7 @@ static actor_method_class l_daWarpBug_Method = { (process_method_func)daWarpBug_Draw, }; -extern actor_process_profile_definition g_profile_WarpBug = { +actor_process_profile_definition g_profile_WarpBug = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index 208d44d0d7..45e162575a 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -278,7 +278,7 @@ static actor_method_class daYkgrMethodTable = { daYkgrDraw, }; -extern actor_process_profile_definition g_profile_Ykgr = { +actor_process_profile_definition g_profile_Ykgr = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 9f2efe0894..e1fa3b8e22 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -72,9 +72,6 @@ void posMoveF_resist_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* strea pos->set(sp14); } -/* 800374EC-80037620 031E2C 0134+00 1/1 0/0 0/0 .text - * posMoveF_grade_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzffPC4cXyzPC4cXyz - */ void posMoveF_grade_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* param_2, f32 friction, f32 no_grade_cos, const cXyz* param_5, const cXyz* param_6) { pos->set(cXyz::Zero); diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index d41cef2b19..96f5d0ad69 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -1761,17 +1761,9 @@ void dAttCatch_c::proc() { mCatchItemNo = fpcNm_ITEM_WATER_BOTTLE; } -// FAKEMATCH: this fixes regalloc in `dAttCatch_c::request` but breaks most other calls -// some more accurate fix should be found eventually -inline fopAc_ac_c* dComIfGp_getPlayer_fakematch(int idx) { - daAlink_c* const link = (daAlink_c* const)g_dComIfG_gameInfo.play.getPlayer(idx); - fopAc_ac_c* player = (fopAc_ac_c*)link; - return player; -} - int dAttCatch_c::request(fopAc_ac_c* i_reqActor, u8 i_itemNo, f32 i_horizontalDist, f32 i_upDist, f32 i_downDist, s16 i_angle, int param_7) { - fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer_fakematch(0); + fopAc_ac_c* player = dComIfGp_getPlayer(0); if (param_7 > field_0x4) { return 0; } diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp index bc16cdade6..1f3046128c 100644 --- a/src/d/d_bg_s_acch.cpp +++ b/src/d/d_bg_s_acch.cpp @@ -121,9 +121,8 @@ void dBgS_Acch::Set(fopAc_ac_c* i_actor, int i_tbl_size, dBgS_AcchCir* i_acchcir } void dBgS_Acch::GroundCheckInit(dBgS& i_bgs) { + UNUSED(i_bgs); if (!(m_flags & 2)) { - i_bgs; // necessary to match - m_ground_h = -G_CM3D_F_INF; m_gnd.SetExtChk(*this); field_0xb4 = ChkGroundHit(); diff --git a/src/d/d_bg_s_movebg_actor.cpp b/src/d/d_bg_s_movebg_actor.cpp index e0bdabc811..3e0735cf91 100644 --- a/src/d/d_bg_s_movebg_actor.cpp +++ b/src/d/d_bg_s_movebg_actor.cpp @@ -85,9 +85,6 @@ int dBgS_MoveBgActor::MoveBGCreateHeap() { return 1; } -/* 800787BC-800788DC 0730FC 0120+00 0/0 0/0 169/169 .text - * MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f - */ int dBgS_MoveBgActor::MoveBGCreate(char const* i_arcName, int i_dzb_id, MoveBGActor_SetFunc i_setFunc, u32 i_heapSize, Mtx* i_bgMtx) { if (i_bgMtx == NULL) { diff --git a/src/d/d_bg_w.cpp b/src/d/d_bg_w.cpp index 09a96ed166..d0f5a718eb 100644 --- a/src/d/d_bg_w.cpp +++ b/src/d/d_bg_w.cpp @@ -2144,9 +2144,5 @@ dBgW* dBgW_NewSet(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) { return nw; } -/* 80450F88 0001+00 data_80450F88 None */ -/* 80450F89 0001+00 data_80450F89 None */ -/* 80450F8A 0001+00 data_80450F8A None */ -/* 80450F8B 0005+00 data_80450F8B None */ extern u8 struct_80450F88[8]; u8 struct_80450F88[8]; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index b6ca10750e..9425cfdde4 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -720,8 +720,7 @@ void dCamera_c::initPad() { mHoldY = mDoCPd_c::getHoldY(mPadID) ? true : false; mTrigY = mDoCPd_c::getTrigY(mPadID) ? true : false; - // fakematch (doesn't match in debug) - mHoldZ = (u8)mDoCPd_c::getHoldZ(mPadID) ? true : false; + mHoldZ = mDoCPd_c::getHoldZ(mPadID) ? true : false; mTrigZ = mDoCPd_c::getTrigZ(mPadID) ? true : false; field_0x21f = 0; @@ -4223,15 +4222,13 @@ bool dCamera_c::lockonCamera(s32 param_0) { target_attention_pos.z = positionOf(mpLockonTarget).z; } - // this should probably be an ifdef, but we force it to be compiled - // to make the function large enough to stop doing inlining - if (!NDEBUG_DEFINED) { - if (mCamSetup.CheckFlag(0x8000)) { - //char name[28]; - fopAcM_getNameString(mpPlayerActor, NULL); - dDbVw_Report(0x1e0, 0x109, "%s", NULL); - } +#if DEBUG + if (mCamSetup.CheckFlag(0x8000)) { + char name[dStage_NAME_LENGTH]; + fopAcM_getNameString(mpPlayerActor, name); + dDbVw_Report(0x1e0, 0x109, "%s", name); } +#endif if (check_owner_action(mPadID, 0x2000008)) { cXyz vec(0.0f, 0.0f, -90.0f); @@ -8924,7 +8921,7 @@ bool dCamera_c::oneSideCamera(s32 param_1) { bool dCamera_c::eventCamera(s32 param_0) { char sp90[12]; - (void)param_0; + UNUSED(param_0); int var_r29 = -1; typedef bool (dCamera_c::*func)(); @@ -10072,7 +10069,7 @@ static leafdraw_method_class method = { (process_method_func)camera_draw, }; -extern camera_process_profile_definition g_profile_CAMERA = { +camera_process_profile_definition g_profile_CAMERA = { fpcLy_CURRENT_e, 11, fpcPi_CURRENT_e, @@ -10093,7 +10090,7 @@ extern camera_process_profile_definition g_profile_CAMERA = { 0, }; -extern camera_process_profile_definition g_profile_CAMERA2 = { +camera_process_profile_definition g_profile_CAMERA2 = { fpcLy_CURRENT_e, 11, fpcPi_CURRENT_e, diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp index 989cb3776c..f7e275dea4 100644 --- a/src/d/d_cc_s.cpp +++ b/src/d/d_cc_s.cpp @@ -107,9 +107,6 @@ bool dCcS::ChkShield(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, dCcD_GObjInf* i_atObj void dCcS::CalcTgPlusDmg(cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts) {} -/* 800861B4-80086240 080AF4 008C+00 1/0 0/0 0/0 .text - * ChkAtTgHitAfterCross__4dCcSFbbPC12cCcD_GObjInfPC12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts - */ bool dCcS::ChkAtTgHitAfterCross(bool i_setAt, bool i_setTg, cCcD_GObjInf const* i_atObjInf, cCcD_GObjInf const* i_tgObjInf, cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts, cCcD_GStts* i_atGStts, cCcD_GStts* i_tgGStts) { @@ -142,9 +139,6 @@ bool dCcS::ChkAtTgHitAfterCross(bool i_setAt, bool i_setTg, cCcD_GObjInf const* return false; } -/* 80086240-80086360 080B80 0120+00 1/0 0/0 0/0 .text - * SetCoGObjInf__4dCcSFbbP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GStts - */ void dCcS::SetCoGObjInf(bool i_co1Set, bool i_co2Set, cCcD_GObjInf* i_co1Obj, cCcD_GObjInf* i_co2Obj, cCcD_Stts* i_co1Stts, cCcD_Stts* i_co2Stts, cCcD_GStts* i_co1GStts, cCcD_GStts* i_co2GStts) { @@ -364,9 +358,6 @@ void dCcS::CalcParticleAngle(dCcD_GObjInf* i_atObjInf, cCcD_Stts* i_atStts, cCcD cM3d_CalcVecZAngle(vec, o_angle); } -/* 8008685C-80086AC0 08119C 0264+00 1/1 0/0 0/0 .text - * ProcAtTgHitmark__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12dCcD_GObjInfP12dCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10dCcD_GSttsP10dCcD_GSttsP4cXyzb - */ void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_Obj* param_3, dCcD_GObjInf* i_atObjInf, dCcD_GObjInf* i_tgObjInf, cCcD_Stts* param_6, cCcD_Stts* param_7, dCcD_GStts* param_8, dCcD_GStts* param_9, @@ -429,9 +420,6 @@ void dCcS::ProcAtTgHitmark(bool i_setAt, bool i_setTg, cCcD_Obj* param_2, cCcD_O } } -/* 80086AC0-80086D8C 081400 02CC+00 1/0 0/0 0/0 .text - * SetAtTgGObjInf__4dCcSFbbP8cCcD_ObjP8cCcD_ObjP12cCcD_GObjInfP12cCcD_GObjInfP9cCcD_SttsP9cCcD_SttsP10cCcD_GSttsP10cCcD_GSttsP4cXyz - */ void dCcS::SetAtTgGObjInf(bool i_setAt, bool i_setTg, cCcD_Obj* i_atObj, cCcD_Obj* i_tgObj, cCcD_GObjInf* i_atObjInf, cCcD_GObjInf* i_tgObjInf, cCcD_Stts* i_atStts, cCcD_Stts* i_tgStts, cCcD_GStts* i_atGStts, cCcD_GStts* i_tgGStts, diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 794a663f61..461f182719 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -115,10 +115,8 @@ daSus_c::data_c daSus_c::mData[0x20]; daSus_c::room_c daSus_c::mRoom[0x40]; -/* 80450D88 0002+00 data_80450D88 m_count__9daArrow_c */ s16 daArrow_c::m_count; -/* 80450D8A 0002+00 data_80450D8A mSetTop__7daSus_c */ s16 daSus_c::mSetTop; int daSus_c::newData(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3, u8 param_4, @@ -247,13 +245,10 @@ void daNpcKakashi_clrSuccessCount() { dComIfGs_setTmpReg(0xFEFF, 0); } -/* 80450D8C 0001+00 data_80450D8C None */ bool daYkgr_c::m_flag; -/* 80450D8D 0001+00 data_80450D8D None */ bool daYkgr_c::m_alpha_flag; -/* 80450D8E 0002+00 data_80450D8E None */ u8 daYkgr_c::m_alpha; f32 daYkgr_c::m_aim_rate; @@ -416,10 +411,8 @@ int daTagMagne_c::checkMagneC() { return 0; } -/* 80450DC0 0001+00 data_80450DC0 None */ u8 daTagMist_c::mPlayerNo; -/* 80450DC1 0003+00 data_80450DC1 None */ bool daObjCarry_c::mSaveFlag; u8 daTagMist_c::getPlayerNo() { diff --git a/src/d/d_debug_viewer.cpp b/src/d/d_debug_viewer.cpp index f34328afc0..eb873f483d 100644 --- a/src/d/d_debug_viewer.cpp +++ b/src/d/d_debug_viewer.cpp @@ -122,7 +122,7 @@ static JUtility::TColor ShadowDarkColor(0, 0, 0, 0x80); static JUtility::TColor ShadowLightColor(0xFF, 0xFF, 0xFF, 0x80); int dDbVw_Report(int x, int y, char const* string, ...) { - string; + UNUSED(string); char buffer[256]; if (reportOK()) { diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index f199a7a3b9..e324a22272 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -14,9 +14,6 @@ s16 dDemo_c::m_branchId = -1; namespace { jstudio_tAdaptor_message::~jstudio_tAdaptor_message() {} -/* 80037E44-80037E74 032784 0030+00 1/0 0/0 0/0 .text - * adaptor_do_MESSAGE__Q220@unnamed@d_demo_cpp@24jstudio_tAdaptor_messageFQ37JStudio4data15TEOperationDataPCvUl - */ void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData iType, const void* pContent, u32 uSize) { switch (iType) { @@ -40,9 +37,6 @@ void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData jstudio_tCreateObject_message::~jstudio_tCreateObject_message() {} -/* 80037ED4-80038020 032814 014C+00 1/0 0/0 0/0 .text - * create__Q220@unnamed@d_demo_cpp@29jstudio_tCreateObject_messageFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object - */ bool jstudio_tCreateObject_message::create(JStudio::TObject** ppObject, const JStudio::stb::data::TParse_TBlock_object& iBlock) { diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index def0edfd65..51b082baf7 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -236,7 +236,7 @@ static leafdraw_method_class l_dEnvSe_Method = { (process_method_func)dEnvSe_Draw, }; -extern kankyo_process_profile_definition g_profile_ENVSE = { +kankyo_process_profile_definition g_profile_ENVSE = { fpcLy_CURRENT_e, 2, fpcPi_CURRENT_e, diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index ac0f1191f1..a961562f80 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -13,7 +13,6 @@ #include "d/actor/d_a_alink.h" namespace { - /* 800889F8-80088A7C 083338 0084+00 1/1 0/0 0/0 .text isStageEvent__25@unnamed@d_ev_camera_cpp@Fi */ static bool isStageEvent(int param_0) { dStage_MapEventInfo_c* info = dComIfGp_getStage()->getMapEventInfo(); if (info != NULL) { @@ -496,7 +495,6 @@ bool dCamera_c::pauseEvCamera() { } namespace { - /* 804253B4-804253C0 0520D4 000C+00 2/3 0/0 0/0 .bss WolfAdditionVec__25@unnamed@d_ev_camera_cpp@*/ static cXyz WolfAdditionVec(0.0f, -70.0f, 70.0f); } @@ -840,10 +838,8 @@ bool dCamera_c::rollingEvCamera() { } namespace { - /* 804253CC-804253D8 0520EC 000C+00 1/2 0/0 0/0 .bss MidnaAdditionVec__25@unnamed@d_ev_camera_cpp@ */ static cXyz MidnaAdditionVec(0.0f, 0.0f, 70.0f); - /* 8008E750-8008E774 089090 0024+00 1/1 0/0 0/0 .text isRelChar__25@unnamed@d_ev_camera_cpp@Fc */ static inline bool isRelChar(char param_1) { return param_1 != '-' && param_1 != 'x'; } @@ -995,7 +991,7 @@ bool dCamera_c::transEvCamera(int param_1) { trans->mEye = (*ptr1).mEye; trans->mFovy = (*ptr1).mFovy; trans->field_0x3c = (*ptr1).mBank; - if (float(s16(ptr1->mBank)) != 0.0f) { + if (s16(ptr1->mBank) != 0.0f) { trans->field_0x68 = true; } } @@ -1011,7 +1007,7 @@ bool dCamera_c::transEvCamera(int param_1) { trans->mStartEye = (*ptr2).mEye; trans->mStartFovy = (*ptr2).mFovy; trans->field_0x1c = (*ptr2).mBank; - if (float(s16(ptr2->mBank)) != 0.0f) { + if (s16(ptr2->mBank) != 0.0f) { trans->field_0x68 = true; } } diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 881d1cc05b..4bf16c7e42 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -489,18 +489,24 @@ bool d_GameOver_Delete(fpc_ProcID& i_id) { return false; } -static void* l_dGameover_Method[5] = { - (void*)dGameover_Create, - (void*)dGameover_Delete, - (void*)dGameover_Execute, - (void*)dGameover_IsDelete, - (void*)dGameover_Draw, +static leafdraw_method_class l_dGameover_Method = { + (process_method_func)dGameover_Create, + (process_method_func)dGameover_Delete, + (process_method_func)dGameover_Execute, + (process_method_func)dGameover_IsDelete, + (process_method_func)dGameover_Draw, }; -extern void* g_profile_GAMEOVER[10] = { - (void*)0xFFFFFFFD, (void*)0x000CFFFD, - (void*)0x03170000, (void*)&g_fpcLf_Method, - (void*)0x0000011C, (void*)NULL, - (void*)NULL, (void*)&g_fopMsg_Method, - (void*)0x03030000, (void*)&l_dGameover_Method, +msg_process_profile_definition g_profile_GAMEOVER = { + fpcLy_CURRENT_e, + 0x0C, + fpcPi_CURRENT_e, + PROC_GAMEOVER, + &g_fpcLf_Method.base, + sizeof(dGameover_c), + 0, + 0, + &g_fopMsg_Method, + 0x303, + &l_dGameover_Method, }; diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index f8167d974e..a619943ccc 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -168,7 +168,7 @@ static leafdraw_method_class l_dkWmark_Method = { (process_method_func)dkWmark_Draw, }; -extern kankyo_process_profile_definition g_profile_WMARK = { +kankyo_process_profile_definition g_profile_WMARK = { fpcLy_CURRENT_e, 9, fpcPi_CURRENT_e, diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index f2d8cd5a3e..b89783c6ee 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -132,7 +132,7 @@ static leafdraw_method_class l_dkWpillar_Method = { (process_method_func)dkWpillar_Draw, }; -extern kankyo_process_profile_definition g_profile_WPILLAR = { +kankyo_process_profile_definition g_profile_WPILLAR = { fpcLy_CURRENT_e, 9, fpcPi_CURRENT_e, diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 227a2b54ad..47a72be75f 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -2219,9 +2219,6 @@ void dScnKy_env_light_c::setLight_palno_get(u8* prev_envr_id_p, u8* next_envr_id #endif } -/* 801A0340-801A040C 19AC80 00CC+00 3/3 0/0 0/0 .text - * dKy_calc_color_set__FP11_GXColorS10P15color_RGB_classP15color_RGB_classP15color_RGB_classP15color_RGB_classff11_GXColorS10f - */ void dKy_calc_color_set(GXColorS10* out_color_p, color_RGB_class* color_a_start_p, color_RGB_class* color_b_start_p, color_RGB_class* color_a_end_p, color_RGB_class* color_b_end_p, f32 color_ratio, f32 blend_ratio, @@ -3046,9 +3043,6 @@ void dScnKy_env_light_c::setLight_actor(dKy_tevstr_c* tevstr_p, GXColorS10* fog_ } } -/* 801A1D64-801A1F58 19C6A4 01F4+00 1/1 0/0 0/0 .text - * settingTevStruct_colget_actor__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_cP11_GXColorS10P11_GXColorS10PfPf - */ void dScnKy_env_light_c::settingTevStruct_colget_actor(cXyz* unused, dKy_tevstr_c* tevstr_p, GXColorS10* out_color_p, GXColorS10* fog_col_p, f32* fog_near_p, @@ -3176,13 +3170,10 @@ static void cLib_addCalcU8(u8* i_value, u8 i_target, s16 i_scale, s16 i_maxStep) *i_value = value; } -/* 801A2128-801A37C4 19CA68 169C+00 2/1 0/0 0/0 .text - * settingTevStruct_plightcol_plus__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_c11_GXColorS1011_GXColorS10Uc - */ void dScnKy_env_light_c::settingTevStruct_plightcol_plus(cXyz* pos_p, dKy_tevstr_c* tevstr_p, GXColorS10 param_2, GXColorS10 param_3, u8 init_timer) { - (void)param_3; + UNUSED(param_3); dScnKy_env_light_c* kankyo = dKy_getEnvlight(); cXyz light_pos; Vec spDC; @@ -8511,7 +8502,7 @@ void dKy_undwater_filter_draw() { } static int dKy_Draw(sub_kankyo__class* i_this) { - (void)i_this; + UNUSED(i_this); g_env_light.drawKankyo(); #if DEBUG @@ -8531,7 +8522,7 @@ static int dKy_Draw(sub_kankyo__class* i_this) { } static int dKy_Execute(sub_kankyo__class* i_this) { - (void)i_this; + UNUSED(i_this); dScnKy_env_light_c* kankyo = dKy_getEnvlight(); g_env_light.exeKankyo(); dKyw_wind_set(); @@ -8570,7 +8561,7 @@ static int dKy_IsDelete(sub_kankyo__class* i_this) { } static int dKy_Delete(sub_kankyo__class* i_this) { - (void)i_this; + UNUSED(i_this); plight_init(); mDoAud_mEnvse_resetScene(); @@ -8670,7 +8661,7 @@ static leafdraw_method_class l_dKy_Method = { (process_method_func)dKy_Draw, }; -extern kankyo_process_profile_definition g_profile_KANKYO = { +kankyo_process_profile_definition g_profile_KANKYO = { fpcLy_CURRENT_e, 1, fpcPi_CURRENT_e, diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 6cf04ee9cc..77545a769c 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -269,7 +269,7 @@ static leafdraw_method_class l_dThunder_Method = { (process_method_func)dThunder_Draw, }; -extern kankyo_process_profile_definition g_profile_KY_THUNDER = { +kankyo_process_profile_definition g_profile_KY_THUNDER = { fpcLy_CURRENT_e, 7, fpcPi_CURRENT_e, diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 01cba3718b..f3c4839002 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -71,7 +71,7 @@ static leafdraw_method_class l_dKyeff_Method = { (process_method_func)dKyeff_Draw, }; -extern kankyo_process_profile_definition g_profile_KYEFF = { +kankyo_process_profile_definition g_profile_KYEFF = { fpcLy_CURRENT_e, 12, fpcPi_CURRENT_e, diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index c9c914eaf9..b58d781ff4 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -43,7 +43,7 @@ static leafdraw_method_class l_dKyeff2_Method = { (process_method_func)dKyeff2_Draw, }; -extern kankyo_process_profile_definition g_profile_KYEFF2 = { +kankyo_process_profile_definition g_profile_KYEFF2 = { fpcLy_CURRENT_e, 12, fpcPi_CURRENT_e, diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp index a7d6172436..4f45717806 100644 --- a/src/d/d_map_path_dmap.cpp +++ b/src/d/d_map_path_dmap.cpp @@ -357,10 +357,8 @@ bool dMpath_c::isExistMapPathData() { int dMapInfo_c::mNextRoomNo = -1; -/* 80450634 0001+00 data_80450634 None */ s8 dMpath_c::mBottomFloorNo = 127; -/* 80450635 0001+00 data_80450635 None */ s8 dMpath_c::mTopFloorNo = -128; int dMpath_c::getTopBottomFloorNo(s8* i_topFloorNo, s8* i_bottomFloorNo) { diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index bfe946f726..649df3039f 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -1383,12 +1383,9 @@ void dMenu_Fmap_c::portal_demo5_init() { void dMenu_Fmap_c::portal_demo5_move() { mpStick->checkTrigger(); - // fakematch: the call to the fake inline function dMeter2Info_isTouchKeyCheck_alt - // should actually call dMeter2Info_isTouchKeyCheck, but for some reason the generated asm - // is different from every other call to dMeter2Info_isTouchKeyCheck if (dMw_B_TRIGGER() || dMw_Z_TRIGGER() || dMw_START_TRIGGER() || dMw_UP_TRIGGER() || dMw_DOWN_TRIGGER() || dMw_LEFT_TRIGGER() || dMw_RIGHT_TRIGGER() - || dMeter2Info_isTouchKeyCheck_alt(0xc)) + || dMeter2Info_isTouchKeyCheck(0xc)) { dMsgObject_setTalkHeap(mpTalkHeap); fopMsgM_messageSet(2015, 1000); diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index dc5fd5d4f5..a8776ee94b 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -1892,7 +1892,7 @@ void dMenu_Fmap2DBack_c::regionMapMove(STControl* i_stick) { } void dMenu_Fmap2DBack_c::stageMapMove(STControl* i_stick, u8 param_1, bool param_2) { - (void)param_1; + UNUSED(param_1); f32 slow_bound = g_fmapHIO.mScrollSpeedSlowBound < g_fmapHIO.mScrollSpeedFastBound ? g_fmapHIO.mScrollSpeedSlowBound : g_fmapHIO.mScrollSpeedFastBound; diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index c47431df70..8542d0eac9 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -1728,7 +1728,7 @@ static leafdraw_method_class l_dMw_Method = { (process_method_func)dMw_Draw, }; -extern msg_process_profile_definition g_profile_MENUWINDOW = { +msg_process_profile_definition g_profile_MENUWINDOW = { fpcLy_CURRENT_e, 12, fpcPi_CURRENT_e, diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 1c282afedd..14efe0fc34 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -3087,12 +3087,12 @@ static leafdraw_method_class l_dMeter2_Method = { (process_method_func)dMeter2_Draw, }; -extern msg_process_profile_definition g_profile_METER2 = { +msg_process_profile_definition g_profile_METER2 = { fpcLy_CURRENT_e, 12, fpcPi_CURRENT_e, PROC_METER2, - (process_method_class*)&g_fpcLf_Method, + &g_fpcLf_Method.base, sizeof(dMeter2_c), 0, 0, diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index aed3bf7fe1..971868b3fa 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -1298,9 +1298,6 @@ void dMeter2Draw_c::playOxygenBpkAnimation(J2DAnmColor* i_bpk) { } } -/* 80213FF0-802140DC 20E930 00EC+00 1/1 0/0 0/0 .text - * drawPikari__13dMeter2Draw_cFP8CPaneMgrPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc - */ void dMeter2Draw_c::drawPikari(CPaneMgr* i_pane, f32* i_framep, f32 i_scale, JUtility::TColor i_moyaBlack, JUtility::TColor i_moyaWhite, JUtility::TColor i_moyabsBlack, JUtility::TColor i_moyabsWhite, @@ -1310,9 +1307,6 @@ void dMeter2Draw_c::drawPikari(CPaneMgr* i_pane, f32* i_framep, f32 i_scale, i_moyabsWhite, param_7, param_8); } -/* 802140DC-8021462C 20EA1C 0550+00 1/1 6/6 0/0 .text - * drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc - */ void dMeter2Draw_c::drawPikari(f32 i_posX, f32 i_posY, f32* i_framep, f32 i_scale, JUtility::TColor i_moyaBlack, JUtility::TColor i_moyaWhite, JUtility::TColor i_moyabsBlack, JUtility::TColor i_moyabsWhite, @@ -1385,9 +1379,6 @@ void dMeter2Draw_c::drawPikari(f32 i_posX, f32 i_posY, f32* i_framep, f32 i_scal } } -/* 8021462C-802147CC 20EF6C 01A0+00 0/0 1/1 0/0 .text - * drawPikariHakusha__13dMeter2Draw_cFffffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor - */ void dMeter2Draw_c::drawPikariHakusha(f32 i_posX, f32 i_posY, f32 i_frame, f32 i_scale, JUtility::TColor i_moyaBlack, JUtility::TColor i_moyaWhite, JUtility::TColor i_moyabsBlack, diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index 94ddceb726..138c15eb33 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -791,9 +791,6 @@ u8 dMeter2Info_c::getItemType(u8 i_itemNo) { return type; } -/* 8021CF08-8021D36C 217848 0464+00 0/0 9/9 0/0 .text - * readItemTexture__13dMeter2Info_cFUcPvP10J2DPicturePvP10J2DPicturePvP10J2DPicturePvP10J2DPicturei - */ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_pic1, void* i_texBuf2, J2DPicture* i_pic2, void* i_texBuf3, J2DPicture* i_pic3, void* i_texBuf4, J2DPicture* i_pic4, int param_9) { diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index a3b92cb9b9..20a5fe7ba1 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -3481,7 +3481,7 @@ void dMeter_ringHIO_c::genMessage(JORMContext* mctx) { } BOOL subJOREventCallbackListNode::JORAct(u32 param_1, const char* param_2) { - (void)param_1; + UNUSED(param_1); JORFile file; if (file.open(param_2, 1, "", NULL, NULL, NULL)) { if (!g_fmapHIO.mpArcFile) { diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index f8ba9a788a..c7ecc0780a 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -865,7 +865,7 @@ jmessage_tMeasureProcessor::jmessage_tMeasureProcessor(jmessage_tReference const } void jmessage_tMeasureProcessor::do_begin(void const* pEntry, char const* pszText) { - (void)pszText; + UNUSED(pszText); jmessage_tReference* pReference = (jmessage_tReference*)getReference(); pReference->resetCharactor(); @@ -3928,8 +3928,8 @@ jmessage_string_tMeasureProcessor::jmessage_string_tMeasureProcessor(jmessage_st } void jmessage_string_tMeasureProcessor::do_begin(void const* pEntry, char const* pszText) { - (void)pEntry; - (void)pszText; + UNUSED(pEntry); + UNUSED(pszText); mpReference->setLineCount(0); mpReference->resetCharactor(); } @@ -4357,9 +4357,6 @@ void jmessage_string_tMeasureProcessor::do_rubyset(void const* i_data, u32 i_siz } } -/* 80230A08-80230A5C 22B348 0054+00 0/0 1/1 0/0 .text - * __ct__34jmessage_string_tSequenceProcessorFPC26jmessage_string_tReferenceP24jmessage_string_tControl - */ jmessage_string_tSequenceProcessor::jmessage_string_tSequenceProcessor( jmessage_string_tReference const* pReference, jmessage_string_tControl* pControl) : JMessage::TSequenceProcessor(pReference, pControl), diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 42301e6507..6e2287a869 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -2461,7 +2461,7 @@ static leafdraw_method_class l_dMsgObject_Method = { (process_method_func)dMsgObject_Draw, }; -extern msg_process_profile_definition g_profile_MSG_OBJECT = { +msg_process_profile_definition g_profile_MSG_OBJECT = { fpcLy_CURRENT_e, // mLayerID 12, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/d_msg_string_base.cpp b/src/d/d_msg_string_base.cpp index 531f543144..2e3124e6bd 100644 --- a/src/d/d_msg_string_base.cpp +++ b/src/d/d_msg_string_base.cpp @@ -88,9 +88,6 @@ f32 dMsgStringBase_c::getStringLocal(u32 param_1, J2DTextBox* param_2, J2DTextBo return lineLength; } -/* 802498D8-80249A48 244218 0170+00 1/1 1/1 0/0 .text - * getStringPageLocal__16dMsgStringBase_cFUlUcUcP10J2DTextBoxP10J2DTextBoxP7JUTFontP10COutFont_cUc - */ f32 dMsgStringBase_c::getStringPageLocal(u32 param_1, u8 param_2, u8 param_3, J2DTextBox* param_4, J2DTextBox* param_5, JUTFont* param_6, COutFont_c* param_7, u8 param_8) { diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index a605e8d4bd..d8edae5d33 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -132,7 +132,7 @@ static leafdraw_method_class l_dOvlpFd_Method = { (process_method_func)dOvlpFd_Draw, }; -extern overlap_process_profile_definition g_profile_OVERLAP0 = { +overlap_process_profile_definition g_profile_OVERLAP0 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -146,7 +146,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP0 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP1 = { +overlap_process_profile_definition g_profile_OVERLAP1 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -160,7 +160,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP1 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP6 = { +overlap_process_profile_definition g_profile_OVERLAP6 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -174,7 +174,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP6 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP7 = { +overlap_process_profile_definition g_profile_OVERLAP7 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -188,7 +188,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP7 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP8 = { +overlap_process_profile_definition g_profile_OVERLAP8 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -202,7 +202,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP8 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP9 = { +overlap_process_profile_definition g_profile_OVERLAP9 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -216,7 +216,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP9 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP10 = { +overlap_process_profile_definition g_profile_OVERLAP10 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, @@ -230,7 +230,7 @@ extern overlap_process_profile_definition g_profile_OVERLAP10 = { &l_dOvlpFd_Method, }; -extern overlap_process_profile_definition g_profile_OVERLAP11 = { +overlap_process_profile_definition g_profile_OVERLAP11 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 2ecf5a5f16..21abd58cdd 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -236,7 +236,7 @@ static leafdraw_method_class l_dOvlpFd2_Method = { (process_method_func)dOvlpFd2_Draw, }; -extern overlap_process_profile_definition g_profile_OVERLAP2 = { +overlap_process_profile_definition g_profile_OVERLAP2 = { fpcLy_ROOT_e, 2, fpcPi_CURRENT_e, diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index cc180c6ca4..8911220768 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -234,7 +234,7 @@ static leafdraw_method_class l_dOvlpFd3_Method = { (process_method_func)dOvlpFd3_Draw, }; -extern overlap_process_profile_definition g_profile_OVERLAP3 = { +overlap_process_profile_definition g_profile_OVERLAP3 = { fpcLy_ROOT_e, 0, fpcPi_CURRENT_e, diff --git a/src/d/d_pane_class.cpp b/src/d/d_pane_class.cpp index 8b4e3543f6..0b12ff7d15 100644 --- a/src/d/d_pane_class.cpp +++ b/src/d/d_pane_class.cpp @@ -283,9 +283,6 @@ bool CPaneMgr::scaleAnime(s16 param_0, f32 param_1, f32 param_2, u8 param_3) { return false; } -/* 802548BC-80254C90 24F1FC 03D4+00 0/0 4/4 0/0 .text - * colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc - */ bool CPaneMgr::colorAnime(s16 anmTimer, JUtility::TColor startBlack, JUtility::TColor endBlack, JUtility::TColor startWhite, JUtility::TColor endWhite, u8 calcType) { if (mColorAnime < anmTimer - 1) { diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index bd1c524b8b..c28ef4be0c 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -139,9 +139,6 @@ dPa_modelEcallBack::model_c* dPa_modelEcallBack::mModel; u8 dPa_modelEcallBack::mNum; #endif -/* 80450E9C 0001+00 data_80450E9C None */ -/* 80450E9D 0001+00 data_80450E9D None */ -/* 80450E9E 0002+00 data_80450E9E None */ static u8 struct_80450E9C; static u8 struct_80450E9D; @@ -1419,9 +1416,6 @@ void dPa_control_c::setWaterRipple(u32* param_0, cBgS_PolyInfo& param_1, cXyz co } } -/* 8004CA90-8004CF90 0473D0 0500+00 3/3 20/20 418/418 .text - * set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf - */ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos, dKy_tevstr_c const* param_3, csXyz const* i_rotation, cXyz const* i_scale, u8 i_alpha, dPa_levelEcallBack* param_7, @@ -1606,9 +1600,6 @@ s32 dPa_control_c::getPolyColor(cBgS_PolyInfo& param_0, int param_1, _GXColor* p return 1; } -/* 8004D068-8004D128 0479A8 00C0+00 0/0 1/1 17/17 .text - * setPoly__13dPa_control_cFUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz - */ JPABaseEmitter* dPa_control_c::setPoly(u16 param_0, cBgS_PolyInfo& param_1, cXyz const* param_2, dKy_tevstr_c const* param_3, csXyz const* param_4, cXyz const* param_5, int param_6, dPa_levelEcallBack* param_7, @@ -1716,9 +1707,6 @@ static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1, } } -/* 8004D4CC-8004D6A4 047E0C 01D8+00 3/3 11/11 364/364 .text - * set__13dPa_control_cFUlUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf - */ u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* pos, dKy_tevstr_c const* param_4, csXyz const* i_rotation, cXyz const* i_scale, u8 alpha, dPa_levelEcallBack* param_8, s8 param_9, _GXColor const* param_10, @@ -1762,9 +1750,6 @@ u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* pos, return field_0x210.entry(param_2, pJVar5, param_8); } -/* 8004D6A4-8004D770 047FE4 00CC+00 1/1 3/3 10/10 .text - * setPoly__13dPa_control_cFUlUsR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyziP18dPa_levelEcallBackScPC4cXyz - */ u32 dPa_control_c::setPoly(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2, cXyz const* param_3, dKy_tevstr_c const* param_4, csXyz const* param_5, cXyz const* param_6, int param_7, @@ -1792,9 +1777,6 @@ u32 dPa_control_c::setStopContinue(u32 param_0) { return 0; } -/* 8004D7C4-8004D988 048104 01C4+00 0/0 1/1 0/0 .text - * setSimpleFoot__13dPa_control_cFUlPUlR13cBgS_PolyInfoPC4cXyzPC12dKy_tevstr_ciPC5csXyzPC4cXyzP18dPa_levelEcallBackScPC4cXyz - */ u32 dPa_control_c::setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param_2, cXyz const* param_3, dKy_tevstr_c const* param_4, int param_5, csXyz const* param_6, cXyz const* param_7, @@ -1833,9 +1815,6 @@ u32 dPa_control_c::setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param return rv; } -/* 8004D988-8004DC28 0482C8 02A0+00 0/0 1/1 0/0 .text - * setCommonPoly__13dPa_control_cFPUlP13cBgS_PolyInfoPC4cXyzPC4cXyzPC12dKy_tevstr_cUlUlPC5csXyzPC4cXyzSc - */ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz const* param_2, cXyz const* param_3, dKy_tevstr_c const* param_4, u32 param_5, u32 param_6, csXyz const* param_7, cXyz const* param_8, diff --git a/src/d/d_particle_copoly.cpp b/src/d/d_particle_copoly.cpp index 82127db43e..f14e90e488 100644 --- a/src/d/d_particle_copoly.cpp +++ b/src/d/d_particle_copoly.cpp @@ -178,9 +178,6 @@ void dPaPoT_c::clearTwoAllID() { clearCenterID(); } -/* 800512E8-80051424 04BC28 013C+00 0/0 1/1 1/1 .text - * setEffectFour__8dPaPoF_cFPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC4cXyzPC5csXyzPC4cXyzScff - */ int dPaPoF_c::setEffectFour(dKy_tevstr_c const* param_0, cXyz const* param_1, u32 param_2, u32 param_3, cXyz const* param_4, cXyz const* param_5, cXyz const* param_6, cXyz const* param_7, cXyz const* param_8, diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 569098c43b..e905222717 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -935,15 +935,15 @@ void dScnLogo_c::setRenderMode() { dLog_HIO_c::~dLog_HIO_c() {} -static dScnLogo_Method l_dScnLogo_Method[5] = { - (dScnLogo_Method)dScnLogo_Create, - dScnLogo_Delete, - dScnLogo_Execute, - dScnLogo_IsDelete, - dScnLogo_Draw, +static scene_method_class l_dScnLogo_Method = { + (process_method_func)dScnLogo_Create, + (process_method_func)dScnLogo_Delete, + (process_method_func)dScnLogo_Execute, + (process_method_func)dScnLogo_IsDelete, + (process_method_func)dScnLogo_Draw, }; -extern scene_process_profile_definition g_profile_LOGO_SCENE = { +scene_process_profile_definition g_profile_LOGO_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, @@ -953,6 +953,6 @@ extern scene_process_profile_definition g_profile_LOGO_SCENE = { 0, 0, &g_fopScn_Method.base, - (process_method_class*)&l_dScnLogo_Method, + &l_dScnLogo_Method, NULL, }; diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 6f8ef0d3f3..da6d9d5918 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -1988,7 +1988,7 @@ bool dScnMenu_setPlayerDebugModeDungeon() { myFontClass::~myFontClass() {} f32 myFontClass::drawChar_scale(f32 param_0, f32 param_1, f32 param_2, f32 param_3, int param_4, bool param_5) { - param_2; + UNUSED(param_2); if (param_4 < 0xFF) { return field_0x70.drawChar_scale(param_0, param_1, 8.75f, param_3, param_4, param_5); @@ -1997,13 +1997,13 @@ f32 myFontClass::drawChar_scale(f32 param_0, f32 param_1, f32 param_2, f32 param } } -static leafdraw_method_class l_dScnMenu_Method = { +static scene_method_class l_dScnMenu_Method = { (process_method_func)dScnMenu_Create, (process_method_func)dScnMenu_Delete, (process_method_func)dScnMenu_Execute, (process_method_func)dScnMenu_IsDelete, (process_method_func)dScnMenu_Draw, }; -extern scene_process_profile_definition g_profile_MENU_SCENE = { +scene_process_profile_definition g_profile_MENU_SCENE = { fpcLy_ROOT_e, // mLayerID 1, // mListID fpcPi_CURRENT_e, // mListPrio @@ -2013,10 +2013,10 @@ extern scene_process_profile_definition g_profile_MENU_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnMenu_Method, // mpMtd + &l_dScnMenu_Method, // mpMtd }; #else -extern scene_process_profile_definition g_profile_MENU_SCENE = { +scene_process_profile_definition g_profile_MENU_SCENE = { fpcLy_ROOT_e, // mLayerID 1, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 660e2c71a9..6ba2f9247b 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -322,13 +322,13 @@ static int dScnName_Create(scene_class* i_this) { return static_cast(i_this)->create(); } -static leafdraw_method_class l_dScnName_Method = { +static scene_method_class l_dScnName_Method = { (process_method_func)dScnName_Create, (process_method_func)dScnName_Delete, (process_method_func)dScnName_Execute, (process_method_func)dScnName_IsDelete, (process_method_func)dScnName_Draw, }; -extern scene_process_profile_definition g_profile_NAME_SCENE = { +scene_process_profile_definition g_profile_NAME_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, @@ -338,11 +338,11 @@ extern scene_process_profile_definition g_profile_NAME_SCENE = { 0, 0, &g_fopScn_Method.base, - (process_method_class*)&l_dScnName_Method, + &l_dScnName_Method, NULL, }; -extern scene_process_profile_definition g_profile_NAMEEX_SCENE = { +scene_process_profile_definition g_profile_NAMEEX_SCENE = { fpcLy_ROOT_e, 1, fpcPi_CURRENT_e, @@ -352,6 +352,6 @@ extern scene_process_profile_definition g_profile_NAMEEX_SCENE = { 0, 0, &g_fopScn_Method.base, - (process_method_class*)&l_dScnName_Method, + &l_dScnName_Method, NULL, }; diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 7187d0229d..1a9932d502 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -61,10 +61,8 @@ static OSTime resPreLoadTime1; static dScnPly_preLoad_HIO_c g_preLoadHIO; -/* 80451124 0001+00 data_80451124 None */ s8 dScnPly_c::pauseTimer; -/* 80451125 0003+00 nextPauseTimer__9dScnPly_c None */ s8 dScnPly_c::nextPauseTimer; s8 dScnPly_c::calcPauseTimer() { @@ -732,7 +730,7 @@ static void dScnPly_Create(scene_class* i_this) { dComLbG_PhaseHandler(&static_cast(i_this)->field_0x1c4, l_method, i_this); } -static leafdraw_method_class l_dScnPly_Method = { +static scene_method_class l_dScnPly_Method = { (process_method_func)dScnPly_Create, (process_method_func)dScnPly_Delete, (process_method_func)dScnPly_Execute, (process_method_func)dScnPly_IsDelete, (process_method_func)dScnPly_Draw, @@ -748,7 +746,7 @@ scene_process_profile_definition g_profile_PLAY_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnPly_Method, // mpMtd + &l_dScnPly_Method, // mpMtd }; scene_process_profile_definition g_profile_OPENING_SCENE = { @@ -761,5 +759,5 @@ scene_process_profile_definition g_profile_OPENING_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnPly_Method, // mpMtd + &l_dScnPly_Method, // mpMtd }; diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 46c4ac3b67..d74a86ab9a 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -417,7 +417,7 @@ static int dScnRoom_Create(scene_class* i_this) { return dComLbG_PhaseHandler(&room->field_0x1c4, l_method, i_this); } -static leafdraw_method_class l_dScnRoom_Method = { +static scene_method_class l_dScnRoom_Method = { (process_method_func)dScnRoom_Create, (process_method_func)dScnRoom_Delete, (process_method_func)dScnRoom_Execute, (process_method_func)dScnRoom_IsDelete, (process_method_func)dScnRoom_Draw, @@ -433,5 +433,5 @@ scene_process_profile_definition g_profile_ROOM_SCENE = { 0, // mSizeOther 0, // mParameters &g_fopScn_Method.base, // sub_method - (process_method_class*)&l_dScnRoom_Method, // mpMtd + &l_dScnRoom_Method, // mpMtd }; diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index c4d6fd1dc7..cf91ed7b17 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_scene.h" #include "f_pc/f_pc_leaf.h" -extern scene_process_profile_definition g_profile_WARNING_SCENE = { +scene_process_profile_definition g_profile_WARNING_SCENE = { fpcLy_ROOT_e, // mLayerID 1, // mListID fpcPi_CURRENT_e, // mListPrio @@ -22,7 +22,7 @@ extern scene_process_profile_definition g_profile_WARNING_SCENE = { NULL, // mpMtd }; -extern scene_process_profile_definition g_profile_WARNING2_SCENE = { +scene_process_profile_definition g_profile_WARNING2_SCENE = { fpcLy_ROOT_e, // mLayerID 1, // mListID fpcPi_CURRENT_e, // mListPrio diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index f5ecb91470..0395d351dc 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -285,8 +285,8 @@ void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz mAngleY = i_angle; mRoomNo = i_roomNo; - (void)unk_4; - (void)unk_5; + UNUSED(unk_4); + UNUSED(unk_5); } void dSv_player_item_c::init() { diff --git a/src/d/d_shop_camera.cpp b/src/d/d_shop_camera.cpp index 449e38e449..c2a8f8a711 100644 --- a/src/d/d_shop_camera.cpp +++ b/src/d/d_shop_camera.cpp @@ -171,9 +171,6 @@ void ShopCam_action_c::move() { } } -/* 80196544-80196608 190E84 00C4+00 0/0 1/1 0/0 .text - * setCamDataIdx__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz - */ void ShopCam_action_c::setCamDataIdx(fopAc_ac_c* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3, fopAc_ac_c* param_4, cXyz* param_5, cXyz* param_6) { mCamDataIdx = -1; @@ -205,9 +202,6 @@ void ShopCam_action_c::setCamDataIdx(fopAc_ac_c* param_1, fopAc_ac_c* param_2, f _debugSetCamera(); } -/* 80196608-801966D4 190F48 00CC+00 0/0 1/1 0/0 .text - * setCamDataIdx2__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz - */ void ShopCam_action_c::setCamDataIdx2(fopAc_ac_c* param_1, fopAc_ac_c* param_2, fopAc_ac_c* param_3, fopAc_ac_c* param_4, fopAc_ac_c* param_5, fopAc_ac_c* param_6, fopAc_ac_c* param_7, cXyz* param_8, cXyz* param_9) { diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index d323df4abf..cbb907c16d 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -1471,7 +1471,7 @@ dStage_objectNameInf* dStage_searchName(char const* objName) { } const char* dStage_getName(s16 procName, s8 argument) { - static char tmp_name[8]; + static char tmp_name[dStage_NAME_LENGTH]; dStage_objectNameInf* obj = l_objectName; char* tmp = NULL; @@ -1489,7 +1489,7 @@ const char* dStage_getName(s16 procName, s8 argument) { } if (tmp == NULL) { - snprintf(tmp_name, 8, "%d%+0d", procName, argument); + snprintf(tmp_name, dStage_NAME_LENGTH, "%d%+0d", procName, argument); tmp = tmp_name; } return tmp; @@ -1501,16 +1501,12 @@ const char* dStage_getName2(s16 procName, s8 argument) { u32 dStage_roomControl_c::mProcID; -/* 80450D64 0001+00 data_80450D64 None */ s8 dStage_roomControl_c::mStayNo; -/* 80450D65 0001+00 data_80450D65 None */ s8 dStage_roomControl_c::mOldStayNo; -/* 80450D66 0001+00 data_80450D66 None */ s8 dStage_roomControl_c::mNextStayNo; -/* 80450D67 0001+00 data_80450D67 None */ u8 dStage_roomControl_c::m_time_pass; u8 dStage_roomControl_c::mNoChangeRoom; @@ -2006,8 +2002,8 @@ static int dStage_rppnInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, } static int dStage_rpatInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void* param_3) { - (void)i_num; - (void)param_3; + UNUSED(i_num); + UNUSED(param_3); dStage_dPath_c* pStagePath = (dStage_dPath_c*)((char*)i_data + 4); dPath* pPath = pStagePath->m_path; @@ -2087,8 +2083,8 @@ static int dStage_floorInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum } static int dStage_memaInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) { - (void)param_2; - (void)param_3; + UNUSED(param_2); + UNUSED(param_3); dStage_MemoryMap_c* pd = (dStage_MemoryMap_c*)((char*)i_data + 4); i_stage->setMemoryMap(pd); @@ -2109,8 +2105,8 @@ static int dStage_memaInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, } static int dStage_mecoInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, void* param_3) { - (void)param_2; - (void)param_3; + UNUSED(param_2); + UNUSED(param_3); dStage_MemoryConfig_c* pd = (dStage_MemoryConfig_c*)((char*)i_data + 4); i_stage->setMemoryConfig(pd); @@ -2264,8 +2260,8 @@ static int dStage_layerTresureInit(dStage_dt_c* i_stage, void* i_data, int entry } static int dStage_dmapInfoInit(dStage_dt_c* i_stage, void* i_data, int entryNum, void* param_3) { - (void)entryNum; - (void)param_3; + UNUSED(entryNum); + UNUSED(param_3); dStage_DMap_c* dmap = (dStage_DMap_c*)((char*)i_data + 4); i_stage->setDMap(dmap); return 1; diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 1a6ab89e9a..4bb87da478 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -1632,12 +1632,12 @@ static leafdraw_method_class l_dTimer_Method = { (process_method_func)dTimer_Draw, }; -extern msg_process_profile_definition g_profile_TIMER = { +msg_process_profile_definition g_profile_TIMER = { fpcLy_CURRENT_e, 12, fpcPi_CURRENT_e, PROC_TIMER, - (process_method_class*)&g_fpcLf_Method, + &g_fpcLf_Method.base, sizeof(dTimer_c), 0, 0, diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 7fa86e9728..7ad3bae85e 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -110,7 +110,7 @@ void print_error_check_c::check() { } if (mPrintErrors != print_errors) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(mpActor, l_name); OS_REPORT("\x1b[36m↑%s_SUBMETHOD %08x %08x %s %s\n\x1b[m", mName, mpActor, mpActor->base.base.name, fpcDbSv_getNameString(mpActor->base.base.name), l_name); @@ -119,7 +119,7 @@ void print_error_check_c::check() { if (mThresholdEnable) { OSTick tick_diff = tick - mTick; if (mTimeMs != 0 && tick_diff > OSMicrosecondsToTicks(mTimeMs)) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(mpActor, l_name); OSReport_Warning("%s_SUBMETHOD 処理時間ながすぎ %4d us [%s] %s\n", mName, OSTicksToMicroseconds(tick_diff), fpcDbSv_getNameString(mpActor->base.base.name), l_name); @@ -219,7 +219,7 @@ static int fopAc_Draw(void* i_this) { fapGm_HIO_c::startCpuTimer(); if (mDoCPd_c::getTrigB(PAD_1) && l_HIO.mBBtnInfoDisp) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(actor, l_name); OSReport("%7s %3d %5d x %10.2f y %10.2f z %10.2f\n", @@ -228,7 +228,7 @@ static int fopAc_Draw(void* i_this) { if (l_HIO.mActorNum == fopAcM_GetName(actor) && l_HIO.mStopDraw) { if (l_HIO.field_0x8 != l_HIO.mStopDraw) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(actor, l_name); OSReport("<%s> の描画を停止します\n", l_name); } @@ -271,11 +271,11 @@ static int fopAc_Draw(void* i_this) { } #if DEBUG - char sp38[40]; - char sp10[8]; - fopAcM_getNameString(actor, sp10); - sprintf(sp38, "%s（描画処理）", sp10); - fapGm_HIO_c::stopCpuTimer(sp38); + char message[40]; + char name[dStage_NAME_LENGTH]; + fopAcM_getNameString(actor, name); + sprintf(message, "%s（描画処理）", name); + fapGm_HIO_c::stopCpuTimer(message); #endif return ret; @@ -290,7 +290,7 @@ static int fopAc_Execute(void* i_this) { if (l_HIO.mActorNum == fopAcM_GetName(actor) && l_HIO.mStopExecute) { if (l_HIO.field_0x7 != l_HIO.mStopExecute) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(actor, l_name); OSReport("<%s> の処理を停止します\n", l_name); } @@ -307,7 +307,7 @@ static int fopAc_Execute(void* i_this) { if (!(-1.0e32f < actor->current.pos.x && actor->current.pos.x < 1.0e32f && -1.0e32f < actor->current.pos.y && actor->current.pos.y < 1.0e32f && -1.0e32f < actor->current.pos.z && actor->current.pos.z < 1.0e32f)) { - static char l_name[8]; + static char l_name[dStage_NAME_LENGTH]; fopAcM_getNameString(actor, l_name); OSReport("！！！<%s> が範囲外にいます！！！\n", l_name); } @@ -366,11 +366,11 @@ static int fopAc_Execute(void* i_this) { } #if DEBUG - char sp38[40]; - char sp10[8]; - fopAcM_getNameString(actor, sp10); - sprintf(sp38, "%s（計算処理）", sp10); - fapGm_HIO_c::stopCpuTimer(sp38); + char message[40]; + char name[dStage_NAME_LENGTH]; + fopAcM_getNameString(actor, name); + sprintf(message, "%s（計算処理）", name); + fapGm_HIO_c::stopCpuTimer(message); #endif return ret; @@ -629,7 +629,7 @@ void fopEn_enemy_c::drawBallModel(dKy_tevstr_c* i_tevstr) { } } -extern actor_method_class g_fopAc_Method = { +actor_method_class g_fopAc_Method = { (process_method_func)fopAc_Create, (process_method_func)fopAc_Delete, (process_method_func)fopAc_Execute, (process_method_func)fopAc_IsDelete, (process_method_func)fopAc_Draw, diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index e12a37fafe..e1d986fb65 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -2016,4 +2016,9 @@ bool fopAcM_wt_c::waterCheck(cXyz const* i_pos) { return false; } +BOOL fopAcM_getNameString(const fopAc_ac_c* i_actor, char* o_name) { + strcpy(o_name, dStage_getName(fopAcM_GetProfName(i_actor), i_actor->argument)); + return TRUE; +} + void fopAcM_initManager() {} diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp index 9b37639502..68624b5548 100644 --- a/src/f_op/f_op_scene.cpp +++ b/src/f_op/f_op_scene.cpp @@ -11,16 +11,16 @@ static int fopScn_Draw(scene_class* i_this) { } static int fopScn_Execute(scene_class* i_this) { - return fpcMtd_Execute(i_this->submethod, i_this); + return fpcMtd_Execute((process_method_class*)i_this->submethod, i_this); } static int fopScn_IsDelete(void* i_this) { - return fpcMtd_IsDelete(static_cast(i_this)->submethod, i_this); + return fpcMtd_IsDelete((process_method_class*)static_cast(i_this)->submethod, i_this); } static int fopScn_Delete(void* i_this) { scene_class* scene = (scene_class*)i_this; - int ret = fpcMtd_Delete(scene->submethod, scene); + int ret = fpcMtd_Delete((process_method_class*)scene->submethod, scene); if (ret == 1) { fopScnTg_QueueTo(&scene->scene_tag); } @@ -42,7 +42,7 @@ static int fopScn_Create(void* i_this) { } } - return fpcMtd_Create(scene->submethod, i_this); + return fpcMtd_Create((process_method_class*)scene->submethod, i_this); } leafdraw_method_class g_fopScn_Method = { diff --git a/src/f_pc/f_pc_debug_sv.cpp b/src/f_pc/f_pc_debug_sv.cpp index 5d78ea3e22..52d89cfb31 100644 --- a/src/f_pc/f_pc_debug_sv.cpp +++ b/src/f_pc/f_pc_debug_sv.cpp @@ -8,7 +8,7 @@ int fpcBs_pc_c__print(base_process_class* i_process) { } void fpcBs_pc_c__fpcDbSv_callbackXX(void* i_process, char* arg1) { - arg1; + UNUSED(arg1); fpcBs_pc_c__print((base_process_class*)i_process); } diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp index d376a64904..2c290c285d 100644 --- a/src/f_pc/f_pc_layer.cpp +++ b/src/f_pc/f_pc_layer.cpp @@ -34,7 +34,7 @@ s32 fpcLy_ToQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_cr } s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) { - i_layer; + UNUSED(i_layer); int ret = cTg_SingleCutFromTree(i_createTag); return ret; diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index 4a1479d1b7..07e593642c 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -18,9 +18,6 @@ #include #endif -/* 80450BB8 0001+00 data_80450BB8 None */ -/* 80450BB9 0001+00 data_80450BB9 None */ -/* 80450BBA 0002+00 data_80450BBA None */ bool mDoAud_zelAudio_c::mInitFlag; bool mDoAud_zelAudio_c::mResetFlag; diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index b1c6ab26ce..f8c2d65728 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -1060,9 +1060,6 @@ void mDoExt_morf_c::frameUpdate() { mFrameCtrl.update(); } -/* 8000FC4C-8000FD10 00A58C 00C4+00 0/0 0/0 34/34 .text - * __ct__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl - */ mDoExt_McaMorf::mDoExt_McaMorf(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* callback1, mDoExt_McaMorfCallBack2_c* callback2, J3DAnmTransform* anmTransform, int param_4, f32 param_5, int param_6, int param_7, int param_8, @@ -1079,9 +1076,6 @@ mDoExt_McaMorf::~mDoExt_McaMorf() { } } -/* 8000FD94-80010074 00A6D4 02E0+00 1/1 0/0 0/0 .text - * create__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl - */ int mDoExt_McaMorf::create(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* callback1, mDoExt_McaMorfCallBack2_c* callback2, J3DAnmTransform* anmTransform, int param_4, f32 param_5, int param_6, int param_7, int param_8, @@ -1320,9 +1314,6 @@ void mDoExt_McaMorf::getTransform(u16 param_0, J3DTransformInfo* param_1) { } } -/* 800107D0-80010888 00B110 00B8+00 0/0 2/2 222/222 .text - * __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl - */ mDoExt_McaMorfSO::mDoExt_McaMorfSO(J3DModelData* param_0, mDoExt_McaMorfCallBack1_c* param_1, mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3, int param_4, f32 param_5, int param_6, int param_7, @@ -1337,9 +1328,6 @@ mDoExt_McaMorfSO::~mDoExt_McaMorfSO() { stopZelAnime(); } -/* 800108F0-80010B68 00B230 0278+00 1/1 0/0 0/0 .text - * create__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl - */ int mDoExt_McaMorfSO::create(J3DModelData* i_modelData, mDoExt_McaMorfCallBack1_c* param_1, mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3, int param_4, f32 param_5, int param_6, int param_7, @@ -1618,9 +1606,6 @@ void mDoExt_McaMorfSO::stopZelAnime() { } } -/* 80011348-800113FC 00BC88 00B4+00 0/0 0/0 1/1 .text - * __ct__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl - */ mDoExt_McaMorf2::mDoExt_McaMorf2(J3DModelData* param_0, mDoExt_McaMorfCallBack1_c* param_1, mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3, J3DAnmTransform* param_4, int param_5, f32 param_6, int param_7, @@ -1633,9 +1618,6 @@ mDoExt_McaMorf2::~mDoExt_McaMorf2() { stopZelAnime(); } -/* 80011464-800116B4 00BDA4 0250+00 1/1 0/0 0/0 .text - * create__15mDoExt_McaMorf2FP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformP15J3DAnmTransformifiiP10Z2CreatureUlUl - */ int mDoExt_McaMorf2::create(J3DModelData* param_0, mDoExt_McaMorfCallBack1_c* param_1, mDoExt_McaMorfCallBack2_c* param_2, J3DAnmTransform* param_3, J3DAnmTransform* param_4, int param_5, f32 param_6, int param_7, diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 38f0b3dfb1..a34af824f4 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -266,10 +266,6 @@ GXColor mDoGph_gInf_c::mBackColor = {0, 0, 0, 0}; GXColor mDoGph_gInf_c::mFadeColor = {0, 0, 0, 0}; -/* 80450BE4 0001+00 data_80450BE4 None */ -/* 80450BE5 0001+00 data_80450BE5 None */ -/* 80450BE6 0001+00 mFade__13mDoGph_gInf_c None */ -/* 80450BE7 0001+00 data_80450BE7 None */ u8 mDoGph_gInf_c::mBlureFlag; u8 mDoGph_gInf_c::mBlureRate; @@ -1006,7 +1002,7 @@ static void drawDepth2(view_class* param_0, view_port_class* param_1, int param_ } static void trimming(view_class* param_0, view_port_class* param_1) { - (void)param_0; + UNUSED(param_0); s16 y_orig = (int)param_1->y_orig & ~7; s16 y_orig_pos = y_orig < 0 ? 0 : y_orig; @@ -1275,8 +1271,8 @@ void mDoGph_gInf_c::bloom_c::draw() { } static void retry_captue_frame(view_class* param_0, view_port_class* param_1, int param_2) { - (void)param_0; - (void)param_2; + UNUSED(param_0); + UNUSED(param_2); s16 x_orig = (int)param_1->x_orig & 0xFFFFFFF8; s16 y_orig = (int)param_1->y_orig & 0xFFFFFFF8; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 53f955b453..430bbadc9b 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -195,14 +195,12 @@ OSTime mDoMain::sPowerOnTime; OSTime mDoMain::sHungUpTime; -/* 80450B18 0001+00 data_80450B18 None */ static u8 mDisplayHeapSize; #if DEBUG static u8 mReportDisable; #endif -/* 80450B19 0001+00 data_80450B19 None */ static u8 mSelectHeapBar; #if DEBUG @@ -210,7 +208,6 @@ static u8 mVisibleHeapBar; static u8 mPrintFrameLine; #endif -/* 80450B1A 0002+00 data_80450B1A None */ static u8 mCheckHeap; #if DEBUG diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index 379e7f2a80..3b8bcd137e 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -23,7 +23,7 @@ static mDoMtx_stack_c mDoMtx_stack; static mDoMtx_quatStack_c mDoMtx_quatStack; -extern Mtx g_mDoMtx_identity = { +Mtx g_mDoMtx_identity = { {1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}, diff --git a/src/revolution/dvd/dvdidutils.c b/src/revolution/dvd/dvdidutils.c index e08209f021..ed6c815b83 100644 --- a/src/revolution/dvd/dvdidutils.c +++ b/src/revolution/dvd/dvdidutils.c @@ -17,7 +17,7 @@ static u32 strnlen(const char* str, u32 maxlen) { } int DVDCompareDiskID(const DVDDiskID* id1, const DVDDiskID* id2) { -#ifdef DEBUG +#if DEBUG const char* game1; const char* game2; const char* company1; From b384af2431c4281d29dfbf3793a2e1bf98f96eb7 Mon Sep 17 00:00:00 2001 From: Max Roncace Date: Tue, 23 Dec 2025 19:11:09 -0500 Subject: [PATCH 11/35] d_a_mg_rod debug improvements (#2993) --- include/d/actor/d_a_mg_rod.h | 33 +- include/d/d_demo.h | 2 + include/d/d_kankyo_tev_str.h | 5 +- include/d/d_meter2_info.h | 2 +- include/d/dolzel_base.pch | 2 + include/f_op/f_op_actor.h | 5 +- include/f_op/f_op_actor_mng.h | 4 +- src/d/actor/d_a_e_bg.cpp | 4 +- src/d/actor/d_a_e_sg.cpp | 4 +- src/d/actor/d_a_mg_fish.cpp | 20 +- src/d/actor/d_a_mg_rod.cpp | 1711 +++++++++++++++++---------------- src/d/actor/d_a_npc_df.cpp | 8 +- src/d/actor/d_a_npc_henna.cpp | 4 +- 13 files changed, 937 insertions(+), 867 deletions(-) diff --git a/include/d/actor/d_a_mg_rod.h b/include/d/actor/d_a_mg_rod.h index c4a5339ff3..3786fbafcb 100644 --- a/include/d/actor/d_a_mg_rod.h +++ b/include/d/actor/d_a_mg_rod.h @@ -94,9 +94,9 @@ public: /* 0x0574 */ u8 arg0; /* 0x0575 */ u8 arg1; /* 0x0576 */ u8 arg2; - /* 0x0578 */ s16 field_0x578; + /* 0x0578 */ s16 counter; /* 0x057A */ s16 timers[10]; - /* 0x0590 */ f32 field_0x590; + /* 0x0590 */ f32 water_surface_y; /* 0x0594 */ f32 field_0x594; /* 0x0598 */ f32 field_0x598; /* 0x059C */ f32 field_0x59c; @@ -106,12 +106,12 @@ public: /* 0x06A0 */ f32 field_0x6a0; /* 0x06A4 */ f32 field_0x6a4; /* 0x06A8 */ u8 field_0x6a8; - /* 0x06AC */ cXyz field_0x6ac; + /* 0x06AC */ cXyz rod_tip_pos; /* 0x06B8 */ cXyz field_0x6b8; - /* 0x06C4 */ s16 field_0x6c4; + /* 0x06C4 */ s16 rod_angle_y; /* 0x06C8 */ cXyz field_0x6c8; /* 0x06D4 */ cXyz field_0x6d4; - /* 0x06E0 */ f32 field_0x6e0; + /* 0x06E0 */ f32 cast_momentum; /* 0x06E4 */ f32 field_0x6e4; /* 0x06E8 */ s8 field_0x6e8; /* 0x06EC */ cXyz field_0x6ec; @@ -156,10 +156,10 @@ public: /* 0x0FF2 */ s16 field_0xff2; /* 0x0FF4 */ s16 field_0xff4; /* 0x0FF8 */ f32 field_0xff8; - /* 0x0FFC */ s16 field_0xffc; - /* 0x0FFE */ s16 field_0xffe; - /* 0x1000 */ s16 field_0x1000; - /* 0x1002 */ s16 field_0x1002; + /* 0x0FFC */ s16 lure_yaw_offset; + /* 0x0FFE */ s16 lure_yaw_target; + /* 0x1000 */ s16 lure_pitch_offset; + /* 0x1002 */ s16 lure_pitch_target; /* 0x1004 */ s16 field_0x1004; /* 0x1006 */ s16 field_0x1006; /* 0x1008 */ s8 field_0x1008; @@ -167,7 +167,7 @@ public: /* 0x100A */ s8 field_0x100a; /* 0x100B */ u8 field_0x100b; /* 0x100C */ u8 field_0x100c; - /* 0x100D */ s8 field_0x100d; + /* 0x100D */ s8 is_hook_in_water; /* 0x100E */ s8 field_0x100e; /* 0x100F */ s8 field_0x100f; /* 0x1010 */ cXyz field_0x1010; @@ -218,10 +218,11 @@ public: /* 0x114E */ s16 field_0x114e; /* 0x1150 */ s16 field_0x1150; /* 0x1154 */ f32 field_0x1154; - /* 0x1158 */ u8 field_0x1158[0x1165 - 0x1158]; - /* 0x1165 */ s8 field_0x1165; + /* 0x1158 */ cXyz field_0x1158; + /* 0x1164 */ u8 field_0x1164[0x1165 - 0x1164]; + /* 0x1165 */ s8 cast_bob_timer; /* 0x1168 */ u32 sibuki_eff[4]; - /* 0x1178 */ u32 field_0x1178; + /* 0x1178 */ u32 emitter_id; /* 0x117C */ u32 field_0x117c; /* 0x1180 */ u32 field_0x1180[2]; /* 0x1188 */ f32 field_0x1188; @@ -246,7 +247,7 @@ public: /* 0x1407 */ u8 field_0x1407; /* 0x1408 */ f32 play_cam_fovy; /* 0x140C */ f32 field_0x140c; - /* 0x1410 */ f32 field_0x1410; + /* 0x1410 */ f32 camera_morf_rate; /* 0x1414 */ f32 field_0x1414; /* 0x1418 */ s16 field_0x1418; /* 0x141A */ s16 field_0x141a; @@ -262,8 +263,8 @@ public: /* 0x1458 */ cXyz field_0x1458; /* 0x1464 */ f32 field_0x1464; /* 0x1468 */ u8 field_0x1468[0x146C - 0x1468]; - /* 0x146C */ u8 field_0x146c; - /* 0x146D */ s8 field_0x146d; + /* 0x146C */ u8 input_cooldown; + /* 0x146D */ s8 msg_flow_state; /* 0x146E */ u8 field_0x146E[0x1470 - 0x146E]; /* 0x1470 */ u8 field_0x1470; /* 0x1472 */ s16 field_0x1472; diff --git a/include/d/d_demo.h b/include/d/d_demo.h index f8ff43b6e7..3d763d0f56 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -1,6 +1,8 @@ #ifndef D_D_DEMO_H #define D_D_DEMO_H +#include "m_Do/m_Do_ext.h" +#include "m_Do/m_Do_mtx.h" #include "JSystem/JStudio/JStudio_JAudio2/control.h" #include "JSystem/JStudio/JStudio_JParticle/object-particle.h" #include "JSystem/JStudio/JStudio_JStage/object.h" diff --git a/include/d/d_kankyo_tev_str.h b/include/d/d_kankyo_tev_str.h index 2021dddd9a..e945694d01 100644 --- a/include/d/d_kankyo_tev_str.h +++ b/include/d/d_kankyo_tev_str.h @@ -1,8 +1,9 @@ #ifndef D_D_KANKYO_TEV_STR #define D_D_KANKYO_TEV_STR -#include "JSystem/J3DGraphBase/J3DStruct.h" -#include "m_Do/m_Do_ext.h" +#include "JSystem/J3DGraphBase/J3DTevs.h" +#include "SSystem/SComponent/c_xyz.h" +#include "dolphin/types.h" class dKy_tevstr_c { public: diff --git a/include/d/d_meter2_info.h b/include/d/d_meter2_info.h index 4738c7faf6..bd88b02a6f 100644 --- a/include/d/d_meter2_info.h +++ b/include/d/d_meter2_info.h @@ -117,7 +117,7 @@ public: bool isUseButton(int i_buttonBit) { return i_buttonBit & mUseButton; } void setMeterMapClass(dMeterMap_c* i_map) { mMeterMap = i_map; } void resetGameStatus() { mGameStatus = 0; } - void onGameStatus(int i_status) { mGameStatus |= i_status; } + void onGameStatus(int i_status) { mGameStatus |= (u16)i_status; } void setMapStatus(u8 i_status) { mMapStatus = i_status; } u8 getMapStatus() { return mMapStatus; } void setPauseStatus(u8 i_status) { mPauseStatus = i_status; } diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index 00fb5c3445..0c900c21a1 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -15,6 +15,8 @@ #include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export #include "JSystem/JHostIO/JORReflexible.h" // IWYU pragma: export +#include "SSystem/SComponent/c_m3d_g_sph.h" // IWYU pragma: export +#include "SSystem/SComponent/c_m3d_g_aab.h" // IWYU pragma: export #include "SSystem/SComponent/c_m3d_g_pla.h" // IWYU pragma: export #include "SSystem/SComponent/c_bg_s_chk.h" // IWYU pragma: export #include "f_op/f_op_actor.h" // IWYU pragma: export diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 648196b870..aa54f8c180 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -3,13 +3,16 @@ #include "d/d_kankyo_tev_str.h" #include "f_pc/f_pc_leaf.h" +#include "m_Do/m_Do_audio.h" +#include "JSystem/J3DGraphAnimator/J3DModel.h" +#include "SSystem/SComponent/c_sxyz.h" #include "global.h" struct actor_method_class { /* 0x00 */ leafdraw_method_class base; /* 0x14 */ u8 field_0x14[0xC]; // Likely padding -}; +}; struct actor_process_profile_definition { /* 0x00 */ leaf_process_profile_definition base; /* 0x24 */ actor_method_class* sub_method; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index dbf01d374d..a6b3f1d677 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -37,6 +37,8 @@ class J3DModelData; // placeholder class JKRHeap; class cM3dGPla; +s8 dComIfGp_getReverb(int roomNo); + struct fopAcM_prmBase_class { /* 0x00 */ u32 parameters; /* 0x04 */ cXyz position; @@ -760,8 +762,6 @@ inline s16 fopAcM_toPlayerShapeAngleY(const fopAc_ac_c* i_actor) { return fopAcM_toActorShapeAngleY(i_actor, dComIfGp_getPlayer(0)); } -s8 dComIfGp_getReverb(int roomNo); - inline void fopAcM_seStartCurrent(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { mDoAud_seStart(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index e0c963bb86..ed18d46750 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -231,8 +231,8 @@ void daE_BG_c::setSparkEffect() { fopAc_ac_c* daE_BG_c::search_esa() { dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD); - if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->field_0x100d != 0 && - rod->actor.current.pos.y < rod->field_0x590 - 20.0f) { + if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->is_hook_in_water != 0 && + rod->actor.current.pos.y < rod->water_surface_y - 20.0f) { return &rod->actor; } else { return NULL; diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp index f65b058eb4..6e24f68b3c 100644 --- a/src/d/actor/d_a_e_sg.cpp +++ b/src/d/actor/d_a_e_sg.cpp @@ -215,8 +215,8 @@ static obj_kbox_class* search_box(e_sg_class* i_this) { static dmg_rod_class* search_esa(e_sg_class* i_this) { dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByName(PROC_MG_ROD); - if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->field_0x100d != 0 && - rod->actor.current.pos.y < rod->field_0x590 - 20.0f) + if (rod != NULL && rod->kind == 1 && rod->action != 5 && rod->is_hook_in_water != 0 && + rod->actor.current.pos.y < rod->water_surface_y - 20.0f) { return rod; } diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index c06414c452..e7b76bc428 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -175,7 +175,7 @@ static void* s_lure_sub(void* a, void* b) { if (rod->kind == 0 && rod->action == 4 && rod->field_0x10a9 == 0 && - rod->field_0x100d != 0) { + rod->is_hook_in_water != 0) { return rod; } } @@ -189,8 +189,8 @@ static void* s_esa_sub(void* a, void* b) { dmg_rod_class* rod = (dmg_rod_class*)a; if (rod->kind == 1 && rod->action != 5 && - rod->field_0x100d != 0 && - rod->actor.current.pos.y < rod->field_0x590 - 20.0f) { + rod->is_hook_in_water != 0 && + rod->actor.current.pos.y < rod->water_surface_y - 20.0f) { return rod; } } @@ -1328,7 +1328,7 @@ static void mf_lure_search(mg_fish_class* i_this) { dmg_rod_class* rod = (dmg_rod_class*)fopAcM_SearchByID(i_this->mRodId); if (rod == NULL || rod->field_0x1008 != 0) { foundLure = true; - } else if (rod->field_0x100a != 0 || rod->field_0x100d == 0) { + } else if (rod->field_0x100a != 0 || rod->is_hook_in_water == 0) { foundLure = true; } else if (rod->action != 4) { if (rod->action >= 5 && @@ -1531,7 +1531,7 @@ static void mf_lure_search(mg_fish_class* i_this) { } } - rod->field_0x1410 = 0.0f; + rod->camera_morf_rate = 0.0f; dKy_Sound_set(i_this->actor.current.pos, 40.0f * i_this->mJointScale, fopAcM_GetID(i_this), 5); rod->vib_timer = 5; @@ -1848,7 +1848,7 @@ static void mf_hit(mg_fish_class* i_this) { pvVar5->play_cam_timer = 0; pvVar5->field_0x14c2 = 0; pvVar5->play_cam_fovy = 90.0f; - pvVar5->field_0x146d = 0; + pvVar5->msg_flow_state = 0; pvVar5->field_0x10b0 = 0; daPy_py_c* player = daPy_getLinkPlayerActorClass(); player->onFishingRodGetFish(); @@ -2173,7 +2173,7 @@ static void mf_catch(mg_fish_class* i_this) { rod->actor.health = 1; rod->play_cam_mode = 11; rod->play_cam_timer = 0; - rod->field_0x146d = 0; + rod->msg_flow_state = 0; i_this->field_0x740 = cM_rndF(1000.0f) + 3000.0f; } break; @@ -2234,7 +2234,7 @@ static void mf_esa_search(mg_fish_class* i_this) { if (rod_actor == NULL) { flag1 = 1; - } else if (rod->field_0x100d == 0) { + } else if (rod->is_hook_in_water == 0) { flag1 = 1; } else if (rod->action == 5) { flag1 = 1; @@ -3575,8 +3575,8 @@ static int daMg_Fish_Execute(mg_fish_class* i_this) { rod->actor.current.pos.x = i_this->field_0x638.x; rod->actor.current.pos.y = i_this->field_0x638.y; rod->actor.current.pos.z = i_this->field_0x638.z; - rod->field_0x1000 = 0; - rod->field_0xffc = 0; + rod->lure_pitch_offset = 0; + rod->lure_yaw_offset = 0; } if (i_this->field_0x659 != 0) { fopAc_ac_c* rod = fopAcM_SearchByID(i_this->mRodId); diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index aa85bfcfdb..bd7899194f 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -42,9 +42,11 @@ public: /* 0x24 */ u8 force_fish_msg_output; }; +#if !DEBUG static u8 const lit_3879[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +#endif static u16 check_kind[] = { 0xF57F, 0xF47F, 0xF37F, 0xF27F, @@ -85,14 +87,16 @@ void dmg_rod_HIO_c::genMessage(JORMContext* ctx) { static int frog_nodeCallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { - int jnt_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jnt_no = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); - dmg_rod_class* a_this = (dmg_rod_class*)model->getUserArea(); + dmg_rod_class* rod = (dmg_rod_class*)model->getUserArea(); + fopAc_ac_c* rod_actor = (fopAc_ac_c*)rod; - if (a_this != NULL) { + if (rod != NULL) { if (jnt_no == 1) { MTXCopy(model->getAnmMtx(jnt_no), *calc_mtx); - cMtx_YrotM(*calc_mtx, -a_this->field_0xff2); + cMtx_YrotM(*calc_mtx, -rod->field_0xff2); MtxScale(1.5f + JREG_F(10), 1.0f + JREG_F(11), 1.3f + JREG_F(12), 1); model->setAnmMtx(jnt_no, *calc_mtx); MTXCopy(*calc_mtx, J3DSys::mCurrentMtx); @@ -105,13 +109,15 @@ static int frog_nodeCallBack(J3DJoint* i_joint, int param_1) { static int ws_nodeCallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { - int jnt_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jnt_no = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); - dmg_rod_class* a_this = (dmg_rod_class*)model->getUserArea(); + dmg_rod_class* rod = (dmg_rod_class*)model->getUserArea(); + fopAc_ac_c* rod_actor = (fopAc_ac_c*)rod; - if (a_this != NULL) { + if (rod != NULL) { MTXCopy(model->getAnmMtx(jnt_no), *calc_mtx); - cMtx_XrotM(*calc_mtx, a_this->field_0x101c[jnt_no - 1]); // technically an OoB access, but this callback is only ever set for joints 1 and 2 + cMtx_XrotM(*calc_mtx, rod->field_0x101c[jnt_no - 1]); // technically an OoB access, but this callback is only ever set for joints 1 and 2 model->setAnmMtx(jnt_no, *calc_mtx); MTXCopy(*calc_mtx, J3DSys::mCurrentMtx); } @@ -122,18 +128,20 @@ static int ws_nodeCallBack(J3DJoint* i_joint, int param_1) { static int Reel_CallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { - int jnt_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jnt_no = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); - dmg_rod_class* a_this = (dmg_rod_class*)model->getUserArea(); + dmg_rod_class* rod = (dmg_rod_class*)model->getUserArea(); + fopAc_ac_c* rodActor = (fopAc_ac_c*)rod; - if (a_this != NULL) { + if (rod != NULL) { if (jnt_no == 1 || jnt_no == 3) { MTXCopy(model->getAnmMtx(jnt_no), *calc_mtx); if (jnt_no == 1) { - cMtx_XrotM(*calc_mtx, -a_this->field_0x75c); + cMtx_XrotM(*calc_mtx, -rod->field_0x75c); } else { - cMtx_XrotM(*calc_mtx, (a_this->field_0x75c * 2)); + cMtx_XrotM(*calc_mtx, (rod->field_0x75c * 2)); } model->setAnmMtx(jnt_no, *calc_mtx); @@ -147,15 +155,16 @@ static int Reel_CallBack(J3DJoint* i_joint, int param_1) { static int Worm_nodeCallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { - int jnt_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jnt_no = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); - dmg_rod_class* a_this = (dmg_rod_class*)model->getUserArea(); + dmg_rod_class* rod = (dmg_rod_class*)model->getUserArea(); - if (a_this != NULL) { + if (rod != NULL) { if (jnt_no >= 1 && jnt_no <= 9) { MTXCopy(model->getAnmMtx(jnt_no), *calc_mtx); - cMtx_YrotM(*calc_mtx, a_this->field_0x103c[jnt_no - 1]); - cMtx_ZrotM(*calc_mtx, a_this->field_0x104e[jnt_no - 1]); + cMtx_YrotM(*calc_mtx, rod->field_0x103c[jnt_no - 1]); + cMtx_ZrotM(*calc_mtx, rod->field_0x104e[jnt_no - 1]); model->setAnmMtx(jnt_no, *calc_mtx); MTXCopy(*calc_mtx, J3DSys::mCurrentMtx); } @@ -196,17 +205,17 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) { } for (int i = 0; i < 6; i++) { - g_env_light.setLightTevColorType_MAJI(i_this->unk_ring_model[i], &actor->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->unk_ring_model[i], &i_this->actor.tevStr); mDoExt_modelUpdateDL(i_this->unk_ring_model[i]); } } static GXColor l_color = {0xFF, 0xFF, 0x96, 0xFF}; - i_this->linemat.update(MG_ROD_LURE_LINE_LEN, l_color, &actor->tevStr); + i_this->linemat.update(MG_ROD_LURE_LINE_LEN, l_color, &i_this->actor.tevStr); dComIfGd_set3DlineMat(&i_this->linemat); model = i_this->rod_modelMorf->getModel(); - g_env_light.setLightTevColorType_MAJI(model, &actor->tevStr); + g_env_light.setLightTevColorType_MAJI(model, &i_this->actor.tevStr); i_this->rod_modelMorf->entryDL(); } else { if (dComIfGp_checkPlayerStatus0(0, 0x2000)) { @@ -220,13 +229,13 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) { } } - g_env_light.setLightTevColorType_MAJI(i_this->uki_model, &actor->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->uki_model, &i_this->actor.tevStr); mDoExt_modelUpdateDL(i_this->uki_model); - g_env_light.setLightTevColorType_MAJI(i_this->uki_saki_model, &actor->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->uki_saki_model, &i_this->actor.tevStr); mDoExt_modelUpdateDL(i_this->uki_saki_model); static GXColor l_color = {0xFF, 0xFF, 0x96, 0xFF}; - i_this->linemat.update(MG_ROD_UKI_LINE_LEN, l_color, &actor->tevStr); + i_this->linemat.update(MG_ROD_UKI_LINE_LEN, l_color, &i_this->actor.tevStr); dComIfGd_set3DlineMat(&i_this->linemat); for (int i = 0; i < 15; i++) { @@ -239,7 +248,7 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) { mDoExt_modelUpdateDL(i_this->hook_model[i_this->hook_kind]); if (i_this->esa_kind != 0) { - g_env_light.setLightTevColorType_MAJI(i_this->esa_model[i_this->esa_kind - 1], &actor->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->esa_model[i_this->esa_kind - 1], &i_this->actor.tevStr); if (i_this->esa_kind == 2) { i_this->esa_model[i_this->esa_kind - 1]->setUserArea((uintptr_t)i_this); @@ -269,30 +278,36 @@ static int dmg_rod_Draw(dmg_rod_class* i_this) { static void rod_control(dmg_rod_class* i_this) { fopAc_ac_c* actor = &i_this->actor; fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); - cXyz* temp_r28; + cXyz* rodJointPos; int i; - cXyz sp98; - cXyz sp8C; + cXyz scratchXyz; + cXyz worldPos; cXyz sp80; cXyz sp74; - cXyz sp68; - csXyz sp30; - s16 spE, spC, spA, sp8; + cXyz rodBasePos; + csXyz rodAimDir; + s16 segPitch, segYaw, rodPitchAdj, rodRollAdj; - temp_r28 = i_this->mg_rod.field_0x0; + f32 var_f31; + f32 var_f29; + f32 var_f26; + f32 var_f30; + f32 var_f25; + + rodJointPos = i_this->mg_rod.field_0x0; if (i_this->kind == MG_ROD_KIND_LURE && (i_this->action == ACTION_LURE_ONBOAT || (i_this->action == ACTION_LURE_STANDBY && i_this->timers[4] != 0))) { daCanoe_c* boat = (daCanoe_c*)fopAcM_SearchByID(i_this->boat_actor_id); if (i_this->play_cam_mode >= 950 && i_this->play_cam_mode < 1000) { cMtx_YrotS(*calc_mtx, player->shape_angle.y); - sp98.x = -50.0f + AREG_F(0); - sp98.y = -20.0f + AREG_F(1); - sp98.z = -70.0f + AREG_F(2); - MtxPosition(&sp98, &sp8C); - sp8C += player->current.pos; + scratchXyz.x = -50.0f + AREG_F(0); + scratchXyz.y = -20.0f + AREG_F(1); + scratchXyz.z = -70.0f + AREG_F(2); + MtxPosition(&scratchXyz, &worldPos); + worldPos += player->current.pos; - MtxTrans(sp8C.x, sp8C.y, sp8C.z, 0); + MtxTrans(worldPos.x, worldPos.y, worldPos.z, 0); cMtx_YrotM(*calc_mtx, (player->shape_angle.y + AREG_S(0)) - 30200); cMtx_XrotM(*calc_mtx, AREG_S(1) - 13000); } else { @@ -310,9 +325,9 @@ static void rod_control(dmg_rod_class* i_this) { cMtx_ZrotM(*calc_mtx, JREG_S(5) - 0x4000); } - i_this->field_0x6c4 = boat->shape_angle.y + NREG_S(3); + i_this->rod_angle_y = boat->shape_angle.y + NREG_S(3); } else { - i_this->field_0x6c4 = daAlink_getAlinkActorClass()->getFishingRodAngleY(); + i_this->rod_angle_y = daAlink_getAlinkActorClass()->getFishingRodAngleY(); if (i_this->kind == MG_ROD_KIND_LURE && daAlink_getAlinkActorClass()->checkFishingRodGrabLeft()) { MTXCopy(daAlink_getAlinkActorClass()->getLeftItemMatrix(), *calc_mtx); cMtx_YrotM(*calc_mtx, (s16)(JREG_S(3) + 0x20B6)); @@ -321,23 +336,24 @@ static void rod_control(dmg_rod_class* i_this) { } else { MTXCopy(daAlink_getAlinkActorClass()->getRightItemMatrix(), *calc_mtx); if (i_this->kind == MG_ROD_KIND_LURE) { - sp8 = 0; - spA = i_this->field_0x6c4 - player->shape_angle.y; - spA = 1000.0f + (spA * (0.2f + NREG_F(10))); + rodRollAdj = 0; + rodPitchAdj = i_this->rod_angle_y - player->shape_angle.y; + rodPitchAdj = 1000.0f + (rodPitchAdj * (0.2f + NREG_F(10))); if (i_this->field_0x14f8 < 0) { - sp8 = i_this->field_0x14f8 * (1.2f + NREG_F(11)); + var_f25 = i_this->field_0x14f8 * (1.2f + NREG_F(11)); + rodRollAdj = var_f25; } - cMtx_XrotM(*calc_mtx, (JREG_S(4) + spA) - 2000); - cMtx_ZrotM(*calc_mtx, JREG_S(5) + sp8); + cMtx_XrotM(*calc_mtx, (JREG_S(4) + rodPitchAdj) - 2000); + cMtx_ZrotM(*calc_mtx, JREG_S(5) + rodRollAdj); } } } if (i_this->kind == MG_ROD_KIND_LURE) { MtxTrans(JREG_F(4), 3.0f + JREG_F(5), JREG_F(6), 1); - + J3DModel* model = i_this->rod_modelMorf->getModel(); model->setBaseTRMtx(*calc_mtx); @@ -345,10 +361,10 @@ static void rod_control(dmg_rod_class* i_this) { i_this->rod_modelMorf->modelCalc(); MtxPull(); - sp98.set(0.0f, 0.0f, 0.0f); - MtxPosition(&sp98, &i_this->field_0x750); - sp98.set(i_this->field_0x760, 5.0f + DREG_F(8), (-4.5f + DREG_F(9)) - 1.0f); - MtxPosition(&sp98, &i_this->field_0x744); + scratchXyz.set(0.0f, 0.0f, 0.0f); + MtxPosition(&scratchXyz, &i_this->field_0x750); + scratchXyz.set(i_this->field_0x760, 5.0f + DREG_F(8), (-4.5f + DREG_F(9)) - 1.0f); + MtxPosition(&scratchXyz, &i_this->field_0x744); MTXCopy(model->getAnmMtx(2), *calc_mtx); cMtx_XrotM(*calc_mtx, -0x4000); @@ -358,43 +374,43 @@ static void rod_control(dmg_rod_class* i_this) { MtxTrans(KREG_F(3), -1.0f + KREG_F(4), -10.0f + KREG_F(5), 1); } - sp98.set(0.0f, 0.0f, 0.0f); - MtxPosition(&sp98, temp_r28); + scratchXyz.set(0.0f, 0.0f, 0.0f); + MtxPosition(&scratchXyz, rodJointPos); MtxTrans(JREG_F(0), JREG_F(1), 16.0f * i_this->field_0x6a0, 1); - sp98.set(0.0f, 0.0f, 0.0f); - MtxPosition(&sp98, &sp68); - sp98 = sp68 - *temp_r28; + scratchXyz.set(0.0f, 0.0f, 0.0f); + MtxPosition(&scratchXyz, &rodBasePos); + scratchXyz = rodBasePos - *rodJointPos; - sp30.y = (s16)cM_atan2s(sp98.x, sp98.z); - sp30.x = -cM_atan2s(sp98.y, JMAFastSqrt(SQUARE(sp98.x) + SQUARE(sp98.z))); - cMtx_YrotS(*calc_mtx, sp30.y); - cMtx_XrotM(*calc_mtx, sp30.x); - sp98.x = 0.0f; - sp98.y = 0.0f; - sp98.z = 300.0f + YREG_F(0); - MtxPosition(&sp98, &sp80); - sp98 = i_this->mg_line.pos[70] - sp68; + rodAimDir.y = (s16)cM_atan2s(scratchXyz.x, scratchXyz.z); + rodAimDir.x = -cM_atan2s(scratchXyz.y, JMAFastSqrt(SQUARE(scratchXyz.x) + SQUARE(scratchXyz.z))); + cMtx_YrotS(*calc_mtx, rodAimDir.y); + cMtx_XrotM(*calc_mtx, rodAimDir.x); + scratchXyz.x = 0.0f; + scratchXyz.y = 0.0f; + scratchXyz.z = 300.0f + YREG_F(0); + MtxPosition(&scratchXyz, &sp80); + scratchXyz = i_this->mg_line.pos[70] - rodBasePos; if (i_this->kind == MG_ROD_KIND_UKI && i_this->action == ACTION_UKI_STANDBY && i_this->field_0x1508 < 0.1f) { - cMtx_YrotS(*calc_mtx, i_this->field_0x6c4); + cMtx_YrotS(*calc_mtx, i_this->rod_angle_y); cMtx_XrotM(*calc_mtx, 6000); } else { - cMtx_YrotS(*calc_mtx, (s16)cM_atan2s(sp98.x, sp98.z)); - cMtx_XrotM(*calc_mtx, -cM_atan2s(sp98.y, JMAFastSqrt(SQUARE(sp98.x) + SQUARE(sp98.z)))); + cMtx_YrotS(*calc_mtx, (s16)cM_atan2s(scratchXyz.x, scratchXyz.z)); + cMtx_XrotM(*calc_mtx, -cM_atan2s(scratchXyz.y, JMAFastSqrt(SQUARE(scratchXyz.x) + SQUARE(scratchXyz.z)))); } - sp98.x = 0.0f; - sp98.y = 0.0f; - sp98.z = i_this->field_0x6f8 * (3.0f + YREG_F(1)); - MtxPosition(&sp98, &sp74); + scratchXyz.x = 0.0f; + scratchXyz.y = 0.0f; + scratchXyz.z = i_this->field_0x6f8 * (3.0f + YREG_F(1)); + MtxPosition(&scratchXyz, &sp74); - sp98.x = 0.0f; - sp98.y = 0.0f; - sp98.z = i_this->field_0x6a0 * i_this->field_0x6a4; + scratchXyz.x = 0.0f; + scratchXyz.y = 0.0f; + scratchXyz.z = i_this->field_0x6a0 * i_this->field_0x6a4; - temp_r28++; - for (i = 1; i < 16; i++, temp_r28++) { + rodJointPos++; + for (i = 1; i < 16; i++, rodJointPos++) { static f32 rod_p[] = { 0.0f, 0.002915448f, @@ -414,38 +430,38 @@ static void rod_control(dmg_rod_class* i_this) { 0.99999869f, }; - f32 temp_f29 = rod_p[i]; - f32 temp_f31 = sp80.x + ((temp_r28[0].x - temp_r28[-1].x) + (sp74.x * temp_f29)); - f32 temp_f26 = sp80.y + ((temp_r28[0].y - temp_r28[-1].y) + (sp74.y * temp_f29)); - f32 temp_f30 = sp80.z + ((temp_r28[0].z - temp_r28[-1].z) + (sp74.z * temp_f29)); + var_f29 = rod_p[i]; + var_f31 = sp80.x + ((rodJointPos[0].x - rodJointPos[-1].x) + (sp74.x * var_f29)); + var_f26 = sp80.y + ((rodJointPos[0].y - rodJointPos[-1].y) + (sp74.y * var_f29)); + var_f30 = sp80.z + ((rodJointPos[0].z - rodJointPos[-1].z) + (sp74.z * var_f29)); - spC = (s16)cM_atan2s(temp_f31, temp_f30); - spE = -cM_atan2s(temp_f26, JMAFastSqrt(SQUARE(temp_f31) + SQUARE(temp_f30))); - cMtx_YrotS(*calc_mtx, spC); - cMtx_XrotM(*calc_mtx, spE); - MtxPosition(&sp98, &sp8C); + segYaw = (s16)cM_atan2s(var_f31, var_f30); + segPitch = -cM_atan2s(var_f26, JMAFastSqrt(SQUARE(var_f31) + SQUARE(var_f30))); + cMtx_YrotS(*calc_mtx, segYaw); + cMtx_XrotM(*calc_mtx, segPitch); + MtxPosition(&scratchXyz, &worldPos); - temp_r28[0].x = temp_r28[-1].x + sp8C.x; - temp_r28[0].y = temp_r28[-1].y + sp8C.y; - temp_r28[0].z = temp_r28[-1].z + sp8C.z; + rodJointPos[0].x = rodJointPos[-1].x + worldPos.x; + rodJointPos[0].y = rodJointPos[-1].y + worldPos.y; + rodJointPos[0].z = rodJointPos[-1].z + worldPos.z; if (i == 15) { - i_this->field_0x6b8 = i_this->field_0x6ac; - i_this->field_0x6ac = *temp_r28; + i_this->field_0x6b8 = i_this->rod_tip_pos; + i_this->rod_tip_pos = *rodJointPos; } else if (i == 1) { i_this->field_0x6d4 = i_this->field_0x6c8; - i_this->field_0x6c8 = *temp_r28; + i_this->field_0x6c8 = *rodJointPos; } } if (i_this->kind == MG_ROD_KIND_UKI) { - temp_r28 = i_this->mg_rod.field_0x0; - for (i = 0; i < 15; i++, temp_r28++) { - sp98 = temp_r28[1] - temp_r28[0]; + rodJointPos = i_this->mg_rod.field_0x0; + for (i = 0; i < 15; i++, rodJointPos++) { + scratchXyz = rodJointPos[1] - rodJointPos[0]; - mDoMtx_stack_c::transS(temp_r28->x, temp_r28->y, temp_r28->z); - mDoMtx_stack_c::YrotM(cM_atan2s(sp98.x, sp98.z)); - mDoMtx_stack_c::XrotM(NREG_S(6) + -cM_atan2s(sp98.y, JMAFastSqrt(SQUARE(sp98.x) + SQUARE(sp98.z)))); + mDoMtx_stack_c::transS(rodJointPos->x, rodJointPos->y, rodJointPos->z); + mDoMtx_stack_c::YrotM(cM_atan2s(scratchXyz.x, scratchXyz.z)); + mDoMtx_stack_c::XrotM(NREG_S(6) + -cM_atan2s(scratchXyz.y, JMAFastSqrt(SQUARE(scratchXyz.x) + SQUARE(scratchXyz.z)))); static u8 rod_wd[] = { 15, @@ -465,9 +481,9 @@ static void rod_control(dmg_rod_class* i_this) { 2, }; - f32 temp_f28 = rod_wd[i] * (0.05166f + NREG_F(3)); - f32 temp_f24 = (0.073f + NREG_F(1)) * sp98.abs(); - mDoMtx_stack_c::scaleM(temp_f28, temp_f28, temp_f24); + f32 var_f28 = rod_wd[i] * (0.05166f + NREG_F(3)); + f32 var_f24 = (0.073f + NREG_F(1)) * scratchXyz.abs(); + mDoMtx_stack_c::scaleM(var_f28, var_f28, var_f24); if (i == 0) { mDoMtx_stack_c::scaleM(1.0f, 1.0f, 0.5f + NREG_F(4)); @@ -477,13 +493,13 @@ static void rod_control(dmg_rod_class* i_this) { i_this->rod_uki_model[i]->setBaseTRMtx(mDoMtx_stack_c::get()); } } else { - temp_r28 = i_this->mg_rod.field_0x0; - for (i = 0; i < 15; i++, temp_r28++) { - sp98 = temp_r28[1] - temp_r28[0]; + rodJointPos = i_this->mg_rod.field_0x0; + for (i = 0; i < 15; i++, rodJointPos++) { + scratchXyz = rodJointPos[1] - rodJointPos[0]; - mDoMtx_stack_c::transS(temp_r28->x, temp_r28->y, temp_r28->z); - mDoMtx_stack_c::YrotM(cM_atan2s(sp98.x, sp98.z)); - mDoMtx_stack_c::XrotM(NREG_S(6) + -cM_atan2s(sp98.y, JMAFastSqrt(SQUARE(sp98.x) + SQUARE(sp98.z)))); + mDoMtx_stack_c::transS(rodJointPos->x, rodJointPos->y, rodJointPos->z); + mDoMtx_stack_c::YrotM(cM_atan2s(scratchXyz.x, scratchXyz.z)); + mDoMtx_stack_c::XrotM(NREG_S(6) + -cM_atan2s(scratchXyz.y, JMAFastSqrt(SQUARE(scratchXyz.x) + SQUARE(scratchXyz.z)))); static u8 rod_wd[] = { 10, @@ -503,9 +519,9 @@ static void rod_control(dmg_rod_class* i_this) { 3, }; - f32 temp_f28 = rod_wd[i] * (0.05166f + NREG_F(3)); - f32 temp_f27 = (0.073f + NREG_F(1)) * sp98.abs(); - mDoMtx_stack_c::scaleM(temp_f28, temp_f28, temp_f27); + f32 var_f28 = rod_wd[i] * (0.05166f + NREG_F(3)); + f32 var_f27 = (0.073f + NREG_F(1)) * scratchXyz.abs(); + mDoMtx_stack_c::scaleM(var_f28, var_f28, var_f27); i_this->rod_uki_model[i]->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -537,22 +553,22 @@ static void line_control1(dmg_rod_class* i_this) { cM3dGPla sp58; cXyz sp28; - if (i_this->field_0x6e0 > 0.1f) { + if (i_this->cast_momentum > 0.1f) { work = i_this->mg_rod.field_0x0[14] - i_this->mg_rod.field_0x0[12]; cMtx_YrotS(*calc_mtx, cM_atan2s(work.x, work.z)); cMtx_XrotM(*calc_mtx, -cM_atan2s(work.y, JMAFastSqrt(SQUARE(work.x) + SQUARE(work.z)))); work.x = 0.0f; work.y = 0.0f; - work.z = i_this->field_0x6e0 * (500.0f + NREG_F(7)); + work.z = i_this->cast_momentum * (500.0f + NREG_F(7)); MtxPosition(&work, &sp28); - cLib_addCalc0(&i_this->field_0x6e0, 1.0f, 0.2f + NREG_F(8)); + cLib_addCalc0(&i_this->cast_momentum, 1.0f, 0.2f + NREG_F(8)); } else { sp28.set(0.0f, 0.0f, 0.0f); } if (i_this->action == ACTION_LURE_STANDBY && i_this->timers[0] != 0) { - cMtx_YrotS(*calc_mtx, i_this->field_0x6c4); + cMtx_YrotS(*calc_mtx, i_this->rod_angle_y); cMtx_XrotM(*calc_mtx, (NREG_S(7) - 21500)); work.x = 0.0f; @@ -561,14 +577,14 @@ static void line_control1(dmg_rod_class* i_this) { MtxPosition(&work, &sp28); } - cXyz* temp_r30 = i_this->mg_line.pos; - *temp_r30 = i_this->field_0x6ac; + cXyz* linePos = i_this->mg_line.pos; + *linePos = i_this->rod_tip_pos; work.x = 0.0f; work.y = 0.0f; work.z = i_this->field_0xf5c; - temp_r30++; + linePos++; BOOL sp10 = 1; if ( @@ -579,32 +595,38 @@ static void line_control1(dmg_rod_class* i_this) { sp10 = 0; } - f32 var_f30, var_f27, var_f26, temp_f29, temp_f28, var_f31; + f32 var_f29; + f32 var_f28; + f32 var_f27; + f32 var_f30; + f32 var_f31; + f32 var_f26; var_f31 = i_this->field_0xf64; - for (i = 1; i < 100; i++, temp_r30++) { - temp_f29 = sp28.x + (temp_r30[0].x - temp_r30[-1].x); - temp_f28 = sp28.z + (temp_r30[0].z - temp_r30[-1].z); + s16 spA, sp8; + for (i = 1; i < 100; i++, linePos++) { + var_f29 = sp28.x + (linePos[0].x - linePos[-1].x); + var_f28 = sp28.z + (linePos[0].z - linePos[-1].z); if (sp10 != 0) { - sp34.x = temp_r30->x; - sp34.y = 50.0f + temp_r30->y; - sp34.z = temp_r30->z; + sp34.x = linePos->x; + sp34.y = 50.0f + linePos->y; + sp34.z = linePos->z; sp6C.SetPos(&sp34); var_f30 = KREG_F(7) + (2.0f + dComIfG_Bgsp().GroundCross(&sp6C)); - if (var_f30 < i_this->field_0x590) { - var_f30 = i_this->field_0x590; + if (var_f30 < i_this->water_surface_y) { + var_f30 = i_this->water_surface_y; } - var_f27 = sp28.y + (temp_r30[0].y + var_f31); + var_f27 = sp28.y + (linePos[0].y + var_f31); if (var_f27 < var_f30) { var_f27 = var_f30; } - var_f26 = var_f27 - temp_r30[-1].y; + var_f26 = var_f27 - linePos[-1].y; } else { - var_f31 = (0.5f + TREG_F(5)) * ((2.0f + i_this->field_0x590) - temp_r30[0].y); + var_f31 = (0.5f + TREG_F(5)) * ((2.0f + i_this->water_surface_y) - linePos[0].y); if (var_f31 < i_this->field_0xf64) { var_f31 = i_this->field_0xf64; } else if (var_f31 > 0.25f) { @@ -615,25 +637,24 @@ static void line_control1(dmg_rod_class* i_this) { var_f31 = JREG_F(11); } - var_f26 = sp28.y + (var_f31 + (temp_r30[0].y - temp_r30[-1].y)); + var_f26 = sp28.y + (var_f31 + (linePos[0].y - linePos[-1].y)); } - s16 spA, sp8; - sp8 = (s16)cM_atan2s(temp_f29, temp_f28); - spA = -cM_atan2s(var_f26, JMAFastSqrt(SQUARE(temp_f29) + SQUARE(temp_f28))); + sp8 = (s16)cM_atan2s(var_f29, var_f28); + spA = -cM_atan2s(var_f26, JMAFastSqrt(SQUARE(var_f29) + SQUARE(var_f28))); cMtx_YrotS(*calc_mtx, sp8); cMtx_XrotM(*calc_mtx, spA); MtxPosition(&work, &sp40); - old_line_pos[i] = *temp_r30; + old_line_pos[i] = *linePos; - temp_r30[0].x = temp_r30[-1].x + sp40.x; - temp_r30[0].y = temp_r30[-1].y + sp40.y; - temp_r30[0].z = temp_r30[-1].z + sp40.z; + linePos[0].x = linePos[-1].x + sp40.x; + linePos[0].y = linePos[-1].y + sp40.y; + linePos[0].z = linePos[-1].z + sp40.z; if (i == 99) { - i_this->field_0x764 = *temp_r30; + i_this->field_0x764 = *linePos; } } } @@ -656,9 +677,9 @@ static void line_control2(dmg_rod_class* i_this) { sp34.z = i_this->field_0xf5c; for (i = 98; i >= 1; i--, var_r28--) { - f32 temp_f30, sp14, temp_f29, var_f31, var_f28; - temp_f30 = (var_r28[0].x - var_r28[1].x) + i_this->field_0xc20[i + TREG_S(9)]; - temp_f29 = (var_r28[0].z - var_r28[1].z) + i_this->field_0xdb0[i + TREG_S(9)]; + f32 var_f30, sp14, var_f29, var_f31, var_f28; + var_f30 = (var_r28[0].x - var_r28[1].x) + i_this->field_0xc20[i + TREG_S(9)]; + var_f29 = (var_r28[0].z - var_r28[1].z) + i_this->field_0xdb0[i + TREG_S(9)]; sp1C.x = var_r28->x; sp1C.y = 50.0f + var_r28->y; @@ -668,9 +689,9 @@ static void line_control2(dmg_rod_class* i_this) { if (dComIfG_Bgsp().GetTriPla(spD8, &sp54) && cBgW_CheckBGround(sp54.mNormal.y)) { var_f31 = KREG_F(7) + (2.0f + dComIfG_Bgsp().GroundCross(&spD8)); } else if (i_this->lure_type == MG_LURE_SP) { - var_f31 = i_this->field_0x590 - 1000.0f; + var_f31 = i_this->water_surface_y - 1000.0f; } else { - var_f31 = i_this->field_0x590; + var_f31 = i_this->water_surface_y; } var_f28 = var_r28[0].y; @@ -681,8 +702,8 @@ static void line_control2(dmg_rod_class* i_this) { sp14 = var_f28 - var_r28[1].y; s16 spA, sp8; - sp8 = (s16)cM_atan2s(temp_f30, temp_f29); - spA = -cM_atan2s(sp14, JMAFastSqrt(SQUARE(temp_f30) + SQUARE(temp_f29))); + sp8 = (s16)cM_atan2s(var_f30, var_f29); + spA = -cM_atan2s(sp14, JMAFastSqrt(SQUARE(var_f30) + SQUARE(var_f29))); cMtx_YrotS(*calc_mtx, sp8); cMtx_XrotM(*calc_mtx, spA); @@ -692,7 +713,7 @@ static void line_control2(dmg_rod_class* i_this) { var_r28[0].z = var_r28[1].z + sp28.z; } - if (i_this->lure_type != MG_LURE_SP && i_this->action == ACTION_LURE_ACTION && i_this->field_0x100d != 0) { + if (i_this->lure_type != MG_LURE_SP && i_this->action == ACTION_LURE_ACTION && i_this->is_hook_in_water != 0) { dBgS_LinChk sp68; cM3dGPla sp40; sp68.SetRope(); @@ -711,13 +732,13 @@ static void line_control2(dmg_rod_class* i_this) { sp34.z = 5.0f + YREG_F(18); MtxPosition(&sp34, &sp28); - f32 temp_f27 = (0.1f * sp28.x) + sp68.GetCross().x; - f32 temp_f26 = (0.1f * sp28.z) + sp68.GetCross().z; - f32 temp_f25 = i_this->mg_line.pos[i - 1].x - temp_f27; - f32 temp_f24 = i_this->mg_line.pos[i - 1].z - temp_f26; - if (JMAFastSqrt(SQUARE(temp_f25) + SQUARE(temp_f24)) < 100.0f + nREG_F(6)) { - i_this->mg_line.pos[i].x = temp_f27; - i_this->mg_line.pos[i].z = temp_f26; + f32 var_f27 = (0.1f * sp28.x) + sp68.GetCross().x; + f32 var_f26 = (0.1f * sp28.z) + sp68.GetCross().z; + f32 var_f25 = i_this->mg_line.pos[i - 1].x - var_f27; + f32 var_f24 = i_this->mg_line.pos[i - 1].z - var_f26; + if (JMAFastSqrt(SQUARE(var_f25) + SQUARE(var_f24)) < 100.0f + nREG_F(6)) { + i_this->mg_line.pos[i].x = var_f27; + i_this->mg_line.pos[i].z = var_f26; } i_this->field_0xc20[i] = sp28.x; @@ -735,7 +756,7 @@ static void line_control2(dmg_rod_class* i_this) { i_this->field_0xdb0[i] *= 0.95f; actor->current.pos.x += (0.02f + TREG_F(17)) * i_this->field_0xc20[i]; actor->current.pos.z += (0.02f + TREG_F(17)) * i_this->field_0xdb0[i]; - cLib_addCalcAngleS2(&i_this->field_0xffe, 0, 2, 20); + cLib_addCalcAngleS2(&i_this->lure_yaw_target, 0, 2, 20); cMtx_YrotS(*calc_mtx, actor->current.angle.y); sp34.x = 0.0f; @@ -764,15 +785,15 @@ static void line_control1_u(dmg_rod_class* i_this) { cMtx_YrotS(*calc_mtx, player->shape_angle.y); work.x = 0.0f; - work.y = i_this->field_0x6e0 * (20.0f + BREG_F(8)); - work.z = i_this->field_0x6e0 * (30.0f + BREG_F(9)); + work.y = i_this->cast_momentum * (20.0f + BREG_F(8)); + work.z = i_this->cast_momentum * (30.0f + BREG_F(9)); MtxPosition(&work, &sp74); sp74.y += i_this->field_0x6e4; cLib_addCalc0(&i_this->field_0x6e4, 1.0f, 3.0f + ZREG_F(17)); - cXyz* temp_r28 = i_this->mg_line.pos; - *temp_r28 = i_this->field_0x6ac; + cXyz* linePos = i_this->mg_line.pos; + *linePos = i_this->rod_tip_pos; f32 fVar1, fVar2, fVar3, fVar4; f32 fVar5, fVar6; @@ -783,14 +804,14 @@ static void line_control1_u(dmg_rod_class* i_this) { if (fVar7 > 300.0f) { fVar7 = 300.0f; } - temp_r28[0].y = 700.0f + mg_fish->current.pos.y + fVar7; + linePos[0].y = 700.0f + mg_fish->current.pos.y + fVar7; } work.x = 0.0f; work.y = 0.0f; work.z = i_this->field_0xf5c; - temp_r28++; + linePos++; f32 fVar8; f32 fVar9 = i_this->field_0xf64; @@ -800,90 +821,92 @@ static void line_control1_u(dmg_rod_class* i_this) { fVar10 *= 1.5f; } - cXyz sp68; - f32 fVar11; - dKyw_get_AllWind_vec(&i_this->hook_pos, &sp68, &fVar11); + cXyz windDir; + f32 windPower; + dKyw_get_AllWind_vec(&i_this->hook_pos, &windDir, &windPower); - if (fVar11 < 0.4f) { - fVar11 = 0.0f; + if (windPower < 0.4f) { + windPower = 0.0f; } else { - fVar11 -= 0.4f; - if (fVar11 > 1.0f) { - fVar11 = 1.0f; + windPower -= 0.4f; + if (windPower > 1.0f) { + windPower = 1.0f; } } - f32 fVar12, fVar13, fVar14; - if (fVar11 > 0.01f) { - fVar11 *= 40.0f; - fVar12 = sp68.x * fVar11; - fVar13 = sp68.z * fVar11; + f32 windMagX, windMagZ; + f32 fVar14; + if (windPower > 0.01f) { + windPower *= 40.0f; + windMagX = windDir.x * windPower; + windMagZ = windDir.z * windPower; - if ((i_this->field_0x578 & 15) == 0) { - i_this->field_0x109e = 2000.0f + (60.0f * fVar11) + cM_rndF(60.0f * fVar11); + if ((i_this->counter & 15) == 0) { + i_this->field_0x109e = 2000.0f + (60.0f * windPower) + cM_rndF(60.0f * windPower); } i_this->field_0x109c += i_this->field_0x109e; } else { - sp68.x = sp68.y = sp68.z = 0.0f; + windDir.x = windDir.y = windDir.z = 0.0f; } cXyz speed; - int iVar1 = 0; - fopAcM_getWaterStream(&actor->current.pos, i_this->acchcir, &speed, &iVar1, 0); + int waterStreamPower = 0; + fopAcM_getWaterStream(&actor->current.pos, i_this->acchcir, &speed, &waterStreamPower, 0); - for (i = 1; i < 100; i++, temp_r28++) { - if (fVar11 > 0.01f && temp_r28[0].y > (20.0f + i_this->field_0x590)) { + f32 var_f31; + for (i = 1; i < 100; i++, linePos++) { + if (windPower > 0.01f && linePos[0].y > (20.0f + i_this->water_surface_y)) { fVar14 = 0.1f + (0.003f * i); - sp68.x = fVar12 * (1.0f + (fVar14 * cM_ssin(i_this->field_0x109c - (i * 600)))); - sp68.y = JREG_F(7) * (fVar11 * (fVar14 * cM_ssin(i_this->field_0x109c - (i * 650)))); - sp68.z = fVar13 * (1.0f + (fVar14 * cM_ssin(i_this->field_0x109c - (i * 630)))); + windDir.x = windMagX * (1.0f + (fVar14 * cM_ssin(i_this->field_0x109c - (i * 600)))); + windDir.y = JREG_F(7) * (windPower * (fVar14 * cM_ssin(i_this->field_0x109c - (i * 650)))); + windDir.z = windMagZ * (1.0f + (fVar14 * cM_ssin(i_this->field_0x109c - (i * 630)))); } else { - if (iVar1 != 0) { - sp68.x = iVar1 * (0.5f * speed.x); - sp68.z = iVar1 * (0.5f * speed.z); + if (waterStreamPower != 0) { + windDir.x = waterStreamPower * (0.5f * speed.x); + windDir.z = waterStreamPower * (0.5f * speed.z); } else { - sp68.x = sp68.z = 0.0f; + windDir.x = windDir.z = 0.0f; } - sp68.y = 0.0f; + windDir.y = 0.0f; } - fVar1 = sp68.x + (sp74.x + (temp_r28[0].x - temp_r28[-1].x)); - fVar3 = sp68.z + (sp74.z + (temp_r28[0].z - temp_r28[-1].z)); + fVar1 = windDir.x + (sp74.x + (linePos[0].x - linePos[-1].x)); + fVar3 = windDir.z + (sp74.z + (linePos[0].z - linePos[-1].z)); - gnd_chk_pos.x = temp_r28[0].x; - gnd_chk_pos.y = 50.0f + temp_r28[0].y; - gnd_chk_pos.z = temp_r28[0].z; + gnd_chk_pos.x = linePos[0].x; + gnd_chk_pos.y = 50.0f + linePos[0].y; + gnd_chk_pos.z = linePos[0].z; gnd_chk.SetPos(&gnd_chk_pos); fVar5 = KREG_F(7) + (2.0f + dComIfG_Bgsp().GroundCross(&gnd_chk)); if (i >= 50 && i <= 90) { - f32 var_f31 = (0.07f + KREG_F(9)) * (20.0f - fabsf(i - 70.0f)); + var_f31 = (0.07f + KREG_F(9)) * (20.0f - fabsf(i - 70.0f)); if (var_f31 > 1.0f) { var_f31 = 1.0f; } var_f31 *= var_f31; - fVar8 = AREG_F(14) + (5.0f + (i_this->field_0x590 + (i_this->field_0xf74 * var_f31))); + fVar8 = AREG_F(14) + (5.0f + (i_this->water_surface_y + (i_this->field_0xf74 * var_f31))); } else { - fVar8 = 5.0f + i_this->field_0x590 + AREG_F(14); + fVar8 = 5.0f + i_this->water_surface_y + AREG_F(14); } - fVar6 = ((0.5f + TREG_F(5)) * (fVar8 - temp_r28[0].y)) - 0.25f; + fVar6 = ((0.5f + TREG_F(5)) * (fVar8 - linePos[0].y)) - 0.25f; if (fVar6 < fVar9) { fVar6 = fVar9; } else if (fVar6 > 2.0f) { fVar6 = 2.0f; } - if (i >= (TREG_S(9) + BREG_S(5) + 71) && temp_r28[0].y < fVar8) { - f32 temp_f31 = (0.02f + VREG_F(3)) * (AREG_S(7) + (i - (TREG_S(9) + BREG_S(5) + 61))); - fVar6 = fVar10 * (temp_f31 * temp_f31); + if (i >= (TREG_S(9) + BREG_S(5) + 71) && linePos[0].y < fVar8) { + var_f31 = (0.02f + VREG_F(3)) * (AREG_S(7) + (i - (TREG_S(9) + BREG_S(5) + 61))); + fVar6 = fVar10 * (var_f31 * var_f31); } - fVar4 = sp68.y + (sp74.y + (temp_r28[0].y + fVar6)); + fVar4 = windDir.y + (sp74.y + (linePos[0].y + fVar6)); if ((fVar4 <= fVar8 || fVar4 <= fVar5) && (i == (TREG_S(9) + BREG_S(6) + 72))) { - cLib_addCalc0(&i_this->field_0x6e0, 1.0f, 0.08f + BREG_F(19)); + cLib_addCalc0(&i_this->cast_momentum, 1.0f, 0.08f + BREG_F(19)); } if (fVar4 <= fVar5) { @@ -893,7 +916,7 @@ static void line_control1_u(dmg_rod_class* i_this) { } } - fVar2 = (fVar4 - temp_r28[-1].y); + fVar2 = (fVar4 - linePos[-1].y); s16 x_rot, y_rot; y_rot = (s16)cM_atan2s(fVar1, fVar3); @@ -902,12 +925,12 @@ static void line_control1_u(dmg_rod_class* i_this) { cMtx_YrotS(*calc_mtx, y_rot); cMtx_XrotM(*calc_mtx, x_rot); MtxPosition(&work, &offset); - temp_r28[0].x = temp_r28[-1].x + offset.x; - temp_r28[0].y = temp_r28[-1].y + offset.y; - temp_r28[0].z = temp_r28[-1].z + offset.z; + linePos[0].x = linePos[-1].x + offset.x; + linePos[0].y = linePos[-1].y + offset.y; + linePos[0].z = linePos[-1].z + offset.z; if (i == 99) { - i_this->field_0x764 = *temp_r28; + i_this->field_0x764 = *linePos; } } } @@ -928,10 +951,14 @@ static void line_control2_u(dmg_rod_class* i_this) { work.y = 0.0f; work.z = i_this->field_0xf5c; + f32 x_delta; + f32 y_delta; + f32 z_delta; + f32 gnd_cross_offset; + f32 y; for (i = 98; i >= 1; i--, linePosP--) { - f32 x_delta = linePosP[0].x - linePosP[1].x; - f32 y_delta; - f32 z_delta = linePosP[0].z - linePosP[1].z; + x_delta = linePosP[0].x - linePosP[1].x; + z_delta = linePosP[0].z - linePosP[1].z; if (i_this->action == ACTION_UKI_STANDBY) { pos.x = linePosP->x; @@ -939,8 +966,8 @@ static void line_control2_u(dmg_rod_class* i_this) { pos.z = linePosP->z; gnd_chk.SetPos(&pos); - f32 gnd_cross_offset = KREG_F(7) + (2.0f + dComIfG_Bgsp().GroundCross(&gnd_chk)); - f32 y = linePosP->y; + gnd_cross_offset = KREG_F(7) + (2.0f + dComIfG_Bgsp().GroundCross(&gnd_chk)); + y = linePosP->y; if (y < gnd_cross_offset) { y = gnd_cross_offset; } @@ -984,19 +1011,19 @@ static f32 depth_check(dmg_rod_class* i_this, cXyz* param_1) { Vec pos; pos.x = param_1->x; - pos.y = 50.0f + i_this->field_0x590; + pos.y = 50.0f + i_this->water_surface_y; pos.z = param_1->z; gnd_chk.SetPos(&pos); - return i_this->field_0x590 - dComIfG_Bgsp().GroundCross(&gnd_chk); + return i_this->water_surface_y - dComIfG_Bgsp().GroundCross(&gnd_chk); } static void sibuki_set(dmg_rod_class* i_this, f32 i_size, cXyz* i_pos, BOOL param_3) { fopAc_ac_c* actor = &i_this->actor; - if (i_this->field_0x1165 == 0 && (param_3 || i_this->field_0x590 - i_pos->y < 20.0f) && depth_check(i_this, i_pos) > 0.0f) { + if (i_this->cast_bob_timer == 0 && (param_3 || i_this->water_surface_y - i_pos->y < 20.0f) && depth_check(i_this, i_pos) > 0.0f) { cXyz pos(*i_pos); - pos.y = i_this->field_0x590; + pos.y = i_this->water_surface_y; static cXyz sc(i_size, i_size, i_size); @@ -1022,7 +1049,7 @@ static void lure_onboat(dmg_rod_class* i_this) { cXyz pos_delta; cXyz sp14; - i_this->field_0x100d = 0; + i_this->is_hook_in_water = 0; fopAc_ac_c* actor_p = fopAcM_SearchByID(i_this->boat_actor_id); if (actor_p == NULL) { @@ -1032,10 +1059,10 @@ static void lure_onboat(dmg_rod_class* i_this) { if (mDoCPd_c::getTrigB(PAD_1)) { i_this->timers[1] = 30; - i_this->field_0x146c = 30; + i_this->input_cooldown = 30; } - if (i_this->field_0x146c == 0 && !dComIfGp_checkPlayerStatus0(0, 0x2000)) { + if (i_this->input_cooldown == 0 && !dComIfGp_checkPlayerStatus0(0, 0x2000)) { dComIfGp_setAStatusForce(79, 2); } @@ -1044,7 +1071,7 @@ static void lure_onboat(dmg_rod_class* i_this) { i_this->field_0x6f8 = 15.0f + BREG_F(4); actor->current.pos = i_this->field_0x764; - pos_delta = i_this->field_0x6ac - actor->current.pos; + pos_delta = i_this->rod_tip_pos - actor->current.pos; actor->current.angle.x = -cM_atan2s(pos_delta.y, pos_delta.z); actor->current.angle.y = (s16)cM_atan2s(pos_delta.x, JMAFastSqrt(SQUARE(pos_delta.y) + SQUARE(pos_delta.z))); @@ -1076,10 +1103,10 @@ static int lure_standby(dmg_rod_class* i_this) { int sp14 = 0; int sp10 = 0; i_this->field_0x10a6 = 0; - i_this->field_0x100d = 0; + i_this->is_hook_in_water = 0; if (daAlink_getAlinkActorClass()->checkCanoeFishingRodGrabOrPut()) { - i_this->field_0x146c = 5; + i_this->input_cooldown = 5; } f32 var_f30 = 0.3f + BREG_F(5); @@ -1091,7 +1118,7 @@ static int lure_standby(dmg_rod_class* i_this) { i_this->field_0xf64 = -30.0f + KREG_F(8); actor->current.pos = i_this->field_0x764; - work = i_this->field_0x6ac - actor->current.pos; + work = i_this->rod_tip_pos - actor->current.pos; actor->current.angle.x = -cM_atan2s(work.y, work.z); actor->current.angle.y = (s16)cM_atan2s(work.x, JMAFastSqrt(SQUARE(work.y) + SQUARE(work.z))); @@ -1140,24 +1167,24 @@ static int lure_standby(dmg_rod_class* i_this) { daAlink_getAlinkActorClass()->setFishingArnmAngle(i_this->field_0x14f8); work = actor->current.pos - actor->old.pos; - - f32 temp_f29 = (0.005f + NREG_F(9)) * work.abs(); - if (temp_f29 > (0.4f + NREG_F(8))) { - i_this->field_0x6e0 = temp_f29; - if (i_this->field_0x6e0 > 1.0f) { - i_this->field_0x6e0 = 1.0f; + + f32 var_f29 = (0.005f + NREG_F(9)) * work.abs(); + if (var_f29 > (0.4f + NREG_F(8))) { + i_this->cast_momentum = var_f29; + if (i_this->cast_momentum > 1.0f) { + i_this->cast_momentum = 1.0f; } } if (i_this->timers[0] != 0) { - i_this->field_0x6e0 = 1.0f + XREG_F(11); + i_this->cast_momentum = 1.0f + XREG_F(11); if (i_this->timers[0] == 3) { dComIfGp_getVibration().StartShock(3, 1, cXyz(0.0f, 1.0f, 0.0f)); } if (i_this->field_0x6e8 != 0) { - cMtx_YrotS(*calc_mtx, i_this->field_0x6c4); + cMtx_YrotS(*calc_mtx, i_this->rod_angle_y); if (i_this->field_0x6e8 == 1) { work.x = -100.0f + hREG_F(1); @@ -1178,14 +1205,14 @@ static int lure_standby(dmg_rod_class* i_this) { i_this->field_0x10a8 = 0; i_this->play_cam_timer = 0; - actor->current.angle.y = i_this->field_0x6c4 + NREG_S(6) + 0x7E0C; + actor->current.angle.y = i_this->rod_angle_y + NREG_S(6) + (0x8000 - 500); OS_REPORT(" CAST POWER %f\n", i_this->cast_power); - f32 var_f31 = i_this->cast_power; - if (var_f31 > 1.0f) { - var_f31 = 1.0f; + f32 castPower = i_this->cast_power; + if (castPower > 1.0f) { + castPower = 1.0f; } - actor->speedF = (-40.0f + JREG_F(13)) * var_f31; + actor->speedF = (-40.0f + JREG_F(13)) * castPower; cMtx_YrotS(*calc_mtx, actor->current.angle.y); @@ -1211,10 +1238,10 @@ static int lure_standby(dmg_rod_class* i_this) { MtxPosition(&work, &offset); actor->current.pos += offset; - i_this->field_0x1410 = 0.05f + ZREG_F(11); + i_this->camera_morf_rate = 0.05f + ZREG_F(11); i_this->field_0xf64 = KREG_F(8); i_this->field_0x14f8 = XREG_S(8) - 5000; - i_this->field_0x6e0 = i_this->field_0x594 = 0.0f; + i_this->cast_momentum = i_this->field_0x594 = 0.0f; } } else if (sp10 != 0) { if (sp10 == 1) { @@ -1226,19 +1253,19 @@ static int lure_standby(dmg_rod_class* i_this) { daAlink_getAlinkActorClass()->seStartOnlyReverb(Z2SE_AL_ROD_SWING_LURE); daAlink_getAlinkActorClass()->seStartOnlyReverb(Z2SE_AL_REEL_ROLL_THROW); i_this->field_0x1514 = 30; - } + } #if VERSION != VERSION_SHIELD_DEBUG else if (i_this->field_0x14f8 < 5000) { dComIfGp_setCStickStatusForce(80, 2, 0); } #endif - i_this->field_0x6f8 = (500.0f + NREG_F(19)) * i_this->field_0x6e0; + i_this->field_0x6f8 = (500.0f + NREG_F(19)) * i_this->cast_momentum; if (!daAlink_getAlinkActorClass()->checkFishingRodGrab(actor)) { i_this->action = ACTION_LURE_ONBOAT; i_this->play_cam_mode = 0; - + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(i_this->play_cam_center, i_this->play_cam_eye, i_this->play_cam_fovy, 0); camera->mCamera.Start(); @@ -1247,7 +1274,7 @@ static int lure_standby(dmg_rod_class* i_this) { dMw_onMenuRing(); daAlink_getAlinkActorClass()->seStartOnlyReverb(Z2SE_AL_ROD_TAKEOUT); i_this->timers[1] = 30; - i_this->field_0x146c = 5; + i_this->input_cooldown = 5; } return sp14; @@ -1272,7 +1299,7 @@ static void lure_cast(dmg_rod_class* i_this) { if (!daAlink_getAlinkActorClass()->checkFishingRodGrab(actor)) { i_this->action = ACTION_LURE_ONBOAT; i_this->play_cam_mode = 0; - + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.Reset(i_this->play_cam_center, i_this->play_cam_eye, i_this->play_cam_fovy, 0); camera->mCamera.Start(); @@ -1285,7 +1312,7 @@ static void lure_cast(dmg_rod_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0x14f8, (VREG_S(5) - 7000), 8, (VREG_S(6) + 200)); daAlink_getAlinkActorClass()->setFishingArnmAngle(i_this->field_0x14f8); - sp4C = actor->current.pos - i_this->field_0x6ac; + sp4C = actor->current.pos - i_this->rod_tip_pos; if (i_this->reel_btn_flags != 0) { actor->speedF *= 0.95f + VREG_F(11); @@ -1339,14 +1366,14 @@ static void lure_cast(dmg_rod_class* i_this) { OS_REPORT(" LURE WALL 2 HIT \n"); } - sp4C.y = 1.0f + i_this->field_0x590 + XREG_F(7); + sp4C.y = 1.0f + i_this->water_surface_y + XREG_F(7); sp4C.x -= actor->speed.x * (3.0f + XREG_F(6)); sp4C.z -= actor->speed.z * (3.0f + XREG_F(6)); sp40 = actor->current.pos; sp40.x -= actor->speed.x * (3.0f + XREG_F(6)); sp40.z -= actor->speed.z * (3.0f + XREG_F(6)); - sp40.y = 1.0f + i_this->field_0x590 + XREG_F(7); + sp40.y = 1.0f + i_this->water_surface_y + XREG_F(7); sp58.Set(&sp4C, &sp40, actor); if (dComIfG_Bgsp().LineCross(&sp58) || spC != 0) { @@ -1371,16 +1398,16 @@ static void lure_cast(dmg_rod_class* i_this) { if (i_this->acch.ChkGroundHit()) { actor->speed.y = 20.0f; actor->speedF *= 0.5f; - i_this->field_0xffc = cM_rndFX(3000.0f); + i_this->lure_yaw_offset = cM_rndFX(3000.0f); sp10 = 2; } - if (i_this->field_0x100d != 0) { + if (i_this->is_hook_in_water != 0) { if (actor->speedF < -5.0f + VREG_F(7)) { actor->speedF = -5.0f + VREG_F(7); } actor->speed.y = -10.0f + VREG_F(0); - actor->current.pos.y = i_this->field_0x590; + actor->current.pos.y = i_this->water_surface_y; i_this->field_0x1009 = 30; i_this->field_0x10a4 = 30; @@ -1400,7 +1427,7 @@ static void lure_cast(dmg_rod_class* i_this) { i_this->timers[4] = 5; i_this->timers[6] = WREG_S(6) + 25; i_this->play_cam_mode = 5; - i_this->field_0x1410 = 0.0f; + i_this->camera_morf_rate = 0.0f; if (i_this->lure_type == MG_LURE_SP) { if ((s16)(player->shape_angle.y - daAlink_getAlinkActorClass()->getFishingRodAngleY()) < 0) { @@ -1439,7 +1466,7 @@ static int simple_bg_check(dmg_rod_class* i_this, f32 param_1) { spC.y = 0.0f; cMtx_YrotS(*calc_mtx, actor->current.angle.y); - + dBgS_LinChk linchk; linchk.SetRope(); @@ -1451,7 +1478,7 @@ static int simple_bg_check(dmg_rod_class* i_this, f32 param_1) { spC.z = param_1 * c_z[i]; MtxPosition(&spC, &sp18); sp18 += sp24; - + linchk.Set(&sp24, &sp18, actor); if (dComIfG_Bgsp().LineCross(&linchk)) { return i + 1; @@ -1462,6 +1489,7 @@ static int simple_bg_check(dmg_rod_class* i_this, f32 param_1) { } static void* s_wd_sub(void* i_actor, void* i_data) { + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_LP) { return i_actor; } @@ -1498,10 +1526,10 @@ static void fr_action(dmg_rod_class* i_this, f32 param_1) { if (i_this->reel_btn_flags != 0) { actor->speedF = i_this->reel_speed; - if (i_this->field_0x578 & 48) { - i_this->field_0xffe = (1000.0f + ZREG_F(8)) * cM_ssin(i_this->field_0x578 * 5000); + if (i_this->counter & 48) { + i_this->lure_yaw_target = (1000.0f + ZREG_F(8)) * cM_ssin(i_this->counter * 5000); } else { - i_this->field_0xffe = 0; + i_this->lure_yaw_target = 0; } if (actor->speedF > 12.0f) { @@ -1512,19 +1540,19 @@ static void fr_action(dmg_rod_class* i_this, f32 param_1) { if (param_1 >= 0.2f && i_this->field_0x100e == 0) { actor->speedF = (6.0f + BREG_F(14)) * param_1; - if (i_this->field_0xffe > 0) { - i_this->field_0xffe = -(BREG_S(2) + 8000); + if (i_this->lure_yaw_target > 0) { + i_this->lure_yaw_target = -(BREG_S(2) + 8000); } else { - i_this->field_0xffe = BREG_S(2) + 8000; + i_this->lure_yaw_target = BREG_S(2) + 8000; } - i_this->field_0x1000 = 0; + i_this->lure_pitch_offset = 0; i_this->field_0xf5c -= 2.0f + BREG_F(10); i_this->field_0x1009 = 10; i_this->field_0x100e = 3; } - cLib_addCalcAngleS2(&i_this->field_0xffc, i_this->field_0xffe, 4, (BREG_S(3) + 12000)); + cLib_addCalcAngleS2(&i_this->lure_yaw_offset, i_this->lure_yaw_target, 4, (BREG_S(3) + 12000)); i_this->field_0xff0 = 0; } @@ -1536,10 +1564,10 @@ static void pe_action(dmg_rod_class* i_this, f32 param_1) { if (i_this->reel_btn_flags != 0) { actor->speedF = i_this->reel_speed; - if (i_this->field_0x578 & 48) { - i_this->field_0xffe = (1000.0f + ZREG_F(8)) * cM_ssin(i_this->field_0x578 * 5000); + if (i_this->counter & 48) { + i_this->lure_yaw_target = (1000.0f + ZREG_F(8)) * cM_ssin(i_this->counter * 5000); } else { - i_this->field_0xffe = 0; + i_this->lure_yaw_target = 0; } if (actor->speedF > 12.0f) { @@ -1550,20 +1578,20 @@ static void pe_action(dmg_rod_class* i_this, f32 param_1) { if (param_1 >= 0.2f && i_this->field_0x100e == 0) { actor->speedF = (8.0f + BREG_F(14)) * param_1; - s16 temp_r26 = 13000.0f * param_1; - if (i_this->field_0xffe > 0) { - i_this->field_0xffe = -temp_r26; + s16 var_r26 = 13000.0f * param_1; + if (i_this->lure_yaw_target > 0) { + i_this->lure_yaw_target = -var_r26; } else { - i_this->field_0xffe = temp_r26; + i_this->lure_yaw_target = var_r26; } - i_this->field_0x1000 = 5000.0f * param_1; + i_this->lure_pitch_offset = 5000.0f * param_1; i_this->field_0xf5c -= 2.0f + BREG_F(10); i_this->field_0x1009 = 30; i_this->field_0x100e = 3; } - cLib_addCalcAngleS2(&i_this->field_0xffc, i_this->field_0xffe, 4, (BREG_S(3) + 12000)); + cLib_addCalcAngleS2(&i_this->lure_yaw_offset, i_this->lure_yaw_target, 4, (BREG_S(3) + 12000)); s16 var_r25 = 4; s16 var_r27 = 500; @@ -1573,18 +1601,18 @@ static void pe_action(dmg_rod_class* i_this, f32 param_1) { if (actor->speedF > 4.0f) { i_this->sound.startCreatureSoundLevel(Z2SE_AL_ROD_ROLLBACK_SLOW, 0, -1); - i_this->field_0x1002 = YREG_S(0) - 500; + i_this->lure_pitch_target = YREG_S(0) - 500; var_r25 = 4; var_r27 = 15000; } else { - i_this->field_0x1002 = (s16)(YREG_S(1) + ((400.0f + ZREG_F(18)) * cM_ssin(i_this->field_0x578 * 1500))) - 2500; + i_this->lure_pitch_target = (YREG_S(1) + (s16)((400.0f + ZREG_F(18)) * cM_ssin(i_this->counter * 1500))) - 2500; } cLib_addCalc0(&actor->speedF, 0.1f, 0.3f + BREG_F(12)); - cLib_addCalcAngleS2(&i_this->field_0x1000, i_this->field_0x1002, var_r25, var_r27); + cLib_addCalcAngleS2(&i_this->lure_pitch_offset, i_this->lure_pitch_target, var_r25, var_r27); - if (i_this->field_0x1000 > 0) { - i_this->field_0x594 = (-5.0f + YREG_F(11)) * cM_ssin(i_this->field_0x1000); + if (i_this->lure_pitch_offset > 0) { + i_this->field_0x594 = (-5.0f + YREG_F(11)) * cM_ssin(i_this->lure_pitch_offset); } else { i_this->field_0x594 = 0.0f; } @@ -1594,14 +1622,14 @@ static void po_action(dmg_rod_class* i_this, f32 param_1) { fopAc_ac_c* actor = &i_this->actor; cXyz sp18; cXyz spC; - + s16 var_r26 = 1500; if (i_this->reel_btn_flags != 0) { actor->speedF = i_this->reel_speed; - if (i_this->field_0x578 & 48) { - i_this->field_0xffe = (2000.0f + ZREG_F(8)) * cM_ssin(i_this->field_0x578 * 4000); + if (i_this->counter & 48) { + i_this->lure_yaw_target = (2000.0f + ZREG_F(8)) * cM_ssin(i_this->counter * 4000); } else { - i_this->field_0xffe = 0; + i_this->lure_yaw_target = 0; } var_r26 = 4000; @@ -1615,18 +1643,18 @@ static void po_action(dmg_rod_class* i_this, f32 param_1) { if (param_1 >= 0.2f && i_this->field_0x100e == 0) { actor->speedF = (10.0f + BREG_F(14)) * param_1; - if ((i_this->field_0x590 - actor->current.pos.y) <= 15.0f) { - u32 var_r27 = (127.0f * param_1); - if (var_r27 > 127) { - var_r27 = 127; + if ((i_this->water_surface_y - actor->current.pos.y) <= 15.0f) { + u32 mapInfo = (127.0f * param_1); + if (mapInfo > 127) { + mapInfo = 127; } - i_this->sound.startCreatureSound(Z2SE_AL_UKI_POKOPOKO, var_r27, -1); + i_this->sound.startCreatureSound(Z2SE_AL_UKI_POKOPOKO, mapInfo, -1); i_this->field_0x100c++; } i_this->field_0x1009 = VREG_S(9) + 10; - i_this->field_0xffe = 0; - i_this->field_0x1000 = VREG_S(0) + 5000; + i_this->lure_yaw_target = 0; + i_this->lure_pitch_offset = VREG_S(0) + 5000; actor->speed.y = -5.0f + VREG_F(5); i_this->field_0xf5c -= 2.0f + BREG_F(10); i_this->timers[0] = ZREG_S(5) + 15; @@ -1634,33 +1662,33 @@ static void po_action(dmg_rod_class* i_this, f32 param_1) { i_this->field_0x118c = actor->speedF; } - f32 temp_f31 = actor->speedF; + f32 speed = actor->speedF; cLib_addCalc0(&actor->speedF, 0.5f, 1.5f + BREG_F(12)); if (actor->speedF < 2.0f) { - if (temp_f31 >= 2.0f) { + if (speed >= 2.0f) { if (cM_rndF(1.0f) < 0.5f) { - i_this->field_0xffe = -(BREG_S(2) + 10000); + i_this->lure_yaw_target = -(BREG_S(2) + 10000); } else { - i_this->field_0xffe = BREG_S(2) + 10000; + i_this->lure_yaw_target = BREG_S(2) + 10000; } i_this->field_0x598 = 1.0f; } } if (i_this->timers[0] == 1) { - i_this->field_0xffe += (s16)cM_rndFX(5000.0f); + i_this->lure_yaw_target += (s16)cM_rndFX(5000.0f); } - cLib_addCalcAngleS2(&i_this->field_0xffc, i_this->field_0xffe, 4, var_r26); + cLib_addCalcAngleS2(&i_this->lure_yaw_offset, i_this->lure_yaw_target, 4, var_r26); if (actor->speedF > 4.0f) { - i_this->field_0x1002 = YREG_S(0) - 500; + i_this->lure_pitch_target = YREG_S(0) - 500; } else { - i_this->field_0x1002 = YREG_S(1); + i_this->lure_pitch_target = (s16)YREG_S(1); } - cLib_addCalcAngleS2(&i_this->field_0x1000, i_this->field_0x1002, 8, (YREG_S(2) + 1000)); + cLib_addCalcAngleS2(&i_this->lure_pitch_offset, i_this->lure_pitch_target, 8, (YREG_S(2) + 1000)); } static void ws_action(dmg_rod_class* i_this, f32 param_1) { @@ -1672,10 +1700,10 @@ static void ws_action(dmg_rod_class* i_this, f32 param_1) { if (i_this->reel_btn_flags != 0) { actor->speedF = i_this->reel_speed; - if (i_this->field_0x578 & 48) { - i_this->field_0xffe = (1000.0f + ZREG_F(8)) * cM_ssin(i_this->field_0x578 * 3000); + if (i_this->counter & 48) { + i_this->lure_yaw_target = (1000.0f + ZREG_F(8)) * cM_ssin(i_this->counter * 3000); } else { - i_this->field_0xffe = 0; + i_this->lure_yaw_target = 0; } i_this->field_0x1009 = 4; @@ -1687,35 +1715,35 @@ static void ws_action(dmg_rod_class* i_this, f32 param_1) { actor->speedF = (15.0f + BREG_F(14)) * param_1; i_this->field_0x1020 = (1300.0f * actor->speedF) + cM_rndF(5000.0f); i_this->field_0x1022 = -((1000.0f * actor->speedF) + cM_rndF(3000.0f)); - i_this->field_0xffe = 0; + i_this->lure_yaw_target = 0; i_this->field_0xf5c -= 2.0f + BREG_F(10); i_this->field_0x100e = 3; } - if ((i_this->field_0x590 - actor->current.pos.y) <= 15.0f && actor->speedF > 2.0f) { - u32 var_r27 = 9.0f * actor->speedF; - if (var_r27 > 127) { - var_r27 = 127; + if ((i_this->water_surface_y - actor->current.pos.y) <= 15.0f && actor->speedF > 2.0f) { + u32 mapInfo = 9.0f * actor->speedF; + if (mapInfo > 127) { + mapInfo = 127; } - i_this->sound.startCreatureSoundLevel(Z2SE_AL_UKI_KURUKURU_LOOP, var_r27, -1); + i_this->sound.startCreatureSoundLevel(Z2SE_AL_UKI_KURUKURU_LOOP, mapInfo, -1); } - f32 temp_f31 = actor->speedF; + f32 speed = actor->speedF; cLib_addCalc0(&actor->speedF, 0.3f, 0.5f + BREG_F(12)); if (actor->speedF < 4.0f) { - if (temp_f31 >= 4.0f) { + if (speed >= 4.0f) { if (cM_rndF(1.0f) < 0.5f) { - i_this->field_0xffe = -(BREG_S(2) + 10000); + i_this->lure_yaw_target = -(BREG_S(2) + 10000); } else { - i_this->field_0xffe = BREG_S(2) + 10000; + i_this->lure_yaw_target = BREG_S(2) + 10000; } i_this->field_0x1009 = VREG_S(9) + 10; } } - cLib_addCalcAngleS2(&i_this->field_0xffc, i_this->field_0xffe, 4, sp8); - cLib_addCalcAngleS2(&i_this->field_0x1000, 0, 8, (YREG_S(2) + 1000)); + cLib_addCalcAngleS2(&i_this->lure_yaw_offset, i_this->lure_yaw_target, 4, sp8); + cLib_addCalcAngleS2(&i_this->lure_pitch_offset, 0, 8, (YREG_S(2) + 1000)); if (actor->speedF > 3.0f) { i_this->field_0x1188 = actor->speedF; @@ -1723,21 +1751,22 @@ static void ws_action(dmg_rod_class* i_this, f32 param_1) { } static void sp_action(dmg_rod_class* i_this, f32 param_1) { + UNUSED(param_1); fopAc_ac_c* actor = &i_this->actor; - cXyz sp18; - cXyz spC; + cXyz unusedXyz1; + cXyz unusedXyz2; i_this->field_0xf6e = 2; - f32 var_f31 = fopAcM_searchPlayerDistanceXZ(actor); - var_f31 *= -0.2f + VREG_F(18); - - if (var_f31 < -500.0f) { - var_f31 = -500.0f; + f32 playerLatDist = fopAcM_searchPlayerDistanceXZ(actor); + playerLatDist *= -0.2f + VREG_F(18); + + if (playerLatDist < -500.0f) { + playerLatDist = -500.0f; } f32 var_f30; - if (var_f31 > -200.0f) { + if (playerLatDist > -200.0f) { var_f30 = 0.0f; } else { var_f30 = -50.0f; @@ -1746,14 +1775,14 @@ static void sp_action(dmg_rod_class* i_this, f32 param_1) { if (i_this->reel_btn_flags != 0 || i_this->timers[0] != 0) { cLib_addCalc2(&actor->speedF, i_this->reel_speed, 1.0f, 3.0f + BREG_F(14)); cLib_addCalc2(&i_this->field_0x594, var_f30, 0.1f, 0.2f * i_this->reel_speed); - actor->current.angle.z = 28000.0f * cM_ssin(i_this->field_0x578 * 3000); - i_this->field_0x1004 = 4000.0f * cM_ssin(i_this->field_0x578 * 4000); + actor->current.angle.z = 28000.0f * cM_ssin(i_this->counter * 3000); + i_this->field_0x1004 = 4000.0f * cM_ssin(i_this->counter * 4000); i_this->field_0x1009 = 5; } else { - cLib_addCalc2(&i_this->field_0x594, var_f31, 0.1f, 1.5f); - if (i_this->field_0x594 > 20.0f + var_f31) { - actor->current.angle.z = 28000.0f * cM_ssin(i_this->field_0x578 * 2000); - i_this->field_0x1004 = 1000.0f * cM_ssin(i_this->field_0x578 * 4000); + cLib_addCalc2(&i_this->field_0x594, playerLatDist, 0.1f, 1.5f); + if (i_this->field_0x594 > 20.0f + playerLatDist) { + actor->current.angle.z = 28000.0f * cM_ssin(i_this->counter * 2000); + i_this->field_0x1004 = 1000.0f * cM_ssin(i_this->counter * 4000); } } @@ -1764,23 +1793,23 @@ static void sp_action(dmg_rod_class* i_this, f32 param_1) { static void ground_action(dmg_rod_class* i_this) { fopAc_ac_c* actor = &i_this->actor; cXyz sp3C; - cXyz sp30; - Vec sp24; - f32 var_f31 = 0.0f; + cXyz curPos; + Vec gndChkPos; + f32 reelSpeed = 0.0f; if (actor->speedF > 15.0f && i_this->acch.ChkWallHit()) { actor->speedF = 0.0f; - i_this->field_0xffc = cM_rndFX(3000.0f); + i_this->lure_yaw_offset = cM_rndFX(3000.0f); } if (i_this->reel_btn_flags != 0) { - var_f31 = i_this->reel_speed; - cLib_addCalcAngleS2(&i_this->field_0xffc, i_this->field_0xffe, 2, var_f31 * (1000.0f + JREG_F(7))); + reelSpeed = i_this->reel_speed; + cLib_addCalcAngleS2(&i_this->lure_yaw_offset, i_this->lure_yaw_target, 2, reelSpeed * (1000.0f + JREG_F(7))); } - if (actor->speedF >= 5.0f && (i_this->field_0x578 & 1) == 0 && cM_rndF(1.0f) < 0.5f) { - i_this->field_0xffe = cM_rndFX(3000.0f + VREG_F(12)); - i_this->field_0x1000 = cM_rndFX(3000.0f + VREG_F(13)); + if (actor->speedF >= 5.0f && (i_this->counter & 1) == 0 && cM_rndF(1.0f) < 0.5f) { + i_this->lure_yaw_target = cM_rndFX(3000.0f + VREG_F(12)); + i_this->lure_pitch_offset = cM_rndFX(3000.0f + VREG_F(13)); if (i_this->lure_type == MG_LURE_FR) { i_this->field_0xff2 = 2000; @@ -1791,11 +1820,11 @@ static void ground_action(dmg_rod_class* i_this) { } if (i_this->acch.ChkGroundHit()) { - cLib_addCalcAngleS2(&i_this->field_0x1000, 0, 1, (YREG_S(2) + 0x2000)); + cLib_addCalcAngleS2(&i_this->lure_pitch_offset, 0, 1, (YREG_S(2) + 0x2000)); if (i_this->field_0x10a8 == 0) { - i_this->field_0xffc = cM_rndFX(32768.0f); - i_this->field_0x1000 = cM_rndFX(32768.0f); + i_this->lure_yaw_offset = cM_rndFX(32768.0f); + i_this->lure_pitch_offset = cM_rndFX(32768.0f); if (cM_rndF(1.0f) < 0.5f) { actor->current.angle.z = (f32)0xB000; @@ -1804,10 +1833,10 @@ static void ground_action(dmg_rod_class* i_this) { } i_this->field_0x10a8++; - if (actor->current.pos.y < 70.0f + i_this->field_0x590) { + if (actor->current.pos.y < 70.0f + i_this->water_surface_y) { actor->speed.y = 20.0f + AREG_F(11); lure_bound_se_set(i_this); - fopAcM_effSmokeSet1(&i_this->field_0x1178, &i_this->field_0x117c, &actor->current.pos, NULL, 0.2f, &actor->tevStr, 1); + fopAcM_effSmokeSet1(&i_this->emitter_id, &i_this->field_0x117c, &actor->current.pos, NULL, 0.2f, &actor->tevStr, 1); } } else { if (i_this->field_0x10a8 == 1) { @@ -1817,80 +1846,81 @@ static void ground_action(dmg_rod_class* i_this) { actor->speed.y = -10.0f; } - dBgS_GndChk sp48; + dBgS_GndChk gndChk; cMtx_YrotS(*calc_mtx, actor->shape_angle.y); sp3C.x = 0.0f; sp3C.y = 0.0f; sp3C.z = -10.0f; - MtxPosition(&sp3C, &sp30); - sp30 += actor->current.pos; + MtxPosition(&sp3C, &curPos); + curPos += actor->current.pos; - sp24.x = sp30.x; - sp24.y = 50.0f + sp30.y; - sp24.z = sp30.z; - sp48.SetPos(&sp24); + gndChkPos.x = curPos.x; + gndChkPos.y = 50.0f + curPos.y; + gndChkPos.z = curPos.z; + gndChk.SetPos(&gndChkPos); - sp30.y = 3.0f + dComIfG_Bgsp().GroundCross(&sp48); - sp3C = sp30 - actor->current.pos; + curPos.y = 3.0f + dComIfG_Bgsp().GroundCross(&gndChk); + sp3C = curPos - actor->current.pos; if (fabsf(sp3C.y) < 30.0f) { - actor->current.angle.x = cM_atan2s(sp3C.y, JMAFastSqrt(SQUARE(sp3C.x) + SQUARE(sp3C.z))); + actor->current.angle.x = + (s16)cM_atan2s(sp3C.y, JMAFastSqrt(SQUARE(sp3C.x) + SQUARE(sp3C.z))); sp3C.x = 10.0f; sp3C.y = 0.0f; sp3C.z = 0.0f; - MtxPosition(&sp3C, &sp30); - sp30 += actor->current.pos; + MtxPosition(&sp3C, &curPos); + curPos += actor->current.pos; - sp24.x = sp30.x; - sp24.y = 50.0f + sp30.y; - sp24.z = sp30.z; - sp48.SetPos(&sp24); + gndChkPos.x = curPos.x; + gndChkPos.y = 50.0f + curPos.y; + gndChkPos.z = curPos.z; + gndChk.SetPos(&gndChkPos); - sp30.y = 3.0f + dComIfG_Bgsp().GroundCross(&sp48); - sp3C = sp30 - actor->current.pos; + curPos.y = 3.0f + dComIfG_Bgsp().GroundCross(&gndChk); + sp3C = curPos - actor->current.pos; s16 sp8 = (s16)cM_atan2s(sp3C.y, JMAFastSqrt(SQUARE(sp3C.x) + SQUARE(sp3C.z))); if (actor->current.angle.x >= 0x1800 || sp8 >= 0x1800 || sp8 <= -0x1800) { actor->speedF = 20.0f; if (cM_rndF(1.0f) < 0.5f) { actor->current.angle.z = 32768.0f + cM_rndFX(16000.0f); - i_this->field_0xffc = cM_rndFX(3000.0f + VREG_F(12)); - i_this->field_0x1000 = cM_rndFX(3000.0f + VREG_F(13)); + i_this->lure_yaw_offset = cM_rndFX(3000.0f + VREG_F(12)); + i_this->lure_pitch_offset = cM_rndFX(3000.0f + VREG_F(13)); } } } } else if (i_this->field_0x10a8 == 1) { - i_this->field_0xffc += 3200; - i_this->field_0x1000 += 4000; + i_this->lure_yaw_offset += (s16)3200; + i_this->lure_pitch_offset += (s16)4000; } - cLib_addCalc2(&actor->speedF, var_f31, 1.0f, 5.0f + BREG_F(12)); + cLib_addCalc2(&actor->speedF, reelSpeed, 1.0f, 5.0f + BREG_F(12)); } static void wd_action(dmg_rod_class* i_this, f32 param_1, wd_ss* i_wd_s) { fopAc_ac_c* actor = &i_this->actor; cXyz sp28; - cXyz sp1C; + cXyz unusedXyz1; cLib_addCalc0(&actor->speedF, 1.0f, 5.0f + BREG_F(12)); if (i_this->lure_type == MG_LURE_FR) { if (i_this->reel_btn_flags != 0) { actor->speedF = i_this->reel_speed; - i_this->field_0xffe = 0; + i_this->lure_yaw_target = 0; } if (param_1 >= 0.2f && i_this->field_0x100e == 0) { actor->speedF = (10.0f + BREG_F(14)) * param_1; s16 spC = 2000.0f * param_1; - if (i_this->field_0xffe > 0) { - i_this->field_0xffe = -spC; + if (i_this->lure_yaw_target > 0) { + i_this->lure_yaw_target = -spC; } else { - i_this->field_0xffe = spC; + i_this->lure_yaw_target = spC; } - i_this->field_0x1000 = 0; + i_this->lure_pitch_offset = 0; i_this->field_0x100e = 3; } @@ -1902,7 +1932,7 @@ static void wd_action(dmg_rod_class* i_this, f32 param_1, wd_ss* i_wd_s) { } } - if (actor->speedF > 5.0f && (i_this->field_0x578 & 3) == 0 && cM_rndF(1.0f) < 0.75f) { + if (actor->speedF > 5.0f && (i_this->counter & 3) == 0 && cM_rndF(1.0f) < 0.75f) { if (cM_rndF(1.0f) < 0.5f) { i_this->field_0xff0 = 0x7000; } else { @@ -1916,20 +1946,20 @@ static void wd_action(dmg_rod_class* i_this, f32 param_1, wd_ss* i_wd_s) { if (i_this->reel_btn_flags != 0) { actor->speedF = 3.0f + BREG_F(17); i_this->field_0xf6e = 1; - i_this->field_0xffe = 0; + i_this->lure_yaw_target = 0; } if (param_1 >= 0.2f && i_this->field_0x100e == 0) { actor->speedF = (7.0f + BREG_F(14)) * param_1; s16 spA = 4000.0f * param_1; - if (i_this->field_0xffe > 0) { - i_this->field_0xffe = -spA; + if (i_this->lure_yaw_target > 0) { + i_this->lure_yaw_target = -spA; } else { - i_this->field_0xffe = spA; + i_this->lure_yaw_target = spA; } - i_this->field_0x1000 = 0; + i_this->lure_pitch_offset = 0; i_this->field_0x100e = 3; } @@ -1937,20 +1967,20 @@ static void wd_action(dmg_rod_class* i_this, f32 param_1, wd_ss* i_wd_s) { i_wd_s->field_0x10.x += 0.65f * actor->speed.x; i_wd_s->field_0x10.z += 0.65f * actor->speed.z; sp28 = actor->current.pos - i_wd_s->field_0x10; - + s16 sp8 = (s16)cM_atan2s(sp28.x, sp28.z); sp8 -= actor->shape_angle.y; if (sp8 < 0) { - i_wd_s->field_0x38 += 200; + i_wd_s->field_0x38 += (s16)200; } else { - i_wd_s->field_0x38 -= 200; + i_wd_s->field_0x38 -= (s16)200; } } } - cLib_addCalcAngleS2(&i_this->field_0xffc, i_this->field_0xffe, 2, (BREG_S(3) + 12000)); - cLib_addCalcAngleS2(&i_this->field_0x1000, 0, 1, (YREG_S(2) + 1000)); + cLib_addCalcAngleS2(&i_this->lure_yaw_offset, i_this->lure_yaw_target, 2, (BREG_S(3) + 12000)); + cLib_addCalcAngleS2(&i_this->lure_pitch_offset, 0, 1, (YREG_S(2) + 1000)); cLib_addCalc2(&i_this->field_0x59c, 4.0f + KREG_F(15), 1.0f, 1.0f); } @@ -1961,7 +1991,7 @@ static void heart_action(dmg_rod_class* i_this, f32 param_1) { if (i_this->reel_btn_flags != 0) { actor->speedF = i_this->reel_speed; - if ((i_this->field_0x578 & 7) == 0) { + if ((i_this->counter & 7) == 0) { dComIfGp_getVibration().StartShock(VIBMODE_S_POWER1, 1, cXyz(0.0f, 1.0f, 0.0f)); } @@ -1984,41 +2014,45 @@ static void heart_action(dmg_rod_class* i_this, f32 param_1) { static void action_eff_set(dmg_rod_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - if (!((i_this->field_0x590 - actor->current.pos.y) > 15.0f)) { + if (!((i_this->water_surface_y - actor->current.pos.y) > 15.0f)) { cXyz sp3C; cXyz sp30; - s16 temp_r0 = actor->shape_angle.y - fopAcM_searchPlayerAngleY(actor); - temp_r0 /= 2; + s16 playerYawDiff = actor->shape_angle.y - fopAcM_searchPlayerAngleY(actor); + playerYawDiff /= 2; - cMtx_YrotS(*calc_mtx, actor->shape_angle.y - temp_r0); + cMtx_YrotS(*calc_mtx, actor->shape_angle.y - playerYawDiff); sp3C.set(0.0f, 0.0f, 20.0f + hREG_F(6)); MtxPosition(&sp3C, &sp30); sp30 += actor->current.pos; if (i_this->field_0x1188 > 0.1f) { - f32 var_f31 = (0.2f + NREG_F(7)) * i_this->field_0x1188; - if (var_f31 > 1.0f) { - var_f31 = 1.0f; + f32 particleScaleF = (0.2f + NREG_F(7)) * i_this->field_0x1188; + if (particleScaleF > 1.0f) { + particleScaleF = 1.0f; } - cXyz sp24(var_f31, var_f31, var_f31); + cXyz particleScale(particleScaleF, particleScaleF, particleScaleF); for (int i = 0; i < 2; i++) { static u16 w_eff_id[] = {0x897D, 0x897E}; - i_this->field_0x1180[i] = dComIfGp_particle_set(i_this->field_0x1180[i], w_eff_id[i], &sp30, &actor->tevStr, &actor->shape_angle, &sp24, 0xFF, NULL, -1, NULL, NULL, NULL); + i_this->field_0x1180[i] = + dComIfGp_particle_set(i_this->field_0x1180[i], w_eff_id[i], &sp30, + &actor->tevStr, &actor->shape_angle, &particleScale, 0xFF, + NULL, -1, NULL, NULL, NULL); } } i_this->field_0x1188 = 0.0f; if (i_this->field_0x118c > 0.1f) { - f32 var_f30 = (0.2f + NREG_F(7)) * i_this->field_0x118c; - if (var_f30 > 1.0f) { - var_f30 = 1.0f; + f32 particleScaleF = (0.2f + NREG_F(7)) * i_this->field_0x118c; + if (particleScaleF > 1.0f) { + particleScaleF = 1.0f; } - cXyz sp18(var_f30, var_f30, var_f30); + cXyz particleScale(particleScaleF, particleScaleF, particleScaleF); for (int i = 0; i < 2; i++) { static u16 w_eff_id[] = {0x897F, 0x8980}; - dComIfGp_particle_set(w_eff_id[i], &sp30, &actor->tevStr, &actor->shape_angle, &sp18); + dComIfGp_particle_set(w_eff_id[i], &sp30, &actor->tevStr, &actor->shape_angle, + &particleScale); } } @@ -2047,18 +2081,18 @@ static void lure_action(dmg_rod_class* i_this) { cLib_addCalc2(&i_this->field_0xf64, -10.0f + KREG_F(9), 1.0f, 0.5f); cLib_addCalc2(&i_this->field_0x6f8, i_this->field_0xf60 * (0.7f + VREG_F(14)), 0.1f, 10.0f); - f32 var_f30 = i_this->rod_stick_x; - if (fabsf(var_f30) < 0.1f) { - var_f30 = 0.0f; + f32 stickX = i_this->rod_stick_x; + if (fabsf(stickX) < 0.1f) { + stickX = 0.0f; } - f32 var_f29 = i_this->rod_stick_y; - if (var_f29 > -0.1f) { - var_f29 = 0.0f; + f32 stickY = i_this->rod_stick_y; + if (stickY > -0.1f) { + stickY = 0.0f; } - f32 temp_f1 = JMAFastSqrt(SQUARE(var_f30) + SQUARE(var_f29)); - f32 var_f31 = temp_f1 - i_this->field_0x14ec; + f32 rodDist = JMAFastSqrt(SQUARE(stickX) + SQUARE(stickY)); + f32 var_f31 = rodDist - i_this->field_0x14ec; if (var_f31 < 0.0f) { var_f31 = 0.0f; } @@ -2068,12 +2102,12 @@ static void lure_action(dmg_rod_class* i_this) { var_f31 = 1.0f; } - i_this->field_0x14ec = temp_f1; + i_this->field_0x14ec = rodDist; if (i_this->reel_btn_flags != 0) { if (i_this->reel_speed > 11.0f) { daAlink_getAlinkActorClass()->seStartOnlyReverbLevel(Z2SE_AL_REEL_FAST_LOOP); i_this->sound.startCreatureSoundLevel(Z2SE_AL_ROD_ROLLBACK_FAST, 0, -1); - i_this->field_0x100b += 2; + i_this->field_0x100b += (u8)2; } else { daAlink_getAlinkActorClass()->seStartOnlyReverbLevel(Z2SE_AL_REEL_SLOW_LOOP); i_this->sound.startCreatureSoundLevel(Z2SE_AL_ROD_ROLLBACK_SLOW, 0, -1); @@ -2102,21 +2136,17 @@ static void lure_action(dmg_rod_class* i_this) { i_this->field_0x100e--; } - if (i_this->field_0x100d != 0) { + if (i_this->is_hook_in_water != 0) { if (i_this->field_0x10a9 != 0) { heart_action(i_this, var_f31); - actor->current.angle.z = 0; - actor->current.angle.x = 0; - i_this->field_0x114c = 0; - i_this->field_0x114a = 0; - i_this->field_0xffc = 0; - i_this->field_0x1000 = 0; - cMtx_YrotS(*calc_mtx, actor->current.angle.y); + i_this->lure_pitch_offset = i_this->lure_yaw_offset = i_this->field_0x114a = + i_this->field_0x114c = actor->current.angle.x = actor->current.angle.z = 0; + cMtx_YrotS(*calc_mtx, (s16)actor->current.angle.y); } else { - wd_ss* wd_p = wd_check(i_this); - if (wd_p != NULL) { + wd_ss* wd_p; + if ((wd_p = wd_check(i_this)) != NULL) { wd_action(i_this, var_f31, wd_p); - cMtx_YrotS(*calc_mtx, actor->current.angle.y); + cMtx_YrotS(*calc_mtx, (s16)actor->current.angle.y); } else { cLib_addCalc0(&i_this->field_0x59c, 1.0f, 1.0f); @@ -2151,11 +2181,11 @@ static void lure_action(dmg_rod_class* i_this) { i_this->timers[3] = 2; if (sp1C == 2) { - i_this->field_0xffe = -0x1000; + i_this->lure_yaw_target = -0x1000; } else if (sp1C == 3) { - i_this->field_0xffe = 0x1000; + i_this->lure_yaw_target = 0x1000; } else { - i_this->field_0xffe = 0; + i_this->lure_yaw_target = 0; } actor->speedF *= 0.8f; @@ -2167,14 +2197,14 @@ static void lure_action(dmg_rod_class* i_this) { if (i_this->lure_type != MG_LURE_SP) { cLib_addCalcAngleS2(&actor->current.angle.z, 0, 2, 0x1000); - cMtx_YrotS(*calc_mtx, (actor->current.angle.y + i_this->field_0xffc)); + cMtx_YrotS(*calc_mtx, (actor->current.angle.y + i_this->lure_yaw_offset)); } else { - cMtx_YrotS(*calc_mtx, actor->current.angle.y); + cMtx_YrotS(*calc_mtx, (s16)actor->current.angle.y); } } } else { ground_action(i_this); - cMtx_YrotS(*calc_mtx, actor->current.angle.y); + cMtx_YrotS(*calc_mtx, (s16)actor->current.angle.y); } sp54.x = 0.0f; @@ -2185,15 +2215,15 @@ static void lure_action(dmg_rod_class* i_this) { actor->speed.z = sp48.z; actor->current.pos += actor->speed; - if (i_this->field_0x100d != 0) { - cLib_addCalc2(&actor->current.pos.y, i_this->field_0x590 + i_this->field_0x594, 0.5f, 2.0f + VREG_F(1)); + if (i_this->is_hook_in_water != 0) { + cLib_addCalc2(&actor->current.pos.y, i_this->water_surface_y + i_this->field_0x594, 0.5f, 2.0f + VREG_F(1)); cLib_addCalc0(&actor->speed.y, 1.0f, 2.0f + VREG_F(2)); } else { actor->speed.y -= 5.0f; i_this->field_0x594 = 0.0f; } - sp54 = i_this->field_0x6ac - actor->current.pos; + sp54 = i_this->rod_tip_pos - actor->current.pos; f32 var_f28; if (i_this->field_0xf6e == 1) { @@ -2221,47 +2251,45 @@ static void lure_action(dmg_rod_class* i_this) { i_this->play_cam_mode = 30; i_this->play_cam_timer = 0; i_this->play_cam_fovy = 90.0f + DREG_F(6); - i_this->field_0x1410 = -40.0f; - i_this->field_0x146d = 0; + i_this->camera_morf_rate = -40.0f; + i_this->msg_flow_state = 0; i_this->field_0x10b0 = 0; daPy_getLinkPlayerActorClass()->onFishingRodGetFish(); } else { - daPy_getLinkPlayerActorClass()->onFishingRodReelEnd(); + daAlink_getAlinkActorClass()->onFishingRodReelEnd(); actor->speed.y = 6.0f; i_this->action = ACTION_LURE_STANDBY; Z2GetAudioMgr()->changeFishingBgm(0); if (i_this->field_0x10a7 == 3) { - daAlink_getAlinkActorClass()->setCanoeFishingWaitAngle(dComIfGp_getPlayer(0)->shape_angle.y); + fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); + daAlink_getAlinkActorClass()->setCanoeFishingWaitAngle(player->shape_angle.y); } else { daAlink_getAlinkActorClass()->setCanoeFishingWaitAngle(daAlink_getAlinkActorClass()->getFishingRodAngleY()); } i_this->field_0x10a7 = 0; - sp54 = i_this->field_0x6ac - actor->current.pos; + sp54 = i_this->rod_tip_pos - actor->current.pos; actor->current.angle.x = -cM_atan2s(sp54.y, sp54.z); - actor->current.angle.y = cM_atan2s(sp54.x, JMAFastSqrt(SQUARE(sp54.y) + SQUARE(sp54.z))); + actor->current.angle.y = (s16)cM_atan2s(sp54.x, JMAFastSqrt(SQUARE(sp54.y) + SQUARE(sp54.z))); OS_REPORT(" MG ROD noo 1!!! \n"); i_this->play_cam_mode = 2; i_this->play_cam_timer = 0; - i_this->field_0x1410 = 10.0f; - i_this->field_0x1000 = 0; - i_this->field_0xffc = 0; + i_this->camera_morf_rate = 10.0f; + i_this->lure_yaw_offset = i_this->lure_pitch_offset = 0; i_this->timers[0] = 0; i_this->timers[1] = 20; i_this->field_0x14f8 = 0; - i_this->field_0x6f8 = 0.0f; - i_this->field_0x6e0 = 0.0f; + i_this->cast_momentum = i_this->field_0x6f8 = 0.0f; actor->old.pos = actor->current.pos = i_this->field_0x764; for (int i = 1; i < 99; i++) { - i_this->field_0xdb0[i] = 0.0f; - i_this->field_0xc20[i] = 0.0f; + i_this->field_0xc20[i] = i_this->field_0xdb0[i] = 0.0f; } } } @@ -2271,17 +2299,17 @@ static void lure_action(dmg_rod_class* i_this) { if (i_this->field_0x10a6 == 0) { i_this->play_cam_mode = 20; i_this->play_cam_timer = 0; - + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.SetTrimSize(1); i_this->action = ACTION_LURE_BARE; - i_this->field_0x146d = 0; + i_this->msg_flow_state = 0; } } if (i_this->field_0x13a8 > 50) { - i_this->field_0x100d = 0; + i_this->is_hook_in_water = 0; actor->speed.y = 0.0f; actor->current.pos.y += 3.0f + VREG_F(16); } @@ -2320,15 +2348,15 @@ static void lure_hit(dmg_rod_class* i_this, mg_fish_class* i_mg_fish) { } if (i_mg_fish != NULL) { - i_this->field_0x6f8 += (i_this->field_0x6f8 * (0.05f + XREG_F(9))) + ((0.05f + XREG_F(9)) * (i_this->field_0x6f8 * cM_ssin(i_mg_fish->jointYaws2[1]))); + i_this->field_0x6f8 += (i_this->field_0x6f8 * (0.05f + XREG_F(9))) + ((0.05f + XREG_F(9)) * (i_this->field_0x6f8 * cM_ssin((s16)i_mg_fish->jointYaws2[1]))); } if (i_mg_fish != NULL) { sp44 = sp1C->current.pos - sp18->current.pos; - f32 temp_f28 = 0.5f + ((0.004f + XREG_F(13)) * sp44.abs()); - if (i_this->field_0xf5c < temp_f28) { - i_this->field_0xf5c = temp_f28; + f32 var_f28 = 0.5f + ((0.004f + XREG_F(13)) * sp44.abs()); + if (i_this->field_0xf5c < var_f28) { + i_this->field_0xf5c = var_f28; } if (i_this->field_0xf60 > 200.0f + JREG_F(14)) { @@ -2336,14 +2364,14 @@ static void lure_hit(dmg_rod_class* i_this, mg_fish_class* i_mg_fish) { } if (i_this->field_0xf60 > 100.0f + JREG_F(16)) { - f32 temp_f31 = i_this->field_0xf60 - (100.0f + JREG_F(16)); - + f32 var_f31 = i_this->field_0xf60 - (100.0f + JREG_F(16)); + f32 var_f30 = i_this->rod_stick_x; if (fabsf(var_f30) < 0.1f) { var_f30 = 0.0f; } - temp_f31 *= 0.1f + JREG_F(17); + var_f31 *= 0.1f + JREG_F(17); if (i_this->rod_stick_y < -0.5f) { i_this->field_0x1515 = 1; } @@ -2355,11 +2383,11 @@ static void lure_hit(dmg_rod_class* i_this, mg_fish_class* i_mg_fish) { var_f29 = 3.0f; } - if (temp_f31 > var_f29) { - temp_f31 = var_f29; + if (var_f31 > var_f29) { + var_f31 = var_f29; } - cMtx_YrotS(*calc_mtx, i_this->field_0x6c4); + cMtx_YrotS(*calc_mtx, i_this->rod_angle_y); sp44.x = var_f30 * -(200.0f + VREG_F(10)); sp44.y = 0.0f; sp44.z = 0.0f; @@ -2371,7 +2399,7 @@ static void lure_hit(dmg_rod_class* i_this, mg_fish_class* i_mg_fish) { cMtx_YrotS(*calc_mtx, spA); sp44.x = 0.0f; sp44.y = 0.0f; - sp44.z = temp_f31; + sp44.z = var_f31; MtxPosition(&sp44, &sp38); i_mg_fish->actor.current.pos += sp38; @@ -2380,9 +2408,9 @@ static void lure_hit(dmg_rod_class* i_this, mg_fish_class* i_mg_fish) { } if (i_mg_fish->mCurAction == 52) { - cLib_addCalc2(&i_mg_fish->actor.current.pos.y, i_this->field_0x590 - ((25.0f + JREG_F(5)) * i_mg_fish->mJointScale), 0.05f, temp_f31 * (1.0f + JREG_F(6))); + cLib_addCalc2(&i_mg_fish->actor.current.pos.y, i_this->water_surface_y - ((25.0f + JREG_F(5)) * i_mg_fish->mJointScale), 0.05f, var_f31 * (1.0f + JREG_F(6))); if (i_mg_fish->mDistToPlayer < 200.0f) { - cLib_addCalc2(&i_mg_fish->actor.current.pos.y, i_this->field_0x590 - ((20.0f + JREG_F(5)) * i_mg_fish->mJointScale), 0.2f, 0.8f + fabsf(i_mg_fish->actor.speed.y)); + cLib_addCalc2(&i_mg_fish->actor.current.pos.y, i_this->water_surface_y - ((20.0f + JREG_F(5)) * i_mg_fish->mJointScale), 0.2f, 0.8f + fabsf(i_mg_fish->actor.speed.y)); } } } @@ -2457,8 +2485,7 @@ static void lure_hit(dmg_rod_class* i_this, mg_fish_class* i_mg_fish) { daAlink_getAlinkActorClass()->onFishingHit(); i_this->timers[7] = WREG_S(9) + 10; - i_this->field_0x1420 = 400.0f; - i_this->field_0x141c = 400.0f; + i_this->field_0x141c = i_this->field_0x1420 = 400.0f; if (i_this->field_0x140c < 20.0f + AREG_F(19)) { if ((s16)(sp18->shape_angle.y - daAlink_getAlinkActorClass()->getFishingRodAngleY()) < 0) { @@ -2492,7 +2519,7 @@ static void lure_catch(dmg_rod_class* i_this) { i_this->field_0xf64 = -5.0f + JREG_F(9); i_this->field_0x6f8 = 0.0f; i_this->field_0xf5c = 2.3f + AREG_F(5); - i_this->field_0x100d = 0; + i_this->is_hook_in_water = 0; csXyz angle; if (mgfish->mActionPhase < 2 && i_this->play_cam_timer > 25) { @@ -2602,7 +2629,7 @@ static void lure_catch(dmg_rod_class* i_this) { } if (i_this->play_cam_timer >= 60) { - if (i_this->field_0x146d == 0) { + if (i_this->msg_flow_state == 0) { data_80450C9A++; if (data_80450C9A > 200) { data_80450C9A = 200; @@ -2643,11 +2670,11 @@ static void lure_catch(dmg_rod_class* i_this) { } i_this->msgflow.init(actor, i_this->catch_flow_id, 0, NULL); - i_this->field_0x146d = 1; + i_this->msg_flow_state = 1; } - if (i_this->field_0x146d == 1 && i_this->msgflow.doFlow(actor, NULL, 0)) { - i_this->field_0x146d = 2; + if (i_this->msg_flow_state == 1 && i_this->msgflow.doFlow(actor, NULL, 0)) { + i_this->msg_flow_state = 2; int sp10 = 0; if (i_this->field_0x14c0 != 0) { @@ -2660,7 +2687,7 @@ static void lure_catch(dmg_rod_class* i_this) { i_this->play_cam_mode = 2; i_this->play_cam_timer = 20; i_this->field_0x1418 = daAlink_getAlinkActorClass()->shape_angle.y; - i_this->field_0x1410 = 0.0f; + i_this->camera_morf_rate = 0.0f; camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera->mCamera.SetTrimSize(1); @@ -2695,7 +2722,7 @@ static void lure_catch(dmg_rod_class* i_this) { i_this->field_0x10a5 = 0; i_this->timers[2] = 20; actor->current.angle.set(0, 0, 0); - i_this->field_0xffc = i_this->field_0x1000 = 0; + i_this->lure_yaw_offset = i_this->lure_pitch_offset = 0; daAlink_getAlinkActorClass()->changeFishGetFace(0); daAlink_getAlinkActorClass()->setCanoeFishingWaitAngle(daAlink_getAlinkActorClass()->shape_angle.y); } @@ -2703,12 +2730,13 @@ static void lure_catch(dmg_rod_class* i_this) { static void lure_bare(dmg_rod_class* i_this) { fopAc_ac_c* actor = &i_this->actor; - fopAc_ac_c* mgfish = fopAcM_SearchByID(i_this->mg_fish_id); + fopAc_ac_c* mgfishActor = fopAcM_SearchByID(i_this->mg_fish_id); + mg_fish_class* mgfish = (mg_fish_class*)mgfishActor; i_this->rod_stick_x = 0.0f; i_this->rod_stick_y = 0.0f; if (i_this->play_cam_timer >= 20) { - if (i_this->field_0x146d == 0) { + if (i_this->msg_flow_state == 0) { if (i_this->field_0x10a7 == 0) { if (henna != NULL) { i_this->msgflow.init(actor, 0x3E6, 0, NULL); @@ -2741,15 +2769,16 @@ static void lure_bare(dmg_rod_class* i_this) { } } - i_this->field_0x146d = 1; + i_this->msg_flow_state = 1; } - if (i_this->field_0x146d == 1 && i_this->msgflow.doFlow(actor, NULL, 0)) { - i_this->field_0x146d = 2; + if (i_this->msg_flow_state == 1 && i_this->msgflow.doFlow(actor, NULL, 0)) { + i_this->msg_flow_state = 2; i_this->play_cam_mode = 5; - i_this->field_0x1410 = 1.0f; + i_this->camera_morf_rate = 1.0f; i_this->field_0x1407 = 110; - dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))->mCamera.SetTrimSize(1); + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera->mCamera.SetTrimSize(1); i_this->action = ACTION_LURE_ACTION; i_this->field_0x1006 = 0; daAlink_getAlinkActorClass()->changeFishGetFace(0); @@ -2771,7 +2800,7 @@ static void lure_bare(dmg_rod_class* i_this) { if (i_this->lure_type != MG_LURE_SP) { i_this->field_0x594 = 0.0f; - actor->current.pos.y = i_this->field_0x590; + actor->current.pos.y = i_this->water_surface_y; } if (i_this->field_0x10a7 == 3 && i_this->timers[2] != 0) { @@ -2779,7 +2808,7 @@ static void lure_bare(dmg_rod_class* i_this) { cXyz sp18; cXyz spC; cMtx_YrotS(*calc_mtx, player->shape_angle.y); - sp18.x = 200.0f * cM_ssin(i_this->field_0x578 * 1800); + sp18.x = 200.0f * cM_ssin(i_this->counter * 1800); sp18.y = -300.0f; sp18.z = 100.0f; MtxPosition(&sp18, &actor->current.pos); @@ -2795,7 +2824,7 @@ static void lure_heart(dmg_rod_class* i_this) { i_this->field_0xf64 = -5.0f + JREG_F(9); i_this->field_0x6f8 = 0.0f; i_this->field_0xf5c = 0.29999995f + AREG_F(5); - i_this->field_0x100d = 0; + i_this->is_hook_in_water = 0; csXyz sp8; i_this->field_0x10b0 = 0; @@ -2805,10 +2834,10 @@ static void lure_heart(dmg_rod_class* i_this) { fopAc_ac_c* obj_life = (fopAc_ac_c*)fopAcM_SearchByName(PROC_Obj_LifeContainer); if (obj_life != NULL) { - fopAc_ac_c* temp_r25 = (fopAc_ac_c*)dComIfGp_getPlayer(0); + fopAc_ac_c* player = (fopAc_ac_c*)dComIfGp_getPlayer(0); cXyz sp10; - cMtx_YrotS(*calc_mtx, temp_r25->shape_angle.y); + cMtx_YrotS(*calc_mtx, player->shape_angle.y); sp10.x = 0.0f; sp10.y = 50.0f + hREG_F(5); sp10.z = 150.0f + hREG_F(6); @@ -2852,9 +2881,10 @@ static void lure_heart(dmg_rod_class* i_this) { i_this->play_cam_mode = 2; i_this->play_cam_timer = 20; i_this->field_0x1418 = daAlink_getAlinkActorClass()->shape_angle.y; - i_this->field_0x1410 = 0.0f; + i_this->camera_morf_rate = 0.0f; - dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))->mCamera.SetTrimSize(1); + camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera->mCamera.SetTrimSize(1); daAlink_getAlinkActorClass()->onFishingKeep(); i_this->action = ACTION_LURE_STANDBY; @@ -2870,7 +2900,9 @@ static void lure_heart(dmg_rod_class* i_this) { fopAcM_delete(obj_life); fopAcM_onItem(obj_life, 0x80); execItemGet(fpcNm_ITEM_KAKERA_HEART); - dComIfGs_setEventReg(0xECFF, dComIfGs_getEventReg(0xECFF) | 0x40); + u8 eventReg = dComIfGs_getEventReg(0xECFF); + eventReg |= (u8)0x40; + dComIfGs_setEventReg(0xECFF, eventReg); } i_this->field_0x10a9 = 0; @@ -2884,18 +2916,18 @@ static void hook_set(dmg_rod_class* i_this, cXyz* param_1, int param_2) { cXyz sp2C; cXyz sp20; - if (i_this->field_0x100d != 0) { + if (i_this->is_hook_in_water != 0) { if (i_this->lure_type == MG_LURE_SP) { sp20.set(0.0f, -2.0f, 0.0f); } else { - mDoMtx_stack_c::YrotS(actor->shape_angle.y); - mDoMtx_stack_c::ZrotM(actor->shape_angle.z); + mDoMtx_stack_c::YrotS((s16)actor->shape_angle.y); + mDoMtx_stack_c::ZrotM((s16)actor->shape_angle.z); sp38.set(0.0f, -2.0f + NREG_F(14), 0.0f); mDoMtx_stack_c::multVec(&sp38, &sp20); } } else if (i_this->action == ACTION_LURE_ACTION) { - mDoMtx_stack_c::YrotS(actor->shape_angle.y); - mDoMtx_stack_c::XrotM(actor->shape_angle.x); + mDoMtx_stack_c::YrotS((s16)actor->shape_angle.y); + mDoMtx_stack_c::XrotM((s16)actor->shape_angle.x); if (param_2 == 0) { s16 sp10 = actor->shape_angle.z - 0x8000; @@ -2916,36 +2948,36 @@ static void hook_set(dmg_rod_class* i_this, cXyz* param_1, int param_2) { sp20.set(0.0f, -10.0f + NREG_F(15), 0.0f); } - mg_hook_s* temp_r30 = &i_this->mg_hook[param_2]; - temp_r30->field_0x0[0] = *param_1; + mg_hook_s* hook = &i_this->mg_hook[param_2]; + hook->field_0x0[0] = *param_1; - f32 temp_f27 = sp20.x + (temp_r30->field_0x0[1].x - temp_r30->field_0x0[0].x); - f32 temp_f30 = sp20.y + (temp_r30->field_0x0[1].y - temp_r30->field_0x0[0].y); - f32 temp_f29 = sp20.z + (temp_r30->field_0x0[1].z - temp_r30->field_0x0[0].z); + f32 var_f27 = sp20.x + (hook->field_0x0[1].x - hook->field_0x0[0].x); + f32 var_f30 = sp20.y + (hook->field_0x0[1].y - hook->field_0x0[0].y); + f32 var_f29 = sp20.z + (hook->field_0x0[1].z - hook->field_0x0[0].z); - temp_r30->field_0x18.x = -cM_atan2s(temp_f30, temp_f29); - temp_r30->field_0x18.y = cM_atan2s(temp_f27, JMAFastSqrt(SQUARE(temp_f30) + SQUARE(temp_f29))); + hook->field_0x18.x = -cM_atan2s(var_f30, var_f29); + hook->field_0x18.y = (s16)cM_atan2s(var_f27, JMAFastSqrt(SQUARE(var_f30) + SQUARE(var_f29))); - cMtx_XrotS(*calc_mtx, temp_r30->field_0x18.x); - cMtx_YrotM(*calc_mtx, temp_r30->field_0x18.y); + cMtx_XrotS(*calc_mtx, hook->field_0x18.x); + cMtx_YrotM(*calc_mtx, hook->field_0x18.y); sp38.set(0.0f, 0.0f, 1.0f + BREG_F(17)); MtxPosition(&sp38, &sp2C); - temp_r30->field_0x0[1] = temp_r30->field_0x0[0] + sp2C; - - mDoMtx_stack_c::transS(temp_r30->field_0x0[0].x, temp_r30->field_0x0[0].y, temp_r30->field_0x0[0].z); + hook->field_0x0[1] = hook->field_0x0[0] + sp2C; + + mDoMtx_stack_c::transS(hook->field_0x0[0].x, hook->field_0x0[0].y, hook->field_0x0[0].z); if (param_2 == 0 && (i_this->action == ACTION_LURE_HIT || i_this->action == ACTION_LURE_CATCH)) { - mDoMtx_stack_c::YrotM(actor->shape_angle.y); - mDoMtx_stack_c::XrotM(actor->shape_angle.x); + mDoMtx_stack_c::YrotM((s16)actor->shape_angle.y); + mDoMtx_stack_c::XrotM((s16)actor->shape_angle.x); mDoMtx_stack_c::ZrotM(actor->shape_angle.z); } else { - mDoMtx_stack_c::XrotM(temp_r30->field_0x18.x); - mDoMtx_stack_c::YrotM(temp_r30->field_0x18.y); + mDoMtx_stack_c::XrotM(hook->field_0x18.x); + mDoMtx_stack_c::YrotM(hook->field_0x18.y); mDoMtx_stack_c::XrotM(-0x4000); if (param_2 == 1 && (i_this->action <= ACTION_LURE_STANDBY || (i_this->lure_type != MG_LURE_SP && i_this->action == ACTION_LURE_CATCH))) { - sp38.x = fabsf(temp_r30->field_0x18.y); - sp38.z = fabsf(temp_r30->field_0x18.x - 0x4000); + sp38.x = fabsf(hook->field_0x18.y); + sp38.z = fabsf(hook->field_0x18.x - 0x4000); f32 var_f31 = JMAFastSqrt(SQUARE(sp38.x) + SQUARE(sp38.z)); if (var_f31 > 7000.0f) { @@ -2957,8 +2989,8 @@ static void hook_set(dmg_rod_class* i_this, cXyz* param_1, int param_2) { } s16 spE, spC; - spE = i_this->field_0xfec * cM_ssin(i_this->field_0x578 * 4000); - spC = i_this->field_0xfec * cM_ssin(i_this->field_0x578 * 3800); + spE = i_this->field_0xfec * cM_ssin(i_this->counter * 4000); + spC = i_this->field_0xfec * cM_ssin(i_this->counter * 3800); mDoMtx_stack_c::XrotM(spE); mDoMtx_stack_c::ZrotM(spC); @@ -2966,8 +2998,8 @@ static void hook_set(dmg_rod_class* i_this, cXyz* param_1, int param_2) { } } - f32 temp_f28 = 1.0f + ZREG_F(6); - mDoMtx_stack_c::scaleM(temp_f28, temp_f28, temp_f28); + f32 var_f28 = 1.0f + ZREG_F(6); + mDoMtx_stack_c::scaleM(var_f28, var_f28, var_f28); mDoMtx_stack_c::YrotM(actor->current.angle.z); i_this->hook_model[param_2]->setBaseTRMtx(mDoMtx_stack_c::get()); } @@ -2997,7 +3029,7 @@ static void lure_disp(dmg_rod_class* i_this) { mDoMtx_stack_c::ZrotM(actor->current.angle.z); actor->current.angle.z += i_this->field_0x114e; - if (i_this->field_0x578 & 0x80) { + if (i_this->counter & 0x80) { cLib_addCalcAngleS2(&i_this->field_0x114e, 700, 8, 13); } else { cLib_addCalcAngleS2(&i_this->field_0x114e, -700, 8, 13); @@ -3030,7 +3062,7 @@ static void lure_disp(dmg_rod_class* i_this) { mDoMtx_stack_c::scaleM(var_f31, var_f31, var_f31); mDoMtx_stack_c::transM(0.0f, 0.0f, i_this->field_0x1154 + WREG_F(14)); i_this->lure_model[i_this->lure_type]->setBaseTRMtx(mDoMtx_stack_c::get()); - + sp28.set(0.0f, 0.0f, WREG_F(6) + lure_eye_off[i_this->lure_type]); mDoMtx_stack_c::multVec(&sp28, &i_this->field_0x1010); @@ -3066,7 +3098,7 @@ static void lure_disp(dmg_rod_class* i_this) { } if (i_this->action <= ACTION_LURE_STANDBY) { - i_this->field_0xff2 = 7000.0f + (i_this->field_0xff8 * cM_ssin(i_this->field_0x578 * 4000)); + i_this->field_0xff2 = 7000.0f + (i_this->field_0xff8 * cM_ssin(i_this->counter * 4000)); f32 var_f29 = (300.0f + KREG_F(12)) * (actor->current.pos - actor->old.pos).abs(); if (var_f29 > 6000.0f) { @@ -3082,7 +3114,7 @@ static void lure_disp(dmg_rod_class* i_this) { } if (i_this->action == ACTION_LURE_CAST) { - i_this->field_0xff2 = 7000.0f * cM_ssin(i_this->field_0x578 * 6000); + i_this->field_0xff2 = 7000.0f * cM_ssin(i_this->counter * 6000); return; } @@ -3104,7 +3136,7 @@ static void lure_disp(dmg_rod_class* i_this) { i_this->field_0xff4 = -5000; } - cLib_addCalcAngleS2(&i_this->field_0xff2, i_this->field_0xff4 + (s16)(i_this->field_0xff8 * cM_ssin(i_this->field_0x578 * 2000)), spC, spA); + cLib_addCalcAngleS2(&i_this->field_0xff2, i_this->field_0xff4 + (s16)(i_this->field_0xff8 * cM_ssin(i_this->counter * 2000)), spC, spA); cLib_addCalc2(&i_this->field_0xff8, 500.0f, 1.0f, 200.0f); } @@ -3182,11 +3214,11 @@ static void lure_main(dmg_rod_class* i_this) { i_this->field_0x1020 = 8000; i_this->field_0x1022 = -8000; } else if (i_this->action == ACTION_LURE_HIT) { - if ((i_this->field_0x578 & 7) == 0 && cM_rndF(1.0f) < 0.35f) { + if ((i_this->counter & 7) == 0 && cM_rndF(1.0f) < 0.35f) { i_this->field_0x1020 = -(3000.0f + cM_rndF(3000.0f)); } - if ((i_this->field_0x578 & 7) == 7 && cM_rndF(1.0f) < 0.35f) { + if ((i_this->counter & 7) == 7 && cM_rndF(1.0f) < 0.35f) { i_this->field_0x1022 = 3000.0f + cM_rndF(3000.0f); } } @@ -3210,12 +3242,12 @@ static void lure_main(dmg_rod_class* i_this) { } if (i_this->action == ACTION_LURE_ACTION || i_this->action == ACTION_LURE_CAST) { - f32 temp_f31 = 3.0f + VREG_F(11); - actor->current.pos.y -= temp_f31; - actor->old.pos.y -= temp_f31; + f32 var_f31 = 3.0f + VREG_F(11); + actor->current.pos.y -= var_f31; + actor->old.pos.y -= var_f31; i_this->acch.CrrPos(dComIfG_Bgsp()); - actor->current.pos.y += temp_f31; - actor->old.pos.y += temp_f31; + actor->current.pos.y += var_f31; + actor->old.pos.y += var_f31; if (i_this->acch.ChkWallHit()) { i_this->field_0x13a8++; @@ -3242,9 +3274,9 @@ static void lure_main(dmg_rod_class* i_this) { i_this->field_0x13a8 = 0; } - if (actor->current.pos.y <= i_this->field_0x590) { - if (i_this->field_0x100d == 0) { - i_this->field_0x100d = 1; + if (actor->current.pos.y <= i_this->water_surface_y) { + if (i_this->is_hook_in_water == 0) { + i_this->is_hook_in_water = 1; i_this->field_0x1009 = 30; i_this->field_0x10a4 = 50; @@ -3252,7 +3284,7 @@ static void lure_main(dmg_rod_class* i_this) { if (i_this->field_0x10a9 != 0) { i_this->sound.startCreatureSound(Z2SE_AL_FISH_JUMP_DOWN, 0, -1); sp68 = actor->current.pos; - sp68.y = i_this->field_0x590; + sp68.y = i_this->water_surface_y; fopKyM_createWpillar(&sp68, 1.5f, 0); } else { sibuki_set(i_this, 0.25f, &actor->current.pos, 1); @@ -3271,8 +3303,8 @@ static void lure_main(dmg_rod_class* i_this) { } } } - } else if (i_this->field_0x100d != 0) { - i_this->field_0x100d = 0; + } else if (i_this->is_hook_in_water != 0) { + i_this->is_hook_in_water = 0; if (cM_rndF(1.0f) < 0.5f) { actor->current.angle.z = (f32)0xB000; @@ -3281,9 +3313,9 @@ static void lure_main(dmg_rod_class* i_this) { } } - if (i_this->field_0x100d != 0) { + if (i_this->is_hook_in_water != 0) { sp50 = actor->current.pos; - sp50.y = i_this->field_0x590; + sp50.y = i_this->water_surface_y; f32 var_f30; if (fabsf(actor->speedF) >= 2.0f) { @@ -3299,23 +3331,23 @@ static void lure_main(dmg_rod_class* i_this) { var_f29 = 0.3f; } - fopAcM_effHamonSet(&i_this->field_0x1178, &sp50, var_f29, var_f30); + fopAcM_effHamonSet(&i_this->emitter_id, &sp50, var_f29, var_f30); } } else if (i_this->action == ACTION_LURE_HIT) { - i_this->field_0x100d = 1; - sp68 = i_this->field_0x6ac - actor->current.pos; + i_this->is_hook_in_water = 1; + sp68 = i_this->rod_tip_pos - actor->current.pos; - sp50.x = actor->current.pos.x + ((i_this->field_0x590 - actor->current.pos.y) / std::tan(cM_atan2f(sp68.y, sp68.x))); - sp50.z = actor->current.pos.z + ((i_this->field_0x590 - actor->current.pos.y) / std::tan(cM_atan2f(sp68.y, sp68.z))); - sp50.y = i_this->field_0x590; - fopAcM_effHamonSet(&i_this->field_0x1178, &sp50, 0.3f + KREG_F(12), 0.3f + KREG_F(13)); + sp50.x = actor->current.pos.x + ((i_this->water_surface_y - actor->current.pos.y) / std::tan(cM_atan2f(sp68.y, sp68.x))); + sp50.z = actor->current.pos.z + ((i_this->water_surface_y - actor->current.pos.y) / std::tan(cM_atan2f(sp68.y, sp68.z))); + sp50.y = i_this->water_surface_y; + fopAcM_effHamonSet(&i_this->emitter_id, &sp50, 0.3f + KREG_F(12), 0.3f + KREG_F(13)); } - cLib_addCalcAngleS2(&actor->shape_angle.y, actor->current.angle.y + i_this->field_0xffc, 2, 0x2000); - cLib_addCalcAngleS2(&actor->shape_angle.x, actor->current.angle.x + i_this->field_0x1000, 2, 0x2000); + cLib_addCalcAngleS2(&actor->shape_angle.y, actor->current.angle.y + i_this->lure_yaw_offset, 2, 0x2000); + cLib_addCalcAngleS2(&actor->shape_angle.x, actor->current.angle.x + i_this->lure_pitch_offset, 2, 0x2000); cLib_addCalcAngleS2(&actor->shape_angle.z, actor->current.angle.z, 2, 0x1000); - mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y + i_this->field_0x59c + (i_this->field_0x598 * cM_ssin(i_this->field_0x578 * 5000)), actor->current.pos.z); + mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y + i_this->field_0x59c + (i_this->field_0x598 * cM_ssin(i_this->counter * 5000)), actor->current.pos.z); cLib_addCalc0(&i_this->field_0x598, 1.0f, 0.05f); lure_disp(i_this); @@ -3333,22 +3365,23 @@ static int uki_calc(dmg_rod_class* i_this) { cXyz sp68; cXyz sp5C; - int var_r28 = 0; + int retval = 0; if (dComIfGp_checkPlayerStatus0(0, 0x100000)) { - i_this->field_0x1165 = 30; - i_this->field_0x100d = 0; + i_this->cast_bob_timer = 30; + i_this->is_hook_in_water = 0; } - if (i_this->hook_pos.y < 10.0f + i_this->field_0x590 + BREG_F(12) && depth_check(i_this, &i_this->hook_pos) > 0.0f) { - if (i_this->field_0x100d == 0) { - i_this->field_0x100d = 1; - if (i_this->field_0x1165 == 0) { + f32 var_f27; + if (i_this->hook_pos.y < 10.0f + i_this->water_surface_y + BREG_F(12) && depth_check(i_this, &i_this->hook_pos) > 0.0f) { + if (i_this->is_hook_in_water == 0) { + i_this->is_hook_in_water = 1; + if (i_this->cast_bob_timer == 0) { sp68.x = i_this->hook_pos.x; - sp68.y = i_this->field_0x590; + sp68.y = i_this->water_surface_y; sp68.z = i_this->hook_pos.z; fopKyM_createWpillar(&sp68, 0.2f, 0); - i_this->field_0x1165 = 20; + i_this->cast_bob_timer = 20; i_this->sound.startCreatureSound(Z2SE_AL_UKI_IN_WATER, 0, -1); } @@ -3361,13 +3394,14 @@ static int uki_calc(dmg_rod_class* i_this) { if (i_this->field_0x10a5 != 0 || abs(i_this->field_0x1084.x) < 0x3000 || i_this->field_0x10a2 > 2000) { cXyz sp50(i_this->hook_pos); - sp50.y = i_this->field_0x590; - fopAcM_effHamonSet(&i_this->field_0x1178, &sp50, 0.2f + KREG_F(2), 0.05f + KREG_F(0)); + sp50.y = i_this->water_surface_y; + f32 emitRate = 0.05f + KREG_F(0); + fopAcM_effHamonSet(&i_this->emitter_id, &sp50, 0.2f + KREG_F(2), emitRate); } - if (i_this->field_0x590 - i_this->mg_line.pos[85].y > 45.0f + BREG_F(11)) { + if (i_this->water_surface_y - i_this->mg_line.pos[85].y > 45.0f + BREG_F(11)) { cLib_addCalcAngleS2(&i_this->field_0x108a, 0, 8, WREG_S(0) + 50); - if (i_this->field_0x108a > WREG_S(0) + 10) { + if ((s16)i_this->field_0x108a > (s16)(WREG_S(0) + 10)) { i_this->field_0x108e += i_this->field_0x108c; } cLib_addCalc2(&i_this->field_0x1090, 0.5f + AREG_F(10), 1.0f, 0.01f + AREG_F(11)); @@ -3375,17 +3409,17 @@ static int uki_calc(dmg_rod_class* i_this) { i_this->field_0x1090 = 0.0f; } } else { - if (i_this->field_0x100d != 0 && i_this->field_0x1165 == 0) { + if (i_this->is_hook_in_water != 0 && i_this->cast_bob_timer == 0) { sp68.x = i_this->hook_pos.x; - sp68.y = i_this->field_0x590; + sp68.y = i_this->water_surface_y; sp68.z = i_this->hook_pos.z; fopKyM_createWpillar(&sp68, 0.2f, 0); - i_this->field_0x1165 = 20; + i_this->cast_bob_timer = 20; i_this->sound.startCreatureSound(Z2SE_AL_UKI_OUT_WATER, 0, -1); } i_this->field_0x1090 = -10.0f; - i_this->field_0x100d = 0; + i_this->is_hook_in_water = 0; cLib_addCalcAngleS2(&i_this->field_0x108a, 0, 2, 100); } @@ -3402,8 +3436,9 @@ static int uki_calc(dmg_rod_class* i_this) { sp68.y = 0.0f; sp68.z = 0.2f + YREG_F(8); MtxPosition(&sp68, &sp38); - - f32 temp_f30 = sp38.x + (i_this->hook_pos.x - sp44.x); + + f32 var_f30 = sp38.x + (i_this->hook_pos.x - sp44.x); + f32 var_f29; dBgS_GndChk spE8; Vec sp2C; sp2C.x = i_this->hook_pos.x; @@ -3412,25 +3447,25 @@ static int uki_calc(dmg_rod_class* i_this) { spE8.SetPos(&sp2C); f32 var_f31 = KREG_F(17) + (17.0f + dComIfG_Bgsp().GroundCross(&spE8)); - if (var_f31 < (5.0f + i_this->field_0x590 + AREG_F(18))) { + if (var_f31 < (5.0f + i_this->water_surface_y + AREG_F(18))) { if (i_this->action < ACTION_UKI_HIT) { - var_f31 = 5.0f + i_this->field_0x590 + AREG_F(18); + var_f31 = 5.0f + i_this->water_surface_y + AREG_F(18); } } else { - var_r28 = 1; + retval = 1; } f32 var_f28 = i_this->hook_pos.y + i_this->field_0x1090; if (var_f28 < var_f31) { var_f28 = var_f31; } else { - var_r28 = 0; + retval = 0; } - f32 temp_f27 = var_f28 - sp44.y; - f32 temp_f29 = sp38.z + (i_this->hook_pos.z - sp44.z); + var_f27 = var_f28 - sp44.y; + var_f29 = sp38.z + (i_this->hook_pos.z - sp44.z); - s16 temp_r0 = -cM_atan2s(temp_f27, JMAFastSqrt(SQUARE(temp_f30) + SQUARE(temp_f29))); + s16 temp_r0 = -cM_atan2s(var_f27, JMAFastSqrt(SQUARE(var_f30) + SQUARE(var_f29))); s16 sp8; if (temp_r0 > 0 || i_this->field_0x1090 > 0.0f || i_this->action >= ACTION_UKI_HIT) { if (temp_r0 > 0 || i_this->action >= ACTION_UKI_HIT) { @@ -3441,26 +3476,26 @@ static int uki_calc(dmg_rod_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0x1084.x, temp_r0, 2, sp8); } - cLib_addCalcAngleS2(&i_this->field_0x1084.y, (s16)cM_atan2s(temp_f30, temp_f29), 2, 0x800); + cLib_addCalcAngleS2(&i_this->field_0x1084.y, (s16)cM_atan2s(var_f30, var_f29), 2, 0x800); cMtx_YrotS(*calc_mtx, i_this->field_0x1084.y); cMtx_XrotM(*calc_mtx, i_this->field_0x1084.x); sp68.set(0.0f, 0.0f, 6.5f + XREG_F(8)); MtxPosition(&sp68, &sp5C); i_this->hook_pos = sp44 + sp5C; - if (i_this->field_0x6e0 > 0.1f) { + if (i_this->cast_momentum > 0.1f) { dBgS_LinChk sp78; sp78.SetRope(); sp78.Set(&i_this->field_0x106c, &i_this->hook_pos, actor); if (dComIfG_Bgsp().LineCross(&sp78)) { OS_REPORT(" UKI WALL HIT \n"); - i_this->field_0x6e0 = -0.5f; + i_this->cast_momentum = -0.5f; i_this->hook_pos = i_this->field_0x106c; } } i_this->field_0x106c = i_this->hook_pos; - return var_r28; + return retval; } static void uki_ready(dmg_rod_class* i_this) { @@ -3482,7 +3517,7 @@ static void uki_ready(dmg_rod_class* i_this) { sp18.y = sp18.z; } else { sp24.x = player->speedF * (2.0f + ZREG_F(4)); - sp18.z = 30.0f + ZREG_F(5) + sp24.x + (sp24.x * cM_ssin(i_this->field_0x578 * (ZREG_S(2) + 4000))); + sp18.z = 30.0f + ZREG_F(5) + sp24.x + (sp24.x * cM_ssin(i_this->counter * (ZREG_S(2) + 4000))); if (sp18.z > 100.0f) { sp18.z = 100.0f; } @@ -3530,24 +3565,22 @@ static void uki_ready(dmg_rod_class* i_this) { if (i_this->play_cam_mode != 0) { daAlink_getAlinkActorClass()->startFishingCastWait(); i_this->action = ACTION_UKI_STANDBY; - i_this->field_0x6e0 = 0.0f; + i_this->cast_momentum = 0.0f; i_this->field_0x1504 = 0.0f; i_this->field_0x1418 = player->shape_angle.y - dCam_getControledAngleY(dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0))); i_this->timers[0] = 20; i_this->field_0x102e = 0; daAlink_getAlinkActorClass()->seStartOnlyReverb(Z2SE_AL_ROD_SWING_UKI); i_this->timers[6] = 20; - i_this->cast_power = 1.0f; - i_this->field_0x6e0 = 1.0f; - i_this->field_0xf68 = 0.0f; - i_this->field_0xf64 = 0.0f; + i_this->cast_momentum = i_this->cast_power = 1.0f; + i_this->field_0xf64 = i_this->field_0xf68 = 0.0f; } } static BOOL uki_rod_bg_check(dmg_rod_class* i_this) { fopAc_ac_c* actor = &i_this->actor; fopAc_ac_c* player = dComIfGp_getPlayer(0); - + dBgS_LinChk sp20; sp20.SetRope(); @@ -3555,7 +3588,7 @@ static BOOL uki_rod_bg_check(dmg_rod_class* i_this) { cXyz sp8; sp14 = player->current.pos; sp14.y += 100.0f; - sp8 = i_this->field_0x6ac; + sp8 = i_this->rod_tip_pos; sp8.y += 30.0f + YREG_F(1); sp20.Set(&sp14, &sp8, actor); @@ -3567,19 +3600,19 @@ static BOOL uki_rod_bg_check(dmg_rod_class* i_this) { } static void uki_pl_arm_calc(dmg_rod_class* i_this) { - fopAc_ac_c* temp_r28 = dComIfGp_getPlayer(0); + fopAc_ac_c* player = dComIfGp_getPlayer(0); csXyz sp10; csXyz sp8; if (i_this->action == ACTION_UKI_STANDBY) { f32 var_f30 = i_this->hook_pos.y; - if (var_f30 < i_this->field_0x590) { - var_f30 = i_this->field_0x590; + if (var_f30 < i_this->water_surface_y) { + var_f30 = i_this->water_surface_y; } - - f32 var_f31 = temp_r28->current.pos.y - var_f30; + + f32 var_f31 = player->current.pos.y - var_f30; if (var_f31 > 100.0f + hREG_F(16)) { - var_f31 = temp_r28->current.pos.y - i_this->field_0x590; + var_f31 = player->current.pos.y - i_this->water_surface_y; var_f31 -= 100.0f + hREG_F(16); var_f31 *= 5.0f + hREG_F(17); if (var_f31 > 1000.0f) { @@ -3608,8 +3641,8 @@ static void uki_pl_arm_calc(dmg_rod_class* i_this) { sp10.z += (s16)((3500.0f * i_this->field_0x1508) + ((-11000.0f + WREG_F(8)) * (i_this->field_0x150c * i_this->field_0x1508))); if (i_this->action == ACTION_UKI_HIT && i_this->field_0xf60 > 140.0f + JREG_F(14)) { - sp8.y += (s16)((50.0f + nREG_F(0)) * cM_ssin(i_this->field_0x578 * 0x6200)); - sp8.z += (s16)((50.0f + nREG_F(0)) * cM_ssin(i_this->field_0x578 * 0x6500)); + sp8.y += (s16)((50.0f + nREG_F(0)) * cM_ssin(i_this->counter * 0x6200)); + sp8.z += (s16)((50.0f + nREG_F(0)) * cM_ssin(i_this->counter * 0x6500)); daAlink_getAlinkActorClass()->seStartOnlyReverbLevel(Z2SE_AL_ROD_BEND); } @@ -3625,14 +3658,14 @@ static void uki_standby(dmg_rod_class* i_this) { dComIfGp_setDoStatusForce(42, 0); - f32 var_f31 = -(i_this->rod_substick_y * (1.05f + AREG_F(13))); - f32 temp_f30 = i_this->rod_substick_x; - if (var_f31 < 0.0f) { - var_f31 = 0.0f; + f32 substickYAdj = -(i_this->rod_substick_y * (1.05f + AREG_F(13))); + f32 substickX = i_this->rod_substick_x; + if (substickYAdj < 0.0f) { + substickYAdj = 0.0f; } - cLib_addCalc2(&i_this->field_0x1508, var_f31, 0.5f, 0.2f); - cLib_addCalc2(&i_this->field_0x150c, temp_f30, 0.5f, 0.2f); + cLib_addCalc2(&i_this->field_0x1508, substickYAdj, 0.5f, 0.2f); + cLib_addCalc2(&i_this->field_0x150c, substickX, 0.5f, 0.2f); if (i_this->field_0x1508 > 0.3f && i_this->play_cam_mode < 5) { i_this->field_0x1418 += (s16)((-500.0f + VREG_F(3)) * mDoCPd_c::getStickX3D(PAD_1)); @@ -3658,7 +3691,7 @@ static void uki_standby(dmg_rod_class* i_this) { sp24.y = sp24.z; } else { sp30.x = player->speedF * (2.0f + ZREG_F(4)); - sp24.z = 30.0f + ZREG_F(5) + sp30.x + (sp30.x * cM_ssin(i_this->field_0x578 * (ZREG_S(2) + 4000))); + sp24.z = 30.0f + ZREG_F(5) + sp30.x + (sp30.x * cM_ssin(i_this->counter * (ZREG_S(2) + 4000))); if (sp24.z > 100.0f) { sp24.z = 100.0f; } @@ -3669,9 +3702,9 @@ static void uki_standby(dmg_rod_class* i_this) { if (i_this->field_0x10a5 == 0) { actor->current.pos = i_this->field_0x764; - if (actor->current.pos.y <= (10.0f + i_this->field_0x590) && actor->old.pos.y > (10.0f + i_this->field_0x590)) { + if (actor->current.pos.y <= (10.0f + i_this->water_surface_y) && actor->old.pos.y > (10.0f + i_this->water_surface_y)) { sp30.x = actor->current.pos.x; - sp30.y = i_this->field_0x590; + sp30.y = i_this->water_surface_y; sp30.z = actor->current.pos.z; fopKyM_createWpillar(&sp30, 0.1f, 0); } @@ -3696,19 +3729,18 @@ static void uki_standby(dmg_rod_class* i_this) { } if (sp8 != 0) { - i_this->field_0x6e0 = i_this->cast_power; - i_this->field_0xf68 = 0.0f; - i_this->field_0xf64 = 0.0f; + i_this->cast_momentum = i_this->cast_power; + i_this->field_0xf64 = i_this->field_0xf68 = 0.0f; } uki_calc(i_this); - cLib_addCalc0(&i_this->field_0x6e0, 1.0f, 0.02f + BREG_F(18)); + cLib_addCalc0(&i_this->cast_momentum, 1.0f, 0.02f + BREG_F(18)); cLib_addCalc2(&i_this->field_0xf64, -30.0f + ZREG_F(1), 1.0f, 0.5f + BREG_F(14)); cLib_addCalc2(&i_this->field_0xf68, -(10.0f + AREG_F(10)), 1.0f, 0.01f * (10.0f + AREG_F(10))); - f32 temp_f29 = (player->current.pos - i_this->hook_pos).abs(); - if (temp_f29 >= YREG_F(18) && i_this->field_0x1508 < 0.5f && i_this->field_0x100d != 0) { + f32 hookDistToPlayer = (player->current.pos - i_this->hook_pos).abs(); + if (hookDistToPlayer >= YREG_F(18) && i_this->field_0x1508 < 0.5f && i_this->is_hook_in_water != 0) { if (i_this->timers[1] == 0 && i_this->play_cam_mode < 5) { i_this->play_cam_mode = 5; i_this->timers[1] = 15; @@ -3726,7 +3758,7 @@ static void uki_standby(dmg_rod_class* i_this) { Z2GetAudioMgr()->changeFishingBgm(0); } - if (i_this->timers[0] == 0 && (dComIfGp_checkPlayerStatus0(0, 0x100000) || i_this->ccSph.ChkCoHit() || dComIfGp_event_runCheck() != 0 || uki_rod_bg_check(i_this) || (i_this->field_0x100d == 0 && player->current.pos.y - actor->current.pos.y > (350.0f + nREG_F(11))) || i_this->field_0x102e != 0)) { + if (i_this->timers[0] == 0 && (dComIfGp_checkPlayerStatus0(0, 0x100000) || i_this->ccSph.ChkCoHit() || dComIfGp_event_runCheck() != 0 || uki_rod_bg_check(i_this) || (i_this->is_hook_in_water == 0 && player->current.pos.y - actor->current.pos.y > (350.0f + nREG_F(11))) || i_this->field_0x102e != 0)) { i_this->play_cam_mode = 90; } @@ -3734,7 +3766,7 @@ static void uki_standby(dmg_rod_class* i_this) { i_this->action = ACTION_UKI_READY; daAlink_getAlinkActorClass()->endFishingCastWait(); i_this->field_0x1094 = 0.0f; - i_this->field_0x6e0 = 0.0f; + i_this->cast_momentum = 0.0f; i_this->field_0x10a5 = 0; } } @@ -3749,19 +3781,19 @@ static void uki_hit(dmg_rod_class* i_this) { actor->eyePos.x = i_this->hook_pos.x; actor->eyePos.z = i_this->hook_pos.z; - actor->eyePos.y = i_this->field_0x590; + actor->eyePos.y = i_this->water_surface_y; int sp18 = 0; int sp14 = 0; - f32 var_f29 = -i_this->rod_substick_y; - f32 temp_f27 = i_this->rod_substick_x; - if (var_f29 < 0.0f) { - var_f29 = 0.0f; + f32 substickY = -i_this->rod_substick_y; + f32 substickX = i_this->rod_substick_x; + if (substickY < 0.0f) { + substickY = 0.0f; } - cLib_addCalc2(&i_this->field_0x1508, var_f29, 0.5f, 0.2f); - cLib_addCalc2(&i_this->field_0x150c, temp_f27, 0.5f, 0.2f); + cLib_addCalc2(&i_this->field_0x1508, substickY, 0.5f, 0.2f); + cLib_addCalc2(&i_this->field_0x150c, substickX, 0.5f, 0.2f); i_this->rod_stick_x = 0.0f; i_this->rod_stick_y = 0.0f; @@ -3792,7 +3824,8 @@ static void uki_hit(dmg_rod_class* i_this) { } if (mgfish->mJointScale > 0.55f) { - var_f30 *= mgfish->mJointScale * (1.1f + (6.0f * (mgfish->mJointScale - 0.55f))); + f32 jointScaleAdj = mgfish->mJointScale - 0.55f; + var_f30 *= mgfish->mJointScale * (1.1f + (6.0f * jointScaleAdj)); } cMtx_YrotS(*calc_mtx, sp8); @@ -3806,9 +3839,9 @@ static void uki_hit(dmg_rod_class* i_this) { mgfish->mJointTranslations[i] += sp48; } - if (i_this->timers[5] == 0 || i_this->field_0x590 - mgfish_a->current.pos.y > 300.0f) { - cLib_addCalc2(&mgfish_a->current.pos.y, 100.0f + i_this->field_0x590, 0.5f, var_f31 * (0.7f + JREG_F(6))); - if (mgfish_a->current.pos.y > (i_this->field_0x590 - (KREG_F(11) * mgfish->mJointScale))) { + if (i_this->timers[5] == 0 || i_this->water_surface_y - mgfish_a->current.pos.y > 300.0f) { + cLib_addCalc2(&mgfish_a->current.pos.y, 100.0f + i_this->water_surface_y, 0.5f, var_f31 * (0.7f + JREG_F(6))); + if (mgfish_a->current.pos.y > (i_this->water_surface_y - (KREG_F(11) * mgfish->mJointScale))) { sp18 = 1; } } @@ -3820,7 +3853,7 @@ static void uki_hit(dmg_rod_class* i_this) { if (sp14 != 0 || i_this->timers[2] == 0) { i_this->action = ACTION_UKI_STANDBY; - i_this->field_0x6e0 = 0.0f; + i_this->cast_momentum = 0.0f; i_this->timers[0] = 20; i_this->play_cam_mode = 2; i_this->field_0x10a5 = 0; @@ -3832,7 +3865,7 @@ static void uki_hit(dmg_rod_class* i_this) { e_sg_class* sg = (e_sg_class*)fopAcM_SearchByID(mgfish->mSkullfishId); sg->mInactive = 0; } - + mgfish->mCaughtType = MG_CATCH_FISH; mgfish->field_0x62e = 300.0f + cM_rndF(200.0f); Z2GetAudioMgr()->changeFishingBgm(1); @@ -3848,16 +3881,16 @@ static void uki_hit(dmg_rod_class* i_this) { uki_calc(i_this); - cLib_addCalc0(&i_this->field_0x6e0, 1.0f, 0.02f + BREG_F(18)); + cLib_addCalc0(&i_this->cast_momentum, 1.0f, 0.02f + BREG_F(18)); cLib_addCalc2(&i_this->field_0xf64, -30.0f + ZREG_F(1), 1.0f, 0.5f + BREG_F(14)); cLib_addCalc2(&i_this->field_0xf68, -(10.0f + AREG_F(10)), 1.0f, 0.01f * (10.0f + AREG_F(10))); cXyz sp3C; - sp54 = i_this->field_0x6ac - actor->current.pos; - sp3C.x = actor->current.pos.x + ((i_this->field_0x590 - actor->current.pos.y) / std::tan(cM_atan2f(sp54.y, sp54.x))); - sp3C.z = actor->current.pos.z + ((i_this->field_0x590 - actor->current.pos.y) / std::tan(cM_atan2f(sp54.y, sp54.z))); - sp3C.y = i_this->field_0x590; - fopAcM_effHamonSet(&i_this->field_0x1178, &sp3C, 0.3f + KREG_F(12), 0.3f + KREG_F(13)); + sp54 = i_this->rod_tip_pos - actor->current.pos; + sp3C.x = actor->current.pos.x + ((i_this->water_surface_y - actor->current.pos.y) / std::tan(cM_atan2f(sp54.y, sp54.x))); + sp3C.z = actor->current.pos.z + ((i_this->water_surface_y - actor->current.pos.y) / std::tan(cM_atan2f(sp54.y, sp54.z))); + sp3C.y = i_this->water_surface_y; + fopAcM_effHamonSet(&i_this->emitter_id, &sp3C, 0.3f + KREG_F(12), 0.3f + KREG_F(13)); if (sp18 != 0) { dComIfGp_getVibration().StartShock(4, 1, cXyz(0.0f, 1.0f, 0.0f)); @@ -3868,13 +3901,14 @@ static void uki_hit(dmg_rod_class* i_this) { i_this->action = ACTION_UKI_CATCH; i_this->play_cam_mode = 20; i_this->play_cam_timer = 0; - i_this->field_0x1410 = 0.0f; - i_this->field_0x146d = 0; + i_this->camera_morf_rate = 0.0f; + i_this->msg_flow_state = 0; i_this->field_0x14fc = 0; } } static int bb_get(dmg_rod_class* i_this) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_this; for (int i = 0; i < 3; i++) { u8 itemno = dComIfGs_getItem(i + 15, false); if (itemno != fpcNm_ITEM_NONE) { @@ -3903,22 +3937,22 @@ static void uki_catch(dmg_rod_class* i_this) { mg_fish_class* mgfish = (mg_fish_class*)mgfish_a; u8 fish_kind = mgfish->mKind2; - s16 fish_size; + s16 fishSizeCm; if (data_804BBBD4 == 1) { - fish_size = 39.37008f * mgfish->mJointScale; + fishSizeCm = 39.37008f * mgfish->mJointScale; } else { - fish_size = 100.0f * mgfish->mJointScale; + fishSizeCm = 100.0f * mgfish->mJointScale; } if (data_804BBBD4 == 2) { - f32 temp_f31 = fish_size / 2.54f; - f32 var_f30 = dComIfGs_getFishSize(fish_kind) / 2.54f; - if ((u8)temp_f31 > (u8)var_f30) { + f32 fishSizeInches = fishSizeCm / 2.54f; + f32 fishKindSizeInches = dComIfGs_getFishSize(fish_kind) / 2.54f; + if ((u8)fishSizeInches > (u8)fishKindSizeInches) { i_this->field_0x14c0 = 1; } else { i_this->field_0x14c0 = 0; } - } else if ((u8)fish_size > dComIfGs_getFishSize(fish_kind)) { + } else if ((u8)fishSizeCm > dComIfGs_getFishSize(fish_kind)) { i_this->field_0x14c0 = 1; } else { i_this->field_0x14c0 = 0; @@ -3966,7 +4000,7 @@ static void uki_catch(dmg_rod_class* i_this) { } if (i_this->play_cam_timer >= 50) { - if (i_this->field_0x146d == 0) { + if (i_this->msg_flow_state == 0) { if (mgfish->mCaughtType == MG_CATCH_BT) { if (data_80450C9E != 0) { i_this->msgflow.init(actor, 0x1395, 0, NULL); @@ -4002,7 +4036,7 @@ static void uki_catch(dmg_rod_class* i_this) { } else if (mgfish->mCaughtType == MG_CATCH_SY) { i_this->msgflow.init(actor, 0x139B, 0, NULL); } else { - OS_REPORT(" GET FISH SIZE %d\n", fish_size); + OS_REPORT(" GET FISH SIZE %d\n", fishSizeCm); OS_REPORT(" GET FISH KIND %d\n", fish_kind); OS_REPORT(" GET FISH REC %d\n", dComIfGs_getFishSize(fish_kind)); @@ -4053,17 +4087,17 @@ static void uki_catch(dmg_rod_class* i_this) { } if (data_804BBBD4 == 2) { - dComIfGp_setMessageCountNumber((u8)(fish_size / 2.54f)); + dComIfGp_setMessageCountNumber((u8)(fishSizeCm / 2.54f)); } else { - dComIfGp_setMessageCountNumber(fish_size); + dComIfGp_setMessageCountNumber(fishSizeCm); } } - i_this->field_0x146d = 1; + i_this->msg_flow_state = 1; } - if (i_this->field_0x146d == 1 && i_this->msgflow.doFlow(actor, NULL, 0)) { - i_this->field_0x146d = 2; + if (i_this->msg_flow_state == 1 && i_this->msgflow.doFlow(actor, NULL, 0)) { + i_this->msg_flow_state = 2; i_this->play_cam_mode = 21; i_this->play_cam_timer = 0; @@ -4074,7 +4108,7 @@ static void uki_catch(dmg_rod_class* i_this) { } else { dComIfGs_addFishNum(fish_kind); if (i_this->field_0x14c0 != 0) { - dComIfGs_setFishSize(fish_kind, fish_size); + dComIfGs_setFishSize(fish_kind, fishSizeCm); } } @@ -4088,7 +4122,8 @@ static void uki_catch(dmg_rod_class* i_this) { } static void* s_sg_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->field_0x590 - 50.0f) { + UNUSED(i_data); + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_SG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) { return i_actor; } @@ -4096,7 +4131,7 @@ static void* s_sg_sub(void* i_actor, void* i_data) { } static void* s_bb_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_BG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->field_0x590 - 50.0f) { + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_BG && ((fopAc_ac_c*)i_actor)->current.pos.y < ((dmg_rod_class*)i_data)->water_surface_y - 50.0f) { return i_actor; } @@ -4104,9 +4139,13 @@ static void* s_bb_sub(void* i_actor, void* i_data) { } static void* s_lh_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH && ((mg_fish_class*)i_actor)->mGedouKind == 21) { - if ((((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < ((mg_fish_class*)i_actor)->mJointScale) { - return i_actor; + UNUSED(i_data); + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH) { + mg_fish_class* fish = (mg_fish_class*)i_actor; + if (fish->mGedouKind == 21) { + if ((fish->actor.current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < fish->mJointScale) { + return i_actor; + } } } @@ -4114,9 +4153,13 @@ static void* s_lh_sub(void* i_actor, void* i_data) { } static void* s_bt_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH && ((mg_fish_class*)i_actor)->mGedouKind == 20) { - if ((((fopAc_ac_c*)i_actor)->current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < ((mg_fish_class*)i_actor)->mJointScale) { - return i_actor; + UNUSED(i_data); + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_MG_FISH) { + mg_fish_class* fish = (mg_fish_class*)i_actor; + if (fish->mGedouKind == 20) { + if ((fish->actor.current.pos - ((fopAc_ac_c*)i_data)->current.pos).abs() < fish->mJointScale) { + return i_actor; + } } } @@ -4130,11 +4173,12 @@ static void uki_main(dmg_rod_class* i_this) { mg_fish_class* mgfish = (mg_fish_class*)mgfish_a; cXyz sp90; - cXyz sp84; + cXyz unusedXyz1; - f32 var_f30 = i_this->rod_stick_x; - if (fabsf(var_f30) < 0.1f) { - var_f30 = 0.0f; + f32 curHookSize; + f32 rodStickX = i_this->rod_stick_x; + if (fabsf(rodStickX) < 0.1f) { + rodStickX = 0.0f; } i_this->field_0xf5c = 4.25f + ZREG_F(0); @@ -4184,7 +4228,7 @@ static void uki_main(dmg_rod_class* i_this) { } if (i_this->rod_substick_y <= -0.5f && (i_this->rod_substick_y - i_this->prev_rod_substick_y) <= -0.5f && i_this->action == ACTION_UKI_STANDBY) { - if (i_this->field_0x100d != 0) { + if (i_this->is_hook_in_water != 0) { daAlink_getAlinkActorClass()->seStartOnlyReverb(Z2SE_AL_ROD_SWING_LURE); } } @@ -4200,7 +4244,7 @@ static void uki_main(dmg_rod_class* i_this) { if (i_this->action == ACTION_UKI_CATCH) { uki_calc(i_this); } - + cXyz sp78 = i_this->mg_line.pos[0] - i_this->mg_line.pos[1]; i_this->field_0xf60 = sp78.abs(); @@ -4308,15 +4352,15 @@ static void uki_main(dmg_rod_class* i_this) { mDoMtx_stack_c::transS(i_this->hook_pos.x, i_this->hook_pos.y, i_this->hook_pos.z); - cXyz sp60; - f32 sp18; - dKyw_get_AllWind_vec(&i_this->hook_pos, &sp60, &sp18); + cXyz windDir; + f32 windPower; + dKyw_get_AllWind_vec(&i_this->hook_pos, &windDir, &windPower); - if (sp18 >= 0.4f && i_this->hook_pos.y < (i_this->field_0x590 - 5.0f) + ZREG_F(11)) { - f32 temp_f29 = 7000.0f + (900.0f * cM_ssin(i_this->field_0x578 * 2000)); + if (windPower >= 0.4f && i_this->hook_pos.y < (i_this->water_surface_y - 5.0f) + ZREG_F(11)) { + f32 var_f29 = 7000.0f + (900.0f * cM_ssin(i_this->counter * 2000)); - cLib_addCalcAngleS2(&i_this->field_0x10a0, cM_atan2s(sp60.x, sp60.z), 4, 100); - cLib_addCalcAngleS2(&i_this->field_0x10a2, (sp18 - 0.4f) * temp_f29, 4, 100); + cLib_addCalcAngleS2(&i_this->field_0x10a0, cM_atan2s(windDir.x, windDir.z), 4, 100); + cLib_addCalcAngleS2(&i_this->field_0x10a2, (windPower - 0.4f) * var_f29, 4, 100); } else { cLib_addCalcAngleS2(&i_this->field_0x10a2, 0, 2, 200); } @@ -4339,46 +4383,45 @@ static void uki_main(dmg_rod_class* i_this) { i_this->uki_saki_model->setBaseTRMtx(mDoMtx_stack_c::get()); sp90 = i_this->mg_line.pos[95] - actor->current.pos; - s16 spA = -cM_atan2s(sp90.y, sp90.z); - s16 sp8 = (s16)cM_atan2s(sp90.x, JMAFastSqrt(SQUARE(sp90.y) + SQUARE(sp90.z))); + s16 rotX = -cM_atan2s(sp90.y, sp90.z); + s16 rotY = (s16)cM_atan2s(sp90.x, JMAFastSqrt(SQUARE(sp90.y) + SQUARE(sp90.z))); actor->current.angle.z += i_this->field_0x114e; if (i_this->action == ACTION_UKI_CATCH && mgfish->mCaughtType == MG_CATCH_SP) { - if (g_Counter.mTimer & 128) { + if (g_Counter.mTimer & 0x80) { cLib_addCalcAngleS2(&i_this->field_0x114e, 1000, 4, 40); } else { cLib_addCalcAngleS2(&i_this->field_0x114e, -1000, 4, 40); } } else if (i_this->action == ACTION_UKI_CATCH && mgfish->mCaughtType >= MG_CATCH_KN) { - if (g_Counter.mTimer & 256) { + if (g_Counter.mTimer & 0x100) { cLib_addCalcAngleS2(&i_this->field_0x114e, 200, 4, 8); } else { cLib_addCalcAngleS2(&i_this->field_0x114e, -200, 4, 8); } - } else if (i_this->field_0x578 & 256) { + } else if (i_this->counter & 0x100) { cLib_addCalcAngleS2(&i_this->field_0x114e, 500, 8, 10); } else { cLib_addCalcAngleS2(&i_this->field_0x114e, -500, 8, 10); } mDoMtx_stack_c::transS(actor->current.pos.x, actor->current.pos.y, actor->current.pos.z); - mDoMtx_stack_c::XrotM(spA); - mDoMtx_stack_c::YrotM(sp8); + mDoMtx_stack_c::XrotM(rotX); + mDoMtx_stack_c::YrotM(rotY); mDoMtx_stack_c::ZrotM(actor->current.angle.z); mDoMtx_stack_c::push(); mDoMtx_stack_c::XrotM(0x4000); static f32 hook_size[] = {1.0f, 0.5f}; - f32 temp_f31 = hook_size[i_this->hook_kind]; - mDoMtx_stack_c::scaleM(temp_f31, temp_f31, temp_f31); + curHookSize = hook_size[i_this->hook_kind]; + mDoMtx_stack_c::scaleM(curHookSize, curHookSize, curHookSize); i_this->hook_model[i_this->hook_kind]->setBaseTRMtx(mDoMtx_stack_c::get()); mDoMtx_stack_c::pop(); if (i_this->esa_kind != 0) { - f32 var_f31; if (i_this->esa_kind == 1) { mDoMtx_stack_c::XrotM(-0x8000); if (i_this->hook_kind == 1) { @@ -4386,39 +4429,39 @@ static void uki_main(dmg_rod_class* i_this) { } else { mDoMtx_stack_c::transM(JREG_F(8), -0.5f + JREG_F(9), 9.0f + JREG_F(10)); } - var_f31 = 0.1f; + curHookSize = 0.1f; } else { if (i_this->hook_kind == 1) { mDoMtx_stack_c::transM(JREG_F(13), -1.0f + JREG_F(14), -9.0f + JREG_F(15)); } else { mDoMtx_stack_c::transM(JREG_F(13), -1.0f + JREG_F(14), -3.0f + JREG_F(15)); } - var_f31 = 0.065f + JREG_F(12); + curHookSize = 0.065f + JREG_F(12); } - mDoMtx_stack_c::scaleM(var_f31, var_f31, var_f31); + mDoMtx_stack_c::scaleM(curHookSize, curHookSize, curHookSize); i_this->esa_model[i_this->esa_kind - 1]->setBaseTRMtx(mDoMtx_stack_c::get()); if (i_this->esa_kind == 2) { for (int i = XREG_S(2) + 1; i < 9; i++) { - i_this->field_0x103c[i] = 4000.0f * cM_ssin((i_this->field_0x578 * 2000) - (i * 4000)); - i_this->field_0x104e[i] = 2000.0f * cM_ssin((i_this->field_0x578 * 2000) - (i * 5000)); + i_this->field_0x103c[i] = 4000.0f * cM_ssin((i_this->counter * 2000) - (i * 4000)); + i_this->field_0x104e[i] = 2000.0f * cM_ssin((i_this->counter * 2000) - (i * 5000)); } } } - i_this->ccSph.SetC(i_this->mg_line.pos[(i_this->field_0x578 * 4) & 60]); + i_this->ccSph.SetC(i_this->mg_line.pos[(i_this->counter * 4) & 0x3f]); dComIfG_Ccsp()->Set(&i_this->ccSph); } static void cam_3d_morf(dmg_rod_class* i_this, f32 i_scale) { - cLib_addCalc2(&i_this->play_cam_center.x, i_this->play_cam_center_target.x, i_scale, i_this->play_cam_center_speed.x * i_this->field_0x1410); - cLib_addCalc2(&i_this->play_cam_center.y, i_this->play_cam_center_target.y, i_scale, i_this->play_cam_center_speed.y * i_this->field_0x1410); - cLib_addCalc2(&i_this->play_cam_center.z, i_this->play_cam_center_target.z, i_scale, i_this->play_cam_center_speed.z * i_this->field_0x1410); + cLib_addCalc2(&i_this->play_cam_center.x, i_this->play_cam_center_target.x, i_scale, i_this->play_cam_center_speed.x * i_this->camera_morf_rate); + cLib_addCalc2(&i_this->play_cam_center.y, i_this->play_cam_center_target.y, i_scale, i_this->play_cam_center_speed.y * i_this->camera_morf_rate); + cLib_addCalc2(&i_this->play_cam_center.z, i_this->play_cam_center_target.z, i_scale, i_this->play_cam_center_speed.z * i_this->camera_morf_rate); - cLib_addCalc2(&i_this->play_cam_eye.x, i_this->play_cam_eye_target.x, i_scale, i_this->play_cam_eye_speed.x * i_this->field_0x1410); - cLib_addCalc2(&i_this->play_cam_eye.y, i_this->play_cam_eye_target.y, i_scale, i_this->play_cam_eye_speed.y * i_this->field_0x1410); - cLib_addCalc2(&i_this->play_cam_eye.z, i_this->play_cam_eye_target.z, i_scale, i_this->play_cam_eye_speed.z * i_this->field_0x1410); + cLib_addCalc2(&i_this->play_cam_eye.x, i_this->play_cam_eye_target.x, i_scale, i_this->play_cam_eye_speed.x * i_this->camera_morf_rate); + cLib_addCalc2(&i_this->play_cam_eye.y, i_this->play_cam_eye_target.y, i_scale, i_this->play_cam_eye_speed.y * i_this->camera_morf_rate); + cLib_addCalc2(&i_this->play_cam_eye.z, i_this->play_cam_eye_target.z, i_scale, i_this->play_cam_eye_speed.z * i_this->camera_morf_rate); } static void play_camera(dmg_rod_class* i_this) { @@ -4429,7 +4472,7 @@ static void play_camera(dmg_rod_class* i_this) { camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); camera_class* camera0 = dComIfGp_getCamera(0); - dBgS_GndChk sp244; + dBgS_GndChk gndChk; dBgS_ObjGndChk_Spl sp1F0; int sp70 = 0; i_this->field_0x13b0 = i_this->rod_substick_y; @@ -4441,10 +4484,16 @@ static void play_camera(dmg_rod_class* i_this) { cXyz sp150; cXyz sp144(0.0f, 0.0f, 0.0f); + f32 sp6C; + f32 sp68; + f32 sp64; + f32 sp60; + f32 sp5C; + camera_class* sp58; switch (i_this->play_cam_mode) { case 0: if (dComIfGp_checkPlayerStatus0(0, 0x2000) || dComIfGp_event_runCheck() != 0) { - i_this->field_0x146c = 20; + i_this->input_cooldown = 20; } if (daAlink_getAlinkActorClass()->checkCanoeRide()) { @@ -4457,7 +4506,7 @@ static void play_camera(dmg_rod_class* i_this) { dComIfGp_setDoStatusForce(15, 0); } - if (i_this->field_0x146c == 0) { + if (i_this->input_cooldown == 0) { if (mDoCPd_c::getTrigA(PAD_1)) { i_this->play_cam_mode = 1050; } @@ -4480,7 +4529,7 @@ static void play_camera(dmg_rod_class* i_this) { i_this->field_0x1424 = 180.0f + WREG_F(0); i_this->field_0x1428 = 100.0f + WREG_F(1); - camera_class* sp58 = (camera_class*)dComIfGp_getCamera(0); + sp58 = (camera_class*)dComIfGp_getCamera(0); i_this->field_0x144c = sp58->lookat.eye; i_this->field_0x1458 = sp58->lookat.center; i_this->play_cam_eye = i_this->field_0x144c; @@ -4493,11 +4542,11 @@ static void play_camera(dmg_rod_class* i_this) { } case 2: { sp70 = 1; - f32 sp6C = 0.3f + NREG_F(3); - f32 sp68 = i_this->field_0x1420; - f32 sp64 = 180.0f + WREG_F(0); - f32 sp60 = 100.0f + WREG_F(1); - f32 sp5C = 30.0f; + sp6C = 0.3f + NREG_F(3); + sp68 = i_this->field_0x1420; + sp64 = 180.0f + WREG_F(0); + sp60 = 100.0f + WREG_F(1); + sp5C = 30.0f; if (i_this->play_cam_timer > (s16)(8 + YREG_S(6))) { cLib_addCalcAngleS2(&i_this->field_0x1418, daAlink_getAlinkActorClass()->getFishingRodAngleY(), 6, 2000); @@ -4512,8 +4561,8 @@ static void play_camera(dmg_rod_class* i_this) { i_this->field_0x1420 = 500.0f; if (i_this->action == ACTION_LURE_CAST) { sp150 = actor->current.pos; - if (sp150.y > (150.0f + (300.0f + i_this->field_0x590) + ZREG_F(19))) { - sp150.y = (150.0f + (300.0f + i_this->field_0x590) + ZREG_F(19)); + if (sp150.y > (150.0f + (300.0f + i_this->water_surface_y) + ZREG_F(19))) { + sp150.y = (150.0f + (300.0f + i_this->water_surface_y) + ZREG_F(19)); } f32 fovy; @@ -4547,10 +4596,10 @@ static void play_camera(dmg_rod_class* i_this) { sp150 += player->current.pos; } - cLib_addCalc2(&i_this->field_0x1410, 1.0f, 1.0f, 0.01f + NREG_F(8)); - cLib_addCalc2(&i_this->play_cam_center.x, sp150.x, 0.3f + NREG_F(4), 200.0f * i_this->field_0x1410); - cLib_addCalc2(&i_this->play_cam_center.y, sp150.y, 0.2f + NREG_F(5), 200.0f * i_this->field_0x1410); - cLib_addCalc2(&i_this->play_cam_center.z, sp150.z, 0.3f + NREG_F(4), 200.0f * i_this->field_0x1410); + cLib_addCalc2(&i_this->camera_morf_rate, 1.0f, 1.0f, 0.01f + NREG_F(8)); + cLib_addCalc2(&i_this->play_cam_center.x, sp150.x, 0.3f + NREG_F(4), 200.0f * i_this->camera_morf_rate); + cLib_addCalc2(&i_this->play_cam_center.y, sp150.y, 0.2f + NREG_F(5), 200.0f * i_this->camera_morf_rate); + cLib_addCalc2(&i_this->play_cam_center.z, sp150.z, 0.3f + NREG_F(4), 200.0f * i_this->camera_morf_rate); i_this->field_0x141a = i_this->field_0x1418 - daAlink_getAlinkActorClass()->getFishingRodAngleY(); i_this->field_0x140c = i_this->play_cam_fovy; @@ -4558,7 +4607,7 @@ static void play_camera(dmg_rod_class* i_this) { } case 5: { sp70 = 1; - cLib_addCalc2(&i_this->field_0x141c, 400.0f + BREG_F(7), 0.1f, (20.0f + YREG_F(8)) * i_this->field_0x1410); + cLib_addCalc2(&i_this->field_0x141c, 400.0f + BREG_F(7), 0.1f, (20.0f + YREG_F(8)) * i_this->camera_morf_rate); f32 sp50 = i_this->field_0x13b0; sp50 *= -(3.0f + BREG_F(2)); @@ -4639,8 +4688,8 @@ static void play_camera(dmg_rod_class* i_this) { sp174 = actor->current.pos - player->current.pos; cMtx_YrotS(*calc_mtx, cM_atan2s(sp174.x, sp174.z)); sp174.x = 0.0f; - sp174.y = (100.0f * i_this->field_0x1410); - sp174.z = (200.0f * i_this->field_0x1410); + sp174.y = (100.0f * i_this->camera_morf_rate); + sp174.z = (200.0f * i_this->camera_morf_rate); MtxPosition(&sp174, &sp168); cLib_addCalc2(&i_this->play_cam_eye.x, sp15C.x, sp38, fabsf(sp168.x)); @@ -4648,13 +4697,13 @@ static void play_camera(dmg_rod_class* i_this) { cLib_addCalc2(&i_this->play_cam_eye.z, sp15C.z, sp38, fabsf(sp168.z)); sp150 = actor->current.pos; - if (i_this->lure_type == MG_LURE_SP && sp150.y < (i_this->field_0x590 - 100.0f)) { - sp150.y = (i_this->field_0x590 - 100.0f); + if (i_this->lure_type == MG_LURE_SP && sp150.y < (i_this->water_surface_y - 100.0f)) { + sp150.y = (i_this->water_surface_y - 100.0f); } sp174.x = 0.0f; - sp174.y = 100.0f * i_this->field_0x1410; - sp174.z = 200.0f * i_this->field_0x1410; + sp174.y = 100.0f * i_this->camera_morf_rate; + sp174.z = 200.0f * i_this->camera_morf_rate; MtxPosition(&sp174, &sp168); sp150 += i_this->field_0x1434; @@ -4667,7 +4716,7 @@ static void play_camera(dmg_rod_class* i_this) { cLib_addCalc2(&i_this->play_cam_center.z, sp150.z, 0.15f + NREG_F(4), fabsf(sp168.z)); } - cLib_addCalc2(&i_this->field_0x1410, 1.0f, 1.0f, 0.05f + NREG_F(8)); + cLib_addCalc2(&i_this->camera_morf_rate, 1.0f, 1.0f, 0.05f + NREG_F(8)); cLib_addCalc2(&i_this->field_0x1434.x, i_this->field_0x1440.x, 1.0f, (5.0f + YREG_F(17)) * i_this->field_0x1414); cLib_addCalc2(&i_this->field_0x1434.y, i_this->field_0x1440.y, 1.0f, (5.0f + YREG_F(17)) * i_this->field_0x1414); cLib_addCalc2(&i_this->field_0x1434.z, i_this->field_0x1440.z, 1.0f, (5.0f + YREG_F(17)) * i_this->field_0x1414); @@ -4725,7 +4774,7 @@ static void play_camera(dmg_rod_class* i_this) { cLib_addCalc2(&i_this->play_cam_fovy, 40.0f + DREG_F(6), 0.05f, 1.0f); - f32 sp2C = -20.0f + (20.0f * cM_ssin(i_this->field_0x578 * 700)); + f32 sp2C = -20.0f + (20.0f * cM_ssin(i_this->counter * 700)); actor->eyePos.y = actor->current.pos.y + sp2C; if (TREG_S(7) != 0) { camera_class* sp28 = dComIfGp_getCamera(0); @@ -4762,7 +4811,7 @@ static void play_camera(dmg_rod_class* i_this) { i_this->play_cam_mode = 2; i_this->play_cam_timer = 20; i_this->field_0x1418 = daAlink_getAlinkActorClass()->shape_angle.y; - i_this->field_0x1410 = 0.0f; + i_this->camera_morf_rate = 0.0f; camera->mCamera.SetTrimSize(1); } @@ -4797,7 +4846,7 @@ static void play_camera(dmg_rod_class* i_this) { cLib_addCalc2(&i_this->play_cam_center.y, sp150.y, 0.1f, 10.0f); cLib_addCalc2(&i_this->play_cam_center.z, sp150.z, 0.1f, 10.0f); } - + if (i_this->timers[2] != 0) { i_this->play_cam_timer = 15; } @@ -4834,7 +4883,7 @@ static void play_camera(dmg_rod_class* i_this) { cLib_addCalc2(&i_this->play_cam_fovy, 40.0f + DREG_F(6), 0.05f, 1.0f); if (i_this->play_cam_timer >= BREG_S(7) + 24) { - cLib_addCalc0(&i_this->field_0x1410, 1.0f, 20.0f); + cLib_addCalc0(&i_this->camera_morf_rate, 1.0f, 20.0f); if (i_this->play_cam_timer == 35) { mDoAud_seStart(Z2SE_AL_FISH_CATCH, NULL, 0, 0); } @@ -4852,7 +4901,7 @@ static void play_camera(dmg_rod_class* i_this) { camera->mCamera.Stop(); i_this->play_cam_mode = 901; i_this->play_cam_timer = 0; - i_this->field_0x146d = 0; + i_this->msg_flow_state = 0; i_this->play_cam_fovy = dComIfGd_getView()->fovy; camera->mCamera.SetTrimSize(1); @@ -4910,8 +4959,8 @@ static void play_camera(dmg_rod_class* i_this) { actor->attention_info.position = actor->eyePos; if (i_this->play_cam_timer >= 10) { - if (i_this->field_0x146d == 0) { - i_this->field_0x146d = 1; + if (i_this->msg_flow_state == 0) { + i_this->msg_flow_state = 1; if (henna->field_0x7d5 != 0 && (henna->field_0x7d6 == 0 || (i_this->field_0x1472 & 3) == 0)) { i_this->msgflow.init(actor, 0x3C3, 0, NULL); henna->field_0x7d5 = 0; @@ -4955,8 +5004,8 @@ static void play_camera(dmg_rod_class* i_this) { dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); i_this->play_cam_mode = 0; - i_this->field_0x146c = 30; - i_this->field_0x146d = 0; + i_this->input_cooldown = 30; + i_this->msg_flow_state = 0; } } break; @@ -4990,7 +5039,7 @@ static void play_camera(dmg_rod_class* i_this) { static f32 old_stick_sx = 0.0f; if ( - (mDoCPd_c::getStickX3D(PAD_1) >= 0.8f && old_stick_x < 0.8f) || (mDoCPd_c::getStickX3D(PAD_1) <= -0.8f && old_stick_x > -0.8f) + (mDoCPd_c::getStickX3D(PAD_1) >= 0.8f && old_stick_x < 0.8f) || (mDoCPd_c::getStickX3D(PAD_1) <= -0.8f && old_stick_x > -0.8f) #if VERSION != VERSION_SHIELD_DEBUG || (mDoCPd_c::getSubStickX3D(PAD_1) >= 0.8f && old_stick_sx < 0.8f) || (mDoCPd_c::getSubStickX3D(PAD_1) <= -0.8f && old_stick_sx > -0.8f) #endif @@ -5103,7 +5152,7 @@ static void play_camera(dmg_rod_class* i_this) { camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); i_this->play_cam_mode = 0; - i_this->field_0x146c = 30; + i_this->input_cooldown = 30; } } break; @@ -5164,7 +5213,7 @@ static void play_camera(dmg_rod_class* i_this) { camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); i_this->play_cam_mode = 0; - i_this->field_0x146c = 30; + i_this->input_cooldown = 30; } break; case 1055: @@ -5173,7 +5222,7 @@ static void play_camera(dmg_rod_class* i_this) { dComIfGp_event_reset(); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); - i_this->field_0x146c = 30; + i_this->input_cooldown = 30; i_this->play_cam_mode = 0; } else { dStage_changeScene(2, 0.0f, 0, 0, 0, -1); @@ -5193,7 +5242,7 @@ static void play_camera(dmg_rod_class* i_this) { camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); i_this->play_cam_mode = 0; - i_this->field_0x146c = 30; + i_this->input_cooldown = 30; dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[466]); i_this->field_0xf81 = 1; } @@ -5263,6 +5312,7 @@ static void play_camera_u(dmg_rod_class* i_this) { int sp18 = 0; int sp14 = 0; + f32 var_f31; switch (i_this->play_cam_mode) { case 0: break; @@ -5272,13 +5322,13 @@ static void play_camera_u(dmg_rod_class* i_this) { i_this->play_cam_timer = 0; dMw_offMenuRing(); i_this->play_cam_fovy = 55.0f; - + camera_class* sp10 = (camera_class*)dComIfGp_getCamera(0); camera->mCamera.SetTrimSize(1); i_this->play_cam_eye = sp10->lookat.eye; i_this->play_cam_center = sp10->lookat.center; - i_this->field_0x1410 = 1000.0f; + i_this->camera_morf_rate = 1000.0f; } /* fallthrough */ case 2: @@ -5303,7 +5353,6 @@ static void play_camera_u(dmg_rod_class* i_this) { MtxPosition(&spCC, &spC0); spB4 += spC0; - f32 var_f31; if (i_this->play_cam_timer < 10) { var_f31 = 200.0f; } else { @@ -5325,7 +5374,7 @@ static void play_camera_u(dmg_rod_class* i_this) { spCC.z = -170.0f + WREG_F(1); MtxPosition(&spCC, &i_this->play_cam_eye_target); i_this->play_cam_eye_target += player->current.pos; - + cMtx_YrotS(*calc_mtx, player->shape_angle.y); spCC.x = 0.0f; spCC.y = 200.0f + (50.0f + WREG_F(11)); @@ -5340,14 +5389,14 @@ static void play_camera_u(dmg_rod_class* i_this) { i_this->play_cam_center_speed.y = fabsf(i_this->play_cam_center_target.y - i_this->play_cam_center.y); i_this->play_cam_center_speed.z = fabsf(i_this->play_cam_center_target.z - i_this->play_cam_center.z); - i_this->field_0x1410 = 0.0f; + i_this->camera_morf_rate = 0.0f; i_this->play_cam_mode = 4; i_this->play_cam_timer = 0; daAlink_getAlinkActorClass()->fishingCastWaitAnimeStart(); /* fallthrough */ case 4: cam_3d_morf(i_this, 0.1f); - cLib_addCalc2(&i_this->field_0x1410, 0.1f, 1.0f, 0.02f); + cLib_addCalc2(&i_this->camera_morf_rate, 0.1f, 1.0f, 0.02f); if (i_this->play_cam_timer > 10) { i_this->play_cam_mode = 2; @@ -5364,8 +5413,8 @@ static void play_camera_u(dmg_rod_class* i_this) { i_this->play_cam_eye_target += player->current.pos; i_this->play_cam_center_target = i_this->hook_pos; - if (i_this->play_cam_center_target.y < i_this->field_0x590) { - i_this->play_cam_center_target.y = i_this->field_0x590; + if (i_this->play_cam_center_target.y < i_this->water_surface_y) { + i_this->play_cam_center_target.y = i_this->water_surface_y; } i_this->play_cam_eye_speed.x = fabsf(i_this->play_cam_eye_target.x - i_this->play_cam_eye.x); @@ -5375,33 +5424,35 @@ static void play_camera_u(dmg_rod_class* i_this) { i_this->play_cam_center_speed.y = fabsf(i_this->play_cam_center_target.y - i_this->play_cam_center.y); i_this->play_cam_center_speed.z = fabsf(i_this->play_cam_center_target.z - i_this->play_cam_center.z); - i_this->field_0x1410 = 0.0f; + i_this->camera_morf_rate = 0.0f; i_this->play_cam_mode = 6; i_this->play_cam_timer = 0; /* fallthrough */ case 6: cam_3d_morf(i_this, 0.1f); - cLib_addCalc2(&i_this->field_0x1410, 0.1f, 1.0f, 0.01f); + cLib_addCalc2(&i_this->camera_morf_rate, 0.1f, 1.0f, 0.01f); if (i_this->play_cam_timer > AREG_S(3) + 20) { i_this->play_cam_mode = 7; } - goto block_41; // fakematch? whats going on here - case 7: { - spA8 = i_this->hook_pos; - spA8.y += 20.0f + AREG_F(11); - if (spA8.y < i_this->field_0x590) { - spA8.y = i_this->field_0x590; - } - spA8.y = (spA8.y + ((0.1f + hREG_F(13)) * (player->current.pos.y - i_this->hook_pos.y))); + // possible fakematch? the alternative is a goto statement + if (false) { + case 7: { + spA8 = i_this->hook_pos; + spA8.y += 20.0f + AREG_F(11); + if (spA8.y < i_this->water_surface_y) { + spA8.y = i_this->water_surface_y; + } + f32 var_f30 = (0.1f + hREG_F(13)) * (player->current.pos.y - i_this->hook_pos.y); + spA8.y = (spA8.y + var_f30); - f32 temp_f31 = 5.0f; - cLib_addCalc2(&i_this->play_cam_center.x, spA8.x, 0.1f, temp_f31); - cLib_addCalc2(&i_this->play_cam_center.y, spA8.y, 0.1f, temp_f31); - cLib_addCalc2(&i_this->play_cam_center.z, spA8.z, 0.1f, temp_f31); - // fallthrough - } - block_41: { + var_f31 = 5.0f; + cLib_addCalc2(&i_this->play_cam_center.x, spA8.x, 0.1f, var_f31); + cLib_addCalc2(&i_this->play_cam_center.y, spA8.y, 0.1f, var_f31); + cLib_addCalc2(&i_this->play_cam_center.z, spA8.z, 0.1f, var_f31); + // fallthrough + } + } if (nREG_S(6) == (int)daAlink_getAlinkActorClass()->getFishingReelFrame()) { daAlink_getAlinkActorClass()->fishingCastWaitAnimeStop(); } @@ -5418,7 +5469,6 @@ static void play_camera_u(dmg_rod_class* i_this) { cLib_addCalc2(&i_this->play_cam_fovy, i_this->field_0x140c, 0.05f, 2.0f); break; - } case 10: daAlink_getAlinkActorClass()->fishingCastWaitAnimeStop(); i_this->play_cam_mode = 11; @@ -5432,18 +5482,18 @@ static void play_camera_u(dmg_rod_class* i_this) { spB4 += player->current.pos; spA8 = actor->current.pos; - f32 temp_f31_2 = 50.0f + ZREG_F(19); - cLib_addCalc2(&i_this->play_cam_eye.x, spB4.x, 0.2f, temp_f31_2); - cLib_addCalc2(&i_this->play_cam_eye.y, spB4.y, 0.2f, temp_f31_2); - cLib_addCalc2(&i_this->play_cam_eye.z, spB4.z, 0.2f, temp_f31_2); - cLib_addCalc2(&i_this->play_cam_center.x, spA8.x, 0.05f, temp_f31_2); - cLib_addCalc2(&i_this->play_cam_center.y, 200.0f + (i_this->field_0x590 + ZREG_F(14)), 0.05f, temp_f31_2); - cLib_addCalc2(&i_this->play_cam_center.z, spA8.z, 0.05f, temp_f31_2); + var_f31 = 50.0f + ZREG_F(19); + cLib_addCalc2(&i_this->play_cam_eye.x, spB4.x, 0.2f, var_f31); + cLib_addCalc2(&i_this->play_cam_eye.y, spB4.y, 0.2f, var_f31); + cLib_addCalc2(&i_this->play_cam_eye.z, spB4.z, 0.2f, var_f31); + cLib_addCalc2(&i_this->play_cam_center.x, spA8.x, 0.05f, var_f31); + cLib_addCalc2(&i_this->play_cam_center.y, 200.0f + (i_this->water_surface_y + ZREG_F(14)), 0.05f, var_f31); + cLib_addCalc2(&i_this->play_cam_center.z, spA8.z, 0.05f, var_f31); cLib_addCalc2(&i_this->play_cam_fovy, 55.0f, 0.1f, 10.0f); break; } case 20: - case 21: { + case 21: if (!actor->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(actor, 2, 0xFFFF, 0); actor->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -5461,9 +5511,9 @@ static void play_camera_u(dmg_rod_class* i_this) { MtxPosition(&spCC, &spB4); spB4 += player->current.pos; - cLib_addCalc2(&i_this->play_cam_eye.x, spB4.x, 0.2f, 100.0f * i_this->field_0x1410); - cLib_addCalc2(&i_this->play_cam_eye.y, spB4.y, 0.2f, 100.0f * i_this->field_0x1410); - cLib_addCalc2(&i_this->play_cam_eye.z, spB4.z, 0.2f, 100.0f * i_this->field_0x1410); + cLib_addCalc2(&i_this->play_cam_eye.x, spB4.x, 0.2f, 100.0f * i_this->camera_morf_rate); + cLib_addCalc2(&i_this->play_cam_eye.y, spB4.y, 0.2f, 100.0f * i_this->camera_morf_rate); + cLib_addCalc2(&i_this->play_cam_eye.z, spB4.z, 0.2f, 100.0f * i_this->camera_morf_rate); spCC.x = 0.0f; spCC.y = 0.0f; @@ -5475,12 +5525,12 @@ static void play_camera_u(dmg_rod_class* i_this) { camera->mCamera.SetTrimSize(1); } - cLib_addCalc2(&i_this->play_cam_center.x, spA8.x, 0.2f, 100.0f * i_this->field_0x1410); - cLib_addCalc2(&i_this->play_cam_center.y, spA8.y, 0.2f, 100.0f * i_this->field_0x1410); - cLib_addCalc2(&i_this->play_cam_center.z, spA8.z, 0.2f, 100.0f * i_this->field_0x1410); + cLib_addCalc2(&i_this->play_cam_center.x, spA8.x, 0.2f, 100.0f * i_this->camera_morf_rate); + cLib_addCalc2(&i_this->play_cam_center.y, spA8.y, 0.2f, 100.0f * i_this->camera_morf_rate); + cLib_addCalc2(&i_this->play_cam_center.z, spA8.z, 0.2f, 100.0f * i_this->camera_morf_rate); if (i_this->play_cam_timer > 5) { - cLib_addCalc2(&i_this->field_0x1410, 1.0f, 1.0f, 0.02f + NREG_F(8)); + cLib_addCalc2(&i_this->camera_morf_rate, 1.0f, 1.0f, 0.02f + NREG_F(8)); cLib_addCalc2(&i_this->play_cam_fovy, 55.0f, 0.05f, 1.0f); } @@ -5592,12 +5642,11 @@ static void play_camera_u(dmg_rod_class* i_this) { i_this->field_0x10a5 = 0; daAlink_getAlinkActorClass()->endFishingCastWait(); i_this->field_0x1094 = 0.0f; - i_this->field_0x6e0 = 0.0f; + i_this->cast_momentum = 0.0f; i_this->field_0xf64 = -30.0f; daAlink_getAlinkActorClass()->changeFishGetFace(0); } break; - } case 90: sp18 = 1; break; @@ -5628,7 +5677,7 @@ static void play_camera_u(dmg_rod_class* i_this) { } break; } - + if (sp18 != 0) { cMtx_YrotS(*calc_mtx, player->shape_angle.y); spCC.x = 0.0f; @@ -5705,7 +5754,8 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { dComIfGp_getVibration().StartShock(i_this->vibmode, 1, cXyz(0.0f, 1.0f, 0.0f)); } - if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0) {} + if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0 && i_this->kind == 0) { + } henna = (npc_henna_class*)fopAcM_SearchByName(PROC_NPC_HENNA); if (henna != NULL && henna->field_0x734 != 0) { @@ -5740,7 +5790,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { i_this->field_0xf6e = 0; - if (0.0f != i_this->field_0x590 && (g_Counter.mTimer & 15) == 0) { + if (0.0f != i_this->water_surface_y && (g_Counter.mTimer & 15) == 0) { dBgS_ObjGndChk_Spl gnd_chk_spl; Vec pos; @@ -5748,10 +5798,11 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { pos.y = 500.0f + actor->current.pos.y; pos.z = actor->current.pos.z; gnd_chk_spl.SetPos(&pos); - i_this->field_0x590 = dComIfG_Bgsp().GroundCross(&gnd_chk_spl); + f32 groundCross = dComIfG_Bgsp().GroundCross(&gnd_chk_spl); + i_this->water_surface_y = groundCross; } - i_this->field_0x578++; + i_this->counter++; for (int i = 0; i < 10; i++) { if (i_this->timers[i] != 0) { @@ -5763,12 +5814,12 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { i_this->field_0x1009--; } - if (i_this->field_0x1165 != 0) { - i_this->field_0x1165--; + if (i_this->cast_bob_timer != 0) { + i_this->cast_bob_timer--; } - if (i_this->field_0x146c != 0) { - i_this->field_0x146c--; + if (i_this->input_cooldown != 0) { + i_this->input_cooldown--; } if (i_this->field_0x1514 != 0) { @@ -5798,6 +5849,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { } } + s16 spC; s16 spA = 0; if (i_this->action <= ACTION_LURE_STANDBY) { spA = -0x4000; @@ -5815,12 +5867,12 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { } else { spF0 = sp118[i] - sp118[i - 1]; - s16 spC = -cM_atan2s(spF0.y, JMAFastSqrt(SQUARE(spF0.x) + SQUARE(spF0.z))); + spC = -cM_atan2s(spF0.y, JMAFastSqrt(SQUARE(spF0.x) + SQUARE(spF0.z))); if (abs(spC) < 0x3800) { i_this->field_0x71c[i].y = cM_atan2s(spF0.x, spF0.z); i_this->field_0x71c[i].x = spC; - spC = i_this->field_0x71c[i].y - i_this->field_0x6c4; + spC = i_this->field_0x71c[i].y - i_this->rod_angle_y; if (spC < 0x4000 && spC > -0x4000) { spC = 0; } else { @@ -5848,8 +5900,8 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { for (int i = 0; i < 6; i++) { MtxTrans(sp118[i].x, sp118[i].y, sp118[i].z, 0); - f32 temp_f30 = (0.9f + XREG_F(2)) * rodline_off[i]; - MtxScale(temp_f30, temp_f30, temp_f30, 1); + f32 scale = (0.9f + XREG_F(2)) * rodline_off[i]; + MtxScale(scale, scale, scale, 1); if (i == 0) { cMtx_YrotM(*calc_mtx, i_this->field_0x71c[1].y); @@ -5869,7 +5921,7 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { play_camera(i_this); } else if (i_this->kind == MG_ROD_KIND_UKI) { f32 var_f31; - if (fabsf(i_this->hook_pos.y - i_this->field_0x590) < 30.0f) { + if (fabsf(i_this->hook_pos.y - i_this->water_surface_y) < 30.0f) { var_f31 = (25.0f + (6.0f + BREG_F(17))) * cM_ssin(i_this->field_0x1084.x); if (var_f31 > 0.0f) { var_f31 = 0.0f; @@ -5942,22 +5994,22 @@ static int dmg_rod_Execute(dmg_rod_class* i_this) { spD8.y = XREG_F(1) - 27.0f; spD8.z = XREG_F(2) - 3.0f; MtxPosition(&spD8, &obj_life->current.pos); - obj_life->current.pos.y += i_this->field_0x1410; + obj_life->current.pos.y += i_this->camera_morf_rate; actor->eyePos = obj_life->current.pos; - actor->eyePos.y += -20.0f + (20.0f * cM_ssin(i_this->field_0x578 * 700)); + f32 var_f27 = -20.0f + (20.0f * cM_ssin(i_this->counter * 700)); + actor->eyePos.y += var_f27; - obj_life->shape_angle.x = 0; - obj_life->shape_angle.z = 0; + obj_life->shape_angle.z = obj_life->shape_angle.x = 0; } else { obj_life->current.pos = actor->current.pos; obj_life->current.pos.y -= 15.0f + JREG_F(7); - + fopAc_ac_c* player = dComIfGp_getPlayer(0); cLib_addCalcAngleS2(&obj_life->shape_angle.y, daAlink_getAlinkActorClass()->getFishingRodAngleY(), 8, 0x200); - obj_life->shape_angle.z = 500.0f * cM_ssin(i_this->field_0x578 * 1300); + obj_life->shape_angle.z = 500.0f * cM_ssin(i_this->counter * 1300); - s16 sp8 = 500.0f * cM_ssin(i_this->field_0x578 * 1100); + s16 sp8 = 500.0f * cM_ssin(i_this->counter * 1100); if (i_this->reel_btn_flags != 0) { sp8 += (s16)0x2000; } @@ -6024,10 +6076,12 @@ static int dmg_rod_Delete(dmg_rod_class* i_this) { return 1; } +static void dummy_report_str_1() { + OS_REPORT("Delete -> Mg_rod(id=%d)\n"); +} + static int useHeapInit(fopAc_ac_c* i_this) { dmg_rod_class* a_this = (dmg_rod_class*)i_this; - int bmd_idx; - u32 mdlflg; J3DModel* model; J3DModelData* modelData; f32* line_sizep; @@ -6044,11 +6098,17 @@ static int useHeapInit(fopAc_ac_c* i_this) { } for (int i = 0; i < 5; i++) { + u32 mdlflg; + static int lure_bmd[] = {6, 7, 8, 10, 13}; modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->arcname, lure_bmd[i]); JUT_ASSERT(11397, modelData != NULL); - mdlflg = i == 4 ? 0 : J3DMdlFlag_DifferedDLBuffer; + if (i == 4) { + mdlflg = 0; + } else { + mdlflg = J3DMdlFlag_DifferedDLBuffer; + } a_this->lure_model[i] = mDoExt_J3DModel__create(modelData, mdlflg, 0x11000084); if (a_this->lure_model[i] == NULL) { return 0; @@ -6098,7 +6158,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (a_this->rod_modelMorf == NULL || a_this->rod_modelMorf->getModel() == NULL) { return 0; } - + model = a_this->rod_modelMorf->getModel(); model->setUserArea((uintptr_t)a_this); for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) { @@ -6117,6 +6177,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } } + int bmd_idx; for (int i = 0; i < 15; i++) { if ((i & 1) || i == 2) { bmd_idx = 41; @@ -6200,41 +6261,41 @@ static int useHeapInit(fopAc_ac_c* i_this) { } static int dmg_rod_Create(fopAc_ac_c* i_this) { - dmg_rod_class* a_this = (dmg_rod_class*)i_this; - fopAcM_ct(i_this, dmg_rod_class); + dmg_rod_class* rod = (dmg_rod_class*)i_this; + fopAcM_ct(&rod->actor, dmg_rod_class); - a_this->arg0 = fopAcM_GetParam(i_this); - a_this->arg1 = (fopAcM_GetParam(i_this) & 0xFF00) >> 8; - a_this->arg2 = (fopAcM_GetParam(i_this) & 0xFF0000) >> 0x10; + rod->arg0 = fopAcM_GetParam(i_this); + rod->arg1 = (fopAcM_GetParam(i_this) & 0xFF00) >> 8; + rod->arg2 = (fopAcM_GetParam(i_this) & 0xFF0000) >> 0x10; fopAc_ac_c* player = dComIfGp_getPlayer(0); - - if (a_this->arg0 == 0xF) { - a_this->arg0 = 13; + + if (rod->arg0 == 0xF) { + rod->arg0 = 13; } if (daAlink_getAlinkActorClass()->checkCanoeRide()) { - a_this->arg0 = 13; - a_this->arg1 = 0; + rod->arg0 = 13; + rod->arg1 = 0; } - if (a_this->arg0 == 13) { + if (rod->arg0 == 13) { if (strcmp(dComIfGp_getStartStageName(), "T_MUKAO") == 0 && fopAcM_GetRoomNo(player) == 4) { - a_this->arg1 = 1; - a_this->arg0 = KREG_S(8) + 29; + rod->arg1 = 1; + rod->arg0 = KREG_S(8) + 29; } } - a_this->field_0x6a0 = a_this->arg0; + rod->field_0x6a0 = rod->arg0; u32 heap_size; - if (a_this->arg1 == 0) { - a_this->kind = MG_ROD_KIND_LURE; - a_this->arcname = "Mg_rod"; + if (rod->arg1 == 0) { + rod->kind = MG_ROD_KIND_LURE; + rod->arcname = "Mg_rod"; heap_size = 0x15FE0; } else { - a_this->kind = MG_ROD_KIND_UKI; - a_this->arcname = "Alink"; + rod->kind = MG_ROD_KIND_UKI; + rod->arcname = "Alink"; heap_size = 0xC9A0; } @@ -6258,7 +6319,7 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) { data_804BBBD4 = 1; #endif - int phase_state = dComIfG_resLoad(&a_this->phase, a_this->arcname); + int phase_state = dComIfG_resLoad(&rod->phase, rod->arcname); if (phase_state == cPhs_COMPLEATE_e) { OS_REPORT("MG_ROD PARAM %x\n", fopAcM_GetParam(i_this)); OS_REPORT("MG_ROD//////////////MG_ROD SET 1 !!\n"); @@ -6270,35 +6331,35 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) { OS_REPORT("//////////////MG_ROD SET 2 !!\n"); if (!hio_set) { - a_this->HIOInit = TRUE; + rod->HIOInit = TRUE; hio_set = TRUE; l_HIO.id = mDoHIO_CREATE_CHILD("釣りシステム", &l_HIO); } - a_this->acch.Set(fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this), i_this, 1, &a_this->acchcir, fopAcM_GetSpeed_p(i_this), NULL, NULL); - a_this->acchcir.SetWall(10.0f, 10.0f); + rod->acch.Set(fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this), i_this, 1, &rod->acchcir, fopAcM_GetSpeed_p(i_this), NULL, NULL); + rod->acchcir.SetWall(10.0f, 10.0f); if (strcmp(dComIfGp_getStartStageName(), "F_SP127") != 0) { - a_this->field_0x590 = -50000.0f; + rod->water_surface_y = -50000.0f; } - a_this->sound.init(&i_this->current.pos, &i_this->current.pos, 3, 1); - a_this->field_0x1165 = 20; + rod->sound.init(&i_this->current.pos, &i_this->current.pos, 3, 1); + rod->cast_bob_timer = 20; - fopAc_ac_c* boat_actor = (fopAc_ac_c*)fpcM_Search(s_boat_sub, i_this); - a_this->boat_actor_id = fopAcM_GetID(boat_actor); + fopAc_ac_c* boat_actor = (fopAc_ac_c*)fpcM_Search(s_boat_sub, rod); + rod->boat_actor_id = fopAcM_GetID(boat_actor); - if (a_this->kind == MG_ROD_KIND_UKI) { + if (rod->kind == MG_ROD_KIND_UKI) { fopAcM_setStageLayer(i_this); fopAc_ac_c* sp18 = dComIfGp_getPlayer(0); - a_this->action = ACTION_UKI_READY; - a_this->hook_pos = sp18->current.pos; - a_this->hook_pos.y += 200.0f; - i_this->current.pos = a_this->hook_pos; - a_this->field_0x1094 = 200.0f; - a_this->timers[0] = 5; - a_this->timers[3] = 5; + rod->action = ACTION_UKI_READY; + rod->hook_pos = sp18->current.pos; + rod->hook_pos.y += 200.0f; + i_this->current.pos = rod->hook_pos; + rod->field_0x1094 = 200.0f; + rod->timers[0] = 5; + rod->timers[3] = 5; static dCcD_SrcSph cc_sph_src = { { @@ -6312,20 +6373,20 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) { } // mSphAttr }; - a_this->ccStts.Init(10, 0, i_this); - a_this->ccSph.Set(cc_sph_src); - a_this->ccSph.SetStts(&a_this->ccStts); + rod->ccStts.Init(10, 0, i_this); + rod->ccSph.Set(cc_sph_src); + rod->ccSph.SetStts(&rod->ccStts); - a_this->field_0x6a8 = 15; + rod->field_0x6a8 = 15; } else { if (boat_actor != NULL) { - a_this->action = ACTION_LURE_ONBOAT; + rod->action = ACTION_LURE_ONBOAT; } else { - a_this->action = ACTION_LURE_STANDBY; + rod->action = ACTION_LURE_STANDBY; } - a_this->timers[1] = 20; - a_this->field_0xf81 = a_this->lure_type = MG_LURE_PE; + rod->timers[1] = 20; + rod->field_0xf81 = rod->lure_type = MG_LURE_PE; u8 lure_ct = dComIfGs_getEventReg(0xF11F) & 0xFF; OS_REPORT(" SP LURE CT %d\n", lure_ct); @@ -6334,11 +6395,11 @@ static int dmg_rod_Create(fopAc_ac_c* i_this) { dComIfGs_setEventReg(0xF11F, lure_ct); } - a_this->field_0x6a4 = 1.0f; + rod->field_0x6a4 = 1.0f; } OS_REPORT("//////////////MG_ROD SET 3 !!\n"); - dmg_rod_Execute(a_this); + dmg_rod_Execute(rod); } return phase_state; diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index 08d6ab6108..a981119eb0 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -135,7 +135,7 @@ static void df_fly(npc_df_class* i_this, df_s* df_p) { df_p->field_0x72 = cM_rndF(5.0f) + 5.0f; if (df_p->field_0x77 == 0 && df_p->field_0x6c > 2000 && lrl != NULL) { - if (lrl->field_0x6ac.y < player->eyePos.y + 80.0f) { + if (lrl->rod_tip_pos.y < player->eyePos.y + 80.0f) { if (lrl->kind == 0 || (lrl->kind != 0 && lrl->play_cam_mode == 7)) { df_p->field_0x74 = 2; df_p->field_0x75 = 0; @@ -200,7 +200,7 @@ static void df_rod(npc_df_class* i_this, df_s* df_p) { } if (df_p->field_0x2c.y < 50.0f) { - cLib_addCalcAngleS2(&df_p->field_0x44.y, lrl->field_0x6c4 + df_p->field_0x6e, 4, 0x400); + cLib_addCalcAngleS2(&df_p->field_0x44.y, lrl->rod_angle_y + df_p->field_0x6e, 4, 0x400); } else { if (fabsf(df_p->field_0x2c.x) > 10.0f && fabsf(df_p->field_0x2c.z) > 10.0f) { cLib_addCalcAngleS2(&df_p->field_0x44.y, cM_atan2s(-df_p->field_0x2c.x, -df_p->field_0x2c.z), 4, 0x400); @@ -214,12 +214,12 @@ static void df_rod(npc_df_class* i_this, df_s* df_p) { df_p->field_0x38.z = 0.0f; df_p->field_0x38.x = 0.0f; df_p->field_0x38.y = 5.0f; - cLib_addCalcAngleS2(&df_p->field_0x44.y, lrl->field_0x6c4 + df_p->field_0x6e, 2, 0x800); + cLib_addCalcAngleS2(&df_p->field_0x44.y, lrl->rod_angle_y + df_p->field_0x6e, 2, 0x800); } cXyz sp54(lrl->mg_rod.field_0x0[df_p->field_0x7b] + ((lrl->mg_rod.field_0x0[df_p->field_0x7b + 1] - lrl->mg_rod.field_0x0[df_p->field_0x7b]) * df_p->field_0x64)); - if ((i_this->field_0xd34 - lrl->mg_rod.field_0x0[8]).abs() > 5.0f || lrl->field_0x6ac.y > player->eyePos.y + 80.0f) { + if ((i_this->field_0xd34 - lrl->mg_rod.field_0x0[8]).abs() > 5.0f || lrl->rod_tip_pos.y > player->eyePos.y + 80.0f) { df_p->field_0x74 = 1; df_p->field_0x4a.y += (int)cM_rndFX(8192.0f); df_p->field_0x44.x = df_p->field_0x4a.x = -8192.0f - cM_rndF(4096.0f); diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 072a3be72f..b2c0a8e450 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -601,7 +601,7 @@ static void henna_ride(npc_henna_class* i_this) { lookat_pos.y = 0.0f; lookat_pos.z = -100.0f + VREG_F(8); MtxPosition(&lookat_pos, &pos); - pos.y = lrl->field_0x590; + pos.y = lrl->water_surface_y; f32 unkFloat1; if (i_this->mAnmResIndex == 7) { unkFloat1 = 22.0f; @@ -630,7 +630,7 @@ static void henna_ride(npc_henna_class* i_this) { i_this->field_0x70d = 10; } - if ((lrl != NULL && lrl->field_0x146d != 0) || i_this->field_0x7b8 != 0 || + if ((lrl != NULL && lrl->msg_flow_state != 0) || i_this->field_0x7b8 != 0 || dComIfGp_checkPlayerStatus0(0, 0x2000) != 0) { i_this->field_0x70d = 2; From 27b8eb1049f842f5928bb6c027fac34901432dd8 Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Wed, 24 Dec 2025 16:54:21 -0800 Subject: [PATCH 12/35] msl_c mostly matching for wii/shield (#2994) --- config/ShieldD/splits.txt | 3 +- configure.py | 7 +- include/global.h | 7 +- src/JSystem/JKernel/JKRFileLoader.cpp | 13 +- .../MSL/MSL_C++/MSL_Common/Include/cstdint.h | 2 + .../MSL/MSL_C/MSL_Common/Include/ansi_files.h | 6 +- .../MSL/MSL_C/MSL_Common/Include/cmath.h | 72 +- .../MSL_Common/Include/critical_regions.h | 10 +- .../MSL/MSL_C/MSL_Common/Include/ctype.h | 137 +++- .../MSL/MSL_C/MSL_Common/Include/errno.h | 2 + .../MSL/MSL_C/MSL_Common/Include/float.h | 17 + .../MSL/MSL_C/MSL_Common/Include/locale.h | 114 +++ .../MSL/MSL_C/MSL_Common/Include/mbstring.h | 3 + .../MSL/MSL_C/MSL_Common/Include/strtold.h | 15 + .../MSL/MSL_C/MSL_Common/Include/strtoul.h | 2 + .../MSL/MSL_C/MSL_Common/Include/wctype_api.h | 32 + .../MSL/MSL_C/MSL_Common/Include/wstring.h | 21 + .../MSL/MSL_C/MSL_Common/Src/FILE_POS.c | 54 +- .../MSL/MSL_C/MSL_Common/Src/alloc.c | 52 +- .../MSL/MSL_C/MSL_Common/Src/ansi_files.c | 2 + .../MSL/MSL_C/MSL_Common/Src/arith.c | 4 + .../MSL/MSL_C/MSL_Common/Src/char_io.c | 41 +- .../MSL/MSL_C/MSL_Common/Src/ctype.c | 89 +- .../MSL/MSL_C/MSL_Common/Src/direct_io.c | 22 + .../MSL/MSL_C/MSL_Common/Src/extras.c | 4 +- .../MSL/MSL_C/MSL_Common/Src/file_io.c | 4 +- .../MSL/MSL_C/MSL_Common/Src/float.c | 7 +- .../MSL/MSL_C/MSL_Common/Src/locale.c | 122 +++ .../MSL/MSL_C/MSL_Common/Src/math_api.c | 51 ++ .../MSL/MSL_C/MSL_Common/Src/math_double.c | 7 + .../MSL/MSL_C/MSL_Common/Src/mbstring.c | 133 +-- .../MSL/MSL_C/MSL_Common/Src/mem.c | 16 +- .../MSL/MSL_C/MSL_Common/Src/mem_funcs.c | 12 + .../MSL/MSL_C/MSL_Common/Src/printf.c | 378 ++++++++- .../MSL/MSL_C/MSL_Common/Src/scanf.c | 769 ++++++++++++++++++ .../MSL/MSL_C/MSL_Common/Src/secure_error.c | 16 + .../MSL/MSL_C/MSL_Common/Src/signal.c | 10 +- .../MSL/MSL_C/MSL_Common/Src/string.c | 13 +- .../MSL/MSL_C/MSL_Common/Src/strtold.c | 663 +++++++++++++++ .../MSL/MSL_C/MSL_Common/Src/strtoul.c | 136 ++++ .../MSL/MSL_C/MSL_Common/Src/wchar_io.c | 41 +- .../MSL/MSL_C/MSL_Common/Src/wctype.c | 166 ++++ .../MSL/MSL_C/MSL_Common/Src/wstring.c | 44 + .../Math/Double_precision/e_acos.c | 5 + .../Math/Double_precision/e_asin.c | 5 + .../Math/Double_precision/e_fmod.c | 21 +- .../Math/Double_precision/e_log.c | 161 ++++ .../Math/Double_precision/e_log10.c | 99 +++ .../Math/Double_precision/e_pow.c | 617 +++++++------- .../Math/Double_precision/e_rem_pio2.c | 240 +++--- .../Math/Double_precision/k_rem_pio2.c | 2 +- .../Math/Double_precision/s_ldexp.c | 8 + .../Math/Double_precision/w_log10.c | 28 + .../MSL_Common_Embedded/Math/Include/fdlibm.h | 4 +- .../MSL_C/MSL_Common_Embedded/Src/ansi_fp.c | 168 +++- .../MSL_C/MSL_Common_Embedded/Src/math_sun.c | 13 + .../MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c | 0 .../MSL/MSL_C/PPC_EABI/Src/math_ppc.c | 2 + 58 files changed, 3997 insertions(+), 695 deletions(-) create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale.h create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c create mode 100644 src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index 65b2639c8d..4aa788274e 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -4609,7 +4609,7 @@ PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c: .sdata2 start:0x80752ED0 end:0x80752ED8 PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c: - .sdata start:0x8074C238 end:0x8074C24C + .sdata start:0x8074C238 end:0x8074C248 PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c: .text start:0x80621C6C end:0x80623150 @@ -4890,6 +4890,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c: NdevExi2AD/DebuggerDriver.c: .text start:0x8062ECBC end:0x8062F1EC + .sdata start:0x8074C248 end:0x8074C24C .sbss start:0x8074D728 end:0x8074D73C NdevExi2AD/exi2.c: diff --git a/configure.py b/configure.py index 1cdcf6c728..a749467ee5 100755 --- a/configure.py +++ b/configure.py @@ -306,10 +306,13 @@ cflags_runtime = [ "-str reuse,pool,readonly", "-common off", "-char signed", - # "-inline deferred,auto" + "-func_align 4", + "-DMSL_USE_INLINES=1", ] -if config.version not in ["ShieldD", "Shield"]: +if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "ShieldD", "Shield"]: + cflags_runtime.extend(["-ipa file", "-fp_contract off"]) +else: cflags_runtime.extend(["-inline deferred,auto"]) cflags_trk = [ diff --git a/include/global.h b/include/global.h index bd726e2e07..ab207f43d3 100644 --- a/include/global.h +++ b/include/global.h @@ -31,6 +31,8 @@ #define DEBUG 0 #endif +#define MSL_INLINE inline + #define ARRAY_SIZE(o) (s32)(sizeof(o) / sizeof(o[0])) #define ARRAY_SIZEU(o) (sizeof(o) / sizeof(o[0])) @@ -87,11 +89,6 @@ void* __memcpy(void*, const void*, int); #define POINTER_ADD(ptr_, offset_) POINTER_ADD_TYPE(__typeof__(ptr_), ptr_, offset_) // floating-point constants -#define _HUGE_ENUF 1e+300 -#define INFINITY ((float)(_HUGE_ENUF * _HUGE_ENUF)) -#define HUGE_VAL ((double)INFINITY) -#define HUGE_VALL ((long double)INFINITY) -#define DOUBLE_INF HUGE_VAL static const float INF = 2000000000.0f; // hack to make strings with no references compile properly diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp index 8a96cafceb..0fd148394e 100644 --- a/src/JSystem/JKernel/JKRFileLoader.cpp +++ b/src/JSystem/JKernel/JKRFileLoader.cpp @@ -1,6 +1,9 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRFileLoader.h" + +#define MSL_USE_INLINES 1 // needed to inline tolower call. not inlined elsewhere in the repo + #include "string.h" #include "ctype.h" #include "global.h" @@ -122,15 +125,7 @@ const char* JKRFileLoader::fetchVolumeName(char* buffer, s32 bufferSize, const c path++; while (*path != 0 && *path != '/') { if (1 < bufferSize) { - int lower_char; - int ch = (int)*path; - if (ch == -1) { - lower_char = -1; - } else { - lower_char = __lower_map[ch & 0xFF]; - } - - *buffer = lower_char; + *buffer = tolower(*path); buffer++; bufferSize--; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint.h index 5f6672b452..e9530a60b8 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint.h @@ -20,6 +20,8 @@ typedef long long int64_t; typedef uint32_t uintptr_t; typedef int32_t intptr_t; +typedef long long intmax_t; + #ifdef __cplusplus }; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h index 6ad791a935..ce7410884c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h @@ -28,9 +28,9 @@ enum __file_kinds { }; enum __file_orientation { - /* 0x0 */ UNORIENTED, - /* 0x1 */ CHAR_ORIENTED, - /* 0x2 */ WIDE_ORIENTED, + __unoriented, + __char_oriented, + __wide_oriented }; typedef struct _file_modes { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h index ad501c896f..78fd149109 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h @@ -6,6 +6,10 @@ #define NAN (*(float*) __float_nan) #define HUGE_VALF (*(float*) __float_huge) +#if !PLATFORM_GCN +#define HUGE_VAL (*(double*)__double_huge) +#endif + #define M_PI 3.14159265358979323846f #define M_SQRT3 1.73205f @@ -44,34 +48,65 @@ float sinf(float); double sqrt(double); double tan(double); float tanf(float); - -inline float expf(float x) { - return exp(x); -} - -inline float ceilf(float num) { - return ceil(num); -} +double log10(double); inline double fabs(double f) { return __fabs(f); } -inline float fabsf(float f) { - return (float)fabs((double)f); +inline long double fabsl(long double x) { + return fabs((double)x); } -inline float floorf(float num) { + + +MSL_INLINE float acosf(float x) { + return acos(x); +} + +MSL_INLINE float atan2f(float y, float x) { + return (float)atan2(y, x); +} + +MSL_INLINE float ceilf(float num) { + return ceil(num); +} + +MSL_INLINE float cosf(float x) { + return cos(x); +} + +MSL_INLINE float expf(float x) { + return exp(x); +} + +MSL_INLINE float floorf(float num) { return floor(num); } -inline float fmodf(float f1, float f2) { +MSL_INLINE float powf(float x, float y) { + return pow(x, y); +} + +MSL_INLINE float sinf(float x) { + return sin(x); +} + +MSL_INLINE float fabsf(float f) { + return (float)fabs((double)f); +} + +MSL_INLINE float fmodf(float f1, float f2) { return fmod(f1, f2); } +MSL_INLINE float log10f(float x) { + return log10(x); +} + #include "global.h" #if PLATFORM_WII || PLATFORM_SHIELD -inline float sqrtf(float mag) { +MSL_INLINE float sqrtf(float mag) { return sqrt(mag); } #else @@ -87,7 +122,7 @@ inline float sqrtf(float mag) { static double _half = 0.5; static double _three = 3.0; #endif -inline float sqrtf(float mag) { +MSL_INLINE float sqrtf(float mag) { #ifndef DECOMPCTX // part of the same hack, these are defined outside of the function when using decompctx static const double _half = 0.5; @@ -110,15 +145,10 @@ inline float sqrtf(float mag) { } #endif -inline float atan2f(float y, float x) { - return (float)atan2(y, x); +MSL_INLINE float tanf(float x) { + return tan(x); } -inline float sinf(float x) { return sin(x); } -inline float cosf(float x) { return cos(x); } -inline float tanf(float x) { return tan(x); } -inline float acosf(float x) { return acos(x); } - #ifdef __cplusplus }; #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h index a36c75d6c7..ed219e8d64 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/critical_regions.h @@ -1,6 +1,8 @@ #ifndef _MSL_COMMON_CRITICAL_REGIONS_H #define _MSL_COMMON_CRITICAL_REGIONS_H +#include "global.h" + #ifdef __cplusplus extern "C" { #endif @@ -20,11 +22,17 @@ enum critical_regions { void __init_critical_regions(void); void __kill_critical_regions(void); + +#if PLATFORM_GCN void __begin_critical_region(int region); void __end_critical_region(int region); +#else +#define __begin_critical_region(region) +#define __end_critical_region(region) +#endif #ifdef __cplusplus } #endif -#endif \ No newline at end of file +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h index 867dc71d91..a0f28e735c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h @@ -1,12 +1,15 @@ #ifndef _MSL_COMMON_CTYPE_H #define _MSL_COMMON_CTYPE_H +#include "global.h" + #ifdef __cplusplus extern "C" { #endif #define EOF -1L +#if PLATFORM_GCN extern unsigned char __ctype_map[]; extern unsigned char __lower_map[]; extern unsigned char __upper_map[]; @@ -28,19 +31,135 @@ extern unsigned char __upper_map[]; #define __control (__motion_char | __control_char) #define __zero_fill(c) ((int)(unsigned char)(c)) -int tolower(int); - -inline int isalpha(int c) { return (int)(__ctype_map[(unsigned char)c] & __letter); } -inline int isdigit(int c) { return (int)(__ctype_map[(unsigned char)c] & __digit); } -inline int isspace(int c) { return (int)(__ctype_map[(unsigned char)c] & __whitespace); } -inline int isupper(int c) { return (int)(__ctype_map[(unsigned char)c] & __upper_case); } -inline int isxdigit(int c) { return (int)(__ctype_map[(unsigned char)c] & __hex_digit); } // added underscore to avoid naming conflicts inline int _tolower(int c) { return (c == -1 ? -1 : (int)__lower_map[(unsigned char)c]); } -inline int toupper(int c) { return (c == -1 ? -1 : (int)__upper_map[(unsigned char)c]); } +#else +#include + +extern const unsigned char __lower_mapC[0x100]; +extern const unsigned char __upper_mapC[0x100]; +extern const unsigned short __ctype_mapC[0x100]; + +#define ctype_alpha 0x0001 +#define ctype_blank 0x0002 +#define ctype_cntrl 0x0004 +#define ctype_digit 0x0008 +#define ctype_graph 0x0010 +#define ctype_lower 0x0020 +#define ctype_print 0x0040 +#define ctype_punct 0x0080 +#define ctype_space 0x0100 +#define ctype_upper 0x0200 +#define ctype_xdigit 0x0400 + +#define ctype_alnum (ctype_alpha | ctype_digit) + +#endif + +int tolower(int); + +#if MSL_USE_INLINES +MSL_INLINE int isalnum(int c) { + #if !PLATFORM_GCN + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_alnum); + #endif +} + +MSL_INLINE int isalpha(int c) { + #if PLATFORM_GCN + return (int)(__ctype_map[(unsigned char)c] & __letter); + #else + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_alpha); + #endif +} + +MSL_INLINE int isblank(int c) { + #if !PLATFORM_GCN + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_blank); + #endif +} + +MSL_INLINE int iscntrl(int c) { + #if !PLATFORM_GCN + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_cntrl); + #endif +} + +MSL_INLINE int isdigit(int c) { + #if PLATFORM_GCN + return (int)(__ctype_map[(unsigned char)c] & __digit); + #else + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_digit); + #endif +} + +MSL_INLINE int isgraph(int c) { + #if !PLATFORM_GCN + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_graph); + #endif +} + +MSL_INLINE int islower(int c) { + #if !PLATFORM_GCN + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_lower); + #endif +} + +MSL_INLINE int isprint(int c) { + #if !PLATFORM_GCN + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_print); + #endif +} + +MSL_INLINE int ispunct(int c) { + #if !PLATFORM_GCN + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_punct); + #endif +} + +MSL_INLINE int isupper(int c) { + #if PLATFORM_GCN + return (int)(__ctype_map[(unsigned char)c] & __upper_case); + #else + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_upper); + #endif +} + +MSL_INLINE int isxdigit(int c) { + #if PLATFORM_GCN + return (int)(__ctype_map[(unsigned char)c] & __hex_digit); + #else + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_xdigit); + #endif +} + +MSL_INLINE int isspace(int c) { + #if PLATFORM_GCN + return (int)(__ctype_map[(unsigned char)c] & __whitespace); + #else + return (c < 0 || c >= 256) ? 0 : (int)(_current_locale.ctype_cmpt_ptr->ctype_map_ptr[c] & ctype_space); + #endif +} + +MSL_INLINE int tolower(int c) { + #if PLATFORM_GCN + return (c == -1) ? -1 : (int) (__lower_map[(unsigned char)c]); + #else + return ((c < 0) || (c >= 0x100)) ? c : (int) (_current_locale.ctype_cmpt_ptr->lower_map_ptr[c]); + #endif +} + +MSL_INLINE int toupper(int c) { + #if PLATFORM_GCN + return (c == -1 ? -1 : (int)__upper_map[(unsigned char)c]); + #else + return (c < 0 || c >= 256) ? c : (int)(&_current_locale)->ctype_cmpt_ptr->upper_map_ptr[c]; + #endif +} +#endif #ifdef __cplusplus } #endif -#endif /* _MSL_COMMON_CTYPE_H */ \ No newline at end of file +#endif /* _MSL_COMMON_CTYPE_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h index 1826b92e75..d66024d2a7 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/errno.h @@ -1,6 +1,8 @@ #ifndef MSL_COMMON_SRC_ERRNO_H #define MSL_COMMON_SRC_ERRNO_H +#include "global.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h index ad2e24f96d..1a294cbb1c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h @@ -2,6 +2,7 @@ #define _MSL_COMMON_FLOAT_H #include +#include "global.h" #define FP_SNAN 0 #define FP_QNAN 1 @@ -22,6 +23,7 @@ ((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : \ __fpclassifyd((double)(x)) ) #endif + #define signbit(x) ((sizeof(x) == sizeof(float)) ? __signbitf(x) : __signbitd(x)) #define isfinite(x) ((fpclassify(x) > FP_INFINITE)) #define isnan(x) (fpclassify(x) == FP_NAN) @@ -37,6 +39,10 @@ extern int __float_huge[]; extern int __float_max[]; extern int __float_epsilon[]; +#if !PLATFORM_GCN +extern int __double_huge[]; +#endif + #ifdef __cplusplus extern "C" { #endif @@ -108,4 +114,15 @@ int __fpclassifyl(long double __value); #define DBL_MAX_EXP 1024 #define DBL_MAX_10_EXP 308 +#define LDBL_MANT_DIG 53 +#define LDBL_DIG 15 +#define LDBL_MIN_EXP (-1021) +#define LDBL_MIN_10_EXP (-308) +#define LDBL_MAX_EXP 1024 +#define LDBL_MAX_10_EXP 308 + +#define LDBL_MAX 0x1.fffffffffffffP1023L +#define LDBL_EPSILON 0x1.0000000000000P-52L +#define LDBL_MIN 0x1.0000000000000P-1022L + #endif /* _MSL_COMMON_FLOAT_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale.h new file mode 100644 index 0000000000..fa317f2837 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale.h @@ -0,0 +1,114 @@ +#ifndef _MSL_LOCALE_H +#define _MSL_LOCALE_H + +#include + +typedef int (*__decode_mbyte) (wchar_t*, const char*, size_t); +typedef int (*__encode_mbyte) (char*, wchar_t); + +struct lconv { + char* decimal_point; + char* thousands_sep; + char* grouping; + char* mon_decimal_point; + char* mon_thousands_sep; + char* mon_grouping; + char* positive_sign; + char* negative_sign; + char* currency_symbol; + char frac_digits; + char p_cs_precedes; + char n_cs_precedes; + char p_sep_by_space; + char n_sep_by_space; + char p_sign_posn; + char n_sign_posn; + char* int_curr_symbol; + char int_frac_digits; + char int_p_cs_precedes; + char int_n_cs_precedes; + char int_p_sep_by_space; + char int_n_sep_by_space; + char int_p_sign_posn; + char int_n_sign_posn; +}; + +struct _loc_mon_cmpt { + char CmptName[8]; + char* mon_decimal_point; + char* mon_thousands_sep; + char* mon_grouping; + char* positive_sign; + char* negative_sign; + char* currency_symbol; + char frac_digits; + char p_cs_precedes; + char n_cs_precedes; + char p_sep_by_space; + char n_sep_by_space; + char p_sign_posn; + char n_sign_posn; + char* int_curr_symbol; + char int_frac_digits; + char int_p_cs_precedes; + char int_n_cs_precedes; + char int_p_sep_by_space; + char int_n_sep_by_space; + char int_p_sign_posn; + char int_n_sign_posn; +}; + +struct _loc_num_cmpt { + char CmptName[8]; + char* decimal_point; + char* thousands_sep; + char* grouping; +}; + +struct _loc_time_cmpt { + char CmptName[8]; + const char* am_pm; + const char* DateTime_Format; + const char* Twelve_hr_format; + const char* Date_Format; + const char* Time_Format; + const char* Day_Names; + const char* MonthNames; + char* TimeZone; +}; + +struct _loc_coll_cmpt { + char name[8]; + int char_start; + int char_coll_tab_size; + short char_spec; + unsigned short* char_coll_table_ptr; + unsigned short* wchar_coll_seq_ptr; +}; + +struct _loc_ctype_cmpt { + char name[8]; // 0x0 + const unsigned short* ctype_map_ptr; // 0x8 + const unsigned char* upper_map_ptr; // 0xC + const unsigned char* lower_map_ptr; // 0x10 + const unsigned short* wctype_map_ptr; // 0x14 + const wchar_t* wupper_map_ptr; // 0x18 + const wchar_t* wlower_map_ptr; // 0x1C + __decode_mbyte decode_mb; + __encode_mbyte encode_wc; +}; + +struct __locale { + struct __locale* next_locale; // 0x0 + char name[0x30]; // 0x4 + struct _loc_coll_cmpt* coll_cmpt_ptr; // 0x34 + struct _loc_ctype_cmpt* ctype_cmpt_ptr; // 0x38 + struct _loc_mon_cmpt* mon_cmpt_ptr; // 0x3C + struct _loc_num_cmpt* num_cmpt_ptr; // 0x40 + struct _loc_time_cmpt* time_cmpt_ptr; // 0x44 +}; + +extern struct __locale _current_locale; +extern struct lconv __lconv; + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h index 8b0a236ec0..5936adcc6c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mbstring.h @@ -9,6 +9,9 @@ extern "C" { size_t wcstombs(char* dst, const wchar_t* src, size_t n); +int __mbtowc_noconv(wchar_t*, const char*, size_t); +int __wctomb_noconv(char*, wchar_t); + #ifdef __cplusplus } #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h new file mode 100644 index 0000000000..cc73532cd1 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtold.h @@ -0,0 +1,15 @@ +#ifndef MSL_STRTOLD_H +#define MSL_STRTOLD_H + +#ifdef __cplusplus +extern "C" { +#endif + +long double __strtold(int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned, + int* overflow); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h index 7d637f763b..a5d93ece23 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/strtoul.h @@ -9,6 +9,8 @@ long strtol(const char* str, char** end, int base); unsigned long strtoul(const char* str, char** end, int base); unsigned long __strtoul(int base, int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned, int* negative, int* overflow); +unsigned long long __strtoull(int base, int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, + int* chars_scanned, int* negative, int* overflow); int atoi(const char* str); float atof(const char* str); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h new file mode 100644 index 0000000000..fd011d70d1 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h @@ -0,0 +1,32 @@ +#ifndef _MSL_WCTYPE_H +#define _MSL_WCTYPE_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define wctype_alpha 0x0001 +#define wctype_blank 0x0002 +#define wctype_cntrl 0x0004 +#define wctype_digit 0x0008 +#define wctype_graph 0x0010 +#define wctype_lower 0x0020 +#define wctype_print 0x0040 +#define wctype_punct 0x0080 +#define wctype_space 0x0100 +#define wctype_upper 0x0200 +#define wctype_xdigit 0x0400 + +#define wctype_alnum (wctype_alpha | wctype_digit) + +extern const unsigned short __wctype_mapC[256]; +extern const wchar_t __wlower_mapC[256]; +extern const wchar_t __wupper_mapC[256]; + +#ifdef __cplusplus +} +#endif + +#endif /* _MSL_COMMON_CTYPE_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h new file mode 100644 index 0000000000..7cd6e26b55 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h @@ -0,0 +1,21 @@ +#ifndef MSL_WSTRING_H +#define MSL_WSTRING_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +size_t wcslen(const wchar_t*); +wchar_t* wcscpy(wchar_t*, const wchar_t*); +wchar_t* wcsncpy(wchar_t*, const wchar_t*, size_t); +wchar_t* wcscat(wchar_t*, const wchar_t*); +int wcscmp(const wchar_t*, const wchar_t*); +wchar_t* wcschr(const wchar_t*, wchar_t); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c index 6c9275730e..a4edf4c5fd 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/FILE_POS.c @@ -2,15 +2,6 @@ #include "critical_regions.h" #include "errno.h" -long ftell(FILE* stream) { - int retval; - - __begin_critical_region(stdin_access); - retval = (long)_ftell(stream); - __end_critical_region(stdin_access); - return retval; -} - int _ftell(FILE* file) { int charsInUndoBuffer = 0; int position; @@ -43,12 +34,18 @@ int _ftell(FILE* file) { return (position); } +long ftell(FILE* stream) { + int retval; + + __begin_critical_region(stdin_access); + retval = (long)_ftell(stream); + __end_critical_region(stdin_access); + return retval; +} + int _fseek(FILE* file, unsigned long offset, int whence) { int bufferCode; int pos; - int adjust; - unsigned long state; - int buffLen; unsigned char* ptr; @@ -68,38 +65,7 @@ int _fseek(FILE* file, unsigned long offset, int whence) { if (whence == SEEK_CUR) { whence = SEEK_SET; - adjust = 0; - if ((file->file_mode.file_kind != 1 && file->file_mode.file_kind != 2) || - file->file_state.error != 0) - { - errno = 0x28; - pos = -1; - } else { - state = file->file_state.io_state; - if (state == 0) { - pos = file->position; - } else { - pos = file->buffer_position; - ptr = file->buffer; - buffLen = (file->buffer_ptr - ptr); - pos += buffLen; - if ((state >= 3)) { - adjust = (state - 2); - pos -= adjust; - } - - if (file->file_mode.binary_io == 0) { - int i; - for (i = (buffLen - adjust); i != 0; i--) { - unsigned char c = *ptr; - ptr++; - if (c == 10) { - pos++; - } - } - } - } - } + pos = _ftell(file); offset += pos; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c index c06fb26075..a50c8913aa 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c @@ -2,6 +2,8 @@ #include "critical_regions.h" #include +#include "global.h" + typedef struct Block { struct Block* prev; struct Block* next; @@ -124,7 +126,29 @@ static const unsigned long fix_pool_sizes[] = {4, 12, 20, 36, 52, 68}; void __sys_free(); -static inline SubBlock* SubBlock_merge_prev(SubBlock* ths, SubBlock** start) { +void Block_link(Block* ths, SubBlock* sb) { + SubBlock** st; + SubBlock_set_free(sb); + st = &Block_start(ths); + + if (*st != 0) { + sb->prev = (*st)->prev; + sb->prev->next = sb; + sb->next = *st; + (*st)->prev = sb; + *st = sb; + *st = SubBlock_merge_prev(*st, st); + SubBlock_merge_next(*st, st); + } else { + *st = sb; + sb->prev = sb; + sb->next = sb; + } + if (ths->max_size < SubBlock_size(*st)) + ths->max_size = SubBlock_size(*st); +} + +static SubBlock* SubBlock_merge_prev(SubBlock* ths, SubBlock** start) { unsigned long prevsz; SubBlock* p; @@ -144,7 +168,7 @@ static inline SubBlock* SubBlock_merge_prev(SubBlock* ths, SubBlock** start) { return ths; } -static inline void SubBlock_merge_next(SubBlock* pBlock, SubBlock** pStart) { +static void SubBlock_merge_next(SubBlock* pBlock, SubBlock** pStart) { SubBlock* next_sub_block; unsigned long this_cur_size; @@ -179,29 +203,7 @@ static inline void SubBlock_merge_next(SubBlock* pBlock, SubBlock** pStart) { } } -inline void Block_link(Block* ths, SubBlock* sb) { - SubBlock** st; - SubBlock_set_free(sb); - st = &Block_start(ths); - - if (*st != 0) { - sb->prev = (*st)->prev; - sb->prev->next = sb; - sb->next = *st; - (*st)->prev = sb; - *st = sb; - *st = SubBlock_merge_prev(*st, st); - SubBlock_merge_next(*st, st); - } else { - *st = sb; - sb->prev = sb; - sb->next = sb; - } - if (ths->max_size < SubBlock_size(*st)) - ths->max_size = SubBlock_size(*st); -} - -static inline Block* __unlink(__mem_pool_obj* pool_obj, Block* bp) { +static Block* __unlink(__mem_pool_obj* pool_obj, Block* bp) { Block* result = bp->next; if (result == bp) { result = 0; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c index 55116eb5e9..e5e725311c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ansi_files.c @@ -1,6 +1,8 @@ #include "ansi_files.h" #include "critical_regions.h" +#include "global.h" + static unsigned char stdin_buff[0x100]; static unsigned char stdout_buff[0x100]; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c index 3d72a9263b..ecb47761d5 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/arith.c @@ -7,6 +7,10 @@ int abs(int n) { return (n); } +long labs(long __x) { + return __x > 0 ? __x : -__x; +} + div_t div(int numerator, int denominator) { div_t ret; int i = 1; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c index c480f2745d..0fdc6ed150 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/char_io.c @@ -3,6 +3,8 @@ #include "misc_io.h" #include "wchar_io.h" +#include "global.h" + int __put_char(int c, FILE* stream) { int ret; @@ -18,8 +20,15 @@ int __put_char(int c, FILE* stream) { } if (stream->file_state.io_state == __neutral && (stream->file_mode.io_mode & __write)) { - if ((stream->file_mode.io_mode & __append) && fseek(stream, 0, 2) != 0) { - return 0; + if ((stream->file_mode.io_mode & __append)) { + #if PLATFORM_GCN + if (fseek(stream, 0, 2) != 0) + #else + if (_fseek(stream, 0, 2) != 0) + #endif + { + return 0; + } } stream->file_state.io_state = __writing; @@ -61,31 +70,21 @@ exit: return ret; } +#if PLATFORM_GCN +#define __putc(c, file) \ + ((fwide(file, -1) >= 0) ? -1 : (file)->buffer_length-- ? (int) (*(file)->buffer_ptr++ = (unsigned char)(c)) : __put_char(c, file)) +#else +#define __putc(c, file) \ + ((__fwide(file, -1) >= 0) ? -1 : (file)->buffer_length-- ? (int) (*(file)->buffer_ptr++ = (unsigned char)(c)) : __put_char(c, file)) +#endif + int fputs(const char* s, FILE* stream) { char c; - int var_r3; - unsigned long len; int ret = 0; __begin_critical_region(stdin_access); while (c = *s++, c != 0) { - if (fwide(stream, -1) >= 0) { - var_r3 = -1; - } else { - len = stream->buffer_length; - stream->buffer_length = len - 1; - - if (len != 0) { - char* buf = (char*)stream->buffer_ptr; - stream->buffer_ptr++; - - *buf = var_r3 = c & 0xFF; - } else { - var_r3 = __put_char(c, stream); - } - } - - if (var_r3 == -1) { + if (__putc(c, stream) == -1) { ret = -1; break; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c index 556432dc7b..4bc8cd4a7e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c @@ -1,5 +1,15 @@ + +#include "locale.h" + +#include "global.h" + +// necessary to generate symbols in this TU +#undef MSL_INLINE +#define MSL_INLINE __declspec(weak) + #include "ctype.h" +#if PLATFORM_GCN #define ctrl __control_char #define motn __motion_char #define spac __space_char @@ -46,16 +56,6 @@ unsigned char __lower_map[256] = { // clang-format on }; -int tolower(int __c) { - { - if (__c == -1) { - return 0xffffffff; - } - - return (unsigned int)__lower_map[__c & 0xff]; - } -} - unsigned char __upper_map[256] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, @@ -75,3 +75,72 @@ unsigned char __upper_map[256] = { 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, // clang-format on }; +#else +#define alph ctype_alpha +#define blnk ctype_blank +#define cntl ctype_cntrl +#define digi ctype_digit | ctype_graph | ctype_print +#define grph ctype_graph +#define lowc ctype_lower | ctype_alpha | ctype_graph | ctype_print +#define prnt ctype_print +#define punc ctype_punct | ctype_graph | ctype_print +#define spac ctype_space +#define uppc ctype_upper | ctype_alpha | ctype_graph | ctype_print +#define hexd ctype_xdigit +#define dhex hexd | digi +#define uhex hexd | uppc +#define lhex hexd | lowc +#define ctbl cntl | blnk +#define ctsp cntl | spac +#define sblp spac | blnk | prnt +#define csbl cntl | spac | blnk + +const unsigned short __ctype_mapC[256] = { + cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, csbl, ctsp, ctsp, ctsp, ctsp, cntl, cntl, + cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, cntl, + sblp, punc, punc, punc, punc, punc, punc, punc, punc, punc, punc, punc, punc, punc, punc, punc, + dhex, dhex, dhex, dhex, dhex, dhex, dhex, dhex, dhex, dhex, punc, punc, punc, punc, punc, punc, + punc, uhex, uhex, uhex, uhex, uhex, uhex, uppc, uppc, uppc, uppc, uppc, uppc, uppc, uppc, uppc, + uppc, uppc, uppc, uppc, uppc, uppc, uppc, uppc, uppc, uppc, uppc, punc, punc, punc, punc, punc, + punc, lhex, lhex, lhex, lhex, lhex, lhex, lowc, lowc, lowc, lowc, lowc, lowc, lowc, lowc, lowc, + lowc, lowc, lowc, lowc, lowc, lowc, lowc, lowc, lowc, lowc, lowc, punc, punc, punc, punc, cntl +}; + +const unsigned char __lower_mapC[0x100] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, + ' ', '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', + '@', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '[', '\\', ']', '^', '_', + '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', + 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~', 0x7F, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, + 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, + 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, + 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, + 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, + 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, + 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF +}; + +const unsigned char __upper_mapC[0x100] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, + ' ', '!', '"', '#', '$', '%', '&', '\'', '(', ')', '*', '+', ',', '-', '.', '/', + '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=', '>', '?', + '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', + 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']', '^', '_', + '`', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', + 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~', 0x7F, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, + 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, + 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, + 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0xBE, 0xBF, + 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, + 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, + 0xE0, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, + 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF +}; +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c index d4edd12dc3..e4a2baa3ab 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/direct_io.c @@ -36,7 +36,11 @@ size_t __fwrite(const void* buffer, size_t size, size_t count, FILE* stream) { if (stream->file_state.io_state == __neutral) { if (stream->file_mode.io_mode & __write) { if (stream->file_mode.io_mode & __append) { + #if PLATFORM_GCN if (fseek(stream, 0, SEEK_END)) + #else + if (_fseek(stream, 0, SEEK_END)) + #endif return 0; } stream->file_state.io_state = __writing; @@ -63,6 +67,7 @@ size_t __fwrite(const void* buffer, size_t size, size_t count, FILE* stream) { if (num_bytes > bytes_to_go) num_bytes = bytes_to_go; + if (stream->file_mode.buffer_mode == _IOLBF && num_bytes) if ((newline = (unsigned char*)__memrchr(write_ptr, '\n', num_bytes)) != NULL) num_bytes = newline + 1 - write_ptr; @@ -71,12 +76,15 @@ size_t __fwrite(const void* buffer, size_t size, size_t count, FILE* stream) { memcpy(stream->buffer_ptr, write_ptr, num_bytes); write_ptr += num_bytes; + #if PLATFORM_GCN bytes_written += num_bytes; + #endif bytes_to_go -= num_bytes; stream->buffer_ptr += num_bytes; stream->buffer_length -= num_bytes; } + if (!stream->buffer_length || newline != NULL || (stream->file_mode.buffer_mode == _IONBF)) { @@ -88,6 +96,9 @@ size_t __fwrite(const void* buffer, size_t size, size_t count, FILE* stream) { break; } } + #if !PLATFORM_GCN + bytes_written += num_bytes; + #endif } while (bytes_to_go && always_buffer); } @@ -99,10 +110,17 @@ size_t __fwrite(const void* buffer, size_t size, size_t count, FILE* stream) { stream->buffer_size = bytes_to_go; stream->buffer_ptr = write_ptr + bytes_to_go; + #if PLATFORM_GCN if (__flush_buffer(stream, &num_bytes) != __no_io_error) set_error(stream); bytes_written += num_bytes; + #else + if (__flush_buffer(stream, &num_bytes) != __no_io_error) + set_error(stream); + else + bytes_written += num_bytes; + #endif stream->buffer = save_buffer; stream->buffer_size = save_size; @@ -115,5 +133,9 @@ size_t __fwrite(const void* buffer, size_t size, size_t count, FILE* stream) { if (stream->file_mode.buffer_mode != _IOFBF) stream->buffer_length = 0; + #if PLATFORM_GCN return ((bytes_written + size - 1) / size); + #else + return bytes_written / size; + #endif } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c index f7e9fd4c80..d24ac7b5ea 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c @@ -6,8 +6,8 @@ int stricmp(const char* str1, const char* str2) { char b_var; do { - b_var = _tolower(*str1++); - a_var = _tolower(*str2++); + b_var = tolower(*str1++); + a_var = tolower(*str2++); if (b_var < a_var) { return -1; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c index df816b2b45..fe71593f35 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c @@ -72,8 +72,8 @@ int __msl_strnicmp(const char* str1, const char* str2, int n) { char c1, c2; for (i = 0; i < n; i++) { - c1 = _tolower(*str1++); - c2 = _tolower(*str2++); + c1 = tolower(*str1++); + c2 = tolower(*str2++); if (c1 < c2) { return -1; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c index 5abb35f27c..473150f84f 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/float.c @@ -1,15 +1,16 @@ #include "float.h" +#include "global.h" int __float_nan[] = {0x7FFFFFFF}; int __float_huge[] = {0x7F800000}; -#if !__REVOLUTION_SDK__ +#if PLATFORM_GCN int __float_max[] = {0x7F7FFFFF}; int __float_epsilon[] = {0x34000000}; #endif -#if DEBUG -unsigned long long __double_huge[] = {0x7ff0000000000000ULL}; +#if !PLATFORM_GCN +int __double_huge[] = {0x7FF00000, 0}; #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c new file mode 100644 index 0000000000..3826686f22 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c @@ -0,0 +1,122 @@ +#include +#include +#include +#include + +#pragma options align=native +#pragma warn_padding off + +struct lconv __lconv = { + ".", + "", + "", + "", + "", + "", + "", + "", + "", + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F, + "", + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F +}; +#pragma warn_padding reset +#pragma options align=reset + +struct _loc_ctype_cmpt _loc_ctyp_C = { + "C", + &__ctype_mapC[0], + &__upper_mapC[0], + &__lower_mapC[0], + &__wctype_mapC[0], + &__wupper_mapC[0], + &__wlower_mapC[0], + __mbtowc_noconv, + __wctomb_noconv +}; + +unsigned short char_coll_tableC[] = { + 0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,0x10, + 0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x11,0x12,0x13,0x14,0x15,0x16, + 0x17,0x2B,0x2D,0x2F,0x31,0x33,0x35,0x37,0x39,0x3B,0x3D,0x3F,0x41,0x43,0x45,0x47, + 0x49,0x4B,0x4D,0x4F,0x51,0x53,0x55,0x57,0x59,0x5B,0x5D,0x18,0x19,0x1A,0x1B,0x1C, + 0x00,0x2C,0x2E,0x30,0x32,0x34,0x36,0x38,0x3A,0x3C,0x3E,0x40,0x42,0x44,0x46,0x48, + 0x4A,0x4C,0x4E,0x50,0x52,0x54,0x56,0x58,0x5A,0x5C,0x5E,0x1D,0x1E,0x1F,0x20,0x00 +}; + +struct _loc_coll_cmpt _loc_coll_C = { + "C", + 0x20, + 0x6E, + 0, + char_coll_tableC, + NULL +}; + +struct _loc_mon_cmpt _loc_mon_C = { + "C", + "", + "", + "", + "", + "", + "", + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F, + "", + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F, + 0x7F +}; + + +struct _loc_num_cmpt _loc_num_C = { + "C", + ".", + "", + "", +}; + +struct _loc_time_cmpt _loc_tim_C = { + "C", + "AM|PM", + "%a %b %e %T %Y", + "%I:%M:%S %p", + "%m/%d/%y", + "%T", + "Sun|Sunday|Mon|Monday|Tue|Tuesday|Wed|Wednesday|Thu|Thursday|Fri|Friday|Sat|Saturday", + "Jan|January|Feb|February|Mar|March|Apr|April|May|May|Jun|June|Jul|July|Aug|August|Sep|September|Oct|October|Nov|November|Dec|December", + "" +}; + + +struct __locale _current_locale = { + NULL, + "C", + &_loc_coll_C, + &_loc_ctyp_C, + &_loc_mon_C, + &_loc_num_C, + &_loc_tim_C +}; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c new file mode 100644 index 0000000000..6c9c5d05cc --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_api.c @@ -0,0 +1,51 @@ +// I think this TU didn't include the header or used a different header +// allowing for both the inline definition and these symbols to exist + +#define __HI(x) *(int*)&x +#define __LO(x) *(1 + (int*)&x) +#define __HIp(x) *(int*)x +#define __LOp(x) *(1 + (int*)x) + +int __fpclassifyf(float x) { + switch ((*(long*)&x) & 0x7f800000) { + case 0x7f800000: { + if ((*(long*)&x) & 0x007fffff) + return 1; + else + return 2; + break; + } + case 0: { + if ((*(long*)&x) & 0x007fffff) + return 5; + else + return 3; + break; + } + } + return 4; +} + +int __signbitd(double x) { + return __HI(x) & 0x80000000; +} + +int __fpclassifyd(double x) { + switch (__HI(x) & 0x7ff00000) { + case 0x7ff00000: { + if ((__HI(x) & 0x000fffff) || (__LO(x) & 0xffffffff)) + return 1; + else + return 2; + break; + } + case 0: { + if ((__HI(x) & 0x000fffff) || (__LO(x) & 0xffffffff)) + return 5; + else + return 3; + break; + } + } + return 4; +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c new file mode 100644 index 0000000000..690e3dd71c --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c @@ -0,0 +1,7 @@ +#include "global.h" + +// necessary to generate symbols in this TU +#undef MSL_INLINE +#define MSL_INLINE __declspec(weak) + +#include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c index d4daab1605..17e30a364e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c @@ -1,64 +1,103 @@ #include "mbstring.h" #include "cstring.h" +#include + +#include "global.h" + +#if !PLATFORM_GCN +int mbtowc(wchar_t* pwc, const char* s, size_t n) { + return _current_locale.ctype_cmpt_ptr->decode_mb(pwc, s, n); +} +#endif inline static int unicode_to_UTF8(char* s, wchar_t wchar) { - int number_of_bytes; - wchar_t wide_char; - char* target_ptr; - char first_byte_mark[4] = { 0x00, 0x00, 0xc0, 0xe0 }; + int number_of_bytes; + wchar_t wide_char; + char* target_ptr; + char first_byte_mark[4] = { 0x00, 0x00, 0xc0, 0xe0 }; - if (!s) - return (0); + if (!s) + return (0); - wide_char = wchar; - if (wide_char < 0x0080) - number_of_bytes = 1; - else if (wide_char < 0x0800) - number_of_bytes = 2; - else - number_of_bytes = 3; + wide_char = wchar; + if (wide_char < 0x0080) + number_of_bytes = 1; + else if (wide_char < 0x0800) + number_of_bytes = 2; + else + number_of_bytes = 3; - target_ptr = s + number_of_bytes; + target_ptr = s + number_of_bytes; - switch (number_of_bytes) { - case 3: - *--target_ptr = (wide_char & 0x003f) | 0x80; - wide_char >>= 6; - case 2: - *--target_ptr = (wide_char & 0x003f) | 0x80; - wide_char >>= 6; - case 1: - *--target_ptr = wide_char | first_byte_mark[number_of_bytes]; - } + switch (number_of_bytes) { + case 3: + *--target_ptr = (wide_char & 0x003f) | 0x80; + wide_char >>= 6; + case 2: + *--target_ptr = (wide_char & 0x003f) | 0x80; + wide_char >>= 6; + case 1: + *--target_ptr = wide_char | first_byte_mark[number_of_bytes]; + } - return number_of_bytes; + return number_of_bytes; } -inline int wctomb(char* s, wchar_t wchar) { return (unicode_to_UTF8(s, wchar)); } +int __mbtowc_noconv(wchar_t* pwc, const char* s, size_t n) { + if (!s) + return 0; + + if (!n) + return -1; + + if (pwc) + *pwc = (unsigned char)*s; + + if (!*s) + return(0); + + return 1; +} + +int __wctomb_noconv(char* s, wchar_t wchar) { + if (!s) + return 0; + + *s = wchar; + return 1; +} + +int wctomb(char* s, wchar_t wchar) { + #if PLATFORM_GCN + return (unicode_to_UTF8(s, wchar)); + #else + return _current_locale.ctype_cmpt_ptr->encode_wc(s, wchar); + #endif +} size_t wcstombs(char* s, const wchar_t* pwcs, size_t n) { - int chars_written = 0; - int result; - char temp[3]; - wchar_t* source; + int chars_written = 0; + int result; + char temp[3]; + wchar_t* source; - if (!s || !pwcs) - return (0); + if (!s || !pwcs) + return (0); - source = (wchar_t*)pwcs; - while (chars_written <= n) { - if (!*source) { - *(s + chars_written) = '\0'; - break; - } else { - result = wctomb(temp, *source++); - if ((chars_written + result) <= n) { - strncpy(s + chars_written, temp, result); - chars_written += result; - } else - break; - } - } + source = (wchar_t*)pwcs; + while (chars_written <= n) { + if (!*source) { + *(s + chars_written) = '\0'; + break; + } else { + result = wctomb(temp, *source++); + if ((chars_written + result) <= n) { + strncpy(s + chars_written, temp, result); + chars_written += result; + } else + break; + } + } - return chars_written; + return chars_written; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c index 07f69f33b4..f2ea575cce 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c @@ -1,8 +1,8 @@ #include "cstring.h" void* memmove(void* dst, const void* src, size_t n) { - unsigned char* csrc; - unsigned char* cdst; + const char* csrc; + char* cdst; int reverse = (unsigned int)src < (unsigned int)dst; @@ -24,19 +24,11 @@ void* memmove(void* dst, const void* src, size_t n) { return dst; } else { if (!reverse) { - csrc = ((unsigned char*)src) - 1; - cdst = ((unsigned char*)dst) - 1; - n++; - - while (--n > 0) { + for (csrc = (const char*)src - 1, cdst = (char*)dst - 1, n++; --n;){ *++cdst = *++csrc; } } else { - csrc = (unsigned char*)src + n; - cdst = (unsigned char*)dst + n; - n++; - - while (--n > 0) { + for (csrc = (const char*)src + n, cdst = (char*)dst + n, n++; --n;){ *--cdst = *--csrc; } } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c index f06bc3c306..b30da21f4b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem_funcs.c @@ -1,5 +1,7 @@ #include "mem_funcs.h" +#include "global.h" + #define cps ((unsigned char*)src) #define cpd ((unsigned char*)dst) #define lps ((unsigned long*)src) @@ -188,6 +190,11 @@ void __copy_longs_rev_unaligned(void* dst, const void* src, size_t n) { cps += 4 - src_offset; + #if !PLATFORM_GCN + cps = ((unsigned char *) lps); + cpd = ((unsigned char *) lpd); + #endif + i = n >> 3; v1 = *--lps; @@ -206,6 +213,11 @@ void __copy_longs_rev_unaligned(void* dst, const void* src, size_t n) { n &= 3; + #if !PLATFORM_GCN + cps = ((unsigned char *) lps); + cpd = ((unsigned char *) lpd); + #endif + if (n) { cps += src_offset; do diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c index a737596dd9..0c2856e046 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c @@ -3,10 +3,14 @@ #include "critical_regions.h" #include "ctype.h" #include "scanf.h" +#include "cmath.h" #include "cstdio.h" #include "cstring.h" +#include "cstdint.h" #include "wchar_io.h" +#define LDBL_MANT_DIG 53 + #define TARGET_FLOAT_BITS 64 #define TARGET_FLOAT_BYTES (TARGET_FLOAT_BITS / 8) #define TARGET_FLOAT_MAX_EXP LDBL_MAX_EXP @@ -28,8 +32,18 @@ enum argument_options { short_argument, long_argument, long_long_argument, + #if PLATFORM_GCN long_double_argument, - wchar_argument + #endif + wchar_argument, + + intmax_argument, + size_t_argument, + ptrdiff_argument, + + #if !PLATFORM_GCN + long_double_argument, + #endif }; typedef struct { @@ -154,12 +168,21 @@ static const char* parse_format(const char* format_string, va_list* arg, print_f f.argument_options = long_long_argument; c = *++s; } - break; - case 'L': f.argument_options = long_double_argument; break; +#if !PLATFORM_GCN + case 'j': + f.argument_options = intmax_argument; + break; + case 't': + f.argument_options = ptrdiff_argument; + break; + case 'z': + f.argument_options = size_t_argument; + break; +#endif default: flag_found = 0; break; @@ -192,7 +215,14 @@ static const char* parse_format(const char* format_string, va_list* arg, print_f case 'f': case 'F': - if (f.argument_options == short_argument || f.argument_options == long_long_argument) { + if (f.argument_options == short_argument + #if !PLATFORM_GCN + || f.argument_options == intmax_argument + || f.argument_options == size_t_argument + || f.argument_options == ptrdiff_argument + #endif + || f.argument_options == long_long_argument) + { f.conversion_char = 0xFF; break; } @@ -208,8 +238,14 @@ static const char* parse_format(const char* format_string, va_list* arg, print_f f.precision = 0xD; } - if (f.argument_options == short_argument || f.argument_options == long_long_argument || - f.argument_options == char_argument) + if (f.argument_options == short_argument + #if !PLATFORM_GCN + || f.argument_options == intmax_argument + || f.argument_options == size_t_argument + || f.argument_options == ptrdiff_argument + #endif + || f.argument_options == long_long_argument + || f.argument_options == char_argument) { f.conversion_char = 0xFF; } @@ -224,8 +260,14 @@ static const char* parse_format(const char* format_string, va_list* arg, print_f case 'e': case 'E': - if (f.argument_options == short_argument || f.argument_options == long_long_argument || - f.argument_options == char_argument) + if (f.argument_options == short_argument + #if !PLATFORM_GCN + || f.argument_options == intmax_argument + || f.argument_options == size_t_argument + || f.argument_options == ptrdiff_argument + #endif + || f.argument_options == long_long_argument + || f.argument_options == char_argument) { f.conversion_char = 0xFF; break; @@ -303,7 +345,11 @@ static char* long2str(signed long num, char* buff, print_format format) { base = 10; if (num < 0) { - unsigned_num = -unsigned_num; + #if !PLATFORM_GCN + if (num != 0x8000000000000000L) + #endif + unsigned_num = -unsigned_num; + minus = 1; } break; @@ -405,7 +451,11 @@ static char* longlong2str(signed long long num, char* pBuf, print_format fmt) { base = 10; if (num < 0) { - unsigned_num = -unsigned_num; + #if !PLATFORM_GCN + if (num != 0x8000000000000000LL) + #endif + unsigned_num = -unsigned_num; + minus = 1; } break; @@ -486,6 +536,7 @@ static char* longlong2str(signed long long num, char* pBuf, print_format fmt) { } static char* double2hex(long double num, char* buff, print_format format) { + #if PLATFORM_GCN int offset, what_nibble = 0; char* wrk_byte_ptr; char *p, *q; @@ -611,6 +662,175 @@ static char* double2hex(long double num, char* buff, print_format format) { } return p; +#else + char *p; + unsigned char *q; + unsigned char working_byte; + long double ld; + int expbits, expmask; + unsigned snum; + long exp; + print_format exp_format; + int hex_precision; + int mantissa_bit; + decform form; + decimal dec; + int radix_marker; + + radix_marker = *(unsigned char *)(__lconv).decimal_point; + p = buff; + ld = num; + + if (format.precision > 509) { + return 0; + } + + form.style = (char)0; + form.digits = 0x20; + __num2dec(&form, num, &dec); + + switch(*dec.sig.text){ + case '0': + dec.exp = 0; + break; + case 'I': + if (dec.sign) { + p = buff - 5; + if (format.conversion_char == 'A') strcpy(p, "-INF"); + else strcpy(p, "-inf"); + } + else { + p = buff - 4; + if (format.conversion_char == 'A') strcpy(p, "INF"); + else strcpy(p, "inf"); + } + + return p; + case 'N': + if (dec.sign) { + p = buff - 5; + if (format.conversion_char == 'A') strcpy(p, "-NAN"); + else strcpy(p, "-nan"); + } + else { + p = buff - 4; + if (format.conversion_char == 'A') strcpy(p, "NAN"); + else strcpy(p, "nan"); + } + + return p; + } + + exp_format.justification_options = right_justification; + exp_format.sign_options = sign_always; + exp_format.precision_specified = 0; + exp_format.alternate_form = 0; + exp_format.argument_options = normal_argument; + exp_format.field_width = 0; + exp_format.precision = 1; + exp_format.conversion_char = 'd'; + + expbits = 11; + expmask = 0x7FF; + + snum = ((unsigned char *)&num)[0] << 25; + if (TARGET_FLOAT_EXP_BITS > 7) + snum |= ((unsigned char *)&num)[1] << 17; + if (TARGET_FLOAT_EXP_BITS > 15) + snum |= ((unsigned char *)&num)[2] << 9; + if (TARGET_FLOAT_EXP_BITS > 23) + snum |= ((unsigned char *)&num)[3] << 1; + + snum = (snum >> (32 - expbits)) & expmask; + + if(snum != 0) + exp = snum - 0x3FF; + else + exp = 0; + + p = long2str(exp, buff, exp_format); + if (format.conversion_char == 'a') + *--p = 'p'; + else + *--p = 'P'; + q = (unsigned char *)# + + if (TARGET_FLOAT_IMPLICIT_J_BIT) { + mantissa_bit = (1 + expbits + format.precision * 4) - 1; + } + else { + mantissa_bit = (1 + expbits + format.precision * 4) - 4; + } + + for (hex_precision = format.precision; hex_precision >= 1; hex_precision--) { + if (mantissa_bit < 64) { + int mantissa_byte; + + mantissa_byte = mantissa_bit >> 3; + working_byte = (*(q + mantissa_byte)) >> (7 - (mantissa_bit & 7)); + + if ((mantissa_bit & ~7) != ((mantissa_bit - 4) & ~7)) { + working_byte |= (unsigned char)(((*(q + (mantissa_byte - 1))) << 8) >> (7 - ((mantissa_bit) & 7))); + } + + if (!TARGET_FLOAT_IMPLICIT_J_BIT) { + if (mantissa_bit == 1 + expbits) { + *--p = radix_marker; + working_byte &= 0x1; + } + } + + if ((working_byte &= 0xF) < 10) { + working_byte += (unsigned char)'0'; + } + else + if (format.conversion_char == 'a') { + working_byte += (unsigned char)('a' - 10); + } + else { + working_byte += (unsigned char)('A' - 10); + } + } + else { + working_byte = '0'; + } + + *--p = working_byte; + mantissa_bit -= 4; + } + + if (TARGET_FLOAT_IMPLICIT_J_BIT){ + if (format.precision || format.alternate_form) { + *--p = radix_marker; + } + + if(fabsl(ld) != 0.0) + *--p = '1'; + else + *--p = '0'; + } + + if (format.conversion_char == 'a') { + *--p = 'x'; + } + else { + *--p = 'X'; + } + + *--p = '0'; + + if (dec.sign) { + *--p = '-'; + } + else if (format.sign_options == sign_always) { + *--p = '+'; + } + else if (format.sign_options == space_holder) { + *--p = ' '; + } + + return p; + #endif } static void round_decimal(decimal* dec, int new_length) { @@ -675,7 +895,11 @@ static char* float2str(long double num, char* buff, print_format format) { int int_digits, frac_digits; int radix_marker; + #if PLATFORM_GCN radix_marker = '.'; + #else + radix_marker = *(unsigned char*)__lconv.decimal_point; + #endif if (format.precision > 509) { return 0; @@ -736,7 +960,12 @@ static char* float2str(long double num, char* buff, print_format format) { return p; } - dec.exp += dec.sig.length - 1; + #if PLATFORM_GCN + dec.exp += (dec.sig.length - 1); + #else + dec.exp += (short)(dec.sig.length - 1); + #endif + p = buff; *--p = 0; @@ -888,7 +1117,12 @@ static char* float2str(long double num, char* buff, print_format format) { } static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* WriteProcArg, - const char* format_str, va_list arg) { + const char* format_str, va_list arg + #if !PLATFORM_GCN + ,int is_secure + #endif + ) +{ int num_chars, chars_written, field_width; const char* format_ptr; const char* curr_format; @@ -933,7 +1167,19 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr long_num = va_arg(arg, signed long); } else if (format.argument_options == long_long_argument) { long_long_num = va_arg(arg, signed long long); - } else { + } + #if !PLATFORM_GCN + else if (format.argument_options == intmax_argument) { + long_long_num = va_arg(arg, intmax_t); + } + else if (format.argument_options == size_t_argument) { + long_num = va_arg(arg, size_t); + } + else if (format.argument_options == ptrdiff_argument) { + long_num = va_arg(arg, ptrdiff_t); + } + #endif + else { long_num = va_arg(arg, int); } @@ -945,7 +1191,12 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr long_num = (signed char)long_num; } - if ((format.argument_options == long_long_argument)) { + if ((format.argument_options == long_long_argument) + #if !PLATFORM_GCN + || format.argument_options == intmax_argument + #endif + ) + { if (!(buff_ptr = longlong2str(long_long_num, buff + 512, format))) { goto conversion_error; } @@ -966,7 +1217,19 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr long_num = va_arg(arg, unsigned long); } else if (format.argument_options == long_long_argument) { long_long_num = va_arg(arg, signed long long); - } else { + } + #if !PLATFORM_GCN + else if (format.argument_options == intmax_argument) { + long_long_num = va_arg(arg, intmax_t); + } + else if (format.argument_options == size_t_argument) { + long_num = va_arg(arg, size_t); + } + else if (format.argument_options == ptrdiff_argument) { + long_num = va_arg(arg, ptrdiff_t); + } + #endif + else { long_num = va_arg(arg, unsigned int); } @@ -978,7 +1241,12 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr long_num = (unsigned char)long_num; } - if ((format.argument_options == long_long_argument)) { + if ((format.argument_options == long_long_argument) + #if !PLATFORM_GCN + || format.argument_options == intmax_argument + #endif + ) + { if (!(buff_ptr = longlong2str(long_long_num, buff + 512, format))) { goto conversion_error; } @@ -1029,6 +1297,13 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr if (format.argument_options == wchar_argument) { wchar_t* wcs_ptr = va_arg(arg, wchar_t*); + #if !PLATFORM_GCN + if (is_secure && wcs_ptr == NULL){ + __msl_runtime_constraint_violation_s(0,0,-1); + return -1; + } + #endif + if (wcs_ptr == NULL) { wcs_ptr = L""; } @@ -1042,6 +1317,13 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr buff_ptr = va_arg(arg, char*); } + #if !PLATFORM_GCN + if (is_secure && buff_ptr == NULL){ + __msl_runtime_constraint_violation_s(0,0,-1); + return -1; + } + #endif + if (buff_ptr == NULL) { buff_ptr = ""; } @@ -1067,6 +1349,13 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr case 'n': buff_ptr = va_arg(arg, char*); + #if !PLATFORM_GCN + if (is_secure){ + __msl_runtime_constraint_violation_s(0,0,-1); + return -1; + } + #endif + switch (format.argument_options) { case normal_argument: *(int*)buff_ptr = chars_written; @@ -1077,6 +1366,17 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr case long_argument: *(signed long*)buff_ptr = chars_written; break; + #if !PLATFORM_GCN + case intmax_argument: + *(intmax_t*)buff_ptr = chars_written; + break; + case size_t_argument: + *(size_t*)buff_ptr = chars_written; + break; + case ptrdiff_argument: + *(ptrdiff_t*)buff_ptr = chars_written; + break; + #endif case long_long_argument: *(signed long long*)buff_ptr = chars_written; break; @@ -1126,6 +1426,18 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr num_chars--; } + #if !PLATFORM_GCN + if ((format.justification_options == zero_fill) && ((format.conversion_char == 'a') || (format.conversion_char == 'A'))) + { + if (num_chars < 2) + return(-1); + if ((*WriteProc)(WriteProcArg, buff_ptr, 2) == 0) + return(-1); + num_chars -= 2; + buff_ptr += 2; + } + #endif + while (field_width < format.field_width) { if ((*WriteProc)(WriteProcArg, &fill_char, 1) == 0) { return -1; @@ -1158,7 +1470,11 @@ static int __pformatter(void* (*WriteProc)(void*, const char*, size_t), void* Wr } static void* __FileWrite(void* pFile, const char* pBuffer, size_t char_num) { + #if PLATFORM_GCN return (fwrite(pBuffer, 1, char_num, (FILE*)pFile) == char_num ? pFile : 0); + #else + return (__fwrite(pBuffer, 1, char_num, (FILE*)pFile) == char_num ? pFile : 0); + #endif } static void* __StringWrite(void* pCtrl, const char* pBuffer, size_t char_num) { @@ -1185,7 +1501,11 @@ int printf(const char* format, ...) { { va_list args; va_start(args, format); + #if PLATFORM_GCN res = __pformatter(&__FileWrite, (void*)stdout, format, args); + #else + res = __pformatter(&__FileWrite, (void*)stdout, format, args, 0); + #endif } __end_critical_region(stdin_access); return res; @@ -1202,7 +1522,11 @@ int fprintf(FILE* file, const char* format, ...) { { va_list args; va_start(args, format); + #if PLATFORM_GCN res = __pformatter(&__FileWrite, (void*)file, format, args); + #else + res = __pformatter(&__FileWrite, (void*)file, format, args, 0); + #endif } __end_critical_region(stdin_access); return res; @@ -1216,7 +1540,11 @@ int vprintf(const char* format, va_list arg) { } __begin_critical_region(stdin_access); + #if PLATFORM_GCN ret = __pformatter(&__FileWrite, (void*)stdout, format, arg); + #else + ret = __pformatter(&__FileWrite, (void*)stdout, format, arg, 0); + #endif __end_critical_region(stdin_access); return ret; } @@ -1228,15 +1556,33 @@ int vsnprintf(char* s, size_t n, const char* format, va_list arg) { osc.MaxCharCount = n; osc.CharsWritten = 0; + #if PLATFORM_GCN end = __pformatter(&__StringWrite, &osc, format, arg); + #else + end = __pformatter(&__StringWrite, &osc, format, arg, 0); + #endif if (s) { + #if PLATFORM_GCN s[(end < n) ? end : n - 1] = '\0'; + #else + if (end < n) { + s[end] = '\0'; + } else { + if (n > 0) { + s[n - 1] = '\0'; + } + } + #endif } return end; } +int vsprintf(char *s, const char *format, va_list arg) { + return vsnprintf(s, 0xFFFFFFFF, format, arg); +} + int snprintf(char* s, size_t n, const char* format, ...) { va_list args; va_start(args, format); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c index ec5fb5536a..e2016b1d41 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c @@ -1,4 +1,744 @@ #include "scanf.h" +#include +#include +#include +#include +#include +#include + +enum argument_options { + normal_argument, + char_argument, + short_argument, + long_argument, + intmax_argument, + size_t_argument, + ptrdiff_argument, + long_long_argument, + double_argument, + long_double_argument, + wchar_argument +}; + +typedef unsigned char char_map[32]; + +typedef struct { + unsigned char suppress_assignment; + unsigned char field_width_specified; + unsigned char argument_options; + unsigned char conversion_char; + int field_width; + char_map char_set; +} scan_format; + +#define set_char_map(map, ch) map[(unsigned char)ch >> 3] |= (1 << (ch & 7)) +#define tst_char_map(map, ch) (map[(unsigned char)ch >> 3] & (1 << (ch & 7))) + +static const char* parse_format(const char* format_string, scan_format *format) { + const char* s = format_string; + int c; + int flag_found, invert; + scan_format f = { 0, 0, normal_argument, 0, 2147483647, { 0 } }; + + if (((c = *++s) == '%')) { + f.conversion_char = c; + *format = f; + return ((const char*)s + 1); + } + + if (c == '*') { + f.suppress_assignment = 1; + c = *++s; + } + + if (isdigit(c)) { + f.field_width = 0; + + do { + f.field_width = (f.field_width * 10) + (c - '0'); + c = *++s; + } while (isdigit(c)); + + if (f.field_width == 0) { + f.conversion_char = 0xFF; + *format = f; + return ((const char*)s + 1); + } + + f.field_width_specified = 1; + } + + flag_found = 1; + + switch (c) { + case 'h': + f.argument_options = short_argument; + + if (s[1] == 'h') { + f.argument_options = char_argument; + c = *++s; + } + + break; + case 'l': + f.argument_options = long_argument; + + if (s[1] == 'l') { + f.argument_options = long_long_argument; + c = *++s; + } + + break; + case 'L': + f.argument_options = long_double_argument; + break; + + case 'j': + f.argument_options = intmax_argument; + break; + case 'z': + f.argument_options = size_t_argument; + break; + case 't': + f.argument_options = ptrdiff_argument; + break; + default: + flag_found = 0; + } + + if (flag_found) { + c = *++s; + } + + f.conversion_char = c; + + switch (c) { + case 'd': + case 'i': + case 'u': + case 'o': + case 'x': + case 'X': + if (f.argument_options == long_double_argument) { + f.conversion_char = 0xFF; + break; + } + + break; + + case 'a': + case 'A': + case 'f': + case 'F': + case 'e': + case 'E': + case 'g': + case 'G': + if (f.argument_options == char_argument || f.argument_options == short_argument || f.argument_options == intmax_argument || f.argument_options == size_t_argument || f.argument_options == ptrdiff_argument || f.argument_options == long_long_argument) { + f.conversion_char = 0xFF; + break; + } + + if (f.argument_options == long_argument) { + f.argument_options = double_argument; + } + + break; + + case 'p': + f.argument_options = long_argument; + f.conversion_char = 'x'; + break; + + case 'c': + if (f.argument_options == long_argument) { + f.argument_options = wchar_argument; + } + else { + if (f.argument_options != normal_argument) { + f.conversion_char = 0xFF; + } + } + + break; + + case 's': + if (f.argument_options == long_argument) { + f.argument_options = wchar_argument; + } + else { + if (f.argument_options != normal_argument) { + f.conversion_char = 0xFF; + } + } + + { + int i; + unsigned char* p; + + for (i = sizeof(f.char_set), p = f.char_set; i; --i) { + *p++ = 0xFF; + } + + f.char_set[1] = 0xC1; + f.char_set[4] = 0xFE; + } + + break; + + case 'n': + break; + + case '[': + if (f.argument_options == long_argument) { + f.argument_options = wchar_argument; + } + else { + if (f.argument_options != normal_argument) { + f.conversion_char = 0xFF; + } + } + + c = *++s; + invert = 0; + + if (c == '^') { + invert = 1; + c = *++s; + } + + if (c == ']') { + set_char_map(f.char_set, ']'); + c = *++s; + } + + while (c && c != ']') { + int d; + set_char_map(f.char_set, c); + + if (*(s + 1) == '-' && (d = *(s + 2)) != 0 && d != ']') { + while (++c <= d) { + set_char_map(f.char_set, c); + } + + c = *(s += 3); + } + else { + c = *++s; + } + } + + if (!c) { + f.conversion_char = 0xFF; + break; + } + + if (invert) { + int i; + unsigned char* p; + + for (i = sizeof(f.char_set), p = f.char_set; i; --i, ++p) { + *p = ~*p; + } + + break; + } + + break; + default: + f.conversion_char = 0xFF; + break; + } + + *format = f; + return ((const char*)s + 1); +} + +static int __sformatter(int (*ReadProc)(void *, int, int), void * ReadProcArg, const char * format_str, va_list arg, int is_secure) +{ + int num_chars, chars_read, items_assigned, conversions; + int base, negative, overflow; + int rval; + const char* format_ptr; + char format_char; + char c; + scan_format format; + long long_num; + unsigned long u_long_num; + long long long_long_num = 0; + unsigned long long u_long_long_num; + long double long_double_num; + char * arg_ptr; + int elem_valid; + size_t elem_maxsize; + int match_failure = 0; + int terminate = 0; + + format_ptr = format_str; + chars_read = 0; + items_assigned = 0; + conversions = 0; + + while (!terminate && (format_char = *format_ptr) != 0) + { + if (isspace(format_char)) + { + do{ + format_char = *++format_ptr; + } while (isspace(format_char)); + + if (!match_failure) + { + while (isspace(c = (*ReadProc)(ReadProcArg, 0, __GetAChar))) + ++chars_read; + + (*ReadProc)(ReadProcArg, c, __UngetAChar); + } + continue; + } + + if ((format_char != '%') && (!match_failure)) + { + if ((c = (*ReadProc)(ReadProcArg, 0, __GetAChar)) != (unsigned char)format_char) + { + (*ReadProc)(ReadProcArg, c, __UngetAChar); + if (!is_secure) + goto exit; + else + { + match_failure = 1; + ++format_ptr; + continue; + } + } + + chars_read++; + format_ptr++; + + continue; + } + + format_ptr = parse_format(format_ptr, &format); + + if (!format.suppress_assignment && format.conversion_char != '%') + { + arg_ptr = va_arg(arg, char *); + } + else + { + arg_ptr = 0; + } + + if ((format.conversion_char != 'n') && (!match_failure) && (*ReadProc)(ReadProcArg, 0, __TestForError)) + { + if (!is_secure) + goto exit; + else + match_failure = 1; + } + + switch (format.conversion_char) + { + case 'd': + base = 10; + goto signed_int; + case 'i': + base = 0; + signed_int: + + if (match_failure) + { + long_num = 0; + long_long_num = 0; + } + else + { + if ((format.argument_options == long_long_argument) || (format.argument_options == intmax_argument)) + u_long_long_num = __strtoull(base, format.field_width, ReadProc, ReadProcArg, &num_chars, &negative, &overflow); + else + u_long_num = __strtoul(base, format.field_width, ReadProc, ReadProcArg, &num_chars, &negative, &overflow); + + if (!num_chars) + { + if (!is_secure) + goto exit; + else + { + match_failure = 1; + long_num = 0; + long_long_num = 0; + goto signed_int_assign; + } + } + + chars_read += num_chars; + + if ((format.argument_options == long_long_argument) || (format.argument_options == intmax_argument)) + long_long_num = (negative ? -u_long_long_num : u_long_long_num); + else + long_num = (negative ? -u_long_num : u_long_num); + } + + signed_int_assign: + + if (arg_ptr) + { + switch (format.argument_options) + { + case normal_argument: * (int *) arg_ptr = long_num; break; + case char_argument: * (signed char *) arg_ptr = long_num; break; + case short_argument: * (short *) arg_ptr = long_num; break; + case long_argument: * (long *) arg_ptr = long_num; break; + case intmax_argument: * (intmax_t *) arg_ptr = long_long_num; break; + case size_t_argument: * (size_t *) arg_ptr = long_num; break; + case ptrdiff_argument: * (ptrdiff_t *) arg_ptr = long_num; break; + case long_long_argument: * (long long *) arg_ptr = long_long_num; break; + } + if (!match_failure) items_assigned++; + } + + conversions++; + break; + case 'o': + base = 8; + goto unsigned_int; + case 'u': + base = 10; + goto unsigned_int; + case 'x': + case 'X': + base = 16; + unsigned_int: + + if (match_failure) + { + u_long_num = 0; + u_long_long_num = 0; + } + else + { + if ((format.argument_options == long_long_argument) || (format.argument_options == intmax_argument)) + u_long_long_num = __strtoull(base, format.field_width, ReadProc, ReadProcArg, &num_chars, &negative, &overflow); + else + u_long_num = __strtoul(base, format.field_width, ReadProc, ReadProcArg, &num_chars, &negative, &overflow); + + if (!num_chars) + { + if (!is_secure) + goto exit; + else + { + match_failure = 1; + u_long_num = 0; + u_long_long_num = 0; + goto unsigned_int_assign; + } + } + + chars_read += num_chars; + + if (negative) + if (format.argument_options == long_long_argument) + u_long_long_num = -u_long_long_num; + else + u_long_num = -u_long_num; + } + + unsigned_int_assign: + + if (arg_ptr) + { + switch (format.argument_options) + { + case normal_argument: * (unsigned int *)arg_ptr = u_long_num; break; + case char_argument: * (unsigned char *)arg_ptr = u_long_num; break; + case short_argument: * (unsigned short *)arg_ptr = u_long_num; break; + case long_argument: * (unsigned long *)arg_ptr = u_long_num; break; + case intmax_argument: * (intmax_t *) arg_ptr = u_long_long_num; break; + case size_t_argument: * (size_t *) arg_ptr = u_long_num; break; + case ptrdiff_argument: * (ptrdiff_t *) arg_ptr = u_long_num; break; + case long_long_argument: * (unsigned long long *) arg_ptr = u_long_long_num; break; + + + } + + if (!match_failure) items_assigned++; + } + + conversions++; + break; + case 'a': + case 'A': + case 'f': + case 'F': + case 'e': + case 'E': + case 'g': + case 'G': + flt: + if (match_failure) long_double_num = NAN; + else + { + long_double_num = __strtold(format.field_width, ReadProc, ReadProcArg, &num_chars, &overflow); + + if (!num_chars) + { + if (!is_secure) + goto exit; + else + { + match_failure = 1; + long_double_num = NAN; + goto assign_float; + } + } + + chars_read += num_chars; + } + + assign_float: + + if (arg_ptr) + { + switch (format.argument_options) + { + case normal_argument: * (float *) arg_ptr = long_double_num; break; + case double_argument: * (double *) arg_ptr = long_double_num; break; + case long_double_argument: * (long double *) arg_ptr = long_double_num; break; + } + + if (!match_failure) items_assigned++; + } + + conversions++; + break; + + case 'c': + + if (!format.field_width_specified) format.field_width = 1; + + if (arg_ptr) + { + if (is_secure) + { + elem_valid = 1; + elem_maxsize = va_arg(arg, size_t); + } + + num_chars = 0; + + if (match_failure) + { + if (elem_maxsize > 0) + *arg_ptr = 0; + continue; + } + else + { + char * arg_start = arg_ptr; + + while (format.field_width-- && (!is_secure || ((elem_valid = (elem_maxsize > num_chars)) != 0)) && ((rval = ((*ReadProc)(ReadProcArg, 0, __GetAChar))) != -1)) + { + c = rval; + + if (format.argument_options == wchar_argument) + { + mbtowc(((wchar_t*)arg_ptr), (char*)(&c), 1); + arg_ptr += sizeof(wchar_t); + } + else + *arg_ptr++ = c; + num_chars++; + } + + c = rval; + if (!num_chars || (is_secure && !elem_valid)) + { + if (!is_secure) + goto exit; + else + { + match_failure = 1; + if (elem_maxsize > 0) + *arg_start = 0; + continue; + } + } + + chars_read += num_chars; + + items_assigned++; + } + } + else + { + num_chars = 0; + + while (format.field_width-- && ((rval = ((*ReadProc)(ReadProcArg, 0, __GetAChar))) != -1)) + { + c = rval; + num_chars++; + } + c = rval; + if (!num_chars) goto exit; + } + + conversions++; + break; + + case '%': + if (match_failure) + continue; + else + { + while (isspace(c = (*ReadProc)(ReadProcArg, 0, __GetAChar))) + chars_read++; + + if (c != '%') + { + (*ReadProc)(ReadProcArg, c, __UngetAChar); + if (!is_secure) + goto exit; + else + { + match_failure = 1; + continue; + } + } + + chars_read++; + } + break; + + case 's': + if (!match_failure) + { + c = (*ReadProc)(ReadProcArg, 0, __GetAChar); + while(isspace(c)) + { + chars_read++; + c = (*ReadProc)(ReadProcArg, 0, __GetAChar); + } + + (*ReadProc)(ReadProcArg, c, __UngetAChar); + } + case '[': + if (arg_ptr) + { + if (is_secure) + { + elem_valid = 1; + elem_maxsize = va_arg(arg, size_t) - 1; + } + + num_chars = 0; + + if (match_failure) + { + if (elem_maxsize > 0) + *arg_ptr = 0; + continue; + } + else + { + char * arg_start = arg_ptr; + + while (format.field_width-- && + (!is_secure || ((elem_valid = (elem_maxsize >= num_chars)) != 0)) && + ((rval = ((*ReadProc)(ReadProcArg, 0, __GetAChar))) != -1)) + { + c = rval; + + if (!tst_char_map(format.char_set, c)) + break; + + if (format.argument_options == wchar_argument) + { + mbtowc(((wchar_t*)arg_ptr), (char*)&c, 1); + arg_ptr = (char*)((wchar_t*)arg_ptr + 1); + } + else + *arg_ptr++ = c; + num_chars++; + } + c = rval; + + if (!num_chars || (is_secure && !elem_valid)) + { + (*ReadProc)(ReadProcArg, c, __UngetAChar); + if (!is_secure) + goto exit; + else + { + match_failure = 1; + if (elem_maxsize > 0) + *arg_start = 0; + continue; + } + } + + chars_read += num_chars; + + if (format.argument_options == wchar_argument) + *(wchar_t*)arg_ptr = L'\0'; + else + *arg_ptr = 0; + + items_assigned++; + } + } + else + { + num_chars = 0; + + while (format.field_width-- && + ((rval = ((*ReadProc)(ReadProcArg, 0, __GetAChar))) != -1)) + { + c = rval; + if (!tst_char_map(format.char_set, c)) + break; + + num_chars++; + } + c = rval; + + if (!num_chars) + { + (*ReadProc)(ReadProcArg, c, __UngetAChar); + break; + } + chars_read += num_chars; + } + + if (format.field_width >= 0) + (*ReadProc)(ReadProcArg, c, __UngetAChar); + + conversions++; + break; + case 'n': + if (arg_ptr) + switch (format.argument_options) + { + case normal_argument: * (int *) arg_ptr = chars_read; break; + case short_argument: * (short *) arg_ptr = chars_read; break; + case long_argument: * (long *) arg_ptr = chars_read; break; + case char_argument: * (char *) arg_ptr = chars_read; break; + case long_long_argument: * (long long *) arg_ptr = chars_read; break; + } + continue; + case 0xFF: + default: + goto exit; + } + } + +exit: + + if ((*ReadProc)(ReadProcArg, 0, __TestForError) && conversions == 0) + return -1; + + return items_assigned; +} int __StringRead(void* pPtr, int ch, int act) { char ret; @@ -31,3 +771,32 @@ int __StringRead(void* pPtr, int ch, int act) { return 0; } + +int isspace_string(const char *s) { + int i = 0; + + while(s[i] != '\0'){ + if(!isspace(s[i++])) return 0; + } + + return 1; +} + +int vsscanf(const char *s, const char *format, va_list arg) { + __InStrCtrl isc; + isc.NextChar = (char*)s; + + if ((s == 0) || (*isc.NextChar == '\0') || isspace_string(s)) { + return -1; + } + + isc.NullCharDetected = 0; + return __sformatter(&__StringRead, (void*)&isc, format, arg, 0); +} + +int sscanf(const char *s, const char *pFormat, ...) { + int ret; + va_list args; + va_start(args, pFormat); + return vsscanf(s, pFormat, args); +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c new file mode 100644 index 0000000000..faf85586d6 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c @@ -0,0 +1,16 @@ +#include + +typedef void (*constraint_handler_t)(const char*, void*, int); + +static constraint_handler_t __msl_constraint_handler = NULL; + +void ignore_handler_s(const char* msg, void* ptr, int error); + +void __msl_runtime_constraint_violation_s(const char* msg, void* ptr, int error) { + if (__msl_constraint_handler) + (*__msl_constraint_handler)(msg, ptr, error); + else + ignore_handler_s(msg, ptr, error); +} + +void ignore_handler_s(const char* msg, void* ptr, int error) {} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c index bf23819570..104728a228 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/signal.c @@ -1,14 +1,20 @@ #include "signal.h" #include "critical_regions.h" +#if PLATFORM_GCN +#define SIGNAL_NUM 6 +#else +#define SIGNAL_NUM 7 +#endif + #define __std(ref) ref -__signal_func_ptr signal_funcs[6]; +__signal_func_ptr signal_funcs[SIGNAL_NUM]; int raise(int sig) { __signal_func_ptr signal_func; - if (sig < 1 || sig > 6) { + if (sig < 1 || sig > SIGNAL_NUM) { return -1; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c index ccfd0550c0..7c9ded40f1 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c @@ -1,4 +1,5 @@ #include "cstring.h" +#include "global.h" #define K1 0x80808080 #define K2 0xFEFEFEFF @@ -42,7 +43,9 @@ char* strcpy(char* dst, const char* src) { w = *((int*)(fromb)); t = w + K2; - + #if !PLATFORM_GCN + t &= ~w; + #endif t &= K1; if (t) { goto bytecopy; @@ -54,6 +57,9 @@ char* strcpy(char* dst, const char* src) { w = *(++((int*)(fromb))); t = w + K2; + #if !PLATFORM_GCN + t &= ~w; + #endif t &= K1; if (t) { goto adjust; @@ -145,6 +151,9 @@ int strcmp(const char* str1, const char* str2) { l1 = *(int*)left; r1 = *(int*)right; x = l1 + K2; + #if !PLATFORM_GCN + x &= ~l1; + #endif if (x & K1) { goto adjust; } @@ -158,10 +167,12 @@ int strcmp(const char* str1, const char* str2) { } } +#if PLATFORM_GCN if (l1 > r1) { return 1; } return -1; +#endif adjust: l1 = *left; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c new file mode 100644 index 0000000000..b4599b1e75 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c @@ -0,0 +1,663 @@ +#include "strtold.h" +#include "cstdio.h" +#include "ansi_fp.h" +#include "locale.h" +#include "ctype.h" +#include "float.h" +#include "cmath.h" +#include "climits.h" +#include + +extern double nan(const char*); +extern double __dec2num(const decimal* d); + +#define TARGET_FLOAT_BITS 64 +#define TARGET_FLOAT_BYTES (TARGET_FLOAT_BITS / 8) +#define TARGET_FLOAT_MAX_EXP LDBL_MAX_EXP +#define TARGET_FLOAT_MANT_DIG LDBL_MANT_DIG +#define TARGET_FLOAT_IMPLICIT_J_BIT 1 +#define TARGET_FLOAT_MANT_BITS (TARGET_FLOAT_MANT_DIG - TARGET_FLOAT_IMPLICIT_J_BIT) +#define TARGET_FLOAT_EXP_BITS (TARGET_FLOAT_BITS - TARGET_FLOAT_MANT_BITS - 1) + +enum scan_states { + start = 0x0001, + sig_start = 0x0002, + leading_sig_zeroes = 0x0004, + int_digit_loop = 0x0008, + frac_start = 0x0010, + frac_digit_loop = 0x0020, + sig_end = 0x0040, + exp_start = 0x0080, + leading_exp_digit = 0x0100, + leading_exp_zeroes = 0x0200, + exp_digit_loop = 0x0400, + finished = 0x0800, + failure = 0x1000, + nan_state = 0x2000, + infin_state = 0x4000, + hex_state = 0x8000 +}; + +enum hex_scan_states { + not_hex = 0x0000, + hex_start = 0x0001, + hex_leading_sig_zeroes = 0x0002, + hex_int_digit_loop = 0x0004, + hex_frac_digit_loop = 0x0008, + hex_sig_end = 0x0010, + hex_exp_start = 0x0020, + hex_leading_exp_digit = 0x0040, + hex_leading_exp_zeroes = 0x0080, + hex_exp_digit_loop = 0x0100 +}; + +#define final_state(scan_state) (scan_state & (finished | failure)) +#define success(scan_state) \ + (scan_state & \ + (leading_sig_zeroes | int_digit_loop | frac_digit_loop | leading_exp_zeroes | exp_digit_loop | finished)) +#define hex_success(count, scan_state) \ + (count - 1 > 2 && scan_state & (hex_leading_sig_zeroes | hex_int_digit_loop | hex_frac_digit_loop | \ + hex_leading_exp_zeroes | hex_exp_digit_loop)) + +#define fetch() (count++, (*ReadProc)(ReadProcArg, 0, __GetAChar)) +#define unfetch(c) (*ReadProc)(ReadProcArg, c, __UngetAChar) + +long double __strtold(int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, int* chars_scanned, + int* overflow) { + int scan_state = start; + int hex_scan_state = not_hex; + int count = 0; + int spaces = 0; + int c; + decimal d = {0, 0, 0, {0, ""}}; + int sig_negative = 0; + int exp_negative = 0; + long exp_value = 0; + int exp_adjust = 0; + register long double result = 0.0; + int sign_detected = 0; + int radix_marker = *(unsigned char*)(__lconv).decimal_point; + + unsigned char* chptr; + unsigned char mantissa[TARGET_FLOAT_BYTES]; + unsigned mantissa_digits; + unsigned long exponent = 0; + + int ui; + unsigned char uch, uch1; + int NibbleIndex; + int expsign = 0; + int exp_digits = 0; + unsigned intdigits = 0; + + *overflow = 0; + c = fetch(); + + while (count <= max_width && c != -1 && !final_state(scan_state)) { + switch (scan_state) { + case start: + if (isspace(c)) { + c = fetch(); + count--; + spaces++; + break; + } + + switch (toupper(c)) { + case '-': + sig_negative = 1; + + case '+': + c = fetch(); + sign_detected = 1; + break; + case 'I': + c = fetch(); + scan_state = infin_state; + break; + + case 'N': + c = fetch(); + scan_state = nan_state; + break; + + default: + scan_state = sig_start; + break; + } + break; + + case infin_state: { + int i = 1; + char model[] = "INFINITY"; + + while ((i < 8) && (toupper(c) == model[i])) { + i++; + c = fetch(); + } + + if ((i == 3) || (i == 8)) { + if (sig_negative) { + result = (float)-HUGE_VALF; + } else { + result = HUGE_VALF; + } + + *chars_scanned = spaces + i + sign_detected; + return result; + } else { + scan_state = failure; + } + + break; + } + + case nan_state: { + int i = 1, j = 0; + char model[] = "NAN("; + char nan_arg[32] = ""; + while ((i < 4) && (toupper(c) == model[i])) { + i++; + c = fetch(); + } + + if ((i == 3) || (i == 4)) { + if (i == 4) { + while ((j < 32) && (isdigit(c) || isalpha(c) || (c == radix_marker))) { + nan_arg[j++] = (char)c; + c = fetch(); + } + + if (c != ')') { + scan_state = failure; + break; + } else { + j++; + } + } + nan_arg[j] = '\0'; + + if (sig_negative) { + result = -nan(nan_arg); + } else { + result = nan(nan_arg); + } + + *chars_scanned = spaces + i + j + sign_detected; + return result; + } else { + scan_state = failure; + } + break; + } + + case sig_start: + if (c == radix_marker) { + scan_state = frac_start; + c = fetch(); + break; + } + if (!isdigit(c)) { + scan_state = failure; + break; + } + + if (c == '0') { + c = fetch(); + if (toupper(c) == 'X') { + scan_state = hex_state; + hex_scan_state = hex_start; + } else { + scan_state = leading_sig_zeroes; + } + break; + } + + scan_state = int_digit_loop; + break; + + case leading_sig_zeroes: + if (c == '0') { + c = fetch(); + + break; + } + scan_state = int_digit_loop; + break; + + case int_digit_loop: + if (!isdigit(c)) { + if (c == radix_marker) { + scan_state = frac_digit_loop; + c = fetch(); + } else { + scan_state = sig_end; + } + break; + } + if (d.sig.length < 20) { + d.sig.text[d.sig.length++] = (unsigned char)c; + } else { + exp_adjust++; + } + + c = fetch(); + break; + + case frac_start: + if (!isdigit(c)) { + scan_state = failure; + break; + } + + scan_state = frac_digit_loop; + break; + + case frac_digit_loop: + if (!isdigit(c)) { + scan_state = sig_end; + break; + } + + if (d.sig.length < 20) { + if (c != '0' || d.sig.length) { + d.sig.text[d.sig.length++] = (unsigned char)c; + } + + exp_adjust--; + } + c = fetch(); + break; + + case sig_end: + if (toupper(c) == 'E') { + scan_state = exp_start; + c = fetch(); + break; + } + scan_state = finished; + break; + + case exp_start: + if (c == '+') { + c = fetch(); + } else if (c == '-') { + c = fetch(); + exp_negative = 1; + } + + scan_state = leading_exp_digit; + break; + + case leading_exp_digit: + if (!isdigit(c)) { + scan_state = failure; + break; + } + + if (c == '0') { + scan_state = leading_exp_zeroes; + c = fetch(); + break; + } + + scan_state = exp_digit_loop; + break; + + case leading_exp_zeroes: + if (c == '0') { + c = fetch(); + break; + } + + scan_state = exp_digit_loop; + break; + + case exp_digit_loop: + if (!isdigit(c)) { + scan_state = finished; + break; + } + + exp_value = exp_value * 10 + (c - '0'); + if (exp_value > DBL_MAX_10_EXP) { + *overflow = 1; + } + + c = fetch(); + break; + + case hex_state: { + switch (hex_scan_state) { + case hex_start: + memset(mantissa, 0, sizeof(mantissa)); + chptr = mantissa; + mantissa_digits = (53 + 3) / 4; + intdigits = 0; + NibbleIndex = 0; + hex_scan_state = hex_leading_sig_zeroes; + c = fetch(); + break; + + case hex_leading_sig_zeroes: + if (c == '0') { + c = fetch(); + break; + } + + hex_scan_state = hex_int_digit_loop; + break; + + case hex_int_digit_loop: + if (!isxdigit(c)) { + if (c == radix_marker) { + hex_scan_state = hex_frac_digit_loop; + c = fetch(); + } + + else { + hex_scan_state = hex_sig_end; + } + break; + } + + if (intdigits < mantissa_digits) { + intdigits++; + uch = *(chptr + NibbleIndex / 2); + + ui = toupper(c); + if (ui >= 'A') { + ui = ui - 'A' + 10; + } else { + ui -= '0'; + } + + uch1 = (unsigned char)ui; + + if ((NibbleIndex % 2) != 0) { + uch |= uch1; + } else { + uch |= (unsigned char)(uch1 << 4); + } + + *(chptr + NibbleIndex++ / 2) = uch; + c = fetch(); + } + + else { + c = fetch(); + } + + break; + + case hex_frac_digit_loop: + if (!isxdigit(c)) { + hex_scan_state = hex_sig_end; + break; + } + + if (intdigits < mantissa_digits) { + uch = *(chptr + NibbleIndex / 2); + ui = toupper(c); + + if (ui >= 'A') { + ui = ui - 'A' + 10; + } else { + ui -= '0'; + } + + uch1 = (unsigned char)ui; + + if ((NibbleIndex % 2) != 0) { + uch |= uch1; + } else { + uch |= (unsigned char)(uch1 << 4); + } + + *(chptr + NibbleIndex++ / 2) = uch; + c = fetch(); + } else { + c = fetch(); + } + break; + + case hex_sig_end: + if (toupper(c) == 'P') { + hex_scan_state = hex_exp_start; + exp_digits++; + c = fetch(); + } else { + scan_state = finished; + } + + break; + + case hex_exp_start: + exp_digits++; + if (c == '-') { + expsign = 1; + } else if (c != '+') { + c = unfetch(c); + count--; + exp_digits--; + } + + hex_scan_state = hex_leading_exp_digit; + c = fetch(); + break; + + case hex_leading_exp_digit: + if (!isdigit(c)) { + scan_state = failure; + break; + } + + if (c == '0') { + exp_digits++; + hex_scan_state = hex_leading_exp_zeroes; + c = fetch(); + break; + } + + hex_scan_state = hex_exp_digit_loop; + break; + + case hex_leading_exp_zeroes: + if (c == '0') { + c = fetch(); + break; + } + + hex_scan_state = hex_exp_digit_loop; + break; + + case hex_exp_digit_loop: + if (!isdigit(c)) { + scan_state = finished; + break; + } + + exponent = exponent * 10 + (c - '0'); + + if (exp_value > SHRT_MAX) { + *overflow = 1; + } + + exp_digits++; + c = fetch(); + + break; + } + } break; + } + } + + if (scan_state != 32768 ? !success(scan_state) : !hex_success(count, hex_scan_state)) { + count = 0; + *chars_scanned = 0; + } else { + count--; + *chars_scanned = count + spaces; + } + + unfetch(c); + + if (hex_scan_state == not_hex) { + if (exp_negative) { + exp_value = -exp_value; + } + + { + int n = d.sig.length; + unsigned char* p = &d.sig.text[n]; + + while (n-- && *--p == '0') { + exp_adjust++; + } + + d.sig.length = (unsigned char)(n + 1); + + if (d.sig.length == 0) { + d.sig.text[d.sig.length++] = '0'; + } + } + + if (exp_value < DBL_MIN_10_EXP || exp_value > DBL_MAX_10_EXP) { + if (!*overflow && d.sig.text[0] == '0' && d.sig.text[1] == 0) { + return 0.0; + } + *overflow = 1; + } + + exp_value += exp_adjust; + + if (*overflow) { + if (exp_negative) { + return 0.0; + } else { + return sig_negative ? -HUGE_VAL : HUGE_VAL; + } + } + + d.exp = (short)exp_value; + + result = __dec2num(&d); + + if (result != 0.0 && result < LDBL_MIN) { + *overflow = 1; + } else if (result > LDBL_MAX) { + *overflow = 1; + result = HUGE_VAL; + } + + if (sig_negative && success(scan_state)) { + result = -result; + } + + return result; + } else { + unsigned mantissa_bit, dbl_bit; + unsigned one_bit; + long double dbl_bits_storage; + unsigned char* dbl_bits = (unsigned char*)&dbl_bits_storage; + + if (expsign) { + exponent = -exponent; + } + + exponent += intdigits * 4; + + one_bit = 0; + while (one_bit < 4 && !(mantissa[0] & (0x80 >> one_bit))) { + one_bit++; + exponent--; + } + exponent--; + + if (TARGET_FLOAT_IMPLICIT_J_BIT) { + one_bit++; + } + + if (one_bit) { + unsigned char carry = 0; + for (chptr = mantissa + sizeof(mantissa) - 1; chptr >= mantissa; chptr--) { + unsigned char a = *chptr; + *chptr = (unsigned char)((a << one_bit) | carry); + carry = (unsigned char)(a >> (8 - one_bit)); + } + } + + memset(dbl_bits, 0, sizeof(dbl_bits_storage)); + dbl_bit = (TARGET_FLOAT_BITS - TARGET_FLOAT_MANT_BITS); + + for (mantissa_bit = 0; mantissa_bit < TARGET_FLOAT_MANT_BITS; mantissa_bit += 8) { + unsigned char ui = mantissa[mantissa_bit >> 3]; + int halfbits; + + if (mantissa_bit + 8 > TARGET_FLOAT_MANT_BITS) { + ui &= 0xff << (TARGET_FLOAT_MANT_BITS - mantissa_bit); + } + + halfbits = (dbl_bit & 7); + dbl_bits[dbl_bit >> 3] |= (unsigned char)(ui >> halfbits); + dbl_bit += 8; + dbl_bits[dbl_bit >> 3] |= (unsigned char)(ui << (8 - halfbits)); + } + + exponent += (TARGET_FLOAT_MAX_EXP - 1) + exp_value; + + if ((exponent & ~(TARGET_FLOAT_MAX_EXP * 2 - 1))) { + *overflow = 1; + return 0.0; + } + + exponent <<= 32 - TARGET_FLOAT_EXP_BITS; + + dbl_bits[0] |= exponent >> 25; + + if (TARGET_FLOAT_EXP_BITS > 7) { + dbl_bits[1] |= exponent >> 17; + } + + if (TARGET_FLOAT_EXP_BITS > 15) { + dbl_bits[2] |= exponent >> 9; + } + + if (TARGET_FLOAT_EXP_BITS > 23) { + dbl_bits[3] |= exponent >> 1; + } + + if (sig_negative) { + dbl_bits[0] |= 0x80; + } + + result = *(long double*)dbl_bits; + + return result; + } +} + +double strtod(const char* str, char** end) { + double value, abs_value; + int count, overflow; + + __InStrCtrl isc; + isc.NextChar = (char *)str; + isc.NullCharDetected = 0; + + value = __strtold(INT_MAX, &__StringRead, (void *)&isc, &count, &overflow); + + if (end) + *end = (char*)str + count; + + abs_value = fabs(value); + + if (overflow) + errno = ERANGE; + + return value; +} + +double atof(const char* str) { + return strtod(str, NULL); +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c index cfc907320c..3d3136e397 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c @@ -150,6 +150,138 @@ unsigned long __strtoul(int base, int max_width, int (*ReadProc)(void*, int, int return value; } +unsigned long long __strtoull(int base, int max_width, int (*ReadProc)(void*, int, int), void* ReadProcArg, + int* chars_scanned, int* negative, int* overflow) { + int scan_state = start; + int count = 0; + int spaces = 0; + unsigned long long value = 0; + unsigned long long value_max = 0; + unsigned long long ullmax = ULLONG_MAX; + int c; + + *negative = *overflow = 0; + + if (base < 0 || base == 1 || base > 36 || max_width < 1) { + scan_state = failure; + } else { + c = fetch(); + } + + if (base != 0) { + value_max = ullmax / base; + } + + while (count <= max_width && c != -1 && !final_state(scan_state)) { + switch (scan_state) { + case start: + if (isspace(c)) { + c = fetch(); + count--; + spaces++; + break; + } + + if (c == '+') { + c = fetch(); + } else if (c == '-') { + c = fetch(); + *negative = 1; + } + + scan_state = check_for_zero; + break; + + case check_for_zero: + if (base == 0 || base == 16) { + if (c == '0') { + scan_state = leading_zero; + c = fetch(); + break; + } + } + + scan_state = need_digit; + break; + + case leading_zero: + if (c == 'X' || c == 'x') { + base = 16; + scan_state = need_digit; + c = fetch(); + break; + } + + if (base == 0) { + base = 8; + } + + scan_state = digit_loop; + break; + + case need_digit: + case digit_loop: + if (base == 0) { + base = 10; + } + + if (!value_max) { + value_max = ullmax / base; + } + + if (isdigit(c)) { + if ((c -= '0') >= base) { + if (scan_state == digit_loop) { + scan_state = finished; + } else { + scan_state = failure; + } + + c += '0'; + break; + } + } else if (!isalpha(c) || (toupper(c) - 'A' + 10) >= base) { + if (scan_state == digit_loop) { + scan_state = finished; + } else { + scan_state = failure; + } + + break; + } else { + c = toupper(c) - 'A' + 10; + } + + if (value > value_max) { + *overflow = 1; + } + + value *= base; + + if (c > (ullmax - value)) { + *overflow = 1; + } + + value += c; + scan_state = digit_loop; + c = fetch(); + break; + } + } + + if (!success(scan_state)) { + count = 0; + value = 0; + *chars_scanned = 0; + } else { + count--; + *chars_scanned = count + spaces; + } + + unfetch(c); + return value; +} + unsigned long strtoul(const char* str, char** end, int base) { unsigned long value; int count, negative, overflow; @@ -198,3 +330,7 @@ long strtol(const char* str, char** end, int base) { return svalue; } + +int atoi(const char* str) { + return strtol(str, NULL, 10); +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c index 699e2721d8..c2f2648df1 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wchar_io.c @@ -1,21 +1,32 @@ #include "wchar_io.h" -int fwide(FILE* file, int mode) { - if (file == NULL || file->file_mode.file_kind == __closed_file) { +int __fwide(FILE* stream, int mode) { + return fwide(stream, mode); +} + +int fwide(FILE* stream, int mode) { + int orientation; + int result; + + if (stream == NULL || stream->file_mode.file_kind == __closed_file) return 0; + + orientation = stream->file_mode.file_orientation; + switch (orientation) { + case __unoriented: + if (mode > 0) + stream->file_mode.file_orientation = __wide_oriented; + else if (mode < 0) + stream->file_mode.file_orientation = __char_oriented; + result = mode; + break; + case __wide_oriented: + result = 1; + break; + case __char_oriented: + result = -1; + break; } - switch (file->file_mode.file_orientation) { - case UNORIENTED: - if (mode > 0) { - file->file_mode.file_orientation = WIDE_ORIENTED; - } else if (mode < 0) { - file->file_mode.file_orientation = CHAR_ORIENTED; - } - return mode; - case WIDE_ORIENTED: - return 1; - case CHAR_ORIENTED: - return -1; - } + return result; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c new file mode 100644 index 0000000000..73e8f15d71 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c @@ -0,0 +1,166 @@ +#include "ctype.h" + +const unsigned short __wctype_mapC[256] = { + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_blank | ctype_cntrl | ctype_space, + ctype_cntrl | ctype_space, + ctype_cntrl | ctype_space, + ctype_cntrl | ctype_space, + ctype_cntrl | ctype_space, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_cntrl, + ctype_blank | ctype_print | ctype_space, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_digit | ctype_graph | ctype_print | ctype_xdigit, + ctype_digit | ctype_graph | ctype_print | ctype_xdigit, + ctype_digit | ctype_graph | ctype_print | ctype_xdigit, + ctype_digit | ctype_graph | ctype_print | ctype_xdigit, + ctype_digit | ctype_graph | ctype_print | ctype_xdigit, + ctype_digit | ctype_graph | ctype_print | ctype_xdigit, + ctype_digit | ctype_graph | ctype_print | ctype_xdigit, + ctype_digit | ctype_graph | ctype_print | ctype_xdigit, + ctype_digit | ctype_graph | ctype_print | ctype_xdigit, + ctype_digit | ctype_graph | ctype_print | ctype_xdigit, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_alpha | ctype_graph | ctype_print | ctype_upper | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_upper | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_upper | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_upper | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_upper | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_upper | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_alpha | ctype_graph | ctype_print | ctype_upper, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_alpha | ctype_graph | ctype_print | ctype_lower | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_lower | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_lower | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_lower | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_lower | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_lower | ctype_xdigit, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_alpha | ctype_graph | ctype_print | ctype_lower, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_graph | ctype_print | ctype_punct, + ctype_cntrl, +}; + +const wchar_t __wlower_mapC[256] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, + 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, + 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, + 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, + 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x5B, 0x5C, 0x5D, 0x5E, + 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, 0x71, + 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, + 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, + 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, + 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, + 0xBE, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, + 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, + 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, + 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, +}; + +const wchar_t __wupper_mapC[256] = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, + 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, + 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, + 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, + 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, + 0x5F, 0x60, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, + 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F, 0x80, 0x81, 0x82, 0x83, 0x84, + 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, + 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F, 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, + 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, + 0xBE, 0xBF, 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, + 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xDE, 0xDF, 0xE0, 0xE1, 0xE2, 0xE3, + 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xEB, 0xEC, 0xED, 0xEE, 0xEF, 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, + 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, +}; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c new file mode 100644 index 0000000000..d1647831d4 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wstring.c @@ -0,0 +1,44 @@ +#include "wstring.h" + +size_t wcslen(const wchar_t* str) { + size_t len = -1; + wchar_t* p = (wchar_t*)str - 1; + + do { + len++; + } while (*++p); + + return len; +} + +wchar_t* wcsncpy(wchar_t* dest, const wchar_t* src, size_t num) { + const wchar_t* p = (const wchar_t*)src - 1; + wchar_t* q = (wchar_t*)dest - 1; + wchar_t zero = 0; + + num++; + + while (--num) { + if (!(*++q = *++p)) { + while (--num) { + *++q = 0; + } + + break; + } + } + + return dest; +} + +int wcscmp(const wchar_t* str1, const wchar_t* str2) { + const wchar_t* p1 = (wchar_t*)str1 - 1; + const wchar_t* p2 = (wchar_t*)str2 - 1; + wchar_t c1, c2; + + while ((c1 = *++p1) == (c2 = *++p2)) + if (!c1) + return 0; + + return c1 - c2; +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c index 7e970a81d0..9588c00582 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c @@ -72,6 +72,11 @@ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ if(hx>0) return 0.0; /* acos(1) = 0 */ else return pi+2.0*pio2_lo; /* acos(-1)= pi */ } + + #if PLATFORM_SHIELD + errno = EDOM; + #endif + return NAN; /* acos(|x|>1) is NaN */ } if(ix<0x3fe00000) { /* |x| < 0.5 */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c index 4058af145d..05c49cee7e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c @@ -78,6 +78,11 @@ double __ieee754_asin(x) double x; if (((ix - 0x3ff00000) | __LO(x)) == 0) /* asin(1)=+-pi/2 with inexact */ return x * pio2_hi + x * pio2_lo; + + #if PLATFORM_SHIELD + errno = EDOM; + #endif + return NAN; /* asin(|x|>1) is NaN */ } else if (ix < 0x3fe00000) { /* |x|<0.5 */ if (ix < 0x3e400000) { /* if |x| < 2**-27 */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c index 2659d584bc..260085ba97 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_fmod.c @@ -37,6 +37,9 @@ double __ieee754_fmod(x, y) double x, y; #endif { int n, hx, hy, hz, ix, iy, sx, i; + #if !PLATFORM_GCN + int diff; + #endif unsigned lx, ly, lz; hx = __HI(x); /* high word of x */ @@ -110,9 +113,19 @@ double __ieee754_fmod(x, y) double x, y; /* fix point fmod */ n = ix - iy; + #if !PLATFORM_GCN + diff = n + 2; + #endif + while (n--) { hz = hx - hy; lz = lx - ly; + #if PLATFORM_SHIELD + if (!hz) + if((lx >> diff) == (ly >> diff)) + return Zero[(unsigned)sx>>31]; + #endif + if (lx < ly) hz -= 1; if (hz < 0) { @@ -127,6 +140,12 @@ double __ieee754_fmod(x, y) double x, y; } hz = hx - hy; lz = lx - ly; + #if PLATFORM_SHIELD + if (!hz) + if((lx >> diff) == (ly >> diff)) + return Zero[(unsigned)sx>>31]; + #endif + if (lx < ly) hz -= 1; if (hz >= 0) { @@ -163,4 +182,4 @@ double __ieee754_fmod(x, y) double x, y; x *= one; /* create necessary signal */ } return x; /* exact output */ -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c new file mode 100644 index 0000000000..d730d777a1 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log.c @@ -0,0 +1,161 @@ +/* @(#)e_log.c 1.3 95/01/18 */ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunSoft, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + */ + +/* __ieee754_log(x) + * Return the logrithm of x + * + * Method : + * 1. Argument Reduction: find k and f such that + * x = 2^k * (1+f), + * where sqrt(2)/2 < 1+f < sqrt(2) . + * + * 2. Approximation of log(1+f). + * Let s = f/(2+f) ; based on log(1+f) = log(1+s) - log(1-s) + * = 2s + 2/3 s**3 + 2/5 s**5 + ....., + * = 2s + s*R + * We use a special Reme algorithm on [0,0.1716] to generate + * a polynomial of degree 14 to approximate R The maximum error + * of this polynomial approximation is bounded by 2**-58.45. In + * other words, + * 2 4 6 8 10 12 14 + * R(z) ~ Lg1*s +Lg2*s +Lg3*s +Lg4*s +Lg5*s +Lg6*s +Lg7*s + * (the values of Lg1 to Lg7 are listed in the program) + * and + * | 2 14 | -58.45 + * | Lg1*s +...+Lg7*s - R(z) | <= 2 + * | | + * Note that 2s = f - s*f = f - hfsq + s*hfsq, where hfsq = f*f/2. + * In order to guarantee error in log below 1ulp, we compute log + * by + * log(1+f) = f - s*(f - R) (if f is not too large) + * log(1+f) = f - (hfsq - s*(hfsq+R)). (better accuracy) + * + * 3. Finally, log(x) = k*ln2 + log(1+f). + * = k*ln2_hi+(f-(hfsq-(s*(hfsq+R)+k*ln2_lo))) + * Here ln2 is split into two floating point number: + * ln2_hi + ln2_lo, + * where n*ln2_hi is always exact for |n| < 2000. + * + * Special cases: + * log(x) is NaN with signal if x < 0 (including -INF) ; + * log(+INF) is +INF; log(0) is -INF with signal; + * log(NaN) is that NaN with no signal. + * + * Accuracy: + * according to an error analysis, the error is always less than + * 1 ulp (unit in the last place). + * + * Constants: + * The hexadecimal values are the intended ones for the following + * constants. The decimal values may be used, provided that the + * compiler will convert from decimal to binary accurately enough + * to produce the hexadecimal values shown. + */ + +#include "fdlibm.h" + +#ifdef __STDC__ +static const double +#else +static double +#endif + ln2_hi = 6.93147180369123816490e-01, /* 3fe62e42 fee00000 */ + ln2_lo = 1.90821492927058770002e-10, /* 3dea39ef 35793c76 */ + two54 = 1.80143985094819840000e+16, /* 43500000 00000000 */ + Lg1 = 6.666666666666735130e-01, /* 3FE55555 55555593 */ + Lg2 = 3.999999999940941908e-01, /* 3FD99999 9997FA04 */ + Lg3 = 2.857142874366239149e-01, /* 3FD24924 94229359 */ + Lg4 = 2.222219843214978396e-01, /* 3FCC71C5 1D8E78AF */ + Lg5 = 1.818357216161805012e-01, /* 3FC74664 96CB03DE */ + Lg6 = 1.531383769920937332e-01, /* 3FC39A09 D078C69F */ + Lg7 = 1.479819860511658591e-01; /* 3FC2F112 DF3E5244 */ + +static double zero = 0.0; + +#ifdef __STDC__ +double __ieee754_log(double x) +#else +double __ieee754_log(x) +double x; +#endif +{ + double hfsq, f, s, z, R, w, t1, t2, dk; + int k, hx, i, j; + unsigned lx; + + hx = __HI(x); /* high word of x */ + lx = __LO(x); /* low word of x */ + + k = 0; + if (hx < 0x00100000) { /* x < 2**-1022 */ + if (((hx & 0x7fffffff) | lx) == 0) { + return -two54 / zero; /* log(+-0)=-inf */ + } + if (hx < 0) { + errno = EDOM; + return (x - x) / zero; + } /* log(-#) = NaN */ + k -= 54; + x *= two54; /* subnormal number, scale up x */ + hx = __HI(x); /* high word of x */ + } + if (hx >= 0x7ff00000) { + return x + x; + } + k += (hx >> 20) - 1023; + hx &= 0x000fffff; + i = (hx + 0x95f64) & 0x100000; + __HI(x) = hx | (i ^ 0x3ff00000); /* normalize x or x/2 */ + k += (i >> 20); + f = x - 1.0; + if ((0x000fffff & (2 + hx)) < 3) { /* |f| < 2**-20 */ + if (f == zero) { + if (k == 0) { + return zero; + } else { + dk = (double)k; + return dk * ln2_hi + dk * ln2_lo; + } + } + R = f * f * (0.5 - 0.33333333333333333 * f); + if (k == 0) { + return f - R; + } else { + dk = (double)k; + return dk * ln2_hi - ((R - dk * ln2_lo) - f); + } + } + s = f / (2.0 + f); + dk = (double)k; + z = s * s; + i = hx - 0x6147a; + w = z * z; + j = 0x6b851 - hx; + t1 = w * (Lg2 + w * (Lg4 + w * Lg6)); + t2 = z * (Lg1 + w * (Lg3 + w * (Lg5 + w * Lg7))); + i |= j; + R = t2 + t1; + if (i > 0) { + hfsq = 0.5 * f * f; + if (k == 0) { + return f - (hfsq - s * (hfsq + R)); + } else { + return dk * ln2_hi - ((hfsq - (s * (hfsq + R) + dk * ln2_lo)) - f); + } + } else { + if (k == 0) { + return f - s * (f - R); + } else { + return dk * ln2_hi - ((s * (f - R) - dk * ln2_lo) - f); + } + } +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c new file mode 100644 index 0000000000..94cdaf2061 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_log10.c @@ -0,0 +1,99 @@ + +/* @(#)e_log10.c 1.3 95/01/18 */ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunSoft, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + */ + +/* __ieee754_log10(x) + * Return the base 10 logarithm of x + * + * Method : + * Let log10_2hi = leading 40 bits of log10(2) and + * log10_2lo = log10(2) - log10_2hi, + * ivln10 = 1/log(10) rounded. + * Then + * n = ilogb(x), + * if(n<0) n = n+1; + * x = scalbn(x,-n); + * log10(x) := n*log10_2hi + (n*log10_2lo + ivln10*log(x)) + * + * Note 1: + * To guarantee log10(10**n)=n, where 10**n is normal, the rounding + * mode must set to Round-to-Nearest. + * Note 2: + * [1/log(10)] rounded to 53 bits has error .198 ulps; + * log10 is monotonic at all binary break points. + * + * Special cases: + * log10(x) is NaN with signal if x < 0; + * log10(+INF) is +INF with no signal; log10(0) is -INF with signal; + * log10(NaN) is that NaN with no signal; + * log10(10**N) = N for N=0,1,...,22. + * + * Constants: + * The hexadecimal values are the intended ones for the following constants. + * The decimal values may be used, provided that the compiler will convert + * from decimal to binary accurately enough to produce the hexadecimal values + * shown. + */ + +#include "fdlibm.h" + +#ifdef __STDC__ +static const double +#else +static double +#endif + two54 = 1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */ + ivln10 = 4.34294481903251816668e-01, /* 0x3FDBCB7B, 0x1526E50E */ + log10_2hi = 3.01029995663611771306e-01, /* 0x3FD34413, 0x509F6000 */ + log10_2lo = 3.69423907715893078616e-13; /* 0x3D59FEF3, 0x11F12B36 */ + +static double zero = 0.0; + +#ifdef __STDC__ +double __ieee754_log10(double x) +#else +double __ieee754_log10(x) +double x; +#endif +{ + double y, z; + int i, k, hx; + unsigned lx; + + hx = __HI(x); /* high word of x */ + lx = __LO(x); /* low word of x */ + + k = 0; + if (hx < 0x00100000) { /* x < 2**-1022 */ + if (((hx & 0x7fffffff) | lx) == 0) { + errno = EDOM; + return -two54 / zero; + } /* log(+-0)=-inf */ + if (hx < 0) { + errno = EDOM; + return (x - x) / zero; + } /* log(-#) = NaN */ + k -= 54; + x *= two54; /* subnormal number, scale up x */ + hx = __HI(x); /* high word of x */ + } + if (hx >= 0x7ff00000) { + return x + x; + } + k += (hx >> 20) - 1023; + i = ((unsigned)k & 0x80000000) >> 31; + hx = (hx & 0x000fffff) | ((0x3ff - i) << 20); + y = (double)(k + i); + __HI(x) = hx; + z = y * log10_2lo + ivln10 * __ieee754_log(x); + return z + y * log10_2hi; +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c index 59b8ffe201..0fe4053e3d 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c @@ -1,59 +1,4 @@ -//======================================================================== -// -// e_pow.c -// -// Part of the standard mathematical function library -// -//======================================================================== -//####ECOSGPLCOPYRIGHTBEGIN#### -// ------------------------------------------- -// This file is part of eCos, the Embedded Configurable Operating System. -// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc. -// -// eCos is free software; you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation; either version 2 or (at your option) any later version. -// -// eCos is distributed in the hope that it will be useful, but WITHOUT ANY -// WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -// for more details. -// -// You should have received a copy of the GNU General Public License along -// with eCos; if not, write to the Free Software Foundation, Inc., -// 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -// -// As a special exception, if other files instantiate templates or use macros -// or inline functions from this file, or you compile this file and link it -// with other works to produce a work based on this file, this file does not -// by itself cause the resulting work to be covered by the GNU General Public -// License. However the source code for this file must still be made available -// in accordance with section (3) of the GNU General Public License. -// -// This exception does not invalidate any other reasons why a work based on -// this file might be covered by the GNU General Public License. -// -// Alternative licenses for eCos may be arranged by contacting Red Hat, Inc. -// at http://sources.redhat.com/ecos/ecos-license/ -// ------------------------------------------- -//####ECOSGPLCOPYRIGHTEND#### -//======================================================================== -//#####DESCRIPTIONBEGIN#### -// -// Author(s): jlarmour -// Contributors: -// Date: 2001-07-20 -// Purpose: -// Description: -// Usage: -// -//####DESCRIPTIONEND#### -// -//======================================================================== - -// CONFIGURATION - -/* @(#)e_pow.c 5.1 93/09/24 */ +/* @(#)e_pow.c 1.2 95/01/04 */ /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -110,298 +55,322 @@ * to produce the hexadecimal values shown. */ -#include "types.h" #include "errno.h" #include "cmath.h" -#ifndef _DOUBLE_IS_32BITS - #ifdef __STDC__ static const double #else static double #endif -bp[] = {1.0, 1.5,}, -dp_h[] = { 0.0, 5.84962487220764160156e-01,}, /* 0x3FE2B803, 0x40000000 */ -dp_l[] = { 0.0, 1.35003920212974897128e-08,}, /* 0x3E4CFDEB, 0x43CFD006 */ -zero = 0.0, -one = 1.0, -two = 2.0, -two53 = 9007199254740992.0, /* 0x43400000, 0x00000000 */ -huge = 1.0e300, -tiny = 1.0e-300, - /* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */ -L1 = 5.99999999999994648725e-01, /* 0x3FE33333, 0x33333303 */ -L2 = 4.28571428578550184252e-01, /* 0x3FDB6DB6, 0xDB6FABFF */ -L3 = 3.33333329818377432918e-01, /* 0x3FD55555, 0x518F264D */ -L4 = 2.72728123808534006489e-01, /* 0x3FD17460, 0xA91D4101 */ -L5 = 2.30660745775561754067e-01, /* 0x3FCD864A, 0x93C9DB65 */ -L6 = 2.06975017800338417784e-01, /* 0x3FCA7E28, 0x4A454EEF */ -P1 = 1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */ -P2 = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */ -P3 = 6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */ -P4 = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */ -P5 = 4.13813679705723846039e-08, /* 0x3E663769, 0x72BEA4D0 */ -lg2 = 6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */ -lg2_h = 6.93147182464599609375e-01, /* 0x3FE62E43, 0x00000000 */ -lg2_l = -1.90465429995776804525e-09, /* 0xBE205C61, 0x0CA86C39 */ -ovt = 8.0085662595372944372e-0017, /* -(1024-log2(ovfl+.5ulp)) */ -cp = 9.61796693925975554329e-01, /* 0x3FEEC709, 0xDC3A03FD =2/(3ln2) */ -cp_h = 9.61796700954437255859e-01, /* 0x3FEEC709, 0xE0000000 =(float)cp */ -cp_l = -7.02846165095275826516e-09, /* 0xBE3E2FE0, 0x145B01F5 =tail of cp_h*/ -ivln2 = 1.44269504088896338700e+00, /* 0x3FF71547, 0x652B82FE =1/ln2 */ -ivln2_h = 1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2*/ -ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/ + bp[] = + { + 1.0, + 1.5, +}, + dp_h[] = + { + 0.0, + 5.84962487220764160156e-01, +}, /* 0x3FE2B803, 0x40000000 */ + dp_l[] = + { + 0.0, + 1.35003920212974897128e-08, +}, /* 0x3E4CFDEB, 0x43CFD006 */ + zero = 0.0, one = 1.0, two = 2.0, two53 = 9007199254740992.0, /* 0x43400000, 0x00000000 */ + big = 1.0e300, tiny = 1.0e-300, + /* poly coefs for (3/2)*(log(x)-2s-2/3*s**3 */ + L1 = 5.99999999999994648725e-01, /* 0x3FE33333, 0x33333303 */ + L2 = 4.28571428578550184252e-01, /* 0x3FDB6DB6, 0xDB6FABFF */ + L3 = 3.33333329818377432918e-01, /* 0x3FD55555, 0x518F264D */ + L4 = 2.72728123808534006489e-01, /* 0x3FD17460, 0xA91D4101 */ + L5 = 2.30660745775561754067e-01, /* 0x3FCD864A, 0x93C9DB65 */ + L6 = 2.06975017800338417784e-01, /* 0x3FCA7E28, 0x4A454EEF */ + P1 = 1.66666666666666019037e-01, /* 0x3FC55555, 0x5555553E */ + P2 = -2.77777777770155933842e-03, /* 0xBF66C16C, 0x16BEBD93 */ + P3 = 6.61375632143793436117e-05, /* 0x3F11566A, 0xAF25DE2C */ + P4 = -1.65339022054652515390e-06, /* 0xBEBBBD41, 0xC5D26BF1 */ + P5 = 4.13813679705723846039e-08, /* 0x3E663769, 0x72BEA4D0 */ + lg2 = 6.93147180559945286227e-01, /* 0x3FE62E42, 0xFEFA39EF */ + lg2_h = 6.93147182464599609375e-01, /* 0x3FE62E43, 0x00000000 */ + lg2_l = -1.90465429995776804525e-09, /* 0xBE205C61, 0x0CA86C39 */ + ovt = 8.0085662595372944372e-0017, /* -(1024-log2(ovfl+.5ulp)) */ + cp = 9.61796693925975554329e-01, /* 0x3FEEC709, 0xDC3A03FD =2/(3ln2) */ + cp_h = 9.61796700954437255859e-01, /* 0x3FEEC709, 0xE0000000 =(float)cp */ + cp_l = -7.02846165095275826516e-09, /* 0xBE3E2FE0, 0x145B01F5 =tail of cp_h*/ + ivln2 = 1.44269504088896338700e+00, /* 0x3FF71547, 0x652B82FE =1/ln2 */ + ivln2_h = 1.44269502162933349609e+00, /* 0x3FF71547, 0x60000000 =24b 1/ln2*/ + ivln2_l = 1.92596299112661746887e-08; /* 0x3E54AE0B, 0xF85DDF44 =1/ln2 tail*/ #ifdef __STDC__ double __ieee754_pow(double x, double y) #else -double __ieee754_pow(x, y) double x, y; +double __ieee754_pow(x, y) +double x, y; #endif { - double z, ax, z_h, z_l, p_h, p_l; - double y1, t1, t2, r, s, t, u, v, w; - double qqq; // necessary temp - int i0, i1, i, j, k, yisint, n; - int hx, hy, ix, iy; - u32 lx, ly; + double z, ax, z_h, z_l, p_h, p_l; + double y1, t1, t2, r, s, t, u, v, w; + int i, j, k, yisint, n; + int hx, hy, ix, iy; + unsigned lx, ly; - i0 = ((*(int*)&one) >> 29) ^ 1; - i1 = 1 - i0; - hx = __HI(x); - lx = __LO(x); - hy = __HI(y); - ly = __LO(y); - ix = hx & 0x7fffffff; - iy = hy & 0x7fffffff; + hx = __HI(x); + lx = __LO(x); + hy = __HI(y); + ly = __LO(y); + ix = hx & 0x7fffffff; + iy = hy & 0x7fffffff; - /* y==zero: x**0 = 1 */ - if ((iy | ly) == 0) - return one; + /* y==zero: x**0 = 1 */ + if ((iy | ly) == 0) { + return one; + } - /* +-NaN return x+y */ - if (ix > 0x7ff00000 || ((ix == 0x7ff00000) && (lx != 0)) || iy > 0x7ff00000 || ((iy == 0x7ff00000) && (ly != 0))) - return x + y; + /* +-NaN return x+y */ + if (ix > 0x7ff00000 || ((ix == 0x7ff00000) && (lx != 0)) || iy > 0x7ff00000 || ((iy == 0x7ff00000) && (ly != 0))) { + return x + y; +#ifdef __STDC__ + errno = EDOM; /* mf-- added to conform to old ANSI standard */ +#endif + } - /* determine if y is an odd int when x < 0 - * yisint = 0 ... y is not an integer - * yisint = 1 ... y is an odd int - * yisint = 2 ... y is an even int - */ - yisint = 0; - if (hx < 0) { - if (iy >= 0x43400000) - yisint = 2; /* even integer y */ - else if (iy >= 0x3ff00000) { - k = (iy >> 20) - 0x3ff; /* exponent */ - if (k > 20) { - j = ly >> (52 - k); - if ((j << (52 - k)) == ly) - yisint = 2 - (j & 1); - } else if (ly == 0) { - j = iy >> (20 - k); - if ((j << (20 - k)) == iy) - yisint = 2 - (j & 1); - } - } - } + /* determine if y is an odd int when x < 0 + * yisint = 0 ... y is not an integer + * yisint = 1 ... y is an odd int + * yisint = 2 ... y is an even int + */ + yisint = 0; + if (hx < 0) { + if (iy >= 0x43400000) { + yisint = 2; /* even integer y */ + } else if (iy >= 0x3ff00000) { + k = (iy >> 20) - 0x3ff; /* exponent */ + if (k > 20) { + j = ly >> (52 - k); + if ((j << (52 - k)) == ly) { + yisint = 2 - (j & 1); + } + } else if (ly == 0) { + j = iy >> (20 - k); + if ((j << (20 - k)) == iy) { + yisint = 2 - (j & 1); + } + } + } + } - /* special value of y */ - if (ly == 0) { - if (iy == 0x7ff00000) { /* y is +-inf */ - if (((ix - 0x3ff00000) | lx) == 0) - return y - y; /* inf**+-1 is NaN */ - else if (ix >= 0x3ff00000) /* (|x|>1)**+-inf = inf,0 */ - return (hy >= 0) ? y : zero; - else /* (|x|<1)**-,+inf = inf,0 */ - return (hy < 0) ? -y : zero; - } - if (iy == 0x3ff00000) { /* y is +-1 */ - if (hy < 0) - return one / x; - else - return x; - } - if (hy == 0x40000000) - return x * x; /* y is 2 */ - if (hy == 0x3fe00000) { /* y is 0.5 */ - if (hx >= 0) /* x >= +0 */ - return sqrt(x); - } - } + /* special value of y */ + if (ly == 0) { + if (iy == 0x7ff00000) { - ax = __fabs(x); - qqq = ax; /*x is +-0,+-inf,+-1*/ - /* special value of x */ - if (lx == 0) { - if (ix == 0x7ff00000 || ix == 0 || ix == 0x3ff00000) { - z = qqq; /*x is +-0,+-inf,+-1*/ - if (hy < 0) - z = one / z; /* z = (1/|x|) */ - if (hx < 0) { - if (((ix - 0x3ff00000) | yisint) == 0) { - z = (z - z) / (z - z); /* (-1)**non-int is NaN */ - } else if (yisint == 1) - z = -z; /* (x<0)**odd = -(|x|**odd) */ - } - return z; - } - } + /* y is +-inf */ + if (((ix - 0x3ff00000) | lx) == 0) { + return y - y; /* inf**+-1 is NaN */ + } else if (ix >= 0x3ff00000) { /* (|x|>1)**+-inf = inf,0 */ + return (hy >= 0) ? y : zero; + } else { /* (|x|<1)**-,+inf = inf,0 */ + return (hy < 0) ? -y : zero; + } + } + if (iy == 0x3ff00000) { + /* y is +-1 */ + if (hy < 0) { + return one / x; + } else { + return x; + } + } + if (hy == 0x40000000) { + return x * x; /* y is 2 */ + } + if (hy == 0x3fe00000) { /* y is 0.5 */ + if (hx >= 0) { /* x >= +0 */ + return sqrt(x); + } + } + } - /* (x<0)**(non-int) is NaN */ - /* CYGNUS LOCAL: This used to be - if((((hx>>31)+1)|yisint)==0) return (x-x)/(x-x); - but ANSI C says a right shift of a signed negative quantity is - implementation defined. */ + ax = fabs(x); + /* special value of x */ + if (lx == 0) { + if (ix == 0x7ff00000 || ix == 0 || ix == 0x3ff00000) { + z = ax; /*x is +-0,+-inf,+-1*/ + if (hy < 0) { + z = one / z; /* z = (1/|x|) */ + } + if (hx < 0) { + if (((ix - 0x3ff00000) | yisint) == 0) { + z = (z - z) / (z - z); /* (-1)**non-int is NaN */ + } else if (yisint == 1) { + z = -z; /* (x<0)**odd = -(|x|**odd) */ + } + } + return z; + } + } - if (((((int)hx >> 31) + 1) | yisint) == 0) { - errno = 33; - return (double)NAN; - }; + /* (x<0)**(non-int) is NaN */ + if ((((hx >> 31) + 1) | yisint) == 0) { +#ifdef __STDC__ + errno = EDOM; /* mf-- added to conform to old ANSI standard */ +#endif + return NAN; + } - /* |y| is huge */ - if (iy > 0x41e00000) { /* if |y| > 2**31 */ - if (iy > 0x43f00000) { /* if |y| > 2**64, must o/uflow */ - if (ix <= 0x3fefffff) - return (hy < 0) ? huge * huge : tiny * tiny; - if (ix >= 0x3ff00000) - return (hy > 0) ? huge * huge : tiny * tiny; - } - /* over/underflow if x is not close to one */ - if (ix < 0x3fefffff) - return (hy < 0) ? huge * huge : tiny * tiny; - if (ix > 0x3ff00000) - return (hy > 0) ? huge * huge : tiny * tiny; - /* now |1-x| is tiny <= 2**-20, suffice to compute - log(x) by x-x^2/2+x^3/3-x^4/4 */ - t = x - 1; /* t has 20 trailing zeros */ - w = (t * t) * (0.5 - t * (0.3333333333333333333333 - t * 0.25)); - u = ivln2_h * t; /* ivln2_h has 21 sig. bits */ - v = t * ivln2_l - w * ivln2; - t1 = u + v; - __LO(t1) = 0; - t2 = v - (t1 - u); - } else { - double s2, s_h, s_l, t_h, t_l; - n = 0; - /* take care subnormal number */ - if (ix < 0x00100000) { - ax *= two53; - n -= 53; - ix = __HI(ax); - } - n += ((ix) >> 20) - 0x3ff; - j = ix & 0x000fffff; - /* determine interval */ - ix = j | 0x3ff00000; /* normalize ix */ - if (j <= 0x3988E) - k = 0; /* |x| 0x41e00000) { /* if |y| > 2**31 */ + if (iy > 0x43f00000) { /* if |y| > 2**64, must o/uflow */ + if (ix <= 0x3fefffff) { + return (hy < 0) ? big * big : tiny * tiny; + } + if (ix >= 0x3ff00000) { + return (hy > 0) ? big * big : tiny * tiny; + } + } + /* over/underflow if x is not close to one */ + if (ix < 0x3fefffff) { + return (hy < 0) ? big * big : tiny * tiny; + } + if (ix > 0x3ff00000) { + return (hy > 0) ? big * big : tiny * tiny; + } + /* now |1-x| is tiny <= 2**-20, suffice to compute + log(x) by x-x^2/2+x^3/3-x^4/4 */ + t = x - 1; /* t has 20 trailing zeros */ + w = (t * t) * (0.5 - t * (0.3333333333333333333333 - t * 0.25)); + u = ivln2_h * t; /* ivln2_h has 21 sig. bits */ + v = t * ivln2_l - w * ivln2; + t1 = u + v; + __LO(t1) = 0; + t2 = v - (t1 - u); + } else { + double s2, s_h, s_l, t_h, t_l; + n = 0; + /* take care subnormal number */ + if (ix < 0x00100000) { + ax *= two53; + n -= 53; + ix = __HI(ax); + } + n += ((ix) >> 20) - 0x3ff; + j = ix & 0x000fffff; + /* determine interval */ + ix = j | 0x3ff00000; /* normalize ix */ + if (j <= 0x3988E) { + k = 0; /* |x|> 1) | 0x20000000) + 0x00080000 + (k << 18); - t_l = ax - (t_h - bp[k]); - s_l = v * ((u - s_h * t_h) - s_h * t_l); - /* compute log(ax) */ - s2 = s * s; - r = s2 * s2 * (L1 + s2 * (L2 + s2 * (L3 + s2 * (L4 + s2 * (L5 + s2 * L6))))); - r += s_l * (s_h + s); - s2 = s_h * s_h; - t_h = 3.0 + s2 + r; - __LO(t_h) = 0; - t_l = r - ((t_h - 3.0) - s2); - /* u+v = s*(1+...) */ - u = s_h * t_h; - v = s_l * t_h + t_l * s; - /* 2/(3log2)*(s+...) */ - p_h = u + v; - __LO(p_h) = 0; - p_l = v - (p_h - u); - z_h = cp_h * p_h; /* cp_h+cp_l = 2/(3*log2) */ - z_l = cp_l * p_h + p_l * cp + dp_l[k]; - /* log2(ax) = (s+..)*2/(3*log2) = n + dp_h + z_h + z_l */ - t = (double)n; - t1 = (((z_h + z_l) + dp_h[k]) + t); - __LO(t1) = 0; - t2 = z_l - (((t1 - t) - dp_h[k]) - z_h); - } + /* compute s = s_h+s_l = (x-1)/(x+1) or (x-1.5)/(x+1.5) */ + u = ax - bp[k]; /* bp[0]=1.0, bp[1]=1.5 */ + v = one / (ax + bp[k]); + s = u * v; + s_h = s; + __LO(s_h) = 0; + /* t_h=ax+bp[k] High */ + t_h = zero; + __HI(t_h) = ((ix >> 1) | 0x20000000) + 0x00080000 + (k << 18); + t_l = ax - (t_h - bp[k]); + s_l = v * ((u - s_h * t_h) - s_h * t_l); + /* compute log(ax) */ + s2 = s * s; + r = s2 * s2 * (L1 + s2 * (L2 + s2 * (L3 + s2 * (L4 + s2 * (L5 + s2 * L6))))); + r += s_l * (s_h + s); + s2 = s_h * s_h; + t_h = 3.0 + s2 + r; + __LO(t_h) = 0; + t_l = r - ((t_h - 3.0) - s2); + /* u+v = s*(1+...) */ + u = s_h * t_h; + v = s_l * t_h + t_l * s; + /* 2/(3log2)*(s+...) */ + p_h = u + v; + __LO(p_h) = 0; + p_l = v - (p_h - u); + z_h = cp_h * p_h; /* cp_h+cp_l = 2/(3*log2) */ + z_l = cp_l * p_h + p_l * cp + dp_l[k]; + /* log2(ax) = (s+..)*2/(3*log2) = n + dp_h + z_h + z_l */ + t = (double)n; + t1 = (((z_h + z_l) + dp_h[k]) + t); + __LO(t1) = 0; + t2 = z_l - (((t1 - t) - dp_h[k]) - z_h); + } - s = one; /* s (sign of result -ve**odd) = -1 else = 1 */ - if (((((int)hx >> 31) + 1) | (yisint - 1)) == 0) - s = -one; /* (-ve)**(odd int) */ + s = one; /* s (sign of result -ve**odd) = -1 else = 1 */ + if ((((hx >> 31) + 1) | (yisint - 1)) == 0) { + s = -one; /* (-ve)**(odd int) */ + } - /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */ - y1 = y; - __LO(y1) = 0; - p_l = (y - y1) * t1 + y * t2; - p_h = y1 * t1; - z = p_l + p_h; - j = __HI(z); - i = __LO(z); - if (j >= 0x40900000) { /* z >= 1024 */ - if (((j - 0x40900000) | i) != 0) /* if z > 1024 */ - return s * huge * huge; /* overflow */ - else { - if (p_l + ovt > z - p_h) - return s * huge * huge; /* overflow */ - } - } else if ((j & 0x7fffffff) >= 0x4090cc00) { /* z <= -1075 */ - if (((j - 0xc090cc00) | i) != 0) /* z < -1075 */ - return s * tiny * tiny; /* underflow */ - else { - if (p_l <= z - p_h) - return s * tiny * tiny; /* underflow */ - } - } - /* - * compute 2**(p_h+p_l) - */ - i = j & 0x7fffffff; - k = (i >> 20) - 0x3ff; - n = 0; - if (i > 0x3fe00000) { /* if |z| > 0.5, set n = [z+0.5] */ - n = j + (0x00100000 >> (k + 1)); - k = ((n & 0x7fffffff) >> 20) - 0x3ff; /* new k for n */ - t = zero; - __HI(t) = (n & ~(0x000fffff >> k)); - n = ((n & 0x000fffff) | 0x00100000) >> (20 - k); - if (j < 0) - n = -n; - p_h -= t; - } - t = p_l + p_h; - __LO(t) = 0; - u = t * lg2_h; - v = (p_l - (t - p_h)) * lg2 + t * lg2_l; - z = u + v; - w = v - (z - u); - t = z * z; - t1 = z - t * (P1 + t * (P2 + t * (P3 + t * (P4 + t * P5)))); - r = (z * t1) / (t1 - two) - (w + z * w); - z = one - (r - z); - j = __HI(z); - j += (n << 20); - if ((j >> 20) <= 0) - z = ldexp(z, n); /* subnormal output */ - else - __HI(z) += (n << 20); - return s * z; + /* split up y into y1+y2 and compute (y1+y2)*(t1+t2) */ + y1 = y; + __LO(y1) = 0; + p_l = (y - y1) * t1 + y * t2; + p_h = y1 * t1; + z = p_l + p_h; + j = __HI(z); + i = __LO(z); + if (j >= 0x40900000) { /* z >= 1024 */ + if (((j - 0x40900000) | i) != 0) { /* if z > 1024 */ + return s * big * big; /* overflow */ + } else { + if (p_l + ovt > z - p_h) { + return s * big * big; /* overflow */ + } + } + } else if ((j & 0x7fffffff) >= 0x4090cc00) { /* z <= -1075 */ + if (((j - 0xc090cc00) | i) != 0) { /* z < -1075 */ + return s * tiny * tiny; /* underflow */ + } else { + if (p_l <= z - p_h) { + return s * tiny * tiny; /* underflow */ + } + } + } + /* + * compute 2**(p_h+p_l) + */ + i = j & 0x7fffffff; + k = (i >> 20) - 0x3ff; + n = 0; + if (i > 0x3fe00000) { /* if |z| > 0.5, set n = [z+0.5] */ + n = j + (0x00100000 >> (k + 1)); + k = ((n & 0x7fffffff) >> 20) - 0x3ff; /* new k for n */ + t = zero; + __HI(t) = (n & ~(0x000fffff >> k)); + n = ((n & 0x000fffff) | 0x00100000) >> (20 - k); + if (j < 0) { + n = -n; + } + p_h -= t; + } + t = p_l + p_h; + __LO(t) = 0; + u = t * lg2_h; + v = (p_l - (t - p_h)) * lg2 + t * lg2_l; + z = u + v; + w = v - (z - u); + t = z * z; + t1 = z - t * (P1 + t * (P2 + t * (P3 + t * (P4 + t * P5)))); + r = (z * t1) / (t1 - two) - (w + z * w); + z = one - (r - z); + j = __HI(z); + j += (n << 20); + if ((j >> 20) <= 0) { + #if PLATFORM_GCN + z = ldexp(z, n); /* subnormal output */ + #else + z = scalbn(z, n); /* subnormal output */ + #endif + } else { + __HI(z) += (n << 20); + } + return s * z; } - -#endif /* defined(_DOUBLE_IS_32BITS) */ - -// EOF e_pow.c diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c index 7902352ff5..20b74f00f6 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_rem_pio2.c @@ -1,3 +1,4 @@ + /* @(#)e_rem_pio2.c 1.4 95/01/18 */ /* * ==================================================== @@ -17,7 +18,7 @@ * use __kernel_rem_pio2() */ -#include "cmath.h" +#include "fdlibm.h" /* * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi @@ -27,12 +28,12 @@ static const int two_over_pi[] = { #else static int two_over_pi[] = { #endif - 0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62, 0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, - 0x246E3A, 0x424DD2, 0xE00649, 0x2EEA09, 0xD1921C, 0xFE1DEB, 0x1CB129, 0xA73EE8, 0x8235F5, 0x2EBB44, 0x84E99C, - 0x7026B4, 0x5F7E41, 0x3991D6, 0x398353, 0x39F49C, 0x845F8B, 0xBDF928, 0x3B1FF8, 0x97FFDE, 0x05980F, 0xEF2F11, - 0x8B5A0A, 0x6D1F6D, 0x367ECF, 0x27CB09, 0xB74F46, 0x3F669E, 0x5FEA2D, 0x7527BA, 0xC7EBE5, 0xF17B3D, 0x0739F7, - 0x8A5292, 0xEA6BFB, 0x5FB11F, 0x8D5D08, 0x560330, 0x46FC7B, 0x6BABF0, 0xCFBC20, 0x9AF436, 0x1DA9E3, 0x91615E, - 0xE61B08, 0x659985, 0x5F14A0, 0x68408D, 0xFFD880, 0x4D7327, 0x310606, 0x1556CA, 0x73A8C9, 0x60E27B, 0xC08C6B, + 0xA2F983, 0x6E4E44, 0x1529FC, 0x2757D1, 0xF534DD, 0xC0DB62, 0x95993C, 0x439041, 0xFE5163, 0xABDEBB, 0xC561B7, + 0x246E3A, 0x424DD2, 0xE00649, 0x2EEA09, 0xD1921C, 0xFE1DEB, 0x1CB129, 0xA73EE8, 0x8235F5, 0x2EBB44, 0x84E99C, + 0x7026B4, 0x5F7E41, 0x3991D6, 0x398353, 0x39F49C, 0x845F8B, 0xBDF928, 0x3B1FF8, 0x97FFDE, 0x05980F, 0xEF2F11, + 0x8B5A0A, 0x6D1F6D, 0x367ECF, 0x27CB09, 0xB74F46, 0x3F669E, 0x5FEA2D, 0x7527BA, 0xC7EBE5, 0xF17B3D, 0x0739F7, + 0x8A5292, 0xEA6BFB, 0x5FB11F, 0x8D5D08, 0x560330, 0x46FC7B, 0x6BABF0, 0xCFBC20, 0x9AF436, 0x1DA9E3, 0x91615E, + 0xE61B08, 0x659985, 0x5F14A0, 0x68408D, 0xFFD880, 0x4D7327, 0x310606, 0x1556CA, 0x73A8C9, 0x60E27B, 0xC08C6B, }; #ifdef __STDC__ @@ -40,9 +41,10 @@ static const int npio2_hw[] = { #else static int npio2_hw[] = { #endif - 0x3FF921FB, 0x400921FB, 0x4012D97C, 0x401921FB, 0x401F6A7A, 0x4022D97C, 0x4025FDBB, 0x402921FB, 0x402C463A, 0x402F6A7A, 0x4031475C, - 0x4032D97C, 0x40346B9C, 0x4035FDBB, 0x40378FDB, 0x403921FB, 0x403AB41B, 0x403C463A, 0x403DD85A, 0x403F6A7A, 0x40407E4C, 0x4041475C, - 0x4042106C, 0x4042D97C, 0x4043A28C, 0x40446B9C, 0x404534AC, 0x4045FDBB, 0x4046C6CB, 0x40478FDB, 0x404858EB, 0x404921FB, + 0x3FF921FB, 0x400921FB, 0x4012D97C, 0x401921FB, 0x401F6A7A, 0x4022D97C, 0x4025FDBB, 0x402921FB, + 0x402C463A, 0x402F6A7A, 0x4031475C, 0x4032D97C, 0x40346B9C, 0x4035FDBB, 0x40378FDB, 0x403921FB, + 0x403AB41B, 0x403C463A, 0x403DD85A, 0x403F6A7A, 0x40407E4C, 0x4041475C, 0x4042106C, 0x4042D97C, + 0x4043A28C, 0x40446B9C, 0x404534AC, 0x4045FDBB, 0x4046C6CB, 0x40478FDB, 0x404858EB, 0x404921FB, }; /* @@ -60,120 +62,128 @@ static const double #else static double #endif - zero - = 0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */ - half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ - two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */ + zero = 0.00000000000000000000e+00, /* 0x00000000, 0x00000000 */ + half = 5.00000000000000000000e-01, /* 0x3FE00000, 0x00000000 */ + two24 = 1.67772160000000000000e+07, /* 0x41700000, 0x00000000 */ invpio2 = 6.36619772367581382433e-01, /* 0x3FE45F30, 0x6DC9C883 */ - pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ + pio2_1 = 1.57079632673412561417e+00, /* 0x3FF921FB, 0x54400000 */ pio2_1t = 6.07710050650619224932e-11, /* 0x3DD0B461, 0x1A626331 */ - pio2_2 = 6.07710050630396597660e-11, /* 0x3DD0B461, 0x1A600000 */ + pio2_2 = 6.07710050630396597660e-11, /* 0x3DD0B461, 0x1A600000 */ pio2_2t = 2.02226624879595063154e-21, /* 0x3BA3198A, 0x2E037073 */ - pio2_3 = 2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */ + pio2_3 = 2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */ pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */ #ifdef __STDC__ int __ieee754_rem_pio2(double x, double* y) #else -int __ieee754_rem_pio2(x, y) double x, y[]; +int __ieee754_rem_pio2(x, y) +double x, y[]; #endif { - double z, w, t, r, fn; - double tx[3]; - int e0, i, j, nx, n, ix, hx; + double z, w, t, r, fn; + double tx[3]; + int e0, i, j, nx, n, ix, hx; - hx = __HI(x); /* high word of x */ - ix = hx & 0x7fffffff; - if (ix <= 0x3fe921fb) /* |x| ~<= pi/4 , no need for reduction */ - { - y[0] = x; - y[1] = 0; - return 0; - } - if (ix < 0x4002d97c) { /* |x| < 3pi/4, special case with n=+-1 */ - if (hx > 0) { - z = x - pio2_1; - if (ix != 0x3ff921fb) { /* 33+53 bit pi is good enough */ - y[0] = z - pio2_1t; - y[1] = (z - y[0]) - pio2_1t; - } else { /* near pi/2, use 33+33+53 bit pi */ - z -= pio2_2; - y[0] = z - pio2_2t; - y[1] = (z - y[0]) - pio2_2t; - } - return 1; - } else { /* negative x */ - z = x + pio2_1; - if (ix != 0x3ff921fb) { /* 33+53 bit pi is good enough */ - y[0] = z + pio2_1t; - y[1] = (z - y[0]) + pio2_1t; - } else { /* near pi/2, use 33+33+53 bit pi */ - z += pio2_2; - y[0] = z + pio2_2t; - y[1] = (z - y[0]) + pio2_2t; - } - return -1; - } - } - if (ix <= 0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */ - t = fabs(x); - n = (int)(t * invpio2 + half); - fn = (double)n; - r = t - fn * pio2_1; - w = fn * pio2_1t; /* 1st round good to 85 bit */ - if (n < 32 && ix != npio2_hw[n - 1]) { - y[0] = r - w; /* quick check no cancellation */ - } else { - j = ix >> 20; - y[0] = r - w; - i = j - (((__HI(y[0])) >> 20) & 0x7ff); - if (i > 16) { /* 2nd iteration needed, good to 118 */ - t = r; - r = t - fn * pio2_2; - w = fn * pio2_2t - ((t - r) - fn * pio2_2); - y[0] = r - w; - i = j - (((__HI(y[0])) >> 20) & 0x7ff); - if (i > 49) { /* 3rd iteration need, 151 bits acc */ - t = r; /* will cover all possible cases */ - w = fn * pio2_3; - r = t - w; - w = fn * pio2_3t - ((t - r) - w); - y[0] = r - w; - } - } - } - y[1] = (r - y[0]) - w; - if (hx < 0) { - y[0] = -y[0]; - y[1] = -y[1]; - return -n; - } else - return n; - } - /* - * all other (large) arguments - */ - if (ix >= 0x7ff00000) { /* x is inf or NaN */ - y[0] = y[1] = x - x; - return 0; - } - /* set z = scalbn(|x|,ilogb(x)-23) */ - __LO(z) = __LO(x); - e0 = (ix >> 20) - 1046; /* e0 = ilogb(z)-23; */ - __HI(z) = ix - (e0 << 20); - for (i = 0; i < 2; i++) { - tx[i] = (double)((int)(z)); - z = (z - tx[i]) * two24; - } - tx[2] = z; - nx = 3; - while (tx[nx - 1] == zero) - nx--; /* skip zero term */ - n = __kernel_rem_pio2(tx, y, e0, nx, 2, two_over_pi); - if (hx < 0) { - y[0] = -y[0]; - y[1] = -y[1]; - return -n; - } - return n; + hx = __HI(x); /* high word of x */ + ix = hx & 0x7fffffff; + if (ix <= 0x3fe921fb) /* |x| ~<= pi/4 , no need for reduction */ + { + y[0] = x; + y[1] = 0; + return 0; + } + if (ix < 0x4002d97c) { /* |x| < 3pi/4, special case with n=+-1 */ + if (hx > 0) { + z = x - pio2_1; + if (ix != 0x3ff921fb) { /* 33+53 bit pi is good enough */ + y[0] = z - pio2_1t; + y[1] = (z - y[0]) - pio2_1t; + } else { /* near pi/2, use 33+33+53 bit pi */ + z -= pio2_2; + y[0] = z - pio2_2t; + y[1] = (z - y[0]) - pio2_2t; + } + return 1; + } else { /* negative x */ + z = x + pio2_1; + if (ix != 0x3ff921fb) { /* 33+53 bit pi is good enough */ + y[0] = z + pio2_1t; + y[1] = (z - y[0]) + pio2_1t; + } else { /* near pi/2, use 33+33+53 bit pi */ + z += pio2_2; + y[0] = z + pio2_2t; + y[1] = (z - y[0]) + pio2_2t; + } + return -1; + } + } + if (ix <= 0x413921fb) { /* |x| ~<= 2^19*(pi/2), medium size */ + t = __fabs(x); + n = (int)(t * invpio2 + half); + fn = (double)n; + r = t - fn * pio2_1; + w = fn * pio2_1t; /* 1st round good to 85 bit */ + if (n < 32 && ix != npio2_hw[n - 1]) { + y[0] = r - w; /* quick check no cancellation */ + } else { + j = ix >> 20; + y[0] = r - w; + i = j - (((__HI(y[0])) >> 20) & 0x7ff); + if (i > 16) { /* 2nd iteration needed, good to 118 */ + t = r; + #if PLATFORM_WII || PLATFORM_SHIELD + w = fn * pio2_2; + r = t - w; + w = fn * pio2_2t - ((t - r) - w); + #else + r = t - fn * pio2_2; + w = fn * pio2_2t - ((t - r) - fn * pio2_2); + #endif + y[0] = r - w; + i = j - (((__HI(y[0])) >> 20) & 0x7ff); + if (i > 49) { /* 3rd iteration need, 151 bits acc */ + t = r; /* will cover all possible cases */ + w = fn * pio2_3; + r = t - w; + w = fn * pio2_3t - ((t - r) - w); + y[0] = r - w; + } + } + } + y[1] = (r - y[0]) - w; + if (hx < 0) { + y[0] = -y[0]; + y[1] = -y[1]; + return -n; + } else { + return n; + } + } + /* + * all other (large) arguments + */ + if (ix >= 0x7ff00000) { /* x is inf or NaN */ + y[0] = y[1] = x - x; + return 0; + } + /* set z = scalbn(|x|,ilogb(x)-23) */ + __LO(z) = __LO(x); + e0 = (ix >> 20) - 1046; /* e0 = ilogb(z)-23; */ + __HI(z) = ix - (e0 << 20); + for (i = 0; i < 2; i++) { + tx[i] = (double)((int)(z)); + z = (z - tx[i]) * two24; + } + tx[2] = z; + nx = 3; + while (tx[nx - 1] == zero) { + nx--; /* skip zero term */ + } + n = __kernel_rem_pio2(tx, y, e0, nx, 2, two_over_pi); + if (hx < 0) { + y[0] = -y[0]; + y[1] = -y[1]; + return -n; + } + return n; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c index f77b012e25..c681f5cce4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_rem_pio2.c @@ -349,4 +349,4 @@ recompute: } } return n & 7; -} \ No newline at end of file +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c index de906d1ef4..3fe3aea68b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c @@ -11,7 +11,15 @@ * ==================================================== */ +#include "global.h" + +#if PLATFORM_GCN #include "cmath.h" /* for isfinite macro */ +#else +#include +#define isfinite(x) ((__fpclassifyd(x) > 2)) +#endif + static const double two54 diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c new file mode 100644 index 0000000000..48b21001a9 --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/w_log10.c @@ -0,0 +1,28 @@ +/* @(#)w_log10.c 1.2 95/01/04 */ +/* $Id: w_log10.c,v 1.3 2004/02/26 17:03:30 ceciliar Exp $ */ +/* + * ==================================================== + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunPro, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ==================================================== + */ + +/* + * wrapper log10(X) + */ + +#include "fdlibm.h" + +#ifdef __STDC__ + double log10(double x) /* wrapper log10 */ +#else + double log10(x) /* wrapper log10 */ + double x; +#endif +{ + return __ieee754_log10(x); +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h index 407419ba58..e9f774a08f 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include/fdlibm.h @@ -1,6 +1,8 @@ #ifndef FDLIBM_H #define FDLIBM_H +#include + /* @(#)fdlibm.h 1.5 04/04/22 */ /* * ==================================================== @@ -225,4 +227,4 @@ extern int __kernel_rem_pio2 __P((double*, double*, int, int, int, const int*)); }; #endif -#endif /* FDLIBM_H */ \ No newline at end of file +#endif /* FDLIBM_H */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c index 2e1e641266..879effbd02 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c @@ -1,7 +1,7 @@ #include "ansi_fp.h" #include "ansi_fp.h" #include "climits.h" -#include "float.h" +#include "cmath.h" static int __count_trailing_zerol(unsigned long x) { int result = 0; @@ -101,6 +101,7 @@ static void __rounddec(decimal* d, int digits) { void __ull2dec(decimal* result, unsigned long long val) { result->sign = 0; + #if PLATFORM_GCN if (val == 0) { result->exp = 0; result->sig.length = 1; @@ -112,6 +113,7 @@ void __ull2dec(decimal* result, unsigned long long val) { val = -val; result->sign = 1; } + #endif result->sig.length = 0; @@ -345,6 +347,7 @@ int __equals_dec(const decimal* x, const decimal* y) { } } + #if PLATFORM_GCN if (l == x->sig.length) { for (; i < y->sig.length; ++i) { if (y->sig.text[i] != 0) { @@ -358,6 +361,17 @@ int __equals_dec(const decimal* x, const decimal* y) { } } } + #else + if (l == x->sig.length) { + x = y; + } + + for (; i < x->sig.length; ++i) { + if (x->sig.text[i] != 0) { + return 0; + } + } + #endif return 1; } @@ -563,7 +577,157 @@ void __num2dec(const decform* form, double x, decimal* d) { d->exp -= d->sig.length - 1; - for (i = 0; i < d->sig.length; i++) { + for (i = 0; i < d->sig.length; ++i) { d->sig.text[i] += '0'; } } + +#if !PLATFORM_GCN +double __dec2num(const decimal* d) { + if (d->sig.length <= 0) { + return copysign(0.0, d->sign == 0 ? 1.0 : -1.0); + } + + switch (d->sig.text[0]) { + case '0': + return copysign(0.0, d->sign == 0 ? 1.0 : -1.0); + case 'I': + return copysign((double)HUGE_VALF, d->sign == 0 ? 1.0 : -1.0); + case 'N': { + double result; + unsigned long long* ll = (unsigned long long*)&result; + + *ll = 0x7FF0000000000000; + if (d->sign) + *ll |= 0x8000000000000000; + *ll |= 0x8000000000000; + + return result; + } + } + + { + static double pow_10[8] = {1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8}; + + decimal dec = *d; + unsigned char* i = dec.sig.text; + unsigned char* e = i + dec.sig.length; + double first_guess; + int exponent; + + for (; i < e; ++i) + *i -= '0'; + dec.exp += dec.sig.length - 1; + exponent = dec.exp; + + { + decimal max; + + __str2dec(&max, "179769313486231580793728714053034151", 308); + if (__less_dec(&max, &dec)) { + return copysign((double)HUGE_VALF, d->sign == 0 ? 1.0 : -1.0); + } + } + + i = dec.sig.text; + first_guess = *i++; + + while (i < e) { + unsigned long ival = 0; + int j; + double temp1, temp2; + int ndig = (int)(e - i) % 8; + + if (ndig == 0) + ndig = 8; + + for (j = 0; j < ndig; ++j, ++i) { + ival = ival * 10 + *i; + } + + temp1 = first_guess * pow_10[ndig - 1]; + temp2 = temp1 + ival; + + if (ival != 0 && temp1 == temp2) + break; + + first_guess = temp2; + exponent -= ndig; + } + + if (exponent < 0) { + first_guess /= pow(5.0, -exponent); + } else { + first_guess *= pow(5.0, exponent); + } + + first_guess = ldexp(first_guess, exponent); + + if (fpclassify(first_guess) == 2) { + first_guess = LDBL_MAX; + } + + { + decimal feedback1, feedback2, difflow, diffhigh; + double next_guess; + unsigned long long* ull = (unsigned long long*)&next_guess; + int guessed_low = 0; + + __num2dec_internal(&feedback1, first_guess); + + if (__equals_dec(&feedback1, &dec)) { + goto done; + } + if (__less_dec(&feedback1, &dec)) { + guessed_low = 1; + } + + next_guess = first_guess; + + while (1) { + if (guessed_low) { + ++*ull; + if (fpclassify(next_guess) == 2) { + goto done; + } + } else { + --*ull; + } + + __num2dec_internal(&feedback2, next_guess); + if (guessed_low && !__less_dec(&feedback2, &dec)) { + break; + } else if (!guessed_low && !__less_dec(&dec, &feedback2)) { + difflow = feedback1; + feedback1 = feedback2; + feedback2 = difflow; + { + double temp = first_guess; + first_guess = next_guess; + next_guess = temp; + } + break; + } + feedback1 = feedback2; + first_guess = next_guess; + } + + __minus_dec(&difflow, &dec, &feedback1); + __minus_dec(&diffhigh, &feedback2, &dec); + + if (__equals_dec(&difflow, &diffhigh)) { + if (*(unsigned long long*)&first_guess & 1) { + first_guess = next_guess; + } + } else if (!__less_dec(&difflow, &diffhigh)) { + first_guess = next_guess; + } + } + done: + if (dec.sign) { + first_guess = -first_guess; + } + return first_guess; + } +} +#endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c new file mode 100644 index 0000000000..aba9df81ed --- /dev/null +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c @@ -0,0 +1,13 @@ +#include + +double scalbn(double x, int n) { + double mant; + int exp; + double result; + + mant = frexp(x, &exp); + exp += n; + result = ldexp(mant, exp); + + return result; +} diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c b/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/abort_exit_ppc_eabi.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c b/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c index e4d8023c9e..05f574a394 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/PPC_EABI/Src/math_ppc.c @@ -14,6 +14,8 @@ #endif #endif +double nan(const char* arg) {} + DECL_WEAK float acosf(float x) { return acos(x); } From 11b713902f49017492e5017649c0ad48d38eaab1 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Wed, 24 Dec 2025 19:57:36 -0500 Subject: [PATCH 13/35] Resolve all gameInfo fakematches (#2995) * Clean up various inlines/fakematches/comments * Copy OptRuby inline name from TWW debug * Resolve all dEvt_control_c related fakematches, return pointer instead of reference * Fix some more missing inline usages --- include/d/actor/d_a_alink.h | 2 +- include/d/actor/d_a_obj_table.h | 12 +-- include/d/d_com_inf_game.h | 140 +++++++++++++-------------- include/d/d_save.h | 9 +- include/d/d_stage.h | 3 +- src/d/actor/d_a_alink.cpp | 6 +- src/d/actor/d_a_alink_HIO.inc | 5 +- src/d/actor/d_a_alink_demo.inc | 4 +- src/d/actor/d_a_alink_wolf.inc | 10 +- src/d/actor/d_a_alldie.cpp | 2 +- src/d/actor/d_a_b_bq.cpp | 4 +- src/d/actor/d_a_b_dr.cpp | 2 +- src/d/actor/d_a_b_ds.cpp | 4 +- src/d/actor/d_a_b_gg.cpp | 8 +- src/d/actor/d_a_b_gm.cpp | 4 +- src/d/actor/d_a_b_gnd.cpp | 10 +- src/d/actor/d_a_b_mgn.cpp | 4 +- src/d/actor/d_a_b_ob.cpp | 4 +- src/d/actor/d_a_b_tn.cpp | 8 +- src/d/actor/d_a_b_yo.cpp | 4 +- src/d/actor/d_a_door_shutter.cpp | 4 +- src/d/actor/d_a_e_dt.cpp | 4 +- src/d/actor/d_a_e_fb.cpp | 2 +- src/d/actor/d_a_e_fm.cpp | 4 +- src/d/actor/d_a_e_gb.cpp | 6 +- src/d/actor/d_a_e_gob.cpp | 4 +- src/d/actor/d_a_e_hp.cpp | 14 +-- src/d/actor/d_a_e_mk.cpp | 10 +- src/d/actor/d_a_e_oc.cpp | 6 +- src/d/actor/d_a_e_oct_bg.cpp | 2 +- src/d/actor/d_a_e_pm.cpp | 8 +- src/d/actor/d_a_e_po.cpp | 15 +-- src/d/actor/d_a_e_pz.cpp | 6 +- src/d/actor/d_a_e_rdb.cpp | 4 +- src/d/actor/d_a_e_rdy.cpp | 10 +- src/d/actor/d_a_e_sf.cpp | 4 +- src/d/actor/d_a_e_th.cpp | 4 +- src/d/actor/d_a_e_vt.cpp | 4 +- src/d/actor/d_a_e_warpappear.cpp | 9 +- src/d/actor/d_a_e_wb.cpp | 11 +-- src/d/actor/d_a_e_ym.cpp | 4 +- src/d/actor/d_a_e_ymb.cpp | 24 ++--- src/d/actor/d_a_e_zh.cpp | 8 +- src/d/actor/d_a_econt.cpp | 2 +- src/d/actor/d_a_horse.cpp | 4 +- src/d/actor/d_a_kago.cpp | 48 ++++----- src/d/actor/d_a_kytag04.cpp | 4 +- src/d/actor/d_a_mg_fish.cpp | 15 ++- src/d/actor/d_a_mg_rod.cpp | 6 +- src/d/actor/d_a_midna.cpp | 8 +- src/d/actor/d_a_myna.cpp | 2 +- src/d/actor/d_a_npc.cpp | 18 +--- src/d/actor/d_a_npc4.cpp | 2 +- src/d/actor/d_a_npc_ash.cpp | 4 +- src/d/actor/d_a_npc_ashB.cpp | 24 ++--- src/d/actor/d_a_npc_besu.cpp | 5 +- src/d/actor/d_a_npc_blue_ns.cpp | 4 +- src/d/actor/d_a_npc_bou.cpp | 4 +- src/d/actor/d_a_npc_bouS.cpp | 4 +- src/d/actor/d_a_npc_chat.cpp | 7 +- src/d/actor/d_a_npc_chin.cpp | 4 +- src/d/actor/d_a_npc_doorboy.cpp | 4 +- src/d/actor/d_a_npc_drainSol.cpp | 2 +- src/d/actor/d_a_npc_du.cpp | 2 +- src/d/actor/d_a_npc_gra.cpp | 8 +- src/d/actor/d_a_npc_grc.cpp | 6 +- src/d/actor/d_a_npc_grd.cpp | 4 +- src/d/actor/d_a_npc_grm.cpp | 10 -- src/d/actor/d_a_npc_gro.cpp | 8 +- src/d/actor/d_a_npc_grr.cpp | 6 +- src/d/actor/d_a_npc_grs.cpp | 6 +- src/d/actor/d_a_npc_grz.cpp | 8 +- src/d/actor/d_a_npc_gwolf.cpp | 8 +- src/d/actor/d_a_npc_hanjo.cpp | 15 ++- src/d/actor/d_a_npc_henna.cpp | 19 +--- src/d/actor/d_a_npc_hoz.cpp | 13 +-- src/d/actor/d_a_npc_impal.cpp | 12 +-- src/d/actor/d_a_npc_ins.cpp | 8 +- src/d/actor/d_a_npc_jagar.cpp | 6 +- src/d/actor/d_a_npc_kasi_hana.cpp | 17 +--- src/d/actor/d_a_npc_kasi_kyu.cpp | 30 +----- src/d/actor/d_a_npc_kasi_mich.cpp | 30 +----- src/d/actor/d_a_npc_kkri.cpp | 2 +- src/d/actor/d_a_npc_kn_base.inc | 17 +--- src/d/actor/d_a_npc_ks.cpp | 9 +- src/d/actor/d_a_npc_kyury.cpp | 2 +- src/d/actor/d_a_npc_maro.cpp | 46 ++++----- src/d/actor/d_a_npc_moi.cpp | 2 +- src/d/actor/d_a_npc_moir.cpp | 6 +- src/d/actor/d_a_npc_myna2.cpp | 8 +- src/d/actor/d_a_npc_pachi_taro.cpp | 4 +- src/d/actor/d_a_npc_prayer.cpp | 2 +- src/d/actor/d_a_npc_rafrel.cpp | 32 ++---- src/d/actor/d_a_npc_saru.cpp | 4 +- src/d/actor/d_a_npc_seira.cpp | 2 +- src/d/actor/d_a_npc_seira2.cpp | 2 +- src/d/actor/d_a_npc_shad.cpp | 24 ++--- src/d/actor/d_a_npc_shoe.cpp | 4 +- src/d/actor/d_a_npc_soldierA.cpp | 4 +- src/d/actor/d_a_npc_soldierB.cpp | 4 +- src/d/actor/d_a_npc_taro.cpp | 8 +- src/d/actor/d_a_npc_the.cpp | 16 ++- src/d/actor/d_a_npc_theB.cpp | 19 ++-- src/d/actor/d_a_npc_tk.cpp | 4 +- src/d/actor/d_a_npc_tkc.cpp | 4 +- src/d/actor/d_a_npc_tks.cpp | 28 +++--- src/d/actor/d_a_npc_toby.cpp | 6 +- src/d/actor/d_a_npc_uri.cpp | 2 +- src/d/actor/d_a_npc_wrestler.cpp | 12 +-- src/d/actor/d_a_npc_yelia.cpp | 6 +- src/d/actor/d_a_npc_ykm.cpp | 3 +- src/d/actor/d_a_npc_ykw.cpp | 10 +- src/d/actor/d_a_npc_zra.cpp | 8 +- src/d/actor/d_a_npc_zra.inc | 2 +- src/d/actor/d_a_npc_zrc.cpp | 6 +- src/d/actor/d_a_npc_zrz.cpp | 20 ++-- src/d/actor/d_a_obj_bmWindow.cpp | 2 +- src/d/actor/d_a_obj_boumato.cpp | 5 +- src/d/actor/d_a_obj_crvgate.cpp | 2 +- src/d/actor/d_a_obj_crvhahen.cpp | 10 +- src/d/actor/d_a_obj_dmelevator.cpp | 7 +- src/d/actor/d_a_obj_geyser.cpp | 2 +- src/d/actor/d_a_obj_gra2.cpp | 8 -- src/d/actor/d_a_obj_gra2_base.inc | 4 +- src/d/actor/d_a_obj_gra2_soldier.inc | 2 +- src/d/actor/d_a_obj_kanban2.cpp | 14 +-- src/d/actor/d_a_obj_kiPot.cpp | 2 +- src/d/actor/d_a_obj_lv7bridge.cpp | 1 - src/d/actor/d_a_obj_mirror_screw.cpp | 6 +- src/d/actor/d_a_obj_nameplate.cpp | 5 +- src/d/actor/d_a_obj_oiltubo.cpp | 2 +- src/d/actor/d_a_obj_onsenFire.cpp | 2 +- src/d/actor/d_a_obj_onsenTaru.cpp | 2 +- src/d/actor/d_a_obj_scannon.cpp | 2 +- src/d/actor/d_a_obj_scannon_crs.cpp | 6 +- src/d/actor/d_a_obj_scannon_ten.cpp | 2 +- src/d/actor/d_a_obj_sekizoa.cpp | 18 ++-- src/d/actor/d_a_obj_smgdoor.cpp | 2 +- src/d/actor/d_a_obj_ss_drink.cpp | 2 +- src/d/actor/d_a_obj_table.cpp | 24 +++-- src/d/actor/d_a_obj_tks.cpp | 6 +- src/d/actor/d_a_obj_tobyhouse.cpp | 2 +- src/d/actor/d_a_obj_volcbom.cpp | 6 +- src/d/actor/d_a_obj_warp_kbrg.cpp | 8 +- src/d/actor/d_a_obj_warp_obrg.cpp | 12 +-- src/d/actor/d_a_obj_wind_stone.cpp | 2 +- src/d/actor/d_a_obj_wood_statue.cpp | 2 +- src/d/actor/d_a_obj_zdoor.cpp | 5 +- src/d/actor/d_a_peru.cpp | 2 +- src/d/actor/d_a_tag_Lv6Gate.cpp | 6 +- src/d/actor/d_a_tag_Lv7Gate.cpp | 7 +- src/d/actor/d_a_tag_Lv8Gate.cpp | 15 +-- src/d/actor/d_a_tag_TWgate.cpp | 117 +++++++++++----------- src/d/actor/d_a_tag_allmato.cpp | 17 +--- src/d/actor/d_a_tag_bottle_item.cpp | 2 +- src/d/actor/d_a_tag_evt.cpp | 6 +- src/d/actor/d_a_tag_evtmsg.cpp | 2 +- src/d/actor/d_a_tag_hstop.cpp | 2 +- src/d/actor/d_a_tag_kmsg.cpp | 6 +- src/d/actor/d_a_tag_lantern.cpp | 5 +- src/d/actor/d_a_tag_msg.cpp | 8 +- src/d/actor/d_a_tag_mstop.cpp | 2 +- src/d/actor/d_a_tag_ss_drink.cpp | 2 +- src/d/actor/d_a_tag_wljump.cpp | 2 +- src/d/actor/d_a_talk.cpp | 7 +- src/d/actor/d_a_vrbox2.cpp | 1 - src/d/d_camera.cpp | 8 +- src/d/d_debug_camera.cpp | 2 +- src/d/d_demo.cpp | 2 +- src/d/d_ev_camera.cpp | 4 +- src/d/d_event.cpp | 18 ++-- src/d/d_event_data.cpp | 30 +++--- src/d/d_event_debug.cpp | 2 +- src/d/d_event_lib.cpp | 2 +- src/d/d_event_manager.cpp | 70 +++++++------- src/d/d_kankyo.cpp | 2 +- src/d/d_kankyo_rain.cpp | 6 +- src/d/d_map.cpp | 4 +- src/d/d_menu_letter.cpp | 2 +- src/d/d_menu_option.cpp | 10 +- src/d/d_menu_window.cpp | 2 +- src/d/d_meter2.cpp | 28 +++--- src/d/d_meter_button.cpp | 2 +- src/d/d_msg_scrn_3select.cpp | 4 +- src/d/d_msg_scrn_explain.cpp | 2 +- src/d/d_msg_scrn_item.cpp | 2 +- src/d/d_msg_scrn_jimaku.cpp | 2 +- src/d/d_msg_scrn_kanban.cpp | 2 +- src/d/d_msg_scrn_talk.cpp | 2 +- src/d/d_msg_scrn_tree.cpp | 2 +- src/d/d_s_play.cpp | 2 +- src/d/d_s_room.cpp | 5 +- src/d/d_save.cpp | 20 ++-- src/f_op/f_op_actor_mng.cpp | 48 ++++----- 194 files changed, 767 insertions(+), 1029 deletions(-) diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h index ff727effba..418aec0e84 100644 --- a/include/d/actor/d_a_alink.h +++ b/include/d/actor/d_a_alink.h @@ -8271,7 +8271,7 @@ static void* daAlink_searchBoar(fopAc_ac_c* param_0, void* param_1); static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* p_actor, void* param_1); inline daAlink_c* daAlink_getAlinkActorClass() { - return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); + return (daAlink_c*)dComIfGp_getLinkPlayer(); } #endif /* D_A_D_A_ALINK_H */ diff --git a/include/d/actor/d_a_obj_table.h b/include/d/actor/d_a_obj_table.h index a52b90081d..cea036783c 100644 --- a/include/d/actor/d_a_obj_table.h +++ b/include/d/actor/d_a_obj_table.h @@ -15,17 +15,17 @@ */ class daObjTable_c : public dBgS_MoveBgActor { public: - int CreateHeap(); - int Create(); - int Execute(Mtx**); - int Draw(); - int Delete(); + inline int CreateHeap(); + inline int Create(); + inline int Execute(Mtx**); + inline int Draw(); + inline int Delete(); inline void initBaseMtx(); inline void setBaseMtx(); inline int create(); - s16 getMessageNo() { return (s16)fopAcM_GetParamBit(this, 0, 16); } + s16 getMessageNo() { return fopAcM_GetParam(this) & 0xFFFF; } private: /* 0x5A0 */ J3DModel* mpModel; diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index df64a28249..c4e922971e 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -285,7 +285,7 @@ public: dMsgObject_c* getMsgObjectClass() { return mItemInfo.mMsgObjectClass; } dStage_roomControl_c* getRoomControl() { return &mRoomControl; } dStage_dt_c& getStage() { return mStageData; } - dEvt_control_c& getEvent() { return mEvent; } + dEvt_control_c* getEvent() { return &mEvent; } daHorse_c* getHorseActor() { return (daHorse_c*)mPlayerPtr[1]; } J2DGrafContext* getCurrentGrafPort() { return (J2DGrafContext*)mCurrentGrafPort; } dVibration_c& getVibration() { return mVibration; } @@ -566,7 +566,7 @@ public: void setStartStageLayer(s8 layer) { mStartStage.setLayer(layer); } const char* getNextStageName() { return mNextStage.getName(); } - dStage_startStage_c* getNextStartStage() { return &mNextStage; } + dStage_startStage_c* getNextStartStage() { return mNextStage.getStartStage(); } s8 getNextStageRoomNo() { return mNextStage.getRoomNo(); } s8 getNextStageLayer() { return mNextStage.getLayer(); } s16 getNextStagePoint() { return mNextStage.getPoint(); } @@ -840,7 +840,6 @@ public: ~dComIfG_inf_c() {} void ct(); void createBaseCsr(); - dComIfG_play_c& getPlay() { return play; } // fake inline #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG class baseCsr_c : public mDoGph_gInf_c::csr_c { @@ -1462,27 +1461,63 @@ inline u8 dComIfGs_getSelectItemIndex(int i_no) { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectItemIndex(i_no); } -//TODO: actual name is unknown -inline u8 dComIfGs_getOptUnk0() { - return g_dComIfG_gameInfo.info.getPlayer().getConfig().getUnk0(); +// Ruby inline names are from TWW debug. +inline u8 dComIfGs_getOptRuby() { + return g_dComIfG_gameInfo.info.getPlayer().getConfig().getRuby(); +} + +inline void dComIfGs_setOptRuby(u8 i_ruby) { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setRuby(i_ruby); } inline u8 dComIfGs_getOptVibration() { return g_dComIfG_gameInfo.info.getPlayer().getConfig().getVibration(); } +inline void dComIfGs_setOptVibration(u8 i_status) { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setVibration(i_status); +} + inline u8 dComIfGs_getOptAttentionType() { return g_dComIfG_gameInfo.info.getPlayer().getConfig().getAttentionType(); } +inline void dComIfGs_setOptAttentionType(u8 i_attentionType) { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setAttentionType(i_attentionType); +} + inline u8 dComIfGs_getOptCameraControl() { return g_dComIfG_gameInfo.info.getPlayer().getConfig().getCameraControl(); } +inline void dComIfGs_setOptCameraControl(u8 i_cameraControl) { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setCameraControl(i_cameraControl); +} + inline u8 dComIfGs_getOptSound() { return g_dComIfG_gameInfo.info.getPlayer().getConfig().getSound(); } +inline void dComIfGs_setOptSound(u8 i_mode) { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(i_mode); +} + +inline void dComIfGs_setOptCalValue(s8 i_calValue) { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setCalValue(i_calValue); +} + +inline void dComIfGs_setOptCalibrateDist(u16 i_calibrateDist) { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setCalibrateDist(i_calibrateDist); +} + +inline u8 dComIfGs_getOptPointer() { + return g_dComIfG_gameInfo.info.getPlayer().getConfig().getPointer(); +} + +inline void dComIfGs_setOptPointer(u8 i_pointer) { + g_dComIfG_gameInfo.info.getPlayer().getConfig().setPointer(i_pointer); +} + inline BOOL dComIfGs_isTbox(int i_no) { return g_dComIfG_gameInfo.info.getMemory().getBit().isTbox(i_no); } @@ -2034,35 +2069,6 @@ inline void dComIfGs_setLastWarpAcceptStage(s8 param_0) { g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().setWarpAcceptStage(param_0); } -//TODO: actual name is unknown -inline void dComIfGs_setOptUnk0(u8 i_unk0) { - g_dComIfG_gameInfo.info.getPlayer().getConfig().setUnk0(i_unk0); -} - -inline void dComIfGs_setOptSound(u8 i_mode) { - g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(i_mode); -} - -inline void dComIfGs_setOptVibration(u8 i_status) { - g_dComIfG_gameInfo.info.getPlayer().getConfig().setVibration(i_status); -} - -inline void dComIfGs_setOptAttentionType(u8 i_attentionType) { - g_dComIfG_gameInfo.info.getPlayer().getConfig().setAttentionType(i_attentionType); -} - -inline void dComIfGs_setOptCameraControl(u8 i_cameraControl) { - g_dComIfG_gameInfo.info.getPlayer().getConfig().setCameraControl(i_cameraControl); -} - -inline void dComIfGs_setOptPointer(u8 i_pointer) { - g_dComIfG_gameInfo.info.getPlayer().getConfig().setPointer(i_pointer); -} - -inline u8 dComIfGs_getOptPointer() { - return g_dComIfG_gameInfo.info.getPlayer().getConfig().getPointer(); -} - inline u8 dComIfGs_getNewFile() { return g_dComIfG_gameInfo.info.getNewFile(); } @@ -2091,14 +2097,6 @@ inline u8 dComIfGs_getWalletSize() { return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getWalletSize(); } -inline void dComIfGs_setOptCalValue(s8 i_calValue) { - g_dComIfG_gameInfo.info.getPlayer().getConfig().setCalValue(i_calValue); -} - -inline void dComIfGs_setOptCalibrateDist(u16 i_calibrateDist) { - g_dComIfG_gameInfo.info.getPlayer().getConfig().setCalibrateDist(i_calibrateDist); -} - inline u16 dComIfGs_getFishNum(u8 param_0) { return g_dComIfG_gameInfo.info.getPlayer().getFishingInfo().getFishCount(param_0); } @@ -2572,7 +2570,7 @@ inline s8 dComIfGp_getNextStageLayer() { return g_dComIfG_gameInfo.play.getNextStageLayer(); } -inline s32 dComIfGp_getNextStageWipe() { +inline s8 dComIfGp_getNextStageWipe() { return g_dComIfG_gameInfo.play.getNextStageWipe(); } @@ -3582,7 +3580,7 @@ inline u8 dComIfGp_getAdvanceDirection() { return g_dComIfG_gameInfo.play.getDirection(); } -inline dEvt_control_c& dComIfGp_getEvent() { +inline dEvt_control_c* dComIfGp_getEvent() { return g_dComIfG_gameInfo.play.getEvent(); } @@ -3611,41 +3609,41 @@ inline s16 dComIfGp_getItemMaxBombNumCount() { } inline BOOL dComIfGp_event_compulsory(void* i_actor, const char* i_eventname, u16 i_hindFlag) { - return g_dComIfG_gameInfo.play.getEvent().compulsory(i_actor, i_eventname, i_hindFlag); + return g_dComIfG_gameInfo.play.getEvent()->compulsory(i_actor, i_eventname, i_hindFlag); } inline int dComIfGp_event_moveApproval(void* i_actor) { - return g_dComIfG_gameInfo.play.getEvent().moveApproval(i_actor); + return g_dComIfG_gameInfo.play.getEvent()->moveApproval(i_actor); } inline int dComIfGp_event_order(u16 i_type, u16 i_prio, u16 i_flags, u16 i_hindFlags, void* i_requestActor, void* i_targetActor, s16 i_eventID, u8 i_mapToolId) { - return g_dComIfG_gameInfo.play.getEvent().order(i_type, i_prio, i_flags, i_hindFlags, i_requestActor, + return g_dComIfG_gameInfo.play.getEvent()->order(i_type, i_prio, i_flags, i_hindFlags, i_requestActor, i_targetActor, i_eventID, i_mapToolId); } inline void dComIfGp_event_setGtItm(int i_itemNo) { - g_dComIfG_gameInfo.play.getEvent().setGtItm(i_itemNo); + g_dComIfG_gameInfo.play.getEvent()->setGtItm(i_itemNo); } inline void dComIfGp_event_reset() { - g_dComIfG_gameInfo.play.getEvent().reset(); + g_dComIfG_gameInfo.play.getEvent()->reset(); } inline void dComIfGp_event_remove() { - g_dComIfG_gameInfo.play.getEvent().remove(); + g_dComIfG_gameInfo.play.getEvent()->remove(); } inline void dComIfGp_event_onEventFlag(u16 i_flag) { - g_dComIfG_gameInfo.play.getEvent().onEventFlag(i_flag); + g_dComIfG_gameInfo.play.getEvent()->onEventFlag(i_flag); } inline void dComIfGp_event_onHindFlag(u16 i_flag) { - g_dComIfG_gameInfo.play.getEvent().onHindFlag(i_flag); + g_dComIfG_gameInfo.play.getEvent()->onHindFlag(i_flag); } inline void dComIfGp_event_offHindFlag(u16 i_flag) { - g_dComIfG_gameInfo.play.getEvent().offHindFlag(i_flag); + g_dComIfG_gameInfo.play.getEvent()->offHindFlag(i_flag); } inline void dComIfGp_evmng_cutEnd(int i_staffId) { @@ -3677,19 +3675,19 @@ inline int dComIfGp_evmng_cameraPlay() { } inline u8 dComIfGp_event_getPreItemNo() { - return g_dComIfG_gameInfo.play.getEvent().getPreItemNo(); + return g_dComIfG_gameInfo.play.getEvent()->getPreItemNo(); } inline void dComIfGp_event_setItemPartner(void* i_actor) { - g_dComIfG_gameInfo.play.getEvent().setPtI(i_actor); + g_dComIfG_gameInfo.play.getEvent()->setPtI(i_actor); } inline void dComIfGp_event_setItemPartnerId(fpc_ProcID i_id) { - g_dComIfG_gameInfo.play.getEvent().setPtI_Id(i_id); + g_dComIfG_gameInfo.play.getEvent()->setPtI_Id(i_id); } inline u8 dComIfGp_event_getGtItm() { - return g_dComIfG_gameInfo.play.getEvent().getGtItm(); + return g_dComIfG_gameInfo.play.getEvent()->getGtItm(); } inline int dComIfGp_evmng_startDemo(int i_mapToolId) { @@ -3697,58 +3695,58 @@ inline int dComIfGp_evmng_startDemo(int i_mapToolId) { } inline void dComIfGp_event_setTalkPartner(void* i_actor) { - g_dComIfG_gameInfo.play.getEvent().setPtT(i_actor); + g_dComIfG_gameInfo.play.getEvent()->setPtT(i_actor); } inline fopAc_ac_c* dComIfGp_event_getTalkPartner() { - return g_dComIfG_gameInfo.play.getEvent().getPtT(); + return g_dComIfG_gameInfo.play.getEvent()->getPtT(); } inline fopAc_ac_c* dComIfGp_event_getItemPartner() { - return g_dComIfG_gameInfo.play.getEvent().getPtI(); + return g_dComIfG_gameInfo.play.getEvent()->getPtI(); } inline fopAc_ac_c* dComIfGp_event_getPt1() { - return g_dComIfG_gameInfo.play.getEvent().getPt1(); + return g_dComIfG_gameInfo.play.getEvent()->getPt1(); } inline fopAc_ac_c* dComIfGp_event_getPt2() { - return g_dComIfG_gameInfo.play.getEvent().getPt2(); + return g_dComIfG_gameInfo.play.getEvent()->getPt2(); } inline BOOL dComIfGp_event_runCheck() { - return g_dComIfG_gameInfo.play.getEvent().runCheck(); + return g_dComIfG_gameInfo.play.getEvent()->runCheck(); } inline f32 dComIfGp_event_getCullRate() { - return g_dComIfG_gameInfo.play.getEvent().getCullRate(); + return g_dComIfG_gameInfo.play.getEvent()->getCullRate(); } inline u16 dComIfGp_event_checkHind(u16 i_hindFlag) { if (!dComIfGp_event_runCheck()) { return false; } - return g_dComIfG_gameInfo.play.getEvent().checkHind(i_hindFlag); + return g_dComIfG_gameInfo.play.getEvent()->checkHind(i_hindFlag); } inline u16 dComIfGp_event_chkEventFlag(u16 i_flag) { - return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(i_flag); + return g_dComIfG_gameInfo.play.getEvent()->chkEventFlag(i_flag); } inline BOOL dComIfGp_event_chkTalkXY() { - return g_dComIfG_gameInfo.play.getEvent().chkTalkXY(); + return g_dComIfG_gameInfo.play.getEvent()->chkTalkXY(); } inline void dComIfGp_event_setCullRate(f32 i_rate) { - g_dComIfG_gameInfo.play.getEvent().setCullRate(i_rate); + g_dComIfG_gameInfo.play.getEvent()->setCullRate(i_rate); } inline u8 dComIfGp_event_getMode() { - return g_dComIfG_gameInfo.play.getEvent().getMode(); + return g_dComIfG_gameInfo.play.getEvent()->getMode(); } inline fopAc_ac_c* dComIfGp_event_getDoorPartner() { - return g_dComIfG_gameInfo.play.getEvent().getPtD(); + return g_dComIfG_gameInfo.play.getEvent()->getPtD(); } inline int dComIfGp_evmng_getMyStaffId(const char* i_staffname, fopAc_ac_c* i_actor, int i_tagId) { diff --git a/include/d/d_save.h b/include/d/d_save.h index e8eccb9d1b..fff3db0a7a 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -506,10 +506,9 @@ public: void setVibration(u8 i_status); u8 getPalLanguage() const; - //TODO: placeholder name, actual name is not known - u8 getUnk0() { return unk0; } - void setUnk0(u8 i_unk0) { unk0 = i_unk0; } - + // Ruby inline names are from TWW debug. + u8 getRuby() { return mRuby; } + void setRuby(u8 i_ruby) { mRuby = i_ruby; } u8 getAttentionType() { return mAttentionType; } void setAttentionType(u8 i_mAttentionType) { mAttentionType = i_mAttentionType; } u16 getCalibrateDist() { return mCalibrateDist; } @@ -532,7 +531,7 @@ public: }; private: - /* 0x0 */ u8 unk0; + /* 0x0 */ u8 mRuby; /* 0x1 */ u8 mSoundMode; /* 0x2 */ u8 mAttentionType; // Lock-On Type; 0 : hold, 1 : switch /* 0x3 */ u8 mVibration; // Rumble status diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 4afb1e9afb..2838afa6a7 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1100,7 +1100,7 @@ public: static void setZoneNo(int, int); static dBgp_c* getBgp(int i_roomNo) { #if DEBUG - // NONMATCHING + // DEBUG NONMATCHING #else return NULL; #endif @@ -1230,6 +1230,7 @@ public: BOOL isEnable() const { return enabled; } s8 getWipe() const { return wipe; } u8 getWipeSpeed() const { return wipe_speed; } + dStage_startStage_c* getStartStage() { return this; } private: s8 enabled; diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 02bd952e3e..c603ce2755 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -4608,7 +4608,7 @@ int daAlink_c::create() { } if (var_r24 != NULL) { - dComIfGp_getEvent().setPtD(var_r24); + dComIfGp_getEvent()->setPtD(var_r24); } bgWaitFlg = 0; @@ -16597,7 +16597,7 @@ int daAlink_c::procCrouch() { int daAlink_c::procCoMetamorphoseInit() { int var_r29 = 0; - if (dComIfGp_getEvent().isOrderOK()) { + if (dComIfGp_getEvent()->isOrderOK()) { if (!dComIfGp_event_compulsory(this, NULL, 0xFFFF)) { return 0; } @@ -17275,7 +17275,7 @@ int daAlink_c::execute() { mWolfEyeUp = mpHIO->mWolf.m.mSensesLingerTime; } else if (mTargetedActor != NULL || dComIfGp_checkPlayerStatus0(0, 0x2000)) { mWolfEyeUp = mpHIO->mWolf.m.mSensesLingerTime - 1; - } else if (!dComIfGp_getEvent().isOrderOK() && mProcID != PROC_GET_ITEM && + } else if (!dComIfGp_getEvent()->isOrderOK() && mProcID != PROC_GET_ITEM && mWolfEyeUp <= mpHIO->mWolf.m.mSensesLingerTime) { offWolfEyeUp(); diff --git a/src/d/actor/d_a_alink_HIO.inc b/src/d/actor/d_a_alink_HIO.inc index 5174833128..52392eec13 100644 --- a/src/d/actor/d_a_alink_HIO.inc +++ b/src/d/actor/d_a_alink_HIO.inc @@ -77,7 +77,7 @@ static void daAlinkHIO_setReverseAnmGenMessage(daAlinkHIO_anm_c* i_anmP, JORMCon 0x18); } -// NONMATCHING - regalloc + extra mr instruction +// DEBUG NONMATCHING - regalloc + extra mr instruction void daAlinkHIO_data_c::setStructData(char* param_1) { u8* pfVar2; u8* pfVar4; @@ -146,7 +146,7 @@ void daAlinkHIO_data_c::baseCopy() { cLib_memCpy(mp_data, mp_src_data, m_len); } -// NONMATCHING +// DEBUG NONMATCHING void daAlinkHIO_data_c::update() { baseCopy(); JORMContext* ctx = attachJORMContext(8); @@ -5764,7 +5764,6 @@ void daAlinkHIO_wolf_c::genMessage(JORMContext* ctx) { ctx->genSlider("光雫Ｂ", &m.mLightDropB, -0x40, 0x40, 0, NULL, 0xffff, 0xffff, 0x200, 0x18); } -// NONMATCHING daAlinkHIO_wolf_c::daAlinkHIO_wolf_c() : mWlMove(), mWlMoveNoP(), mWlAtnMove(), mWlSideStep(), mWlBackJump(), mWlHowl(), mWlAutoJump(), mWlPush(), mWlLie(), mLight(1), mWlWallHang(), mWlDamage(), mWlSlide(), mWlRope(), diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index f524aada1d..a855799204 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -70,7 +70,7 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) { } int daAlink_c::checkDemoAction() { - if (dComIfGp_getEvent().isOrderOK()) { + if (dComIfGp_getEvent()->isOrderOK()) { if (!dComIfGp_event_runCheck()) { offNoResetFlg0(FLG0_UNK_200000); } @@ -566,7 +566,7 @@ void daAlink_c::setNoDrawSwordShield(int param_0, u16 param_1) { } void daAlink_c::setDemoData() { - if (dComIfGp_getEvent().isOrderOK()) { + if (dComIfGp_getEvent()->isOrderOK()) { if (checkPlayerDemoMode() && mClothesChangeWaitTimer == 0) { endDemoMode(); } diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc index d11ad1f601..77e4b67d45 100644 --- a/src/d/actor/d_a_alink_wolf.inc +++ b/src/d/actor/d_a_alink_wolf.inc @@ -3967,7 +3967,7 @@ int daAlink_c::procWolfHowlDemo() { daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl; daNpc_GWolf_c* gwolf_p = (daNpc_GWolf_c*)field_0x280c.getActor(); - BOOL skip_edge = dComIfGp_getEvent().checkSkipEdge(); + BOOL skip_edge = dComIfGp_getEvent()->checkSkipEdge(); if (skip_edge) { mZ2WolfHowlMgr.skipCorrectDemo(); } @@ -4012,11 +4012,11 @@ int daAlink_c::procWolfHowlDemo() { if (checkUnderMove0BckNoArcWolf(WANM_HOWL_SUCCESS)) { if (gwolf_p == NULL) { - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); } } else if (checkUnderMove0BckNoArcWolf(WANM_HOWL_END)) { if (gwolf_p == NULL) { - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); } } else if ((var_r26 || mZ2WolfHowlMgr.getTimer() != 0) && mZ2WolfHowlMgr.getReleaseTimer() != 30) @@ -4143,7 +4143,7 @@ int daAlink_c::procWolfHowlDemo() { dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); } else { - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); } } @@ -9281,7 +9281,7 @@ int daAlink_c::procWolfGetSmell() { if (field_0x319c >= 0) { if (checkSpecialDemoMode()) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); dComIfGp_clearPlayerStatus1(0, 0x4000000); if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) { diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 9ad4e41b03..376f439561 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -62,7 +62,7 @@ int daAlldie_c::actionOrder() { int daAlldie_c::actionEvent() { if (dComIfGp_evmng_endCheck(mEventIdx)) { - dComIfGp_getEvent().reset(); + dComIfGp_getEvent()->reset(); if (mNextEventIdx != -1) { mAction = ACT_NEXT; diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 9339260a1c..6513781efe 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -1423,7 +1423,7 @@ static void demo_camera(b_bq_class* i_this) { i_this->mDemoCamEye = camera0->lookat.eye; i_this->mDemoCamCenter = camera0->lookat.center; - dComIfGp_getEvent().startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(a_this); // fallthrough case 11: if (i_this->mDemoModeTimer == (s16)(VREG_S(0) + 8)) { @@ -2136,7 +2136,7 @@ static void demo_camera(b_bq_class* i_this) { } if (i_this->mDemoMode >= 11 && i_this->mDemoMode < 20) { - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { cDmr_SkipInfo = 20; Z2GetAudioMgr()->subBgmStop(); OS_REPORT("//////////////B_BQ SKIP 11\n"); diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index bad6772369..cdf3befcb7 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -3859,7 +3859,7 @@ int daB_DR_c::execute() { fopAc_ac_c* parent; if (fopAcM_SearchByID(parentActorID, &parent) != 0 && parent != NULL && parent->argument != 1) { if (dComIfGs_isZoneSwitch(20, fopAcM_GetRoomNo(this))) { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); } } else if (!dComIfGs_isZoneSwitch(0, fopAcM_GetRoomNo(this)) && cLib_calcTimer(&mTimer[0]) == 0) { dComIfGs_onZoneSwitch(0, fopAcM_GetRoomNo(this)); diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 5335844544..fefbedbbd0 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -1234,7 +1234,7 @@ void daB_DS_c::executeOpeningDemo() { Z2GetAudioMgr()->setDemoName("force_start"); if (mMode == 10) { - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); sp298.set(mOpPlayerDt[1]); daPy_getPlayerActorClass()->changeDemoMode(4, 2, 0, 0); @@ -1713,7 +1713,7 @@ void daB_DS_c::executeOpeningDemo() { } } - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { cDmr_SkipInfo = 1; dStage_changeScene(2, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); dComIfGs_onZoneSwitch(5, fopAcM_GetRoomNo(this)); diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index 013ed52d62..243b415ac3 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -935,8 +935,8 @@ void daB_GG_c::St_CamAction() { } if (mCamMode != 0) { - dComIfGp_getEvent().onSkipFade(); - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); } } @@ -1373,8 +1373,8 @@ void daB_GG_c::Gn_CamAction() { } if (mCamMode > 1) { - dComIfGp_getEvent().onSkipFade(); - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); } } diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 7228df2ca5..4f911c8a90 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -1038,7 +1038,7 @@ static void demo_camera(b_gm_class* i_this) { spBC.set(0.0f, 0.0f, 2418.0f); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&spBC, 0x8000, 0); - dComIfGp_getEvent().startCheckSkipEdge(i_this); + dComIfGp_getEvent()->startCheckSkipEdge(i_this); camera->mCamera.SetTrimSize(3); mDoAud_seStart(Z2SE_EN_GO_DEMO_OP, NULL, 0, 0); @@ -1563,7 +1563,7 @@ static void demo_camera(b_gm_class* i_this) { } if (i_this->mDemoMode != 0 && i_this->mDemoMode < 10) { - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { i_this->mMode = 4; i_this->mTimers[2] = cM_rndF(100.0f) + 200.0f; sp10 = 1; diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 2fb9403d8d..dbba925577 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -2878,6 +2878,7 @@ static void demo_camera(b_gnd_class* i_this) { if (i_this->mDemoCamMode != 0) { // fakematch - dComIfGp_getHorseActor() isn't getting inlined for some reason horse = (daHorse_c*)g_dComIfG_gameInfo.play.getPlayerPtr(1); + // horse = (daHorse_c*)dComIfGp_getHorseActor(); } cXyz sp114; @@ -3483,8 +3484,7 @@ static void demo_camera(b_gnd_class* i_this) { a_this->current.pos.set(0.0f, 1100.0f, 0.0f); a_this->old.pos = a_this->current.pos; - a_this->shape_angle.y = -0x2000; - a_this->current.angle.y = -0x2000; + a_this->current.angle.y = a_this->shape_angle.y = -0x2000; cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); sp114.x = -300.0f; @@ -3653,8 +3653,7 @@ static void demo_camera(b_gnd_class* i_this) { player->setPlayerPosAndAngle(&sp108, -0x4802, 0); a_this->current.pos.set(-600.0f, 1100.0f, 0.0f); a_this->old.pos = a_this->current.pos; - a_this->current.angle.y = 0x37FE; - a_this->shape_angle.y = 0x37FE; + a_this->shape_angle.y = a_this->current.angle.y = 0x37FE; sp8 = TRUE; } break; @@ -3679,8 +3678,7 @@ static void demo_camera(b_gnd_class* i_this) { a_this->current.pos.set(-600.0f, 1100.0f, 0.0f); a_this->old.pos = a_this->current.pos; - a_this->current.angle.y = 0x37FE; - a_this->shape_angle.y = 0x37FE; + a_this->shape_angle.y = a_this->current.angle.y = 0x37FE; sp108.set(0.0f, 1100.0f, 0.0f); fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1); diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index 97575825d3..51c8fe8684 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -2814,8 +2814,8 @@ void daB_MGN_c::executeOpening() { } camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0); - dComIfGp_getEvent().onSkipFade(); - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); mSound.startCreatureVoiceLevel(Z2SE_EN_MGN_DEMO_OP, -1); } diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 9c34171cae..8b4c5eedb6 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -2369,7 +2369,7 @@ static void demo_camera(b_ob_class* i_this) { } if (i_this->mDemoActionTimer == 30) { - dComIfGp_getEvent().startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(a_this); } sp88 = a_this->current.pos; @@ -2975,7 +2975,7 @@ static void demo_camera(b_ob_class* i_this) { cLib_addCalcAngleS2(&i_this->mBlureRate, i_this->mBlureRateTarget, 1, 8); if (i_this->mDemoAction >= 31 && i_this->mDemoAction < 40) { - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { cDmr_SkipInfo = JREG_S(8) + 30; dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(a_this), 0, -1); } diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index f768a4f875..09b761d637 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -1817,8 +1817,8 @@ void daB_TN_c::executeRoomDemo() { } camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); - dComIfGp_getEvent().onSkipFade(); - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); } void daB_TN_c::executeOpening() { @@ -2014,8 +2014,8 @@ void daB_TN_c::executeOpening() { } camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); - dComIfGp_getEvent().onSkipFade(); - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); } void daB_TN_c::executeWaitH() { diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index ccb33ce32d..ee926cd717 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -1241,8 +1241,8 @@ void daB_YO_c::executeOpening() { } camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0); - dComIfGp_getEvent().onSkipFade(); - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); } static f32 yo_max_bound_speed[8] = {10.0f, 12.0f, 15.0f, 18.0f, 21.0f, 24.0f, 27.0f, 30.0f}; diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 06be94937c..4bf468af08 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -2015,7 +2015,7 @@ int daDoor20_c::chkStopOpen() { roomNo = door_param2_c::getBRoomNo(this); } if ((field_0x68c == 0 && frontOption == 3) || (field_0x68c == 1 && backOption == 3)) { - if (dComIfGp_event_runCheck() == 0 || (field_0x68d == 0)) { + if (dComIfGp_event_runCheck() == FALSE || (field_0x68d == 0)) { if (dComIfGp_roomControl_checkRoomDisp(roomNo) && fopAcM_myRoomSearchEnemy(roomNo) == NULL) { @@ -2024,7 +2024,7 @@ int daDoor20_c::chkStopOpen() { return 0; } if (swBit != 0xff) { - g_dComIfG_gameInfo.info.onSwitch(swBit, roomNo); + dComIfGs_onSwitch(swBit, roomNo); } return 1; } diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 7411529a63..76034bb66d 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -1933,8 +1933,8 @@ void daE_DT_c::executeOpening() { } camera->Set(mCamCenter, mCamEye, mCamFovy, mCamBank); - dComIfGp_getEvent().onSkipFade(); - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); } void daE_DT_c::calcCamera() { diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index a17e1f024f..73bebf54ed 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -461,7 +461,7 @@ void daE_FB_c::executeAttack() { } } - if (dComIfGp_event_runCheck() == FALSE) { + if (!dComIfGp_event_runCheck()) { cMtx_YrotS(*calc_mtx, current.angle.y); cMtx_XrotM(*calc_mtx, sp_0x28.x); sp_0x48.x = 0.0f; diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index b6386d3f00..3dae088fbd 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -1284,7 +1284,7 @@ static void demo_camera(e_fm_class* i_this) { i_this->mDemoCamCenter = camera0->lookat.center; i_this->field_0x778 = 0.0f; camera->mCamera.SetTrimSize(3); - dComIfGp_getEvent().startCheckSkipEdge(actor); + dComIfGp_getEvent()->startCheckSkipEdge(actor); case 11: if (i_this->mDemoCamTimer == (s16)(VREG_S(0) + 8)) { daPy_getPlayerActorClass()->changeDemoMode(0x19, 0, 0, 0); @@ -1974,7 +1974,7 @@ static s8 e_fm_start(e_fm_class* i_this) { i_this->mDamageInvulnerabilityTimer = 5; int var_r26 = 0; - if (i_this->mDemoCamMode >= 11 && dComIfGp_getEvent().checkSkipEdge()) { + if (i_this->mDemoCamMode >= 11 && dComIfGp_getEvent()->checkSkipEdge()) { cDmr_SkipInfo = 1; i_this->mDemoCamMode = 1000; dComIfGp_event_reset(); diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index a7cd49b80f..83e265b3eb 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -1137,7 +1137,7 @@ static void demo_camera(e_gb_class* i_this) { i_this->demoCamStepScale = 0.0; Z2GetAudioMgr()->setBattleBgmOff(true); - dComIfGp_getEvent().startCheckSkipEdge(actor); + dComIfGp_getEvent()->startCheckSkipEdge(actor); swBit = (fopAcM_GetParam(actor) & 0xFF00) >> 8; dComIfGs_onSwitch(swBit, fopAcM_GetRoomNo(actor)); // fallthrough @@ -1290,8 +1290,8 @@ static void demo_camera(e_gb_class* i_this) { i_this->demoCounter++; if (i_this->demoMode < 10) { - dComIfGp_getEvent().setSkipProc(i_this, dEv_defaultSkipProc, 0); - if (dComIfGp_getEvent().checkSkipEdge()) { + dComIfGp_getEvent()->setSkipProc(i_this, dEv_defaultSkipProc, 0); + if (dComIfGp_getEvent()->checkSkipEdge()) { i_this->demoMode = 100; cMtx_YrotS(*calc_mtx, player->shape_angle.y); work.x = 0.0; diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index f70008fd83..724c4ff83e 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -1670,7 +1670,7 @@ static void demo_camera(e_gob_class* i_this) { player->changeOriginalDemo(); Z2GetAudioMgr()->subBgmStart(Z2BGM_MAGNE_GORON_D01); - dComIfGp_getEvent().startCheckSkipEdge(i_this); + dComIfGp_getEvent()->startCheckSkipEdge(i_this); // fallthrough case 2: if (i_this->mDemoCamTimer < 20) { @@ -1993,7 +1993,7 @@ static void demo_camera(e_gob_class* i_this) { i_this->mDemoCamTimer = 10000; } - if (i_this->mDemoCamMode >= 2 && i_this->mDemoCamMode < 10 && dComIfGp_getEvent().checkSkipEdge()) { + if (i_this->mDemoCamMode >= 2 && i_this->mDemoCamMode < 10 && dComIfGp_getEvent()->checkSkipEdge()) { cDmr_SkipInfo = 20; i_this->mDemoCamMode = 1000; dStage_changeScene(2, 0.0f, 0, fopAcM_GetRoomNo(actor), 0, -1); diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 90338615e6..4eb4202437 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -705,7 +705,6 @@ void daE_HP_c::executeDown() { } } -// NONMATCHING - g_dComIfG_gameInfo loading void daE_HP_c::executeDead() { if (field_0x78d == 0 && field_0x71c == 1) { mSound1.startCreatureSound(Z2SE_EN_PO_SOUL_PULLOUT, 0, -1); @@ -735,21 +734,10 @@ void daE_HP_c::executeDead() { movemode++; } case 1: { -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandDemoAccrpt()) { if (dComIfGp_getEventManager().endCheck(field_0x778)) { -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif } else if (strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM") == 0 && field_0x784 != -1) diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 50a598f172..47e68003e4 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -1288,7 +1288,7 @@ static void demo_camera_start(e_mk_class* i_this) { i_this->distToCamCenterTarget.y = fabsf(i_this->camCenterTarget.y - i_this->camCenter.y); i_this->distToCamCenterTarget.z = fabsf(i_this->camCenterTarget.z - i_this->camCenter.z); - dComIfGp_getEvent().startCheckSkipEdge(actor); + dComIfGp_getEvent()->startCheckSkipEdge(actor); // fallthrough case 2: if (i_this->demoCamCounter == (s16)(8 + VREG_S(0))) { @@ -1532,7 +1532,7 @@ static void demo_camera_start(e_mk_class* i_this) { break; } - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { u8 sw_bit = (fopAcM_GetParam(actor) & 0xff0000) >> 16; if (sw_bit != 0xff) { dComIfGs_onSwitch(sw_bit, fopAcM_GetRoomNo(actor)); @@ -1850,7 +1850,7 @@ static void demo_camera_end(e_mk_class* i_this) { if (i_this->demoCamCounter == 200) { player->changeDemoMode(1, 3, 0, 0); player->changeDemoParam0(3); - dComIfGp_getEvent().setPtT(boomerang_p); + dComIfGp_getEvent()->setPtT(boomerang_p); } if (i_this->demoCamCounter != (s16)(KREG_S(9) + 250)) { @@ -2011,7 +2011,7 @@ static void demo_camera_r04(e_mk_class* i_this) { i_this->distToCamEyeTarget.y = fabsf(i_this->camEyeTarget.y - i_this->camEye.y) * 0.02f; i_this->distToCamEyeTarget.z = fabsf(i_this->camEyeTarget.z - i_this->camEye.z) * 0.02f; - dComIfGp_getEvent().startCheckSkipEdge(i_this); + dComIfGp_getEvent()->startCheckSkipEdge(i_this); // fallthrough case 2: if (i_this->demoCamCounter > 60) { @@ -2308,7 +2308,7 @@ static void demo_camera(e_mk_class* i_this) { case e_mk_class::DEMO_MODE_R04: demo_camera_r04(i_this); - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { npc_ks_class* monkey_p = (npc_ks_class*)fpcM_Search(s_ks_sub, i_this); if (monkey_p != NULL) { u8 sw_bit = (fopAcM_GetParam(actor) & 0xFF0000) >> 16; diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 6a266cb87a..e8bb8c8f3e 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -1127,7 +1127,7 @@ void daE_OC_c::executeFind() { s16 pl_ang = fopAcM_searchPlayerAngleY(this); f32 pl_dist = fopAcM_searchPlayerDistance(this); if (mOcState < 3 || !setWatchMode()) { - if (field_0x6b4 == 2 && dComIfGp_event_runCheck() == FALSE) { + if (field_0x6b4 == 2 && !dComIfGp_event_runCheck()) { fopAcM_OffStatus(this, 0x4000); field_0x6b4 = 0; } @@ -2255,7 +2255,7 @@ void daE_OC_c::executeFindStay() { current.angle.y = shape_angle.y; if (target_dist < 400.0f && target_dist > 200.0f) { if (abs(shape_angle.y - fopAcM_searchPlayerAngleY(this)) < 0x1000 && checkBeforeFloorBg(100.0f) - && dComIfGp_event_runCheck() == FALSE) { + && !dComIfGp_event_runCheck()) { setActionMode(E_OC_ACTION_ATTACK, 0); } @@ -2353,7 +2353,7 @@ void daE_OC_c::executeMoveOut() { if (player_distance < 400.0f && player_distance > 200.0f) { if (abs(shape_angle.y - fopAcM_searchPlayerAngleY(this)) < 0x1000 - && dComIfGp_event_runCheck() == FALSE) { + && !dComIfGp_event_runCheck()) { setActionMode(E_OC_ACTION_ATTACK, 0); } diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index b2edcdea7e..f4dde1c3cc 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -220,7 +220,7 @@ void daE_OctBg_c::mtx_set() { bool daE_OctBg_c::checkNormalAttack() { daPy_py_c* player = daPy_getPlayerActorClass(); - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { return false; } if (unk_bss_7A < l_HIO.field_0x20 && diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index aa134b2820..9fe29edb9b 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -788,8 +788,8 @@ void daE_PM_c::AppearAction() { cLib_addCalcAngleS2(¤t.angle.y, mTargetAngleY, 5, 0x1000); cLib_addCalcAngleS2(&mHeadAngleX, mTargetHeadAngleX, 4, 0x1000); if (mAction != ACT_START || mMode != 0) { - dComIfGp_getEvent().onSkipFade(); - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); } } @@ -2039,8 +2039,8 @@ void daE_PM_c::BossAction() { } else { DemoBossStart(); } - dComIfGp_getEvent().onSkipFade(); - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); } if (mSecondEncounter && daPy_getPlayerActorClass()->checkWolfLock(this)) { diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index cd6099ef04..6db6e2b4b7 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -1231,21 +1231,10 @@ static void e_po_dead(e_po_class* i_this) { i_this->mType += 1; case 51: -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (a_this->eventInfo.checkCommandDemoAccrpt()) { if (dComIfGp_getEventManager().endCheck(i_this->field_0x762) != 0) { -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif } else { if (strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM") == 0 && @@ -1259,7 +1248,7 @@ static void e_po_dead(e_po_class* i_this) { } } } else if (i_this->field_0x75B != 0) { - if (dComIfGp_getEvent().isOrderOK()) { + if (dComIfGp_getEvent()->isOrderOK()) { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, -1, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index 2cf270e694..389f550e1c 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -503,7 +503,7 @@ void daE_PZ_c::executeOpeningDemo() { field_0x7d0 = 2; setBck(8, 0, 3.0f, -1.0f); mpModelMorf->setFrame(0.0f); - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); dComIfGs_onSaveDunSwitch(41); mMoveMode++; break; @@ -717,7 +717,7 @@ void daE_PZ_c::executeOpeningDemo() { mMoveMode = 130; } - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 3); } break; @@ -1146,7 +1146,7 @@ void daE_PZ_c::executeOpeningDemo() { camera->mCamera.Set(mDemoCameraCenter, mDemoCameraEye); } - if (((mMoveMode >= 2 && mMoveMode <= 17) || (mMoveMode >= 102 && mMoveMode <= 125)) && dComIfGp_getEvent().checkSkipEdge()) { + if (((mMoveMode >= 2 && mMoveMode <= 17) || (mMoveMode >= 102 && mMoveMode <= 125)) && dComIfGp_getEvent()->checkSkipEdge()) { cDmr_SkipInfo = 1; dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); Z2GetAudioMgr()->bgmStreamStop(0x1E); diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index c3a8b87d77..ce2532cb50 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1105,7 +1105,7 @@ static void demo_camera(e_rdb_class* i_this) { i_this->mDemoCamFovy = 55.0f; camera->mCamera.SetTrimSize(3); player->changeOriginalDemo(); - dComIfGp_getEvent().startCheckSkipEdge(i_this); + dComIfGp_getEvent()->startCheckSkipEdge(i_this); Z2GetAudioMgr()->setDemoName("force_start"); // [[fallthrough]] case 2: @@ -1352,7 +1352,7 @@ static void demo_camera(e_rdb_class* i_this) { } if (i_this->mDemoMode > 0 && i_this->mDemoMode < 10) { - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { sVar1 = 1; i_this->mAction = ACTION_WAIT; i_this->mMode = 10; diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 4227cae259..9958da8446 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -3838,7 +3838,7 @@ static void demo_camera(e_rdy_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(0x17, 0, 0, 0); i_this->mCamDist = 300.0f; - dComIfGp_getEvent().startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(a_this); i_this->mTargetAngleY = i_this->mPlayerAngle; a_this->current.angle.y = -0x3384; a_this->shape_angle.y = a_this->current.angle.y; @@ -3996,7 +3996,7 @@ static void demo_camera(e_rdy_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(4, 0, 0, 0); Z2GetAudioMgr()->bgmStop(70, 0); - dComIfGp_getEvent().offFlag2(8); + dComIfGp_getEvent()->offFlag2(8); dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[11] & 0xffff); // fallthrough @@ -4008,7 +4008,7 @@ static void demo_camera(e_rdy_class* i_this) { i_this->mMsgFlow.init(a_this, 0x7d1, 0, NULL); } if (i_this->mDemoTimer == 50) { - dComIfGp_getEvent().startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(a_this); } if (i_this->mDemoTimer == 55) { daPy_getPlayerActorClass()->changeDemoMode(1, 4, 0, 0); @@ -4197,7 +4197,7 @@ static void demo_camera(e_rdy_class* i_this) { } if (i_this->mDemoMode >= 11 && i_this->mDemoMode < 20) { - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { a_this->current.pos.set(-103242.0f, -22894.0f, 38097.0f); a_this->current.angle.y = 0x44a3; a_karg->current.pos.set(-103242.0f, -22894.0f, 38097.0f); @@ -4213,7 +4213,7 @@ static void demo_camera(e_rdy_class* i_this) { Z2GetAudioMgr()->setBattleBgmOff(false); } } else if (i_this->mDemoMode >= 20 && i_this->mDemoMode < 29) { - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { cVar13 = 2; vec2.set(-93666.0f, -5951.0f, 39000.0f); player->setPlayerPosAndAngle(&vec2, 0, 0); diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index 7fb4012ee7..45bf84f63c 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -847,7 +847,7 @@ static s16 e_sf_sitwait(e_sf_class* i_this) { rv = 0xFF; i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_SF_V_FIRST_DEMO, -1); - if (dComIfGp_getEvent().checkSkipEdge() || i_this->mpModelMorf->isStop()) { + if (dComIfGp_getEvent()->checkSkipEdge() || i_this->mpModelMorf->isStop()) { i_this->mAction = ACTION_FIGHT_RUN; i_this->mActionPhase = FIGHT_RUN_PHASE_NEG_10; i_this->mTimers[0] = 60; @@ -1384,7 +1384,7 @@ static void demo_camera(e_sf_class* i_this) { i_this->field_0xfda = 0; i_this->mDemoCamFovy = 75.0f; camera->mCamera.SetTrimSize(3); - dComIfGp_getEvent().startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(a_this); daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0); // fallthrough diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index 896a465ea1..cb9caf6fa0 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -708,7 +708,7 @@ static void demo_camera(e_th_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(1, 0, 0, 0); - dComIfGp_getEvent().startCheckSkipEdge(i_this); + dComIfGp_getEvent()->startCheckSkipEdge(i_this); case 2: sp80.set(1.9f, 0.0f, -1127.0f); player->setPlayerPosAndAngle(&sp80, -0x8000, 0); @@ -993,7 +993,7 @@ static void demo_camera(e_th_class* i_this) { camera->mCamera.Set(i_this->mDemoCamCenter, i_this->mDemoCamEye, i_this->mDemoCamFovy, 0); i_this->mDemoCamTimer++; - if (i_this->mDemoCamMode >= 2 && i_this->mDemoCamMode < 10 && dComIfGp_getEvent().checkSkipEdge()) { + if (i_this->mDemoCamMode >= 2 && i_this->mDemoCamMode < 10 && dComIfGp_getEvent()->checkSkipEdge()) { Z2GetAudioMgr()->subBgmStop(); cDmr_SkipInfo = 30; dStage_changeScene(4, 0.0f, 0, fopAcM_GetRoomNo(i_this), 0, -1); diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index 98edc800bc..b131638ec9 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -1728,8 +1728,8 @@ void daE_VA_c::executeDemoOp() { calcTagAngle(); camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamBank, 0); - dComIfGp_getEvent().onSkipFade(); - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); } void daE_VA_c::executeClearWait() { diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index 07a7b71d11..7157621c62 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -274,10 +274,11 @@ static void demo_camera(e_warpappear_class* i_this) { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); + camera_class* camera0 = dComIfGp_getCamera(0); daHorse_c* horseActor = (daHorse_c*)dComIfGp_getHorseActor(); cXyz sp48, sp54; - dComIfG_play_c* play; + cXyz temp1, temp2; switch (i_this->field_0x59e) { case 1: if (!i_this->eventInfo.checkCommandDemoAccrpt()) { @@ -464,9 +465,7 @@ static void demo_camera(e_warpappear_class* i_this) { i_this->field_0x5f8 = 0.0f; } - // TODO: gameInfo fake match to force reuse of pointer - play = &g_dComIfG_gameInfo.play; - play->getEvent().onHindFlag(15); + dComIfGp_event_onHindFlag(15); if (i_this->field_0x59e == 5) { if (i_this->field_0x5a0 >= 310) { @@ -496,7 +495,7 @@ static void demo_camera(e_warpappear_class* i_this) { camera->mCamera.Reset(i_this->field_0x5b0, i_this->field_0x5a4, i_this->field_0x5f4, 0); camera->mCamera.Start(); camera->mCamera.SetTrimSize(0); - play->getEvent().reset(); + dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); fopAcM_delete(i_this); fpcM_Search(s_s1fight_sub, i_this); diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 055e882782..b8415ed5de 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -3409,7 +3409,6 @@ static s8 e_wb_c_run(e_wb_class* i_this) { return return_value; } -// NONMATCHING - regalloc / conditional pathing static void action(e_wb_class* i_this) { fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this; cXyz pos1; @@ -3740,7 +3739,7 @@ static void demo_camera(e_wb_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); fpcM_Search(s_wbdel_sub, a_this); - dComIfGp_getEvent().startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(a_this); // fallthrough case 2: if (i_this->field_0x16a0 == 0xa0) { @@ -4085,7 +4084,7 @@ static void demo_camera(e_wb_class* i_this) { } if (i_this->field_0x16a0 == 40) { horse->changeDemoMode(8, 0); - dComIfGp_getEvent().startCheckSkipEdge(a_this); + dComIfGp_getEvent()->startCheckSkipEdge(a_this); } if (i_this->field_0x16a0 == 80) { horse->changeDemoMode(9, 0); @@ -4305,7 +4304,7 @@ static void demo_camera(e_wb_class* i_this) { horse->changeDemoPos0(&cStack_48); dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[87]); Z2GetAudioMgr()->bgmStart(Z2BGM_HORSE_BATTLE_D02, 0, 0); - dComIfGp_getEvent().startCheckSkipEdge(i_this); + dComIfGp_getEvent()->startCheckSkipEdge(i_this); // fallthrough case 0x29: if (i_this->field_0x16a0 == 30) { @@ -4428,7 +4427,7 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16bc.set(1679.0, 100.0, 852.0); i_this->field_0x16a4.set(1873.0, 64.0, 527.0); daPy_getPlayerActorClass()->changeOriginalDemo(); - dComIfGp_getEvent().startCheckSkipEdge(i_this); + dComIfGp_getEvent()->startCheckSkipEdge(i_this); dComIfGs_onOneZoneSwitch(4, -1); case 0x33: if (i_this->field_0x16a0 < 30) { @@ -4956,7 +4955,7 @@ static void demo_camera(e_wb_class* i_this) { } if (i_this->field_0x169e < 10 || (i_this->field_0x169e >= 30 && i_this->field_0x169e < 60)) { - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { cDmr_SkipInfo = 0x28; Z2GetAudioMgr()->bgmStop(0, 0); if (i_this->field_0x169e < 10 || dComIfG_play_c::getLayerNo(0) == 4) { diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 81a24edf3a..536754f7cf 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -780,7 +780,7 @@ void daE_YM_c::executeEscape() { field_0x6dc = 0.0f; } } - if (dComIfGp_event_runCheck() == 0) { + if (!dComIfGp_event_runCheck()) { fopAcM_OffStatus(this, 0x4000); } switch (mMode) { @@ -2517,7 +2517,7 @@ void daE_YM_c::executeFire() { shape_angle.y = current.angle.y; break; case 3: - if (dComIfGp_event_runCheck() == 0) { + if (!dComIfGp_event_runCheck()) { mSphCc.OnCoSetBit(); } else { mSphCc.OffCoSetBit(); diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 0bbc284203..750a6ea406 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -2302,7 +2302,7 @@ void daE_YMB_c::executeLakeDemo() { break; case 2: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); field_0x760 += field_0x762; mDemoCamCenter.set(-81000.0f, -17000.0f, 33000.0f); sp24.set(0.0f, 0.0f, 1000.0f); @@ -2320,7 +2320,7 @@ void daE_YMB_c::executeLakeDemo() { break; case 3: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); cLib_chaseF(&field_0x75c, 300.0f, 10.0f); cLib_chaseAngleS(&field_0x762, 0, 0x10); field_0x760 += field_0x762; @@ -2344,7 +2344,7 @@ void daE_YMB_c::executeLakeDemo() { break; case 5: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); if (field_0x6fc != 0) { cXyz sp30(mDemoCamCenter); @@ -2438,7 +2438,7 @@ void daE_YMB_c::executeStartDemo() { break; case 2: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); setBoilEffect(0); sp34.set(-89100.0f, player->current.pos.y, 39410.0f); player->setPlayerPosAndAngle(&sp34, 0x5400, 0); @@ -2455,7 +2455,7 @@ void daE_YMB_c::executeStartDemo() { break; case 3: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); setBoilEffect(0); sp34.set(current.pos.x, field_0x6cc - 120.0f, current.pos.z); cLib_chasePos(&mDemoCamCenter, sp34, 1.5f); @@ -2471,7 +2471,7 @@ void daE_YMB_c::executeStartDemo() { break; case 4: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); if (field_0x6fc >= 95) { setBoilEffect(1); @@ -2498,7 +2498,7 @@ void daE_YMB_c::executeStartDemo() { break; case 8: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); if (field_0x6f0 == 0) { if (current.pos.y >= field_0x6cc) { @@ -2531,7 +2531,7 @@ void daE_YMB_c::executeStartDemo() { break; case 9: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); mSound.startCreatureSoundLevel(Z2SE_EN_YB_FLY, 0, -1); sp34.set(-89000.0f, -18583.0f, 39350.0f); cLib_chasePos(&mDemoCamEye, sp34, 10.0f); @@ -2545,7 +2545,7 @@ void daE_YMB_c::executeStartDemo() { break; case 10: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); mSound.startCreatureSoundLevel(Z2SE_EN_YB_FLY, 0, -1); sp34.set(-89260.0f, -18650.0f, 39500.0f); cLib_chasePos(&mDemoCamEye, sp34, 10.0f); @@ -2559,7 +2559,7 @@ void daE_YMB_c::executeStartDemo() { break; case 11: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); mSound.startCreatureSoundLevel(Z2SE_EN_YB_FLY, 0, -1); setElecEffect2(); @@ -2633,7 +2633,7 @@ void daE_YMB_c::executeBattleDemo() { break; case 2: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 3); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 3); if (mpModelMorf->checkFrame(30.0f)) { dComIfGp_getVibration().StopQuake(31); @@ -2675,7 +2675,7 @@ void daE_YMB_c::executeBattleDemo() { // fallthrough case 4: case 5: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); cLib_chaseF(&mDemoCamCenter.y, current.pos.y - 200.0f, 3.0f); sp34.set(current.pos.x, mDemoCamCenter.y, current.pos.z); cLib_chasePosXZ(&mDemoCamCenter, sp34, 5.0f); diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 6451a2ac38..5ce16590e1 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -747,7 +747,7 @@ void daE_ZH_c::executeStartDemo() { switch (mMoveMode) { case 0: if (startDemoCheck()) { - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); mDemoCamCenter.set(-30.0f, 650.0f, 1955.0f); mDemoCamEye.set(-25.0f, 720.0f, 2330.0f); field_0x794[0] = 60; @@ -792,7 +792,7 @@ void daE_ZH_c::executeStartDemo() { } if (mMoveMode != 0 && mActionMode != ACTION_EXECUTE_WAIT) { - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { fopAcM_onSwitch(this, 0x12); dStage_changeScene(2, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1); } @@ -895,11 +895,11 @@ void daE_ZH_c::executeBallWait() { } dCam_getBody()->StartBlure(100, this, 0.8f, 1.4f); - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); mMoveMode++; // fallthrough case 12: - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { dCam_getBody()->ResetBlure(); field_0x794[2] = 2; camera->mCamera.Start(); diff --git a/src/d/actor/d_a_econt.cpp b/src/d/actor/d_a_econt.cpp index cdfe48bc51..1e0b69a82d 100644 --- a/src/d/actor/d_a_econt.cpp +++ b/src/d/actor/d_a_econt.cpp @@ -24,7 +24,7 @@ static void* s_rd_sub(void* i_this, void* param_1) { } static void rider_game(econt_class* i_this) { - if (dComIfGs_isSwitch(0x2e,fopAcM_GetRoomNo(i_this)) && dComIfGp_event_runCheck() == 0) { + if (dComIfGs_isSwitch(0x2e,fopAcM_GetRoomNo(i_this)) && !dComIfGp_event_runCheck()) { data_805197E0[0] = 0; fpcM_Search(s_rd_sub,i_this); diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 688e997f13..5e5784216f 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -1002,7 +1002,7 @@ int daHorse_c::checkDemoAction() { return procMoveInit(); } - if (dComIfGp_getEvent().isOrderOK()) { + if (dComIfGp_getEvent()->isOrderOK()) { return 0; } @@ -1200,7 +1200,7 @@ void daHorse_c::setDemoData() { offStateFlg0(FLG0_UNK_2000000); } - if (dComIfGp_getEvent().isOrderOK()) { + if (dComIfGp_getEvent()->isOrderOK()) { u32 unused; if (checkHorseDemoMode()) { u32 old_demoMode = m_demoMode; diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 494f85bd72..b863c19ba9 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -218,7 +218,7 @@ int daKago_c::executeBalloonMenu() { switch (field_0x6eb) { case 0: if (field_0x6e7 == 1 && (mCurrentAction == 0 || mCurrentAction == 5) && - dComIfGp_event_runCheck() == 0 && mDoCPd_c::getTrigB(0)) + !dComIfGp_event_runCheck() && mDoCPd_c::getTrigB(0)) { field_0x6eb = 1; return 1; @@ -1917,7 +1917,7 @@ bool daKago_c::executePerchDemo() { return true; } - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); break; } @@ -1940,16 +1940,16 @@ bool daKago_c::executePerchDemo() { return true; } - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0); break; } case 2: { if (field_0x6e4 == 0) { if (field_0x73c == 0) { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 4); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4); } else if (field_0x73c == 2) { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 5); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 5); } } @@ -2020,9 +2020,9 @@ bool daKago_c::executePerchDemo() { case 3: { if (field_0x6e4 == 0) { if (field_0x73c == 0) { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 4); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4); } else if (field_0x73c == 2) { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 5); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 5); } } @@ -2056,9 +2056,9 @@ bool daKago_c::executePerchDemo() { case 4: { if (field_0x6e4 == 0) { if (field_0x73c == 0) { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 4); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4); } else if (field_0x73c == 2) { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 6); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 6); } } @@ -2497,7 +2497,7 @@ bool daKago_c::executeFirstDemo() { int switchVal = field_0x748; switch (switchVal) { case 0: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); cLib_chaseAngleS(&field_0x6bc, 0x1400, 0x40); cLib_chaseF(&field_0x6cc, 1250.0f, 6.7f); @@ -2524,7 +2524,7 @@ bool daKago_c::executeFirstDemo() { break; case 1: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); cLib_chaseAngleS(&field_0x6bc, 0x1000, 0x20); @@ -2571,7 +2571,7 @@ bool daKago_c::executeFirstDemo() { } break; case 2: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 3); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 3); setMidnaTagPos(); cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 10.0f, 10.0f); @@ -2598,7 +2598,7 @@ bool daKago_c::executeFirstDemo() { break; case 3: { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 3); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 3); setMidnaTagPos(); cLib_addCalcAngleS( @@ -2620,7 +2620,7 @@ bool daKago_c::executeFirstDemo() { break; } case 4: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); cLib_addCalcAngleS(&field_0x718, 0, 8, 0x100, 0x10); cLib_addCalcAngleS(&field_0x71a, 0, 8, 0x100, 0x10); @@ -2663,7 +2663,7 @@ bool daKago_c::executeFirstDemo() { break; case 5: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); cLib_addCalcAngleS(¤t.angle.y, cLib_targetAngleY(¤t.pos, &field_0x6a4), 4, 0x800, 0x100); cLib_addCalcAngleS(¤t.angle.x, -cLib_targetAngleX(¤t.pos, &field_0x6a4), 4, 0x400, 0x100); @@ -2696,7 +2696,7 @@ bool daKago_c::executeFirstDemo() { } break; case 6: - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2); cLib_addCalcAngleS(¤t.angle.x, 0xffffe000, 8, 0x100, 0x40); shape_angle.x = current.angle.x; @@ -2758,7 +2758,7 @@ bool daKago_c::executeFirstDemo() { } if (field_0x728 != 0) { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1); } else { if (field_0x73c == 0 && setSceneChange(0)) { field_0x748 = 9; @@ -2864,7 +2864,7 @@ void daKago_c::executeLandingLakeHairia() { field_0x744 = 3; } - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 7); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7); break; case 3: @@ -2897,7 +2897,7 @@ void daKago_c::executeLandingLakeHairia() { field_0x728 = 0x28; } - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 7); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7); break; case 5: @@ -2917,7 +2917,7 @@ void daKago_c::executeLandingLakeHairia() { setBck(0xf, 0x02, 10.0f, 1.0f); } else { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 7); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7); } field_0x6cc = 50.0f; @@ -2968,7 +2968,7 @@ void daKago_c::executeLandingLakeHairia() { return; } - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 8); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 8); } camera->Set(field_0x68c, field_0x698, field_0x6d4, 0); @@ -3033,7 +3033,7 @@ void daKago_c::executeLandingBoartHouse() { field_0x728 = 0x28; } - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 9); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 9); break; } @@ -3051,7 +3051,7 @@ void daKago_c::executeLandingBoartHouse() { field_0x744 = 3; field_0x728 = 90; } else { - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 9); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 9); } field_0x6cc = 40.0f; @@ -3106,7 +3106,7 @@ void daKago_c::executeLandingBoartHouse() { return; } - dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 10); + dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 10); break; } diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 173564854a..353bb396b5 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -116,7 +116,7 @@ static int daKytag04_Execute(kytag04_class* i_this) { s32 room_no = dComIfGp_roomControl_getStayNo(); if (dComIfGs_isSwitch(i_this->field_0x5b5, room_no) && i_this->field_0x5d0 == 0) { - if (dComIfGp_getEvent().isOrderOK() && + if (dComIfGp_getEvent()->isOrderOK() && fopAcM_orderOtherEvent(i_this, "WITHWARP_OPEN", 0xFFFF, 1, 0)) { i_this->field_0x5d1 = 1; @@ -168,7 +168,7 @@ static int daKytag04_Execute(kytag04_class* i_this) { switch (i_this->field_0x5c4) { case 0: if (!a_this->eventInfo.checkCommandDemoAccrpt()) { - dComIfGp_getEvent().reset(a_this); + dComIfGp_getEvent()->reset(a_this); fopAcM_orderPotentialEvent(a_this, 0x400, 0xFFFF, 0); } else { i_this->field_0x5c5 = 1; diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index e7b76bc428..4ab9b65da0 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -1842,7 +1842,7 @@ static void mf_hit(mg_fish_class* i_this) { i_this->mCurAction = ACTION_MG_FISH_MF_CATCH; i_this->mActionPhase = 0; g_dComIfG_gameInfo.play.mVibration.StartShock(4, 1, cXyz(0.0f, 1.0f, 0.0f)); - Z2AudioMgr::getInterface()->changeBgmStatus(4); + Z2GetAudioMgr()->changeBgmStatus(4); pvVar5->action = 6; pvVar5->play_cam_mode = 10; pvVar5->play_cam_timer = 0; @@ -1853,11 +1853,11 @@ static void mf_hit(mg_fish_class* i_this) { daPy_py_c* player = daPy_getLinkPlayerActorClass(); player->onFishingRodGetFish(); if (pvVar5->lure_type == MG_LURE_SP) { - u8 bVar7 = g_dComIfG_gameInfo.info.mSavedata.mEvent.getEventReg(0xf11f); + u8 bVar7 = dComIfGs_getEventReg(0xf11f); if (bVar7 < 0x1f) { bVar7++; } - g_dComIfG_gameInfo.info.mSavedata.mEvent.setEventReg(0xf11f, bVar7); + dComIfGs_setEventReg(0xf11f, bVar7); } } else if (iVar1 != 0) { if (iVar1 == 2) { @@ -2015,7 +2015,7 @@ static void mf_jump(mg_fish_class* i_this) { fopAcM_effSmokeSet1(&i_this->field_0xc34, &i_this->field_0xc38, &i_this->actor.current.pos, NULL, 0.6f * i_this->mJointScale, &i_this->actor.tevStr, 1); - Z2AudioMgr::getInterface()->seStart(Z2SE_OBJ_NIOIMASU_BOUND, (Vec*)&i_this->actor.current, + Z2GetAudioMgr()->seStart(Z2SE_OBJ_NIOIMASU_BOUND, &i_this->actor.current.pos, 0x14, 0,1.0f, 1.0f, -1.0f, -1.0f, 0); } @@ -2041,8 +2041,7 @@ static void mf_jump(mg_fish_class* i_this) { commonXyz2.z += i_this->actor.current.pos.z; commonXyz2.y = 10.0f + i_this->mSurfaceY; fopAcM_createItem(&commonXyz2, 0, -1, -1, NULL, NULL, 0); - g_dComIfG_gameInfo.info.mSavedata.mEvent.onEventBit( - dSv_event_flag_c::saveBitLabels[0x1d6]); + dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x1d6]); } break; } @@ -2460,7 +2459,7 @@ static s32 mf_esa_catch(mg_fish_class* i_this) { position = i_this->actor.current.pos; position.y = i_this->mSurfaceY; fopKyM_createWpillar(&position, 0.7f, 0); - Z2AudioMgr::getInterface()->changeFishingBgm(4); + Z2GetAudioMgr()->changeFishingBgm(4); i_this->mActionPhase = 1; i_this->mBobAmp = 50.0f; i_this->mSound.startCreatureSound(Z2SE_AL_FISH_CATCH, 0, -1); @@ -3859,7 +3858,7 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) { if (phase == cPhs_COMPLEATE_e) { s32 params_0 = fopAcM_GetParam(i_this) >> 24; if (params_0 != 0 && params_0 != 0xff && - g_dComIfG_gameInfo.info.isSwitch(params_0, fopAcM_GetRoomNo(i_this))) + dComIfGs_isSwitch(params_0, fopAcM_GetRoomNo(i_this))) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index bd7899194f..bdac3c86c4 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -3545,7 +3545,7 @@ static void uki_ready(dmg_rod_class* i_this) { cLib_addCalc2(&i_this->field_0xf64, -30.0f + ZREG_F(1), 1.0f, 0.5f + BREG_F(14)); cLib_addCalc2(&i_this->field_0xf68, -(20.0f + AREG_F(10)), 1.0f, 0.02f * (20.0f + AREG_F(10))); - if (i_this->timers[0] != 0 || dComIfGp_event_runCheck() != 0 || i_this->play_cam_mode >= 1000 || (henna != NULL && henna->cam_mode != 0) || dComIfGp_checkPlayerStatus0(0, 0x100000)) { + if (i_this->timers[0] != 0 || dComIfGp_event_runCheck() || i_this->play_cam_mode >= 1000 || (henna != NULL && henna->cam_mode != 0) || dComIfGp_checkPlayerStatus0(0, 0x100000)) { return; } @@ -3758,7 +3758,7 @@ static void uki_standby(dmg_rod_class* i_this) { Z2GetAudioMgr()->changeFishingBgm(0); } - if (i_this->timers[0] == 0 && (dComIfGp_checkPlayerStatus0(0, 0x100000) || i_this->ccSph.ChkCoHit() || dComIfGp_event_runCheck() != 0 || uki_rod_bg_check(i_this) || (i_this->is_hook_in_water == 0 && player->current.pos.y - actor->current.pos.y > (350.0f + nREG_F(11))) || i_this->field_0x102e != 0)) { + if (i_this->timers[0] == 0 && (dComIfGp_checkPlayerStatus0(0, 0x100000) || i_this->ccSph.ChkCoHit() || dComIfGp_event_runCheck() || uki_rod_bg_check(i_this) || (i_this->is_hook_in_water == 0 && player->current.pos.y - actor->current.pos.y > (350.0f + nREG_F(11))) || i_this->field_0x102e != 0)) { i_this->play_cam_mode = 90; } @@ -4492,7 +4492,7 @@ static void play_camera(dmg_rod_class* i_this) { camera_class* sp58; switch (i_this->play_cam_mode) { case 0: - if (dComIfGp_checkPlayerStatus0(0, 0x2000) || dComIfGp_event_runCheck() != 0) { + if (dComIfGp_checkPlayerStatus0(0, 0x2000) || dComIfGp_event_runCheck()) { i_this->input_cooldown = 20; } diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index a906af3f97..dd09eff513 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -2778,7 +2778,7 @@ void daMidna_c::setDemoData() { mStaffID = dComIfGp_evmng_getMyStaffId("Midna", this, 0); } - if (dComIfGp_getEvent().isOrderOK()) { + if (dComIfGp_getEvent()->isOrderOK()) { if (mDemoType != 0) { mDemoType = 0; mDemoMode = 0; @@ -3256,7 +3256,7 @@ int daMidna_c::execute() { } if (event_id == 4 || event_id == 5) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); offStateFlg0(FLG0_UNK_8000); fopAcM_orderPotentialEvent(this, 0x400, 0xffff, 1); link->changeOriginalDemo(); @@ -3283,13 +3283,13 @@ int daMidna_c::execute() { link->onMidnaTalkPolySpeed(); } - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); offStateFlg0(FLG0_UNK_8000); } } } } else if (eventInfo.checkCommandDemoAccrpt() && !link->checkMetamorphose()) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); } if (link->checkMidnaRide()) { diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index 4289833173..067a544d41 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -1240,7 +1240,7 @@ void daMyna_c::talkAnime(msg_class* param_0) { int daMyna_c::chkEvent() { int retVal = 1; if (daPy_py_c::checkNowWolf()) { - if (!dComIfGp_getEvent().isOrderOK()) { + if (!dComIfGp_getEvent()->isOrderOK()) { retVal = 0; if (eventInfo.checkCommandTalk()) { if (field_0x92C == 0x10) { diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 727d7259be..56dca96b1e 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -1426,7 +1426,7 @@ int daNpcT_c::execute() { setCollision(); if (!field_0xe2c) { - if ((field_0xe33 && dComIfGp_getEvent().isOrderOK()) || dComIfGp_event_runCheck() == FALSE) { + if ((field_0xe33 && dComIfGp_getEvent()->isOrderOK()) || dComIfGp_event_runCheck() == FALSE) { evtOrder(); } } @@ -1899,15 +1899,7 @@ int daNpcT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { BOOL daNpcT_c::evtProc() { BOOL ret = FALSE; - -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (!checkChangeEvt()) { evtTalk(); @@ -1916,11 +1908,7 @@ BOOL daNpcT_c::evtProc() { } else if (eventInfo.checkCommandDemoAccrpt() && dComIfGp_getEventManager().endCheck(mEvtId)) { if (evtEndProc()) { -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif mEvtId = -1; } } else { @@ -2088,7 +2076,7 @@ void daNpcT_c::evtChange() { } mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEvtData[mEvtNo].eventName, 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEvtId, 1, 0xFFFF); } } diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 0ce78f0305..4b873a8db6 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -1308,7 +1308,7 @@ void daNpcF_c::changeEvent(char* i_arcName, char* i_evtName, u16 param_2, u16 pa JUT_ASSERT(2887, NULL != i_evtName); mEventIdx = dComIfGp_getEventManager().getEventIdx(this, i_evtName, 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventIdx, param_2, param_3); } diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index 423817b1ac..6cbd2c6a46 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -963,7 +963,7 @@ bool daNpcAsh_c::demo(void* param_0) { // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staff_id = eventManager.getMyStaffId(l_myName, NULL, 0); if (staff_id != -1) { @@ -1244,7 +1244,7 @@ BOOL daNpcAsh_c::main() { if (mpActionFn != NULL) { (this->*mpActionFn)(NULL); } - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && mItemPartnerId != -1) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && mItemPartnerId != -1) { dComIfGp_event_setItemPartnerId(mItemPartnerId); mItemPartnerId = -1; } diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 75421ce2e0..2073b86fa9 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -752,7 +752,7 @@ bool daNpcAshB_c::wait(void* param_0) { } } - if (dComIfGp_event_runCheck() != false) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (dComIfGp_event_chkTalkXY()) { if (!dComIfGp_evmng_ChkPresentEnd()) { @@ -765,7 +765,7 @@ bool daNpcAshB_c::wait(void* param_0) { } else { s16 evt_idx = dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, evt_idx, 1, -1); } } @@ -878,7 +878,7 @@ bool daNpcAshB_c::talk(void* param_0) { if (mItemPartnerId != 0xffffffff) { s16 evt_idx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, evt_idx, 1, -1); field_0x9ec = 1; setAction(&daNpcAshB_c::wait); @@ -939,14 +939,7 @@ bool daNpcAshB_c::demo(void* param_0) { // fallthrough case 2: -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck() && !eventInfo.checkCommandTalk()) -#else - if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) -#endif - { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { s32 staff_id = evtmgr.getMyStaffId(l_myName, NULL, 0); if (staff_id != -1) { mStaffID = staff_id; @@ -957,13 +950,8 @@ bool daNpcAshB_c::demo(void* param_0) { r26 = TRUE; } - if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && evtmgr.endCheck(mEventIdx)) - { -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else + if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && evtmgr.endCheck(mEventIdx)) { dComIfGp_event_reset(); -#endif mOrderEvtNo = 0; mEventIdx = -1; setAction(&daNpcAshB_c::wait); @@ -1113,7 +1101,7 @@ BOOL daNpcAshB_c::main() { (this->*mpActionFn)(NULL); } - if (mItemPartnerId != -1 && dComIfGp_event_runCheck() != 0 && + if (mItemPartnerId != -1 && dComIfGp_event_runCheck() && !strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM")) { dComIfGp_event_setItemPartnerId(mItemPartnerId); diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 5fd697742d..4948bd9aef 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -1419,8 +1419,7 @@ void daNpc_Besu_c::setCollision() { mCyl1.SetR(wallR); mCyl1.SetC(cStack_48); dComIfG_Ccsp()->Set(&mCyl1); - if ((mType == 11 && !dComIfGp_event_runCheck()) || mType == 3) - { + if ((mType == 11 && !dComIfGp_event_runCheck()) || mType == 3) { switch (mType) { case 3: wallR = 100.0f; @@ -2623,7 +2622,7 @@ int daNpc_Besu_c::wait(void* param_0) { } /* dSv_event_flag_c::M_027 - Cutscene - [cutscene: 13] kids in the church (beast eyes) */ - if (field_0x112f && daNpcT_chkEvtBit(0x3C) && dComIfGp_event_runCheck() == 0) { + if (field_0x112f && daNpcT_chkEvtBit(0x3C) && !dComIfGp_event_runCheck()) { field_0x112f = 0; } diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index d214ade475..4d046c03b6 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -842,7 +842,7 @@ int daNpcBlueNS_c::wait(int param_0) { break; case 2: chkFindPlayer(); - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd() != 0) { setAction(&daNpcBlueNS_c::talk); @@ -939,7 +939,7 @@ int daNpcBlueNS_c::demo(int param_0) { field_0xdc0 = 2; break; case 2: - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { evtmgr = &dComIfGp_getEventManager(); int staffId = evtmgr->getMyStaffId(l_myName, this, 0); diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index 9e0a753c10..629f5f6ab5 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -784,7 +784,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) { case 2: { actor_p = mActorMngr[0].getActorP(); JUT_ASSERT(0x811, NULL != actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); Z2GetAudioMgr()->subBgmStart(0x1000011); break; } @@ -1160,7 +1160,7 @@ int daNpc_Bou_c::cutFindWolf(int arg) { case 0: { mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0); mMotionSeqMngr.setNo(3, -1.0f, 0, 0); - dComIfGp_getEvent().setPtT(this); + dComIfGp_getEvent()->setPtT(this); initTalk(0xD4, NULL); break; } diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index e1e2a1e726..7bc2432317 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -714,7 +714,7 @@ BOOL daNpcBouS_c::main() { (this->*mAction)(NULL); } - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk() && mItemPartnerId != fpcM_ERROR_PROCESS_ID_e) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && mItemPartnerId != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(mItemPartnerId); mItemPartnerId = fpcM_ERROR_PROCESS_ID_e; } @@ -1183,7 +1183,7 @@ bool daNpcBouS_c::demo(void* param_1) { mMode = 2; // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); staffId = eventManager.getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index f4e73ffa9e..f650a01ffe 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -3869,10 +3869,9 @@ bool daNpcChat_c::wait(void* param_1) { } } } else { - dComIfG_play_c& play = g_dComIfG_gameInfo.play; // fakematch - if (play.getEvent().runCheck()) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { - if (!play.getEvent().chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { + if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { setAction(&daNpcChat_c::talk); } } else { @@ -4060,7 +4059,7 @@ bool daNpcChat_c::demo(void* param_1) { break; case 2: - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk() == false) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 553a6e8abb..b871c8d635 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -485,7 +485,7 @@ void daNpcChin_c::setParam() { int daNpcChin_c::main() { Action(); - if (dComIfGp_event_runCheck() != FALSE && eventInfo.checkCommandTalk() == FALSE && + if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk() == FALSE && field_0xdf4 != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(field_0xdf4); @@ -1214,7 +1214,7 @@ bool daNpcChin_c::wait(void* param_0) { eventInfo.setArchiveName(l_arcNames[4]); } - if (!dComIfGp_getEvent().isOrderOK()) { + if (!dComIfGp_getEvent()->isOrderOK()) { return true; } diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index 550f03aea6..f8b48b07a0 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -658,7 +658,7 @@ bool daNpcDoorBoy_c::talk(void* param_1) { field_0xdf0 = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, -1, NULL, NULL); if (field_0xdf0 != fpcM_ERROR_PROCESS_ID_e) { s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF); field_0x9ec = true; setAction(&daNpcDoorBoy_c::wait); @@ -699,7 +699,7 @@ bool daNpcDoorBoy_c::demo(void* param_1) { break; case 2: - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp index f7f8d8469a..d66a99b13a 100644 --- a/src/d/actor/d_a_npc_drainSol.cpp +++ b/src/d/actor/d_a_npc_drainSol.cpp @@ -279,7 +279,7 @@ bool daNpcDrSol_c::wait(void* param_0) { mMode = 2; break; case 2: - if (dComIfGp_event_runCheck() != 0 && eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk()) { if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { setAction(&daNpcDrSol_c::talk); } diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index 591d594adc..edc0f1d386 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -347,7 +347,7 @@ static void npc_du_message(npc_du_class* i_this) { cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mPlayerAngleY, 2, maxStep); - if (dComIfGp_event_runCheck() == FALSE && i_this->mPlayerDist > 220.0f) { + if (!dComIfGp_event_runCheck() && i_this->mPlayerDist > 220.0f) { if (i_this->mSwimFlag == 0) { i_this->mAction = ACTION_NORMAL; } else { diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index aa00f9cf7d..246aa4c9b5 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -784,7 +784,7 @@ BOOL daNpc_grA_c::main() { attention_info.flags = 0; } if (GET_HIO(mNpcFParams.debug_mode_ON) == 0 && - (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) + (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { u16 j = 1; if (mOrderEvtNo != 0) { @@ -1795,7 +1795,7 @@ enum Event_Cut_Nums { BOOL daNpc_grA_c::doEvent() { dEvent_manager_c* manager = NULL; BOOL ret = FALSE; - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { manager = &dComIfGp_getEventManager(); if (field_0x1691 == 0) { mOrderNewEvt = 0; @@ -4024,7 +4024,7 @@ BOOL daNpc_grA_c::talk(void*) { fopAcM_createItemForPresentDemo(¤t.pos, sp8, 0, -1, -1, NULL, NULL); if (field_0x1480 != fpcM_ERROR_PROCESS_ID_e) { s16 r25 = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, r25, 1, -1); field_0x9ec = 1; r29 = 1; @@ -4035,7 +4035,7 @@ BOOL daNpc_grA_c::talk(void*) { } } else { if (mType == 0xa && field_0x1486 == 0 && daNpcF_chkEvtBit(0x187)) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); field_0x9ec = 1; mOrderNewEvt = 1; mOrderEvtNo = 0xa; diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 577763adab..7b72766233 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -500,7 +500,7 @@ BOOL daNpc_grC_c::main() { attention_info.flags = 0; } - if (!daNpc_grC_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) { + if (!daNpc_grC_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != 0) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } @@ -1066,7 +1066,7 @@ void daNpc_grC_c::doNormalAction(int param_1) { BOOL daNpc_grC_c::doEvent() { BOOL rv = FALSE; - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); if (!field_0xe51) { @@ -1451,7 +1451,7 @@ BOOL daNpc_grC_c::talk(void* param_1) { if (mItemID != fpcM_ERROR_PROCESS_ID_e) { s16 i_eventID = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, i_eventID, 1, 0xFFFF); field_0x9ec = true; rv = TRUE; diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index f81e422472..351e05b443 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -382,7 +382,7 @@ BOOL daNpc_Grd_c::main() { } if (!mpHIO->m.common.debug_mode_ON && - (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) + (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != 0) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); @@ -843,7 +843,7 @@ void daNpc_Grd_c::doNormalAction(int param_1) { BOOL daNpc_Grd_c::doEvent() { BOOL rv = FALSE; - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); if (eventInfo.mCommand == 1 || eventInfo.mCommand == 2) { diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index f0a53d4428..f0f2270f75 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -392,13 +392,7 @@ void daNpc_grM_c::srchActors() { BOOL daNpc_grM_c::evtProc() { BOOL ret = FALSE; -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) { -#else if (dComIfGp_event_runCheck()) { -#endif if (eventInfo.checkCommandTalk()) { if (!checkChangeEvt()) { evtTalk(); @@ -408,11 +402,7 @@ BOOL daNpc_grM_c::evtProc() { dComIfGp_getEventManager().endCheck(mEvtId)) { if (evtEndProc()) { -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif mEvtId = -1; } } else { diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index 71e5f7367a..6dd71c0900 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -639,7 +639,7 @@ BOOL daNpc_grO_c::main() { attention_info.flags = 0; } - if (!mpHIO->m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) { + if (!mpHIO->m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != EVT_NONE) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } @@ -1289,7 +1289,7 @@ BOOL daNpc_grO_c::doEvent() { int evtCutNo = 0; BOOL rv = FALSE; - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !mUnkFlag) { @@ -1672,7 +1672,7 @@ int daNpc_grO_c::talk(void* param_1) { mItemID = fopAcM_createItemForPresentDemo(¤t.pos, itemId, 0, -1, -1, NULL, NULL); if (mItemID != fpcM_ERROR_PROCESS_ID_e) { s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF); mUnkFlag = 1; field_0x9ec = true; @@ -1684,7 +1684,7 @@ int daNpc_grO_c::talk(void* param_1) { // dSv_event_tmp_flag_c::T_0081 - Kakariko Village - For use in fundraiser event completion cutscene daNpcF_chkTmpBit(81) ) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); field_0x9ec = true; mOrderNewEvt = true; mOrderEvtNo = EVT_BOKIN_FINISH; diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index c8eb2daf26..76f2c743fb 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -489,7 +489,7 @@ BOOL daNpc_grR_c::main() { attention_info.flags = 0; } - if (!daNpc_grR_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) { + if (!daNpc_grR_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != 0) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } @@ -1048,7 +1048,7 @@ void daNpc_grR_c::doNormalAction(int param_1) { BOOL daNpc_grR_c::doEvent() { BOOL rv = FALSE; - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !field_0xe18) { @@ -1333,7 +1333,7 @@ int daNpc_grR_c::talk(void* param_1) { if (mItemID != fpcM_ERROR_PROCESS_ID_e) { s16 i_eventID = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, i_eventID, 1, 0xFFFF); field_0xe18 = true; field_0x9ec = true; diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 06e9bf36b1..727a26a15b 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -385,7 +385,7 @@ int daNpc_grS_c::main() { } if (!mpHIO->m.common.debug_mode_ON) { - if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK())) { + if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK())) { if (mOrderEvtNo != 0) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } @@ -896,7 +896,7 @@ int daNpc_grS_c::doEvent() { int evtCutNo; int staffId; - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { eventManager = &dComIfGp_getEventManager(); if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !mIsSpeaking) @@ -1187,7 +1187,7 @@ int daNpc_grS_c::talk(void* param_0) { if (mPresentItemId != fpcM_ERROR_PROCESS_ID_e) { s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xffff); mIsSpeaking = true; field_0x9ec = true; diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 39fb696106..bc1d19c0d8 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -711,7 +711,7 @@ BOOL daNpc_Grz_c::main() { } if (!daNpc_Grz_Param_c::m.common.debug_mode_ON) { - if (!dComIfGp_event_runCheck() || mOrderNewEvt && dComIfGp_getEvent().isOrderOK()) { + if (!dComIfGp_event_runCheck() || mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()) { if (mOrderEvtNo != EVT_NONE) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } @@ -1500,7 +1500,7 @@ void daNpc_Grz_c::doNormalAction(int param_1) { BOOL daNpc_Grz_c::doEvent() { BOOL rv = FALSE; - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) { @@ -1601,8 +1601,8 @@ bool daNpc_Grz_c::setSkipZev(int param_1, int param_2) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); if (strcmp(eventManager.getRunEventName(), l_evtNames[param_1]) == 0) { - dComIfGp_getEvent().setSkipZev(this, l_evtNames[param_2]); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->setSkipZev(this, l_evtNames[param_2]); + dComIfGp_getEvent()->onSkipFade(); return true; } diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index cc4395c1c1..e97fb66ff4 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -558,7 +558,7 @@ BOOL daNpc_GWolf_c::main() { attention_info.flags = 0; } - if (!daNpc_GWolf_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) { + if (!daNpc_GWolf_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != EVT_NONE) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } @@ -1057,7 +1057,7 @@ void daNpc_GWolf_c::doNormalAction(int param_1) { BOOL daNpc_GWolf_c::doEvent() { BOOL rv = FALSE; - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) { @@ -1636,8 +1636,8 @@ BOOL daNpc_GWolf_c::ECut_meetGWolf(int i_staffId) { case 0: setMotion(MOT_WAITSIT, -1.0f, 0); setLookMode(LOOK_PLAYER); - dComIfGp_getEvent().setSkipProc(this, callback_proc, 0); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, callback_proc, 0); + dComIfGp_getEvent()->onSkipFade(); break; } } diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index b5522ac0fa..9d644e9017 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -1102,7 +1102,7 @@ int daNpc_Hanjo_c::cutConversation(int param_1) { if (iVar6 == 1) { fopAc_ac_c* actor_p =field_0x10c8[0].getActorP(); JUT_ASSERT(2650, NULL != actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); } break; } @@ -1163,7 +1163,7 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) { setAngle(home.angle.y); actor_p = field_0x10c8[0].getActorP(); JUT_ASSERT(2748, NULL != actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); for (int i = 0; i < 4; i++) { if (mStones[i].chkActive()) { mStones[i].initialize(); @@ -1309,8 +1309,8 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { initTalk(0xcf, NULL); strcpy(acStack_98, l_evtList[9].eventName); strcat(acStack_98, "@"); - dComIfGp_getEvent().setSkipZev(this, acStack_98); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->setSkipZev(this, acStack_98); + dComIfGp_getEvent()->onSkipFade(); dComIfGp_getVibration().StartShock( 9, 15, cXyz(0.0f, 1.0f, 0.0f)); break; case 1: @@ -1747,9 +1747,8 @@ int daNpc_Hanjo_c::takayose(void* param_0) { } case 2: { field_0xe2d = 0; - dComIfG_play_c& play = g_dComIfG_gameInfo.play; - if (play.getEvent().runCheck()) { - if (strcmp("toal_enter01", play.getEvtManager().getRunEventName()) == 0) { + if (dComIfGp_event_runCheck() != FALSE) { + if (strcmp("toal_enter01", dComIfGp_getEventManager().getRunEventName()) == 0) { dComIfGp_event_setTalkPartner(this); field_0xe2d = 1; } @@ -1835,7 +1834,7 @@ int daNpc_Hanjo_c::takayose(void* param_0) { } } } else { - if (!g_dComIfG_gameInfo.play.getEvent().mEventStatus && + if (!dComIfGp_event_runCheck() && cLib_calcTimer(&field_0x1710) == 0) { field_0x1714++; diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index b2c0a8e450..b9cb555a42 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -274,7 +274,7 @@ static void message_shop(npc_henna_class* i_this) { i_this->actor.attention_info.distances[1] = 4; i_this->actor.attention_info.distances[3] = 4; i_this->actor.eventInfo.onCondition(1); - if (dComIfGp_event_runCheck() != 0 && i_this->cam_mode == 0 && + if (dComIfGp_event_runCheck() && i_this->cam_mode == 0 && i_this->actor.eventInfo.checkCommandTalk() != 0) { dComIfGp_event_reset(); @@ -450,7 +450,7 @@ static void henna_ride(npc_henna_class* i_this) { i_this->field_0x70e = 1300; i_this->field_0x720 = player->eyePos; - if (dComIfGp_checkPlayerStatus0(0, 0x2000) != 0 || dComIfGp_event_runCheck() != 0) { + if (dComIfGp_checkPlayerStatus0(0, 0x2000) != 0 || dComIfGp_event_runCheck()) { stickX = stickY = 0.0f; } stickMag = JMAFastSqrt(stickX * stickX + stickY * stickY); @@ -1015,7 +1015,7 @@ static void demo_camera_shop(npc_henna_class* i_this) { switch (i_this->cam_mode) { case 0: { - if (dComIfGp_event_runCheck() == FALSE) { + if (!dComIfGp_event_runCheck()) { if (i_this->field_0x7b5 != 0) { if (i_this->field_0x7b5 == 1 || i_this->field_0x7b5 == 21 || i_this->field_0x7b5 == 41) @@ -2197,14 +2197,7 @@ static void message_guide(npc_henna_class* i_this) { return; } -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (!actor->eventInfo.checkCommandTalk()) { return; } @@ -2234,11 +2227,7 @@ static void message_guide(npc_henna_class* i_this) { } if (i_this->mMsgFlow.doFlow(actor, NULL, 0) != 0) { -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif i_this->mIsTalking = 0; } } else { diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index 081b398098..3463b27cde 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -660,14 +660,7 @@ BOOL daNpc_Hoz_c::evtCutProc() { int daNpc_Hoz_c::evtProc() { BOOL ret = FALSE; -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (!checkChangeEvt()) { evtTalk(); @@ -676,11 +669,7 @@ int daNpc_Hoz_c::evtProc() { } else if (eventInfo.checkCommandDemoAccrpt() && dComIfGp_getEventManager().endCheck(mEvtId)) { if (evtEndProc()) { -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif mEvtId = -1; } } else { diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index b3449f4303..9052798b03 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -727,7 +727,7 @@ bool daNpcImpal_c::wait(void* param_0) { } } - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (dComIfGp_event_chkTalkXY()) { if (dComIfGp_evmng_ChkPresentEnd() == FALSE) { @@ -740,7 +740,7 @@ bool daNpcImpal_c::wait(void* param_0) { } else { s16 evt_idx = dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, evt_idx, 1, -1); } } else { @@ -814,7 +814,7 @@ bool daNpcImpal_c::talk(void* param_0) { if (mItemPartnerId != 0xffffffff) { s16 evt_idx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, evt_idx, 1, -1); field_0x9ec = 1; } @@ -864,7 +864,7 @@ bool daNpcImpal_c::demo(void* param_0) { setMotion(MOT_0, -1.0f, false); mMode = 2; case 2: { - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& event_manager = dComIfGp_getEventManager(); s32 staff_id = dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0); @@ -975,7 +975,7 @@ BOOL daNpcImpal_c::EvCut_ImpalAppear1(int i_cut_index) { if (mItemPartnerId != 0xffffffff) { s16 evt_idx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, evt_idx, 1, -1); field_0x9ec = 1; mOrderEvtNo = 2; @@ -1153,7 +1153,7 @@ BOOL daNpcImpal_c::main() { (this->*mpActionFn)(NULL); } - if (mItemPartnerId != -1 && dComIfGp_event_runCheck() != 0 && + if (mItemPartnerId != -1 && dComIfGp_event_runCheck() && !strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM")) { dComIfGp_event_setItemPartnerId(mItemPartnerId); diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index 3ef01d3cf5..0badcf95dd 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -710,7 +710,7 @@ BOOL daNpcIns_c::main() { (this->*mAction)(NULL); } - if (mItemID != fpcM_ERROR_PROCESS_ID_e && dComIfGp_event_runCheck() != FALSE) { + if (mItemID != fpcM_ERROR_PROCESS_ID_e && dComIfGp_event_runCheck()) { if (strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM") == 0) { dComIfGp_event_setItemPartnerId(mItemID); mItemID = fpcM_ERROR_PROCESS_ID_e; @@ -1053,7 +1053,7 @@ BOOL daNpcIns_c::setAction(actionFunc action) { } void daNpcIns_c::waitEventMng() { - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { setAction(&daNpcIns_c::talk); } else if (dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0) != -1) { @@ -1469,7 +1469,7 @@ int daNpcIns_c::talk(void* param_1) { if (mItemID != fpcM_ERROR_PROCESS_ID_e) { daPy_getPlayerActorClass()->cancelOriginalDemo(); s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF); field_0x9ec = true; mOrderSpeakEvent = 1; @@ -1533,7 +1533,7 @@ int daNpcIns_c::demo(void* param_1) { mMode = 2; // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { eventManager = &dComIfGp_getEventManager(); s32 staffId = eventManager->getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 240203087a..7fd3a5aad5 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -954,7 +954,7 @@ int daNpc_Jagar_c::cutNeedYourHelp(int i_cutIndex) { if (dComIfGp_getEventManager().getIsAddvance(i_cutIndex)) { switch(prm) { case 0: - dComIfGp_getEvent().setPt2(mActorMngr[0].getActorP()); + dComIfGp_getEvent()->setPt2(mActorMngr[0].getActorP()); break; case 1: @@ -964,7 +964,7 @@ int daNpc_Jagar_c::cutNeedYourHelp(int i_cutIndex) { case 7: { fopAc_ac_c* iVar6 = mActorMngr[1].getActorP(); if (iVar6) { - dComIfGp_getEvent().setPt2(iVar6); + dComIfGp_getEvent()->setPt2(iVar6); } break; } @@ -1170,7 +1170,7 @@ int daNpc_Jagar_c::cutConfidentialConversation(int i_cutIndex) { break; case 1: - dComIfGp_getEvent().setPt2(mActorMngr[1].getActorP()); + dComIfGp_getEvent()->setPt2(mActorMngr[1].getActorP()); break; case 2: diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 011f504abe..fdd6f52e93 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -1591,7 +1591,7 @@ int daNpcKasiHana_c::demo(int param_1) { break; case 1: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { @@ -1721,22 +1721,11 @@ int daNpcKasiHana_c::cheer(int param_1) { field_0x1440 = 1; } -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { - if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { + if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) { mTalked = true; -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif } } } else { diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 64ce7ef027..ebda0254da 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -771,24 +771,13 @@ int daNpcKasiKyu_c::wait(int param_1) { } } -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { - if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { + if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) { OS_REPORT("------------------kyu talk reset!!\n"); mTalked = true; -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif } } } else { @@ -1335,22 +1324,11 @@ int daNpcKasiKyu_c::cheer(int param_1) { current.angle.y = mCurAngle.y; shape_angle.y = mCurAngle.y; -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { - if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { + if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) { mTalked = true; -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif } } } else { diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index 5b15b65834..fdef4db8c3 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -770,24 +770,13 @@ int daNpcKasiMich_c::wait(int param_1) { } } -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { - if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { + if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) { OS_REPORT("------------------mich talk reset!!\n"); mTalked = true; -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif } } } else { @@ -1321,22 +1310,11 @@ int daNpcKasiMich_c::cheer(int param_1) { current.angle.y = mCurAngle.y; shape_angle.y = mCurAngle.y; -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { - if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) { + if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) { mTalked = true; -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif } } } else { diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index bdd4b635a0..edfd036138 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -722,7 +722,7 @@ void daNpc_Kkri_c::setCollision() { if (!mHide) { u32 tg_type = 0xD8FBFDFF; u32 tg_sprm = 0x1F; - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { tg_type = 0; tg_sprm = 0; } else if (mTwilight) { diff --git a/src/d/actor/d_a_npc_kn_base.inc b/src/d/actor/d_a_npc_kn_base.inc index e8ff2bb1c0..0ee3bb6e33 100644 --- a/src/d/actor/d_a_npc_kn_base.inc +++ b/src/d/actor/d_a_npc_kn_base.inc @@ -140,7 +140,7 @@ int daNpc_Kn_c::execute() { setCollision(); if (field_0xe33 == 0) { - if ((field_0xe39 != 0 && dComIfGp_getEvent().isOrderOK()) || dComIfGp_event_runCheck() == FALSE) + if ((field_0xe39 != 0 && dComIfGp_getEvent()->isOrderOK()) || dComIfGp_event_runCheck() == FALSE) { evtOrder(); } @@ -603,14 +603,7 @@ int daNpc_Kn_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) { int daNpc_Kn_c::evtProc() { BOOL ret = FALSE; -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (!checkChangeEvt()) { evtTalk(); @@ -618,11 +611,7 @@ int daNpc_Kn_c::evtProc() { ret = TRUE; } else if (eventInfo.checkCommandDemoAccrpt() && dComIfGp_getEventManager().endCheck(mEvtId)) { if (evtEndProc()) { -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif mEvtId = -1; } } else { @@ -789,7 +778,7 @@ void daNpc_Kn_c::evtChange() { } mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEventData[mEvtNo].eventName, 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEvtId, 1, 0xffff); } } diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 5e6e00844a..3d65fb561d 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -5811,7 +5811,6 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) { int frame = i_this->model->getFrame(); int iVar1 = 0; s16 sVar1 = 0x1000; - s16 range; i_this->field_0x5fc = 0; i_this->field_0xaec = 1; @@ -5936,7 +5935,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) { } iVar1 = 1; - range = actor->current.angle.y - i_this->target_angle; + s16 range = actor->current.angle.y - i_this->target_angle; if ((range > 0x3000 || range < -0x3000) && i_this->mode < 22) { anm_init(i_this, 28, 3.0f, 0, 1.0f); i_this->mode = 22; @@ -6000,9 +5999,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) { fopAcM_OnStatus(actor, 0); cLib_onBit(actor->attention_info.flags, fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e); actor->eventInfo.onCondition(dEvtCnd_CANTALK_e); - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) { + if (dComIfGp_event_runCheck()) { if (actor->eventInfo.checkCommandTalk()) { if (i_this->field_0xaee == 0) { i_this->msg_flow.init(actor, 0x74, 0, NULL); @@ -6010,7 +6007,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) { } if (i_this->msg_flow.doFlow(actor, NULL, 0)) { - play->getEvent().reset(); + dComIfGp_event_reset(); i_this->field_0xaee = 0; } } diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 4a94648eb4..329ccdfea6 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -667,7 +667,7 @@ int daNpc_Kyury_c::cutConversation(int param_0) { switch (local_34) { case 0: actor_p = mActorMngr[0].getActorP(); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); mPlayerAngle = fopAcM_searchPlayerAngleY(this); if (checkStep()) { mStepMode = 0; diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 2576375bbc..8c1f861d88 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -923,7 +923,7 @@ void daNpc_Maro_c::action() { mMode = 1; } - if (dComIfGp_event_runCheck() == 0) { + if (!dComIfGp_event_runCheck()) { field_0x1138 = 0; if (daNpcT_chkTmpBit(0x3C)) { if (dComIfGs_getArrowNum() == 0) { @@ -1770,7 +1770,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { mActorMngr[4].entry(getItaMatoP(1)); actor_p = mActorMngr[4].getActorP(); JUT_ASSERT(0xCC3, NULL != actor_p); - dComIfGp_getEvent().setPtI(actor_p); + dComIfGp_getEvent()->setPtI(actor_p); break; } @@ -1783,7 +1783,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 4: { actor_p = mActorMngr[4].getActorP(); JUT_ASSERT(0xCCE, NULL != actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); break; } @@ -1835,11 +1835,11 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { mFaceMotionSeqMngr.setNo(9, 0.0f, 0, 0); mMotionSeqMngr.setNo(0, 0.0f, 0, 0); mEventTimer = timer_val; - dComIfGp_getEvent().setPtT(this); + dComIfGp_getEvent()->setPtT(this); mActorMngr[4].entry(getItaMatoP(1)); actor_p = mActorMngr[4].getActorP(); JUT_ASSERT(0xD0B, NULL != actor_p); - dComIfGp_getEvent().setPtI(actor_p); + dComIfGp_getEvent()->setPtI(actor_p); break; } @@ -1850,7 +1850,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { setAngle(mPlayerAngle); mHide = false; mEventTimer = timer_val; - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); break; } @@ -1858,8 +1858,8 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { mActorMngr[4].entry(getItaMatoP(2)); actor_p = mActorMngr[4].getActorP(); JUT_ASSERT(0xD1E, NULL != actor_p); - dComIfGp_getEvent().setPtI(actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPtI(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); } // fallthrough intentional. case 33: { @@ -1874,8 +1874,8 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { mActorMngr[4].entry(getItaMatoP(2)); actor_p = mActorMngr[4].getActorP(); JUT_ASSERT(0xD2E, NULL != actor_p); - dComIfGp_getEvent().setPtI(actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPtI(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); break; } @@ -1910,7 +1910,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 65: { actor_p = mActorMngr[1].getActorP(); JUT_ASSERT(0xD2E, NULL != actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); break; } @@ -1962,12 +1962,12 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { setAngle(fopAcM_searchPlayerAngleY(this)); mHide = false; initTalk(mFlowNodeNo, local_4c); - dComIfGp_getEvent().setPtT(this); + dComIfGp_getEvent()->setPtT(this); break; } case 7: { - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); break; } @@ -1990,8 +1990,8 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { mActorMngr[4].entry(getItaMatoP(2)); actor_p = mActorMngr[4].getActorP(); JUT_ASSERT(0xDB3, NULL != actor_p); - dComIfGp_getEvent().setPtI(actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPtI(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); } // fallthrough intentional. case 35: { @@ -2002,7 +2002,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 44: { actor_p = mActorMngr[1].getActorP(); JUT_ASSERT(0xDBD, NULL != actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); break; } @@ -2045,7 +2045,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { if (prm_val == 1 && retval != 0) { actor_p = mActorMngr[4].getActorP(); JUT_ASSERT(0xDF0, NULL != actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); } break; @@ -2088,7 +2088,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { switch (prm_val) { case 2: case 4: { - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); break; } } @@ -2208,7 +2208,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { if (retval != 0) { actor_p = mActorMngr[1].getActorP(); JUT_ASSERT(0xE48, NULL != actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); } break; @@ -2284,7 +2284,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { my_s_vec.y = fopAcM_searchActorAngleY(daPy_getPlayerActorClass(), this); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&daPy_getPlayerActorClass()->current.pos, my_s_vec.y, 0); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); setAngle(fopAcM_searchPlayerAngleY(this)); } else if (prm_val == 63) { if (!daNpcT_chkEvtBit(0x4B)) { @@ -2555,8 +2555,8 @@ int daNpc_Maro_c::cutMarosWhisper(int arg0) { mDoMtx_stack_c::multVec(&my_vec_0, &field_0xd6c); mJntAnm.sorasu2(&field_0xd6c, 1); initTalk(22, NULL); - dComIfGp_getEvent().setPtT(this); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPtT(this); + dComIfGp_getEvent()->setPt2(this); } } } @@ -2870,7 +2870,7 @@ int daNpc_Maro_c::wait(void* param_0) { field_0x1133 = 1; } - if (field_0x1133 && daNpcT_chkEvtBit(0x3C) && dComIfGp_event_runCheck() == 0) { + if (field_0x1133 && daNpcT_chkEvtBit(0x3C) && !dComIfGp_event_runCheck()) { field_0x1133 = 0; } diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index 13f2e9749b..a7bbec2aef 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -1477,7 +1477,7 @@ int daNpc_Moi_c::cutAppearanceMoi(int param_1) { case 2: mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0); mMotionSeqMngr.setNo(MOT_UNK_45, -1.0f, 0, 0); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); mEventTimer = local_78; break; case 3: diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index de4fcee8dc..c672009145 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -1336,7 +1336,7 @@ bool daNpcMoiR_c::talk(void* param_1) { if (field_0xdf8 != -1) { s16 i_eventID = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, i_eventID, 1, 0xFFFF); field_0x9ec = true; } @@ -1513,7 +1513,7 @@ bool daNpcMoiR_c::demo(void* param_1) { field_0xe08 = 2; // fallthrough case 2: - if (dComIfGp_event_runCheck() != 0 && eventInfo.checkCommandTalk() == 0) { + if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk() == 0) { evt_mng = &dComIfGp_getEventManager(); s32 staffIdx = evt_mng->getMyStaffId(l_myName, NULL, 0); if (staffIdx != -1) { @@ -1860,7 +1860,7 @@ BOOL daNpcMoiR_c::main() { (this->*mAction)(NULL); } - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && field_0xdf8 != -1) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && field_0xdf8 != -1) { dComIfGp_event_setItemPartnerId(field_0xdf8); field_0xdf8 = -1; } diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index 96b0e67bf1..86fd8dbec7 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -307,7 +307,7 @@ BOOL daNpc_myna2_c::main() { attention_info.flags = 0; } - if (!daNpc_myna2_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) { + if (!daNpc_myna2_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != 0) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } @@ -687,7 +687,7 @@ void daNpc_myna2_c::doNormalAction(int param_0) { BOOL daNpc_myna2_c::doEvent() { BOOL rv = FALSE; - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) { @@ -854,7 +854,7 @@ int daNpc_myna2_c::waitFailure(void* param_0) { fopAcM_delete(myna); } - if (dComIfGp_getEvent().isOrderOK()) { + if (dComIfGp_getEvent()->isOrderOK()) { mOrderEvtNo = 2; mOrderNewEvt = 1; } @@ -878,7 +878,7 @@ int daNpc_myna2_c::waitGoal(void* param_0) { case 2: mSound.playSumomoBgm(0); - if (!daPy_getPlayerActorClass()->checkCargoCarry() && dComIfGp_getEvent().isOrderOK()) { + if (!daPy_getPlayerActorClass()->checkCargoCarry() && dComIfGp_getEvent()->isOrderOK()) { if (dComIfGp_getMessageCountNumber() >= 10000 && (!daNpcF_chkEvtBit(0x11E) || dComIfGp_getMessageCountNumber() > dComIfGs_getBalloonScore() || (dComIfGp_getMessageCountNumber() >= 0xF00E))) { mOrderEvtNo = 4; } else { diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 9ca34144e4..bd27296dc2 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -1471,7 +1471,7 @@ int daNpc_Pachi_Taro_c::wait(void* param_1) { if (field_0x1004 == 0) { mEvtNo = EVT_TUTRIAL_BEGIN; mPrevEvtNo = mEvtNo; - dComIfGp_getEvent().setSkipProc(this, dEv_defaultSkipProc, 0); + dComIfGp_getEvent()->setSkipProc(this, dEv_defaultSkipProc, 0); } else if (field_0x1004 == 1) { watch_tutrial(); } @@ -1801,7 +1801,7 @@ BOOL daNpc_Pachi_Taro_c::evtEndProc() { BOOL daNpc_Pachi_Taro_c::cutTutrialBegin(int i_staffId) { field_0x1004 = 1; - dComIfGp_getEvent().setSkipZev(this, "TUTRIAL_BEGIN_SKIP"); + dComIfGp_getEvent()->setSkipZev(this, "TUTRIAL_BEGIN_SKIP"); dEvent_manager_c& eventManager = dComIfGp_getEventManager(); int* cutId = NULL; cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId"); diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index 57fcebbc69..13b39e0bbb 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -651,7 +651,7 @@ bool daNpcPray_c::demo(void*) { mActionMode = 2; break; case 2: - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& evtmgr = dComIfGp_getEventManager(); const int staffID = evtmgr.getMyStaffId(l_myName, NULL, 0); if (staffID != -1) { diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index e35c843276..a3576806d4 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -439,7 +439,7 @@ BOOL daNpcRafrel_c::main() { (this->*field_0xde0)(NULL); } - if (field_0xe00 != fpcM_ERROR_PROCESS_ID_e && dComIfGp_event_runCheck() != 0) { + if (field_0xe00 != fpcM_ERROR_PROCESS_ID_e && dComIfGp_event_runCheck()) { if (strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM") == 0) { dComIfGp_event_setItemPartnerId(field_0xe00); field_0xe00 = -1; @@ -1065,7 +1065,6 @@ BOOL daNpcRafrel_c::chkFindPlayer() { return ret; } -// NONMATCHING - gameinfo event load stuff bool daNpcRafrel_c::wait_type01(void* param_0) { switch (field_0xe10) { case 0: @@ -1130,26 +1129,13 @@ bool daNpcRafrel_c::wait_type01(void* param_0) { field_0xe15 = 1; } -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck() != 0) -#endif - { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (isSneaking()) { mOrderEvtNo = 6; changeEvent(l_arcNames[0], l_evtNames[mOrderEvtNo], 1, 0xFFFF); } else if (dComIfGp_event_chkTalkXY()) { -#if VERSION != VERSION_SHIELD_DEBUG - dEvent_manager_c* evtmng_p = &play->getEvtManager(); - if (evtmng_p->ChkPresentEnd() == 0) -#else - if (dComIfGp_evmng_ChkPresentEnd() == 0) -#endif - { + if (dComIfGp_evmng_ChkPresentEnd() == 0) { return 1; } @@ -1157,12 +1143,8 @@ bool daNpcRafrel_c::wait_type01(void* param_0) { field_0xe0c = 0x21; setAction(&daNpcRafrel_c::talk); } else { -#if VERSION != VERSION_SHIELD_DEBUG - s16 sp8 = evtmng_p->getEventIdx(this, "NO_RESPONSE", 0xFF); -#else s16 sp8 = dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xFF); -#endif - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, sp8, 1, 0xFFFF); } } else { @@ -1332,7 +1314,7 @@ bool daNpcRafrel_c::talk(void* param_0) { field_0xe00 = fopAcM_createItemForPresentDemo(¤t.pos, itemNo, 0, -1, -1, NULL, NULL); if (field_0xe00 != fpcM_ERROR_PROCESS_ID_e) { s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF); field_0xe16 = 1; field_0x9ec = 1; @@ -1382,7 +1364,7 @@ bool daNpcRafrel_c::demo(void* param_0) { field_0xe10 = 2; /* fallthrough */ case 2: - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { evtmgr = &dComIfGp_getEventManager(); const int staffId = evtmgr->getMyStaffId(l_myName, NULL, 0); @@ -1611,7 +1593,7 @@ int daNpcRafrel_c::EvCut_Appear(int i_staffId) { OS_REPORT("二択分岐 %s\n", choiceNo == 0 ? "はい" : "いいえ"); if (choiceNo > 0) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); } return 1; diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 6096224406..dc0dddaf08 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -935,8 +935,8 @@ int daNpc_Saru_c::cutYmLook(int param_1) { case 0: strcpy(acStack_88, l_evtList[2].eventName); strcat(acStack_88, "@"); - dComIfGp_getEvent().setSkipZev(this, acStack_88); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->setSkipZev(this, acStack_88); + dComIfGp_getEvent()->onSkipFade(); field_0xfd9 = 1; case 1: diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index 7bf59cff96..81e3f10ed3 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -670,7 +670,7 @@ void daNpc_Seira_c::setCollision() { cXyz cStack_48; f32 cylH, wallR; if (!mHide) { - if (mTwilight == 1 && dComIfGp_event_runCheck() == FALSE) { + if (mTwilight == 1 && !dComIfGp_event_runCheck()) { mCyl1.SetCoSPrm(0x69); } else { mCyl1.SetCoSPrm(0x79); diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 692d74d1cf..b02408954e 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -579,7 +579,7 @@ void daNpc_Seira2_c::setCollision() { cXyz cStack_48; f32 cylH, wallR; if (!mHide) { - if (mTwilight == 1 && dComIfGp_event_runCheck() == FALSE) { + if (mTwilight == 1 && !dComIfGp_event_runCheck()) { mCyl1.SetCoSPrm(0x69); } else { mCyl1.SetCoSPrm(0x79); diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index 9ee4e08486..b08ed46f8b 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -1327,7 +1327,7 @@ bool daNpcShad_c::wait_type1(void* param_1) { } } - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (dComIfGp_event_chkTalkXY()) { if (!dComIfGp_evmng_ChkPresentEnd()) { @@ -1352,7 +1352,7 @@ bool daNpcShad_c::wait_type1(void* param_1) { changeEvent(l_evtArcs[mOrderEvtNo], l_evtNames[mOrderEvtNo], 1, 0xFFFF); } else { s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF); } } else if (daNpcF_chkEvtBit(0x313)) { @@ -1493,7 +1493,7 @@ bool daNpcShad_c::talk(void* param_1) { if (mItemPartnerId != fpcM_ERROR_PROCESS_ID_e) { eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF); field_0x9ec = true; setWaitAction(); @@ -1546,7 +1546,7 @@ bool daNpcShad_c::demo(void* param_1) { field_0xe1a = 2; // fallthrough case 2: - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 iVar1 = eventManager.getMyStaffId(l_myName, NULL, 0); if (iVar1 != -1) { @@ -1859,8 +1859,8 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) { fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x800); } - dComIfGp_getEvent().startCheckSkipEdge(this); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->startCheckSkipEdge(this); + dComIfGp_getEvent()->onSkipFade(); // fallthrough case '0003': setLookMode(LOOK_NONE, NULL, NULL); @@ -1913,7 +1913,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) { } } - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { Z2GetAudioMgr()->unMuteSceneBgm(70); daNpcF_clearMessageTmpBit(); daNpcF_onEvtBit(0x12F); @@ -2046,7 +2046,7 @@ BOOL daNpcShad_c::EvCut_DiscoveryCannon(int i_cutIndex) { if (eventManager->getIsAddvance(i_cutIndex)) { switch (*cutName) { case '0001': - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); Z2GetAudioMgr()->bgmStreamPrepare(0x200007C); Z2GetAudioMgr()->bgmStreamPlay(); setExpression(EXPR_NONE, 0.0f); @@ -2097,7 +2097,7 @@ BOOL daNpcShad_c::EvCut_DiscoveryCannon(int i_cutIndex) { } } - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { Z2GetAudioMgr()->bgmStreamStop(30); daNpcF_clearMessageTmpBit(); daNpcF_onEvtBit(0x312); @@ -2201,7 +2201,7 @@ BOOL daNpcShad_c::EvCut_Disappear(int i_cutIndex) { if (eventManager->getIsAddvance(i_cutIndex)) { switch (*cutName) { case '0001': - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); // fallthrough case '0004': setExpression(EXPR_NONE, -1.0f); @@ -2264,7 +2264,7 @@ BOOL daNpcShad_c::EvCut_Disappear(int i_cutIndex) { setExpressionTalkAfter(); } - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { daNpcF_clearMessageTmpBit(); daNpcF_onEvtBit(0x311); mOrderEvtNo = 9; @@ -2553,7 +2553,7 @@ BOOL daNpcShad_c::main() { (this->*mActionFn)(NULL); } - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && mItemPartnerId != fpcM_ERROR_PROCESS_ID_e) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && mItemPartnerId != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(mItemPartnerId); mItemPartnerId = fpcM_ERROR_PROCESS_ID_e; } diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index 40d70575c3..c8e825cd09 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -602,7 +602,7 @@ bool daNpcShoe_c::demo(void* param_0) { case 1: break; case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staff_id = eventManager.getMyStaffId(l_myName, NULL, 0); if (staff_id != -1) { @@ -674,7 +674,7 @@ BOOL daNpcShoe_c::main() { if (mpActionFn != NULL) { (this->*mpActionFn)(0); } - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk() && field_0xe00 != -1) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && field_0xe00 != -1) { dComIfGp_event_setItemPartnerId(field_0xe00); field_0xe00 = -1; } diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index 80dabacb74..ddfc244175 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -427,7 +427,7 @@ BOOL daNpc_SoldierA_c::main() { } if (!mHIO->m.common.debug_mode_ON) { - if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK())) { + if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK())) { if (mOrderEvtNo != EVT_NONE) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } @@ -766,7 +766,7 @@ BOOL daNpc_SoldierA_c::doEvent() { int unused = 0; BOOL rv = FALSE; - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& event_manager = dComIfGp_getEventManager(); if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) { diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index deacd75f6a..d26caca468 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -386,7 +386,7 @@ BOOL daNpc_SoldierB_c::main() { } if (!mHIO->m.common.debug_mode_ON) { - if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK())) { + if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK())) { if (mOrderEvtNo != EVT_NONE) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); } @@ -661,7 +661,7 @@ void daNpc_SoldierB_c::doNormalAction(int param_1) { BOOL daNpc_SoldierB_c::doEvent() { BOOL rv = FALSE; - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& event_manager = dComIfGp_getEventManager(); if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) { diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 6585bbd22c..8c1f7d9525 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -2608,14 +2608,14 @@ int daNpc_Taro_c::cutNotGonnaLet(int param_1) { fopAc_ac_c* actor_p = mActors[0].getActorP(); JUT_ASSERT(5464, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); break; } case 7: { fopAc_ac_c* actor_p = mActors[2].getActorP(); JUT_ASSERT(5473, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); break; } case 9: @@ -2648,12 +2648,12 @@ int daNpc_Taro_c::cutNotGonnaLet(int param_1) { case 21: { fopAc_ac_c* actor_p = mActors[0].getActorP(); JUT_ASSERT(5517, NULL != actor_p); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); break; } case 22: mJntAnm.lookPlayer(0); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); break; case 30: daNpcT_getPlayerInfoFromPlayerList(7, fopAcM_GetRoomNo(this), &cStack_30, &cStack_50); diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index c02974579d..d614541427 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -827,7 +827,7 @@ BOOL daNpcThe_c::talk(void* param_0) { if (mItemID != -1) { s16 event_id = dComIfGp_getEventManager().getEventIdx( this, "DEFAULT_GETITEM", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, event_id, 1, 0xffff); field_0x9ec = true; } @@ -1126,17 +1126,13 @@ BOOL daNpcThe_c::main() { attention_info.flags = 0; } - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_inf_c* gameInfo = &g_dComIfG_gameInfo; if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && mItemID != -1) { - // Fakematch, should be: - // dComIfGp_event_setItemPartnerId(mItemID); - gameInfo->play.getEvent().setPtI_Id(mItemID); + dComIfGp_event_setItemPartnerId(mItemID); mItemID = -1; } if (!mpHIO->m.common.debug_mode_ON && - (dComIfGp_event_runCheck() == FALSE || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) + (dComIfGp_event_runCheck() == FALSE || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != 0 && l_resNames[l_evtGetParamList[mOrderEvtNo]] != NULL) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo]]); @@ -1180,7 +1176,7 @@ void daNpcThe_c::setExpressionTalkAfter() { BOOL daNpcThe_c::doEvent() { BOOL ret = false; - if (dComIfGp_event_runCheck() != false) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& event_manager = dComIfGp_getEventManager(); if (eventInfo.checkCommandTalk()) { if (mTwilight) { @@ -1195,7 +1191,7 @@ BOOL daNpcThe_c::doEvent() { event_manager.setObjectArchive(eventInfo.getArchiveName()); mEventIdx = event_manager.getEventIdx(this, l_evtNames[mOrderEvtNo], 0xff); if (mEventIdx != -1) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventIdx, 1, 0xffff); } } else if (dComIfGp_event_chkTalkXY()) { @@ -1220,7 +1216,7 @@ BOOL daNpcThe_c::doEvent() { } else { s16 event_idx = dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, event_idx, 1, 0xffff); } } else { diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 31261fd91a..29df164a3f 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -452,7 +452,7 @@ BOOL daNpcTheB_c::main() { field_0x9ee = false; } - if (dComIfGp_event_runCheck() == FALSE || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK())) { + if (dComIfGp_event_runCheck() == FALSE || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK())) { mOrderEvtNo = EVT_NONE; if (strcmp(dComIfGp_getStartStageName(), "F_SP121") == 0) { @@ -880,8 +880,7 @@ BOOL daNpcTheB_c::doEvent() { BOOL rv = FALSE; s32 staffId; - dComIfG_play_c& play = g_dComIfG_gameInfo.play; // Fakematch - if (play.getEvent().runCheck()) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (chkAction(&daNpcTheB_c::talk)) { (this->*mAction)(NULL); @@ -896,8 +895,8 @@ BOOL daNpcTheB_c::doEvent() { rv = TRUE; } else { - dEvent_manager_c& eventManager = play.getEvtManager(); - staffId = eventManager.getMyStaffId(l_myName, NULL, 0); + dEvent_manager_c* eventManager = &dComIfGp_getEventManager(); + staffId = eventManager->getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { mStaffID = staffId; JUT_ASSERT(1357, NULL != mEvtSeqList[mOrderEvtNo]); @@ -908,7 +907,7 @@ BOOL daNpcTheB_c::doEvent() { } if ((this->*mEvtSeqList[mOrderEvtNo])(staffId)) { - eventManager.cutEnd(staffId); + eventManager->cutEnd(staffId); } rv = TRUE; @@ -926,7 +925,7 @@ BOOL daNpcTheB_c::doEvent() { } } - if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && eventManager.endCheck(mEventIdx)) { + if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && eventManager->endCheck(mEventIdx)) { switch (mOrderEvtNo) { default: break; @@ -1245,7 +1244,7 @@ int daNpcTheB_c::EvCut_PersonalCombatRevenge(int i_staffId) { } } - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); break; } @@ -1264,9 +1263,9 @@ int daNpcTheB_c::EvCut_PersonalCombatRevenge(int i_staffId) { } } - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { daNpcF_clearMessageTmpBit(); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->onSkipFade(); dComIfGp_setNextStage("F_SP123", 0, 13, 0); } diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index 61e4884bdf..3e98247b20 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -1920,7 +1920,7 @@ void daNPC_TK_c::executeBackHanjoDemo() { void daNPC_TK_c::executeWolfEvent() { mIsExecutingAction = false; if (eventInfo.checkCommandDemoAccrpt() != 0) { - dComIfGp_getEvent().setSkipProc(this, dEv_defaultSkipProc, 0); + dComIfGp_getEvent()->setSkipProc(this, dEv_defaultSkipProc, 0); setActionMode(12); executePerch(); } else { @@ -2896,7 +2896,7 @@ void daNPC_TK_c::action() { case 1: mIsExecutingAction = false; if (eventInfo.checkCommandDemoAccrpt()) { - dComIfGp_getEvent().setSkipZev(this, "TAKAYOSE@"); + dComIfGp_getEvent()->setSkipZev(this, "TAKAYOSE@"); setActionMode(2); executePerch(); } else { diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index 91ba23f714..45ca1dad16 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -1031,7 +1031,7 @@ void daNpcTkc_c::warpTalk() { if (choice == 0) { dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); eventInfo.setArchiveName(l_arcName); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventIdx = dComIfGp_getEventManager().getEventIdx(this, "TKC_WARP", 0xFF); @@ -1122,7 +1122,7 @@ int daNpcTkc_c::EvCut_TksSecretChild(int i_staffId) { break; case 2: - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); eventInfo.setArchiveName(l_arcName); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventIdx = dComIfGp_getEventManager().getEventIdx(this, "TKS_WARP", 0xFF); diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index b60efb4595..1a104cb9dd 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -575,7 +575,7 @@ BOOL daNpcTks_c::main() { setAction(&daNpcTks_c::demo_appear); } - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk() && mItemID != fpcM_ERROR_PROCESS_ID_e) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && mItemID != fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_setItemPartnerId(mItemID); mItemID = fpcM_ERROR_PROCESS_ID_e; fopAcM_delete(this); @@ -1177,7 +1177,7 @@ void daNpcTks_c::talk() { if (mItemID != fpcM_ERROR_PROCESS_ID_e) { const char* eventName = daPy_py_c::checkNowWolf() ? "WOLF_GET_TKS" : "DEFAULT_GETITEM"; s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, eventName, 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF); } } @@ -1531,7 +1531,7 @@ void daNpcTks_c::demo_appear() { mMode = 2; // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); if (staffId != -1) { @@ -1648,7 +1648,7 @@ void daNpcTks_c::demo_appear() { if (mItemID != fpcM_ERROR_PROCESS_ID_e) { s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF); field_0x9ec = true; } @@ -1694,7 +1694,7 @@ void daNpcTks_c::demo_scannon() { mMode = 2; // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); @@ -1800,7 +1800,7 @@ void daNpcTks_c::demo_Lv6Gate() { mMode = 2; // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); @@ -1858,7 +1858,7 @@ void daNpcTks_c::demo_Lv6Gate() { void daNpcTks_c::demo_farewell() { switch (mMode) { case 0: - if (cLib_calcTimer(&field_0x1370) > 0 || dComIfGp_event_runCheck() != FALSE) { + if (cLib_calcTimer(&field_0x1370) > 0 || dComIfGp_event_runCheck()) { return; } @@ -1875,7 +1875,7 @@ void daNpcTks_c::demo_farewell() { mMode = 2; // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); @@ -1885,7 +1885,7 @@ void daNpcTks_c::demo_farewell() { if (eventManager.getIsAddvance(staffId)) { switch (*cutName) { case '0001': - dComIfGp_getEvent().setSkipZev(this, "TKS_FAREWELL_SKIP"); + dComIfGp_getEvent()->setSkipZev(this, "TKS_FAREWELL_SKIP"); // fallthrough case '0006': case '0007': @@ -2059,7 +2059,7 @@ void daNpcTks_c::demo_warpBack() { mMode = 2; // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); @@ -2187,7 +2187,7 @@ void daNpcTks_c::demo_walkBack() { } // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); @@ -2292,7 +2292,7 @@ void daNpcTks_c::demo_Lv7Start() { mMode = 2; // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); @@ -2627,7 +2627,7 @@ void daNpcTks_c::demo_Lv3PickUp() { break; case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); @@ -2758,7 +2758,7 @@ void daNpcTks_c::demo_Lv6PickUp() { } // fallthrough case 2: - if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0); diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index c47fd622e3..11b0bd5989 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -795,7 +795,7 @@ void daNpc_Toby_c::action() { } } - if (dComIfGp_event_runCheck() == FALSE && field_0x1001) { + if (!dComIfGp_event_runCheck() && field_0x1001) { fopAcM_delete(this); } } @@ -1688,7 +1688,7 @@ int daNpc_Toby_c::cutConversationAboutSCannon(int arg0) { actor_p = mActorMngr[2].getActorP(); if (actor_p != NULL) { mJntAnm.lookPos(&actor_p->current.pos, 0); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); } else { mJntAnm.lookNone(0); } @@ -1726,7 +1726,7 @@ int daNpc_Toby_c::cutConversationAboutSCannon(int arg0) { field_0xd6c = actor_p->current.pos; field_0xd6c.y += 600.0f; mJntAnm.lookPos(&field_0xd6c, 0); - dComIfGp_getEvent().setPt2(actor_p); + dComIfGp_getEvent()->setPt2(actor_p); } else { mJntAnm.lookNone(0); } diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index 0482eeeb79..0392c6fa4b 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -1261,7 +1261,7 @@ int daNpc_Uri_c::cutFindWolf(int param_1) { case 1: fopAc_ac_c* actor = mActorMngr[0].getActorP(); if (actor) { - dComIfGp_getEvent().setPt2(actor); + dComIfGp_getEvent()->setPt2(actor); } break; } diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 008133fc49..d10c22aa09 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -1739,7 +1739,7 @@ bool daNpcWrestler_c::wait(void* param_1) { } case 2: { - if (dComIfGp_event_runCheck() && (mOrderNewEvt == 0 || !dComIfGp_getEvent().isOrderOK())) { + if (dComIfGp_event_runCheck() && (mOrderNewEvt == 0 || !dComIfGp_getEvent()->isOrderOK())) { actionFunc action; if (eventInfo.checkCommandTalk()) { if (dComIfGp_event_chkTalkXY() == 0 || dComIfGp_evmng_ChkPresentEnd()) { @@ -1898,7 +1898,7 @@ bool daNpcWrestler_c::talk(void* param_1) { field_0xe78 = fopAcM_createItemForPresentDemo(¤t.pos, mItemNo, 0, -1, -1, NULL, NULL); if (field_0xe78 != -1) { s16 sVar1 = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, sVar1, 1, 0xFFFF); field_0x9ec = true; field_0xe8c = field_0xbd8->common.morf_frame; @@ -3682,12 +3682,12 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { field_0xe80 = 0; } - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); field_0xe96 = 2; break; case 2: - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { field_0xe84 = 10; } @@ -3895,7 +3895,7 @@ bool daNpcWrestler_c::demoSumouReady(void* param_1) { break; case 10: - dComIfGp_getEvent().setSkipProc(this, NULL, 0); + dComIfGp_getEvent()->setSkipProc(this, NULL, 0); field_0x9ec = true; mItemNo = 3; setAction(&daNpcWrestler_c::gotoArena); @@ -5173,7 +5173,7 @@ BOOL daNpcWrestler_c::main() { (this->*field_0xdcc)(NULL); } - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && field_0xe78 != -1) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && field_0xe78 != -1) { dComIfGp_event_setItemPartnerId(field_0xe78); field_0xe78 = -1; } diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index ecb987c996..100b20b170 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -1107,8 +1107,8 @@ BOOL daNpc_Yelia_c::cutTakeWoodStatue(int i_staffId) { Z2GetAudioMgr()->muteSceneBgm(90, 0.0f); strcpy(name, l_evtList[EVENT_TAKE_WOODSTATUE].eventName); strcat(name, "@"); - dComIfGp_getEvent().setSkipZev(this, name); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->setSkipZev(this, name); + dComIfGp_getEvent()->onSkipFade(); break; } @@ -1455,7 +1455,7 @@ BOOL daNpc_Yelia_c::reminiscence(void* param_0) { case MODE_RUN: field_0xe2d = false; - if (dComIfGp_event_runCheck() != FALSE + if (dComIfGp_event_runCheck() && !strcmp("SMELL_1st", dComIfGp_getEventManager().getRunEventName())) { dComIfGp_event_setTalkPartner(this); diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 44793b7c8f..ad6cff2179 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -979,7 +979,6 @@ BOOL daNpc_ykM_c::isDelete() { } } -// NONMATCHING - m_nextID load issue, regalloc void daNpc_ykM_c::reset() { csXyz angle; int iVar1 = (u8*)&field_0x1588 - (u8*)&mpNextAction; @@ -2553,7 +2552,7 @@ int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) { mEventTimer = timer; angleY = fopAcM_searchActorAngleY(player, this); ((daPy_py_c*)daPy_getPlayerActorClass())->setPlayerPosAndAngle(&player->current.pos, angleY, 0); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); break; case 2: diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 24dcf7a925..8694e2bf99 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -1023,7 +1023,7 @@ void daNpc_ykW_c::setCollision() { u32 type = 0xd8fbfdff; u32 unkInt1 = 31; u32 unkInt2 = 0; - if (dComIfGp_event_runCheck() != FALSE || field_0x1069 != 0) { + if (dComIfGp_event_runCheck() || field_0x1069 != 0) { type = 0; unkInt1 = 0; } else if (mTwilight) { @@ -1431,7 +1431,7 @@ int daNpc_ykW_c::cutGoIntoBossRoom(int param_0) { strcpy(unkStrBuf1, l_evtList[5].eventName); } strcat(unkStrBuf1, "@"); - dComIfGp_getEvent().setSkipZev(this, unkStrBuf1); + dComIfGp_getEvent()->setSkipZev(this, unkStrBuf1); } } @@ -1458,7 +1458,7 @@ int daNpc_ykW_c::cutGoIntoBossRoom(int param_0) { bossDoor = mActorMngrs[2].getActorP(); JUT_ASSERT(0xb9e, bossDoor != NULL); - dComIfGp_getEvent().setPt2(bossDoor); + dComIfGp_getEvent()->setPt2(bossDoor); retval = 1; break; @@ -1786,7 +1786,7 @@ BOOL daNpc_ykW_c::cutLv5DungeonClear(int param_0) { itemPos += *fopCamM_GetCenter_p(camera); unkActor1 = putUtuwaHeart(&itemPos, 22.0f, 40.0f, 0x5000, 0); if (unkActor1 != NULL) { - dComIfGp_getEvent().setPt2(unkActor1); + dComIfGp_getEvent()->setPt2(unkActor1); mDoAud_seStart(Z2SE_OBJ_YO_HEART_L, &itemPos, 0, 0); retval = 1; } @@ -2663,7 +2663,7 @@ int daNpc_ykW_c::walk(void* param_0) { } dstPos2 = dstPos; - if (dComIfGp_event_runCheck() != 0 && mStaffId == -1) { + if (dComIfGp_event_runCheck() && mStaffId == -1) { dstPos2 = 1; } diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index 9631856f8a..2f262464da 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -910,7 +910,7 @@ BOOL daNpc_zrA_c::main() { } if (!daNpc_zrA_Param_c::m.mTest - && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) + && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != EVT_NONE) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); @@ -1983,7 +1983,7 @@ BOOL daNpc_zrA_c::doEvent() { BOOL ret = false; int staff_id; - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { event_manager = &dComIfGp_getEventManager(); if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) { mOrderNewEvt = false; @@ -2031,7 +2031,7 @@ BOOL daNpc_zrA_c::doEvent() { } else { s16 event_idx = dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, event_idx, 1, 0xffff); field_0x9ec = true; } @@ -2131,7 +2131,7 @@ BOOL daNpc_zrA_c::doEvent() { BOOL daNpc_zrA_c::setSkipZev(int i_idx1, int i_idx2) { if (!strcmp(dComIfGp_getEventManager().getRunEventName(), l_evtNames[i_idx1])) { - dComIfGp_getEvent().setSkipZev(this, l_evtNames[i_idx2]); + dComIfGp_getEvent()->setSkipZev(this, l_evtNames[i_idx2]); return true; } return false; diff --git a/src/d/actor/d_a_npc_zra.inc b/src/d/actor/d_a_npc_zra.inc index 4fa5b46b87..4ef98c107b 100644 --- a/src/d/actor/d_a_npc_zra.inc +++ b/src/d/actor/d_a_npc_zra.inc @@ -1406,7 +1406,7 @@ BOOL daNpc_zrA_c::ECut_carryWaterfall(int i_staffID) { if (event_manager.getIsAddvance(i_staffID)) { switch (prm) { case 0: - dComIfGp_getEvent().setSkipProc(this, dEv_defaultSkipProc, 0); + dComIfGp_getEvent()->setSkipProc(this, dEv_defaultSkipProc, 0); Z2GetAudioMgr()->subBgmStart(Z2BGM_ZORA_D01); break; diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index c6245ebae9..da829e33d7 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -451,7 +451,7 @@ BOOL daNpc_zrC_c::main() { } if (!daNpc_zrC_Param_c::m.mTest - && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) + && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != EVT_NONE) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); @@ -1099,7 +1099,7 @@ BOOL daNpc_zrC_c::doEvent() { BOOL ret = 0; int staff_id; - if (dComIfGp_event_runCheck() != FALSE) { + if (dComIfGp_event_runCheck()) { event_mgr = &dComIfGp_getEventManager(); if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !mSpeakEvent) { @@ -1118,7 +1118,7 @@ BOOL daNpc_zrC_c::doEvent() { l_evtNames[l_evtGetParamList[mOrderEvtNo].fileIdx], 2, 0xffff); } else { s16 idx = dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, idx, 1, 0xffff); field_0x9ec = true; } diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index 62cf3a6b8f..dbd5f675d8 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -525,7 +525,7 @@ BOOL daNpc_zrZ_c::main() { attention_info.flags = 0; if (!daNpc_zrZ_Param_c::m.mTest - && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) + && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) { if (mOrderEvtNo != EVT_NONE) { eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]); @@ -1030,7 +1030,7 @@ void daNpc_zrZ_c::doNormalAction(BOOL param_0) { BOOL daNpc_zrZ_c::doEvent() { BOOL ret = false; - if (dComIfGp_event_runCheck() != false) { + if (dComIfGp_event_runCheck()) { dEvent_manager_c& event_manager = dComIfGp_getEventManager(); if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) { @@ -1107,7 +1107,7 @@ BOOL daNpc_zrZ_c::doEvent() { switch (mOrderEvtNo) { case EVT_SEAL_RELEASE: setSkipZev(EVT_SEAL_RELEASE, EVT_SR_SKIP); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->onSkipFade(); break; } } @@ -1137,7 +1137,7 @@ BOOL daNpc_zrZ_c::doEvent() { BOOL daNpc_zrZ_c::setSkipZev(int i_idx1, int i_idx2) { if (!strcmp(dComIfGp_getEventManager().getRunEventName(), l_evtNames[i_idx1])) { - dComIfGp_getEvent().setSkipZev(this, l_evtNames[i_idx2]); + dComIfGp_getEvent()->setSkipZev(this, l_evtNames[i_idx2]); return true; } return false; @@ -1559,7 +1559,7 @@ BOOL daNpc_zrZ_c::ECut_comeHere(int i_staffID) { angle = player->current.angle; angle.y = fopAcM_searchPlayerAngleY(this) + 0x8000; player->setPlayerPosAndAngle(&player->current.pos, &angle); - dComIfGp_getEvent().setPtT(this); + dComIfGp_getEvent()->setPtT(this); initTalk(8, NULL); mIsLeading = true; break; @@ -1659,8 +1659,8 @@ BOOL daNpc_zrZ_c::ECut_clothesGet(int i_staffID) { case 10: initTalk(9, NULL); if (mpGravestoneActor != NULL) { - dComIfGp_getEvent().setPtT(mpGravestoneActor); - dComIfGp_getEvent().setPt2(mpGravestoneActor); + dComIfGp_getEvent()->setPtT(mpGravestoneActor); + dComIfGp_getEvent()->setPt2(mpGravestoneActor); } break; @@ -1687,7 +1687,7 @@ BOOL daNpc_zrZ_c::ECut_clothesGet(int i_staffID) { case 50: if (mpClothActor != NULL) { - dComIfGp_getEvent().setPtT(mpClothActor); + dComIfGp_getEvent()->setPtT(mpClothActor); } mEventTimer = 20; break; @@ -1708,7 +1708,7 @@ BOOL daNpc_zrZ_c::ECut_clothesGet(int i_staffID) { break; case 70: - dComIfGp_getEvent().setPtT(this); + dComIfGp_getEvent()->setPtT(this); break; case 71: @@ -1925,7 +1925,7 @@ BOOL daNpc_zrZ_c::ECut_sealRelease(int i_staffID) { case 0: mEventTimer = 20; mSealReleased = true; - dComIfGp_getEvent().setSkipProc(this, dEv_defaultSkipProc, 0); + dComIfGp_getEvent()->setSkipProc(this, dEv_defaultSkipProc, 0); mpRockActor->setDemoStart(); break; diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index f913dfecbf..aa9a59c5b2 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -150,7 +150,7 @@ void daBmWindow_c::init_modeWait() { } void daBmWindow_c::modeWait() { - daPy_py_c* player = (daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR); + daPy_py_c* player = (daPy_py_c*)dComIfGp_getLinkPlayer(); cXyz cStack_2c; cXyz cStack_38; cStack_2c = l_check_area[0]; diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index df2ecc9a70..b16c183506 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -119,10 +119,9 @@ int daObj_BouMato_c::Execute() { if (field_0xa38 == 1 && dVar1 == 0) { deleteStuckArrow(); } - dComIfG_play_c& play = g_dComIfG_gameInfo.play; - if (play.getEvent().runCheck() && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { if (eventInfo.checkCommandDemoAccrpt() && dComIfGp_getEventManager().endCheck(field_0xa30)) { - play.getEvent().reset(); + dComIfGp_event_reset(); field_0xa30 = -1; } else { int staffId = dComIfGp_getEventManager().getMyStaffId("BouMato", this, -1); diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index f8ac63adfe..ccd8030230 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -352,7 +352,7 @@ void daObjCRVGATE_c::CloseAction() { daPy_py_c* player = daPy_getPlayerActorClass(); cXyz* player_pos = &fopAcM_GetPosition(player); - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { cXyz* boar_speed = &fopAcM_GetSpeed(boar_ac); daPy_py_c* player = daPy_getPlayerActorClass(); cXyz* player_pos = &fopAcM_GetPosition(player); diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index abc9aef6aa..fc5b5ee82b 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -161,9 +161,8 @@ int daObjCRVHAHEN_c::Execute() { int daObjCRVHAHEN_c::Delete() { if (mInitialized) { - J3DModelData* model_data = (J3DModelData*)dRes_control_c::getRes( - l_arcName, "CaravanPiece.bmd", g_dComIfG_gameInfo.mResControl.mObjectInfo, 0x80); - dComIfGp_removeSimpleModel(model_data, (int)(char)current.roomNo); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "CaravanPiece.bmd"); + dComIfGp_removeSimpleModel(model_data, fopAcM_GetRoomNo(this)); } dComIfG_resDelete(&mPhase, l_arcName); @@ -222,9 +221,8 @@ int daObjCRVHAHEN_c::create() { } mDrawHahen = 0; gravity = -9.0f; - J3DModelData* model_data = (J3DModelData*)dRes_control_c::getRes( - l_arcName, "CaravanPiece.bmd", g_dComIfG_gameInfo.mResControl.mObjectInfo, 0x80); - dComIfGp_addSimpleModel(model_data, (int)(char)current.roomNo, '\0'); + J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "CaravanPiece.bmd"); + dComIfGp_addSimpleModel(model_data, fopAcM_GetRoomNo(this), '\0'); mInitialized = true; mGroundHeight = current.pos.y; fopAcM_setCullSizeBox(this, -1000.0, -500.0, -1000.0, 1000.0, 500.0, 1000.0); diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index 3f9a1bdb12..69123a477a 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -360,7 +360,7 @@ void daObjDmElevator_c::actionSwPause() { daPy_getPlayerActorClass()->mEndResetFlg1 = daPy_getPlayerActorClass()->mEndResetFlg1 | 0x200; field_0x62a += -1; if (field_0x62a == 0) { - g_dComIfG_gameInfo.play.mEvent.reset(); + dComIfGp_event_reset(); actionSwPauseNoneInit(); } } @@ -589,10 +589,7 @@ int daObjDmElevator_c::demoProc() { void daObjDmElevator_c::moveInit() { speedF = 0.0f; if (field_0x5e0 == 0) { - s8 i_reverb = dComIfGp_getReverb(fopAcM_GetRoomNo(this)); - - Z2AudioMgr::mAudioMgrPtr->seStart(Z2SE_OBJ_ELEVATOR_START, (Vec*)&eyePos, 0, i_reverb, 1.0, - 1.0, -1.0, -1.0, 0); + fopAcM_seStart(this, Z2SE_OBJ_ELEVATOR_START, 0); } } diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp index ee0a774e4a..465ce1807a 100644 --- a/src/d/actor/d_a_obj_geyser.cpp +++ b/src/d/actor/d_a_obj_geyser.cpp @@ -138,7 +138,7 @@ static const Vec l_scale[] = { }; int daObjGeyser_c::Execute(Mtx** param_0) { - if (dComIfGp_event_runCheck() == 0) { + if (!dComIfGp_event_runCheck()) { f32 range = 5000.0f; if (fopAcM_searchPlayerDistance(this) > range) { stopEmitterPre00(); diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 06ae7700c7..3db1110cfb 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -980,10 +980,6 @@ void daObj_GrA_c::setParam() { BOOL daObj_GrA_c::checkEvent() { BOOL rv = TRUE; -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; -#endif if (dComIfGp_event_runCheck()) { rv = FALSE; if (eventInfo.checkCommandTalk()) { @@ -994,11 +990,7 @@ BOOL daObj_GrA_c::checkEvent() { } } else if (eventInfo.checkCommandDemoAccrpt()) { if (dComIfGp_getEventManager().endCheck(mEvtIdx) != 0) { -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif field_0x1520 = 0; mEvtIdx = -1; rv = TRUE; diff --git a/src/d/actor/d_a_obj_gra2_base.inc b/src/d/actor/d_a_obj_gra2_base.inc index e697261016..9af48bb896 100644 --- a/src/d/actor/d_a_obj_gra2_base.inc +++ b/src/d/actor/d_a_obj_gra2_base.inc @@ -152,8 +152,8 @@ int daObj_GrA_c::startDemo(void* param_1) { gra_p->setProcess(&daObj_GrA_c::soldierDemo); fopAcM_OnStatus(gra_p, fopAcM_STATUS_UNK_0x8000); field_0x2056 = 0; - dComIfGp_getEvent().setSkipProc(this, skipCallBack, 0); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->setSkipProc(this, skipCallBack, 0); + dComIfGp_getEvent()->onSkipFade(); } // fallthrough case 2: { diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index 36b2da6d0e..f8b1870f67 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -1289,7 +1289,7 @@ int daObj_GrA_c::rollEscape(void* param_1) { } rollLanding(); - if (!dComIfGp_event_runCheck() || dComIfGp_getEvent().isOrderOK()) { + if (!dComIfGp_event_runCheck() || dComIfGp_getEvent()->isOrderOK()) { if (dComIfGoat_GetThrow() == this) { dComIfGoat_SetThrow(0); if (isFirstGra()) { diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 7621643c09..e2a5a08b3c 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -909,7 +909,6 @@ void daObj_Kanban2_c::calcNormalSwing() { field_0x626 = sp8; } -// NONMATCHING - gameinfo mEvent load, equivalent void daObj_Kanban2_c::executeNormal() { calcNormalSwing(); mCcSph.OffAtSetBit(); @@ -953,20 +952,9 @@ void daObj_Kanban2_c::executeNormal() { break; case 1: mInvulnerabilityTimer = 3; -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck() && eventInfo.checkCommandTalk()) -#else - if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk()) -#endif - { + if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk()) { if (mMsgFlow.doFlow(this, NULL, 0)) { -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif field_0x9fe = 0; } } else { diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp index e7964f2b52..eb0ddc56a0 100644 --- a/src/d/actor/d_a_obj_kiPot.cpp +++ b/src/d/actor/d_a_obj_kiPot.cpp @@ -74,7 +74,7 @@ void daKiPot_c::modeWait() { s32 daKiPot_c::chkEvent() { s32 result = 1; - if (!dComIfGp_getEvent().isOrderOK()) { + if (!dComIfGp_getEvent()->isOrderOK()) { result = 0; if (eventInfo.checkCommandCatch()) { diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 08e6f62d1d..6c861719f9 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -324,7 +324,6 @@ void daObjLv7Brg_c::action() { } } -// NONMATCHING - small regalloc void daObjLv7Brg_c::mode_action() { f32 var_f31; f32 temp_f30 = field_0xa78; diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp index a261c08cce..13a0c64eb5 100644 --- a/src/d/actor/d_a_obj_mirror_screw.cpp +++ b/src/d/actor/d_a_obj_mirror_screw.cpp @@ -75,7 +75,6 @@ void daObjMirrorScrew_c::initDown() { } void daObjMirrorScrew_c::executeDown() { - dComIfG_inf_c* gameinfo = &g_dComIfG_gameInfo; if (dComIfGp_event_runCheck()) { daPy_py_c* player = daPy_getPlayerActorClass(); player->changeOriginalDemo(); @@ -112,9 +111,8 @@ void daObjMirrorScrew_c::executeDown() { if (current.pos.y <= home.pos.y + M_attr.mDownDist) { current.pos.y = home.pos.y + M_attr.mDownDist; - // fake match: these should be dComIfGp_getVibration() - gameinfo->play.getVibration().StartShock(8, 0xf, cXyz(0.0f, 1.0f, 0.0f)); - gameinfo->play.getVibration().StopQuake(0x1f); + dComIfGp_getVibration().StartShock(8, 0xf, cXyz(0.0f, 1.0f, 0.0f)); + dComIfGp_getVibration().StopQuake(0x1f); Z2GetAudioMgr()->seStart(Z2SE_OBJ_MR_SCRW_OFF, ¤t.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index 9c8a043a87..eede848e44 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -218,11 +218,10 @@ void daObjNameplate_c::messageProc() { break; case 1: - dComIfG_play_c& play = g_dComIfG_gameInfo.play; - if (play.getEvent().runCheck() && eventInfo.checkCommandTalk() != 0 && + if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk() != 0 && mMsgFlow.doFlow(this, NULL, 0) != 0) { - play.getEvent().reset(); + dComIfGp_event_reset(); mShowMessage = 0; } break; diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index 1d8873d462..99639641d0 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -235,7 +235,7 @@ void daObj_Oiltubo_c::setAttnPos() { BOOL daObj_Oiltubo_c::chkEvent() { BOOL var_r5 = 1; - if (!dComIfGp_getEvent().isOrderOK()) { + if (!dComIfGp_getEvent()->isOrderOK()) { var_r5 = 0; if (eventInfo.checkCommandCatch()) { diff --git a/src/d/actor/d_a_obj_onsenFire.cpp b/src/d/actor/d_a_obj_onsenFire.cpp index f9540a3681..44e0937896 100644 --- a/src/d/actor/d_a_obj_onsenFire.cpp +++ b/src/d/actor/d_a_obj_onsenFire.cpp @@ -21,7 +21,7 @@ int daObjOnsenFire_c::execute() { dComIfGp_particle_setSimple(0x100,¤t.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f); dComIfGp_particle_setSimple(0x101,¤t.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f); dComIfGp_particle_setSimple(0x103,¤t.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f); - Z2AudioMgr::getInterface()->seStartLevel(Z2SE_OBJ_ONSEN_WARM_FIRE,¤t.pos,0,0,1.0f,1.0f,-1.0f,-1.0f,0); + Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_ONSEN_WARM_FIRE,¤t.pos,0,0,1.0f,1.0f,-1.0f,-1.0f,0); return 1; } diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index 32da9d72fa..a8aef7325e 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -206,7 +206,7 @@ int daOnsTaru_c::Execute() { if (mStartTimer) { if (mTimer < (s16)(l_HIO.mCoolTime * 30)) { - if (!g_dComIfG_gameInfo.play.mEvent.runCheck()) { + if (dComIfGp_event_runCheck() == FALSE) { mTimer++; } diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 362d540850..475dddbe5d 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -516,7 +516,7 @@ void daSCannon_c::exeModeActionEvt() { } } else { if ((mLayerNo == 3 || mLayerNo == 10) && fopAcM_isSwitch(this, getSw2())) { - dComIfGp_getEvent().setSkipProc(this, eventCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, eventCallBack, 0); } demoExe(); } diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index 27b0e80533..c4e3a81cb3 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -160,7 +160,7 @@ void daSCannonCrs_c::middleExe(daMidna_c* i_midna_p) { void daSCannonCrs_c::exeModeWait(daMidna_c* i_midna_p) { if (dComIfGp_evmng_startCheck(mEvtIdx) != 0) { if (strcmp(dComIfGp_getEventManager().getRunEventName(), "SKY_CANNON_WARP_START") == 0) { - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); if (player_p != NULL) { @@ -211,7 +211,7 @@ void daSCannonCrs_c::exeModeOrderEvt(daMidna_c* i_midna_p) { } } else { if (dComIfGp_evmng_startCheck(mEvtIdx) != 0) { - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); daPy_py_c* player_p = (daPy_py_c*)dComIfGp_getPlayer(0); if (player_p != NULL) { @@ -259,7 +259,7 @@ void daSCannonCrs_c::exeModeWarpEvt(daMidna_c* i_midna_p) { if (dComIfGp_evmng_endCheck(mEvtIdx) != 0) { mMode = MODE_END; } else { - dComIfGp_getEvent().setSkipProc(this, eventCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, eventCallBack, 0); demoExe(); } } diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index 560fe14948..6d9025f079 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -207,7 +207,7 @@ void daObjSCannonTen_c::exeModeActionEvt() { dComIfGp_event_reset(); mMode = MODE_END; } else { - dComIfGp_getEvent().setSkipProc(this, eventCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, eventCallBack, 0); demoExe(); } } diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index edf15095fd..e944baca10 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -1320,11 +1320,11 @@ int daObj_Sekizoa_c::cutStart(int i_staffIdx) { if (mType == TYPE_0) { daObj_SMTile_c* actor_4 = (daObj_SMTile_c*)mActorMngrs[4].getActorP(); actor_4->reset(); - dComIfGp_getEvent().setPt2(actor_4); + dComIfGp_getEvent()->setPt2(actor_4); strcpy(acStack_90, l_evtList[2].eventName); strcat(acStack_90, "@"); - dComIfGp_getEvent().setSkipZev(this, acStack_90); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->setSkipZev(this, acStack_90); + dComIfGp_getEvent()->onSkipFade(); if (daNpcT_getPlayerInfoFromPlayerList(1, fopAcM_GetRoomNo(this), &c_stack_9c, &c_stack_c8)) { @@ -1434,7 +1434,7 @@ int daObj_Sekizoa_c::cutStart(int i_staffIdx) { if (prm == 13) { daObj_SMTile_c* actor_4 = (daObj_SMTile_c*)mActorMngrs[4].getActorP(); actor_4->reset(); - dComIfGp_getEvent().setPt2(actor_4); + dComIfGp_getEvent()->setPt2(actor_4); mDoAud_seStart(Z2SE_SY_MG_SEKI_WHITE_OUT, 0, 0, 0); } } @@ -1815,8 +1815,8 @@ int daObj_Sekizoa_c::cutGoal(int i_staffIdx) { if (mType == TYPE_0) { strcpy(acStack_9c, l_evtList[6].eventName); strcat(acStack_9c, "@"); - dComIfGp_getEvent().setSkipZev(this, acStack_9c); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->setSkipZev(this, acStack_9c); + dComIfGp_getEvent()->onSkipFade(); } mEventTimer = timer; break; @@ -2181,10 +2181,10 @@ int daObj_Sekizoa_c::cutExtinction(int i_staffIdx) { actor_0->shape_angle.y - -0x8000, 0); strcpy(acStack_a4, l_evtList[9].eventName); strcat(acStack_a4, "@"); - dComIfGp_getEvent().setSkipZev(actor_0, acStack_a4); - dComIfGp_getEvent().onSkipFade(); + dComIfGp_getEvent()->setSkipZev(actor_0, acStack_a4); + dComIfGp_getEvent()->onSkipFade(); actor_0->pullMasterSword(); - dComIfGp_getEvent().setPt2(actor_0); + dComIfGp_getEvent()->setPt2(actor_0); break; case 1: diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index 2bd117f1ea..7df8c9e12f 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -319,7 +319,7 @@ void daObjSmgDoor_c::actionWaitEvent() { void daObjSmgDoor_c::actionEvent() { dMeter2Info_onGameStatus(2); - dComIfGp_getEvent().setSkipProc(this, eventCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, eventCallBack, 0); demoProc(); } diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index 9230868e47..601e09e3ca 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -370,7 +370,7 @@ int daObj_SSDrink_c::chkEvent() { return 1; } - if (dComIfGp_getEvent().isOrderOK() == 0) { + if (dComIfGp_getEvent()->isOrderOK() == 0) { if (getParentPtr() != NULL) { fopAc_ac_c* parent = (fopAc_ac_c*)getParentPtr(); attention_info.position.set(parent->attention_info.position); diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index fdd92a010a..6ebb9f556d 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -42,7 +42,7 @@ int daObjTable_c::create() { } static int daObjTable_Draw(daObjTable_c* i_this) { - return i_this->Draw(); + return i_this->MoveBGDraw(); } static int daObjTable_Execute(daObjTable_c* i_this) { @@ -64,6 +64,7 @@ static int daObjTable_Create(fopAc_ac_c* i_this) { int daObjTable_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); + JUT_ASSERT(76, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -140,23 +141,26 @@ int daObjTable_c::Create() { int daObjTable_c::Execute(Mtx** i_mtx) { eventInfo.onCondition(1); - dComIfG_inf_c& gameInfo = g_dComIfG_gameInfo; if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (mMsgFlow.doFlow(this, NULL, 0) != 0) { - gameInfo.play.getEvent().reset(this); // Fake match? + dComIfGp_getEvent()->reset(this); eventInfo.setArchiveName("Table"); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = dComIfGp_getEventManager().getEventIdx(this, "TABLE_MAP", -1); - fopAcM_orderChangeEventId(this, mEventID, 1, -1); + int r27 = fopAcM_orderChangeEventId(this, mEventID, 1, -1); + } + } else { + dEvent_manager_c& evtMgr = dComIfGp_getEventManager(); + int staffId = evtMgr.getMyStaffId(l_arcName, NULL, 0); + if (staffId != -1 && + eventInfo.checkCommandDemoAccrpt() && mEventID != -1 && + evtMgr.endCheck(mEventID)) + { + mEventID = -1; + dMeter2Info_setPauseStatus(7); } - } else if (dComIfGp_getEventManager().getMyStaffId(l_arcName, NULL, 0) != -1 && - eventInfo.checkCommandDemoAccrpt() && mEventID != -1 && - dComIfGp_getEventManager().endCheck(mEventID)) - { - mEventID = -1; - dMeter2Info_setPauseStatus(7); } } else { mMsgFlow.init(this, getMessageNo(), 0, NULL); diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index 942ad5b3f0..92ebccbca1 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -573,7 +573,7 @@ void daObjTks_c::demo() { switch (field_0xdde) { case 0: dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); eventInfo.setArchiveName(l_arcName); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventIdx = dComIfGp_getEventManager().getEventIdx(this, "TKS_SECRET", 0xFF); @@ -702,7 +702,7 @@ void daObjTks_c::warp() { switch (field_0xdde) { case 0: dCam_getBody()->EndEventCamera(fopAcM_GetID(this)); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); eventInfo.setArchiveName(l_arcName); dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventIdx = dComIfGp_getEventManager().getEventIdx(this, "TKS_WARP", 0xFF); @@ -714,7 +714,7 @@ void daObjTks_c::warp() { field_0xdde = 2; return; case 2: - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventMgr = dComIfGp_getEventManager(); int staff_id = eventMgr.getMyStaffId(l_myName, NULL, 0); diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index 3c7540b530..2c9738b6bb 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -306,7 +306,7 @@ void daObjTobyHouse_c::actionEvent() { dComIfGs_offOneZoneSwitch(6, 0xffffffff); setAction(ACTION_WAIT); } else { - dComIfGp_getEvent().setSkipProc(this, eventCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, eventCallBack, 0); demoProc(); } } diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 7711aefa25..7b5ee2f6af 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -603,7 +603,7 @@ void daObjVolcBom_c::actionWait() { if (dComIfGp_evmng_startCheck(mEventId)) { if (strcmp(dComIfGp_getEventManager().getRunEventName(), "PORTAL_WARP_BIGVOLC") == 0) { player->onWarpObjDemo(); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); setAction(ACTION_WARP_EVENT); demoProc(); @@ -636,7 +636,7 @@ void daObjVolcBom_c::actionOrderATalkEvent() { } else { if (dComIfGp_evmng_startCheck(mEventId)) { player->onWarpObjDemo(); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0); setAction(ACTION_WARP_EVENT); demoProc(); @@ -668,7 +668,7 @@ void daObjVolcBom_c::actionTalkEvent() { void daObjVolcBom_c::actionWarpEvent() { if (!dComIfGp_evmng_endCheck(mEventId)) { - dComIfGp_getEvent().setSkipProc(this, eventCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, eventCallBack, 0); demoProc(); } } diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index e3c20eb359..7532b31a0a 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -333,7 +333,7 @@ void daObjWarpKBrg_c::actionWait() { if (dComIfGp_evmng_startCheck(mEventId[mEventType])) { if (strcmp(dComIfGp_getEventManager().getRunEventName(), "PORTAL_WARP_KBRIDGE") == 0) { midna_p->onTagWaitPosPortalObj(&mMidnaWaitPos); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); setAction(ACTION_WARP_EVENT_e); demoProc(); @@ -360,7 +360,7 @@ void daObjWarpKBrg_c::actionWaitWarpEvent() { if (dComIfGp_evmng_startCheck(mEventId[mEventType])) { midna_p->onTagWaitPosPortalObj(&mMidnaWaitPos); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); setAction(ACTION_WARP_EVENT_e); demoProc(); @@ -375,7 +375,7 @@ void daObjWarpKBrg_c::actionOrderATalkEvent() { mMsgFlow.init(this, getMsgID(), 0, NULL); } else if (dComIfGp_evmng_startCheck(mEventId[mEventType])) { midna_p->onTagWaitPosPortalObj(&mMidnaWaitPos); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0); setAction(ACTION_WARP_EVENT_e); demoProc(); @@ -408,7 +408,7 @@ void daObjWarpKBrg_c::actionTalkEvent() { void daObjWarpKBrg_c::actionWarpEvent() { if (!dComIfGp_evmng_endCheck(mEventId[mEventType])) { - dComIfGp_getEvent().setSkipProc(this, eventCallBack, 0); + dComIfGp_getEvent()->setSkipProc(this, eventCallBack, 0); demoProc(); } } diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index 38773c9e91..c040f6b6b5 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -215,7 +215,6 @@ void daObjWarpOBrg_c::actionWait() { daMidna_c* midna_p = daPy_py_c::getMidnaActor(); if (midna_p != NULL) { - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; // fakematch if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk()) { midna_p->onTagWaitPosPortalObj(&mMidnaWaitPos); if (midna_p->current.pos.abs(mMidnaWaitPos) < 5.0f) { @@ -243,10 +242,9 @@ void daObjWarpOBrg_c::actionWait() { if (strcmp(dComIfGp_getEventManager().getRunEventName(), "PORTAL_WARP_OBRIDGE") == 0) { mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name[getNameArg()], NULL, 0); setAction(ACTION_WARP_EVENT_e); - dEvt_control_c* event = &play->getEvent(); // fakematch - event->startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); midna_p->offTagWaitPos(); - event->setPt2(this); + dComIfGp_getEvent()->setPt2(this); } } } @@ -265,9 +263,9 @@ void daObjWarpOBrg_c::actionOrderEvent() { } else if (dComIfGp_evmng_startCheck(mEventId)) { mStaffId = dComIfGp_evmng_getMyStaffId(l_staff_name[getNameArg()], NULL, 0); setAction(ACTION_WARP_EVENT_e); - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); midna_p->offTagWaitPos(); - dComIfGp_getEvent().setPt2(this); + dComIfGp_getEvent()->setPt2(this); } else { eventInfo.onCondition(1); if (checkTalkDistance()) { @@ -295,7 +293,7 @@ void daObjWarpOBrg_c::actionWarpEvent() { if (!dComIfGp_evmng_endCheck(mEventId)) { demoProc(); - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { /* dSv_event_tmp_flag_c::T_0010 - General use - General use temporary flag (flow control) A */ dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[11]); /* dSv_event_tmp_flag_c::T_0011 - General use - General use temporary flag (flow control) B */ diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index cd055d895f..51afb23173 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -172,7 +172,7 @@ void daWindStone_c::exeModeHowl() { } void daWindStone_c::exeModeMapDisp() { - if (dComIfGp_getEvent().isOrderOK() || !dComIfGp_event_runCheck()) { + if (dComIfGp_getEvent()->isOrderOK() || !dComIfGp_event_runCheck()) { dMeter2Info_setGoldWolfMapType(getGoldWolfIdx()); dMeter2Info_setPauseStatus(5); fopAcM_onSwitch(this, getSwBit2()); diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index eb03316072..bc69497739 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -239,7 +239,7 @@ int daObjWStatue_c::initActionOrderGetDemo() { mCcCyl.OffCoSPrmBit(1); hide(); s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, eventIdx, 1, 0xffff); mItemId = fopAcM_createItemForTrBoxDemo(¤t.pos, m_itemNo, 0xffffffff, fopAcM_GetRoomNo(this), 0, 0); diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index bd616d5be4..d612506c0c 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -273,10 +273,11 @@ int daZdoor_c::create1st() { mDoorType = getType(); int phase_state = dComIfG_resLoad(&mPhaseReq, l_arcName[mDoorType]); if (phase_state == cPhs_COMPLEATE_e) { - int res_name_index = g_dComIfG_gameInfo.mResControl.getObjectResName2Index(l_arcName[mDoorType], l_dzbName[mDoorType]); + int dzb_id = dComIfG_getObjctResName2Index(l_arcName[mDoorType], l_dzbName[mDoorType]); + JUT_ASSERT(604, dzb_id != -1); u16 estimate_size = estimateSizeTbl[mDoorType]; - phase_state = MoveBGCreate(l_arcName[mDoorType], res_name_index, 0x0, estimate_size, 0x0); + phase_state = MoveBGCreate(l_arcName[mDoorType], dzb_id, 0x0, estimate_size, 0x0); if (phase_state == cPhs_ERROR_e) { return phase_state; diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index 764901c3a9..3875e0a95f 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -386,7 +386,7 @@ void daPeru_c::srchActors() { int daPeru_c::evtTalk() { if (chkAction(&daPeru_c::talk)) { (this->*(mActionFunc))(0); - } else if (!g_dComIfG_gameInfo.play.mEvent.chkTalkXY() || g_dComIfG_gameInfo.play.mEvtManager.ChkPresentEnd()) { + } else if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) { setAction(&daPeru_c::talk, 0); } return 1; diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index d2b2b729a5..041a1dab90 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -116,9 +116,7 @@ inline bool daTagLv6Gate_c::checkOpenArea() { } inline int daTagLv6Gate_c::execute() { - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_inf_c& game_info = g_dComIfG_gameInfo; - if (game_info.getPlay().getEvent().runCheck() && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 cut_index = eventManager.getMyStaffId(l_arcName, NULL, 0); if (cut_index != -1) { @@ -129,7 +127,7 @@ inline int daTagLv6Gate_c::execute() { if (eventManager.getIsAddvance(cut_index)) { switch (*cut_name) { case '0001': { - dComIfGp_getEvent().setSkipZev(this, "LV6_GATE_APPEAR_SKIP"); + dComIfGp_getEvent()->setSkipZev(this, "LV6_GATE_APPEAR_SKIP"); cXyz pos(0.0f, 0.0f, 78.0f); diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp index 4ef355cc28..a31bceface 100644 --- a/src/d/actor/d_a_tag_Lv7Gate.cpp +++ b/src/d/actor/d_a_tag_Lv7Gate.cpp @@ -218,9 +218,7 @@ void daTagLv7Gate_c::flyAnime() { } int daTagLv7Gate_c::execute() { - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c& play = g_dComIfG_gameInfo.play; - if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) { + if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { dEvent_manager_c& evtMgr = dComIfGp_getEventManager(); s32 cut_index = evtMgr.getMyStaffId(l_arcName, NULL, 0); if (cut_index != -1) { @@ -263,8 +261,7 @@ int daTagLv7Gate_c::execute() { if (eventInfo.checkCommandDemoAccrpt() && mEvtId != -1 && evtMgr.endCheck(mEvtId)) { - // dComIfGp_event_reset(); - play.getEvent().reset(); // Fakematch + dComIfGp_event_reset(); mEvtId = -1; fopAcM_delete(this); } diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index 4bed7e7b61..be0e766c7d 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -114,13 +114,7 @@ static int daTagLv8Gate_Execute(daTagLv8Gate_c* i_this) { } inline int daTagLv8Gate_c::execute() { - #if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck() && !eventInfo.checkCommandTalk()) { - #else if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) { - #endif dEvent_manager_c& eventManager = dComIfGp_getEventManager(); s32 cut_index = eventManager.getMyStaffId(l_arcName, NULL, 0); @@ -130,7 +124,7 @@ inline int daTagLv8Gate_c::execute() { if (eventManager.getIsAddvance(cut_index)) { switch (*cut_name) { case '0001': { - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); daPy_getPlayerActorClass()->setPlayerPosAndAngle(¤t.pos, shape_angle.y, 0); @@ -149,12 +143,9 @@ inline int daTagLv8Gate_c::execute() { } } - #if VERSION != VERSION_SHIELD_DEBUG - dEvt_control_c& eventControl = play->getEvent(); - #endif - if (dComIfGp_getEvent().checkSkipEdge()) { + if (dComIfGp_getEvent()->checkSkipEdge()) { #if VERSION != VERSION_SHIELD_DEBUG - dComIfGp_getEvent().reset(); + dComIfGp_getEvent()->reset(); #else dComIfGp_event_reset(); #endif diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index 62e8d72bf2..2d90b9bef3 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -172,15 +172,15 @@ void daTagTWGate_c::executeDemoFilone1() { if (event_manager.getIsAddvance(staffId)) { switch (*cutName) { case 0x30303031: - dComIfGp_getEvent().setSkipProc(this, dEv_noFinishSkipProc, 0); + dComIfGp_getEvent()->setSkipProc(this, dEv_noFinishSkipProc, 0); break; } } switch (*cutName) { case 0x30303031: - if (dComIfGp_getEvent().chkFlag2(8)) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->chkFlag2(8)) { + dComIfGp_getEvent()->onSkipFade(); mActionID = ACT_DEMO_FILONE_2; mAction = ActionTable[mActionID]; (this->**mAction)(); @@ -201,14 +201,11 @@ void daTagTWGate_c::executeDemoFilone1() { void daTagTWGate_c::initDemoFilone2() { fopAcM_onSwitch(this, getSwitch()); eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - dComIfG_play_c& play = g_dComIfG_gameInfo.play; - dEvent_manager_c& mng = play.getEvtManager(); - mng.setObjectArchive(eventInfo.getArchiveName()); - mEventID = - mng.getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, -1); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, -1); - if (play.getEvent().mEventStatus != 0) { - dComIfGp_getEvent().reset(this); + if (dComIfGp_event_runCheck()) { + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, -1); } else { fopAcM_orderOtherEventId(this, mEventID, -1, -1, 4, 1); @@ -251,7 +248,7 @@ void daTagTWGate_c::executeDemoFilone2() { if (eventInfo.checkCommandDemoAccrpt() && mEventID != -1 && dComIfGp_evmng_endCheck(mEventID)) { - dComIfGp_getEvent().reset(); + dComIfGp_getEvent()->reset(); field_0x5e0 = 0; mActionID = ACT_WAIT; mAction = ActionTable[mActionID]; @@ -267,7 +264,7 @@ void daTagTWGate_c::initDemoFilone3() { dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, -1); } @@ -282,7 +279,7 @@ void daTagTWGate_c::executeDemoFilone3() { case 0x30303031: break; case 0x30303032: - dComIfGp_getEvent().setSkipProc(this, dEv_noFinishSkipProc, 0); + dComIfGp_getEvent()->setSkipProc(this, dEv_noFinishSkipProc, 0); field_0x5e1 = 0; break; case 0x30303033: @@ -305,8 +302,8 @@ void daTagTWGate_c::executeDemoFilone3() { break; } case 0x30303032: { - if (dComIfGp_getEvent().chkFlag2(8)) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->chkFlag2(8)) { + dComIfGp_getEvent()->onSkipFade(); dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } @@ -333,8 +330,8 @@ void daTagTWGate_c::executeDemoFilone3() { break; } case 0x30303033: - if (dComIfGp_getEvent().chkFlag2(8)) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->chkFlag2(8)) { + dComIfGp_getEvent()->onSkipFade(); dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, l_zevParamTbl[mType].mRoomNo, @@ -349,7 +346,7 @@ void daTagTWGate_c::executeDemoFilone3() { if (eventInfo.checkCommandDemoAccrpt() && mEventID != -1 && dComIfGp_evmng_endCheck(mEventID)) { - dComIfGp_getEvent().reset(); + dComIfGp_getEvent()->reset(); field_0x5e0 = 0; mActionID = ACT_WAIT; mAction = ActionTable[mActionID]; @@ -372,14 +369,14 @@ void daTagTWGate_c::executeDemoOrdin1() { if (evtMng.getIsAddvance(staffId)) { switch (*cutName) { case '0001': - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); break; } } switch (*cutName) { case '0001': - if (dComIfGp_getEvent().checkSkipEdge()) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->checkSkipEdge()) { + dComIfGp_getEvent()->onSkipFade(); setAction(ACT_DEMO_ORDIN_2); } evtMng.cutEnd(staffId); @@ -394,12 +391,10 @@ void daTagTWGate_c::executeDemoOrdin1() { void daTagTWGate_c::initDemoOrdin2() { fopAcM_onSwitch(this, getSwitch()); eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - dComIfG_play_c& play = g_dComIfG_gameInfo.play; - dEvent_manager_c& mng = play.getEvtManager(); - mng.setObjectArchive(eventInfo.getArchiveName()); - mEventID = mng.getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, 0xff); - if (play.getEvent().mEventStatus != 0) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, 0xff); + if (dComIfGp_event_runCheck()) { + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, 0xffff); } else { fopAcM_orderOtherEventId(this, mEventID, 0xff, 0xffff, 4, 1); @@ -457,7 +452,7 @@ void daTagTWGate_c::initDemoOrdin3() { dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, -1); } @@ -473,7 +468,7 @@ void daTagTWGate_c::executeDemoOrdin3() { case '0001': break; case '0002': - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); field_0x5e1 = 0; break; case '0003': @@ -499,8 +494,8 @@ void daTagTWGate_c::executeDemoOrdin3() { } break; case '0002': - if (dComIfGp_getEvent().checkSkipEdge()) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->checkSkipEdge()) { + dComIfGp_getEvent()->onSkipFade(); dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } @@ -519,8 +514,8 @@ void daTagTWGate_c::executeDemoOrdin3() { } break; case '0003': - if (dComIfGp_getEvent().checkSkipEdge()) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->checkSkipEdge()) { + dComIfGp_getEvent()->onSkipFade(); dComIfGp_setNextStage( l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, @@ -557,14 +552,14 @@ void daTagTWGate_c::executeDemoRanail1() { if (evtMng.getIsAddvance(staffId)) { switch (*cutName) { case '0001': - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); break; } } switch (*cutName) { case '0001': - if (dComIfGp_getEvent().checkSkipEdge()) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->checkSkipEdge()) { + dComIfGp_getEvent()->onSkipFade(); setAction(ACT_DEMO_RANAIL_2); } evtMng.cutEnd(staffId); @@ -579,12 +574,10 @@ void daTagTWGate_c::executeDemoRanail1() { void daTagTWGate_c::initDemoRanail2() { fopAcM_onSwitch(this, getSwitch()); eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - dComIfG_play_c& play = g_dComIfG_gameInfo.play; - dEvent_manager_c& mng = play.getEvtManager(); - mng.setObjectArchive(eventInfo.getArchiveName()); - mEventID = mng.getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, 0xff); - if (play.getEvent().mEventStatus != 0) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, 0xff); + if (dComIfGp_event_runCheck()) { + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, 0xffff); } else { fopAcM_orderOtherEventId(this, mEventID, 0xff, 0xffff, 4, 1); @@ -642,7 +635,7 @@ void daTagTWGate_c::initDemoRanail3() { dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, -1); /* dSv_event_flag_c::F_0071 - Twilight Hyrule Field - Cannot warp to Lanayru */ dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[170]); @@ -660,7 +653,7 @@ void daTagTWGate_c::executeDemoRanail3() { case '0001': break; case '0002': - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); field_0x5e1 = 0; break; case '0003': @@ -685,8 +678,8 @@ void daTagTWGate_c::executeDemoRanail3() { } break; case '0002': - if (dComIfGp_getEvent().checkSkipEdge()) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->checkSkipEdge()) { + dComIfGp_getEvent()->onSkipFade(); dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } @@ -705,8 +698,8 @@ void daTagTWGate_c::executeDemoRanail3() { } break; case '0003': - if (dComIfGp_getEvent().checkSkipEdge()) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->checkSkipEdge()) { + dComIfGp_getEvent()->onSkipFade(); dComIfGp_setNextStage( l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, @@ -743,14 +736,14 @@ void daTagTWGate_c::executeDemoHyral1() { if (evtMng.getIsAddvance(staffId)) { switch (*cutName) { case '0001': - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); break; } } switch (*cutName) { case '0001': - if (dComIfGp_getEvent().checkSkipEdge()) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->checkSkipEdge()) { + dComIfGp_getEvent()->onSkipFade(); setAction(ACT_DEMO_HYRAL_2); } evtMng.cutEnd(staffId); @@ -765,12 +758,10 @@ void daTagTWGate_c::executeDemoHyral1() { void daTagTWGate_c::initDemoHyral2() { fopAcM_onSwitch(this, getSwitch()); eventInfo.setArchiveName(l_zevParamTbl[mType].mArcName); - dComIfG_play_c& play = g_dComIfG_gameInfo.play; - dEvent_manager_c& mng = play.getEvtManager(); - mng.setObjectArchive(eventInfo.getArchiveName()); - mEventID = mng.getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, 0xff); - if (play.getEvent().mEventStatus != 0) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); + mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mTalkEventName, 0xff); + if (dComIfGp_event_runCheck()) { + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, 0xffff); } else { fopAcM_orderOtherEventId(this, mEventID, 0xff, 0xffff, 4, 1); @@ -826,7 +817,7 @@ void daTagTWGate_c::initDemoHyral3() { dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); mEventID = dComIfGp_getEventManager().getEventIdx(this, l_zevParamTbl[mType].mInEventName, -1); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventID, 1, -1); } @@ -842,7 +833,7 @@ void daTagTWGate_c::executeDemoHyral3() { case '0001': break; case '0002': - dComIfGp_getEvent().startCheckSkipEdge(this); + dComIfGp_getEvent()->startCheckSkipEdge(this); field_0x5e1 = 0x0; break; case '0003': @@ -864,8 +855,8 @@ void daTagTWGate_c::executeDemoHyral3() { } break; case '0002': - if (dComIfGp_getEvent().checkSkipEdge()) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->checkSkipEdge()) { + dComIfGp_getEvent()->onSkipFade(); dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } @@ -883,8 +874,8 @@ void daTagTWGate_c::executeDemoHyral3() { } break; case '0003': - if (dComIfGp_getEvent().checkSkipEdge()) { - dComIfGp_getEvent().onSkipFade(); + if (dComIfGp_getEvent()->checkSkipEdge()) { + dComIfGp_getEvent()->onSkipFade(); dComIfGp_setNextStage(l_zevParamTbl[mType].mStage, l_zevParamTbl[mType].mPoint, l_zevParamTbl[mType].mRoomNo, l_zevParamTbl[mType].mLayer); } diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index 27a4533eab..9bb94d22f9 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -74,14 +74,7 @@ int daTag_AllMato_c::Execute() { return 1; } -#if VERSION != VERSION_SHIELD_DEBUG - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) -#else - if (dComIfGp_event_runCheck()) -#endif - { + if (dComIfGp_event_runCheck()) { if (!eventInfo.checkCommandTalk()) { if (eventInfo.checkCommandDemoAccrpt() && dComIfGp_getEventManager().endCheck(mEventIdx)) { u16 evt_action = EVT_NONE; @@ -121,11 +114,7 @@ int daTag_AllMato_c::Execute() { } dCam_getBody()->CorrectCenter(); -#if VERSION != VERSION_SHIELD_DEBUG - play->getEvent().reset(); -#else dComIfGp_event_reset(); -#endif mEventIdx = -1; } } else { @@ -146,7 +135,7 @@ int daTag_AllMato_c::Execute() { actor_p = mBrkMatoActorMngr.getActorP(); JUT_ASSERT(218, NULL != actor_p); - dComIfGp_getEvent().setPt2(mBrkMatoActorMngr.getActorP()); + dComIfGp_getEvent()->setPt2(mBrkMatoActorMngr.getActorP()); if (field_0x1d08 != 0) { switch (field_0x1d08) { @@ -552,7 +541,7 @@ void daTag_AllMato_c::evtChange(u16 i_action) { } mEventIdx = dComIfGp_getEventManager().getEventIdx(this, l_evtList[i_action].eventName, 0xFF); - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventIdx, 1, 0xFFFF); } diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp index c876ce8588..20dce2e102 100644 --- a/src/d/actor/d_a_tag_bottle_item.cpp +++ b/src/d/actor/d_a_tag_bottle_item.cpp @@ -102,7 +102,7 @@ void daTag_BottleItem_c::setAttnPos() { s32 daTag_BottleItem_c::chkEvent() { s32 uVar2 = 1; - if (!dComIfGp_getEvent().isOrderOK()) { + if (!dComIfGp_getEvent()->isOrderOK()) { uVar2 = 0; if (eventInfo.checkCommandCatch()) { diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index 131bde5f2a..a41258bebb 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -43,8 +43,7 @@ int daTag_Evt_c::execute() { attention_info.position = eyePos; fopAcM_SetRoomNo(this, dComIfGp_roomControl_getStayNo()); if (field_0x5E4 == 0 || field_0x5E4 == 1) { - dComIfG_inf_c* pGameInfo = &g_dComIfG_gameInfo; - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { bVar = false; int iVar1 = dComIfGp_evmng_getMyStaffId(field_0x568, 0, 0); if (!eventInfo.checkCommandTalk()) { @@ -99,8 +98,7 @@ int daTag_Evt_c::execute() { } } if (bVar != 0 && field_0x570 != 0) { - field_0x572 = - pGameInfo->play.getEvtManager().getEventIdx(this, l_evtNameList[field_0x570], -1); + field_0x572 = dComIfGp_getEventManager().getEventIdx(this, l_evtNameList[field_0x570], -1); fopAcM_orderOtherEventId(this, field_0x572, -1, -1, 0, 1); } } else if (field_0x5E4 == 2 && isDelete()) { diff --git a/src/d/actor/d_a_tag_evtmsg.cpp b/src/d/actor/d_a_tag_evtmsg.cpp index 5b18a10ef8..73d516eacb 100644 --- a/src/d/actor/d_a_tag_evtmsg.cpp +++ b/src/d/actor/d_a_tag_evtmsg.cpp @@ -47,7 +47,7 @@ int daTag_EvtMsg_c::Execute() { dEvent_manager_c& evt_mng = dComIfGp_getEventManager(); if (home.roomNo == dComIfGp_roomControl_getStayNo()) { - if (dComIfGp_event_runCheck() != 0) { + if (dComIfGp_event_runCheck()) { int staff_id; BOOL reset = false; if (eventInfo.checkCommandTalk()) { diff --git a/src/d/actor/d_a_tag_hstop.cpp b/src/d/actor/d_a_tag_hstop.cpp index 5692f6fa5f..eb5179b751 100644 --- a/src/d/actor/d_a_tag_hstop.cpp +++ b/src/d/actor/d_a_tag_hstop.cpp @@ -105,7 +105,7 @@ int daTagHstop_c::execute() { m_msgFlow.init(this, (u16)shape_angle.z, 0, NULL); field_0x573 = 3; } else if (m_msgFlow.doFlow(this, NULL, 0)) { - dComIfGp_getEvent().reset(); + dComIfGp_getEvent()->reset(); field_0x573 = 0; s16 arrow_num = dComIfGp_getItemMaxArrowNumCount(); diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index 6e51a28c7f..7e0681ec52 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -101,9 +101,7 @@ int daTag_KMsg_c::Execute() { attention_info.flags = 0; } - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c* play = &g_dComIfG_gameInfo.play; - if (play->getEvent().runCheck()) { + if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { u16 iVar10 = 0; switch (getType()) { @@ -119,7 +117,7 @@ int daTag_KMsg_c::Execute() { } mEventIdx = dComIfGp_getEventManager().getEventIdx(this, l_evtList[iVar10].mEventName, 0xff); - play->getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderChangeEventId(this, mEventIdx, 1, 0xffff); } diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index e04fe2ecd3..9960d5886c 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -22,16 +22,13 @@ int daTag_Lantern_c::Delete() { } int daTag_Lantern_c::Execute() { - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c& play = g_dComIfG_gameInfo.play; - if (dComIfGp_event_runCheck()) { if (eventInfo.checkCommandTalk()) { if (!field_0x604) { mMsgFlow.init(this, mFlowIndex, 0, NULL); field_0x604++; } else if (field_0x604 == 1 && mMsgFlow.doFlow(this, NULL, 0)) { - play.getEvent().reset(); + dComIfGp_event_reset(); field_0x604 = 0; field_0x5f8 = 0; } diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 25e2469c8e..734635ec74 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -66,9 +66,7 @@ int daTag_Msg_c::execute() { eyePos.set(current.pos.x, current.pos.y + 150.0f, current.pos.z); attention_info.position = eyePos; - // TODO: gameInfo fake match to force reuse of pointer - dComIfG_play_c& play = g_dComIfG_gameInfo.play; - if (play.getEvent().runCheck()) { + if (dComIfGp_event_runCheck()) { set_event = false; if (eventInfo.checkCommandTalk()) { @@ -77,7 +75,7 @@ int daTag_Msg_c::execute() { dComIfGs_onSwitch(mOffSwitch, fopAcM_GetRoomNo(this)); } - play.getEvent().reset(); + dComIfGp_event_reset(); set_event = true; } @@ -91,7 +89,7 @@ int daTag_Msg_c::execute() { dComIfGs_onSwitch(mOffSwitch, fopAcM_GetRoomNo(this)); } - play.getEvent().reset(); + dComIfGp_event_reset(); set_event = true; } else { int staff_id = dComIfGp_evmng_getMyStaffId(mStaffName, NULL, 0); diff --git a/src/d/actor/d_a_tag_mstop.cpp b/src/d/actor/d_a_tag_mstop.cpp index 377f5ee39c..83f41a4678 100644 --- a/src/d/actor/d_a_tag_mstop.cpp +++ b/src/d/actor/d_a_tag_mstop.cpp @@ -126,7 +126,7 @@ int daTagMstop_c::execute() { } else if (eventInfo.checkCommandTalk()) { if (field_0x56e == 2) { if (!midna_p->checkShadowModelDraw() || midna_p->checkShadowReturnEnd()) { - dComIfGp_getEvent().reset(this); + dComIfGp_getEvent()->reset(this); fopAcM_orderPotentialEvent(this, 0x400, 0x14f, 1); field_0x56e = 3; } diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp index b41ef6e33d..3126e8c000 100644 --- a/src/d/actor/d_a_tag_ss_drink.cpp +++ b/src/d/actor/d_a_tag_ss_drink.cpp @@ -141,7 +141,7 @@ void daTag_SSDrink_c::setAttnPos() { int daTag_SSDrink_c::chkEvent() { int retVal = 1; - if (!dComIfGp_getEvent().isOrderOK()) { + if (!dComIfGp_getEvent()->isOrderOK()) { retVal = 0; if (eventInfo.checkCommandTalk()) { if (!checkProcess(&daTag_SSDrink_c::talk) == 0) { diff --git a/src/d/actor/d_a_tag_wljump.cpp b/src/d/actor/d_a_tag_wljump.cpp index 0c229719ac..d5d374deec 100644 --- a/src/d/actor/d_a_tag_wljump.cpp +++ b/src/d/actor/d_a_tag_wljump.cpp @@ -105,7 +105,7 @@ int daTagWljump_c::execute() { if (field_0x571 != 0xff) { fopAcM_onSwitch(this, field_0x571); } - } else if (!dComIfGp_getEvent().isOrderOK()) { + } else if (!dComIfGp_getEvent()->isOrderOK()) { field_0x572 = 0; } else { if (!midna->checkWolfNoPos()) { diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp index 071f53ba74..b77a7069eb 100644 --- a/src/d/actor/d_a_talk.cpp +++ b/src/d/actor/d_a_talk.cpp @@ -26,8 +26,7 @@ int daTalk_c::create() { } int daTalk_c::execute() { - dComIfG_inf_c& dcomif = g_dComIfG_gameInfo; - if (dcomif.play.getEvent().runCheck()) { + if (dComIfGp_event_runCheck()) { if (!eventInfo.checkCommandTalk()) { fopAcM_delete(this); } @@ -49,7 +48,7 @@ int daTalk_c::execute() { } else if (getStatus() == 14) { setStatus(16); } else if (getStatus() == 18) { - dcomif.play.getEvent().reset(); + dComIfGp_event_reset(); setStatus(19); mMessageID = -1; fopAcM_delete(this); @@ -58,7 +57,7 @@ int daTalk_c::execute() { mMsgFlow.init(this, dMsgObject_getMsgObjectClass()->getNodeIdx(), 0, NULL); mMessageID = 2; } else if (mMsgFlow.doFlow(dMsgObject_getMsgObjectClass()->getpTalkActor(), NULL, 0)) { - dcomif.play.getEvent().reset(); + dComIfGp_event_reset(); mMessageID = -1; fopAcM_delete(this); } diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 94cd1510de..5fb12400e4 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -23,7 +23,6 @@ static void texScrollCheck(f32& param_0) { param_0 -= 1.0f; } -// NONMATCHING - reg alloc static int daVrbox2_Draw(vrbox2_class* i_this) { camera_class* camera_p; dKankyo_sunlenz_Packet* lenz_p; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 9425cfdde4..894c0507f7 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -1028,7 +1028,7 @@ bool dCamera_c::Run() { mCamSetup.mCStick.Shift(mPadID); } - if (dComIfGp_getEvent().runCheck()) { + if (dComIfGp_getEvent()->runCheck()) { mPadInfo.mMainStick.mLastValue = 0.0f; mPadInfo.mMainStick.mLastPosY = 0.0f; mPadInfo.mMainStick.mLastPosX = 0.0f; @@ -1318,7 +1318,7 @@ void dCamera_c::CalcTrimSize() { if (mCurState == 1) { mCurState = 0; } else if (mCurState == 2) { - if (dComIfGp_getEvent().isOrderOK()) { + if (dComIfGp_getEvent()->isOrderOK()) { mCurState = 0; } } @@ -1707,7 +1707,7 @@ s32 dCamera_c::nextType(s32 i_curType) { dComIfGp_getAttention()->LockSoundOff(); } else { clrFlag(0x40000000); - if (dComIfGp_getEvent().runCheck()) { + if (dComIfGp_getEvent()->runCheck()) { setComStat(4); dComIfGp_getAttention()->LockSoundOff(); } @@ -9069,7 +9069,7 @@ bool dCamera_c::eventCamera(s32 param_0) { pushInfo(mSavedViewStack + 1, 0); mEventData.field_0x0 = 0; mEventData.field_0xec = NULL; - int sp2C = dComIfGp_getEvent().getMapToolId(); + int sp2C = dComIfGp_getEvent()->getMapToolId(); if (sp2C != -1) { mEventData.field_0xec = dEvt_control_c::searchMapEventData(sp2C); } diff --git a/src/d/d_debug_camera.cpp b/src/d/d_debug_camera.cpp index be40eadb3b..2d54283bf1 100644 --- a/src/d/d_debug_camera.cpp +++ b/src/d/d_debug_camera.cpp @@ -707,7 +707,7 @@ int dDbgCamera_c::cmdTool() { default: return 1; } - } else if (dComIfGp_event_runCheck() == 0) { + } else if (!dComIfGp_event_runCheck()) { mIsPlaying = false; } diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index e324a22272..d3332240bf 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -92,7 +92,7 @@ dDemo_actor_c::~dDemo_actor_c() { #if DEBUG if(dComIfGp_event_getMode() == 0) { - g_dComIfG_gameInfo.play.getEvent().setDebugStb(0); + g_dComIfG_gameInfo.play.getEvent()->setDebugStb(0); } #endif } diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index a961562f80..ac2d2ca32f 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -64,7 +64,7 @@ int dCamera_c::EndEventCamera(int param_1) { clrFlag(0x20000000); mEventData.field_0x0 = 1; - if (dComIfGp_getEvent().runCheck()) { + if (dComIfGp_getEvent()->runCheck()) { dComIfGp_getEventManager().setCameraPlay(2); } @@ -1845,7 +1845,7 @@ bool dCamera_c::talktoEvCamera() { bool dCamera_c::maptoolIdEvCamera() { if (mCurCamStyleTimer == 0) { int id; - getEvIntData(&id, "ID", g_dComIfG_gameInfo.play.getEvent().getMapToolId()); + getEvIntData(&id, "ID", g_dComIfG_gameInfo.play.getEvent()->getMapToolId()); mEventData.field_0x8 = 0; field_0x160 = 0; diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index 458dc0c59f..7958ea5fad 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -728,16 +728,16 @@ void dEvt_control_c::clearSkipSystem() { int dEv_defaultSkipProc(void* actor, int parameter) { // "%06d: event: skip event!!!" OS_REPORT("\x1b[34m%06d: event: スキップ event!!!\n\x1b[m", g_Counter.mCounter0); - dEvt_control_c& event = dComIfGp_getEvent(); + dEvt_control_c* event = dComIfGp_getEvent(); - event.reset(actor); + event->reset(actor); return 1; } int dEv_defaultSkipZev(void* actor, int parameter) { // "%06d: event: skip ZEV event!!!" OS_REPORT("\x1b[34m%06d: event: スキップ ZEV event!!!\n\x1b[m", g_Counter.mCounter0); - dEvt_control_c* event = &dComIfGp_getEvent(); + dEvt_control_c* event = dComIfGp_getEvent(); s16 eventID = -1; dStage_MapEvent_dt_c* data = event->getStageEventDt(); @@ -761,9 +761,9 @@ int dEv_defaultSkipZev(void* actor, int parameter) { OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, eventName); break; case 1: - skipName = dComIfGp_getEvent().getSkipEventName(); + skipName = dComIfGp_getEvent()->getSkipEventName(); eventID = dComIfGp_getEventManager().getEventIdx(skipName, 0xFF, -1); - OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, dComIfGp_getEvent().getSkipEventName()); + OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, dComIfGp_getEvent()->getSkipEventName()); break; default: OS_REPORT("%06d: event: ERROR: illegal prameter!\n", g_Counter.mCounter0); @@ -785,7 +785,7 @@ int dEv_defaultSkipZev(void* actor, int parameter) { int dEv_defaultSkipStb(void* actor, int parameter) { OS_REPORT("\x1b[34m%06d: event: スキップ STB event!!!\n\x1b[m", g_Counter.mCounter0); - dEvt_control_c* event = &dComIfGp_getEvent(); + dEvt_control_c* event = dComIfGp_getEvent(); s16 eventID = -1; dStage_MapEvent_dt_c* data = event->getStageEventDt(); @@ -809,9 +809,9 @@ int dEv_defaultSkipStb(void* actor, int parameter) { OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, eventName); break; case 1: - skipName = dComIfGp_getEvent().getSkipEventName(); + skipName = dComIfGp_getEvent()->getSkipEventName(); eventID = dComIfGp_getEventManager().getEventIdx(skipName, 0xFF, -1); - OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, dComIfGp_getEvent().getSkipEventName()); + OS_REPORT("%06d: event: [%d] %s!\n", g_Counter.mCounter0, eventID, dComIfGp_getEvent()->getSkipEventName()); break; default: OS_REPORT("%06d: event: ERROR: illegal prameter!\n", g_Counter.mCounter0); @@ -834,7 +834,7 @@ int dEv_defaultSkipStb(void* actor, int parameter) { } int dEv_noFinishSkipProc(void* actor, int parameter) { - dComIfGp_getEvent().offSkipFade(); + dComIfGp_getEvent()->offSkipFade(); return 0; } diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index 1286c63dea..c0e34a0c50 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -870,7 +870,7 @@ void dEvDtStaff_c::specialProcDirector() { f32* rate; daPy_py_c* player = dComIfGp_getLinkPlayer(); - dEvt_control_c& evtControl = dComIfGp_getEvent(); + dEvt_control_c* evtControl = dComIfGp_getEvent(); GXColor color; int staffId = dComIfGp_evmng_getMyStaffId("DIRECTOR", NULL, 0); @@ -979,15 +979,15 @@ void dEvDtStaff_c::specialProcDirector() { break; case 'SKIP': { char* zev = dComIfGp_evmng_getMyStringP(staffId, "Zev"); - void* pt = (void*)evtControl.getPt1(); + void* pt = (void*)evtControl->getPt1(); if (NULL == pt) { - pt = evtControl.getPt2(); + pt = evtControl->getPt2(); } if (zev != NULL) { - evtControl.setSkipZev(pt, zev); + evtControl->setSkipZev(pt, zev); } else { - evtControl.setSkipProc(pt, dEv_defaultSkipProc, 0); + evtControl->setSkipProc(pt, dEv_defaultSkipProc, 0); } break; } @@ -1090,7 +1090,7 @@ void dEvDtStaff_c::specialProcDirector() { if (sdata != NULL) { evt_actor_p = fopAcM_searchFromName4Event(sdata, -1); if (evt_actor_p != NULL) { - evtControl.setPt2(evt_actor_p); + evtControl->setPt2(evt_actor_p); OS_REPORT("%06d: event: derector: set %s as Pt2!\n", g_Counter.mCounter0, sdata); } else { OS_REPORT("%06d: event: derector: casting: %s not found!\n", g_Counter.mCounter0, sdata); @@ -1101,7 +1101,7 @@ void dEvDtStaff_c::specialProcDirector() { if (sdata != NULL) { evt_actor_p = fopAcM_searchFromName4Event(sdata, -1); if (evt_actor_p != NULL) { - evtControl.setPtT(evt_actor_p); + evtControl->setPtT(evt_actor_p); OS_REPORT("%06d: event: derector: set %s as PtT!\n", g_Counter.mCounter0, sdata); } else { OS_REPORT("%06d: event: derector: casting: %s not found!\n", g_Counter.mCounter0, sdata); @@ -1112,7 +1112,7 @@ void dEvDtStaff_c::specialProcDirector() { if (sdata != NULL) { evt_actor_p = fopAcM_searchFromName4Event(sdata, -1); if (evt_actor_p != NULL) { - evtControl.setPtI(evt_actor_p); + evtControl->setPtI(evt_actor_p); OS_REPORT("%06d: event: derector: set %s as PtI!\n", g_Counter.mCounter0, sdata); } else { OS_REPORT("%06d: event: derector: casting: %s not found!\n", g_Counter.mCounter0, sdata); @@ -1123,7 +1123,7 @@ void dEvDtStaff_c::specialProcDirector() { if (sdata != NULL) { evt_actor_p = fopAcM_searchFromName4Event(sdata, -1); if (evt_actor_p != NULL) { - evtControl.setPtD(evt_actor_p); + evtControl->setPtD(evt_actor_p); OS_REPORT("%06d: event: derector: set %s as PtD!\n", g_Counter.mCounter0, sdata); } else { OS_REPORT("%06d: event: derector: casting: %s not found!\n", g_Counter.mCounter0, sdata); @@ -1267,13 +1267,11 @@ void dEvDtStaff_c::specialProcPackage() { offsetAngY = 0.0f; } - // fake match: should not save event from g_dComIfG_gameInfo to register - dComIfG_play_c& info = g_dComIfG_gameInfo.play; - demo_data = (u8*)info.getEvent().getStbDemoData(sdata); + demo_data = (u8*)dComIfGp_getEvent()->getStbDemoData(sdata); JUT_ASSERT(1571, demo_data); dDemo_c::start(demo_data, xyzdata, offsetAngY); - info.getEvent().setCullRate(10.0f); // fake match: suppoed to be dComIfGp_event_setCullRate + dComIfGp_event_setCullRate(10.0f); idata = dComIfGp_evmng_getMyIntegerP(staffId, "EventFlag"); if (idata != NULL) { @@ -1287,10 +1285,10 @@ void dEvDtStaff_c::specialProcPackage() { specialProc_WaitProc(staffId); break; case 'PLAY': { - dEvt_control_c& evtControl = dComIfGp_getEvent(); + dEvt_control_c* evtControl = dComIfGp_getEvent(); if (dDemo_c::getMode() == 2) { - dStage_MapEvent_dt_c* event = dComIfGp_getEvent().getStageEventDt(); - if (event != NULL && event->field_0x7 != 0xFF && !evtControl.chkFlag2(1)) { + dStage_MapEvent_dt_c* event = dComIfGp_getEvent()->getStageEventDt(); + if (event != NULL && event->field_0x7 != 0xFF && !evtControl->chkFlag2(1)) { dDemo_c::getControl()->suspend(100); dComIfGp_evmng_cutEnd(staffId); } else { diff --git a/src/d/d_event_debug.cpp b/src/d/d_event_debug.cpp index 774e939966..6c0f72667b 100644 --- a/src/d/d_event_debug.cpp +++ b/src/d/d_event_debug.cpp @@ -174,7 +174,7 @@ void dEvM_HIO_c::listenPropertyEvent(const JORPropertyEvent* param_0) { break; case BTN_FORCED_TERMINATION: // "Forced termination" button - dComIfGp_getEvent().reset(); + dComIfGp_getEvent()->reset(); break; } } diff --git a/src/d/d_event_lib.cpp b/src/d/d_event_lib.cpp index 76b7547c48..a078569052 100644 --- a/src/d/d_event_lib.cpp +++ b/src/d/d_event_lib.cpp @@ -94,7 +94,7 @@ bool dEvLib_callback_c::executeRun() { if (!dComIfGp_evmng_endCheck(mActor->eventInfo.getEventId())) { return eventRun(); } else { - dComIfGp_getEvent().reset(); + dComIfGp_getEvent()->reset(); setAction(NULL); return eventEnd(); } diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index abe589b4c4..ab346a899d 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -145,13 +145,13 @@ void dEvent_manager_c::debugBfProc() { break; case 2: if (endCheck(id)) { - dComIfGp_getEvent().reset(); + dComIfGp_getEvent()->reset(); l_HIO.m_playtest.field_0xA = 0; } break; case 3: if (endCheck(id)) { - dComIfGp_getEvent().reset(); + dComIfGp_getEvent()->reset(); l_HIO.m_playtest.field_0xA = 0; } break; @@ -617,17 +617,17 @@ void dEvent_manager_c::endProc(s16 evId, BOOL isClose) { event->mEventState = 0; mCurrentEvType = 0; mCurrentEvId = -1; - dComIfGp_getEvent().setPtD(NULL); - dComIfGp_getEvent().setPtI(NULL); + dComIfGp_getEvent()->setPtD(NULL); + dComIfGp_getEvent()->setPtI(NULL); } void dEvent_manager_c::Sequencer() { - dEvt_control_c& evtControl = dComIfGp_getEvent(); + dEvt_control_c* evtControl = dComIfGp_getEvent(); dEvDtEvent_c* event = getEventData(mCurrentEvId); - dStage_MapEvent_dt_c* mapdata = evtControl.getStageEventDt(); + dStage_MapEvent_dt_c* mapdata = evtControl->getStageEventDt(); if (event != NULL) { - if (evtControl.chkEventFlag(0x100)) { + if (evtControl->chkEventFlag(0x100)) { char* name = NULL; if (mapdata != NULL) { switch (mapdata->type) { @@ -645,15 +645,15 @@ void dEvent_manager_c::Sequencer() { || l_HIO.m_enable_skip #endif ) && - !evtControl.chkFlag2(2)) { + !evtControl->chkFlag2(2)) { int scut_type = dStage_MapEvent_dt_c_getEventSCutType(mapdata); if (scut_type == 2) { - evtControl.onSkipFade(); + evtControl->onSkipFade(); } - fopAc_ac_c* actor = evtControl.getPt1(); + fopAc_ac_c* actor = evtControl->getPt1(); if (actor == NULL) { - actor = evtControl.getPt2(); + actor = evtControl->getPt2(); } if (actor == NULL) { @@ -663,13 +663,13 @@ void dEvent_manager_c::Sequencer() { if (actor != NULL) { switch (mapdata->type) { case dStage_MapEvent_dt_TYPE_STB: - evtControl.setSkipProc(actor, dEv_defaultSkipStb, 0); + evtControl->setSkipProc(actor, dEv_defaultSkipStb, 0); break; case dStage_MapEvent_dt_TYPE_ZEV: - evtControl.setSkipProc(actor, dEv_defaultSkipZev, 0); + evtControl->setSkipProc(actor, dEv_defaultSkipZev, 0); break; case dStage_MapEvent_dt_TYPE_MAPTOOLCAMERA: - evtControl.setSkipProc(actor, dEv_defaultSkipProc, 0); + evtControl->setSkipProc(actor, dEv_defaultSkipProc, 0); break; } } @@ -681,12 +681,12 @@ void dEvent_manager_c::Sequencer() { if (event->finishCheck()) { bool bVar1 = false; - if (evtControl.chkFlag2(1)) { + if (evtControl->chkFlag2(1)) { bVar1 = true; } int exitId = -1; - bool iVar5 = evtControl.chkFlag2(2) != 0; + bool iVar5 = evtControl->chkFlag2(2) != 0; if (mapdata != NULL) { int scut_type = dStage_MapEvent_dt_c_getEventSCutType(mapdata); @@ -731,10 +731,10 @@ void dEvent_manager_c::Sequencer() { if (!bVar1) { if (iVar5 && mapdata->field_0x9 != 0xFF) { exitId = mapdata->field_0x9; - evtControl.sceneChange(exitId); + evtControl->sceneChange(exitId); } else if (mapdata->data.maptool.field_0x17 != 0xFF) { exitId = mapdata->data.maptool.field_0x17; - evtControl.sceneChange(exitId); + evtControl->sceneChange(exitId); } } @@ -744,10 +744,10 @@ void dEvent_manager_c::Sequencer() { if (!bVar1) { if (iVar5 && mapdata->field_0x9 != 0xFF) { exitId = mapdata->field_0x9; - evtControl.sceneChange(exitId); + evtControl->sceneChange(exitId); } else if (mapdata->field_0x7 != 0xFF) { exitId = mapdata->field_0x7; - evtControl.sceneChange(exitId); + evtControl->sceneChange(exitId); } } break; @@ -755,10 +755,10 @@ void dEvent_manager_c::Sequencer() { if (!bVar1) { if (iVar5 && mapdata->field_0x9 != 0xFF) { exitId = mapdata->field_0x9; - evtControl.sceneChange(exitId); + evtControl->sceneChange(exitId); } else if (mapdata->field_0x7 != 0xFF) { exitId = mapdata->field_0x7; - evtControl.sceneChange(exitId); + evtControl->sceneChange(exitId); } } break; @@ -768,7 +768,7 @@ void dEvent_manager_c::Sequencer() { if (exitId == -1) { getBase().advanceCut(event); closeProc(event); - evtControl.reset(); + evtControl->reset(); } } else { if (event->mEventState == dEvDt_State_START_e) { @@ -780,7 +780,7 @@ void dEvent_manager_c::Sequencer() { unk_0x1b8--; } } else { - if (evtControl.chkEventFlag(0x100)) { + if (evtControl->chkEventFlag(0x100)) { Z2GetAudioMgr()->setDemoName(NULL); } } @@ -990,7 +990,7 @@ int dEvent_manager_c::startCheckOld(const char* eventname) { } int dEvent_manager_c::endCheck(s16 eventID) { - s16 compositId = dComIfGp_getEvent().runningEventID(eventID); + s16 compositId = dComIfGp_getEvent()->runningEventID(eventID); dEvDtEvent_c* event = getEventData(compositId); if (event == NULL) { return 0; @@ -1014,7 +1014,7 @@ int dEvent_manager_c::getMyStaffId(const char* staffName, fopAc_ac_c* actor, int int n_staff; int evtIdx = -1; - if (dComIfGp_getEvent().getMode() == dEvt_mode_WAIT_e) { + if (dComIfGp_getEvent()->getMode() == dEvt_mode_WAIT_e) { return -1; } @@ -1084,7 +1084,7 @@ int dEvent_manager_c::getMyStaffId(const char* staffName, fopAc_ac_c* actor, int } int dEvent_manager_c::getIsAddvance(int staffId) { - if (dComIfGp_getEvent().getMode() == dEvt_mode_WAIT_e) { + if (dComIfGp_getEvent()->getMode() == dEvt_mode_WAIT_e) { if (OREG_F(8)) { // "%s: %d: events not running so don't call." OS_REPORT("%s: %d: イベント走ってないので呼ばないでください。\n", __FILE__, 1672); @@ -1122,7 +1122,7 @@ static int dEvmng_strcmp(const char* strA, char* strB) { int dEvent_manager_c::getMyActIdx(int staffId, const char* const* action, int n_action, BOOL param_3, BOOL param_4) { - if (dComIfGp_getEvent().getMode() == dEvt_mode_WAIT_e) { + if (dComIfGp_getEvent()->getMode() == dEvt_mode_WAIT_e) { if (OREG_F(8)) { // "%s: %d: events not running so don't call." OS_REPORT("%s: %d: イベント走ってないので呼ばないでください。\n", __FILE__, 1733); @@ -1182,7 +1182,7 @@ int dEvent_manager_c::getMyActIdx(int staffId, const char* const* action, int n_ char* dEvent_manager_c::getMyNowCutName(int staffId) { dEvDtCut_c* cut; - if (dComIfGp_getEvent().getMode() == dEvt_mode_WAIT_e) { + if (dComIfGp_getEvent()->getMode() == dEvt_mode_WAIT_e) { if (OREG_F(8)) { // "%s: %d: events not running so don't call." OS_REPORT("%s: %d: イベント走ってないので呼ばないでください。\n", __FILE__, 1856); @@ -1203,7 +1203,7 @@ dEvDtData_c* dEvent_manager_c::getMyDataP(int staffId, const char* dataname, BOO int index; dEvDtCut_c* cut; - if (dComIfGp_getEvent().getMode() == dEvt_mode_WAIT_e) { + if (dComIfGp_getEvent()->getMode() == dEvt_mode_WAIT_e) { if (OREG_F(8)) { // "%s: %d: events not running so don't call." OS_REPORT("%s: %d: イベント走ってないので呼ばないでください。\n", __FILE__, 1886); @@ -1253,7 +1253,7 @@ int dEvent_manager_c::getMySubstanceNum(int staffId, const char* dataname) { void dEvent_manager_c::cutEnd(int staffId) { dEvDtCut_c* cut; - if (dComIfGp_getEvent().getMode() == dEvt_mode_WAIT_e) { + if (dComIfGp_getEvent()->getMode() == dEvt_mode_WAIT_e) { if (OREG_F(8)) { // "%s: %d: events not running so don't call." OS_REPORT("%s: %d: イベント走ってないので呼ばないでください。\n", __FILE__, 1984); @@ -1388,8 +1388,8 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 actorName, BOOL param_1) { goal.z += cM_scos(angle) * 100; setGoal(&goal); - dComIfGp_getEvent().setPt2(shutterActor); - dComIfGp_getEvent().setPtD(shutterActor); + dComIfGp_getEvent()->setPt2(shutterActor); + dComIfGp_getEvent()->setPtD(shutterActor); } return shutterActor; @@ -1416,7 +1416,7 @@ fopAc_ac_c* dEvent_manager_c::specialCast(const char* staffname, BOOL param_1) { shutterActor = specialCast_Shutter(PROC_L5BOSS_DOOR, param_1); } if (shutterActor != NULL) { - dComIfGp_getEvent().onEventFlag(0x10); + dComIfGp_getEvent()->onEventFlag(0x10); } } @@ -1457,7 +1457,7 @@ int dEvent_manager_c::ChkPresentEnd() { } int dEvent_manager_c::checkStartDemo() { - if (!dComIfGp_getEvent().runCheck()) { + if (!dComIfGp_getEvent()->runCheck()) { return FALSE; } diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 47a72be75f..4a5233faa4 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -4661,7 +4661,7 @@ void dScnKy_env_light_c::exeKankyo() { g_env_light.mColPatMode = g_env_light.mColPatModeGather; - if (dComIfGp_event_runCheck() == false && g_env_light.mColPatModeGather != 0) { + if (dComIfGp_event_runCheck() == FALSE && g_env_light.mColPatModeGather != 0) { if (g_env_light.mColPatModeGather >= 3) { g_env_light.mColPatModeGather = 0; } else { diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 4b740c6652..ae2cfd0210 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -415,7 +415,7 @@ void dKyr_sun_move() { } void dKyr_rain_init() { - camera_class* camera = g_dComIfG_gameInfo.play.mCameraInfo[0].mCamera; + camera_class* camera = (camera_class*)dComIfGp_getCamera(0); g_env_light.mpRainPacket->mpTex = (u8*)dComIfG_getObjectRes("Always", 0x4a); g_env_light.mpRainPacket->mpTex2 = (u8*)dComIfG_getObjectRes("Always", 0x57); g_env_light.mpRainPacket->mCamEyePos = camera->lookat.eye; @@ -1224,7 +1224,7 @@ void dKyr_housi_move() { } void dKyr_snow_init() { - camera_class* camera = g_dComIfG_gameInfo.play.mCameraInfo[0].mCamera; + camera_class* camera = (camera_class*)dComIfGp_getCamera(0); g_env_light.mpSnowPacket = new (32) dKankyo_snow_Packet(); if (g_env_light.mpSnowPacket == NULL) { @@ -1518,7 +1518,7 @@ void dKyr_snow_move() { } void dKyr_star_init() { - camera_class* camera = g_dComIfG_gameInfo.play.mCameraInfo[0].mCamera; + camera_class* camera = (camera_class*)dComIfGp_getCamera(0); g_env_light.mpStarPacket = new (32) dKankyo_star_Packet(); if (g_env_light.mpStarPacket == NULL) { diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index 11c62f37c9..922a0aea39 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -36,7 +36,7 @@ dMap_HIO_c::dMap_HIO_c() { } void dMap_HIO_c::listenPropertyEvent(const JORPropertyEvent* evt) { - // NONMATCHING + // DEBUG NONMATCHING JORReflexible::listenPropertyEvent(evt); if (dMap_HIO_prm_res_dst_s::m_res != NULL) { @@ -117,7 +117,7 @@ void dMap_HIO_c::listenPropertyEvent(const JORPropertyEvent* evt) { } void dMap_HIO_list_c::copySrcToHio() { - // NONMATCHING + // DEBUG NONMATCHING if (dMap_HIO_c::m_res_src_p != NULL) { dMpath_RGBA_c color; for (int i = 0; i < 51; i++) { diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index 65abead063..7e45500dc9 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -981,7 +981,7 @@ void dMenu_Letter_c::screenSetLetter() { dPaneClass_showNullPane(mpLetterScreen[0]); #if VERSION == VERSION_GCN_JPN - if (dComIfGs_getOptUnk0() == 0) { + if (dComIfGs_getOptRuby() == 0) { field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], 't3f_s', 0, NULL); field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], 'mg_3flin', 0, NULL); field_0x2f4[0] = new CPaneMgr(mpLetterScreen[0], 'mg_3f_s', 0, NULL); diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index 1e2226db89..e0bf6c8714 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -899,7 +899,7 @@ void dMenu_Option_c::sound_move() { -1.0f, 0); break; } - Z2AudioMgr::mAudioMgrPtr->setOutputMode(dMo_soundMode[field_0x3e9]); + mDoAud_setOutputMode(dMo_soundMode[field_0x3e9]); setSoundMode(dMo_soundMode[field_0x3e9]); field_0x3ef = SelectType3; field_0x3f5 = SelectType2; @@ -925,7 +925,7 @@ void dMenu_Option_c::sound_move() { -1.0f, 0); break; } - Z2AudioMgr::mAudioMgrPtr->setOutputMode(dMo_soundMode[field_0x3e9]); + mDoAud_setOutputMode(dMo_soundMode[field_0x3e9]); setSoundMode(dMo_soundMode[field_0x3e9]); field_0x3ef = SelectType3; field_0x3f5 = SelectType2; @@ -1128,9 +1128,9 @@ void dMenu_Option_c::confirm_close_move() { dComIfGs_setOptAttentionType(field_0x3e4); #if VERSION == VERSION_GCN_JPN if (field_0x3e5_JPN == 0) { - dComIfGs_setOptUnk0(1); + dComIfGs_setOptRuby(1); } else { - dComIfGs_setOptUnk0(0); + dComIfGs_setOptRuby(0); } #endif if (isRumbleSupported()) { @@ -2144,7 +2144,7 @@ void dMenu_Option_c::paneResize(u64 i_tag) { void dMenu_Option_c::initialize() { field_0x3e4 = dComIfGs_getOptAttentionType(); #if VERSION == VERSION_GCN_JPN - if (dComIfGs_getOptUnk0() == 0) { + if (dComIfGs_getOptRuby() == 0) { field_0x3e5_JPN = 1; } else { field_0x3e5_JPN = 0; diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index 8542d0eac9..860bb57323 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -1417,7 +1417,7 @@ BOOL dMw_c::dMw_isPush_S_Button() { } bool dMw_c::isPauseReady() { - if (dComIfGp_getEvent().checkCompulsory() || dComIfGs_getLife() == 0) { + if (dComIfGp_getEvent()->checkCompulsory() || dComIfGs_getLife() == 0) { return false; } diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 14efe0fc34..e4261c8d3e 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -418,8 +418,7 @@ void dMeter2_c::checkStatus() { mStatus = 0; field_0x12c = field_0x128; - // supposed to be daPy_py_c::checkNowWolf, but it messes with reg alloc? - field_0x128 = ((daPy_py_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR))->checkWolf(); + field_0x128 = daPy_py_c::checkNowWolf(); if (!dComIfGp_2dShowCheck() || dMsgObject_getMsgObjectClass()->isPlaceMessage()) { mStatus |= 0x4000; @@ -1008,33 +1007,30 @@ void dMeter2_c::moveLightDrop() { void dMeter2_c::moveRupee() { s16 temp_r5; - s16 var_r6; s32 temp_r0; - bool draw_rupee; temp_r5 = dComIfGs_getRupeeMax(); - draw_rupee = false; + s16 r29 = 0; + bool draw_rupee = false; - // using dComIfGp_getItemRupeeCount() here swaps r3/r4 reg alloc? - if (g_dComIfG_gameInfo.play.mItemInfo.mItemRupeeCount != 0) { - var_r6 = dComIfGs_getRupee() + dComIfGp_getItemRupeeCount(); - if (var_r6 > temp_r5) { - var_r6 = temp_r5; - } else if (var_r6 < 0) { - var_r6 = 0; + if (dComIfGp_getItemRupeeCount() != 0) { + r29 = dComIfGs_getRupee() + dComIfGp_getItemRupeeCount(); + if (r29 > temp_r5) { + r29 = temp_r5; + } else if (r29 < 0) { + r29 = 0; } - dComIfGs_setRupee(var_r6); + dComIfGs_setRupee(r29); dComIfGp_clearItemRupeeCount(); - temp_r0 = (u16)var_r6 - mRupeeNum; - if (temp_r0 >= 5) { + if (dComIfGs_getRupee() - mRupeeNum >= 5) { onRupeeSoundBit(2); if (isRupeeSoundBit(3)) { offRupeeSoundBit(3); offRupeeSoundBit(1); } - } else if (temp_r0 <= -5) { + } else if (dComIfGs_getRupee() - mRupeeNum <= -5) { onRupeeSoundBit(3); if (isRupeeSoundBit(2)) { offRupeeSoundBit(2); diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index 2995517ef0..7147e97bc3 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -1444,7 +1444,7 @@ void dMeterButton_c::screenInitText() { JUT_ASSERT(2499, mpTmRoot_c != NULL); #if VERSION == VERSION_GCN_JPN - if (dComIfGs_getOptUnk0() == 0) { + if (dComIfGs_getOptRuby() == 0) { mpTm_c[0] = new CPaneMgr(mpTextScreen, 'mg_3flin', 0, NULL); mpTm_c[1] = new CPaneMgr(mpTextScreen, 't3f_s', 0, NULL); diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index bfd268aab6..834919ff1d 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -108,7 +108,7 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { } #if VERSION == VERSION_GCN_JPN - if (dComIfGs_getOptUnk0() == 0) { + if (dComIfGs_getOptRuby() == 0) { mpTmSel_c[0] = new CPaneMgr(mpScreen, 'a_tf', 0, NULL); mpTmSel_c[1] = new CPaneMgr(mpScreen, 'b_tf', 0, NULL); @@ -911,7 +911,7 @@ void dMsgScrn3Select_c::selectTrans() { f32 sp68[3]; for (int i = 0; i < 3; i++) { #if VERSION == VERSION_GCN_JPN - if (dComIfGs_getOptUnk0() == 0 && (field_0x112 & (u8)(1 << i)) != 0) { + if (dComIfGs_getOptRuby() == 0 && (field_0x112 & (u8)(1 << i)) != 0) { sp68[i] = 0.0f; } else { f32 temp = mpTmSel_c[i]->getInitPosY(); diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index 8ffd59b5de..01794f419e 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -90,7 +90,7 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool param_ #if VERSION == VERSION_GCN_JPN field_0x50 = 0.0f; - if (dComIfGs_getOptUnk0() == 0) { + if (dComIfGs_getOptRuby() == 0) { mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3flin', 0, NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3f_s', 0, NULL); diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index 02943d326c..e6cd7f582a 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -198,7 +198,7 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { mpPmP_c->scale(g_MsgObject_HIO_c.mBoxItemScaleX, g_MsgObject_HIO_c.mBoxItemScaleY); #if VERSION == VERSION_GCN_JPN - if (dComIfGs_getOptUnk0() == 0) { + if (dComIfGs_getOptRuby() == 0) { mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3flin', 0, NULL); JUT_ASSERT(407, mpTm_c[0] != NULL); diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp index 0d921528e9..53d83df320 100644 --- a/src/d/d_msg_scrn_jimaku.cpp +++ b/src/d/d_msg_scrn_jimaku.cpp @@ -46,7 +46,7 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { mpPmP_c->paneTrans(0.0f, field_0xcc); #if VERSION == VERSION_GCN_JPN - if (dComIfGs_getOptUnk0() == 0) { + if (dComIfGs_getOptRuby() == 0) { mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_3flin', 0, NULL); mpTm_c[1] = new CPaneMgr(mpScreen, 't3f_s', 0, NULL); diff --git a/src/d/d_msg_scrn_kanban.cpp b/src/d/d_msg_scrn_kanban.cpp index 4a84e0f9e3..864d533bff 100644 --- a/src/d/d_msg_scrn_kanban.cpp +++ b/src/d/d_msg_scrn_kanban.cpp @@ -58,7 +58,7 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { #if VERSION == VERSION_GCN_JPN - if (dComIfGs_getOptUnk0() != 0) { + if (dComIfGs_getOptRuby() != 0) { static u64 const t_tag[3] = {'mg_3line', 't3_w', 't3_s'}; for (int i = 0; i < 3; i++) { mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index d45b67c219..5324728edc 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -106,7 +106,7 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { mpPmP_c->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, g_MsgObject_HIO_c.mBoxTalkScaleY); #if VERSION == VERSION_GCN_JPN - if (dComIfGs_getOptUnk0() == 0) { + if (dComIfGs_getOptRuby() == 0) { mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3flin', 0, NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3f_s', 0, NULL); diff --git a/src/d/d_msg_scrn_tree.cpp b/src/d/d_msg_scrn_tree.cpp index 15403b83b9..6165a62b8f 100644 --- a/src/d/d_msg_scrn_tree.cpp +++ b/src/d/d_msg_scrn_tree.cpp @@ -58,7 +58,7 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { mpScreen->search('white_m')->setAnimation(field_0xd4); #if VERSION == VERSION_GCN_JPN - if (dComIfGs_getOptUnk0() != 0) { + if (dComIfGs_getOptRuby() != 0) { for (int i = 0; i < 3; i++) { static u64 const t_tag[3] = {'mg_3line', 't3_w', 't3_s'}; diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 1a9932d502..5e6e97467d 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -189,7 +189,7 @@ static int dScnPly_Execute(dScnPly_c* i_this) { dKy_itudemo_se(); if (!dComIfGp_isPauseFlag()) { dDemo_c::update(); - dComIfGp_getEvent().Step(); + dComIfGp_getEvent()->Step(); dComIfGp_getAttention()->Run(); } return 1; diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index d74a86ab9a..9c4bb22f2d 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -225,9 +225,8 @@ static bool objectSetCheck(room_of_scene_class* i_this) { static int dScnRoom_Execute(room_of_scene_class* i_this) { int roomNo = fopScnM_GetParam(i_this); - u32 flag = g_dComIfG_gameInfo.play.getRoomControl()->mStatus[roomNo].mFlag; - if (flag & 2) { - dComIfGp_roomControl_setStatusFlag(roomNo, flag & ~2); + if (dComIfGp_roomControl_checkStatusFlag(roomNo, 2)) { + dComIfGp_roomControl_offStatusFlag(roomNo, 2); dComIfGp_roomControl_onStatusFlag(roomNo, 1); } else if (objectSetCheck(i_this)) { if (dComIfGp_roomControl_checkStatusFlag(roomNo, 4)) { diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 0395d351dc..9b8f2d1805 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -973,18 +973,18 @@ void dSv_player_info_c::init() { void dSv_player_config_c::init() { #if VERSION == VERSION_GCN_JPN - unk0 = 0; + mRuby = 0; #else - unk0 = 1; + mRuby = 1; #endif #if PLATFORM_GCN if (OSGetSoundMode() == OS_SOUND_MODE_MONO) { mSoundMode = OS_SOUND_MODE_MONO; - Z2AudioMgr::mAudioMgrPtr->setOutputMode(OS_SOUND_MODE_MONO); + mDoAud_setOutputMode(OS_SOUND_MODE_MONO); } else { mSoundMode = OS_SOUND_MODE_STEREO; - Z2AudioMgr::mAudioMgrPtr->setOutputMode(OS_SOUND_MODE_STEREO); + mDoAud_setOutputMode(OS_SOUND_MODE_STEREO); } #endif @@ -1798,13 +1798,13 @@ int dSv_info_c::card_to_memory(char* i_cardPtr, int i_dataNum) { #if PLATFORM_GCN if (OSGetSoundMode() == OS_SOUND_MODE_MONO) { - g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(OS_SOUND_MODE_MONO); - Z2AudioMgr::mAudioMgrPtr->setOutputMode(OS_SOUND_MODE_MONO); - } else if (g_dComIfG_gameInfo.info.getPlayer().getConfig().getSound() == 2) { - Z2AudioMgr::mAudioMgrPtr->setOutputMode(2); + dComIfGs_setOptSound(OS_SOUND_MODE_MONO); + mDoAud_setOutputMode(OS_SOUND_MODE_MONO); + } else if (dComIfGs_getOptSound() == 2) { + mDoAud_setOutputMode(2); } else { - g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(OS_SOUND_MODE_STEREO); - Z2AudioMgr::mAudioMgrPtr->setOutputMode(OS_SOUND_MODE_STEREO); + dComIfGs_setOptSound(OS_SOUND_MODE_STEREO); + mDoAud_setOutputMode(OS_SOUND_MODE_STEREO); } #endif diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index e1d986fb65..3d10b12fdc 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -825,8 +825,8 @@ void* event_second_actor(u16) { } s32 fopAcM_orderTalkEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actorA))) { return 0; } @@ -841,8 +841,8 @@ s32 fopAcM_orderTalkEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_prio s32 fopAcM_orderTalkItemBtnEvent(u16 i_eventType, fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actorA))) { return 0; } @@ -855,8 +855,8 @@ s32 fopAcM_orderTalkItemBtnEvent(u16 i_eventType, fopAc_ac_c* i_actorA, fopAc_ac } s32 fopAcM_orderSpeakEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actor))) { return 0; } @@ -870,8 +870,8 @@ s32 fopAcM_orderSpeakEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) { } s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actorA))) { return 0; } @@ -892,8 +892,8 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_prio } s32 fopAcM_orderCatchEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actorA))) { return 0; } @@ -907,8 +907,8 @@ s32 fopAcM_orderCatchEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_pri s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actor, char const* i_eventName, u16 param_2, u16 i_flag, u16 i_priority) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actor))) { return 0; } @@ -933,8 +933,8 @@ s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actor, char const* i_eventName, u16 par s32 fopAcM_orderOtherEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, char const* i_eventName, u16 param_3, u16 i_flag, u16 i_priority) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actorA))) { return 0; } @@ -969,8 +969,8 @@ s32 fopAcM_orderChangeEventId(fopAc_ac_c* i_actor, s16 i_eventID, u16 i_flag, u1 s32 fopAcM_orderOtherEventId(fopAc_ac_c* i_actor, s16 i_eventID, u8 i_mapToolID, u16 param_3, u16 i_priority, u16 i_flag) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actor))) { return 0; } @@ -1003,8 +1003,8 @@ s32 fopAcM_orderOtherEventId(fopAc_ac_c* i_actor, s16 i_eventID, u8 i_mapToolID, s32 fopAcM_orderMapToolEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 param_3, u16 i_flag, u16 param_5) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actor))) { return 0; } @@ -1042,8 +1042,8 @@ s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_even } s32 fopAcM_orderPotentialEvent(fopAc_ac_c* i_actor, u16 i_flag, u16 param_2, u16 i_priority) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actor))) { return 0; } @@ -1057,8 +1057,8 @@ s32 fopAcM_orderPotentialEvent(fopAc_ac_c* i_actor, u16 i_flag, u16 param_2, u16 } s32 fopAcM_orderItemEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actor))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actor))) { return 0; } @@ -1073,8 +1073,8 @@ s32 fopAcM_orderItemEvent(fopAc_ac_c* i_actor, u16 i_priority, u16 i_flag) { s32 fopAcM_orderTreasureEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) { - if (!dComIfGp_getEvent().isOrderOK() && - (!(i_flag & 0x400) || !dComIfGp_getEvent().isChangeOK(i_actorA))) + if (!dComIfGp_getEvent()->isOrderOK() && + (!(i_flag & 0x400) || !dComIfGp_getEvent()->isChangeOK(i_actorA))) { return 0; } From df0ffcd87cb098260ebc877a7120a8feec6b9269 Mon Sep 17 00:00:00 2001 From: Niklas Bauer Date: Fri, 26 Dec 2025 22:17:51 +0100 Subject: [PATCH 14/35] f_op debug work (#2991) * f_op debug 1 * f_op debug 2 * f_op debug 3 * f_op debug 4 * f_op debug 5 * f_op_debug fix build * f_op linking * remove goto in fopac_create * fix regressions * fix regressions * pr comments --- config/RZDE01_02/symbols.txt | 2 +- config/RZDJ01/symbols.txt | 2 +- config/RZDP01/symbols.txt | 2 +- config/Shield/symbols.txt | 2 +- config/ShieldD/splits.txt | 4 +- config/ShieldD/symbols.txt | 14 +- configure.py | 96 ++++---- include/d/actor/d_a_itembase.h | 1 + include/d/actor/d_a_obj_carry.h | 7 +- include/d/actor/d_a_tag_stream.h | 6 +- include/d/d_com_inf_game.h | 2 +- include/d/d_event.h | 8 +- include/d/d_item.h | 1 + include/d/d_particle.h | 3 + include/d/d_s_play.h | 6 +- include/d/d_stage.h | 5 +- include/f_op/f_op_actor.h | 1 + include/f_op/f_op_actor_mng.h | 14 +- include/f_op/f_op_actor_tag.h | 2 +- include/f_op/f_op_camera_mng.h | 3 +- include/f_op/f_op_kankyo.h | 2 + include/f_op/f_op_scene_mng.h | 24 +- include/f_op/f_op_scene_req.h | 2 +- include/f_pc/f_pc_manager.h | 11 +- include/m_Do/m_Do_ext.h | 2 + include/m_Do/m_Do_hostIO.h | 1 + src/Z2AudioLib/Z2StatusMgr.cpp | 2 +- src/d/actor/d_a_obj_stone.cpp | 3 +- src/d/d_camera.cpp | 6 +- src/d/d_debug_camera.cpp | 6 +- src/d/d_particle.cpp | 2 +- src/f_op/f_op_actor.cpp | 97 ++++---- src/f_op/f_op_actor_mng.cpp | 395 +++++++++++++++++++------------ src/f_op/f_op_actor_tag.cpp | 4 +- src/f_op/f_op_camera.cpp | 27 ++- src/f_op/f_op_camera_mng.cpp | 6 +- src/f_op/f_op_draw_iter.cpp | 8 +- src/f_op/f_op_kankyo.cpp | 47 ++-- src/f_op/f_op_kankyo_mng.cpp | 20 +- src/f_op/f_op_msg.cpp | 57 +++-- src/f_op/f_op_overlap.cpp | 32 ++- src/f_op/f_op_overlap_mng.cpp | 41 +++- src/f_op/f_op_overlap_req.cpp | 19 +- src/f_op/f_op_scene.cpp | 24 +- src/f_op/f_op_scene_mng.cpp | 14 +- src/f_op/f_op_scene_pause.cpp | 2 +- src/f_op/f_op_scene_req.cpp | 34 ++- src/f_op/f_op_view.cpp | 23 +- src/f_pc/f_pc_manager.cpp | 1 + src/m_Do/m_Do_hostIO.cpp | 4 + 50 files changed, 690 insertions(+), 407 deletions(-) diff --git a/config/RZDE01_02/symbols.txt b/config/RZDE01_02/symbols.txt index f834826770..3572680587 100644 --- a/config/RZDE01_02/symbols.txt +++ b/config/RZDE01_02/symbols.txt @@ -28000,7 +28000,7 @@ dylPreLoadTime1 = .sbss:0x80520E18; // type:object size:0x8 scope:global align:4 resPreLoadTime0 = .sbss:0x80520E20; // type:object size:0x8 scope:global align:4 data:4byte resPreLoadTime1 = .sbss:0x80520E28; // type:object size:0x8 scope:global align:4 data:4byte g_preLoadHIO = .sbss:0x80520E30; // type:object size:0x4 scope:global align:4 -lbl_80520E34 = .sbss:0x80520E34; // type:object size:0x1 data:byte +pauseTimer__9dScnPly_c = .sbss:0x80520E34; // type:object size:0x1 data:byte lbl_80520E35 = .sbss:0x80520E35; // type:object size:0x1 data:byte g_regHIO = .sbss:0x80520E38; // type:object size:0x4 scope:global align:4 m_nowID__9dkWmark_c = .sbss:0x80520E40; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/RZDJ01/symbols.txt b/config/RZDJ01/symbols.txt index 83f6d7e6e7..7e63623202 100644 --- a/config/RZDJ01/symbols.txt +++ b/config/RZDJ01/symbols.txt @@ -28004,7 +28004,7 @@ dylPreLoadTime1 = .sbss:0x8051EC88; // type:object size:0x8 scope:global align:4 resPreLoadTime0 = .sbss:0x8051EC90; // type:object size:0x8 scope:global align:4 data:4byte resPreLoadTime1 = .sbss:0x8051EC98; // type:object size:0x8 scope:global align:4 data:4byte g_preLoadHIO = .sbss:0x8051ECA0; // type:object size:0x4 scope:global align:4 -lbl_8051ECA4 = .sbss:0x8051ECA4; // type:object size:0x1 data:byte +pauseTimer__9dScnPly_c = .sbss:0x8051ECA4; // type:object size:0x1 data:byte lbl_8051ECA5 = .sbss:0x8051ECA5; // type:object size:0x1 data:byte g_regHIO = .sbss:0x8051ECA8; // type:object size:0x4 scope:global align:4 m_nowID__9dkWmark_c = .sbss:0x8051ECB0; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/RZDP01/symbols.txt b/config/RZDP01/symbols.txt index 570d80796b..752db8a4f2 100644 --- a/config/RZDP01/symbols.txt +++ b/config/RZDP01/symbols.txt @@ -27891,7 +27891,7 @@ dylPreLoadTime1 = .sbss:0x805215D8; // type:object size:0x8 scope:global align:4 resPreLoadTime0 = .sbss:0x805215E0; // type:object size:0x8 scope:global align:4 data:4byte resPreLoadTime1 = .sbss:0x805215E8; // type:object size:0x8 scope:global align:4 data:4byte g_preLoadHIO = .sbss:0x805215F0; // type:object size:0x4 scope:global align:4 -lbl_805215F4 = .sbss:0x805215F4; // type:object size:0x1 data:byte +pauseTimer__9dScnPly_c = .sbss:0x805215F4; // type:object size:0x1 data:byte lbl_805215F5 = .sbss:0x805215F5; // type:object size:0x1 data:byte g_regHIO = .sbss:0x805215F8; // type:object size:0x4 scope:global align:4 m_nowID__9dkWmark_c = .sbss:0x80521600; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/Shield/symbols.txt b/config/Shield/symbols.txt index ee6a502e1d..814a870c54 100644 --- a/config/Shield/symbols.txt +++ b/config/Shield/symbols.txt @@ -25503,7 +25503,7 @@ dylPreLoadTime1 = .sbss:0x80508F18; // type:object size:0x8 scope:global data:4b resPreLoadTime0 = .sbss:0x80508F20; // type:object size:0x8 scope:global data:4byte hash:0xA1124705 resPreLoadTime1 = .sbss:0x80508F28; // type:object size:0x8 scope:global data:4byte hash:0xA1124704 g_preLoadHIO = .sbss:0x80508F30; // type:object size:0x4 scope:global data:4byte hash:0x2AE34DF2 -lbl_80508F34 = .sbss:0x80508F34; // type:object size:0x1 data:byte hash:0x2421530A dhash:0x54C04193 +pauseTimer__9dScnPly_c = .sbss:0x80508F34; // type:object size:0x1 data:byte hash:0x2421530A dhash:0x54C04193 lbl_80508F35 = .sbss:0x80508F35; // type:object size:0x1 data:byte hash:0x16684D2D dhash:0x100CD5B4 g_regHIO = .sbss:0x80508F38; // type:object size:0x4 scope:global data:4byte hash:0x944FCFA3 m_nowID__9dkWmark_c = .sbss:0x80508F40; // type:object size:0x4 scope:global data:4byte hash:0x8C7CDEA4 dhash:0x6AA81CDD diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index 4aa788274e..453eb67a2b 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -239,12 +239,12 @@ f_op/f_op_view.cpp: f_op/f_op_kankyo.cpp: .text start:0x800414A0 end:0x800417A0 .data start:0x8066AB58 end:0x8066ABA0 - .sbss start:0x8074C508 end:0x8074C514 + .sbss start:0x8074C508 end:0x8074C510 f_op/f_op_msg.cpp: .text start:0x800417A0 end:0x80041A50 .data start:0x8066ABA0 end:0x8066ABE8 - .sbss start:0x8074C514 end:0x8074C518 + .sbss start:0x8074C510 end:0x8074C518 f_op/f_op_kankyo_mng.cpp: .text start:0x80041A50 end:0x80041FD0 diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index 508a7bf04e..232039cea8 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -64102,7 +64102,7 @@ mDoMain_HIO = .sbss:0x8074C280; // type:object size:0x8 scope:global hash:0x5C34 @LOCAL@Debug_console__FUl@console_scroll@1 = .sbss:0x8074C288; // type:object size:0x4 scope:local align:4 data:float hash:0xBF7B851A dhash:0x7086F27F @LOCAL@main01__Fv@frame = .sbss:0x8074C28C; // type:object size:0x4 scope:local data:4byte hash:0xA8D047CF dhash:0x4B63C2BB instance__29JHIComPortManager<9JHICmnMem> = .sbss:0x8074C290; // type:object size:0x4 scope:global data:4byte hash:0x3E85C712 dhash:0x073E21A0 -lbl_8074C298 = .sbss:0x8074C298; // type:object size:0x1 data:byte hash:0xAA4B677C +print_initialized = .sbss:0x8074C298; // type:object size:0x1 data:byte hash:0xAA4B677C lbl_8074C299 = .sbss:0x8074C299; // type:object size:0x1 data:byte hash:0x732354FB lbl_8074C29A = .sbss:0x8074C29A; // type:object size:0x1 data:byte hash:0x192C6F69 lbl_8074C29B = .sbss:0x8074C29B; // type:object size:0x1 data:byte hash:0xD31C3E46 @@ -64255,9 +64255,9 @@ mCaptureScreenLineNum__11fapGm_HIO_c = .sbss:0x8074C490; // type:object size:0x2 lbl_8074C492 = .sbss:0x8074C492; // type:object size:0x1 data:byte hash:0x56EDE2EE dhash:0x36F65A0E lbl_8074C493 = .sbss:0x8074C493; // type:object size:0x1 data:byte hash:0xDA2ADA30 dhash:0x36F65A10 lbl_8074C494 = .sbss:0x8074C494; // type:object size:0x1 data:byte hash:0xA9B59EC0 dhash:0xA12DE4E0 -lbl_8074C498 = .sbss:0x8074C498; // type:object size:0x1 data:byte hash:0xE0AE7E09 dhash:0x4F24BEA1 -lbl_8074C499 = .sbss:0x8074C499; // type:object size:0x1 data:byte hash:0xC93122F6 dhash:0x62D5041E -lbl_8074C49A = .sbss:0x8074C49A; // type:object size:0x1 data:byte hash:0xB66ED925 dhash:0x722717CD +mPriorityMaximum__19print_error_check_c = .sbss:0x8074C498; // type:object size:0x1 data:byte hash:0xE0AE7E09 dhash:0x4F24BEA1 +mPrintDisable__19print_error_check_c = .sbss:0x8074C499; // type:object size:0x1 data:byte hash:0xC93122F6 dhash:0x62D5041E +mThresholdEnable__19print_error_check_c = .sbss:0x8074C49A; // type:object size:0x1 data:byte hash:0xB66ED925 dhash:0x722717CD @LOCAL@check__19print_error_check_cFv@l_name = .sbss:0x8074C4A0; // type:object size:0x8 scope:local hash:0x67D55231 dhash:0x02F8A364 @LOCAL@check__19print_error_check_cFv@l_name@0 = .sbss:0x8074C4A8; // type:object size:0x8 scope:local hash:0xB2729A01 dhash:0x02F8A364 g_fopAc_type = .sbss:0x8074C4B0; // type:object size:0x4 scope:global data:4byte hash:0x79729021 @@ -64280,7 +64280,7 @@ mWaterY__11fopAcM_wt_c = .sbss:0x8074C4F4; // type:object size:0x4 scope:global l_fopOvlpM_overlap = .sbss:0x8074C4F8; // type:object size:0x4 scope:global data:4byte hash:0x0EF2800B l_fopScnRq_IsUsingOfOverlap = .sbss:0x8074C500; // type:object size:0x4 scope:global data:4byte hash:0xB8D9D5AB fopKy_KANKYO_TYPE = .sbss:0x8074C508; // type:object size:0x4 scope:global data:4byte hash:0xBC1E6A2F -lbl_8074C510 = .sbss:0x8074C510; // type:object size:0x1 data:byte hash:0x69766C30 dhash:0xE973ADA6 +MemCheck__6fopMsg = .sbss:0x8074C510; // type:object size:0x1 scope:global data:byte hash:0x69766C30 dhash:0xE973ADA6 fopMsg_MSG_TYPE = .sbss:0x8074C514; // type:object size:0x4 scope:global hash:0xAC9753E4 @LOCAL@fopMsgM_createExpHeap__FUlP7JKRHeap@displayed = .sbss:0x8074C518; // type:object size:0x4 scope:local data:4byte hash:0xA29E9C43 dhash:0xFD9484E8 l_fopDwTg_id = .sbss:0x8074C520; // type:object size:0x4 scope:global data:4byte hash:0xBA0582FD @@ -64625,9 +64625,9 @@ dylPreLoadTime1 = .sbss:0x8074CAB8; // type:object size:0x8 scope:global data:4b resPreLoadTime0 = .sbss:0x8074CAC0; // type:object size:0x8 scope:global data:4byte hash:0xA1124705 resPreLoadTime1 = .sbss:0x8074CAC8; // type:object size:0x8 scope:global data:4byte hash:0xA1124704 g_preLoadHIO = .sbss:0x8074CAD0; // type:object size:0x8 scope:global hash:0x2AE34DF2 -lbl_8074CAD8 = .sbss:0x8074CAD8; // type:object size:0x1 data:byte hash:0x2421530A dhash:0x54C04193 +pauseTimer__9dScnPly_c = .sbss:0x8074CAD8; // type:object size:0x1 data:byte hash:0x2421530A dhash:0x54C04193 lbl_8074CAD9 = .sbss:0x8074CAD9; // type:object size:0x1 data:byte hash:0x16684D2D dhash:0x100CD5B4 -lbl_8074CADA = .sbss:0x8074CADA; // type:object size:0x1 data:byte hash:0xA127BB3C dhash:0x6A3A8CA5 +nextPauseTimer__9dScnPly_c = .sbss:0x8074CADA; // type:object size:0x1 data:byte hash:0xA127BB3C dhash:0x6A3A8CA5 lbl_8074CADB = .sbss:0x8074CADB; // type:object size:0x1 data:byte hash:0x2EF7A134 l_pause = .sbss:0x8074CADC; // type:object size:0x4 scope:global data:4byte hash:0x57FF2104 l_pauseFrame = .sbss:0x8074CAE0; // type:object size:0x4 scope:global align:4 data:float hash:0x378D15B9 diff --git a/configure.py b/configure.py index a749467ee5..22615e3796 100755 --- a/configure.py +++ b/configure.py @@ -514,6 +514,10 @@ Equivalent = config.non_matching # Object should be linked when configured with ALL_GCN = ["GZ2E01", "GZ2P01", "GZ2J01"] +ALL_WII = ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01"] # , "RZDK01"] +ALL_DEMO = ["DZDE01", "DZDP01"] +ALL_SHIELD = ["Shield", "ShieldD"] # , "ShieldP"] +ALL = ALL_GCN + ALL_WII + ALL_SHIELD # Object is only matching for specific versions @@ -598,59 +602,59 @@ config.libs = [ # f_op Object(MatchingFor(ALL_GCN), "f_op/f_op_actor.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_op/f_op_actor_iter.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_actor_tag.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_camera.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_actor_iter.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_actor_tag.cpp"), + Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_camera.cpp"), Object(NonMatching, "f_op/f_op_actor_map.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_actor_mng.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_camera_mng.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_overlap.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_overlap_mng.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_overlap_req.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_scene.cpp"), + Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_overlap.cpp"), + Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_overlap_mng.cpp"), + Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_overlap_req.cpp"), + Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_scene.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_scene_iter.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_scene_mng.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_scene_req.cpp"), - Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_scene_tag.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_view.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_kankyo.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_msg.cpp"), + Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_scene_mng.cpp"), + Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_scene_req.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_scene_tag.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_view.cpp"), + Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_kankyo.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_msg.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_kankyo_mng.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_msg_mng.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_draw_iter.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_op/f_op_draw_tag.cpp"), - Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_scene_pause.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_draw_tag.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_scene_pause.cpp"), # f_pc Object(MatchingFor(ALL_GCN), "f_pc/f_pc_base.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_create_iter.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_create_iter.cpp"), Object(MatchingFor(ALL_GCN), "f_pc/f_pc_create_req.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_create_tag.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_creator.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_delete_tag.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_create_tag.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_creator.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_delete_tag.cpp"), Object(MatchingFor(ALL_GCN), "f_pc/f_pc_deletor.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_draw_priority.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_draw_priority.cpp"), Object(MatchingFor(ALL_GCN), "f_pc/f_pc_executor.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_layer.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "f_pc/f_pc_leaf.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_layer_iter.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_layer_tag.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_line.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_line.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_load.cpp"), Object(MatchingFor(ALL_GCN), "f_pc/f_pc_manager.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_method.cpp"), Object(MatchingFor(ALL_GCN), "f_pc/f_pc_node.cpp"), Object(MatchingFor(ALL_GCN), "f_pc/f_pc_node_req.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_priority.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_profile.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_searcher.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_profile.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_searcher.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_line_tag.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_line_iter.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_method_iter.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_method_iter.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_method_tag.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_pause.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_pause.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_pc/f_pc_draw.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_fstcreate_req.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_fstcreate_req.cpp"), Object(MatchingFor(ALL_GCN), "f_pc/f_pc_stdcreate_req.cpp"), Object(MatchingFor("ShieldD"), "f_pc/f_pc_debug_sv.cpp"), ], @@ -672,7 +676,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bomb.cpp"), # debug weak func order Object(MatchingFor(ALL_GCN), "d/d_lib.cpp"), Object(MatchingFor(ALL_GCN), "d/d_save.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_save_init.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_save_init.cpp"), Object(MatchingFor(ALL_GCN), "d/d_jnt_col.cpp"), Object(MatchingFor(ALL_GCN), "d/d_a_obj.cpp"), Object(MatchingFor(ALL_GCN), "d/d_a_itembase_static.cpp"), @@ -704,8 +708,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield"), "d/d_vib_pattern.cpp"), Object(MatchingFor(ALL_GCN), "d/d_attention.cpp"), Object(NonMatching, "d/d_bg_parts.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_bg_pc.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_att_dist.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_bg_pc.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_att_dist.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "d/d_bg_plc.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s_acch.cpp"), @@ -719,8 +723,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "ShieldD"), "d/d_bg_s_sph_chk.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s_spl_grp_chk.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_s_poly_pass_chk.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_bg_s_roof_chk.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "d/d_bg_s_wtr_chk.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_bg_s_roof_chk.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "d/d_bg_s_wtr_chk.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w.cpp"), Object(MatchingFor(ALL_GCN), "d/d_bg_w_base.cpp"), Object(NonMatching, "d/d_bg_w_deform.cpp"), @@ -870,23 +874,23 @@ config.libs = [ "progress_category": "third_party", "host": True, "objects": [ - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_malloc.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_API.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_API_controller_pad.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_API_graphic.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_malloc.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_API.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_API_controller_pad.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_API_graphic.cpp"), Object(MatchingFor(ALL_GCN), "SSystem/SComponent/c_cc_d.cpp"), Object(MatchingFor(ALL_GCN), "SSystem/SComponent/c_cc_s.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_counter.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_counter.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_list.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_list_iter.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_list_iter.cpp"), Object(MatchingFor(ALL_GCN), "SSystem/SComponent/c_node.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_node_iter.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_tree.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_tree.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_tree_iter.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_phase.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_request.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_tag.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "SSystem/SComponent/c_tag_iter.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_tag.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "SSystem/SComponent/c_tag_iter.cpp"), Object(MatchingFor(ALL_GCN), "SSystem/SComponent/c_xyz.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "SSystem/SComponent/c_sxyz.cpp"), Object(MatchingFor(ALL_GCN), "SSystem/SComponent/c_math.cpp"), # debug weak literal order @@ -960,14 +964,14 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JStage/JSGFog.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JStage/JSGLight.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JStage/JSGObject.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "JSystem/JStage/JSGSystem.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "JSystem/JStage/JSGSystem.cpp"), ], ), JSystemLib( "JStudio", [ Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/ctb.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "JSystem/JStudio/JStudio/ctb-data.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "JSystem/JStudio/JStudio/ctb-data.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/functionvalue.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/fvb.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "JSystem/JStudio/JStudio/fvb-data.cpp"), @@ -976,7 +980,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN, "Shield"), "JSystem/JStudio/JStudio/jstudio-data.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/jstudio-math.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/jstudio-object.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "JSystem/JStudio/JStudio/object-id.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "JSystem/JStudio/JStudio/object-id.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/stb.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "JSystem/JStudio/JStudio/stb-data-parse.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JStudio/JStudio/stb-data.cpp"), @@ -1290,7 +1294,7 @@ config.libs = [ [ Object(MatchingFor(ALL_GCN), "JSystem/JSupport/JSUList.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JSupport/JSUInputStream.cpp"), - Object(MatchingFor("Shield", "ShieldD"), "JSystem/JSupport/JSUOutputStream.cpp"), + Object(MatchingFor(ALL_SHIELD), "JSystem/JSupport/JSUOutputStream.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JSupport/JSUMemoryStream.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JSupport/JSUFileStream.cpp"), ], @@ -1334,7 +1338,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JUtility/JUTProcBar.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JUtility/JUTConsole.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JUtility/JUTDirectFile.cpp"), - Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp"), + Object(MatchingFor(ALL_GCN, ALL_SHIELD), "JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp"), Object(NonMatching, "JSystem/JUtility/JUTFontData_Ascfont_fix16.cpp"), ], ), @@ -2096,7 +2100,7 @@ config.libs = [ ), ], }, - Rel("f_pc_profile_lst", [Object(MatchingFor(ALL_GCN, "Shield", "ShieldD"), "f_pc/f_pc_profile_lst.cpp")]), + Rel("f_pc_profile_lst", [Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_profile_lst.cpp")]), ActorRel(MatchingFor(ALL_GCN), "d_a_andsw"), ActorRel(MatchingFor(ALL_GCN), "d_a_bg"), ActorRel(MatchingFor(ALL_GCN), "d_a_bg_obj"), diff --git a/include/d/actor/d_a_itembase.h b/include/d/actor/d_a_itembase.h index ac463a42fa..ccac214e45 100644 --- a/include/d/actor/d_a_itembase.h +++ b/include/d/actor/d_a_itembase.h @@ -5,6 +5,7 @@ #include "d/d_cc_d.h" #include "d/d_a_itembase_static.h" #include "f_op/f_op_actor_mng.h" +#include "m_Do/m_Do_ext.h" struct daItemBase_data { /* 0x00 */ f32 mGravity; diff --git a/include/d/actor/d_a_obj_carry.h b/include/d/actor/d_a_obj_carry.h index aa1db0f645..0581dda831 100644 --- a/include/d/actor/d_a_obj_carry.h +++ b/include/d/actor/d_a_obj_carry.h @@ -294,9 +294,10 @@ public: return mCannon; } - static void make_prm(u32* o_params, csXyz* o_paramsEx, u8 param_2, u8 i_itemNo, u8 i_itemBit, u8 i_itemType, u8 param_6) { - o_paramsEx->x = (i_itemBit << 8) | (i_itemNo & 0xFF); - o_paramsEx->z = (param_6 << 13) | (param_2 << 1) | i_itemType; + static u32* make_prm(u32* o_params, csXyz* o_paramsEx, u8 param_2, u8 i_itemNo, u8 i_itemBit, u8 i_itemType, u8 param_6) { + o_paramsEx->x = (i_itemBit << 8) | i_itemNo; + o_paramsEx->z = i_itemType | ((param_6 << 13) | (param_2 << 1)); + return o_params; } static void make_prm_bokkuri(u32* o_params, csXyz* o_paramsEx, u8 i_itemNo, u8 i_itemBit, u8 i_itemType, u8 param_5) { diff --git a/include/d/actor/d_a_tag_stream.h b/include/d/actor/d_a_tag_stream.h index 6405de3412..6988320281 100644 --- a/include/d/actor/d_a_tag_stream.h +++ b/include/d/actor/d_a_tag_stream.h @@ -17,15 +17,15 @@ public: return mNext; } - u8 checkStreamOn() { + u8 checkStreamOn() const { return mStreamOn; } - s32 checkCanoeOn() { + s32 checkCanoeOn() const { return mParameters; } - u8 getPower() { + u8 getPower() const { return mPower; } diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index c4e922971e..de93f6d793 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -3622,7 +3622,7 @@ inline int dComIfGp_event_order(u16 i_type, u16 i_prio, u16 i_flags, u16 i_hindF i_targetActor, i_eventID, i_mapToolId); } -inline void dComIfGp_event_setGtItm(int i_itemNo) { +inline void dComIfGp_event_setGtItm(u8 i_itemNo) { g_dComIfG_gameInfo.play.getEvent()->setGtItm(i_itemNo); } diff --git a/include/d/d_event.h b/include/d/d_event.h index adc09de53d..7b60d37bae 100644 --- a/include/d/d_event.h +++ b/include/d/d_event.h @@ -150,7 +150,13 @@ public: #endif } - BOOL isOrderOK() { return mEventStatus == 0 || mEventStatus == 2; } + BOOL isOrderOK() { +#if DEBUG + return (mEventStatus == 0 || mEventStatus == 2) && !mDebugStb; +#else + return mEventStatus == 0 || mEventStatus == 2; +#endif + } fopAc_ac_c* getPt1() { return convPId(mPt1); } fopAc_ac_c* getPt2() { return convPId(mPt2); } diff --git a/include/d/d_item.h b/include/d/d_item.h index e9dee1c010..14425c4d60 100644 --- a/include/d/d_item.h +++ b/include/d/d_item.h @@ -6,6 +6,7 @@ class dEnemyItem_c { public: static void setItemData(u8* data) { mData = data; } + static u8* getItemData() { return mData; } static u8* mData; }; diff --git a/include/d/d_particle.h b/include/d/d_particle.h index ed9bac9b2d..dd90e5735a 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -499,6 +499,9 @@ private: /* 0x01A */ u8 field_0x1a; /* 0x01B */ u8 field_0x1b; /* 0x01C */ dPa_simpleEcallBack field_0x1c[25]; + #if DEBUG + u8 unk_0x210[0x1CC]; + #endif /* 0x210 */ level_c field_0x210; #if DEBUG u8 mSceneCount; diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h index 8c2c03c615..5736f0838c 100644 --- a/include/d/d_s_play.h +++ b/include/d/d_s_play.h @@ -68,7 +68,11 @@ public: bool resetGame(); void offReset(); - static bool isPause() { return pauseTimer == 0; } + #if VERSION == VERSION_SHIELD_DEBUG + static s8 isPause() { return pauseTimer | nextPauseTimer; } + #else + static s8 isPause() { return pauseTimer; } + #endif static void setPauseTimer(s8 time) { nextPauseTimer = time; } static s8 pauseTimer; diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 2838afa6a7..d3a2f9c114 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1133,7 +1133,10 @@ public: static void setProcID(u32 id) { mProcID = id; } static u32 getProcID() { return mProcID; } static void setStatusProcID(int i_roomNo, fpc_ProcID i_id) { mStatus[i_roomNo].mProcID = i_id; } - static int getStatusProcID(int i_roomNo) { return mStatus[i_roomNo].mProcID; } + static int getStatusProcID(int i_roomNo) { + JUT_ASSERT(2774, 0 <= i_roomNo && i_roomNo < 64); + return mStatus[i_roomNo].mProcID; + } static void setRegionNo(int i_roomNo, u8 i_regionNo) { mStatus[i_roomNo].mRegionNo = i_regionNo; } u8 checkStatusFlag(int i_roomNo, u8 flag) const { diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index aa54f8c180..99fcc87535 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -278,6 +278,7 @@ public: fopAc_ac_c(); ~fopAc_ac_c(); + static u32 getStopStatus() { return stopStatus; } static void setStopStatus(u32 status) { stopStatus = status; } static u32 stopStatus; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index a6b3f1d677..bc02df41ac 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -76,6 +76,8 @@ struct fopAcM_search4ev_prm { }; struct fopAcM_search_prm { + fopAcM_search_prm() {}; + /* 0x00 */ u32 prm0; /* 0x04 */ u32 prm1; /* 0x08 */ s16 procname; @@ -480,15 +482,14 @@ inline f32 fopAcM_searchActorDistanceY(const fopAc_ac_c* actorA, const fopAc_ac_ return actorB->current.pos.y - actorA->current.pos.y; } -inline u16 fopAcM_GetSetId(const fopAc_ac_c* i_actor) { +inline int fopAcM_GetSetId(const fopAc_ac_c* i_actor) { return i_actor->setID; } inline void dComIfGs_onActor(int bitNo, int roomNo); inline void fopAcM_onActor(const fopAc_ac_c* i_actor) { - int setId = fopAcM_GetSetId(i_actor); - dComIfGs_onActor(setId, fopAcM_GetHomeRoomNo(i_actor)); + dComIfGs_onActor(fopAcM_GetSetId(i_actor), fopAcM_GetHomeRoomNo(i_actor)); } inline void fopAcM_onDraw(fopAc_ac_c* i_actor) { @@ -781,7 +782,7 @@ inline void fopAcM_seStartCurrentLevel(const fopAc_ac_c* actor, u32 sfxID, u32 p dComIfGp_getReverb(fopAcM_GetRoomNo(actor))); } -inline void fopAcM_offActor(fopAc_ac_c* i_actor, u32 flag) { +inline void fopAcM_offActor(const fopAc_ac_c* i_actor, int flag) { dComIfGs_offActor(flag, fopAcM_GetHomeRoomNo(i_actor)); } @@ -853,7 +854,10 @@ public: static cXyz* getCrossP() { return mLineCheck.GetCrossP(); } static cXyz& getCross() { return mLineCheck.GetCross(); } static bool lineCheck(const cXyz*, const cXyz*, const fopAc_ac_c*); - static bool getTriPla(cM3dGPla* o_tri) { return dComIfG_Bgsp().GetTriPla(mLineCheck, o_tri); } + static bool dummyCheck(cM3dGPla* i_plane); + static bool getTriPla(cM3dGPla* i_plane) { + return dComIfG_Bgsp().GetTriPla(mLineCheck, i_plane); + }; static s32 getWallCode() { return dComIfG_Bgsp().GetWallCode(mLineCheck); } static bool checkWallHit() { cM3dGPla poly; diff --git a/include/f_op/f_op_actor_tag.h b/include/f_op/f_op_actor_tag.h index dbda5276a0..a354178a8b 100644 --- a/include/f_op/f_op_actor_tag.h +++ b/include/f_op/f_op_actor_tag.h @@ -3,7 +3,7 @@ #include "SSystem/SComponent/c_tag.h" -int fopAcTg_ActorQTo(create_tag_class* i_createTag); +void fopAcTg_ActorQTo(create_tag_class* i_createTag); int fopAcTg_Init(create_tag_class* i_createTag, void* i_data); int fopAcTg_ToActorQ(create_tag_class* i_createTag); diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h index 4aa5f05d01..c722784386 100644 --- a/include/f_op/f_op_camera_mng.h +++ b/include/f_op/f_op_camera_mng.h @@ -1,9 +1,8 @@ #ifndef F_F_OP_CAMERA_MNG_H_ #define F_F_OP_CAMERA_MNG_H_ -#include "SSystem/SComponent/c_phase.h" -#include "d/d_camera.h" #include "f_op/f_op_view.h" +#include "d/d_camera.h" typedef struct leafdraw_method_class leafdraw_method_class; diff --git a/include/f_op/f_op_kankyo.h b/include/f_op/f_op_kankyo.h index 4d7dd8e6aa..9d2b3b87eb 100644 --- a/include/f_op/f_op_kankyo.h +++ b/include/f_op/f_op_kankyo.h @@ -19,6 +19,8 @@ struct kankyo_process_profile_definition { /* 0x24 */ leafdraw_method_class* sub_method; }; // Size: 0x28 +void fopKy_IsKankyo(void* i_this); + extern leafdraw_method_class g_fopKy_Method; #endif /* F_OP_F_OP_KANKYO_H */ diff --git a/include/f_op/f_op_scene_mng.h b/include/f_op/f_op_scene_mng.h index c4ada01812..996a3b6d6e 100644 --- a/include/f_op/f_op_scene_mng.h +++ b/include/f_op/f_op_scene_mng.h @@ -1,6 +1,7 @@ #ifndef F_F_OP_SCENE_MNG_H_ #define F_F_OP_SCENE_MNG_H_ +#include "f_op/f_op_scene_pause.h" #include "f_pc/f_pc_manager.h" #include "f_op/f_op_scene.h" @@ -15,9 +16,10 @@ void fopScnM_Management(); void fopScnM_Init(); inline fpc_ProcID fpcM_LayerID(const void* i_process) { - return fpcBs_Is_JustOfType(g_fpcNd_type, ((base_process_class*)i_process)->subtype) != FALSE ? - ((scene_class*)i_process)->base.layer.layer_id : - fpcM_ERROR_PROCESS_ID_e; + if (fpcBs_Is_JustOfType(g_fpcNd_type, ((base_process_class*)i_process)->subtype) != FALSE) { + return ((scene_class*)i_process)->base.layer.layer_id; + } + return fpcM_ERROR_PROCESS_ID_e; } inline fpc_ProcID fopScnM_GetID(void* i_scene) { @@ -32,4 +34,20 @@ inline u32 fopScnM_GetParam(void* i_scene) { return fpcM_GetParam(i_scene); } +inline void fopScnM_SetParam(void* i_scene, u32 i_param) { + fpcM_SetParam(i_scene, i_param); +} + +inline void* fopScnM_GetAppend(void* i_scene) { + return fpcM_GetAppend(i_scene); +} + +inline int fopScnM_PauseEnable(scene_class* i_scene) { + return fopScnPause_Enable(i_scene); +} + +inline int fopScnM_PauseDisable(scene_class* i_scene) { + return fopScnPause_Disable(i_scene); +} + #endif diff --git a/include/f_op/f_op_scene_req.h b/include/f_op/f_op_scene_req.h index 283e000eae..c9d68d3bdd 100644 --- a/include/f_op/f_op_scene_req.h +++ b/include/f_op/f_op_scene_req.h @@ -15,6 +15,6 @@ public: fpc_ProcID fopScnRq_Request(int i_reqType, scene_class* i_scene, s16 i_procName, void* i_data, s16 param_5, u16 param_6); s32 fopScnRq_ReRequest(fpc_ProcID i_requestId, s16 i_procName, void* i_data); -void fopScnRq_Handler(); +int fopScnRq_Handler(); #endif diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 2150558827..f2399a39b6 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -1,6 +1,7 @@ #ifndef F_PC_MANAGER_H_ #define F_PC_MANAGER_H_ +#include "f_op/f_op_scene.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_leaf.h" @@ -41,7 +42,7 @@ inline fpc_ProcID fpcM_Create(s16 i_procName, FastCreateReqFunc i_createFunc, vo i_append); } -inline s16 fpcM_DrawPriority(const void* i_process) { +inline s32 fpcM_DrawPriority(const void* i_process) { return (s16)fpcLf_GetPriority((const leafdraw_class*)i_process); } @@ -49,6 +50,10 @@ inline s32 fpcM_ChangeLayerID(void* i_process, int i_layerID) { return fpcPi_Change(&((base_process_class*)i_process)->priority, i_layerID, 0xFFFD, 0xFFFD); } +inline s32 fpcM_MakeOfType(int* i_type) { + return fpcBs_MakeOfType(i_type); +} + inline BOOL fpcM_IsJustType(int i_typeA, int i_typeB) { return fpcBs_Is_JustOfType(i_typeA, i_typeB); } @@ -85,6 +90,10 @@ inline base_process_class* fpcM_SearchByID(fpc_ProcID i_id) { return fpcEx_SearchByID(i_id); } +inline process_node_class* fpcM_Layer(void* i_process) { + return ((base_process_class*)i_process)->layer_tag.layer->process_node; +} + void fpcM_Draw(void* i_process); s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc); s32 fpcM_Execute(void* i_process); diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 73556c5075..e2aa21e811 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -21,6 +21,7 @@ namespace mDoExt { }; #if DEBUG +void DummyCheckHeap_init(); void DummyCheckHeap_create(); void DummyCheckHeap_destroy(); #endif @@ -750,6 +751,7 @@ inline void mDoExt_bckAnmRemove(J3DModelData* i_modelData) { i_modelData->getJointNodePointer(0)->setMtxCalc(NULL); } +static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_parent, u32 i_alignment); JKRSolidHeap* mDoExt_createSolidHeapFromGame(u32 i_size, u32 i_alignment); void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap); u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap); diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index 761db651c3..e432c736ad 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -71,6 +71,7 @@ public: extern mDoHIO_root_c mDoHIO_root; void mDoHIO_updateChild(s8 i_no); +void mDoHIO_update(); void mDoHIO_deleteChild(s8 i_no); inline s8 mDoHIO_createChild(const char* i_name, JORReflexible* i_node) { return mDoHIO_root.createChild(i_name, i_node); diff --git a/src/Z2AudioLib/Z2StatusMgr.cpp b/src/Z2AudioLib/Z2StatusMgr.cpp index 619055090f..c86b86eee3 100644 --- a/src/Z2AudioLib/Z2StatusMgr.cpp +++ b/src/Z2AudioLib/Z2StatusMgr.cpp @@ -114,7 +114,7 @@ void Z2StatusMgr::heartGaugeOn() { void Z2StatusMgr::processHeartGaugeSound() { if (!dComIfGp_event_runCheck() && mHeartGaugeOn != 0) { - if (dScnPly_c::isPause()) { + if (!dScnPly_c::isPause()) { mHeartGaugeOn--; } diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index bea118ce80..488436c5ee 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -991,8 +991,7 @@ int daObjStone_c::draw() { int daObjStone_c::_delete() { mSound.deleteObject(); - u16 setid = fopAcM_GetSetId(this); - fopAcM_offActor(this, setid); + fopAcM_offActor(this, fopAcM_GetSetId(this)); effect_delete(true); dComIfG_resDelete(&mPhase, l_arcName[mStoneType]); return 1; diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 894c0507f7..9fca792bc5 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -4391,7 +4391,7 @@ bool dCamera_c::lockonCamera(s32 param_0) { v.Val(lockon->field_0x34.V() + ang5 * 0.05f); } else { r = lockon->field_0x34.R(); - r = r + ((fVar44a - r) * lockon->field_0x54 * fabsf(ang5.Cos())); + r = r + (fVar44a - r) * lockon->field_0x54 * fabsf(ang5.Cos()); u.Val(lockon->field_0x34.U() + (ang4 - lockon->field_0x34.U()) * lockon->field_0x58); v.Val(lockon->field_0x34.V() + ang5 * lockon->field_0x58); } @@ -4443,9 +4443,9 @@ bool dCamera_c::lockonCamera(s32 param_0) { bool bVar3 = false; f32 fVar31; - if (std::fabsf(fVar47) > 0.05f) { + if (fabsf(fVar47) > 0.05f) { cSAngle ang = globe2.U() + cSAngle(dCamMath::rationalBezierRatio(fVar47, 0.5f) * 7.5f); - fVar31 = std::fabsf(fVar47) - 0.05f; + fVar31 = fabsf(fVar47) - 0.05f; lockon->field_0x42 = ang; lockon->field_0x4c = 0.0f; bVar3 = true; diff --git a/src/d/d_debug_camera.cpp b/src/d/d_debug_camera.cpp index 2d54283bf1..d80eb3202b 100644 --- a/src/d/d_debug_camera.cpp +++ b/src/d/d_debug_camera.cpp @@ -557,6 +557,8 @@ int dDbgCamera_c::moveTool() { field_0x44.Val(*sp30 - *var_r28); switch (field_0xc00) { + f32 temp_f26; + f32 temp_f1_2; case 2: *var_r28 = *var_r28 + (field_0x44.Norm() * mCamSetup.Turbo(field_0xc10 * var_f30)); @@ -571,8 +573,8 @@ int dDbgCamera_c::moveTool() { *var_r28 = *var_r28 - (field_0x44.Norm() * mCamSetup.Translate(field_0xc10 * var_f30)); break; case 3: { - f32 temp_f26 = fabsf(substick_x); - f32 temp_f1_2 = fabsf(substick_y); + temp_f26 = fabsf(substick_x); + temp_f1_2 = fabsf(substick_y); if (field_0xc0c == 0 || temp_f26 < temp_f1_2) { cXyz sp1B0(0.0f, 1.0f, 0.0f); diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index c28ef4be0c..f4c164ef29 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -1218,7 +1218,7 @@ bool dPa_control_c::readScene(u8 param_0, mDoDvdThd_toMainRam_c** param_1) { if (m_sceneRes) { JUT_ASSERT(2641, !(--mSceneCount)); - JKRHeap::free(m_sceneRes, NULL); + JKRFree(m_sceneRes); m_sceneRes = NULL; } JUT_ASSERT(2647, !mSceneCount++); diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 7ad3bae85e..2a0d52a768 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -6,8 +6,8 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_alink.h" +#include "d/actor/d_a_suspend.h" #include "d/d_com_inf_actor.h" -#include "d/d_com_static.h" #include "d/d_demo.h" #include "d/d_s_play.h" #include "f_ap/f_ap_game.h" @@ -242,7 +242,7 @@ static int fopAc_Draw(void* i_this) { if (!dComIfGp_isPauseFlag()) { int var_r28 = dComIfGp_event_moveApproval(actor); - if ((var_r28 == 2 || (!fopAcM_CheckStatus(actor, fopAc_ac_c::stopStatus) && + if ((var_r28 == 2 || (!fopAcM_CheckStatus(actor, fopAc_ac_c::getStopStatus()) && (!fopAcM_CheckStatus(actor, fopAcStts_CULL_e) || !fopAcM_cullingCheck(actor)))) && !fopAcM_CheckStatus(actor, 0x21000000)) { @@ -315,54 +315,52 @@ static int fopAc_Execute(void* i_this) { JUT_ASSERT(685, -1.0e32f < actor->current.pos.x && actor->current.pos.x < 1.0e32f && -1.0e32f < actor->current.pos.y && actor->current.pos.y < 1.0e32f && -1.0e32f < actor->current.pos.z && actor->current.pos.z < 1.0e32f); #endif - if (!dComIfGp_isPauseFlag() && dScnPly_c::isPause()) { - if (!dComIfA_PauseCheck()) { - daSus_c::check(actor); - actor->eventInfo.beforeProc(); - s32 move = dComIfGp_event_moveApproval(i_this); - fopAcM_OffStatus(actor, 0x40000000); + if (!dComIfGp_isPauseFlag() && !dScnPly_c::isPause() && !dComIfA_PauseCheck()) { + daSus_c::check(actor); + actor->eventInfo.beforeProc(); + s32 move = dComIfGp_event_moveApproval(actor); + fopAcM_OffStatus(actor, 0x40000000); - if (!fopAcM_CheckStatus(actor, 0x20000000) && - (move == 2 || - (move != 0 && !fopAcM_CheckStatus(actor, fopAc_ac_c::stopStatus) && - (!fopAcM_CheckStatus(actor, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(actor, fopAcCnd_NODRAW_e))))) + if (!fopAcM_CheckStatus(actor, 0x20000000) && + (move == 2 || + (move != 0 && !fopAcM_CheckStatus(actor, fopAc_ac_c::getStopStatus()) && + (!fopAcM_CheckStatus(actor, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(actor, fopAcCnd_NODRAW_e))))) + { + fopAcM_OffCondition(actor, fopAcCnd_NOEXEC_e); + actor->old = actor->current; + + #if DEBUG { - fopAcM_OffCondition(actor, fopAcCnd_NOEXEC_e); - actor->old = actor->current; + print_error_check_c error_check(actor, print_error_check_c::sEXECUTE); + #endif - #if DEBUG - { - print_error_check_c error_check(actor, print_error_check_c::sEXECUTE); - #endif + ret = fpcMtd_Execute((process_method_class*)actor->sub_method, actor); - ret = fpcMtd_Execute((process_method_class*)actor->sub_method, actor); - - #if DEBUG - } - #endif - } else { - actor->eventInfo.suspendProc(actor); - fopAcM_OnCondition(actor, fopAcCnd_NOEXEC_e); + #if DEBUG } - - if (fopAcM_CheckStatus(actor, 0x20) && - actor->home.pos.y - actor->current.pos.y > 5000.0f) - { - fopAcM_delete(actor); - } - - JUT_ASSERT(750, !isnan(actor->current.pos.x)); - JUT_ASSERT(751, !isnan(actor->current.pos.y)); - JUT_ASSERT(752, !isnan(actor->current.pos.z)); - - if (actor->current.pos.y < -1e31f) { - actor->current.pos.y = -1e31f; - } - - JUT_ASSERT(762, -1.0e32f < actor->current.pos.x && actor->current.pos.x < 1.0e32f && -1.0e32f < actor->current.pos.y && actor->current.pos.y < 1.0e32f && -1.0e32f < actor->current.pos.z && actor->current.pos.z < 1.0e32f); - - dKy_depth_dist_set(actor); + #endif + } else { + actor->eventInfo.suspendProc(actor); + fopAcM_OnCondition(actor, fopAcCnd_NOEXEC_e); } + + if (fopAcM_CheckStatus(actor, 0x20) && + actor->home.pos.y - actor->current.pos.y > 5000.0f) + { + fopAcM_delete(actor); + } + + JUT_ASSERT(750, !isnan(actor->current.pos.x)); + JUT_ASSERT(751, !isnan(actor->current.pos.y)); + JUT_ASSERT(752, !isnan(actor->current.pos.z)); + + if (actor->current.pos.y < -1e31f) { + actor->current.pos.y = -1e31f; + } + + JUT_ASSERT(762, -1.0e32f < actor->current.pos.x && actor->current.pos.x < 1.0e32f && -1.0e32f < actor->current.pos.y && actor->current.pos.y < 1.0e32f && -1.0e32f < actor->current.pos.z && actor->current.pos.z < 1.0e32f); + + dKy_depth_dist_set(actor); } #if DEBUG @@ -400,7 +398,7 @@ static int fopAc_IsDelete(void* i_this) { static int fopAc_Delete(void* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)i_this; - int ret; + int ret = FALSE; #if DEBUG { @@ -416,7 +414,7 @@ static int fopAc_Delete(void* i_this) { if (ret == TRUE) { fopAcTg_ActorQTo(&actor->actor_tag); fopDwTg_DrawQTo(&actor->draw_tag); - fopAcM_DeleteHeap(actor); + fopAcM_DeleteHeap((fopAc_ac_c*) i_this); dDemo_actor_c* demoAc = dDemo_c::getActor(actor->demoActorID); if (demoAc != NULL) { @@ -442,7 +440,7 @@ static int fopAc_Create(void* i_this) { if (fpcM_IsFirstCreating(i_this)) { actor_process_profile_definition* profile = (actor_process_profile_definition*)fpcM_GetProfile(i_this); - actor->actor_type = fpcBs_MakeOfType(&g_fopAc_type); + actor->actor_type = fpcM_MakeOfType(&g_fopAc_type); actor->sub_method = (profile_method_class*)profile->sub_method; fopAcTg_Init(&actor->actor_tag, actor); @@ -506,8 +504,9 @@ static int fopAc_Create(void* i_this) { } if (filelist != NULL) { + u8 sw; if (!dStage_FileList_dt_GetEnemyAppear1Flag(filelist)) { - u8 sw = dStage_FileList_dt_GetBitSw(filelist); + sw = dStage_FileList_dt_GetBitSw(filelist); if (sw != 0xFF && dComIfGs_isSwitch(sw, actor->home.roomNo) && profile->group == fopAc_ENEMY_e) { @@ -515,7 +514,7 @@ static int fopAc_Create(void* i_this) { return cPhs_ERROR_e; } } else { - u8 sw = dStage_FileList_dt_GetBitSw(filelist); + sw = dStage_FileList_dt_GetBitSw(filelist); if (sw != 0xFF && !dComIfGs_isSwitch(sw, actor->home.roomNo) && profile->group == fopAc_ENEMY_e) { diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 3d10b12fdc..e3e33f7ba0 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -16,10 +16,12 @@ #include "d/actor/d_a_tag_stream.h" #include "d/d_item.h" #include "d/d_path.h" +#include "d/d_s_play.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_scene_mng.h" #include "m_Do/m_Do_lib.h" +#include #define MAKE_ITEM_PARAMS(itemNo, itemBitNo, param_2, param_3) \ ((itemNo & 0xFF) << 0 | (itemBitNo & 0xFF) << 0x8 | param_2 << 0x10 | (param_3 & 0xF) << 0x18) @@ -107,7 +109,7 @@ fopAc_ac_c* fopAcM_FastCreate(s16 i_procName, FastCreateReqFunc i_createFunc, vo void fopAcM_setStageLayer(void* i_proc) { scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); - JUT_ASSERT(0, stageProc != NULL); + JUT_ASSERT(367, stageProc != NULL); fpcM_ChangeLayerID(i_proc, fopScnM_LayerID(stageProc)); } @@ -115,7 +117,7 @@ void fopAcM_setStageLayer(void* i_proc) { void fopAcM_setRoomLayer(void* i_proc, int i_roomNo) { if (i_roomNo >= 0) { scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(i_roomNo)); - JUT_ASSERT(0, roomProc != NULL); + JUT_ASSERT(390, roomProc != NULL); fpcM_ChangeLayerID(i_proc, fopScnM_LayerID(roomProc)); } @@ -283,13 +285,13 @@ fpc_ProcID fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentID, u s16 parent_angleY = parent_actor->current.angle.y; cXyz offset_pos; + csXyz offset_angle; if (i_pos == NULL) { offset_pos = cXyz::Zero; } else { offset_pos = *i_pos; } - csXyz offset_angle; if (i_angle == NULL) { offset_angle = csXyz::Zero; } else { @@ -354,10 +356,31 @@ u8 fopAcM::HeapAdjustVerbose; u8 fopAcM::HeapAdjustQuiet; u8 fopAcM::HeapDummyCreate; +static bool lbl_8074C4DC; +static bool lbl_8074C4DD; + +struct DummyCheckHeap { + static JKRHeap* getHeap(); + + /* 0x0 */ JKRHeap* dummyHeap; +}; + +static DummyCheckHeap* dch; + bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, u32 i_size) { const char* procNameString = fopAcM_getProcNameString(i_actor); JKRSolidHeap* heap00 = NULL; +#if DEBUG + if (lbl_8074C4DC != 0 && lbl_8074C4DD != 0 && dch != NULL) { + JKRHeap* dummy_heap = dch->getHeap(); + if (dummy_heap != NULL) { + JKRSolidHeap* heap = mDoExt_createSolidHeap(-1, dummy_heap, 0x20); + JUT_ASSERT(1211, heap); + } + } +#endif + if (fopAcM::HeapAdjustVerbose) { OS_REPORT("\x1b[36mfopAcM_entrySolidHeap 開始 [%s] 見積もりサイズ=%08x\n\x1b[m", procNameString, i_size); @@ -521,29 +544,33 @@ void fopAcM_setCullSizeSphere(fopAc_ac_c* i_actor, f32 i_minX, f32 i_minY, f32 i void fopAcM_setCullSizeBox2(fopAc_ac_c* i_actor, J3DModelData* i_modelData) { J3DJoint* jointNode = i_modelData->getJointNodePointer(0); - - f32 minX = i_actor->scale.x * jointNode->getMin()->x; - f32 minY = i_actor->scale.y * jointNode->getMin()->y; - f32 minZ = i_actor->scale.z * jointNode->getMin()->z; - f32 maxX = i_actor->scale.x * jointNode->getMax()->x; - f32 maxY = i_actor->scale.y * jointNode->getMax()->y; - f32 maxZ = i_actor->scale.z * jointNode->getMax()->z; - - fopAcM_setCullSizeBox(i_actor, minX, minY, minZ, maxX, maxY, maxZ); + fopAcM_setCullSizeBox(i_actor, + i_actor->scale.x * jointNode->getMin()->x, + i_actor->scale.y * jointNode->getMin()->y, + i_actor->scale.z * jointNode->getMin()->z, + i_actor->scale.x * jointNode->getMax()->x, + i_actor->scale.y * jointNode->getMax()->y, + i_actor->scale.z * jointNode->getMax()->z); } bool fopAcM_addAngleY(fopAc_ac_c* i_actor, s16 i_target, s16 i_step) { - return cLib_chaseAngleS(&fopAcM_GetAngle_p(i_actor)->y, i_target, i_step); + csXyz* angle = fopAcM_GetAngle_p(i_actor); + return cLib_chaseAngleS(&angle->y, i_target, i_step); +} + +void dummy(fopAc_ac_c* i_actor) { + fopAcM_SetSpeedF(i_actor, 10.0f); } void fopAcM_calcSpeed(fopAc_ac_c* i_actor) { + f32 xSpeed, ySpeed, zSpeed; f32 speedF = fopAcM_GetSpeedF(i_actor); f32 gravity = fopAcM_GetGravity(i_actor); cXyz* speed = fopAcM_GetSpeed_p(i_actor); - f32 xSpeed = speedF * cM_ssin(i_actor->current.angle.y); - f32 ySpeed = speed->y + gravity; - f32 zSpeed = speedF * cM_scos(i_actor->current.angle.y); + xSpeed = speedF * cM_ssin(i_actor->current.angle.y); + ySpeed = speed->y + gravity; + zSpeed = speedF * cM_scos(i_actor->current.angle.y); if (ySpeed < fopAcM_GetMaxFallSpeed(i_actor)) { ySpeed = fopAcM_GetMaxFallSpeed(i_actor); @@ -580,13 +607,14 @@ s16 fopAcM_searchActorAngleX(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_act f32 x_dist = posB->x - posA->x; f32 z_dist = posB->z - posA->z; - return cM_atan2s(posB->y - posA->y, JMAFastSqrt(x_dist * x_dist + z_dist * z_dist)); + f32 dist = JMAFastSqrt(x_dist * x_dist + z_dist * z_dist); + return cM_atan2s(posB->y - posA->y, dist); } s32 fopAcM_seenActorAngleY(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) { - s16 target_angle = - cLib_targetAngleY(fopAcM_GetPosition_p(i_actorA), fopAcM_GetPosition_p(i_actorB)); - return abs((s16)(target_angle - i_actorA->shape_angle.y)); + s16 target_angle = cLib_targetAngleY(fopAcM_GetPosition_p(i_actorA), fopAcM_GetPosition_p(i_actorB)); + target_angle -= i_actorA->shape_angle.y; + return abs(target_angle); } f32 fopAcM_searchActorDistance(const fopAc_ac_c* i_actorA, const fopAc_ac_c* i_actorB) { @@ -778,49 +806,50 @@ s32 fopAcM_cullingCheck(fopAc_ac_c const* i_actor) { mDoLib_clipper::clip(mtx_p, &i_actor->cull.box.max, &i_actor->cull.box.min); mDoLib_clipper::resetFar(); return ret; - } else { - return mDoLib_clipper::clip(mtx_p, &i_actor->cull.box.max, &i_actor->cull.box.min); } - } else { - cull_box* box = &l_cullSizeBox[fopAcM_CULLSIZE_IDX(fopAcM_GetCullSize(i_actor))]; - if (fopAcM_getCullSizeFar(i_actor) > 0.0f) { - mDoLib_clipper::changeFar(cullsize_far * mDoLib_clipper::getFar()); - u32 ret = mDoLib_clipper::clip(mtx_p, &box->max, &box->min); - mDoLib_clipper::resetFar(); - return ret; - } else { - return mDoLib_clipper::clip(mtx_p, &box->max, &box->min); - } + return mDoLib_clipper::clip(mtx_p, &i_actor->cull.box.max, &i_actor->cull.box.min); } - } else { - if (fopAcM_GetCullSize(i_actor) == fopAc_CULLSPHERE_CUSTOM_e) { - if (fopAcM_getCullSizeFar(i_actor) > 0.0f) { - mDoLib_clipper::changeFar(cullsize_far * mDoLib_clipper::getFar()); - u32 ret = mDoLib_clipper::clip(mtx_p, fopAcM_getCullSizeSphereCenter(i_actor), - fopAcM_getCullSizeSphereR(i_actor)); - mDoLib_clipper::resetFar(); - return ret; - } else { - return mDoLib_clipper::clip(mtx_p, fopAcM_getCullSizeSphereCenter(i_actor), - fopAcM_getCullSizeSphereR(i_actor)); - } - } else { - cull_sphere* sphere = &l_cullSizeSphere[fopAcM_CULLSIZE_Q_IDX(fopAcM_GetCullSize(i_actor))]; - if (fopAcM_getCullSizeFar(i_actor) > 0.0f) { - mDoLib_clipper::changeFar(cullsize_far * mDoLib_clipper::getFar()); - u32 ret = mDoLib_clipper::clip(mtx_p, sphere->center, sphere->radius); - mDoLib_clipper::resetFar(); - return ret; - } else { - return mDoLib_clipper::clip(mtx_p, sphere->center, sphere->radius); - } + cull_box* box = &l_cullSizeBox[fopAcM_CULLSIZE_IDX(fopAcM_GetCullSize(i_actor))]; + + if (fopAcM_getCullSizeFar(i_actor) > 0.0f) { + mDoLib_clipper::changeFar(cullsize_far * mDoLib_clipper::getFar()); + u32 ret = mDoLib_clipper::clip(mtx_p, &box->max, &box->min); + mDoLib_clipper::resetFar(); + return ret; } + + return mDoLib_clipper::clip(mtx_p, &box->max, &box->min); } + + if (fopAcM_GetCullSize(i_actor) == fopAc_CULLSPHERE_CUSTOM_e) { + if (fopAcM_getCullSizeFar(i_actor) > 0.0f) { + mDoLib_clipper::changeFar(cullsize_far * mDoLib_clipper::getFar()); + u32 ret = mDoLib_clipper::clip(mtx_p, fopAcM_getCullSizeSphereCenter(i_actor), + fopAcM_getCullSizeSphereR(i_actor)); + mDoLib_clipper::resetFar(); + return ret; + } + + return mDoLib_clipper::clip(mtx_p, fopAcM_getCullSizeSphereCenter(i_actor), + fopAcM_getCullSizeSphereR(i_actor)); + } + + cull_sphere* sphere = &l_cullSizeSphere[fopAcM_CULLSIZE_Q_IDX(fopAcM_GetCullSize(i_actor))]; + + if (fopAcM_getCullSizeFar(i_actor) > 0.0f) { + mDoLib_clipper::changeFar(cullsize_far * mDoLib_clipper::getFar()); + u32 ret = mDoLib_clipper::clip(mtx_p, sphere->center, sphere->radius); + mDoLib_clipper::resetFar(); + return ret; + } + + return mDoLib_clipper::clip(mtx_p, sphere->center, sphere->radius); } -void* event_second_actor(u16) { +void* event_second_actor(u16 i_flag) { + (void)i_flag; return dComIfGp_getPlayer(0); } @@ -880,15 +909,19 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_prio i_priority = 0xFF; } - s16 eventID = i_actorB->eventInfo.getEventId(); - u8 toolID = i_actorB->eventInfo.getMapToolId(); + s16 evid = i_actorB->eventInfo.getEventId(); + u8 toolid = i_actorB->eventInfo.getMapToolId(); - if (fopAcM_GetProfName(i_actorB) == 0x55 && toolID != 0xFF) { - eventID = dComIfGp_getEventManager().getEventIdx(i_actorA, NULL, toolID); + if (fopAcM_GetProfName(i_actorB) == 0x55) { + if (toolid != 0xFF) { + evid = dComIfGp_getEventManager().getEventIdx(i_actorA, NULL, toolid); + } + } else if (fopAcM_GetProfName(i_actorB) == 0xAB) { } + OS_REPORT("toolid<%d>evid<%d>\n", toolid, evid); - return dComIfGp_event_order(dEvt_type_DOOR_e, i_priority, i_flag, -1, i_actorA, i_actorB, eventID, - toolID); + return dComIfGp_event_order(dEvt_type_DOOR_e, i_priority, i_flag, -1, i_actorA, i_actorB, evid, + toolid); } s32 fopAcM_orderCatchEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_priority, u16 i_flag) { @@ -976,6 +1009,7 @@ s32 fopAcM_orderOtherEventId(fopAc_ac_c* i_actor, s16 i_eventID, u8 i_mapToolID, } u16 newPriority = 50; + u16 eventPrio; s32 roomNo = dComIfGp_roomControl_getStayNo(); if (i_actor != NULL) { roomNo = fopAcM_GetRoomNo(i_actor); @@ -984,7 +1018,7 @@ s32 fopAcM_orderOtherEventId(fopAc_ac_c* i_actor, s16 i_eventID, u8 i_mapToolID, if (i_priority != 0) { newPriority = i_priority; } else if (i_actor != NULL) { - u16 eventPrio = dComIfGp_getEventManager().getEventPrio(i_actor, i_eventID); + eventPrio = dComIfGp_getEventManager().getEventPrio(i_actor, i_eventID); if (eventPrio != 0) { newPriority = eventPrio; @@ -1018,10 +1052,12 @@ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 dStage_MapEvent_dt_c* dt = dEvt_control_c::searchMapEventData(param_1, roomNo); if (dt != NULL) { newPriority = dt->priority; - + if (i_eventID == 0xFF) { i_eventID = dComIfGp_getEventManager().getEventIdx(i_actor, param_1); } + } else { + OS_REPORT("\x1b[31m%s: %d: fopAcM_orderMapToolEvent() マップデータがみつかりません\n\x1b[m", __FILE__, 2984); // "Map data could not be found." } if (i_flag & 0x100) { @@ -1038,7 +1074,9 @@ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 param_3, u16 i_flag, u16 param_5) { - return fopAcM_orderMapToolEvent(i_actor, param_1, i_eventID, param_3, i_flag | 0x100, param_5); + u16 flag = i_flag; + flag = flag | 0x100; + return fopAcM_orderMapToolEvent(i_actor, param_1, i_eventID, param_3, flag, param_5); } s32 fopAcM_orderPotentialEvent(fopAc_ac_c* i_actor, u16 i_flag, u16 param_2, u16 i_priority) { @@ -1087,11 +1125,13 @@ s32 fopAcM_orderTreasureEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_ -1); } -fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c const*) { +fopAc_ac_c* fopAcM_getTalkEventPartner(fopAc_ac_c const* i_this) { + (void)i_this; return (fopAc_ac_c*)dComIfGp_event_getTalkPartner(); } -fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c const*) { +fopAc_ac_c* fopAcM_getItemEventPartner(fopAc_ac_c const* i_this) { + (void)i_this; return (fopAc_ac_c*)dComIfGp_event_getItemPartner(); } @@ -1106,9 +1146,11 @@ fopAc_ac_c* fopAcM_getEventPartner(fopAc_ac_c const* i_actor) { fpc_ProcID fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 param_2, int i_itemBitNo, int i_roomNo, csXyz const* i_angle, cXyz const* i_scale) { + JUT_ASSERT(3214, 0 <= i_itemNo && i_itemNo < 256); dComIfGp_event_setGtItm(i_itemNo); if (i_itemNo == fpcNm_ITEM_NONE) { + OS_REPORT("プレゼントデモ用なのに「ハズレ」です！[%d]\n", i_itemNo); // Even though it is for a Present Demo, it is a 'Miss'! return fpcM_ERROR_PROCESS_ID_e; } @@ -1117,13 +1159,17 @@ fpc_ProcID fopAcM_createItemForPresentDemo(cXyz const* i_pos, int i_itemNo, u8 p fpc_ProcID fopAcM_createItemForTrBoxDemo(cXyz const* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, csXyz const* i_angle, cXyz const* i_scale) { - dComIfGp_event_setGtItm(i_itemNo); + + JUT_ASSERT(3259, 0 <= i_itemNo && i_itemNo < 256); + dComIfGp_event_setGtItm(i_itemNo); if (i_itemNo == fpcNm_ITEM_NONE) { + OS_REPORT("ゲットデモ用なのに「ハズレ」です！[%d]\n", i_itemNo); // Even though it is for a Get Demo, it is a 'Miss'! return fpcM_ERROR_PROCESS_ID_e; } - return fopAcM_createDemoItem(i_pos, i_itemNo, i_itemBitNo, i_angle, i_roomNo, i_scale, 0); + u8 param_7 = 0; + return fopAcM_createDemoItem(i_pos, i_itemNo, i_itemBitNo, i_angle, i_roomNo, i_scale, param_7); } struct ItemTableList { @@ -1134,23 +1180,26 @@ struct ItemTableList { }; u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo) { - u8 tableNo = i_tableNo; + u8 hp_max; + u8 hp_percent; ItemTableList* tableList = (ItemTableList*)dComIfGp_getItemTable(); - + if (i_tableNo == 255) { return i_tableNo; } - + #if DEBUG - if (tableList->mTableNum - 1 < i_tableNo) { + u8 tableNum = tableList->mTableNum; + if (tableNum - 1 < i_tableNo) { // "Table Num<%d>, Specified Table<%d>, over table num!\n" OSReport_Error("テーブル数<%d>、指定テーブル番号<%d>で、テーブル数オーバーしています！\n", - tableList->mTableNum, i_tableNo); + tableNum, i_tableNo); i_tableNo = 0; } #endif - u8 hp_percent = (dComIfGs_getLife() * 100) / (((dComIfGs_getMaxLife() / 5) * 4) & 0xFC); + hp_max = dComIfGs_getMaxLife() / 5 * 4; + hp_percent = (dComIfGs_getLife() * 100) / hp_max; switch (i_tableNo) { case 150: @@ -1160,19 +1209,20 @@ u8 fopAcM_getItemNoFromTableNo(u8 i_tableNo) { case 190: if (hp_percent < 80) { if (hp_percent >= 60) { - tableNo = i_tableNo + 1; + i_tableNo = i_tableNo + 1; } else if (hp_percent >= 40) { - tableNo = i_tableNo + 2; + i_tableNo = i_tableNo + 2; } else if (hp_percent >= 20) { - tableNo = i_tableNo + 3; + i_tableNo = i_tableNo + 3; } else { - tableNo = i_tableNo + 4; + i_tableNo = i_tableNo + 4; } } break; } - return tableList->mTables[tableNo][(int)cM_rndF(15.9999f)]; + i_tableNo = tableList->mTables[i_tableNo][(int)cM_rndF(15.9999f)]; + return i_tableNo; } struct EnemyTableList { @@ -1190,11 +1240,14 @@ struct EnemyTable { fpc_ProcID fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* i_pos, int i_itemBitNo, int i_roomNo, csXyz const* i_angle, cXyz const* i_scale, f32* i_speedF, f32* i_speedY) { + int itemNo; int tableNo = 0xFF; - EnemyTableList* tblList = (EnemyTableList*)dEnemyItem_c::mData; - int tableNum = tblList->field_0x4; - EnemyTable* table = (EnemyTable*)&tblList->mData; - + u32* data = (u32*)dEnemyItem_c::getItemData(); + data++; + int tableNum = (int) *data; + data++; + EnemyTable* table = (EnemyTable*)data; + for (u32 i = 0; i < tableNum; i++) { if (i_enemyID == table->mEnemyID) { if (table->mStage[0] == '#') { @@ -1206,11 +1259,11 @@ fpc_ProcID fopAcM_createItemFromEnemyID(u8 i_enemyID, cXyz const* i_pos, int i_i } table++; } - + if (daPy_getPlayerActorClass()->checkHorseRide()) { - int itemNo = fopAcM_getItemNoFromTableNo(tableNo); + tableNo = fopAcM_getItemNoFromTableNo(tableNo); void* actor = - fopAcM_createItemForDirectGet(i_pos, itemNo, i_roomNo, NULL, NULL, 0.0f, 0.0f); + fopAcM_createItemForDirectGet(i_pos, tableNo, i_roomNo, NULL, NULL, 0.0f, 0.0f); return fopAcM_GetID(actor); } @@ -1369,7 +1422,7 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, int param_5, const csXyz* i_angle, const cXyz* i_scale) { // clang-format off - JUT_ASSERT(0, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); + JUT_ASSERT(4202, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on csXyz item_angle(csXyz::Zero); @@ -1387,49 +1440,53 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi u8 item_no = check_itemno(i_itemNo); u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, 0xFF, param_5); + fopAc_ac_c* ret; switch (i_itemNo) { case fpcNm_ITEM_RECOVERY_FAILY: - return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, + ret = fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); + break; #if DEBUG case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); - JUT_ASSERT(0, FALSE); + JUT_ASSERT(4268, FALSE); break; case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); - JUT_ASSERT(0, FALSE); + JUT_ASSERT(4272, FALSE); break; case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); - JUT_ASSERT(0, FALSE); + JUT_ASSERT(4276, FALSE); break; #endif case fpcNm_ITEM_KAKERA_HEART: case fpcNm_ITEM_UTAWA_HEART: - return fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, + ret = fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); + break; case fpcNm_ITEM_TRIPLE_HEART: for (int i = 0; i < 2; i++) { - fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, + ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, NULL); item_angle.y = cM_rndFX(0x7FFF); } default: - return fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, + ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, NULL); } + return ret; } fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, f32* i_speedF, f32* i_speedY, int i_itemBitNo, int param_9, createFunc i_createFunc) { - JUT_ASSERT(0, 0 <= i_itemNo && i_itemNo < 256); + JUT_ASSERT(4324, 0 <= i_itemNo && i_itemNo < 256); csXyz angle; if (i_itemNo == fpcNm_ITEM_NONE) { @@ -1446,31 +1503,35 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, *i_speedF = 2.0f * *i_speedF; } + fopAc_ac_c* ret; + switch (i_itemNo) { case fpcNm_ITEM_RECOVERY_FAILY: - return fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, + ret = fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); + break; #if DEBUG case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); - JUT_ASSERT(0, FALSE); + JUT_ASSERT(4383, FALSE); break; case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); - JUT_ASSERT(0, FALSE); + JUT_ASSERT(4387, FALSE); break; case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); - JUT_ASSERT(0, FALSE); + JUT_ASSERT(4391, FALSE); break; #endif case fpcNm_ITEM_KAKERA_HEART: case fpcNm_ITEM_UTAWA_HEART: - return fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, + ret = fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); + break; case fpcNm_ITEM_TRIPLE_HEART: for (i = 0; i < 2; i++) { if (i_angle != NULL) { @@ -1502,25 +1563,26 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, } angle.z = 0xFF; - fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, + ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &angle, i_scale, -1, i_createFunc, NULL); - if (actor != NULL) { + if (ret != NULL) { if (i_speedF != NULL) { - actor->speedF = *i_speedF; + ret->speedF = *i_speedF; } if (i_speedY != NULL) { - actor->speed.y = *i_speedY; + ret->speed.y = *i_speedY; } } - - return actor; } + + return ret; } fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int i_itemNo, int i_itemBit, int i_roomNo, const cXyz* param_6, int i_itemType, int param_8) { + u32 params = 0; csXyz params_ex(0, 0, 0); if (param_6 != NULL) { params_ex.y = param_6->atan2sX_Z(); @@ -1528,7 +1590,6 @@ fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int i_itemNo, in param_8 = 1; } - u32 params = 0; daObjCarry_c::make_prm_bokkuri(¶ms, ¶ms_ex, i_itemNo, i_itemBit, i_itemType, param_8); return fopAcM_create(PROC_Obj_Carry, i_setId, params, i_pos, i_roomNo, ¶ms_ex, NULL, -1, NULL); } @@ -1538,13 +1599,13 @@ fpc_ProcID fopAcM_createWarpHole(const cXyz* i_pos, const csXyz* i_angle, int i_ if (param_6 == 0xFF) { param_6 = param_4; } - u32 actorParams; - make_prm_warp_hole(&actorParams, param_5, param_6, param_4); - return fopAcM_create(PROC_Obj_BossWarp, actorParams, i_pos, i_roomNo, i_angle, NULL, -1); + u32 actorParams = 0x17000000 + 0xFF; + u32 actorParamsOut = actorParams | (param_5 << 0x1B) | (param_6 << 0x10) | (param_4 << 0x8); + return fopAcM_create(PROC_Obj_BossWarp, actorParamsOut, i_pos, i_roomNo, i_angle, NULL, -1); } void* enemySearchJugge(void* i_actor, void* i_data) { - if (i_actor != NULL && fopAc_IsActor(i_actor) && ((fopAc_ac_c*)i_actor)->group == fopAc_ENEMY_e) + if (i_actor != NULL && fopAcM_IsActor(i_actor) && fopAcM_GetGroup((fopAc_ac_c*)i_actor) == fopAc_ENEMY_e) { return i_actor; } else { @@ -1553,17 +1614,18 @@ void* enemySearchJugge(void* i_actor, void* i_data) { } fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { - JUT_ASSERT(0, roomNo >= 0); + JUT_ASSERT(4659, roomNo >= 0); - int procID = dStage_roomControl_c::getStatusProcID(roomNo); - scene_class* roomProc = fopScnM_SearchByID(procID); - JUT_ASSERT(0, roomProc != NULL); + scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(roomNo)); + JUT_ASSERT(4662, roomProc != NULL); - u32 actorID = ((daPy_py_c*)dComIfGp_getPlayer(0))->getGrabActorID(); - fopAc_ac_c* actor = fopAcM_SearchByID(actorID); + { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + fopAc_ac_c* actor = fopAcM_SearchByID(player->getGrabActorID()); - if (actor != NULL && fopAcM_GetGroup(actor) == 2) { - return actor; + if (actor != NULL && fopAcM_GetGroup(actor) == 2) { + return actor; + } } return (fopAc_ac_c*)fpcM_JudgeInLayer(fpcM_LayerID(roomProc), enemySearchJugge, NULL); @@ -1571,9 +1633,11 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { fpc_ProcID fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 i_size, u8 i_type, u8 i_enemyID) { - return fopAcM_GetID(fopAcM_fastCreate( - PROC_DISAPPEAR, (i_enemyID << 0x10) | (i_size << 0x8) | i_type, i_pos, - fopAcM_GetRoomNo(i_actor), &i_actor->current.angle, NULL, 0xFF, NULL, NULL)); + u32 param = (i_enemyID << 0x10) | (i_size << 0x8) | i_type; + fopAc_ac_c* actor = fopAcM_fastCreate( + PROC_DISAPPEAR, param, i_pos, fopAcM_GetRoomNo(i_actor), &i_actor->current.angle, NULL, 0xFF, + NULL, NULL); + return fopAcM_GetID(actor); } void fopAcM_setCarryNow(fopAc_ac_c* i_actor, int param_1) { @@ -1589,14 +1653,11 @@ void fopAcM_cancelCarryNow(fopAc_ac_c* i_actor) { if (fopAcM_checkCarryNow(i_actor)) { i_actor->actor_status &= ~0x2000; - s8 roomNo = fopAcM_GetHomeRoomNo(i_actor); - if (roomNo != -1) { - int procID = dStage_roomControl_c::getStatusProcID(fopAcM_GetRoomNo(i_actor)); - scene_class* roomProc = fopScnM_SearchByID(procID); - - if (roomProc != NULL) { - fopAcM_setRoomLayer(i_actor, fopAcM_GetRoomNo(i_actor)); - } + if (fopAcM_GetHomeRoomNo(i_actor) != -1 && + fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(fopAcM_GetRoomNo(i_actor))) != + NULL) + { + fopAcM_setRoomLayer(i_actor, fopAcM_GetRoomNo(i_actor)); } i_actor->shape_angle.z = 0; @@ -1624,6 +1685,7 @@ BOOL fopAcM_otoCheck(fopAc_ac_c const* i_actor, f32 param_1) { BOOL fopAcM_otherBgCheck(fopAc_ac_c const* param_0, fopAc_ac_c const* param_1) { dBgS_LinChk linChk; + cXyz _; cXyz start; cXyz end; @@ -1650,14 +1712,14 @@ BOOL fopAcM_wayBgCheck(fopAc_ac_c const* param_0, f32 param_1, f32 param_2) { start = param_0->current.pos; start.y += param_2; - mDoMtx_YrotS((MtxP)calc_mtx, param_0->shape_angle.y); + cMtx_YrotS((MtxP)calc_mtx, param_0->shape_angle.y); offset.x = 0.0f; offset.y = 50.0f; offset.z = param_1; MtxPosition(&offset, &end); - VECAdd(&end, ¶m_0->current.pos, &end); + end += param_0->current.pos; linChk.Set(&start, &end, param_0); @@ -1669,7 +1731,8 @@ BOOL fopAcM_wayBgCheck(fopAc_ac_c const* param_0, f32 param_1, f32 param_2) { } BOOL fopAcM_plAngleCheck(fopAc_ac_c const* i_actor, s16 i_angle) { - s16 angle = i_actor->shape_angle.y - dComIfGp_getPlayer(0)->shape_angle.y; + fopAc_ac_c* player = dComIfGp_getPlayer(0); + s16 angle = i_actor->shape_angle.y - player->shape_angle.y; if (angle <= i_angle && angle >= (s16)-i_angle) { return FALSE; } @@ -1701,7 +1764,7 @@ void fopAcM_effSmokeSet1(u32* param_0, u32* param_1, cXyz const* param_2, csXyz f32 param_4, dKy_tevstr_c const* param_5, int param_6) { cXyz p2(param_2->x, param_2->y + 100.0f, param_2->z); if (fopAcM_gc_c::gndCheck(&p2)) { - p2.y = fopAcM_gc_c::getGroundY(); + p2.y = fopAcM_gc_c::getGroundY() + TREG_F(7); cXyz stack_18(param_4, param_4, param_4); *param_0 = dComIfGp_particle_setSimpleFoot(*param_0, param_1, *fopAcM_gc_c::getGroundCheck(), &p2, @@ -1725,6 +1788,11 @@ void fopAcM_effHamonSet(u32* param_0, cXyz const* param_1, f32 param_2, f32 emit } s32 fopAcM_riverStream(cXyz* param_0, s16* param_1, f32* param_2, f32 param_3) { + (void)¶m_0; + (void)¶m_1; + (void)¶m_2; + (void)¶m_3; + return 0; } @@ -1737,14 +1805,14 @@ s32 fopAcM_carryOffRevise(fopAc_ac_c* param_0) { start = player->current.pos; start.y = param_0->current.pos.y; - mDoMtx_YrotS((MtxP)calc_mtx, player->shape_angle.y); + cMtx_YrotS((MtxP)calc_mtx, player->shape_angle.y); offset.x = 0.0f; offset.y = param_0->current.pos.y - player->current.pos.y; - offset.z = 150.0f; + offset.z = 150.0f + AREG_F(17); MtxPosition(&offset, &end); - VECAdd(&end, &player->current.pos, &end); + end += player->current.pos; linChk.Set(&start, &end, param_0); @@ -1786,11 +1854,12 @@ void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelDat cXyz v1 = *pEyePos - camera->lookat.eye; cXyz v2; get_vectle_calc(&i_actor->tevStr.field_0x32c, pEyePos, &v2); - Vec half; + cXyz half; C_VECHalfAngle(&v1, &v2, &half); Mtx mtx; C_MTXLookAt(mtx, &cXyz::Zero, &cXyz::BaseY, &half); - mDoMtx_stack_c::scaleS(1.0, 1.0, 1.0); + f32 scale = 1.0f + IREG_F(0); + mDoMtx_stack_c::scaleS(scale, scale, 1.0); // static Mtx const mtx_adj = { {0.5f, 0.0f, 0.0f, 0.5f}, {0.0f, -0.5f, 0.0f, 0.5f}, @@ -1798,19 +1867,19 @@ void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelDat }; mDoMtx_stack_c::concat(mtx_adj); mDoMtx_stack_c::concat(mtx); - MtxP currentMtx = mDoMtx_stack_c::get(); - currentMtx[0][3] = 0.0; - currentMtx[1][3] = 0.0; - currentMtx[2][3] = 0.0; + mDoMtx_stack_c::get()[0][3] = 0.0; + mDoMtx_stack_c::get()[1][3] = 0.0; + mDoMtx_stack_c::get()[2][3] = 0.0; Mtx mtx2; - mDoMtx_copy(currentMtx, mtx2); + cMtx_copy(mDoMtx_stack_c::get(), mtx2); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { J3DMaterial* material = modelData->getMaterialNodePointer(i); for (u32 j = 0; j < 8; j++) { J3DTexMtx* texMtx = material->getTexMtx(j); if (texMtx != NULL) { - switch (texMtx->getTexMtxInfo().mInfo) { + J3DTexMtxInfo* info = &texMtx->getTexMtxInfo(); + switch (info->mInfo) { case 6: texMtx->setEffectMtx(mtx2); break; @@ -1827,12 +1896,12 @@ const char* fopAcM_getProcNameString(const fopAc_ac_c* i_actor) { } static const fopAc_ac_c* fopAcM_findObjectCB(fopAc_ac_c const* i_actor, void* i_data) { - fopAcM_search_prm* prm = (fopAcM_search_prm*)i_data; - if (!fopAcM_IsExecuting(fopAcM_GetID(i_actor))) { return NULL; } + fopAcM_search_prm* prm = (fopAcM_search_prm*)i_data; + if (prm->procname == fopAcM_GetProfName(i_actor) && prm->argument == i_actor->argument) { if (prm->prm0 == 0 || prm->prm1 == (prm->prm0 & fopAcM_GetParam(i_actor))) { return i_actor; @@ -1878,12 +1947,12 @@ fopAc_ac_c* fopAcM_searchFromName4Event(char const* i_name, s16 i_eventID) { prm.event_id = i_eventID; strcpy(prm.name, i_name); - char* chr = strchr(prm.name, ':'); + char* chr = std::strchr(prm.name, ':'); if (chr != NULL) { chr[0] = 0; + chr++; prm.event_id = 0; - chr++; for (; *chr != 0; chr++) { if (*chr < '0' || *chr > '9') { prm.event_id = 0xFFFF; @@ -1923,7 +1992,8 @@ s32 fopAcM_getWaterY(cXyz const* param_0, f32* o_waterY) { void fpoAcM_relativePos(fopAc_ac_c const* i_actor, cXyz const* i_pos, cXyz* o_pos) { s16 angle = -i_actor->shape_angle.y; - cXyz pos = *i_pos - i_actor->current.pos; + cXyz pos; + pos = *i_pos - i_actor->current.pos; o_pos->x = (pos.z * cM_ssin(angle)) + (pos.x * cM_scos(angle)); o_pos->y = pos.y; @@ -1932,14 +2002,13 @@ void fpoAcM_relativePos(fopAc_ac_c const* i_actor, cXyz const* i_pos, cXyz* o_po s32 fopAcM_getWaterStream(cXyz const* pos, cBgS_PolyInfo const& polyinfo, cXyz* speed, int* power, BOOL param_4) { - daTagStream_c* stream = daTagStream_c::getTop(); - if (stream != NULL) { - for (stream = daTagStream_c::getTop(); stream != NULL; stream = stream->getNext()) { + if (daTagStream_c::getTop() != NULL) { + for (daTagStream_c* stream = daTagStream_c::getTop(); stream != NULL; stream = stream->getNext()) { if (stream->checkStreamOn() && (!param_4 || stream->checkCanoeOn()) && stream->checkArea(pos)) { *speed = stream->speed; - *power = stream->getPower() & 0xff; + *power = stream->getPower(); return 1; } } @@ -1977,7 +2046,11 @@ s16 fopAcM_getPolygonAngle(cBgS_PolyInfo const& poly, s16 param_1) { s16 fopAcM_getPolygonAngle(cM3dGPla const* p_plane, s16 param_1) { if (p_plane == NULL) { +#if DEBUG + JUT_ASSERT(5810, FALSE); +#else return 0; +#endif } f32 cos = cM_scos(p_plane->mNormal.atan2sX_Z() - param_1); @@ -1992,6 +2065,10 @@ bool fopAcM_lc_c::lineCheck(cXyz const* i_start, cXyz const* i_end, fopAc_ac_c c return dComIfG_Bgsp().LineCross(&mLineCheck); } +bool fopAcM_lc_c::dummyCheck(cM3dGPla* i_plane) { + return getTriPla(i_plane); +} + bool fopAcM_gc_c::gndCheck(cXyz const* i_pos) { mGndCheck.SetPos(i_pos); mGroundY = (f32)dComIfG_Bgsp().GroundCross(&mGndCheck); @@ -2021,4 +2098,12 @@ BOOL fopAcM_getNameString(const fopAc_ac_c* i_actor, char* o_name) { return TRUE; } -void fopAcM_initManager() {} +void fopAcM_initManager() { +#if DEBUG + DummyCheckHeap_init(); + if (lbl_8074C4DC != 0) { + DummyCheckHeap_create(); + } + l_hio.entry(); +#endif +} diff --git a/src/f_op/f_op_actor_tag.cpp b/src/f_op/f_op_actor_tag.cpp index b4a95012e5..2f0518b595 100644 --- a/src/f_op/f_op_actor_tag.cpp +++ b/src/f_op/f_op_actor_tag.cpp @@ -12,8 +12,8 @@ int fopAcTg_ToActorQ(create_tag_class* i_createTag) { return cTg_Addition(&g_fopAcTg_Queue, i_createTag); } -int fopAcTg_ActorQTo(create_tag_class* i_createTag) { - return cTg_SingleCutFromTree(i_createTag); +void fopAcTg_ActorQTo(create_tag_class* i_createTag) { + int _ = cTg_SingleCutFromTree(i_createTag); } int fopAcTg_Init(create_tag_class* i_createTag, void* i_data) { diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index 3d17f6d4fa..c2d94d0a76 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -5,26 +5,42 @@ #include "f_op/f_op_camera.h" #include "f_op/f_op_camera_mng.h" +#include "f_ap/f_ap_game.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "f_op/f_op_draw_tag.h" static s32 fopCam_Draw(camera_class* i_this) { s32 ret = 1; + #if DEBUG + fapGm_HIO_c::startCpuTimer(); + #endif + if (!dComIfGp_isPauseFlag()) { ret = fpcLf_DrawMethod(i_this->submethod, i_this); } + #if DEBUG + fapGm_HIO_c::stopCpuTimer("カメラ（描画処理）"); // Camera (rendering process) + #endif + return ret; } static int fopCam_Execute(camera_class* i_this) { int ret; + #if DEBUG + fapGm_HIO_c::startCpuTimer(); + #endif - if (!dComIfGp_isPauseFlag() && dScnPly_c::isPause()) { + if (!dComIfGp_isPauseFlag() && !dScnPly_c::isPause()) { ret = fpcMtd_Execute((process_method_class*)i_this->submethod, i_this); } + #if DEBUG + fapGm_HIO_c::stopCpuTimer("カメラ（計算処理）"); // Camera (computational processing) + #endif + return ret; } @@ -38,7 +54,8 @@ int fopCam_IsDelete(camera_class* i_this) { } int fopCam_Delete(camera_class* i_this) { - int ret = fpcMtd_Delete((process_method_class*)i_this->submethod, i_this); + int ret = 0; + ret = fpcMtd_Delete((process_method_class*)i_this->submethod, i_this); if (ret == 1) { fopDwTg_DrawQTo(&i_this->create_tag); } @@ -48,6 +65,7 @@ int fopCam_Delete(camera_class* i_this) { static int fopCam_Create(void* i_this) { camera_class* a_this = (camera_class*)i_this; + int ret; if (fpcM_IsFirstCreating(i_this)) { camera_process_profile_definition* profile = (camera_process_profile_definition*)fpcM_GetProfile(i_this); @@ -61,10 +79,9 @@ static int fopCam_Create(void* i_this) { } } - int ret = fpcMtd_Create(&a_this->submethod->base, a_this); + ret = fpcMtd_Create(&a_this->submethod->base, a_this); if (ret == cPhs_COMPLEATE_e) { - s32 priority = fpcM_DrawPriority(a_this); - fopDwTg_ToDrawQ(&a_this->create_tag, priority); + fopDwTg_ToDrawQ(&a_this->create_tag, fpcM_DrawPriority(a_this)); } return ret; diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp index ea40325226..e8a035a40e 100644 --- a/src/f_op/f_op_camera_mng.cpp +++ b/src/f_op/f_op_camera_mng.cpp @@ -4,8 +4,6 @@ */ #include "f_op/f_op_camera_mng.h" -#include "f_pc/f_pc_layer.h" -#include "f_pc/f_pc_stdcreate_req.h" static fpc_ProcID l_fopCamM_id[4]; @@ -13,6 +11,10 @@ u32 fopCamM_GetParam(camera_class* i_this) { return fpcM_GetParam(i_this); } +void dummy(fpc_ProcID i_procName) { + fpcM_SearchByID(i_procName); +} + fpc_ProcID fopCamM_Create(int i_cameraIdx, s16 i_procName, void* i_append) { l_fopCamM_id[i_cameraIdx] = fpcM_Create(i_procName, NULL, i_append); return l_fopCamM_id[i_cameraIdx]; diff --git a/src/f_op/f_op_draw_iter.cpp b/src/f_op/f_op_draw_iter.cpp index 8f9150acfa..de1805762a 100644 --- a/src/f_op/f_op_draw_iter.cpp +++ b/src/f_op/f_op_draw_iter.cpp @@ -12,8 +12,8 @@ static int l_fopDwTg_id; create_tag_class* fopDwIt_GetTag() { while (l_fopDwTg_id + 1 < g_fopDwTg_Queue.mNumLists) { - l_fopDwTg_id++; - node_class* node = g_fopDwTg_Queue.mpLists[l_fopDwTg_id].mpHead; + node_list_class* list = &g_fopDwTg_Queue.mpLists[++l_fopDwTg_id]; + node_class* node = list->mpHead; if (node != NULL) { return (create_tag_class*)node; @@ -30,13 +30,13 @@ create_tag_class* fopDwIt_Begin() { if (tag != NULL) { return tag; } - return tag = fopDwIt_GetTag(); + return fopDwIt_GetTag(); } create_tag_class* fopDwIt_Next(create_tag_class* i_createTag) { create_tag_class* tag = (create_tag_class*)i_createTag->mpNode.mpNextNode; if (tag == NULL) { - tag = fopDwIt_GetTag(); + return fopDwIt_GetTag(); } return tag; } diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index 7a9b170786..c65007622a 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -6,38 +6,59 @@ #include "f_op/f_op_kankyo.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" +#include "f_ap/f_ap_game.h" #include "f_op/f_op_draw_tag.h" #include "f_op/f_op_kankyo_mng.h" +static int fopKy_KANKYO_TYPE; + +void fopKy_IsKankyo(void* i_this) { + fpcM_IsJustType(fopKy_KANKYO_TYPE, ((kankyo_class*)i_this)->type); +} + static int fopKy_Draw(void* i_this) { int ret; - kankyo_class* a_this = (kankyo_class*)i_this; + +#if DEBUG + fapGm_HIO_c::startCpuTimer(); +#endif if (!dComIfGp_isPauseFlag()) { - ret = fpcLf_DrawMethod(a_this->sub_method, i_this); + ret = fpcLf_DrawMethod(((kankyo_class*)i_this)->sub_method, i_this); } +#if DEBUG + fapGm_HIO_c::stopCpuTimer("環境関係（描画処理）"); // Environmental aspects (rendering processing) +#endif + return ret; } static int fopKy_Execute(void* i_this) { - int ret; kankyo_class* a_this = (kankyo_class*)i_this; + int ret; + +#if DEBUG + fapGm_HIO_c::startCpuTimer(); +#endif - if (dScnPly_c::isPause() && (!dComIfGp_isPauseFlag() || fpcM_GetName(i_this) == PROC_ENVSE)) { - ret = fpcMtd_Execute(&a_this->sub_method->base, i_this); + if (!dScnPly_c::isPause() && (!dComIfGp_isPauseFlag() || fpcM_GetName(a_this) == PROC_ENVSE)) { + ret = fpcMtd_Execute(&((kankyo_class*)i_this)->sub_method->base, i_this); } +#if DEBUG + fapGm_HIO_c::stopCpuTimer("環境関係（計算処理）"); // Environmental aspects (computational processing) +#endif + return ret; } static int fopKy_IsDelete(void* i_this) { int ret; - kankyo_class* a_this = (kankyo_class*)i_this; - ret = fpcMtd_IsDelete(&a_this->sub_method->base, a_this); + ret = fpcMtd_IsDelete(&((kankyo_class*)i_this)->sub_method->base, i_this); if (ret == 1) { - fopDwTg_DrawQTo(&a_this->draw_tag); + fopDwTg_DrawQTo(&((kankyo_class*)i_this)->draw_tag); } return ret; @@ -52,15 +73,14 @@ static int fopKy_Delete(void* i_this) { return ret; } -static int fopKy_KANKYO_TYPE; - static int fopKy_Create(void* i_this) { kankyo_class* a_this = (kankyo_class*)i_this; + int ret; if (fpcM_IsFirstCreating(i_this)) { kankyo_process_profile_definition* profile = (kankyo_process_profile_definition*)fpcM_GetProfile(i_this); - a_this->type = fpcBs_MakeOfType(&fopKy_KANKYO_TYPE); + a_this->type = fpcM_MakeOfType(&fopKy_KANKYO_TYPE); a_this->sub_method = profile->sub_method; fopDwTg_Init(&a_this->draw_tag, a_this); @@ -73,10 +93,9 @@ static int fopKy_Create(void* i_this) { } } - int ret = fpcMtd_Create(&a_this->sub_method->base, a_this); + ret = fpcMtd_Create(&a_this->sub_method->base, a_this); if (ret == cPhs_COMPLEATE_e) { - s32 priority = fpcM_DrawPriority(a_this); - fopDwTg_ToDrawQ(&a_this->draw_tag, priority); + fopDwTg_ToDrawQ(&a_this->draw_tag, fpcM_DrawPriority(a_this)); } return ret; diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index d09a6be0df..0093173817 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -7,12 +7,22 @@ #include "SSystem/SComponent/c_malloc.h" #include "d/d_com_inf_game.h" +void dummy(fpcLyIt_JudgeFunc i_createFunc, void* i_this) { + fpcM_Search(i_createFunc, i_this); +} + +void fopKyM_IsKy(void* i_this) { + fopKy_IsKankyo((fopKyM_prm_class*)i_this); +} + fopKyM_prm_class* fopKyM_CreateAppend() { fopKyM_prm_class* append = (fopKyM_prm_class*)cMl::memalignB(-4, sizeof(fopKyM_prm_class)); if (append != NULL) { cLib_memSet(append, 0, sizeof(fopKyM_prm_class)); - append->scale.set(1.0f, 1.0f, 1.0f); + append->scale.x = 1.0f; + append->scale.y = 1.0f; + append->scale.z = 1.0f; } return append; } @@ -71,9 +81,7 @@ fpc_ProcID fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param) { } append->pos = *i_pos; - append->scale.x = scale; - append->scale.y = scale; - append->scale.z = scale; + append->scale.set(scale, scale, scale); append->parameters = i_param; return fopKyM_Create(PROC_WPILLAR, NULL, append); @@ -86,9 +94,7 @@ fpc_ProcID fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) { }; cXyz scale; - scale.x = i_size; - scale.y = i_size; - scale.z = i_size; + scale.setall(i_size); for (int i = 0; i < 2; i++) { dComIfGp_particle_set(m_name[i], i_pos, NULL, &scale); diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp index 4b9ad8afe6..f5cbf98b1c 100644 --- a/src/f_op/f_op_msg.cpp +++ b/src/f_op/f_op_msg.cpp @@ -5,32 +5,52 @@ #include "f_op/f_op_msg.h" #include "d/d_s_play.h" +#include "f_ap/f_ap_game.h" #include "f_op/f_op_draw_tag.h" #include "f_op/f_op_msg_mng.h" #include "f_pc/f_pc_manager.h" +#include "m_Do/m_Do_machine.h" static int fopMsg_Draw(void* i_this) { - msg_class* a_this = (msg_class*)i_this; - return fpcLf_DrawMethod(a_this->sub_method, i_this); +#if DEBUG + fapGm_HIO_c::startCpuTimer(); +#endif + s32 ret = fpcLf_DrawMethod(((msg_class*)i_this)->sub_method, i_this); +#if DEBUG + fapGm_HIO_c::stopCpuTimer("２Ｄ関係（描画処理）"); // 2D graphics (rendering) +#endif + return ret; } static int fopMsg_Execute(void* i_this) { msg_class* a_this = (msg_class*)i_this; - int ret = 1; - if (dScnPly_c::isPause()) { - ret = fpcMtd_Execute(&a_this->sub_method->base, i_this); +#if DEBUG + fapGm_HIO_c::startCpuTimer(); +#endif + if (!dScnPly_c::isPause()) { +#if DEBUG + if (fopMsg::MemCheck) { + mDoMch_HeapCheckAll(); + } +#endif + ret = fpcMtd_Execute(&((msg_class*)i_this)->sub_method->base, i_this); +#if DEBUG + if (fopMsg::MemCheck) { + mDoMch_HeapCheckAll(); + } +#endif } - +#if DEBUG + fapGm_HIO_c::stopCpuTimer("２Ｄ関係（計算処理）"); // 2D graphics (computational processing) +#endif return ret; } static int fopMsg_IsDelete(void* i_this) { - msg_class* a_this = (msg_class*)i_this; - - int ret = fpcMtd_IsDelete(&a_this->sub_method->base, i_this); + int ret = fpcMtd_IsDelete(&((msg_class*)i_this)->sub_method->base, i_this); if (ret == 1) { - fopDwTg_DrawQTo(&a_this->draw_tag); + fopDwTg_DrawQTo(&((msg_class*)i_this)->draw_tag); } return ret; @@ -39,7 +59,7 @@ static int fopMsg_IsDelete(void* i_this) { static int fopMsg_Delete(void* i_this) { msg_class* a_this = (msg_class*)i_this; - int ret = fpcMtd_Delete(&a_this->sub_method->base, i_this); + int ret = fpcMtd_Delete(&((msg_class*)i_this)->sub_method->base, i_this); fopDwTg_DrawQTo(&a_this->draw_tag); return ret; @@ -53,12 +73,14 @@ static int fopMsg_MSG_TYPE; int fopMsg_Create(void* i_this) { msg_class* a_this = (msg_class*)i_this; + int ret; - if (fpcM_IsFirstCreating(a_this)) { - msg_process_profile_definition* profile = (msg_process_profile_definition*)fpcM_GetProfile(i_this); - a_this->type = fpcBs_MakeOfType(&fopMsg_MSG_TYPE); + if (fpcM_IsFirstCreating(i_this)) { + msg_process_profile_definition* profile = + (msg_process_profile_definition*)fpcM_GetProfile(i_this); + a_this->type = fpcM_MakeOfType(&fopMsg_MSG_TYPE); a_this->sub_method = profile->sub_method; - + fopDwTg_Init(&a_this->draw_tag, a_this); fopMsg_prm_class* append = fopMsgM_GetAppend(a_this); @@ -71,10 +93,9 @@ int fopMsg_Create(void* i_this) { } } - int ret = fpcMtd_Create(&a_this->sub_method->base, a_this); + ret = fpcMtd_Create(&a_this->sub_method->base, a_this); if (ret == cPhs_COMPLEATE_e) { - s32 priority = fpcM_DrawPriority(a_this); - fopDwTg_ToDrawQ(&a_this->draw_tag, priority); + fopDwTg_ToDrawQ(&a_this->draw_tag, fpcM_DrawPriority(a_this)); } return ret; diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp index 6625931ac9..557e9bda08 100644 --- a/src/f_op/f_op_overlap.cpp +++ b/src/f_op/f_op_overlap.cpp @@ -4,26 +4,34 @@ */ #include "f_op/f_op_overlap.h" +#include "JSystem/JKernel/JKRExpHeap.h" #include "f_pc/f_pc_manager.h" +#include "m_Do/m_Do_ext.h" static s32 fopOvlp_Draw(void* i_this) { - overlap_task_class* a_this = (overlap_task_class*)i_this; - return fpcLf_DrawMethod(a_this->submethod, i_this); + s32 ret = fpcLf_DrawMethod(((overlap_task_class*)i_this)->submethod, i_this); + return ret; } static s32 fopOvlp_Execute(void* i_this) { - overlap_task_class* a_this = (overlap_task_class*)i_this; - return fpcMtd_Execute(&a_this->submethod->base, i_this); + s32 ret = fpcMtd_Execute(&((overlap_task_class*)i_this)->submethod->base, i_this); + return ret; } static s32 fopOvlp_IsDelete(void* i_this) { - overlap_task_class* a_this = (overlap_task_class*)i_this; - return fpcMtd_IsDelete(&a_this->submethod->base, i_this); + s32 ret = fpcMtd_IsDelete(&((overlap_task_class*)i_this)->submethod->base, i_this); + return ret; } static s32 fopOvlp_Delete(void* i_this) { - overlap_task_class* a_this = (overlap_task_class*)i_this; - return fpcMtd_Delete(&a_this->submethod->base, i_this); + s32 ret = 0; + ret = fpcMtd_Delete(&((overlap_task_class*)i_this)->submethod->base, i_this); +#if DEBUG + if (ret == 1 && mDoExt_getSafeZeldaHeapSize() >= 0) { + mDoExt_addSafeZeldaHeapSize(mDoExt_getZeldaHeap()->getSize(i_this)); + } +#endif + return ret; } static s32 fopOvlp_Create(void* i_this) { @@ -36,9 +44,15 @@ static s32 fopOvlp_Create(void* i_this) { cReq_Create(&a_this->request, 1); a_this->submethod = profile->sub_method; a_this->scene_id = fpcM_ERROR_PROCESS_ID_e; +#if DEBUG + if (mDoExt_getSafeZeldaHeapSize() >= 0) { + mDoExt_addSafeZeldaHeapSize(-mDoExt_getZeldaHeap()->getSize(i_this)); + } +#endif } - return fpcMtd_Create(&a_this->submethod->base, a_this); + s32 ret = fpcMtd_Create(&a_this->submethod->base, a_this); + return ret; } leafdraw_method_class g_fopOvlp_Method = { diff --git a/src/f_op/f_op_overlap_mng.cpp b/src/f_op/f_op_overlap_mng.cpp index 5ed2a95de8..844b18a16a 100644 --- a/src/f_op/f_op_overlap_mng.cpp +++ b/src/f_op/f_op_overlap_mng.cpp @@ -4,29 +4,32 @@ */ #include "SSystem/SComponent/c_request.h" +#include "m_Do/m_Do_controller_pad.h" #include "f_op/f_op_overlap_mng.h" #include "f_op/f_op_overlap_req.h" +#include "f_op/f_op_scene_mng.h" #include "f_op/f_op_scene_pause.h" -#include "f_pc/f_pc_executor.h" // making it not an array put it in .bss static overlap_request_class* l_fopOvlpM_overlap[1] = {NULL}; int fopOvlpM_SceneIsStop() { if (l_fopOvlpM_overlap[0] != NULL) { - return fopScnPause_Enable( - (scene_class*)fpcEx_SearchByID(l_fopOvlpM_overlap[0]->overlap_task->scene_id)); + fpc_ProcID scene_id = l_fopOvlpM_overlap[0]->overlap_task->scene_id; + scene_class* cls = (scene_class*)fpcM_SearchByID(scene_id); + return fopScnM_PauseEnable(cls); } - + return 0; } int fopOvlpM_SceneIsStart() { if (l_fopOvlpM_overlap[0] != NULL) { - return fopScnPause_Disable( - (scene_class*)fpcEx_SearchByID(l_fopOvlpM_overlap[0]->overlap_task->scene_id)); + fpc_ProcID scene_id = l_fopOvlpM_overlap[0]->overlap_task->scene_id; + scene_class* cls = (scene_class*)fpcM_SearchByID(scene_id); + return fopScnM_PauseDisable(cls); } - + return 0; } @@ -45,23 +48,31 @@ void fopOvlpM_ToldAboutID(fpc_ProcID i_sceneId) { } int fopOvlpM_IsPeek() { - return l_fopOvlpM_overlap[0] != NULL ? l_fopOvlpM_overlap[0]->field_0x8 : FALSE; + if (l_fopOvlpM_overlap[0] != NULL) { + return l_fopOvlpM_overlap[0]->field_0x8; + } + return FALSE; } int fopOvlpM_IsDone() { - return l_fopOvlpM_overlap[0] != NULL ? cReq_Is_Done(&l_fopOvlpM_overlap[0]->base) : FALSE; + if (l_fopOvlpM_overlap[0] != NULL) { + return cReq_Is_Done(&l_fopOvlpM_overlap[0]->base); + } + return FALSE; } int fopOvlpM_IsDoingReq() { if (l_fopOvlpM_overlap[0] != NULL && l_fopOvlpM_overlap[0]->field_0x4 == 1) { return 1; } - - return 0; + return FALSE; } int fopOvlpM_ClearOfReq() { - return l_fopOvlpM_overlap[0] != NULL ? fopOvlpReq_OverlapClr(l_fopOvlpM_overlap[0]) : 0; + if (l_fopOvlpM_overlap[0] != NULL) { + return fopOvlpReq_OverlapClr(l_fopOvlpM_overlap[0]); + } + return FALSE; } static overlap_request_class l_fopOvlpM_Request; @@ -94,6 +105,12 @@ int fopOvlpM_Cancel() { if (fopOvlpReq_Cancel(l_fopOvlpM_overlap[0]) == true) { l_fopOvlpM_overlap[0] = NULL; +#if DEBUG + BOOL state = mDoCPd_c::isConnect(PAD_3); + if (state) { + JUT_WARN(336, "%s", "fopOvlpM_Cancel SUCCESSED"); + } +#endif return 1; } diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp index 112809a706..28d0a743cc 100644 --- a/src/f_op/f_op_overlap_req.cpp +++ b/src/f_op/f_op_overlap_req.cpp @@ -80,7 +80,7 @@ static int fopOvlpReq_phase_IsCreated(overlap_request_class* i_overlapReq) { static int fopOvlpReq_phase_Create(overlap_request_class* i_overlapReq) { fpcLy_SetCurrentLayer(i_overlapReq->layer); i_overlapReq->request_id = - fpcSCtRq_Request(fpcLy_CurrentLayer(), i_overlapReq->procname, NULL, NULL, NULL); + fpcM_Create(i_overlapReq->procname, NULL, NULL); return cPhs_NEXT_e; } @@ -98,8 +98,7 @@ overlap_request_class* fopOvlpReq_Request(overlap_request_class* i_overlapReq, s }; if (i_overlapReq->field_0x4 == 1) { - i_overlapReq = NULL; - return i_overlapReq; + return NULL; } cReq_Command(&i_overlapReq->base, 1); @@ -116,9 +115,7 @@ overlap_request_class* fopOvlpReq_Request(overlap_request_class* i_overlapReq, s } int fopOvlpReq_Handler(overlap_request_class* i_overlapReq) { - int phase_state = cPhs_Do(&i_overlapReq->phase_req, i_overlapReq); - - switch (phase_state) { + switch (cPhs_Do(&i_overlapReq->phase_req, i_overlapReq)) { case cPhs_NEXT_e: return fopOvlpReq_Handler(i_overlapReq); case cPhs_INIT_e: @@ -136,11 +133,17 @@ int fopOvlpReq_Handler(overlap_request_class* i_overlapReq) { } int fopOvlpReq_Cancel(overlap_request_class* i_overlapReq) { - return fopOvlpReq_phase_Done(i_overlapReq) == cPhs_NEXT_e ? TRUE : FALSE; + if (fopOvlpReq_phase_Done(i_overlapReq) == cPhs_NEXT_e) { + return TRUE; + } + return FALSE; } int fopOvlpReq_Is_PeektimeLimit(overlap_request_class* i_overlapReq) { - return i_overlapReq->peektime == 0 ? TRUE : FALSE; + if (i_overlapReq->peektime == 0) { + return TRUE; + } + return FALSE; } void fopOvlpReq_SetPeektime(overlap_request_class* i_overlapReq, u16 i_peektime) { diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp index 68624b5548..97a0124b09 100644 --- a/src/f_op/f_op_scene.cpp +++ b/src/f_op/f_op_scene.cpp @@ -5,13 +5,17 @@ #include "f_op/f_op_scene.h" #include "f_pc/f_pc_manager.h" +#include "f_op/f_op_scene_mng.h" +#include "m_Do/m_Do_hostIO.h" static int fopScn_Draw(scene_class* i_this) { - return fpcNd_DrawMethod((nodedraw_method_class*)i_this->submethod, i_this); + int ret = fpcNd_DrawMethod((nodedraw_method_class*)i_this->submethod, i_this); + return ret; } static int fopScn_Execute(scene_class* i_this) { - return fpcMtd_Execute((process_method_class*)i_this->submethod, i_this); + int ret = fpcMtd_Execute((process_method_class*)i_this->submethod, i_this); + return ret; } static int fopScn_IsDelete(void* i_this) { @@ -20,15 +24,21 @@ static int fopScn_IsDelete(void* i_this) { static int fopScn_Delete(void* i_this) { scene_class* scene = (scene_class*)i_this; - int ret = fpcMtd_Delete((process_method_class*)scene->submethod, scene); + int ret = 0; + ret = fpcMtd_Delete((process_method_class*)scene->submethod, scene); if (ret == 1) { fopScnTg_QueueTo(&scene->scene_tag); } +#if DEBUG + mDoHIO_update(); +#endif return ret; } static int fopScn_Create(void* i_this) { scene_class* scene = (scene_class*)i_this; + int ret; + if (fpcM_IsFirstCreating(i_this)) { scene_process_profile_definition* profile = (scene_process_profile_definition*)fpcM_GetProfile(i_this); scene->submethod = profile->submethod; @@ -36,13 +46,15 @@ static int fopScn_Create(void* i_this) { fopScnTg_Init(&scene->scene_tag, i_this); fopScnTg_ToQueue(&scene->scene_tag); - u32* append = (u32*)fpcM_GetAppend(i_this); + u32* append = (u32*)fopScnM_GetAppend(i_this); if (append != NULL) { - scene->base.base.parameters = *append; + fopScnM_SetParam(i_this, *append); } } - return fpcMtd_Create((process_method_class*)scene->submethod, i_this); + + ret = fpcMtd_Create((process_method_class*)scene->submethod, i_this); + return ret; } leafdraw_method_class g_fopScn_Method = { diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index b547549200..ba1f322139 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -4,6 +4,7 @@ */ #include "f_op/f_op_scene_mng.h" +#include "JSystem/JUtility/JUTAssert.h" #include "f_op/f_op_scene_iter.h" #include "f_op/f_op_scene_req.h" @@ -24,13 +25,11 @@ int fopScnM_ChangeReq(scene_class* i_scene, s16 i_procName, s16 param_3, u16 par } fpc_ProcID fopScnM_DeleteReq(scene_class* i_scene) { - fpc_ProcID request_id = fopScnRq_Request(1, i_scene, 0x7FFF, NULL, 0x7FFF, 0); - return request_id != fpcM_ERROR_PROCESS_ID_e; + return fopScnRq_Request(1, i_scene, 0x7FFF, NULL, 0x7FFF, 0) != fpcM_ERROR_PROCESS_ID_e; } int fopScnM_CreateReq(s16 i_procName, s16 param_2, u16 param_3, u32 i_data) { - fpc_ProcID request_id = fopScnRq_Request(0, 0, i_procName, (void*)i_data, param_2, param_3); - return request_id != fpcM_ERROR_PROCESS_ID_e; + return fopScnRq_Request(0, 0, i_procName, (void*)i_data, param_2, param_3) != fpcM_ERROR_PROCESS_ID_e; } u32 fopScnM_ReRequest(s16 i_procName, u32 i_data) { @@ -42,7 +41,14 @@ u32 fopScnM_ReRequest(s16 i_procName, u32 i_data) { } void fopScnM_Management() { +#if DEBUG + if (fopScnRq_Handler()) { + return; + }; + JUT_ASSERT(326, 0); +#else fopScnRq_Handler(); +#endif } void fopScnM_Init() {} diff --git a/src/f_op/f_op_scene_pause.cpp b/src/f_op/f_op_scene_pause.cpp index 3628f188e8..db98067143 100644 --- a/src/f_op/f_op_scene_pause.cpp +++ b/src/f_op/f_op_scene_pause.cpp @@ -19,7 +19,7 @@ int fopScnPause_Enable(scene_class* i_scene) { int fopScnPause_Disable(scene_class* i_scene) { if (i_scene != NULL) { - process_node_class* process_node = i_scene->base.base.layer_tag.layer->process_node; + process_node_class* process_node = fpcM_Layer(i_scene); if (process_node == NULL) { fpcM_PauseDisable(i_scene, 1); diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp index 8bf1afd91f..d3136962ae 100644 --- a/src/f_op/f_op_scene_req.cpp +++ b/src/f_op/f_op_scene_req.cpp @@ -11,11 +11,13 @@ #include "f_pc/f_pc_manager.h" static cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* i_sceneReq) { + cPhs__Step rv; if (fopOvlpM_ClearOfReq() == 1) { - return cPhs_NEXT_e; + rv = cPhs_NEXT_e; } else { - return cPhs_INIT_e; + rv = cPhs_INIT_e; } + return rv; } static cPhs__Step fopScnRq_phase_Execute(scene_request_class* i_sceneReq) { @@ -23,26 +25,31 @@ static cPhs__Step fopScnRq_phase_Execute(scene_request_class* i_sceneReq) { } static cPhs__Step fopScnRq_phase_IsDoingOverlap(scene_request_class* i_sceneReq) { + cPhs__Step rv; if (fopOvlpM_IsDoingReq() == 1) { - return cPhs_NEXT_e; + rv = cPhs_NEXT_e; } else { - return cPhs_INIT_e; + rv = cPhs_INIT_e; } + return rv; } static cPhs__Step fopScnRq_phase_IsDoneOverlap(scene_request_class* i_sceneReq) { + cPhs__Step rv; if (fopOvlpM_IsDone() == 1) { - return cPhs_NEXT_e; + rv = cPhs_NEXT_e; } else { - return cPhs_INIT_e; + rv = cPhs_INIT_e; } + return rv; } static BOOL l_fopScnRq_IsUsingOfOverlap; static cPhs__Step fopScnRq_phase_Done(scene_request_class* i_sceneReq) { if (i_sceneReq->create_request.parameters != 1) { - fopScnPause_Disable((scene_class*)fpcEx_SearchByID(i_sceneReq->create_request.creating_id)); + scene_class* scene = (scene_class*)fpcM_SearchByID(i_sceneReq->create_request.creating_id); + fopScnPause_Disable(scene); } l_fopScnRq_IsUsingOfOverlap = FALSE; @@ -55,6 +62,9 @@ static void fopScnRq_Execute(scene_request_class* i_sceneReq) { switch (phase_state) { case cPhs_NEXT_e: fopScnRq_Execute(i_sceneReq); + break; + default: + break; } } @@ -77,9 +87,11 @@ static int fopScnRq_Cancel(scene_request_class* i_sceneReq) { static scene_request_class* fopScnRq_FadeRequest(s16 i_procname, u16 i_peektime) { overlap_request_class* req = NULL; - if (!l_fopScnRq_IsUsingOfOverlap && (req = fopOvlpM_Request(i_procname, i_peektime), req != NULL)) - { - l_fopScnRq_IsUsingOfOverlap = TRUE; + if (!l_fopScnRq_IsUsingOfOverlap) { + req = fopOvlpM_Request(i_procname, i_peektime); + if (req != NULL) { + l_fopScnRq_IsUsingOfOverlap = TRUE; + } } return (scene_request_class*)req; @@ -145,6 +157,6 @@ s32 fopScnRq_ReRequest(fpc_ProcID i_requestId, s16 i_procName, void* i_data) { return fpcNdRq_ReRequest(i_requestId, i_procName, i_data); } -void fopScnRq_Handler() { +int fopScnRq_Handler() { fpcNdRq_Handler(); } diff --git a/src/f_op/f_op_view.cpp b/src/f_op/f_op_view.cpp index 0265048740..c48f7eb0f7 100644 --- a/src/f_op/f_op_view.cpp +++ b/src/f_op/f_op_view.cpp @@ -6,31 +6,36 @@ #include "f_op/f_op_view.h" #include "f_pc/f_pc_manager.h" -void fopVw_Draw(view_class* i_this) { - fpcLf_DrawMethod(i_this->sub_method, i_this); +s32 fopVw_Draw(view_class* i_this) { + int ret = fpcLf_DrawMethod(i_this->sub_method, i_this); + return ret; } -void fopVw_Execute(view_class* i_this) { - fpcMtd_Execute(&i_this->sub_method->base, i_this); +s32 fopVw_Execute(view_class* i_this) { + int ret = fpcMtd_Execute(&i_this->sub_method->base, i_this); + return ret; } s32 fopVw_IsDelete(void* i_this) { - view_class* a_this = (view_class*)i_this; - return fpcMtd_IsDelete(&a_this->sub_method->base, a_this); + int ret = fpcMtd_IsDelete(&((view_class*)i_this)->sub_method->base, i_this); + return ret; } s32 fopVw_Delete(view_class* i_this) { - return fpcMtd_Delete(&i_this->sub_method->base, i_this); + int ret = fpcMtd_Delete(&i_this->sub_method->base, i_this); + return ret; } s32 fopVw_Create(void* i_this) { view_class* a_this = (view_class*)i_this; + int ret; - view_process_profile_definition* profile = (view_process_profile_definition*)fpcM_GetProfile(a_this); + view_process_profile_definition* profile = (view_process_profile_definition*)fpcM_GetProfile(i_this); a_this->sub_method = profile->sub_method; a_this->field_0xc4 = profile->unk_0x28; - return fpcMtd_Create(&a_this->sub_method->base, a_this); + ret = fpcMtd_Create(&a_this->sub_method->base, a_this); + return ret; } leafdraw_method_class g_fopVw_Method = { diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index 4e49170d59..a6acd65848 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -7,6 +7,7 @@ #include "SSystem/SComponent/c_API_graphic.h" #include "d/d_error_msg.h" #include "d/d_lib.h" +#include "f_op/f_op_scene.h" #include "f_pc/f_pc_creator.h" #include "f_pc/f_pc_deletor.h" #include "f_pc/f_pc_draw.h" diff --git a/src/m_Do/m_Do_hostIO.cpp b/src/m_Do/m_Do_hostIO.cpp index 286a942110..7ee6a3653b 100644 --- a/src/m_Do/m_Do_hostIO.cpp +++ b/src/m_Do/m_Do_hostIO.cpp @@ -128,6 +128,10 @@ void mDoHIO_updateChild(s8 i_no) { mDoHIO_root.updateChild(i_no); } +void mDoHIO_update() { + mDoHIO_root.update(); +} + void mDoHIO_root_c::updateChild(s8 i_no) { mSub.updateChild(i_no); } From a325d40e35dae01e076069d2ff09e5d9eeaba223 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Fri, 26 Dec 2025 13:20:53 -0800 Subject: [PATCH 15/35] JAudio2 debug (#2996) --- include/JSystem/JAudio2/JAISe.h | 2 +- include/JSystem/JAudio2/JAISeMgr.h | 7 +- include/JSystem/JAudio2/JAISeq.h | 2 +- include/JSystem/JAudio2/JAISeqMgr.h | 3 +- include/JSystem/JAudio2/JASBNKParser.h | 4 +- include/JSystem/JAudio2/JASBank.h | 2 + include/JSystem/JAudio2/JASChannel.h | 7 +- include/JSystem/JAudio2/JASHeapCtrl.h | 35 ++++++++- include/JSystem/JAudio2/JASOscillator.h | 8 +- include/JSystem/JAudio2/JASSeqReader.h | 3 +- include/JSystem/JAudio2/JASTrackPort.h | 4 +- include/JSystem/JAudio2/JASWSParser.h | 2 +- include/JSystem/JSupport/JSUList.h | 4 +- include/JSystem/JSupport/JSupport.h | 6 +- src/JSystem/JAudio2/JAISeMgr.cpp | 30 +++++--- src/JSystem/JAudio2/JAISeqMgr.cpp | 14 ++-- src/JSystem/JAudio2/JASAramStream.cpp | 5 +- src/JSystem/JAudio2/JASBNKParser.cpp | 90 ++++++++++++++--------- src/JSystem/JAudio2/JASBasicBank.cpp | 4 + src/JSystem/JAudio2/JASBasicInst.cpp | 3 +- src/JSystem/JAudio2/JASCallback.cpp | 9 ++- src/JSystem/JAudio2/JASChannel.cpp | 51 +++++++++---- src/JSystem/JAudio2/JASDrumSet.cpp | 1 + src/JSystem/JAudio2/JASHeapCtrl.cpp | 37 +++++++--- src/JSystem/JAudio2/JASProbe.cpp | 27 ++++--- src/JSystem/JAudio2/JASRegisterParam.cpp | 56 +++++++------- src/JSystem/JAudio2/JASSeqCtrl.cpp | 25 ++++--- src/JSystem/JAudio2/JASSeqParser.cpp | 3 +- src/JSystem/JAudio2/JASSeqReader.cpp | 4 + src/JSystem/JAudio2/JASSimpleWaveBank.cpp | 1 + src/JSystem/JAudio2/JASTrack.cpp | 19 +++-- src/JSystem/JAudio2/JASTrackPort.cpp | 4 + src/JSystem/JAudio2/JASWSParser.cpp | 24 ++++-- src/JSystem/JAudio2/JASWaveArcLoader.cpp | 42 +++++------ 34 files changed, 337 insertions(+), 201 deletions(-) diff --git a/include/JSystem/JAudio2/JAISe.h b/include/JSystem/JAudio2/JAISe.h index e23372410d..408a84703a 100644 --- a/include/JSystem/JAudio2/JAISe.h +++ b/include/JSystem/JAudio2/JAISe.h @@ -10,7 +10,7 @@ class JAISeMgr; * @ingroup jsystem-jaudio * */ -class JAISe : public JSULink, public JASPoolAllocObject, public JAISound { +class JAISe : public JSULink, public JAISound, public JASPoolAllocObject { public: class TInner { public: diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr.h index 0ec8a510a8..10f559595c 100644 --- a/include/JSystem/JAudio2/JAISeMgr.h +++ b/include/JSystem/JAudio2/JAISeMgr.h @@ -69,6 +69,7 @@ public: return mMaxActiveSe + mMaxInactiveSe; } + int getMaxInactiveSe() const { return mMaxInactiveSe; } int getMaxActiveSe() const { return mMaxActiveSe; } void setMaxActiveSe(int num) { mMaxActiveSe = num; } void setMaxInactiveSe(int num) { mMaxInactiveSe = num; } @@ -88,11 +89,11 @@ public: * */ class JAISeMgr : public JASGlobalInstance, - public JAISeqDataUser, - public JAISoundActivity { + public JAISeqDataUser { public: JAISeMgr(bool setInstance); void setCategoryArrangement(const JAISeCategoryArrangement& arrangement); + void getCategoryArrangement(JAISeCategoryArrangement*); void stop(); void stopSoundID(JAISoundID id); void initParams(); @@ -105,6 +106,8 @@ public: bool startSound(JAISoundID id, JAISoundHandle* handle, const JGeometry::TVec3* posPtr); int getNumActiveSe() const; + /* 0x004 */ JAISoundActivity mSoundActivity; + virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion); virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion); diff --git a/include/JSystem/JAudio2/JAISeq.h b/include/JSystem/JAudio2/JAISeq.h index b6cb55b5dc..b619ea4396 100644 --- a/include/JSystem/JAudio2/JAISeq.h +++ b/include/JSystem/JAudio2/JAISeq.h @@ -52,7 +52,7 @@ public: void mixOut_(const JASSoundParams& params, JAISoundActivity activity); void JAISeqMgr_mixOut_(const JASSoundParams& params, JAISoundActivity activity); - JAISeqData& getSeqData() { return inner_.mSeqData; } + const JAISeqData& getSeqData() const { return inner_.mSeqData; } /* 0x0A8 */ TInner inner_; /* 0x3A8 */ JAISoundStrategyMgr__unknown* field_0x3a8; diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/include/JSystem/JAudio2/JAISeqMgr.h index cdbf853a62..87c85f316f 100644 --- a/include/JSystem/JAudio2/JAISeqMgr.h +++ b/include/JSystem/JAudio2/JAISeqMgr.h @@ -29,6 +29,8 @@ public: JAISeq* beginStartSeq_(); bool endStartSeq_(JAISeq* seq, JAISoundHandle* handle); + /* 0x04 */ JAISoundActivity mActivity; + virtual ~JAISeqMgr() {} virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion); virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion); @@ -59,7 +61,6 @@ public: void pause(bool paused) { mActivity.field_0x0.flags.flag2 = paused; } private: - /* 0x04 */ JAISoundActivity mActivity; /* 0x08 */ JAIAudience* mAudience; /* 0x0C */ JAISeqDataMgr* seqDataMgr_; /* 0x10 */ JAISoundStrategyMgr* field_0x10; diff --git a/include/JSystem/JAudio2/JASBNKParser.h b/include/JSystem/JAudio2/JASBNKParser.h index bfbad8376c..bebe1a1f05 100644 --- a/include/JSystem/JAudio2/JASBNKParser.h +++ b/include/JSystem/JAudio2/JASBNKParser.h @@ -18,7 +18,7 @@ namespace JASBNKParser { namespace Ver1 { struct TOsc { - /* 0x00 */ u8 _00[4]; + /* 0x00 */ u32 id; /* 0x04 */ u8 mTarget; /* 0x08 */ f32 _08; /* 0x0C */ u32 mTableOffset; @@ -50,7 +50,7 @@ namespace JASBNKParser { }; struct TListChunk : TChunk { - /* 0x8 */ u32 mCount; + /* 0x8 */ u32 count; /* 0xC */ u32 mOffsets[0]; }; diff --git a/include/JSystem/JAudio2/JASBank.h b/include/JSystem/JAudio2/JASBank.h index 8daa926938..67136da0ee 100644 --- a/include/JSystem/JAudio2/JASBank.h +++ b/include/JSystem/JAudio2/JASBank.h @@ -17,6 +17,8 @@ namespace JASDsp { */ class JASBank { public: + static const int PRG_OSC = 240; + JASBank() { mWaveBank = NULL; } virtual ~JASBank() {}; virtual bool getInstParam(int, int, int, JASInstParam*) const = 0; diff --git a/include/JSystem/JAudio2/JASChannel.h b/include/JSystem/JAudio2/JASChannel.h index 6cd2d4c0de..5b4a959372 100644 --- a/include/JSystem/JAudio2/JASChannel.h +++ b/include/JSystem/JAudio2/JASChannel.h @@ -53,6 +53,7 @@ class JASChannel : public JASPoolAllocObject_MultiThreaded { public: typedef void (*Callback)(u32, JASChannel*, JASDsp::TChannel*, void*); static const int BUSOUT_CPUCH = 6; + static const int OSC_NUM = 2; enum CallbackType { /* 0 */ CB_PLAY, @@ -62,8 +63,8 @@ public: }; enum Status { - /* 0 */ STATUS_INACTIVE, - /* 1 */ STATUS_ACTIVE, + /* 0 */ STATUS_STOP, + /* 1 */ STATUS_PLAY, /* 2 */ STATUS_RELEASE, }; @@ -129,7 +130,7 @@ public: void setKey(s32 param_0) { mKey = param_0; } void setVelocity(u32 param_0) { mVelocity = param_0; } void setSkipSamples(u32 param_0) { mSkipSamples = param_0; } - bool isDolbyMode() { return mMixConfig[0].whole == 0xffff; } + bool isDolbyMode() const { return mMixConfig[0].whole == 0xffff; } /* 0x00 */ int mStatus; /* 0x04 */ bool mPauseFlag; diff --git a/include/JSystem/JAudio2/JASHeapCtrl.h b/include/JSystem/JAudio2/JASHeapCtrl.h index af04892178..759ac8fda6 100644 --- a/include/JSystem/JAudio2/JASHeapCtrl.h +++ b/include/JSystem/JAudio2/JASHeapCtrl.h @@ -22,8 +22,8 @@ public: bool alloc(JASHeap*, u32); bool allocTail(JASHeap*, u32); bool free(); - u32 getTotalFreeSize(); - u32 getFreeSize(); + u32 getTotalFreeSize() const; + u32 getFreeSize() const; void insertChild(JASHeap*, JASHeap*, void*, u32, bool); JASHeap* getTailHeap(); u32 getTailOffset(); @@ -203,6 +203,7 @@ public: } bool createNewChunk() { + bool r27 = 0; if (field_0x18 != NULL && field_0x18->isEmpty()) { field_0x18->revive(); return true; @@ -242,7 +243,7 @@ public: while (chunk != NULL) { if (chunk->checkArea(ptr)) { chunk->free(ptr); - + bool r26 = false; if (chunk != field_0x18 && chunk->isEmpty()) { MemoryChunk* nextChunk = chunk->getNextChunk(); delete chunk; @@ -283,38 +284,54 @@ template class JASPoolAllocObject { public: static void* operator new(size_t n) { +#if PLATFORM_GCN JASMemPool& memPool_ = getMemPool_(); +#endif return memPool_.alloc(n); } static void* operator new(size_t n, void* ptr) { return ptr; } static void operator delete(void* ptr, size_t n) { +#if PLATFORM_GCN JASMemPool& memPool_ = getMemPool_(); +#endif memPool_.free(ptr, n); } static void newMemPool(int param_0) { +#if PLATFORM_GCN JASMemPool& memPool_ = getMemPool_(); +#endif memPool_.newMemPool(param_0); } static u32 getFreeMemCount() { +#if PLATFORM_GCN JASMemPool& memPool_ = getMemPool_(); +#endif return memPool_.getFreeMemCount(); } static u32 getTotalMemCount() { +#if PLATFORM_GCN JASMemPool& memPool_ = getMemPool_(); +#endif return memPool_.getTotalMemCount(); } private: // Fakematch? Is memPool_ both an in-function static and an out-of-function static? static JASMemPool memPool_; +#if PLATFORM_GCN static JASMemPool& getMemPool_() { static JASMemPool memPool_; return memPool_; } +#endif }; +#if !PLATFORM_GCN +template JASMemPool JASPoolAllocObject::memPool_; +#endif + /** * @ingroup jsystem-jaudio * @@ -346,31 +363,43 @@ template class JASPoolAllocObject_MultiThreaded { public: static void* operator new(size_t n) { +#if PLATFORM_GCN JASMemPool_MultiThreaded& memPool_ = getMemPool(); +#endif return memPool_.alloc(n); } static void* operator new(size_t n, void* ptr) { return ptr; } static void operator delete(void* ptr, size_t n) { +#if PLATFORM_GCN JASMemPool_MultiThreaded& memPool_ = getMemPool(); +#endif memPool_.free(ptr, n); } static void newMemPool(int n) { +#if PLATFORM_GCN JASMemPool_MultiThreaded& memPool_ = getMemPool(); +#endif memPool_.newMemPool(n); } private: // Fakematch? Is memPool_ both an in-function static and an out-of-function static? static JASMemPool_MultiThreaded memPool_; +#if PLATFORM_GCN static JASMemPool_MultiThreaded& getMemPool() { static JASMemPool_MultiThreaded memPool_; return memPool_; } +#endif }; +#if !PLATFORM_GCN +template JASMemPool_MultiThreaded JASPoolAllocObject_MultiThreaded::memPool_; +#endif + extern JKRSolidHeap* JASDram; #endif /* JASHEAPCTRL_H */ diff --git a/include/JSystem/JAudio2/JASOscillator.h b/include/JSystem/JAudio2/JASOscillator.h index bfff094f5c..56e7dbf966 100644 --- a/include/JSystem/JAudio2/JASOscillator.h +++ b/include/JSystem/JAudio2/JASOscillator.h @@ -64,10 +64,10 @@ struct JASOscillator { void setDirectRelease(u16 param_0) { mDirectRelease = param_0; } void stop() { _1C = 0; } - bool isValid() { return mData != NULL; } - bool isStop() { return _1C == 0; } - bool isRelease() { return _1C == 3 || _1C == 4; } - u32 getTarget() { return mData->mTarget; } + bool isValid() const { return mData != NULL; } + bool isStop() const { return _1C == 0; } + bool isRelease() const { return _1C == 3 || _1C == 4; } + u32 getTarget() const { return mData->mTarget; } /* 0x00 */ const Data* mData; /* 0x04 */ f32 _04; diff --git a/include/JSystem/JAudio2/JASSeqReader.h b/include/JSystem/JAudio2/JASSeqReader.h index 24cc48a1d7..b600d49504 100644 --- a/include/JSystem/JAudio2/JASSeqReader.h +++ b/include/JSystem/JAudio2/JASSeqReader.h @@ -9,6 +9,7 @@ */ class JASSeqReader { public: + JASSeqReader() { init(); } void init(); void init(void*); bool call(u32); @@ -25,7 +26,7 @@ public: field_0x04 = (u8*)param_1; } - u32 get24(int param_0) const { + u32 get24(u32 param_0) const { return (*(u32*)(field_0x00 + param_0 - 1)) & 0xffffff; } diff --git a/include/JSystem/JAudio2/JASTrackPort.h b/include/JSystem/JAudio2/JASTrackPort.h index 08ebd4360a..f020ae3bd1 100644 --- a/include/JSystem/JAudio2/JASTrackPort.h +++ b/include/JSystem/JAudio2/JASTrackPort.h @@ -9,6 +9,8 @@ */ class JASTrackPort { public: + static const int MAX_PORTS = 16; + void init(); u16 readImport(u32); u16 readExport(u32); @@ -22,7 +24,7 @@ public: u16 field_0x0; u16 field_0x2; - u16 field_0x4[16]; + u16 field_0x4[MAX_PORTS]; }; #endif /* JASTRACKPORT_H */ diff --git a/include/JSystem/JAudio2/JASWSParser.h b/include/JSystem/JAudio2/JASWSParser.h index 0191ffa625..000aee0069 100644 --- a/include/JSystem/JAudio2/JASWSParser.h +++ b/include/JSystem/JAudio2/JASWSParser.h @@ -17,7 +17,7 @@ public: template class TOffset { public: - T* ptr(void const* param_0) { + T* ptr(void const* param_0) const { return JSUConvertOffsetToPtr(param_0, mOffset); } diff --git a/include/JSystem/JSupport/JSUList.h b/include/JSystem/JSupport/JSUList.h index 7b31430276..8d42762d2c 100644 --- a/include/JSystem/JSupport/JSUList.h +++ b/include/JSystem/JSupport/JSUList.h @@ -245,9 +245,9 @@ public: return *this; } - T* operator*() const { return this->getObject(); } + T* operator*() const { return mTree->getObject(); } - T* operator->() const { return this->getObject(); } + T* operator->() const { return mTree->getObject(); } private: JSUTree* mTree; diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h index 4f103bdf1a..717fd9b7b0 100644 --- a/include/JSystem/JSupport/JSupport.h +++ b/include/JSystem/JSupport/JSupport.h @@ -10,11 +10,7 @@ */ template T* JSUConvertOffsetToPtr(const void* ptr, uintptr_t offset) { - if (offset == 0) { - return NULL; - } else { - return (T*)((intptr_t)ptr + (intptr_t)offset); - } + return offset == 0 ? NULL : (T*)((intptr_t)ptr + (intptr_t)offset); } /** diff --git a/src/JSystem/JAudio2/JAISeMgr.cpp b/src/JSystem/JAudio2/JAISeMgr.cpp index e2ea99c86b..82885d1db4 100644 --- a/src/JSystem/JAudio2/JAISeMgr.cpp +++ b/src/JSystem/JAudio2/JAISeMgr.cpp @@ -6,15 +6,16 @@ #include "JSystem/JAudio2/JASReport.h" bool JAISeCategoryMgr::isUsingSeqData(const JAISeqDataRegion& seqDataRegion) { - JSULink* i = mSeList.getFirst(); - while (i != NULL) { - JAISe* obj = i->getObject(); - if (seqDataRegion.intersects(*obj->getSeqData())) { - return true; + { + JSULink* i = mSeList.getFirst(); + while (i != NULL) { + if (seqDataRegion.intersects(*i->getObject()->getSeqData())) { + return true; + } + i = i->getNext(); } - i = i->getNext(); } - + return false; } @@ -162,7 +163,7 @@ JAISeMgr::JAISeMgr(bool setInstance) : JASGlobalInstance(setInstance) mSeqDataMgr = NULL; mStrategyMgr = NULL; mParams.init(); - JAISoundActivity::init(); + mSoundActivity.init(); } bool JAISeMgr::isUsingSeqData(const JAISeqDataRegion& seqDataRegion) { @@ -196,6 +197,17 @@ void JAISeMgr::setCategoryArrangement(const JAISeCategoryArrangement& arrangemen } } +void JAISeMgr::getCategoryArrangement(JAISeCategoryArrangement* arrangement) { + for (int i = 0; i < 16; i++) { + int active = mCategoryMgrs[i].getMaxActiveSe(); + JUT_ASSERT(299, active <= 255); + arrangement->mItems[i].mMaxActiveSe = active; + int inactive = mCategoryMgrs[i].getMaxInactiveSe(); + JUT_ASSERT(302, inactive <= 255); + arrangement->mItems[i].mMaxInactiveSe = inactive; + } +} + void JAISeMgr::stop() { for (int i = 0; i < 16; i++) { mCategoryMgrs[i].stop(); @@ -268,7 +280,7 @@ void JAISeMgr::calc() { void JAISeMgr::mixOut() { for (int i = 0; i < 16; i++) { - mCategoryMgrs[i].JAISeMgr_mixOut_(mParams, *this); + mCategoryMgrs[i].JAISeMgr_mixOut_(mParams, mSoundActivity); } } diff --git a/src/JSystem/JAudio2/JAISeqMgr.cpp b/src/JSystem/JAudio2/JAISeqMgr.cpp index 3c2c1600a3..a077de9434 100644 --- a/src/JSystem/JAudio2/JAISeqMgr.cpp +++ b/src/JSystem/JAudio2/JAISeqMgr.cpp @@ -6,8 +6,9 @@ #include "JSystem/JAudio2/JAISoundInfo.h" bool JAISeqMgr::isUsingSeqData(const JAISeqDataRegion& seqDataRegion) { - for (JSULink* i = mSeqList.getFirst(); i != NULL; i = i->getNext()) { - if (seqDataRegion.intersects(i->getObject()->getSeqData())) { + JSULink* link; + for (link = mSeqList.getFirst(); link != NULL; link = link->getNext()) { + if (seqDataRegion.intersects(link->getObject()->getSeqData())) { return true; } } @@ -16,9 +17,10 @@ bool JAISeqMgr::isUsingSeqData(const JAISeqDataRegion& seqDataRegion) { int JAISeqMgr::releaseSeqData(const JAISeqDataRegion& seqDataRegion) { bool bVar1 = false; - for (JSULink* i = mSeqList.getFirst(); i != NULL; i = i->getNext()) { - if (seqDataRegion.intersects(i->getObject()->getSeqData())) { - i->getObject()->stop(); + JSULink* link; + for (link = mSeqList.getFirst(); link != NULL; link = link->getNext()) { + if (seqDataRegion.intersects(link->getObject()->getSeqData())) { + link->getObject()->stop(); bVar1 = true; } } @@ -120,7 +122,7 @@ void JAISeqMgr::mixOut() { JAISeq* JAISeqMgr::beginStartSeq_() { JAISeq* seq = new JAISeq(this, field_0x10); if (seq == NULL) { - JUT_WARN(273, "JASPoolAllocObject::::operator new failed .\n"); + JUT_WARN(273, "%s", "JASPoolAllocObject::::operator new failed .\n"); } return seq; } diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp index 616c8f3671..a78c66d3ec 100644 --- a/src/JSystem/JAudio2/JASAramStream.cpp +++ b/src/JSystem/JAudio2/JASAramStream.cpp @@ -689,8 +689,9 @@ void JASAramStream::channelStart() { void JASAramStream::channelStop(u16 i_directRelease) { for (int i = 0; i < mChannelNum; i++) { - if (mChannels[i] != NULL) { - mChannels[i]->release(i_directRelease); + JASChannel* channel = mChannels[i]; + if (channel != NULL) { + channel->release(i_directRelease); } } } diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp index ec57df253a..66b9746715 100644 --- a/src/JSystem/JAudio2/JASBNKParser.cpp +++ b/src/JSystem/JAudio2/JASBNKParser.cpp @@ -62,8 +62,11 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h } TEnvtChunk* envt_chunk = (TEnvtChunk*)findChunk(stream, 'ENVT'); + JUT_ASSERT(139, envt_chunk); TOscChunk* osc_chunk = (TOscChunk*)findChunk(stream, 'OSCT'); + JUT_ASSERT(142, osc_chunk); TListChunk* list_chunk = (TListChunk*)findChunk(stream, 'LIST'); + JUT_ASSERT(145, list_chunk); u8* envt = new (heap, 2) u8[envt_chunk->mSize]; JASCalc::bcopy(envt_chunk->mData, envt, envt_chunk->mSize); @@ -72,36 +75,40 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h u32 count = *ptr++; JASOscillator::Data* osc_data = new (heap, 0) JASOscillator::Data[count]; for (int i = 0; i < count; i++, ptr += sizeof(TOsc) >> 2) { - TOsc* osc = (TOsc*)ptr; + TOsc* op = (TOsc*)ptr; + JUT_ASSERT(155, op->id == 'Osci'); JASOscillator::Data* data = &osc_data[i]; - data->mTarget = osc->mTarget; - data->_04 = osc->_08; - data->mScale = osc->mScale; - data->_14 = osc->_18; - data->mTable = (JASOscillator::Point*)(envt + osc->mTableOffset); - data->rel_table = (JASOscillator::Point*)(envt + osc->_10); + data->mTarget = op->mTarget; + data->_04 = op->_08; + data->mScale = op->mScale; + data->_14 = op->_18; + data->mTable = (JASOscillator::Point*)(envt + op->mTableOffset); + data->rel_table = (JASOscillator::Point*)(envt + op->_10); } + TListChunk* list = list_chunk; + JUT_ASSERT(172, list->count <= JASBank::PRG_OSC); - bank->newInstTable(list_chunk->mCount, heap); - for (int i = 0; i < list_chunk->mCount; i++) { + bank->newInstTable(list_chunk->count, heap); + for (int i = 0; i < list_chunk->count; i++) { if (list_chunk->mOffsets[i] != 0) { u32* data = (u32*)((intptr_t)stream + list_chunk->mOffsets[i]); switch (*data++) { case 'Inst': { - JASBasicInst* inst = new (heap, 0) JASBasicInst(); + JASBasicInst* instp = new (heap, 0) JASBasicInst(); + JUT_ASSERT(187, instp != 0); u32 count = *data++; for (int j = 0; j < count; j++) { u32 index = *data++; - inst->setOsc(j, &osc_data[index]); + instp->setOsc(j, &osc_data[index]); } count = *data++; for (int j = 0; j < count; j++) { data++; } count = *data++; - inst->setKeyRegionCount(count, heap); + instp->setKeyRegionCount(count, heap); for (int j = 0; j < count; j++) { - JASBasicInst::TKeymap* keymap = inst->getKeyRegion(j); + JASBasicInst::TKeymap* keymap = instp->getKeyRegion(j); keymap->setHighKey(*data >> 0x18); u32 fVar4 = data[1]; keymap->field_0x4 = JSULoHalf(data[3]); @@ -112,42 +119,51 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h data += 4; } } - inst->setVolume(*(f32*)&data[0]); - inst->setPitch(*(f32*)&data[1]); - bank->setInst(i, inst); + instp->setVolume(*(f32*)&data[0]); + instp->setPitch(*(f32*)&data[1]); + bank->setInst(i, instp); break; } case 'Perc': { - JASDrumSet* drum = new (heap, 0) JASDrumSet(); + JASDrumSet* drump = new (heap, 0) JASDrumSet(); + JUT_ASSERT(264, drump != 0); + u32 pmap_count = data[1]; + JUT_ASSERT(268, pmap_count <= 128); u32 count = *data++; - drum->newPercArray(count, heap); + drump->newPercArray(count, heap); for (int j = 0; j < count; j++) { u32 offset = *data++; if (offset != 0) { - JASDrumSet::TPerc* perc = new (heap, 0) JASDrumSet::TPerc(); + JASDrumSet::TPerc* percp = new (heap, 0) JASDrumSet::TPerc(); + JUT_ASSERT(277, percp); + u32 type = data[0]; + JUT_ASSERT(282, type == 'Pmap'); u32* ptr = (u32*)((intptr_t)stream + offset); TPercData* perc_data = (TPercData*)(ptr + 1); - perc->setVolume(perc_data->mVolume); - perc->setPitch(perc_data->mPitch); - perc->setPan((f32)perc_data->mPan / 127.0f); - perc->setRelease(perc_data->mRelease); + percp->setVolume(perc_data->mVolume); + percp->setPitch(perc_data->mPitch); + percp->setPan((f32)perc_data->mPan / 127.0f); + percp->setRelease(perc_data->mRelease); ptr = (u32*)&perc_data->field_0xc; u32 count2 = *ptr++; for (int k = 0; k < count2; k++) { ptr++; } u32 pVar6 = ptr[0]; - perc->field_0xe = JSULoHalf(ptr[2]); - perc->field_0x10 = *(f32*)&ptr[3]; - perc->field_0x14 = *(f32*)&ptr[4]; + percp->field_0xe = JSULoHalf(ptr[2]); + percp->field_0x10 = *(f32*)&ptr[3]; + percp->field_0x14 = *(f32*)&ptr[4]; for (int k = 0; k < pVar6; k++) {} - drum->setPerc(j, perc); + drump->setPerc(j, percp); } } - bank->setInst(i, drum); + bank->setInst(i, drump); break; } + default: + JUT_PANIC(338, "Unexpected Inst Type"); + break; } } } @@ -277,8 +293,7 @@ JASOscillator::Data* JASBNKParser::Ver0::findOscPtr(JASBasicBank* bank, THeader TInst* tinst = data->mInstOffset[i].ptr(header); if (tinst != NULL) { for (int j = 0; j < 2; j++) { - TOsc* tosc = tinst->mOscOffset[j].ptr(header); - if (tosc == osc) { + if (tinst->mOscOffset[j].ptr(header) == osc) { JASInst* inst = bank->getInst(i); if (inst != NULL) { JASInstParam param; @@ -295,12 +310,15 @@ JASOscillator::Data* JASBNKParser::Ver0::findOscPtr(JASBasicBank* bank, THeader } JASOscillator::Point const* JASBNKParser::Ver0::getOscTableEndPtr(JASOscillator::Point const* points) { - s16 tmp; - do { - tmp = points->_0; - points++; - } while (tmp <= 10); - return points; + const JASOscillator::Point* ptr = points; + while(true) { + s16 tmp = ptr->_0; + ptr++; + if (tmp > 10) { + break; + } + } + return ptr; } // Fakematch? Why is this here? diff --git a/src/JSystem/JAudio2/JASBasicBank.cpp b/src/JSystem/JAudio2/JASBasicBank.cpp index e9d77adb09..510d7a718d 100644 --- a/src/JSystem/JAudio2/JASBasicBank.cpp +++ b/src/JSystem/JAudio2/JASBasicBank.cpp @@ -10,6 +10,7 @@ JASBasicBank::JASBasicBank() { void JASBasicBank::newInstTable(u8 num, JKRHeap* heap) { if (num != 0) { + JUT_ASSERT(31, num <= JASBank::PRG_OSC); mInstNumMax = num; mInstTable = new (heap, 0) JASInst*[mInstNumMax]; JASCalc::bzero(mInstTable, mInstNumMax * 4); @@ -27,6 +28,9 @@ bool JASBasicBank::getInstParam(int prg_no, int param_1, int param_2, void JASBasicBank::setInst(int prg_no, JASInst* inst) { if (mInstTable != NULL) { + JUT_ASSERT(50, prg_no < mInstNumMax); + JUT_ASSERT(54, prg_no >= 0); + JUT_ASSERT(56, mInstTable[prg_no] == 0); mInstTable[prg_no] = inst; } } diff --git a/src/JSystem/JAudio2/JASBasicInst.cpp b/src/JSystem/JAudio2/JASBasicInst.cpp index 716e6b1963..051136bc46 100644 --- a/src/JSystem/JAudio2/JASBasicInst.cpp +++ b/src/JSystem/JAudio2/JASBasicInst.cpp @@ -21,6 +21,7 @@ JASBasicInst::~JASBasicInst() { } bool JASBasicInst::getParam(int param_0, int param_1, JASInstParam* param_2) const { + UNUSED(param_1); param_2->field_0x1c = 0; param_2->field_0x1e = 0; param_2->field_0x14 = (JASOscillator::Data**)&field_0xc; @@ -42,7 +43,7 @@ bool JASBasicInst::getParam(int param_0, int param_1, JASInstParam* param_2) con param_2->mVolume *= keyMap->field_0x8; param_2->mPitch *= keyMap->field_0xc; - param_2->field_0x1a = keyMap->field_0x4; + param_2->field_0x1a = u16(keyMap->field_0x4); return true; } diff --git a/src/JSystem/JAudio2/JASCallback.cpp b/src/JSystem/JAudio2/JASCallback.cpp index 0a01a453a9..02fb1469df 100644 --- a/src/JSystem/JAudio2/JASCallback.cpp +++ b/src/JSystem/JAudio2/JASCallback.cpp @@ -31,9 +31,12 @@ int JASCallbackMgr::reject(JASCallback* callback, void* argument) { void JASCallbackMgr::callback() { for (int i = 0; i < NUM_CALLBACKS; i++) { - if (callbacks_[i].callback_ && callbacks_[i].callback_(callbacks_[i].arg_) < 0) { - callbacks_[i].callback_ = NULL; - callbacks_[i].arg_ = NULL; + if (callbacks_[i].callback_) { + s32 result = callbacks_[i].callback_(callbacks_[i].arg_); + if (result < 0) { + callbacks_[i].callback_ = NULL; + callbacks_[i].arg_ = NULL; + } } } } diff --git a/src/JSystem/JAudio2/JASChannel.cpp b/src/JSystem/JAudio2/JASChannel.cpp index 7d216ed6c5..0979b38b8d 100644 --- a/src/JSystem/JAudio2/JASChannel.cpp +++ b/src/JSystem/JAudio2/JASChannel.cpp @@ -18,7 +18,7 @@ OSMessage JASChannel::sBankDisposeList[16]; int JASChannel::sBankDisposeListSize; JASChannel::JASChannel(Callback i_callback, void* i_callbackData) : - mStatus(STATUS_INACTIVE), + mStatus(STATUS_STOP), mDspCh(NULL), mCallback(i_callback), mCallbackData(i_callbackData), @@ -45,6 +45,7 @@ JASChannel::JASChannel(Callback i_callback, void* i_callbackData) : JASChannel::~JASChannel() { if (mDspCh != NULL) { + JUT_WARN(62, "%s","~JASChannel:: mDspCh != NULL"); mDspCh->drop(); } if (mCallback != NULL) { @@ -61,7 +62,7 @@ int JASChannel::play() { } mDspCh = channel; channel->start(); - mStatus = STATUS_ACTIVE; + mStatus = STATUS_PLAY; return 1; } @@ -74,12 +75,12 @@ int JASChannel::playForce() { } mDspCh = channel; channel->start(); - mStatus = STATUS_ACTIVE; + mStatus = STATUS_PLAY; return 1; } void JASChannel::release(u16 i_directRelease) { - if (mStatus == STATUS_ACTIVE) { + if (mStatus == STATUS_PLAY) { if (i_directRelease != 0) { setDirectRelease(i_directRelease); } @@ -88,17 +89,20 @@ void JASChannel::release(u16 i_directRelease) { mOscillators[i].release(); } } + JUT_ASSERT(135, mDspCh); mDspCh->setPriority(JSUHiByte(mPriority)); mStatus = STATUS_RELEASE; } } -void JASChannel::setOscInit(u32 i_index, JASOscillator::Data const* i_data) { - mOscillators[i_index].initStart(i_data); +void JASChannel::setOscInit(u32 oscnum, JASOscillator::Data const* i_data) { + JUT_ASSERT(147, oscnum < OSC_NUM); + mOscillators[oscnum].initStart(i_data); } -void JASChannel::setMixConfig(u32 i_index, u16 i_config) { - mMixConfig[i_index].whole = i_config; +void JASChannel::setMixConfig(u32 bus, u16 i_config) { + JUT_ASSERT(153, bus < BUSOUT_CPUCH); + mMixConfig[bus].whole = i_config; } f32 JASChannel::calcEffect(JASChannel::PanVector const* i_vector) { @@ -110,9 +114,10 @@ f32 JASChannel::calcPan(JASChannel::PanVector const* i_vector) { + (i_vector->mChannel - 0.5f); } -void JASChannel::effectOsc(u32 i_index, JASOscillator::EffectParams* i_params) { - f32 value = mOscillators[i_index].getValue(); - switch (mOscillators[i_index].getTarget()) { +void JASChannel::effectOsc(u32 oscnum, JASOscillator::EffectParams* i_params) { + JUT_ASSERT(176, oscnum < OSC_NUM); + f32 value = mOscillators[oscnum].getValue(); + switch (mOscillators[oscnum].getTarget()) { case JASOscillator::TARGET_PITCH: i_params->mPitch *= value; break; @@ -135,6 +140,8 @@ void JASChannel::effectOsc(u32 i_index, JASOscillator::EffectParams* i_params) { case JASOscillator::TARGET_6: i_params->_18 *= value; break; + default: + JUT_WARN(205, "%s", "Invalid osc target"); } } @@ -207,6 +214,8 @@ s32 JASChannel::dspUpdateCallback(u32 i_type, JASDsp::TChannel* i_channel, void* _this->mDspCh = NULL; delete _this; return -1; + default: + JUT_WARN(323, "Unexpected JASDSPChannel::UpdateStatus %d", i_type); } return 0; } @@ -221,6 +230,7 @@ s32 JASChannel::initialUpdateDSPChannel(JASDsp::TChannel* i_channel) { } if (field_0xdc.field_0x4.field_0x20[0] == 0) { + JUT_WARN_DEVICE(346, 2, "%s", "Lost wave data while playing"); mDspCh->free(); mDspCh = NULL; delete this; @@ -228,6 +238,7 @@ s32 JASChannel::initialUpdateDSPChannel(JASDsp::TChannel* i_channel) { } if (checkBankDispose()) { + JUT_WARN_DEVICE(357, 2, "%s","Lost bank data while playing"); mDspCh->free(); mDspCh = NULL; delete this; @@ -290,11 +301,14 @@ s32 JASChannel::initialUpdateDSPChannel(JASDsp::TChannel* i_channel) { } s32 JASChannel::updateDSPChannel(JASDsp::TChannel* i_channel) { + JUT_ASSERT(444, mStatus == STATUS_PLAY || mStatus == STATUS_RELEASE); + JUT_ASSERT(445, mDspCh); if (mCallback != NULL) { mCallback(CB_PLAY, this, i_channel, mCallbackData); } if (field_0xdc.field_0x4.field_0x20[0] == 0) { + JUT_WARN_DEVICE(456, 2, "%s","Lost wave data while playing"); mDspCh->free(); mDspCh = NULL; delete this; @@ -302,6 +316,7 @@ s32 JASChannel::updateDSPChannel(JASDsp::TChannel* i_channel) { } if (checkBankDispose()) { + JUT_WARN_DEVICE(467, 2, "%s", "Lost bank data while playing"); mDspCh->free(); mDspCh = NULL; delete this; @@ -368,9 +383,13 @@ void JASChannel::updateAutoMixer(JASDsp::TChannel* i_channel, f32 param_1, f32 p if (JASDriver::getOutputMode() == 0) { param_1 *= 0.707f; } - f32 fvar1 = JASCalc::clamp01(param_1); - i_channel->setAutoMixer(fvar1 * JASDriver::getChannelLevel_dsp(), param_2 * 127.5f, - param_4 * 127.5f, param_3 * 127.5f, 0); + param_1 = JASCalc::clamp01(param_1); + + u16 r31 = param_1 * JASDriver::getChannelLevel_dsp(); + u8 r30 = param_2 * 127.5f; + u8 r29 = param_4 * 127.5f; + u8 r28 = param_3 * 127.5f; + i_channel->setAutoMixer(r31, r30, r29, r28, 0); } void JASChannel::updateMixer(f32 i_volume, f32 i_pan, f32 i_fxmix, f32 i_dolby, u16* i_volumeOut) { @@ -461,12 +480,14 @@ void JASChannel::updateMixer(f32 i_volume, f32 i_pan, f32 i_fxmix, f32 i_dolby, } } - i_volumeOut[i] = JASCalc::clamp01(volume) * JASDriver::getChannelLevel_dsp(); + volume = JASCalc::clamp01(volume); + i_volumeOut[i] = volume * JASDriver::getChannelLevel_dsp(); } } } void JASChannel::free() { + JUT_ASSERT(661, mStatus == STATUS_RELEASE || mStatus == STATUS_STOP); mCallback = NULL; mCallbackData = NULL; } diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/src/JSystem/JAudio2/JASDrumSet.cpp index bf9e90383c..0262e63c36 100644 --- a/src/JSystem/JAudio2/JASDrumSet.cpp +++ b/src/JSystem/JAudio2/JASDrumSet.cpp @@ -23,6 +23,7 @@ void JASDrumSet::newPercArray(u8 num, JKRHeap* heap) { } bool JASDrumSet::getParam(int key, int param_1, JASInstParam* param_2) const { + UNUSED(param_1); JUT_ASSERT(48, key >= 0); if (mPercArray == NULL) { return false; diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp index 43da2531ec..ffa19293e0 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp @@ -132,8 +132,8 @@ bool JASHeap::free() { return true; } -u32 JASHeap::getTotalFreeSize() { - JASMutexLock lock(&mMutex); +u32 JASHeap::getTotalFreeSize() const { + JASMutexLock lock(const_cast(&mMutex)); u8* r28 = mBase; u32 r29 = 0; for (JSUTreeIterator it = mTree.getFirstChild(); it != mTree.getEndChild(); it++) { @@ -145,8 +145,8 @@ u32 JASHeap::getTotalFreeSize() { return r29; } -u32 JASHeap::getFreeSize() { - JASMutexLock lock(&mMutex); +u32 JASHeap::getFreeSize() const { + JASMutexLock lock(const_cast(&mMutex)); u8* r27 = mBase; u32 r29 = 0; u32 r28; @@ -188,6 +188,7 @@ void JASHeap::insertChild(JASHeap* heap, JASHeap* next, void* param_2, u32 param } JASHeap* JASHeap::getTailHeap() { + int r30 = 0; JSUTreeIterator it; JASMutexLock lock(&mMutex); if (!field_0x40) { @@ -202,15 +203,25 @@ JASHeap* JASHeap::getTailHeap() { } u32 JASHeap::getTailOffset() { + u32 offset = 0; JASMutexLock lock(&mMutex); JASHeap* heap = getTailHeap(); - u32 offset = !heap ? mSize : heap->mBase - mBase; + if (heap == NULL) { + offset = mSize; + } else { + offset = heap->mBase - mBase; + } return offset; } u32 JASHeap::getCurOffset() { + u32 offset = 0; JASMutexLock lock(&mMutex); - u32 offset = !field_0x40 ? 0 : field_0x40->mBase + field_0x40->mSize - mBase; + if (field_0x40 == NULL) { + offset = 0; + } else { + offset = field_0x40->mBase + field_0x40->mSize - mBase; + } return offset; } @@ -251,10 +262,10 @@ void JASGenericMemPool::newMemPool(u32 n, int param_1) { } void* JASGenericMemPool::alloc(u32 param_0) { - void* chunk = field_0x0; - if (chunk == NULL) { + if (field_0x0 == NULL) { return NULL; } + void* chunk = field_0x0; field_0x0 = *(void**)chunk; freeMemCount--; if (usedMemCount < totalMemCount - freeMemCount) { @@ -264,11 +275,13 @@ void* JASGenericMemPool::alloc(u32 param_0) { } void JASGenericMemPool::free(void* ptr, u32 param_1) { - if (ptr != NULL) { - *(void**)ptr = field_0x0; - field_0x0 = ptr; - freeMemCount++; + if (!ptr) { + return; } + void* chunk = ptr; + *(void**)chunk = field_0x0; + field_0x0 = chunk; + freeMemCount++; } u32 JASKernel::sAramBase; diff --git a/src/JSystem/JAudio2/JASProbe.cpp b/src/JSystem/JAudio2/JASProbe.cpp index 3fcbcc6112..55a63e67c8 100644 --- a/src/JSystem/JAudio2/JASProbe.cpp +++ b/src/JSystem/JAudio2/JASProbe.cpp @@ -1,19 +1,19 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASProbe.h" -#include "dolphin/os.h" +#include "JSystem/JAudio2/JASCriticalSection.h" void JASProbe::start(char const* name) { - volatile BOOL interrupts = OSDisableInterrupts(); - mName = name; - mStartTime = OSGetTime(); - OSRestoreInterrupts(interrupts); + JASCriticalSection cs; + mName = name; + mStartTime = OSGetTime(); } void JASProbe::stop() { - volatile int interrupts = OSDisableInterrupts(); - _08 = (u32)OSGetTime() - mStartTime; + JASCriticalSection cs; + u32 r29 = OSGetTime(); + _08 = r29 - mStartTime; _08 /= OS_TIMER_CLOCK / 59.94f; if (_10 < _08 && 100 < _1A8) { _10 = _08; @@ -24,23 +24,26 @@ void JASProbe::stop() { _18[resultIndex] = _08; _14 += _08; _1A8++; - OSRestoreInterrupts(interrupts); } JASProbe* JASProbe::sProbeTable[16]; void JASProbe::start(s32 index, char const* name) { + JASProbe* probe; if (index < 16) { - if (sProbeTable[index] != NULL) { - sProbeTable[index]->start(name); + probe = sProbeTable[index]; + if (probe != NULL) { + probe->start(name); } } } void JASProbe::stop(s32 index) { + JASProbe* probe; if (index < 16) { - if (sProbeTable[index] != NULL) { - sProbeTable[index]->stop(); + probe = sProbeTable[index]; + if (probe != NULL) { + probe->stop(); } } } diff --git a/src/JSystem/JAudio2/JASRegisterParam.cpp b/src/JSystem/JAudio2/JASRegisterParam.cpp index c619042106..02d3c140b9 100644 --- a/src/JSystem/JAudio2/JASRegisterParam.cpp +++ b/src/JSystem/JAudio2/JASRegisterParam.cpp @@ -1,6 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASRegisterParam.h" +#include "JSystem/JSupport/JSupport.h" JASRegisterParam::JASRegisterParam() { for (int i = 0; i < 14; i++) { @@ -19,53 +20,55 @@ void JASRegisterParam::write(JASRegisterParam::RegID param_0, u32 param_1) { if (param_0 < 14) { if (param_0 <= 2) { field_0x0[param_0] = (u8)param_1; - return; + } else { + field_0x0[param_0] = param_1; } - - field_0x0[param_0] = param_1; return; } switch (param_0) { case 32: - field_0x0[0] = (param_1 >> 8) & 0xff; - field_0x0[1] = param_1 & 0xff; + field_0x0[0] = JSUHiByte(param_1); + field_0x0[1] = JSULoByte(param_1); break; case 33: - field_0x0[4] = param_1 >> 16; - field_0x0[5] = param_1; + field_0x0[4] = JSUHiHalf(param_1); + field_0x0[5] = JSULoHalf(param_1); break; case 34: - field_0x0[4] &= 0xff; - field_0x0[4] |= ((param_1 & 0xff) << 8); + field_0x0[4] = u8(field_0x0[4]); + field_0x0[4] |= u16((param_1 & 0xff) << 8); break; case 35: field_0x0[4] &= 0xff00; - field_0x0[4] |= param_1 & 0xff; + field_0x0[4] |= u8(param_1); break; case 36: - field_0x0[5] &= 0xff; - field_0x0[5] |= (param_1 & 0xff) << 8; + field_0x0[5] = u8(field_0x0[5]); + field_0x0[5] |= u16((param_1 & 0xff) << 8); break; case 37: field_0x0[5] &= 0xff00; - field_0x0[5] |= param_1 & 0xff; + field_0x0[5] |= u8(param_1); break; case 38: - field_0x0[6] = param_1 >> 16; - field_0x0[7] = param_1; + field_0x0[6] = JSUHiHalf(param_1); + field_0x0[7] = JSULoHalf(param_1); break; case 39: - field_0x0[8] = param_1 >> 16; - field_0x0[9] = param_1; + field_0x0[8] = JSUHiHalf(param_1); + field_0x0[9] = JSULoHalf(param_1); break; case 40: - field_0x0[10] = param_1 >> 16; - field_0x0[11] = param_1; + field_0x0[10] = JSUHiHalf(param_1); + field_0x0[11] = JSULoHalf(param_1); break; case 41: - field_0x0[12] = param_1 >> 16; - field_0x0[13] = param_1; + field_0x0[12] = JSUHiHalf(param_1); + field_0x0[13] = JSULoHalf(param_1); + break; + default: + JUT_WARN(92, "%s", "Warning: Unsupported REG id"); break; } } @@ -86,16 +89,16 @@ u32 JASRegisterParam::read(JASRegisterParam::RegID param_0) { rv |= field_0x0[5]; break; case 34: - rv = (u8)(field_0x0[4] >> 8); + rv = JSUHiByte(field_0x0[4]); break; case 35: - rv = (u8)field_0x0[4]; + rv = JSULoByte(field_0x0[4]); break; case 36: - rv = (u8)(field_0x0[5] >> 8); + rv = JSUHiByte(field_0x0[5]); break; case 37: - rv = (u8)field_0x0[5]; + rv = JSULoByte(field_0x0[5]); break; case 38: rv = field_0x0[6]; @@ -118,6 +121,9 @@ u32 JASRegisterParam::read(JASRegisterParam::RegID param_0) { rv <<= 16; rv |= field_0x0[11]; break; + default: + JUT_WARN(160, "%s", "Warning: Unsupported REG id"); + break; } return rv; } diff --git a/src/JSystem/JAudio2/JASSeqCtrl.cpp b/src/JSystem/JAudio2/JASSeqCtrl.cpp index ad4f341869..044f3873f2 100644 --- a/src/JSystem/JAudio2/JASSeqCtrl.cpp +++ b/src/JSystem/JAudio2/JASSeqCtrl.cpp @@ -7,7 +7,6 @@ JASSeqParser JASSeqCtrl::sDefaultParser; JASSeqCtrl::JASSeqCtrl() { - mReader.init(); field_0x3c = &sDefaultParser; field_0x40 = 0; field_0x44 = NULL; @@ -96,27 +95,35 @@ int JASSeqCtrl::retIntr() { } int JASSeqCtrl::findIntr() { - u32 uVar1 = field_0x4e & field_0x4c; - for (int i = 0; uVar1 != 0; uVar1 >>= 1, i++) { + u32 uVar1 = field_0x4e; + uVar1 &= field_0x4c; + int i; + for (i = 0; uVar1 != 0; i++) { if (uVar1 & 1) { field_0x4c &= ~(1 << i); return i; } + uVar1 >>= 1; } return -1; } void JASSeqCtrl::checkIntr() { - if (field_0x44) return; + if (field_0x44) { + return; + } int intr = findIntr(); - if (intr < 0) return; + if (intr < 0) { + return; + } - u32 uVar2 = field_0x48; - uVar2 += intr * 3; - u32 uVar1 = get24(uVar2); + u32 vec = field_0x48; + JUT_ASSERT(144, vec != 0); + vec += intr * 3; + vec = get24(vec); field_0x44 = mReader.getCur(); - mReader.jump(uVar1); + mReader.jump(vec); } void JASSeqCtrl::timerProcess() { diff --git a/src/JSystem/JAudio2/JASSeqParser.cpp b/src/JSystem/JAudio2/JASSeqParser.cpp index 251debee5d..e68d880e17 100644 --- a/src/JSystem/JAudio2/JASSeqParser.cpp +++ b/src/JSystem/JAudio2/JASSeqParser.cpp @@ -999,7 +999,8 @@ s32 JASSeqParser::parseRegCommand(JASTrack* param_0, int param_1) { r30 <<= 1; r28 <<= 2; } - return parseCommand(param_0, seqCtrl->readByte(), r29); + u8 r25 = seqCtrl->readByte(); + return parseCommand(param_0, r25, r29); } s32 JASSeqParser::parse(JASTrack* param_0) { diff --git a/src/JSystem/JAudio2/JASSeqReader.cpp b/src/JSystem/JAudio2/JASSeqReader.cpp index be76620b31..c259c57d40 100644 --- a/src/JSystem/JAudio2/JASSeqReader.cpp +++ b/src/JSystem/JAudio2/JASSeqReader.cpp @@ -32,6 +32,7 @@ void JASSeqReader::init(void* param_0) { bool JASSeqReader::call(u32 param_0) { if (field_0x08 >= 8) { + JUT_WARN(42, "%s", "Cannot exec call command"); return false; } @@ -43,6 +44,7 @@ bool JASSeqReader::call(u32 param_0) { bool JASSeqReader::loopStart(u32 param_0) { if (8 <= field_0x08) { + JUT_WARN(53, "%s", "Cannot exec loopStart command"); return false; } @@ -55,6 +57,7 @@ bool JASSeqReader::loopStart(u32 param_0) { bool JASSeqReader::loopEnd() { if (field_0x08 == 0) { + JUT_WARN(65, "%s", "cannot loopE for call-stack is NULL"); return false; } @@ -97,6 +100,7 @@ int JASSeqReader::readMidiValue() { while (true) { if (2 < i) { + JUT_WARN(100, "%s", "readMidiValue: Too large value"); return 0; } diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp index a20d6cbdea..1dc9da38ea 100644 --- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp +++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp @@ -15,6 +15,7 @@ JASSimpleWaveBank::~JASSimpleWaveBank() { void JASSimpleWaveBank::setWaveTableSize(u32 size, JKRHeap* heap) { delete[] mWaveTable; mWaveTable = new (heap, 0) TWaveHandle[size]; + JUT_ASSERT(29, mWaveTable != 0); mWaveTableSize = size; } diff --git a/src/JSystem/JAudio2/JASTrack.cpp b/src/JSystem/JAudio2/JASTrack.cpp index e6bedccd69..6ba0a66a79 100644 --- a/src/JSystem/JAudio2/JASTrack.cpp +++ b/src/JSystem/JAudio2/JASTrack.cpp @@ -336,18 +336,14 @@ int JASTrack::noteOn(u32 noteid, u32 param_1, u32 param_2) { } int JASTrack::gateOn(u32 param_0, u32 i_velocity, f32 i_time, u32 i_flags) { + bool result = true; param_0 += getTransposeTotal(); if (mGateRate != 100) { i_time *= mGateRate / 100.0f; } u32 uvar2 = seqTimeToDspTime(i_time); u32 update_timer = (i_flags & 6) ? 0 : uvar2; - int uvar7; - if (i_flags & 1) { - uvar7 = field_0x22b; - } else { - uvar7 = param_0; - } + int uvar7 = i_flags & 1 ? field_0x22b : param_0; for (u32 i = 0; i < mChannelMgrCount; i++) { TChannelMgr* channel_mgr = mChannelMgrs[i]; if (channel_mgr != NULL) { @@ -365,14 +361,17 @@ int JASTrack::gateOn(u32 param_0, u32 i_velocity, f32 i_time, u32 i_flags) { channel->setUpdateTimer(update_timer); } } - if ((i_flags & 1) && channel_mgr->mChannels[0] != NULL) { - channel_mgr->mChannels[0]->setKeySweepTarget(param_0 - uvar7, uvar2); + if (i_flags & 1) { + JASChannel* channel = channel_mgr->mChannels[0]; + if (channel != NULL) { + channel->setKeySweepTarget(param_0 - uvar7, uvar2); + } } } } - mFlags.flag4 = (i_flags >> 1) & 1; + mFlags.flag4 = (i_flags & 2) ? true : false; field_0x22b = param_0; - return 1; + return result; } int JASTrack::noteOff(u32 noteid, u16 param_1) { diff --git a/src/JSystem/JAudio2/JASTrackPort.cpp b/src/JSystem/JAudio2/JASTrackPort.cpp index ad13734e28..e822212ec9 100644 --- a/src/JSystem/JAudio2/JASTrackPort.cpp +++ b/src/JSystem/JAudio2/JASTrackPort.cpp @@ -11,21 +11,25 @@ void JASTrackPort::init() { } u16 JASTrackPort::readImport(u32 port_num) { + JUT_ASSERT(27, port_num < MAX_PORTS); field_0x0 = field_0x0 & ~(1 << port_num); return field_0x4[port_num]; } u16 JASTrackPort::readExport(u32 port_num) { + JUT_ASSERT(34, port_num < MAX_PORTS); field_0x2 = field_0x2 & ~(1 << port_num); return field_0x4[port_num]; } void JASTrackPort::writeImport(u32 port_num, u16 param_1) { + JUT_ASSERT(41, port_num < MAX_PORTS); field_0x0 = field_0x0 | (1 << port_num); field_0x4[port_num] = param_1; } void JASTrackPort::writeExport(u32 port_num, u16 param_1) { + JUT_ASSERT(47, port_num < MAX_PORTS); field_0x2 = field_0x2 | (1 << port_num); field_0x4[port_num] = param_1; } diff --git a/src/JSystem/JAudio2/JASWSParser.cpp b/src/JSystem/JAudio2/JASWSParser.cpp index 2194561303..a03f73f35e 100644 --- a/src/JSystem/JAudio2/JASWSParser.cpp +++ b/src/JSystem/JAudio2/JASWSParser.cpp @@ -8,7 +8,8 @@ u32 JASWSParser::getGroupCount(void const* stream) { THeader* header = (THeader*)stream; - return header->mCtrlGroupOffset.ptr(header)->mGroupCount; + TCtrlGroup* group = header->mCtrlGroupOffset.ptr(header); + return group->mGroupCount; } @@ -38,9 +39,11 @@ JASBasicWaveBank* JASWSParser::createBasicWaveBank(void const* stream, JKRHeap* wave_bank->setGroupCount(ctrl_group->mGroupCount, heap); wave_bank->setWaveTableSize(header->mWaveTableSize, heap); for (u32 i = 0; i < ctrl_group->mGroupCount; i++) { - TCtrl* ctrl = ctrl_group->mCtrlSceneOffsets[i].ptr(header)->mCtrlOffset.ptr(header); + TCtrlScene* ctrlScene = ctrl_group->mCtrlSceneOffsets[i].ptr(header); + TCtrl* ctrl = ctrlScene->mCtrlOffset.ptr(header); JASBasicWaveBank::TWaveGroup* wave_group = wave_bank->getWaveGroup(i); - TWaveArchive* archive = header->mArchiveBankOffset.ptr(header)->mArchiveOffsets[i].ptr(header); + TWaveArchiveBank* archiveBank = header->mArchiveBankOffset.ptr(header); + TWaveArchive* archive = archiveBank->mArchiveOffsets[i].ptr(header); wave_group->setWaveCount(ctrl->mWaveCount, heap); for (int j = 0; j < ctrl->mWaveCount; j++) { TWave* wave = archive->mWaveOffsets[j].ptr(header); @@ -57,7 +60,8 @@ JASBasicWaveBank* JASWSParser::createBasicWaveBank(void const* stream, JKRHeap* wave_info.field_0x1c = wave->_20; wave_info.field_0x1e = wave->_22; TCtrlWave* ctrl_wave = ctrl->mCtrlWaveOffsets[j].ptr(header); - wave_bank->setWaveInfo(wave_group, j, JSULoHalf(ctrl_wave->_00), wave_info); + u16 local_74 = JSULoHalf(ctrl_wave->_00); + wave_bank->setWaveInfo(wave_group, j, local_74, wave_info); } wave_group->setFileName(archive->mFileName); } @@ -84,10 +88,13 @@ JASSimpleWaveBank* JASWSParser::createSimpleWaveBank(void const* stream, JKRHeap } u32 max = 0; - TCtrl* ctrl = ctrl_group->mCtrlSceneOffsets[0].ptr(header)->mCtrlOffset.ptr(header); - TWaveArchive* archive = header->mArchiveBankOffset.ptr(header)->mArchiveOffsets[0].ptr(header); + TCtrlScene* ctrlScene = ctrl_group->mCtrlSceneOffsets[0].ptr(header); + TCtrl* ctrl = ctrlScene->mCtrlOffset.ptr(header); + TWaveArchiveBank* archiveBank = header->mArchiveBankOffset.ptr(header); + TWaveArchive* archive = archiveBank->mArchiveOffsets[0].ptr(header); for (int i = 0; i < ctrl->mWaveCount; i++) { - u32 tmp = JSULoHalf(ctrl->mCtrlWaveOffsets[i].ptr(header)->_00); + TCtrlWave* ctrlWave = ctrl->mCtrlWaveOffsets[i].ptr(header); + u32 tmp = JSULoHalf(ctrlWave->_00); if (max < tmp) { max = tmp; } @@ -109,7 +116,8 @@ JASSimpleWaveBank* JASWSParser::createSimpleWaveBank(void const* stream, JKRHeap wave_info.field_0x1c = wave->_20; wave_info.field_0x1e = wave->_22; TCtrlWave* ctrl_wave = ctrl->mCtrlWaveOffsets[i].ptr(header); - wave_bank->setWaveInfo(JSULoHalf(ctrl_wave->_00), wave_info); + u32 tmp = JSULoHalf(ctrl_wave->_00); + wave_bank->setWaveInfo(tmp, wave_info); } wave_bank->setFileName(archive->mFileName); diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp index 03525f9199..ee91eb3e8a 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -21,11 +21,11 @@ JASHeap* JASWaveArcLoader::getRootHeap() { char JASWaveArcLoader::sCurrentDir[DIR_MAX] = "/AudioRes/Waves/"; void JASWaveArcLoader::setCurrentDir(char const* dir) { - ASSERT(std::strlen(dir) < DIR_MAX - 1); + JUT_ASSERT(40, std::strlen(dir) < DIR_MAX - 1); strcpy(sCurrentDir, dir); u32 len = strlen(sCurrentDir); if (sCurrentDir[len - 1] != '/') { - ASSERT(len + 1 < DIR_MAX); + JUT_ASSERT(45, len + 1 < DIR_MAX); sCurrentDir[len] = '/'; sCurrentDir[len + 1] = '\0'; } @@ -77,10 +77,8 @@ bool JASWaveArc::eraseSetup() { void JASWaveArc::loadToAramCallback(void* this_) { loadToAramCallbackParams* tmp = (loadToAramCallbackParams*)this_; JASWaveArc* wavArc = tmp->mWavArc; - JKRAramBlock* block = JKRDvdAramRipper::loadToAram(tmp->mEntryNum, tmp->mBase, - EXPAND_SWITCH_UNKNOWN0, 0, 0, NULL); - if (block == NULL) { - // "loadToAram Failed" + if (JKRDvdAramRipper::loadToAram(tmp->mEntryNum, tmp->mBase, EXPAND_SWITCH_UNKNOWN0, 0, 0, NULL) == NULL) { + JUT_WARN(129, "%s", "loadToAram Failed"); return; } wavArc->_5a--; @@ -93,19 +91,16 @@ bool JASWaveArc::sendLoadCmd() { JASMutexLock mutexLock(&mMutex); _48 = 0; mStatus = 1; - void* base = mHeap.getBase(); loadToAramCallbackParams commandInfo; commandInfo.mWavArc = this; commandInfo.mEntryNum = mEntryNum; - commandInfo.mBase = (uintptr_t)mHeap.mBase; + commandInfo.mBase = (uintptr_t)mHeap.getBase(); commandInfo._c = ++_58; _5a++; - JASTaskThread* thread = JASDvd::getThreadPointer(); - int status = thread->sendCmdMsg(loadToAramCallback, &commandInfo, 0x10); - if (status == 0) { - // "sendCmdMsg loadToAramCallback Failed" + if (JASDvd::getThreadPointer()->sendCmdMsg(loadToAramCallback, &commandInfo, 0x10) == 0) { + JUT_WARN(193, "%s", "sendCmdMsg loadToAramCallback Failed"); mHeap.free(); return false; } @@ -123,8 +118,7 @@ bool JASWaveArc::load(JASHeap* heap) { if (heap == NULL) { heap = JASWaveArcLoader::getRootHeap(); } - bool result = mHeap.alloc(heap, mFileLength); - if (result == false) { + if (mHeap.alloc(heap, mFileLength) == false) { return false; } return sendLoadCmd(); @@ -141,8 +135,7 @@ bool JASWaveArc::loadTail(JASHeap* heap) { if (heap == NULL) { heap = JASWaveArcLoader::getRootHeap(); } - bool result = mHeap.allocTail(heap, mFileLength); - if (result == false) { + if (mHeap.allocTail(heap, mFileLength) == false) { return false; } return sendLoadCmd(); @@ -163,8 +156,7 @@ void JASWaveArc::setEntryNum(s32 entryNum) { if (entryNum < 0) { return; } - BOOL openStatus = DVDFastOpen(entryNum, &fileInfo); - if (openStatus == FALSE) { + if (DVDFastOpen(entryNum, &fileInfo) == FALSE) { return; } mFileLength = fileInfo.length; @@ -176,13 +168,13 @@ void JASWaveArc::setFileName(char const* fileName) { char* currentDir = JASWaveArcLoader::getCurrentDir(); size_t length = strlen(currentDir); length = length + strlen(fileName); - JKRHeap* systemHeap = JASKernel::getSystemHeap(); - char* fileString = new (systemHeap, -4) char[length + 1]; - strcpy(fileString, currentDir); - strcat(fileString, fileName); - fileString[length] = '\0'; - int entryNum = DVDConvertPathToEntrynum(fileString); - delete[] fileString; + char* path = new (JASKernel::getSystemHeap(), -4) char[length + 1]; + JUT_ASSERT(322, path); + strcpy(path, currentDir); + strcat(path, fileName); + path[length] = '\0'; + int entryNum = DVDConvertPathToEntrynum(path); + delete[] path; if (entryNum < 0) { return; } From 6a9525b54f36661034bf11c38e8d571c733c41c4 Mon Sep 17 00:00:00 2001 From: roeming Date: Fri, 26 Dec 2025 17:56:15 -0500 Subject: [PATCH 16/35] match d_a_e_mk debug (#2999) * match d_a_e_mk debug * Fix platform guard --- src/d/actor/d_a_e_mk.cpp | 431 +++++++++++++++++++-------------------- 1 file changed, 214 insertions(+), 217 deletions(-) diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 47e68003e4..f9569500db 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -78,8 +78,7 @@ static int daE_MK_Draw(e_mk_class* i_this) { J3DModel* model_p = i_this->anmP->getModel(); g_env_light.settingTevStruct(0, &actor->current.pos, &actor->tevStr); g_env_light.setLightTevColorType_MAJI(model_p, &actor->tevStr); - J3DModelData* i_modelData = model_p->getModelData(); - i_this->btpP->entry(i_modelData); + i_this->btpP->entry(model_p->getModelData()); i_this->anmP->entryDL(); cXyz pos; @@ -93,8 +92,7 @@ static int daE_MK_Draw(e_mk_class* i_this) { } if (i_this->crownStatus != 0) { - model_p = i_this->crownAnmP->getModel(); - g_env_light.setLightTevColorType_MAJI(model_p, &actor->tevStr); + g_env_light.setLightTevColorType_MAJI(i_this->crownAnmP->getModel(), &actor->tevStr); i_this->crownAnmP->entryDL(); if (i_this->unkFlag1 != 0) { pos.set(i_this->crownPos.x, actor->current.pos.y + 50.0f + BREG_F(18), i_this->crownPos.z); @@ -118,11 +116,11 @@ static void* s_obj_delete(void* i_actor, void* i_data) { UNUSED(i_data); if (fopAcM_IsActor(i_actor)) { - fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; - if (fopAcM_GetName(actor) == PROC_E_DB) { + if (fopAcM_GetName(i_actor) == PROC_E_DB) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; actor->health = 1000; - } else if (fopAcM_GetName(actor) == PROC_E_DB_LEAF) { - fopAcM_delete(actor); + } else if (fopAcM_GetName(i_actor) == PROC_E_DB_LEAF) { + fopAcM_delete((fopAc_ac_c*)i_actor); } } @@ -161,7 +159,6 @@ static void* s_h_sub(void* i_actor, void* i_data) { static daPillar_c* search_hasira(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; daPillar_c* pillar_p; - daPillar_c* rv; target_info_count = 0; for (int i = 0; i < 20; i++) { @@ -179,7 +176,7 @@ static daPillar_c* search_hasira(e_mk_class* i_this) { s16 angle = 0x7000; // 157.5° if (target_info_count != 0) { cXyz pos_delta; - rv = NULL; + daPillar_c* rv = NULL; int iVar1 = 0; for (int i = 0; i < target_info_count;) { pillar_p = (daPillar_c*)target_info[i]; @@ -363,7 +360,8 @@ static void e_mk_move(e_mk_class* i_this) { work.y += 500.0f; work -= actor->current.pos; if (work.abs() < 200.0f) { - i_this->prevHasira->setShake(2); + daPillar_c* pillar = i_this->prevHasira; + pillar->setShake(2); } } } @@ -425,7 +423,6 @@ static void e_mk_move(e_mk_class* i_this) { } } - cLib_addCalc2(&actor->current.pos.x, i_this->posTarget.x, 1.0f, fabsf(i_this->posTargetStep.x)); cLib_addCalc2(&actor->current.pos.z, i_this->posTarget.z, 1.0f, fabsf(i_this->posTargetStep.z)); cLib_addCalc2(&actor->current.pos.y, i_this->posTarget.y, 1.0f, fabsf(i_this->posTargetStep.y)); @@ -781,44 +778,49 @@ static void damage_check(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - if (i_this->invulnerabilityTimer == 0) { - i_this->stts.Move(); + if (i_this->invulnerabilityTimer != 0) { + return; + } - if (i_this->action >= 9) { - if (i_this->tgSph.ChkTgHit()) { - i_this->atInfo.mpCollider = i_this->tgSph.GetTgHitObj(); - cc_at_check(actor, &i_this->atInfo); - if (i_this->atInfo.mpCollider->ChkAtType(AT_TYPE_UNK) != 0) { - i_this->invulnerabilityTimer = 20; - } else { - i_this->invulnerabilityTimer = 10; - } + i_this->stts.Move(); + dCcU_AtInfo unused; - if (actor->health <= 0) { - fpcM_Search(s_obj_delete, i_this); - i_this->action = 30; - i_this->mode = 0; - i_this->sound.startCreatureVoice(Z2SE_EN_MK_V_DEAD, -1); - i_this->invulnerabilityTimer = 20000; - Z2GetAudioMgr()->subBgmStop(); - - #if !DEBUG - dScnPly_c::nextPauseTimer = 0; - #endif - } else { - i_this->action = 10; - i_this->mode = 0; - if (player->getCutType() == daPy_py_c::CUT_TYPE_JUMP && player->checkCutJumpCancelTurn()) { - i_this->invulnerabilityTimer = 3; - } + if (i_this->action >= 9) { + if (i_this->tgSph.ChkTgHit()) { + i_this->atInfo.mpCollider = i_this->tgSph.GetTgHitObj(); + cc_at_check(actor, &i_this->atInfo); + if (i_this->atInfo.mpCollider->ChkAtType(AT_TYPE_UNK) != 0) { + i_this->invulnerabilityTimer = 20; + } else { + i_this->invulnerabilityTimer = 10; + } + + if (actor->health <= 0) { + fpcM_Search(s_obj_delete, i_this); + i_this->action = 30; + i_this->mode = 0; + i_this->sound.startCreatureVoice(Z2SE_EN_MK_V_DEAD, -1); + i_this->invulnerabilityTimer = 20000; + Z2GetAudioMgr()->subBgmStop(); + +#if PLATFORM_GCN + dScnPly_c::nextPauseTimer = 0; +#endif + } else { + i_this->action = 10; + i_this->mode = 0; + if (player->getCutType() == daPy_py_c::CUT_TYPE_JUMP && + player->checkCutJumpCancelTurn()) + { + i_this->invulnerabilityTimer = 3; } } } + } - if (actor->health <= 1) { - actor->health = 0; - i_this->tgSph.SetTgHitMark((CcG_Tg_HitMark )3); - } + if (actor->health <= 1) { + actor->health = 0; + i_this->tgSph.SetTgHitMark((CcG_Tg_HitMark)3); } } @@ -988,7 +990,8 @@ static s8 e_mk_e_demo(e_mk_class* i_this) { unk_flag = 60; target_info_count = 0; fpcM_Search(s_h_sub, i_this); - static_cast(target_info[8])->setShake(1); + daPillar_c* pillar = static_cast(target_info[8]); + pillar->setShake(1); } } break; @@ -1247,8 +1250,7 @@ static void cam_3d_morf(e_mk_class* i_this, f32 i_scale) { static void demo_camera_start(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - fopAc_ac_c* deku_baba_1_p; - fopAc_ac_c* deku_baba_2_p; + fopAc_ac_c* deku_baba_p[2]; fopAc_ac_c* boomerang_p; boomerang_p = fopAcM_SearchByID(i_this->boomerangId); camera_class* camera1 = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); @@ -1292,7 +1294,7 @@ static void demo_camera_start(e_mk_class* i_this) { // fallthrough case 2: if (i_this->demoCamCounter == (s16)(8 + VREG_S(0))) { - ((daPy_py_c*)daPy_getPlayerActorClass())->changeDemoMode(25, 0, 0, 0); + daPy_getPlayerActorClass()->changeDemoMode(25, 0, 0, 0); } if (i_this->demoCamCounter >= (s16)(35 + VREG_S(1))) { @@ -1426,7 +1428,9 @@ static void demo_camera_start(e_mk_class* i_this) { break; case 7: - if (boomerang_p == NULL) break; + if (boomerang_p == NULL) { + break; + } i_this->camCenter = boomerang_p->current.pos; cMtx_YrotS(*calc_mtx, STAGE_ANGLE_Y); @@ -1454,28 +1458,28 @@ static void demo_camera_start(e_mk_class* i_this) { i_this->demoCamCounter = 0; // fallthrough case 9: - deku_baba_1_p = fopAcM_SearchByID(i_this->dbId1); - deku_baba_2_p = fopAcM_SearchByID(i_this->dbId2); + deku_baba_p[0] = fopAcM_SearchByID(i_this->dbId1); + deku_baba_p[1] = fopAcM_SearchByID(i_this->dbId2); if (i_this->demoCamCounter == 0) { - deku_baba_1_p->current.pos.x = player->current.pos.x - 200.0f; - deku_baba_1_p->current.pos.y = player->current.pos.y + 500.0f; - deku_baba_1_p->current.pos.z = player->current.pos.z - 1200.0f; - deku_baba_1_p->speed.y = 0.0f; - deku_baba_2_p->current.pos.x = player->current.pos.x + 200.0f; - deku_baba_2_p->current.pos.y = player->current.pos.y + 1000.0f; - deku_baba_2_p->current.pos.z = player->current.pos.z - 1000.0f; - deku_baba_2_p->speed.y = 0.0f; - i_this->camCenter.x = deku_baba_1_p->current.pos.x; - i_this->camCenter.z = deku_baba_1_p->current.pos.z; + deku_baba_p[0]->current.pos.x = player->current.pos.x - 200.0f; + deku_baba_p[0]->current.pos.y = player->current.pos.y + 500.0f; + deku_baba_p[0]->current.pos.z = player->current.pos.z - 1200.0f; + deku_baba_p[0]->speed.y = 0.0f; + deku_baba_p[1]->current.pos.x = player->current.pos.x + 200.0f; + deku_baba_p[1]->current.pos.y = player->current.pos.y + 1000.0f; + deku_baba_p[1]->current.pos.z = player->current.pos.z - 1000.0f; + deku_baba_p[1]->speed.y = 0.0f; + i_this->camCenter.x = deku_baba_p[0]->current.pos.x; + i_this->camCenter.z = deku_baba_p[0]->current.pos.z; } i_this->camEye.x = player->current.pos.x + 100.0f + ZREG_F(0); i_this->camEye.y = player->current.pos.y + 100.0f + ZREG_F(1); i_this->camEye.z = player->current.pos.z - 400.0f + ZREG_F(2); - i_this->camCenter.y = deku_baba_1_p->current.pos.y + ZREG_F(3); + i_this->camCenter.y = deku_baba_p[0]->current.pos.y + ZREG_F(3); - cLib_addCalc2(&i_this->camCenter.x, deku_baba_1_p->current.pos.x + 100.0f, 0.1f, 50.0f); - cLib_addCalc2(&i_this->camCenter.z, deku_baba_1_p->current.pos.z, 0.1f, 50.0f); + cLib_addCalc2(&i_this->camCenter.x, deku_baba_p[0]->current.pos.x + 100.0f, 0.1f, 50.0f); + cLib_addCalc2(&i_this->camCenter.z, deku_baba_p[0]->current.pos.z, 0.1f, 50.0f); if (i_this->demoCamCounter <= (s16)(60 + AREG_S(0))) { boomerang_p->current.pos -= boomerang_p->speed; @@ -1497,12 +1501,12 @@ static void demo_camera_start(e_mk_class* i_this) { i_this->camCenter = actor->current.pos; i_this->camCenter.y += 230.0f + NREG_F(11); - deku_baba_1_p = fopAcM_SearchByID(i_this->dbId1); - deku_baba_2_p = fopAcM_SearchByID(i_this->dbId2); - deku_baba_1_p->current.pos.x = player->current.pos.x - 200.0f; - deku_baba_1_p->current.pos.z = player->current.pos.z - 1200.0f; - deku_baba_2_p->current.pos.x = player->current.pos.x + 200.0f; - deku_baba_2_p->current.pos.z = player->current.pos.z - 1000.0f; + deku_baba_p[0] = fopAcM_SearchByID(i_this->dbId1); + deku_baba_p[1] = fopAcM_SearchByID(i_this->dbId2); + deku_baba_p[0]->current.pos.x = player->current.pos.x - 200.0f; + deku_baba_p[0]->current.pos.z = player->current.pos.z - 1200.0f; + deku_baba_p[1]->current.pos.x = player->current.pos.x + 200.0f; + deku_baba_p[1]->current.pos.z = player->current.pos.z - 1000.0f; break; case 11: @@ -1520,12 +1524,12 @@ static void demo_camera_start(e_mk_class* i_this) { Z2GetAudioMgr()->subBgmStart(Z2BGM_BOOMERAMG_MONKEY); } - deku_baba_1_p = fopAcM_SearchByID(i_this->dbId1); - deku_baba_2_p = fopAcM_SearchByID(i_this->dbId2); - deku_baba_1_p->current.pos.x = player->current.pos.x - 200.0f; - deku_baba_1_p->current.pos.z = player->current.pos.z - 1200.0f; - deku_baba_2_p->current.pos.x = player->current.pos.x + 200.0f; - deku_baba_2_p->current.pos.z = player->current.pos.z - 1000.0f; + deku_baba_p[0] = fopAcM_SearchByID(i_this->dbId1); + deku_baba_p[1] = fopAcM_SearchByID(i_this->dbId2); + deku_baba_p[0]->current.pos.x = player->current.pos.x - 200.0f; + deku_baba_p[0]->current.pos.z = player->current.pos.z - 1200.0f; + deku_baba_p[1]->current.pos.x = player->current.pos.x + 200.0f; + deku_baba_p[1]->current.pos.z = player->current.pos.z - 1000.0f; break; case 100: @@ -1554,7 +1558,7 @@ static void demo_camera_end(e_mk_class* i_this) { if (!actor->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(actor, 2, 0xffff, 0); actor->eventInfo.onCondition(dEvtCnd_CANDEMO_e); - return; + break; } camera->mCamera.Stop(); @@ -1586,13 +1590,11 @@ static void demo_camera_end(e_mk_class* i_this) { pos += actor->current.pos; player->setPlayerPosAndAngle(&pos, (s16)actor->shape_angle.y, 0); - if (i_this->demoCamCounter < (s16)(AREG_S(0) + 30)) { - return; + if (i_this->demoCamCounter >= (s16)(AREG_S(0) + 30)) { + i_this->demoSubMode++; + i_this->demoCamCounter = 0; } - - i_this->demoSubMode++; - i_this->demoCamCounter = 0; - return; + break; case 3: cMtx_YrotS(*calc_mtx, actor->shape_angle.y); @@ -1606,7 +1608,7 @@ static void demo_camera_end(e_mk_class* i_this) { work.z = AREG_F(5); MtxPosition(&work, &i_this->camEye); i_this->camEye += actor->current.pos; - return; + break; case 4: cMtx_YrotS(*calc_mtx, STAGE_ANGLE_Y); @@ -1620,7 +1622,7 @@ static void demo_camera_end(e_mk_class* i_this) { work.z = AREG_F(11) + 300.0f; MtxPosition(&work, &i_this->camEye); i_this->camEye += STAGE_CENTER_POS; - return; + break; case 5: cMtx_YrotS(*calc_mtx, STAGE_ANGLE_Y); @@ -1674,75 +1676,73 @@ static void demo_camera_end(e_mk_class* i_this) { if (i_this->demoCamCounter == 40) { Z2GetAudioMgr()->seStart(Z2SE_MK_DARK_INSECT_DEATH, &i_this->crownPos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } - - if (i_this->demoCamCounter < 90) { - return; - } - if (i_this->demoCamCounter == 90) { - work.x = WREG_F(12) + 1300.0f; - work.y = WREG_F(13); - work.z = WREG_F(14); - MtxPosition(&work, &pos); - pos += STAGE_CENTER_POS; - player->setPlayerPosAndAngle(&pos, (s16)actor->shape_angle.y, 0); - player->changeDemoMode(3, 1, 0, 0); - work.x = WREG_F(15) + 170.0f; - work.y = 0.0f; - work.z = 0.0f; - MtxPosition(&work, &pos); - pos += i_this->crownPos; - player->changeDemoPos0(&pos); - } + if (i_this->demoCamCounter >= 90) { + if (i_this->demoCamCounter == 90) { + work.x = WREG_F(12) + 1300.0f; + work.y = WREG_F(13); + work.z = WREG_F(14); + MtxPosition(&work, &pos); + pos += STAGE_CENTER_POS; + player->setPlayerPosAndAngle(&pos, (s16)actor->shape_angle.y, 0); + player->changeDemoMode(3, 1, 0, 0); + work.x = WREG_F(15) + 170.0f; + work.y = 0.0f; + work.z = 0.0f; + MtxPosition(&work, &pos); + pos += i_this->crownPos; + player->changeDemoPos0(&pos); + } - if (i_this->demoCamCounter == 130) { - ok_anm_init(i_this, dRes_INDEX_E_MK_BCK_OK_DEMO_DIE_e, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - } + if (i_this->demoCamCounter == 130) { + ok_anm_init(i_this, dRes_INDEX_E_MK_BCK_OK_DEMO_DIE_e, 1.0f, + J3DFrameCtrl::EMode_NONE, 1.0f); + } - if (i_this->demoCamCounter == 180) { - i_this->crownStatus = 0; - cMtx_YrotS(*calc_mtx, actor->shape_angle.y); - work.x = 0.0f; - work.y = 0.0f; - work.z = AREG_F(2) + -20.0f; - MtxPosition(&work, &pos); - pos += i_this->crownPos; - fopAcM_createDisappear(actor, &pos, 5, 0, 0xff); - } + if (i_this->demoCamCounter == 180) { + i_this->crownStatus = 0; + cMtx_YrotS(*calc_mtx, actor->shape_angle.y); + work.x = 0.0f; + work.y = 0.0f; + work.z = AREG_F(2) + -20.0f; + MtxPosition(&work, &pos); + pos += i_this->crownPos; + fopAcM_createDisappear(actor, &pos, 5, 0, 0xff); + } - if (i_this->demoCamCounter != 248) { - return; + if (i_this->demoCamCounter == 248) { + i_this->demoSubMode++; + i_this->demoCamCounter = 0; + i_this->mode = 5; + cMtx_YrotS(*calc_mtx, STAGE_ANGLE_Y); + work.x = AREG_F(9) + 300.0f; + work.y = AREG_F(10); + work.z = AREG_F(11) + 300.0f; + MtxPosition(&work, &pos); + pos += STAGE_CENTER_POS; + actor->current.pos.x = pos.x; + actor->current.pos.z = pos.z; + work.x = AREG_F(3) + 50.0f + 80.0f; + work.y = AREG_F(4) + 120.0f - 20.0f; + work.z = AREG_F(5) + 100.0f; + MtxPosition(&work, &i_this->camEye); + i_this->camEye += STAGE_CENTER_POS; + i_this->camCenter = actor->current.pos; + i_this->camCenter.y += AREG_F(12) + 150.0f + 40.0f; + work.x = AREG_F(6) + 400.0f; + work.y = AREG_F(7); + work.z = AREG_F(8) + 700.0f; + MtxPosition(&work, &pos); + pos += STAGE_CENTER_POS; + work.x = STAGE_CENTER_POS.x - pos.x; + work.z = STAGE_CENTER_POS.z - pos.z; + player->setPlayerPosAndAngle(&pos, cM_atan2s(work.x, work.z), 0); + actor->current.angle.y = player->shape_angle.y; + Z2GetAudioMgr()->bgmStreamPlay(); + } } + break; - i_this->demoSubMode++; - i_this->demoCamCounter = 0; - i_this->mode = 5; - cMtx_YrotS(*calc_mtx, STAGE_ANGLE_Y); - work.x = AREG_F(9) + 300.0f; - work.y = AREG_F(10); - work.z = AREG_F(11) + 300.0f; - MtxPosition(&work, &pos); - pos += STAGE_CENTER_POS; - actor->current.pos.x = pos.x; - actor->current.pos.z = pos.z; - work.x = AREG_F(3) + 50.0f + 80.0f; - work.y = AREG_F(4) + 120.0f - 20.0f; - work.z = AREG_F(5) + 100.0f; - MtxPosition(&work, &i_this->camEye); - i_this->camEye += STAGE_CENTER_POS; - i_this->camCenter = actor->current.pos; - i_this->camCenter.y += AREG_F(12) + 150.0f + 40.0f; - work.x = AREG_F(6) + 400.0f; - work.y = AREG_F(7); - work.z = AREG_F(8) + 700.0f; - MtxPosition(&work, &pos); - pos += STAGE_CENTER_POS; - work.x = STAGE_CENTER_POS.x - pos.x; - work.z = STAGE_CENTER_POS.z - pos.z; - player->setPlayerPosAndAngle(&pos, cM_atan2s(work.x, work.z), 0); - actor->current.angle.y = player->shape_angle.y; - Z2GetAudioMgr()->bgmStreamPlay(); - // fallthrough case 7: break; @@ -1758,7 +1758,7 @@ static void demo_camera_end(e_mk_class* i_this) { work.z = AREG_F(5) + 1100.0f; MtxPosition(&work, &i_this->camEye); i_this->camEye += STAGE_CENTER_POS; - return; + break; case 9: cMtx_YrotS(*calc_mtx, STAGE_ANGLE_Y); @@ -1772,18 +1772,19 @@ static void demo_camera_end(e_mk_class* i_this) { work.z = AREG_F(5) + -100.0f; MtxPosition(&work,&i_this->camEye); i_this->camEye += STAGE_CENTER_POS; - if (i_this->demoCamCounter < 300) return; - i_this->demoSubMode = 10; - i_this->demoCamCounter = 0; - work.x = AREG_F(16) + 400.0f; - work.y = AREG_F(17); - work.z = AREG_F(18) + 700.0f - 100.0f; - MtxPosition(&work, &pos); - pos += STAGE_CENTER_POS; - work.x = STAGE_CENTER_POS.x - player->current.pos.x; - work.z = STAGE_CENTER_POS.z - player->current.pos.z; - player->setPlayerPosAndAngle(&pos, cM_atan2s(work.x, work.z), 0); - return; + if (i_this->demoCamCounter >= 300) { + i_this->demoSubMode = 10; + i_this->demoCamCounter = 0; + work.x = AREG_F(16) + 400.0f; + work.y = AREG_F(17); + work.z = AREG_F(18) + 700.0f - 100.0f; + MtxPosition(&work, &pos); + pos += STAGE_CENTER_POS; + work.x = STAGE_CENTER_POS.x - player->current.pos.x; + work.z = STAGE_CENTER_POS.z - player->current.pos.z; + player->setPlayerPosAndAngle(&pos, cM_atan2s(work.x, work.z), 0); + } + break; case 10: cMtx_YrotS(*calc_mtx, STAGE_ANGLE_Y); @@ -1853,13 +1854,11 @@ static void demo_camera_end(e_mk_class* i_this) { dComIfGp_getEvent()->setPtT(boomerang_p); } - if (i_this->demoCamCounter != (s16)(KREG_S(9) + 250)) { - return; + if (i_this->demoCamCounter == (s16)(KREG_S(9) + 250)) { + i_this->demoSubMode = 20; + i_this->demoCamCounter = 0; } - - i_this->demoSubMode = 20; - i_this->demoCamCounter = 0; - return; + break; case 20: work = boomerang_p->current.pos - player->current.pos; @@ -1879,15 +1878,13 @@ static void demo_camera_end(e_mk_class* i_this) { pos = boomerang_p->current.pos - player->eyePos; actor->current.pos = player->eyePos + (pos * 20.0f); - if (i_this->demoCamCounter != 20) { - return; + if (i_this->demoCamCounter == 20) { + boomerang_p->health = 1; + i_this->demoSubMode = 21; + i_this->demoCamCounter = 0; + i_this->camStepScale1 = 0.0f; } - - boomerang_p->health = 1; - i_this->demoSubMode = 21; - i_this->demoCamCounter = 0; - i_this->camStepScale1 = 0.0f; - return; + break; case 21: cLib_addCalc2(&i_this->camCenter.y, boomerang_p->current.pos.y + ZREG_F(4) - 20.0f, 0.2f, i_this->camStepScale1 * 200.0f); @@ -1897,20 +1894,16 @@ static void demo_camera_end(e_mk_class* i_this) { cLib_addCalc2(&i_this->camStepScale1, 1.0f, 1.0f, 0.02f); pos = boomerang_p->current.pos - player->eyePos; actor->current.pos = player->eyePos + (pos * 20.0f); - if (i_this->demoCamCounter < 70) { - return; - } + if (i_this->demoCamCounter >= 70) { + if (i_this->demoCamCounter == 70) { + i_this->msgFlow.init(actor, 102, 0, NULL); + } - if (i_this->demoCamCounter == 70) { - i_this->msgFlow.init(actor, 102, 0, NULL); + if (i_this->msgFlow.doFlow(actor, NULL, 0)) { + boomerang_p->health = 1; + } } - - if (i_this->msgFlow.doFlow(actor, NULL, 0) == 0) { - return; - } - - boomerang_p->health = 1; - return; + break; case 22: player->changeDemoMode(28, 0, 0, 0); @@ -1964,7 +1957,11 @@ static void* s_brg_sub2(void* i_actor, void* i_data) { UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_OBJ_BRG) { - static_cast(i_actor)->mType &= ~0x4 & 0xFFFFFFFB; +#if PLATFORM_SHIELD + static_cast(i_actor)->mType &= (u8)~4u; +#else + static_cast(i_actor)->mType &= ~4u; +#endif } return NULL; @@ -1973,11 +1970,10 @@ static void* s_brg_sub2(void* i_actor, void* i_data) { /* Camera logic for the cutscene in the Forest Temple when Ook cuts the bridge down with the boomerang */ static void demo_camera_r04(e_mk_class* i_this) { fopEn_enemy_c* actor = (fopEn_enemy_c*)&i_this->actor; - u8 sw_bit; daPy_py_c* player = (daPy_py_c *)dComIfGp_getPlayer(0); fopAc_ac_c* boomerang_p = fopAcM_SearchByID(i_this->boomerangId); camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0)); - cXyz work, pos; + cXyz work, pos, unused, unused2; npc_ks_class* monkey_p = (npc_ks_class*)fpcM_Search(s_ks_sub, i_this); if (monkey_p == NULL) { @@ -1989,7 +1985,7 @@ static void demo_camera_r04(e_mk_class* i_this) { if (!monkey_p->actor.eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(&monkey_p->actor, 2, 0xffff, 0); monkey_p->actor.eventInfo.onCondition(dEvtCnd_CANDEMO_e); - return; + break; } camera->mCamera.Stop(); @@ -2011,7 +2007,7 @@ static void demo_camera_r04(e_mk_class* i_this) { i_this->distToCamEyeTarget.y = fabsf(i_this->camEyeTarget.y - i_this->camEye.y) * 0.02f; i_this->distToCamEyeTarget.z = fabsf(i_this->camEyeTarget.z - i_this->camEye.z) * 0.02f; - dComIfGp_getEvent()->startCheckSkipEdge(i_this); + dComIfGp_getEvent()->startCheckSkipEdge(actor); // fallthrough case 2: if (i_this->demoCamCounter > 60) { @@ -2045,7 +2041,7 @@ static void demo_camera_r04(e_mk_class* i_this) { } actor->current.pos.y = actor->home.pos.y + 10000.0f; - return; + break; case 3: actor->current.pos.y = actor->home.pos.y + 10000.0f; @@ -2053,7 +2049,7 @@ static void demo_camera_r04(e_mk_class* i_this) { cLib_addCalc2(&i_this->camCenter.y, monkey_p->actor.current.pos.y + 130.0f + ZREG_F(3) + (KREG_F(18) + 30.0f) * cM_ssin(i_this->demoCamCounter * 0xA00), 0.2f, 50.0f); if (i_this->demoCamCounter != 93) { - return; + break; } actor->current.pos.y = actor->home.pos.y; @@ -2069,14 +2065,14 @@ static void demo_camera_r04(e_mk_class* i_this) { i_this->demoCamCounter = 0; i_this->mode = 2; monkey_p->mode = 20; - return; + break; case 4: cLib_addCalc2(&i_this->camCenter.z, actor->current.pos.z, 0.2f, 50.0f); cLib_addCalc2(&i_this->camCenter.y, actor->current.pos.y + 220.0f + ZREG_F(7), 0.2f, 50.0f); if (i_this->demoCamCounter != 74) { - return; + break; } i_this->demoSubMode = 45; @@ -2090,7 +2086,7 @@ static void demo_camera_r04(e_mk_class* i_this) { i_this->camEye += monkey_p->actor.current.pos; i_this->camCenter = monkey_p->actor.current.pos; i_this->camCenter.y += ZREG_F(8) + 90.0f; - return; + break; case 45: cLib_addCalc2(&i_this->camCenter.z, monkey_p->actor.current.pos.z, 0.2f, 50.0f); @@ -2101,7 +2097,7 @@ static void demo_camera_r04(e_mk_class* i_this) { } if (i_this->demoCamCounter != NREG_S(7) + 55) { - return; + break; } i_this->demoSubMode = 46; @@ -2118,11 +2114,11 @@ static void demo_camera_r04(e_mk_class* i_this) { i_this->camCenter.y += ZREG_F(17) + 220.0f; if (i_this->demoCamCounter < ZREG_S(9) + 45) { - return; + break; } if (boomerang_p == NULL) { - return; + break; } i_this->demoSubMode = 5; @@ -2138,12 +2134,12 @@ static void demo_camera_r04(e_mk_class* i_this) { } if (i_this->demoCamCounter != ZREG_S(4) + 69) { - return; + break; } i_this->demoSubMode = 6; i_this->demoCamCounter = 0; - return; + break; case 6: if (i_this->demoCamCounter == ZREG_S(6) + 3) { @@ -2151,7 +2147,7 @@ static void demo_camera_r04(e_mk_class* i_this) { } if (i_this->demoCamCounter != ZREG_S(5) + 25) { - return; + break; } i_this->demoSubMode = 7; @@ -2171,7 +2167,7 @@ static void demo_camera_r04(e_mk_class* i_this) { monkey_p->actor.current.pos.set(0.0f, 2500.0f, 3373.0f); if (i_this->demoCamCounter != 250) { - return; + break; } i_this->demoSubMode = 8; @@ -2195,11 +2191,11 @@ static void demo_camera_r04(e_mk_class* i_this) { i_this->camEye.set(-131.0f, 3452.0f, 4552.0f); player->changeDemoMode(1, 1, 0, 0); } - return; + break; case 9: if (i_this->demoCamCounter != 138) { - return; + break; } i_this->camCenter.set(30.0f, 3422.0f, 4520.0f); @@ -2207,14 +2203,15 @@ static void demo_camera_r04(e_mk_class* i_this) { i_this->demoSubMode = 10; i_this->demoCamCounter = 0; i_this->prevPlShapeAngle = player->shape_angle.y; - return; + break; - case 10: - cLib_addCalcAngleS2(&i_this->prevPlShapeAngle, monkey_p->target_angle + (u16)-0x8000, 4, 0x800); + case 10: { + cLib_addCalcAngleS2(&i_this->prevPlShapeAngle, monkey_p->target_angle + (u16)-0x8000, 4, + 0x800); player->setPlayerPosAndAngle(&player->current.pos, i_this->prevPlShapeAngle, 0); if (i_this->demoCamCounter != 60) { - return; + break; } camera->mCamera.Reset(i_this->camCenter, i_this->camEye); @@ -2223,18 +2220,18 @@ static void demo_camera_r04(e_mk_class* i_this) { dComIfGp_event_reset(); daPy_getPlayerActorClass()->cancelOriginalDemo(); fopAcM_delete(actor); - sw_bit = fopAcM_GetParam(i_this) >> 16; + u8 sw_bit = (fopAcM_GetParam(actor) & 0xff0000) >> 16; if (sw_bit == 0xFF) { - return; + break; } dComIfGs_onSwitch(sw_bit, fopAcM_GetRoomNo(actor)); - return; + } break; case 0: case 100: default: - return; + break; } } @@ -2249,7 +2246,7 @@ static void demo_camera_bohit(e_mk_class* i_this) { if (!actor->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(actor, 2, 0xffff, 0); actor->eventInfo.onCondition(dEvtCnd_CANDEMO_e); - return; + break; } camera->mCamera.Stop(); @@ -2550,7 +2547,7 @@ static void anm_se_set(e_mk_class* i_this) { if (i_this->anmNo == dRes_INDEX_E_MK_BCK_MK_DEMO_THROW_e || i_this->anmNo == dRes_INDEX_E_MK_BCK_MK_DEMO_THROW_WAIT_e) { for (int i = 0; i < 2; i++) { - i_this->boEno1Prtcls[i] = dComIfGp_particle_set(i_this->boEno1Prtcls[i], bo_eno_1[i], &i_this->actor.current.pos, NULL, 0); + i_this->boEno1Prtcls[i] = dComIfGp_particle_set(i_this->boEno1Prtcls[i], bo_eno_1[i], &actor->current.pos, NULL, 0); JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->boEno1Prtcls[i]); if (emitter != NULL) { @@ -2561,7 +2558,7 @@ static void anm_se_set(e_mk_class* i_this) { if (i_this->anmNo == dRes_INDEX_E_MK_BCK_MK_DEMO_THROW_WAIT_e) { for (int i = 0; i < 4; i++) { - i_this->boEno0Prtcls[i] = dComIfGp_particle_set(i_this->boEno0Prtcls[i], bo_eno_0[i], &i_this->actor.eyePos, NULL, 0); + i_this->boEno0Prtcls[i] = dComIfGp_particle_set(i_this->boEno0Prtcls[i], bo_eno_0[i], &actor->eyePos, NULL, 0); JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(i_this->boEno0Prtcls[i]); if (emitter != NULL) { From e9e4adc368d25ae007012d07d5874b507d898d7d Mon Sep 17 00:00:00 2001 From: roeming Date: Fri, 26 Dec 2025 17:56:46 -0500 Subject: [PATCH 17/35] match most of d_a_e_wb debug (#3001) * match most of d_a_e_wb debug * Move over to using new `UNUSED` macro --- include/d/actor/d_a_e_wb.h | 8 +- include/d/actor/d_a_player.h | 2 +- src/d/actor/d_a_e_wb.cpp | 1937 +++++++++++++++++----------------- 3 files changed, 968 insertions(+), 979 deletions(-) diff --git a/include/d/actor/d_a_e_wb.h b/include/d/actor/d_a_e_wb.h index 2344a5a0eb..e1297d97a2 100644 --- a/include/d/actor/d_a_e_wb.h +++ b/include/d/actor/d_a_e_wb.h @@ -123,9 +123,7 @@ public: /* 0x06A0 */ s16 field_0x6a0; /* 0x06A2 */ u8 field_0x6a2[0x6ae - 0x6a2]; /* 0x06AE */ csXyz field_0x6ae; - /* 0x06B4 */ u8 field_0x6b4[0x6b6 - 0x6b4]; - /* 0x06B6 */ s16 field_0x6b6; - /* 0x06B8 */ u8 field_0x6b8[0x6ba - 0x6b8]; + /* 0x06B4 */ csXyz field_0x6b4; /* 0x06BA */ s16 field_0x6ba; /* 0x06BC */ u8 field_0x6bc; /* 0x06BD */ s8 mPursuitFlag; ///< @brief Flag indicating pursuit mode. @@ -141,9 +139,7 @@ public: /* 0x06D8 */ s16 field_0x6d8; /* 0x06DA */ s16 field_0x6da; /* 0x06DC */ s16 field_0x6dc; - /* 0x06DE */ s16 field_0x6de; - /* 0x06E0 */ s16 field_0x6e0; - /* 0x06E2 */ s16 field_0x6e2; + /* 0x06DE */ csXyz field_0x6de; /* 0x06E4 */ s8 field_0x6e4; /* 0x06E5 */ u8 field_0x6e5[0x6ec - 0x6e5]; /* 0x06EC */ csXyz field_0x6ec[0x1d]; diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h index 1725fc7e50..7dc2cacc4c 100644 --- a/include/d/actor/d_a_player.h +++ b/include/d/actor/d_a_player.h @@ -267,7 +267,7 @@ public: int getParam0() const { return mParam0; } void setParam0(int value) { mParam0 = value; } void setParam1(int value) { mParam1 = value; } - void setParam2(int value) { mParam2 = value; } + void setParam2(s16 value) { mParam2 = value; } void setPos0(const cXyz* pos) { mDemoPos0 = *pos; } void setToolDemoType() { setDemoType(DEMO_TYPE_TOOL_e); } s16 getTimer() const { return mTimer; } diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index b8415ed5de..8a332e117d 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -17,6 +17,7 @@ #include "d/d_s_play.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" +#include "res/Object/Always.h" class daE_WB_HIO_c : public JORReflexible { @@ -54,7 +55,9 @@ public: STATIC_ASSERT(sizeof(daE_WB_HIO_c) == 0x5C); +#if !DEBUG static u8 const lit_3882[12] = {0}; +#endif daE_WB_HIO_c::daE_WB_HIO_c() { mId = -1; @@ -107,7 +110,7 @@ void daE_WB_HIO_c::genMessage(JORMContext* ctx) { ctx->genSlider("最速度（車）", &mMaxSpeedVi, 0.0f, 100.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("一騎速", &mSingleRiderSpeed, 0.0f, 100.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genCheckBox("手綱ナシ", &mNoReins, 1, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); - ctx->genLabel("", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); + ctx->genLabel(" ", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genLabel(" プレイヤー騎乗時", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("最大速度", &mPlayerMountedMaxSpeed, 0.0f, 100.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); @@ -115,7 +118,7 @@ void daE_WB_HIO_c::genMessage(JORMContext* ctx) { 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("ダッシュ時間", &mPlayerMountedDashTime, 0.0f, 2000.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); - ctx->genLabel("", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); + ctx->genLabel(" ", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genLabel(" 以下 一騎討ち用", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); ctx->genSlider("サーチ無視距離(１)", &mSearchIgnoreDistance1, 0.0f, 5000.0f, 0, NULL, 0xFFFF, 0xFFFF, 512, 24); @@ -141,9 +144,11 @@ static void anm_init(e_wb_class* i_actor, int i_anmId, f32 i_morf, u8 i_attr, f3 static int nodeCallBack(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { - int joint_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int joint_no = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); e_wb_class* bullbo_p = (e_wb_class*)model->getUserArea(); + e_wb_class* bullbo_p2 = bullbo_p; if (bullbo_p) { MTXCopy(model->getAnmMtx(joint_no), *calc_mtx); @@ -162,9 +167,9 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { } if (bullbo_p->field_0x79d && joint_no == 0xd) { - cMtx_YrotM(*calc_mtx, bullbo_p->field_0x6e0); - cMtx_XrotM(*calc_mtx, bullbo_p->field_0x6de); - cMtx_ZrotM(*calc_mtx, bullbo_p->field_0x6e2); + cMtx_YrotM(*calc_mtx, bullbo_p->field_0x6de.y); + cMtx_XrotM(*calc_mtx, bullbo_p->field_0x6de.x); + cMtx_ZrotM(*calc_mtx, bullbo_p->field_0x6de.z); } model->setAnmMtx(joint_no, *calc_mtx); @@ -183,22 +188,22 @@ static bool hio_set; static daE_WB_HIO_c l_HIO; static void himo_control1(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3) { - fopAc_ac_c* a_this = (fopAc_ac_c*)&i_this->mEnemy; - cXyz sp60; - cXyz sp54; + fopEn_enemy_c* a_this = &i_this->mEnemy; + cXyz sp60, sp54; int i; s16 sp10; s16 spE; - cXyz* var_r30 = i_this->field_0x1450[i_idx].field_0x0; - var_r30[0] = *i_pos; + cXyz* sp18 = i_this->field_0x1450[i_idx].field_0x0; + cXyz* r30 = sp18; + *r30 = *i_pos; cXyz sp48; cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); cMtx_XrotM(*calc_mtx, a_this->shape_angle.x); - sp60.x = 20.0f; + sp60.x = 20.0f + YREG_F(17); if (i_idx == 0) { sp60.x *= -1.0f; } @@ -211,14 +216,14 @@ static void himo_control1(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3 cXyz sp24; sp60.x = 0.0f; - sp60.y = i_this->mAnimDuration; - sp60.z = sp60.y; + sp60.y = i_this->mAnimDuration * (1.0f + YREG_F(4)); + sp60.z = i_this->mAnimDuration * (1.0f + YREG_F(5)); MtxPosition(&sp60, &sp30); if (a_this->speedF > 20.0f) { - sp60.x = i_this->mAnimDuration * 0.4f; + sp60.x = i_this->mAnimDuration * (0.4f + YREG_F(9)); } else { - sp60.x = i_this->mAnimDuration * 0.1f; + sp60.x = i_this->mAnimDuration * (0.1f + YREG_F(9)); } if (i_idx == 0) { @@ -231,9 +236,9 @@ static void himo_control1(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3 sp60.x = 0.0f; sp60.y = 0.0f; if (param_3 != 0) { - sp60.z = 15.0f; + sp60.z = 15.0f + YREG_F(6); } else { - sp60.z = 20.0f; + sp60.z = 20.0f + YREG_F(7); } if (i_this->field_0x79d != 0) { @@ -243,17 +248,18 @@ static void himo_control1(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3 sp24 *= l_HIO.leader_size_ratio; } - i = 1; - cXyz* var_r30_2 = var_r30 + 1; - for (; i < 16; i++, var_r30_2++) { + f32 var_f29, var_f31, var_f28, var_f30; + + r30++; + for (i = 1; i < 16; i++, r30++) { sp3C.x = sp30.x * cM_ssin(i_this->field_0x1688 + i * 6000); sp3C.y = sp30.y * cM_ssin(i_this->field_0x1688 + i * 6000); sp3C.z = sp30.z * cM_ssin(i_this->field_0x1688 + i * 6000); - f32 var_f29 = 1.0f; - f32 var_f31 = sp24.x + (sp3C.x + ((var_r30_2[0].x - var_r30_2[-1].x) + (sp48.x * var_f29))); - f32 var_f28 = sp3C.y + ((var_r30_2[0].y - var_r30_2[-1].y) - 20.0f); - f32 var_f30 = sp24.z + (sp3C.z + ((var_r30_2[0].z - var_r30_2[-1].z) + (sp48.z * var_f29))); + var_f29 = 1.0f; + var_f31 = sp24.x + (sp3C.x + ((r30[0].x - r30[-1].x) + (sp48.x * var_f29))); + var_f28 = sp3C.y + ((r30[0].y - r30[-1].y) - 20.0f + YREG_F(16)); + var_f30 = sp24.z + (sp3C.z + ((r30[0].z - r30[-1].z) + (sp48.z * var_f29))); spE = (s16)cM_atan2s(var_f31, var_f30); sp10 = -cM_atan2s(var_f28, JMAFastSqrt(var_f31 * var_f31 + var_f30 * var_f30)); @@ -262,9 +268,9 @@ static void himo_control1(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3 cMtx_XrotM(*calc_mtx, sp10); MtxPosition(&sp60, &sp54); - var_r30_2[0].x = var_r30_2[-1].x + sp54.x; - var_r30_2[0].y = var_r30_2[-1].y + sp54.y; - var_r30_2[0].z = var_r30_2[-1].z + sp54.z; + r30[0].x = r30[-1].x + sp54.x; + r30[0].y = r30[-1].y + sp54.y; + r30[0].z = r30[-1].z + sp54.z; } } @@ -284,17 +290,17 @@ static void himo_control2(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3 sp30.y = 0.0f; if (param_3 != 0) { - sp30.z = 15.0f + YREG_F(7); + sp30.z = 15.0f + YREG_F(6); } else { - sp30.z = 20.0f + YREG_F(6); + sp30.z = 20.0f + YREG_F(7); } + f32 temp_f31, temp_f29, temp_f30; temp_r31--; - for (i = 14; i >= 1; i--, temp_r31--) { - f32 temp_f31 = temp_r31[0].x - temp_r31[1].x; - f32 temp_f29 = temp_r31[0].y - temp_r31[1].y; - f32 temp_f30 = temp_r31[0].z - temp_r31[1].z; + temp_f31 = temp_r31[0].x - temp_r31[1].x; + temp_f29 = temp_r31[0].y - temp_r31[1].y; + temp_f30 = temp_r31[0].z - temp_r31[1].z; spE = (s16)cM_atan2s(temp_f31, temp_f30); sp10 = -cM_atan2s(temp_f29, JMAFastSqrt((temp_f31 * temp_f31) + (temp_f30 * temp_f30))); @@ -309,7 +315,7 @@ static void himo_control2(e_wb_class* i_this, cXyz* i_pos, int i_idx, s8 param_3 temp_r31 = sp1C->field_0x0; cXyz* var_r29 = i_this->field_0x15d0[i_idx].getPos(0); - for (int i = 0; i < 16; i++, var_r29++, temp_r31++) { + for (i = 0; i < 16; i++, var_r29++, temp_r31++) { *var_r29 = *temp_r31; } @@ -331,14 +337,16 @@ static int e_wb_lr_wall_check(e_wb_class* i_this) { cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); pos1.x = -400.0f; pos1.y = 300.0f; - pos1.z = 400.0f; + pos1.z = 400.0f + BREG_F(11); MtxPosition(&pos1, &pos3); pos3 += a_this->current.pos; linChk.Set(&pos2, &pos3, a_this); + fopAc_ac_c* r30; if (dComIfG_Bgsp().LineCross(&linChk)) { - if (fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(linChk)) == PROC_BG) { + r30 = dComIfG_Bgsp().GetActorPointer(linChk); + if (fopAcM_GetName(r30) == PROC_BG) { return -1; } } @@ -348,7 +356,8 @@ static int e_wb_lr_wall_check(e_wb_class* i_this) { pos3 += a_this->current.pos; if (dComIfG_Bgsp().LineCross(&linChk)) { - if (fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(linChk)) == PROC_BG) { + r30 = dComIfG_Bgsp().GetActorPointer(linChk); + if (fopAcM_GetName(r30) == PROC_BG) { return 1; } } @@ -357,7 +366,6 @@ static int e_wb_lr_wall_check(e_wb_class* i_this) { } static int daE_WB_Draw(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; static _GXColor l_color = { 0x14, 0x0F, @@ -365,12 +373,12 @@ static int daE_WB_Draw(e_wb_class* i_this) { 0xFF, }; f32 fVar9; - int local_74; - int local_78; + if (i_this->field_0x1430 != 0 || i_this->mActionID == ACT_EVENT) { return 1; } + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; cXyz local_3c; cXyz local_48; @@ -385,17 +393,16 @@ static int daE_WB_Draw(e_wb_class* i_this) { a_this->current.pos.z); if (i_this->field_0x79d != 0) { - fVar9 = a_this->scale.z * 1000.0f; + fVar9 = a_this->scale.z * 1000.0f + BREG_F(19); } else { - fVar9 = a_this->scale.z * 800.0f; + fVar9 = a_this->scale.z * 800.0f + BREG_F(19); } - fVar9 += BREG_F(0x13); i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &cStack_54, fVar9, 0.0f, a_this->current.pos.y, i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, - &a_this->tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); + &i_this->mEnemy.tevStr, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex()); if (l_HIO.mNoReins == 0) { MTXCopy(model->getAnmMtx((i_this->field_0x688 + 0xb) + YREG_S(3)), *calc_mtx); @@ -419,13 +426,13 @@ static int daE_WB_Draw(e_wb_class* i_this) { } } - local_3c.x = YREG_F(0) + 80.0f; - local_3c.y = YREG_F(1) - 20.0f; + local_3c.x = 80.0f + YREG_F(0); + local_3c.y = -20.0f + YREG_F(1); if (i_this->field_0x79d != 0) { - local_3c.z = YREG_F(2) + 47.0f; + local_3c.z = 47.0f + YREG_F(12); } else { - local_3c.z = YREG_F(0xc) + 42.0f; + local_3c.z = 42.0f + YREG_F(2); } MtxPosition(&local_3c, &local_48); @@ -437,30 +444,33 @@ static int daE_WB_Draw(e_wb_class* i_this) { if (cVar7 != 0) { cXyz local_60; - + daAlink_c* sp10; + int spc; + int sp8; if (daAlink_getAlinkActorClass()->checkBoarRideOwn(a_this)) { - daAlink_getAlinkActorClass()->getHorseReinHandPos(&local_60, &local_48); + sp10 = daAlink_getAlinkActorClass(); + sp10->getHorseReinHandPos(&local_60, &local_48); i_this->field_0x1438[0] = local_48; i_this->field_0x1438[1] = local_60; } else { if (pfVar4->mBossMode != 0) { - local_78 = 0xf; - local_74 = 0x14; + sp8 = 0xf; + spc = 0x14; } else { - local_78 = 0x13; - local_74 = 0x18; + sp8 = 0x13; + spc = 0x18; } - MTXCopy(model->getAnmMtx(local_74), *calc_mtx); - local_3c.x = PREG_F(0xd) + 15.0f; - local_3c.y = PREG_F(0xe); - local_3c.z = PREG_F(0xf); + MTXCopy(model->getAnmMtx(spc), *calc_mtx); + local_3c.x = XREG_F(13) + 15.0f; + local_3c.y = XREG_F(14); + local_3c.z = XREG_F(15); MtxPosition(&local_3c, &local_48); - MTXCopy(model->getAnmMtx(local_78), *calc_mtx); - local_3c.x = PREG_F(0x10) + 15.0f; - local_3c.y = PREG_F(0x11); - local_3c.z = PREG_F(0x12); + MTXCopy(model->getAnmMtx(sp8), *calc_mtx); + local_3c.x = XREG_F(16) + 15.0f; + local_3c.y = XREG_F(17); + local_3c.z = XREG_F(18); MtxPosition(&local_3c, &local_60); } @@ -516,7 +526,7 @@ static s16 e_wb_wall_check(e_wb_class* i_this) { cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); local_a0.x = 10.0f; local_a0.y = 120.0f; - local_a0.z = 250.0f; + local_a0.z = 250.0f + BREG_F(8); MtxPosition(&local_a0, &cStack_b8); cStack_b8 += a_this->current.pos; cStack_ac = a_this->current.pos; @@ -586,33 +596,30 @@ static s8 gake_check(e_wb_class* i_this) { cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); local_7c.x = 500.0f; local_7c.y = 1000.0f; - local_7c.z = JREG_F(0) + 1000.0f; + local_7c.z = 1000.0f + WREG_F(0); MtxPosition(&local_7c, &cStack_88); cStack_88 += a_this->current.pos; dStack_70.SetPos(&cStack_88); - f32 ground_cross = dComIfG_Bgsp().GroundCross(&dStack_70); - if (a_this->current.pos.y - ground_cross > 2000.0f) { + if (a_this->current.pos.y - dComIfG_Bgsp().GroundCross(&dStack_70) > 2000.0f) { return 1; } else { local_7c.x = -500.0f; MtxPosition(&local_7c, &cStack_88); cStack_88 += a_this->current.pos; dStack_70.SetPos(&cStack_88); - ground_cross = dComIfG_Bgsp().GroundCross(&dStack_70); - if (a_this->current.pos.y - ground_cross > 2000.0f) { + if (a_this->current.pos.y - dComIfG_Bgsp().GroundCross(&dStack_70) > 2000.0f) { return 1; } else { local_7c.x = 0.0f; local_7c.y = 1000.0f; - local_7c.z = JREG_F(1) + 2000.0f; + local_7c.z = 2000.0f + WREG_F(1); MtxPosition(&local_7c, &cStack_88); cStack_88 += a_this->current.pos; dStack_70.SetPos(&cStack_88); - ground_cross = dComIfG_Bgsp().GroundCross(&dStack_70); - if (a_this->current.pos.y - ground_cross > 2000.0f) { + if (a_this->current.pos.y - dComIfG_Bgsp().GroundCross(&dStack_70) > 2000.0f) { return 1; } else { return 0; @@ -673,7 +680,6 @@ static int e_wb_saku_check_sub(e_wb_class* i_this, s16 param_1) { cXyz cStack_124; f32 iVar2 = (i_this->field_0x68e & 7) * 400.0f; - f32 local_38 = 176.0f; cMtx_YrotS(*calc_mtx, a_this->shape_angle.y + param_1); local_10c.x = 0.0f; @@ -699,6 +705,7 @@ static int e_wb_saku_check_sub(e_wb_class* i_this, s16 param_1) { } static int e_wb_saku_check(e_wb_class* i_this) { + e_wb_class* unused = i_this; int uVar2 = false; static s16 yaa[3] = {0, -4096, 4096}; static u32 saku_bit[3] = {1, 2, 4}; @@ -714,6 +721,7 @@ static int e_wb_saku_check(e_wb_class* i_this) { static void e_wb_wait(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + cXyz unused1, unused2; switch (i_this->mActionMode) { case 0: anm_init(i_this, 0x25, 3.0f, 2, 1.0f); @@ -725,7 +733,7 @@ static void e_wb_wait(e_wb_class* i_this) { } else { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); i_this->mActionMode = 2; - i_this->mStatusFlags |= 0x20; + i_this->mStatusFlags |= (u16)0x20; } case 2: default: @@ -734,6 +742,7 @@ static void e_wb_wait(e_wb_class* i_this) { } static void e_wb_ride(e_wb_class* i_this) { + e_wb_class* unused = i_this; switch (i_this->mActionMode) { case 0: anm_init(i_this, 0x1f, 3.0f, 0, 1.0f); @@ -766,18 +775,21 @@ static void e_wb_pl_ride(e_wb_class* i_this) { anm_init(i_this, 0x20, 2.0f, 2, 2.0f); a_this->speedF = 1.0; } else { - if (!i_this->mpModelMorf->checkFrame(22.0f) && - !i_this->mpModelMorf->checkFrame(42.0)) + if (i_this->mpModelMorf->checkFrame(22.0f) || i_this->mpModelMorf->checkFrame(42.0)) { - return; + dComIfGp_getVibration().StartShock(5, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } - - dComIfGp_getVibration().StartShock(5, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); return; } } - - if ((i_this->field_0x1432 & 7) == 0) { + if ( +#if PLATFORM_GCN + (i_this->field_0x1432 & 0x7) == 0 +#else + (i_this->field_0x1432 & 0xf) == 0 +#endif + ) + { dComIfGp_getVibration().StartShock(3, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } } else { @@ -793,6 +805,7 @@ static void e_wb_pl_ride(e_wb_class* i_this) { if (a_this->speedF > 10.0f) { i_this->mMovementType = 2; } + return; } else { f32 stick_value = mDoCPd_c::getStickValue(0); if (daAlink_getAlinkActorClass()->checkHorseGetOffMode()) { @@ -861,8 +874,8 @@ static void e_wb_pl_ride(e_wb_class* i_this) { } // Bulblin Camp, Outside Arbiter's Grounds Room - if (strcmp(dComIfGp_getStartStageName(), "F_SP118") == 0 && fopAcM_GetRoomNo(a_this) == 3 && - dComIfGp_event_runCheck() || + if ((strcmp(dComIfGp_getStartStageName(), "F_SP118") == 0 && + fopAcM_GetRoomNo(a_this) == 3 && dComIfGp_event_runCheck()) || dComIfGp_checkPlayerStatus0(0, 0x2000)) { fVar2 = 0.0f; @@ -877,14 +890,14 @@ static void e_wb_pl_ride(e_wb_class* i_this) { i_this->mTurnStep = 0; } else { s16 local_94 = 0; - s16 local_96 = KREG_S(3) + 0x40; + s16 local_96 = 0x40 + KREG_S(3); if (iVar4 == 2) { - local_94 = KREG_S(2) + 0x300; + local_94 = 0x300 + KREG_S(2); } else if (iVar4 == 3) { - local_94 = -KREG_S(2) - 0x300; + local_94 = -(0x300 + KREG_S(2)); } else { - local_96 = KREG_S(4) + 0x10; + local_96 = 0x10 + KREG_S(4); } cLib_addCalcAngleS2(&i_this->mTurnStep, local_94, 4, local_96); @@ -897,8 +910,8 @@ static void e_wb_pl_ride(e_wb_class* i_this) { if (fVar10 > NREG_F(0x11) + 4500.0f) { fVar10 = NREG_F(0x11) + 4500.0f; - } else if (fVar10 < -NREG_F(0x11) - 4500.0f) { - fVar10 = -NREG_F(0x11) - 4500.0f; + } else if (fVar10 < -(4500.0f + NREG_F(0x11))) { + fVar10 = -(4500.0f + NREG_F(0x11)); } cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, (s16)fVar10, 8, 0x140); @@ -919,16 +932,12 @@ static void e_wb_pl_ride(e_wb_class* i_this) { anm_init(i_this, 0x28, 5.0f, 2, 1.5f); } } - } else { - fVar11 = fabsf(a_this->speedF); - - if (fVar11 < 0.01f) { - if (i_this->mAnmID != 0x2a) { - anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - } - } else { - cLib_chaseF(&a_this->speedF, 0.0f, 0.5f); + } else if (fabsf(a_this->speedF) < 0.01f) { + if (i_this->mAnmID != 0x2a) { + anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); } + } else { + cLib_chaseF(&a_this->speedF, 0.0f, 0.5f); } } else { i_this->mWaitRollAngle = 0; @@ -993,7 +1002,7 @@ static void e_wb_f_wait(e_wb_class* i_this) { } else { anm_init(i_this, 0x28, 5.0f, 2, 1.5f); i_this->mActionMode = 1; - i_this->mStatusFlags |= 4; + i_this->mStatusFlags |= (u16)4; } // fallthrough case 1: @@ -1075,8 +1084,11 @@ static int pl_pass_check(e_wb_class* i_this, f32 param_1) { cMtx_YrotS(*calc_mtx, -player->shape_angle.y); MtxPosition(&pos_delta, &cStack_24); - - return cStack_24.z > param_1; + if (cStack_24.z > param_1) { + return 1; + } else { + return 0; + } } static void e_wb_f_run(e_wb_class* i_this) { @@ -1092,8 +1104,8 @@ static void e_wb_f_run(e_wb_class* i_this) { i_this->mActionMode = 0; } else { e_rd_class* local_90 = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); - int local_94 = e_wb_saku_check(i_this); - if (local_94 != 0) { + int local_94; + if (local_94 = e_wb_saku_check(i_this)) { i_this->field_0x6d4 = 60; if ((local_94 & 2) != 0) { i_this->field_0x6d6 = 0x3000; @@ -1117,28 +1129,28 @@ static void e_wb_f_run(e_wb_class* i_this) { anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); i_this->mActionMode = 1; i_this->mAnimDuration = 40.0f; - i_this->mStatusFlags |= 8; + i_this->mStatusFlags |= (u16)8; } else { i_this->field_0x7a6 = 0; anm_init(i_this, 0x20, 5.0f, 2, 1.0f); i_this->mpModelMorf->setFrame(cM_rndF(10.0f)); i_this->mActionMode = 2; - i_this->mStatusFlags |= 0x10; + i_this->mStatusFlags |= (u16)0x10; i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); } break; case 1: if (i_this->mpModelMorf->checkFrame(3.0f)) { - i_this->mCollisionFlags |= 2; + i_this->mCollisionFlags |= (u8)2; i_this->mMovementType = 10; } else if (i_this->mpModelMorf->checkFrame(15.0f)) { - i_this->mCollisionFlags |= 3; + i_this->mCollisionFlags |= (u8)3; } if (i_this->mpModelMorf->isStop()) { anm_init(i_this, 0x20, 5.0f, 2, 1.0f); i_this->mActionMode = 2; - i_this->mStatusFlags |= 0x10; + i_this->mStatusFlags |= (u16)0x10; i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); } break; @@ -1171,17 +1183,18 @@ static void e_wb_f_run(e_wb_class* i_this) { } if (pl_pass_check(i_this, i_this->field_0x7a8)) { - dVar16 *= 0.95f; + dVar16 *= 0.95f + TREG_F(7); uVar15 = 0.5f; } else { - dVar16 *= 1.35f; + dVar16 *= 1.35f + TREG_F(8); uVar15 = 0.5f; } local_a4 = 0x200; } if (local_90 != NULL && local_90->mAnmID == 0x27) { - i_this->field_0x6d6 = 5000.0f * cM_ssin(i_this->field_0x68e * 1000); + i_this->field_0x6d6 = + (5000.0f + BREG_F(16)) * cM_ssin(i_this->field_0x68e * (1000 + BREG_S(7))); local_a4 = 0x400; } @@ -1221,7 +1234,7 @@ static void e_wb_f_run(e_wb_class* i_this) { dVar16 = l_HIO.max_speed; uVar15 = 3.0f; if (i_this->field_0x698[0] == 15) { - i_this->mStatusFlags |= 0x20; + i_this->mStatusFlags |= (u16)0x20; } if (i_this->field_0x698[0] == 0) { @@ -1246,10 +1259,10 @@ static void e_wb_f_run(e_wb_class* i_this) { } cLib_addCalc2(&a_this->speedF, dVar16, 1.0f, uVar15); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, (-8) * (a_this->current.angle.y - sVar2), 8, - 0x200); + s16 spA = (-8 + TREG_S(7)) * (a_this->current.angle.y - sVar2); + cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, spA, 8, 0x200); if (i_this->mActionMode < 4 && i_this->mSpeedCapTimer > 0) { - i_this->mStatusFlags |= 0x20; + i_this->mStatusFlags |= (u16)0x20; anm_init(i_this, 0x25, 3.0f, 2, 1.0f); if (a_this->speedF > 30.0f) { a_this->speedF = 30.0f; @@ -1260,13 +1273,14 @@ static void e_wb_f_run(e_wb_class* i_this) { } static void* s_wbstart_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB && - static_cast(i_actor)->field_0x79d == 0) - { - static_cast(i_actor)->field_0x7a6 = 1; - static_cast(i_actor)->field_0x7a7 = 1; + UNUSED(i_data); + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + e_wb_class* wb = static_cast(i_actor); + if (wb->field_0x79d == 0) { + wb->field_0x7a6 = 1; + wb->field_0x7a7 = 1; + } } - return NULL; } @@ -1277,7 +1291,7 @@ static void e_wb_b_wait(e_wb_class* i_this) { if (i_this->field_0x79c != 0) { i_this->field_0x79c--; if (i_this->field_0x79c == 0) { - fpcM_Search(s_wbstart_sub, a_this); + fpcM_Search(s_wbstart_sub, i_this); } } @@ -1286,7 +1300,7 @@ static void e_wb_b_wait(e_wb_class* i_this) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); i_this->mActionMode = 1; i_this->field_0x698[0] = cM_rndF(100.0f) + 100.0f; - i_this->mStatusFlags |= 0x20; + i_this->mStatusFlags |= (u16)0x20; // fallthrough case 1: if (i_this->field_0x698[0] == 0 && i_this->mPathInitialized != 0) { @@ -1331,22 +1345,23 @@ static void e_wb_b_run2(e_wb_class* i_this) { f32 fVar10 = 0.0f; f32 fVar1 = 1.0f; s16 curr_angle = a_this->current.angle.y; + f32 target = 1.0f; switch (i_this->mActionMode) { case 0: anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); i_this->mActionMode = 1; - i_this->mStatusFlags |= 8; + i_this->mStatusFlags |= (u16)8; i_this->mAnimDuration = 40.0f; i_this->mPlaySpeed = 1.0f; break; case 1: if (i_this->mpModelMorf->checkFrame(3.0f) != 0) { - i_this->mCollisionFlags |= 2; + i_this->mCollisionFlags |= (u8)2; i_this->mMovementType = 10; } else { if (i_this->mpModelMorf->checkFrame(15.0f) != 0) { - i_this->mCollisionFlags |= 3; + i_this->mCollisionFlags |= (u8)3; } } @@ -1430,10 +1445,10 @@ static void e_wb_b_run2(e_wb_class* i_this) { } cLib_addCalc2(&a_this->speedF, fVar10, 1.0f, fVar1); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, -4 * (a_this->current.angle.y - curr_angle), 8, - 0x200); + s16 sp8 = (-4 + TREG_S(7)) * (a_this->current.angle.y - curr_angle); + cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, sp8, 8, 0x200); i_this->mpModelMorf->setPlaySpeed(i_this->mPlaySpeed); - cLib_addCalc2(&i_this->mPlaySpeed, 1.0f, 1.0f, 0.1f); + cLib_addCalc2(&i_this->mPlaySpeed, target, 1.0f, 0.1f); if (dist < 1000.0f) { i_this->mActionID = ACT_B_RUN; @@ -1533,13 +1548,13 @@ static void e_wb_b_run(e_wb_class* i_this) { switch (i_this->mActionMode) { case 0: - i_this->mStatusFlags |= 8; + i_this->mStatusFlags |= (u16)8; case 1: // path initialization i_this->mAnimDuration = 30.0f; i_this->mPlaySpeed = 1.0f; anm_init(i_this, 0x20, 5.0f, 2, 1.0f); i_this->mActionMode = 2; - i_this->mStatusFlags |= 0x10; + i_this->mStatusFlags |= (u16)0x10; i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); if (i_this->mPathInitialized != 0) { @@ -1560,9 +1575,9 @@ static void e_wb_b_run(e_wb_class* i_this) { } else { if (lbl_244_bss_45 == 1) { - i_this->mCurrentPathIndex = 6; + i_this->mCurrentPathIndex = 6 + TREG_S(6); } else { - i_this->mCurrentPathIndex = 2; + i_this->mCurrentPathIndex = 2 + TREG_S(6); } i_this->mPathDirection = 1; @@ -1663,7 +1678,7 @@ static void e_wb_b_run(e_wb_class* i_this) { acceleration = 3.0f; if (i_this->field_0x698[0] == 10) { - i_this->mStatusFlags |= 0x20; + i_this->mStatusFlags |= (u16)0x20; } if (i_this->field_0x698[0] == 0) { @@ -1690,14 +1705,14 @@ static void e_wb_b_run(e_wb_class* i_this) { if (i_this->mAnmID == 0x18) { if (a_this->speed.y < 10.0f) { - anm_init(i_this, 0x19, 10.0f, 0, anim_speed_factor); + anm_init(i_this, 0x19, 10.0f, 0, 1.0f); } } else if (i_this->mAnmID == 0x19) { if (a_this->speed.y < (-30.0f + JREG_F(9)) || i_this->mAcch.ChkGroundHit()) { anm_init(i_this, 0x1a, 2.0f, 0, 1.0f); - i_this->mCollisionFlags |= 0xc; + i_this->mCollisionFlags |= (u8)0xc; i_this->mLandingFlag = 1; - i_this->mStatusFlags |= 0x200; + i_this->mStatusFlags |= (u16)0x200; } } else if (i_this->mAnmID == 0x1a) { i_this->mMovementType = 1; @@ -1721,9 +1736,9 @@ static void e_wb_b_run(e_wb_class* i_this) { if (a_this->speedF >= 30.0f && i_this->mAcch.ChkGroundHit()) { if (i_this->mAcch.ChkWallHit() || e_wb_saku_jump_check(i_this)) { i_this->mActionMode = 10; - a_this->speed.y = 55.0f; + a_this->speed.y = 55.0f + WREG_F(1); anm_init(i_this, 0x18, 2.0f, 0, 1.0f); - i_this->mStatusFlags |= 0x100; + i_this->mStatusFlags |= (u16)0x100; } } } @@ -1774,16 +1789,16 @@ static cXyz saku_p(34800.0f, 0.0f, -14900.0f); static cXyz saku_p2(34800.0f, 0.0f, -37200.0f); static void e_wb_b_ikki(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; static cXyz ikki_pos[2] = {cXyz(34789.0f, -290.0f, -36200.0f), cXyz(34789.0f, -290.0f, -16600.0f)}; + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; fopAc_ac_c* local_ac = dComIfGp_getPlayer(0); cXyz local_88; cXyz local_94; f32 dVar14 = fopAcM_searchPlayerDistanceXZ(a_this); - s16 sVar11 = fopAcM_searchPlayerAngleY(a_this); - sVar11 = sVar11 - a_this->current.angle.y; + s16 sVar11_ = fopAcM_searchPlayerAngleY(a_this); + s16 sVar11 = sVar11_ - a_this->current.angle.y; f32 dVar17 = 0.0; f32 dVar16 = 1.0; s16 local_d6 = 0x400; @@ -1794,35 +1809,35 @@ static void e_wb_b_ikki(e_wb_class* i_this) { case -100: anm_init(i_this, 0x27, 5.0f, 2, 1.0f); i_this->mActionMode = -99; - i_this->mStatusFlags |= 0x400; + i_this->mStatusFlags |= (u16)0x400; break; case -99: if (i_this->mpModelMorf->checkFrame(10.0f) || i_this->mpModelMorf->checkFrame(31.0f)) { - i_this->mCollisionFlags |= 1; + i_this->mCollisionFlags |= (u8)1; i_this->mMovementType = 10; } break; case -98: anm_init(i_this, 0x26, 10.0f, 0, 1.0f); i_this->mActionMode = 0xff9f; - i_this->mStatusFlags |= 0x800; + i_this->mStatusFlags |= (u16)0x800; break; case -97: if (i_this->mpModelMorf->checkFrame(38.0f) || i_this->mpModelMorf->checkFrame(50.0f) || i_this->mpModelMorf->checkFrame(65.0f) || i_this->mpModelMorf->checkFrame(108.0f)) { - i_this->mCollisionFlags |= 1; + i_this->mCollisionFlags |= (u8)1; i_this->mMovementType = 10; } else if (i_this->mpModelMorf->checkFrame(82.0f)) { - i_this->mCollisionFlags |= 3; + i_this->mCollisionFlags |= (u8)3; } else if (i_this->mpModelMorf->checkFrame(106.0f)) { - i_this->mCollisionFlags |= 2; + i_this->mCollisionFlags |= (u8)2; i_this->mMovementType = 10; } if (local_b0 >= 0x70) { if (local_b0 == 0x70) { - i_this->mStatusFlags |= 0x10; + i_this->mStatusFlags |= (u16)0x10; i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); i_this->mAnimDuration = 40.0f; @@ -1854,7 +1869,7 @@ static void e_wb_b_ikki(e_wb_class* i_this) { case 2: if (!i_this->field_0x5bf) { anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); - i_this->mStatusFlags |= 8; + i_this->mStatusFlags |= (u16)8; i_this->mAnimDuration = 40.0f; i_this->field_0x5c4 = ikki_pos[i_this->mCurrentPathIndex]; i_this->mActionMode = 3; @@ -1862,16 +1877,16 @@ static void e_wb_b_ikki(e_wb_class* i_this) { break; case 3: if (i_this->mpModelMorf->checkFrame(3.0f)) { - i_this->mCollisionFlags |= 2; + i_this->mCollisionFlags |= (u8)2; i_this->mMovementType = 10; } else if (i_this->mpModelMorf->checkFrame(15.0)) { - i_this->mCollisionFlags |= 3; + i_this->mCollisionFlags |= (u8)3; } if (i_this->mpModelMorf->isStop()) { anm_init(i_this, 0x20, 5.0f, 2, 1.0f); i_this->mActionMode = 4; - i_this->mStatusFlags |= 0x10; + i_this->mStatusFlags |= (u8)0x10; i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); i_this->field_0x1690 = 0; } @@ -1880,8 +1895,10 @@ static void e_wb_b_ikki(e_wb_class* i_this) { dVar17 = l_HIO.mSingleRiderSpeed; dVar16 = 5.0f; i_this->mMovementType = 1; - if (sVar11 < 0x3000 && sVar11 > -0x3000 && dVar14 < 4000.0f && dVar14 > 600.0f) { - i_this->field_0x6dc = 13; + if (sVar11 < 0x3000 && sVar11 > -0x3000 && dVar14 < 4000.0f + VREG_F(16) && + dVar14 > 600.0f + VREG_F(17)) + { + i_this->field_0x6dc = 13 + VREG_S(5); } else if (sVar11 < 0x800 && sVar11 > -0x800) { i_this->field_0x6da = 1; } else if (sVar11 > 0) { @@ -1889,8 +1906,8 @@ static void e_wb_b_ikki(e_wb_class* i_this) { } else { i_this->field_0x6da = 2; } - f32 fVar1; f32 fVar2; + f32 fVar1; if (i_this->mLapCount == 0) { fVar2 = l_HIO.mSearchIgnoreDistance2; fVar1 = l_HIO.mGuidanceDisplayDistance2; @@ -1898,7 +1915,6 @@ static void e_wb_b_ikki(e_wb_class* i_this) { fVar2 = l_HIO.mSearchIgnoreDistance1; fVar1 = l_HIO.mGuidanceDisplayDistance1; } - f32 dVar15 = fVar1; if (sVar11 < 0x3000 && sVar11 > -0x3000) { if (dVar14 > fVar2) { @@ -1907,29 +1923,28 @@ static void e_wb_b_ikki(e_wb_class* i_this) { cLib_addCalc2(&i_this->field_0x1690, 0.6f, 1.0f, 0.06f); cMtx_YrotS(*calc_mtx, a_this->current.angle.y); local_88.x = a_this->current.pos.x - local_ac->current.pos.x; - local_88.z = 0.0f; - local_88.y = 0.0f; + local_88.y = local_88.z = 0.0f; MtxPosition(&local_88, &local_94); - local_d8 = local_94.x * -20.0f; + local_d8 = local_94.x * (-20.0f + XREG_F(12)); if (local_d8 > 0x1000) { local_d8 = 0x1000; } else if (local_d8 < -0x1000) { local_d8 = -0x1000; } } - if (dVar14 < dVar15) { + if (dVar14 < fVar1) { daPy_getPlayerActorClass()->onSingleBoarAvoid(); } } local_88 = i_this->field_0x5c4 - a_this->current.pos; - i_this->mTargetFacingAngle = cM_atan2s(local_88.x, local_88.z); - if (local_88.abs() < 600.0f) { + i_this->mTargetFacingAngle = (s16)cM_atan2s(local_88.x, local_88.z); + if (local_88.abs() < 600.0f + AREG_F(8)) { anm_init(i_this, 0x25, 3.0f, 2, 1.0f); i_this->mActionMode = 5; - i_this->mStatusFlags |= 0x20; + i_this->mStatusFlags |= (u16)0x20; } - local_d6 = 0x800; + local_d6 = 0x800 + XREG_S(1); break; } case 5: @@ -1939,7 +1954,7 @@ static void e_wb_b_ikki(e_wb_class* i_this) { } else if (a_this->speedF < 1.0f) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); i_this->mActionMode = 6; - i_this->mTargetFacingAngle -= 0x8000; + i_this->mTargetFacingAngle += (s16)0x8000; } break; case 6: @@ -2039,15 +2054,16 @@ static void e_wb_b_ikki_end(e_wb_class* i_this) { } static void e_wb_b_ikki2(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; static cXyz ikki2_pos[2] = {cXyz(-93620.0f, -5750.0f, 48944.0f), cXyz(-93620.0f, -5750.0f, 28423.0f)}; + fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; fopAc_ac_c* player = dComIfGp_getPlayer(0); cXyz local_78; cXyz local_84; f32 dist = fopAcM_searchPlayerDistanceXZ(a_this); - s16 angle_diff = fopAcM_searchPlayerAngleY(a_this) - a_this->current.angle.y; + s16 angle_diff_ = fopAcM_searchPlayerAngleY(a_this); + s16 angle_diff = angle_diff_ - a_this->current.angle.y; f32 target_speed = 0.0f; f32 speed_step = 1.0f; s16 turn_speed = 0x400; @@ -2065,19 +2081,19 @@ static void e_wb_b_ikki2(e_wb_class* i_this) { i_this->mActionMode = 0xff9d; anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); } - break; - } + } break; case -99: { - a_this->current.angle.y = 0x58f0; + a_this->current.angle.y = 0x58f0 + JREG_S(7); turn_speed = 0; - local_b6 = 0; int local_a4 = dComIfGp_getEventManager().getMyStaffId("RiderBoss", NULL, 0); - if (local_a4 != -1 && dComIfGp_evmng_getMyIntegerP(local_a4, "action") != 0) { - rider->mMode = 2; - i_this->mActionMode = -98; + if (local_a4 != -1 ) { + int* p = dComIfGp_evmng_getMyIntegerP(local_a4, "action"); + if (p) { + rider->mMode = 2; + i_this->mActionMode = -98; + } } - break; - } + } break; case -98: turn_speed = 0; break; @@ -2098,40 +2114,42 @@ static void e_wb_b_ikki2(e_wb_class* i_this) { case 2: if (!i_this->field_0x5bf) { anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); - i_this->mStatusFlags |= 8; + i_this->mStatusFlags |= (u16)8; i_this->mAnimDuration = 40.0f; i_this->field_0x5c4 = ikki2_pos[i_this->mCurrentPathIndex]; i_this->mActionMode = 3; } break; - case 3: - if (frame < 15) { + case 3: { + if (frame < 15 + JREG_S(4)) { turn_speed = 0; } if (i_this->mpModelMorf->checkFrame(3.0f)) { - i_this->mCollisionFlags |= 2; + i_this->mCollisionFlags |= (u8)2; i_this->mMovementType = 10; } else if (i_this->mpModelMorf->checkFrame(15.0f)) { - i_this->mCollisionFlags |= 3; + i_this->mCollisionFlags |= (u8)3; } if (i_this->mpModelMorf->isStop()) { anm_init(i_this, 0x20, 5.0f, 2, 1.0f); i_this->mActionMode = 4; - i_this->mStatusFlags |= 0x10; + i_this->mStatusFlags |= (u8)0x10; i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); i_this->field_0x1690 = 0.0f; } - break; + } break; - case 4: + case 4: { target_speed = l_HIO.mSingleRiderSpeed; speed_step = 5.0f; i_this->mMovementType = 1; - if (angle_diff < 0x3000 && angle_diff > -0x3000 && dist < 4000.0f && dist > 600.0f) { - i_this->field_0x6dc = 13; + if (angle_diff < 0x3000 && angle_diff > -0x3000 && dist < 4000.0f + VREG_F(16) && + dist > 600.0f + VREG_F(17)) + { + i_this->field_0x6dc = 13 + VREG_S(5); } else if (angle_diff < 0x800 && angle_diff > -0x800) { i_this->field_0x6da = 1; } else if (angle_diff > 0) { @@ -2158,11 +2176,10 @@ static void e_wb_b_ikki2(e_wb_class* i_this) { cMtx_YrotS(*calc_mtx, a_this->current.angle.y); local_78.x = a_this->current.pos.x - player->current.pos.x; - local_78.z = 0.0f; - local_78.y = 0.0f; + local_78.y = local_78.z = 0.0f; MtxPosition(&local_78, &local_84); - local_b8 = (s16)(local_84.x * -20.0f); + local_b8 = (s16)(local_84.x * (-20.0f + XREG_F(12))); if (local_b8 > 0x1000) { local_b8 = 0x1000; } else if (local_b8 < -0x1000) { @@ -2176,33 +2193,34 @@ static void e_wb_b_ikki2(e_wb_class* i_this) { } local_78 = i_this->field_0x5c4 - a_this->current.pos; - i_this->mTargetFacingAngle = cM_atan2s(local_78.x, local_78.z); + i_this->mTargetFacingAngle = (s16)cM_atan2s(local_78.x, local_78.z); if (i_this->mLapCount >= 2) { - i_this->mTargetFacingAngle += (s16)(2500.0f * cM_ssin(i_this->field_0x68e * 800)); + i_this->mTargetFacingAngle += + (s16)(cM_ssin(i_this->field_0x68e * (800 + KREG_S(4))) * (2500.0f + BREG_F(16))); } - if (local_78.abs() < 700.0f) { + if (local_78.abs() < 700.0f + AREG_F(8)) { anm_init(i_this, 0x25, 3.0f, 2, 1.0f); i_this->mActionMode = 5; - i_this->mStatusFlags |= 0x20; + i_this->mStatusFlags |= (u16)0x20; } - turn_speed = 0x800; - break; + turn_speed = 0x800 + XREG_S(1); + } break; - case 5: + case 5: { if (a_this->speedF > 15.0f) { i_this->mMovementType = 2; i_this->mZ2Ride.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); } else if (a_this->speedF < 1.0f) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); i_this->mActionMode = 6; - i_this->mTargetFacingAngle -= 0x8000; + i_this->mTargetFacingAngle += (s16)0x8000; } - break; + } break; - case 6: + case 6: { turn_speed = 0x200; i_this->field_0x6d0 = i_this->mTargetFacingAngle - a_this->current.angle.y; @@ -2212,7 +2230,7 @@ static void e_wb_b_ikki2(e_wb_class* i_this) { } else if (i_this->mAnmID != 0x28) { anm_init(i_this, 0x28, 5.0f, 2, 1.5f); } - break; + } break; } cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 2, turn_speed); @@ -2253,7 +2271,7 @@ static void e_wb_b_ikki2_end(e_wb_class* i_this) { i_this->field_0x68e = 0; // fallthrough case 1: - if (i_this->field_0x68e > 170 && i_this->mAcch.ChkWallHit()) { + if (i_this->field_0x68e > (s16)(170 + KREG_S(6)) && i_this->mAcch.ChkWallHit()) { i_this->mActionID = ACT_BG_DAMAGE; i_this->mActionMode = 0; i_this->mAnimDuration = 50.0f; @@ -2266,21 +2284,21 @@ static void e_wb_b_ikki2_end(e_wb_class* i_this) { a_this->speedF = l_HIO.mSingleRiderSpeed; - if (i_this->field_0x68e == 180) { - i_this->field_0x7ac.SetWall(100.0f, 300.0f + BREG_F(11)); + if (i_this->field_0x68e == (s16)(180 + KREG_S(7))) { + i_this->field_0x7ac.SetWall(100.0f, 300.0f + BREG_F(8)); } s16 angle_offset; - if (i_this->field_0x68e > 170) { + if (i_this->field_0x68e > (s16)(170 + KREG_S(6))) { angle_offset = -15000; } else { - angle_offset = (s16)(3000.0f * cM_ssin(i_this->field_0x68e * 1000)); + angle_offset = (s16)(3000.0f * cM_ssin(i_this->field_0x68e * (1000 + KREG_S(4)))); } s16 curr_angle = a_this->current.angle.y; cLib_addCalcAngleS2(&a_this->current.angle.y, angle_offset + 0x8000, 2, 0x800); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, -13 * (a_this->current.angle.y - curr_angle), 8, - 0x800); + s16 r26 = (TREG_S(7) - 13) * (a_this->current.angle.y - curr_angle); + cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, r26, 8, 0x800); } static void e_wb_b_lv9_end(e_wb_class* i_this) { @@ -2305,21 +2323,21 @@ static void e_wb_b_lv9_end(e_wb_class* i_this) { case 1: if (i_this->field_0x698[0] == 0) { i_this->mActionMode = 2; - i_this->field_0x698[0] = NREG_S(0) + 65; + i_this->field_0x698[0] = KREG_S(6) + 65; } break; case 2: - target_speed = NREG_F(12) + 15.0f; + target_speed = KREG_F(6) + 15.0f; if (i_this->field_0x698[0] == 0) { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); i_this->mActionMode = 3; - i_this->mStatusFlags |= 8; + i_this->mStatusFlags |= (u16)8; i_this->field_0x698[0] = 40; } break; case 3: if (i_this->field_0x698[0] == 1) { - i_this->mStatusFlags |= 8; + i_this->mStatusFlags |= (u16)8; } break; case 4: @@ -2334,7 +2352,7 @@ static void e_wb_b_lv9_end(e_wb_class* i_this) { } break; case 6: - target_speed = NREG_F(13) + 40.0f; + target_speed = KREG_F(7) + 40.0f; speed_step = 5.0f; if (i_this->field_0x698[0] < 30) { i_this->mMovementType = 1; @@ -2349,16 +2367,17 @@ static void e_wb_b_lv9_end(e_wb_class* i_this) { cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, speed_step); cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 4, 0x100); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, - (NREG_S(0) + -8) * (a_this->current.angle.y - curr_angle), 8, 0x200); + s16 sp8 = (TREG_S(7) + -8) * (a_this->current.angle.y - curr_angle); + cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, sp8, 8, 0x200); } static void e_wb_a_run(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + cXyz sp18, spC; s16 curr_angle_y = a_this->current.angle.y; - s16 f5b4 = i_this->mActionMode; + s16 r27; - switch (f5b4) { + switch (i_this->mActionMode) { case 0: anm_init(i_this, 0x20, 5.0f, 2, 1.399999976158142f); i_this->mActionMode = 1; @@ -2381,8 +2400,8 @@ static void e_wb_a_run(e_wb_class* i_this) { default: cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 8, 0x800); cLib_addCalc2(&a_this->speedF, l_HIO.max_speed * 1.2f, 1.0f, 2.0f); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, (a_this->current.angle.y - curr_angle_y) * -8, - 8, 0x200); + r27 = (TREG_S(7) - 8) * (a_this->current.angle.y - curr_angle_y); + cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, r27, 8, 0x200); } } @@ -2439,7 +2458,7 @@ static void e_wb_s_damage(e_wb_class* i_this) { } static int e_wb_damage(e_wb_class* i_this) { - fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; + fopEn_enemy_c* a_this = &i_this->mEnemy; cXyz local_2c; cXyz local_38; @@ -2448,22 +2467,22 @@ static int e_wb_damage(e_wb_class* i_this) { switch (i_this->mActionMode) { case 0: - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(a_this), 5); + dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(&i_this->mEnemy), 5); anm_init(i_this, 8, 1.0f, 0, 1.0f); i_this->mActionMode = 1; - a_this->speedF = -15.0f; - a_this->speed.y = 50.0f + cM_rndF(20.0f); + a_this->speedF = -15.0f + YREG_F(0); + a_this->speed.y = 50.0f + YREG_F(1) + cM_rndF(20.0f); a_this->current.angle.y += (s16)cM_rndFX(3000.0f); - i_this->mStatusFlags |= 0x40; + i_this->mStatusFlags |= (u16)0x40; break; case 1: if (i_this->mAcch.ChkGroundHit()) { i_this->mActionMode = 2; a_this->speedF *= 0.5f; - a_this->speed.y = 40.0f; + a_this->speed.y = 40.0f + YREG_F(2); anm_init(i_this, 0x22, 2.0f, 0, 1.0f); - i_this->field_0x6b6 = (s16)cM_rndFX(2000.0f); + i_this->field_0x6b4.y = (s16)cM_rndFX(2000.0f + YREG_F(4)); } break; @@ -2493,7 +2512,7 @@ static int e_wb_damage(e_wb_class* i_this) { if (i_this->mAcch.ChkGroundHit()) { a_this->speedF = 0.0f; - cLib_addCalcAngleS2(&i_this->field_0x6b6, 0, 1, 0x96); + cLib_addCalcAngleS2(&i_this->field_0x6b4.y, 0, 1, 0x96 + YREG_S(3)); } if (i_this->field_0x698[0] == 0 && i_this->field_0x6ae.x > -0x200) { @@ -2513,18 +2532,17 @@ static int e_wb_damage(e_wb_class* i_this) { i_this->field_0x6ae.x = 0; a_this->current.angle.y += i_this->field_0x6ae.y; a_this->shape_angle.y = a_this->current.angle.y; - i_this->field_0x6b6 = 0; - i_this->field_0x6ae.y = 0; + i_this->field_0x6ae.y = i_this->field_0x6b4.y = 0; } break; } - i_this->field_0x6ae.y += i_this->field_0x6b6; + i_this->field_0x6ae.y += i_this->field_0x6b4.y; if (i_this->mActionMode >= 3) { cLib_addCalcAngleS2(&i_this->field_0x6ae.x, 0, 1, 0x600); } else { - cLib_addCalcAngleS2(&i_this->field_0x6ae.x, -0x4000, 1, 0x200); + cLib_addCalcAngleS2(&i_this->field_0x6ae.x, -(YREG_S(6) + 0x4000), 1, YREG_S(1) + 0x200); } return local_48; @@ -2532,18 +2550,18 @@ static int e_wb_damage(e_wb_class* i_this) { static int e_wb_bg_damage(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - cXyz local_30; + cXyz local_30, unused; BOOL return_value = FALSE; i_this->field_0x6a0 = 10; switch (i_this->mActionMode) { case 0: - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(a_this), 5); + dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(&i_this->mEnemy), 5); anm_init(i_this, 5, 2.0f, 0, 1.0f); i_this->mActionMode = 1; a_this->speedF = 0.0f; - i_this->mStatusFlags |= 0x80; + i_this->mStatusFlags |= (u16)0x80; i_this->field_0x1432 = 0; break; @@ -2583,61 +2601,56 @@ static int e_wb_lr_damage(e_wb_class* i_this) { i_this->field_0x6a0 = 10; switch (i_this->mActionMode) { - case 0: - { - f32 rnd = cM_rndF(1.0f); - if (rnd < 0.5f || i_this->field_0x1720 != 0) { - anm_init(i_this, 0xc, 2.0f, 0, 1.0f); - i_this->field_0x6e4 = 0; - } else { - anm_init(i_this, 0xd, 2.0f, 0, 1.0f); - i_this->field_0x6e4 = 1; + case 0: { + if (cM_rndF(1.0f) < 0.5f || i_this->field_0x1720 != 0) { + anm_init(i_this, 0xc, 2.0f, 0, 1.0f); + i_this->field_0x6e4 = 0; + } else { + anm_init(i_this, 0xd, 2.0f, 0, 1.0f); + i_this->field_0x6e4 = 1; + } + i_this->mActionMode = 1; + i_this->mStatusFlags |= (u16)0x40; + i_this->field_0x698[0] = (s16)(cM_rndF(60.0f) + 150.0f); + i_this->field_0x698[1] = 15 + TREG_S(5); + + if (i_this->field_0x1720 != 0) { + a_this->speedF = -50.0f + JREG_F(16); + i_this->field_0x6b4.y = JREG_S(7) - 0x640; + } else { + i_this->field_0x6b4.y = (s16)cM_rndFX(a_this->speedF * (50.0f + YREG_F(4))); + } + } break; + + case 1: { + if ((int)i_this->mpModelMorf->getFrame() == 10) { + i_this->mAnimDuration = 40.0f; + i_this->field_0x168a = 4000; + + if (a_this->speedF > 30.0f) { + if (i_this->field_0x6e4 == 0) { + anm_init(i_this, 0xe, 2.0f, 2, 1.0f); + } else { + anm_init(i_this, 0xf, 2.0f, 2, 1.0f); + } + i_this->mActionMode = 2; + a_this->speedF = 30.0f; } - i_this->mActionMode = 1; - i_this->mStatusFlags |= 0x40; - i_this->field_0x698[0] = (s16)(cM_rndF(60.0f) + 150.0f); - i_this->field_0x698[1] = 15; - - if (i_this->field_0x1720 != 0) { - a_this->speedF = -50.0f; - i_this->field_0x6b6 = -0x640; - } else { - i_this->field_0x6b6 = (s16)cM_rndFX(a_this->speedF * 50.0f); - } - } - break; - - case 1: - { - int frame = i_this->mpModelMorf->getFrame(); - if (frame == 10) { - i_this->mAnimDuration = 40.0f; - i_this->field_0x168a = 4000; - - if (a_this->speedF > 30.0f) { - if (i_this->field_0x6e4 == 0) { - anm_init(i_this, 0xe, 2.0f, 2, 1.0f); - } else { - anm_init(i_this, 0xf, 2.0f, 2, 1.0f); - } - i_this->mActionMode = 2; - a_this->speedF = 30.0f; - } - i_this->mLandingFlag = 1; - dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(a_this), 5); - } - - if (i_this->mpModelMorf->isStop()) { - i_this->mActionMode = 3; - if (i_this->mAnmID == 0xc) { - anm_init(i_this, 0x12, 3.0f, 2, 1.0f); - } else if (i_this->mAnmID == 0xd) { - anm_init(i_this, 0x13, 3.0f, 2, 1.0f); - } + i_this->mLandingFlag = 1; + dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(&i_this->mEnemy), 5); + } + + if (i_this->mpModelMorf->isStop()) { + i_this->mActionMode = 3; + if (i_this->mAnmID == 0xc) { + anm_init(i_this, 0x12, 3.0f, 2, 1.0f); + } else if (i_this->mAnmID == 0xd) { + anm_init(i_this, 0x13, 3.0f, 2, 1.0f); } } + } goto case3; - + case 2: if (a_this->speedF < 5.0f) { if (i_this->mAnmID == 14) { @@ -2648,17 +2661,17 @@ static int e_wb_lr_damage(e_wb_class* i_this) { i_this->mActionMode = 3; } // fallthrough - - case 3: - case3: + + case 3: { + case3: if (i_this->field_0x698[1] == 0) { return_value = TRUE; } - + if (a_this->speedF > 15.0f) { i_this->mMovementType = 2; } - + if (i_this->field_0x698[0] == 0 && i_this->field_0x1720 == 0) { if (i_this->field_0x6e4 == 0) { anm_init(i_this, 0x10, 3.0f, 0, 1.0f); @@ -2667,31 +2680,30 @@ static int e_wb_lr_damage(e_wb_class* i_this) { } i_this->mActionMode = 4; } - - cLib_addCalcAngleS2(&i_this->field_0x6b6, 0, 1, 100); - break; - - case 4: + + cLib_addCalcAngleS2(&i_this->field_0x6b4.y, 0, 1, 100 + YREG_S(3)); + } break; + + case 4: { if (i_this->mpModelMorf->isStop()) { i_this->mActionID = ACT_WAIT; i_this->mActionMode = 0; a_this->current.angle.y += i_this->field_0x6ae.y; a_this->shape_angle.y = a_this->current.angle.y; - i_this->field_0x6b6 = 0; - i_this->field_0x6ae.y = 0; + i_this->field_0x6ae.y = i_this->field_0x6b4.y = 0; } - break; + } break; } - - cLib_addCalc0(&a_this->speedF, 1.0f, 1.5f); - i_this->field_0x6ae.y += i_this->field_0x6b6; + + cLib_addCalc0(&a_this->speedF, 1.0f, 1.5f + YREG_F(11)); + i_this->field_0x6ae.y += i_this->field_0x6b4.y; return return_value; } static void e_wb_kiba_start(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - + f32 target = 0.0f; switch (i_this->mActionMode) { case 0: anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); @@ -2704,7 +2716,7 @@ static void e_wb_kiba_start(e_wb_class* i_this) { break; } - cLib_addCalc2(&a_this->speedF, 0.0f, 1.0f, 5.0f); + cLib_addCalc2(&a_this->speedF, target, 1.0f, 5.0f); } static void e_wb_kiba_end(e_wb_class* i_this) { @@ -2723,17 +2735,17 @@ static void e_wb_kiba_end(e_wb_class* i_this) { case 1: i_this->mMovementType = 1; - i_this->mAnimDuration = 60.0f; - i_this->field_0x168a = 5000; - + i_this->mAnimDuration = 60.0f + YREG_F(10); + i_this->field_0x168a = 5000 + YREG_S(7); + if (a_this->current.pos.x > 34000.0f && a_this->current.pos.x < 35500.0f && - a_this->current.pos.z < -14500.0f) + a_this->current.pos.z < -14500.0f + KREG_F(13)) { - a_this->speed.y = 55.0f; + a_this->speed.y = 55.0f + WREG_F(1); anm_init(i_this, 0x18, 2.0f, 0, 1.0f); i_this->mActionMode = 2; i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); - i_this->mStatusFlags |= 0x100; + i_this->mStatusFlags |= (u16)0x100; } break; @@ -2746,11 +2758,11 @@ static void e_wb_kiba_end(e_wb_class* i_this) { case 3: if (i_this->mAnmID == 0x19) { - if (a_this->speed.y < -30.0f || i_this->mAcch.ChkGroundHit()) { + if (a_this->speed.y < -30.0f + JREG_F(9) || i_this->mAcch.ChkGroundHit()) { anm_init(i_this, 0x1a, 2.0f, 0, 1.0f); - i_this->mCollisionFlags |= 0xc; + i_this->mCollisionFlags |= (u8)0xc; i_this->mLandingFlag = 1; - i_this->mStatusFlags |= 0x200; + i_this->mStatusFlags |= (u16)0x200; } } else if (i_this->mAnmID == 0x1a && i_this->mpModelMorf->isStop()) { anm_init(i_this, 0x20, 2.0f, 2, 1.0f); @@ -2776,13 +2788,12 @@ static void damage_check(e_wb_class* i_this) { for (int i = 0; i <= 2; i++) { if (i_this->field_0xa00[i].ChkCoHit()) { - cCcD_Obj* hit_obj = i_this->field_0xa00[i].GetCoHitObj(); - fopAc_ac_c* hit_actor = hit_obj->GetAc(); - + fopAc_ac_c* hit_actor = dCc_GetAc(i_this->field_0xa00[i].GetCoHitObj()->GetAc()); + if (!daAlink_getAlinkActorClass()->checkBoarRideOwn(a_this) && i_this->field_0x6a0 == 0 && a_this->speedF < 1.0f && fopAcM_GetName(hit_actor) == PROC_ALINK) { - i_this->field_0x6ba += 2; + i_this->field_0x6ba += (s16)2; if (i_this->field_0x6ba >= 150) { i_this->field_0x692 = i_this->mActionID; i_this->mActionID = ACT_S_DAMAGE; @@ -2793,14 +2804,16 @@ static void damage_check(e_wb_class* i_this) { } if ((lbl_244_bss_47 != 0 || lbl_244_bss_45 != 0) && - fopAcM_GetName(hit_actor) == PROC_E_WB && i_this->field_0x6a0 == 0) + fopAcM_GetName(hit_actor) == PROC_E_WB) { e_wb_class* wb = (e_wb_class*)hit_actor; - if (wb->field_0x6a0 == 0 && i_this->field_0x79d == 0 && wb->field_0x79d == 0) { - u8 temp = wb->mParam2; - wb->mParam2 = i_this->mParam2; - i_this->mParam2 = temp; - i_this->field_0x6a0 = 10; + if (i_this->field_0x6a0 == 0) { + if (wb->field_0x6a0 == 0 && i_this->field_0x79d == 0 && wb->field_0x79d == 0) { + u8 temp = wb->mParam2; + wb->mParam2 = i_this->mParam2; + i_this->mParam2 = temp; + i_this->field_0x6a0 = 10; + } } } @@ -2812,25 +2825,23 @@ static void damage_check(e_wb_class* i_this) { rider->field_0x998 = 20; } else { if (i_this->field_0x79d == 0 || i_this->mSpeedCapTimer == 0) { - fopAc_ac_c* hit_actor = i_this->field_0xa00[i].GetCoHitObj()->GetAc(); - + fopAc_ac_c* hit_actor = + dCc_GetAc(i_this->field_0xa00[i].GetCoHitObj()->GetAc()); + if (a_this->speedF >= 20.0f) { - cCcD_Stts* hit_stts = i_this->field_0xa00[i].GetCoHitObj()->GetStts(); - u8 weight = hit_stts->GetWeightUc(); - - if (weight > 100 && + if (i_this->field_0xa00[i].GetCoHitObj()->GetStts()->GetWeightUc() > 100 && (i_this->mActionID == ACT_C_F_RUN || i_this->mActionID == ACT_B_RUN) && - hit_actor->speedF >= 20.0f) { - + hit_actor->speedF >= 20.0f) + { cXyz pos_diff = hit_actor->current.pos - a_this->current.pos; s16 angle = cM_atan2s(pos_diff.x, pos_diff.z) - a_this->shape_angle.y; if (angle < 0) { i_this->field_0x5de = 0x1000; - a_this->current.angle.y += 0x800; + a_this->current.angle.y += (s16)0x800; } else { i_this->field_0x5de = -0x1000; - a_this->current.angle.y -= 0x800; + a_this->current.angle.y -= (s16)0x800; } } } @@ -2905,9 +2916,9 @@ static void effect_set(e_wb_class* i_this) { if (i_this->mMovementType == 1) { if (i_this->mpModelMorf->checkFrame(11.0f)) { - i_this->mCollisionFlags |= 4; + i_this->mCollisionFlags |= (u8)4; } else if (i_this->mpModelMorf->checkFrame(13.0f)) { - i_this->mCollisionFlags |= 8; + i_this->mCollisionFlags |= (u8)8; } } else if (i_this->mMovementType == 2) { pos.set(0.0f, 0.0f, 0.0f); @@ -3016,9 +3027,9 @@ static void effect_set(e_wb_class* i_this) { if (is_water) { in_water = true; } else { - pos.set(0.0f, 0.0f, 0.0f); - J3DModel* model = i_this->mpModelMorf->getModel(); - MTXCopy(model->getAnmMtx(i_this->field_0x688 + 0xb), *calc_mtx); + pos.set(JREG_F(0), JREG_F(1), JREG_F(2)); + MTXCopy(i_this->mpModelMorf->getModel()->getAnmMtx(i_this->field_0x688 + 0xb), + *calc_mtx); MtxPosition(&pos, &effect_pos); fopAcM_effSmokeSet1(&i_this->field_0x1418, &i_this->field_0x141c, &effect_pos, NULL, a_this->scale.z * 2.0f, &a_this->tevStr, 1); @@ -3026,7 +3037,8 @@ static void effect_set(e_wb_class* i_this) { } if (in_water) { - cXyz scale(2.0f, 2.0f, 2.0f); + f32 v = 2.0f; + cXyz scale(v, v, v); csXyz angle(0, 0, 0); static u16 w_eff_name[3] = { @@ -3091,7 +3103,7 @@ static void wb_rd_reset(e_wb_class* i_this) { static void wb_c_rd_reset(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - dComIfGp_getPlayer(0); + fopAc_ac_c* player = dComIfGp_getPlayer(0); u32 param = 0xff010300; if (i_this->field_0x17e1 != 0) { param = 0xff020300; @@ -3102,6 +3114,7 @@ static void wb_c_rd_reset(e_wb_class* i_this) { } static void* s_rddel_sub(void* param_0, void* param_1) { + UNUSED(param_1); if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_E_RD) { e_rd_class* rd = (e_rd_class*)param_0; if (rd->mBossMode == 0) { @@ -3114,9 +3127,11 @@ static void* s_rddel_sub(void* param_0, void* param_1) { static int rd_count; static void* s_rdcount_sub(void* i_actor, void* i_data) { + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { - e_rd_class* rd = (e_rd_class*)i_actor; - if (rd->mBossMode == 0 && (rd->field_0x5b7 == 1 || rd->field_0x5b7 == 2)) { + if (((e_rd_class*)i_actor)->mBossMode == 0 && + (((e_rd_class*)i_actor)->field_0x5b7 == 1 || ((e_rd_class*)i_actor)->field_0x5b7 == 2)) + { rd_count++; } } @@ -3124,9 +3139,11 @@ static void* s_rdcount_sub(void* i_actor, void* i_data) { } static void* s_rddel2_sub(void* i_actor, void* i_data) { + UNUSED(i_data); if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { - e_rd_class* rd = (e_rd_class*)i_actor; - if (fopAcM_SearchByID(rd->mWbActorID) == i_data) { + e_rd_class* rd = ((e_rd_class*)i_actor); + fopAc_ac_c* r28 = fopAcM_SearchByID(rd->mWbActorID); + if (r28 == i_data) { fopAcM_delete((fopAc_ac_c*)i_actor); } } @@ -3134,6 +3151,8 @@ static void* s_rddel2_sub(void* i_actor, void* i_data) { } static void e_wb_crv_wait(e_wb_class* i_this) { + fopEn_enemy_c* a_this = &i_this->mEnemy; + cXyz unused, unused2; fopAc_ac_c* player = dComIfGp_getPlayer(0); fopAc_ac_c* king_bulblin = fopAcM_SearchByName(PROC_E_RDB); i_this->field_0x6a0 = 0x14; @@ -3165,30 +3184,28 @@ static void e_wb_crv_wait(e_wb_class* i_this) { static s8 e_wb_c_run(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; fopAc_ac_c* player = dComIfGp_getPlayer(0); - fopAc_ac_c* coach = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach_ = fopAcM_SearchByName(PROC_NPC_COACH); + fopAc_ac_c* coach = coach_; e_rd_class* rider = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); - cXyz local_10c; - cXyz cStack_118; + cXyz sp94; + cXyz sp88; f32 target_speed = 0.0f; + f32 f26 = 1.0f; int wall_check; - s8 return_value; - s8 far_from_point; - far_from_point = false; - return_value = false; + s8 far_from_point = false; + s8 return_value = false; f32 dist_x = -46137.0f - a_this->current.pos.x; f32 dist_z = 81549.0f - a_this->current.pos.z; - f32 dist = JMAFastSqrt(dist_x * dist_x + dist_z * dist_z); - if (dist < KREG_F(7) + 5000.0f) { + if (JMAFastSqrt(dist_x * dist_x + dist_z * dist_z) < KREG_F(7) + 5000.0f) { far_from_point = true; } else { dist_x = -7650.0f - a_this->current.pos.x; dist_z = 56877.0f - a_this->current.pos.z; - dist = JMAFastSqrt(dist_x * dist_x + dist_z * dist_z); - if (dist < KREG_F(7) + 5000.0f) { + if (JMAFastSqrt(dist_x * dist_x + dist_z * dist_z) < KREG_F(7) + 5000.0f) { far_from_point = true; } } @@ -3198,93 +3215,91 @@ static s8 e_wb_c_run(e_wb_class* i_this) { if ((i_this->mStatusFlags & 1) == 0) { i_this->mActionID = ACT_A_RUN; i_this->mActionMode = 0; - return false; + return return_value; } - s16 sVar1 = a_this->current.angle.y; + s16 sp10 = a_this->current.angle.y; + s16 turn_speed = 0x200; + s16 spC; dBgS_LinChk lin_chk; switch (i_this->mActionMode) { - case 0: + case 0: { anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); i_this->mActionMode = 1; - i_this->mStatusFlags |= 0x20; - // fallthrough - + i_this->mStatusFlags |= (u16)0x20; + } + // fallthrough case 1: { cXyz target_pos(-62943.0f, -9045.0f, 70997.0f); - local_10c = target_pos - a_this->current.pos; - s16 target_angle = cM_atan2s(local_10c.x, local_10c.z); + sp94 = target_pos - a_this->current.pos; + a_this->current.angle.y = cM_atan2s(sp94.x, sp94.z); + sp94 = target_pos - coach_->current.pos; - a_this->current.angle.y = target_angle; - local_10c = target_pos - coach->current.pos; - - if (i_this->field_0x7a7 == 0 || JMAFastSqrt(local_10c.x * local_10c.x + local_10c.z * local_10c.z) < 500.0f) - { + if (i_this->field_0x7a7 == 0 || JMAFastSqrt(sp94.x * sp94.x + sp94.z * sp94.z) < 500.0f) { i_this->mActionMode = 2; i_this->field_0x7a7 = 0; - fopAcM_setStageLayer(i_this); + fopAcM_setStageLayer(a_this); i_this->field_0x17e1 = 1; } - break; - } - case 2: + } break; + + case 2: { if (i_this->field_0x7a6 == 0) { anm_init(i_this, 0x1b, 3.0f, 0, 1.0f); i_this->mActionMode = 0xb; i_this->mAnimDuration = 40.0f; - i_this->mStatusFlags |= 8; + i_this->mStatusFlags |= (u16)8; } else { i_this->field_0x7a6 = 0; anm_init(i_this, 0x20, 5.0f, 2, 1.0f); - f32 rnd_frame = cM_rndF(10.0f); - i_this->mpModelMorf->setFrame(rnd_frame); + i_this->mpModelMorf->setFrame(cM_rndF(10.0f)); i_this->mActionMode = 0xc; - i_this->mStatusFlags |= 0x10; + i_this->mStatusFlags |= (u16)0x10; i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); } - break; + } break; - case 0xb: + case 0xb: { if (i_this->mpModelMorf->checkFrame(3.0f)) { - i_this->mCollisionFlags |= 2; + i_this->mCollisionFlags |= (u8)2; i_this->mMovementType = 10; } else if (i_this->mpModelMorf->checkFrame(15.0f)) { - i_this->mCollisionFlags |= 3; + i_this->mCollisionFlags |= (u8)3; } if (i_this->mpModelMorf->isStop()) { anm_init(i_this, 0x20, 5.0f, 2, 1.0f); i_this->mActionMode = 0xc; - i_this->mStatusFlags |= 0x10; + i_this->mStatusFlags |= (u8)0x10; i_this->mZ2Ride.startCreatureSound(Z2SE_EN_WB_KICK_GROUND, 0, -1); } - break; - case 0xc: + } break; + case 0xc: { i_this->mActionMode = 0xd; + } // fallthrough case 0xd: { - local_10c = a_this->current.pos; - local_10c.y += 500.0f; - cStack_118 = coach->eyePos; - cStack_118.y += 500.0f; - lin_chk.Set(&local_10c, &cStack_118, a_this); + sp94 = a_this->current.pos; + sp94.y += 500.0f; + sp88 = coach_->eyePos; + sp88.y += 500.0f; + lin_chk.Set(&sp94, &sp88, a_this); s8 behind_obstacle = false; - cXyz diff_player; if (dComIfG_Bgsp().LineCross(&lin_chk)) { cXyz diff_field = i_this->field_0x5d0 - a_this->current.pos; - local_10c = player->eyePos - a_this->current.pos; - if (diff_field.abs() < local_10c.abs()) { - cStack_118 = i_this->field_0x5d0; + sp94 = player->eyePos - a_this->current.pos; + if (diff_field.abs() < sp94.abs()) { + sp88 = i_this->field_0x5d0; behind_obstacle = true; } else { cMtx_YrotS(*calc_mtx, player->shape_angle.y); - cStack_118 = player->eyePos; + sp88 = player->eyePos; } } else { - cMtx_YrotS(*calc_mtx, coach->shape_angle.y); - cStack_118 = coach->current.pos; - i_this->field_0x5d0 = cStack_118; + cMtx_YrotS(*calc_mtx, coach_->shape_angle.y); + sp88 = coach_->current.pos; + i_this->field_0x5d0 = sp88; } @@ -3302,29 +3317,27 @@ static s8 e_wb_c_run(e_wb_class* i_this) { }; if (far_from_point || wall_check != 0) { - local_10c = sh_posH[i_this->mParam2 - 1]; + sp94 = sh_posH[i_this->mParam2 - 1]; } else { - local_10c = sh_pos[i_this->mParam2 - 1]; - local_10c.x += i_this->field_0x6c4; - local_10c.z += i_this->field_0x7a8; + sp94 = sh_pos[i_this->mParam2 - 1]; + sp94.x += i_this->field_0x6c4; + sp94.z += i_this->field_0x7a8; if ((i_this->field_0x68e & 0x3f) == 0 && cM_rndF(1.0f) < 0.5f) { - f32 rnd = cM_rndF(200.0f); - i_this->field_0x7a8 = -rnd; - rnd = cM_rndFX(100.0f); - i_this->field_0x6c4 = rnd; + i_this->field_0x7a8 = -cM_rndF(200.0f); + i_this->field_0x6c4 = cM_rndFX(100.0f); } } } else { - local_10c.set(0.0f, 0.0f, 0.0f); + sp94.set(0.0f, 0.0f, 0.0f); } - MtxPosition(&local_10c, &i_this->field_0x5c4); - i_this->field_0x5c4 += cStack_118; + MtxPosition(&sp94, &i_this->field_0x5c4); + i_this->field_0x5c4 += sp88; - local_10c = i_this->field_0x5c4 - a_this->current.pos; + sp94 = i_this->field_0x5c4 - a_this->current.pos; - dist = JMAFastSqrt(local_10c.x * local_10c.x + local_10c.z * local_10c.z); + f32 dist = JMAFastSqrt(sp94.x * sp94.x + sp94.z * sp94.z); if (dist < 500.0f) { target_speed = l_HIO.normal_speed_vi; @@ -3339,17 +3352,15 @@ static s8 e_wb_c_run(e_wb_class* i_this) { return_value = 1; } - s16 turn_speed = 0x200; - s16 calc_angle = cM_atan2s(local_10c.x, local_10c.z); - i_this->mTargetFacingAngle = calc_angle; + turn_speed = 0x200; + i_this->mTargetFacingAngle = cM_atan2s(sp94.x, sp94.z); if (rider && rider->mAnmID == 0x27) { - f32 sin_val = cM_ssin(i_this->field_0x68e * (BREG_S(7) + 1000)); - s16 add_angle = static_cast((BREG_F(16) + 5000.0f) * sin_val); - i_this->mTargetFacingAngle += add_angle; + i_this->mTargetFacingAngle += static_cast( + (BREG_F(16) + 5000.0f) * cM_ssin(i_this->field_0x68e * (BREG_S(7) + 1000))); turn_speed = 0x400; } else if (wall_check != 0) { - i_this->mTargetFacingAngle += (s16)(wall_check * (BREG_S(8) + -8000)); + i_this->mTargetFacingAngle += (s16)((BREG_S(8) + -8000) * wall_check); } cLib_addCalcAngleS2(&a_this->current.angle.y, i_this->mTargetFacingAngle, 8, turn_speed); @@ -3366,45 +3377,47 @@ static s8 e_wb_c_run(e_wb_class* i_this) { i_this->mpModelMorf->setPlaySpeed(anim_speed); i_this->mMovementType = 1; i_this->mPursuitFlag = 1; - break; - } - case 0x14: + } break; + + case 0x14: { anm_init(i_this, 0x25, 3.0f, 2, 1.0f); i_this->mActionMode = 0x15; + } // fallthrough case 0x15: - if (a_this->speedF > 15.0f) { - i_this->mMovementType = 2; - i_this->mZ2Ride.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); - } else { - anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); - i_this->mActionMode = 0x16; - i_this->mStatusFlags |= 0x20; + int unused; // needs to be here to match debug + { + if (a_this->speedF > 15.0f) { + i_this->mMovementType = 2; + i_this->mZ2Ride.startCreatureSoundLevel(Z2SE_EN_WB_L_SLIP, 0, -1); + } else { + anm_init(i_this, 0x2a, 10.0f, 2, 1.0f); + i_this->mActionMode = 0x16; + i_this->mStatusFlags |= (u16)0x20; + } } break; } if (i_this->mActionMode < 0x14) { - local_10c.x = 4025.0f - coach->current.pos.x; - local_10c.z = 52319.0f - coach->current.pos.z; + sp94.x = 4025.0f - coach_->current.pos.x; + sp94.z = 52319.0f - coach_->current.pos.z; - if (coach->speedF < 1.0f || - (dist = JMAFastSqrt(local_10c.x * local_10c.x + local_10c.z * local_10c.z), - dist < 1500.0f)) + if (coach_->speedF < 1.0f || + JMAFastSqrt(sp94.x * sp94.x + sp94.z * sp94.z) < 1500.0f) { - local_10c = coach->current.pos - a_this->current.pos; - dist = local_10c.abs(); + sp94 = coach_->current.pos - a_this->current.pos; - if (dist < 1000.0f) { + if (sp94.abs() < 1000.0f) { i_this->mActionMode = 0x14; } } } - cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, 1.0f); - cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, - (TREG_S(7) + -8) * (a_this->current.angle.y - sVar1), 8, 0x200); + cLib_addCalc2(&a_this->speedF, target_speed, 1.0f, f26); + spC = (TREG_S(7) + -8) * (a_this->current.angle.y - sp10); + cLib_addCalcAngleS2(&i_this->mBodyTiltAngle, spC, 8, 0x200); return return_value; } @@ -3418,9 +3431,9 @@ static void action(e_wb_class* i_this) { if (i_this->mActionID != 0x67) { damage_check(i_this); } - s8 cVar8 = false; - a_this->offDownFlg(); + fopEn_enemy_c* a_this2 = a_this; + a_this2->offDownFlg(); if (lbl_244_bss_45 != 0 || lbl_244_bss_46 != 0) { i_this->mSpeedCapTimer = gake_check(i_this); @@ -3445,7 +3458,7 @@ static void action(e_wb_class* i_this) { case ACT_C_F_RUN: if (i_this->mParam == 10) { cVar8 = e_wb_c_run(i_this); - dComIfGp_getPlayer(0); // unusued? + fopAc_ac_c* v = dComIfGp_getPlayer(0); // unusued? if (a_this->home.pos.y - a_this->current.pos.y > 4500.0f) { OS_REPORT(" WB NARAKU DOWN \n"); @@ -3491,21 +3504,21 @@ static void action(e_wb_class* i_this) { break; case ACT_DAMAGE: if (e_wb_damage(i_this)) { - a_this->onDownFlg(); + a_this2->onDownFlg(); } cVar8 = true; break; case ACT_BG_DAMAGE: if (e_wb_bg_damage(i_this)) { - a_this->onDownFlg(); + a_this2->onDownFlg(); } cVar8 = true; break; case ACT_LR_DAMAGE: if (e_wb_lr_damage(i_this)) { - a_this->onDownFlg(); + a_this2->onDownFlg(); } cVar8 = true; @@ -3561,10 +3574,10 @@ static void action(e_wb_class* i_this) { i_this->mStatusFlags = 3; i_this->field_0x6ae.set(0, 0, 0); wb_rd_reset(i_this); - if (i_this->field_0x79d == 0) { - OS_REPORT(" WB RESET \n"); - } else { + if (i_this->field_0x79d) { OS_REPORT(" BB RESET \n"); + } else { + OS_REPORT(" WB RESET \n"); } } } @@ -3612,10 +3625,9 @@ static void action(e_wb_class* i_this) { // Hyrule Castle strcmp(dComIfGp_getStartStageName(), "D_MN09") == 0)) { - s16 ang = cLib_targetAngleY(&a_this->attention_info.position, - &dComIfGp_getPlayer(0)->current.pos) - - a_this->shape_angle.y; - int target_angle = abs(ang); + int target_angle = abs((s16)(cLib_targetAngleY(&a_this->attention_info.position, + &dComIfGp_getPlayer(0)->current.pos) - + a_this->shape_angle.y)); if (target_angle < 0x6000 && target_angle > 0x3000) { a_this->attention_info.flags |= fopAc_AttnFlag_ETC_e; @@ -3629,7 +3641,7 @@ static void action(e_wb_class* i_this) { s16 angle = 0; if (i_this->mAnmID == 0x28) { - angle = (a_this->current.angle.y - a_this->old.angle.y) * 7 + VREG_S(2); + angle = (a_this->current.angle.y - a_this->old.angle.y) * (7 + VREG_S(2)); } cLib_addCalcAngleS2(&i_this->field_0x6d8, angle, 8, 0x400); @@ -3637,49 +3649,55 @@ static void action(e_wb_class* i_this) { if (lbl_244_bss_45 != 0 && a_this->home.pos.y - a_this->current.pos.y > 5000.0f) { i_this->mActionID = ACT_EVENT; i_this->mActionMode = 0; - i_this->mStatusFlags |= 0x40; + i_this->mStatusFlags |= (u16)0x40; a_this->current.pos = a_this->home.pos; a_this->old = a_this->current; } } static void* s_wbZrevise_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB && - static_cast(i_actor)->field_0x79d == 0) - { - static_cast(i_actor)->current.pos = - static_cast(i_actor)->home.pos; + UNUSED(i_data); + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + e_wb_class* a_this = static_cast(i_actor); + if (a_this->field_0x79d == 0) { + a_this->mEnemy.current.pos = a_this->mEnemy.home.pos; + } } return NULL; } static void* s_spd0_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB && - static_cast(i_actor)->field_0x79d == 0) - { - static_cast(i_actor)->speedF = 0.0f; + UNUSED(i_data); + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + e_wb_class* a_this = static_cast(i_actor); + if (a_this->field_0x79d == 0) { + a_this->mEnemy.speedF = 0.0f; + } } return NULL; } static void* s_wbdel_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB && - static_cast(i_actor)->field_0x79d == 0) - { - fopAcM_delete((fopAc_ac_c*)i_actor); + UNUSED(i_data); + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_WB) { + e_wb_class* a_this = static_cast(i_actor); + if (a_this->field_0x79d == 0) { + fopAcM_delete((fopAc_ac_c*)i_actor); + } } return NULL; } static void* s_rdArrowWait_sub(void* i_actor, void* i_data) { - if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD && - (static_cast(i_actor)->field_0x5bc == 2 || - static_cast(i_actor)->field_0x5bc == 3)) - { - static_cast(i_actor)->field_0x990[1] = cM_rndF(20.0) + 3.0f; + UNUSED(i_data); + if (fopAcM_IsActor(i_actor) && fopAcM_GetName(i_actor) == PROC_E_RD) { + e_rd_class* a_this = static_cast(i_actor); + if (a_this->field_0x5bc == 2 || a_this->field_0x5bc == 3) { + a_this->field_0x990[1] = cM_rndF(20.0) + 3.0f; + } } return NULL; @@ -3713,12 +3731,10 @@ static void demo_camera(e_wb_class* i_this) { local_194 = (e_rd_class*)fopAcM_SearchByID(i_this->field_0x1434); rdb = (e_rdb_class*)fopAcM_SearchByName(PROC_E_RDB); } - cXyz local_3c; - cXyz cStack_48; - cXyz cStack_54; - cXyz cStack_60; + cXyz local_3c, cStack_48, cStack_54, cStack_60; + switch (i_this->field_0x169e) { - case 1: + case 1: { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -3729,72 +3745,74 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a0 = 0; i_this->field_0x1714 = 55.0f; i_this->field_0x16a0 = 0; - i_this->field_0x1708 = 800.0f; + i_this->field_0x1708 = 800.0f + ZREG_F(1); local_184->mCamera.SetTrimSize(3); a_this->current.pos.set(34800.0f, -66.0f, -604.0f); a_this->current.angle.y = 0x8000; a_this->shape_angle = a_this->current.angle; a_this->old = a_this->current; - i_this->field_0x1704 = 0x2000; + i_this->field_0x1704 = 0x2000 + XREG_S(0); daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); fpcM_Search(s_wbdel_sub, a_this); dComIfGp_getEvent()->startCheckSkipEdge(a_this); + } // fallthrough - case 2: - if (i_this->field_0x16a0 == 0xa0) { - cStack_48.set(34700.0f, -66.0f, 7896.0f); + case 2: { + if (i_this->field_0x16a0 == 160 + JREG_S(5)) { + cStack_48.set(34700.0f, -66.0f, 7896.0f + JREG_F(18)); horse->setHorsePosAndAngle(&cStack_48, -0x8000); horse->changeDemoMode(4, 0); cStack_48.set(34900.0f, -280.0f, -18048.0f); horse->changeDemoPos0(&cStack_48); } - cLib_addCalc2(&i_this->field_0x1708, 1200.0f, 0.05f, 3.0f); + cLib_addCalc2(&i_this->field_0x1708, 1200.0f + ZREG_F(3), 0.05f, 3.0f); mDoMtx_stack_c::YrotS(a_this->shape_angle.y + i_this->field_0x1704); local_3c.x = 0.0f; - local_3c.y = 300.0f; + local_3c.y = 300.0f + ZREG_F(0); local_3c.z = i_this->field_0x1708; mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); i_this->field_0x16a4 += a_this->current.pos; cLib_addCalcAngleS2(&i_this->field_0x1704, 0x7800, 0x20, 0xa0); if (i_this->field_0x16a0 == 0) { i_this->field_0x16bc = a_this->current.pos; - i_this->field_0x16bc.y += 400.0f; + i_this->field_0x16bc.y += 400.0f + ZREG_F(2); } else { cLib_addCalc2(&i_this->field_0x16bc.x, a_this->current.pos.x, 0.5f, 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.y, 200.0f + a_this->current.pos.y + 200.0f, 0.5f, - 200.0f); + cLib_addCalc2(&i_this->field_0x16bc.y, + 200.0f + a_this->current.pos.y + 200.0f + ZREG_F(2), 0.5f, 200.0f); cLib_addCalc2(&i_this->field_0x16bc.z, a_this->current.pos.z, 0.5f, 200.0f); } if (i_this->field_0x16a0 == 0xdc) { i_this->field_0x169e = 3; i_this->field_0x16a0 = 0; - i_this->field_0x1708 = 1100.0f; - i_this->field_0x1704 = 0x1000; + i_this->field_0x1708 = 1100.0f + ZREG_F(9); + i_this->field_0x1704 = 0x1000 + XREG_S(8); } - break; - case 3: + } break; + case 3: { mDoMtx_stack_c::YrotS(player->shape_angle.y + i_this->field_0x1704); local_3c.x = 0.0f; - local_3c.y = 0.0f; + local_3c.y = 0.0f + ZREG_F(10); local_3c.z = i_this->field_0x1708; mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); i_this->field_0x16a4 += player->current.pos; i_this->field_0x16bc = player->current.pos; - i_this->field_0x16bc.y += -50.0f; + i_this->field_0x16bc.y += ZREG_F(11) - 50.0f; cLib_addCalc2(&i_this->field_0x1708, 500.0f, 0.05f, 10.0f); if (i_this->field_0x16a0 != 0x46) { break; } i_this->field_0x169e = 4; i_this->field_0x16a0 = 0; + } // fallthrough - case 4: - i_this->field_0x1708 = 1200.0f; + case 4: { + i_this->field_0x1708 = 1200.0f + ZREG_F(3); mDoMtx_stack_c::YrotS(a_this->shape_angle.y - 0x7800); local_3c.x = 0.0f; - local_3c.y = 300.0f; + local_3c.y = 300.0f + ZREG_F(0); local_3c.z = i_this->field_0x1708; mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); i_this->field_0x16a4.x += a_this->current.pos.x; @@ -3803,10 +3821,10 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16bc.x = a_this->current.pos.x; i_this->field_0x16bc.z = a_this->current.pos.z; if (i_this->field_0x16a0 == 0) { - i_this->field_0x16bc.y = a_this->current.pos.y + 200.0f + 200.0f; + i_this->field_0x16bc.y = a_this->current.pos.y + 200.0f + 200.0f + ZREG_F(2); } else { - cLib_addCalc2(&i_this->field_0x16bc.y, a_this->current.pos.y + 200.0f + 200.0f, 0.1f, - 20.0f); + cLib_addCalc2(&i_this->field_0x16bc.y, + a_this->current.pos.y + 200.0f + 200.0f + ZREG_F(2), 0.1f, 20.0f); } if (i_this->field_0x16a0 != 0x8c) { break; @@ -3814,12 +3832,13 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x169e = 5; i_this->field_0x16a0 = 0; - i_this->field_0x1708 = 350.0f; + i_this->field_0x1708 = 350.0f + ZREG_F(9); i_this->field_0x170c = 50.0f; + } // fallthrough case 5: - case 6: - i_this->field_0x1704 = 0x7800; + case 6: { + i_this->field_0x1704 = 0x7800 + XREG_S(3); mDoMtx_stack_c::YrotS(player->shape_angle.y + i_this->field_0x1704); local_3c.x = i_this->field_0x170c; local_3c.y = 0.0f; @@ -3827,32 +3846,32 @@ static void demo_camera(e_wb_class* i_this) { mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); i_this->field_0x16a4.x += player->current.pos.x; i_this->field_0x16a4.z += player->current.pos.z; - i_this->field_0x16a4.y = 50.0f; + i_this->field_0x16a4.y = 50.0f + ZREG_F(10); if (i_this->field_0x16a0 == 0) { i_this->field_0x16bc = player->current.pos; - i_this->field_0x16bc.y += -50.0f + 50.0f; + i_this->field_0x16bc.y += ZREG_F(11) - 50.0f + 50.0f; } else { i_this->field_0x16bc.x = player->current.pos.x; i_this->field_0x16bc.z = player->current.pos.z; - f32 dVar13 = player->current.pos.y - 50.0f + 50.0f; + f32 dVar13 = player->current.pos.y + ZREG_F(11) - 50.0f + 50.0f; if (dVar13 > 150.0f) { dVar13 = 150.0f; } - cLib_addCalc2(&i_this->field_0x16bc.y, dVar13, 0.2f, 30.0f); + cLib_addCalc2(&i_this->field_0x16bc.y, dVar13, 0.2f + ZREG_F(12), 30.0f + ZREG_F(13)); } cLib_addCalc2(&i_this->field_0x1708, 800.0f, 0.05f, 5.0f); cLib_addCalc2(&i_this->field_0x170c, -50.0f, 0.05f, 1.2f); - if (i_this->field_0x169e == 5 && player->current.pos.z < -14500.0f) { + if (i_this->field_0x169e == 5 && player->current.pos.z < -14500.0f + KREG_F(12)) { horse->changeDemoMode(7, 0); - horse->onDemoJumpDistance(600.0f, 100.0f); + horse->onDemoJumpDistance(600.0f + BREG_F(18), 100.0f + BREG_F(19)); i_this->field_0x169e = 6; } if (i_this->field_0x16a0 == 0x4b) { dComIfGp_setNextStage("F_SP102", 1, 0, 4); } - break; - case 10: + } break; + case 10: { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -3862,35 +3881,33 @@ static void demo_camera(e_wb_class* i_this) { local_184->mCamera.SetTrimSize(3); i_this->field_0x169e = 0xb; i_this->field_0x16a0 = 0; - i_this->field_0x1714 = 55.0f; + i_this->field_0x1714 = 55.0f + KREG_F(7); i_this->field_0x16a0 = 0; - mDoMtx_stack_c::YrotS(local_194->actor.shape_angle.y + - (local_194->field_0xa0e - local_194->actor.shape_angle.y) / 2); - local_3c.x = 0.0f; - local_3c.y = 500.0f; - local_3c.z = -500.0f; + s16 sp16 = local_194->actor.shape_angle.y + + (local_194->field_0xa0e - local_194->actor.shape_angle.y) / 2; + mDoMtx_stack_c::YrotS(sp16); + local_3c.x = NREG_F(0); + local_3c.y = NREG_F(1) + 500.0f; + local_3c.z = NREG_F(2) - 500.0f; mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); i_this->field_0x16a4 += local_194->actor.current.pos; i_this->field_0x1710 = 10.0f; i_this->field_0x16bc = local_194->actor.current.pos; - i_this->field_0x16bc.y += 200.0f; + i_this->field_0x16bc.y += 200.0f + KREG_F(11); daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); + } // fallthrough - case 0xb: - cLib_addCalc2(&i_this->field_0x1710, 1000.0f, 1.0f, - 100.0f); - cLib_addCalc2(&i_this->field_0x16bc.x, local_194->actor.current.pos.x, - 0.5f, - i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.y, local_194->actor.current.pos.y + 200.0f, - 0.5f, - i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.z, local_194->actor.current.pos.z, - 0.5f, - i_this->field_0x1710); + case 0xb: { + cLib_addCalc2(&i_this->field_0x1710, 1000.0f, 1.0f, 100.0f + KREG_F(10)); + cLib_addCalc2(&i_this->field_0x16bc.x, local_194->actor.current.pos.x, 0.5f + KREG_F(8), + i_this->field_0x1710); + cLib_addCalc2(&i_this->field_0x16bc.y, local_194->actor.current.pos.y + 200.0f + KREG_F(11), + 0.5f + KREG_F(8), i_this->field_0x1710); + cLib_addCalc2(&i_this->field_0x16bc.z, local_194->actor.current.pos.z, 0.5f + KREG_F(8), + i_this->field_0x1710); cLib_addCalc2(&i_this->field_0x16a4.x, local_194->actor.current.pos.x, 0.05f, - 12.0f); + 12.0f + NREG_F(3)); if (i_this->field_0x16a0 == 0x28) { if (a_this->shape_angle.y < 0x4000 && -0x4000 < a_this->shape_angle.y) { cStack_48.set(34800.0f, -300.0f, -26400.0f); @@ -3915,9 +3932,9 @@ static void demo_camera(e_wb_class* i_this) { if (i_this->field_0x16a0 == 0x57) { a_this->current.pos.y = -300.0f; if (a_this->shape_angle.y < 0x4000 && -0x4000 < a_this->shape_angle.y) { - a_this->current.pos.z = -25000.0f; + a_this->current.pos.z = -25000.0f - KREG_F(16); } else { - a_this->current.pos.z = -27800.0f; + a_this->current.pos.z = -27800.0f + KREG_F(16); } a_this->speedF = l_HIO.mSingleRiderSpeed; } @@ -3930,7 +3947,7 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x1714 = 45.0f; fopAc_ac_c* local_19c = fopAcM_SearchByID(i_this->field_0x1434); local_19c->current.pos.z = -26400.0f; - local_19c->current.pos.y = -3500.0f; + local_19c->current.pos.y = -3500.0f + KREG_F(18); local_19c->current.pos.x = 34800.0f; local_19c->speed.set(0.0f, -50.0f, 0.0f); local_19c->speedF = 0.0f; @@ -3943,8 +3960,8 @@ static void demo_camera(e_wb_class* i_this) { daPy_getPlayerActorClass()->cancelOriginalDemo(); i_this->field_0x169e = 0; } - break; - case 0xc: + } break; + case 0xc: { cLib_addCalc2(&i_this->field_0x1714, 55.0f, 0.05f, 0.1f); if (i_this->field_0x16a0 == 0x5a) { Z2GetAudioMgr()->bgmStreamPrepare(0x2000010); @@ -3952,8 +3969,8 @@ static void demo_camera(e_wb_class* i_this) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[85]); dComIfGp_setNextStage("F_SP102", 0x14, 0, 8); } - break; - case 0x14: + } break; + case 0x14: { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -3966,17 +3983,19 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x1714 = 55.0f; i_this->field_0x16a0 = 0; mDoMtx_stack_c::YrotS(player->shape_angle.y); - local_3c.x = -500.0f; - local_3c.y = 100.0f; - local_3c.z = 0.0f; + local_3c.x = -500.0f + ZREG_F(8); + local_3c.y = 100.0f + ZREG_F(9); + local_3c.z = 0.0f + ZREG_F(10); mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); i_this->field_0x16a4 += player->current.pos; i_this->field_0x1710 = 0; i_this->field_0x16bc = a_this->current.pos; - i_this->field_0x16bc.y += 300.0f; + i_this->field_0x16bc.y += 300.0f + ZREG_F(11); horse->changeOriginalDemo(); horse->changeDemoMode(6, 0); - case 0x15: + } + // fallthrough + case 0x15: { s16 local_1cc; if (horse->shape_angle.y < 0x4000 && -0x4000 < horse->shape_angle.y) { local_1cc = 0; @@ -3984,19 +4003,17 @@ static void demo_camera(e_wb_class* i_this) { local_1cc = -0x8000; } horse->setHorsePosAndAngle(&horse->current.pos, local_1cc); - cLib_addCalc2(&i_this->field_0x16bc.x, a_this->current.pos.x, 0.8f, - 100.0f); - cLib_addCalc2(&i_this->field_0x16bc.y, (a_this->current.pos.y + 300.0f), - 0.8f, 100.0f); - cLib_addCalc2(&i_this->field_0x16bc.z, a_this->current.pos.z, 0.8f, - 100.0f); - if (i_this->field_0x16a0 == 0x14) { + cLib_addCalc2(&i_this->field_0x16bc.x, a_this->current.pos.x, 0.8f, 100.0f); + cLib_addCalc2(&i_this->field_0x16bc.y, (a_this->current.pos.y + 300.0f + ZREG_F(11)), 0.8f, + 100.0f); + cLib_addCalc2(&i_this->field_0x16bc.z, a_this->current.pos.z, 0.8f, 100.0f); + if (i_this->field_0x16a0 == (s16)(20 + ZREG_S(8))) { local_184->mCamera.Start(); local_184->mCamera.SetTrimSize(0); dComIfGp_event_reset(); i_this->field_0x169e = 0; } - break; + } break; case 0x19: { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); @@ -4018,20 +4035,21 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x170c = -200.0f; } } - case 0x1a: + // fallthrough + case 0x1a: { mDoMtx_stack_c::YrotS(a_this->shape_angle.y); local_3c.x = i_this->field_0x170c; - local_3c.y = 300.0f; - local_3c.z = 300.0f; + local_3c.y = 300.0f + ZREG_F(9); + local_3c.z = 300.0f + ZREG_F(10); mDoMtx_stack_c::multVec(&local_3c, &i_this->field_0x16a4); i_this->field_0x16a4 += a_this->current.pos; i_this->field_0x16bc = a_this->current.pos; - i_this->field_0x16bc.y += 400.0f; - if (i_this->field_0x16a0 == 0xf) { + i_this->field_0x16bc.y += 400.0f + ZREG_F(11); + if (i_this->field_0x16a0 == (s16)(15 + ZREG_S(8))) { cMtx_YrotS(*calc_mtx, player->shape_angle.y); local_3c.x = 0.0f; - local_3c.y = 400.0f; - local_3c.z = -600.0f; + local_3c.y = 400.0f + JREG_F(1); + local_3c.z = -600.0f + JREG_F(2); MtxPosition(&local_3c, &i_this->field_0x16a4); i_this->field_0x16a4 += player->current.pos; i_this->field_0x16bc = player->current.pos; @@ -4043,8 +4061,8 @@ static void demo_camera(e_wb_class* i_this) { dComIfGp_event_reset(); i_this->field_0x169e = 0; } - break; - case 0x1e: + } break; + case 0x1e: { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -4061,15 +4079,15 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a4.set(-8844.0f, 317.0f, 512.0f); i_this->field_0x16e0.set(-8416.0f, 345.0f, 6.0f); i_this->field_0x16d4.set(-8994.0f, 326.0f, 400.0f); - i_this->field_0x16ec.x = std::fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = std::fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = std::fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = std::fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = std::fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = std::fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); + i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); + i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); + i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); + i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); + i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); + i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); - cStack_48.set(-10775.0f + 350.0f, 60.0f, 75.0f); + cStack_48.set(-10775.0f + ZREG_F(0) + 350.0f, 60.0f, 75.0f); horse->setHorsePosAndAngle(&cStack_48, horse->shape_angle.y); horse->changeDemoMode(3, 0); cStack_48.set(-8705.0f, 213.0f, 75.0f); @@ -4077,22 +4095,24 @@ static void demo_camera(e_wb_class* i_this) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[86]); Z2GetAudioMgr()->bgmStreamPrepare(0x200000f); Z2GetAudioMgr()->bgmStreamPlay(); - case 0x1f: - if (i_this->field_0x16a0 > 50) { + } + // fallthrough + case 0x1f: { + if (i_this->field_0x16a0 > 50 + JREG_S(3)) { cam_3d_morf(i_this, 0.1f); cLib_addCalc2(&i_this->field_0x1710, 0.02f, 1.0f, 0.001f); } - if (i_this->field_0x16a0 == 40) { + if (i_this->field_0x16a0 == 40 + JREG_S(0)) { horse->changeDemoMode(8, 0); dComIfGp_getEvent()->startCheckSkipEdge(a_this); } - if (i_this->field_0x16a0 == 80) { + if (i_this->field_0x16a0 == 80 + JREG_S(1)) { horse->changeDemoMode(9, 0); } - if (i_this->field_0x16a0 == 143) { + if (i_this->field_0x16a0 == 143 + JREG_S(2)) { dKy_change_colpat(4); } - if (i_this->field_0x16a0 == 144) { + if (i_this->field_0x16a0 == 144 + JREG_S(2)) { i_this->field_0x169e = 0x20; i_this->field_0x16a0 = 0; horse->changeDemoMode(1, 0); @@ -4100,8 +4120,8 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a4.set(-8586.0f, 447.0f, 18.0f); i_this->field_0x1714 = 40.0f; } - break; - case 0x20: + } break; + case 0x20: { if (i_this->field_0x16a0 == 10) { player->changeDemoParam2(1); } @@ -4114,33 +4134,34 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x1714 = 85.0f; i_this->field_0x1710 = 0; dKy_change_colpat(5); + } // fallthrough - case 0x21: - i_this->field_0x16b0.set(400.0f, 400.0f, 500.0f); - i_this->field_0x16c8.set(-10.0f, 700.0f, 180.0f); + case 0x21: { + i_this->field_0x16b0.set(400.0f + JREG_F(6), 400.0f + JREG_F(7), 500.0f + JREG_F(8)); + i_this->field_0x16c8.set(-10.0f + JREG_F(9), 700.0f + JREG_F(10), 180.0f + JREG_F(11)); cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); MtxPosition(&i_this->field_0x16b0, &cStack_48); i_this->field_0x16a4 = a_this->current.pos + cStack_48; MtxPosition(&i_this->field_0x16c8, &cStack_48); i_this->field_0x16bc = a_this->current.pos + cStack_48; if (i_this->field_0x16a0 > 25) { - cLib_addCalc2(&i_this->field_0x1714, 55.0f - 30.0f, 0.8f, 6.0f); + cLib_addCalc2(&i_this->field_0x1714, 55.0f + JREG_F(12) - 30.0f, 0.8f, 6.0f); } if (i_this->field_0x16a0 == 95) { i_this->field_0x169e = 0x22; i_this->field_0x16a0 = 0; i_this->field_0x16d4.set(700.0f, 100.0f, 0.0f); i_this->field_0x16e0.set(-10.0f, 350.0f, 80.0f); - i_this->field_0x16ec.x = std::fabsf(i_this->field_0x16d4.x - i_this->field_0x16b0.x); - i_this->field_0x16ec.y = std::fabsf(i_this->field_0x16d4.y - i_this->field_0x16b0.y); - i_this->field_0x16ec.z = std::fabsf(i_this->field_0x16d4.z - i_this->field_0x16b0.z); - i_this->field_0x16f8.x = std::fabsf(i_this->field_0x16e0.x - i_this->field_0x16c8.x); - i_this->field_0x16f8.y = std::fabsf(i_this->field_0x16e0.y - i_this->field_0x16c8.y); - i_this->field_0x16f8.z = std::fabsf(i_this->field_0x16e0.z - i_this->field_0x16c8.z); + i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16b0.x); + i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16b0.y); + i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16b0.z); + i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16c8.x); + i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16c8.y); + i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16c8.z); i_this->field_0x1710 = 0; } - break; - case 0x22: + } break; + case 0x22: { cLib_addCalc2(&i_this->field_0x1714, 55.0f, 0.05f, 0.3f); cLib_addCalc2(&i_this->field_0x16c8.x, i_this->field_0x16e0.x, 0.05f, i_this->field_0x16f8.x * i_this->field_0x1710); @@ -4169,8 +4190,8 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a0 = 0; dKy_change_colpat(4); } - break; - case 0x23: + } break; + case 0x23: { i_this->field_0x1714 = 55.0f; i_this->field_0x16bc.set(-9110.0f, 492.0f, 331.0f); i_this->field_0x16a4.set(-8469.0f, 372.0f, -54.0f); @@ -4182,10 +4203,10 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x169e = 0x24; i_this->field_0x16a0 = 0; } - break; - case 0x24: - i_this->field_0x16b0.set(700.0f, 100.0f, 500.0f); - i_this->field_0x16c8.set(-10.0f, 350.0f, 80.0f); + } break; + case 0x24: { + i_this->field_0x16b0.set(700.0f + JREG_F(0), 100.0f + JREG_F(1), 500.0f + JREG_F(2)); + i_this->field_0x16c8.set(-10.0f + JREG_F(3), 350.0f + JREG_F(4), 80.0f + JREG_F(5)); cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); MtxPosition(&i_this->field_0x16b0, &i_this->field_0x16a4); i_this->field_0x16a4 += a_this->current.pos; @@ -4194,45 +4215,38 @@ static void demo_camera(e_wb_class* i_this) { if (i_this->field_0x16a0 == 20) { local_194->mMode++; } - if (i_this->field_0x16a0 != 92) { + if (i_this->field_0x16a0 != (s16)(92 + KREG_S(8))) { break; } i_this->field_0x169e = 0x25; i_this->field_0x16a0 = 0; - fpcM_Search(s_wbstart_sub, a_this); + fpcM_Search(s_wbstart_sub, i_this); i_this->field_0x16bc.set(-12800.0f, 153.0f, 51.0f); i_this->field_0x16a4.set(-12022.0f, 82.0f, 51.0f); i_this->field_0x16e0.set(-13168.0f, 163.0f, -200.0f); i_this->field_0x16d4.set(-12500.0f, 83.0f, -593.0f); - i_this->field_0x16ec.x = std::fabsf(i_this->field_0x16d4.x - - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = std::fabsf(i_this->field_0x16d4.y - - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = std::fabsf(i_this->field_0x16d4.z - - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = std::fabsf(i_this->field_0x16e0.x - - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = std::fabsf(i_this->field_0x16e0.y - - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = std::fabsf(i_this->field_0x16e0.z - - i_this->field_0x16bc.z); + i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); + i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); + i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); + i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); + i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); + i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); i_this->field_0x1710 = 0; - + } // fallthrough - case 0x25: + case 0x25: { if (i_this->field_0x16a0 < 110) { fpcM_Search(s_spd0_sub, i_this); } if (i_this->field_0x16a0 < 0xd2) { fpcM_Search(s_rdArrowWait_sub, i_this); } - if (i_this->field_0x16a0 > 165) { - cam_3d_morf(i_this, 0.1f); - cLib_addCalc2(&i_this->field_0x1710, 0.01f, 1.0f, - 0.00015f); + if (i_this->field_0x16a0 > (s16)(165 + BREG_S(6))) { + cam_3d_morf(i_this, 0.1f + BREG_F(17)); + cLib_addCalc2(&i_this->field_0x1710, 0.01f + BREG_F(18), 1.0f, 0.00015f + BREG_F(19)); } if (i_this->field_0x16a0 == 245) { - dComIfGp_getVibration().StartQuake(4, 0x1f, cXyz(0.0f, 1.0f, 0.0f)); + dComIfGp_getVibration().StartQuake(4 + TREG_S(5), 0x1f, cXyz(0.0f, 1.0f, 0.0f)); } if (i_this->field_0x16a0 == 295) { @@ -4240,8 +4254,7 @@ static void demo_camera(e_wb_class* i_this) { } if (i_this->field_0x16a0 > 250 && i_this->field_0x16a0 < 285) { - cLib_addCalc2(&i_this->field_0x171c, 35.0f - 10.0f, 1.0f, - 3.0f); + cLib_addCalc2(&i_this->field_0x171c, 35.0f + BREG_F(7) - 10.0f, 1.0f, 3.0f + BREG_F(6)); } if (i_this->field_0x16a0 == 325) { @@ -4259,8 +4272,8 @@ static void demo_camera(e_wb_class* i_this) { i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_RDB_V_HOICK, -1); local_194->field_0x990[3] = 700; } - break; - case 0x26: + } break; + case 0x26: { if (i_this->field_0x16a0 == 50) { local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4); local_184->mCamera.Start(); @@ -4272,8 +4285,8 @@ static void demo_camera(e_wb_class* i_this) { Z2GetAudioMgr()->subBgmStart(Z2BGM_HORSE_BATTLE); dKy_change_colpat(3); } - break; - case 0x28: + } break; + case 0x28: { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -4289,12 +4302,12 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a4.set(36496.0f, 1358.0f, -17344.0f); i_this->field_0x16e0.set(36453.0f, 1116.0f, -16995.0f); i_this->field_0x16d4.set(35835.0f, 955.0f, -16867.0f); - i_this->field_0x16ec.x = std::fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x) * 0.3f; - i_this->field_0x16ec.y = std::fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y) * 0.3f; - i_this->field_0x16ec.z = std::fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z) * 0.3f; - i_this->field_0x16f8.x = std::fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = std::fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = std::fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); + i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x) * 0.3f; + i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y) * 0.3f; + i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z) * 0.3f; + i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); + i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); + i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); cStack_48.set(34800.0f, -300.0f, -15200.0f); @@ -4304,37 +4317,35 @@ static void demo_camera(e_wb_class* i_this) { horse->changeDemoPos0(&cStack_48); dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[87]); Z2GetAudioMgr()->bgmStart(Z2BGM_HORSE_BATTLE_D02, 0, 0); - dComIfGp_getEvent()->startCheckSkipEdge(i_this); + dComIfGp_getEvent()->startCheckSkipEdge(a_this); + } // fallthrough - case 0x29: - if (i_this->field_0x16a0 == 30) { + case 0x29: { + if (i_this->field_0x16a0 == (30 + JREG_S(0))) { horse->changeDemoMode(8, 0); } - if (i_this->field_0x16a0 > 70) { + if (i_this->field_0x16a0 > (70 + JREG_S(3))) { cam_3d_morf(i_this, 0.2f); cLib_addCalc2(&i_this->field_0x1710, 0.2f, 1.0f, 0.01f); - if (i_this->field_0x16a0 == 150) { + if (i_this->field_0x16a0 == (150 + JREG_S(4))) { i_this->field_0x16bc.set(35528.0f, 316.0f, -16987.0f); i_this->field_0x16a4.set(35059.0f, -128.0f, -16992.0f); i_this->field_0x16ec.set(0.0f, 0.0f, 0.0f); i_this->field_0x16e0.set(34973.0f, -148.0f, -16346.0f); - i_this->field_0x16f8.x = - std::fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = - std::fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = - std::fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); + i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); + i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); + i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); i_this->field_0x1710 = 0; i_this->field_0x169e = 0x2a; i_this->field_0x16a0 = 0; } } - break; - case 0x2a: - i_this->field_0x1710 = 0.075f; + } break; + case 0x2a: { + i_this->field_0x1710 = 0.075f + JREG_F(7); cam_3d_morf(i_this, 0.5f); - if (i_this->field_0x16a0 == 20) { + if (i_this->field_0x16a0 == 20 + JREG_S(5)) { i_this->field_0x1722 = 1; i_this->field_0x1718 = 0.0f; Z2GetAudioMgr()->seStart(Z2SE_OBJ_STRAWFENCE_IGNITION, &saku_p, 0, 0, 1.0f, 1.0f, -1.0f, @@ -4343,7 +4354,7 @@ static void demo_camera(e_wb_class* i_this) { -1.0f, -1.0f, 0); } - if (i_this->field_0x16a0 == 23) { + if (i_this->field_0x16a0 == 23 + JREG_S(6)) { horse->changeDemoMode(9, 0); } @@ -4356,8 +4367,8 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a0 = 0; i_this->mActionMode = -100; } - break; - case 0x2b: + } break; + case 0x2b: { if (i_this->field_0x16a0 == 5) { horse->changeDemoMode(1, 0); daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0); @@ -4371,26 +4382,20 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a4.set(35167.0f, -202.0f, -35403.0f); i_this->field_0x16e0.set(34740.0f, -92.7f, -35966.0f); i_this->field_0x16d4.set(34320.0, -202.0, -35490.0); - i_this->field_0x16ec.x = - std::fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = - std::fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = - std::fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = - std::fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = - std::fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = - std::fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); + i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); + i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); + i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); + i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); + i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); + i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); i_this->field_0x1714 = 55.0f; i_this->field_0x169e = 0x2c; i_this->field_0x16a0 = 0; i_this->field_0x698[0] = 0x14; } } - break; - case 0x2c: + } break; + case 0x2c: { cam_3d_morf(i_this, 0.05f); cLib_addCalc2(&i_this->field_0x1710, 0.005f, 1.0f, 0.0002f); if (i_this->field_0x16a0 == 170) { @@ -4401,7 +4406,7 @@ static void demo_camera(e_wb_class* i_this) { cStack_48.set(34800.0f, -300.0f, -18700.0f); horse->setHorsePosAndAngle(&cStack_48, horse->shape_angle.y); } - if (i_this->field_0x16a0 == 306) { + if (i_this->field_0x16a0 == 306 + NREG_S(6)) { local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4); local_184->mCamera.Start(); local_184->mCamera.SetTrimSize(0); @@ -4411,8 +4416,8 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x169e = 0; Z2GetAudioMgr()->subBgmStart(Z2BGM_FACE_OFF_BATTLE2); } - break; - case 0x32: + } break; + case 0x32: { if (!rdb->enemy.eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(&rdb->enemy, 2, 0xffff, 0); rdb->enemy.eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -4427,9 +4432,11 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16bc.set(1679.0, 100.0, 852.0); i_this->field_0x16a4.set(1873.0, 64.0, 527.0); daPy_getPlayerActorClass()->changeOriginalDemo(); - dComIfGp_getEvent()->startCheckSkipEdge(i_this); + dComIfGp_getEvent()->startCheckSkipEdge(a_this); dComIfGs_onOneZoneSwitch(4, -1); - case 0x33: + } + // fallthrough + case 0x33: { if (i_this->field_0x16a0 < 30) { cStack_48.set(1787.0f, 1.75f, 484.0f); player->setPlayerPosAndAngle(&cStack_48, -0x12c3, 0); @@ -4450,81 +4457,79 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a0 = 0; cMtx_YrotS(*calc_mtx, rdb->enemy.shape_angle.y); local_3c.x = 0.0f; - local_3c.y = 150.0f; - local_3c.z = 800.0f; + local_3c.y = 150.0f + JREG_F(7); + local_3c.z = 800.0f + JREG_F(8); MtxPosition(&local_3c, &i_this->field_0x16a4); i_this->field_0x16a4 += rdb->enemy.current.pos; i_this->field_0x16bc = rdb->enemy.current.pos; - i_this->field_0x16bc.y += 150.0f; + i_this->field_0x16bc.y += 150.0f + JREG_F(9); rdb->mMode = 2; rdb->field_0x6b8[0] = 0x28; - case 0x34: - cLib_addCalc0(&rdb->field_0x6e0, 1.0f, 0.3f); - if (i_this->field_0x16a0 == 145) { - rdb->field_0x6d8 = 3; - } - if (i_this->field_0x16a0 == 0xaf) { - rdb->mMode = 4; - } - if (i_this->field_0x16a0 == 0x138) { - i_this->mActionID = 0x18; - i_this->mActionMode = 0; - i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); - cXyz cStack_6c(a_this->current.pos); - cStack_6c.y += 150.0f; - dComIfGp_setHitMark(3, 0, &cStack_6c, &a_this->shape_angle, 0, 0); - } - if (i_this->field_0x16a0 == 315) { - i_this->field_0x16bc.set(1717.0f, 96.0f, 910.0f); - i_this->field_0x16a4.set(2226.0f, 56.0f, 751.0f); - i_this->field_0x16e0.set(1780.0f, 92.0f, 967.0f); - i_this->field_0x16d4.set(1988.0f, 69.0f, 475.0f); - i_this->field_0x16ec.x = - std::fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = - std::fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = - std::fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = - std::fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = - std::fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = - std::fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); - i_this->field_0x1710 = 0; - player->setPlayerPosAndAngle(&player->current.pos, player->shape_angle.y - 4000, 0); - } - if (i_this->field_0x16a0 == 345) { - daPy_getPlayerActorClass()->setThrowDamage(rdb->enemy.shape_angle.y - 8000, 40.0f, - 25.0f, 0, 1, 0); - daPy_getPlayerActorClass()->changeDemoMode(1, 0, 0, 0); - cXyz cStack_78(player->current.pos); - cStack_78.y += 150.0f; - dComIfGp_setHitMark(3, 0, &cStack_78, &player->shape_angle, 0, 0); - } - - if (i_this->field_0x16a0 == 418) { - daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0); - } - - if (i_this->field_0x16a0 >= 378) { - cam_3d_morf(i_this, 0.1f); - cLib_addCalc2(&i_this->field_0x1710, 0.05f, 1.0f, 0.001f); - } - - if (i_this->field_0x16a0 >= 490) { - local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4); - local_184->mCamera.Start(); - local_184->mCamera.SetTrimSize(0); - dComIfGp_event_reset(); - daPy_getPlayerActorClass()->cancelOriginalDemo(); - i_this->field_0x169e = 0; - rdb->mMode = 7; - Z2GetAudioMgr()->subBgmStart(Z2BGM_FACE_OFF_BATTLE3); - } + } else { + break; } - break; - case 0x3c: + } + // fallthrough + case 0x34: { + cLib_addCalc0(&rdb->field_0x6e0, 1.0f, 0.3f + KREG_F(3)); + if (i_this->field_0x16a0 == 145) { + rdb->field_0x6d8 = 3; + } + if (i_this->field_0x16a0 == 0xaf) { + rdb->mMode = 4; + } + if (i_this->field_0x16a0 == 0x138) { + i_this->mActionID = 0x18; + i_this->mActionMode = 0; + i_this->mZ2Ride.startCreatureVoice(Z2SE_EN_WB_V_DAMAGE, -1); + cXyz cStack_6c(a_this->current.pos); + cStack_6c.y += 150.0f; + dComIfGp_setHitMark(3, 0, &cStack_6c, &a_this->shape_angle, 0, 0); + } + if (i_this->field_0x16a0 == 315) { + i_this->field_0x16bc.set(1717.0f, 96.0f, 910.0f); + i_this->field_0x16a4.set(2226.0f, 56.0f, 751.0f); + i_this->field_0x16e0.set(1780.0f, 92.0f, 967.0f); + i_this->field_0x16d4.set(1988.0f, 69.0f, 475.0f); + i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); + i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); + i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); + i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); + i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); + i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); + i_this->field_0x1710 = 0; + player->setPlayerPosAndAngle(&player->current.pos, player->shape_angle.y - 4000, 0); + } + if (i_this->field_0x16a0 == 345) { + daPy_getPlayerActorClass()->setThrowDamage(rdb->enemy.shape_angle.y - 8000 + TREG_S(8), + 40.0f, 25.0f + KREG_F(14), 0, 1, 0); + daPy_getPlayerActorClass()->changeDemoMode(1, 0, 0, 0); + cXyz cStack_78(player->current.pos); + cStack_78.y += 150.0f; + dComIfGp_setHitMark(3, 0, &cStack_78, &player->shape_angle, 0, 0); + } + + if (i_this->field_0x16a0 == 418) { + daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0); + } + + if (i_this->field_0x16a0 >= 378) { + cam_3d_morf(i_this, 0.1f + BREG_F(17)); + cLib_addCalc2(&i_this->field_0x1710, 0.05f + BREG_F(18), 1.0f, 0.001f + BREG_F(19)); + } + + if (i_this->field_0x16a0 >= 490) { + local_184->mCamera.Reset(i_this->field_0x16bc, i_this->field_0x16a4); + local_184->mCamera.Start(); + local_184->mCamera.SetTrimSize(0); + dComIfGp_event_reset(); + daPy_getPlayerActorClass()->cancelOriginalDemo(); + i_this->field_0x169e = 0; + rdb->mMode = 7; + Z2GetAudioMgr()->subBgmStart(Z2BGM_FACE_OFF_BATTLE3); + } + } break; + case 0x3c: { if (!rdb->enemy.eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(&rdb->enemy, 2, 0xffff, 0); rdb->enemy.eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -4539,26 +4544,26 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16bc.set(2297.0f, 81.0f, 1668.0f); i_this->field_0x16a4.set(2285.0f, 95.0f, 1988.0f); rdb->enemy.current.pos.set(2341.0f, 1.0f, 1292.0f); - rdb->enemy.current.angle.y = 0x958; - rdb->enemy.shape_angle.y = 0x958; + rdb->enemy.shape_angle.y = rdb->enemy.current.angle.y = 0x958; daPy_getPlayerActorClass()->changeOriginalDemo(); daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0); dComIfGs_onOneZoneSwitch(5, -1); + } // fallthrough - case 0x3d: + case 0x3d: { if (i_this->field_0x16a0 == 170) { daPy_getPlayerActorClass()->changeDemoMode(0xc, 0, 0, 0); } - cStack_48.set(2120.0f, player->current.pos.y, 1200.0f); + cStack_48.set(2120.0f + BREG_F(2), player->current.pos.y, 1200.0f + BREG_F(3)); player->setPlayerPosAndAngle(&cStack_48, 5300, 0); - cStack_60.y = rdb->enemy.eyePos.y; + cStack_60.y = rdb->enemy.eyePos.y + BREG_F(16); if (cStack_60.y < 81.0f) { cStack_60.y = 81.0f; } - if (cStack_60.y > 120.0f) { - cStack_60.y = 120.0f; + if (cStack_60.y > 120.0f + BREG_F(15)) { + cStack_60.y = 120.0f + BREG_F(15); } cLib_addCalc2(&i_this->field_0x16bc.y, cStack_60.y, 0.1f, 10.0f); @@ -4572,20 +4577,20 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x169e = 0x3e; i_this->field_0x16a0 = 0; } - break; + } break; case 0x3e: { daObjCRVSTEEL_c* crvSteel = (daObjCRVSTEEL_c*)fopAcM_SearchByName(PROC_Obj_CRVSTEEL); - if (i_this->field_0x16a0 == 20) { - crvSteel->OpenSet(20.0f, 350.0f); + if (i_this->field_0x16a0 == (s16)(20 + AREG_S(4))) { + crvSteel->OpenSet(20.0f + AREG_F(3), 350.0f + AREG_F(4)); Z2GetAudioMgr()->seStart(Z2SE_OBJ_CRVN_URA_GATE, &crvSteel->current.pos, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); } - if (i_this->field_0x16a0 == 130) { - crvSteel->CloseSet(-40.0f); + if (i_this->field_0x16a0 == (s16)(130 + AREG_S(5))) { + crvSteel->CloseSet(-40.0f + AREG_F(5)); } - if (i_this->field_0x16a0 == 140) { + if (i_this->field_0x16a0 == (s16)(140 + AREG_S(5))) { dComIfGp_getVibration().StartShock(5, 0x4f, cXyz(0.0f, 1.0f, 0.0f)); } @@ -4596,18 +4601,18 @@ static void demo_camera(e_wb_class* i_this) { rdb->field_0x680 = 0; i_this->field_0x16e0.set(2834.0f, 490.0f, 1584.0f); i_this->field_0x16d4.set(1978.0f, 87.0f, 1225.0f); - i_this->field_0x16ec.x = std::fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = std::fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = std::fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = std::fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = std::fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = std::fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); + i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); + i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); + i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); + i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); + i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); + i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); i_this->field_0x1710 = 0; i_this->field_0x169e = 0x3f; i_this->field_0x16a0 = 0; // fallthrough } - case 0x3f: + case 0x3f: { if (i_this->field_0x16a0 == 40) { rdb->field_0xfe4 = 1; Z2GetAudioMgr()->bgmStart(Z2BGM_EVENT02, 0, 0); @@ -4618,8 +4623,8 @@ static void demo_camera(e_wb_class* i_this) { } if (i_this->field_0x16a0 > 60) { - cam_3d_morf(i_this, 0.05f); - cLib_addCalc2(&i_this->field_0x1710, 0.05f, 1.0f, 0.0002); + cam_3d_morf(i_this, 0.05f + BREG_F(17)); + cLib_addCalc2(&i_this->field_0x1710, 0.05f + BREG_F(18), 1.0f, 0.0002f + BREG_F(19)); } if (i_this->field_0x16a0 == 110) { @@ -4634,22 +4639,23 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16a4.set(2265.0f, 127.0f, 1011.0f); i_this->field_0x16e0.set(1267.0f, 259.0f, 821.0f); i_this->field_0x16d4.set(2265.0f, 127.0f, 1011.0f); - i_this->field_0x16ec.x = std::fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); - i_this->field_0x16ec.y = std::fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); - i_this->field_0x16ec.z = std::fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); - i_this->field_0x16f8.x = std::fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); - i_this->field_0x16f8.y = std::fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); - i_this->field_0x16f8.z = std::fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); + i_this->field_0x16ec.x = fabsf(i_this->field_0x16d4.x - i_this->field_0x16a4.x); + i_this->field_0x16ec.y = fabsf(i_this->field_0x16d4.y - i_this->field_0x16a4.y); + i_this->field_0x16ec.z = fabsf(i_this->field_0x16d4.z - i_this->field_0x16a4.z); + i_this->field_0x16f8.x = fabsf(i_this->field_0x16e0.x - i_this->field_0x16bc.x); + i_this->field_0x16f8.y = fabsf(i_this->field_0x16e0.y - i_this->field_0x16bc.y); + i_this->field_0x16f8.z = fabsf(i_this->field_0x16e0.z - i_this->field_0x16bc.z); i_this->field_0x1710 = 0; i_this->field_0x1714 = 60.0f; i_this->field_0x169e = 0x40; i_this->field_0x16a0 = 0; daPy_getPlayerActorClass()->changeDemoMode(0x14, 0, 0, 0); + } // fallthrough - case 0x40: + case 0x40: { if (i_this->field_0x16a0 > 60) { - cam_3d_morf(i_this, 0.05f); - cLib_addCalc2(&i_this->field_0x1710, 0.05f, 1.0f, 0.0002f); + cam_3d_morf(i_this, 0.05f + BREG_F(17)); + cLib_addCalc2(&i_this->field_0x1710, 0.05f + BREG_F(18), 1.0f, 0.0002f + BREG_F(19)); } if (i_this->field_0x16a0 == 170) { @@ -4664,8 +4670,8 @@ static void demo_camera(e_wb_class* i_this) { daPy_getPlayerActorClass()->cancelOriginalDemo(); i_this->field_0x169e = 0; } - break; - case 0x46: + } break; + case 0x46: { if (!rdb->enemy.eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(&rdb->enemy, 2, 0xffff, 0); rdb->enemy.eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -4682,16 +4688,17 @@ static void demo_camera(e_wb_class* i_this) { daPy_getPlayerActorClass()->changeOriginalDemo(); fpcM_Search(s_rddel_sub, i_this); rdb->field_0x6d8 = 1; + } // fallthrough - case 0x47: + case 0x47: { cStack_48.set(1800.0f, player->current.pos.y, -192.0f); player->setPlayerPosAndAngle(&cStack_48, 0, 0); - if (i_this->field_0x16a0 == 2) { + if (i_this->field_0x16a0 == (s16)(2 + VREG_S(1))) { daObjCRVGATE_c* crvGate = (daObjCRVGATE_c*)fopAcM_SearchByName(PROC_Obj_CRVGATE); crvGate->SetB_Close(); } - if (i_this->field_0x16a0 == 25) { + if (i_this->field_0x16a0 == (s16)(25 + VREG_S(0))) { daPy_getPlayerActorClass()->changeDemoMode(0x19, 0, 0, 0); } @@ -4703,8 +4710,8 @@ static void demo_camera(e_wb_class* i_this) { daPy_getPlayerActorClass()->cancelOriginalDemo(); i_this->field_0x169e = 0; } - break; - case 0x50: + } break; + case 0x50: { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -4722,8 +4729,9 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x16bc.set(1631.0f, 195.0f, -224.0f); i_this->field_0x16a4.set(1233.0f, 167.0f, 195.0f); daPy_getPlayerActorClass()->changeOriginalDemo(); + } // fallthrough - case 0x51: + case 0x51: { a_this->current.angle.y = 0x8000; a_this->shape_angle.y = 0x8000; i_this->mTurnStep = 0; @@ -4734,22 +4742,22 @@ static void demo_camera(e_wb_class* i_this) { if (i_this->field_0x16a0 >= 52) { if (i_this->field_0x16a0 == 52) { i_this->field_0x16a4 = a_this->current.pos; - i_this->field_0x16a4.x += 300.0f; - i_this->field_0x16a4.y += 150.0f; - i_this->field_0x16a4.z -= 1400.0f; + i_this->field_0x16a4.x += 300.0f + VREG_F(8); + i_this->field_0x16a4.y += 150.0f + VREG_F(9); + i_this->field_0x16a4.z -= 1400.0f + VREG_F(10); } } else { i_this->field_0x16a4 = a_this->current.pos; - i_this->field_0x16a4.y += 400.0f; - i_this->field_0x16a4.z += 700.0f; + i_this->field_0x16a4.y += 400.0f + VREG_F(6); + i_this->field_0x16a4.z += 700.0f + VREG_F(7); } } if (i_this->field_0x16a0 == 140) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[90]); dComIfGp_setNextStage("F_SP118", 0, 3, 0, 0.0f, 0, 1, 0, 0, 1, 0); } - break; - case 0x5a: + } break; + case 0x5a: { if (!a_this->eventInfo.checkCommandDemoAccrpt()) { fopAcM_orderPotentialEvent(a_this, 2, 0xffff, 0); a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e); @@ -4759,42 +4767,39 @@ static void demo_camera(e_wb_class* i_this) { local_184->mCamera.SetTrimSize(3); i_this->field_0x169e = 0x5b; i_this->field_0x16a0 = 0; - i_this->field_0x1714 = 55.0; + i_this->field_0x1714 = 55.0f + KREG_F(7); i_this->field_0x16a0 = 0; i_this->field_0x1710 = 0; daPy_getPlayerActorClass()->changeOriginalDemo(); horse->changeOriginalDemo(); a_this->current.pos.set(-93640.0f, a_this->current.pos.y, 44000.0f); - a_this->shape_angle.y = 0x8000; - a_this->current.angle.y = 0x8000; + a_this->current.angle.y = a_this->shape_angle.y = 0x8000; i_this->field_0x16bc = a_this->current.pos; - i_this->field_0x16bc.y = a_this->eyePos.y + 200.0f; + i_this->field_0x16bc.y = a_this->eyePos.y + 200.0f + VREG_F(0); i_this->field_0x16a4 = a_this->current.pos; - i_this->field_0x16a4.y += 300.0f; - i_this->field_0x16a4.z += 500.0f; + i_this->field_0x16a4.y += 300.0f + VREG_F(1); + i_this->field_0x16a4.z += 500.0f + VREG_F(2); horse->changeDemoMode(1, 0); daPy_getPlayerActorClass()->changeDemoMode(1, 0, 0, 0); + } // fallthrough - case 0x5b: - cStack_48.set(-93335.0f, horse->current.pos.y, 44500.0f); + case 0x5b: { + cStack_48.set(-93335.0f + JREG_F(17), horse->current.pos.y, 44500.0f); horse->setHorsePosAndAngle(&cStack_48, 0); - cLib_addCalc2(&i_this->field_0x16bc.x, a_this->eyePos.x, 0.2f, - 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.y, a_this->eyePos.y + 150.0f, 0.2f, - 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.z, a_this->eyePos.z, 0.2f, - 200.0f); - i_this->field_0x16a4.z += a_this->speed.z * 0.8f; + cLib_addCalc2(&i_this->field_0x16bc.x, a_this->eyePos.x, 0.2f, 200.0f); + cLib_addCalc2(&i_this->field_0x16bc.y, 150.0f + a_this->eyePos.y + VREG_F(0), 0.2f, 200.0f); + cLib_addCalc2(&i_this->field_0x16bc.z, a_this->eyePos.z, 0.2f, 200.0f); + i_this->field_0x16a4.z += a_this->speed.z * (0.8f + VREG_F(3)); if (i_this->field_0x16a0 == 111) { i_this->field_0x169e = 0x5c; i_this->field_0x16a0 = 0; i_this->field_0x16a4 = a_this->current.pos; - i_this->field_0x16a4.x += -300.0f; - i_this->field_0x16a4.y += 100.0f; - i_this->field_0x16a4.z += -1300.0f; + i_this->field_0x16a4.x += -300.0f + VREG_F(5); + i_this->field_0x16a4.y += 100.0f + VREG_F(6); + i_this->field_0x16a4.z += -1300.0f + VREG_F(7); } - i_this->field_0x171c = 23.0f; + i_this->field_0x171c = 23.0f + JREG_F(7); if (!daPy_getPlayerActorClass()->checkHorseRide()) { local_184->mCamera.Start(); local_184->mCamera.SetTrimSize(0); @@ -4802,10 +4807,10 @@ static void demo_camera(e_wb_class* i_this) { daPy_getPlayerActorClass()->cancelOriginalDemo(); i_this->field_0x169e = 0; } - break; - case 0x5c: + } break; + case 0x5c: { cLib_addCalc2(&i_this->field_0x16bc.x, a_this->eyePos.x, 0.2f, 200.0f); - cLib_addCalc2(&i_this->field_0x16bc.y, a_this->eyePos.y + 100.0f, 0.2f, 200.0f); + cLib_addCalc2(&i_this->field_0x16bc.y, a_this->eyePos.y + 100.0f + VREG_F(8), 0.2f, 200.0f); cLib_addCalc2(&i_this->field_0x16bc.z, a_this->eyePos.z, 0.2f, 200.0f); if (i_this->field_0x16a0 != 60) { break; @@ -4814,23 +4819,25 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x169e = 0x5d; i_this->field_0x16a0 = 0; i_this->field_0x16a4 = a_this->current.pos; - i_this->field_0x16a4.x += 100.0f; - i_this->field_0x16a4.y += 600.0f; - i_this->field_0x16a4.z += -500.0f; + i_this->field_0x16a4.x += 100.0f + VREG_F(8); + i_this->field_0x16a4.y += 600.0f + VREG_F(9); + i_this->field_0x16a4.z += -500.0f + VREG_F(10); i_this->field_0x16bc = local_194->actor.current.pos; - i_this->field_0x16bc.y = local_194->actor.current.pos.y + 100.0f; + i_this->field_0x16bc.y = local_194->actor.current.pos.y + 100.0f + KREG_F(11); + } // fallthrough - case 0x5d: + case 0x5d: { if (local_194 != NULL) { - cLib_addCalc2(&i_this->field_0x1710, 1000.0f, 1.0f, 100.0f); - cLib_addCalc2(&i_this->field_0x16bc.x, local_194->actor.current.pos.x, 0.5f, + cLib_addCalc2(&i_this->field_0x1710, 1000.0f, 1.0f, 100.0f + KREG_F(10)); + cLib_addCalc2(&i_this->field_0x16bc.x, local_194->actor.current.pos.x, 0.5f + KREG_F(8), i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.y, local_194->actor.current.pos.y + 100.0f, 0.5f, + cLib_addCalc2(&i_this->field_0x16bc.y, + local_194->actor.current.pos.y + 100.0f + KREG_F(11), 0.5f + KREG_F(8), i_this->field_0x1710); - cLib_addCalc2(&i_this->field_0x16bc.z, local_194->actor.current.pos.z, 0.5f, + cLib_addCalc2(&i_this->field_0x16bc.z, local_194->actor.current.pos.z, 0.5f + KREG_F(8), i_this->field_0x1710); cLib_addCalc2(&i_this->field_0x16a4.x, local_194->actor.current.pos.x - 10.0f, 0.05f, - 12.0f); + 12.0f + NREG_F(3)); if (i_this->field_0x16a0 >= 40) { if (i_this->field_0x16a0 == 40) { i_this->field_0x5c4 = local_194->actor.current.pos; @@ -4846,11 +4853,11 @@ static void demo_camera(e_wb_class* i_this) { } local_3c = player->eyePos - i_this->field_0x5c4; cMtx_YrotS(*calc_mtx, cM_atan2s(local_3c.x, local_3c.z)); - cMtx_XrotM(*calc_mtx, -cM_atan2s(local_3c.y, JMAFastSqrt( - local_3c.x * local_3c.x + local_3c.z * local_3c.z))); + cMtx_XrotM(*calc_mtx, -cM_atan2s(local_3c.y, JMAFastSqrt(local_3c.x * local_3c.x + + local_3c.z * local_3c.z))); local_3c.x = 0.0f; local_3c.y = 0.0f; - local_3c.z = 30.0f; + local_3c.z = 30.0f + VREG_F(11); MtxPosition(&local_3c, &cStack_48); i_this->field_0x5c4 += cStack_48; } @@ -4866,8 +4873,8 @@ static void demo_camera(e_wb_class* i_this) { fopAcM_delete(&local_194->actor); } } - break; - case 0x5e: + } break; + case 0x5e: { for (int i = 0; i < 2; i++) { static u16 key_eno[2] = { dPa_RM(ID_ZM_S_KEYLIGHT00), @@ -4884,15 +4891,17 @@ static void demo_camera(e_wb_class* i_this) { i_this->field_0x5c4 = player->eyePos; } else { cMtx_YrotS(*calc_mtx, cM_atan2s(local_3c.x, local_3c.z)); - cMtx_XrotM(*calc_mtx, -cM_atan2s(local_3c.y, JMAFastSqrt(local_3c.x * local_3c.x + local_3c.z * local_3c.z))); + cMtx_XrotM(*calc_mtx, -cM_atan2s(local_3c.y, JMAFastSqrt(local_3c.x * local_3c.x + + local_3c.z * local_3c.z))); local_3c.x = 0.0f; local_3c.y = 0.0f; - local_3c.z = 30.0f; + local_3c.z = 30.0f + VREG_F(11); MtxPosition(&local_3c, &cStack_48); i_this->field_0x5c4 += cStack_48; } + } // fallthrough - case 0x5f: + case 0x5f: { cLib_addCalc2(&i_this->field_0x16bc.x, i_this->field_0x5c4.x, 0.2f, 100.0f); cLib_addCalc2(&i_this->field_0x16bc.y, i_this->field_0x5c4.y, 0.2f, 100.0f); cLib_addCalc2(&i_this->field_0x16bc.z, i_this->field_0x5c4.z, 0.2f, 100.0f); @@ -4901,11 +4910,9 @@ static void demo_camera(e_wb_class* i_this) { daPy_getPlayerActorClass()->changeDemoMode(0xb, 0xf3, 0, 0); } if (i_this->field_0x16a0 >= 60) { - cLib_addCalc2(&i_this->field_0x1714, 30.0f, 0.2f, - 1.5f); + cLib_addCalc2(&i_this->field_0x1714, 30.0f, 0.2f, 1.5f); } - if (i_this->field_0x16a0 >= 120 && !dMsgObject_isTalkNowCheck()) - { + if (i_this->field_0x16a0 >= 120 && !dMsgObject_isTalkNowCheck()) { i_this->field_0x169e = 0x60; i_this->field_0x16a0 = 0; daPy_getPlayerActorClass()->changeDemoMode(1, 1, 0, 0); @@ -4916,37 +4923,37 @@ static void demo_camera(e_wb_class* i_this) { a_this->current.pos.z += 3000.0f; } } - break; - case 0x60: + } break; + case 0x60: { if (i_this->field_0x16a0 >= 100) { fopAc_ac_c* local_1b0 = fopAcM_SearchByName(PROC_NPC_COACH); a_this->current.pos = local_1b0->eyePos; - a_this->current.pos.z = a_this->current.pos.z; + a_this->current.pos.z = a_this->current.pos.z - VREG_F(17); } - if (i_this->field_0x16a0 >= 220 && !dMsgObject_isTalkNowCheck()) - { + if (i_this->field_0x16a0 >= 220 && !dMsgObject_isTalkNowCheck()) { i_this->field_0x169e = 0x61; i_this->field_0x16a0 = 0; } - break; - case 0x61: + } break; + case 0x61: { fopAc_ac_c* local_1b4 = fopAcM_SearchByName(PROC_NPC_COACH); a_this->current.pos = local_1b4->eyePos; - a_this->current.pos.z = a_this->current.pos.z; + a_this->current.pos.z = a_this->current.pos.z - VREG_F(17); if (i_this->field_0x16a0 == 120) { - dComIfGp_setNextStage("F_SP121", 99, 13, 2, 0.0f, 0, 1, 0, 0, 1, - 0); + dComIfGp_setNextStage("F_SP121", 99, 13, 2, 0.0f, 0, 1, 0, 0, 1, 0); } + } break; } + if (i_this->field_0x169e != 0) { cStack_60 = i_this->field_0x16bc; cStack_54 = i_this->field_0x16a4; s16 local_1d0 = 0; if (i_this->field_0x171c > 0.0f) { i_this->field_0x16bc.y += i_this->field_0x171c * cM_ssin(i_this->field_0x16a0 * 0x2400); - local_1d0 = 10.0f * - (i_this->field_0x171c * cM_scos(i_this->field_0x16a0 * 0x2100)); - cLib_addCalc0(&i_this->field_0x171c, 1.0f, 1.5f); + local_1d0 = (10.0f + BREG_F(4)) * + (i_this->field_0x171c * cM_scos(i_this->field_0x16a0 * 0x2100)); + cLib_addCalc0(&i_this->field_0x171c, 1.0f, 1.5f + BREG_F(5)); } local_184->mCamera.Set(cStack_60, cStack_54, local_1d0, i_this->field_0x1714); i_this->field_0x16a0++; @@ -4979,8 +4986,7 @@ static void demo_camera(e_wb_class* i_this) { i_this->mActionMode = 3; a_this->current.pos.x = 828.0f; a_this->current.pos.z = 554.0f; - a_this->shape_angle.y = 0x800; - a_this->current.angle.y = 0x800; + a_this->current.angle.y = a_this->shape_angle.y = 0x800; rdb->mMode = 7; rdb->field_0xfcf = 0; rdb->field_0x6e0 = 0; @@ -5117,6 +5123,10 @@ static void anm_se_eff_set(e_wb_class* i_this) { static int c_start; +#if DEBUG +static f32 dummy(){return 35.f;} +#endif + static int daE_WB_Execute(e_wb_class* i_this) { if (c_start == 0) { if (dComIfGp_event_runCheck()) { @@ -5152,7 +5162,7 @@ static int daE_WB_Execute(e_wb_class* i_this) { if (i_this->field_0x1430 == 0) { fopAcM_OffStatus(a_this, 0); a_this->attention_info.flags = 0; - i_this->mStatusFlags &= 3; + i_this->mStatusFlags &= (u16)3; for (int i = 0; i < 4; i++) { if (i_this->field_0x698[i] != 0) { @@ -5460,7 +5470,7 @@ static int daE_WB_IsDelete(e_wb_class* i_this) { static int daE_WB_Delete(e_wb_class* i_this) { fopAc_ac_c* a_this = (fopAc_ac_c*)i_this; - fopAcM_GetID(i_this); + fpc_ProcID unused = fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhase, i_this->mResName); if (i_this->field_0x17e0 != 0) { hio_set = false; @@ -5492,83 +5502,73 @@ static int useHeapInit(fopAc_ac_c* a_this) { for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - + + f32* size; for (int i = 0; i < 2; i++) { if (i_this->field_0x79d != 0) { - int iVar6 = i_this->field_0x15d0[i].init( - 1, 0x10, (ResTIMG*)dComIfG_getObjectRes("Always", 0x54), 1); - - if (iVar6 == 0) { + if (!i_this->field_0x15d0[i].init( + 1, 0x10, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), + 1)) + { return 0; } } else { - int iVar6 = i_this->field_0x15d0[i].init( - 1, 0x10, (ResTIMG*)dComIfG_getObjectRes("Always", 0x54), 1); - - if (iVar6 == 0) { + if (!i_this->field_0x15d0[i].init( + 1, 0x10, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), + 1)) + { return 0; } } - f32* size = i_this->field_0x15d0[i].getSize(0); - for (int j = 0; j < 16; j++) { + size = i_this->field_0x15d0[i].getSize(0); + for (int j = 0; j < 16; j++, size++) { if (i_this->field_0x79d != 0) { - *size = 5.0f + PREG_S(0); + *size = 5.0f + XREG_S(1) * 0.1f; } else { - *size = 3.0f + PREG_S(1); + *size = 3.0f + XREG_S(0) * 0.1f; } - size++; } } if (i_this->field_0x79d != 0) { - int iVar6 = - i_this->field_0x1648.init(1, 2, (ResTIMG*)dComIfG_getObjectRes("Always", 0x54), 1); - - if (iVar6 == 0) { + if (!i_this->field_0x1648.init(1, 2, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1)) { return 0; } } else { - int iVar6 = - i_this->field_0x1648.init(1, 2, (ResTIMG*)dComIfG_getObjectRes("Always", 0x54), 1); - if (iVar6 == 0) { + if (!i_this->field_0x1648.init(1, 2, (ResTIMG*)dComIfG_getObjectRes("Always", dRes_INDEX_ALWAYS_BTI_ROPE_e), 1)) { return 0; } } - f32* size = i_this->field_0x1648.getSize(0); - - for (int i = 0; i < 2; i++) { + size = i_this->field_0x1648.getSize(0); + for (int i = 0; i < 2; i++, size++) { if (i_this->field_0x79d != 0) { - *size = 5.0f + PREG_S(0); + *size = 5.0f + XREG_S(1) * 0.1f; } else { - *size = 3.0f + PREG_S(1); + *size = 3.0f + XREG_S(0) * 0.1f; } - size++; } return 1; } -static int daE_WB_Create(fopAc_ac_c* a_this) { - fopAcM_ct(a_this, e_wb_class); - e_wb_class* i_this = (e_wb_class*)a_this; +static int daE_WB_Create(fopAc_ac_c* i_this) { + e_wb_class* a_this = (e_wb_class*)i_this; + fopAcM_ct(&a_this->mEnemy, e_wb_class); OS_REPORT("//////////////E_WB SET 555 !!\n"); + + a_this->mParam = fopAcM_GetParam(i_this); - fopAcM_GetParam((fopAc_ac_c*)i_this); - i_this->mParam = fopAcM_GetParam(i_this); - - if (i_this->mParam == 5 || i_this->mParam == 7 || i_this->mParam == 8 || i_this->mParam == 9) { - i_this->mResName = "E_bb"; + if (a_this->mParam == 5 || a_this->mParam == 7 || a_this->mParam == 8 || a_this->mParam == 9) { + a_this->mResName = "E_bb"; } else { - i_this->mResName = "E_wb"; + a_this->mResName = "E_wb"; } - int phase = dComIfG_resLoad(&i_this->mPhase, i_this->mResName); - lbl_244_bss_46 = 0; - lbl_244_bss_45 = 0; - lbl_244_bss_47 = 0; + int phase = dComIfG_resLoad(&a_this->mPhase, a_this->mResName); + lbl_244_bss_47 = lbl_244_bss_45 = lbl_244_bss_46 = 0; // Title Screen if (!strcmp(dComIfGp_getStartStageName(), "F_SP102")) { @@ -5576,61 +5576,61 @@ static int daE_WB_Create(fopAc_ac_c* a_this) { } // Hyrule Field, Bridge of Eldin area - if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && fopAcM_GetRoomNo(a_this) == 0) { + if (!strcmp(dComIfGp_getStartStageName(), "F_SP121") && fopAcM_GetRoomNo(i_this) == 0) { lbl_244_bss_46 = 1; } if (phase == cPhs_COMPLEATE_e) { - i_this->mActionID = ACT_WAIT; + a_this->mActionID = ACT_WAIT; - if (i_this->mParam == 0xff) { - i_this->mParam = 0; - } else if (i_this->mParam == 5) { - i_this->field_0x79d = 1; - i_this->mActionID = ACT_B_WAIT; - } else if (i_this->mParam == 7) { - i_this->field_0x79d = 2; - i_this->mActionID = ACT_B_IKKI; + if (a_this->mParam == 0xff) { + a_this->mParam = 0; + } else if (a_this->mParam == 5) { + a_this->field_0x79d = 1; + a_this->mActionID = ACT_B_WAIT; + } else if (a_this->mParam == 7) { + a_this->field_0x79d = 2; + a_this->mActionID = ACT_B_IKKI; if (cDmr_SkipInfo == 0) { - i_this->field_0x169e = 0x28; - arrow_rd_set(i_this); + a_this->field_0x169e = 0x28; + arrow_rd_set(a_this); } else { Z2GetAudioMgr()->subBgmStart(Z2BGM_FACE_OFF_BATTLE2); - i_this->field_0x1722 = 1; + a_this->field_0x1722 = 1; } - } else if (i_this->mParam == 8) { - i_this->field_0x79d = 3; - i_this->mActionID = ACT_B_IKKI2; + } else if (a_this->mParam == 8) { + a_this->field_0x79d = 3; + a_this->mActionID = ACT_B_IKKI2; // Hyrule Field if (!strcmp(dComIfGp_getStartStageName(), "F_SP121")) { - i_this->mActionMode = -100; + a_this->mActionMode = -100; } - i_this->mTargetFacingAngle = 0x8000; - } else if (i_this->mParam == 6) { - i_this->mActionID = ACT_EVENT; - } else if (i_this->mParam == 10) { - i_this->mActionID = ACT_C_F_RUN; - i_this->field_0x7a6 = 1; - i_this->field_0x7a7 = 1; + a_this->mTargetFacingAngle = 0x8000; + } else if (a_this->mParam == 6) { + a_this->mActionID = ACT_EVENT; + } else if (a_this->mParam == 10) { + a_this->mActionID = ACT_C_F_RUN; + a_this->field_0x7a6 = 1; + a_this->field_0x7a7 = 1; - if (fopAcM_gc_c::gndCheck(&a_this->current.pos)) { - a_this->current.pos.y = fopAcM_gc_c::getGroundY(); + if (fopAcM_gc_c::gndCheck(&i_this->current.pos)) { + i_this->current.pos.y = fopAcM_gc_c::getGroundY(); } OS_REPORT(" C_RD RESET 00\n"); - } else if (i_this->mParam == 9) { - i_this->field_0x79d = 4; - i_this->mActionID = ACT_B_LV9_END; - i_this->mActionMode = 0; + } else if (a_this->mParam == 9) { + a_this->field_0x79d = 4; + a_this->mActionID = ACT_B_LV9_END; + a_this->mActionMode = 0; } - i_this->mParam2 = fopAcM_GetParam(i_this) >> 8; + a_this->mParam2 = (fopAcM_GetParam(i_this) & 0xff00) >> 8; - if (i_this->field_0x79d != 0) { - i_this->field_0x688 = 2; + if (a_this->field_0x79d != 0) { + a_this->field_0x688 = 2; cXyz local_38; cXyz local_44; local_38.x = 0.0f; @@ -5652,10 +5652,9 @@ static int daE_WB_Create(fopAc_ac_c* a_this) { b_path[i] = local_44; } - if (i_this->field_0x79d == 1 || i_this->field_0x79d == 2) { - s8 room_no = fopAcM_GetRoomNo(a_this); - fopAcM_createChild(PROC_OBJ_WFLAG, fopAcM_GetID(i_this), 0, &a_this->current.pos, - room_no, 0, 0, -1, 0); + if (a_this->field_0x79d == 1 || a_this->field_0x79d == 2) { + fopAcM_createChild(PROC_OBJ_WFLAG, fopAcM_GetID(i_this), 0, &i_this->current.pos, + fopAcM_GetRoomNo(i_this), 0, 0, -1, 0); } static f32 pass_r[6] = { @@ -5666,51 +5665,50 @@ static int daE_WB_Create(fopAc_ac_c* a_this) { 600.0f, -800.0f, 800.0f, -300.0f, 0.0f, 300.0f, }; - i_this->field_0x7a8 = pass_r[i_this->mParam2]; - i_this->field_0x6c4 = x_check_off[i_this->mParam2]; + a_this->field_0x7a8 = pass_r[a_this->mParam2]; + a_this->field_0x6c4 = x_check_off[a_this->mParam2]; } u32 local_50; - if (i_this->field_0x79d != 0) { + if (a_this->field_0x79d != 0) { local_50 = 0x4300; } else { local_50 = 0x3740; } - if (!fopAcM_entrySolidHeap(a_this, useHeapInit, local_50)) { + if (!fopAcM_entrySolidHeap(i_this, useHeapInit, local_50)) { OS_REPORT("//////////////E_WB SET NON !!\n"); return cPhs_ERROR_e; } else { if (!hio_set) { - i_this->field_0x17e0 = 1; + a_this->field_0x17e0 = 1; hio_set = true; l_HIO.mId = mDoHIO_CREATE_CHILD("イノシシ", &l_HIO); } - fopAcM_OnStatus(a_this, 0); + fopAcM_OnStatus(i_this, 0); - a_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; - a_this->attention_info.distances[fopAc_attn_ETC_e] = 0xe; + i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; + i_this->attention_info.distances[fopAc_attn_ETC_e] = 0xe; - fopAcM_SetMtx(a_this, i_this->mpModelMorf->getModel()->getBaseTRMtx()); - fopAcM_SetMin(a_this, -800.0f, -400.0f, -800.0f); - fopAcM_SetMax(a_this, 800.0f, 400.0f, 800.0f); + fopAcM_SetMtx(i_this, a_this->mpModelMorf->getModel()->getBaseTRMtx()); + fopAcM_SetMin(i_this, -800.0f, -400.0f, -800.0f); + fopAcM_SetMax(i_this, 800.0f, 400.0f, 800.0f); - fopAcM_setCullSizeFar(a_this, 30000.0f); + fopAcM_setCullSizeFar(i_this, 30000.0f); - i_this->mAcch.Set(fopAcM_GetPosition_p(a_this), fopAcM_GetOldPosition_p(a_this), a_this, - 1, &i_this->field_0x7ac, fopAcM_GetSpeed_p(a_this), 0, 0); - i_this->field_0x7ac.SetWall(100.0f, 100.0f + BREG_F(8)); - i_this->mAcch.ClrWaterNone(); + a_this->mAcch.Set(fopAcM_GetPosition_p(i_this), fopAcM_GetOldPosition_p(i_this), i_this, + 1, &a_this->field_0x7ac, fopAcM_GetSpeed_p(i_this), 0, 0); + a_this->field_0x7ac.SetWall(100.0f, 100.0f + BREG_F(8)); + a_this->mAcch.ClrWaterNone(); - a_this->health = 10; - a_this->field_0x560 = 10; + i_this->field_0x560 = i_this->health = 10; - if (i_this->field_0x79d != 0) { - i_this->mStts.Init(0xfe, 0, a_this); + if (a_this->field_0x79d != 0) { + a_this->mStts.Init(0xfe, 0, i_this); } else { - i_this->mStts.Init(0xfd, 0, a_this); + a_this->mStts.Init(0xfd, 0, i_this); } for (int i = 0; i <= 6; i++) { @@ -5726,12 +5724,12 @@ static int daE_WB_Create(fopAc_ac_c* a_this) { } // mSphAttr }; - i_this->field_0xa00[i].Set(cc_sph_src); - i_this->field_0xa00[i].SetStts(&i_this->mStts); + a_this->field_0xa00[i].Set(cc_sph_src); + a_this->field_0xa00[i].SetStts(&a_this->mStts); - if (i_this->field_0x79d != 0) { - i_this->field_0xa00[i].OnTgShield(); - i_this->field_0xa00[i].SetTgHitMark(CcG_Tg_UNK_MARK_2); + if (a_this->field_0x79d != 0) { + a_this->field_0xa00[i].OnTgShield(); + a_this->field_0xa00[i].SetTgHitMark(CcG_Tg_UNK_MARK_2); } } @@ -5747,64 +5745,59 @@ static int daE_WB_Create(fopAc_ac_c* a_this) { } // mSphAttr }; - i_this->field_0x1288.Set(at_sph_src); - i_this->field_0x1288.SetStts(&i_this->mStts); + a_this->field_0x1288.Set(at_sph_src); + a_this->field_0x1288.SetStts(&a_this->mStts); - a_this->attention_info.distances[fopAc_attn_CARRY_e] = 0x28; - a_this->attention_info.distances[fopAc_attn_LOCK_e] = 0x16; - a_this->attention_info.distances[fopAc_attn_ETC_e] = 0x30; - a_this->attention_info.flags = 0; - i_this->field_0x68e = (s16)cM_rndF(65535.0f); + i_this->attention_info.distances[fopAc_attn_CARRY_e] = 0x28; + i_this->attention_info.distances[fopAc_attn_LOCK_e] = 0x16; + i_this->attention_info.distances[fopAc_attn_ETC_e] = 0x30; + i_this->attention_info.flags = 0; + a_this->field_0x68e = (s16)cM_rndF(65535.0f); for (int i = 0; i < 2; i++) { for (int j = 0; j < 16; j++) { - i_this->field_0x1450[i].field_0x0[j] = a_this->current.pos; + a_this->field_0x1450[i].field_0x0[j] = i_this->current.pos; } } - i_this->field_0x1438[0] = a_this->current.pos; - i_this->field_0x1438[1] = i_this->field_0x1438[0]; + a_this->field_0x1438[1] = a_this->field_0x1438[0] = i_this->current.pos; - i_this->mZ2Ride.init(&a_this->current.pos, &a_this->eyePos, 6, 1); - i_this->field_0x13c0.mpSound = &i_this->mZ2Ride; + a_this->mZ2Ride.init(&i_this->current.pos, &i_this->eyePos, 6, 1); + a_this->field_0x13c0.mpSound = &a_this->mZ2Ride; // Bulblin Camp if (!strcmp(dComIfGp_getStartStageName(), "F_SP118")) { - s16 room_no = fopAcM_GetRoomNo(a_this); - if (room_no == 1) { - a_this->current.pos.set(1500.0f, 0.0f, 1100.0f); - a_this->current.angle.y = 0x2000; - i_this->mActionID = ACT_CRV_WAIT; - i_this->field_0x1720 = 1; + if (fopAcM_GetRoomNo(i_this) == 1) { + i_this->current.pos.set(1500.0f, 0.0f, 1100.0f); + i_this->current.angle.y = 0x2000; + a_this->mActionID = ACT_CRV_WAIT; + a_this->field_0x1720 = 1; } else { - room_no = fopAcM_GetRoomNo(a_this); - - if (room_no == 2) { - i_this->mActionID = ACT_LR_DAMAGE; - anm_init(i_this, 0x12, 0.0f, 2, 1.0f); - i_this->mActionMode = 3; - a_this->current.pos.x = 828.0f; - a_this->current.pos.z = 554.0f; - a_this->shape_angle.y = 0x800; - a_this->current.angle.y = 0x800; - i_this->field_0x1720 = 1; + if (fopAcM_GetRoomNo(i_this) == 2) { + a_this->mActionID = ACT_LR_DAMAGE; + anm_init(a_this, 0x12, 0.0f, 2, 1.0f); + a_this->mActionMode = 3; + i_this->current.pos.x = 828.0f; + i_this->current.pos.z = 554.0f; + i_this->current.angle.y = i_this->shape_angle.y = 0x800; + a_this->field_0x1720 = 1; } } } - if (i_this->mParam == 10) { + if (a_this->mParam == 10) { lbl_244_bss_47 = 1; } - fopAcM_setCullSizeFar(a_this, 30000.0f); - i_this->mSpeedRate = l_HIO.mPlayerMountedMaxSpeed; + fopAcM_setCullSizeFar(i_this, 30000.0f); + a_this->mSpeedRate = l_HIO.mPlayerMountedMaxSpeed; c_start = 1; - daE_WB_Execute(i_this); + daE_WB_Execute(a_this); c_start = 0; if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[88])) { - i_this->mLapCount = 1; + a_this->mLapCount = 1; } } } From d63835d5c694cf5c4751b1f12863f54b9fb49356 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Fri, 26 Dec 2025 19:20:21 -0500 Subject: [PATCH 18/35] Fix optimization flag for Shield (#3004) * Fix optimization flag for Shield * Minor debug work * Fix NULL asserts --- configure.py | 27 ++-- include/JSystem/J3DGraphBase/J3DMatBlock.h | 144 +++++++++--------- src/JSystem/J3DGraphBase/J3DTexture.cpp | 2 +- src/JSystem/JAWExtSystem/JAWWindow.cpp | 2 +- src/JSystem/JAudio2/JASAramStream.cpp | 2 +- src/JSystem/JAudio2/JASBNKParser.cpp | 4 +- src/JSystem/JAudio2/JASBasicInst.cpp | 4 +- src/JSystem/JAudio2/JASCmdStack.cpp | 2 +- src/JSystem/JAudio2/JASSimpleWaveBank.cpp | 2 +- src/JSystem/JAudio2/JASTrack.cpp | 2 +- src/JSystem/JStudio/JStudio/functionvalue.cpp | 10 +- src/JSystem/JStudio/JStudio/fvb.cpp | 12 +- src/d/actor/d_a_npc_ashB.cpp | 2 +- src/d/actor/d_a_obj_brakeeff.cpp | 2 +- src/d/actor/d_a_obj_shield.cpp | 4 +- src/d/actor/d_a_tag_watchge.cpp | 7 +- src/d/actor/d_a_title.cpp | 1 + src/d/d_map_path.cpp | 2 +- src/d/d_menu_fmap.cpp | 2 +- src/m_Do/m_Do_ext.cpp | 29 +++- 20 files changed, 148 insertions(+), 114 deletions(-) diff --git a/configure.py b/configure.py index 22615e3796..d592b55afc 100755 --- a/configure.py +++ b/configure.py @@ -377,7 +377,7 @@ if config.version != "ShieldD": if config.version == "ShieldD": - cflags_framework.extend(["-O0", "-inline off", "-RTTI on", "-DDEBUG=1", "-DWIDESCREEN_SUPPORT=1"]) + cflags_framework.extend(["-O0,p", "-inline off", "-RTTI on", "-DDEBUG=1", "-DWIDESCREEN_SUPPORT=1"]) elif config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield"]: cflags_framework.extend(["-ipa file", "-RTTI on", "-DWIDESCREEN_SUPPORT=1"]) @@ -385,9 +385,12 @@ if config.version in ["RZDE01_00", "ShieldD"] or args.debug or args.reghio: cflags_framework.extend(["-DENABLE_REGHIO=1"]) if config.version != "ShieldD": - if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01", "Shield"]: + if config.version in ["RZDE01_00", "RZDE01_02", "RZDP01", "RZDJ01"]: # TODO: whats the correct inlining flag? deferred looks better in some places, others not. something else wrong? cflags_framework.extend(["-inline noauto", "-O4,s", "-sym on"]) + elif config.version in ["Shield"]: + # TODO: whats the correct inlining flag? deferred looks better in some places, others not. something else wrong? + cflags_framework.extend(["-inline noauto", "-O4,p", "-sym on"]) else: cflags_framework.extend(["-inline noauto", "-O3,s", "-sym on", "-str reuse,pool,readonly"]) @@ -2101,7 +2104,7 @@ config.libs = [ ], }, Rel("f_pc_profile_lst", [Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_pc/f_pc_profile_lst.cpp")]), - ActorRel(MatchingFor(ALL_GCN), "d_a_andsw"), + ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_andsw"), ActorRel(MatchingFor(ALL_GCN), "d_a_bg"), ActorRel(MatchingFor(ALL_GCN), "d_a_bg_obj"), ActorRel(MatchingFor(ALL_GCN), "d_a_dmidna"), @@ -2139,7 +2142,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mist"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_msg"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_push"), - ActorRel(MatchingFor(ALL_GCN), "d_a_tag_telop"), + ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_telop"), ActorRel(MatchingFor(ALL_GCN), "d_a_tbox"), ActorRel(MatchingFor(ALL_GCN), "d_a_tbox2"), ActorRel(MatchingFor(ALL_GCN), "d_a_vrbox"), @@ -2227,7 +2230,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hinit"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hjump"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_hstop"), - ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv2prchk"), + ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lv2prchk"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_magne"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mhint"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mstop"), @@ -2353,7 +2356,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_e_yh"), ActorRel(MatchingFor(ALL_GCN), "d_a_e_yk"), ActorRel(MatchingFor(ALL_GCN), "d_a_e_ym"), - ActorRel(MatchingFor(ALL_GCN), "d_a_e_ym_tag"), + ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_e_ym_tag"), ActorRel(MatchingFor(ALL_GCN), "d_a_e_ymb"), ActorRel(MatchingFor(ALL_GCN), "d_a_e_yr"), ActorRel(MatchingFor(ALL_GCN), "d_a_e_zh"), @@ -2435,12 +2438,12 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_npc_lf"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_lud"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_midp"), - ActorRel(MatchingFor(ALL_GCN, "ShieldD"), "d_a_npc_mk"), + ActorRel(MatchingFor(ALL_GCN, ALL_SHIELD), "d_a_npc_mk"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_moi"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_moir"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_myna2"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_ne"), - ActorRel(MatchingFor(ALL_GCN, "ShieldD"), "d_a_npc_p2"), + ActorRel(MatchingFor(ALL_GCN, ALL_SHIELD), "d_a_npc_p2"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_pachi_besu"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_pachi_maro"), ActorRel(MatchingFor(ALL_GCN), "d_a_npc_pachi_taro"), @@ -2809,7 +2812,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_startAndGoal"), ActorRel(MatchingFor(ALL_GCN), "d_a_swBall"), ActorRel(MatchingFor(ALL_GCN), "d_a_swLBall"), - ActorRel(MatchingFor(ALL_GCN), "d_a_swTime"), + ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_swTime"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv6Gate"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv7Gate"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_Lv8Gate"), @@ -2825,7 +2828,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_guard"), ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_instruction"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_kago_fall"), - ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lightball"), + ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_lightball"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_lv5soup"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mmsg"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_mwait"), @@ -2838,7 +2841,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_tag_river_back"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_rmbit_sw"), ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_schedule"), - ActorRel(MatchingFor(ALL_GCN), "d_a_tag_setBall"), + ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tag_setBall"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_setrestart"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_camera"), ActorRel(MatchingFor(ALL_GCN), "d_a_tag_shop_item"), @@ -2854,7 +2857,7 @@ config.libs = [ ActorRel(MatchingFor(ALL_GCN), "d_a_tag_wljump"), # debug weak func order ActorRel(MatchingFor(ALL_GCN), "d_a_tag_yami"), ActorRel(MatchingFor(ALL_GCN), "d_a_talk"), - ActorRel(MatchingFor(ALL_GCN), "d_a_tboxSw"), + ActorRel(MatchingFor(ALL_GCN, "Shield"), "d_a_tboxSw"), ActorRel(MatchingFor(ALL_GCN), "d_a_title"), ActorRel(MatchingFor(ALL_GCN), "d_a_warp_bug"), ] diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index b403528a3c..caf638fe4e 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -214,7 +214,7 @@ public: virtual u32 getType() { return 'CLOF'; } virtual void setMatColor(u32 idx, J3DGXColor const* color) { J3D_ASSERT_RANGE(0x121, idx >= 0 && idx < ARRAY_SIZEU(mMatColor)); - J3D_ASSERT_NULLPTR(0x122, color != 0); + J3D_ASSERT_NULLPTR(0x122, color != NULL); mMatColor[idx] = *color; } virtual void setMatColor(u32 idx, J3DGXColor color) { @@ -227,7 +227,7 @@ public: } virtual void setColorChanNum(u8 num) { mColorChanNum = num; } virtual void setColorChanNum(u8 const* num) { - J3D_ASSERT_NULLPTR(0x137, num != 0); + J3D_ASSERT_NULLPTR(0x137, num != NULL); mColorChanNum = *num; } virtual u8 getColorChanNum() const { return mColorChanNum; } @@ -237,7 +237,7 @@ public: } virtual void setColorChan(u32 idx, J3DColorChan const* chan) { J3D_ASSERT_RANGE(0x148, idx >= 0 && idx < ARRAY_SIZEU(mColorChan)); - J3D_ASSERT_NULLPTR(0x149, chan != 0); + J3D_ASSERT_NULLPTR(0x149, chan != NULL); mColorChan[idx] = *chan; } virtual J3DColorChan* getColorChan(u32 idx) { @@ -245,7 +245,7 @@ public: return &mColorChan[idx]; } virtual void setCullMode(u8 const* mode) { - J3D_ASSERT_NULLPTR(0x154, mode != 0); + J3D_ASSERT_NULLPTR(0x154, mode != NULL); mCullMode = *mode; } virtual void setCullMode(u8 mode) { mCullMode = mode; } @@ -281,7 +281,7 @@ public: virtual u32 getType() { return 'CLAB'; } virtual void setAmbColor(u32 idx, J3DGXColor const* color) { J3D_ASSERT_RANGE(0x1a3, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor)); - J3D_ASSERT_NULLPTR(0x1a4, color != 0); + J3D_ASSERT_NULLPTR(0x1a4, color != NULL); mAmbColor[idx] = *color; } virtual void setAmbColor(u32 idx, J3DGXColor color) { @@ -322,7 +322,7 @@ public: virtual u32 getType() { return 'CLON'; } virtual void setMatColor(u32 idx, J3DGXColor const* color) { J3D_ASSERT_RANGE(0x1e9, idx >= 0 && idx < ARRAY_SIZEU(mMatColor)); - J3D_ASSERT_NULLPTR(0x1ea, color != 0); + J3D_ASSERT_NULLPTR(0x1ea, color != NULL); mMatColor[idx] = *color; } virtual void setMatColor(u32 idx, J3DGXColor color) { @@ -335,7 +335,7 @@ public: } virtual void setAmbColor(u32 idx, J3DGXColor const* color) { J3D_ASSERT_RANGE(0x1fc, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor)); - J3D_ASSERT_NULLPTR(0x1fd, color != 0); + J3D_ASSERT_NULLPTR(0x1fd, color != NULL); mAmbColor[idx] = *color; } virtual void setAmbColor(u32 idx, J3DGXColor color) { @@ -348,7 +348,7 @@ public: } virtual void setColorChanNum(u8 num) { mColorChanNum = num; } virtual void setColorChanNum(u8 const* num) { - J3D_ASSERT_NULLPTR(0x212, num != 0); + J3D_ASSERT_NULLPTR(0x212, num != NULL); mColorChanNum = *num; } virtual u8 getColorChanNum() const { return mColorChanNum; } @@ -358,7 +358,7 @@ public: } virtual void setColorChan(u32 idx, J3DColorChan const* chan) { J3D_ASSERT_RANGE(0x223, idx >= 0 && idx < ARRAY_SIZEU(mColorChan)); - J3D_ASSERT_NULLPTR(0x224, chan != 0); + J3D_ASSERT_NULLPTR(0x224, chan != NULL); mColorChan[idx] = *chan; } virtual J3DColorChan* getColorChan(u32 idx) { @@ -374,7 +374,7 @@ public: return mLight[idx]; } virtual void setCullMode(u8 const* mode) { - J3D_ASSERT_NULLPTR(0x23b, mode != 0); + J3D_ASSERT_NULLPTR(0x23b, mode != NULL); mCullMode = *mode; } virtual void setCullMode(u8 mode) { @@ -466,14 +466,14 @@ public: virtual s32 countDLSize(); virtual u32 getType() { return 'TGPT'; } virtual void setTexGenNum(u32 const* num) { - J3D_ASSERT_NULLPTR(0x335, num != 0); + J3D_ASSERT_NULLPTR(0x335, num != NULL); mTexGenNum = *num; } virtual void setTexGenNum(u32 num) { mTexGenNum = num; } virtual u32 getTexGenNum() const { return mTexGenNum; } virtual void setTexCoord(u32 idx, J3DTexCoord const* coord) { J3D_ASSERT_RANGE(0x344, idx >= 0 && idx < ARRAY_SIZEU(mTexCoord)); - J3D_ASSERT_NULLPTR(0x345, coord != 0); + J3D_ASSERT_NULLPTR(0x345, coord != NULL); mTexCoord[idx] = *coord; } virtual J3DTexCoord* getTexCoord(u32 idx) { @@ -515,7 +515,7 @@ public: virtual s32 countDLSize(); virtual u32 getType() { return 'TGB4'; } virtual void setNBTScale(J3DNBTScale const* scale) { - J3D_ASSERT_NULLPTR(0x393, scale != 0); + J3D_ASSERT_NULLPTR(0x393, scale != NULL); mNBTScale = *scale; } virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; } @@ -542,7 +542,7 @@ public: virtual s32 countDLSize(); virtual u32 getType() { return 'TGBC'; } virtual void setNBTScale(J3DNBTScale const* scale) { - J3D_ASSERT_NULLPTR(0x3ca, scale != 0); + J3D_ASSERT_NULLPTR(0x3ca, scale != NULL); mNBTScale = *scale; } virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; } @@ -674,7 +674,7 @@ public: virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); } virtual u32 getType() { return 'TVPT'; } virtual void setTevStageNum(u8 const* num) { - J3D_ASSERT_NULLPTR(0x52c, num != 0); + J3D_ASSERT_NULLPTR(0x52c, num != NULL); mTevStageNum = *num; } virtual void setTevStageNum(u8 num) { mTevStageNum = num; } @@ -682,7 +682,7 @@ public: virtual s32 countDLSize(); virtual void setTexNo(u32 idx, u16 const* texNo) { J3D_ASSERT_RANGE(0x53b, idx >= 0 && idx < ARRAY_SIZEU(mTexNo)); - J3D_ASSERT_NULLPTR(0x53c, texNo != 0); + J3D_ASSERT_NULLPTR(0x53c, texNo != NULL); mTexNo[idx] = *texNo; } virtual void setTexNo(u32 idx, u16 texNo) { @@ -695,7 +695,7 @@ public: } virtual void setTevOrder(u32 idx, J3DTevOrder const* order) { J3D_ASSERT_RANGE(0x550, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder)); - J3D_ASSERT_NULLPTR(0x551, order != 0); + J3D_ASSERT_NULLPTR(0x551, order != NULL); mTevOrder[idx] = *order; } virtual void setTevOrder(u32 idx, J3DTevOrder order) { @@ -708,7 +708,7 @@ public: } virtual void setTevStage(u32 idx, J3DTevStage const* stage) { J3D_ASSERT_RANGE(0x563, idx >= 0 && idx < ARRAY_SIZEU(mTevStage)); - J3D_ASSERT_NULLPTR(0x564, stage != 0); + J3D_ASSERT_NULLPTR(0x564, stage != NULL); mTevStage[idx] = *stage; } virtual void setTevStage(u32 idx, J3DTevStage stage) { @@ -721,7 +721,7 @@ public: } virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) { J3D_ASSERT_RANGE(0x576, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage)); - J3D_ASSERT_NULLPTR(0x577, stage != 0); + J3D_ASSERT_NULLPTR(0x577, stage != NULL); mIndTevStage[idx] = *stage; } virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) { @@ -734,7 +734,7 @@ public: } virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) { J3D_ASSERT_RANGE(0x589, idx >= 0 && idx < ARRAY_SIZEU(mTevColor)); - J3D_ASSERT_NULLPTR(0x58a, color != 0); + J3D_ASSERT_NULLPTR(0x58a, color != NULL); mTevColor[idx] = *color; } virtual void setTevColor(u32 idx, J3DGXColorS10 color) { @@ -747,7 +747,7 @@ public: } virtual void setTevKColor(u32 idx, J3DGXColor const* color) { J3D_ASSERT_RANGE(0x59c, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor)); - J3D_ASSERT_NULLPTR(0x59d, color != 0); + J3D_ASSERT_NULLPTR(0x59d, color != NULL); mTevKColor[idx] = *color; } virtual void setTevKColor(u32 idx, J3DGXColor color) { @@ -760,7 +760,7 @@ public: } virtual void setTevKColorSel(u32 idx, u8 const* sel) { J3D_ASSERT_RANGE(0x5af, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel)); - J3D_ASSERT_NULLPTR(0x5b0, sel != 0); + J3D_ASSERT_NULLPTR(0x5b0, sel != NULL); mTevKColorSel[idx] = *sel; } virtual void setTevKColorSel(u32 idx, u8 sel) { @@ -818,7 +818,7 @@ public: virtual s32 countDLSize(); virtual void setTexNo(u32 idx, u16 const* no) { J3D_ASSERT_RANGE(0x618, idx >= 0 && idx < ARRAY_SIZEU(mTexNo)); - J3D_ASSERT_NULLPTR(0x619, no != 0); + J3D_ASSERT_NULLPTR(0x619, no != NULL); mTexNo[idx] = *no; } virtual void setTexNo(u32 idx, u16 no) { @@ -831,7 +831,7 @@ public: } virtual void setTevOrder(u32 idx, J3DTevOrder const* order) { J3D_ASSERT_RANGE(0x62d, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder)); - J3D_ASSERT_NULLPTR(0x62e, order != 0); + J3D_ASSERT_NULLPTR(0x62e, order != NULL); mTevOrder[idx] = *order; } virtual void setTevOrder(u32 idx, J3DTevOrder order) { @@ -847,7 +847,7 @@ public: virtual u8 getTevStageNum() const { return 1; } virtual void setTevStage(u32 idx, J3DTevStage const* stage) { J3D_ASSERT_RANGE(0x64b, idx >= 0 && idx < ARRAY_SIZEU(mTevStage)); - J3D_ASSERT_NULLPTR(0x64c, stage != 0); + J3D_ASSERT_NULLPTR(0x64c, stage != NULL); mTevStage[idx] = *stage; } virtual void setTevStage(u32 idx, J3DTevStage stage) { @@ -860,7 +860,7 @@ public: } virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) { J3D_ASSERT_RANGE(0x65e, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage)); - J3D_ASSERT_NULLPTR(0x65f, stage != 0); + J3D_ASSERT_NULLPTR(0x65f, stage != NULL); mIndTevStage[idx] = *stage; } virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) { @@ -908,7 +908,7 @@ public: virtual s32 countDLSize(); virtual void setTexNo(u32 idx, u16 const* texNo) { J3D_ASSERT_RANGE(0x6b4, idx >= 0 && idx < ARRAY_SIZEU(mTexNo)); - J3D_ASSERT_NULLPTR(0x6b5, texNo != 0); + J3D_ASSERT_NULLPTR(0x6b5, texNo != NULL); mTexNo[idx] = *texNo; } virtual void setTexNo(u32 idx, u16 texNo) { @@ -921,7 +921,7 @@ public: } virtual void setTevOrder(u32 idx, J3DTevOrder const* order) { J3D_ASSERT_RANGE(0x6c9, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder)); - J3D_ASSERT_NULLPTR(0x6ca, order != 0); + J3D_ASSERT_NULLPTR(0x6ca, order != NULL); mTevOrder[idx] = *order; } virtual void setTevOrder(u32 idx, J3DTevOrder order) { @@ -934,7 +934,7 @@ public: } virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) { J3D_ASSERT_RANGE(0x6dc, idx >= 0 && idx < ARRAY_SIZEU(mTevColor)); - J3D_ASSERT_NULLPTR(0x6dd, color != 0); + J3D_ASSERT_NULLPTR(0x6dd, color != NULL); mTevColor[idx] = *color; } virtual void setTevColor(u32 idx, J3DGXColorS10 color) { @@ -947,7 +947,7 @@ public: } virtual void setTevKColor(u32 idx, J3DGXColor const* color) { J3D_ASSERT_RANGE(0x6ef, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor)); - J3D_ASSERT_NULLPTR(0x6f0, color != 0); + J3D_ASSERT_NULLPTR(0x6f0, color != NULL); mTevKColor[idx] = *color; } virtual void setTevKColor(u32 idx, J3DGXColor color) { @@ -960,7 +960,7 @@ public: } virtual void setTevKColorSel(u32 idx, u8 const* sel) { J3D_ASSERT_RANGE(0x702, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel)); - J3D_ASSERT_NULLPTR(0x703, sel != 0); + J3D_ASSERT_NULLPTR(0x703, sel != NULL); mTevKColorSel[idx] = *sel; } virtual void setTevKColorSel(u32 idx, u8 sel) { @@ -973,7 +973,7 @@ public: } virtual void setTevKAlphaSel(u32 idx, u8 const* sel) { J3D_ASSERT_RANGE(0x715, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel)); - J3D_ASSERT_NULLPTR(0x716, sel != 0); + J3D_ASSERT_NULLPTR(0x716, sel != NULL); mTevKAlphaSel[idx] = *sel; } virtual void setTevKAlphaSel(u32 idx, u8 sel) { @@ -985,14 +985,14 @@ public: return mTevKAlphaSel[idx]; } virtual void setTevStageNum(u8 const* num) { - J3D_ASSERT_NULLPTR(0x727, num != 0); + J3D_ASSERT_NULLPTR(0x727, num != NULL); mTevStageNum = *num; } virtual void setTevStageNum(u8 num) { mTevStageNum = num; } virtual u8 getTevStageNum() const { return mTevStageNum; } virtual void setTevStage(u32 idx, J3DTevStage const* stage) { J3D_ASSERT_RANGE(0x736, idx >= 0 && idx < ARRAY_SIZEU(mTevStage)); - J3D_ASSERT_NULLPTR(0x737, stage != 0); + J3D_ASSERT_NULLPTR(0x737, stage != NULL); mTevStage[idx] = *stage; } virtual void setTevStage(u32 idx, J3DTevStage stage) { @@ -1005,7 +1005,7 @@ public: } virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) { J3D_ASSERT_RANGE(0x749, idx >= 0 && idx < ARRAY_SIZEU(mTevStage)); - J3D_ASSERT_NULLPTR(0x74a, info != 0); + J3D_ASSERT_NULLPTR(0x74a, info != NULL); mTevStage[idx].setTevSwapModeInfo(*info); } virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) { @@ -1014,7 +1014,7 @@ public: } virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) { J3D_ASSERT_RANGE(0x757, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable)); - J3D_ASSERT_NULLPTR(0x758, table != 0); + J3D_ASSERT_NULLPTR(0x758, table != NULL); mTevSwapModeTable[idx] = *table; } virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) { @@ -1027,7 +1027,7 @@ public: } virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) { J3D_ASSERT_RANGE(0x76a, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage)); - J3D_ASSERT_NULLPTR(0x76b, stage != 0); + J3D_ASSERT_NULLPTR(0x76b, stage != NULL); mIndTevStage[idx] = *stage; } virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) { @@ -1084,7 +1084,7 @@ public: virtual s32 countDLSize(); virtual void setTexNo(u32 idx, u16 const* texNo) { J3D_ASSERT_RANGE(0x7d5, idx >= 0 && idx < ARRAY_SIZEU(mTexNo)); - J3D_ASSERT_NULLPTR(0x7d6, texNo != 0); + J3D_ASSERT_NULLPTR(0x7d6, texNo != NULL); mTexNo[idx] = *texNo; } virtual void setTexNo(u32 idx, u16 texNo) { @@ -1097,7 +1097,7 @@ public: } virtual void setTevOrder(u32 idx, J3DTevOrder const* order) { J3D_ASSERT_RANGE(0x7ea, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder)); - J3D_ASSERT_NULLPTR(0x7eb, order != 0); + J3D_ASSERT_NULLPTR(0x7eb, order != NULL); mTevOrder[idx] = *order; } virtual void setTevOrder(u32 idx, J3DTevOrder order) { @@ -1110,7 +1110,7 @@ public: } virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) { J3D_ASSERT_RANGE(0x7fd, idx >= 0 && idx < ARRAY_SIZEU(mTevColor)); - J3D_ASSERT_NULLPTR(0x7fe, color != 0); + J3D_ASSERT_NULLPTR(0x7fe, color != NULL); mTevColor[idx] = *color; } virtual void setTevColor(u32 idx, J3DGXColorS10 color) { @@ -1123,7 +1123,7 @@ public: } virtual void setTevKColor(u32 idx, J3DGXColor const* color) { J3D_ASSERT_RANGE(0x810, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor)); - J3D_ASSERT_NULLPTR(0x811, color != 0); + J3D_ASSERT_NULLPTR(0x811, color != NULL); mTevKColor[idx] = *color; } virtual void setTevKColor(u32 idx, J3DGXColor color) { @@ -1136,7 +1136,7 @@ public: } virtual void setTevKColorSel(u32 idx, u8 const* sel) { J3D_ASSERT_RANGE(0x823, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel)); - J3D_ASSERT_NULLPTR(0x824, sel != 0); + J3D_ASSERT_NULLPTR(0x824, sel != NULL); mTevKColorSel[idx] = *sel; } virtual void setTevKColorSel(u32 idx, u8 sel) { @@ -1149,7 +1149,7 @@ public: } virtual void setTevKAlphaSel(u32 idx, u8 const* sel) { J3D_ASSERT_RANGE(0x836, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel)); - J3D_ASSERT_NULLPTR(0x837, sel != 0); + J3D_ASSERT_NULLPTR(0x837, sel != NULL); mTevKAlphaSel[idx] = *sel; } virtual void setTevKAlphaSel(u32 idx, u8 sel) { @@ -1161,14 +1161,14 @@ public: return mTevKAlphaSel[idx]; } virtual void setTevStageNum(u8 const* num) { - J3D_ASSERT_NULLPTR(0x848, num != 0); + J3D_ASSERT_NULLPTR(0x848, num != NULL); mTevStageNum = *num; } virtual void setTevStageNum(u8 num) { mTevStageNum = num; } virtual u8 getTevStageNum() const { return mTevStageNum; } virtual void setTevStage(u32 idx, J3DTevStage const* stage) { J3D_ASSERT_RANGE(0x857, idx >= 0 && idx < ARRAY_SIZEU(mTevStage)); - J3D_ASSERT_NULLPTR(0x858, stage != 0); + J3D_ASSERT_NULLPTR(0x858, stage != NULL); mTevStage[idx] = *stage; } virtual void setTevStage(u32 idx, J3DTevStage stage) { @@ -1181,7 +1181,7 @@ public: } virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) { J3D_ASSERT_RANGE(0x86a, idx >= 0 && idx < ARRAY_SIZEU(mTevStage)); - J3D_ASSERT_NULLPTR(0x86b, info != 0); + J3D_ASSERT_NULLPTR(0x86b, info != NULL); mTevStage[idx].setTevSwapModeInfo(*info); } virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) { @@ -1190,7 +1190,7 @@ public: } virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) { J3D_ASSERT_RANGE(0x878, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable)); - J3D_ASSERT_NULLPTR(0x879, table != 0); + J3D_ASSERT_NULLPTR(0x879, table != NULL); mTevSwapModeTable[idx] = *table; } virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) { @@ -1203,7 +1203,7 @@ public: } virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) { J3D_ASSERT_RANGE(0x88b, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage)); - J3D_ASSERT_NULLPTR(0x88c, stage != 0); + J3D_ASSERT_NULLPTR(0x88c, stage != NULL); mIndTevStage[idx] = *stage; } virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) { @@ -1260,7 +1260,7 @@ public: virtual s32 countDLSize(); virtual void setTexNo(u32 idx, u16 const* texNo) { J3D_ASSERT_RANGE(0x8f6, idx >= 0 && idx < ARRAY_SIZEU(mTexNo)); - J3D_ASSERT_NULLPTR(0x8f7, texNo != 0); + J3D_ASSERT_NULLPTR(0x8f7, texNo != NULL); mTexNo[idx] = *texNo; } virtual void setTexNo(u32 idx, u16 texNo) { @@ -1273,7 +1273,7 @@ public: } virtual void setTevOrder(u32 idx, J3DTevOrder const* order) { J3D_ASSERT_RANGE(0x90b, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder)); - J3D_ASSERT_NULLPTR(0x90c, order != 0); + J3D_ASSERT_NULLPTR(0x90c, order != NULL); mTevOrder[idx] = *order; } virtual void setTevOrder(u32 idx, J3DTevOrder order) { @@ -1286,7 +1286,7 @@ public: } virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) { J3D_ASSERT_RANGE(0x91e, idx >= 0 && idx < ARRAY_SIZEU(mTevColor)); - J3D_ASSERT_NULLPTR(0x91f, color != 0); + J3D_ASSERT_NULLPTR(0x91f, color != NULL); mTevColor[idx] = *color; } virtual void setTevColor(u32 idx, J3DGXColorS10 color) { @@ -1299,7 +1299,7 @@ public: } virtual void setTevKColor(u32 idx, J3DGXColor const* color) { J3D_ASSERT_RANGE(0x931, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor)); - J3D_ASSERT_NULLPTR(0x932, color != 0); + J3D_ASSERT_NULLPTR(0x932, color != NULL); mTevKColor[idx] = *color; } virtual void setTevKColor(u32 idx, J3DGXColor color) { @@ -1312,7 +1312,7 @@ public: } virtual void setTevKColorSel(u32 idx, u8 const* sel) { J3D_ASSERT_RANGE(0x944, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel)); - J3D_ASSERT_NULLPTR(0x945, sel != 0); + J3D_ASSERT_NULLPTR(0x945, sel != NULL); mTevKColorSel[idx] = *sel; } virtual void setTevKColorSel(u32 idx, u8 sel) { @@ -1325,7 +1325,7 @@ public: } virtual void setTevKAlphaSel(u32 idx, u8 const* sel) { J3D_ASSERT_RANGE(0x957, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel)); - J3D_ASSERT_NULLPTR(0x958, sel != 0); + J3D_ASSERT_NULLPTR(0x958, sel != NULL); mTevKAlphaSel[idx] = *sel; } virtual void setTevKAlphaSel(u32 idx, u8 sel) { @@ -1337,14 +1337,14 @@ public: return mTevKAlphaSel[idx]; } virtual void setTevStageNum(u8 const* num) { - J3D_ASSERT_NULLPTR(0x969, num != 0); + J3D_ASSERT_NULLPTR(0x969, num != NULL); mTevStageNum = *num; } virtual void setTevStageNum(u8 num) { mTevStageNum = num; } virtual u8 getTevStageNum() const { return mTevStageNum; } virtual void setTevStage(u32 idx, J3DTevStage const* stage) { J3D_ASSERT_RANGE(0x978, idx >= 0 && idx < ARRAY_SIZEU(mTevStage)); - J3D_ASSERT_NULLPTR(0x979, stage != 0); + J3D_ASSERT_NULLPTR(0x979, stage != NULL); mTevStage[idx] = *stage; } virtual void setTevStage(u32 idx, J3DTevStage stage) { @@ -1357,7 +1357,7 @@ public: } virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) { J3D_ASSERT_RANGE(0x98b, idx >= 0 && idx < ARRAY_SIZEU(mTevStage)); - J3D_ASSERT_NULLPTR(0x98c, info != 0); + J3D_ASSERT_NULLPTR(0x98c, info != NULL); mTevStage[idx].setTevSwapModeInfo(*info); } virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) { @@ -1366,7 +1366,7 @@ public: } virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) { J3D_ASSERT_RANGE(0x999, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable)); - J3D_ASSERT_NULLPTR(0x99a, table != 0); + J3D_ASSERT_NULLPTR(0x99a, table != NULL); mTevSwapModeTable[idx] = *table; } virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) { @@ -1379,7 +1379,7 @@ public: } virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) { J3D_ASSERT_RANGE(0x9ac, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage)); - J3D_ASSERT_NULLPTR(0x9ad, stage != 0); + J3D_ASSERT_NULLPTR(0x9ad, stage != NULL); mIndTevStage[idx] = *stage; } virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) { @@ -1671,7 +1671,7 @@ public: virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; } virtual u8 getIndTexStageNum() const { return mIndTexStageNum; } virtual void setIndTexOrder(u32 idx, J3DIndTexOrder const* order) { - J3D_ASSERT_NULLPTR(0xa94, order != 0); + J3D_ASSERT_NULLPTR(0xa94, order != NULL); J3D_ASSERT_RANGE(0xa95, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder)); mIndTexOrder[idx] = *order; } @@ -1684,7 +1684,7 @@ public: return &mIndTexOrder[idx]; } virtual void setIndTexMtx(u32 idx, J3DIndTexMtx const* mtx) { - J3D_ASSERT_NULLPTR(0xaa7, mtx != 0); + J3D_ASSERT_NULLPTR(0xaa7, mtx != NULL); J3D_ASSERT_RANGE(0xaa8, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx)); mIndTexMtx[idx] = *mtx; } @@ -1697,7 +1697,7 @@ public: return &mIndTexMtx[idx]; } virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale const* scale) { - J3D_ASSERT_NULLPTR(0xaba, scale != 0); + J3D_ASSERT_NULLPTR(0xaba, scale != NULL); J3D_ASSERT_RANGE(0xabb, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale)); mIndTexCoordScale[idx] = *scale; } @@ -1831,31 +1831,31 @@ public: virtual s32 countDLSize(); virtual u32 getType() { return 'PEFG'; } virtual void setAlphaComp(J3DAlphaComp const* alphaComp) { - J3D_ASSERT_NULLPTR(0xbf9, alphaComp != 0); + J3D_ASSERT_NULLPTR(0xbf9, alphaComp != NULL); mAlphaComp = *alphaComp; } virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; } virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; } virtual void setBlend(J3DBlend const* blend) { - J3D_ASSERT_NULLPTR(0xc07, blend != 0); + J3D_ASSERT_NULLPTR(0xc07, blend != NULL); mBlend = *blend; } virtual void setBlend(J3DBlend const& blend) { mBlend = blend; } virtual J3DBlend* getBlend() { return &mBlend; } virtual void setZMode(J3DZMode const* zMode) { - J3D_ASSERT_NULLPTR(0xc15, zMode != 0); + J3D_ASSERT_NULLPTR(0xc15, zMode != NULL); mZMode = *zMode; } virtual void setZMode(J3DZMode zMode) { mZMode = zMode; } virtual J3DZMode* getZMode() { return &mZMode; } virtual void setZCompLoc(u8 const* zCompLoc) { - J3D_ASSERT_NULLPTR(0xc23, zCompLoc != 0); + J3D_ASSERT_NULLPTR(0xc23, zCompLoc != NULL); mZCompLoc = *zCompLoc; } virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; } virtual u8 getZCompLoc() const { return mZCompLoc; } virtual void setDither(u8 const* dither) { - J3D_ASSERT_NULLPTR(0xc31, dither != 0); + J3D_ASSERT_NULLPTR(0xc31, dither != NULL); mDither = *dither; } virtual void setDither(u8 dither) { mDither = dither; } @@ -1892,31 +1892,31 @@ public: virtual void setFog(J3DFog* pFog) { mFog.setFogInfo(pFog->getFogInfo()); } virtual J3DFog* getFog() { return &mFog; } virtual void setAlphaComp(J3DAlphaComp const* alphaComp) { - J3D_ASSERT_NULLPTR(0xc7d, alphaComp != 0); + J3D_ASSERT_NULLPTR(0xc7d, alphaComp != NULL); mAlphaComp = *alphaComp; } virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; } virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; } virtual void setBlend(J3DBlend const* blend) { - J3D_ASSERT_NULLPTR(0xc8b, blend != 0); + J3D_ASSERT_NULLPTR(0xc8b, blend != NULL); mBlend = *blend; } virtual void setBlend(J3DBlend const& blend) { mBlend = blend; } virtual J3DBlend* getBlend() { return &mBlend; } virtual void setZMode(J3DZMode const* zMode) { - J3D_ASSERT_NULLPTR(0xc99, zMode != 0); + J3D_ASSERT_NULLPTR(0xc99, zMode != NULL); mZMode = *zMode; } virtual void setZMode(J3DZMode zMode) { mZMode = zMode; } virtual J3DZMode* getZMode() { return &mZMode; } virtual void setZCompLoc(u8 const* zCompLoc) { - J3D_ASSERT_NULLPTR(0xca7, zCompLoc != 0); + J3D_ASSERT_NULLPTR(0xca7, zCompLoc != NULL); mZCompLoc = *zCompLoc; } virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; } virtual u8 getZCompLoc() const { return mZCompLoc; } virtual void setDither(u8 const* dither) { - J3D_ASSERT_NULLPTR(0xcb5, dither != 0); + J3D_ASSERT_NULLPTR(0xcb5, dither != NULL); mDither = *dither; } virtual void setDither(u8 dither) { mDither = dither; } diff --git a/src/JSystem/J3DGraphBase/J3DTexture.cpp b/src/JSystem/J3DGraphBase/J3DTexture.cpp index 60c0590222..70d9a69031 100644 --- a/src/JSystem/J3DGraphBase/J3DTexture.cpp +++ b/src/JSystem/J3DGraphBase/J3DTexture.cpp @@ -49,7 +49,7 @@ void J3DTexture::addResTIMG(u16 newNum, const ResTIMG* newRes) { if (newNum == 0) return; - J3D_ASSERT_NULLPTR(105, newRes != 0); + J3D_ASSERT_NULLPTR(105, newRes != NULL); u16 oldNum = mNum; ResTIMG* oldRes = mpRes; diff --git a/src/JSystem/JAWExtSystem/JAWWindow.cpp b/src/JSystem/JAWExtSystem/JAWWindow.cpp index 0a8b8f1afd..7153fd0d2d 100644 --- a/src/JSystem/JAWExtSystem/JAWWindow.cpp +++ b/src/JSystem/JAWExtSystem/JAWWindow.cpp @@ -207,7 +207,7 @@ void JAWWindow::TWindowText::drawSelf(f32, f32, Mtx* param_3) { MTXConcat(*param_3, mGlobalMtx, stack_48); GXLoadPosMtxImm(stack_48, 0); field_0xfc.setParentAlpha(mColorAlpha); - JUT_ASSERT(209, m_pParent != 0); + JUT_ASSERT(209, m_pParent != NULL); m_pParent->setMatrix(stack_48); m_pParent->onDraw(&field_0xfc); } diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp index a78c66d3ec..34a2c811c7 100644 --- a/src/JSystem/JAudio2/JASAramStream.cpp +++ b/src/JSystem/JAudio2/JASAramStream.cpp @@ -89,7 +89,7 @@ JASAramStream::JASAramStream() { } void JASAramStream::init(u32 param_0, u32 param_1, StreamCallback i_callback, void* i_callbackData) { - JUT_ASSERT(153, sReadBuffer != 0); + JUT_ASSERT(153, sReadBuffer != NULL); field_0x148 = param_0; field_0x14c = param_1; field_0x0c8 = 0.0f; diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp index 66b9746715..c19daf5fe1 100644 --- a/src/JSystem/JAudio2/JASBNKParser.cpp +++ b/src/JSystem/JAudio2/JASBNKParser.cpp @@ -95,7 +95,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h switch (*data++) { case 'Inst': { JASBasicInst* instp = new (heap, 0) JASBasicInst(); - JUT_ASSERT(187, instp != 0); + JUT_ASSERT(187, instp != NULL); u32 count = *data++; for (int j = 0; j < count; j++) { u32 index = *data++; @@ -127,7 +127,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h case 'Perc': { JASDrumSet* drump = new (heap, 0) JASDrumSet(); - JUT_ASSERT(264, drump != 0); + JUT_ASSERT(264, drump != NULL); u32 pmap_count = data[1]; JUT_ASSERT(268, pmap_count <= 128); u32 count = *data++; diff --git a/src/JSystem/JAudio2/JASBasicInst.cpp b/src/JSystem/JAudio2/JASBasicInst.cpp index 051136bc46..4cd85278f6 100644 --- a/src/JSystem/JAudio2/JASBasicInst.cpp +++ b/src/JSystem/JAudio2/JASBasicInst.cpp @@ -49,8 +49,8 @@ bool JASBasicInst::getParam(int param_0, int param_1, JASInstParam* param_2) con void JASBasicInst::setKeyRegionCount(u32 count, JKRHeap* param_1) { delete [] mKeymap; - mKeymap = new (param_1, 0) TKeymap[count]; - JUT_ASSERT(114, mKeymap != 0); + mKeymap = new (param_1, 0) TKeymap[count]; + JUT_ASSERT(114, mKeymap != NULL); mKeymapCount = count; } diff --git a/src/JSystem/JAudio2/JASCmdStack.cpp b/src/JSystem/JAudio2/JASCmdStack.cpp index 8d214151cc..1a39ab1560 100644 --- a/src/JSystem/JAudio2/JASCmdStack.cpp +++ b/src/JSystem/JAudio2/JASCmdStack.cpp @@ -18,7 +18,7 @@ bool JASPortCmd::addPortCmdOnce() { } bool JASPortCmd::setPortCmd(Command func, JASPortArgs* args) { - JUT_ASSERT(81, func != 0); + JUT_ASSERT(81, func != NULL); if (getSupervisor()) { return false; } diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp index 1dc9da38ea..5598ab2277 100644 --- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp +++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp @@ -15,7 +15,7 @@ JASSimpleWaveBank::~JASSimpleWaveBank() { void JASSimpleWaveBank::setWaveTableSize(u32 size, JKRHeap* heap) { delete[] mWaveTable; mWaveTable = new (heap, 0) TWaveHandle[size]; - JUT_ASSERT(29, mWaveTable != 0); + JUT_ASSERT(29, mWaveTable != NULL); mWaveTableSize = size; } diff --git a/src/JSystem/JAudio2/JASTrack.cpp b/src/JSystem/JAudio2/JASTrack.cpp index 6ba0a66a79..eec0ebd644 100644 --- a/src/JSystem/JAudio2/JASTrack.cpp +++ b/src/JSystem/JAudio2/JASTrack.cpp @@ -190,7 +190,7 @@ void JASTrack::stopSeq() { } void JASTrack::start() { - JUT_ASSERT(289, mParent != 0); + JUT_ASSERT(289, mParent != NULL); JUT_ASSERT(290, mStatus == STATUS_FREE); mStatus = STATUS_RUN; } diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index 3aada44eb1..3a929bb433 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -262,7 +262,7 @@ f64 TFunctionValue_composite::composite_raw(TVector_pointer con } TFunctionValue** p = (TFunctionValue**)param_1.begin(); std::advance(p, index); - JUT_ASSERT(0x247, p!=0); + JUT_ASSERT(0x247, p!=NULL); TFunctionValue* piVar4 = *p; return piVar4->getValue(param_3); } @@ -348,7 +348,7 @@ f64 TFunctionValue_composite::composite_add(TVector_pointer con TContainerEnumerator_const_TVector aTStack_18(param_1); while (aTStack_18) { TFunctionValue* const* p = *aTStack_18; - JUT_ASSERT(0x2a1, p!=0); + JUT_ASSERT(0x2a1, p!=NULL); TFunctionValue* piVar3 = *p; dVar4 += piVar3->getValue(param_3); } @@ -368,7 +368,7 @@ f64 TFunctionValue_composite::composite_subtract(TVector_pointergetValue(param_3); while (aTStack_18) { TFunctionValue* const* p = *aTStack_18; - JUT_ASSERT(0x2b5, p!=0); + JUT_ASSERT(0x2b5, p!=NULL); TFunctionValue* piVar3 = *p; dVar4 -= piVar3->getValue(param_3); } @@ -383,7 +383,7 @@ f64 TFunctionValue_composite::composite_multiply(TVector_pointer aTStack_18(param_1); while (aTStack_18) { TFunctionValue* const* p = *aTStack_18; - JUT_ASSERT(0x2c5, p!=0); + JUT_ASSERT(0x2c5, p!=NULL); TFunctionValue* piVar3 = *p; dVar4 *= piVar3->getValue(param_3); } @@ -403,7 +403,7 @@ f64 TFunctionValue_composite::composite_divide(TVector_pointer TValue fData = pFront->getValue(param_3); while (aTStack_18) { TFunctionValue* const* p = *aTStack_18; - JUT_ASSERT(0x2d9, p!=0); + JUT_ASSERT(0x2d9, p!=NULL); TFunctionValue* piVar3 = *p; fData /= piVar3->getValue(param_3); JGADGET_ASSERTWARN(0x2db, fData!=TValue(0)); diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp index ce703f62dc..d10cd0c78a 100644 --- a/src/JSystem/JStudio/JStudio/fvb.cpp +++ b/src/JSystem/JStudio/JStudio/fvb.cpp @@ -374,14 +374,14 @@ void TFactory::destroy(TObject* pObject) { } TParse::TParse(TControl* pControl) : pControl_(pControl) { - ASSERT(pControl_ != 0); + ASSERT(pControl_ != NULL); } TParse::~TParse() {} bool TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 flags) { - ASSERT(ppData_inout != 0); - ASSERT(puBlock_out != 0); + ASSERT(ppData_inout != NULL); + ASSERT(puBlock_out != NULL); const void* pData = *ppData_inout; ASSERT(pData != NULL); @@ -415,8 +415,8 @@ bool TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 f } bool TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 flags) { - ASSERT(ppData_inout != 0); - ASSERT(puData_out != 0); + ASSERT(ppData_inout != NULL); + ASSERT(puData_out != NULL); const void* pData = *ppData_inout; ASSERT(pData != NULL); @@ -425,7 +425,7 @@ bool TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 fla *puData_out = blk.get_size(); TControl* pControl = getControl(); - ASSERT(pControl != 0); + ASSERT(pControl != NULL); if (flags & 0x10) { if (pControl->getObject(blk.get_ID(), blk.get_IDSize()) != NULL) diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index 2073b86fa9..0a61d67882 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -943,7 +943,7 @@ bool daNpcAshB_c::demo(void* param_0) { s32 staff_id = evtmgr.getMyStaffId(l_myName, NULL, 0); if (staff_id != -1) { mStaffID = staff_id; - JUT_ASSERT(1523, mEvtSeqList[mOrderEvtNo] != 0); + JUT_ASSERT(1523, mEvtSeqList[mOrderEvtNo] != NULL); if ((this->*(mEvtSeqList[mOrderEvtNo]))(staff_id)) { evtmgr.cutEnd(staff_id); } diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp index cf8a2b06b0..d9299694f9 100644 --- a/src/d/actor/d_a_obj_brakeeff.cpp +++ b/src/d/actor/d_a_obj_brakeeff.cpp @@ -147,7 +147,7 @@ int useHeapInit(fopAc_ac_c* i_this) { J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Obj_Bef", bef_bmd[a_this->mEffectType])); - JUT_ASSERT(339, modelData != 0); + JUT_ASSERT(339, modelData != NULL); a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index d2105d38b0..9815391dfa 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -349,11 +349,13 @@ static int daItemShield_Execute(daItemShield_c* i_this) { } static int daItemShield_Delete(daItemShield_c* i_this) { + fopAcM_RegisterDeleteID(i_this, "ObjSShield"); return i_this->_delete(); } static int daItemShield_Create(fopAc_ac_c* i_this) { - return static_cast(i_this)->create(); + fopAcM_RegisterCreateID(daItemShield_c, i_this, "ObjSShield"); + return a_this->create(); } static actor_method_class l_daItemShield_Method = { diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp index 7c1b06a5c1..15b920f211 100644 --- a/src/d/actor/d_a_tag_watchge.cpp +++ b/src/d/actor/d_a_tag_watchge.cpp @@ -59,17 +59,20 @@ static int daTagWatchGe_Delete(daTagWatchGe_c* i_this) { int daTagWatchGe_c::create() { fopAcM_ct(this, daTagWatchGe_c); + OS_REPORT("Tag_WatchGe PARAM %x\n", fopAcM_GetParam(this)); mGroupNo = fopAcM_GetParam(this); if (mGroupNo == 0xFF) { + OS_REPORT("監視するグェーのグループが指定されてません！"); return cPhs_ERROR_e; } else { - field_0x568 = fopAcM_GetParam(this) >> 8; + field_0x568 = (fopAcM_GetParam(this) >> 8) & 0xFF; if (field_0x568 == 0xFF) { + OS_REPORT("グェー監視タグのスイッチが指定されてません！"); return cPhs_ERROR_e; } - if (dComIfGs_isSwitch(field_0x568,fopAcM_GetRoomNo(this)) != 0) { + if (dComIfGs_isSwitch(field_0x568, fopAcM_GetRoomNo(this)) != 0) { return cPhs_ERROR_e; } } diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 22d39a7bbb..3072d3c24c 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -117,6 +117,7 @@ int daTitle_c::create() { field_0x5f9 = 0; m2DHeap = JKRExpHeap::create(0x8000, mDoExt_getGameHeap(), false); + JUT_ASSERT(345, m2DHeap != NULL); loadWait_init(); g_daTitHIO.field_0x4 = -1; diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp index afba0654ff..d34b981e89 100644 --- a/src/d/d_map_path.cpp +++ b/src/d/d_map_path.cpp @@ -173,7 +173,7 @@ bool dMpath_HIO_file_base_c::readBinaryFile(const char* param_1) { if (file.open(JORFile::EFlags_READ, r26, NULL, NULL, NULL)) { s32 r28 = file.getFileSize(); char* buf = new char[r28]; - JUT_ASSERT(855, buf != 0); + JUT_ASSERT(855, buf != NULL); file.readData(buf, r28); copyReadBufToData(buf, r28); OSReport("write read success!::%6d\n", r28); diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 649df3039f..1fb29a54ce 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -189,7 +189,7 @@ dMenu_Fmap_c::dMenu_Fmap_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i } mpTalkHeap = JKRCreateExpHeap(0x32000, mpHeap, false); - JUT_ASSERT(359, mpTalkHeap != 0); + JUT_ASSERT(359, mpTalkHeap != NULL); field_0x200 = 0; mIsWarpMap = false; diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index f8c2d65728..228bc9f29f 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -831,17 +831,42 @@ u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap) { return -1; } + u32 estimatedSize = i_heap->getHeapSize(); s32 result = i_heap->adjustSize(); if (result < 0) { // "adjustSize failure %08x\n" OSReport_Error("adjustSize失敗 %08x\n", i_heap); return -1; } + u32 actualSize = i_heap->getHeapSize(); + + #if DEBUG + if (lbl_8074C3B9[0]) { + // "\x1B[33mSolid heap estimate: %08x actual: %08x\n\x1B[m" + OS_REPORT("\x1B[33mソリッドヒープの見積もり %08x 実際 %08x\n\x1B[m", estimatedSize, actualSize); + + if (estimatedSize > 0x400 && estimatedSize > (actualSize + 0x400)) { + // "\x1B[33mThe estimate is %x bytes too large (%5.2f times). This could lead to degraded memory efficiency.\n\x1B[m" + OS_REPORT("\x1B[33m見積もりが %x バイト大きい(%5.2f倍)です。メモリ効率悪化が懸念されます。\n\x1B[m", estimatedSize - actualSize, (f32)estimatedSize / (f32)actualSize); + } else if (estimatedSize >= (actualSize + 0x20)) { + // "\x1B[36mThe estimate is %x bytes too large. That's pretty good.\n\x1B[m" + OS_REPORT("\x1B[36m見積もりが %x バイト大きいです。だいぶいい感じです。\n\x1B[m", estimatedSize - actualSize); + } else { + // "\x1B[32mThe estimate is spot on! Perfect.\n\x1B[m" + OS_REPORT("\x1B[32m見積もりが、ジャストミート！完璧です。\n\x1B[m"); + } + } + + if (lbl_8074C3B9[0]) { + OS_REPORT("JKRSolidHeap::adjustSize %08x (%08x bytes)\n", (u32)i_heap, result); + } + #endif // this probably indicates that 0x80 is some constant, maybe from a sizeof(JKRSolidHeap) // with alignment? - if (result >= (u32)0x80) { - result -= 0x80; + u32 r25 = 0x80; + if (result >= r25) { + return result - r25; } return result; From fc3692e4acc9294796ca9c63d93fdf14cc983e20 Mon Sep 17 00:00:00 2001 From: YunataSavior <58997725+YunataSavior@users.noreply.github.com> Date: Fri, 26 Dec 2025 16:23:14 -0800 Subject: [PATCH 19/35] Debug d_a_e_ym (#3003) --- config/GZ2E01/rels/d_a_e_ym/symbols.txt | 28 +- include/SSystem/SComponent/c_xyz.h | 3 +- include/d/actor/d_a_e_ym.h | 26 +- include/d/actor/d_a_kago.h | 6 +- include/d/d_cc_d.h | 2 + src/d/actor/d_a_e_ym.cpp | 968 +++++++++++++++--------- 6 files changed, 627 insertions(+), 406 deletions(-) diff --git a/config/GZ2E01/rels/d_a_e_ym/symbols.txt b/config/GZ2E01/rels/d_a_e_ym/symbols.txt index 32d8376a4f..3d1e742d89 100644 --- a/config/GZ2E01/rels/d_a_e_ym/symbols.txt +++ b/config/GZ2E01/rels/d_a_e_ym/symbols.txt @@ -8,8 +8,8 @@ checkBck__8daE_YM_cFPCci = .text:0x00000144; // type:function size:0x5C scope:gl bckSet__8daE_YM_cFiUcff = .text:0x000001A0; // type:function size:0x148 scope:global bckSetFly__8daE_YM_cFiUcff = .text:0x000002E8; // type:function size:0xA4 scope:global draw__8daE_YM_cFv = .text:0x0000038C; // type:function size:0x2AC scope:global -daE_YM_Draw__FP8daE_YM_c = .text:0x00000638; // type:function size:0x20 scope:global -s_obj_sub__FPvPv = .text:0x00000658; // type:function size:0xD0 scope:global +daE_YM_Draw__FP8daE_YM_c = .text:0x00000638; // type:function size:0x20 scope:local +s_obj_sub__FPvPv = .text:0x00000658; // type:function size:0xD0 scope:local setDigEffect__8daE_YM_cFv = .text:0x00000728; // type:function size:0x11C scope:global setElecEffect1__8daE_YM_cFv = .text:0x00000844; // type:function size:0x158 scope:global setElecEffect2__8daE_YM_cFv = .text:0x0000099C; // type:function size:0x160 scope:global @@ -59,20 +59,20 @@ executeFire__8daE_YM_cFv = .text:0x000097F8; // type:function size:0x878 scope:g setRiverAttention__8daE_YM_cFv = .text:0x0000A070; // type:function size:0x314 scope:global setLockByCargo__8daE_YM_cFv = .text:0x0000A384; // type:function size:0xC scope:global executeRiver__8daE_YM_cFv = .text:0x0000A390; // type:function size:0xB3C scope:global -s_ym_sub__FPvPv = .text:0x0000AECC; // type:function size:0xC0 scope:global +s_ym_sub__FPvPv = .text:0x0000AECC; // type:function size:0xC0 scope:local checkFrinedSamePos__8daE_YM_cFv = .text:0x0000AF8C; // type:function size:0x40 scope:global action__8daE_YM_cFv = .text:0x0000AFCC; // type:function size:0x51C scope:global mtx_set__8daE_YM_cFv = .text:0x0000B4E8; // type:function size:0x88 scope:global cc_set__8daE_YM_cFv = .text:0x0000B570; // type:function size:0x2FC scope:global execute__8daE_YM_cFv = .text:0x0000B86C; // type:function size:0x164 scope:global -daE_YM_Execute__FP8daE_YM_c = .text:0x0000B9D0; // type:function size:0x20 scope:global -daE_YM_IsDelete__FP8daE_YM_c = .text:0x0000B9F0; // type:function size:0x8 scope:global +daE_YM_Execute__FP8daE_YM_c = .text:0x0000B9D0; // type:function size:0x20 scope:local +daE_YM_IsDelete__FP8daE_YM_c = .text:0x0000B9F0; // type:function size:0x8 scope:local _delete__8daE_YM_cFv = .text:0x0000B9F8; // type:function size:0x98 scope:global -daE_YM_Delete__FP8daE_YM_c = .text:0x0000BA90; // type:function size:0x20 scope:global +daE_YM_Delete__FP8daE_YM_c = .text:0x0000BA90; // type:function size:0x20 scope:local CreateHeap__8daE_YM_cFv = .text:0x0000BAB0; // type:function size:0x348 scope:global __ct__4cXyzFv = .text:0x0000BDF8; // type:function size:0x4 scope:global __dt__12J3DFrameCtrlFv = .text:0x0000BDFC; // type:function size:0x48 scope:global -useHeapInit__FP10fopAc_ac_c = .text:0x0000BE44; // type:function size:0x20 scope:global +useHeapInit__FP10fopAc_ac_c = .text:0x0000BE44; // type:function size:0x20 scope:local checkBeforeBg__8daE_YM_cFs = .text:0x0000BE64; // type:function size:0x4FC scope:global checkBeforeGround__8daE_YM_cFv = .text:0x0000C360; // type:function size:0x138 scope:global checkInitialWall__8daE_YM_cFv = .text:0x0000C498; // type:function size:0x280 scope:global @@ -84,7 +84,7 @@ __dt__8cM3dGAabFv = .text:0x0000D22C; // type:function size:0x48 scope:global __dt__10dCcD_GSttsFv = .text:0x0000D274; // type:function size:0x5C scope:global __dt__12dBgS_ObjAcchFv = .text:0x0000D2D0; // type:function size:0x70 scope:global __dt__12dBgS_AcchCirFv = .text:0x0000D340; // type:function size:0x70 scope:global -daE_YM_Create__FP8daE_YM_c = .text:0x0000D3B0; // type:function size:0x20 scope:global +daE_YM_Create__FP8daE_YM_c = .text:0x0000D3B0; // type:function size:0x20 scope:local __dt__10cCcD_GSttsFv = .text:0x0000D3D0; // type:function size:0x48 scope:global __dt__12daE_YM_HIO_cFv = .text:0x0000D418; // type:function size:0x48 scope:global __sinit_d_a_e_ym_cpp = .text:0x0000D460; // type:function size:0x3C scope:local @@ -180,7 +180,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global @9420 = .rodata:0x00000150; // type:object size:0x8 scope:local @stringBase0 = .rodata:0x00000158; // type:object size:0x17 scope:local data:string_table ...data.0 = .data:0x00000000; // type:label scope:local -cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global +cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local @1787 = .data:0x0000000C; // type:object size:0x4 scope:local _three$localstatic4$sqrtf = .data:0x00000010; // type:object size:0x8 scope:local data:double _half$localstatic3$sqrtf = .data:0x00000018; // type:object size:0x8 scope:local data:double @@ -194,7 +194,7 @@ w_eff_id$5427 = .data:0x00000078; // type:object size:0x8 scope:local YM_DIG_POS_Y$7355 = .data:0x000000CC; // type:object size:0xC scope:local @8522 = .data:0x000000D8; // type:object size:0x4C scope:local @9421 = .data:0x00000124; // type:object size:0x20 scope:local -l_daE_YM_Method = .data:0x00000144; // type:object size:0x20 scope:global +l_daE_YM_Method = .data:0x00000144; // type:object size:0x20 scope:local g_profile_E_YM = .data:0x00000164; // type:object size:0x30 scope:global __vt__12dBgS_AcchCir = .data:0x00000194; // type:object size:0xC scope:global __vt__10cCcD_GStts = .data:0x000001A0; // type:object size:0xC scope:global @@ -206,8 +206,8 @@ __vt__12J3DFrameCtrl = .data:0x000001F4; // type:object size:0xC scope:global __vt__8cM3dGPla = .data:0x00000200; // type:object size:0xC scope:global __vt__12daE_YM_HIO_c = .data:0x0000020C; // type:object size:0xC scope:global __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_253_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte +lbl_253_bss_8 = .bss:0x00000008; // type:object size:0x1 scope:local data:byte @3941 = .bss:0x0000000C; // type:object size:0xC scope:local -l_HIO = .bss:0x00000018; // type:object size:0x24 scope:global data:byte -m_near_obj = .bss:0x0000003C; // type:object size:0x4 scope:global data:4byte -m_obj_dist = .bss:0x00000040; // type:object size:0x4 scope:global align:4 data:float +l_HIO = .bss:0x00000018; // type:object size:0x24 scope:local data:byte +m_near_obj = .bss:0x0000003C; // type:object size:0x4 scope:local data:4byte +m_obj_dist = .bss:0x00000040; // type:object size:0x4 scope:local align:4 data:float diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index bf2008cfdb..be2bf76935 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -36,10 +36,11 @@ struct cXyz : Vec { this->y = vec.y; this->z = vec.z; } - void operator=(const Vec& vec) { + cXyz& operator=(const Vec& vec) { this->x = vec.x; this->y = vec.y; this->z = vec.z; + return *this; } cXyz operator+(Vec const&) const; cXyz operator-(Vec const&) const; diff --git a/include/d/actor/d_a_e_ym.h b/include/d/actor/d_a_e_ym.h index 270734c286..3217592e13 100644 --- a/include/d/actor/d_a_e_ym.h +++ b/include/d/actor/d_a_e_ym.h @@ -8,6 +8,7 @@ #include "d/d_cc_d.h" #include "d/d_cc_uty.h" #include "d/d_path.h" +#include "m_Do/m_Do_ext.h" class daKago_c; @@ -49,19 +50,20 @@ public: void setTagPosP() { mTagPosP = &mTagPos; } - u8 checkBck(char const*, int); + bool checkBck(char const*, int); void bckSet(int, u8, f32, f32); void bckSetFly(int, u8, f32, f32); int draw(); + void setWaterEffect(); // unused void setDigEffect(); void setElecEffect1(); void setElecEffect2(); void setFireEffect(); bool checkWallCrash(); - u8 checkWolfBark(); - u8 checkSurpriseLock(); - u8 checkRailSurprise(); - u8 checkSurpriseNear(); + bool checkWolfBark(); + bool checkSurpriseLock(); + bool checkRailSurprise(); + bool checkSurpriseNear(); void setNormalCc(); void setAppear(); void setMoveSound(int); @@ -80,17 +82,17 @@ public: void executeBack(); void executeFall(); void executeAttack(); - u8 checkAttackEnd(); - u8 setAttackMotion(); + bool checkAttackEnd(); + bool setAttackMotion(); void executeAttackWall(); void executeDefense(); - u8 checkFlyTerritory(); + bool checkFlyTerritory(); void initFly(); void executeFly(); void setInclination(); void executeFlyAttack(); void setNextPathPoint(); - u8 checkRailDig(); + bool checkRailDig(); void executeRail(); void executeBackRail(); void checkElectricStart(); @@ -108,8 +110,8 @@ public: int execute(); int _delete(); int CreateHeap(); - u8 checkBeforeBg(s16); - u8 checkBeforeGround(); + bool checkBeforeBg(s16); + bool checkBeforeGround(); void checkInitialWall(); u8 checkWall(); void setHideType(); @@ -132,7 +134,7 @@ private: /* 0x670 */ cXyz mPrevPos; /* 0x67C */ cXyz field_0x67c; /* 0x688 */ f32 field_0x688; - /* 0x68C */ f32 field_0x68c; + /* 0x68C */ f32 field_0x68c; // model size? /* 0x690 */ int mAction; /* 0x694 */ int mLastAction; /* 0x698 */ int mMode; diff --git a/include/d/actor/d_a_kago.h b/include/d/actor/d_a_kago.h index 3bac7b7997..a84d049ad2 100644 --- a/include/d/actor/d_a_kago.h +++ b/include/d/actor/d_a_kago.h @@ -120,10 +120,10 @@ public: MtxP getLegR3Mtx() { return mLegR3Mtx; } MtxP getMidnaLocaterMtx() { return mpMorf->getModel()->getAnmMtx(4); } s8 getPathDir() { return mPathDir; } - bool isFlying() { return mIsFlying; } + u8 isFlying() { return mIsFlying; } fopAc_ac_c* getLockActor() { return mpLockActor; } void setLockActor(fopAc_ac_c* actor) { mpLockActor = actor; } - void setEatYm() { field_0x6d8 |= 4; } + void setEatYm() { field_0x6d8 |= (u8) 4; } MtxP getMouthMtx() { return mpMorf->getModel()->getAnmMtx(7); } private: @@ -156,7 +156,7 @@ private: /* 0x6DE */ u8 field_0x6de; /* 0x6DF */ u8 field_0x6df; /* 0x6E0 */ u8 field_0x6e0; - /* 0x6E1 */ bool mIsFlying; + /* 0x6E1 */ u8 mIsFlying; /* 0x6E2 */ u8 field_0x6e2[0x6e3 - 0x6e2]; /* 0x6E3 */ u8 field_0x6e3; /* 0x6E4 */ u8 field_0x6e4; diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index 8a8e07215d..397a76c070 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -203,6 +203,7 @@ public: s16* GetShieldFrontRangeYAngle() { return mShieldFrontRangeYAngle; } s16 GetShieldRange() { return mShieldRange; } u8 GetSpl() { return mSpl; } + void SetSpl(dCcG_Tg_Spl tg_spl) { mSpl = tg_spl; } void SetSpl(u8 tg_spl) { mSpl = tg_spl; } u8 GetHitMark() { return mHitMark; } void SetRVec(cXyz& vec) { mRVec = vec; } @@ -387,6 +388,7 @@ public: bool ChkTgHookShotNoHitMark() { return mGObjTg.ChkSPrm(0x400); } bool ChkTgArrowNoHitMark() { return mGObjTg.ChkSPrm(0x1000); } dCcG_Tg_Spl GetTgSpl() { return (dCcG_Tg_Spl)mGObjTg.GetSpl(); } + void SetTgSpl(dCcG_Tg_Spl tg_spl) { mGObjTg.SetSpl(tg_spl); } void SetTgSpl(u8 tg_spl) { mGObjTg.SetSpl(tg_spl); } int GetTgHitMark() { return mGObjTg.GetHitMark(); } int GetAtHitMark() { return mGObjAt.GetHitMark(); } diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 536754f7cf..133c316988 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -15,11 +15,12 @@ #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" -class daE_YM_HIO_c { +class daE_YM_HIO_c: public JORReflexible { public: daE_YM_HIO_c(); virtual ~daE_YM_HIO_c() {} + void genMessage(JORMContext*); /* 0x04 */ s8 field_0x4; /* 0x08 */ f32 mModelSize; @@ -46,47 +47,69 @@ dCcD_SrcSph E_YM_n::cc_sph_src = { } }; -static u16 w_eff_id[] = {0x01B8, 0x01B9, 0x01BA, 0x01BB}; // unused +#define DEFAULT_E_YM_MODEL_SIZE 0.6f daE_YM_HIO_c::daE_YM_HIO_c() { field_0x4 = -1; mFlyMoveSpeed = 20.0f; mFlyAttackSpeed = 30.0f; - mModelSize = 0.6f; + mModelSize = DEFAULT_E_YM_MODEL_SIZE; mElectricInvincibilityTimeExtension = 3.0f; mMoveSpeed = 13.0f; mSurpriseDistance = 400.0f; mMoveRange = 300.0f; } +#if DEBUG +void daE_YM_HIO_c::genMessage(JORMContext* ctext) { + // 'yami mushi', a.k.a. dark insect + ctext->genLabel(" 闇虫", 0x80000001, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); + // basic size + ctext->genSlider("基本サイズ", &mModelSize, 0.0f, 5.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); + ctext->genSlider("放電無敵延長時間", &mElectricInvincibilityTimeExtension, 0.0f, 100.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); + // hovering speed + ctext->genSlider("徘徊速度", &mMoveSpeed, 0.0f, 100.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); + // surprising distance + ctext->genSlider("びっくり距離", &mSurpriseDistance, 0.0f, 1000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); + // movement radius + ctext->genSlider("移動半径", &mMoveRange, 0.0f, 1000.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); + // flight speed + ctext->genSlider("飛行移動速度", &mFlyMoveSpeed, 0.0f, 100.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); + // flight attack speed + ctext->genSlider("飛行攻撃速度", &mFlyAttackSpeed, 0.0f, 100.0f, 0, NULL, 0xFFFF, 0xFFFF, 0x200, 24); +} +#endif -u8 daE_YM_c::checkBck(char const* i_arcName, int i_resNo) { - return mpMorf->getAnm() == (J3DAnmTransform*)dComIfG_getObjectRes(i_arcName, i_resNo); + +bool daE_YM_c::checkBck(char const* i_arcName, int i_resNo) { + if (mpMorf->getAnm() == (J3DAnmTransform*)dComIfG_getObjectRes(i_arcName, i_resNo)) { + return true; + } else { + return false; + } } void daE_YM_c::bckSet(int i_resID, u8 i_attribute, f32 i_morf, f32 i_speed) { - int tm_res_id; - if (mFlyType == true) { switch (i_resID) { case 6: - tm_res_id = 8; + i_resID = 8; break; case 15: - tm_res_id = 9; + i_resID = 9; break; case 16: i_speed = 2.0f; - tm_res_id = 10; + i_resID = 10; break; case 14: - tm_res_id = 10; + i_resID = 10; break; default: - tm_res_id = 9; + i_resID = 9; } - mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_TM", tm_res_id), i_attribute, + mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_TM", i_resID), i_attribute, i_morf, i_speed, 0.0f, -1.0f); } else { mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("E_YM", i_resID), i_attribute, @@ -104,7 +127,7 @@ int daE_YM_c::draw() { return 1; } - if (daPy_py_c::checkNowWolfEyeUp()) { + if (daPy_getPlayerActorClass()->checkNowWolfEyeUp()) { cLib_addCalc2(&field_0x6d4, 255.0f, 1.0f, 30.0f); } else if (mAction == ACT_DOWN) { cLib_addCalc2(&field_0x6d4, 255.0f, 1.0f, 30.0f); @@ -145,7 +168,8 @@ int daE_YM_c::draw() { J3DModelData* modelData_p = model_p->getModelData(); for (u16 i = 0; i < modelData_p->getMaterialNum(); i++) { - modelData_p->getMaterialNodePointer(i)->getTevKColor(3)->a = field_0x6d4; + J3DMaterial* material = modelData_p->getMaterialNodePointer(i); + material->getTevKColor(3)->a = field_0x6d4; } if (bvar) { @@ -180,21 +204,17 @@ static fopAc_ac_c* m_near_obj; static f32 m_obj_dist; static void* s_obj_sub(void* param_0, void* param_1) { - fopAc_ac_c* e_ym; - fopAc_ac_c* near_obj; + f32 obj_dist, abs_dist_to_player; + if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_Obj_Carry) { + if (!fpcM_IsCreating(fopAcM_GetID(param_0))) { + obj_dist = fopAcM_searchActorDistanceXZ((fopAc_ac_c*)param_0, (fopAc_ac_c*)param_1); - near_obj = (fopAc_ac_c*)param_0; - e_ym = (fopAc_ac_c*)param_1; - - if (fopAcM_IsActor(near_obj) && fopAcM_GetName(near_obj) == PROC_Obj_Carry) { - if (!fpcM_IsCreating(fopAcM_GetID(near_obj))) { - f32 obj_dist = fopAcM_searchActorDistanceXZ(near_obj, e_ym); - - if (obj_dist < 100.0f && obj_dist < m_obj_dist && - fabsf(fopAcM_searchActorDistanceY(near_obj, e_ym)) < 30.0f) - { - m_near_obj = near_obj; - m_obj_dist = obj_dist; + if (obj_dist < 100.0f && obj_dist < m_obj_dist) { + abs_dist_to_player = std::abs(fopAcM_searchActorDistanceY((fopAc_ac_c*)param_0, (fopAc_ac_c*)param_1)); + if (abs_dist_to_player < 30.0f) { + m_near_obj = (fopAc_ac_c*) param_0; + m_obj_dist = obj_dist; + } } } } @@ -202,13 +222,23 @@ static void* s_obj_sub(void* param_0, void* param_1) { return 0; } +// unused function. +void daE_YM_c::setWaterEffect() { + static u16 w_eff_id[] = { + ID_ZI_J_DOWNWTRA_A, + ID_ZI_J_DOWNWTRA_B, + ID_ZI_J_DOWNWTRA_C, + ID_ZI_J_DOWNWTRA_D + }; // unused +} + void daE_YM_c::setDigEffect() { cXyz sp1C(field_0x68c, field_0x68c, field_0x68c); cXyz sp28(current.pos); sp28.y += field_0x6dc; - field_0xad8 = dComIfGp_particle_set(field_0xad8, 0x83A8, &sp28, &shape_angle, &sp1C); - field_0xadc = dComIfGp_particle_set(field_0xadc, 0x83A9, &sp28, &shape_angle, &sp1C); + field_0xad8 = dComIfGp_particle_set(field_0xad8, dPa_RM(ID_ZI_S_YM_DIGA_A), &sp28, &shape_angle, &sp1C); + field_0xadc = dComIfGp_particle_set(field_0xadc, dPa_RM(ID_ZI_S_YM_DIGA_B), &sp28, &shape_angle, &sp1C); } void daE_YM_c::setElecEffect1() { @@ -222,10 +252,12 @@ void daE_YM_c::setElecEffect1() { } cXyz cStack_38(iVar5[0][3], iVar5[1][3], iVar5[2][3]); - field_0xad8 = dComIfGp_particle_set(field_0xad8, 0x8393, &cStack_38, &tevStr, &shape_angle, &cStack_2c, - 0xff, 0, -1, 0, 0, 0); - field_0xadc = dComIfGp_particle_set(field_0xadc, 0x8394, &cStack_38, &tevStr, &shape_angle, &cStack_2c, - 0xff, 0, -1, 0, 0, 0); + field_0xad8 = dComIfGp_particle_set(field_0xad8, dPa_RM(ID_ZI_S_YM_ELECAT_A), + &cStack_38, &tevStr, &shape_angle, &cStack_2c, + 0xFF, 0, -1, 0, 0, 0); + field_0xadc = dComIfGp_particle_set(field_0xadc, dPa_RM(ID_ZI_S_YM_ELECAT_B), + &cStack_38, &tevStr, &shape_angle, &cStack_2c, + 0xFF, 0, -1, 0, 0, 0); } @@ -238,35 +270,32 @@ void daE_YM_c::setElecEffect2() { } else { iVar5 = mpMorf->getModel()->getAnmMtx(0); } + cXyz cStack_38(iVar5[0][3], iVar5[1][3], iVar5[2][3]); setElecEffect1(); - field_0xae0 = dComIfGp_particle_set(field_0xae0, 0x8395, &cStack_38, &tevStr, + field_0xae0 = dComIfGp_particle_set(field_0xae0, dPa_RM(ID_ZI_S_YM_ELECAT_C), &cStack_38, &tevStr, &shape_angle, &cStack_2c, - 0xff, 0, -1, 0, 0, 0); - field_0xae4 = dComIfGp_particle_set(field_0xae4, 0x8396, &cStack_38, &tevStr, + 0xFF, 0, -1, 0, 0, 0); + field_0xae4 = dComIfGp_particle_set(field_0xae4, dPa_RM(ID_ZI_S_YM_ELECAT_D), &cStack_38, &tevStr, &shape_angle, &cStack_2c, - 0xff, 0, -1, 0, 0, 0); + 0xFF, 0, -1, 0, 0, 0); } void daE_YM_c::setFireEffect() { cXyz my_vec_0(1.0f, 1.0f, 1.0f); - mParticleKeys[0] = dComIfGp_particle_set(mParticleKeys[0], 0x3ad, ¤t.pos, NULL, - NULL, &my_vec_0, 0xff, NULL, -1, - NULL, NULL, NULL); - mParticleKeys[1] = dComIfGp_particle_set(mParticleKeys[1], 0x3af, ¤t.pos, NULL, - NULL, &my_vec_0, 0xff, NULL, -1, - NULL, NULL, NULL); - mParticleKeys[2] = dComIfGp_particle_set(mParticleKeys[2], 0x3ae, ¤t.pos, NULL, - NULL, &my_vec_0, 0xff, NULL, -1, - NULL, NULL, NULL); + mParticleKeys[0] = dComIfGp_particle_set(mParticleKeys[0], ID_ZF_J_FIRE00_GLOW, ¤t.pos, NULL, &my_vec_0); + mParticleKeys[1] = dComIfGp_particle_set(mParticleKeys[1], ID_ZF_J_FIRE02_FIRE, ¤t.pos, NULL, &my_vec_0); + mParticleKeys[2] = dComIfGp_particle_set(mParticleKeys[2], ID_ZF_J_FIRE01_SPARK, ¤t.pos, NULL, &my_vec_0); + JPABaseEmitter* emitter; if (field_0x6d0 != NULL) { - for (int idx = 0x2c; idx >= 0; --idx) { + for (int idx = 44; idx >= 0; --idx) { field_0x6d0[idx+1] = field_0x6d0[idx]; } + field_0x6d0[0] = speed; for (int idx = 0; idx < 3; ++idx) { - JPABaseEmitter* emitter = dComIfGp_particle_getEmitter(mParticleKeys[idx]); + emitter = dComIfGp_particle_getEmitter(mParticleKeys[idx]); if (emitter != NULL) { if (speed.abs() > 1.0f) { emitter->setParticleCallBackPtr((JPAParticleCallBack*)&JPTracePCB4); @@ -298,10 +327,12 @@ bool daE_YM_c::checkWallCrash() { return false; } -u8 daE_YM_c::checkWolfBark() { +bool daE_YM_c::checkWolfBark() { if (mType == 2) { - return 0; - } else if (daPy_getPlayerActorClass()->checkWolfBark() && mDistToPlayer < 900.0f) { + return false; + } + + if (daPy_getPlayerActorClass()->checkWolfBark() && mDistToPlayer < 900.0f) { if (mType == 0) { s16 dist_ang = cLib_distanceAngleS(mAngleToPlayer, shape_angle.y); cXyz my_vec_0 = current.pos - mPrevPos; @@ -315,41 +346,45 @@ u8 daE_YM_c::checkWolfBark() { } } } else if (mType == 1) { - return 0; + return false; } - return 1; - } else { - return 0; + + return true; } + + return false; } -u8 daE_YM_c::checkSurpriseLock() { +bool daE_YM_c::checkSurpriseLock() { daPy_py_c* player = daPy_getPlayerActorClass(); if (mType == 2) { - return 0; + return false; } + if (mAction != ACT_WAIT && mAction != ACT_MOVE && mAction != ACT_SURPRISE && mAction != ACT_ATTACK && mAction != ACT_ATTACK_WALL) { - return 0; + return false; } + if (field_0x6f6 != 0) { - return 0; + return false; } + if (field_0x6fc) { - return 0; + return false; } - if (mAction != 8) { - bool truth = dComIfGp_getAttention()->LockonTruth(); - if (truth) { - fopAc_ac_c* tgt = dComIfGp_getAttention()->LockonTarget(0); - if (tgt == this && mType == 0) { + + if (mAction != ACT_ATTACK) { + if (dComIfGp_getAttention()->LockonTruth()) { + if (dComIfGp_getAttention()->LockonTarget(0) == this && mType == 0) { cXyz my_vec_0 = current.pos - mPrevPos; cXyz my_vec_1 = player->current.pos - mPrevPos; if (mType == 4) { return checkRailSurprise(); } + switch (field_0x6a1) { - case 0: + case 0: { if (my_vec_0.abs() > l_HIO.mMoveRange || my_vec_1.abs() > (l_HIO.mMoveRange + 150.0f)) { if (mAction != ACT_SURPRISE) { if (mTagPosP != NULL) { @@ -357,14 +392,17 @@ u8 daE_YM_c::checkSurpriseLock() { } else { setActionMode(ACT_SURPRISE); } - return 1; + return true; } - return 0; + + return false; } else { setActionMode(ACT_ATTACK); - return 1; + return true; } - case 1: + } + // fallthrough + case 1: { if (mAction != ACT_SURPRISE) { if (mTagPosP != NULL) { setActionMode(ACT_FLY); @@ -372,45 +410,50 @@ u8 daE_YM_c::checkSurpriseLock() { setActionMode(ACT_SURPRISE); } } - return 1; - default: - break; + return true; + } } } } } - return 0; + + return false; } -u8 daE_YM_c::checkRailSurprise() { +bool daE_YM_c::checkRailSurprise() { if (dComIfGp_checkPlayerStatus0(0, 0x8000000)) { if (mDistToPlayer > 200.0f || (s16)cLib_distanceAngleS(mAngleToPlayer, shape_angle.y) > 0x2000) { field_0x70a = 0x1e; } } + if (field_0x70a != 0) { - return 0; + return false; } + if (field_0x704 == 0) { setActionMode(ACT_BACK_RAIL); } else { setActionMode(ACT_SURPRISE); } - return 1; + + return true; } -u8 daE_YM_c::checkSurpriseNear() { +bool daE_YM_c::checkSurpriseNear() { daPy_py_c* player = daPy_getPlayerActorClass(); cXyz my_vec_0; if (mType == 1) { if (field_0x6fa) { - return 0; + return false; } + if (player->checkClimbMove()) { f32 my_val = field_0x6e0 - 50.0f; if (my_val < 50.0f) { my_val = 50.0f; } + cXyz my_vec_1 = player->current.pos; my_vec_1.y += 100.0f; my_vec_0 = mPrevPos - current.pos; @@ -419,10 +462,11 @@ u8 daE_YM_c::checkSurpriseNear() { if (my_vec_0.abs() < 350.0f) { dBgS_GndChk gnd_chk; gnd_chk.SetPos(&my_vec_1); - if ((player->current.pos.y - dComIfG_Bgsp().GroundCross(&gnd_chk)) > 50.0f) { + f32 gnd_cross = dComIfG_Bgsp().GroundCross(&gnd_chk); + if (player->current.pos.y - gnd_cross > 50.0f) { field_0x6a5 = 0; setActionMode(ACT_ATTACK_WALL); - return 1; + return true; } } } else { @@ -430,14 +474,15 @@ u8 daE_YM_c::checkSurpriseNear() { if (my_vec_0.abs() < 100.0f) { field_0x6a5 = 1; setActionMode(ACT_ATTACK_WALL); - return 1; + return true; } } } } else if (mType == 0 || mType == 4) { if (mAcch.ChkGroundHit() == 0) { - return 0; + return false; } + f32 my_val; if (mType == 4) { my_val = l_HIO.mSurpriseDistance + 200.0f; @@ -448,52 +493,61 @@ u8 daE_YM_c::checkSurpriseNear() { my_val = l_HIO.mSurpriseDistance + 200.0f; } } + if (mDistToPlayer < my_val) { if (mSphCc.ChkCoHit()) { cCcD_Obj* hit_obj = mSphCc.GetCoHitObj(); - fopAc_ac_c* my_ac = dCc_GetAc(hit_obj->GetAc()); - if (fopAcM_GetName(my_ac) == PROC_ALINK) { + if (fopAcM_GetName(dCc_GetAc(hit_obj->GetAc())) == PROC_ALINK) { if (mType == 4) { return checkRailSurprise(); } + if (mTagPosP != NULL) { setActionMode(ACT_FLY); } else { setActionMode(ACT_SURPRISE); } - return 1; + + return true; } } + if (mAction == ACT_ATTACK) { - return 0; + return false; } + if (player->getSpeedF() >= 16.0f) { field_0x6f6 = 0; } else { if (field_0x6f8) { - return 0; + return false; } + if (mDistToPlayer > l_HIO.mSurpriseDistance - 100.0f) { field_0x6f8 = 0x3c; - return 0; + return false; } } + if (field_0x6f6 == 0) { if (mType == 4) { return checkRailSurprise(); } + if (mTagPosP != NULL) { setActionMode(ACT_FLY); } else { setActionMode(ACT_SURPRISE); } - return 1; + + return true; } } else { field_0x6f8 = 0; } } - return 0; + + return false; } void daE_YM_c::setNormalCc() { @@ -519,6 +573,7 @@ void daE_YM_c::setMoveSound(int param_0) { } else if (checkBck("E_YM", 16) == 0) { return; } + mpMorf->setPlaySpeed(fabsf(speedF) * 0.15f); if (mpMorf->checkFrame(1.0f) || mpMorf->checkFrame(5.0f) || mpMorf->checkFrame(9.0f)) { if (param_0) { @@ -539,8 +594,7 @@ void daE_YM_c::setActionMode(int i_action) { mLastAction = mAction; mAction = i_action; mMode = 0; - field_0x6f2 = 0; - field_0x6f0 = 0; + field_0x6f0 = field_0x6f2 = 0; current.angle.y = shape_angle.y; } @@ -550,18 +604,22 @@ void daE_YM_c::executeWait() { if (mType != 2) { mSound.startCreatureSoundLevel(Z2SE_EN_YM_WAIT, 0, -1); } + if (mType != 1) { cLib_chaseF(&speed.y, -60.0f, 5.0f); } + if (field_0x6a1 == 1 && mMode != 0 && field_0x6f2 == 0) { - field_0x6c9 = 0; - field_0x708 = 0; + field_0x708 = field_0x6c9 = 0; } + switch (mMode) { - case 0x64: + case 100: { field_0x6f0 = 0x1e; - mMode = 0x65; - case 0x65: { + mMode = 101; + } + // fallthrough + case 101: { current.pos = home.pos; setHideType(); mPrevPos = current.pos; @@ -571,7 +629,8 @@ void daE_YM_c::executeWait() { } break; } - case 0: + + case 0: { field_0x6f2 = 0x1e; checkWall(); bckSet(0xf, 2, 5.0f, 1.0f); @@ -601,22 +660,30 @@ void daE_YM_c::executeWait() { field_0x6f0 = cM_rndFX(30.0f) + 100.0f; } break; - case 1: + } + + case 1: { if (checkSurpriseNear()) { return; } + if (checkWolfBark()) { return; } + if (checkWallCrash()) { return; } + if (field_0x6f0 == 0) { setActionMode(ACT_MOVE); return; } + break; - case 2: + } + + case 2: { checkFrinedSamePos(); switch (field_0x6a6) { case 1: @@ -647,18 +714,24 @@ void daE_YM_c::executeWait() { } } } + break; - case 3: + } + + case 3: { if (field_0x6f0 == 0) { setActionMode(ACT_ESCAPE); } break; - case 4: + } + + case 4: { if (field_0x6d4) { field_0x714 = 4; } else { field_0x714 = 0; } + if (dComIfGs_isSwitch(field_0x6a3, fopAcM_GetRoomNo(this)) && mType == 1) { field_0x714 = 4; if (mTagPosP != NULL) { @@ -667,26 +740,28 @@ void daE_YM_c::executeWait() { setActionMode(ACT_FALL); } } + break; - default: - break; + } } + current.angle.y = shape_angle.y; } void daE_YM_c::executeMove() { - daPy_py_c* player = daPy_getPlayerActorClass(); - (void) player; // acquired, but not used. + daPy_py_c* player = daPy_getPlayerActorClass(); // unused cXyz my_vec_0; cXyz my_vec_1; f32 my_val = field_0x6e0 - 50.0f; if (my_val < 50.0f) { my_val = 50.0f; } - if (checkSurpriseNear() == 0 && checkWolfBark() == 0 && checkWallCrash() == 0 && setAttackMotion() == 0) { + + if (!checkSurpriseNear() && !checkWolfBark() && !checkWallCrash() && !setAttackMotion()) { if (mType != 1) { cLib_chaseF(&speed.y, -60.0f, 5.0f); } + switch (mMode) { case 0: bckSet(0xe, 2, 10.0f, 1.5f); @@ -788,7 +863,8 @@ void daE_YM_c::executeEscape() { if (mType == 2) { setAppear(); } - if (mLastAction != 4) { + + if (mLastAction != ACT_WIND) { s16 adj_angle = mAngleToPlayer + 0x8000; if (mFriendFlag & 0x1) { shape_angle.y = adj_angle; @@ -888,13 +964,15 @@ void daE_YM_c::executeEscape() { cLib_chaseF(&speedF, 20.0f, 1.0f); setMoveSound(0); if (mAcch.ChkWallHit()) { - field_0x6e4 += 0x800; + field_0x6e4 += (s16) 0x800; } + if (field_0x6e8 >= 0) { - field_0x6e6 -= 200; + field_0x6e6 -= (s16) 200; } else { - field_0x6e6 += 200; + field_0x6e6 += (s16) 200; } + field_0x6e8 += field_0x6e6; cLib_addCalcAngleS(&shape_angle.y, field_0x6e4 + field_0x6e8, 8, 0x1000, 0x100); my_vec_0 = current.pos - mPrevPos; @@ -905,13 +983,16 @@ void daE_YM_c::executeEscape() { setActionMode(ACT_WAIT); setNormalCc(); } + break; default: break; } + if (field_0x6f0 == 1) { mSphCc.SetCoSPrm(0x75); } + current.angle.y = shape_angle.y; } @@ -929,7 +1010,8 @@ void daE_YM_c::executeDown() { } else { gravity = 0.0f; } - OS_REPORT("YM executeDown %d %f %f \n", gnd_cross, current.pos.z, mMode); + + OS_REPORT("YM executeDown %d %f %f \n", mMode, gnd_cross, current.pos.y); field_0x6cf = 0; switch (mMode) { case 0: @@ -962,6 +1044,7 @@ void daE_YM_c::executeDown() { } setAppear(); field_0x714 = 0; + // Faron Woods if (0 == strcmp("R_SP108", dComIfGp_getStartStageName())) { if (dComIfGp_getStartStageRoomNo() == 0 && dComIfG_play_c::getLayerNo(0) == 0xe && mSwitchBit != 0xff) { if (dComIfGs_isSwitch(mSwitchBit, fopAcM_GetRoomNo(this)) == 0) { @@ -998,24 +1081,25 @@ void daE_YM_c::executeDown() { } break; } + if (current.pos.y < gnd_cross) { mSound.startCreatureSound(Z2SE_CM_BODYFALL_WATER_M, 0, -1); mSound.startCreatureSound(Z2SE_EN_YM_MOGAKU, 0, -1); bckSet(6, 0, 0.0f, 1.0f); speedF = 0.0f; - gravity = 0.0f; - speed.y = 0.0f; + speed.y = gravity = 0.0f; current.pos.y = gnd_cross; shape_angle.x = -0x8000; field_0x6f0 = 0; mMode = 3; break; } - if (speed.y < 0.0f && fabsf(gnd_cross - current.pos.y) > 1000.f) { + + if (speed.y < 0.0f && std::abs(gnd_cross - current.pos.y) > 1000.f) { dBgS_GndChk gnd_chk; gnd_chk.SetPos(¤t.pos); - gnd_cross = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (gnd_cross == -G_CM3D_F_INF || fabsf(gnd_cross - current.pos.y) > 1000.0f + f32 gnd_cross_2 = dComIfG_Bgsp().GroundCross(&gnd_chk); + if (gnd_cross_2 == -G_CM3D_F_INF || std::abs(gnd_cross_2 - current.pos.y) > 1000.0f || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) { bckSet(6, 0, 0.0f, 1.0f); @@ -1042,26 +1126,35 @@ void daE_YM_c::executeDown() { } void daE_YM_c::damage_check() { - if (field_0x6f4 != 0 || mAction == ACT_RIVER || mAction == ACT_DOWN) { + if (field_0x6f4 != 0) { return; } + + if (mAction == ACT_RIVER || mAction == ACT_DOWN) { + return; + } + mStts.Move(); if (mSphCc.ChkTgHit()) { mAtInfo.mpCollider = mSphCc.GetTgHitObj(); - if (field_0x700 == 0 || !mAtInfo.mpCollider->ChkAtType(0xD8000000)) { + if (field_0x700 == 0 || !mAtInfo.mpCollider->ChkAtType(AT_TYPE_UNK)) { cc_at_check(this, &mAtInfo); - if (mAtInfo.mpCollider->ChkAtType(0xD8000000)) { + if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_UNK)) { field_0x6f4 = 20; } else { field_0x6f4 = 10; } + if (mAtInfo.mAttackPower <= 1) { - field_0x6f4 = 10; + field_0x6f4 = 10 + KREG_S(8); } + if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_BOOMERANG)) { if (mIsHide) { setActionMode(ACT_WIND); } + + return; // necessary for proper dbg asm flow ctrl } else if (mType != 2) { mSound.startCreatureSound(Z2SE_EN_YM_DEATH, 0, -1); if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_10000000)) { @@ -1102,8 +1195,7 @@ void daE_YM_c::executeWind() { break; case 2: if (mAcch.ChkGroundHit()) { - speed.y = 0.0f; - speedF = 0.0f; + speedF = speed.y = 0.0f; if (cLib_chaseAngleS(&field_0x6e6, 0, 200)) { mMode = 3; field_0x6f0 = 0x32; @@ -1137,8 +1229,7 @@ void daE_YM_c::executeWind() { break; case 4: if (cLib_chaseAngleS(&shape_angle.z, 0, 0x1000) && mAcch.ChkGroundHit()) { - speed.y = 0.0f; - speedF = 0.0f; + speedF = speed.y = 0.0f; setActionMode(ACT_ESCAPE); } break; @@ -1151,10 +1242,11 @@ void daE_YM_c::executeWind() { int daE_YM_c::getSurpriseType() { cXyz my_vec_0 = mPrevPos - current.pos; int ret; + s16 dist_ang; if (my_vec_0.abs() > l_HIO.mMoveRange) { ret = 2; } else { - s16 dist_ang = cLib_distanceAngleS(mAngleToPlayer, shape_angle.y); + dist_ang = cLib_distanceAngleS(mAngleToPlayer, shape_angle.y); ret = 1; if (dist_ang < 0x3000 && cM_rndF(10.0f) > 8.0f) { ret = 0; @@ -1179,16 +1271,19 @@ void daE_YM_c::setGoHomeType() { shape_angle.y = tgt_ang + cM_rndFX(4000.0f); mMode = 3; } else { - if ((s16)(mAngleToPlayer - tgt_ang) < 0) { + s16 angle_diff = mAngleToPlayer - tgt_ang; + if (angle_diff < 0) { field_0x6a5 = 2; } else { field_0x6a5 = 3; } + if (field_0x6cb) { speedF = 25.0f; } else { speedF = l_HIO.mMoveSpeed; } + setSurpriseAway(); } } @@ -1198,29 +1293,34 @@ void daE_YM_c::executeSurprise() { if (mType != 1) { cLib_chaseF(&speed.y, -90.0f, 15.0f); } + cXyz my_vec_0 = mPrevPos - current.pos; if (daPy_getPlayerActorClass()->checkWolfLock(this) && mAcch.ChkGroundHit()) { cLib_chaseF(&speedF, 0.0f, 5.0f); cLib_chaseAngleS(&shape_angle.y,mAngleToPlayer, 0x400); return; } + switch (mMode) { - case 0: + case 0: { if (field_0x6a1 == 1 && field_0x708 == 0 && field_0x6c9 == 0) { field_0x708 = 0x78; } - if (getSurpriseType() == 2 && field_0x6a9) { + + int surprise_type = getSurpriseType(); + if (surprise_type == 2 && field_0x6a9) { setGoHomeType(); } else { field_0x6a5 = 0; field_0x6e4 = mAngleToPlayer + 0x8000; s16 sh_ang = player->shape_angle.y; - s16 dist_ang = cLib_distanceAngleS(field_0x6e4, player->shape_angle.y); + s16 dist_ang = cLib_distanceAngleS(field_0x6e4, sh_ang); if (sh_ang + dist_ang == field_0x6e4) { field_0x6a5 = 0; } else { field_0x6a5 = 1; } + if (field_0x6cb) { speedF = 25.0f; if (field_0x6a9 == 0) { @@ -1236,12 +1336,16 @@ void daE_YM_c::executeSurprise() { } setSurpriseAway(); } + break; - case 1: + } + + case 1: { if (mAcch.ChkWallHit() && field_0x6a5 < 2) { setGoHomeType(); return; } + setMoveSound(0); if (field_0x6a5 == 0) { field_0x6e4 = mAngleToPlayer - 0x6000; @@ -1252,6 +1356,7 @@ void daE_YM_c::executeSurprise() { if (field_0x6a5 == 2) { sh_val = 0x2000; } + if (current.pos.absXZ(mPrevPos) < 100.0f) { field_0x6e4 = sh_val + cLib_targetAngleY(¤t.pos, &home.pos); } else { @@ -1266,27 +1371,29 @@ void daE_YM_c::executeSurprise() { } } } + field_0x6e4 = next_0x6e4; } } + if (field_0x6a5 <= 1 && my_vec_0.abs() >= l_HIO.mMoveRange + 200.0f) { field_0x6f0 = 0; } + cLib_addCalcAngleS(&shape_angle.y, field_0x6e4, 8, 0x1000, 0x100); if (field_0x6f0 == 0) { if (!field_0x6d4 && cM_rnd() < 0.3f) { if (field_0x6a1 == 1) { setActionMode(ACT_ELECTRIC); - return; - } - if (field_0x6a1) { - return; - } - if (daPy_getPlayerActorClass()->current.pos.abs(mPrevPos) <= l_HIO.mMoveRange + 200.0f) { - setActionMode(ACT_ATTACK); + } else if (field_0x6a1 == 0) { + if (daPy_getPlayerActorClass()->current.pos.abs(mPrevPos) <= l_HIO.mMoveRange + 200.0f) { + setActionMode(ACT_ATTACK); + } } + return; } + if (field_0x6c9 && mDistToPlayer < 300.0f) { setActionMode(ACT_ELECTRIC); } else { @@ -1295,12 +1402,16 @@ void daE_YM_c::executeSurprise() { field_0x6f6 = 5; } } + break; - case 2: + } + + case 2: { field_0x6a5 = getSurpriseType(); if (mAcch.ChkWallHit()) { field_0x6a5 = 2; } + if (field_0x6a5 == 0) { shape_angle.y = mAngleToPlayer + cM_rndFX(4000.0f); } else if (field_0x6a5 == 1) { @@ -1308,12 +1419,16 @@ void daE_YM_c::executeSurprise() { } else { shape_angle.y = cLib_targetAngleY(¤t.pos, &mPrevPos) + cM_rndFX(4000.0f); } - case 3: + } + // fallthrough + case 3: { mMode = 5; speedF = 0.0f; bckSet(10, 0, 10.0f, 2.0f); break; - case 5: + } + + case 5: { if (mpMorf->isStop()) { bckSet(0xb, 0, 5.0f, 1.0f); mSound.startCreatureSound(Z2SE_EN_YM_JUMP, 0, -1); @@ -1331,14 +1446,14 @@ void daE_YM_c::executeSurprise() { speedF = my_vec_0.abs() / 10.0f; speed.y = 75.0f; break; - default: - break; } + if (speedF < 35.0f) { speedF = 35.0f; } else if (speedF >= 50.0f) { speedF = 50.0f; } + if (speed.y < 60.0f) { speed.y = 60.0f; } else if (speed.y >= 90.0f) { @@ -1346,24 +1461,31 @@ void daE_YM_c::executeSurprise() { } } break; - case 6: + } + + case 6: { if (mAcch.ChkGroundHit()) { mSound.startCreatureSound(Z2SE_EN_YM_LAND, 0, -1); bckSet(0xc, 0, 0.0f, 1.0f); mMode = 7; speedF = 0.0f; } + break; - case 7: + } + + case 7: { + int _; // to force b in dbg if (mpMorf->isStop() && field_0x6f0 == 0) { setActionMode(ACT_WAIT); field_0x6f6 = 0xf; field_0x6a7 = 0; } + break; - default: - break; + } } + current.angle.y = shape_angle.y; } @@ -1419,8 +1541,7 @@ void daE_YM_c::executeFall() { current.angle.y = shape_angle.y + 0x7000; } } - field_0x668.z = 0; - field_0x668.x = 0; + field_0x668.x = field_0x668.z = 0; setElecEffect1(); mSound.startCreatureSoundLevel(Z2SE_EN_YM_ELECTRIC, 0, -1); } @@ -1478,7 +1599,7 @@ void daE_YM_c::executeAttack() { if (checkBck("E_YM", 0xf) == 0) { bckSet(0xf, 2, 5.0f, 1.0f); } - field_0x6a5 += 1; + field_0x6a5 += (u8) 1; } else { if (checkBck("E_YM", 0xe) == 0) { bckSet(0xe, 2, 10.0f, 1.5f); @@ -1535,43 +1656,46 @@ void daE_YM_c::executeAttack() { current.angle.y = shape_angle.y; } -u8 daE_YM_c::checkAttackEnd() { +bool daE_YM_c::checkAttackEnd() { if (daPy_getPlayerActorClass()->checkClimbMove() == 0) { setActionMode(ACT_MOVE); speedF = 0.0f; return 1; + } + + cXyz my_vec_0 = mPrevPos - current.pos; + if (my_vec_0.abs() > l_HIO.mMoveRange + 50.0f) { + setActionMode(ACT_WAIT); + speedF = 0.0f; + return 1; } else { - cXyz my_vec_0 = mPrevPos - current.pos; - if (my_vec_0.abs() > l_HIO.mMoveRange + 50.0f) { - setActionMode(ACT_WAIT); - speedF = 0.0f; - return 1; - } else { - return 0; - } + return 0; } } -u8 daE_YM_c::setAttackMotion() { +bool daE_YM_c::setAttackMotion() { if (mType != 1) { - return 0; + return false; } + if (mSphCc.ChkAtHit()) { - fopAc_ac_c* hit_actor = dCc_GetAc(mSphCc.GetAtHitObj()->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_ALINK) { + cCcD_Obj* at_hit_obj = mSphCc.GetAtHitObj(); + if (fopAcM_GetName(dCc_GetAc(at_hit_obj->GetAc())) == PROC_ALINK) { if (mAction != ACT_ATTACK_WALL) { setActionMode(ACT_ATTACK_WALL); } else if (mMode == 4) { - return 0; + return false; } + speedF = 0.0f; mMode = 4; bckSet(5, 0, 3.0f, 1.0f); mSound.startCreatureSound(Z2SE_EN_YM_ATTACK, 0, -1); - return 1; + return true; } } - return 0; + + return false; } void daE_YM_c::executeAttackWall() { @@ -1580,7 +1704,7 @@ void daE_YM_c::executeAttackWall() { cXyz my_vec_0; cXyz my_vec_1; cXyz my_vec_2; - if (checkWolfBark() == 0 && checkWallCrash() == 0 && setAttackMotion() == 0) { + if (!checkWolfBark() && !checkWallCrash() && !setAttackMotion()) { switch (mMode) { case 0: checkWall(); @@ -1591,6 +1715,7 @@ void daE_YM_c::executeAttackWall() { } else { my_vec_0 = mPrevPos - current.pos; } + mDoMtx_stack_c::ZrotS(-field_0x668.z); mDoMtx_stack_c::XrotM(-field_0x668.x); mDoMtx_stack_c::multVec(&my_vec_0, &my_vec_1); @@ -1600,10 +1725,12 @@ void daE_YM_c::executeAttackWall() { speedF = 0.0f; return; } + bckSet(0xe, 2, 10.0f, 1.5f); speedF = 0.0f; mMode = 1; break; + case 1: if (checkAttackEnd()) { return; @@ -1614,6 +1741,7 @@ void daE_YM_c::executeAttackWall() { mMode = 2; } break; + case 2: if (checkAttackEnd()) { return; @@ -1627,9 +1755,10 @@ void daE_YM_c::executeAttackWall() { mSound.startCreatureSound(Z2SE_EN_YM_FIND, 0, -1); } break; + case 3: { setMoveSound(0); - bool do_stuff = false; + u8 do_stuff = false; if (field_0x6f0 == 0 || checkBeforeBg(field_0x6e4)) { do_stuff = true; } else { @@ -1642,6 +1771,7 @@ void daE_YM_c::executeAttackWall() { do_stuff = true; } } + if (do_stuff) { speedF = 0.0f; mMode = 4; @@ -1650,15 +1780,15 @@ void daE_YM_c::executeAttackWall() { } break; } + case 4: if (mpMorf->isStop()) { setActionMode(ACT_WAIT); return; } break; - default: - break; } + current.angle.y = shape_angle.y; } } @@ -1683,8 +1813,7 @@ void daE_YM_c::executeDefense() { } else { bckSet(7, 0, 3.0f, 1.0f); mMode = 2; - speed.y = 0.0f; - speedF = 0.0f; + speedF = speed.y = 0.0f; } break; case 1: @@ -1713,15 +1842,16 @@ void daE_YM_c::executeDefense() { } } -u8 daE_YM_c::checkFlyTerritory() { +bool daE_YM_c::checkFlyTerritory() { if (mPrevPos.absXZ(current.pos) > 300.0f) { - return 0; - } else { - if (fabsf(mPrevPos.y - current.pos.y) > 150.0f) { - return 0; - } - return 1; + return false; } + + if (std::abs(mPrevPos.y - current.pos.y) > 150.0f) { + return false; + } + + return true; } void daE_YM_c::initFly() { @@ -1744,12 +1874,14 @@ void daE_YM_c::executeFly() { cXyz my_vec_2 = current.pos - mPrevPos; cXyz my_vec_3 = player_pos - mPrevPos; mSound.startCreatureSoundLevel(Z2SE_EN_YM_FLY, 0, -1); + s16 tgt_ang_y; switch (mMode) { case 0: field_0x6f2 = 100; bckSetFly(0xd, 0, 0.0f, 1.0f); field_0x6a5 = 0; mMode = 1; + case 1: if (mType == 1) { setElecEffect1(); @@ -1772,6 +1904,7 @@ void daE_YM_c::executeFly() { } } break; + case 2: field_0x6f2 = 100; bckSetFly(0xe, 2, 5.0f, 1.0f); @@ -1779,6 +1912,7 @@ void daE_YM_c::executeFly() { field_0x6a5 = 0; mMode = 3; break; + case 3: { mAcch.SetGroundUpY(70.0f); if (field_0x6a5) { @@ -1791,29 +1925,30 @@ void daE_YM_c::executeFly() { field_0x67c.z += cM_rndFX(300.0f); } } else { - s16 tgt_ang_y; if (checkFlyTerritory()) { tgt_ang_y = cLib_targetAngleY(¤t.pos, &player_pos) + 0x8000; } else { tgt_ang_y = cLib_targetAngleY(¤t.pos, &mPrevPos); } + field_0x67c.x += cM_ssin(tgt_ang_y) * 300.0f; field_0x67c.z += cM_scos(tgt_ang_y) * 300.0f; } + field_0x67c.y = player_pos.y + cM_rndF(50.0f); - if (fabsf(field_0x67c.y - mPrevPos.y) > 300.0f) { + if (std::abs(field_0x67c.y - mPrevPos.y) > 300.0f) { field_0x67c.y = mPrevPos.y + cM_rndF(75.0f); } current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x67c); current.angle.x = cLib_targetAngleX(¤t.pos, &field_0x67c); - speedF = l_HIO.mFlyMoveSpeed * cM_scos(current.angle.x); - speed.y = l_HIO.mFlyMoveSpeed * cM_ssin(current.angle.x); + speedF = l_HIO.mFlyMoveSpeed * cM_scos(s16(current.angle.x)); + speed.y = l_HIO.mFlyMoveSpeed * cM_ssin(s16(current.angle.x)); field_0x6f0 = 0x14; mMode = 6; break; } } else { - field_0x6a5 += 1; + field_0x6a5 += (u8) 1; } if (my_vec_3.absXZ() >= 400.0f) { field_0x67c = mPrevPos; @@ -1836,36 +1971,38 @@ void daE_YM_c::executeFly() { current.angle.y = cLib_targetAngleY(¤t.pos, &mPrevPos); current.angle.x = cLib_targetAngleX(¤t.pos, &mPrevPos); if ((s16)(cLib_targetAngleY(¤t.pos, &player_pos) - current.angle.y) < 0) { - current.angle.y += 0x3000; + current.angle.y += (s16) 0x3000; } else { - current.angle.y -= 0x3000; + current.angle.y -= (s16) 0x3000; } } } + speed.y = l_HIO.mFlyMoveSpeed * cM_ssin(current.angle.x); field_0x6f0 = 0x14; mMode = 4; } + // fallthrough case 4: case 6: { - cLib_chaseF(&speedF, l_HIO.mFlyMoveSpeed * fabsf(cM_scos(current.angle.x)), 1.0f); + cLib_chaseF(&speedF, l_HIO.mFlyMoveSpeed * std::abs(cM_scos(current.angle.x)), 1.0f); if (mpMorf->isStop() && checkBck("E_TM", 0xd)) { bckSetFly(0xc, 2, 0.0f, 1.0f); } cLib_chaseAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, &player_pos), 0x400); s16 ang_diff = current.angle.y - shape_angle.y; - cLib_chaseAngleS(&shape_angle.z, cM_ssin(ang_diff) * -3072.0f * fabsf(cM_scos(current.angle.x)), 0x100); - if (fabsf(cM_scos(current.angle.x)) >= fabsf(cM_ssin(current.angle.x))) { - cLib_chaseAngleS(&shape_angle.x, cM_scos(ang_diff) * 5120.0f * fabsf(cM_scos(current.angle.x)), 0x400); + cLib_chaseAngleS(&shape_angle.z, cM_ssin(ang_diff) * -3072.0f * std::abs(cM_scos(current.angle.x)), 0x100); + if (std::abs(cM_scos(current.angle.x)) >= std::abs(cM_ssin(current.angle.x))) { + cLib_chaseAngleS(&shape_angle.x, cM_scos(ang_diff) * 5120.0f * std::abs(cM_scos(current.angle.x)), 0x400); } else { - cLib_chaseAngleS(&shape_angle.x, fabsf(cM_ssin(current.angle.x)) * 5120.0f, 0x400); + cLib_chaseAngleS(&shape_angle.x, std::abs(cM_ssin(current.angle.x)) * 5120.0f, 0x400); } int do_stuff = false; if (mMode == 4) { if (field_0x6f0 == 0) { do_stuff = true; } - } else if (fabsf(field_0x67c.y - current.pos.y) < 100.0f || mAcch.ChkGroundHit()) { + } else if (std::abs(field_0x67c.y - current.pos.y) < 100.0f || mAcch.ChkGroundHit()) { do_stuff = true; speed.y = 0.0f; } @@ -1876,6 +2013,7 @@ void daE_YM_c::executeFly() { } break; } + case 7: { if (mpMorf->isStop() && checkBck("E_TM", 0xd)) { bckSetFly(0xc, 2, 0.0f, 1.0f); @@ -1887,12 +2025,12 @@ void daE_YM_c::executeFly() { if (field_0x6f0 == 0) { mMode = 5; field_0x6f0 = 0x1e; - speed.y = 0.0f; - speedF = 0.0f; + speedF = speed.y = 0.0f; bckSetFly(0xe, 2, 5.0f, 1.0f); } break; } + case 5: { cLib_chaseAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, &player_pos), 0x800); cLib_chaseAngleS(&shape_angle.x, 0, 0x400); @@ -1901,27 +2039,30 @@ void daE_YM_c::executeFly() { cLib_chaseF(&speed.y, 0.0f, 3.0f); if (field_0x6f0 == 0 || my_vec_1.absXZ() < 50.0f || (daPy_getPlayerActorClass()->checkWolfBark() && my_vec_1.absXZ() < 100.0f)) { - speed.y = 0.0f; - speedF = 0.0f; + speedF = speed.y = 0.0f; mMode = 3; return; } + if (field_0x6f2 == 0 && my_vec_1.absXZ() < 500.0f - && my_vec_3.absXZ() < l_HIO.mMoveRange + 150.0f && fabsf(my_vec_2.y) < 150.0f) { - speed.y = 0.0f; - speedF = 0.0f; + && my_vec_3.absXZ() < l_HIO.mMoveRange + 150.0f && std::abs(my_vec_2.y) < 150.0f) { + speedF = speed.y = 0.0f; setActionMode(ACT_FLY_ATTACK); return; } + break; } + case 10: { + int _; // to force b in dbg asm if (field_0x70e) { setElecEffect2(); mSound.startCreatureSoundLevel(Z2SE_EN_YM_ELECTRIC_LOOP, 0, -1); field_0x700 = l_HIO.mElectricInvincibilityTimeExtension; mSphCc.OnAtSetBit(); } + if (field_0x70e) { if (mpMorf->isStop() && checkBck("E_TM", 0xd)) { bckSetFly(0xc, 2, 0.0f, 1.0f); @@ -1934,26 +2075,32 @@ void daE_YM_c::executeFly() { } else { cLib_chaseF(&speed.y, 0.0f, 1.0f); } - cLib_chaseF(&speedF, 30.0f - fabsf(speed.y), 1.0f); + + cLib_chaseF(&speedF, 30.0f - std::abs(speed.y), 1.0f); } else { - s16 tgt_ang = cLib_targetAngleY(¤t.pos, &mPrevPos); - if ((s16)(cLib_targetAngleY(¤t.pos, &player_pos) - tgt_ang) < 0) { - tgt_ang += 0x3000; + tgt_ang_y = cLib_targetAngleY(¤t.pos, &mPrevPos); + if (s16(cLib_targetAngleY(¤t.pos, &player_pos) - tgt_ang_y) < 0) { + tgt_ang_y += (s16) 0x3000; } else { - tgt_ang -= 0x3000; + tgt_ang_y -= (s16) 0x3000; } - cLib_chaseAngleS(¤t.angle.y, tgt_ang, 0x400); + + cLib_chaseAngleS(¤t.angle.y, tgt_ang_y, 0x400); current.angle.x = cLib_targetAngleX(¤t.pos, &mPrevPos); speed.y = l_HIO.mFlyMoveSpeed * cM_ssin(current.angle.x); cLib_chaseF(&speedF, l_HIO.mFlyMoveSpeed * cM_scos(current.angle.x), 1.0f); } + cLib_chaseAngleS(&shape_angle.y, current.angle.y, 0x400); if (field_0x6f0 == 0) { mMode = 3; } + + break; } } - field_0x6e4 += 0x800; + + field_0x6e4 += (s16) 0x800; current.pos.y += cM_ssin(field_0x6e4) * 3.0f; } @@ -1972,13 +2119,16 @@ void daE_YM_c::executeFlyAttack() { cXyz my_vec_0; mSound.startCreatureSoundLevel(Z2SE_EN_YM_FLY, 0, -1); switch (mMode) { - case 0: + case 0: { field_0x6e4 = 0; bckSetFly(5, 0, 0.0f, 1.0f); mMode = 1; - field_0x67c = dComIfGp_getPlayer(0)->current.pos; + fopAc_ac_c* ply = dComIfGp_getPlayer(0); + field_0x67c = ply->current.pos; field_0x67c.y += 50.0f; break; + } + case 1: setElecEffect1(); mSound.startCreatureSoundLevel(Z2SE_EN_YM_ELECTRIC, 0, -1); @@ -1990,6 +2140,7 @@ void daE_YM_c::executeFlyAttack() { field_0x6f0 = 300; } break; + case 2: { setElecEffect2(); mSound.startCreatureSoundLevel(Z2SE_EN_YM_ELECTRIC_LOOP, 0, -1); @@ -1999,15 +2150,14 @@ void daE_YM_c::executeFlyAttack() { my_vec_0 = field_0x67c - current.pos; cLib_chaseAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, &field_0x67c), 0x800); current.angle.y = shape_angle.y; - int tan_val = cM_atan2s(my_vec_0.absXZ(), my_vec_0.y); + s16 tan_val = (s16) cM_atan2s(my_vec_0.absXZ(), my_vec_0.y); cLib_chaseF(&speed.y, l_HIO.mFlyAttackSpeed * cM_scos(tan_val), 5.0f); cLib_chaseF(&speedF, l_HIO.mFlyAttackSpeed * cM_ssin(tan_val), 3.0f); if (mSphCc.ChkAtHit()) { fopAc_ac_c* hit_actor = dCc_GetAc(mSphCc.GetAtHitObj()->GetAc()); if (fopAcM_GetName(hit_actor) == PROC_ALINK) { bckSetFly(7, 0, 0.0f, 1.0f); - speed.y = 0.0f; - speedF = 0.0f; + speedF = speed.y = 0.0f; mMode = 4; current.angle.y = cLib_targetAngleY(¤t.pos, &mPrevPos); shape_angle.x = 0; @@ -2023,9 +2173,10 @@ void daE_YM_c::executeFlyAttack() { setInclination(); break; } + case 4: case 5: { - field_0x6e4 += 0x800; + field_0x6e4 += (s16) 0x800; current.pos.y += cM_ssin(field_0x6e4) * 3.0f; cLib_chaseF(&speed.y, 0.0f, 3.0f); cLib_chaseF(&speedF, 0.0f, 3.0f); @@ -2040,13 +2191,13 @@ void daE_YM_c::executeFlyAttack() { if (do_stuff) { mMode = 3; bckSetFly(0xe, 2, 5.0f, 1.0f); - speedF = 0.0f; - speed.y = 0.0f; + speed.y = speedF = 0.0f; field_0x6f0 = cM_rndF(10.0f) + 30.0f; } setInclination(); break; } + case 3: { s16 mang = mAngleToPlayer; cLib_addCalcAngleS(¤t.angle.y, mang + 0x8000, 4, 0x1000, 0x100); @@ -2068,8 +2219,6 @@ void daE_YM_c::executeFlyAttack() { setInclination(); break; } - default: - break; } } @@ -2085,61 +2234,68 @@ void daE_YM_c::setNextPathPoint() { bckSet(0x10, 2, 5.0f, 1.0f); } -u8 daE_YM_c::checkRailDig() { +bool daE_YM_c::checkRailDig() { daPy_py_c* player = daPy_getPlayerActorClass(); cXyz my_vec_0; if (player->checkWolfDig()) { my_vec_0 = player->getLeftHandPos() - current.pos; if (my_vec_0.abs() < 200.0f) { - field_0x714 &= ~0x80; + field_0x714 &= ~fopAc_AttnFlag_ETC_e; field_0x6f0 = 0x14; mMode = 3; mAcchCir.SetWall(40.0f, 60.0f); fopAcM_OnStatus(this, 0x4000); - return 1; + return true; } } - return 0; + + return false; } void daE_YM_c::executeRail() { daPy_py_c* player = daPy_getPlayerActorClass();; cXyz my_vec_0; switch (mMode) { - case 0: + case 0: { mIsHide = 1; field_0x6a6 = 4; field_0x714 |= 4; field_0x6dc = -70.0f; - old.pos = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position; - current.pos = old.pos; - field_0x6f0 = 0x3c; - field_0x714 |= 0x80; + dPnt* point_p = dPath_GetPnt(mpPath, mCurrentPntNo); + current.pos = old.pos = point_p->m_position; + field_0x6f0 = 60; + field_0x714 |= fopAc_AttnFlag_ETC_e; mSphCc.SetCoSPrm(0x145); mSphCc.SetTgType(0x10000); setNextPathPoint(); - case 1: - if (checkRailDig() == 0) { + } + // fallthrough + case 1: { + if (!checkRailDig()) { mSound.startCreatureSoundLevel(Z2SE_EN_YM_WAIT, 0, -1); if (player->checkWolfDig() == 0 && field_0x6f0 == 0) { setNextPathPoint(); } } break; - case 2: - if (checkRailDig() == 0) { + } + + case 2: { + if (!checkRailDig()) { speedF = 9.0f; setMoveSound(1); my_vec_0 = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position; if (cLib_chasePos(¤t.pos, my_vec_0, speedF) || current.pos.absXZ(my_vec_0) < 10.0f) { mMode = 1; - field_0x6f0 = 0x3c; + field_0x6f0 = 60; bckSet(0xf, 2, 5.0f, 1.0f); } speedF = 0.0f; } break; - case 3: + } + + case 3: { if (field_0x6f0 == 0) { setAppear(); mPrevPos = current.pos; @@ -2151,17 +2307,16 @@ void daE_YM_c::executeRail() { } } break; - default: - break; + } } } -static f32 YM_DIG_POS_Y[] = {-15.0f, -30.0f, -70.0f}; - void daE_YM_c::executeBackRail() { + static f32 YM_DIG_POS_Y[] = {-15.0f, -30.0f, -70.0f}; + cXyz my_vec_0 = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position; switch (mMode) { - case 0: + case 0: { if (current.pos.abs(my_vec_0) < 150.0f) { if ((s16)cLib_distanceAngleS(shape_angle.y, cLib_targetAngleY(¤t.pos, &my_vec_0)) >= 0x2000) { ++mCurrentPntNo; @@ -2171,13 +2326,16 @@ void daE_YM_c::executeBackRail() { my_vec_0 = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position; } } + bckSet(8, 2, 5.0f, 1.0f); mIsHide = 1; field_0x6a5 = 0; field_0x6f0 = 7; mMode = 1; mAcchCir.SetWall(40.0f, 60.0f); - case 1: + } + // fallthrough + case 1: { setDigEffect(); mSound.startCreatureSoundLevel(Z2SE_EN_YM_DIG, 0, -1); cLib_chaseF(&field_0x6dc, YM_DIG_POS_Y[field_0x6a5], 3.0f); @@ -2189,8 +2347,11 @@ void daE_YM_c::executeBackRail() { mMode = 2; speedF = 0.0f; } + break; - case 2: + } + + case 2: { setDigEffect(); mSound.startCreatureSoundLevel(Z2SE_EN_YM_DIG, 0, -1); if (field_0x6f0 == 0) { @@ -2214,8 +2375,11 @@ void daE_YM_c::executeBackRail() { mMode = 1; } } + break; - case 3: + } + + case 3: { cLib_chaseF(&field_0x6dc, -70.0f, 2.0f); setMoveSound(1); if (current.pos.absXZ(my_vec_0) < 100.0f) { @@ -2223,39 +2387,45 @@ void daE_YM_c::executeBackRail() { } else { cLib_addCalcAngleS(&shape_angle.y, cLib_targetAngleY(¤t.pos, &my_vec_0), 8, 0x2000, 0x100); } + current.angle.y = shape_angle.y; cLib_chaseF(&speedF, 20.0f, 1.0f); if (mAcch.ChkWallHit()) { - field_0x6a5 += 2; - if (field_0x6a5 >= 0x14 && checkBeforeGround()) { + field_0x6a5 += (u8) 2; + if (field_0x6a5 >= 20 && checkBeforeGround()) { field_0x6a5 = 0; } } else if (field_0x6a5) { --field_0x6a5; } + if (current.pos.absXZ(my_vec_0) < 30.0f && field_0x6dc == -70.0f) { speedF = 0.0f; mMode = 4; field_0x6f0 = 100; bckSet(0xf, 2, 5.0f, 1.0f); } + break; - case 4: + } + + case 4: { + // following needed for both (a) dbg stack reg to use r31, and (b) force b instruction in asm: + int _; if (field_0x6f0 == 0) { field_0x714 |= 4; setActionMode(ACT_RAIL); } + break; - default: - break; + } } } void daE_YM_c::checkElectricStart() { if (field_0x6a1 == 1) { if (mAction != ACT_WAIT && mAction != ACT_SURPRISE) { - field_0x6c9 = 0; - field_0x708 = 0; + field_0x708 = field_0x6c9 = 0; } else if (field_0x708 != 0) { field_0x708--; @@ -2264,20 +2434,21 @@ void daE_YM_c::checkElectricStart() { } } } else { - field_0x6c9 = 0; - field_0x708 = 0; + field_0x708 = field_0x6c9 = 0; } } void daE_YM_c::executeElectric() { switch (mMode) { - case 0: + case 0: { field_0x6c9 = 0; bckSet(9, 0, 3.0f, 1.0f); speedF = 0.0f; mMode = 1; break; - case 1: + } + + case 1: { if (mpMorf->getFrame() < 36.0f) { setElecEffect1(); mSound.startCreatureSoundLevel(Z2SE_EN_YM_ELECTRIC, 0, -1); @@ -2285,11 +2456,15 @@ void daE_YM_c::executeElectric() { setElecEffect2(); mSound.startCreatureSoundLevel(Z2SE_EN_YM_ELECTRIC_LOOP, 0, -1); } + if (mpMorf->checkFrame(40.0f)) { mMode = 2; } + break; - case 2: + } + + case 2: { setElecEffect2(); mSound.startCreatureSoundLevel(Z2SE_EN_YM_ELECTRIC_LOOP, 0, -1); field_0x700 = l_HIO.mElectricInvincibilityTimeExtension; @@ -2299,13 +2474,18 @@ void daE_YM_c::executeElectric() { field_0x6f0 = 0x1e; bckSet(0xf, 2, 5.0f, 1.0f); } + break; - case 3: + } + + case 3: { if (field_0x6f0 == 0) { setActionMode(ACT_WAIT); + return; } - default: + break; + } } } @@ -2339,8 +2519,7 @@ void daE_YM_c::executeSwitch() { dPnt* pnt = dPath_GetPnt(mpPath, mCurrentPntNo); mCurrentPntNo = 0; ++mCurrentPntNo; - old.pos = pnt->m_position; - current.pos = old.pos; + current.pos = old.pos = pnt->m_position; mMode = 2; } if (field_0x6cb) { @@ -2358,12 +2537,12 @@ void daE_YM_c::executeSwitch() { cLib_chaseF(&field_0x6dc, 0.0f, 15.0f); setMoveSound(0); if (mAcch.ChkWallHit()) { - field_0x6e4 += 0x800; + field_0x6e4 += (s16) 0x800; } if (field_0x6e8 >= 0) { - field_0x6e6 -= 200; + field_0x6e6 -= (s16) 200; } else { - field_0x6e6 += 200; + field_0x6e6 += (s16) 200; } field_0x6e8 += field_0x6e6; cLib_addCalcAngleS(&shape_angle.y, field_0x6e4 + field_0x6e8, 4, 0x1000, 0x100); @@ -2406,8 +2585,7 @@ void daE_YM_c::executeSwitch() { case 10: setAppear(); setNormalCc(); - old.pos = dPath_GetPnt(mpPath, mpPath->m_num-1)->m_position; - current.pos = old.pos; + current.pos = old.pos = dPath_GetPnt(mpPath, mpPath->m_num-1)->m_position; mPrevPos = current.pos; field_0x6dc = 0.0f; speedF = 0.0f; @@ -2424,8 +2602,8 @@ void daE_YM_c::initFireFly(int param_0) { field_0x6e6 = cM_rndFX(512.0f); if (param_0 && mAcch.ChkWallHit()) { s16 wall_ang = mAcchCir.GetWallAngleY(); - s16 res = (wall_ang << 1) - (current.angle.y + 0x8000); - current.angle.y = res + cM_rndFX(4096.0); + wall_ang = (wall_ang * 2) - (current.angle.y + 0x8000); + current.angle.y = wall_ang + cM_rndFX(4096.0); speed.y += cM_rndFX(15.0f); field_0x70e = cM_rndFX(5.0f) + 10.0f; } @@ -2503,8 +2681,8 @@ void daE_YM_c::executeFire() { mSphCc.OnAtSetBit(); current.angle.y = cLib_targetAngleY(¤t.pos, &field_0x67c); current.angle.x = cLib_targetAngleX(¤t.pos, &field_0x67c); - speedF = cM_scos(current.angle.x) * 40.0f; - speed.y = cM_ssin(current.angle.x) * 40.0f; + speedF = cM_scos(s16(current.angle.x)) * 40.0f; + speed.y = cM_ssin(s16(current.angle.x)) * 40.0f; if (field_0x67c.abs(current.pos) < 200.0f && mAcch.ChkWallHit()) { mMode = 3; initFireFly(1); @@ -2552,7 +2730,7 @@ void daE_YM_c::executeFire() { speed.y = 15.0f; } } - speedF = 40.0f - fabsf(speed.y); + speedF = 40.0f - std::abs(speed.y); current.angle.y += field_0x6e6; if (mAcch.ChkWallHit()) { initFireFly(1); @@ -2564,7 +2742,7 @@ void daE_YM_c::executeFire() { default: break; } - field_0x6e4 += 0x2000; + field_0x6e4 += (s16) 0x2000; current.pos.y += cM_ssin(field_0x6e4) * 3.0f; if (mMode) { mSound.startCreatureSoundLevel(Z2SE_EN_YM_FLY, 0, -1); @@ -2572,8 +2750,7 @@ void daE_YM_c::executeFire() { } void daE_YM_c::setRiverAttention() { - daPy_py_c* player = daPy_getPlayerActorClass(); - cXyz player_pos = player->current.pos; + cXyz player_pos = daPy_getPlayerActorClass()->current.pos; attention_info.distances[2] = 60; field_0x714 = 0; if (current.pos.abs(mpKago->current.pos) > 2000.0f) { @@ -2596,18 +2773,17 @@ void daE_YM_c::setLockByCargo() { } void daE_YM_c::executeRiver() { - daPy_py_c* player = daPy_getPlayerActorClass(); - cXyz player_pos = player->current.pos; + cXyz player_pos = daPy_getPlayerActorClass()->current.pos; cXyz pnt_pos = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position; cXyz my_vec_0; + f32 next_path; switch (mMode) { - case 0: + case 0: { field_0x714 = 0; field_0x6d4 = 0.0f; field_0x6dc = 0.0f; gravity = 0.0f; - speedF = 0.0f; - speed.y = 0.0f; + speed.y = speedF = 0.0f; field_0x6ec = 0.0f; field_0x6f2 = 0; if (mpKago == NULL) { @@ -2637,13 +2813,10 @@ void daE_YM_c::executeRiver() { field_0x6cc = 1; mCurrentPntNo = 0; pnt_pos = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position; - old.pos = pnt_pos; - current.pos = old.pos; + current.pos = old.pos = pnt_pos; ++mCurrentPntNo; pnt_pos = dPath_GetPnt(mpPath, mCurrentPntNo)->m_position; - s16 tgt_ang = cLib_targetAngleY(¤t.pos, &pnt_pos); - current.angle.y = tgt_ang; - shape_angle.y = tgt_ang; + shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &pnt_pos); setAppear(); setNormalCc(); field_0x6f0 = 0; @@ -2651,44 +2824,42 @@ void daE_YM_c::executeRiver() { } } break; - case 1: + } + + case 1: { setElecEffect1(); mSound.startCreatureSoundLevel(Z2SE_EN_YM_FLY, 0, -1); if (mpKago->isFlying()) { - if (field_0x6a3 != 0xff) { + if (field_0x6a3 != 0xFF) { if (dComIfGs_isSwitch(field_0x6a3, fopAcM_GetRoomNo(this))) { - speedF = 0.0f; - speed.y = 0.0f; + speed.y = speedF = 0.0f; mMode = 2; bckSetFly(0xb, 2, 5.0f, 1.0f); } } else { - f32 next_path = mpKago->checkNextPath(current.pos); + next_path = mpKago->checkNextPath(current.pos); if (next_path < 2000.0f) { - speedF = 0.0f; - speed.y = 0.0f; + speed.y = speedF = 0.0f; mMode = 2; bckSetFly(0xb, 2, 5.0f, 1.0f); } } } + break; + } + case 2: { setRiverAttention(); - field_0x6e8 += 0x200; + field_0x6e8 += (s16) 0x200; current.pos.y += cM_ssin(field_0x6e8 << 1) * 15.0f; f32 my_float_val = cM_scos(field_0x6e8) * 15.0f; current.pos.x += my_float_val * cM_ssin(shape_angle.y); current.pos.z += my_float_val * cM_scos(shape_angle.y); - s16 tgt_ang = cLib_targetAngleY(¤t.pos, &pnt_pos); - current.angle.y = tgt_ang; - shape_angle.y = tgt_ang; - tgt_ang = cLib_targetAngleX(¤t.pos, &pnt_pos); - current.angle.x = tgt_ang; - shape_angle.x = tgt_ang; - // The following is necessary for matching, but unused?! - abs(mAngleToPlayer - shape_angle.y); - f32 next_path = mpKago->checkNextPath(current.pos); + shape_angle.y = current.angle.y = cLib_targetAngleY(¤t.pos, &pnt_pos); + shape_angle.x = current.angle.x = cLib_targetAngleX(¤t.pos, &pnt_pos); + s16 ang_diff = abs(mAngleToPlayer - shape_angle.y); // unused + next_path = mpKago->checkNextPath(current.pos); if (mpKago->isFlying()) { if (field_0x6f2) { field_0x714 = 4; @@ -2708,11 +2879,11 @@ void daE_YM_c::executeRiver() { } else { if (next_path < 4000.0f) { if (next_path < 1500.0f) { - f32 abs_val = mpKago->speed.abs(); - abs_val -= 10.0f; + f32 abs_val = mpKago->speed.abs() - 10.0f; if (abs_val < 30.0f) { abs_val = 30.0f; } + cLib_chaseF(&field_0x6ec, abs_val, 1.0f); } else { cLib_chaseF(&field_0x6ec, 30.0f, 1.0f); @@ -2726,46 +2897,53 @@ void daE_YM_c::executeRiver() { cLib_chaseF(&field_0x6ec, 0.0f, 1.0f); field_0x6d4 = 0.0f; } + speed.y = field_0x6ec * cM_ssin(current.angle.x); speedF = field_0x6ec * cM_scos(current.angle.x); - if (pnt_pos.abs(current.pos) < 500.0f && ((++mCurrentPntNo), mCurrentPntNo >= mpPath->m_num)) { - speedF = 0.0f; - mPrevPos = pnt_pos; - field_0x6dc = 0.0f; - mAcchCir.SetWall(40.0f, 60.0f); - current.angle.x = 0; - shape_angle.x = 0; - setActionMode(ACT_WAIT); - } else { - if (current.pos.abs(mpKago->current.pos) > 2000.0f) { - field_0x68c = 2.4f; - setElecEffect2(); - field_0x68c = 1.5f; + if (pnt_pos.abs(current.pos) < 500.0f) { + ++mCurrentPntNo; + if (mCurrentPntNo >= mpPath->m_num) { + speedF = 0.0f; + mPrevPos = pnt_pos; + field_0x6dc = 0.0f; + mAcchCir.SetWall(40.0f, 60.0f); + shape_angle.x = current.angle.x = 0; + setActionMode(ACT_WAIT); + break; } - mSound.startCreatureSoundLevel(Z2SE_EN_YM_FLY, 0, -1); - if (mSphCc.ChkTgHit()) { - cCcD_Obj * tg_hit_obj = mSphCc.GetTgHitObj(); - fopAc_ac_c* hit_actor = dCc_GetAc(tg_hit_obj->GetAc()); - if (fopAcM_GetName(hit_actor) == PROC_KAGO) { - if (mpKago == tg_hit_obj->GetAc()) { - if (mpKago->getLockActor() == this) { - mpKago->setLockActor(NULL); - } - setAppear(); - speedF = 0.0f; - speed.y = 0.0f; - field_0x714 = 0; - bckSet(0x10, 2, 5.0f, 1.0f); - mpKago->setEatYm(); - mMode = 3; - field_0x6ce = 1; + } + + if (current.pos.abs(mpKago->current.pos) > 2000.0f) { + field_0x68c = 2.4f; + setElecEffect2(); + field_0x68c = 1.5f; + } + + mSound.startCreatureSoundLevel(Z2SE_EN_YM_FLY, 0, -1); + if (mSphCc.ChkTgHit()) { + cCcD_Obj * tg_hit_obj = mSphCc.GetTgHitObj(); + if (fopAcM_GetName(dCc_GetAc(tg_hit_obj->GetAc())) == PROC_KAGO) { + if (mpKago == tg_hit_obj->GetAc()) { + if (mpKago->getLockActor() == this) { + mpKago->setLockActor(NULL); } + + setAppear(); + speed.y = speedF = 0.0f; + field_0x714 = 0; + bckSet(0x10, 2, 5.0f, 1.0f); + mpKago->setEatYm(); + mMode = 3; + field_0x6ce = 1; } } } + break; } - case 3: + + case 3: { + int _; // force extra b instruction in dbg asm setElecEffect1(); if (mpKago != NULL) { mDoMtx_stack_c::copy(mpKago->getMouthMtx()); @@ -2776,32 +2954,31 @@ void daE_YM_c::executeRiver() { if (mSwitchBit != 0xff && dComIfGs_isSwitch(mSwitchBit, fopAcM_GetRoomNo(this)) == 0) { dComIfGs_onSwitch(mSwitchBit, fopAcM_GetRoomNo(this)); } + dComIfGp_setHitMark(3, this, ¤t.pos, NULL, NULL, 0); fopAcM_delete(this); fopAcM_createDisappear(this, ¤t.pos, 0x14, 1, 0xff); } } + break; - default: - break; + } } } -static void* s_ym_sub(void* param_0, void* param_1) { - daE_YM_c* actor_a = (daE_YM_c*)param_0; - daE_YM_c* actor_b = (daE_YM_c*)param_1; - - if (fopAcM_IsActor(actor_a) && fopAcM_GetName(actor_a) == PROC_E_YM) { - if (!fpcM_IsCreating(fopAcM_GetID(actor_a)) && actor_a != actor_b && - actor_a->current.pos == actor_b->current.pos) +static void* s_ym_sub(void* main_p, void* other_p) { + if (fopAcM_IsActor(main_p) && fopAcM_GetName(main_p) == PROC_E_YM) { + if (!fpcM_IsCreating(fopAcM_GetID(main_p)) && main_p != other_p && + ((daE_YM_c*)main_p)->current.pos == ((daE_YM_c*)other_p)->current.pos) { - if (actor_b->getFriendFlag() & 1) { - actor_a->setFriendFlag(0x84); + u8 friend_flag = ((daE_YM_c*)other_p)->getFriendFlag(); + if (friend_flag & 1) { + ((daE_YM_c*)main_p)->setFriendFlag(0x84); } else { - actor_a->setFriendFlag(0x82); + ((daE_YM_c*)main_p)->setFriendFlag(0x82); } - actor_b->setFriendFlag(0x81); + ((daE_YM_c*)other_p)->setFriendFlag(0x81); } } @@ -2816,9 +2993,12 @@ void daE_YM_c::checkFrinedSamePos() { } void daE_YM_c::action() { + int reg_r27 = 0; // set but not used if (daPy_getPlayerActorClass()->getCutType() == 0x36) { + reg_r27 = 1; field_0x700 = 0; } + mDistToPlayer = fopAcM_searchPlayerDistance(this); mAngleToPlayer = fopAcM_searchPlayerAngleY(this); cXyz my_vec_0; @@ -2827,19 +3007,23 @@ void daE_YM_c::action() { if (field_0x6fe) { mSphCc.OffTgSetBit(); } + if (!field_0x6d4) { mSphCc.OffTgSetBit(); } - mSphCc.SetTgSpl(0); + + mSphCc.SetTgSpl(dCcG_Tg_Spl_UNK_0); mSphCc.SetAtMtrl(0); if (field_0x700) { mSphCc.SetAtMtrl(7); } + if (mType == 1) { mSphCc.OnAtSetBit(); } else { mSphCc.OffAtSetBit(); } + damage_check(); checkSurpriseLock(); field_0x6cf = 1; @@ -2906,23 +3090,26 @@ void daE_YM_c::action() { case ACT_RIVER: executeRiver(); break; - default: - break; } + mSound.setLinkSearch(do_stuff); if (field_0x6cf) { mSound.startCreatureSoundLevel(Z2SE_EN_YM_NEAR, 0, -1); } + if (mType != 1) { + f32 reg_f31 = speedF; // set but not used if (mAcch.ChkGroundHit()) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(mAcch.m_gnd, &plane); cXyz* p_vec = plane.GetNP(); cLib_addCalcAngleS(&field_0x668.x, (s16)cM_atan2s(p_vec->z, p_vec->y), 8, 0x800, 0x100); cLib_addCalcAngleS(&field_0x668.y, (s16)cM_atan2s(p_vec->x, p_vec->y), 8, 0x800, 0x100); + reg_f31 *= p_vec->y; } else { field_0x668.set(0, 0, 0); } + fopAcM_posMoveF(this, mStts.GetCCMoveP()); if (field_0x71c == 0) { mAcch.CrrPos(dComIfG_Bgsp()); @@ -2936,11 +3123,13 @@ void daE_YM_c::action() { speed = my_vec_1; current.pos += speed; } + if (!field_0x6d4) { attention_info.flags = 0; if (daPy_getPlayerActorClass()->checkWolfLock(this)) { daPy_getPlayerActorClass()->cancelWolfLock(this); } + onWolfNoLock(); } else { attention_info.flags = field_0x714; @@ -2953,6 +3142,7 @@ void daE_YM_c::action() { } } } + cXyz unused_vec(field_0x68c, field_0x68c, field_0x68c); cXyz my_pos = current.pos; setMidnaBindEffect(this, &mSound, &my_pos, &scale); @@ -2966,7 +3156,8 @@ void daE_YM_c::mtx_set() { mDoMtx_stack_c::ZXYrotM(shape_angle); mDoMtx_stack_c::scaleM(field_0x68c, field_0x68c, field_0x68c); - mpMorf->getModel()->setBaseTRMtx(mDoMtx_stack_c::get()); + J3DModel* model_p = mpMorf->getModel(); + model_p->setBaseTRMtx(mDoMtx_stack_c::get()); mpMorf->modelCalc(); } @@ -2978,6 +3169,7 @@ void daE_YM_c::cc_set() { if (mIsHide) { my_vec_2.y = 40.0f; } + if (field_0x718 == 0) { if (mType != 1) { MTXCopy(model->getAnmMtx(0), mDoMtx_stack_c::get()); @@ -3002,12 +3194,14 @@ void daE_YM_c::cc_set() { attention_info.position = eyePos; attention_info.position.y += 70.0f; } + MTXCopy(model->getAnmMtx(0), mDoMtx_stack_c::get()); if (mType != 1) { my_vec_0.set(10.0f, -20.0f, 0.0f); } else { my_vec_0.set(10.0f, 40.0f, 0.0f); } + mDoMtx_stack_c::multVec(&my_vec_0, &my_vec_1); mSphCc.SetC(my_vec_1 + my_vec_2); if (mAction == ACT_RIVER) { @@ -3017,10 +3211,17 @@ void daE_YM_c::cc_set() { } else { mSphCc.SetR(30.0f); } + dComIfG_Ccsp()->Set(&mSphCc); } int daE_YM_c::execute() { +#if DEBUG + if (DEFAULT_E_YM_MODEL_SIZE != l_HIO.mModelSize) { + field_0x68c = l_HIO.mModelSize; + } +#endif + if (field_0x71d) { return 1; } @@ -3088,7 +3289,7 @@ static int daE_YM_Execute(daE_YM_c* i_this) { return i_this->execute(); } -static int daE_YM_IsDelete(daE_YM_c* i_this) { +static int daE_YM_IsDelete(daE_YM_c*) { return 1; } @@ -3101,6 +3302,7 @@ int daE_YM_c::_delete() { if (field_0xaf4) { lbl_253_bss_8 = 0; + mDoHIO_DELETE_CHILD(l_HIO.field_0x4); } if (heap != NULL) { @@ -3111,6 +3313,7 @@ int daE_YM_c::_delete() { } static int daE_YM_Delete(daE_YM_c* i_this) { + fopAcM_RegisterDeleteID(i_this, "E_YM"); return i_this->_delete(); } @@ -3123,10 +3326,12 @@ int daE_YM_c::CreateHeap() { if (mpMorf == NULL || mpMorf->getModel() == NULL) { return 0; } + mpBrk = new mDoExt_brkAnm(); if (mpBrk == NULL) { return 0; } + if (!mpBrk->init(mpMorf->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("E_TM", 0x14), TRUE, 2, 1.0f, 0, -1)) { @@ -3140,38 +3345,44 @@ int daE_YM_c::CreateHeap() { if (mpMorf == NULL || mpMorf->getModel() == NULL) { return 0; } + mpBrk = new mDoExt_brkAnm(); if (mpBrk == NULL) { return 0; } + if (!mpBrk->init(mpMorf->getModel()->getModelData(), (J3DAnmTevRegKey*)dComIfG_getObjectRes("E_YM", 0x16), TRUE, 2, 1.0f, 0, -1)) { return 0; } } + if (mType == 6) { field_0x6d0 = new cXyz[45]; } + return 1; } static int useHeapInit(fopAc_ac_c* i_this) { - return static_cast(i_this)->CreateHeap(); + daE_YM_c* a_this = static_cast(i_this); + return a_this->CreateHeap(); } -u8 daE_YM_c::checkBeforeBg(s16 i_rot_val) { +bool daE_YM_c::checkBeforeBg(s16 i_rot_val) { dBgS_LinChk lin_chk; cXyz my_vec_0; cXyz my_vec_1; cXyz my_vec_2; cXyz my_vec_3; if (!speedF) { - return 0; + return false; } + if (mType != 1) { if (mAcch.ChkWallHit()) { - return 1; + return true; } } else { mDoMtx_stack_c::XrotS(field_0x668.x); @@ -3189,18 +3400,21 @@ u8 daE_YM_c::checkBeforeBg(s16 i_rot_val) { my_vec_2 = my_vec_3 + my_vec_0; lin_chk.Set(&my_vec_3, &my_vec_2, NULL); if (dComIfG_Bgsp().LineCross(&lin_chk)) { - return 1; + return true; } + if (my_vec_1.y > 0.0f) { my_vec_0.set(0.0f, 60.0f, 0.0f); } else { my_vec_0.set(0.0f, -200.0f, 0.0f); } + my_vec_2 = my_vec_3 + my_vec_0; lin_chk.Set(&my_vec_3, &my_vec_2, NULL); if (dComIfG_Bgsp().LineCross(&lin_chk)) { - return 1; + return true; } + mDoMtx_stack_c::XrotS(field_0x668.x); mDoMtx_stack_c::ZrotM(field_0x668.z); mDoMtx_stack_c::YrotM(i_rot_val); @@ -3211,22 +3425,24 @@ u8 daE_YM_c::checkBeforeBg(s16 i_rot_val) { cLib_offsetPos(&my_vec_2, &my_vec_3, (s16)field_0x668.z, &inside_vec); lin_chk.Set(&my_vec_3, &my_vec_2, NULL); if (dComIfG_Bgsp().LineCross(&lin_chk) == 0) { - return 1; + return true; } + cM3dGPla plane; dComIfG_Bgsp().GetTriPla(lin_chk, &plane); cXyz* p_vec = plane.GetNP(); s16 tan_val = cM_atan2s(p_vec->absXZ(), p_vec->y) + -0x8000; if (abs(tan_val + 0x4000) <= 0x1555) { if (field_0x668.z != (s16)(cM_atan2s(p_vec->x, p_vec->z) + 0x8000)) { - return 1; + return true; } } } - return 0; + + return false; } -u8 daE_YM_c::checkBeforeGround() { +bool daE_YM_c::checkBeforeGround() { cXyz my_vec_0; cXyz my_vec_1; dBgS_GndChk gnd_chk; @@ -3242,9 +3458,9 @@ u8 daE_YM_c::checkBeforeGround() { if (gnd_cross > current.pos.y) { current.pos.set(adj_pos.x, gnd_cross, adj_pos.z); old.pos = current.pos; - return 1; + return true; } else { - return 0; + return false; } } @@ -3259,8 +3475,7 @@ void daE_YM_c::checkInitialWall() { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(lin_chk, &plane); cXyz* p_vec = plane.GetNP(); - f32 absxz_val = p_vec->absXZ(); - s16 tan_val = cM_atan2s(absxz_val, p_vec->y) + -0x8000; + s16 tan_val = cM_atan2s(p_vec->absXZ(), p_vec->y) + -0x8000; if (abs(tan_val + 0x4000) <= 0x1555) { current.pos = lin_chk.GetCross(); field_0x668.z = cM_atan2s(p_vec->x, p_vec->z) + 0x8000; @@ -3281,9 +3496,10 @@ u8 daE_YM_c::checkWall() { if (mType != 1) { return 0; } - cLib_offsetPos(&my_vec_1, ¤t.pos, field_0x668.z, &my_vec_2); + + cLib_offsetPos(&my_vec_1, ¤t.pos, s16(field_0x668.z), &my_vec_2); my_vec_2.z = -50.0; - cLib_offsetPos(&my_vec_0, ¤t.pos, field_0x668.z, &my_vec_2); + cLib_offsetPos(&my_vec_0, ¤t.pos, s16(field_0x668.z), &my_vec_2); lin_chk.Set(&my_vec_0, &my_vec_1, NULL); if (dComIfG_Bgsp().LineCross(&lin_chk)) { cM3dGPla plane; @@ -3324,33 +3540,33 @@ void daE_YM_c::setHideType() { int daE_YM_c::create() { fopAcM_ct(this, daE_YM_c); - mType = fopAcM_GetParam(this); + mType = fopAcM_GetParam(this) & 0xFF; if (mType == 0xFF) { mType = 0; } - mSwitchBit = (fopAcM_GetParam(this) & 0xff000000) >> 24; + mSwitchBit = (fopAcM_GetParam(this) & 0xFF000000) >> 24; - u8 prm2 = (fopAcM_GetParam(this) & 0xff0000) >> 16; + u8 prm2 = (fopAcM_GetParam(this) & 0xFF0000) >> 16; if (prm2 == 0xFF) { prm2 = 0; } field_0x6e0 = prm2 * 100.0f; - u8 prm1 = (fopAcM_GetParam(this) & 0xff00) >> 8; - u8 tmp0 = (current.angle.z & 0xff00) >> 8; - mTagNo = current.angle.z; + u8 prm1 = (fopAcM_GetParam(this) & 0xFF00) >> 8; + u8 tmp0 = (current.angle.z & 0xFF00) >> 8; + mTagNo = current.angle.z & 0xFF; field_0x6a1 = 1; - if ((current.angle.x & 3) != 0) { + if ((current.angle.x & 0x3) != 0) { field_0x6a1 = 0; } - if ((current.angle.x & 12) != 0) { + if ((current.angle.x & 0xC) != 0) { field_0x6cb = 1; } - field_0x6a3 = (current.angle.x & 0xff00) >> 8; + field_0x6a3 = (current.angle.x & 0xFF00) >> 8; if (mSwitchBit != 0xFF && dComIfGs_isSwitch(mSwitchBit, fopAcM_GetRoomNo(this))) { // E_YM won't reset because it's already been defeated. @@ -3383,7 +3599,7 @@ int daE_YM_c::create() { if (!lbl_253_bss_8) { field_0xaf4 = 1; lbl_253_bss_8 = 1; - l_HIO.field_0x4 = -1; + l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("闇の虫", &l_HIO); } field_0x714 = 4; @@ -3406,7 +3622,7 @@ int daE_YM_c::create() { mSound.setEnemyName("E_ym"); mAtInfo.mpSound = &mSound; mAtInfo.mPowerType = 1; - field_0x68c = 0.6f; + field_0x68c = DEFAULT_E_YM_MODEL_SIZE; switch (mType) { case 0: From f03f54f3b09e681eee12911636ba021c1460251b Mon Sep 17 00:00:00 2001 From: YunataSavior <58997725+YunataSavior@users.noreply.github.com> Date: Fri, 26 Dec 2025 17:52:14 -0800 Subject: [PATCH 20/35] Enable unk_0x4d38 for VERSION_SHIELD (#3005) --- include/d/d_com_inf_game.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index de93f6d793..a8239c0736 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -779,7 +779,7 @@ public: /* 0x04780 */ dAttention_c mAttention; /* 0x04C9C */ dVibration_c mVibration; /* 0x04D2C */ u8 field_0x4d2c[4]; - #if PLATFORM_WII + #if PLATFORM_WII || VERSION == VERSION_SHIELD /* 0x04D38 */ u8 unk_0x4d38[8]; #endif /* 0x04D30 */ JKRArchive* mFieldMapArchive2; From d58e17f9f136bded794dbf7703a9456a55def7bb Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sat, 27 Dec 2025 12:46:46 -0800 Subject: [PATCH 21/35] d_a_door_spiral mostly done (#3007) --- include/d/actor/d_a_door_spiral.h | 148 +++- include/d/d_com_inf_game.h | 4 + include/f_op/f_op_actor.h | 2 +- include/f_op/f_op_actor_mng.h | 2 + src/d/actor/d_a_door_spiral.cpp | 1190 ++++++++++++++++++++++++++++- 5 files changed, 1341 insertions(+), 5 deletions(-) diff --git a/include/d/actor/d_a_door_spiral.h b/include/d/actor/d_a_door_spiral.h index d4503a90aa..1cb32dfb90 100644 --- a/include/d/actor/d_a_door_spiral.h +++ b/include/d/actor/d_a_door_spiral.h @@ -1,6 +1,152 @@ #ifndef D_A_DOOR_SPIRAL_H #define D_A_DOOR_SPIRAL_H -#include "dolphin/types.h" +#include "f_op/f_op_actor_mng.h" + +class daSpiral_c; +class dSpiral_stop_c { +public: + int create(daSpiral_c*); + int remove(daSpiral_c*); + void calcMtx(daSpiral_c*); + void openInit(daSpiral_c*); + BOOL openProc(daSpiral_c*); + void closeInit(daSpiral_c*); + BOOL closeProc(daSpiral_c*); + void draw(daSpiral_c*); + BOOL regist(daSpiral_c*); + BOOL release(daSpiral_c*); + + /* 0x00 */ J3DModel* mpModel; + /* 0x04 */ dBgW* mpBgw; + /* 0x08 */ u8 field_0x08[0x38 - 0x08]; + /* 0x38 */ Mtx mBgMtx; + /* 0x68 */ f32 mHeight; + /* 0x6C */ f32 mHeightStep; + /* 0x70 */ u8 field_0x70; + /* 0x71 */ u8 field_0x71; + /* 0x72 */ u8 field_0x72; +}; + +class daSpiral_c : public fopAc_ac_c { +public: + enum daSpiral_Type_e { + daSpiral_TYPE_DOWN_e, + daSpiral_TYPE_UP_e, + }; + + enum daSpiral_DemoAction_e { + daSpiral_DEMOACT_WAIT_e, + daSpiral_DEMOACT_START_e, + daSpiral_DEMOACT_SETGOAL_e, + daSpiral_DEMOACT_SETSTART_e, + daSpiral_DEMOACT_SETPOS_e, + daSpiral_DEMOACT_L_SET_e, + daSpiral_DEMOACT_SETROOM_e, + daSpiral_DEMOACT_SETROOM2_e, + daSpiral_DEMOACT_RUN_e, + daSpiral_DEMOACT_STOP_OPEN_e, + daSpiral_DEMOACT_STOP_CLOSE_e, + daSpiral_DEMOACT_END_CHECK_e, + }; + + enum daSpiral_Action_e { + daSpiral_ACT_INIT_e, + daSpiral_ACT_WAIT_e, + daSpiral_ACT_DEMO_e, + daSpiral_ACT_STOP_CLOSE_e, + }; + + daSpiral_c() {} + ~daSpiral_c() {} + + const char* getAlwaysArcName(); + const char* getSpiralDzbName(int); + const char* getDzb(); + const char* getBmdArcName(); + const char* getEvArcName(); + const char* getBmd(int); + const char* getBmd2(int); + const char* getStopBmd(); + const char* getStopBmd2(); + const char* getStopDzb(); + + J3DModelData* getModelData(); + J3DModelData* getStopModelData(); + bool debugCheckParam(); + int create(); + int CreateHeap(); + int CreateInit(); + void makeEventId(int); + void setEventPrm(); + void settingStartRoom(); + void settingEndRoom(); + void EndCommon(); + BOOL checkArea(); + void calcMtx(); + void initProc(int); + void initOpenDemo(int); + int getDemoAction(); + int demoProc(); + int actionWait(); + int actionDemo(); + int actionStopClose(); + int actionInit(); + void setPartner(); + void clrPartner(); + void setGoal(); + void setNextSpiral(); + BOOL RunPlayerSpiral(); + u8 frontCheck(); + int checkExecute(); + int execute(); + BOOL adjoinPlayer(); + BOOL drawCheck_local(); + BOOL drawCheck(int); + void debugDraw(); + int draw(); + int Delete(); + BOOL checkMakeStop(); + int checkStopF(); + void setStopDemo(); + BOOL checkStopClose(); + void setStop(); + BOOL checkStopOpen(); + + void setAction(u8 i_action) { mAction = i_action; } + + /* 0x570 */ request_of_phase_process_class mAlwaysResPhase; + /* 0x578 */ request_of_phase_process_class mBmdResPhase; + /* 0x580 */ request_of_phase_process_class mEvResPhase; + /* 0x588 */ J3DModel* mpModel; + /* 0x58C */ dBgW* mpSpiralDzb; + /* 0x590 */ Mtx mSpiralBgMtx; + /* 0x5C0 */ dBgW* mDoorDarkDzb; + /* 0x5C4 */ Mtx mDoorDarkBgMtx; + /* 0x5F4 */ u8 mType; + /* 0x5F5 */ s8 field_0x5f5; + /* 0x5F6 */ u8 field_0x5f6; + /* 0x5F7 */ u8 mAction; + /* 0x5F8 */ int field_0x5f8; + /* 0x5FC */ s16 mEventIds[8]; + /* 0x60C */ u8 mMapToolIds[8]; + /* 0x614 */ u8 mDemoMode; + /* 0x618 */ int mStaffId; + /* 0x61C */ s8 mRoomNo; + /* 0x61D */ u8 mStartRoomNo; + /* 0x61E */ u8 mEndRoomNo; + /* 0x620 */ cXyz field_0x620; + /* 0x62C */ u8 field_0x62c; + /* 0x62D */ u8 mTimer; + /* 0x630 */ cXyz field_0x630; + /* 0x63C */ dSpiral_stop_c mStop; + /* 0x6B0 */ u8 field_0x6B0[0x6B4 - 0x6B0]; + /* 0x6B4 */ s16 mPlRunPointNo; + + #if VERSION == VERSION_SHIELD_DEBUG + /* 0x6B8 */ cXyz field_0x6b8[2]; + /* 0x6D0 */ u8 mIsCheckParam; + #endif +}; #endif /* D_A_DOOR_SPIRAL_H */ diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index a8239c0736..f30e2bbee5 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -3749,6 +3749,10 @@ inline fopAc_ac_c* dComIfGp_event_getDoorPartner() { return g_dComIfG_gameInfo.play.getEvent()->getPtD(); } +inline void dComIfGp_event_setDoorPartner(void* i_partner) { + g_dComIfG_gameInfo.play.getEvent()->setPtD(i_partner); +} + inline int dComIfGp_evmng_getMyStaffId(const char* i_staffname, fopAc_ac_c* i_actor, int i_tagId) { return dComIfGp_getPEvtManager()->getMyStaffId(i_staffname, i_actor, i_tagId); } diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h index 99fcc87535..f04034459f 100644 --- a/include/f_op/f_op_actor.h +++ b/include/f_op/f_op_actor.h @@ -122,7 +122,7 @@ enum fopAc_AttentionFlag_e { /* 0x00000040 */ fopAc_AttnFlag_JUEL_e = (1 << fopAc_attn_JUEL_e), /* 0x00000080 */ fopAc_AttnFlag_ETC_e = (1 << fopAc_attn_ETC_e), - /* 0x00000100 */fopAc_AttnFlag_CHECK_e = (1 << fopAc_attn_CHECK_e), + /* 0x00000100 */ fopAc_AttnFlag_CHECK_e = (1 << fopAc_attn_CHECK_e), /* 0x00200000 */ fopAc_AttnFlag_UNK_0x200000 = 0x200000, /* 0x00400000 */ fopAc_AttnFlag_UNK_0x400000 = 0x400000, diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index bc02df41ac..f1d161342e 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -845,6 +845,8 @@ void fopAcM_showAssert_f(const fopAc_ac_c*, const char*, int, const char*, ...); BOOL fopAcM_getNameString(const fopAc_ac_c*, char*); +inline void fopAcM_SetStatusMap(fopAc_ac_c*, u32) {} + class fopAcM_lc_c { public: fopAcM_lc_c() { mLineCheck.ClrSttsRoofOff(); } diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp index 61562d0fb3..501e43930a 100644 --- a/src/d/actor/d_a_door_spiral.cpp +++ b/src/d/actor/d_a_door_spiral.cpp @@ -5,7 +5,1191 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_spiral.h" -#include "f_op/f_op_actor.h" +#include "d/d_door_param2.h" +#include "d/actor/d_a_player.h" +#include "d/d_s_play.h" +#include "SSystem/SComponent/c_counter.h" + +#if DEBUG +#include "d/d_debug_viewer.h" +#endif + +#if VERSION == VERSION_SHIELD_DEBUG +static cXyz l_step_offset(0.0f, 0.0f, 150.0f); +static cXyz l_dzb_offset(0.0f, 0.0f, 100.0f); + +static cXyz l_spiral_path_point_d[] = { + cXyz(360.0f, 0.0f, -600.0f) + l_step_offset, + cXyz(250.0f, 0.0f, -600.0f) + l_step_offset, + cXyz(150.0f, 0.0f, -600.0f) + l_step_offset, + cXyz(82.0f, 0.0f, -560.0f) + l_step_offset, + cXyz(10.0f, 0.0f, -500.0f) + l_step_offset, + cXyz(0.0f, 0.0f, -400.0f) + l_step_offset, + cXyz(0.0f, 0.0f, -300.0f) + l_step_offset, + cXyz(0.0f, 0.0f, -150.0f) + l_step_offset, + cXyz(0.0f, 0.0f, 270.0f) + l_step_offset, +}; + +static cXyz l_spiral_path_point_u[] = { + cXyz(-360.0f, 0.0f, -600.0f) + l_step_offset, + cXyz(-250.0f, 0.0f, -600.0f) + l_step_offset, + cXyz(-150.0f, 0.0f, -600.0f) + l_step_offset, + cXyz(-82.0f, 0.0f, -560.0f) + l_step_offset, + cXyz(-10.0f, 0.0f, -500.0f) + l_step_offset, + cXyz(0.0f, 0.0f, -400.0f) + l_step_offset, + cXyz(0.0f, 0.0f, -300.0f) + l_step_offset, + cXyz(0.0f, 0.0f, -150.0f) + l_step_offset, + cXyz(0.0f, 0.0f, 270.0f) + l_step_offset, +}; + +void* searchSpiralSub(void* i_actor, void* i_data) { + fopAc_ac_c* actor = (fopAc_ac_c*)i_actor; + fopAc_ac_c* other = (fopAc_ac_c*)i_data; + + if (actor != NULL && fopAcM_IsActor(actor)) { + if (fopAcM_GetProfName(actor) == PROC_SPIRAL_DOOR && actor != other) { + if (door_param2_c::getBRoomNo(actor) == door_param2_c::getBRoomNo(other)) { + return actor; + } + } + } + + return NULL; +} + +const char* daSpiral_c::getAlwaysArcName() { + return getBmdArcName(); +} + +const char* daSpiral_c::getSpiralDzbName(int i_type) { + static const char* dzb[] = { + "door-stepD.dzb", + "door-stepU.dzb", + }; + + return dzb[i_type]; +} + +const char* daSpiral_c::getDzb() { + return "door-dark.dzb"; +} + +const char* daSpiral_c::getBmdArcName() { + return "K_step"; +} + +const char* daSpiral_c::getEvArcName() { + return "DoorEvt"; +} + +const char* daSpiral_c::getBmd(int i_type) { + static const char* bmd[] = { + "K_stepd.bmd", + "K_stepu.bmd", + }; + + return bmd[i_type]; +} + +const char* daSpiral_c::getBmd2(int i_type) { + static char bmdName[32]; + if (i_type == daSpiral_TYPE_DOWN_e) { + sprintf(bmdName, "door-stairSpiralU.bmd"); + } else { + sprintf(bmdName, "door-stairSpiralD.bmd"); + } + + return bmdName; +} + +J3DModelData* daSpiral_c::getModelData() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getStageRes(getBmd2(mType)); + if (modelData == NULL) { + modelData = (J3DModelData*)dComIfG_getObjectRes(getBmdArcName(), getBmd(mType)); + } + + return modelData; +} + +const char* daSpiral_c::getStopBmd() { + return "door-spiralStop.bmd"; +} + +const char* daSpiral_c::getStopBmd2() { + return "door-stop.bmd"; +} + +J3DModelData* daSpiral_c::getStopModelData() { + J3DModelData* modelData = (J3DModelData*)dComIfG_getStageRes(getStopBmd2()); + if (modelData == NULL) { + modelData = (J3DModelData*)dComIfG_getObjectRes(getBmdArcName(), getStopBmd()); + } + + return modelData; +} + +const char* daSpiral_c::getStopDzb() { + return "door-spiralStop.dzb"; +} + +static int CheckCreateHeap(fopAc_ac_c* actor) { + daSpiral_c* i_this = (daSpiral_c*)actor; + return i_this->CreateHeap(); +} + +#if DEBUG +bool daSpiral_c::debugCheckParam() { + bool rt = false; + if (!mIsCheckParam) { + u8 fRoomNo = door_param2_c::getFRoomNo(this); + if (fRoomNo == 0x3F) { + // "Spiral Staircase: No room number specified!\n" + OS_REPORT_ERROR("螺旋階段：部屋番号指定がありません！\n"); + rt = true; + } + + u8 fOption = door_param2_c::getFrontOption(this); + if (fOption == 2) { + // "Spiral Staircase: Key option is not supported!\n" + OS_REPORT_ERROR("螺旋階段：鍵オプションは対応していません！\n"); + rt = true; + } + + mIsCheckParam = true; + } + + return rt; +} +#endif + +int daSpiral_c::create() { + #if DEBUG + if (debugCheckParam()) { + return cPhs_ERROR_e; + } + #endif + + int phase_state = dComIfG_resLoad(&mAlwaysResPhase, getAlwaysArcName()); + if (phase_state != cPhs_COMPLEATE_e) { + return phase_state; + } + + phase_state = dComIfG_resLoad(&mEvResPhase, getEvArcName()); + if (phase_state != cPhs_COMPLEATE_e) { + return phase_state; + } + + phase_state = dComIfG_resLoad(&mBmdResPhase, getBmdArcName()); + if (phase_state != cPhs_COMPLEATE_e) { + return phase_state; + } + + fopAcM_SetRoomNo(this, door_param2_c::getFRoomNo(this)); + + u8 back_option = door_param2_c::getBackOption(this); + switch (back_option) { + case 4: + mType = daSpiral_TYPE_DOWN_e; + break; + case 5: + mType = daSpiral_TYPE_UP_e; + break; + default: + // "Spiral Staircase back-door option setting is incorrect!<%d>\n" + OS_REPORT_ERROR("螺旋階段の裏オプション設定が正しくありません！<%d>\n", back_option); + JUT_ASSERT(300, 0); + break; + } + + if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0x7000)) { + return cPhs_ERROR_e; + } + + CreateInit(); + return cPhs_COMPLEATE_e; +} + +// DEBUG NONMATCHING - regalloc +int daSpiral_c::CreateHeap() { + J3DModelData* modelData = getModelData(); + JUT_ASSERT(338, modelData != NULL); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel == NULL) { + return 0; + } + + mpSpiralDzb = new dBgW(); + if (mpSpiralDzb == NULL) { + return 0; + } + + cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getSpiralDzbName(mType)); + JUT_ASSERT(356, bgd != NULL); + bool spiral_rt = mpSpiralDzb->Set(bgd, 1, &mSpiralBgMtx); + if (spiral_rt == true) { + return 0; + } + + mDoorDarkDzb = new dBgW(); + if (mDoorDarkDzb == NULL) { + return 0; + } + + bgd = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()); + JUT_ASSERT(375, bgd != NULL); + + cXyz dzb_pos(l_dzb_offset); + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&dzb_pos, &dzb_pos); + mDoMtx_stack_c::transS(current.pos.x + dzb_pos.x, current.pos.y + dzb_pos.y, current.pos.z + dzb_pos.z); + mDoMtx_stack_c::YrotM(home.angle.y); + cMtx_copy(mDoMtx_stack_c::get(), mDoorDarkBgMtx); + + bool dark_rt = mDoorDarkDzb->Set(bgd, 1, &mDoorDarkBgMtx); + if (dark_rt == true) { + return 0; + } + + if (checkMakeStop() && !mStop.create(this)) { + int _; + return 0; + } + + return 1; +} + +int daSpiral_c::CreateInit() { + bool rt = dComIfG_Bgsp().Regist(mpSpiralDzb, this); + JUT_ASSERT(416, rt == 0); + + rt = dComIfG_Bgsp().Regist(mDoorDarkDzb, this); + JUT_ASSERT(419, rt == 0); + + tevStr.room_no = current.roomNo; + setAction(daSpiral_ACT_INIT_e); + attention_info.position.y += 150.0f; + eyePos.y += 150.0f; + attention_info.flags = fopAc_AttnFlag_DOOR_e; + + calcMtx(); + + mpSpiralDzb->SetRoomId((u16)door_param2_c::getFRoomNo(this)); + mDoorDarkDzb->SetRoomId((u16)door_param2_c::getFRoomNo(this)); + mpSpiralDzb->Move(); + mDoorDarkDzb->Move(); + + initProc(1); + return 1; +} + +void daSpiral_c::makeEventId(int) { + static const char* table[] = { + "DEFAULT_SPIRAL_DOOR_F", + "DEFAULT_SPIRAL_DOOR_F", + "DEFAULT_STOP_OPEN", + "DEFAULT_STOP_OPEN", + "DEFAULT_SPIRAL_DOOR_F_STOP", + "DEFAULT_SPIRAL_DOOR_F_STOP", + NULL, + NULL, + }; + + int i; + for (i = 0; i < 8; i++) { + mEventIds[i] = dComIfGp_getEventManager().getEventIdx(this, table[i], 0xFF); + mMapToolIds[i] = 0xFF; + } +} + +void daSpiral_c::setEventPrm() { + mDemoMode = 0; + + daSpiral_c* other = (daSpiral_c*)fopAcM_Search(searchSpiralSub, this); + if (other == NULL) { + // "Spiral Staircase: No matching spiral staircase!\n" + OS_REPORT_ERROR("螺旋階段：対になる螺旋階段がありません！\n"); + JUT_ASSERT(488, 0); + } + + if (other->mStop.field_0x70 == 1) { + mDemoMode = 4; + } else { + mDemoMode = 0; + } + + daPy_py_c* player; + s32 var_r27; + if (checkArea()) { + player = daPy_getPlayerActorClass(); + eventInfo.setEventId(mEventIds[mDemoMode]); + eventInfo.setMapToolId(mMapToolIds[mDemoMode]); + eventInfo.onCondition(4); + var_r27 = fopAcM_orderOtherEventId(this, mEventIds[mDemoMode], 0xFF, 0xFFFF, 0, 1); + field_0x630 = player->current.pos; + } +} + +void daSpiral_c::settingStartRoom() { + if (mStartRoomNo != mEndRoomNo && mStartRoomNo != 0x3F && mEndRoomNo != 0x3F) { + dComIfGp_roomControl_onStatusFlag(mStartRoomNo, 8); + } +} + +void daSpiral_c::settingEndRoom() { + fopAc_ac_c* door = dComIfGp_event_getDoorPartner(); + mStartRoomNo = (u8)door_param2_c::getFRoomNo(this); + mEndRoomNo = (u8)door_param2_c::getFRoomNo(door); + + if (mStartRoomNo != mEndRoomNo && mStartRoomNo != 0x3F && mEndRoomNo != 0x3F) { + dComIfGp_roomControl_offStatusFlag(mEndRoomNo, 8); + } + + dStage_roomControl_c::setNextStayNo(mEndRoomNo); +} + +void daSpiral_c::EndCommon() { + fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz sp14 = player->current.pos - current.pos; + + f32 prod = sp14.inprodXZ(field_0x620); + f32 var_f29 = prod < 0.0f ? 180.0f : -180.0f; + + cXyz pos(current.pos.x - (var_f29 * field_0x620.x), current.pos.y, current.pos.z - (var_f29 * field_0x620.z)); + s16 angle; + if (prod > 0.0f) { + int _; // fakematch? + angle = current.angle.y; + } else { + angle = current.angle.y + 0x8000; + } + + dComIfGs_setRestartRoom(pos, angle, fopAcM_GetRoomNo(player)); +} + +BOOL daSpiral_c::checkArea() { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz sp8 = player->current.pos - current.pos; + + int angle = current.angle.y; + if (field_0x62c == 1) { + angle += 0x7FFF; + } + + mDoMtx_stack_c::YrotS(-angle); + mDoMtx_stack_c::multVec(&sp8, &sp8); + + f32 x = std::fabs(sp8.x); + if (x > 225.0f) { + return FALSE; + } + + f32 y = std::fabs(sp8.y); + if (y > 300.0f) { + return FALSE; + } + + f32 z = sp8.z; + if (z < 0.0f && z > -450.0f) { + return TRUE; + } + + return FALSE; +} + +void daSpiral_c::calcMtx() { + cXyz step_pos(l_step_offset); + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&step_pos, &step_pos); + mDoMtx_stack_c::transS(current.pos.x + step_pos.x, current.pos.y + step_pos.y, current.pos.z + step_pos.z); + mDoMtx_stack_c::YrotM(home.angle.y); + cMtx_copy(mDoMtx_stack_c::get(), mSpiralBgMtx); + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + + mpSpiralDzb->Move(); + field_0x5f5 = dComIfGp_roomControl_getStayNo(); +} + +void daSpiral_c::initProc(int param_0) { + field_0x620.set(cM_ssin(home.angle.y), 0.0f, cM_scos(home.angle.y)); + eventInfo.setArchiveName((char*)getEvArcName()); + makeEventId(param_0); +} + +void daSpiral_c::initOpenDemo(int param_0) { + shape_angle.y = current.angle.y; + if (field_0x62c == 1) { + shape_angle.y += (s16)0x7FFF; + } + + mStaffId = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", NULL, 0); + if (param_0 != 0) { + dComIfGp_event_onEventFlag(2); + } + + dComIfGp_event_onEventFlag(0x40); +} + +int daSpiral_c::getDemoAction() { + static char* action_table[] = { + "WAIT", + "START", + "SETGOAL", + "SETSTART", + "SETPOS", + "L_SET", + "SETROOM", + "SETROOM2", + "RUN", + "STOP_OPEN", + "STOP_CLOSE", + "END_CHECK", + }; + + return dComIfGp_evmng_getMyActIdx(mStaffId, action_table, ARRAY_SIZE(action_table), 0, 0); +} + +int daSpiral_c::demoProc() { + fopAc_ac_c* door = dComIfGp_event_getDoorPartner(); + if (door == this) { + mStaffId = dComIfGp_evmng_getMyStaffId("PARTNER_DOOR", NULL, 0); + } else { + mStaffId = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", NULL, 0); + } + + int action_idx = getDemoAction(); + int rt = 0; + daPy_py_c* player = daPy_getPlayerActorClass(); + + cXyz goal_point; + cXyz* point_list; + if (dComIfGp_evmng_getIsAddvance(mStaffId)) { + switch (action_idx) { + case daSpiral_DEMOACT_START_e: + setPartner(); + break; + case daSpiral_DEMOACT_SETGOAL_e: + setGoal(); + break; + case daSpiral_DEMOACT_RUN_e: { + mPlRunPointNo = 1; + + if (mType == daSpiral_TYPE_DOWN_e) { + point_list = l_spiral_path_point_d; + } else { + point_list = l_spiral_path_point_u; + } + + goal_point = point_list[mPlRunPointNo]; + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&goal_point, &goal_point); + goal_point += current.pos; + dComIfGp_evmng_setGoal(&goal_point); + break; + } + case daSpiral_DEMOACT_SETROOM_e: + settingEndRoom(); + break; + case daSpiral_DEMOACT_SETROOM2_e: + settingStartRoom(); + break; + case daSpiral_DEMOACT_SETPOS_e: + setNextSpiral(); + // "Spiral Staircase: force player move!<%d>" + OS_REPORT("\x1B[33m螺旋階段：プレイヤー強制移動！<%d>\n\x1B[m", g_Counter.mCounter0); + mTimer = 10; + break; + case daSpiral_DEMOACT_STOP_OPEN_e: + mStop.openInit(this); + break; + case daSpiral_DEMOACT_STOP_CLOSE_e: + setStop(); + if (mStop.field_0x70 != 0) { + mStop.closeInit(this); + mStop.regist(this); + } + break; + case daSpiral_DEMOACT_L_SET_e: + mTimer = 2; + break; + case daSpiral_DEMOACT_END_CHECK_e: + clrPartner(); + EndCommon(); + break; + } + } + + switch (action_idx) { + case daSpiral_DEMOACT_END_CHECK_e: + shape_angle.y = current.angle.y; + setAction(daSpiral_ACT_WAIT_e); + dComIfGp_evmng_cutEnd(mStaffId); + break; + case daSpiral_DEMOACT_STOP_OPEN_e: + if (mStop.openProc(this)) { + mStop.release(this); + dComIfGp_evmng_cutEnd(mStaffId); + } + mStop.calcMtx(this); + break; + case daSpiral_DEMOACT_STOP_CLOSE_e: + if (mStop.closeProc(this)) { + dComIfGp_evmng_cutEnd(mStaffId); + } + mStop.calcMtx(this); + break; + case daSpiral_DEMOACT_RUN_e: + if (RunPlayerSpiral()) { + dComIfGp_evmng_cutEnd(mStaffId); + } + break; + case daSpiral_DEMOACT_L_SET_e: + if (cLib_calcTimer(&mTimer) == 0) { + dComIfGp_evmng_cutEnd(mStaffId); + } + break; + default: + dComIfGp_evmng_cutEnd(mStaffId); + break; + } + + return rt; +} + +int daSpiral_c::actionWait() { + fopAc_ac_c* door = dComIfGp_event_getDoorPartner(); + if (door == this) { + shape_angle.y = current.angle.y; + shape_angle.y += (s16)0x7FFF; + mStaffId = dComIfGp_evmng_getMyStaffId("PARTNER_DOOR", NULL, 0); + setAction(daSpiral_ACT_DEMO_e); + eventInfo.setEventId(mEventIds[mDemoMode]); + eventInfo.setMapToolId(mMapToolIds[mDemoMode]); + eventInfo.onCondition(4); + return 1; + } + + if (mStop.field_0x70 != 0) { + if (eventInfo.checkCommandDemoAccrpt()) { + mStaffId = dComIfGp_evmng_getMyStaffId("SHUTTER_DOOR", NULL, 0); + shape_angle.y = current.angle.y; + if (field_0x62c == 1) { + shape_angle.y += (s16)0x7FFF; + } + setAction(daSpiral_ACT_DEMO_e); + demoProc(); + } else if (checkStopOpen()) { + setStopDemo(); + fopAcM_orderOtherEventId(this, mEventIds[mDemoMode], mMapToolIds[mDemoMode], 0xFFFF, 0, 1); + } + } else if (eventInfo.checkCommandDemoAccrpt()) { + initOpenDemo(0); + setAction(daSpiral_ACT_DEMO_e); + demoProc(); + } else if (checkStopClose()) { + mStop.field_0x70 = 1; + mStop.regist(this); + mStop.closeInit(this); + mStop.calcMtx(this); + setAction(daSpiral_ACT_STOP_CLOSE_e); + return 1; + } else { + makeEventId(1); + setEventPrm(); + } + + return 1; +} + +int daSpiral_c::actionDemo() { + fopAc_ac_c* door = dComIfGp_event_getDoorPartner(); + if (door == this) { + demoProc(); + } else if (dComIfGp_evmng_endCheck(mEventIds[mDemoMode])) { + setAction(daSpiral_ACT_WAIT_e); + dComIfGp_event_reset(); + shape_angle.y = current.angle.y; + } else { + demoProc(); + } + + return 1; +} + +int daSpiral_c::actionStopClose() { + if (mStop.closeProc(this)) { + setAction(daSpiral_ACT_WAIT_e); + } + + mStop.calcMtx(this); + return 1; +} + +int daSpiral_c::actionInit() { + actionWait(); + setAction(daSpiral_ACT_WAIT_e); + setStop(); + mStop.calcMtx(this); + return 1; +} + +void daSpiral_c::setPartner() { + fopAc_ac_c* actor = fopAcM_Search(searchSpiralSub, this); + JUT_ASSERT(1065, actor); + + dComIfGp_event_setDoorPartner(actor); + fopAcM_OnStatus(actor, 0x8000); +} + +void daSpiral_c::clrPartner() { + dComIfGp_event_setDoorPartner(NULL); +} + +void daSpiral_c::setGoal() { + daPy_py_c* player = daPy_getPlayerActorClass(); + cXyz goal_pos(current.pos); + f32 var_f31 = 450.0f; + s16 angle = shape_angle.y + 0x7FFF; + + if (this == dComIfGp_event_getDoorPartner()) {} + + goal_pos.x += var_f31 * cM_ssin(angle); + goal_pos.y = current.pos.y; + goal_pos.z += var_f31 * cM_scos(angle); + dComIfGp_evmng_setGoal(&goal_pos); +} + +void daSpiral_c::setNextSpiral() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + fopAc_ac_c* door = dComIfGp_event_getDoorPartner(); + JUT_ASSERT(1121, door != NULL); + + cXyz pl_pos; + s16 pl_angle = (s16)door->current.angle.y; + if (mType == daSpiral_TYPE_DOWN_e) { + pl_pos = l_spiral_path_point_u[0]; + pl_angle += (s16)0x4000; + } else { + pl_pos = l_spiral_path_point_d[0]; + pl_angle -= (s16)0x4000; + } + + mDoMtx_stack_c::transS(door->current.pos.x, door->current.pos.y, door->current.pos.z); + mDoMtx_stack_c::YrotM(door->current.angle.y); + mDoMtx_stack_c::multVec(&pl_pos, &pl_pos); + + if (mType == daSpiral_TYPE_DOWN_e) { + pl_pos.y += 200.0f; + } + + player->setPlayerPosAndAngle(&pl_pos, pl_angle, 0); +} + +int daSpiral_c::RunPlayerSpiral() { + daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); + + cXyz* point_list; + if (mType == daSpiral_TYPE_DOWN_e) { + point_list = l_spiral_path_point_d; + } else { + point_list = l_spiral_path_point_u; + } + + cXyz* pgoal = dComIfGp_evmng_getGoal(); + if (pgoal->absXZ(player->current.pos) < 80.0f + KREG_F(4)) { + mPlRunPointNo++; + if (mPlRunPointNo == 9) { + return 1; + } + + cXyz pos(point_list[mPlRunPointNo]); + mDoMtx_stack_c::YrotS(home.angle.y); + mDoMtx_stack_c::multVec(&pos, &pos); + pos += current.pos; + dComIfGp_evmng_setGoal(&pos); + } + + return 0; +} + +u8 daSpiral_c::frontCheck() { + int roomNo = dComIfGp_roomControl_getStayNo(); + int fRoomNo = door_param2_c::getFRoomNo(this); + if (roomNo == fRoomNo) { + return 0; + } + + return 1; +} + +int daSpiral_c::checkExecute() { + field_0x62c = frontCheck(); + + if (eventInfo.checkCommandDemoAccrpt() || eventInfo.checkCommandDoor()) { + return 2; + } + + fopAc_ac_c* door = dComIfGp_event_getDoorPartner(); + if (door == this) { + return 2; + } + + if (mRoomNo != dComIfGp_roomControl_getStayNo()) { + return 0; + } + + if (field_0x62c != 2 && adjoinPlayer()) { + return 2; + } + + return 0; +} + +int daSpiral_c::execute() { + int var_r29 = checkExecute(); + switch (var_r29) { + case 0: + setAction(daSpiral_ACT_INIT_e); + break; + case 2: + switch (mAction) { + case daSpiral_ACT_INIT_e: + actionInit(); + break; + case daSpiral_ACT_WAIT_e: + actionWait(); + break; + case daSpiral_ACT_DEMO_e: + actionDemo(); + break; + case daSpiral_ACT_STOP_CLOSE_e: + actionStopClose(); + break; + } + break; + default: + case 1: + JUT_ASSERT(1364, 0); + break; + } + + mRoomNo = dComIfGp_roomControl_getStayNo(); + return 1; +} + +BOOL daSpiral_c::adjoinPlayer() { + int fRoomNo = door_param2_c::getFRoomNo(this); + if (dComIfGp_roomControl_checkRoomDisp(fRoomNo)) { + return TRUE; + } + + return FALSE; +} + +BOOL daSpiral_c::drawCheck_local() { + if (!adjoinPlayer()) { + return FALSE; + } + + return TRUE; +} + +BOOL daSpiral_c::drawCheck(int) { + BOOL rt = drawCheck_local(); + if (rt) { + fopAcM_SetStatusMap(this, 9); + } else { + fopAcM_OffStatus(this, 0); + } + + return rt; +} + +#if DEBUG +// DEBUG NONMATCHING - stack +void daSpiral_c::debugDraw() { + GXColor spC = {0xFF, 0xFF, 0xFF, 0xFF}; + GXColor sp8 = spC; + GXColor color = sp8; + + cXyz sp68[4]; + cXyz sp38[4]; + + f32 temp_f31 = 225.0f; + f32 temp_f30 = 0.0f; + + sp68[0] = sp68[1] = sp68[2] = sp68[3] = current.pos; + + sp38[0].x = sp38[1].x = temp_f31; + sp38[2].x = sp38[3].x = -temp_f31; + + sp38[0].y = sp38[1].y = sp38[2].y = sp38[3].y = 5.0f; + + sp38[0].z = sp38[3].z = -450.0f; + sp38[1].z = sp38[2].z = temp_f30; + + s16 var_r25 = current.angle.y; + if (field_0x62c == 1) { + var_r25 += (s16)0x7FFF; + } + + mDoMtx_stack_c::YrotS(var_r25); + + for (int i = 0; i < 4; i++) { + mDoMtx_stack_c::multVec(&sp38[i], &sp38[i]); + } + + for (int i = 0; i < 4; i++) { + sp68[i] = sp68[i] + sp38[i]; + } + + if (KREG_S(9) == 1000) { + dDbVw_drawQuadOpa(sp68, spC, TRUE); + dDbVw_drawSphereXlu(current.pos, 30.0f, color, TRUE); + } + + if (KREG_S(9) == 2000) { + cXyz* var_r27 = l_spiral_path_point_d; + if (mType == daSpiral_TYPE_UP_e) { + var_r27 = l_spiral_path_point_u; + } + + mDoMtx_stack_c::transS(current.pos.x, current.pos.y, current.pos.z); + mDoMtx_stack_c::YrotM(home.angle.y); + + cXyz sp2C; + cXyz sp20; + for (int i = 0; i < 8; i++) { + sp2C = var_r27[0]; + sp20 = var_r27[1]; + mDoMtx_stack_c::multVec(&sp2C, &sp2C); + mDoMtx_stack_c::multVec(&sp20, &sp20); + dDbVw_drawLineXlu(sp2C, sp20, color, TRUE, 12); + var_r27++; + } + } +} +#endif + +int daSpiral_c::draw() { + BOOL var_r27 = drawCheck(0); + if (!var_r27) { + if (field_0x5f6 == 0) { + field_0x5f6 = 1; + dComIfG_Bgsp().Release(mpSpiralDzb); + dComIfG_Bgsp().Release(mDoorDarkDzb); + mStop.release(this); + } + return 1; + } + + if (field_0x5f6 != 0) { + field_0x5f6 = 0; + + bool rt = dComIfG_Bgsp().Regist(mpSpiralDzb, this); + JUT_ASSERT(1544, !rt); + + rt = dComIfG_Bgsp().Regist(mDoorDarkDzb, this); + JUT_ASSERT(1546, !rt); + + if (mStop.field_0x70 != 0) { + mStop.regist(this); + } + } + + g_env_light.settingTevStruct(16, ¤t.pos, &tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); + + dComIfGd_setListBG(); + mDoExt_modelUpdateDL(mpModel); + dComIfGd_setList(); + + if (mStop.field_0x70 != 0) { + mStop.draw(this); + } + + #if DEBUG + debugDraw(); + #endif + return 1; +} + +int daSpiral_c::Delete() { + if (heap != NULL) { + if (mpSpiralDzb->ChkUsed()) { + dComIfG_Bgsp().Release(mpSpiralDzb); + } + + if (mDoorDarkDzb->ChkUsed()) { + dComIfG_Bgsp().Release(mDoorDarkDzb); + } + } + + mStop.remove(this); + dComIfG_resDelete(&mAlwaysResPhase, getAlwaysArcName()); + dComIfG_resDelete(&mEvResPhase, getEvArcName()); + dComIfG_resDelete(&mBmdResPhase, getBmdArcName()); + return 1; +} + +BOOL daSpiral_c::checkMakeStop() { + u8 option = door_param2_c::getFrontOption(this); + if (option == 1 || option == 3) { + return 1; + } + + return 0; +} + +int daSpiral_c::checkStopF() { + int fRoomNo = door_param2_c::getFRoomNo(this); + u8 option = door_param2_c::getFrontOption(this); + u8 swbit = door_param2_c::getSwbit(this); + if (swbit == 0xFF) { + return 0; + } + + if (option != 1 && option != 3) { + return 0; + } + + if (!dComIfGp_roomControl_checkStatusFlag(fRoomNo, 1)) { + return -1; + } + + return dComIfGs_isSwitch(swbit, fRoomNo) == FALSE; +} + +void daSpiral_c::setStopDemo() { + u8 option = door_param2_c::getFrontOption(this); + BOOL isMsgDoor = door_param2_c::isMsgDoor(this); + u8 eventNo = door_param2_c::getEventNo(this); + + if (field_0x62c == 0) { + if ((option == 3 || option == 1) && isMsgDoor == 0 && eventNo != 0xFF) { + mDemoMode = 6; + mMapToolIds[mDemoMode] = door_param2_c::getEventNo(this); + mEventIds[mDemoMode] = dComIfGp_getEventManager().getEventIdx(this, mMapToolIds[mDemoMode]); + } else { + mDemoMode = 2; + } + } +} + +BOOL daSpiral_c::checkStopClose() { + u8 swbit = 0xFF; + u8 fRoomNo = door_param2_c::getFRoomNo(this); + if (mStop.mpModel == NULL) { + return 0; + } + + int option = door_param2_c::getFrontOption(this); + if (field_0x62c == 0) { + if (option == 3) { + return 0; + } + + swbit = door_param2_c::getSwbit(this); + fRoomNo = door_param2_c::getFRoomNo(this); + + } + + if (swbit == 0xFF) { + return 0; + } + + if (!dComIfGs_isSwitch(swbit, fRoomNo)) { + return 1; + } + + return 0; +} + +void daSpiral_c::setStop() { + if (checkMakeStop() && mStop.mpModel != NULL) { + mStop.field_0x72 = field_0x62c; + mStop.field_0x70 = checkStopF(); + mStop.mHeight = 0.0f; + } +} + +BOOL daSpiral_c::checkStopOpen() { + u8 option = door_param2_c::getFrontOption(this); + u8 swbit = door_param2_c::getSwbit(this); + u8 fRoomNo = door_param2_c::getFRoomNo(this); + + if (field_0x62c == 0 && option == 3) { + if (!dComIfGp_event_runCheck() || field_0x5f8 == 0) { + if (dComIfGp_roomControl_checkRoomDisp(fRoomNo) && !fopAcM_myRoomSearchEnemy(fRoomNo)) { + if (field_0x5f8 > 0) { + field_0x5f8--; + return 0; + } + + if (swbit != 0xFF) { + dComIfGs_onSwitch(swbit, fRoomNo); + } + + return 1; + } + field_0x5f8 = 65; + } + } else if (swbit != 0xFF && dComIfGs_isSwitch(swbit, fRoomNo)) { + return 1; + } + + return 0; +} + +int dSpiral_stop_c::create(daSpiral_c* i_spiral) { + J3DModelData* modelData = i_spiral->getStopModelData(); + JUT_ASSERT(1830, modelData != NULL); + mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); + if (mpModel== NULL) { + return 0; + } + + mpBgw = new dBgW(); + if (mpBgw == NULL) { + return 0; + } + + cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(i_spiral->getAlwaysArcName(), i_spiral->getStopDzb()); + JUT_ASSERT(1849, bgd != NULL); + bool rt = mpBgw->Set(bgd, 1, &mBgMtx); + if (rt == true) { + int _; // fakematch? + return 0; + } + + return 1; +} + +int dSpiral_stop_c::remove(daSpiral_c* i_spiral) { + release(i_spiral); + field_0x70 = 0; + return 1; +} + +void dSpiral_stop_c::calcMtx(daSpiral_c* i_spiral) { + f32 var_f31 = -40.0f; + cXyz pos(i_spiral->current.pos); + cXyz offset; + offset.set(0.0f, 0.0f, 100.0f); + if (field_0x72 == 1) { + offset.set(0.0f, 0.0f, -100.0f); + } + + cLib_offsetPos(&pos, &i_spiral->home.pos, i_spiral->home.angle.y, &offset); + + s16 angle = i_spiral->current.angle.y; + if (field_0x72 == 1) { + angle += (s16)0x7FFF; + } + + mDoMtx_stack_c::transS(pos.x, pos.y, pos.z); + mDoMtx_stack_c::YrotM(angle); + mDoMtx_stack_c::transM(0.0f, mHeight, 0.0f); + cMtx_copy(mDoMtx_stack_c::get(), mBgMtx); + + if (mpBgw != NULL) { + mpBgw->Move(); + } + + if (mpModel != NULL) { + mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + } +} + +void dSpiral_stop_c::openInit(daSpiral_c*) { + mHeight = 0.0f; + mHeightStep = 0.0f; +} + +int dSpiral_stop_c::openProc(daSpiral_c*) { + cLib_chaseF(&mHeightStep, 30.0f, 4.0f); + if (cLib_chaseF(&mHeight, 300.0f, mHeightStep)) { + field_0x70 = 0; + return 1; + } + + return 0; +} + +void dSpiral_stop_c::closeInit(daSpiral_c*) { + mHeight = 300.0f; + mHeightStep = 0.0f; +} + +int dSpiral_stop_c::closeProc(daSpiral_c*) { + cLib_chaseF(&mHeightStep, 60.0f, 6.0f); + if (cLib_chaseF(&mHeight, 0.0f, mHeightStep)) { + return 1; + } + + return 0; +} + +void dSpiral_stop_c::draw(daSpiral_c* i_spiral) { + if (mpModel != NULL) { + g_env_light.settingTevStruct(16, &i_spiral->current.pos, &i_spiral->tevStr); + g_env_light.setLightTevColorType_MAJI(mpModel, &i_spiral->tevStr); + mDoExt_modelUpdateDL(mpModel); + } +} + +BOOL dSpiral_stop_c::regist(daSpiral_c* i_spiral) { + if (mpBgw != NULL) { + bool rt = dComIfG_Bgsp().Regist(mpBgw, i_spiral); + if (!rt) { + return 1; + } + } + + return 0; +} + +BOOL dSpiral_stop_c::release(daSpiral_c*) { + if (mpBgw != NULL && mpBgw->ChkUsed()) { + dComIfG_Bgsp().Release(mpBgw); + } + + return 1; +} + +int daSpiral_Draw(daSpiral_c* i_this) { + return i_this->draw(); +} + +int daSpiral_Execute(daSpiral_c* i_this) { + i_this->execute(); + return 1; +} + +int daSpiral_Delete(daSpiral_c* i_this) { + fopAcM_RegisterDeleteID(i_this, "Door10"); + i_this->Delete(); + i_this->~daSpiral_c(); + return 1; +} + +int daSpiral_Create(fopAc_ac_c* i_this) { + fopAcM_RegisterCreateID(daSpiral_c, i_this, "Door10"); + fopAcM_ct(a_this, daSpiral_c); + return a_this->create(); +} + +static actor_method_class l_daSpiral_Method = { + (process_method_func)daSpiral_Create, (process_method_func)daSpiral_Delete, + (process_method_func)daSpiral_Execute, (process_method_func)NULL, + (process_method_func)daSpiral_Draw, +}; +#endif + +#if VERSION == VERSION_SHIELD_DEBUG +#define DASPIRAL_METHODS &l_daSpiral_Method +#else +#define DASPIRAL_METHODS NULL +#endif actor_process_profile_definition g_profile_SPIRAL_DOOR = { fpcLy_CURRENT_e, // mLayerID @@ -13,12 +1197,12 @@ actor_process_profile_definition g_profile_SPIRAL_DOOR = { fpcPi_CURRENT_e, // mListPrio PROC_SPIRAL_DOOR, // mProcName &g_fpcLf_Method.base, // sub_method - 0x6b0, // mSize + sizeof(daSpiral_c), // mSize 0, // mSizeOther 0, // mParameters &g_fopAc_Method.base, // sub_method 301, // mPriority - NULL, // sub_method + DASPIRAL_METHODS, // sub_method 0x44000, // mStatus fopAc_ACTOR_e, // mActorType fopAc_CULLBOX_6_e, // cullType From 5fcfa49f3b4c1d8df7145da308e7c86e25fcb57a Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sat, 27 Dec 2025 14:23:15 -0800 Subject: [PATCH 22/35] JAudio2 debug (#3006) --- configure.py | 8 +- include/JSystem/JAudio2/JAISeMgr.h | 6 +- include/JSystem/JAudio2/JAISeq.h | 3 +- include/JSystem/JAudio2/JAISeqDataMgr.h | 4 +- include/JSystem/JAudio2/JAISound.h | 32 +++- include/JSystem/JAudio2/JAISoundHandles.h | 28 ---- include/JSystem/JAudio2/JAIStream.h | 2 +- include/JSystem/JAudio2/JASAiCtrl.h | 4 +- include/JSystem/JAudio2/JASAudioReseter.h | 4 +- include/JSystem/JAudio2/JASBNKParser.h | 5 +- include/JSystem/JAudio2/JASBasicWaveBank.h | 10 +- include/JSystem/JAudio2/JASDSPChannel.h | 3 + include/JSystem/JAudio2/JASDSPInterface.h | 14 +- include/JSystem/JAudio2/JASDriverIF.h | 1 + include/JSystem/JAudio2/JAUAudioArcLoader.h | 19 +++ include/JSystem/JAudio2/JAUSectionHeap.h | 10 +- include/JSystem/JAudio2/JAUSeqCollection.h | 2 +- include/JSystem/JAudio2/JAUSeqDataBlockMgr.h | 2 +- include/JSystem/JAudio2/JAUStreamFileTable.h | 6 +- include/JSystem/JKernel/JKRHeap.h | 1 + src/JSystem/JAudio2/JAISeq.cpp | 2 + src/JSystem/JAudio2/JAISoundStarter.cpp | 13 +- src/JSystem/JAudio2/JAIStream.cpp | 2 +- src/JSystem/JAudio2/JASAiCtrl.cpp | 108 +++++++++---- src/JSystem/JAudio2/JASAudioReseter.cpp | 38 +++-- src/JSystem/JAudio2/JASAudioThread.cpp | 51 ++++-- src/JSystem/JAudio2/JASDSPChannel.cpp | 38 ++++- src/JSystem/JAudio2/JASDSPInterface.cpp | 128 +++++++++++---- src/JSystem/JAudio2/JASDriverIF.cpp | 4 + src/JSystem/JAudio2/JASOscillator.cpp | 28 ++-- .../JAudio2/JAUAudioArcInterpreter.cpp | 4 +- src/JSystem/JAudio2/JAUAudioArcLoader.cpp | 84 +++++++++- src/JSystem/JAudio2/JAUClusterSound.cpp | 3 + src/JSystem/JAudio2/JAUSectionHeap.cpp | 148 +++++++++++------- src/JSystem/JAudio2/JAUSeqCollection.cpp | 6 +- src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp | 86 +++++----- src/JSystem/JAudio2/JAUStreamFileTable.cpp | 13 +- src/JSystem/JKernel/JKRHeap.cpp | 4 + src/Z2AudioLib/Z2SoundMgr.cpp | 2 +- 39 files changed, 629 insertions(+), 297 deletions(-) diff --git a/configure.py b/configure.py index d592b55afc..09ddce3ef7 100755 --- a/configure.py +++ b/configure.py @@ -1051,8 +1051,8 @@ config.libs = [ [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASCalc.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASTaskThread.cpp"), - Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASDvdThread.cpp"), - Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASCallback.cpp"), + Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JAudio2/JASDvdThread.cpp"), + Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JAudio2/JASCallback.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASHeapCtrl.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASResArcLoader.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASProbe.cpp"), @@ -1084,8 +1084,8 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASOscillator.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASAiCtrl.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASAudioThread.cpp"), - Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASAudioReseter.cpp"), - Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASDSPChannel.cpp"), + Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JAudio2/JASAudioReseter.cpp"), + Object(MatchingFor(ALL_GCN, "ShieldD"), "JSystem/JAudio2/JASDSPChannel.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASDSPInterface.cpp"), Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASDriverIF.cpp"), Object(MatchingFor(ALL_GCN, "Shield"), "JSystem/JAudio2/JASSoundParams.cpp"), # debug weak func order diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr.h index 10f559595c..a2f1fff791 100644 --- a/include/JSystem/JAudio2/JAISeMgr.h +++ b/include/JSystem/JAudio2/JAISeMgr.h @@ -111,7 +111,11 @@ public: virtual bool isUsingSeqData(const JAISeqDataRegion& seqDataRegion); virtual int releaseSeqData(const JAISeqDataRegion& seqDataRegion); - JAISeCategoryMgr* getCategory(int index) { return &mCategoryMgrs[index]; } + JAISeCategoryMgr* getCategory(int categoryIndex) { + JUT_ASSERT(222, categoryIndex >= 0); + JUT_ASSERT(223, categoryIndex < NUM_CATEGORIES); + return &mCategoryMgrs[categoryIndex]; + } JAIAudience* getAudience() { return mAudience; } JAIAudience* getAudience(int index) { if (index >= 0 && index < NUM_CATEGORIES) { diff --git a/include/JSystem/JAudio2/JAISeq.h b/include/JSystem/JAudio2/JAISeq.h index b619ea4396..3752e0adc7 100644 --- a/include/JSystem/JAudio2/JAISeq.h +++ b/include/JSystem/JAudio2/JAISeq.h @@ -12,7 +12,7 @@ class JAISoundChild; * @ingroup jsystem-jaudio * */ -class JAISeq : public JASPoolAllocObject, public JAISound, public JSULink { +class JAISeq : public JAISound, public JSULink, public JASPoolAllocObject { public: static const int NUM_CHILDREN = 32; @@ -53,6 +53,7 @@ public: void JAISeqMgr_mixOut_(const JASSoundParams& params, JAISoundActivity activity); const JAISeqData& getSeqData() const { return inner_.mSeqData; } + s32 getCategory() const { return inner_.field_0x39c; } /* 0x0A8 */ TInner inner_; /* 0x3A8 */ JAISoundStrategyMgr__unknown* field_0x3a8; diff --git a/include/JSystem/JAudio2/JAISeqDataMgr.h b/include/JSystem/JAudio2/JAISeqDataMgr.h index bbedc12a18..510f1f4905 100644 --- a/include/JSystem/JAudio2/JAISeqDataMgr.h +++ b/include/JSystem/JAudio2/JAISeqDataMgr.h @@ -14,8 +14,8 @@ struct JAISeqData { field_0x4 = param_1; } - void set(void* param_0, u32 param_1) { - field_0x0 = param_0; + void set(const void* param_0, u32 param_1) { + field_0x0 = (void*)param_0; field_0x4 = param_1; } diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index 2a7fc1c0f9..50c45562b9 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -6,6 +6,36 @@ #include "JSystem/JUtility/JUTAssert.h" #include "global.h" +class JAISound; + +/** + * @ingroup jsystem-jaudio + * + */ +class JAISoundHandle { +public: + JAISoundHandle() {sound_ = NULL;}; + ~JAISoundHandle() { releaseSound(); } + + bool isSoundAttached() const { return sound_ != NULL; } + + JAISound* getSound() { + JUT_ASSERT(41, sound_ != NULL); + return sound_; + } + + JAISound* operator->() const { + JUT_ASSERT(58, sound_ != NULL); + return sound_; + } + + operator bool() const { return isSoundAttached(); } + + void releaseSound(); + + JAISound* sound_; +}; + /** * @ingroup jsystem-jaudio * @@ -63,7 +93,7 @@ struct JAISoundStatus_ { bool isMute() const { return field_0x0.flags.mute; } bool isPaused() const { return field_0x0.flags.paused; } void pauseWhenOut() { - field_0x1.flags.flag6 = 1; + field_0x1.flags.flag3 = 1; } /* 0x0 */ union { diff --git a/include/JSystem/JAudio2/JAISoundHandles.h b/include/JSystem/JAudio2/JAISoundHandles.h index 9bcd7de88a..0681009e88 100644 --- a/include/JSystem/JAudio2/JAISoundHandles.h +++ b/include/JSystem/JAudio2/JAISoundHandles.h @@ -7,34 +7,6 @@ class JAISound; class JAISoundID; -/** - * @ingroup jsystem-jaudio - * - */ -class JAISoundHandle { -public: - JAISoundHandle() {sound_ = NULL;}; - ~JAISoundHandle() { releaseSound(); } - - bool isSoundAttached() const { return sound_ != NULL; } - - JAISound* getSound() { - JUT_ASSERT(41, sound_ != NULL); - return sound_; - } - - JAISound* operator->() const { - JUT_ASSERT(58, sound_ != NULL); - return sound_; - } - - operator bool() const { return isSoundAttached(); } - - void releaseSound(); - - JAISound* sound_; -}; - /** * @ingroup jsystem-jaudio * diff --git a/include/JSystem/JAudio2/JAIStream.h b/include/JSystem/JAudio2/JAIStream.h index 3594f05459..d6d6694be0 100644 --- a/include/JSystem/JAudio2/JAIStream.h +++ b/include/JSystem/JAudio2/JAIStream.h @@ -11,7 +11,7 @@ class JAIStreamMgr; * @ingroup jsystem-jaudio * */ -class JAIStream : public JASPoolAllocObject, public JAISound, public JSULink { +class JAIStream : public JAISound, public JSULink, public JASPoolAllocObject { public: struct TInner { JASAramStream aramStream_; diff --git a/include/JSystem/JAudio2/JASAiCtrl.h b/include/JSystem/JAudio2/JASAiCtrl.h index a13dad1586..d7e7ff73fe 100644 --- a/include/JSystem/JAudio2/JASAiCtrl.h +++ b/include/JSystem/JAudio2/JASAiCtrl.h @@ -17,6 +17,7 @@ enum JASMixMode { namespace JASDriver { typedef s16* (*MixCallback)(s32); typedef void (*MixFunc)(s16*, u32, MixCallback); + typedef void (*DSPBufCallback)(s16*, u32); void initAI(void (*)(void)); void startDMA(); @@ -27,6 +28,7 @@ namespace JASDriver { void readDspBuffer(s16*, u32); void finishDSPFrame(); void registerMixCallback(MixCallback, JASMixMode); + void registDSPBufCallback(DSPBufCallback); f32 getDacRate(); u32 getSubFrames(); u32 getDacSize(); @@ -48,7 +50,7 @@ namespace JASDriver { extern s32 sDspDacWriteBuffer; extern s32 sDspDacReadBuffer; extern s32 sDspStatus; - extern void (*sDspDacCallback)(s16*, u32); + extern DSPBufCallback sDspDacCallback; extern s16* lastRspMadep; extern void (*dacCallbackFunc)(s16*, u32); extern MixCallback extMixCallback; diff --git a/include/JSystem/JAudio2/JASAudioReseter.h b/include/JSystem/JAudio2/JASAudioReseter.h index 91e34dc8fd..18850e8832 100644 --- a/include/JSystem/JAudio2/JASAudioReseter.h +++ b/include/JSystem/JAudio2/JASAudioReseter.h @@ -18,8 +18,8 @@ struct JASAudioReseter { /* 0x0 */ u32 field_0x0; /* 0x4 */ f32 mDSPLevel; - /* 0x8 */ s32 mIsDone; - /* 0xC */ bool field_0xc; + /* 0x8 */ s32 mDoneFlag; + /* 0xC */ bool mThreadStopFlag; }; // Size: 0x10 #endif /* JASAUDIORESETER_H */ diff --git a/include/JSystem/JAudio2/JASBNKParser.h b/include/JSystem/JAudio2/JASBNKParser.h index bebe1a1f05..df742ed681 100644 --- a/include/JSystem/JAudio2/JASBNKParser.h +++ b/include/JSystem/JAudio2/JASBNKParser.h @@ -132,7 +132,10 @@ namespace JASBNKParser { JASBank* createBank(void const*, JKRHeap*); JASBasicBank* createBasicBank(void const*, JKRHeap*); - inline u32 getBankNumber(const void* param_0) { return ((u32*)param_0)[2]; } + inline u32 getBankNumber(const void* param_0) { + u32* ptr = (u32*)param_0; + return ptr[2]; + } extern u32 sUsedHeapSize; }; diff --git a/include/JSystem/JAudio2/JASBasicWaveBank.h b/include/JSystem/JAudio2/JASBasicWaveBank.h index 820eae2fc3..73a6b9fdd4 100644 --- a/include/JSystem/JAudio2/JASBasicWaveBank.h +++ b/include/JSystem/JAudio2/JASBasicWaveBank.h @@ -10,9 +10,9 @@ */ struct JASBasicWaveBank : public JASWaveBank { struct TWaveHandle : public JASWaveHandle { - int getWavePtr() const; TWaveHandle() { mHeap = NULL; } - const JASWaveInfo* getWaveInfo() const { return &field_0x4; } + virtual int getWavePtr() const; + virtual const JASWaveInfo* getWaveInfo() const { return &field_0x4; } bool compareHeap(JASHeap* heap) const { return mHeap == heap;} /* 0x04 */ JASWaveInfo field_0x4; @@ -31,10 +31,10 @@ struct JASBasicWaveBank : public JASWaveBank { struct TWaveGroup : JASWaveArc { TWaveGroup(); - ~TWaveGroup(); + virtual ~TWaveGroup(); void setWaveCount(u32, JKRHeap*); - void onLoadDone(); - void onEraseDone(); + virtual void onLoadDone(); + virtual void onEraseDone(); u32 getWaveID(int) const; /* 0x74 */ JASBasicWaveBank* mBank; diff --git a/include/JSystem/JAudio2/JASDSPChannel.h b/include/JSystem/JAudio2/JASDSPChannel.h index dce5c6cd52..0bf221ef4a 100644 --- a/include/JSystem/JAudio2/JASDSPChannel.h +++ b/include/JSystem/JAudio2/JASDSPChannel.h @@ -38,6 +38,9 @@ struct JASDSPChannel { static void updateAll(); static int killActiveChannel(); static JASDSPChannel* getHandle(u32); + static u32 getNumUse(); + static u32 getNumFree(); + static u32 getNumBreak(); static JASDSPChannel* sDspChannels; diff --git a/include/JSystem/JAudio2/JASDSPInterface.h b/include/JSystem/JAudio2/JASDSPInterface.h index 3081075486..7c519402f9 100644 --- a/include/JSystem/JAudio2/JASDSPInterface.h +++ b/include/JSystem/JAudio2/JASDSPInterface.h @@ -19,14 +19,14 @@ namespace JASDsp { }; typedef struct { - s16 field_0x0; - s16 field_0x2; + u16 field_0x0; + u16 field_0x2; s16* field_0x4; - s16 field_0x8; + u16 field_0x8; s16 field_0xa; - s16 field_0xc; + u16 field_0xc; s16 field_0xe; - s16 field_0x10[8]; + u16 field_0x10[8]; } FxBuf; struct TChannel { @@ -63,7 +63,7 @@ namespace JASDsp { /* 0x00E */ short field_0x00E; /* 0x010 */ u16 field_0x010[1][4]; // array size unknown /* 0x018 */ u8 field_0x018[0x050 - 0x018]; - /* 0x050 */ short field_0x050; + /* 0x050 */ u16 field_0x050; /* 0x052 */ u16 field_0x052; /* 0x054 */ u16 field_0x054; /* 0x056 */ u16 field_0x056; @@ -106,11 +106,13 @@ namespace JASDsp { void setDSPMixerLevel(f32); f32 getDSPMixerLevel(); TChannel* getDSPHandle(int); + TChannel* getDSPHandleNc(int); void setFilterTable(s16*, s16*, u32); void flushBuffer(); void invalChannelAll(); void initBuffer(); int setFXLine(u8, s16*, JASDsp::FxlineConfig_*); + BOOL changeFXLineParam(u8, u8, u32); extern u8 const DSPADPCM_FILTER[64]; extern u32 const DSPRES_FILTER[320]; diff --git a/include/JSystem/JAudio2/JASDriverIF.h b/include/JSystem/JAudio2/JASDriverIF.h index c44dab2b43..319c826345 100644 --- a/include/JSystem/JAudio2/JASDriverIF.h +++ b/include/JSystem/JAudio2/JASDriverIF.h @@ -8,6 +8,7 @@ typedef s32 (*DriverCallback)(void*); namespace JASDriver { void setDSPLevel(f32); u16 getChannelLevel_dsp(); + f32 getChannelLevel(); f32 getDSPLevel(); void setOutputMode(u32); u32 getOutputMode(); diff --git a/include/JSystem/JAudio2/JAUAudioArcLoader.h b/include/JSystem/JAudio2/JAUAudioArcLoader.h index 6e5440626b..21a1266e41 100644 --- a/include/JSystem/JAudio2/JAUAudioArcLoader.h +++ b/include/JSystem/JAudio2/JAUAudioArcLoader.h @@ -31,4 +31,23 @@ public: /* 0x0C */ JAUSection* mSection; }; +class JAUAudioArcLoader_withoutCopy : public JAUAudioArcInterpreter { + virtual void readWS(u32, void const*, u32); + virtual void readBNK(u32, void const*); + virtual void readBSC(void const*, u32); + virtual void readBST(void const*, u32); + virtual void readBSTN(void const*, u32); + virtual void readBMS(u32, void const*, u32); + virtual void readBMS_fromArchive(u32); + virtual void newVoiceBank(u32, u32); + virtual void newDynamicSeqBlock(u32); + virtual void readBSFT(void const*); + virtual void beginBNKList(u32, u32); + virtual void endBNKList(); + virtual void readMaxSeCategory(int, int, int); + virtual ~JAUAudioArcLoader_withoutCopy() {} + + /* 0x0C */ JAUSection* mSection; +}; + #endif /* JAUAUDIOARCLOADER_H */ diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h index 21049065f1..25eee17d55 100644 --- a/include/JSystem/JAudio2/JAUSectionHeap.h +++ b/include/JSystem/JAudio2/JAUSectionHeap.h @@ -64,7 +64,12 @@ public: bool isBuilding() const { return field_0x2c; } bool isOpen() const; - JAUSectionHeap* asSectionHeap() { return (JAUSection*)sectionHeap_ == this ? sectionHeap_ : NULL; } + JAUSectionHeap* asSectionHeap() { + if ((JAUSection*)sectionHeap_ == this) { + return sectionHeap_; + } + return NULL; + } const TSectionData& getSectionData() const { return data_; } JKRHeap* getHeap_(); @@ -99,6 +104,7 @@ public: u32 releaseIdleDynamicSeqDataBlock(); JAUSectionHeap(JKRSolidHeap*, bool, s32); JAUSection* getOpenSection(); + JAUSection* getSection(int); bool setSeqDataUser(JAISeqDataUser*); bool newDynamicSeqBlock(u32); SeqDataReturnValue getSeqData(JAISoundID, JAISeqData*); @@ -123,7 +129,7 @@ public: }; inline JKRHeap* JAUSection::getHeap_() { return sectionHeap_->mHeap; } -inline bool JAUSection::isOpen() const { return this == sectionHeap_->getOpenSection(); } +inline bool JAUSection::isOpen() const { return sectionHeap_->getOpenSection() == this; } JAUSectionHeap* JAUNewSectionHeap(bool); diff --git a/include/JSystem/JAudio2/JAUSeqCollection.h b/include/JSystem/JAudio2/JAUSeqCollection.h index 586f33e4a7..fae2688bed 100644 --- a/include/JSystem/JAudio2/JAUSeqCollection.h +++ b/include/JSystem/JAudio2/JAUSeqCollection.h @@ -29,7 +29,7 @@ public: bool getSeqData(int, int, JAISeqData*); bool getSeqDataRegion(JAISeqDataRegion*); - bool isValid() { return field_0x8; } + bool isValid() const { return field_0x8; } /* 0x00 */ u16 field_0x0; /* 0x04 */ const u32* field_0x4; diff --git a/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h b/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h index 41a4115040..aa77383a4f 100644 --- a/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h +++ b/include/JSystem/JAudio2/JAUSeqDataBlockMgr.h @@ -17,7 +17,7 @@ struct JAUSeqDataBlock { /* 0x00 */ JSULink field_0x0; /* 0x10 */ JAISoundID field_0x10; - /* 0x14 */ JAISeqDataRegion field_0x14; + /* 0x14 */ JAISeqDataRegion region; /* 0x1C */ int field_0x1c; }; diff --git a/include/JSystem/JAudio2/JAUStreamFileTable.h b/include/JSystem/JAudio2/JAUStreamFileTable.h index 00f660509f..5e7e894940 100644 --- a/include/JSystem/JAudio2/JAUStreamFileTable.h +++ b/include/JSystem/JAudio2/JAUStreamFileTable.h @@ -4,8 +4,8 @@ #include "JSystem/JAudio2/JAIStreamDataMgr.h" struct BinaryStreamFileTable { - /* 0x0 */ char mIdentifier[4]; - /* 0x4 */ int mNumFiles; + /* 0x0 */ u8 mIdentifier[4]; + /* 0x4 */ u32 mNumFiles; /* 0x8 */ int mFilePathOffsets[]; }; @@ -16,7 +16,7 @@ struct BinaryStreamFileTable { struct JAUStreamFileTable { JAUStreamFileTable(); void init(void const*); - int getNumFiles() const; + u32 getNumFiles() const; const char* getFilePath(int) const; bool isValid() { return mData; } diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index 0284012f49..0f149dc7b9 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -65,6 +65,7 @@ public: bool setErrorFlag(bool errorFlag); bool isSubHeap(JKRHeap* heap) const; + void* getAltAramStartAdr(); /* vt[03] */ virtual void callAllDisposer(); /* vt[04] */ virtual u32 getHeapType() = 0; diff --git a/src/JSystem/JAudio2/JAISeq.cpp b/src/JSystem/JAudio2/JAISeq.cpp index f54c0ee242..7f9f9132d1 100644 --- a/src/JSystem/JAudio2/JAISeq.cpp +++ b/src/JSystem/JAudio2/JAISeq.cpp @@ -73,10 +73,12 @@ void JAISeq::reserveChildTracks_(int param_0) { track->connectChild(j, track2); } else { JUT_WARN(117, "%s", "JASPoolAllocObject::::operator new failed .\n"); + continue; } } } else { JUT_WARN(124, "%s", "JASPoolAllocObject::::operator new failed .\n"); + continue; } } } diff --git a/src/JSystem/JAudio2/JAISoundStarter.cpp b/src/JSystem/JAudio2/JAISoundStarter.cpp index 5dc20b6737..6de5c0c281 100644 --- a/src/JSystem/JAudio2/JAISoundStarter.cpp +++ b/src/JSystem/JAudio2/JAISoundStarter.cpp @@ -10,19 +10,20 @@ JAISoundStarter::~JAISoundStarter() {} bool JAISoundStarter::startLevelSound(JAISoundID id, JAISoundHandle* handlePtr, const JGeometry::TVec3* posPtr) { JUT_ASSERT(20, handlePtr); - if (*handlePtr) { - if ((*handlePtr)->getID() == id) { - (*handlePtr)->updateLifeTime(1); + JAISoundHandle* handlePtr2 = handlePtr; + if (*handlePtr2) { + if ((*handlePtr2)->getID() == id) { + (*handlePtr2)->updateLifeTime(1); if (posPtr != NULL) { - (*handlePtr)->setPos(*posPtr); + (*handlePtr2)->setPos(*posPtr); } return true; } } bool rt = startSound(id, handlePtr, posPtr); - if (rt && *handlePtr) { - (*handlePtr)->setLifeTime(1, false); + if (rt && *handlePtr2) { + (*handlePtr2)->setLifeTime(1, false); } return rt; } diff --git a/src/JSystem/JAudio2/JAIStream.cpp b/src/JSystem/JAudio2/JAIStream.cpp index e4a0c7dd4e..f228347d26 100644 --- a/src/JSystem/JAudio2/JAIStream.cpp +++ b/src/JSystem/JAudio2/JAIStream.cpp @@ -251,7 +251,7 @@ JAISoundChild* JAIStream::getChild(int index) { if (children_[index] == NULL) { children_[index] = new JAISoundChild(); if (children_[index] == NULL) { - JUT_WARN(370, "%s", "JASPoolAllocObject::::operator new failed .") + JUT_WARN(370, "%s", "JASPoolAllocObject::::operator new failed .\n") } } return children_[index]; diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/src/JSystem/JAudio2/JASAiCtrl.cpp index de97b58a3f..662e5e6df4 100644 --- a/src/JSystem/JAudio2/JASAiCtrl.cpp +++ b/src/JSystem/JAudio2/JASAiCtrl.cpp @@ -30,7 +30,7 @@ s32 JASDriver::sDspDacReadBuffer; s32 JASDriver::sDspStatus; -void (*JASDriver::sDspDacCallback)(s16*, u32); +JASDriver::DSPBufCallback JASDriver::sDspDacCallback; s16* JASDriver::lastRspMadep; @@ -140,7 +140,6 @@ void JASDriver::updateDac() { } void JASDriver::updateDSP() { - static u32 history[10] = {0x000F4240}; JASProbe::start(3, "SFR-UPDATE"); JASDsp::invalChannelAll(); @@ -151,6 +150,7 @@ void JASDriver::updateDSP() { JASPortCmd::execAllCommand(); DSPSyncCallback(); static u32 old_time = 0; + static u32 history[10] = {0x000F4240}; u32 r28 = OSGetTick(); u32 r27 = r28 - old_time; old_time = r28; @@ -210,15 +210,37 @@ void JASDriver::readDspBuffer(s16* param_0, u32 param_1) { JASCalc::imixcopy(endDacBuffer, dacBuffer, param_0, param_1); } +u32 sDspUpCount; + void JASDriver::finishDSPFrame() { + static u32 waitcount; int r30 = sDspDacWriteBuffer + 1; if (r30 == data_804507A8) { r30 = 0; } if (r30 == sDspDacReadBuffer) { sDspStatus = 0; +#if DEBUG + if (sDspStatus != 0) { + waitcount = 0; + } else { + waitcount++; + } + if (waitcount != 7) { + return; + } + if (sDspUpCount != 0) { + JUT_WARN(0, "forth DSP return\n"); + } + if (sDspUpCount == 0) { + sDspUpCount += 1; + } + JASReport("finishDSPFrame nbuf:%d sWBuf:%d BCount:%d stat:%d", r30, sDspDacWriteBuffer, data_804507A8, sDspStatus); +#else return; +#endif } + sDspDacWriteBuffer = r30; JASAudioThread::setDSPSyncCount(getSubFrames()); JASProbe::start(7, "DSP-MAIN"); @@ -236,6 +258,10 @@ void JASDriver::registerMixCallback(MixCallback param_0, JASMixMode param_1) { sMixMode = param_1; } +void JASDriver::registDSPBufCallback(DSPBufCallback cb) { + sDspDacCallback = cb; +} + f32 JASDriver::getDacRate() { return sDacRate; } @@ -254,68 +280,84 @@ u32 JASDriver::getFrameSamples() { void JASDriver::mixMonoTrack(s16* buffer, u32 param_1, MixCallback param_2) { JASProbe::start(5, "MONO-MIX"); - s16* r31 = param_2(param_1); - s16* pTrack = buffer; - if (r31 == NULL) { + s16* r26 = param_2(param_1); + if (r26 == NULL) { return; } JASProbe::stop(5); + s16* pTrack = buffer; + s16* r28 = r26; for (u32 i = param_1; i != 0; i--) { - pTrack[0] = JASCalc::clamp(pTrack[0] + r31[0]); - pTrack[1] = JASCalc::clamp(pTrack[1] + r31[0]); - pTrack += 2; - r31++; + s32 src = pTrack[0]; + src += r28[0]; + pTrack[0] = JASCalc::clamp(src); + pTrack++; + src = pTrack[0]; + src += r28[0]; + pTrack[0] = JASCalc::clamp(src); + pTrack++; + r28++; } } void JASDriver::mixMonoTrackWide(s16* buffer, u32 param_1, MixCallback param_2) { JASProbe::start(5, "MONO(W)-MIX"); - s16* r31 = param_2(param_1); - s16* pTrack = buffer; - if (!r31) { + s16* r26 = param_2(param_1); + if (!r26) { return; } JASProbe::stop(5); + s16* pTrack = buffer; + s16* r28 = r26; for (u32 i = param_1; i != 0; i--) { - pTrack[0] = JASCalc::clamp(pTrack[0] + r31[0]); - s32 src = pTrack[1]; - src -= r31[0]; - pTrack[1] = JASCalc::clamp(src); - pTrack += 2; - r31++; + s32 src = pTrack[0]; + src += r28[0]; + pTrack[0] = JASCalc::clamp(src); + pTrack++; + src = pTrack[0]; + src -= r28[0]; + pTrack[0] = JASCalc::clamp(src); + pTrack++; + r28++; } } void JASDriver::mixExtraTrack(s16* buffer, u32 param_1, MixCallback param_2) { JASProbe::start(5, "DSPMIX"); - s16* r31 = param_2(param_1); - if (!r31) { + s16* r27 = param_2(param_1); + if (!r27) { return; } JASProbe::stop(5); JASProbe::start(6, "MIXING"); s16* pTrack = buffer; - s16* r29 = r31 + getFrameSamples(); + s16* r29 = r27; + s16* r28 = r27 + getFrameSamples(); for (u32 i = param_1; i != 0; i--) { - pTrack[0] = JASCalc::clamp(pTrack[0] + r29[0]); - pTrack[1] = JASCalc::clamp(pTrack[1] + r31[0]); - pTrack += 2; + s32 r25 = pTrack[0] + r28[0]; + pTrack[0] = JASCalc::clamp(r25); + pTrack++; + r25 = pTrack[0] + r29[0]; + pTrack[0] = JASCalc::clamp(r25); + pTrack++; + r28++; r29++; - r31++; } JASProbe::stop(6); } void JASDriver::mixInterleaveTrack(s16* buffer, u32 param_1, MixCallback param_2) { s16* r31 = param_2(param_1); - if (r31) { - s16* pTrack = buffer; - s16* r30 = r31; - for (u32 i = param_1 * 2; i != 0; i--) { - pTrack[0] = JASCalc::clamp(pTrack[0] + r30[0]); - pTrack += 1; - r30++; - } + if (!r31) { + return; + } + s16* pTrack = buffer; + s16* r30 = r31; + for (u32 i = param_1 * 2; i != 0; i--) { + s32 r26 = pTrack[0] + r30[0]; + pTrack[0] = JASCalc::clamp(r26); + pTrack++; + r30++; } } diff --git a/src/JSystem/JAudio2/JASAudioReseter.cpp b/src/JSystem/JAudio2/JASAudioReseter.cpp index 834320869a..14599d032b 100644 --- a/src/JSystem/JAudio2/JASAudioReseter.cpp +++ b/src/JSystem/JAudio2/JASAudioReseter.cpp @@ -10,41 +10,46 @@ struct JASDSPChannel { void drop(); static JASDSPChannel* getHandle(u32); - inline u32 getStatus() {return mStatus;} + inline u8 getStatus() const { return mStatus; } u32 mStatus; }; JASAudioReseter::JASAudioReseter() { field_0x0 = 0; - mIsDone = true; - field_0xc = false; + mDoneFlag = true; + mThreadStopFlag = false; mDSPLevel = JASDriver::getDSPLevel(); } -JASAudioReseter::~JASAudioReseter() {} +JASAudioReseter::~JASAudioReseter() { + JUT_ASSERT(28, mDoneFlag); +} bool JASAudioReseter::start(u32 param_0, bool param_1) { - if (mIsDone == false) { + if (mDoneFlag == false) { return false; } - field_0xc = param_1; + mThreadStopFlag = param_1; JASCriticalSection critical; if (!JASDriver::registerDspSyncCallback(callback, this)) { + JUT_WARN(40, "%s", "Failed JASAudioReseter start\n"); return false; } else { mDSPLevel = JASDriver::getDSPLevel(); field_0x0 = param_0; - mIsDone = false; + mDoneFlag = false; return true; } } void JASAudioReseter::resume() { + JUT_ASSERT(55, mDoneFlag); + JUT_ASSERT(56, ! mThreadStopFlag); JASDriver::setDSPLevel(mDSPLevel); } s32 JASAudioReseter::checkDone() const { - return mIsDone; + return mDoneFlag; } @@ -52,23 +57,24 @@ s32 JASAudioReseter::calc() { if(field_0x0==0) { for(size_t i = 0; i<64; i++) { JASDSPChannel* handle = JASDSPChannel::getHandle(i); - if ((handle->getStatus()&0xFF)==0) { + if ((handle->getStatus())==0) { handle->drop(); } } - if(field_0xc!=false) { - JASGlobalInstance::getInstance()->stop();//JASGlobalInstance::sInstance->stop(); + if(mThreadStopFlag!=false) { + JASAudioThread* pAudioThread = JASGlobalInstance::getInstance(); + JUT_ASSERT(78, pAudioThread); + pAudioThread->stop(); } - mIsDone = 1; + mDoneFlag = 1; return -1; } field_0x0--; - u32 unk = field_0x0; - float dspLevel = JASDriver::getDSPLevel(); - JASDriver::setDSPLevel(((float)unk*dspLevel)/(float)(unk+1)); + JASDriver::setDSPLevel(field_0x0 * JASDriver::getDSPLevel() / (field_0x0 + 1)); return 0; } s32 JASAudioReseter::callback(void* param_0) { - return ((JASAudioReseter*)param_0)->calc(); + JASAudioReseter* i_this = (JASAudioReseter*) param_0; + return i_this->calc(); } diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/src/JSystem/JAudio2/JASAudioThread.cpp index fef909dd16..e1f6f83f08 100644 --- a/src/JSystem/JAudio2/JASAudioThread.cpp +++ b/src/JSystem/JAudio2/JASAudioThread.cpp @@ -7,6 +7,7 @@ #include "JSystem/JAudio2/JASDSPInterface.h" #include "JSystem/JAudio2/JASHeapCtrl.h" #include "JSystem/JAudio2/JASProbe.h" +#include "JSystem/JAudio2/JASReport.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "dolphin/dsp.h" #include "stdint.h" @@ -21,9 +22,17 @@ JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority) } void JASAudioThread::create(s32 threadPriority) { - JASAudioThread* sAudioThread = new (JASDram, 0) JASAudioThread(threadPriority, 0x10, 0x1400); - sAudioThread->setCurrentHeap(JKRGetSystemHeap()); - sAudioThread->resume(); +#if PLATFORM_GCN + const int size = 0x1400; +#else + const int size = 0x2800; +#endif + JASAudioThread* pAudioThread = new (JASDram, 0) JASAudioThread(threadPriority, 0x10, size); + JUT_ASSERT(46, pAudioThread); + JKRHeap* pCurrentHeap = JKRGetSystemHeap(); + JUT_ASSERT(48, pCurrentHeap); + pAudioThread->setCurrentHeap(pCurrentHeap); + pAudioThread->resume(); } void JASAudioThread::stop() { @@ -59,19 +68,27 @@ void* JASAudioThread::run() { JASPoolAllocObject_MultiThreaded::newMemPool(0x48); JASDriver::startDMA(); + OSMessage msg; while (true) { - OSMessage msg = waitMessageBlock(); + msg = waitMessageBlock(); switch ((intptr_t)msg) { case AUDIOMSG_DMA: if (sbPauseFlag) { + JUT_PANIC(107, "AUDIO THREAD PAUSED\n"); JASDriver::stopDMA(); OSSleepThread(&sThreadQueue); } +#if DEBUG + if (snIntCount != 0) { + JASReport("DSP process is over."); + } +#endif JASDriver::updateDac(); JASDriver::updateDacCallback(); - break; + continue; case AUDIOMSG_DSP: + JUT_ASSERT(125, snIntCount != 0); snIntCount--; if (snIntCount == 0) { JASProbe::stop(7); @@ -81,31 +98,41 @@ void* JASAudioThread::run() { JASDriver::updateDSP(); JASProbe::stop(2); } - break; + continue; case AUDIOMSG_STOP: JASDriver::stopDMA(); OSExitThread(NULL); - break; + continue; + default: + JUT_PANIC(152, "AUDIO THREAD INVALID MESSAGE\n"); } } } void JASAudioThread::DMACallback() { - JASAudioThread* thread = getInstance(); + JASAudioThread* pAudioThread = getInstance(); + JUT_ASSERT(167, pAudioThread); JASProbe::stop(4); JASProbe::start(4, "UPDATE-DAC"); - thread->sendMessage((void*)AUDIOMSG_DMA); + if (!pAudioThread->sendMessage((void*)AUDIOMSG_DMA)) { + JUT_WARN_DEVICE(173, 1, "%s","----- DMACallback : Can\'t send DAC_SYNC message\n"); + } } void JASAudioThread::DSPCallback(void*) { - JASAudioThread* thread = getInstance(); + JASAudioThread* pAudioThread = getInstance(); + JUT_ASSERT(184, pAudioThread); while (DSPCheckMailFromDSP() == 0) { } u32 mail = DSPReadMailFromDSP(); - if (mail >> 0x10 == 0xF355) { + if (mail >> 0x10 != 0xF355) { + JUT_WARN(196, "DSP Mail format error %x\n", mail); + } else { if ((mail & 0xFF00) == 0xFF00) { - thread->sendMessage((void*)AUDIOMSG_DSP); + if (!pAudioThread->sendMessage((void*)AUDIOMSG_DSP)) { + JUT_WARN_DEVICE(204, 1, "%s", "----- syncDSP : Send Miss\n"); + } } else { JASDsp::finishWork(mail); } diff --git a/src/JSystem/JAudio2/JASDSPChannel.cpp b/src/JSystem/JAudio2/JASDSPChannel.cpp index b1e4dc1296..268c80a779 100644 --- a/src/JSystem/JAudio2/JASDSPChannel.cpp +++ b/src/JSystem/JAudio2/JASDSPChannel.cpp @@ -43,6 +43,7 @@ void JASDSPChannel::drop() { void JASDSPChannel::initAll() { sDspChannels = new (JASDram, 0x20) JASDSPChannel[0x40]; + JUT_ASSERT(102, sDspChannels); for (int i = 0; i < 0x40; i++) { sDspChannels[i].mChannel = JASDsp::getDSPHandle(i); } @@ -87,7 +88,7 @@ JASDSPChannel* JASDSPChannel::getLowestChannel(int i_priority) { JASDSPChannel* channel = &sDspChannels[i]; s16 priority = channel->mPriority; if (priority < 0) { - return channel; + return &sDspChannels[i]; } if (priority <= i_priority && priority <= best_priority) { if (priority != best_priority || channel->field_0xc > best_unknown) { @@ -127,7 +128,8 @@ JASDSPChannel* JASDSPChannel::getLowestActiveChannel() { } void JASDSPChannel::updateProc() { - int ret; + int ret = 0; + bool flush; if (mChannel->isFinish()) { mFlags &= ~2; if (mStatus == STATUS_ACTIVE) { @@ -173,7 +175,7 @@ void JASDSPChannel::updateProc() { mChannel->flush(); } } else if (mStatus != STATUS_INACTIVE) { - bool flush = false; + flush = false; if (mCallback != NULL) { ret = mCallback(CB_PLAY, mChannel, mCallbackData); flush = true; @@ -225,3 +227,33 @@ int JASDSPChannel::killActiveChannel() { JASDSPChannel* JASDSPChannel::getHandle(u32 i_index) { return &sDspChannels[i_index]; } + +u32 JASDSPChannel::getNumUse() { + u32 count = 0; + for (int i = 0; i < 0x40; i++) { + if (sDspChannels[i].mStatus == 0) { + count++; + } + } + return count; +} + +u32 JASDSPChannel::getNumFree() { + u32 count = 0; + for (int i = 0; i < 0x40; i++) { + if (sDspChannels[i].mStatus == 1) { + count++; + } + } + return count; +} + +u32 JASDSPChannel::getNumBreak() { + u32 count = 0; + for (int i = 0; i < 0x40; i++) { + if (sDspChannels[i].mStatus == 2) { + count++; + } + } + return count; +} diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/src/JSystem/JAudio2/JASDSPInterface.cpp index 4d1a2f1d8b..79cf9bb249 100644 --- a/src/JSystem/JAudio2/JASDSPInterface.cpp +++ b/src/JSystem/JAudio2/JASDSPInterface.cpp @@ -17,10 +17,34 @@ JASDsp::FxBuf* JASDsp::FX_BUF; f32 JASDsp::sDSPVolume; +u16 JASDsp::SEND_TABLE[] = { + 0x0D00, + 0x0D60, + 0x0DC8, + 0x0E28, + 0x0E88, + 0x0EE8, + 0x0CA0, + 0x0F40, + 0x0FA0, + 0x0B00, + 0x09A0, + 0x0000, +}; + +u32 JASWaveInfo::one = 1; + +#if DEBUG +s32 JASDsp::dspMutex = 1; +#endif + void JASDsp::boot(void (*param_0)(void*)) { static bool data_804512F4 = true; if (data_804512F4) { DspBoot(param_0); +#if !PLATFORM_GCN + // DsetVARAM(JKRHeap::getAltAramStartAdr()); +#endif data_804512F4 = false; } } @@ -40,6 +64,7 @@ void JASDsp::syncFrame(u32 param_0, u32 param_1, u32 param_2) { void JASDsp::setDSPMixerLevel(f32 dsp_level) { sDSPVolume = dsp_level; dsp_level *= 4.0f; + JUT_ASSERT(277, (0.0 <= dsp_level) && (dsp_level <= 8.0)); DsetMixerLevel(dsp_level); } @@ -51,6 +76,10 @@ JASDsp::TChannel* JASDsp::getDSPHandle(int param_0) { return CH_BUF + param_0; } +JASDsp::TChannel* JASDsp::getDSPHandleNc(int param_0) { + return (TChannel*)OSCachedToUncached(CH_BUF + param_0); +} + void JASDsp::setFilterTable(s16* param_0, s16* param_1, u32 param_2) { for (int i = 0; i < param_2; i++) { *param_0++ = *param_1++; @@ -398,7 +427,9 @@ u32 const ATTRIBUTE_ALIGN(32) JASDsp::DSPRES_FILTER[320] = { void JASDsp::initBuffer() { CH_BUF = new(JASDram, 0x20) TChannel[64]; + JUT_ASSERT(354, CH_BUF); FX_BUF = new(JASDram, 0x20) FxBuf[4]; + JUT_ASSERT(356, FX_BUF); JASCalc::bzero(CH_BUF, 0x6000); JASCalc::bzero(FX_BUF, sizeof(FxBuf) * 4); for (u8 i = 0; i < 4; i++) { @@ -408,22 +439,7 @@ void JASDsp::initBuffer() { flushBuffer(); } -u16 JASDsp::SEND_TABLE[] = { - 0x0D00, - 0x0D60, - 0x0DC8, - 0x0E28, - 0x0E88, - 0x0EE8, - 0x0CA0, - 0x0F40, - 0x0FA0, - 0x0B00, - 0x09A0, - 0x0000, -}; - -int JASDsp::setFXLine(u8 param_0, s16* param_1, JASDsp::FxlineConfig_* param_2) { +int JASDsp::setFXLine(u8 param_0, s16* buffer, JASDsp::FxlineConfig_* param_2) { FxBuf* puVar3 = FX_BUF + param_0; JASCriticalSection aJStack_20; puVar3->field_0x0 = 0; @@ -433,15 +449,17 @@ int JASDsp::setFXLine(u8 param_0, s16* param_1, JASDsp::FxlineConfig_* param_2) puVar3->field_0xe = param_2->field_0x8; puVar3->field_0xc = SEND_TABLE[param_2->field_0x6]; puVar3->field_0x2 = param_2->field_0xc; - setFilterTable(puVar3->field_0x10, param_2->field_0x10, 8); + setFilterTable((s16*)puVar3->field_0x10, param_2->field_0x10, 8); } - if (param_1 != NULL && param_2 != NULL) { - u32 iVar1 = param_2->field_0xc * 0xa0; - puVar3->field_0x4 = param_1; - JASCalc::bzero(param_1, iVar1); - DCFlushRange(param_1, iVar1); - } else if (param_2 == NULL || param_1 != NULL) { - puVar3->field_0x4 = param_1; + if (buffer != NULL && param_2 != NULL) { + u32 bufsize = param_2->field_0xc * 0xa0; + puVar3->field_0x4 = buffer; + JASCalc::bzero(buffer, bufsize); + JUT_ASSERT(420, (reinterpret_cast(buffer) & 0x1f) == 0); + JUT_ASSERT(421, (bufsize & 0x1f) == 0); + DCFlushRange(buffer, bufsize); + } else if (param_2 == NULL || buffer != NULL) { + puVar3->field_0x4 = buffer; } if (puVar3->field_0x4 != NULL) { @@ -453,7 +471,31 @@ int JASDsp::setFXLine(u8 param_0, s16* param_1, JASDsp::FxlineConfig_* param_2) return 1; } +BOOL JASDsp::changeFXLineParam(u8 param_0, u8 param_1, u32 param_2) { + JUT_ASSERT(450, dspMutex); + FxBuf* buf = &FX_BUF[param_0]; + switch (param_1) { + case 0: buf->field_0x8 = param_2; break; + case 1: buf->field_0xc = param_2; break; + case 2: buf->field_0xa = param_2; break; + case 3: buf->field_0xe = param_2; break; + case 4: buf->field_0x2 = param_2; break; + case 5: buf->field_0x10[0] = param_2; break; + case 6: buf->field_0x10[1] = param_2; break; + case 7: buf->field_0x10[2] = param_2; break; + case 8: buf->field_0x10[3] = param_2; break; + case 9: buf->field_0x10[4] = param_2; break; + case 10: buf->field_0x10[5] = param_2; break; + case 11: buf->field_0x10[6] = param_2; break; + case 12: buf->field_0x10[7] = param_2; break; + case 13: setFilterTable((s16*)buf->field_0x10, (s16*)param_2, 8); break; + case 14: buf->field_0x0 = param_2; break; + } + return 1; +} + void JASDsp::TChannel::init() { + JUT_ASSERT(489, dspMutex); mPauseFlag = 0; mIsFinished = 0; mForcedStop = 0; @@ -464,6 +506,7 @@ void JASDsp::TChannel::init() { } void JASDsp::TChannel::playStart() { + JUT_ASSERT(508, dspMutex); field_0x10c = 0; field_0x060 = 0; field_0x008 = 1; @@ -480,27 +523,34 @@ void JASDsp::TChannel::playStart() { } void JASDsp::TChannel::playStop() { + JUT_ASSERT(540, dspMutex); mIsActive = 0; } void JASDsp::TChannel::replyFinishRequest() { + JUT_ASSERT(549, dspMutex); mIsFinished = 0; mIsActive = 0; } void JASDsp::TChannel::forceStop() { + JUT_ASSERT(559, dspMutex); mForcedStop = 1; } bool JASDsp::TChannel::isActive() const { + JUT_ASSERT(568, dspMutex); return mIsActive != 0; } bool JASDsp::TChannel::isFinish() const { + JUT_ASSERT(577, dspMutex); return mIsFinished != 0; } void JASDsp::TChannel::setWaveInfo(JASWaveInfo const& param_0, u32 param_1, u32 param_2) { + int i; + JUT_ASSERT(610, dspMutex); field_0x118 = param_1; static const u8 COMP_BLOCKSAMPLES[8] = {0x10, 0x10, 0x01, 0x01, 0x01, 0x10, 0x10, 0x01}; field_0x064 = COMP_BLOCKSAMPLES[param_0.field_0x00]; @@ -536,19 +586,21 @@ void JASDsp::TChannel::setWaveInfo(JASWaveInfo const& param_0, u32 param_1, u32 break; } } - for (int i = 0; i < 16; i++) { + for (i = 0; i < 16; i++) { field_0x0b0[i] = 0; } } } void JASDsp::TChannel::setOscInfo(u32 param_0) { + JUT_ASSERT(671, dspMutex); field_0x118 = 0; field_0x064 = 16; field_0x100 = param_0; } void JASDsp::TChannel::initAutoMixer() { + JUT_ASSERT(688, dspMutex); if (field_0x058) { field_0x054 = field_0x056; } else { @@ -559,6 +611,7 @@ void JASDsp::TChannel::initAutoMixer() { void JASDsp::TChannel::setAutoMixer(u16 param_0, u8 param_1, u8 param_2, u8 param_3, u8 param_4) { + JUT_ASSERT(709, dspMutex); field_0x050 = (param_1 << 8) | param_2; field_0x052 = param_3 << 8 | param_3 << 1; field_0x056 = param_0; @@ -566,6 +619,7 @@ void JASDsp::TChannel::setAutoMixer(u16 param_0, u8 param_1, u8 param_2, u8 para } void JASDsp::TChannel::setPitch(u16 param_0) { + JUT_ASSERT(763, dspMutex); if (param_0 >= 0x7fff) { param_0 = 0x7fff; } @@ -573,6 +627,7 @@ void JASDsp::TChannel::setPitch(u16 param_0) { } void JASDsp::TChannel::setMixerInitVolume(u8 param_0, s16 param_1) { + JUT_ASSERT(798, dspMutex); u16* tmp = field_0x010[param_0]; tmp[2] = param_1; tmp[1] = param_1; @@ -580,14 +635,17 @@ void JASDsp::TChannel::setMixerInitVolume(u8 param_0, s16 param_1) { } void JASDsp::TChannel::setMixerVolume(u8 param_0, s16 param_1) { + u16* tmp; + JUT_ASSERT(841, dspMutex); if (mForcedStop == 0) { - u16* tmp = field_0x010[param_0]; + tmp = field_0x010[param_0]; tmp[1] = param_1; tmp[3] &= 0xff; } } void JASDsp::TChannel::setPauseFlag(u8 param_0) { + JUT_ASSERT(863, dspMutex); mPauseFlag = param_0; } @@ -596,7 +654,8 @@ void JASDsp::TChannel::flush() { } void JASDsp::TChannel::initFilter() { - int i; + u32 i; + JUT_ASSERT(888, dspMutex); for (i = 0; i < 8; i++) { fir_filter_params[i] = 0; } @@ -609,6 +668,7 @@ void JASDsp::TChannel::initFilter() { } void JASDsp::TChannel::setFilterMode(u16 param_0) { + JUT_ASSERT(914, dspMutex); u8 r30 = param_0 & 0x20; u8 r31 = param_0 & 0x1f; if (r30) { @@ -624,24 +684,30 @@ void JASDsp::TChannel::setFilterMode(u16 param_0) { } void JASDsp::TChannel::setIIRFilterParam(s16* param_0) { + JUT_ASSERT(937, dspMutex); setFilterTable(iir_filter_params, param_0, 8); } void JASDsp::TChannel::setFIR8FilterParam(s16* param_0) { + JUT_ASSERT(948, dspMutex); setFilterTable(fir_filter_params, param_0, 8); } void JASDsp::TChannel::setDistFilter(s16 param_0) { + JUT_ASSERT(959, dspMutex); iir_filter_params[4] = param_0; } void JASDsp::TChannel::setBusConnect(u8 param_0, u8 param_1) { + JUT_ASSERT(973, dspMutex); u16* tmp = field_0x010[param_0]; static u16 const connect_table[12] = { 0x0000, 0x0D00, 0x0D60, 0x0DC0, 0x0E20, 0x0E80, 0x0EE0, 0x0CA0, 0x0F40, 0x0FA0, 0x0B00, 0x09A0, }; - tmp[0] = connect_table[param_1]; + u16 r30 = 0; + r30 = connect_table[param_1]; + tmp[0] = r30; } u16 DSP_CreateMap2(u32 param_0) { @@ -656,9 +722,3 @@ u16 DSP_CreateMap2(u32 param_0) { } return r30; } - -u32 JASWaveInfo::one = 1; - -#if DEBUG -s32 dspMutex = 1; -#endif diff --git a/src/JSystem/JAudio2/JASDriverIF.cpp b/src/JSystem/JAudio2/JASDriverIF.cpp index b579103ab6..083a969413 100644 --- a/src/JSystem/JAudio2/JASDriverIF.cpp +++ b/src/JSystem/JAudio2/JASDriverIF.cpp @@ -15,6 +15,10 @@ u16 JASDriver::getChannelLevel_dsp() { return JASDriver::MAX_MIXERLEVEL; } +f32 JASDriver::getChannelLevel() { + return MAX_MIXERLEVEL / 16383.5f; +} + f32 JASDriver::getDSPLevel() { return JASDsp::getDSPMixerLevel(); } diff --git a/src/JSystem/JAudio2/JASOscillator.cpp b/src/JSystem/JAudio2/JASOscillator.cpp index 41a1d0a018..e67f997619 100644 --- a/src/JSystem/JAudio2/JASOscillator.cpp +++ b/src/JSystem/JAudio2/JASOscillator.cpp @@ -8,10 +8,7 @@ JASOscillator::JASOscillator() { mDirectRelease = 0; _18 = 0; _1C = 0; - _0C = 0.0f; - _10 = 0.0f; - _08 = 0.0f; - _04 = 0.0f; + _04 = _08 = _10 = _0C = 0.0f; } @@ -52,6 +49,7 @@ void JASOscillator::incCounter(f32 param_0) { } f32 JASOscillator::getValue() const { + JUT_ASSERT(120, mData); return _08 * mData->mScale + mData->_14; } @@ -71,8 +69,9 @@ void JASOscillator::release() { update(); return; } - + if (mData->mTable != mData->rel_table) { + JUT_ASSERT(157, mData->rel_table != NULL); _04 = 0.0f; _0C = _08; _10 = mData->rel_table[0]._4 / 32768.0f; @@ -86,7 +85,7 @@ void JASOscillator::release() { void JASOscillator::update() { if (_1C == 4) { - s16 x = mDirectRelease & 0x3FFF; + s32 x = mDirectRelease & 0x3FFF; if (_04 < x) { updateCurrentValue(x); } else { @@ -98,25 +97,21 @@ void JASOscillator::update() { if (_1C == 2) return; - const Point* psVar1; - if (_1C == 1) { - psVar1 = mData->mTable; - } else { - psVar1 = mData->rel_table; - } + const Point* psVar1 = _1C == 1 ? mData->mTable : mData->rel_table; if (psVar1 == NULL) { _1C = 2; return; } - + while (_04 >= psVar1[_14]._2) { _04 -= psVar1[_14]._2; _08 = _10; _14++; _0C = _08; const s16* ps = &psVar1[_14]._0; - switch(ps[0]) { + s16 r26 = ps[0]; + switch(r26) { case 0xf: _1C = 0; return; @@ -127,7 +122,7 @@ void JASOscillator::update() { _14 = ps[2]; break; default: - _18 = ps[0]; + _18 = r26; _10 = ps[2] / 32768.0f; break; } @@ -172,7 +167,6 @@ void JASOscillator::updateCurrentValue(f32 param_0) { f32 fVar1 = 16.0f * (_04 / param_0); u32 index = (u32) fVar1; f32 fVar3 = (fVar1 - index); - f32 fVar2 = (1.0f - fVar3) * table[index]; - f32 fVar4 = fVar2 + fVar3 * table[index + 1]; + f32 fVar4 = (1.0f - fVar3) * table[index] + fVar3 * table[index + 1]; _08 = _0C * fVar4 + _10 * (1.0f - fVar4); } diff --git a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp b/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp index 2f226b1e1f..aacf8bcdba 100644 --- a/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp +++ b/src/JSystem/JAudio2/JAUAudioArcInterpreter.cpp @@ -98,11 +98,11 @@ bool JAUAudioArcInterpreter::readCommand_() { break; } case 'sect': { - readU8_(); u8 var1 = readU8_(); u8 var2 = readU8_(); u8 var3 = readU8_(); - readMaxSeCategory(var1, var2, var3); + u8 var4 = readU8_(); + readMaxSeCategory(var2, var3, var4); break; } default: diff --git a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp b/src/JSystem/JAudio2/JAUAudioArcLoader.cpp index 74b00eda9a..af1952144c 100644 --- a/src/JSystem/JAudio2/JAUAudioArcLoader.cpp +++ b/src/JSystem/JAudio2/JAUAudioArcLoader.cpp @@ -2,11 +2,12 @@ #include "JSystem/JAudio2/JAUAudioArcLoader.h" #include "JSystem/JAudio2/JAISeMgr.h" +#include "JSystem/JAudio2/JASReport.h" #include "JSystem/JAudio2/JAUSectionHeap.h" JAUAudioArcLoader::JAUAudioArcLoader(JAUSection* section) { - //JUT_ASSERT(13, section->isOpen()); - //JUT_ASSERT(14, section->isBuilding()); + JUT_ASSERT(13, section->isOpen()); + JUT_ASSERT(14, section->isBuilding()); mSection = section; } @@ -68,9 +69,80 @@ void JAUAudioArcLoader::endBNKList() { } void JAUAudioArcLoader::readMaxSeCategory(int param_0, int param_1, int param_2) { - JAISeMgr* seMgr = JASGlobalInstance::getInstance(); - if (seMgr) { - seMgr->getCategory(param_0)->setMaxActiveSe(param_1); - seMgr->getCategory(param_0)->setMaxInactiveSe(param_2); + { + JAISeMgr* seMgr = JASGlobalInstance::getInstance(); + if (seMgr) { + seMgr->getCategory(param_0)->setMaxActiveSe(param_1); + seMgr->getCategory(param_0)->setMaxInactiveSe(param_2); + } + } +} + +void JAUAudioArcLoader_withoutCopy::readWS(u32 param_0, void const* param_1, u32 param_2) { + mSection->newWaveBank(param_0, param_1); + if (param_2) { + mSection->loadWaveArc(param_0, param_2); + } + JASReport(".ws resource remains at Heap Head\n"); +} + +void JAUAudioArcLoader_withoutCopy::readBNK(u32 param_0, void const* param_1) { + mSection->newBank(param_1, param_0); + JASReport(".bnk resource remains at Heap Head\n"); +} + +void JAUAudioArcLoader_withoutCopy::readBSC(void const* param_0, u32 param_1) { + UNUSED(param_1); + mSection->newSeSeqCollection(param_0, 0); +} + +void JAUAudioArcLoader_withoutCopy::readBST(void const* param_0, u32 param_1) { + UNUSED(param_1); + mSection->newSoundTable(param_0, 0, true); +} + +void JAUAudioArcLoader_withoutCopy::readBSTN(void const* param_0, u32 param_1) { + UNUSED(param_1); + mSection->newSoundNameTable(param_0, 0, true); +} + +void JAUAudioArcLoader_withoutCopy::readBMS(u32 param_0, void const* param_1, u32 param_2) { + UNUSED(param_2); + mSection->newStaticSeqData(param_0, param_1, 0); +} + +void JAUAudioArcLoader_withoutCopy::readBMS_fromArchive(u32 param_0) { + mSection->newStaticSeqData(param_0); +} + +void JAUAudioArcLoader_withoutCopy::newVoiceBank(u32 param_0, u32 param_1) { + mSection->newVoiceBank(param_1, param_0); +} + +void JAUAudioArcLoader_withoutCopy::newDynamicSeqBlock(u32 param_0) { + JAUSectionHeap* sectionHeap = mSection->asSectionHeap(); + JUT_ASSERT(166, sectionHeap); + sectionHeap->newDynamicSeqBlock(param_0); +} + +void JAUAudioArcLoader_withoutCopy::readBSFT(void const* param_0) { + mSection->newStreamFileTable(param_0, false); +} + +void JAUAudioArcLoader_withoutCopy::beginBNKList(u32 param_0, u32 param_1) { + mSection->beginNewBankTable(param_0, param_1); +} + +void JAUAudioArcLoader_withoutCopy::endBNKList() { + mSection->endNewBankTable(); +} + +void JAUAudioArcLoader_withoutCopy::readMaxSeCategory(int param_0, int param_1, int param_2) { + { + JAISeMgr* seMgr = JASGlobalInstance::getInstance(); + if (seMgr) { + seMgr->getCategory(param_0)->setMaxActiveSe(param_1); + seMgr->getCategory(param_0)->setMaxInactiveSe(param_2); + } } } diff --git a/src/JSystem/JAudio2/JAUClusterSound.cpp b/src/JSystem/JAudio2/JAUClusterSound.cpp index 612fcca5dd..66fd255865 100644 --- a/src/JSystem/JAudio2/JAUClusterSound.cpp +++ b/src/JSystem/JAudio2/JAUClusterSound.cpp @@ -6,8 +6,11 @@ #include "JSystem/JAudio2/JAUClusterSound.h" #include "JSystem/JAudio2/JAISoundHandles.h" +#include "JSystem/JAudio2/JAISoundStarter.h" // Dummy function to generate JAISoundHandle::JAISoundHandle static void dummyCtor() { + JASGlobalInstance::getInstance(); JAISoundHandle dummy[20]; + JAISoundHandles handles(dummy, 20); } diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp index aee48de91d..cf037011fe 100644 --- a/src/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp @@ -195,7 +195,7 @@ JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param } JAISeqDataMgr* JAUSection::newSeSeqCollection(void const* bsc, u32 param_1) { - // JUT_ASSERT(398, asSectionHeap() == this); + JUT_ASSERT(398, asSectionHeap() == this); JUT_ASSERT(399, sectionHeap_->sectionHeapData_.seSeqDataMgr_ == NULL); if (param_1) { bsc = newCopy(bsc, param_1, 4); @@ -224,14 +224,16 @@ u8* JAUSection::newStaticSeqDataBlock_(JAISoundID param_0, u32 size) { } JSULink* link = new JSULink(seqDataBlock); if (!link) { + JUT_WARN(432, "%s", "created UNUSED object in Heap\n"); return NULL; } u8* r28 = new(0x20) u8[size]; if (!r28) { + JUT_WARN(438, "%s", "created UNUSED object in Heap\n"); return NULL; } - seqDataBlock->field_0x14.addr = r28; - seqDataBlock->field_0x14.size = size; + seqDataBlock->region.addr = r28; + seqDataBlock->region.size = size; seqDataBlock->field_0x10 = param_0; JASCriticalSection cs; if(data_.field_0x00.appendDynamicSeqDataBlock(seqDataBlock)) { @@ -243,10 +245,12 @@ u8* JAUSection::newStaticSeqDataBlock_(JAISoundID param_0, u32 size) { } bool JAUSection::newStaticSeqData(JAISoundID param_0, void const* param_1, u32 param_2) { - u8* r30 = newStaticSeqDataBlock_(param_0, param_2); - if (r30) { - memcpy(r30, param_1, param_2); - return true; + { + u8* r30 = newStaticSeqDataBlock_(param_0, param_2); + if (r30) { + memcpy(r30, param_1, param_2); + return true; + } } return false; } @@ -256,6 +260,7 @@ bool JAUSection::newStaticSeqData(JAISoundID param_0) { JUT_ASSERT(481, seqArchive); JAUSoundInfo* soundInfo = JASGlobalInstance::getInstance(); if (!soundInfo) { + JUT_WARN(485, "%s","cannot JAUSoundInfo::getInstance()."); return false; } u16 r26 = soundInfo->getBgmSeqResourceID(param_0); @@ -286,15 +291,17 @@ static bool dummy_string(int i) { JASWaveBank* JAUSection::newWaveBank(u32 bank_no, void const* param_1) { JUT_ASSERT(528, isOpen()); JUT_ASSERT(529, isBuilding()); - TPushCurrentHeap push(getHeap_()); - s32 r27 = getHeap_()->getFreeSize(); - JASWaveBank* waveBank = JASWSParser::createWaveBank(param_1, getHeap_()); - if (waveBank) { - JUT_ASSERT(536, sectionHeap_->getWaveBankTable().getWaveBank( bank_no ) == NULL); - sectionHeap_->getWaveBankTable().registWaveBank(bank_no, waveBank); - data_.registeredWaveBankTables.set(bank_no, true); - data_.field_0xa0 += r27 - getHeap_()->getFreeSize(); - return waveBank; + { + TPushCurrentHeap push(getHeap_()); + s32 r27 = getHeap_()->getFreeSize(); + JASWaveBank* waveBank = JASWSParser::createWaveBank(param_1, getHeap_()); + if (waveBank) { + JUT_ASSERT(536, sectionHeap_->getWaveBankTable().getWaveBank( bank_no ) == NULL); + sectionHeap_->getWaveBankTable().registWaveBank(bank_no, waveBank); + data_.registeredWaveBankTables.set(bank_no, true); + data_.field_0xa0 += r27 - getHeap_()->getFreeSize(); + return waveBank; + } } return NULL; @@ -306,7 +313,8 @@ bool JAUSection::loadWaveArc(u32 param_0, u32 param_1) { if (waveBank) { for (u32 i = 0; i < waveBank->getArcCount(); i++) { if (param_1 & 1 << i) { - waveBank->getWaveArc(i)->load(NULL); + JASWaveArc* waveArc = waveBank->getWaveArc(i); + waveArc->load(NULL); } } return true; @@ -320,22 +328,24 @@ JASBank* JAUSection::newBank(void const* param_0, u32 param_1) { JUT_ASSERT(648, isBuilding()); JASWaveBank* waveBank = sectionHeap_->getWaveBankTable().getWaveBank(param_1); JUT_ASSERT(650, waveBank != NULL); - TPushCurrentHeap push(getHeap_()); - u32 bank_no = JASBNKParser::getBankNumber(param_0); - s32 r25 = getHeap_()->getFreeSize(); - JASBank* bank = JASBNKParser::createBank(param_0, getHeap_()); - if (bank) { - if (buildingBankTable_) { - JUT_ASSERT(660, buildingBankTable_->getBank( bank_no ) == NULL); - buildingBankTable_->registBank(bank_no, bank); - } else { - JUT_ASSERT(665, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == NULL); - JASDefaultBankTable::getInstance()->registBank(bank_no, bank); - data_.registeredBankTables.set(bank_no, true); + { + TPushCurrentHeap push(getHeap_()); + u32 bank_no = JASBNKParser::getBankNumber(param_0); + s32 r25 = getHeap_()->getFreeSize(); + JASBank* bank = JASBNKParser::createBank(param_0, getHeap_()); + if (bank) { + if (buildingBankTable_) { + JUT_ASSERT(660, buildingBankTable_->getBank( bank_no ) == NULL); + buildingBankTable_->registBank(bank_no, bank); + } else { + JUT_ASSERT(665, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == NULL); + JASDefaultBankTable::getInstance()->registBank(bank_no, bank); + data_.registeredBankTables.set(bank_no, true); + } + bank->assignWaveBank(waveBank); + data_.field_0x9c += r25 - getHeap_()->getFreeSize(); + return bank; } - bank->assignWaveBank(waveBank); - data_.field_0x9c += r25 - getHeap_()->getFreeSize(); - return bank; } return 0; } @@ -377,10 +387,10 @@ bool JAUSection::beginNewBankTable(u32 param_0, u32 param_1) { if (bankTableLink) { buildingBankTable_ = bankTableLink; } else { - + JUT_WARN(730, "%s","created UNUSED object in Heap\n"); } } else { - + JUT_WARN(735, "%s","created UNUSED object in Heap\n"); } } return bankTableLink; @@ -406,7 +416,8 @@ JAUSectionHeap::TSectionHeapData::TSectionHeapData() { void JAUSectionHeap::setSeqDataArchive(JKRArchive* param_0) { sectionHeapData_.seqDataBlocks.setSeqDataArchive(param_0); - for (JSULink* link = mSectionList.getFirst(); link; link = link->getNext()) { + JSULink* link; + for (link = mSectionList.getFirst(); link; link = link->getNext()) { link->getObject()->data_.field_0x00.setSeqDataArchive(param_0); } } @@ -423,7 +434,8 @@ static JAUSectionHeap* JAUNewSectionHeap(JKRSolidHeap* heap, bool param_1) { JUT_ASSERT(809, JKRSolidHeap_isEmpty( heap )); TPushCurrentHeap push(heap); s32 r29 = heap->getFreeSize(); - return new JAUSectionHeap(heap, param_1, r29); + JAUSectionHeap* sectionHeap = new JAUSectionHeap(heap, param_1, r29); + return sectionHeap; } JAUSectionHeap* JAUNewSectionHeap(bool param_0) { @@ -443,42 +455,61 @@ JAUSection* JAUSectionHeap::getOpenSection() { return mSectionList.getLast()->getObject(); } +JAUSection* JAUSectionHeap::getSection(int param_0) { + JSULink* link = mSectionList.getFirst(); + while (param_0 > 0) { + JSULink* link2 = link->getNext(); + if (!link2) { + return NULL; + } + link = link2; + param_0--; + } + return link->getObject(); +} + bool JAUSectionHeap::setSeqDataUser(JAISeqDataUser* param_0) { sectionHeapData_.seqDataUser = param_0; return true; } bool JAUSectionHeap::newDynamicSeqBlock(u32 size) { - /* JUT_ASSERT(937, isOpen()); + JUT_ASSERT(937, isOpen()); JUT_ASSERT(938, isBuilding()); - JUT_ASSERT(939, sectionHeap_ == this); */ - TPushCurrentHeap push(getHeap_()); - JAUSeqDataBlock * seqDataBlock = new JAUSeqDataBlock(); - if (!seqDataBlock) { - return false; - } - JSULink * link = new JSULink(seqDataBlock); - if (!link) { - return false; - } - u8* r25 = new(0x20) u8[size]; - if (!r25) { - return false; - } - seqDataBlock->field_0x14.addr = r25; - seqDataBlock->field_0x14.size = size; - seqDataBlock->field_0x10.setAnonymous(); - JASCriticalSection cs; - if (sectionHeap_->sectionHeapData_.seqDataBlocks.appendDynamicSeqDataBlock(seqDataBlock)) { - return true; + JUT_ASSERT(939, sectionHeap_ == this); + { + TPushCurrentHeap push(getHeap_()); + JAUSeqDataBlock * seqDataBlock = new JAUSeqDataBlock(); + if (!seqDataBlock) { + return false; + } + JSULink * link = new JSULink(seqDataBlock); + if (!link) { + JUT_WARN(950, "%s", "created UNUSED object in Heap\n"); + return false; + } + u8* r25 = new(0x20) u8[size]; + if (!r25) { + JUT_WARN(956, "%s", "created UNUSED object in Heap\n"); + return false; + } + seqDataBlock->region.addr = r25; + seqDataBlock->region.size = size; + seqDataBlock->field_0x10.setAnonymous(); + JASCriticalSection cs; + if (sectionHeap_->sectionHeapData_.seqDataBlocks.appendDynamicSeqDataBlock(seqDataBlock)) { + return true; + } + JUT_WARN(968, "%s","created UNUSED object in Heap\n"); } return false; } JAISeqDataMgr::SeqDataReturnValue JAUSectionHeap::getSeqData(JAISoundID param_0, JAISeqData* param_1) { + const int JAI_ASYNC_RESULT_RETRY = 1; for (JSULink * link = mSectionList.getFirst(); link; link = link->getNext()) { s32 result = link->getObject()->data_.field_0x00.getSeqData(param_0, sectionHeapData_.seqDataUser, param_1, false); - // JUT_ASSERT(994, result != JAI_ASYNC_RESULT_RETRY); + JUT_ASSERT(994, result != JAI_ASYNC_RESULT_RETRY); if (result == 2) { return JAISeqDataMgr::SeqDataReturnValue_2; } @@ -487,5 +518,6 @@ JAISeqDataMgr::SeqDataReturnValue JAUSectionHeap::getSeqData(JAISoundID param_0, } int JAUSectionHeap::releaseSeqData() { + JUT_WARN(1005, "%s", "JAUSectionHeap cannot release SeqData all at once. Please pop Section.\n"); return 0; } diff --git a/src/JSystem/JAudio2/JAUSeqCollection.cpp b/src/JSystem/JAudio2/JAUSeqCollection.cpp index a9787321f3..074862e521 100644 --- a/src/JSystem/JAudio2/JAUSeqCollection.cpp +++ b/src/JSystem/JAudio2/JAUSeqCollection.cpp @@ -24,7 +24,8 @@ bool JAUSeqCollection::getSeqData(int param_0, int param_1, JAISeqData* param_2) if (param_0 >= field_0x0) { return false; } - u32* puVar2 = (u32*)((u8*)field_0x8 + field_0x4[param_0]); + u32 r29 = field_0x4[param_0]; + u32* puVar2 = (u32*)((u8*)field_0x8 + r29); if (param_1 >= puVar2[0]) { return false; } @@ -55,7 +56,8 @@ int JAUSeqDataMgr_SeqCollection::releaseSeqData() { if (user_) { JAISeqDataRegion region; getSeqDataRegion(®ion); - return user_->releaseSeqData(region); + int result = user_->releaseSeqData(region); + return result; } return 2; } diff --git a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp index a5bb6ae620..37e0577413 100644 --- a/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp +++ b/src/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp @@ -20,7 +20,7 @@ u8* JAUSeqDataBlocks::getSeqData(JAISoundID param_0) { link = link->getNext()) { if ((u32)link->getObject()->field_0x10 == (u32)param_0) { - return link->getObject()->field_0x14.addr; + return link->getObject()->region.addr; } } return NULL; @@ -32,7 +32,7 @@ JSULink* JAUSeqDataBlocks::seekFreeBlock(u32 size) { for (JSULink* link = getFirst(); link != NULL; link = link->getNext()) { if (link->getObject()->field_0x10.isAnonymous()) { - u32 blockSize = link->getObject()->field_0x14.size; + u32 blockSize = link->getObject()->region.size; if (blockSize >= size && blockSize < currentBlockSize) { rv = link; currentBlockSize = blockSize; @@ -54,8 +54,8 @@ bool JAUSeqDataBlocks::remove(JSULink* param_0) { } bool JAUSeqDataBlocks::hasFailedBlock(JAISoundID param_0) { - JSULink* rv = NULL; - for (JSULink* link = getFirst(); link != NULL; link = link->getNext()) + JSULink* link; + for (link = getFirst(); link != NULL; link = link->getNext()) { if (link->getObject()->field_0x10 == param_0) { link->getObject()->field_0x10.setAnonymous(); @@ -70,6 +70,7 @@ JAUDynamicSeqDataBlocks::JAUDynamicSeqDataBlocks() { } void JAUDynamicSeqDataBlocks::setSeqDataArchive(JKRArchive* param_0) { + JUT_ASSERT(104, seqDataArchive_ == NULL); seqDataArchive_ = param_0; } @@ -98,17 +99,21 @@ s32 JAUDynamicSeqDataBlocks::getSeqData(JAISoundID param_0, JAISeqDataUser* para } bool JAUDynamicSeqDataBlocks::appendDynamicSeqDataBlock(JAUSeqDataBlock* seqDataBlock) { + JUT_ASSERT(135, ( reinterpret_cast < u32 > ( seqDataBlock->region.addr ) & 0x1f ) == 0); rearrangeLoadingSeqs_(); + bool result; if (seqDataBlock->field_0x10.isAnonymous()) { - mFreeBlocks.append(&seqDataBlock->field_0x0); + result = mFreeBlocks.append(&seqDataBlock->field_0x0); } else { - mLoadedBlocks.append(&seqDataBlock->field_0x0); + result = mLoadedBlocks.append(&seqDataBlock->field_0x0); } + JUT_ASSERT(144, result); return 1; } static void JAUDynamicSeqDataBlocks_receiveLoaded_(u32 param_0, u32 param_1) { - JAUSeqDataBlock* seqDataBlock = ((JSULink*)param_1)->getObject(); + JSULink* link = (JSULink*)param_1; + JAUSeqDataBlock* seqDataBlock = link->getObject(); if (param_0 != NULL) { seqDataBlock->field_0x1c = 2; } else { @@ -118,35 +123,38 @@ static void JAUDynamicSeqDataBlocks_receiveLoaded_(u32 param_0, u32 param_1) { bool JAUDynamicSeqDataBlocks::loadDynamicSeq(JAISoundID param_0, bool param_1, JAISeqDataUser* param_2) { - if (seqDataArchive_ == NULL) { - return false; - } - JAUSoundInfo* soundInfo = JASGlobalInstance::getInstance(); - if (soundInfo == NULL) { - return false; - } - u16 resourceId = soundInfo->getBgmSeqResourceID(param_0); - size_t resSize = JASResArcLoader::getResSize(seqDataArchive_, resourceId); - JSULink* link = mFreeBlocks.seekFreeBlock(resSize); - if (link == NULL) { - if (param_1) { - link = &releaseIdleDynamicSeqDataBlock_(param_2, resSize)->field_0x0; - if (link == NULL) { - return false; - } - } else { + { + if (seqDataArchive_ == NULL) { + JUT_WARN(192, "%s", "cannot get sequence data archive."); return false; } + JAUSoundInfo* soundInfo = JASGlobalInstance::getInstance(); + if (soundInfo == NULL) { + JUT_WARN(198, "%s", "cannot JAUSoundInfo::getInstance()."); + return false; + } + u16 resourceId = soundInfo->getBgmSeqResourceID(param_0); + size_t resSize = JASResArcLoader::getResSize(seqDataArchive_, resourceId); + JSULink* link = mFreeBlocks.seekFreeBlock(resSize); + if (link == NULL) { + if (param_1) { + link = &releaseIdleDynamicSeqDataBlock_(param_2, resSize)->field_0x0; + if (link == NULL) { + return false; + } + } else { + return false; + } + } + mFreeBlocks.remove(link); + link->getObject()->field_0x10 = param_0; + link->getObject()->field_0x1c = 1; + field_0xc.append(link); + JASResArcLoader::loadResourceAsync( + seqDataArchive_, resourceId, + link->getObject()->region.addr, link->getObject()->region.size, + JAUDynamicSeqDataBlocks_receiveLoaded_, (u32)link); } - mFreeBlocks.remove(link); - JAUSeqDataBlock* seqDataBlock = link->getObject(); - seqDataBlock->field_0x10 = param_0; - link->getObject()->field_0x1c = 1; - field_0xc.append(link); - JASResArcLoader::loadResourceAsync( - seqDataArchive_, resourceId, - link->getObject()->field_0x14.addr, link->getObject()->field_0x14.size, - JAUDynamicSeqDataBlocks_receiveLoaded_, (u32)link); return true; } @@ -157,12 +165,12 @@ u32 JAUDynamicSeqDataBlocks::releaseIdleDynamicSeqDataBlock(JAISeqDataUser* para for (JSULink* link = mLoadedBlocks.getFirst(); link != NULL; ) { nextLink = link->getNext(); JAUSeqDataBlock* seqDataBlock = link->getObject(); - if (param_0 == NULL || !param_0->isUsingSeqData(seqDataBlock->field_0x14)) { + if (param_0 == NULL || !param_0->isUsingSeqData(seqDataBlock->region)) { mLoadedBlocks.remove(link); JAUSeqDataBlock* seqDataBlock = link->getObject(); - link->getObject()->field_0x10.setAnonymous(); - if (size < seqDataBlock->field_0x14.size) { - size = seqDataBlock->field_0x14.size; + seqDataBlock->field_0x10.setAnonymous(); + if (size < seqDataBlock->region.size) { + size = seqDataBlock->region.size; } mFreeBlocks.append(link); } @@ -181,8 +189,8 @@ JAUDynamicSeqDataBlocks::releaseIdleDynamicSeqDataBlock_(JAISeqDataUser* param_0 while (link != NULL) { nextLink = link->getNext(); JAUSeqDataBlock* seqDataBlock = link->getObject(); - if (param_0 == NULL || !param_0->isUsingSeqData(seqDataBlock->field_0x14)) { - u32 size = seqDataBlock->field_0x14.size; + if (param_0 == NULL || !param_0->isUsingSeqData(seqDataBlock->region)) { + u32 size = seqDataBlock->region.size; if (size >= param_1 && size < minSize) { foundBlock = link; minSize = size; diff --git a/src/JSystem/JAudio2/JAUStreamFileTable.cpp b/src/JSystem/JAudio2/JAUStreamFileTable.cpp index ccd18b890c..f30c5c4a01 100644 --- a/src/JSystem/JAudio2/JAUStreamFileTable.cpp +++ b/src/JSystem/JAudio2/JAUStreamFileTable.cpp @@ -7,18 +7,17 @@ JAUStreamFileTable::JAUStreamFileTable() { } void JAUStreamFileTable::init(void const* data) { - if (data == NULL) { + const BinaryStreamFileTable* binaryTable = (const BinaryStreamFileTable*)data; + if (binaryTable == NULL) { mData = NULL; return; } - const BinaryStreamFileTable* binaryTable = (const BinaryStreamFileTable*)data; - const char* ident = binaryTable->mIdentifier; - if (ident[0] == 'b' && ident[1] == 's' && ident[2] == 'f' && ident[3] == 't') { + if (binaryTable->mIdentifier[0] == 'b' && binaryTable->mIdentifier[1] == 's' && binaryTable->mIdentifier[2] == 'f' && binaryTable->mIdentifier[3] == 't') { mData = binaryTable; } } -int JAUStreamFileTable::getNumFiles() const { +u32 JAUStreamFileTable::getNumFiles() const { return mData->mNumFiles; } @@ -26,8 +25,8 @@ const char* JAUStreamFileTable::getFilePath(int index) const { if (mData == NULL) { return 0; } - ASSERT(index >= 0); - ASSERT(index < getNumFiles()); + JUT_ASSERT(52, index >= 0); + JUT_ASSERT(53, index < getNumFiles()); char* data = (char*)mData; return (char*)(data + *(int*)(data + 8 + (index * sizeof(s32)))); } diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index cabbbb3179..82321544a7 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -10,6 +10,8 @@ #include "JSystem/JUtility/JUTException.h" #include +void* ARALT_AramStartAdr = (void*)0x90000000; + bool data_804508B0 = 1; #if DEBUG @@ -447,6 +449,8 @@ void JKRHeap::state_dump(const JKRHeap::TState& p) const { JUT_LOG(1248, "used size : %u", p.getUsedSize()); } +void* JKRHeap::getAltAramStartAdr() { return ARALT_AramStartAdr; } + s32 JKRHeap::do_changeGroupID(u8 param_0) { return 0; } diff --git a/src/Z2AudioLib/Z2SoundMgr.cpp b/src/Z2AudioLib/Z2SoundMgr.cpp index add152850c..8e32d68196 100644 --- a/src/Z2AudioLib/Z2SoundMgr.cpp +++ b/src/Z2AudioLib/Z2SoundMgr.cpp @@ -157,7 +157,7 @@ bool Z2SoundMgr::startSound(JAISoundID soundID, JAISoundHandle* handle, const JG OS_REPORT("[Z2SoundMgr::startSound] FAILED!!! LOAD SEQ_DATA id: %08x\n", *(u32*)&soundID); for (JSULink* link = sectionHeap->getSectionHeapData().seqDataBlocks.getFreeBlocks().getFirst(); link != NULL; link = link->getNext()) { - OS_REPORT(" freeSeqBlock: %d\n", link->getObject()->field_0x14.size); + OS_REPORT(" freeSeqBlock: %d\n", link->getObject()->region.size); } } From 4a75dc3736b656223fa151dd4caf78f92f73d50d Mon Sep 17 00:00:00 2001 From: TakaRikka <38417346+TakaRikka@users.noreply.github.com> Date: Sat, 27 Dec 2025 14:24:27 -0800 Subject: [PATCH 23/35] jgadget debug improvements (#3000) --- include/JSystem/JGadget/binary.h | 18 +- include/JSystem/JGadget/define.h | 12 +- include/JSystem/JGadget/search.h | 49 ++- include/JSystem/JGadget/std-stream.h | 194 ++++++++ include/JSystem/JGadget/std-streambuf.h | 76 ++++ include/JSystem/JUtility/JUTAssert.h | 4 + src/JSystem/JGadget/binary.cpp | 105 +++-- src/JSystem/JGadget/define.cpp | 72 +++ .../JGadget/dolphin-stream-JORFile.cpp | 0 src/JSystem/JGadget/search.cpp | 13 + src/JSystem/JGadget/std-list.cpp | 0 src/JSystem/JGadget/std-stream.cpp | 413 ++++++++++++++++++ src/JSystem/JGadget/std-streambuf.cpp | 60 +++ src/JSystem/JGadget/std-string.cpp | 9 + src/JSystem/JGadget/textreader.cpp | 0 src/JSystem/JGadget/xml-scanner.cpp | 0 src/JSystem/JKernel/JKRFileCache.cpp | 1 + .../JStudio/JStudioCameraEditor/control.cpp | 0 .../controlset-csb-valueset.cpp | 0 .../JStudio/JStudioCameraEditor/csb-data.cpp | 0 .../JStudio/JStudioCameraEditor/csb.cpp | 0 .../JStudio/JStudioCameraEditor/sequence.cpp | 0 .../JStudio/JStudioPreviewer/control.cpp | 0 .../JStudio/JStudioToolLibrary/anchor.cpp | 0 .../JStudio/JStudioToolLibrary/console.cpp | 0 .../JStudioToolLibrary/controlset-anchor.cpp | 0 .../JStudioToolLibrary/controlset-preview.cpp | 0 .../JStudio/JStudioToolLibrary/controlset.cpp | 0 .../JStudio/JStudioToolLibrary/interface.cpp | 0 .../jstudio-controlset-transform.cpp | 0 .../JStudio/JStudioToolLibrary/scroll.cpp | 0 .../JStudio/JStudioToolLibrary/visual.cpp | 0 .../JStudio/JStudioToolLibrary/xml.cpp | 0 src/JSystem/JSupport/JSUInputStream.cpp | 6 +- src/JSystem/JSupport/JSUList.cpp | 20 +- .../MSL_C++/MSL_Common/Include/algorithm.h | 36 ++ .../MSL/MSL_C/MSL_Common/Include/ctype.h | 15 +- 37 files changed, 1016 insertions(+), 87 deletions(-) create mode 100644 include/JSystem/JGadget/std-stream.h create mode 100644 include/JSystem/JGadget/std-streambuf.h create mode 100644 src/JSystem/JGadget/define.cpp create mode 100644 src/JSystem/JGadget/dolphin-stream-JORFile.cpp create mode 100644 src/JSystem/JGadget/search.cpp create mode 100644 src/JSystem/JGadget/std-list.cpp create mode 100644 src/JSystem/JGadget/std-stream.cpp create mode 100644 src/JSystem/JGadget/std-streambuf.cpp create mode 100644 src/JSystem/JGadget/std-string.cpp create mode 100644 src/JSystem/JGadget/textreader.cpp create mode 100644 src/JSystem/JGadget/xml-scanner.cpp create mode 100644 src/JSystem/JStudio/JStudioCameraEditor/control.cpp create mode 100644 src/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp create mode 100644 src/JSystem/JStudio/JStudioCameraEditor/csb-data.cpp create mode 100644 src/JSystem/JStudio/JStudioCameraEditor/csb.cpp create mode 100644 src/JSystem/JStudio/JStudioCameraEditor/sequence.cpp create mode 100644 src/JSystem/JStudio/JStudioPreviewer/control.cpp create mode 100644 src/JSystem/JStudio/JStudioToolLibrary/anchor.cpp create mode 100644 src/JSystem/JStudio/JStudioToolLibrary/console.cpp create mode 100644 src/JSystem/JStudio/JStudioToolLibrary/controlset-anchor.cpp create mode 100644 src/JSystem/JStudio/JStudioToolLibrary/controlset-preview.cpp create mode 100644 src/JSystem/JStudio/JStudioToolLibrary/controlset.cpp create mode 100644 src/JSystem/JStudio/JStudioToolLibrary/interface.cpp create mode 100644 src/JSystem/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp create mode 100644 src/JSystem/JStudio/JStudioToolLibrary/scroll.cpp create mode 100644 src/JSystem/JStudio/JStudioToolLibrary/visual.cpp create mode 100644 src/JSystem/JStudio/JStudioToolLibrary/xml.cpp diff --git a/include/JSystem/JGadget/binary.h b/include/JSystem/JGadget/binary.h index fc6c2641fb..34aa9c0a5d 100644 --- a/include/JSystem/JGadget/binary.h +++ b/include/JSystem/JGadget/binary.h @@ -1,8 +1,7 @@ -#ifndef BINARY_H -#define BINARY_H +#ifndef JGADGET_BINARY_H +#define JGADGET_BINARY_H #include "JSystem/JUtility/JUTAssert.h" -#include "dolphin/types.h" #include "JSystem/JGadget/search.h" namespace JGadget { @@ -12,8 +11,7 @@ struct TEBit { u32 value; }; -const void* parseVariableUInt_16_32_following(const void* pu16, u32* pu32First, u32* pu32Second, - TEBit* tebit); +const void* parseVariableUInt_16_32_following(const void* pu16, u32* pu32First, u32* pu32Second, TEBit* tebit); inline bool isPower2(unsigned int arg0) { return arg0 != 0 && (arg0 & arg0 - 1) == 0; @@ -57,14 +55,6 @@ struct TParse_header_block { bool parse(const void* ppData_inout, u32 a2) { return parse_next(&ppData_inout, a2); } - - bool checkNext(const void** ptrLocation, u32* headerEnd, u32 idx) { - bool checkNext = false; - if (parseHeader_next(ptrLocation, headerEnd, idx)) { - checkNext = true; - } - return checkNext; - } }; template @@ -194,4 +184,4 @@ struct TValueIterator_misaligned : public TValueIterator #ifdef __cplusplus extern "C" { @@ -25,11 +25,13 @@ public: JGadget_outMessage& operator<<(u32); JGadget_outMessage& operator<<(const void*); + static const int BUFFER_SIZE = 256; + private: MessageFunc mMsgFunc; - char mBuffer[256]; + char mBuffer[BUFFER_SIZE]; char* mWrite_p; - char* mFile; + const char* mFile; int mLine; }; diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h index 161902bf12..555cf63cd7 100644 --- a/include/JSystem/JGadget/search.h +++ b/include/JSystem/JGadget/search.h @@ -1,15 +1,13 @@ -#ifndef SEARCH_H -#define SEARCH_H +#ifndef JGADGET_SEARCH_H +#define JGADGET_SEARCH_H -#include "dolphin/os.h" +#include #include #include #include namespace JGadget { - namespace search { - template struct TExpandStride_ {}; @@ -18,11 +16,29 @@ struct TExpandStride_ { static s32 get(s32 n) { return n << 3; } }; +struct TPR1IsEqual_string_ { + TPR1IsEqual_string_(const char* sz) { + string_ = sz; + } + + bool operator()(const char* sz) const { + bool ret; + if (string_ == NULL) { + ret = sz == NULL; + } else { + ret = sz != NULL && strcmp(string_, sz) == 0; + } + return ret; + } + + const char* string_; +}; + } // namespace search -//! @todo: mangled name isn't correct, fix this -//! Current: toValueFromIndex__7JGadgetFiPCPFdd_dUlRCPFdd_d -//! Target: toValueFromIndex__7JGadgetFiPCPFdd_dUlRCPFdd_d_RCPFdd_d +const char* toStringFromIndex(int index, const char* const* pValue, u32 count, const char* fallback); +int toIndexFromString_linear(const char*, const char* const*, u32, int); + template inline const T& toValueFromIndex(int idx, const T* pValue, u32 count, const T& fallback) { JUT_ASSERT(200, pValue!=NULL); @@ -34,6 +50,21 @@ inline const T& toValueFromIndex(int idx, const T* pValue, u32 count, const T& f } } +template +inline int toIndexFromValue_linear_if(Predicate p, const T* pValue, u32 count, int fallback) { + JUT_ASSERT(212, pValue!=NULL); + + const T* first = pValue; + const T* last = pValue + count; + const T* found = std::find_if(first, last, p); + + if (found == last) { + return fallback; + } + + return std::distance(first, found); +} + template struct TIterator : public std::iterator { }; @@ -130,4 +161,4 @@ inline Iterator findUpperBound_binary_current(Iterator first, Iterator last, Ite } // namespace JGadget -#endif /* SEARCH_H */ +#endif /* JGADGET_SEARCH_H */ diff --git a/include/JSystem/JGadget/std-stream.h b/include/JSystem/JGadget/std-stream.h new file mode 100644 index 0000000000..c6ca776ee2 --- /dev/null +++ b/include/JSystem/JGadget/std-stream.h @@ -0,0 +1,194 @@ +#ifndef JGADGET_STD_STREAM_H +#define JGADGET_STD_STREAM_H + +#include "JSystem/JGadget/std-streambuf.h" +#include "global.h" + +namespace JGadget { +class TStream_base { +public: + TStream_base() {} + virtual ~TStream_base() = 0; + + void setf(u32); + void setf(u32, u32); + void width(s32); + + s32 precision() const { + return precision_; + } + + s32 width() const { + return width_; + } + + u32 flags() const { + return flags_; + } + + void Init_() { + flags_ = skipws|dec; + width_ = 0; + precision_ = 6; + } + + static const u32 skipws = 0x400000; + static const u32 dec = 0x1; + +private: + /* 0x4 */ u32 flags_; + /* 0x8 */ s32 width_; + /* 0xC */ s32 precision_; +}; + +class TStream : public TStream_base { +public: + TStream(); + virtual ~TStream() = 0; + + void init(TStreamBuffer* psb); + bool fail() const; + bool good() const; + void setstate(u8 state); + void clear(u8 state); + TStreamBuffer* rdbuf() const; + void fill(char); + static char widen(char); + static char narrow(char, char); + + char fill() const { + return fill_; + } + +private: + /* 0x10 */ u8 state_; + /* 0x14 */ TStreamBuffer* rdbuf_; + /* 0x18 */ char fill_; +}; + +class TInputStream { +public: + struct sentry { + sentry(TInputStream& stream, bool); + + operator bool() const { return _0x0; } + + /* 0x0 */ bool _0x0; + }; + + int get(); + + TStream* _0x0; + virtual ~TInputStream(); + +private: + /* 0x08 */ int field_0x8; +}; + +class TOutputStream { +public: + struct sentry { + sentry(TOutputStream& stream) { + _0x0 = &stream; + + _0x4 = stream._0x0->good(); + if (!_0x4) { + stream._0x0->setstate(2); + } + } + + ~sentry() { + if (!_0x0->_0x0->fail() && (_0x0->_0x0->flags() & 2)) { + _0x0->flush(); + } + } + + operator bool() const { return _0x4; } + + /* 0x0 */ TOutputStream* _0x0; + /* 0x4 */ bool _0x4; + }; + + struct TBufferIterator { + TBufferIterator(TStreamBuffer* psb) { + buffer_ = psb; + } + + void operator=(char param_0) { + if (buffer_ != NULL && TTrait_char::eq_int_type(buffer_->sputc(param_0), TTrait_char::eof())) { + buffer_ = NULL; + } + } + + TBufferIterator& operator*() { + return *this; + } + + void operator++() {} + + bool failed() const { return buffer_ == NULL; } + + TStreamBuffer* buffer_; + }; + + TOutputStream& operator<<(const char*); + TOutputStream& operator<<(char); + TOutputStream& operator<<(s32); + TOutputStream& operator<<(u32); + TOutputStream& operator<<(bool); + TOutputStream& operator<<(double); + + void flush(); + TBufferIterator& Put_CString_prefixed_(const char*, u32, const char*, u32); + TBufferIterator& Put_longInt_(u32, bool); + TBufferIterator& Put(double); + + TBufferIterator& Put(const char* param_0, u32 param_1) { + return Put_CString_prefixed_(param_0, param_1, NULL, 0); + } + + TBufferIterator& Put(s32 param_0) { + return Put_longInt_(param_0, true); + } + + TBufferIterator& Put(u32 param_0) { + return Put_longInt_(param_0, false); + } + + TBufferIterator& Put(bool param_0) { + u32 flags = _0x0->flags(); + const TCString_* s = &saaosz_bool_[!(flags & 8) ? 0 : 1][param_0 ? 1 : 0]; + return Put_CString_prefixed_(s->sz, s->len, NULL, 0); + } + + TStream* _0x0; + virtual ~TOutputStream(); + + struct TCString_ { + const char* sz; + u32 len; + }; + + struct saoCaseNumeral_struct { + const char _0[16]; + TCString_ _1; // 0x10 + TCString_ _2; // 0x18 + TCString_ _3; // 0x20 + }; + + static const saoCaseNumeral_struct saoCaseNumeral_[2]; + static const TCString_ saoszPrefix_sign_[3]; + static const TCString_ saaosz_bool_[2][2]; + static const TCString_ soszPrefix_oct_; + + static const saoCaseNumeral_struct& getCaseNumeral_(u32 flags) { + return saoCaseNumeral_[!(flags & 4) ? 0 : 1]; + } + +private: + /* 0x08 */ int field_0x8; +}; + +} + +#endif /* JGADGET_STD_STREAM_H */ diff --git a/include/JSystem/JGadget/std-streambuf.h b/include/JSystem/JGadget/std-streambuf.h new file mode 100644 index 0000000000..06ac0e36e7 --- /dev/null +++ b/include/JSystem/JGadget/std-streambuf.h @@ -0,0 +1,76 @@ +#ifndef JGADGET_STD_STREAMBUF_H +#define JGADGET_STD_STREAMBUF_H + +#include +#include + +namespace JGadget { +template +struct TTrait_char {}; + +template <> +struct TTrait_char { + static int eof() { return -1; } + static int to_int_type(char value) { return (int)value; } + static char to_char_type(int value) { return (char)value; } + static bool eq_int_type(int a, int b) { return a == b; } + static size_t length(const char* sz) { return strlen(sz); } +}; + +class TStreamBuffer { +public: + TStreamBuffer() { + pBase_get_ = NULL; + pEnd_get_ = NULL; + pCurrent_get_ = NULL; + pBase_put_ = NULL; + pEnd_put_ = NULL; + pCurrent_put_ = NULL; + } + + virtual ~TStreamBuffer() = 0; + + int sputc(char param_0) { + if (pCurrent_put_ < pEnd_put_) { + *pCurrent_put_ = param_0; + pCurrent_put_++; + return TTrait_char::to_int_type(param_0); + } else { + return overflow(TTrait_char::to_int_type(param_0)); + } + } + + int sgetc(); + + int sbumpc() { + if (pCurrent_get_ < pEnd_get_) { + int var_r29 = TTrait_char::to_int_type(*pCurrent_get_); + pCurrent_get_++; + return var_r29; + } + + return uflow(); + } + + int snextc() { + int var_r31 = TTrait_char::eof(); + return TTrait_char::eq_int_type(sbumpc(), var_r31) ? var_r31 : sgetc(); + } + + virtual void setbuf(char*, s32); + virtual s32 sync(); + virtual int underflow(); + virtual int uflow(); + virtual s32 xsputn(const char*, s32); + virtual int overflow(int); + + /* 0x04 */ char* pBase_get_; + /* 0x08 */ char* pEnd_get_; + /* 0x0C */ char* pCurrent_get_; + /* 0x10 */ char* pBase_put_; + /* 0x14 */ char* pEnd_put_; + /* 0x18 */ char* pCurrent_put_; +}; +} + +#endif /* JGADGET_STD_STREAMBUF_H */ diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 3aba3302a3..3c8cf14908 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -70,6 +70,10 @@ namespace JUTAssertion { inline void showAssert(u32 device, const char* file, int line, const char* msg) { showAssert_f(device, file, line, "%s", msg); } + + inline void setWarningMessage(u32 device, char* file, int line, const char* msg) { + setWarningMessage_f(device, file, line, "%s", msg); + } }; extern bool sAssertVisible; diff --git a/src/JSystem/JGadget/binary.cpp b/src/JSystem/JGadget/binary.cpp index e6c25a9044..cde00093f2 100644 --- a/src/JSystem/JGadget/binary.cpp +++ b/src/JSystem/JGadget/binary.cpp @@ -1,62 +1,81 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JGadget/binary.h" +#include "JSystem/JGadget/define.h" +#include -const void* -JGadget::binary::parseVariableUInt_16_32_following(void const* buffer, u32* param_1, u32* param_2, - JGadget::binary::TEBit* param_3) { - JGadget::binary::TEBit temp; - if (param_3 == NULL) { - param_3 = &temp; +#if DEBUG +static void dummyString() { + // probably some stripped function that called JUT_ASSERT here + DEAD_STRING("Halt"); +} +#endif + +const void* JGadget::binary::parseVariableUInt_16_32_following(const void* pBuffer, u32* pu32First, u32* pu32Second, + JGadget::binary::TEBit* pTEBit) { + u16* pu16 = (u16*)pBuffer; + JUT_ASSERT(122, pu16!=NULL); + JUT_ASSERT(123, pu32First!=NULL); + JUT_ASSERT(124, pu32Second!=NULL); + + JGadget::binary::TEBit spC; + if (pTEBit == NULL) { + pTEBit = &spC; } - u32 uVar1 = *(u16*)buffer; - const void* rv; - if ((uVar1 & 0x8000) == 0) { - param_3->value = 0x10; - *param_1 = uVar1; - *param_2 = *(u16*)((u8*)buffer + 2); - rv = (u8*)buffer + 4; + + u32 var_r30 = *pu16; + if ((var_r30 & 0x8000) == 0) { + pTEBit->value = 0x10; + + *pu32First = var_r30; + pu16++; + *pu32Second = *pu16; + + return pu16 + 1; } else { - param_3->value = 0x20; - uVar1 <<= 16; - uVar1 &= 0x7fff0000; - uVar1 |= *(u16*)((u8*)buffer + 2); - *param_1 = uVar1; - *param_2 = *(u32*)((u8*)buffer + 4); - rv = (u8*)buffer + 8; + pTEBit->value = 0x20; + + var_r30 &= 0x7FFF; + var_r30 <<= 16; + pu16++; + var_r30 |= *pu16; + + *pu32First = var_r30; + pu16++; + *pu32Second = *(u32*)pu16; + + return pu16 + 2; } - return rv; } -JGadget::binary::TParse_header_block::~TParse_header_block() { -} +JGadget::binary::TParse_header_block::~TParse_header_block() {} -bool JGadget::binary::TParse_header_block::parse_next(void const** ptrLocation, u32 idx) { - u32 headerEnd, blockEnd; +bool JGadget::binary::TParse_header_block::parse_next(const void** ppData_inout, u32 idx) { + u32 uBlock, uData; - if ((ptrLocation == NULL) || (*ptrLocation == NULL)) { + if (ppData_inout == NULL || *ppData_inout == NULL) { + JGADGET_WARNMSG(172, "data not specified"); return false; } - bool check, checkLastBlock; - checkLastBlock = check = false; - check = checkNext(ptrLocation, &headerEnd, idx); - - checkLastBlock = check; - if (!(idx & 1) && (check == false)) { - return check; + bool var_r29 = true; + var_r29 = parseHeader_next(ppData_inout, &uBlock, idx) && var_r29; + + if (!(idx & 1) && !var_r29) { + return var_r29; } - while (headerEnd > 0) { - check = false; - if (parseBlock_next(ptrLocation, &blockEnd, idx) && checkLastBlock) { - check = true; + while (uBlock > 0) { + const void* p = *ppData_inout; + var_r29 = parseBlock_next(ppData_inout, &uData, idx) && var_r29; + + JUT_ASSERT(192, std::uintptr_t(*ppData_inout)==std::uintptr_t(p)+uData); + + if ((idx & 2) == 0 && !var_r29) { + return var_r29; } - checkLastBlock = check; - if (((idx & 2) == 0) && (check == false)) { - return check; - } - headerEnd--; + uBlock--; } - return checkLastBlock; + + return var_r29; } diff --git a/src/JSystem/JGadget/define.cpp b/src/JSystem/JGadget/define.cpp new file mode 100644 index 0000000000..f7496480ac --- /dev/null +++ b/src/JSystem/JGadget/define.cpp @@ -0,0 +1,72 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JGadget/define.h" + +#define MSL_USE_INLINES 1 +#include + +JGadget_outMessage::JGadget_outMessage(MessageFunc fn, const char* file, int line) { + mMsgFunc = fn; + mFile = file; + mLine = line; + + mWrite_p = mBuffer; + *mWrite_p = 0; +} + +JGadget_outMessage::~JGadget_outMessage() { + for (u8* p = (u8*)mBuffer; p != (u8*)mWrite_p; p++) { + char c = *p; + if (!isprint(c) && !isspace(c)) { + *p = '_'; + } + } + + mMsgFunc(mFile, mLine, mBuffer); +} + +JGadget_outMessage& JGadget_outMessage::operator<<(const char* sz) { + JUT_ASSERT(99, sz!=NULL); + + while (*sz != 0 && mWrite_p < mBuffer + (BUFFER_SIZE - 1)) { + *mWrite_p = *sz; + mWrite_p++; + sz++; + } + + *mWrite_p = 0; + return *this; +} + +JGadget_outMessage& JGadget_outMessage::operator<<(char c) { + char sz[2]; + sz[0] = c; + sz[1] = 0; + + return *this << sz; +} + +JGadget_outMessage& JGadget_outMessage::operator<<(s32 value) { + char sz[64]; + snprintf(sz, 64, "%d", value); + + return *this << sz; +} + +JGadget_outMessage& JGadget_outMessage::operator<<(u32 value) { + char sz[64]; + snprintf(sz, 64, "%u", value); + + return *this << sz; +} + +JGadget_outMessage& JGadget_outMessage::operator<<(const void* data) { + char sz[64]; + snprintf(sz, 64, "%p", data); + + return *this << sz; +} + +void JGadget_outMessage::warning(const char* file, int line, const char* message) { + JUTAssertion::setWarningMessage(3, (char*)file, line, message); +} diff --git a/src/JSystem/JGadget/dolphin-stream-JORFile.cpp b/src/JSystem/JGadget/dolphin-stream-JORFile.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JGadget/search.cpp b/src/JSystem/JGadget/search.cpp new file mode 100644 index 0000000000..906bb8c560 --- /dev/null +++ b/src/JSystem/JGadget/search.cpp @@ -0,0 +1,13 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JGadget/search.h" + +const char* JGadget::toStringFromIndex(int index, const char* const* pValue, u32 count, const char* fallback) { + return toValueFromIndex(index, pValue, count, fallback); +} + +int JGadget::toIndexFromString_linear(const char* sz, const char* const* pValue, u32 count, int fallback) { + JUT_ASSERT(29, sz!=NULL); + return toIndexFromValue_linear_if( + search::TPR1IsEqual_string_(sz), pValue, count, fallback); +} diff --git a/src/JSystem/JGadget/std-list.cpp b/src/JSystem/JGadget/std-list.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JGadget/std-stream.cpp b/src/JSystem/JGadget/std-stream.cpp new file mode 100644 index 0000000000..418e8096a3 --- /dev/null +++ b/src/JSystem/JGadget/std-stream.cpp @@ -0,0 +1,413 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JGadget/std-stream.h" +#include "JSystem/JGadget/define.h" +#include +#include + +namespace JGadget { +namespace { + namespace floatingpoint_ { + int classify(double x) { + int fp = __fpclassifyd(x); + switch (fp) { + case FP_ZERO: + return 1; + case FP_SUBNORMAL: + return 2; + case FP_NORMAL: + return 3; + case FP_INFINITE: + return 4; + case FP_QNAN: + return 5; + } + + return 0; + } + } +} + +TStream_base::~TStream_base() {} +TStream::~TStream() {} + +void TStream::init(TStreamBuffer* psb) { + Init_(); + state_ = 0; + rdbuf_ = psb; + fill_ = widen(' '); + + JUT_ASSERT(126, rdbuf()==psb); + JUT_ASSERT(127, flags()==(skipws|dec)); + JUT_ASSERT(128, width()==0); + JUT_ASSERT(129, precision()==6); + JUT_ASSERT(130, fill()==' '); +} + +// NONMATCHING +TInputStream::sentry::sentry(TInputStream& stream, bool param_1) { + _0x0 = stream._0x0->good(); + if (!_0x0) { + stream._0x0->setstate(2); + return; + } + + if (!param_1 && (stream._0x0->flags() & TStream_base::dec)) { + TStreamBuffer* rdbuf = stream._0x0->rdbuf(); + int var_r28 = rdbuf->sgetc(); + + while (true) { + var_r28 = rdbuf->snextc(); + + if (TTrait_char::eq_int_type(var_r28, TTrait_char::eof())) { + break; + } + + if (!isspace(TTrait_char::to_char_type(var_r28))) { + break; + } + } + } + + _0x0 = stream._0x0->good(); +} + +// NONMATCHING +TInputStream::~TInputStream() {} + +int TInputStream::get() { + int var_r29; + int var_r28 = TTrait_char::eof(); + field_0x8 = 0; + + var_r29 = var_r28; + sentry entry(*this, true); + if (entry) { + TStreamBuffer* var_r26 = _0x0->rdbuf(); + int var_r27 = 0; + + var_r29 = var_r26->sbumpc(); + if (TTrait_char::eq_int_type(var_r29, var_r28)) { + var_r27 |= 0x3; + } else { + field_0x8++; + } + } + + return var_r29; +} + +// NONMATCHING +TOutputStream::~TOutputStream() {} + +void TOutputStream::flush() {} + +// NONMATCHING +TOutputStream& TOutputStream::operator<<(const char* param_0) { + sentry entry(*this); + if (entry) { + TBufferIterator& sp8 = Put(param_0, TTrait_char::length(param_0)); + if (TBufferIterator(sp8).failed()) { + _0x0->setstate(6); + } + } + + return *this; +} + +// NONMATCHING +TOutputStream& TOutputStream::operator<<(char param_0) { + char sz[2]; + sz[0] = param_0; + + sentry entry(*this); + if (entry) { + TBufferIterator& sp8 = Put(sz, 1); + if (TBufferIterator(sp8).failed()) { + _0x0->setstate(6); + } + } + + return *this; +} + +// NONMATCHING +TOutputStream& TOutputStream::operator<<(s32 param_0) { + sentry entry(*this); + if (entry) { + TBufferIterator& sp8 = Put(param_0); + if (TBufferIterator(sp8).failed()) { + _0x0->setstate(6); + } + } + + return *this; +} + +// NONMATCHING +TOutputStream& TOutputStream::operator<<(u32 param_0) { + sentry entry(*this); + if (entry) { + TBufferIterator& sp8 = Put(param_0); + if (TBufferIterator(sp8).failed()) { + _0x0->setstate(6); + } + } + + return *this; +} + +// NONMATCHING +TOutputStream& TOutputStream::operator<<(bool param_0) { + sentry entry(*this); + if (entry) { + TBufferIterator& sp8 = Put(param_0); + if (TBufferIterator(sp8).failed()) { + _0x0->setstate(6); + } + } + + return *this; +} + +// NONMATCHING +TOutputStream& TOutputStream::operator<<(double param_0) { + sentry entry(*this); + if (entry) { + TBufferIterator& sp8 = Put(param_0); + if (TBufferIterator(sp8).failed()) { + _0x0->setstate(6); + } + } + + return *this; +} + +// NONMATCHING +TOutputStream::TBufferIterator& TOutputStream::Put(double param_0) { + u32 flags = _0x0->flags(); + + const saoCaseNumeral_struct& sp24 = getCaseNumeral_(flags); + + const TCString_* var_r28 = &saoszPrefix_sign_[0]; + if (param_0 < 0.0f) { + var_r28 = &saoszPrefix_sign_[2]; + param_0 = -param_0; + } else if (flags & 0x1000) { + var_r28 = &saoszPrefix_sign_[1]; + } + + TCString_ sp30; + int sp1C = floatingpoint_::classify(param_0); + switch (sp1C) { + case 5: + sp30 = sp24._3; + break; + case 4: + sp30 = sp24._2; + break; + default: + char sp28[8]; + char* var_r30 = sp28; + + *var_r30 = '%'; + if (flags & 0x800) { + *++var_r30 = '#'; + } + *++var_r30 = '.'; + *++var_r30 = '*'; + + static const char pcFormat[] = "gGffeE"; + const char* var_r29 = pcFormat; + + u32 sp18 = flags & 0xF0000000; + switch (sp18) { + case 0: + break; + case 0x10000000: + var_r29 += 2; + break; + case 0x20000000: + var_r29 += 4; + break; + default: + JGADGET_WARNMSG1(580, "illegal float-field : ", sp18); + bool sp9 = false; + } + + if (flags & 4) { + var_r29++; + } + + *++var_r30 = *var_r29; + *++var_r30 = 0; + + char sp38[64]; + int sp14 = snprintf(sp38, 64, sp28, param_0, _0x0->precision()); + sp30.sz = sp38; + + int sp10; + bool sp8 = sp14 >= 0 && (u32)sp14 < 64; + if (sp8) { + sp10 = sp14; + } else { + JUT_ASSERT(590, false); + int spC = 0x3F; + sp10 = spC; + } + + sp30.len = sp10; + } + + return Put_CString_prefixed_(sp30.sz, sp30.len, var_r28->sz, var_r28->len); +} + +TOutputStream::TBufferIterator& TOutputStream::Put_CString_prefixed_(const char* param_0, u32 param_1, const char* param_2, u32 param_3) { + TBufferIterator sp8(_0x0->rdbuf()); + if (sp8.failed()) { + return sp8; + } + + u32 flags = _0x0->flags(); + char fill = _0x0->fill(); + s32 width = _0x0->width(); + + s32 var_r26 = param_1 + param_3; + s32 var_r31 = 0; + if (width > var_r26) { + var_r31 = width - var_r26; + } + + if (!(flags & 0x50000)) { + while (var_r31 != 0) { + *sp8 = fill; + var_r31--; + ++sp8; + } + } + + while (param_3 != 0) { + *sp8 = *param_2; + param_3--; + param_2++; + ++sp8; + } + + if (flags & 0x40000) { + while (var_r31 != 0) { + *sp8 = fill; + var_r31--; + ++sp8; + } + } + + while (param_1 != 0) { + *sp8 = *param_0; + param_1--; + param_0++; + ++sp8; + } + + if (flags & 0x10000) { + while (var_r31 != 0) { + *sp8 = fill; + var_r31--; + ++sp8; + } + } + + _0x0->width(0); + return sp8; +} + +// NONMATCHING - stack +TOutputStream::TBufferIterator& TOutputStream::Put_longInt_(u32 param_0, bool param_1) { + bool spC = false; + + char buf[33]; + char* pbufBegin = buf; + char* pbufEnd = &buf[32]; + char* pbuf = pbufEnd; + + u32 flags = _0x0->flags(); + + const saoCaseNumeral_struct& sp20 = getCaseNumeral_(flags); + const char* sp1C = sp20._0; + int sp18 = 10; + + const TCString_* var_r29 = &saoszPrefix_sign_[0]; + + u32 sp14 = flags & 0xFC00000; + switch (sp14) { + case 0x400000: + if (param_1) { + int sp10 = param_0; + if (sp10 < 0) { + var_r29 = &saoszPrefix_sign_[2]; + param_0 = -sp10; + } else if (flags & 0x1000) { + var_r29 = &saoszPrefix_sign_[1]; + } + } + break; + case 0x800000: + sp18 = 0x10; + if (param_0 != 0 && (flags & 0x400)) { + var_r29 = &sp20._1; + } + break; + case 0x1000000: + sp18 = 8; + if (param_0 != 0 && (flags & 0x400)) { + var_r29 = &soszPrefix_oct_; + } + break; + default: + JGADGET_WARNMSG1(737, "illegal base-field : ", sp14); + bool spA = false; + } + + if (param_0 == 0) { + pbuf--; + *pbuf = TStream::widen('0'); + } else { + do { + pbuf--; + *pbuf = TStream::widen(sp1C[param_0 % sp18]); + param_0 /= sp18; + } while (param_0 != 0); + } + + JUT_ASSERT(737, (pbufBegin<=pbuf)&&(pbufsz, var_r29->len); +} + +const TOutputStream::saoCaseNumeral_struct TOutputStream::saoCaseNumeral_[2] = { + { + {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}, + {"0x", 2}, + {"inf", 3}, + {"nan", 3}, + }, + { + {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}, + {"0X", 2}, + {"INF", 3}, + {"NAN", 3}, + }, +}; + +const TOutputStream::TCString_ TOutputStream::saoszPrefix_sign_[3] = { + {"", 0}, + {"+", 1}, + {"-", 1}, +}; + +const TOutputStream::TCString_ TOutputStream::saaosz_bool_[2][2] = { + {{"0", 1}, {"1", 1}}, + {{"false", 5}, {"true", 4}}, +}; + +const TOutputStream::TCString_ TOutputStream::soszPrefix_oct_ = {"0", 1}; + +} diff --git a/src/JSystem/JGadget/std-streambuf.cpp b/src/JSystem/JGadget/std-streambuf.cpp new file mode 100644 index 0000000000..b9cc93de22 --- /dev/null +++ b/src/JSystem/JGadget/std-streambuf.cpp @@ -0,0 +1,60 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include "JSystem/JGadget/std-streambuf.h" +#include "JSystem/JUtility/JUTAssert.h" +#include + +namespace JGadget { +TStreamBuffer::~TStreamBuffer() {} + +void TStreamBuffer::setbuf(char*, s32) {} + +s32 TStreamBuffer::sync() { + return 0; +} + +int TStreamBuffer::underflow() { + return TTrait_char::eof(); +} + +int TStreamBuffer::uflow() { + int var_r30 = TTrait_char::eof(); + int var_r29; + + if (TTrait_char::eq_int_type(underflow(), var_r30)) { + return var_r30; + } + + var_r29 = TTrait_char::to_int_type(*pCurrent_get_); + pCurrent_get_++; + return var_r29; +} + +s32 TStreamBuffer::xsputn(const char* param_0, s32 param_1) { + s32 var_r29 = std::min(param_1, pEnd_put_ - pCurrent_put_); + if (var_r29 > 0) { + const char* var_r27 = param_0 + var_r29; + JUT_ASSERT(70, pCurrent_put_!=NULL); + pCurrent_put_ = std::copy(param_0, var_r27, pCurrent_put_); + param_0 = var_r27; + param_1 -= var_r29; + } + + while (param_1 > 0) { + if (TTrait_char::eq_int_type(sputc(*param_0), TTrait_char::eof())) { + break; + } + + param_1--; + param_0++; + var_r29++; + s32 var_r25 = var_r29; + } + + return var_r29; +} + +int TStreamBuffer::overflow(int) { + return TTrait_char::eof(); +} +} diff --git a/src/JSystem/JGadget/std-string.cpp b/src/JSystem/JGadget/std-string.cpp new file mode 100644 index 0000000000..04b416b0d1 --- /dev/null +++ b/src/JSystem/JGadget/std-string.cpp @@ -0,0 +1,9 @@ +#include "JSystem/JSystem.h" // IWYU pragma: keep + +#include + +static void dummy() { + u32 a = 0; + u32 b = 1; + std::min(a, b); +} diff --git a/src/JSystem/JGadget/textreader.cpp b/src/JSystem/JGadget/textreader.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JGadget/xml-scanner.cpp b/src/JSystem/JGadget/xml-scanner.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp index 05c8201f11..27be140bd8 100644 --- a/src/JSystem/JKernel/JKRFileCache.cpp +++ b/src/JSystem/JKernel/JKRFileCache.cpp @@ -5,6 +5,7 @@ #include "JSystem/JKernel/JKRFileFinder.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" + #include "ctype.h" #include "string.h" #include "global.h" diff --git a/src/JSystem/JStudio/JStudioCameraEditor/control.cpp b/src/JSystem/JStudio/JStudioCameraEditor/control.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp b/src/JSystem/JStudio/JStudioCameraEditor/controlset-csb-valueset.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioCameraEditor/csb-data.cpp b/src/JSystem/JStudio/JStudioCameraEditor/csb-data.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioCameraEditor/csb.cpp b/src/JSystem/JStudio/JStudioCameraEditor/csb.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioCameraEditor/sequence.cpp b/src/JSystem/JStudio/JStudioCameraEditor/sequence.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioPreviewer/control.cpp b/src/JSystem/JStudio/JStudioPreviewer/control.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioToolLibrary/anchor.cpp b/src/JSystem/JStudio/JStudioToolLibrary/anchor.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioToolLibrary/console.cpp b/src/JSystem/JStudio/JStudioToolLibrary/console.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioToolLibrary/controlset-anchor.cpp b/src/JSystem/JStudio/JStudioToolLibrary/controlset-anchor.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioToolLibrary/controlset-preview.cpp b/src/JSystem/JStudio/JStudioToolLibrary/controlset-preview.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioToolLibrary/controlset.cpp b/src/JSystem/JStudio/JStudioToolLibrary/controlset.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioToolLibrary/interface.cpp b/src/JSystem/JStudio/JStudioToolLibrary/interface.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp b/src/JSystem/JStudio/JStudioToolLibrary/jstudio-controlset-transform.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioToolLibrary/scroll.cpp b/src/JSystem/JStudio/JStudioToolLibrary/scroll.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioToolLibrary/visual.cpp b/src/JSystem/JStudio/JStudioToolLibrary/visual.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JStudio/JStudioToolLibrary/xml.cpp b/src/JSystem/JStudio/JStudioToolLibrary/xml.cpp new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/src/JSystem/JSupport/JSUInputStream.cpp index 26830a0b51..cb5a2fdc09 100644 --- a/src/JSystem/JSupport/JSUInputStream.cpp +++ b/src/JSystem/JSupport/JSUInputStream.cpp @@ -35,9 +35,9 @@ char* JSUInputStream::read(char* str) { } s32 JSUInputStream::skip(s32 count) { - u8 buffer; - s32 skipCount = 0; - for (; skipCount < count; skipCount++) { + s32 skipCount; + for (skipCount = 0; skipCount < count; skipCount++) { + u8 buffer; if (readData(&buffer, sizeof(buffer)) != sizeof(buffer)) { setState(IOS_STATE_1); break; diff --git a/src/JSystem/JSupport/JSUList.cpp b/src/JSystem/JSupport/JSUList.cpp index 1a544fb60c..516b37bb7b 100644 --- a/src/JSystem/JSupport/JSUList.cpp +++ b/src/JSystem/JSupport/JSUList.cpp @@ -23,11 +23,9 @@ JSUPtrList::JSUPtrList(bool init) { JSUPtrList::~JSUPtrList() { JSUPtrLink* node = mHead; - s32 removed = 0; - while (mLength > removed) { + for (int i = 0; i < mLength; i++) { node->mList = NULL; - node = node->getNext(); - removed += 1; + node = node->mNext; } } @@ -47,10 +45,9 @@ void JSUPtrList::setFirst(JSUPtrLink* first) { } bool JSUPtrList::append(JSUPtrLink* ptr) { - JSUPtrList* list = ptr->mList; - bool result = (NULL == list); + bool result = ptr->mList == NULL; if (!result) { - result = list->remove(ptr); + result = ptr->mList->remove(ptr); } if (result) { @@ -70,10 +67,9 @@ bool JSUPtrList::append(JSUPtrLink* ptr) { } bool JSUPtrList::prepend(JSUPtrLink* ptr) { - JSUPtrList* list = ptr->mList; - bool result = (NULL == list); + bool result = ptr->mList == NULL; if (!result) { - result = list->remove(ptr); + result = ptr->mList->remove(ptr); } if (result) { @@ -103,7 +99,7 @@ bool JSUPtrList::insert(JSUPtrLink* before, JSUPtrLink* ptr) { return false; } - bool result = (NULL == ptr->mList); + bool result = ptr->mList == NULL; if (!result) { result = ptr->mList->remove(ptr); } @@ -152,7 +148,7 @@ JSUPtrLink* JSUPtrList::getNthLink(u32 index) const { JSUPtrLink* node = mHead; for (u32 i = 0; i < index; i++) { - node = node->getNext(); + node = node->mNext; } return node; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h index 126a38f5ba..8a1ef98eb3 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h @@ -4,6 +4,7 @@ #include #include #include +#include "global.h" namespace std { @@ -127,6 +128,36 @@ inline void fill(ForwardIt first, ForwardIt last, const T& value) { } } +#if PLATFORM_SHIELD +template +struct __msl_copy { + static T* copy(T* first, T* last, T* result) { + for (; first < last; ++first, ++result) + *result = *first; + return result; + } +}; + +template +struct __msl_copy { + static T* copy(T* first, T* last, T* result) { + size_t n = static_cast(last - first); + memmove(result, first, n * sizeof(T)); + return result + n; + } +}; + +template +inline T* copy(T* first, T* last, T* result) { + return __msl_copy::copy(first, last, result); +} + +template +inline T* copy(const T* first, const T* last, T* result) { + return __msl_copy::copy(const_cast(first), const_cast(last), result); +} +#endif + template inline OutputIt copy(InputIt first, InputIt last, OutputIt d_first) { @@ -177,6 +208,11 @@ inline T* copy_backward(T* first, T* last, T* result) { return __copy_backward::copy_backward(first, last, result); } +template +inline const T& min(const T& a, const T& b) { + return b < a ? b : a; +} + } // namespace std #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h index a0f28e735c..8ae87d0401 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h @@ -56,7 +56,20 @@ extern const unsigned short __ctype_mapC[0x100]; #endif -int tolower(int); +int isalnum(int c); +int isalpha(int c); +int isblank(int c); +int iscntrl(int c); +int isdigit(int c); +int isgraph(int c); +int islower(int c); +int isprint(int c); +int ispunct(int c); +int isupper(int c); +int isxdigit(int c); +int isspace(int c); +int tolower(int c); +int toupper(int c); #if MSL_USE_INLINES MSL_INLINE int isalnum(int c) { From 798ba743a064c783ed51436c31c5a64920483929 Mon Sep 17 00:00:00 2001 From: hatal175 Date: Mon, 29 Dec 2025 14:12:01 +0200 Subject: [PATCH 24/35] Work on d_cc_d debug (#3002) --- include/SSystem/SComponent/c_cc_d.h | 36 ++++++---- include/SSystem/SComponent/c_m3d.h | 7 ++ include/SSystem/SComponent/c_m3d_g_lin.h | 3 +- include/d/d_cc_d.h | 19 ++++- include/m_Do/m_Do_mtx.h | 4 ++ src/SSystem/SComponent/c_m3d.cpp | 41 +++++++++++ src/d/actor/d_a_alink.cpp | 20 +++--- src/d/actor/d_a_b_dr.cpp | 30 ++++---- src/d/actor/d_a_b_ds.cpp | 20 +++--- src/d/actor/d_a_b_gg.cpp | 20 +++--- src/d/actor/d_a_b_gnd.cpp | 10 +-- src/d/actor/d_a_b_gos.cpp | 14 ++-- src/d/actor/d_a_b_yo.cpp | 10 +-- src/d/actor/d_a_b_yo_ice.cpp | 30 ++++---- src/d/actor/d_a_b_zant.cpp | 14 ++-- src/d/actor/d_a_b_zant_mobile.cpp | 10 +-- src/d/actor/d_a_bg_obj.cpp | 10 +-- src/d/actor/d_a_boomerang.cpp | 8 ++- src/d/actor/d_a_canoe.cpp | 10 +-- src/d/actor/d_a_cstaF.cpp | 10 +-- src/d/actor/d_a_cstatue.cpp | 6 +- src/d/actor/d_a_e_ai.cpp | 10 +-- src/d/actor/d_a_e_bee.cpp | 10 +-- src/d/actor/d_a_e_bi.cpp | 10 +-- src/d/actor/d_a_e_df.cpp | 14 ++-- src/d/actor/d_a_e_fs.cpp | 10 +-- src/d/actor/d_a_e_gb.cpp | 10 +-- src/d/actor/d_a_e_hp.cpp | 16 +++-- src/d/actor/d_a_e_is.cpp | 10 +-- src/d/actor/d_a_e_kk.cpp | 10 +-- src/d/actor/d_a_e_md.cpp | 10 +-- src/d/actor/d_a_e_nest.cpp | 10 +-- src/d/actor/d_a_e_pm.cpp | 10 +-- src/d/actor/d_a_e_po.cpp | 10 +-- src/d/actor/d_a_e_pz.cpp | 20 +++--- src/d/actor/d_a_e_rdb.cpp | 10 +-- src/d/actor/d_a_e_sb.cpp | 10 +-- src/d/actor/d_a_e_st.cpp | 10 +-- src/d/actor/d_a_e_vt.cpp | 10 +-- src/d/actor/d_a_e_zh.cpp | 8 ++- src/d/actor/d_a_e_zm.cpp | 6 +- src/d/actor/d_a_e_zs.cpp | 10 +-- src/d/actor/d_a_ep.cpp | 10 +-- src/d/actor/d_a_horse.cpp | 10 +-- src/d/actor/d_a_mg_fish.cpp | 10 +-- src/d/actor/d_a_npc.cpp | 10 +-- src/d/actor/d_a_npc2.cpp | 2 + src/d/actor/d_a_npc4.cpp | 10 +-- src/d/actor/d_a_npc_blue_ns.cpp | 10 +-- src/d/actor/d_a_npc_cd.cpp | 14 ++-- src/d/actor/d_a_npc_cd2.cpp | 10 +-- src/d/actor/d_a_npc_coach.cpp | 4 +- src/d/actor/d_a_npc_kn.cpp | 4 +- src/d/actor/d_a_npc_ks.cpp | 10 +-- src/d/actor/d_a_npc_shop0.cpp | 10 +-- src/d/actor/d_a_obj_Turara.cpp | 10 +-- src/d/actor/d_a_obj_TvCdlst.cpp | 10 +-- src/d/actor/d_a_obj_Y_taihou.cpp | 10 +-- src/d/actor/d_a_obj_automata.cpp | 10 +-- src/d/actor/d_a_obj_barDesk.cpp | 4 +- src/d/actor/d_a_obj_bbox.cpp | 10 +-- src/d/actor/d_a_obj_bemos.cpp | 10 +-- src/d/actor/d_a_obj_bhashi.cpp | 10 +-- src/d/actor/d_a_obj_bky_rock.cpp | 10 +-- src/d/actor/d_a_obj_bmWindow.cpp | 10 +-- src/d/actor/d_a_obj_boumato.cpp | 10 +-- src/d/actor/d_a_obj_brg.cpp | 20 +++--- src/d/actor/d_a_obj_bubblePilar.cpp | 4 +- src/d/actor/d_a_obj_burnbox.cpp | 10 +-- src/d/actor/d_a_obj_carry.cpp | 20 +++--- src/d/actor/d_a_obj_cblock.cpp | 2 + src/d/actor/d_a_obj_chest.cpp | 10 +-- src/d/actor/d_a_obj_crvlh_down.cpp | 10 +-- src/d/actor/d_a_obj_cwall.cpp | 20 +++--- src/d/actor/d_a_obj_fireWood.cpp | 10 +-- src/d/actor/d_a_obj_fireWood2.cpp | 10 +-- src/d/actor/d_a_obj_flag2.cpp | 10 +-- src/d/actor/d_a_obj_gadget.cpp | 10 +-- src/d/actor/d_a_obj_gpTaru.cpp | 10 +-- src/d/actor/d_a_obj_graWall.cpp | 10 +-- src/d/actor/d_a_obj_gra_rock.cpp | 10 +-- src/d/actor/d_a_obj_grave_stone.cpp | 4 +- src/d/actor/d_a_obj_hakai_brl.cpp | 10 +-- src/d/actor/d_a_obj_hakai_ftr.cpp | 14 ++-- src/d/actor/d_a_obj_hbombkoya.cpp | 10 +-- src/d/actor/d_a_obj_hhashi.cpp | 10 +-- src/d/actor/d_a_obj_iceblock.cpp | 10 +-- src/d/actor/d_a_obj_iceleaf.cpp | 10 +-- src/d/actor/d_a_obj_inobone.cpp | 20 +++--- src/d/actor/d_a_obj_item.cpp | 10 +-- src/d/actor/d_a_obj_kago.cpp | 10 +-- src/d/actor/d_a_obj_kaisou.cpp | 10 +-- src/d/actor/d_a_obj_kantera.cpp | 10 +-- src/d/actor/d_a_obj_kazeneko.cpp | 10 +-- src/d/actor/d_a_obj_kbacket.cpp | 10 +-- src/d/actor/d_a_obj_kgate.cpp | 10 +-- src/d/actor/d_a_obj_klift00.cpp | 10 +-- src/d/actor/d_a_obj_ktOnFire.cpp | 10 +-- src/d/actor/d_a_obj_laundry.cpp | 10 +-- src/d/actor/d_a_obj_life_container.cpp | 10 +-- src/d/actor/d_a_obj_lv1Candle00.cpp | 4 +- src/d/actor/d_a_obj_lv1Candle01.cpp | 4 +- src/d/actor/d_a_obj_lv2Candle.cpp | 4 +- src/d/actor/d_a_obj_lv5FloorBoard.cpp | 10 +-- src/d/actor/d_a_obj_lv5IceWall.cpp | 10 +-- src/d/actor/d_a_obj_lv5SwIce.cpp | 10 +-- src/d/actor/d_a_obj_lv5ychndlr.cpp | 20 +++--- src/d/actor/d_a_obj_lv5yiblltray.cpp | 10 +-- src/d/actor/d_a_obj_lv6ChangeGate.cpp | 4 +- src/d/actor/d_a_obj_lv6SwGate.cpp | 11 ++- src/d/actor/d_a_obj_lv6TogeTrap.cpp | 10 +-- src/d/actor/d_a_obj_lv6bemos2.cpp | 10 +-- src/d/actor/d_a_obj_lv6egate.cpp | 10 +-- src/d/actor/d_a_obj_lv7bridge.cpp | 10 +-- src/d/actor/d_a_obj_master_sword.cpp | 10 +-- src/d/actor/d_a_obj_mato.cpp | 10 +-- src/d/actor/d_a_obj_mie.cpp | 10 +-- src/d/actor/d_a_obj_movebox.cpp | 10 +-- src/d/actor/d_a_obj_nagaisu.cpp | 10 +-- src/d/actor/d_a_obj_octhashi.cpp | 12 ++-- src/d/actor/d_a_obj_oiltubo.cpp | 10 +-- src/d/actor/d_a_obj_onsenTaru.cpp | 10 +-- src/d/actor/d_a_obj_pdtile.cpp | 10 +-- src/d/actor/d_a_obj_picture.cpp | 10 +-- src/d/actor/d_a_obj_pillar.cpp | 10 +-- src/d/actor/d_a_obj_pumpkin.cpp | 10 +-- src/d/actor/d_a_obj_rgate.cpp | 10 +-- src/d/actor/d_a_obj_riverrock.cpp | 10 +-- src/d/actor/d_a_obj_rotTrap.cpp | 4 +- src/d/actor/d_a_obj_rw.cpp | 10 +-- src/d/actor/d_a_obj_shield.cpp | 10 +-- src/d/actor/d_a_obj_smallkey.cpp | 10 +-- src/d/actor/d_a_obj_so.cpp | 10 +-- src/d/actor/d_a_obj_swLight.cpp | 10 +-- src/d/actor/d_a_obj_swpropeller.cpp | 8 ++- src/d/actor/d_a_obj_taFence.cpp | 10 +-- src/d/actor/d_a_obj_tatigi.cpp | 10 +-- src/d/actor/d_a_obj_thashi.cpp | 10 +-- src/d/actor/d_a_obj_thdoor.cpp | 10 +-- src/d/actor/d_a_obj_togeTrap.cpp | 10 +-- src/d/actor/d_a_obj_tp.cpp | 10 +-- src/d/actor/d_a_obj_volcbom.cpp | 10 +-- src/d/actor/d_a_obj_waterfall.cpp | 10 +-- src/d/actor/d_a_obj_web1.cpp | 10 +-- src/d/actor/d_a_obj_window.cpp | 10 +-- src/d/actor/d_a_obj_wood_statue.cpp | 10 +-- src/d/actor/d_a_obj_wsword.cpp | 10 +-- src/d/actor/d_a_obj_yel_bag.cpp | 4 +- src/d/actor/d_a_obj_yobikusa.cpp | 10 +-- src/d/actor/d_a_obj_zdoor.cpp | 20 +++--- src/d/actor/d_a_obj_zrTurara.cpp | 4 +- src/d/actor/d_a_obj_zraMark.cpp | 10 +-- src/d/actor/d_a_spinner.cpp | 8 ++- src/d/actor/d_a_tag_attack_item.cpp | 10 +-- src/d/actor/d_a_tag_csw.cpp | 20 +++--- src/d/actor/d_a_tag_pachi.cpp | 10 +-- src/d/actor/d_a_tag_qs.cpp | 10 +-- src/d/actor/d_a_tag_sppath.cpp | 10 +-- src/d/actor/d_a_tag_yami.cpp | 10 +-- src/d/actor/d_a_tbox.cpp | 10 +-- src/d/actor/d_a_tbox2.cpp | 10 +-- src/d/d_cc_d.cpp | 89 +++++++++++++++++++++--- 162 files changed, 1162 insertions(+), 662 deletions(-) diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h index 0ad2f717a7..413664746b 100644 --- a/include/SSystem/SComponent/c_cc_d.h +++ b/include/SSystem/SComponent/c_cc_d.h @@ -78,6 +78,10 @@ struct cCcD_SrcSphAttr { cM3dGSphS mSph; }; +struct cCcD_SrcCylAttr { + cM3dGCylS mCyl; +}; + class cCcD_DivideInfo { private: /* 0x00 */ u32 mXDivInfo; @@ -214,7 +218,7 @@ public: cCcD_Obj* GetHitObj() { return mHitObj; } const cCcD_Obj* GetHitObj() const { return mHitObj; } u32 MskSPrm(u32 mask) const { return mSPrm & mask; } - u32 MskRPrm(u32 mask) { return mRPrm & mask; } + u32 MskRPrm(u32 mask) const { return mRPrm & mask; } void OnSPrmBit(u32 flag) { mSPrm |= flag; } void OffSPrmBit(u32 flag) { mSPrm &= ~flag; } u32 ChkSPrm(u32 prm) const { return MskSPrm(prm); } @@ -228,7 +232,8 @@ STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase)); #pragma pack(1) class cCcD_ObjAt : public cCcD_ObjCommonBase { public: - cCcD_ObjAt() { mType = 0; } + cCcD_ObjAt() { Ct(); } + void Ct() { mType = 0; } virtual ~cCcD_ObjAt() {} void SetHit(cCcD_Obj*); void Set(cCcD_SrcObjAt const&); @@ -241,7 +246,7 @@ public: void SetType(u32 type) { mType = type; } void SetAtp(int atp) { mAtp = atp; } void ClrSet() { OffSPrmBit(1); } - u32 ChkHit() { return MskRPrm(1); } + u32 ChkHit() const { return MskRPrm(1); } protected: /* 0x10 */ int mType; @@ -266,7 +271,7 @@ public: u32 GetGrp() const { return MskSPrm(0x1E); } bool ChkSet() const { return MskSPrm(1); } void ClrSet() { OffSPrmBit(1); } - u32 ChkHit() { return MskRPrm(1); } + u32 ChkHit() const { return MskRPrm(1); } private: /* 0x10 */ int mType; @@ -276,6 +281,8 @@ STATIC_ASSERT(0x14 == sizeof(cCcD_ObjTg)); class cCcD_ObjCo : public cCcD_ObjCommonBase { public: + cCcD_ObjCo() { Ct(); } + void Ct() {} virtual ~cCcD_ObjCo() {} void SetHit(cCcD_Obj*); void ClrHit(); @@ -292,7 +299,7 @@ public: void OnCoSameActorHit() { OnSPrmBit(cCcD_ObjCommonBase::CO_SPRM_SAME_ACTOR_HIT); } void OffCoSameActorHit() { OffSPrmBit(cCcD_ObjCommonBase::CO_SPRM_SAME_ACTOR_HIT); } void ClrSet() { OffSPrmBit(1); } - u32 ChkHit() { return MskRPrm(1); } + u32 ChkHit() const { return MskRPrm(1); } void Set(cCcD_SrcObjCo const& src) { cCcD_ObjCommonBase::Set(src.mBase); } }; @@ -368,12 +375,12 @@ public: void ClrAtHit() { mObjAt.ClrHit(); } void ClrTgHit() { mObjTg.ClrHit(); } void ClrCoHit() { mObjCo.ClrHit(); } - u32 ChkAtHit() { return mObjAt.ChkHit(); } - u32 ChkTgHit() { return mObjTg.ChkHit(); } - u32 ChkCoHit() { return mObjCo.ChkHit(); } - cCcD_Obj* GetAtHitObj() { return mObjAt.GetHitObj(); } - cCcD_Obj* GetTgHitObj() { return mObjTg.GetHitObj(); } - cCcD_Obj* GetCoHitObj() { return mObjCo.GetHitObj(); } + u32 ChkAtHit() const { return mObjAt.ChkHit(); } + u32 ChkTgHit() const { return mObjTg.ChkHit(); } + u32 ChkCoHit() const { return mObjCo.ChkHit(); } + cCcD_Obj* GetAtHitObj() const { return (cCcD_Obj*)mObjAt.GetHitObj(); } + cCcD_Obj* GetTgHitObj() const { return (cCcD_Obj*)mObjTg.GetHitObj(); } + cCcD_Obj* GetCoHitObj() const { return (cCcD_Obj*)mObjCo.GetHitObj(); } u32 ChkAtSPrm(u32 prm) { return mObjAt.ChkSPrm(prm); } u32 ChkCoSPrm(u32 prm) const { return mObjCo.ChkSPrm(prm); } void OnTgNoSlingHitInfSet() { mObjTg.OnSPrmBit(0x40); } @@ -463,9 +470,9 @@ class cCcD_GObjInf : public cCcD_Obj { public: cCcD_GObjInf() {} virtual ~cCcD_GObjInf() {} - virtual void ClrAtHit() { mObjAt.ClrHit(); } - virtual void ClrTgHit() { mObjTg.ClrHit(); } - virtual void ClrCoHit() { mObjCo.ClrHit(); } + virtual void ClrAtHit() { cCcD_ObjHitInf::ClrAtHit(); } + virtual void ClrTgHit() { cCcD_ObjHitInf::ClrTgHit(); } + virtual void ClrCoHit() { cCcD_ObjHitInf::ClrCoHit(); } virtual cCcD_GObjInf const* GetGObjInf() const { return this; } virtual cCcD_GObjInf* GetGObjInf() { return this; } }; @@ -582,6 +589,7 @@ public: virtual void CalcAabBox(); virtual bool GetNVec(cXyz const&, cXyz*) const; virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const; + void Set(const cCcD_SrcCylAttr& src) { cM3dGCyl::Set(src.mCyl); } const cM3dGCyl* GetShapeP() const { return this; } diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index 4c4d947100..6634100209 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -108,4 +108,11 @@ inline bool cM3d_Cross_CylSph(const cM3dGCyl* cyl, const cM3dGSph* sph, Vec* out return cM3d_Cross_CylSph(cyl, sph, out, &sp10); } +#ifdef DEBUG + +bool cM3d_UpMtx_Base(const Vec& param_1, const Vec& param_2, Mtx param_3); +bool cM3d_UpMtx(const Vec& param_1, Mtx param_2); + +#endif + #endif diff --git a/include/SSystem/SComponent/c_m3d_g_lin.h b/include/SSystem/SComponent/c_m3d_g_lin.h index 85bfc28437..d6b86ebcf0 100644 --- a/include/SSystem/SComponent/c_m3d_g_lin.h +++ b/include/SSystem/SComponent/c_m3d_g_lin.h @@ -18,7 +18,7 @@ public: void SetStartEnd(const cXyz&, const cXyz&); void SetStartEnd(const Vec&, const Vec&); void CalcPos(Vec*, f32) const; - void CalcVec(Vec* pOut) const { VECSubtract(&this->mEnd, &this->mStart, pOut); } + void CalcVec(Vec* pOut) const { PSVECSubtract(&this->mEnd, &this->mStart, pOut); } void SetEnd(const cXyz&); void set(const Vec& i_start, const Vec& i_end) { SetStartEnd(i_start, i_end); } @@ -31,6 +31,7 @@ public: cXyz& GetEndP(void) { return mEnd; } cXyz& GetEnd() { return mEnd; } const cXyz& GetEnd() const { return mEnd; } + f32 GetLen() const { return PSVECDistance(&mStart, &mEnd); } }; // Size = 0x1C STATIC_ASSERT(0x1C == sizeof(cM3dGLin)); diff --git a/include/d/d_cc_d.h b/include/d/d_cc_d.h index 397a76c070..7511fda358 100644 --- a/include/d/d_cc_d.h +++ b/include/d/d_cc_d.h @@ -103,7 +103,7 @@ struct dCcD_SrcTri { struct dCcD_SrcCyl { /* 0x00 */ dCcD_SrcGObjInf mObjInf; - /* 0x30 */ cM3dGCylS mCyl; + /* 0x30 */ cCcD_SrcCylAttr mCylAttr; }; // Size: 0x44 struct dCcD_SrcCps { @@ -171,12 +171,13 @@ public: void SetMtrl(u8 mtrl) { mMtrl = mtrl; } void SetAtSpl(dCcG_At_Spl spl) { mSpl = spl; } u8 GetSe() { return mSe; } - u8 GetSpl() { return mSpl; } + dCcG_At_Spl GetSpl() { return (dCcG_At_Spl)mSpl; } u8 GetMtrl() { return mMtrl; } u8 GetHitMark() { return mHitMark; } void SetRVec(cXyz& vec) { mRVec = vec; } void SetHitPos(cXyz& pos) { mHitPos = pos; } cXyz* GetHitPosP() { return &mHitPos; } + void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); } // private: /* 0x1C */ u8 mSe; @@ -212,6 +213,7 @@ public: void SetHitPos(cXyz& pos) { mHitPos = pos; } cXyz* GetHitPosP() { return &mHitPos; } u8 GetSe() { return mSe; } + void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); } private: /* 0x1C */ u8 mSe; @@ -231,6 +233,7 @@ class dCcD_GObjCo : public dCcD_GAtTgCoCommonBase { public: virtual ~dCcD_GObjCo() {} void Set(dCcD_SrcGObjCo const& pSrc) { dCcD_GAtTgCoCommonBase::Set(pSrc.mBase); } + void ClrHit() { dCcD_GAtTgCoCommonBase::ClrActorInfo(); } }; // Size = 0x1C ? class dCcD_GStts : public cCcD_GStts { @@ -448,6 +451,9 @@ public: void CalcTgVec(); virtual ~dCcD_Cps() {} dCcD_Cps() {} + #if DEBUG + virtual void Draw(const GXColor& color); + #endif }; // Size = 0x144 // Triangle @@ -457,6 +463,9 @@ public: cCcD_ShapeAttr* GetShapeAttr(); virtual ~dCcD_Tri() {} dCcD_Tri() {} + #if DEBUG + virtual void Draw(const GXColor& color); + #endif }; // Cylinder @@ -469,6 +478,9 @@ public: void MoveCTg(cXyz&); virtual ~dCcD_Cyl() {} dCcD_Cyl() {} + #if DEBUG + virtual void Draw(const GXColor& color); + #endif }; // Size = 0x13C // Sphere @@ -480,6 +492,9 @@ public: void MoveCAt(cXyz&); virtual cCcD_ShapeAttr* GetShapeAttr(); virtual ~dCcD_Sph() {} + #if DEBUG + virtual void Draw(const GXColor& color); + #endif }; // Size = 0x138 dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* param_0); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 18022e4b1a..cbc3fd8616 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -100,6 +100,10 @@ inline void cMtx_copy(const Mtx src, Mtx dst) { mDoMtx_copy(src, dst); } +inline void cMtx_trans(Mtx pDest, f32 x, f32 y, f32 z) { + mDoMtx_trans(pDest, x, y, z); +} + inline void cMtx_multVecArray(const Mtx mtx, const Vec* src, Vec* dst, u32 count) { mDoMtx_multVecArray(mtx, src, dst, count); } diff --git a/src/SSystem/SComponent/c_m3d.cpp b/src/SSystem/SComponent/c_m3d.cpp index 726ceeeedf..1af53e81e3 100644 --- a/src/SSystem/SComponent/c_m3d.cpp +++ b/src/SSystem/SComponent/c_m3d.cpp @@ -1978,6 +1978,47 @@ void cM3d_CalcVecZAngle(Vec const& param_0, csXyz* param_1) { param_1->z = 0; } +#ifdef DEBUG + +bool cM3d_UpMtx_Base(const Vec& param_1, const Vec& param_2, Mtx param_3) { + Vec local_3c; + Vec auStack_48; + f32 dVar8; + f32 angle; + + if (cM3d_IsZero(PSVECMag(¶m_2))) { + MTXIdentity(param_3); + return false; + } + + PSVECNormalize(¶m_2, &auStack_48); + PSVECCrossProduct(¶m_1, &auStack_48, &local_3c); + + if (cM3d_IsZero(PSVECMag(&local_3c))) { + local_3c.x = 1.0f; + local_3c.y = 0.0f; + local_3c.z = 0.0f; + } + + dVar8 = PSVECDotProduct(¶m_1, &auStack_48); + if (dVar8 > 1.0f) { + dVar8 = 1.0f; + } else if (dVar8 < -1.0f) { + dVar8 = -1.0f; + } + + angle = acosf(dVar8); + C_MTXRotAxisRad(param_3, &local_3c, angle); + return true; +} + +static Vec base_y = {0.0f, 1.0f, 0.0f}; + +bool cM3d_UpMtx(const Vec& param_1, Mtx param_2) { + return cM3d_UpMtx_Base(base_y, param_1, param_2); +} + +#endif void cM3d_PlaneCrossLineProcWork(f32 f1, f32 f2, f32 f3, f32 f4, f32 f5, f32 f6, f32 f7, f32* pF1, f32* pF2) { diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index c603ce2755..f0f878205f 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -1249,10 +1249,12 @@ static dCcD_SrcCyl l_cylSrc = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 35.0f, - 180.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 35.0f, + 180.0f, + }, + } }; static dCcD_SrcSph l_sphSrc = { @@ -1276,10 +1278,12 @@ static dCcD_SrcCyl l_atCylSrc = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 180.0f, - 130.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 180.0f, + 130.0f, + }, + } }; static dCcD_SrcCps l_atCpsSrc = { diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index cdf3befcb7..4bb3e1c98d 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -145,10 +145,12 @@ static dCcD_SrcCyl cc_dr_week_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcSph cc_dr_tail_src = { @@ -207,10 +209,12 @@ static dCcD_SrcCyl cc_pillar_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl cc_down_src = { @@ -221,10 +225,12 @@ static dCcD_SrcCyl cc_down_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 300.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcSph cc_downSph_src = { diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index fefbedbbd0..99795f5bee 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -132,10 +132,12 @@ static dCcD_SrcCyl cc_ds_backbone_src = { {0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 130.0f, // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 130.0f, // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl cc_ds_hand_at_cyl_src = { @@ -147,10 +149,12 @@ static dCcD_SrcCyl cc_ds_hand_at_cyl_src = { {0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 130.0f, // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 130.0f, // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcSph cc_ds_breath_at_src = { diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index 243b415ac3..8623cdb422 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -196,10 +196,12 @@ void daB_GG_c::initCc() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 130.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 130.0f, // mRadius + 200.0f // mHeight + } // mCyl + } // mCylAttr }; const static dCcD_SrcCyl ccHookSrc = { @@ -210,10 +212,12 @@ void daB_GG_c::initCc() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 130.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 130.0f, // mRadius + 200.0f // mHeight + } // mCyl + } // mCylAttr }; const static dCcD_SrcSph ccShieldSphSrc = { diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index dbba925577..1bc70756d5 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -4875,10 +4875,12 @@ static int daB_GND_Create(fopAc_ac_c* a_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 100.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 100.0f, // mRadius + 200.0f // mHeight + } // mCyl + } }; for (int i = 0; i < 2; i++) { diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index 190baad085..a71b100158 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -389,12 +389,14 @@ static int daB_GOS_Create(fopAc_ac_c* i_this) { {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x2}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 150.0f, // mRadius - 60.0f // mHeight - } // mCyl + }, + { // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 150.0f, // mRadius + 60.0f // mHeight + } // mCyl + } }; a_this->mCcStts.Init(0xFA, 0, a_this); diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index ee926cd717..5029eec6d8 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -136,10 +136,12 @@ static dCcD_SrcCyl cc_yo_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 40.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph cc_yo_tg_src = { diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index c716d4a73b..085fb1e0d7 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -41,10 +41,12 @@ static dCcD_SrcCyl cc_yo_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 40.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl cc_yo_iron_src = { @@ -55,10 +57,12 @@ static dCcD_SrcCyl cc_yo_iron_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 40.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl cc_yo_cam_src = { @@ -69,10 +73,12 @@ static dCcD_SrcCyl cc_yo_cam_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 40.0f // mHeight + } // mCyl + } // mCylAttr }; } // namespace diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index e7e2fd146e..ea53c4d7be 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -128,12 +128,14 @@ dCcD_SrcCyl cc_zant_roll_src = { {dCcD_SE_METAL, 0x0, 0x6, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x2, 0x0, 0x0, 0x303}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 40.0f // mHeight - } // mCyl + }, + { // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 40.0f // mHeight + } // mCyl + } }; dCcD_SrcSph cc_zant_foot_src = { diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 64d09f788e..c67b00498e 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -34,10 +34,12 @@ static dCcD_SrcCyl cc_zant_snort_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 40.0f, - 40.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 40.0f, + 40.0f, + }, + } }; } diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index f6491ef290..6fee7b6dde 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -265,10 +265,12 @@ static const dCcD_SrcCyl l_cyl_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 0.0f, - 0.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 0.0f, + 0.0f, + }, + } }; void daBgObj_c::initAtt() { diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 83cff8be3f..8853c08d03 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -1410,9 +1410,11 @@ static dCcD_SrcCyl l_windAtCylSrc = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 150.0f, - 600.0f, + { + {0.0f, 0.0f, 0.0f}, + 150.0f, + 600.0f, + } } }; diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index 588b0318e6..f238b3ed5e 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -80,10 +80,12 @@ static dCcD_SrcCyl l_cylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 55.0f, // mRadius - 80.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 55.0f, // mRadius + 80.0f // mHeight + } // mCyl + } }; int daCanoe_c::create() { diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index c07eca7aff..833a9f5892 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -92,10 +92,12 @@ static dCcD_SrcCyl l_cylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 125.0f, // mRadius - 390.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 125.0f, // mRadius + 390.0f // mHeight + } // mCyl + } }; int daCstaF_c::create() { diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 3c8b7ce917..3c7b71b1a2 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -99,12 +99,14 @@ static dCcD_SrcCyl l_cylSrc = { {dCcD_SE_STONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x5, 0x0, 0x0, 0x3}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf + }, + { // mObjInf { {0.0f, 0.0f, 0.0f}, // mCenter 88.0f, // mRadius 392.0f // mHeight - } // mCyl + } // mCyl + } }; static dCcD_SrcSph l_sphSrc = { diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index 8e8841ffc2..a35bee546a 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -79,10 +79,12 @@ void e_ai_class::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 80.0f, // mRadius - 250.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 80.0f, // mRadius + 250.0f // mHeight + } // mCyl + } }; m_ccCyl.Set(cc_cyl_src); diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index 529ca90348..85ffee70bb 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -770,10 +770,12 @@ static cPhs__Step daE_Bee_Create(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 130.0f // mHeight - } // mCcCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 130.0f // mHeight + } // mCcCyl + } }; _this->mCcCyl.Set(cc_cyl_src); _this->mCcCyl.SetStts(&_this->mCcStts); diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index c120f8a19f..b5a43fa168 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -915,10 +915,12 @@ static cPhs__Step daE_BI_Create(fopAc_ac_c* actor) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 20.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 20.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph at_sph_src = { diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index ac61d6deed..3f431340ec 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -61,12 +61,14 @@ void daE_DF_c::initCcCylinder() { {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x1}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 150.0f, // mRadius - 158.0f // mHeight - } // mCyl + }, + { // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 150.0f, // mRadius + 158.0f // mHeight + } // mCyl + } }; mStts.Init(0xff, 0xff, this); diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 397ace06ad..7ab29d6fca 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -794,10 +794,12 @@ static cPhs__Step daE_Fs_Create(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 80.0f, // mRadius - 230.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 80.0f, // mRadius + 230.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph at_sph_src = { diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index 83e265b3eb..5bbec45128 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -1637,10 +1637,12 @@ static cPhs__Step daE_GB_Create(fopAc_ac_c* actor) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 20.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 20.0f // mHeight + } // mCyl + } }; e_gb_class* i_this = (e_gb_class*)actor; diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index 4eb4202437..483f0d8346 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -36,9 +36,11 @@ static dCcD_SrcCyl cc_hp_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 50.0f, - 300.0f, + { + {0.0f, 0.0f, 0.0f}, + 50.0f, + 300.0f, + } } }; @@ -62,9 +64,11 @@ static dCcD_SrcCyl cc_hp_at_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 50.0f, - 300.0f, + { + {0.0f, 0.0f, 0.0f}, + 50.0f, + 300.0f, + } } }; } // namespace diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index f95bba1755..1379fbf62e 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -691,10 +691,12 @@ static int daE_IS_Create(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 200.0f, // mRadius - 250.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 200.0f, // mRadius + 250.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph core_sph_src = { diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index a2838ee4da..8e298b5dd4 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -50,10 +50,12 @@ static dCcD_SrcCyl cc_kk_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph cc_kk_at_src = { diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index 863482cd7e..cd109f1e16 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -33,10 +33,12 @@ void daE_MD_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 60.0f, // mRadius - 350.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 60.0f, // mRadius + 350.0f // mHeight + } // mCyl + } }; mCcStts.Init(200, 0xFF, this); diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 44fa483e6e..b02feff7bf 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -1035,10 +1035,12 @@ static cPhs__Step daE_Nest_Create(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 5.0f, // mRadius - 10.0f // mHeight - } // mCcCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 5.0f, // mRadius + 10.0f // mHeight + } // mCcCyl + } }; _this->mCcCyl.Set(cc_cyl_src); _this->mCcCyl.SetStts(&_this->mCcStts); diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 9fe29edb9b..b9c75e830a 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -238,10 +238,12 @@ void daE_PM_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 130.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 130.0f // mHeight + } // mCyl + } }; mCcStts.Init(0xff, 0xff, this); diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 6db6e2b4b7..04e8bf0ff8 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -2954,10 +2954,12 @@ static int daE_PO_Create(fopAc_ac_c* i_act_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 300.0f // mHeight + } // mCyl + } }; i_this->mCyl.Set(cc_cyl_src); diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index 389f550e1c..9241a33234 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -40,10 +40,12 @@ static dCcD_SrcCyl cc_pz_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 300.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcSph cc_pz_at_src = { @@ -66,10 +68,12 @@ static dCcD_SrcCyl cc_pz_wp_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 300.0f // mHeight + } // mCyl + } // mCylAttr }; } diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index ce2532cb50..f5c533fcb7 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1808,10 +1808,12 @@ static int daE_RDB_Create(fopAc_ac_c* actor) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 100.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 100.0f, // mRadius + 200.0f // mHeight + } // mCyl + } }; e_rdb_class* i_this = (e_rdb_class*)actor; diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index 9b793f4a6d..b9b744d2ea 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -92,10 +92,12 @@ void daE_SB_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 80.0f, // mRadius - 130.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 80.0f, // mRadius + 130.0f // mHeight + } // mCyl + } }; mStts.Init(0xFE, 0xFF, this); diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index 41c9d2a143..40b67695fe 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -3095,10 +3095,12 @@ static cPhs__Step daE_ST_Create(fopAc_ac_c* a_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 2000.0f // mHeight - } // mLineCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 2000.0f // mHeight + } // mLineCyl + } }; static dCcD_SrcSph def_sph_src = { diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index b131638ec9..e3e0b9de5f 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -123,10 +123,12 @@ static dCcD_SrcCyl cc_vt_body_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 150.0f, // mRadius - 158.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 150.0f, // mRadius + 158.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph cc_vt_attack_src = { diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 5ce16590e1..996cdf036e 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -92,7 +92,9 @@ namespace { {0} }, { - {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, + { + {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, + } } }; @@ -104,7 +106,9 @@ namespace { {0}, }, { - {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, + { + {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, + } } }; } diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index 8fa15b01f4..1e67b6c317 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -78,8 +78,10 @@ namespace { {0}, }, { - {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, - }, + { + {0.0f, 0.0f, 0.0f}, 50.0f, 300.0f, + }, + } }; static dCcD_SrcSph cc_zm_at_src = { diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index cba87d9373..805a0d28c3 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -28,10 +28,12 @@ static dCcD_SrcCyl cc_zs_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 130.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 130.0f // mHeight + } // mCyl + } }; } diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index f2a1c2aae1..9eed297ef2 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -859,10 +859,12 @@ static int daEp_Create(fopAc_ac_c* a_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 35.0f, // mRadius - 120.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 35.0f, // mRadius + 120.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph at_sph_src = { diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 5e5784216f..a99b8d4b8f 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -222,10 +222,12 @@ static dCcD_SrcCyl l_cylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 230.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 230.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph l_sphSrc = { diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index 4ab9b65da0..ab644a3c73 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -3767,10 +3767,12 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) { { 0 }, // mGObjCo }, // mObjInf { - { 0.0f, 0.0f, 0.0f }, // mCenter - 35.0f, // mRadius - 35.0f // mHeight - } // mCyl + { + { 0.0f, 0.0f, 0.0f }, // mCenter + 35.0f, // mRadius + 35.0f // mHeight + } // mCyl + } }; static f32 fish_max[11] = { 0.828f, diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 56dca96b1e..49c17d8129 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -1231,10 +1231,12 @@ void daNpcT_DmgStagger_c::calc(BOOL param_0) { dCcD_SrcCyl daNpcT_c::mCcDCyl = { daNpcT_c::mCcDObjData, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; dCcD_SrcSph daNpcT_c::mCcDSph = { diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index 6f5b85bc0f..2558f4c092 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -10,10 +10,12 @@ static s16 daBaseNpc_getGroundAngle(cBgS_PolyInfo* param_0, s16 param_1); dCcD_SrcCyl daBaseNpc_c::mCcDCyl = { daBaseNpc_c::mCcDObj, { + { {0.0f, 0.0f, 0.0f}, // mCenter 0.0f, // mRadius 0.0f // mHeight } // mCyl + } }; dCcD_SrcSph daBaseNpc_c::mCcDSph = { diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index 4b873a8db6..a8f6db90d5 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -710,10 +710,12 @@ void daNpcF_c::tgHitCallBack(fopAc_ac_c* i_this, dCcD_GObjInf* param_1, fopAc_ac dCcD_SrcCyl daNpcF_c::mCcDCyl = { daNpcF_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; dCcD_SrcSph daNpcF_c::mCcDSph = { diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index 4d046c03b6..32b934b090 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -69,10 +69,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; const daNpcBlueNS_HIOParam daNpcBlueNS_Param_c::m = { diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index dde66fd193..629f029a92 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -165,12 +165,14 @@ dCcD_SrcCyl const daNpcCd_c::m_cylDat = { {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + }, + { // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daNpcCd_c::NpcCreate(int param_1) { diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 72f4dc7f5e..721afc93f3 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -187,10 +187,12 @@ dCcD_SrcCyl const daNpcCd2_c::m_cylDat = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daNpcCd2_c::NpcCreate(int param_1) { diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 43600c6ae2..aadb0e25f7 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -430,7 +430,9 @@ void daNpcCoach_c::initCollision() { 0, }, { - 0.0f, 0.0f + { + 0.0f, 0.0f + } } }; diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index ab87d87d6a..f29e6b64fc 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -18,7 +18,9 @@ dCcD_SrcCyl daNpc_Kn_c::mCcDCyl = { mCcDObjData, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}, + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}, + } }; dCcD_SrcSph daNpc_Kn_c::mCcDSph = { diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 3d65fb561d..0ddaae6de8 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -7324,10 +7324,12 @@ static int daNpc_Ks_Create(fopAc_ac_c* actor) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 20.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 20.0f // mHeight + } // mCyl + } }; npc_ks_class* i_this = (npc_ks_class*)actor; diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 3be79434ac..78157b3ba8 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -51,10 +51,12 @@ dCcD_SrcCyl const daNpc_Shop0_c::mCylDat = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; daNpc_Shop0_Param_c::param const daNpc_Shop0_Param_c::mParam = { diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index c847b96223..35711715ed 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -66,10 +66,12 @@ const dCcD_SrcGObjInf daTurara_c::mCcDObjInfo = { dCcD_SrcCyl daTurara_c::mCcDCyl = { daTurara_c::mCcDObjInfo, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static u32 const l_bmdIdx[2] = {5, 8}; diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index 8f07b81887..fd365f58f8 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -13,10 +13,12 @@ static daTvCdlst_HIO_c l_HIO; dCcD_SrcCyl daTvCdlst_c::mCcDCyl = { daTvCdlst_c::mCcDObjInfo, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; daTvCdlst_HIO_c::daTvCdlst_HIO_c() { diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index cf51e021af..970a5662b3 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -136,10 +136,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 120.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 120.0f, // mRadius + 200.0f // mHeight + } // mCyl + } }; void daObjYtaihou_c::setNextAngle() { diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index aecb349f3e..1ee6793581 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -34,10 +34,12 @@ static dCcD_SrcGObjInf const l_ccDObjData = static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static dCcD_SrcSph l_ccDSph = { diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index 28ba74c407..85cb7f5955 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -21,7 +21,9 @@ dCcD_SrcGObjInf const daBarDesk_c::mCcDObjInfo = { dCcD_SrcCyl daBarDesk_c::mCcDCyl = { mCcDObjInfo, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; daBarDesk_HIO_c::daBarDesk_HIO_c() : field_0x4(10), field_0x5(3) { diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp index 89c373c168..2a645ae557 100644 --- a/src/d/actor/d_a_obj_bbox.cpp +++ b/src/d/actor/d_a_obj_bbox.cpp @@ -17,10 +17,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 90.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 90.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; static char* l_arcName = "M_BBox"; diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 788e24e294..52d796d6b5 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -113,10 +113,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 15.0f, // mRadius - 60.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 15.0f, // mRadius + 60.0f // mHeight + } // mCyl + } }; diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index a5b7a104ca..a09728a02c 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -19,10 +19,12 @@ void daObjBHASHI_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 300.0f, // mRadius - 2200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 300.0f, // mRadius + 2200.0f // mHeight + } // mCyl + } }; mCcStts.Init(0xFF, 0xFF, this); diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index fae6153ae1..f5894f7c7a 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -131,10 +131,12 @@ dCcD_SrcCyl const daBkyRock_c::s_CcDCyl = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static int const BMD_IDX[2][3] = { diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index aa9a59c5b2..eadbca6baa 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -125,10 +125,12 @@ static daBmWindow_HIO_c l_HIO; dCcD_SrcCyl daBmWindow_c::mCcDCyl = { daBmWindow_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f, // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f, // mHeight + } // mCyl + } }; void daBmWindow_c::windowProc() { diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index b16c183506..95ca898d01 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -29,10 +29,12 @@ static dCcD_SrcGObjInf const l_ccDObjData = static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static char* l_resName = "H_BouMato"; diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index c82fb96e7c..fd00d5b5a4 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -1429,10 +1429,12 @@ static void CreateInit(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 5.0f, // mRadius - 1000.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 5.0f, // mRadius + 1000.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl wire_cyl_src = { @@ -1443,10 +1445,12 @@ static void CreateInit(fopAc_ac_c* i_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 5.0f, // mRadius - 1000.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 5.0f, // mRadius + 1000.0f // mHeight + } // mCyl + } // mCylAttr }; br_s* part = a_this->mBr; diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index fd4d53a350..7fcf42ae80 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -20,7 +20,9 @@ const dCcD_SrcGObjInf daBubbPilar_c::mCcDObjInfo = { dCcD_SrcCyl daBubbPilar_c::mCcDCyl = { daBubbPilar_c::mCcDObjInfo, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; daBubbPilar_HIO_c::daBubbPilar_HIO_c() { diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp index 70b6ce41c6..f8f5123570 100644 --- a/src/d/actor/d_a_obj_burnbox.cpp +++ b/src/d/actor/d_a_obj_burnbox.cpp @@ -40,10 +40,12 @@ const dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; int daObjBurnBox_c::Create() { diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index 8363d91bbe..cb4b785a34 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -665,10 +665,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 10.0f, // mRadius - 50.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 10.0f, // mRadius + 50.0f // mHeight + } // mCyl + } // mCylAttr }; const static dCcD_SrcSph l_light_at_sph_src = { @@ -703,10 +705,12 @@ const static dCcD_SrcCyl l_tg_cyl = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 60.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 60.0f // mHeight + } // mCyl + } // mCylAttr }; static const GXColor l_light_color = {0xFF, 0xFF, 0xFF, 0xFF}; diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index fc4a336e62..d608eab9f5 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -65,10 +65,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { + { {0.0f, 0.0f, 0.0f}, // mCenter 60.0f, // mRadius 300.0f // mHeight } // mCyl + } }; #if DEBUG diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp index 8e74fad3e3..1e904f28a0 100644 --- a/src/d/actor/d_a_obj_chest.cpp +++ b/src/d/actor/d_a_obj_chest.cpp @@ -28,10 +28,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 260.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 260.0f // mHeight + } // mCyl + } }; void daObjChest_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index 2be8d83865..bc66b5cf50 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -24,10 +24,12 @@ void daObjCRVLH_DW_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 250.0f, // mRadius - 400.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 250.0f, // mRadius + 400.0f // mHeight + } // mCyl + } }; mStts.Init(0xff, 0xff, this); diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 418de6547e..87d7158cd7 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -91,10 +91,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 70.0f, // mRadius - 450.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 70.0f, // mRadius + 450.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl l_cyl_src2 = { @@ -105,10 +107,12 @@ static dCcD_SrcCyl l_cyl_src2 = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 60.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 60.0f, // mRadius + 300.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcSph l_sph_src = { diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp index aab5c4406e..7fe9d9c9fa 100644 --- a/src/d/actor/d_a_obj_fireWood.cpp +++ b/src/d/actor/d_a_obj_fireWood.cpp @@ -24,10 +24,12 @@ static daFireWood_HIO_c l_HIO; dCcD_SrcCyl daFireWood_c::mCcDCyl = { daFireWood_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; const dCcD_SrcGObjInf daFireWood_c::mCcDObjInfo = { diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp index 26df7b03a3..a1d04e396e 100644 --- a/src/d/actor/d_a_obj_fireWood2.cpp +++ b/src/d/actor/d_a_obj_fireWood2.cpp @@ -31,10 +31,12 @@ const dCcD_SrcGObjInf daFireWood2_c::mCcDObjInfo = { dCcD_SrcCyl daFireWood2_c::mCcDCyl = { daFireWood2_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static cull_box l_cull_box = { diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index ab824c1328..578b62b029 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -349,10 +349,12 @@ void daObjFlag2_c::initCollision() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 15.0f, // mRadius - 30.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 15.0f, // mRadius + 30.0f // mHeight + } // mCyl + } }; mStts.Init(0xff, 0xff, this); mCyl.Set(ccCylSrc); diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 3ce3d54be9..67fe8bd6eb 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -59,10 +59,12 @@ static char* l_resNameList[2] = { static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; #if DEBUG diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 08b879ad16..5e01a5bf17 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -62,10 +62,12 @@ int daGpTaru_c::CreateHeap() { dCcD_SrcCyl daGpTaru_c::mCcDCyl = { daGpTaru_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; const dCcD_SrcGObjInf daGpTaru_c::mCcDObjInfo = { diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp index ee5911eea5..44b6b034c0 100644 --- a/src/d/actor/d_a_obj_graWall.cpp +++ b/src/d/actor/d_a_obj_graWall.cpp @@ -58,10 +58,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daObjGraWall_c::col_init() { diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index 230e26e297..980bfd05c1 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -24,10 +24,12 @@ dCcD_SrcCyl const daObjGraRock_c::mCcDCyl = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + }, }; void daObjGraRock_c::setAttnPos() { diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp index b5a3c9e105..8d1a5b3ab8 100644 --- a/src/d/actor/d_a_obj_grave_stone.cpp +++ b/src/d/actor/d_a_obj_grave_stone.cpp @@ -26,7 +26,9 @@ dCcD_SrcCyl const daGraveStone_c::mCcDCyl = { {0, 0, 0, 0, 0}, {0}, }, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}, + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f}, + }, }; void daGraveStone_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index 3d8d31f782..756ee528ab 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -90,10 +90,12 @@ dCcD_SrcCyl const daObjHBarrel_c::s_CcDCyl = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daObjHBarrel_c::init() { diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index 63c0a93b99..e1f42e611b 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -105,12 +105,14 @@ dCcD_SrcCyl const daObjHFtr_c::s_CcDCyl = { {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt {dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjTg {0x0}, // mGObjCo - }, // mObjInf - { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + }, + { // mObjInf + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daObjHFtr_c::execute() { diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp index ceb8a96a30..c701ffbf0e 100644 --- a/src/d/actor/d_a_obj_hbombkoya.cpp +++ b/src/d/actor/d_a_obj_hbombkoya.cpp @@ -52,10 +52,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 1000.0f, // mRadius - 1000.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 1000.0f, // mRadius + 1000.0f // mHeight + } // mCyl + } // mCylAttr }; int daObjHBombkoya_c::Create() { diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 05ff5a8298..78c7653e70 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -25,10 +25,12 @@ void daObjHHASHI_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 110.0f, // mRadius - 158.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 110.0f, // mRadius + 158.0f // mHeight + } // mCyl + } }; mStts.Init(0xff, 0xff, this); diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 836f68d71d..43a078154c 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -124,10 +124,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 180.0f, // mRadius - 290.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 180.0f, // mRadius + 290.0f // mHeight + } // mCyl + } }; int daObjIceBlk_c::saveCurrentPos() { diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index e5fd929932..f146c0da91 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -83,10 +83,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; int daObjIceLeaf_c::Create() { diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index ab7e95e1c4..64ab337594 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -47,10 +47,12 @@ static const dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 140.0f, // mRadius - 70.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 140.0f, // mRadius + 70.0f // mHeight + } // mCyl + } // mCylAttr }; static const dCcD_SrcCyl l_cyl_src2 = { @@ -61,10 +63,12 @@ static const dCcD_SrcCyl l_cyl_src2 = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 140.0f, // mRadius - 70.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 140.0f, // mRadius + 70.0f // mHeight + } // mCyl + } // mCylAttr }; static void* s_boar_sub(void* i_actor, void* i_data) { diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index 9170050135..919629415b 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -1167,10 +1167,12 @@ const dCcD_SrcCyl daItem_c::m_cyl_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 10.0f, - 50.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 10.0f, + 50.0f, + }, + } }; void daItem_c::initSpeed(BOOL i_noTypeChk) { diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index 9f573a1bdd..6f25e54dd2 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -53,10 +53,12 @@ static char* l_resNameList[2] = { static dCcD_SrcCyl l_ccDCyl = { daNpcT_c::mCcDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; daObj_Kago_c::~daObj_Kago_c() { diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index 3b809ccc52..bd5c84cfaa 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -106,10 +106,12 @@ void daObjKaisou_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; mCyl.Set(ccCylSrc); mCyl.SetStts(&mStts); diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index c558db9b7b..93240748bd 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -23,10 +23,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl + } // mCylAttr }; static f32 Reflect(cXyz* i_xyz, cBgS_PolyInfo const& param_2, f32 param_3) { diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index f964e7eac8..f758d2ffed 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -55,10 +55,12 @@ const static dCcD_SrcCyl ccCylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 10.0f, // mRadius - 30.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 10.0f, // mRadius + 30.0f // mHeight + } // mCyl + } }; void daObjKazeNeko_c::initCcCylinder() { diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index 586cf56ccd..33895045cd 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -30,10 +30,12 @@ static const dCcD_SrcGObjInf l_ccDObjData = { static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static daObj_KBacket_Param_c l_HIO; diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 909a14616b..8866ac7a4c 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -65,10 +65,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 350.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 350.0f // mHeight + } // mCyl + } }; void daObjKGate_c::initBaseMtx() { diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index 1723ab03c5..002c0e66e3 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -96,10 +96,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 300.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 300.0f, // mRadius + 100.0f // mHeight + } // mCyl + } // mCylAttr }; #if DEBUG diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp index e9608f761e..b866dc0811 100644 --- a/src/d/actor/d_a_obj_ktOnFire.cpp +++ b/src/d/actor/d_a_obj_ktOnFire.cpp @@ -35,10 +35,12 @@ const dCcD_SrcGObjInf daKtOnFire_c::mCcDObjInfo = { dCcD_SrcCyl daKtOnFire_c::mCcDCyl = { mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; daKtOnFire_HIO_c::daKtOnFire_HIO_c() { diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index 49d47d1f8e..e5a6923793 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -65,10 +65,12 @@ const static dCcD_SrcCyl ccCylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, -80.0f, 0.0f}, // mCenter - 25.0f, // mRadius - 25.0f // mHeight - } // mCyl + { + {0.0f, -80.0f, 0.0f}, // mCenter + 25.0f, // mRadius + 25.0f // mHeight + } // mCyl + } }; static f32 dummy(cXyz v) { diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index 4924d14d85..8f89c82a04 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -19,10 +19,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl + } }; static f32 Reflect(cXyz* i_vec, cBgS_PolyInfo const& i_wallpoly, f32 i_scale) { diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp index 7b328b5059..701f474814 100644 --- a/src/d/actor/d_a_obj_lv1Candle00.cpp +++ b/src/d/actor/d_a_obj_lv1Candle00.cpp @@ -25,7 +25,9 @@ dCcD_SrcGObjInf const daLv1Cdl00_c::mCcDObjInfo = { dCcD_SrcCyl daLv1Cdl00_c::mCcDCyl = { daLv1Cdl00_c::mCcDObjInfo, - { {0.0f, 0.0f, 0.0f}, 0, 0} + { + { {0.0f, 0.0f, 0.0f}, 0, 0} + } }; daLv1Cdl00_HIO_c::daLv1Cdl00_HIO_c() : diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index e5558ed550..916b73bdb9 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -25,7 +25,9 @@ dCcD_SrcGObjInf const daLv1Cdl01_c::mCcDObjInfo = { dCcD_SrcCyl daLv1Cdl01_c::mCcDCyl = { daLv1Cdl01_c::mCcDObjInfo, - { {0.0f, 0.0f, 0.0f}, 0, 0} + { + { {0.0f, 0.0f, 0.0f}, 0, 0} + } }; daLv1Cdl01_HIO_c::daLv1Cdl01_HIO_c() : diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp index 28d7f1cb58..d0e7100c44 100644 --- a/src/d/actor/d_a_obj_lv2Candle.cpp +++ b/src/d/actor/d_a_obj_lv2Candle.cpp @@ -50,7 +50,9 @@ dCcD_SrcGObjInf const daLv2Candle_c::mCcDObjInfo = { dCcD_SrcCyl daLv2Candle_c::mCcDCyl = { daLv2Candle_c::mCcDObjInfo, - { {0.0f, 0.0f, 0.0f}, 0, 0} + { + { {0.0f, 0.0f, 0.0f}, 0, 0} + } }; static char* l_resNameIdx[3] = { diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index f94f8ba986..74206ac37b 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -86,10 +86,12 @@ const dCcD_SrcGObjInf daFlorBoad_c::mCcDObjInfo = { dCcD_SrcCyl daFlorBoad_c::mCcDCyl = { daFlorBoad_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daFlorBoad_c::procMain() { diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index 36c21f56d6..7eedee6c61 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -60,10 +60,12 @@ const dCcD_SrcGObjInf daIceWall_c::mCcDObjInfo = { dCcD_SrcCyl daIceWall_c::mCcDCyl = { daIceWall_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; static const int l_bmdIdx[] = {4, 5}; diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index da91936bfa..e4a644a5fe 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -80,10 +80,12 @@ const dCcD_SrcGObjInf daLv5SwIce_c::mCcDObjInfo = { dCcD_SrcCyl daLv5SwIce_c::mCcDCyl = { daLv5SwIce_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daLv5SwIce_c::procMain() { diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index eeeecdc351..0bd3dcdb97 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -114,10 +114,12 @@ static dCcD_SrcCyl l_cc_src_shaft_cyl = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 100.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl l_cc_cyl_src = { @@ -128,10 +130,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 350.0f, // mRadius - 150.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 350.0f, // mRadius + 150.0f // mHeight + } // mCyl + } // mCylAttr }; int daObjYchndlr_c::Create() { diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index f0400aa04d..29af54398d 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -99,10 +99,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 90.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 90.0f, // mRadius + 200.0f // mHeight + } // mCyl + } }; int daObjYIblltray_c::Create() { diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index d0ffff13f1..a28b3dca48 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -37,7 +37,9 @@ const dCcD_SrcGObjInf daLv6ChangeGate_c::mCcDObjInfo = { dCcD_SrcCyl daLv6ChangeGate_c::mCcDCyl = { mCcDObjInfo, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; void daLv6ChangeGate_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index c7ddba314e..316cd0e855 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -35,7 +35,16 @@ const dCcD_SrcGObjInf daLv6SwGate_c::mCcDObjInfo = { {0, {{0, 0, 0}, {0x400, 0x11}, {0x79}}}, {1, 0, 0, 0, 0}, {0xA, 0, 0, 0, 0}, {0} }; -dCcD_SrcCyl daLv6SwGate_c::mCcDCyl = {mCcDObjInfo}; +dCcD_SrcCyl daLv6SwGate_c::mCcDCyl = { + mCcDObjInfo, + { + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr +}; static cull_box l_cull_box = {-1200.0f, -300.0f, -100.0f, 1200.0f, 300.0f, 100.0f}; diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index 71d741a290..9cd5e04f80 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -75,10 +75,12 @@ dCcD_SrcSph daLv6TogeTrap_c::mCcDSph = { dCcD_SrcCyl daLv6TogeTrap_c::mCcDCyl = { daLv6TogeTrap_c::mCcDObjInfo2, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static char* l_resNameIdx[3] = { diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index acb172e98a..90aa698e2b 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -165,10 +165,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 120.0f, // mRadius - 200.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 120.0f, // mRadius + 200.0f // mHeight + } // mCyl + } }; int daObjLv6Bm_c::Create() { diff --git a/src/d/actor/d_a_obj_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index 9b0e2029d5..0b9e4b3d93 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -48,10 +48,12 @@ static dCcD_SrcCyl l_at_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 300.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 300.0f // mHeight + } // mCyl + } }; int daObjLv6EGate_c::Create() { diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 6c861719f9..6d4b35cec5 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -120,10 +120,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 100.0f, // mRadius - 250.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 100.0f, // mRadius + 250.0f // mHeight + } // mCyl + } }; int daObjLv7Brg_c::Create() { diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 1704dc2605..9c8082bb8f 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -93,10 +93,12 @@ void daObjMasterSword_c::initCollision() { {0}, // mGObjCo }, // mObjInf { - {current.pos.x, current.pos.y, current.pos.z}, // mCenter - 18.0f, // mRadius - 180.0f // mHeight - } // mCyl + { + {current.pos.x, current.pos.y, current.pos.z}, // mCenter + 18.0f, // mRadius + 180.0f // mHeight + } // mCyl + } }; mCcStts.Init(0xFF, 0xFF, this); diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp index 8a5a431e6e..91788372f4 100644 --- a/src/d/actor/d_a_obj_mato.cpp +++ b/src/d/actor/d_a_obj_mato.cpp @@ -86,10 +86,12 @@ static dCcD_SrcCyl cc_cyl_src = { {2}, }, { - {0.0f, 0.0f, 0.0f}, - 150.0f, - 300.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 150.0f, + 300.0f, + }, + } }; } diff --git a/src/d/actor/d_a_obj_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index c2e85e7290..099296a979 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -38,10 +38,12 @@ static dCcD_SrcGObjInf const l_ccDObjData = static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } // mCylAttr }; #if DEBUG diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index dccfd84bf3..e0794916f4 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -428,10 +428,12 @@ const dCcD_SrcCyl daObjMovebox::Act_c::M_cyl_src = { {0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 75.0f, // mRadius - 150.0f, // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 75.0f, // mRadius + 150.0f, // mHeight + } // mCyl + } }; // __declspec(section ".rodata") diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index 4eb368f552..0537544cf5 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -58,10 +58,12 @@ const dCcD_SrcCyl daObjIsuChild_c::s_CcDCyl = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 0.0f, - 0.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 0.0f, + 0.0f, + }, + } }; int daObjNagaisu_c::create() { diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index c0f2f3eb8f..b1f99c034e 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -39,14 +39,16 @@ void daObjOCTHASHI_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 400.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 400.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; if (l_cyl_height_init == 0) { - ccCylSrc.mCyl.mHeight = (f32)(mPieceNum + 1) * 800.0f - 100.f; + ccCylSrc.mCylAttr.mCyl.mHeight = (f32)(mPieceNum + 1) * 800.0f - 100.f; l_cyl_height_init = 1; } for (int idx = 0; idx < mPieceNum; ++idx) { diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index 99639641d0..b21f980aff 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -18,10 +18,12 @@ static char* l_bbtkFileName = "x_oiltubo_00b.btk"; dCcD_SrcCyl daObj_Oiltubo_c::mCcDCyl = { daObj_Oiltubo_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daObj_Oiltubo_c::create() { diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index a8aef7325e..cc6f4dd16b 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -30,10 +30,12 @@ const dCcD_SrcGObjInf daOnsTaru_c::mCcDObjInfo = { dCcD_SrcCyl daOnsTaru_c::mCcDCyl = { daOnsTaru_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daOnsTaru_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index 911d9ac999..dde20c199e 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -193,10 +193,12 @@ static dCcD_SrcCyl cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 70.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 70.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; int daObjPDtile_c::Create() { diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 1fae189c54..35943067e0 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -540,10 +540,12 @@ dCcD_SrcCyl daObjPicture_c::s_CcDCyl_pic_at = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static actor_method_class daObjPicture_METHODS = { diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index d991879540..80f0eb6dee 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -38,10 +38,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 75.0f, // mRadius - 500.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 75.0f, // mRadius + 500.0f // mHeight + } // mCyl + } }; #define SHAKE_DATA_CRASH_FIRST 0 diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index 61346b493f..db62ad2fa3 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -154,10 +154,12 @@ static char* l_resNameList[2] = { static dCcD_SrcCyl l_ccDCyl = { l_ccDObjData, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static OBJ_PUMPKIN_HIO_CLASS l_HIO; diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 26ca7f138b..024b545284 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -80,10 +80,12 @@ static const dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 350.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 350.0f // mHeight + } // mCyl + } // mCylAttr }; void daObjRgate_c::initBaseMtx() { diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index 69bea987c6..23df94e990 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -27,10 +27,12 @@ void daObjRIVERROCK_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, -500.0f, 0.0f}, // mCenter - 1000.0f, // mRadius - 1000.0f // mHeight - } // mCyl + { + {0.0f, -500.0f, 0.0f}, // mCenter + 1000.0f, // mRadius + 1000.0f // mHeight + } // mCyl + } }; mStts.Init(0xff, 0xff, this); diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index bcd0f60079..72f7217102 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -28,7 +28,9 @@ dCcD_SrcGObjInf const daRotTrap_c::mCcDObjInfo = { dCcD_SrcCyl daRotTrap_c::mCcDCyl = { mCcDObjInfo, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; static Vec atPos[] = { diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index eff67a34b7..52eb092e24 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -343,10 +343,12 @@ static int daOBJ_RW_Create(fopAc_ac_c* actor) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 200.0f, // mRadius - 250.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 200.0f, // mRadius + 250.0f // mHeight + } // mCyl + } }; i_this->ccStts.Init(0xFF, 0, actor); diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 9815391dfa..95505cbfb0 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -21,10 +21,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl + } // mCylAttr }; static f32 Reflect(cXyz* pSpeed, cBgS_PolyInfo const& param_2, f32 param_3) { diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index 49953d0084..cc2614aba4 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -20,10 +20,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl + } }; static void* searchParentSub(void* i_actor, void* i_data) { diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 68ae4dc357..02671f7c3a 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -987,10 +987,12 @@ static int daObj_So_Create(fopAc_ac_c* a_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 10.0f, // mRadius - 120.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 10.0f, // mRadius + 120.0f // mHeight + } // mCyl + } }; obj_so_class* i_this = (obj_so_class*)a_this; diff --git a/src/d/actor/d_a_obj_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 3d419b2e16..f5e8efc05f 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -99,10 +99,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 90.0f, // mRadius - 170.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 90.0f, // mRadius + 170.0f // mHeight + } // mCyl + } }; int daObjSwLight_c::Create() { diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index ea190d0ba2..5c4f1c6b4b 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -59,9 +59,11 @@ static const dCcD_SrcCyl l_cyl_src = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 100.0f, - 100.0f, + { + {0.0f, 0.0f, 0.0f}, + 100.0f, + 100.0f, + }, }, }; diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index 999c7b3122..2a58db6e0d 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -116,10 +116,12 @@ const dCcD_SrcGObjInf daTaFence_c::mCcDObjInfo = { dCcD_SrcCyl daTaFence_c::mCcDCyl = { daTaFence_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daTaFence_c::create() { diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index 5c19b7f286..5d91ed7e53 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -118,10 +118,12 @@ static int daObj_Tatigi_Create(fopAc_ac_c* a_this) { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 35.0f, // mRadius - 120.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 35.0f, // mRadius + 120.0f // mHeight + } // mCyl + } }; obj_tatigi_class* i_this = (obj_tatigi_class*)a_this; diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index fe1d9d33d6..a702266dd4 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -35,10 +35,12 @@ void daObjTHASHI_c::initCcCylinder() { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 110.f + nREG_F(17), // mRadius - 130.f + nREG_F(16) // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 110.f + nREG_F(17), // mRadius + 130.f + nREG_F(16) // mHeight + } // mCyl + } // mCylAttr }; unk13C8.Init(0xff, 0xff, this); unk1A58.Set(ccCylSrc); diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 5bb8d461e1..ec063f21cd 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -76,10 +76,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 37.5f, // mRadius - 250.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 37.5f, // mRadius + 250.0f // mHeight + } // mCyl + } }; int daObjThDoor_c::Create() { diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index adef7a2c8b..fb3b050364 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -32,10 +32,12 @@ const dCcD_SrcGObjInf daTogeTrap_c::mCcDObjInfo = { dCcD_SrcCyl daTogeTrap_c::mCcDCyl = { daTogeTrap_c::mCcDObjInfo, { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; void daTogeTrap_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index d23976dc5a..4a8eccd9da 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -316,10 +316,12 @@ static dCcD_SrcCyl cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 360.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 360.0f // mHeight + } // mCyl + } }; static int useHeapInit(fopAc_ac_c* i_this) { diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 7b5ee2f6af..1c239ff129 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -79,10 +79,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 350.0f, // mRadius - 1500.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 350.0f, // mRadius + 1500.0f // mHeight + } // mCyl + } }; int daObjVolcBom_c::Create() { diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp index 9eb4abe824..2f12cacf8b 100644 --- a/src/d/actor/d_a_obj_waterfall.cpp +++ b/src/d/actor/d_a_obj_waterfall.cpp @@ -167,10 +167,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x2}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; cPhs__Step daObjWaterFall_c::Create() { diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index 5b28d3a5a2..23586b8825 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -250,10 +250,12 @@ static int daObj_Web1_Create(fopAc_ac_c* i_this) { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 50.0f, - 2.0f, - }, + { + {0.0f, 0.0f, 0.0f}, + 50.0f, + 2.0f, + }, + } }; int phase = dComIfG_resLoad(&_this->mPhase, "Obj_web1"); diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index 915abc25db..cad92fc8dc 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -21,10 +21,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 40.0f, // mRadius - 400.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 40.0f, // mRadius + 400.0f // mHeight + } // mCyl + } // mCylAttr }; void daObjWindow_c::initBaseMtx() { diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index bc69497739..cb28097ce8 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -45,10 +45,12 @@ const static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 20.0f, // mRadius - 40.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 20.0f, // mRadius + 40.0f // mHeight + } // mCyl + } }; static char* l_arcName = "O_wood"; diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp index 908074e456..97f9272470 100644 --- a/src/d/actor/d_a_obj_wsword.cpp +++ b/src/d/actor/d_a_obj_wsword.cpp @@ -19,10 +19,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 150.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 150.0f // mHeight + } // mCyl + } }; static int CheckCreateHeap(fopAc_ac_c* i_this) { diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index 67f6f1b15e..2d2d41a8b3 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -29,7 +29,9 @@ static char* l_resNames[] = {"yel_bag"}; dCcD_SrcCyl daObj_YBag_c::mCcDCyl = { daNpcT_c::mCcDObjData, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; static u16 emttrId[4] = { diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp index 1981d5aeaa..5cc08c8baa 100644 --- a/src/d/actor/d_a_obj_yobikusa.cpp +++ b/src/d/actor/d_a_obj_yobikusa.cpp @@ -212,10 +212,12 @@ const static dCcD_SrcCyl ccCylSrc = { {0x2}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 80.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 80.0f // mHeight + } // mCyl + } }; void daObjYobikusa_c::initCcCylinder() { diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index d612506c0c..9c57124eca 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -155,10 +155,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 35.0f, // mRadius - 400.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 35.0f, // mRadius + 400.0f // mHeight + } // mCyl + } // mCylAttr }; static dCcD_SrcCyl l_cyl_src2 = { @@ -169,10 +171,12 @@ static dCcD_SrcCyl l_cyl_src2 = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 80.0f, // mRadius - 400.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 80.0f, // mRadius + 400.0f // mHeight + } // mCyl + } // mCylAttr }; void daZdoor_c::init_cyl() { diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index 63191c70cf..caa2a7e123 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -32,7 +32,9 @@ dCcD_SrcGObjInf const daZrTurara_c::mCcDObjInfo = { dCcD_SrcCyl daZrTurara_c::mCcDCyl = { mCcDObjInfo, - {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + { + {{0.0f, 0.0f, 0.0f}, 0.0f, 0.0f} + } }; void daZrTurara_c::setBaseMtx() { diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp index bf93888f74..1519380276 100644 --- a/src/d/actor/d_a_obj_zraMark.cpp +++ b/src/d/actor/d_a_obj_zraMark.cpp @@ -32,10 +32,12 @@ static const dCcD_SrcCyl l_sph_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f, // mHeight - } // mCylAttr + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f, // mHeight + } // mCylAttr + } }; static const int l_arcIdx[] = {3, 6, 5, 4}; diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index e0b3e7e0ff..26fee719d8 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -44,9 +44,11 @@ static dCcD_SrcCyl l_cylSrc = { {0}, }, { - {0.0f, 0.0f, 0.0f}, - 40.0f, - 85.0f, + { + {0.0f, 0.0f, 0.0f}, + 40.0f, + 85.0f, + } } }; diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp index 8924b628f7..f3bfc4becb 100644 --- a/src/d/actor/d_a_tag_attack_item.cpp +++ b/src/d/actor/d_a_tag_attack_item.cpp @@ -17,10 +17,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; int daTagAtkItem_c::Create() { diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index baea03d037..5c461f3afc 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -22,10 +22,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 300.0f, // mRadius - 600.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 300.0f, // mRadius + 600.0f // mHeight + } // mCyl + } // mCylAttr }; #pragma pop @@ -39,10 +41,12 @@ static dCcD_SrcCyl l_tg_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 300.0f, // mRadius - 600.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 300.0f, // mRadius + 600.0f // mHeight + } // mCyl + } // mCylAttr }; #pragma pop diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index 530d796043..eaa18e2fd4 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -14,10 +14,12 @@ static dCcD_SrcCyl const l_sph_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daTagPati_c::create() { diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp index 8061311d57..780e338a6e 100644 --- a/src/d/actor/d_a_tag_qs.cpp +++ b/src/d/actor/d_a_tag_qs.cpp @@ -21,10 +21,12 @@ static dCcD_SrcCyl l_cc_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 50.0f, // mRadius - 50.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 50.0f, // mRadius + 50.0f // mHeight + } // mCyl + } }; daTagQs_c::~daTagQs_c() {} diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 62121c7c71..96955e7610 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -17,10 +17,12 @@ static dCcD_SrcCyl l_cylSrc = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 30.0f, // mRadius - 100.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 30.0f, // mRadius + 100.0f // mHeight + } // mCyl + } }; int daTagSppath_c::create() { diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index 7420bd48dc..edc1319f3a 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -17,10 +17,12 @@ const static dCcD_SrcCyl l_sph_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daTagYami_c::create() { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index bb12fd1886..a0149a3d19 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -29,10 +29,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; static daTbox_ModelInfo l_modelInfo[3] = { diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index 06f0ac9aa4..d148a5343f 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -57,10 +57,12 @@ static dCcD_SrcCyl l_cyl_src = { {0x0}, // mGObjCo }, // mObjInf { - {0.0f, 0.0f, 0.0f}, // mCenter - 0.0f, // mRadius - 0.0f // mHeight - } // mCyl + { + {0.0f, 0.0f, 0.0f}, // mCenter + 0.0f, // mRadius + 0.0f // mHeight + } // mCyl + } }; int daTbox2_c::Create() { diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index 5a76e1b4c0..cf09711b3e 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -4,6 +4,10 @@ #include "f_op/f_op_actor_mng.h" #include "f_pc/f_pc_searcher.h" +#if DEBUG +#include "d/d_debug_viewer.h" +#endif + void dCcD_GAtTgCoCommonBase::ClrActorInfo() { mApid = -1; mAc = NULL; @@ -51,7 +55,10 @@ void dCcD_GAtTgCoCommonBase::SubtractEffCounter() { } bool dCcD_GAtTgCoCommonBase::ChkEffCounter() { - return mEffCounter > 0; + if (mEffCounter > 0) { + return true; + } + return false; } dCcD_GStts::dCcD_GStts() { @@ -197,7 +204,11 @@ cCcD_GObjInf* dCcD_GObjInf::GetAtHitGObj() { } u8 dCcD_GObjInf::ChkAtNoGuard() { - return GetAtSpl() >= 12; + dCcG_At_Spl spl = GetAtSpl(); + if (spl >= 12) { + return 1; + } + return 0; } void dCcD_GObjInf::ClrTgHit() { @@ -313,8 +324,11 @@ void dCcD_GObjInf::Set(dCcD_SrcGObjInf const& src) { mGObjCo.Set(src.mGObjCo); } -dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* p_obj) { - return (dCcD_GObjInf*)p_obj->GetGObjInf(); +dCcD_GObjInf* dCcD_GetGObjInf(cCcD_Obj* pobj) { + JUT_ASSERT(687, pobj != NULL); + cCcD_GObjInf* cgobj = pobj->GetGObjInf(); + dCcD_GObjInf* dgobj = (dCcD_GObjInf*)cgobj; + return dgobj; } cCcD_ShapeAttr* dCcD_Pnt::GetShapeAttr() { @@ -340,17 +354,57 @@ void dCcD_Cps::CalcTgVec() { CalcVec(dest); } +#if DEBUG + +void dCcD_Cps::Draw(const GXColor& color) { + Mtx auStack_68; + Mtx auStack_98; + Mtx auStack_c8; + + MTXIdentity(auStack_68); + + cXyz cStack_d8; + CalcVec(&cStack_d8); + cMtx_trans(auStack_98, GetStartP().x, GetStartP().y, GetStartP().z); + cM3d_UpMtx(cStack_d8, auStack_c8); + cMtx_concat(auStack_98, auStack_c8, auStack_68); + cMtx_scale(auStack_98, GetR(), 0.5f * GetLen(), GetR()); + cMtx_concat(auStack_68, auStack_98, auStack_68); + cMtx_trans(auStack_98, 0.0f, 1.0f, 0.0f); + cMtx_concat(auStack_68, auStack_98, auStack_68); + cMtx_XrotS(auStack_98, 0x4000); + cMtx_concat(auStack_68, auStack_98, auStack_68); + dDbVw_drawCylinderMXlu(auStack_68, color, 1); + dDbVw_drawSphereXlu(GetStartP(), GetR(), color, 1); + dDbVw_drawSphereXlu(GetEndP(), GetR(), color, 1); +} + +#endif + void dCcD_Tri::Set(dCcD_SrcTri const& src) { dCcD_GObjInf::Set(src.mObjInf); + cCcD_TriAttr* attr = this; } cCcD_ShapeAttr* dCcD_Tri::GetShapeAttr() { return this; } +#if DEBUG + +void dCcD_Tri::Draw(const GXColor& color) { + cXyz cStack_34[3]; + cStack_34[0] = mA; + cStack_34[1] = mB; + cStack_34[2] = mC; + dDbVw_drawTriangleXlu(cStack_34, color, 1); +} + +#endif + void dCcD_Cyl::Set(dCcD_SrcCyl const& src) { dCcD_GObjInf::Set(src.mObjInf); - cCcD_CylAttr::Set(src.mCyl); + cCcD_CylAttr::Set(src.mCylAttr); } cCcD_ShapeAttr* dCcD_Cyl::GetShapeAttr() { @@ -365,18 +419,28 @@ void dCcD_Cyl::StartCAt(cXyz& pos) { void dCcD_Cyl::MoveCAt(cXyz& pos) { const cXyz* center = GetCP(); - cXyz diff = pos - *center; + cXyz diff; + diff = pos - *center; SetAtVec(diff); SetC(pos); } void dCcD_Cyl::MoveCTg(cXyz& pos) { const cXyz* center = GetCP(); - cXyz diff = pos - *center; + cXyz diff; + diff = pos - *center; SetTgVec(diff); SetC(pos); } +#if DEBUG + +void dCcD_Cyl::Draw(const GXColor& color) { + dDbVw_drawCylinderXlu(*GetCP(), GetR(), GetH(), color, 1); +} + +#endif + void dCcD_Sph::Set(dCcD_SrcSph const& src) { dCcD_GObjInf::Set(src.mObjInf); cCcD_SphAttr::Set(src.mSphAttr); @@ -390,7 +454,8 @@ void dCcD_Sph::StartCAt(cXyz& pos) { void dCcD_Sph::MoveCAt(cXyz& pos) { const cXyz* center = GetCP(); - cXyz diff = pos - *center; + cXyz diff; + diff = pos - *center; SetAtVec(diff); SetC(pos); } @@ -398,3 +463,11 @@ void dCcD_Sph::MoveCAt(cXyz& pos) { cCcD_ShapeAttr* dCcD_Sph::GetShapeAttr() { return this; } + +#if DEBUG + +void dCcD_Sph::Draw(const GXColor& color) { + dDbVw_drawSphereXlu(*GetCP(), GetR(), color, 1); +} + +#endif From b3803dfa749fef99cb59e22b4cec9bf23e3c1446 Mon Sep 17 00:00:00 2001 From: Niklas Bauer Date: Tue, 30 Dec 2025 13:22:38 +0100 Subject: [PATCH 25/35] f_op work (#3008) * f_op debug 1 * f_op debug 2 * f_op debug 3 * f_op debug 4 * f_op debug 5 * f_op_debug fix build * f_op linking * remove goto in fopac_create * fix regressions * fix regressions * pr comments * f_op debug 6 * f_op debug 7 * f_op debug 8 * f_op debug 9 * f_op debug 10 * f_op work, linking, symbols, heap * regressions 1 * regressions 2 * pr comments --- config/RZDE01_00/symbols.txt | 8 +- config/RZDE01_02/symbols.txt | 8 +- config/RZDJ01/symbols.txt | 8 +- config/RZDP01/symbols.txt | 10 +- config/Shield/symbols.txt | 6 +- config/ShieldD/symbols.txt | 18 +- configure.py | 38 +- include/JSystem/J2DGraph/J2DPane.h | 4 +- include/JSystem/JKernel/JKRExpHeap.h | 1 + include/JSystem/JUtility/JUTAssert.h | 5 +- include/d/d_debug_viewer.h | 1 + include/d/d_error_msg.h | 6 + include/d/d_msg_object.h | 4 +- include/d/d_path.h | 4 + include/d/d_procname.h | 2 +- include/d/d_stage.h | 3 +- include/f_op/f_op_actor_mng.h | 31 +- include/m_Do/m_Do_ext.h | 2 +- include/m_Do/m_Do_hostIO.h | 4 +- include/m_Do/m_Do_mtx.h | 2 +- src/d/d_path.cpp | 4 + src/f_op/f_op_actor.cpp | 11 +- src/f_op/f_op_actor_map.cpp | 13 + src/f_op/f_op_actor_mng.cpp | 641 ++++++++++++++++++++------- src/f_op/f_op_draw_iter.cpp | 2 + src/f_op/f_op_msg_mng.cpp | 154 ++++--- src/f_op/f_op_overlap.cpp | 4 + src/f_op/f_op_scene.cpp | 5 +- src/f_op/f_op_scene_iter.cpp | 1 + src/f_op/f_op_scene_req.cpp | 13 +- src/m_Do/m_Do_ext.cpp | 14 +- src/m_Do/m_Do_hostIO.cpp | 4 - 32 files changed, 729 insertions(+), 302 deletions(-) create mode 100644 src/f_op/f_op_actor_map.cpp diff --git a/config/RZDE01_00/symbols.txt b/config/RZDE01_00/symbols.txt index 8b8871d95e..7c16a90383 100644 --- a/config/RZDE01_00/symbols.txt +++ b/config/RZDE01_00/symbols.txt @@ -28144,10 +28144,10 @@ cDyl_Initialized = .sbss:0x8053A8FC; // type:object size:0x4 scope:global align: cDyl_DVD = .sbss:0x8053A900; // type:object size:0x4 scope:global align:4 data:4byte g_fopAc_type = .sbss:0x8053A908; // type:object size:0x4 scope:global align:4 data:4byte stopStatus__10fopAc_ac_c = .sbss:0x8053A90C; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8053A910 = .sbss:0x8053A910; // type:object size:0x1 data:byte -lbl_8053A911 = .sbss:0x8053A911; // type:object size:0x1 data:byte -lbl_8053A912 = .sbss:0x8053A912; // type:object size:0x1 -lbl_8053A913 = .sbss:0x8053A913; // type:object size:0x1 +HeapAdjustEntry__6fopAcM = .sbss:0x8053A910; // type:object size:0x1 data:byte +HeapAdjustUnk__6fopAcM = .sbss:0x8053A911; // type:object size:0x1 data:byte +l_hio = .sbss:0x8053A912; // type:object size:0x1 +l_actorLC = .sbss:0x8053A913; // type:object size:0x1 mGroundY__11fopAcM_gc_c = .sbss:0x8053A914; // type:object size:0x4 scope:global align:4 data:float mRoofY__11fopAcM_rc_c = .sbss:0x8053A918; // type:object size:0x4 scope:global align:4 data:float mWaterY__11fopAcM_wt_c = .sbss:0x8053A91C; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/RZDE01_02/symbols.txt b/config/RZDE01_02/symbols.txt index 3572680587..1ccb0c7749 100644 --- a/config/RZDE01_02/symbols.txt +++ b/config/RZDE01_02/symbols.txt @@ -27694,10 +27694,10 @@ cDyl_Initialized = .sbss:0x80520904; // type:object size:0x4 scope:global align: cDyl_DVD = .sbss:0x80520908; // type:object size:0x4 scope:global align:4 data:4byte g_fopAc_type = .sbss:0x80520910; // type:object size:0x4 scope:global align:4 data:4byte stopStatus__10fopAc_ac_c = .sbss:0x80520914; // type:object size:0x4 scope:global align:4 data:4byte -lbl_80520918 = .sbss:0x80520918; // type:object size:0x1 data:byte -lbl_80520919 = .sbss:0x80520919; // type:object size:0x1 data:byte -lbl_8052091A = .sbss:0x8052091A; // type:object size:0x1 -lbl_8052091B = .sbss:0x8052091B; // type:object size:0x1 +HeapAdjustEntry__6fopAcM = .sbss:0x80520918; // type:object size:0x1 data:byte +HeapAdjustUnk__6fopAcM = .sbss:0x80520919; // type:object size:0x1 data:byte +l_hio = .sbss:0x8052091A; // type:object size:0x1 +l_actorLC = .sbss:0x8052091B; // type:object size:0x1 mGroundY__11fopAcM_gc_c = .sbss:0x8052091C; // type:object size:0x4 scope:global align:4 data:float mRoofY__11fopAcM_rc_c = .sbss:0x80520920; // type:object size:0x4 scope:global align:4 data:float mWaterY__11fopAcM_wt_c = .sbss:0x80520924; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/RZDJ01/symbols.txt b/config/RZDJ01/symbols.txt index 7e63623202..1190a34e82 100644 --- a/config/RZDJ01/symbols.txt +++ b/config/RZDJ01/symbols.txt @@ -27700,10 +27700,10 @@ cDyl_Initialized = .sbss:0x8051E784; // type:object size:0x4 scope:global align: cDyl_DVD = .sbss:0x8051E788; // type:object size:0x4 scope:global align:4 data:4byte g_fopAc_type = .sbss:0x8051E790; // type:object size:0x4 scope:global align:4 data:4byte stopStatus__10fopAc_ac_c = .sbss:0x8051E794; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8051E798 = .sbss:0x8051E798; // type:object size:0x1 data:byte -lbl_8051E799 = .sbss:0x8051E799; // type:object size:0x1 data:byte -lbl_8051E79A = .sbss:0x8051E79A; // type:object size:0x1 -lbl_8051E79B = .sbss:0x8051E79B; // type:object size:0x1 +HeapAdjustEntry__6fopAcM = .sbss:0x8051E798; // type:object size:0x1 data:byte +HeapAdjustUnk__6fopAcM = .sbss:0x8051E799; // type:object size:0x1 data:byte +l_hio = .sbss:0x8051E79A; // type:object size:0x1 +l_actorLC = .sbss:0x8051E79B; // type:object size:0x1 mGroundY__11fopAcM_gc_c = .sbss:0x8051E79C; // type:object size:0x4 scope:global align:4 data:float mRoofY__11fopAcM_rc_c = .sbss:0x8051E7A0; // type:object size:0x4 scope:global align:4 data:float mWaterY__11fopAcM_wt_c = .sbss:0x8051E7A4; // type:object size:0x4 scope:global align:4 data:float diff --git a/config/RZDP01/symbols.txt b/config/RZDP01/symbols.txt index 752db8a4f2..73851a557e 100644 --- a/config/RZDP01/symbols.txt +++ b/config/RZDP01/symbols.txt @@ -27585,10 +27585,10 @@ cDyl_Initialized = .sbss:0x805210C4; // type:object size:0x4 scope:global align: cDyl_DVD = .sbss:0x805210C8; // type:object size:0x4 scope:global align:4 data:4byte g_fopAc_type = .sbss:0x805210D0; // type:object size:0x4 scope:global align:4 data:4byte stopStatus__10fopAc_ac_c = .sbss:0x805210D4; // type:object size:0x4 scope:global align:4 data:4byte -lbl_805210D8 = .sbss:0x805210D8; // type:object size:0x1 data:byte -lbl_805210D9 = .sbss:0x805210D9; // type:object size:0x1 data:byte -lbl_805210DA = .sbss:0x805210DA; // type:object size:0x1 -lbl_805210DB = .sbss:0x805210DB; // type:object size:0x1 +HeapAdjustEntry__6fopAcM = .sbss:0x805210D8; // type:object size:0x1 data:byte +HeapAdjustUnk__6fopAcM = .sbss:0x805210D9; // type:object size:0x1 data:byte +l_hio = .sbss:0x805210DA; // type:object size:0x1 +l_actorLC = .sbss:0x805210DB; // type:object size:0x1 mGroundY__11fopAcM_gc_c = .sbss:0x805210DC; // type:object size:0x4 scope:global align:4 data:float mRoofY__11fopAcM_rc_c = .sbss:0x805210E0; // type:object size:0x4 scope:global align:4 data:float mWaterY__11fopAcM_wt_c = .sbss:0x805210E4; // type:object size:0x4 scope:global align:4 data:float @@ -27608,7 +27608,7 @@ request_id$46742 = .sbss:0x80521140; // type:object size:0x4 scope:local align:4 g_fpcPf_ProfileList_p = .sbss:0x80521148; // type:object size:0x4 scope:global align:4 data:4byte lbl_80521150 = .sbss:0x80521150; // type:object size:0x8 mProcID__20dStage_roomControl_c = .sbss:0x80521158; // type:object size:0x4 scope:global align:4 data:4byte -lbl_8052115C = .sbss:0x8052115C; // type:object size:0x1 data:byte +mStayNo__20dStage_roomControl_c = .sbss:0x8052115C; // type:object size:0x1 data:byte lbl_8052115D = .sbss:0x8052115D; // type:object size:0x1 data:byte lbl_8052115E = .sbss:0x8052115E; // type:object size:0x1 data:byte lbl_8052115F = .sbss:0x8052115F; // type:object size:0x1 data:byte diff --git a/config/Shield/symbols.txt b/config/Shield/symbols.txt index 814a870c54..d0f7467e56 100644 --- a/config/Shield/symbols.txt +++ b/config/Shield/symbols.txt @@ -25252,8 +25252,8 @@ cDyl_Initialized = .sbss:0x80508ACC; // type:object size:0x4 scope:global data:4 cDyl_DVD = .sbss:0x80508AD0; // type:object size:0x4 scope:global data:4byte hash:0x12A4A3DE g_fopAc_type = .sbss:0x80508AD8; // type:object size:0x4 scope:global data:4byte hash:0x79729021 stopStatus__10fopAc_ac_c = .sbss:0x80508ADC; // type:object size:0x4 scope:global data:4byte hash:0xD4489812 dhash:0xA7560FD3 -lbl_80508AE0 = .sbss:0x80508AE0; // type:object size:0x1 data:byte hash:0x112A0F50 dhash:0xD993AE06 -lbl_80508AE1 = .sbss:0x80508AE1; // type:object size:0x1 data:byte hash:0x16A8A2FA dhash:0x6C7BE12C +HeapAdjustEntry__6fopAcM = .sbss:0x80508AE0; // type:object size:0x1 data:byte hash:0x112A0F50 dhash:0xD993AE06 +HeapAdjustUnk__6fopAcM = .sbss:0x80508AE1; // type:object size:0x1 data:byte hash:0x16A8A2FA dhash:0x6C7BE12C l_hio = .sbss:0x80508AE4; // type:object size:0x1 scope:global hash:0x0A6CFFF8 mGroundY__11fopAcM_gc_c = .sbss:0x80508AE8; // type:object size:0x4 scope:global align:4 data:float hash:0x43B2A105 dhash:0x6F39B9E5 mRoofY__11fopAcM_rc_c = .sbss:0x80508AEC; // type:object size:0x4 scope:global align:4 data:float hash:0x062D9541 dhash:0xBEBFC081 @@ -25274,7 +25274,7 @@ g_fpcNd_type = .sbss:0x80508B48; // type:object size:0x4 scope:global data:4byte g_fpcPf_ProfileList_p = .sbss:0x80508B58; // type:object size:0x4 scope:global data:4byte hash:0x2CADF2C7 @LOCAL@dStage_getName__FsSc@tmp_name = .sbss:0x80508B60; // type:object size:0x8 scope:local hash:0xDC907C52 dhash:0x0B811DD9 mProcID__20dStage_roomControl_c = .sbss:0x80508B68; // type:object size:0x4 scope:global data:4byte hash:0x24C2F7B2 dhash:0xBF1DEEF0 -lbl_80508B6C = .sbss:0x80508B6C; // type:object size:0x1 data:byte hash:0x87058A4F dhash:0xB3B700CD +mStayNo__20dStage_roomControl_c = .sbss:0x80508B6C; // type:object size:0x1 data:byte hash:0x87058A4F dhash:0xB3B700CD lbl_80508B6D = .sbss:0x80508B6D; // type:object size:0x1 data:byte hash:0x5AF37248 dhash:0x1A945A6A lbl_80508B6E = .sbss:0x80508B6E; // type:object size:0x1 data:byte hash:0xE957ED68 dhash:0x66C51F6A lbl_80508B6F = .sbss:0x80508B6F; // type:object size:0x1 data:byte hash:0x88D929D5 dhash:0xB0689D17 diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index 232039cea8..f72be9f389 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -25711,7 +25711,7 @@ getSDevice__12JUTAssertionFv = .text:0x80522C80; // type:function size:0x8 scope setConfirmMessage__12JUTAssertionFUlPcibPCc = .text:0x80522C90; // type:function size:0xF4 scope:global align:16 hash:0x81E1CAAB dhash:0x4A96C3A5 showAssert_f_va = .text:0x80522D90; // type:function size:0x23C scope:global align:16 hash:0xF0EFDC15 showAssert_f__12JUTAssertionFUlPCciPCce = .text:0x80522FD0; // type:function size:0xAC scope:global align:16 hash:0x281C1DAC dhash:0x542AA36D -setWarningMessage_f_va = .text:0x80523080; // type:function size:0x110 scope:global align:16 hash:0xD1C7AD17 +setWarningMessage_f_va__FUlPCciPCcP16__va_list_struct = .text:0x80523080; // type:function size:0x110 scope:global align:16 hash:0xD1C7AD17 setWarningMessage_f__12JUTAssertionFUlPciPCce = .text:0x80523190; // type:function size:0xAC scope:global align:16 hash:0xB2CDC6ED dhash:0xC8D660CA setLogMessage_f_va = .text:0x80523240; // type:function size:0x10C scope:global align:16 hash:0x72144599 setLogMessage_f__12JUTAssertionFUlPciPCce = .text:0x80523350; // type:function size:0xAC scope:global align:16 hash:0x2FDEA7A3 dhash:0xDE10A904 @@ -64188,8 +64188,8 @@ lbl_8074C3AB = .sbss:0x8074C3AB; // type:object size:0x1 data:byte hash:0x15E8B5 @LOCAL@exceptionNNGCReadPad__FPUlPUl@l_oldButton@0 = .sbss:0x8074C3AC; // type:object size:0x4 scope:local data:4byte hash:0x50F85B88 dhash:0x8D7B3DDD mDoMtx_stack = .sbss:0x8074C3B0; // type:object size:0x1 scope:global hash:0x2AB168B3 lbl_8074C3B8 = .sbss:0x8074C3B8; // type:object size:0x1 data:byte hash:0x60980213 dhash:0x3EBAE505 -lbl_8074C3B9 = .sbss:0x8074C3B9; // type:object size:0x1 data:byte hash:0xDD10CA27 dhash:0x25FFD851 -lbl_8074C3BA = .sbss:0x8074C3BA; // type:object size:0x2 hash:0x364A3DE1 dhash:0xAED09ED7 +HeapAdjustVerbose__6mDoExt = .sbss:0x8074C3B9; // type:object size:0x1 data:byte hash:0xDD10CA27 dhash:0x25FFD851 +HeapAdjustQuiet__6mDoExt = .sbss:0x8074C3BA; // type:object size:0x2 hash:0x364A3DE1 dhash:0xAED09ED7 AssertHeap = .sbss:0x8074C3BC; // type:object size:0x4 scope:global data:4byte hash:0x0726E63B DbPrintHeap = .sbss:0x8074C3C0; // type:object size:0x4 scope:global data:4byte hash:0x114A8B4E gameHeap = .sbss:0x8074C3C4; // type:object size:0x4 scope:global data:4byte hash:0x31D7CBD7 @@ -64266,12 +64266,12 @@ stopStatus__10fopAc_ac_c = .sbss:0x8074C4B4; // type:object size:0x4 scope:globa @LOCAL@fopAc_Draw__FPv@l_name@0 = .sbss:0x8074C4C0; // type:object size:0x8 scope:local hash:0xD2949688 dhash:0x486AE47F @LOCAL@fopAc_Execute__FPv@l_name = .sbss:0x8074C4C8; // type:object size:0x8 scope:local hash:0xB39E0987 dhash:0x018DD2A0 @LOCAL@fopAc_Execute__FPv@l_name@0 = .sbss:0x8074C4D0; // type:object size:0x8 scope:local hash:0x13467F37 dhash:0x018DD2A0 -lbl_8074C4D8 = .sbss:0x8074C4D8; // type:object size:0x1 data:byte hash:0x112A0F50 dhash:0xD993AE06 -lbl_8074C4D9 = .sbss:0x8074C4D9; // type:object size:0x1 data:byte hash:0x16A8A2FA dhash:0x6C7BE12C -lbl_8074C4DA = .sbss:0x8074C4DA; // type:object size:0x1 data:byte hash:0xFD0599DE dhash:0x91983648 -lbl_8074C4DB = .sbss:0x8074C4DB; // type:object size:0x1 data:byte hash:0x3B1C7C18 dhash:0xD83275CE -lbl_8074C4DC = .sbss:0x8074C4DC; // type:object size:0x1 data:byte hash:0xCE781BD5 dhash:0x9D3A7FA3 -lbl_8074C4DD = .sbss:0x8074C4DD; // type:object size:0x1 data:byte hash:0x26832D44 dhash:0xBFAD0F52 +HeapAdjustEntry__6fopAcM = .sbss:0x8074C4D8; // type:object size:0x1 data:byte hash:0x112A0F50 dhash:0xD993AE06 +HeapSkipMargin__6fopAcM = .sbss:0x8074C4D9; // type:object size:0x1 data:byte hash:0x16A8A2FA dhash:0x6C7BE12C +HeapAdjustVerbose__6fopAcM = .sbss:0x8074C4DA; // type:object size:0x1 data:byte hash:0xFD0599DE dhash:0x91983648 +HeapAdjustQuiet__6fopAcM = .sbss:0x8074C4DB; // type:object size:0x1 data:byte hash:0x3B1C7C18 dhash:0xD83275CE +HeapDummyCreate__6fopAcM = .sbss:0x8074C4DC; // type:object size:0x1 data:byte hash:0xCE781BD5 dhash:0x9D3A7FA3 +HeapDummyCheck__6fopAcM = .sbss:0x8074C4DD; // type:object size:0x1 data:byte hash:0x26832D44 dhash:0xBFAD0F52 l_hio = .sbss:0x8074C4E0; // type:object size:0x8 scope:global hash:0x0A6CFFF8 l_actorLC = .sbss:0x8074C4E8; // type:object size:0x1 scope:global hash:0xCFE549D2 mGroundY__11fopAcM_gc_c = .sbss:0x8074C4EC; // type:object size:0x4 scope:global align:4 data:float hash:0x43B2A105 dhash:0x6F39B9E5 diff --git a/configure.py b/configure.py index 09ddce3ef7..8fb5950bba 100755 --- a/configure.py +++ b/configure.py @@ -604,29 +604,29 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "f_ap/f_ap_game.cpp"), # f_op - Object(MatchingFor(ALL_GCN), "f_op/f_op_actor.cpp"), - Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_actor_iter.cpp"), - Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_actor_tag.cpp"), - Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_camera.cpp"), - Object(NonMatching, "f_op/f_op_actor_map.cpp"), + Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_actor.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_actor_iter.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_actor_tag.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_camera.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_actor_map.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_actor_mng.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_camera_mng.cpp"), - Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_overlap.cpp"), - Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_overlap_mng.cpp"), - Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_overlap_req.cpp"), - Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_scene.cpp"), + Object(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "f_op/f_op_camera_mng.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_overlap.cpp"), + Object(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "f_op/f_op_overlap_mng.cpp"), + Object(MatchingFor(ALL_GCN, ALL_WII, "ShieldD"), "f_op/f_op_overlap_req.cpp"), + Object(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "f_op/f_op_scene.cpp"), Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_scene_iter.cpp"), - Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_scene_mng.cpp"), - Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_scene_req.cpp"), - Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_scene_tag.cpp"), - Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_view.cpp"), - Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_kankyo.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_scene_mng.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_scene_req.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_scene_tag.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_view.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_kankyo.cpp"), Object(MatchingFor(ALL), "f_op/f_op_msg.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_kankyo_mng.cpp"), + Object(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "f_op/f_op_kankyo_mng.cpp"), Object(MatchingFor(ALL_GCN), "f_op/f_op_msg_mng.cpp"), - Object(MatchingFor(ALL_GCN), "f_op/f_op_draw_iter.cpp"), - Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_draw_tag.cpp"), - Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_scene_pause.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_draw_iter.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_draw_tag.cpp"), + Object(MatchingFor(ALL), "f_op/f_op_scene_pause.cpp"), # f_pc Object(MatchingFor(ALL_GCN), "f_pc/f_pc_base.cpp"), diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index dccc76e448..c66e10d668 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -86,7 +86,9 @@ public: /* vt 0x18 */ virtual void resize(f32 x, f32 y); /* vt 0x1C */ virtual void setCullBack(bool cull); /* vt 0x20 */ virtual void setCullBack(_GXCullMode cmode); - /* vt 0x24 */ virtual void setAlpha(u8); + /* vt 0x24 */ virtual void setAlpha(u8 alpha) { + mAlpha = alpha; + }; /* vt 0x28 */ virtual bool setConnectParent(bool connected); /* vt 0x2C */ virtual void calcMtx() { if (mPaneTree.getParent() != NULL) { diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h index f9f126aa23..224d4cbe1e 100644 --- a/include/JSystem/JKernel/JKRExpHeap.h +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -63,6 +63,7 @@ protected: void joinTwoBlocks(CMemBlock* block); public: + s32 isEmpty(); s32 getUsedSize(u8 groupId) const; s32 getTotalUsedSize(void) const; diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 3c8cf14908..66af11774b 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -63,10 +63,12 @@ namespace JUTAssertion { u32 getSDevice(); void showAssert_f(u32 device, const char* file, int line, const char* msg, ...); + void showAssert_f_va(u32 device, const char* file, int line, const char* msg, __va_list args); void setWarningMessage_f(u32 device, char * file, int line, const char * fmt, ...); + void setWarningMessage_f_va(u32 device, const char* file, int line, const char* msg, va_list args); void setLogMessage_f(u32 device, char* file, int line, const char* fmt, ...); void setConfirmMessage(u32 param_1, char* file, int line, bool param_4, const char* msg); - + inline void showAssert(u32 device, const char* file, int line, const char* msg) { showAssert_f(device, file, line, "%s", msg); } @@ -76,6 +78,7 @@ namespace JUTAssertion { } }; + extern bool sAssertVisible; #endif /* JUTASSERT_H */ diff --git a/include/d/d_debug_viewer.h b/include/d/d_debug_viewer.h index cd2fe2d93c..f535207a3a 100644 --- a/include/d/d_debug_viewer.h +++ b/include/d/d_debug_viewer.h @@ -22,6 +22,7 @@ void dDbVw_drawCircle(int i_bufferType, cXyz& i_pos, f32 i_radius, const GXColor void dDbVw_drawSphere(int i_bufferType, cXyz& i_pos, f32 i_size, const GXColor& i_color, u8 i_clipZ); void dDbVw_drawCylinder(int i_bufferType, cXyz& i_pos, f32 i_radius, f32 i_height, const GXColor& i_color, u8 i_clipZ); void dDbVw_drawCylinderM(int i_bufferType, Mtx i_mtx, const GXColor& i_color, u8 i_clipZ); +void dDbVw_drawCube8pXlu(cXyz* i_points, const GXColor& i_color); inline void dDbVw_drawCube8pOpa(cXyz* i_points, const GXColor& i_color) { dDbVw_drawCube8p(0, i_points, i_color); diff --git a/include/d/d_error_msg.h b/include/d/d_error_msg.h index 8016378b22..ebd87ec633 100644 --- a/include/d/d_error_msg.h +++ b/include/d/d_error_msg.h @@ -12,4 +12,10 @@ struct dDvdErrorMsg_c { static u8 execute(); }; +#if !PLATFORM_GCN +struct dConnectErrorMsg_c { + static void disable(); +}; +#endif + #endif /* D_D_ERROR_MSG_H */ diff --git a/include/d/d_msg_object.h b/include/d/d_msg_object.h index c646e957f7..8d91d20b29 100644 --- a/include/d/d_msg_object.h +++ b/include/d/d_msg_object.h @@ -417,7 +417,7 @@ inline void dMsgObject_changeFlowGroup(s32 flow) { inline void dMsgObject_setTalkActor(fopAc_ac_c* actor) { if (dMsgObject_getMsgObjectClass() != NULL) { - dMsgObject_c::setTalkActor(actor); + dMsgObject_getMsgObjectClass()->setTalkActor(actor); } } @@ -445,7 +445,7 @@ inline void dMsgObject_setKillMessageFlag() { } inline void dMsgObject_endFlowGroup() { - dMsgObject_c::endFlowGroup(); + dMsgObject_getMsgObjectClass()->endFlowGroup(); } inline void dMsgObject_setSmellType(u8 type) { diff --git a/include/d/d_path.h b/include/d/d_path.h index 37a876a8f8..3d1b296988 100644 --- a/include/d/d_path.h +++ b/include/d/d_path.h @@ -30,6 +30,10 @@ inline BOOL dPath_ChkClose(const dPath* i_path) { return i_path->m_closed & 1; } dPath* dPath_GetRoomPath(int path_index, int room_no); dPath* dPath_GetNextRoomPath(dPath const* i_path, int room_no); dPnt* dPath_GetPnt(dPath const* i_path, int pnt_index); +#if !PLATFORM_GCN // Fakematch due to differing return type on non-GCN platforms +int dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* param_2); +#else u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* param_2); +#endif #endif /* D_D_PATH_H */ diff --git a/include/d/d_procname.h b/include/d/d_procname.h index cfdeaf6730..bc0ed5efc1 100644 --- a/include/d/d_procname.h +++ b/include/d/d_procname.h @@ -19,7 +19,7 @@ enum { /* 0x00C */ PROC_OPENING_SCENE, /* 0x00D */ PROC_NAME_SCENE, /* 0x00E */ PROC_NAMEEX_SCENE, -#if VERSION != VERSION_WII_USA_R0 +#if VERSION != VERSION_WII_USA_R0 && VERSION != VERSION_WII_PAL /* 0x00F */ PROC_WARNING_SCENE, /* 0x010 */ PROC_WARNING2_SCENE, #endif diff --git a/include/d/d_stage.h b/include/d/d_stage.h index d3a2f9c114..2fdc6a9cf3 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -1140,7 +1140,8 @@ public: static void setRegionNo(int i_roomNo, u8 i_regionNo) { mStatus[i_roomNo].mRegionNo = i_regionNo; } u8 checkStatusFlag(int i_roomNo, u8 flag) const { - return cLib_checkBit(mStatus[i_roomNo].mFlag, flag); + JUT_ASSERT(2699, 0 <= i_roomNo && i_roomNo < 64); + return cLib_checkBit((u8) mStatus[i_roomNo].mFlag, flag); } void onStatusFlag(int i_roomNo, u8 flag) { diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index f1d161342e..b81a7735cf 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -39,6 +39,17 @@ class cM3dGPla; s8 dComIfGp_getReverb(int roomNo); +namespace fopAcM { +extern u8 HeapAdjustEntry; +extern u8 HeapAdjustUnk; +extern u8 HeapAdjustVerbose; +extern u8 HeapAdjustQuiet; +extern u8 HeapDummyCreate; +extern u8 HeapDummyCheck; +extern u8 HeapSkipMargin; +extern int HeapAdjustMargin; +} // namespace fopAcM + struct fopAcM_prmBase_class { /* 0x00 */ u32 parameters; /* 0x04 */ cXyz position; @@ -816,22 +827,8 @@ inline void fopAcM_effSmokeSet2(u32* param_0, u32* param_1, cXyz const* param_2, fopAcM_effSmokeSet1(param_0, param_1, param_2, param_3, param_4, param_5, 0); } -inline void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_filename, - int i_line, const char* i_msg, ...) { -#if DEBUG - /* va_list args; - va_start(args, i_msg); - - char buf[64]; - snprintf(buf, sizeof(buf), "<%s> %s", dStage_getName(fopAcM_GetProfName(i_actor), - i_actor->argument), i_msg); setWarningMessage_f_va(JUTAssertion::getSDevice(), i_filename, - i_line, buf, args); - - va_end(args); */ -#endif -} - -void fopAcM_showAssert_f(const fopAc_ac_c*, const char*, int, const char*, ...); +void fopAcM_showAssert_f(const fopAc_ac_c* i_actor, const char* i_filename, int i_line, + const char* i_msg, ...) ; #define fopAcM_assert(line, actor, COND, msg) \ (COND) ? (void)0 : (fopAcM_showAssert_f(actor, __FILE__, line, msg)); @@ -839,6 +836,8 @@ void fopAcM_showAssert_f(const fopAc_ac_c*, const char*, int, const char*, ...); #if DEBUG #define fopAcM_setWarningMessage(i_actor, i_filename, i_line, i_msg) \ fopAcM_setWarningMessage_f(i_actor, i_filename, i_line, i_msg) +void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_filename, int i_line, + const char* i_msg, ...); #else #define fopAcM_setWarningMessage(...) #endif diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index e2aa21e811..00a8144bc3 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -751,7 +751,7 @@ inline void mDoExt_bckAnmRemove(J3DModelData* i_modelData) { i_modelData->getJointNodePointer(0)->setMtxCalc(NULL); } -static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_parent, u32 i_alignment); +JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_parent, u32 i_alignment); JKRSolidHeap* mDoExt_createSolidHeapFromGame(u32 i_size, u32 i_alignment); void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap); u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap); diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index e432c736ad..643143cd45 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -71,7 +71,9 @@ public: extern mDoHIO_root_c mDoHIO_root; void mDoHIO_updateChild(s8 i_no); -void mDoHIO_update(); +inline void mDoHIO_update() { + mDoHIO_root.update(); +}; void mDoHIO_deleteChild(s8 i_no); inline s8 mDoHIO_createChild(const char* i_name, JORReflexible* i_node) { return mDoHIO_root.createChild(i_name, i_node); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index cbc3fd8616..a85f7e9b4f 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -45,7 +45,7 @@ inline void mDoMtx_multVec(CMtxP m, const Vec* src, Vec* dst) { } inline void mDoMtx_multVecArray(const Mtx m, const Vec* src, Vec* dst, u32 count) { - MTXMultVecArray(m, src, dst, count); + PSMTXMultVecArray(m, src, dst, count); } inline void mDoMtx_copy(const Mtx src, Mtx dst) { diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp index bbf549364f..fb15758e06 100644 --- a/src/d/d_path.cpp +++ b/src/d/d_path.cpp @@ -63,7 +63,11 @@ dPath* dPath_GetNextRoomPath(dPath const* p_path, int room_no) { return &path->m_path[next_id]; } +#if !PLATFORM_GCN // Fakematch due to differing return type on non-GCN platforms +int dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* param_2) { +#else u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* param_2) { +#endif int roomId = dComIfG_Bgsp().GetRoomId(poly); int roomPathId = dComIfG_Bgsp().GetRoomPathId(poly); diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 2a0d52a768..a04944759e 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -155,7 +155,7 @@ print_error_check_c::param_s print_error_check_c::sDRAW = { class fopac_HIO_c : public JORReflexible { public: fopac_HIO_c(); - ~fopac_HIO_c(); + virtual ~fopac_HIO_c(); void genMessage(JORMContext*); @@ -168,7 +168,6 @@ public: /* 0x0C */ u8 mBBtnInfoDisp; }; -fopac_HIO_c::~fopac_HIO_c() {} fopac_HIO_c::fopac_HIO_c() { mId = -1; @@ -178,6 +177,8 @@ fopac_HIO_c::fopac_HIO_c() { mBBtnInfoDisp = false; } +fopac_HIO_c::~fopac_HIO_c() {} + static fopac_HIO_c l_HIO; void fopac_HIO_c::genMessage(JORMContext* mctx) { @@ -433,6 +434,7 @@ static int fopAc_Delete(void* i_this) { return ret; } +// Wii: NONMATCHING, minor temp regalloc static int fopAc_Create(void* i_this) { fopAc_ac_c* actor = (fopAc_ac_c*)i_this; int ret; @@ -628,6 +630,11 @@ void fopEn_enemy_c::drawBallModel(dKy_tevstr_c* i_tevstr) { } } +#if PLATFORM_WII || VERSION == VERSION_SHIELD +u8 fopAcM::HeapAdjustEntry; +u8 fopAcM::HeapAdjustUnk; +#endif + actor_method_class g_fopAc_Method = { (process_method_func)fopAc_Create, (process_method_func)fopAc_Delete, (process_method_func)fopAc_Execute, (process_method_func)fopAc_IsDelete, diff --git a/src/f_op/f_op_actor_map.cpp b/src/f_op/f_op_actor_map.cpp new file mode 100644 index 0000000000..ede583eb3d --- /dev/null +++ b/src/f_op/f_op_actor_map.cpp @@ -0,0 +1,13 @@ +/** + * f_op_actor_map.cpp + * Actor Map (Debug only) + */ + +#include "d/dolzel.h" // IWYU pragma: keep + +#include "f_op/f_op_actor_mng.h" + + +void dummy(s16 i_procName, createFunc i_createFunc, void* params) { + fopAcM_Create(i_procName, i_createFunc, params); +} diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index e3e33f7ba0..c56d92c086 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -17,6 +17,7 @@ #include "d/d_item.h" #include "d/d_path.h" #include "d/d_s_play.h" +#include "d/d_debug_viewer.h" #include "f_op/f_op_actor_mng.h" #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_scene_mng.h" @@ -24,15 +25,7 @@ #include #define MAKE_ITEM_PARAMS(itemNo, itemBitNo, param_2, param_3) \ - ((itemNo & 0xFF) << 0 | (itemBitNo & 0xFF) << 0x8 | param_2 << 0x10 | (param_3 & 0xF) << 0x18) - -namespace fopAcM { -extern u8 HeapAdjustEntry; -extern u8 HeapAdjustUnk; -extern u8 HeapAdjustVerbose; -extern u8 HeapAdjustQuiet; -extern u8 HeapDummyCreate; -} // namespace fopAcM + ((itemNo & 0xFF) << 0x0 | (itemBitNo & 0xFF) << 0x8 | (param_2 & 0xFF) << 0x10 | (param_3 & 0xF) << 0x18) class l_HIO : public JORReflexible { public: @@ -87,6 +80,7 @@ void l_HIO::genMessage(JORMContext* mctx) { } void l_HIO::listenPropertyEvent(const JORPropertyEvent* property) { + (void)property; JORMContext* mctx = attachJORMContext(8); JORReflexible::listenPropertyEvent(property); @@ -100,6 +94,37 @@ void l_HIO::listenPropertyEvent(const JORPropertyEvent* property) { releaseJORMContext(mctx); } + +void fopAcM_setWarningMessage_f(const fopAc_ac_c* i_actor, const char* i_filename, int i_line, + const char* i_msg, ...) { + (void)i_msg; + va_list args; + va_start(args, i_msg); + + char buf[64]; + const char* name = dStage_getName(fopAcM_GetProfName(i_actor), i_actor->argument); + snprintf(buf, sizeof(buf), "<%s> %s", name, i_msg); + JUTAssertion::setWarningMessage_f_va(JUTAssertion::getSDevice(), i_filename, i_line, buf, + args); // Namespace issue + + va_end(args); +} + +void fopAcM_showAssert_f(const fopAc_ac_c* i_actor, const char* i_filename, int i_line, + const char* i_msg, ...) { + (void)i_msg; + va_list args; + va_start(args, i_msg); + + char buf[64]; + const char* name = dStage_getName(fopAcM_GetProfName(i_actor), i_actor->argument); + snprintf(buf, sizeof(buf), "<%s> %s", name, i_msg); + JUTAssertion::showAssert_f_va(JUTAssertion::getSDevice(), i_filename, i_line, buf, + args); // Namespace/Inlining issue + OS_PANIC(267, "Halt"); + + va_end(args); +} #endif fopAc_ac_c* fopAcM_FastCreate(s16 i_procName, FastCreateReqFunc i_createFunc, void* i_createData, @@ -203,7 +228,10 @@ fopAcM_prm_class* createAppend(u16 i_setId, u32 i_parameters, const cXyz* i_pos, return append; } -void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message) {} +void fopAcM_Log(fopAc_ac_c const* i_actor, char const* i_message) { + UNUSED(i_actor); + UNUSED(i_message); +} s32 fopAcM_delete(fopAc_ac_c* i_actor) { // "Deleting Actor" @@ -355,33 +383,66 @@ u8 fopAcM::HeapAdjustUnk; u8 fopAcM::HeapAdjustVerbose; u8 fopAcM::HeapAdjustQuiet; u8 fopAcM::HeapDummyCreate; - -static bool lbl_8074C4DC; -static bool lbl_8074C4DD; +u8 fopAcM::HeapSkipMargin; +u8 fopAcM::HeapDummyCheck; +int fopAcM::HeapAdjustMargin = +#if VERSION == VERSION_SHIELD_DEBUG + 0x1000; +#else + 0x10000; +#endif struct DummyCheckHeap { - static JKRHeap* getHeap(); + JKRHeap* getHeap(); + void setHeap(JKRHeap* heap); /* 0x0 */ JKRHeap* dummyHeap; }; -static DummyCheckHeap* dch; +static DummyCheckHeap* dch = NULL; bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, u32 i_size) { - const char* procNameString = fopAcM_getProcNameString(i_actor); - JKRSolidHeap* heap00 = NULL; - #if DEBUG - if (lbl_8074C4DC != 0 && lbl_8074C4DD != 0 && dch != NULL) { + s16 procProfName = fopAcM_GetProfName(i_actor); + + char procNameString[16]; + fopAcM_getNameString(i_actor, procNameString); +#else + const char* procNameString = fopAcM_getProcNameString(i_actor); +#endif + JKRSolidHeap* heap = NULL; + + u32 adjustedHeap; + bool result; + + if (DEBUG && fopAcM::HeapDummyCreate && !fopAcM::HeapDummyCheck && dch != NULL) { JKRHeap* dummy_heap = dch->getHeap(); if (dummy_heap != NULL) { - JKRSolidHeap* heap = mDoExt_createSolidHeap(-1, dummy_heap, 0x20); + heap = mDoExt_createSolidHeap(-1, dummy_heap, 0x20); JUT_ASSERT(1211, heap); + + if (fopAcM::HeapAdjustVerbose) { + // Attempting registration with max dummy heap. + OS_REPORT("ダミーヒープ最大で登録してみます。%08x\n", heap); + } + result = fopAcM_callCallback(i_actor, i_heapCallback, heap); + if (!result) { + // Registration failed with max dummy heap. + OS_REPORT_ERROR("ダミーヒープ最大で登録失敗。%08x[%s]\n", heap->getFreeSize(), + procNameString); + } else if (fopAcM::HeapAdjustVerbose) { + // Registration successful with max dummy heap. + OS_REPORT("ダミーヒープ最大で登録成功。\n"); + } + + mDoExt_destroySolidHeap(heap); + heap = NULL; + dch->setHeap(dummy_heap); } } -#endif if (fopAcM::HeapAdjustVerbose) { + // fopAcM_entrySolidHeap Start [%s] Estimated Size=%08x OS_REPORT("\x1b[36mfopAcM_entrySolidHeap 開始 [%s] 見積もりサイズ=%08x\n\x1b[m", procNameString, i_size); } @@ -393,102 +454,260 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback while (true) { if (i_size != 0) { if (fopAcM::HeapAdjustVerbose) { + // Attempting to allocate with estimated heap size (%08x). [%s] OS_REPORT("見積もりヒープサイズで(%08x)確保してみます。 [%s]\n", i_size, procNameString); } - heap00 = mDoExt_createSolidHeapFromGame(i_size, 0x20); - if (heap00 != NULL) { + heap = mDoExt_createSolidHeapFromGame(i_size, 0x20); + if (heap != NULL) { if (fopAcM::HeapAdjustVerbose) { - OS_REPORT("見積もりヒープサイズで登録してみます。%08x [%s]\n", heap00, + // Attempting registration with estimated heap size. %08x [%s] + OS_REPORT("見積もりヒープサイズで登録してみます。%08x [%s]\n", heap, procNameString); } - bool status = fopAcM_callCallback(i_actor, i_heapCallback, heap00) != 0; - if (!status) { - // "Entry for estimated heap size(%08x) failed. %08x[%s]\n" - OSReport_Error("見積もりヒープサイズ(%08x)で登録失敗しました。%08x[%s]\n", - i_size, heap00->getFreeSize(), procNameString); - mDoExt_destroySolidHeap(heap00); - heap00 = NULL; - } - } else { - // "Could not allocate estimated heap. %08x [%s]\n" - OSReport_Error("見積もりヒープが確保できませんでした。 %08x [%s]\n", i_size, - procNameString); - } - } - - if (heap00 == NULL) { - heap00 = mDoExt_createSolidHeapFromGame(0xFFFFFFFF, 0x20); - if (heap00 == NULL) { - // "Failed to allocate maximum heap size. [%s]\n" - OSReport_Error("最大空きヒープサイズで確保失敗。[%s]\n", procNameString); - return false; - } - - bool status = fopAcM_callCallback(i_actor, i_heapCallback, heap00) != 0; - if (!status) { - // "Entry failed for maximum heap size. %08x[%s]\n" - OSReport_Error("最大空きヒープサイズで登録失敗。%08x[%s]\n", heap00->getFreeSize(), - procNameString); - mDoExt_destroySolidHeap(heap00); - return false; - } - } - - if (heap00 == NULL) { - break; - } - - if (fopAcM::HeapAdjustEntry == 0) { - mDoExt_adjustSolidHeap(heap00); - i_actor->heap = heap00; - return true; - } else { - JKRSolidHeap* heap = NULL; - u32 heap00Size = heap00->getSize(); - u32 alignedSize = ALIGN_NEXT(heap00Size - heap00->getFreeSize(), 0x20); - if (alignedSize + 0x90 < mDoExt_getGameHeap()->getFreeSize()) { - heap = mDoExt_createSolidHeapFromGame(alignedSize, 0x20); - } - - if (heap != NULL) { - if (heap < heap00) { - mDoExt_destroySolidHeap(heap00); - heap00 = NULL; - bool status = fopAcM_callCallback(i_actor, i_heapCallback, heap) != 0; - if (!status) { - // "Entry fails at exact size? (Bug)\n" - OSReport_Error("ぴったりサイズで、登録失敗？(バグ)\n"); - mDoExt_destroySolidHeap(heap); - heap = NULL; + result = fopAcM_callCallback(i_actor, i_heapCallback, heap); + if (!result) { + if (!DEBUG || !fopAcM::HeapAdjustQuiet) { + // Registration failed with estimated heap size (%08x). %08x[%s] + OSReport_Error("見積もりヒープサイズ(%08x)で登録失敗しました。%08x[%s]\n", + i_size, heap->getFreeSize(), procNameString); } - } else { mDoExt_destroySolidHeap(heap); heap = NULL; } +#if !PLATFORM_GCN && VERSION != VERSION_WII_JPN + else { + int margin = fopAcM::HeapAdjustMargin; + adjustedHeap = ALIGN_NEXT(heap->getHeapSize() - heap->getFreeSize(), 0x20); +#if PLATFORM_SHIELD + if (i_size < adjustedHeap + margin || fopAcM::HeapSkipMargin) { +#elif VERSION == VERSION_WII_USA_R2 || VERSION == VERSION_WII_PAL + if (i_size < adjustedHeap + margin || fopAcM::HeapAdjustUnk) { +#else + if (i_size < adjustedHeap + margin) { +#endif + if (!fopAcM::HeapAdjustEntry) { + u32 res = mDoExt_adjustSolidHeap(heap); + if (fopAcM::HeapAdjustVerbose) { + // Registration successful with estimated heap size. %08x %08x %08x + OS_REPORT( + "見積もりヒープサイズで登録成功しました。 %08x %08x %08x\n", + adjustedHeap, res, i_size); + } + i_actor->heap = heap; + return true; + } + } else { + if (!DEBUG || !fopAcM::HeapAdjustQuiet) { + // Too much free space remaining with estimated heap size. %08x %08x + // [%s] + OSReport_Warning( + "見積もりヒープサイズでは空きが多すぎます。 %08x %08x [%s]\n", + adjustedHeap, i_size, procNameString); + } +#if DEBUG + // Destroying heap temporarily to obtain exact size + OS_WARNING("正確なサイズを得るために一旦 heap を破棄します\n"); + mDoExt_destroySolidHeap(heap); + heap = NULL; +#endif + } + } +#endif + } else { + // Could not allocate estimated heap. %08x [%s] + OSReport_Error("見積もりヒープが確保できませんでした。 %08x [%s]\n", i_size, + procNameString); + } + } + + if (heap == NULL) { + heap = mDoExt_createSolidHeapFromGame(-1, 0x20); + if (heap == NULL) { + // Allocation failed with max free heap size. [%s] + OSReport_Error("最大空きヒープサイズで確保失敗。[%s]\n", procNameString); + return false; + } +#if DEBUG + if (!fopAcM::HeapAdjustQuiet) { + // Attempting registration with max heap size. %08x + OS_REPORT("最大ヒープサイズで登録してみます。%08x\n", heap); + } + heap->alloc(16, 16); + + bool result2 = fopAcM_callCallback(i_actor, i_heapCallback, heap); + + if (!result2) { + // Registration failed with max free heap size -16 (1st attempt). + OS_REPORT_ERROR("最大空きヒープサイズ-16(1回目)で登録失敗。%08x[%s]\n", + heap->getFreeSize(), procNameString); + mDoExt_destroySolidHeap(heap); + heap = NULL; + return false; + } + u32 prevAlignedHeapSize = + ALIGN_PREV(heap->getHeapSize() - heap->getFreeSize() - 1, 0x10); + heap->freeAll(); + + bool result3 = fopAcM_callCallback(i_actor, i_heapCallback, heap); + if (!result3) { + // Registration failed with max free heap size (2nd attempt). + OS_REPORT_ERROR("最大空きヒープサイズ(2回目)で登録失敗。%08x[%s]\n", + heap->getFreeSize(), procNameString); + mDoExt_destroySolidHeap(heap); + heap = NULL; + return false; + } + + u32 alignedHeapSize = ALIGN_NEXT(heap->getHeapSize() - heap->getFreeSize(), 0x10); + + if (prevAlignedHeapSize > alignedHeapSize + 0x20 || + prevAlignedHeapSize + 0x20 < alignedHeapSize) + { + // Sizes differ between 1st and 2nd attempts. Registration failed. [%s] 0x%08x + // 0x%08x + OS_REPORT_ERROR("1回目と2回目でサイズが違います。登録失敗。[%s] 0x%08x 0x%08x\n", + procNameString, prevAlignedHeapSize, alignedHeapSize); + mDoExt_destroySolidHeap(heap); + heap = NULL; + return false; + } + + if (!fopAcM::HeapAdjustQuiet) { + u32 maxSize = + (prevAlignedHeapSize > alignedHeapSize) ? prevAlignedHeapSize : alignedHeapSize; + + if (!fopAcM::HeapAdjustQuiet) { + // Registration successful with max free heap size. [%s(%d)] 0x%08x 0x%08x + OS_WARNING("最大空きヒープサイズで登録成功。[%s(%d)] 0x%08x 0x%08x\n", + procNameString, procProfName, prevAlignedHeapSize, alignedHeapSize); + } + + if (i_size == 0) { + if (!fopAcM::HeapAdjustQuiet) { + // Please set the estimated size value. (0x%08x) + OS_WARNING("見積もりサイズの値を設定してください。(0x%08x)\n", maxSize); + } + } else if (i_size != maxSize) { + // Please change the estimated size value. (0x%08x -> 0x%08x) [%s] + OS_REPORT_ERROR("見積もりサイズの値を変更してください。(0x%08x→0x%08x) [%s]\n", + i_size, maxSize, procNameString); + } else if (fopAcM::HeapAdjustVerbose) { + // Matches the estimated size. (0x%08x) + OS_REPORT("見積もりサイズと一致しています。(0x%08x)\n", maxSize); + } + } +#else + bool result2 = fopAcM_callCallback(i_actor, i_heapCallback, heap); + if (!result2) { + // "Entry failed for maximum heap size. %08x[%s]\n" + OSReport_Error("最大空きヒープサイズで登録失敗。%08x[%s]\n", heap->getFreeSize(), + procNameString); + mDoExt_destroySolidHeap(heap); + return false; + } +#endif + } + + if (heap == NULL) { + break; + } + + if (!fopAcM::HeapAdjustEntry) { + adjustedHeap = mDoExt_adjustSolidHeap(heap); + if (fopAcM::HeapAdjustVerbose) { + // Skipping exact size check for speed optimization. %08x + OS_REPORT("高速化のためぴったりサイズは調べません。%08x\n", adjustedHeap); + } + i_actor->heap = heap; + return true; + } else { + JKRSolidHeap* newHeap = NULL; + u32 alignedSize = ALIGN_NEXT(heap->getHeapSize() - heap->getFreeSize(), 0x20); + u32 adjOffset = 0x80; + u32 freeSize = mDoExt_getGameHeap()->getFreeSize(); + + if (alignedSize + adjOffset + 0x10 < freeSize) { + newHeap = mDoExt_createSolidHeapFromGame(alignedSize, 0x20); + } + + if (fopAcM::HeapAdjustVerbose) { + // Attempting registration with exact size. %08x %08x + OS_REPORT("ぴったりサイズで登録してみます。%08x %08x\n", newHeap, alignedSize); + } + + if (newHeap != NULL) { + if (newHeap < heap) { + if (fopAcM::HeapAdjustVerbose) { + // Exact size heap was allocated at the front. + OS_REPORT("ぴったりサイズヒープは前のほうに確保されました。\n"); + } + if (fopAcM::HeapAdjustVerbose) { + // Destroying the previous heap first. %08x + OS_REPORT("先にさっきのヒープは破壊しておきます。%08x\n", heap); + } + + mDoExt_destroySolidHeap(heap); + heap = NULL; + + result = fopAcM_callCallback(i_actor, i_heapCallback, newHeap); + JUT_ASSERT(1421, result != NULL); + + if (!result) { + // Registration failed with exact size? (Bug) + OSReport_Error("ぴったりサイズで、登録失敗？(バグ)\n"); + mDoExt_destroySolidHeap(newHeap); + newHeap = NULL; + } else if (fopAcM::HeapAdjustVerbose) { + // Registration successful with exact size. + OS_REPORT("ぴったりサイズで登録成功しました。\n"); + } + } else { + mDoExt_destroySolidHeap(newHeap); + newHeap = NULL; + + if (fopAcM::HeapAdjustVerbose) { + // Exact size heap was allocated at the back, so it will not be used. + OS_REPORT( + "ぴったりサイズヒープは後ろのほうに確保されたので採用しません。\n"); + } + } + } else if (fopAcM::HeapAdjustVerbose) { + // Could not allocate new exact size heap. + OS_REPORT("ぴったりサイズヒープを新たに確保できませんでした。\n"); + } + + if (newHeap != NULL) { + adjustedHeap = mDoExt_adjustSolidHeap(newHeap); + if (fopAcM::HeapAdjustVerbose) { + // Using the exact size heap. %08x + OS_REPORT("ぴったりサイズヒープを採用します。%08x\n", adjustedHeap); + } + i_actor->heap = newHeap; + return true; } if (heap != NULL) { - mDoExt_adjustSolidHeap(heap); + adjustedHeap = mDoExt_adjustSolidHeap(heap); + if (fopAcM::HeapAdjustVerbose) { + // Using the previous heap. This is normal. %08x + OS_REPORT("さっきのヒープを採用します。これは正常です。%08x\n", adjustedHeap); + } i_actor->heap = heap; return true; } - if (heap00 != NULL) { - mDoExt_adjustSolidHeap(heap00); - i_actor->heap = heap00; - return true; - } - - OSReport_Error("ばぐばぐです\n"); // "There's a big bug\n" - JUT_ASSERT(0, FALSE); - OSReport_Error("緊急回避措置\n"); // "Emergency action\n" + OSReport_Error("ばぐばぐです\n"); // It is extremely buggy. + JUT_ASSERT(1454, FALSE); +#if VERSION != VERSION_WII_USA_R0 + OSReport_Error("緊急回避措置\n"); // Emergency evasion measure. fopAcM::HeapAdjustEntry = false; +#endif } } - // "fopAcM_entrySolidHeap didn't work [%s]\n" + // fopAcM_entrySolidHeap failed. [%s] OSReport_Error("fopAcM_entrySolidHeap だめでした [%s]\n", procNameString); return false; } @@ -498,15 +717,27 @@ bool fopAcM_entrySolidHeap(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, if (i_size & 0x80000000) { fopAcM::HeapAdjustUnk = true; } - - u8 var_r30 = fopAcM::HeapAdjustEntry; +#if DEBUG + u8 var_r29 = fopAcM::HeapDummyCheck; + if (i_size & 0x40000000) { + fopAcM::HeapDummyCheck = true; + }; +#endif +u8 var_r30 = fopAcM::HeapAdjustEntry; if (i_size & 0x20000000) { fopAcM::HeapAdjustEntry = false; - } else if (i_size & 0x10000000) { + } +#if VERSION != VERSION_WII_USA_R0 + else if (i_size & 0x10000000) { fopAcM::HeapAdjustEntry = true; } +#endif - bool result = fopAcM_entrySolidHeap_(i_actor, i_heapCallback, i_size & 0xFFFFFF); + u32 size = i_size & 0xFFFFFF; + bool result = fopAcM_entrySolidHeap_(i_actor, i_heapCallback, size); +#if DEBUG + fopAcM::HeapDummyCheck = var_r29; +#endif fopAcM::HeapAdjustUnk = var_r31; fopAcM::HeapAdjustEntry = var_r30; return result; @@ -912,11 +1143,11 @@ s32 fopAcM_orderDoorEvent(fopAc_ac_c* i_actorA, fopAc_ac_c* i_actorB, u16 i_prio s16 evid = i_actorB->eventInfo.getEventId(); u8 toolid = i_actorB->eventInfo.getMapToolId(); - if (fopAcM_GetProfName(i_actorB) == 0x55) { + if (fopAcM_GetProfName(i_actorB) == PROC_Obj_Kshutter) { if (toolid != 0xFF) { evid = dComIfGp_getEventManager().getEventIdx(i_actorA, NULL, toolid); } - } else if (fopAcM_GetProfName(i_actorB) == 0xAB) { + } else if (fopAcM_GetProfName(i_actorB) == PROC_Obj_SmgDoor) { } OS_REPORT("toolid<%d>evid<%d>\n", toolid, evid); @@ -1074,9 +1305,8 @@ s32 fopAcM_orderMapToolEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 s32 fopAcM_orderMapToolAutoNextEvent(fopAc_ac_c* i_actor, u8 param_1, s16 i_eventID, u16 param_3, u16 i_flag, u16 param_5) { - u16 flag = i_flag; - flag = flag | 0x100; - return fopAcM_orderMapToolEvent(i_actor, param_1, i_eventID, param_3, flag, param_5); + i_flag |= (u16)0x100; + return fopAcM_orderMapToolEvent(i_actor, param_1, i_eventID, param_3, i_flag, param_5); } s32 fopAcM_orderPotentialEvent(fopAc_ac_c* i_actor, u16 i_flag, u16 param_2, u16 i_priority) { @@ -1276,38 +1506,39 @@ fpc_ProcID fopAcM_createItemFromTable(cXyz const* i_pos, int i_itemNo, int i_ite cXyz const* i_scale, f32* i_speedF, f32* i_speedY, bool i_createDirect) { // clang-format off - JUT_ASSERT(0, 0 <= i_itemNo && i_itemNo <= 255 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); + JUT_ASSERT(3655, 0 <= i_itemNo && i_itemNo <= 255 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on - ItemTableList* tableList = (ItemTableList*)dComIfGp_getItemTable(); - + u8 tableNum; + ItemTableList* tableList; + tableList = (ItemTableList*)dComIfGp_getItemTable(); if (i_itemNo == 0xFF) { return fpcM_ERROR_PROCESS_ID_e; } #if DEBUG - if (tableList->mTableNum - 1 < i_itemNo) { - // "Table Num<%d>, Specified Table<%d>, over table num!\n" + tableNum = tableList->mTableNum; + if (tableNum - 1 < i_itemNo) { OSReport_Error("テーブル数<%d>、指定テーブル番号<%d>で、テーブル数オーバーしています！\n", - tableList->mTableNum, i_itemNo); + tableNum, i_itemNo); i_itemNo = 0; } #endif - int itemNo = fopAcM_getItemNoFromTableNo(i_itemNo); - if (itemNo == fpcNm_ITEM_NONE) { + i_itemNo = fopAcM_getItemNoFromTableNo(i_itemNo); + if (i_itemNo == fpcNm_ITEM_NONE) { return fpcM_ERROR_PROCESS_ID_e; } void* create_actor; if (i_createDirect) { create_actor = - fopAcM_createItemForDirectGet(i_pos, itemNo, i_roomNo, NULL, NULL, 0.0f, 0.0f); + fopAcM_createItemForDirectGet(i_pos, i_itemNo, i_roomNo, NULL, NULL, 0.0f, 0.0f); } else if (i_speedF == NULL && i_speedY == NULL) { - create_actor = - fopAcM_fastCreateItem2(i_pos, itemNo, i_itemBitNo, i_roomNo, param_5, i_angle, i_scale); + create_actor = fopAcM_fastCreateItem2(i_pos, i_itemNo, i_itemBitNo, i_roomNo, param_5, + i_angle, i_scale); } else { - create_actor = fopAcM_fastCreateItem(i_pos, itemNo, i_roomNo, i_angle, i_scale, i_speedF, + create_actor = fopAcM_fastCreateItem(i_pos, i_itemNo, i_roomNo, i_angle, i_scale, i_speedF, i_speedY, i_itemBitNo, param_5, NULL); } @@ -1318,24 +1549,25 @@ fpc_ProcID fopAcM_createDemoItem(const cXyz* i_pos, int i_itemNo, int i_itemBitN const csXyz* i_angle, int i_roomNo, const cXyz* scale, u8 param_7) { // clang-format off - JUT_ASSERT(0, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); + JUT_ASSERT(3824, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on if (i_itemNo == fpcNm_ITEM_NONE) { return fpcM_ERROR_PROCESS_ID_e; } - return fopAcM_create(PROC_Demo_Item, - (i_itemNo & 0xFF) | (i_itemBitNo & 0x7F) << 0x8 | (param_7 << 0x10), i_pos, - i_roomNo, i_angle, scale, -1); + u32 params = (i_itemNo & 0xFF) << 0x0 | (i_itemBitNo & 0x7F) << 0x8 | (param_7 & 0xFF) << 0x10; + return fopAcM_create(PROC_Demo_Item, params, i_pos, i_roomNo, i_angle, scale, -1); } fpc_ProcID fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF, f32 i_speedY, int param_8) { - fopAc_ac_c* actor = - fopAcM_fastCreate(PROC_Obj_LifeContainer, 0xFFFF0000 | param_8 << 0x8 | (i_itemNo & 0xFF), - i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); + int _ = -1; + u32 params = 0xFFFF0000 | param_8 << 8 | (i_itemNo & 0xFF); + + fopAc_ac_c* actor = fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, + i_scale, -1, NULL, NULL); if (actor != NULL) { actor->speedF = i_speedF; actor->speed.y = i_speedY; @@ -1347,28 +1579,36 @@ fpc_ProcID fopAcM_createItemForBoss(const cXyz* i_pos, int i_itemNo, int i_roomN fpc_ProcID fopAcM_createItemForMidBoss(const cXyz* i_pos, int i_itemNo, int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, int param_6, int param_7) { + UNUSED(i_angle); + UNUSED(param_6); + fpc_ProcID ret = -1; csXyz angle(csXyz::Zero); - return fopAcM_createItem(i_pos, i_itemNo, param_7, i_roomNo, &angle, i_scale, 0x6); + ret = fopAcM_createItem(i_pos, i_itemNo, param_7, i_roomNo, &angle, i_scale, 0x6); + return ret; } fopAc_ac_c* fopAcM_createItemForDirectGet(const cXyz* i_pos, int i_itemNo, int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF, f32 i_speedY) { - return fopAcM_fastCreateItem(i_pos, i_itemNo, i_roomNo, i_angle, i_scale, &i_speedF, &i_speedY, -1, + fopAc_ac_c* item = fopAcM_fastCreateItem(i_pos, i_itemNo, i_roomNo, i_angle, i_scale, &i_speedF, &i_speedY, -1, 0x7, NULL); + fopAc_ac_c* ret = item; + return ret; } fopAc_ac_c* fopAcM_createItemForSimpleDemo(const cXyz* i_pos, int i_itemNo, int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, f32 i_speedF, f32 i_speedY) { - return fopAcM_fastCreateItem(i_pos, i_itemNo, i_roomNo, i_angle, i_scale, &i_speedF, &i_speedY, -1, + fopAc_ac_c* item = fopAcM_fastCreateItem(i_pos, i_itemNo, i_roomNo, i_angle, i_scale, &i_speedF, &i_speedY, -1, 0x4, NULL); + fopAc_ac_c* ret = item; + return ret; } fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, const csXyz* i_angle, const cXyz* i_scale, int param_7) { // clang-format off - JUT_ASSERT(0, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); + JUT_ASSERT(4067, 0 <= i_itemNo && i_itemNo < 256 && (-1 <= i_itemBitNo && i_itemBitNo < (dSv_info_c::DAN_ITEM + dSv_info_c::MEMORY_ITEM + dSv_info_c::ZONE_ITEM )) || i_itemBitNo == 255); // clang-format on if (i_itemNo == fpcNm_ITEM_NONE) { @@ -1384,39 +1624,49 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i item_angle.z = 0xFF; u8 item_no = check_itemno(i_itemNo); - u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, 0xFF, param_7); + int unk = -1; + fpc_ProcID ret; + int i; + + u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, unk, param_7); switch (i_itemNo) { case fpcNm_ITEM_RECOVERY_FAILY: - return fopAcM_create(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1); + ret = fopAcM_create(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1); + break; #if DEBUG +// Return pointer fopAc_ac_c* is uninitialized for these branches case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); - JUT_ASSERT(0, FALSE); + JUT_ASSERT(4145, FALSE); break; case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); - JUT_ASSERT(0, FALSE); + JUT_ASSERT(4149, FALSE); break; case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); - JUT_ASSERT(0, FALSE); + JUT_ASSERT(4153, FALSE); break; #endif case fpcNm_ITEM_KAKERA_HEART: case fpcNm_ITEM_UTAWA_HEART: - return fopAcM_create(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1); + ret = fopAcM_create(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, -1); + break; case fpcNm_ITEM_TRIPLE_HEART: - for (int i = 0; i < 2; i++) { + for (i = 0; i < 2; i++) { fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1); item_angle.y = cM_rndFX(0x7FFF); } default: - return fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1); + ret = fopAcM_create(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1); + break; } + + return ret; } fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, int i_roomNo, @@ -1439,15 +1689,19 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi item_angle.z = 0xFF; u8 item_no = check_itemno(i_itemNo); - u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, 0xFF, param_5); + int unk = -1; + int i; fopAc_ac_c* ret; + u32 params = MAKE_ITEM_PARAMS(item_no, i_itemBitNo, unk, param_5); + switch (i_itemNo) { case fpcNm_ITEM_RECOVERY_FAILY: ret = fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, - NULL, NULL); + NULL, NULL); break; #if DEBUG +// Return pointer fopAc_ac_c* is uninitialized for these branches case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); @@ -1467,17 +1721,17 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi case fpcNm_ITEM_KAKERA_HEART: case fpcNm_ITEM_UTAWA_HEART: ret = fopAcM_fastCreate(PROC_Obj_LifeContainer, params, i_pos, i_roomNo, i_angle, i_scale, - -1, NULL, NULL); + -1, NULL, NULL); break; case fpcNm_ITEM_TRIPLE_HEART: - for (int i = 0; i < 2; i++) { - ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, - NULL); + for (i = 0; i < 2; i++) { + ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, + NULL, NULL); item_angle.y = cM_rndFX(0x7FFF); } default: ret = fopAcM_fastCreate(PROC_ITEM, params, i_pos, i_roomNo, &item_angle, i_scale, -1, NULL, - NULL); + NULL); } return ret; } @@ -1487,30 +1741,32 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, f32* i_speedY, int i_itemBitNo, int param_9, createFunc i_createFunc) { JUT_ASSERT(4324, 0 <= i_itemNo && i_itemNo < 256); - + csXyz angle; if (i_itemNo == fpcNm_ITEM_NONE) { return NULL; } - int i; - u8 item_no = check_itemno(i_itemNo); - u8 item_bit_no = i_itemBitNo; - u32 params = MAKE_ITEM_PARAMS(item_no, item_bit_no, 0xFF, param_9); - + u8 item_bit_no = (u8) i_itemBitNo; + u8 last_param = (u8) param_9; + + int unk = -1; + int i; + fopAc_ac_c* ret; + u32 params = MAKE_ITEM_PARAMS(item_no, item_bit_no, unk, last_param); + if (i_speedF != NULL && isHeart(i_itemNo)) { *i_speedF = 2.0f * *i_speedF; } - - fopAc_ac_c* ret; - + switch (i_itemNo) { case fpcNm_ITEM_RECOVERY_FAILY: ret = fopAcM_fastCreate(PROC_Obj_Yousei, 0xFFFFFFFF, i_pos, i_roomNo, i_angle, i_scale, -1, NULL, NULL); break; #if DEBUG +// Return pointer fopAc_ac_c* is uninitialized for these branches case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); @@ -1542,16 +1798,16 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, angle.z = 0xFF; angle.y += (s16)cM_rndFX(0x2000); - fopAc_ac_c* actor = (fopAc_ac_c*)fopAcM_fastCreate( + ret = (fopAc_ac_c*)fopAcM_fastCreate( PROC_ITEM, params, i_pos, i_roomNo, &angle, i_scale, -1, i_createFunc, NULL); - if (actor != NULL) { + if (ret != NULL) { if (i_speedF != NULL) { - actor->speedF = *i_speedF * (1.0f + cM_rndFX(0.3f)); + ret->speedF = *i_speedF * (1.0f + cM_rndFX(0.3f)); } if (i_speedY != NULL) { - actor->speed.y = *i_speedY * (1.0f + cM_rndFX(0.2f)); + ret->speed.y = *i_speedY * (1.0f + cM_rndFX(0.2f)); } } } @@ -1580,6 +1836,10 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, return ret; } +void dummySetAll() { + cXyz().setall(0.0f); +} + fpc_ProcID fopAcM_createBokkuri(u16 i_setId, const cXyz* i_pos, int i_itemNo, int i_itemBit, int i_roomNo, const cXyz* param_6, int i_itemType, int param_8) { u32 params = 0; @@ -1611,6 +1871,7 @@ void* enemySearchJugge(void* i_actor, void* i_data) { } else { return NULL; } + UNUSED(i_data); } fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { @@ -1631,6 +1892,68 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { return (fopAc_ac_c*)fpcM_JudgeInLayer(fpcM_LayerID(roomProc), enemySearchJugge, NULL); } +void dummyStatusCheck(int i_roomNo, u8 i_flag) { + dComIfGp_roomControl_checkStatusFlag(i_roomNo, i_flag); +} + +void fopAcM_DrawCullingBox(const fopAc_ac_c* i_actor, const GXColor& i_color) { + if (fopAcM_CULLSIZE_IS_BOX(fopAcM_GetCullSize(i_actor))) { + cXyz vertices[8]; + + cXyz* min; + cXyz* max; + + if (fopAcM_GetCullSize(i_actor) == fopAc_CULLBOX_CUSTOM_e) { + min = (cXyz*)&i_actor->cull.box.min; + max = (cXyz*)&i_actor->cull.box.max; + } else { + cull_box* box = &l_cullSizeBox[fopAcM_CULLSIZE_IDX(fopAcM_GetCullSize(i_actor))]; + min = (cXyz*)&box->min; + max = (cXyz*)&box->max; + } + + vertices[0].set(min->x, max->y, min->z); + vertices[1].set(max->x, max->y, min->z); + vertices[2].set(min->x, max->y, max->z); + vertices[3].set(max->x, max->y, max->z); + vertices[4].set(min->x, min->y, min->z); + vertices[5].set(max->x, min->y, min->z); + vertices[6].set(min->x, min->y, max->z); + vertices[7].set(max->x, min->y, max->z); + + if (fopAcM_GetMtx(i_actor) != NULL) { + cMtx_multVecArray(fopAcM_GetMtx(i_actor), vertices, vertices, 8); + } + + dDbVw_drawCube8pXlu(vertices, i_color); + } else { + cXyz center; + f32 radius; + + if (fopAcM_GetCullSize(i_actor) == fopAc_CULLSPHERE_CUSTOM_e) { + radius = fopAcM_getCullSizeSphereR(i_actor); + if (fopAcM_GetMtx(i_actor) != NULL) { + cMtx_multVec(fopAcM_GetMtx(i_actor), &i_actor->cull.sphere.center, ¢er); + } else { + center = fopAcM_getCullSizeSphereCenter(i_actor); + } + } else { + radius = l_cullSizeSphere[fopAcM_CULLSIZE_Q_IDX(fopAcM_GetCullSize(i_actor))].radius; + if (fopAcM_GetMtx(i_actor) != NULL) { + cMtx_multVec( + fopAcM_GetMtx(i_actor), + &l_cullSizeSphere[fopAcM_CULLSIZE_Q_IDX(fopAcM_GetCullSize(i_actor))].center, + ¢er); + } else { + center = + l_cullSizeSphere[fopAcM_CULLSIZE_Q_IDX(fopAcM_GetCullSize(i_actor))].center; + } + } + + dDbVw_drawSphereXlu(center, radius, i_color, 1); + } +} + fpc_ProcID fopAcM_createDisappear(const fopAc_ac_c* i_actor, const cXyz* i_pos, u8 i_size, u8 i_type, u8 i_enemyID) { u32 param = (i_enemyID << 0x10) | (i_size << 0x8) | i_type; @@ -1848,6 +2171,7 @@ static void get_vectle_calc(const cXyz* pXyzA, const cXyz* pXyzB, cXyz* pOut) { vectle_calc(&dPos, pOut); } +// Wii: NONMATCHING, regalloc r30/r31 void fopAcM_setEffectMtx(const fopAc_ac_c* i_actor, const J3DModelData* modelData) { const cXyz* pEyePos = &i_actor->eyePos; camera_class* camera = dCam_getCamera(); @@ -2019,7 +2343,7 @@ s32 fopAcM_getWaterStream(cXyz const* pos, cBgS_PolyInfo const& polyinfo, cXyz* } if (dComIfG_Bgsp().ChkPolySafe(polyinfo)) { - if (dPath_GetPolyRoomPathVec(polyinfo, speed, power)) { + if (dPath_GetPolyRoomPathVec(polyinfo, speed, power) != 0) { speed->normalizeZP(); return 1; } @@ -2054,8 +2378,7 @@ s16 fopAcM_getPolygonAngle(cM3dGPla const* p_plane, s16 param_1) { } f32 cos = cM_scos(p_plane->mNormal.atan2sX_Z() - param_1); - f32 xz = JMAFastSqrt(p_plane->mNormal.x * p_plane->mNormal.x + - p_plane->mNormal.z * p_plane->mNormal.z); + f32 xz = JMAFastSqrt(SQUARE(p_plane->mNormal.x) + SQUARE(p_plane->mNormal.z)); xz *= cos; return cM_atan2s(xz, p_plane->mNormal.y); } @@ -2101,7 +2424,7 @@ BOOL fopAcM_getNameString(const fopAc_ac_c* i_actor, char* o_name) { void fopAcM_initManager() { #if DEBUG DummyCheckHeap_init(); - if (lbl_8074C4DC != 0) { + if (fopAcM::HeapDummyCreate != 0) { DummyCheckHeap_create(); } l_hio.entry(); diff --git a/src/f_op/f_op_draw_iter.cpp b/src/f_op/f_op_draw_iter.cpp index de1805762a..7b4c9e4173 100644 --- a/src/f_op/f_op_draw_iter.cpp +++ b/src/f_op/f_op_draw_iter.cpp @@ -34,7 +34,9 @@ create_tag_class* fopDwIt_Begin() { } create_tag_class* fopDwIt_Next(create_tag_class* i_createTag) { + (void)&i_createTag; create_tag_class* tag = (create_tag_class*)i_createTag->mpNode.mpNextNode; + if (tag == NULL) { return fopDwIt_GetTag(); } diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 6bcb675acd..9442a807a6 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" // IWYU pragma: keep +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRExpHeap.h" #include "SSystem/SComponent/c_malloc.h" @@ -9,15 +9,17 @@ #include "f_op/f_op_msg_mng.h" #include "f_op/f_op_scene_mng.h" -s32 fopMsgM_setStageLayer(void* i_process) { - scene_class* scn = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); +static fpc_ProcID i_msgID = fpcM_ERROR_PROCESS_ID_e; - int id = fopScnM_LayerID(scn); - return fpcM_ChangeLayerID(i_process, id); +s32 fopMsgM_setStageLayer(void* i_process) { + scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); + JUT_ASSERT(93, stageProc != 0); + + return fpcM_ChangeLayerID(i_process, fopScnM_LayerID(stageProc)); } msg_class* fopMsgM_SearchByID(fpc_ProcID i_id) { - return (msg_class*)fpcEx_SearchByID(i_id); + return (msg_class*)fpcM_SearchByID(i_id); } fopMsg_prm_class* fopMsgM_GetAppend(void* i_msg) { @@ -28,8 +30,8 @@ void fopMsgM_Delete(void* i_this) { fpcM_Delete(i_this); } -static fopMsg_prm_class* createAppend(fopAc_ac_c* i_talkActor, cXyz* i_pos, u32* i_msgIdx, u32* param_3, - fpc_ProcID param_4) { +static fopMsg_prm_class* createAppend(fopAc_ac_c* i_talkActor, cXyz* i_pos, u32* i_msgIdx, + u32* param_3, fpc_ProcID param_4) { fopMsg_prm_class* append = (fopMsg_prm_class*)cMl::memalignB(-4, sizeof(fopMsg_prm_class)); if (append == NULL) { return NULL; @@ -40,10 +42,14 @@ static fopMsg_prm_class* createAppend(fopAc_ac_c* i_talkActor, cXyz* i_pos, u32* if (i_msgIdx != NULL) { append->msg_idx = *i_msgIdx; + } else { + i_msgIdx = NULL; } if (param_3 != NULL) { append->field_0x14 = *param_3; + } else { + param_3 = NULL; } if (i_pos != NULL) { @@ -81,29 +87,33 @@ static fopMsg_prm_timer* createTimerAppend(int i_mode, u32 i_limitMs, u8 i_type, return appen; } -fpc_ProcID fopMsgM_create(s16 i_procName, fopAc_ac_c* i_talkActor, cXyz* i_pos, u32* i_msgIdx, u32* param_4, - fopMsgCreateFunc createFunc) { - fopMsg_prm_class* append = createAppend(i_talkActor, i_pos, i_msgIdx, param_4, fpcM_ERROR_PROCESS_ID_e); +fpc_ProcID fopMsgM_create(s16 i_procName, fopAc_ac_c* i_talkActor, cXyz* i_pos, u32* i_msgIdx, + u32* param_4, FastCreateReqFunc i_createFunc) { + fopMsg_prm_class* append = + createAppend(i_talkActor, i_pos, i_msgIdx, param_4, fpcM_ERROR_PROCESS_ID_e); if (append == NULL) { return fpcM_ERROR_PROCESS_ID_e; } - return fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, (stdCreateFunc)createFunc, NULL, append); + return fpcM_Create(i_procName, i_createFunc, append); } -fpc_ProcID fop_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, u8 param_4, f32 param_5, - f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc i_createFunc) { - fopMsg_prm_timer* append = createTimerAppend(i_mode, i_limitMs, i_type, param_4, param_5, - param_6, param_7, param_8, fpcM_ERROR_PROCESS_ID_e); +fpc_ProcID fop_Timer_create(s16 i_procName, u8 i_mode, u32 i_limitMs, u8 i_type, u8 param_4, + f32 param_5, f32 param_6, f32 param_7, f32 param_8, + FastCreateReqFunc i_createFunc) { + fopMsg_prm_timer* append = + createTimerAppend(i_mode, i_limitMs, i_type, param_4, param_5, param_6, param_7, param_8, + fpcM_ERROR_PROCESS_ID_e); if (append == NULL) { return fpcM_ERROR_PROCESS_ID_e; } - return fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, (stdCreateFunc)i_createFunc, NULL, - append); + return fpcM_Create(i_procName, i_createFunc, append); } -static fpc_ProcID i_msgID = fpcM_ERROR_PROCESS_ID_e; +void dummySet() { + csXyz().set(0, 0, 0); +} fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_talkActor, u32 param_2) { if (dComIfGp_isHeapLockFlag() == 8) { @@ -115,7 +125,6 @@ fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_talkActor, u32 param_2 dComIfGp_isHeapLockFlag() != 1) { return fpcM_ERROR_PROCESS_ID_e; - } dComIfGp_clearMesgAnimeTagInfo(); @@ -156,9 +165,9 @@ fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, u32 param_1) { dComIfGp_isHeapLockFlag() != 1) { return fpcM_ERROR_PROCESS_ID_e; - } + fopAc_ac_c* actor = NULL; cXyz pos; pos.x = pos.y = pos.z = 0.0f; @@ -169,7 +178,7 @@ fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, u32 param_1) { msg->pos.set(pos); msg->msg_idx = i_msgIdx; msg->field_0xf0 = param_1; - msg->talk_actor = NULL; + msg->talk_actor = actor; msg->setTalkPartner(NULL); msg->setMessageIndex(i_msgIdx, param_1, false); return i_msgID; @@ -177,7 +186,7 @@ fpc_ProcID fopMsgM_messageSet(u32 i_msgIdx, u32 param_1) { msg->pos.set(pos); msg->msg_idx = i_msgIdx; msg->field_0xf0 = param_1; - msg->talk_actor = NULL; + msg->talk_actor = actor; return i_msgID; } } @@ -196,9 +205,10 @@ fpc_ProcID fopMsgM_messageSetDemo(u32 i_msgidx) { dComIfGp_isHeapLockFlag() != 1) { return fpcM_ERROR_PROCESS_ID_e; - } + fopAc_ac_c* NULL_ = NULL; + cXyz pos; pos.x = pos.y = pos.z = 0.0f; @@ -208,7 +218,7 @@ fpc_ProcID fopMsgM_messageSetDemo(u32 i_msgidx) { msg->pos.set(pos); msg->msg_idx = i_msgidx; msg->field_0xf0 = 1000; - msg->talk_actor = NULL; + msg->talk_actor = NULL_; msg->setMessageIndexDemo(i_msgidx, false); return i_msgID; } @@ -238,56 +248,67 @@ u8 fopMsgM_itemNumIdx(u8 i_no) { return itemicon[i_no] & 0xFF; } -void J2DPane::setAlpha(u8 alpha) { - mAlpha = alpha; -} - f32 dummy() { + J2DPane* dummyPlane = NULL; + dummyPlane->getAlpha(); + dummyPlane->getHeight(); + dummyPlane->getWidth(); + dummyPlane->setAlpha(0); + +#if !PLATFORM_GCN + J2DPicture* dummyPicture = NULL; + const char* str = NULL; + dummyPicture->append(str, 0.0f); + dummyPicture->setBlendRatio(0.0f, 0.0f); +#endif + return 0.5f; } -f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 i_type) { - if (param_0 <= 0) { +// Wii: NONMATCHING, float regalloc in case 3 +f32 fopMsgM_valueIncrease(int i_max, int i_value, u8 i_mode) { + if (i_max <= 0) { return 1.0f; } - if (param_1 < 0) { - param_1 = 0; - } else if (param_1 > param_0) { - param_1 = param_0; + if (i_value < 0) { + i_value = 0; + } else if (i_value > i_max) { + i_value = i_max; } - f32 var_f31 = (f32)param_1 / param_0; - f32 var_f30; + f32 v = (f32)i_value / i_max; + f32 ret; - switch (i_type) { + switch (i_mode) { case 0: - var_f30 = var_f31 * var_f31; + ret = v * v; break; case 1: - var_f30 = JMAFastSqrt(var_f31); + ret = JMAFastSqrt(v); break; case 2: default: - var_f30 = var_f31; + ret = v; break; case 3: - var_f30 = (2.0f * ((2.0f * var_f31) - 1.0f)) - 1.0f; + v = (2.0f * v) - 1.0f; + ret = (2.0f * v) - 1.0f; break; case 4: - var_f31 = cM_ssin(0.5f * ((f32)0x8000 * var_f31)); - var_f30 = var_f31 * var_f31; + v = cM_ssin((int)(0.5f * ((f32)0x8000 * v))); + ret = v * v; break; case 5: - var_f31 = cM_ssin(0.5f * ((f32)0xFFFF * var_f31)); - var_f30 = var_f31 * var_f31; + v = cM_ssin((int)(0.5f * ((f32)0xFFFF * v))); + ret = v * v; break; case 6: - var_f30 = cM_ssin((f32)0x8000 * var_f31); + ret = cM_ssin((int)((f32)0x8000 * v)); break; } - return var_f30; + return ret; } // Here to generate J2DPicture virtual inlines @@ -297,13 +318,46 @@ static void dummyVirtual(J2DPicture* picture, f32 param_1, f32 param_2, const ch } JKRExpHeap* fopMsgM_createExpHeap(u32 i_heapSize, JKRHeap* i_heap) { + JKRHeap* heap; if (i_heap == NULL) { - i_heap = mDoExt_getGameHeap(); + heap = mDoExt_getGameHeap(); + } else { + heap = i_heap; } + + JKRExpHeap* exp_heap = JKRCreateExpHeap(i_heapSize, heap, false); + +#if DEBUG + static int displayed = false; + if (exp_heap == NULL && !displayed) { + displayed = true; + int _; - return JKRExpHeap::create(i_heapSize, i_heap, false); + // Failed to allocate %f KB of ExpHeap Continuous free space = %f KB + // Remaining free space = %f + OS_REPORT("\x1b[43;30mfopMsgM_createMaxExpHeap : Expヒープ%fKの確保に失敗 連続空き容量=%fK " + "残り空き容量=%f\n\x1b[m", + i_heapSize / 1024.0f, heap->getFreeSize() / 1024.0f, + heap->getTotalFreeSize() / 1024.0f); + } +#endif + + return exp_heap; } void fopMsgM_destroyExpHeap(JKRExpHeap* i_heap) { +#if DEBUG + if (!i_heap->check()) { + // EXPHeap is corrupted %08x + OS_REPORT_ERROR("EXPヒープ破壊されている %08x\n", i_heap); + } else if (i_heap->isEmpty() == false) { + // EXPHeap has not been completely freed %08x %08x + OS_REPORT_ERROR("EXPヒープ全開放されていない %08x %08x\n", i_heap, + i_heap->getTotalUsedSize()); + i_heap->dump(); + i_heap->freeAll(); + } +#endif + i_heap->destroy(); } diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp index 557e9bda08..5cdaea666b 100644 --- a/src/f_op/f_op_overlap.cpp +++ b/src/f_op/f_op_overlap.cpp @@ -5,6 +5,7 @@ #include "f_op/f_op_overlap.h" #include "JSystem/JKernel/JKRExpHeap.h" +#include "d/d_error_msg.h" #include "f_pc/f_pc_manager.h" #include "m_Do/m_Do_ext.h" @@ -15,6 +16,9 @@ static s32 fopOvlp_Draw(void* i_this) { static s32 fopOvlp_Execute(void* i_this) { s32 ret = fpcMtd_Execute(&((overlap_task_class*)i_this)->submethod->base, i_this); +#if VERSION == VERSION_SHIELD || PLATFORM_WII + dConnectErrorMsg_c::disable(); +#endif return ret; } diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp index 97a0124b09..304a734577 100644 --- a/src/f_op/f_op_scene.cpp +++ b/src/f_op/f_op_scene.cpp @@ -19,7 +19,8 @@ static int fopScn_Execute(scene_class* i_this) { } static int fopScn_IsDelete(void* i_this) { - return fpcMtd_IsDelete((process_method_class*)static_cast(i_this)->submethod, i_this); + int ret = fpcMtd_IsDelete((process_method_class*)((scene_class*) i_this)->submethod, i_this); + return ret; } static int fopScn_Delete(void* i_this) { @@ -53,7 +54,7 @@ static int fopScn_Create(void* i_this) { } - ret = fpcMtd_Create((process_method_class*)scene->submethod, i_this); + ret = fpcMtd_Create((process_method_class*)scene->submethod, scene); return ret; } diff --git a/src/f_op/f_op_scene_iter.cpp b/src/f_op/f_op_scene_iter.cpp index 69b2d61616..a21919a74e 100644 --- a/src/f_op/f_op_scene_iter.cpp +++ b/src/f_op/f_op_scene_iter.cpp @@ -8,6 +8,7 @@ #include "SSystem/SComponent/c_tag_iter.h" #include "f_op/f_op_scene_tag.h" +// Wii: NONMATCHING, regalloc, scheduling void* fopScnIt_Judge(fop_ScnItFunc i_judgeFunc, void* i_data) { struct { fop_ScnItFunc func; diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp index d3136962ae..94aed7f3e8 100644 --- a/src/f_op/f_op_scene_req.cpp +++ b/src/f_op/f_op_scene_req.cpp @@ -18,6 +18,7 @@ static cPhs__Step fopScnRq_phase_ClearOverlap(scene_request_class* i_sceneReq) { rv = cPhs_INIT_e; } return rv; + UNUSED(i_sceneReq); } static cPhs__Step fopScnRq_phase_Execute(scene_request_class* i_sceneReq) { @@ -32,6 +33,7 @@ static cPhs__Step fopScnRq_phase_IsDoingOverlap(scene_request_class* i_sceneReq) rv = cPhs_INIT_e; } return rv; + UNUSED(i_sceneReq); } static cPhs__Step fopScnRq_phase_IsDoneOverlap(scene_request_class* i_sceneReq) { @@ -42,13 +44,16 @@ static cPhs__Step fopScnRq_phase_IsDoneOverlap(scene_request_class* i_sceneReq) rv = cPhs_INIT_e; } return rv; + UNUSED(i_sceneReq); } static BOOL l_fopScnRq_IsUsingOfOverlap; static cPhs__Step fopScnRq_phase_Done(scene_request_class* i_sceneReq) { + if (i_sceneReq->create_request.parameters != 1) { scene_class* scene = (scene_class*)fpcM_SearchByID(i_sceneReq->create_request.creating_id); + (void)scene; fopScnPause_Disable(scene); } @@ -56,16 +61,18 @@ static cPhs__Step fopScnRq_phase_Done(scene_request_class* i_sceneReq) { return cPhs_NEXT_e; } -static void fopScnRq_Execute(scene_request_class* i_sceneReq) { - int phase_state = cPhs_Do(&i_sceneReq->phase_request, i_sceneReq); +static cPhs__Step fopScnRq_Execute(scene_request_class* i_sceneReq) { + cPhs__Step phase_state = (cPhs__Step)cPhs_Do(&i_sceneReq->phase_request, i_sceneReq); switch (phase_state) { case cPhs_NEXT_e: - fopScnRq_Execute(i_sceneReq); + return fopScnRq_Execute(i_sceneReq); break; default: break; } + + return phase_state; } static int fopScnRq_PostMethod(void* i_scene, scene_request_class* i_sceneReq) { diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 228bc9f29f..2a0794cc35 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -717,11 +717,7 @@ JKRExpHeap* mDoExt_getHostIOHeap() { return HostIOHeap; } -#if DEBUG -extern u8 lbl_8074C3B9[1]; -#endif - -static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_alignment) { +JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_alignment) { if (i_heap == NULL) { i_heap = JKRGetCurrentHeap(); } @@ -729,7 +725,7 @@ static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_a JKRSolidHeap* createdHeap; if (i_size == 0 || i_size == -1) { #if DEBUG - if (lbl_8074C3B9[0] != 0) { + if (mDoExt::HeapAdjustVerbose != 0) { OS_REPORT("\x1b[44mmDoExt_createSolidHeap サイズ未設定\n\x1b[m"); OS_REPORT("最大空き容量確保します %08x\n\x1b[m", i_heap->getFreeSize()); } @@ -749,7 +745,7 @@ static JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_a if (createdHeap != NULL) { JKRSetErrorFlag(createdHeap, true); #if DEBUG - if (lbl_8074C3B9[0] != 0) { + if (mDoExt::HeapAdjustVerbose != 0) { u32 heapSize = createdHeap->getHeapSize(); OS_REPORT( "JKRCreateSolidHeap %08x i_size=%08x solidHeapSize=%08x\n", @@ -841,7 +837,7 @@ u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap) { u32 actualSize = i_heap->getHeapSize(); #if DEBUG - if (lbl_8074C3B9[0]) { + if (mDoExt::HeapAdjustVerbose) { // "\x1B[33mSolid heap estimate: %08x actual: %08x\n\x1B[m" OS_REPORT("\x1B[33mソリッドヒープの見積もり %08x 実際 %08x\n\x1B[m", estimatedSize, actualSize); @@ -857,7 +853,7 @@ u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap) { } } - if (lbl_8074C3B9[0]) { + if (mDoExt::HeapAdjustVerbose) { OS_REPORT("JKRSolidHeap::adjustSize %08x (%08x bytes)\n", (u32)i_heap, result); } #endif diff --git a/src/m_Do/m_Do_hostIO.cpp b/src/m_Do/m_Do_hostIO.cpp index 7ee6a3653b..286a942110 100644 --- a/src/m_Do/m_Do_hostIO.cpp +++ b/src/m_Do/m_Do_hostIO.cpp @@ -128,10 +128,6 @@ void mDoHIO_updateChild(s8 i_no) { mDoHIO_root.updateChild(i_no); } -void mDoHIO_update() { - mDoHIO_root.update(); -} - void mDoHIO_root_c::updateChild(s8 i_no) { mSub.updateChild(i_no); } From 59fa5deb808a615bbe297fdfc1101209a5eff39a Mon Sep 17 00:00:00 2001 From: Max Roncace Date: Fri, 2 Jan 2026 11:24:40 -0500 Subject: [PATCH 26/35] d_particle debug improvements (#3010) --- config/ShieldD/symbols.txt | 4 +- include/JSystem/JGeometry.h | 28 +-- include/JSystem/JParticle/JPAEmitter.h | 22 +- include/d/d_particle.h | 76 ++++--- include/d/dolzel_base.pch | 1 + include/m_Do/m_Do_mtx.h | 4 + src/d/d_particle.cpp | 287 ++++++++++++------------- 7 files changed, 209 insertions(+), 213 deletions(-) diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index f72be9f389..45a62b4b3b 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -64389,8 +64389,8 @@ lbl_8074C6EC = .sbss:0x8074C6EC; // type:object size:0x1 data:byte hash:0x0C373A mEcallback__18dPa_modelEcallBack = .sbss:0x8074C6F0; // type:object size:0x4 scope:global hash:0x5F2475C4 dhash:0x6907098D mPcallback__18dPa_modelEcallBack = .sbss:0x8074C6F4; // type:object size:0x4 scope:global hash:0x458FCFD1 dhash:0x25B18E98 mModel__18dPa_modelEcallBack = .sbss:0x8074C6F8; // type:object size:0x4 scope:global data:4byte hash:0x4E4B8FC7 dhash:0x39D6160E -lbl_8074C6FC = .sbss:0x8074C6FC; // type:object size:0x1 data:byte hash:0x45C69FFE dhash:0x7F773CF7 -lbl_8074C6FD = .sbss:0x8074C6FD; // type:object size:0x1 data:byte hash:0x52B0F54B dhash:0x3A8E0E82 +struct_80450E9C = .sbss:0x8074C6FC; // type:object size:0x1 data:byte hash:0x45C69FFE dhash:0x7F773CF7 +struct_80450E9D = .sbss:0x8074C6FD; // type:object size:0x1 data:byte hash:0x52B0F54B dhash:0x3A8E0E82 lbl_8074C6FE = .sbss:0x8074C6FE; // type:object size:0x1 data:byte hash:0x4FCC7570 dhash:0x6CDA0703 mEmitterMng__13dPa_control_c = .sbss:0x8074C700; // type:object size:0x4 scope:global data:4byte hash:0x6D91DA09 dhash:0x80BC120B mWaterBubblePcallBack__13dPa_control_c = .sbss:0x8074C704; // type:object size:0x4 scope:global hash:0x38091769 dhash:0x0789ADEB diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index f080c91f72..c90d3bdc81 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -119,9 +119,9 @@ struct TVec3 { } void set(s16 x_, s16 y_, s16 z_) { - x = x_; - y = y_; - z = z_; + x = (s16)x_; + y = (s16)y_; + z = (s16)z_; } }; @@ -175,17 +175,17 @@ inline void mulInternal(__REGISTER const f32* a, __REGISTER const f32* b, __REGI template <> struct TVec3 : public Vec { - inline TVec3(const Vec& i_vec) { + TVec3(const Vec& i_vec) { setTVec3f(&i_vec.x, &x); } - inline TVec3(const TVec3& i_vec) { + TVec3(const TVec3& i_vec) { setTVec3f(&i_vec.x, &x); } template TVec3(U x, U y, U z) { - set(x, y, z); + set((U)x, (U)y, (U)z); } TVec3() {} @@ -195,9 +195,9 @@ struct TVec3 : public Vec { template void set(const TVec3& other) { - x = other.x; - y = other.y; - z = other.z; + x = (U)other.x; + y = (U)other.y; + z = (U)other.z; } void set(const Vec& other) { @@ -208,9 +208,9 @@ struct TVec3 : public Vec { template void set(U x_, U y_, U z_) { - x = x_; - y = y_; - z = z_; + x = (U)x_; + y = (U)y_; + z = (U)z_; } inline void add(const TVec3& b) { @@ -359,9 +359,9 @@ struct TVec3 : public Vec { } void cross(const TVec3& a, const TVec3& b) { - VECCrossProduct(a, b, *this); + PSVECCrossProduct(&a, &b, this); } - + f32 setLength(f32 len) { f32 sq = squared(); if (sq <= TUtil::epsilon()) { diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index ebf82df33e..9ce16e8f22 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -79,8 +79,6 @@ public: virtual void executeAfter(JPABaseEmitter*) {} virtual void draw(JPABaseEmitter*) {} virtual void drawAfter(JPABaseEmitter*) {} - - //~JPAEmitterCallBack(); }; enum { @@ -160,34 +158,16 @@ public: mGlobalPScl.y = height; } void setGlobalParticleScale(const JGeometry::TVec3& scale) { - mGlobalPScl.set(scale.x, scale.y); + mGlobalPScl.set((f32)scale.x, (f32)scale.y); } void setGlobalParticleScale(f32 scaleX, f32 scaleY) { mGlobalPScl.set(scaleX, scaleY); } void getGlobalParticleScale(JGeometry::TVec3& scale) const { - //TODO: Possible fakematch. Debug and Wii indicate TVec3::set, but using it breaks regalloc - // in dPa_gen_b_light8PcallBack::draw on GCN (where the call to set would normally be - // inlined). -#if PLATFORM_GCN - scale.x = mGlobalPScl.x; - scale.y = mGlobalPScl.y; - scale.z = 1.0f; -#else scale.set(mGlobalPScl.x, mGlobalPScl.y, 1.0f); -#endif } void getGlobalParticleScale(JGeometry::TVec3* scale) const { - //TODO: Possible fakematch. Debug and Wii indicate TVec3::set, but using it breaks regalloc - // in dPa_gen_b_light8PcallBack::draw on GCN (where the call to set would normally be - // inlined). -#if PLATFORM_GCN - scale->x = mGlobalPScl.x; - scale->y = mGlobalPScl.y; - scale->z = 1.0f; -#else scale->set(mGlobalPScl.x, mGlobalPScl.y, 1.0f); -#endif } void setGlobalScale(const JGeometry::TVec3& scale) { mGlobalScl.set(scale); diff --git a/include/d/d_particle.h b/include/d/d_particle.h index dd90e5735a..a57a6918b7 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -18,7 +18,7 @@ class JKRSolidHeap; class dKy_tevstr_c; class fopAc_ac_c; -class dPa_levelEcallBack : public JPAEmitterCallBack { +class dPa_levelEcallBack : public JPAEmitterCallBack { public: virtual ~dPa_levelEcallBack() { cleanup(); } virtual void setup(JPABaseEmitter*, const cXyz*, const csXyz*, s8) = 0; @@ -55,18 +55,17 @@ public: /* 0x10 */ dPa_simpleData_c* mData; }; // Size: 0x14 -class dPa_modelPcallBack : public JPAParticleCallBack { -public: - virtual ~dPa_modelPcallBack() {} - virtual void draw(JPABaseEmitter*, JPABaseParticle*); -}; - class dPa_windPcallBack : public JPAParticleCallBack { public: virtual ~dPa_windPcallBack() {} virtual void execute(JPABaseEmitter*, JPABaseParticle*); }; +class dPa_modelPcallBack : public JPAParticleCallBack { +public: + virtual void draw(JPABaseEmitter*, JPABaseParticle*); +}; + class dPa_modelEcallBack : public dPa_levelEcallBack { public: struct model_c { @@ -127,7 +126,9 @@ public: class dPa_selectTexEcallBack : public dPa_levelEcallBack { public: - dPa_selectTexEcallBack(u8 param_0) { field_0x4 = param_0; } + dPa_selectTexEcallBack(u8 param_0) { + field_0x4 = (u8)param_0; + } virtual ~dPa_selectTexEcallBack() {} virtual void draw(JPABaseEmitter*); @@ -136,6 +137,20 @@ public: /* 0x4 */ u8 field_0x4; }; +class dPa_setColorEcallBack : public dPa_levelEcallBack { +public: + dPa_setColorEcallBack(const GXColor& color) { mColor = color; } + + virtual ~dPa_setColorEcallBack() {} + virtual void draw(JPABaseEmitter* i_emitter) { + UNUSED(i_emitter); + GXSetTevColor(GX_TEVREG1, mColor); + } + virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {} + + /* 0x4 */ GXColor mColor; +}; + class dPa_followEcallBack : public dPa_levelEcallBack { public: dPa_followEcallBack(u8 param_0 = 0, u8 param_1 = 0); @@ -149,7 +164,7 @@ public: void remove() { end(); } JPABaseEmitter* getEmitter() { return mpEmitter; } - bool isEnd() { + int isEnd() { return field_0x10 & 1; } @@ -171,25 +186,32 @@ public: class dPa_light8EcallBack : public dPa_levelEcallBack { public: - virtual ~dPa_light8EcallBack() {} virtual void draw(JPABaseEmitter*); - virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); } + virtual void drawAfter(JPABaseEmitter* i_emitter) { + UNUSED(i_emitter); + dPa_cleanupGX(); + } virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8); }; class dPa_gen_b_light8EcallBack : public dPa_levelEcallBack { public: - virtual ~dPa_gen_b_light8EcallBack() {} virtual void draw(JPABaseEmitter*); - virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); } + virtual void drawAfter(JPABaseEmitter* i_emitter) { + UNUSED(i_emitter); + dPa_cleanupGX(); + } virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8); }; class dPa_gen_d_light8EcallBack : public dPa_levelEcallBack { public: - virtual ~dPa_gen_d_light8EcallBack() {} virtual void draw(JPABaseEmitter*); - virtual void drawAfter(JPABaseEmitter*) { dPa_cleanupGX(); } + virtual void drawAfter(JPABaseEmitter* i_emitter) { + UNUSED(i_emitter); + dPa_cleanupGX(); + } + virtual void execute(JPABaseEmitter*); virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8); }; @@ -247,17 +269,6 @@ private: /* 0x14 */ cXyz const* field_0x14; }; -class dPa_setColorEcallBack : public dPa_levelEcallBack { -public: - dPa_setColorEcallBack(const GXColor& color) { mColor = color; } - - virtual ~dPa_setColorEcallBack() {} - virtual void draw(JPABaseEmitter*) { GXSetTevColor(GX_TEVREG1, mColor); } - virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8) {} - - /* 0x4 */ GXColor mColor; -}; - class dPa_simpleData_c { public: ~dPa_simpleData_c(); @@ -295,10 +306,10 @@ public: void onEventMove() { mStatus |= 2; } void offEventMove() { mStatus &= ~2; } #endif - bool isEventMove() { return mStatus & 2; } + BOOL isEventMove() { return mStatus & 2; } void offActive() { mStatus &= (u8)~1; } - bool isActive() { return mStatus & 1; } + BOOL isActive() { return mStatus & 1; } u16 getNameId() { return mNameId; } dPa_levelEcallBack* getCallback() { return mCallback; } @@ -434,7 +445,7 @@ public: } static JPAEmitterManager* getEmitterManager() { return mEmitterMng; } - static int getEmitterNum() { return mEmitterMng->getEmitterNumber(); }; + int getEmitterNum() { return mEmitterMng->getEmitterNumber(); }; static dPa_light8PcallBack* getLight8PcallBack() { return &mLight8PcallBack; @@ -498,10 +509,11 @@ private: /* 0x019 */ u8 field_0x19; /* 0x01A */ u8 field_0x1a; /* 0x01B */ u8 field_0x1b; +#if DEBUG + /* 0x01C */ dPa_simpleEcallBack field_0x1c[48]; +#else /* 0x01C */ dPa_simpleEcallBack field_0x1c[25]; - #if DEBUG - u8 unk_0x210[0x1CC]; - #endif +#endif /* 0x210 */ level_c field_0x210; #if DEBUG u8 mSceneCount; diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index 0c900c21a1..46c707b504 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -30,6 +30,7 @@ #include "JSystem/J2DGraph/J2DPictureEx.h" // IWYU pragma: export #include "JSystem/J2DGraph/J2DScreen.h" // IWYU pragma: export #include "JSystem/J2DGraph/J2DTextBoxEx.h" // IWYU pragma: export +#include "JSystem/JParticle/JPAEmitter.h" // IWYU pragma: export #include "JSystem/JUtility/JUTFont.h" // IWYU pragma: export #include "JSystem/JUtility/JUTReport.h" // IWYU pragma: export diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index a85f7e9b4f..793416ca4e 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -146,6 +146,10 @@ inline void mDoMtx_quat(Mtx m, const Quaternion* q) { MTXQuat(m, q); } +inline void cMtx_identity(Mtx mtx) { + mDoMtx_identity(mtx); +} + inline void cMtx_inverse(const Mtx a, Mtx b) { mDoMtx_inverse(a, b); } diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index f4c164ef29..a955d202fe 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -26,7 +26,7 @@ #include "SSystem/SComponent/c_math.h" #if DEBUG -#pragma nosyminline on +//#pragma nosyminline on #endif extern dPa_particleTracePcallBack_c JPTracePCB4; @@ -54,12 +54,6 @@ void dPa_cleanupGX() { GXSetNumChans(0); } -static GXColor l_lifeBallColor[3] = { - {0xEB, 0x20, 0x78, 0xFF}, - {0x20, 0xF1, 0x9B, 0xFF}, - {0xEB, 0xD7, 0x2F, 0xFF}, -}; - dPa_followEcallBack::dPa_followEcallBack(u8 param_0, u8 param_1) { field_0x11 = param_0; field_0x12 = param_1; @@ -71,15 +65,7 @@ void dPa_followEcallBack::execute(JPABaseEmitter* i_emitter) { if ((field_0x12 == 0) && ((field_0x10 & 2) == 0)) { i_emitter->setGlobalTranslation(field_0x8->x, field_0x8->y, field_0x8->z); if (field_0xc != NULL) { - // LIKELY FAKEMATCH - #if DEBUG JGeometry::TVec3 aTStack_24(field_0xc->x, field_0xc->y, field_0xc->z); - #else - JGeometry::TVec3 aTStack_24; - aTStack_24.x = field_0xc->x; - aTStack_24.y = field_0xc->y; - aTStack_24.z = field_0xc->z; - #endif i_emitter->setGlobalRotation(aTStack_24); } } @@ -94,7 +80,10 @@ void dPa_followEcallBack::execute(JPABaseEmitter* i_emitter) { } } -void dPa_followEcallBack::draw(JPABaseEmitter* i_emitter) {} +void dPa_followEcallBack::draw(JPABaseEmitter* i_emitter) { + if (i_emitter->getGroupID() == 3) { + } +} void dPa_followEcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1, csXyz const* param_2, s8) { @@ -143,22 +132,29 @@ static u8 struct_80450E9C; static u8 struct_80450E9D; void dPa_light8EcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1, csXyz const* param_2, s8 param_3) { + UNUSED(param_1); + UNUSED(param_2); + UNUSED(param_3); i_emitter->setDrawTimes(2); i_emitter->setParticleCallBackPtr(dPa_control_c::getLight8PcallBack()); } void dPa_gen_b_light8EcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1, csXyz const* param_2, s8 param_3) { - u32 userWork = param_3; + UNUSED(param_1); + UNUSED(param_2); + UNUSED(param_3); i_emitter->setDrawTimes(2); i_emitter->setParticleCallBackPtr(dPa_control_c::getGen_b_Light8PcallBack()); - i_emitter->setUserWork((s8)userWork); + i_emitter->setUserWork(param_3); } void dPa_gen_d_light8EcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1, csXyz const* param_2, s8 param_3) { - u32 userWork = param_3; + UNUSED(param_1); + UNUSED(param_2); + UNUSED(param_3); i_emitter->setDrawTimes(2); i_emitter->setParticleCallBackPtr(dPa_control_c::getGen_d_Light8PcallBack()); - i_emitter->setUserWork((s8)userWork); + i_emitter->setUserWork(param_3); } static void dPa_group_id_change(u32* param_0, u8* param_1) { @@ -217,18 +213,18 @@ static void initiateLighting8(_GXColor& param_0, s16 param_1) { GXSetChanCtrl(GX_ALPHA0, false, GX_SRC_REG, GX_SRC_VTX, 0xfe, GX_DF_CLAMP, GX_AF_SPOT); s32 r,g,b; GXColor color0; - color0.r = r = (param_1 & 0x1F) << 1; - color0.g = g = ((param_1 >> 5) & 0x1F) << 1; - color0.b = b = ((param_1 >> 10) & 0x1F) << 1; + color0.r = (param_1 & 0x1F) << 1; + color0.g = ((param_1 >> 5) & 0x1F) << 1; + color0.b = ((param_1 >> 10) & 0x1F) << 1; if (daPy_py_c::checkNowWolfPowerUp()) { f32 fVar1 = (g_env_light.bg_amb_col[0].r / 255.0f); - color0.r = (r + 0x10) * (4.0f * (fVar1)); + color0.r = (((param_1 & 0x1F) << 1) + 0x10) * (4.0f * (fVar1)); fVar1 = (g_env_light.bg_amb_col[0].g / 255.0f); - color0.g = (g + 0x10) * (4.0f * (fVar1)); + color0.g = ((((param_1 >> 5) & 0x1F) << 1) + 0x10) * (4.0f * (fVar1)); fVar1 = (g_env_light.bg_amb_col[0].b / 255.0f); - color0.b = (b + 0x10) * (4.0f * (fVar1)); + color0.b = ((((param_1 >> 10) & 0x1F) << 1) + 0x10) * (4.0f * (fVar1)); } if (color0.r == 0x3e) { @@ -259,13 +255,21 @@ static void drawFirst(JPABaseEmitter* i_emitter) { } static void drawFirst_l8(JPABaseEmitter* i_emitter) { + UNUSED(i_emitter); GXSetColorUpdate(false); } +static void dummy2() { + // fixes weak function order for debug + GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x3c); +} + static void drawSecond_light8(JPABaseEmitter* i_emitter) { GXColor globalPrmColor; i_emitter->getGlobalPrmColor(&globalPrmColor); - s16 sVar3 = (s16)((s16)globalPrmColor.r << 8) + (s16)globalPrmColor.g; + s16 sVar3 = globalPrmColor.r; + sVar3 <<= 8; + sVar3 = sVar3 + globalPrmColor.g; dScnKy_env_light_c* envLight = dKy_getEnvlight(); dKy_setLight_nowroom_grass(dComIfGp_roomControl_getStayNo(), 0.0f); GXSetColorUpdate(1); @@ -296,6 +300,7 @@ static void drawSecond_light8(JPABaseEmitter* i_emitter) { } static void drawSecond_b_light8(JPABaseEmitter* i_emitter) { + UNUSED(i_emitter); dScnKy_env_light_c* envLight = dKy_getEnvlight(); dKy_setLight_nowroom(dComIfGp_roomControl_getStayNo()); GXSetColorUpdate(true); @@ -416,18 +421,16 @@ void dPa_gen_d_light8EcallBack::draw(JPABaseEmitter* i_emitter) { } static void dPa_setWindPower(JPABaseParticle* param_0) { - f32 local_58; - JGeometry::TVec3 aTStack_18; - JGeometry::TVec3 aTStack_24; - JGeometry::TVec3 aTStack_30; - cXyz cStack_3c; - param_0->getOffsetPosition(&aTStack_24); - dKyw_get_AllWind_vec((cXyz*)&aTStack_24, &cStack_3c, &local_58); - cStack_3c.y = 0.65f; - JGeometry::TVec3 aTStack_48; - JGeometry::setTVec3f(cStack_3c * (9.0f * local_58), *(Vec*)&aTStack_48); - aTStack_24 += aTStack_48; - param_0->setOffsetPosition(aTStack_24); + f32 sp08; + JGeometry::TVec3 sp48; + JGeometry::TVec3 sp3C; + JGeometry::TVec3 sp30; + cXyz sp24; + param_0->getOffsetPosition(&sp3C); + dKyw_get_AllWind_vec((cXyz*)&sp3C, &sp24, &sp08); + sp24.y = 0.65f; + sp3C += JGeometry::TVec3(sp24 * (9.0f * sp08)); + param_0->setOffsetPosition(sp3C); } void dPa_modelPcallBack::draw(JPABaseEmitter* i_emitter, JPABaseParticle* param_1) { @@ -609,10 +612,9 @@ void dPa_modelEcallBack::draw(JPABaseEmitter* i_emitter) { void dPa_modelEcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1, csXyz const* param_2, s8 param_3) { i_emitter->setEmitterCallBackPtr(NULL); if (mModel != NULL) { - int sVar1 = struct_80450E9C; - for (int i = 0; i < sVar1; i++) { - int x = struct_80450E9D / sVar1; - struct_80450E9D -= (x) * sVar1; + int sVar1;// = struct_80450E9C; + for (int var_r30 = 0; var_r30 < struct_80450E9C; var_r30++) { + struct_80450E9D %= struct_80450E9C; if (mModel[struct_80450E9D].getModelData() == NULL) { i_emitter->setUserWork(struct_80450E9D++); i_emitter->setParticleCallBackPtr(&mPcallback); @@ -725,7 +727,7 @@ void dPa_simpleEcallBack::executeAfter(JPABaseEmitter* i_emitter) { i_emitter->playCreateParticle(); for (; field_0xc != 0; field_0xc--) { Vec local_3c; - if ((int)mDoLib_clipper::clip(j3dSys.getViewMtx(), *(Vec*)pData, 200.0f) == 0) { + if ((int)mDoLib_clipper::clip(j3dSys.getViewMtx(), pData->field_0x00, 200.0f) == 0) { JGeometry::TVec3 aTStack_30; i_emitter->getLocalTranslation(&aTStack_30); i_emitter->setGlobalTranslation(pData->field_0x00.x, pData->field_0x00.y + aTStack_30.y, pData->field_0x00.z); @@ -733,9 +735,10 @@ void dPa_simpleEcallBack::executeAfter(JPABaseEmitter* i_emitter) { i_emitter->setGlobalAlpha(pData->field_0x0c.a); i_emitter->setGlobalEnvColor(pData->field_0x10.r, pData->field_0x10.g, pData->field_0x10.b); for (int i = 0; i < currentCreateNumber; i++) { - JPABaseParticle* particle = (JPABaseParticle*)i_emitter->createParticle(); - if (particle == NULL) + JPABaseParticle* particle; + if ((particle = (JPABaseParticle*)i_emitter->createParticle()) == NULL) { break; + } particle->setOffsetPosition(pData->field_0x00.x, pData->field_0x00.y + aTStack_30.y, pData->field_0x00.z); } } @@ -747,7 +750,10 @@ void dPa_simpleEcallBack::executeAfter(JPABaseEmitter* i_emitter) { } void dPa_simpleEcallBack::draw(JPABaseEmitter* i_emitter) { - /* empty function */ + if (i_emitter->getGroupID() != 3 && i_emitter->getGroupID() != 11) { + if (i_emitter->getGroupID() == 13) { + } + } } JPABaseEmitter* dPa_simpleEcallBack::create(JPAEmitterManager* param_0, u16 id, u8 param_2) { @@ -792,7 +798,8 @@ JPABaseEmitter* dPa_simpleEcallBack::createEmitter(JPAEmitterManager* param_0) { } u32 dPa_simpleEcallBack::set(cXyz const* i_pos, dKy_tevstr_c const* param_2, u8 param_3, - _GXColor const& param_4, _GXColor const& param_5, int param_6, f32 param_7) { + _GXColor const& param_4, _GXColor const& param_5, int param_6, + f32 param_7) { f32 fVar1; f32 dVar7 = param_7; if (param_2 != NULL && param_2->Material_use_fg != 124) { @@ -800,6 +807,8 @@ u32 dPa_simpleEcallBack::set(cXyz const* i_pos, dKy_tevstr_c const* param_2, u8 return 0; } + // FAKEMATCH: Debug indicates this temporary is fake and mData is used directly, but doing this + // causes an r3/r4 regswap on GCN retail dPa_simpleData_c* pData = mData; if (pData == NULL || field_0xc >= field_0xe) { if (pData == NULL) { @@ -1004,10 +1013,13 @@ dPa_control_c::level_c::emitter_c* dPa_control_c::level_c::get(u32 id) { return NULL; } - for (emitter_c* emitter = mTable[id & 0xFF]; emitter != NULL; emitter = emitter->getNext()) { + u8 idx = id; + emitter_c* emitter = mTable[idx]; + while (emitter != NULL) { if (id == emitter->getId()) { return emitter; } + emitter = emitter->getNext(); } return NULL; @@ -1046,10 +1058,7 @@ u32 dPa_control_c::level_c::entry(u16 i_name, JPABaseEmitter* i_emitter, dPa_lev for (int i = 0; i < EMITTER_MAX; i++) { if (mEmitter[mFreeNo].getId() == 0) { - u32 uvar1 = field_0x0 + 1; - field_0x0 = uvar1; - - if (uvar1 == 0) { + if ((field_0x0 = field_0x0 + 1) == 0) { field_0x0++; } @@ -1091,7 +1100,8 @@ void dPa_control_c::level_c::cutTable(dPa_control_c::level_c::emitter_c* i_emitt emitter_c* next = i_emitter->getNext(); if (pre == NULL) { - mTable[i_emitter->getId() & 0xFF] = next; + u8 id = i_emitter->getId(); + mTable[id] = next; } else { pre->setNext(next); } @@ -1114,6 +1124,12 @@ dPa_selectTexEcallBack dPa_control_c::mTsubo[] = { dPa_selectTexEcallBack(7), }; +static GXColor l_lifeBallColor[3] = { + {0xEB, 0x20, 0x78, 0xFF}, + {0x20, 0xF1, 0x9B, 0xFF}, + {0xEB, 0xD7, 0x2F, 0xFF}, +}; + dPa_setColorEcallBack dPa_control_c::mLifeBall[3] = { dPa_setColorEcallBack(l_lifeBallColor[0]), dPa_setColorEcallBack(l_lifeBallColor[1]), @@ -1145,7 +1161,12 @@ Mtx dPa_control_c::mWindViewMatrix; dPa_particleTracePcallBack_c dPa_control_c::mParticleTracePCB; dPa_control_c::dPa_control_c() { - m_resHeap = JKRCreateExpHeap(0x96000, mDoExt_getArchiveHeap(), false); +#if DEBUG + size_t heapSize = 0x1f0800; +#else + size_t heapSize = 0x96000; +#endif + m_resHeap = JKRCreateExpHeap(heapSize, mDoExt_getArchiveHeap(), false); JUT_ASSERT(2426, m_resHeap != NULL); mHeap = NULL; mSceneHeap = NULL; @@ -1156,15 +1177,23 @@ dPa_control_c::dPa_control_c() { mSceneResMng = NULL; m_sceneRes = NULL; - MTXIdentity(mWindViewMatrix); + cMtx_identity(mWindViewMatrix); + +#if DEBUG + mSceneCount = 0; +#endif } u8 dPa_control_c::getRM_ID(u16 param_0) { - return (param_0 >> 15) & 1; + return (param_0 & 0x8000) == 0 ? FALSE : TRUE; } void dPa_control_c::createCommon(void const* param_0) { - OS_REPORT("常駐パーティクルリソースサイズ<%d>\n", mHeap->getSize((void*)param_0)); +#if DEBUG + s32 heapSize = m_resHeap->getSize((void*)param_0); + // "Resident particle resource size" + OS_REPORT("常駐パーティクルリソースサイズ<%d>\n", heapSize); +#endif mHeap = mDoExt_createSolidHeapFromSystem(0, 0); JUT_ASSERT(2518, mHeap != NULL); mCommonResMng = new (mHeap, 0) JPAResourceManager(param_0, mHeap); @@ -1235,7 +1264,11 @@ void dPa_control_c::createScene(void const* param_0) { } if (param_0 != NULL) { m_sceneRes = (void*)param_0; - OS_REPORT("シーン依存パーティクルリソースサイズ<%d>\n", m_resHeap->getSize(m_sceneRes)); +#if DEBUG + s32 resHeapSize = m_resHeap->getSize(m_sceneRes); + // "Scene-dependent particle resource size" + OS_REPORT("シーン依存パーティクルリソースサイズ<%d>\n", resHeapSize); +#endif } if (m_sceneRes != NULL) { createRoomScene(); @@ -1255,7 +1288,7 @@ bool dPa_control_c::removeRoomScene(bool param_0) { field_0x19 = field_0x1a; if (param_0) { JUT_ASSERT(2710, !(--mSceneCount)); - JKRHeap::free(m_sceneRes, NULL); + JKRFree(m_sceneRes); m_sceneRes = NULL; field_0x18 = 0xff; } @@ -1328,7 +1361,8 @@ void dPa_control_c::draw(JPADrawInfo* param_0, u8 param_1) { } } -void dPa_control_c::setHitMark(u16 param_1, fopAc_ac_c* param_2, cXyz const* param_3, csXyz const* param_4, cXyz const* param_5, u32 param_6) { +void dPa_control_c::setHitMark(u16 param_1, fopAc_ac_c* param_2, cXyz const* param_3, + csXyz const* param_4, cXyz const* param_5, u32 param_6) { cXyz const* pPos = param_3; csXyz const* pAngle = param_4; cXyz cStack_34; @@ -1340,8 +1374,8 @@ void dPa_control_c::setHitMark(u16 param_1, fopAc_ac_c* param_2, cXyz const* par fopAcM_OnStatus(param_2, 0x40000000); if (fopAcM_GetJntCol(param_2) != NULL) { - dJntCol_c* jntCol = fopAcM_GetJntCol(param_2); - if (jntCol->getHitmarkPosAndAngle(pPos, pAngle, &cStack_34, &cStack_78, param_1 == 6) >= 0) { + if (fopAcM_GetJntCol(param_2)->getHitmarkPosAndAngle(param_3, param_4, &cStack_34, + &cStack_78, param_1 == 6) >= 0) { pPos = &cStack_34; pAngle = &cStack_78; } @@ -1428,18 +1462,13 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos, } u32 local_ac = local_a8->getResUserWork(param_1); + f32 var_f31 = param_12; if (param_3 != NULL && param_3->Material_use_fg != 0x7c) { return NULL; } dPa_group_id_change(&local_ac, ¶m_0); - // FAKEMATCH - #if DEBUG JGeometry::TVec3 aTStack_78(i_pos->x, i_pos->y, i_pos->z); - #else - JGeometry::TVec3 aTStack_78; - aTStack_78.set(i_pos->x, i_pos->y, i_pos->z); - #endif JPABaseEmitter* this_00 = mEmitterMng->createSimpleEmitterID( aTStack_78, param_1, param_0, local_e0, NULL, NULL @@ -1457,26 +1486,12 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos, } if (i_rotation != NULL) { - #if DEBUG JGeometry::TVec3 aTStack_a4(i_rotation->x, i_rotation->y, i_rotation->z); - #else - JGeometry::TVec3 aTStack_a4; - aTStack_a4.x = i_rotation->x; - aTStack_a4.y = i_rotation->y; - aTStack_a4.z = i_rotation->z; - #endif this_00->setGlobalRotation(aTStack_a4); } if (i_scale != NULL) { - #if DEBUG JGeometry::TVec3 aTStack_84(i_scale->x, i_scale->y, i_scale->z); - #else - JGeometry::TVec3 aTStack_84; - aTStack_84.x = i_scale->x; - aTStack_84.y = i_scale->y; - aTStack_84.z = i_scale->z; - #endif this_00->setGlobalScale(aTStack_84); } @@ -1515,7 +1530,7 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos, } } else { if ((local_ac & 0xef0000) >> 0x10 < 100) { - param_12 = ((local_ac & 0xef0000) >> 0x10) / 99.0f; + var_f31 = ((local_ac & 0xef0000) >> 0x10) / 99.0f; } if ((local_ac & 0x20) != 0) { @@ -1532,7 +1547,7 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos, } dKy_ParticleColor_get_actor((cXyz*)i_pos, (dKy_tevstr_c*)param_3, &local_b0, - &local_b4, &local_b8, &local_bc, param_12); + &local_b4, &local_b8, &local_bc, var_f31); this_00->setGlobalEnvColor(local_b0.r, local_b0.g, local_b0.b); this_00->setGlobalPrmColor(local_b4.r, local_b4.g, local_b4.b); } else if ((local_ac & 0x40) != 0) { @@ -1550,10 +1565,11 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos, } dKy_ParticleColor_get_bg((cXyz*)i_pos, (dKy_tevstr_c*)param_3, &local_c0, - &local_c4, &local_c8, &local_cc, param_12); - param_12 = g_env_light.bg_light_influence + (1.0f - g_env_light.bg_light_influence) * param_12; - local_c0 = dKy_light_influence_col(&local_c0, param_12); - local_c4 = dKy_light_influence_col(&local_c4, param_12); + &local_c4, &local_c8, &local_cc, var_f31); + f32 var_f30 = g_env_light.bg_light_influence + + (1.0f - g_env_light.bg_light_influence) * var_f31; + local_c0 = dKy_light_influence_col(&local_c0, var_f30); + local_c4 = dKy_light_influence_col(&local_c4, var_f30); this_00->setGlobalEnvColor(local_c0.r, local_c0.g, local_c0.b); this_00->setGlobalPrmColor(local_c4.r, local_c4.g, local_c4.b); } else { @@ -1568,12 +1584,7 @@ JPABaseEmitter* dPa_control_c::set(u8 param_0, u16 param_1, cXyz const* i_pos, } if (param_11 != NULL) { - #if DEBUG JGeometry::TVec3 aTStack_9c(param_11->x, param_11->y, param_11->z); - #else - JGeometry::TVec3 aTStack_9c; - aTStack_9c.set(param_11->x, param_11->y, param_11->z); - #endif this_00->setGlobalParticleScale(aTStack_9c); } return this_00; @@ -1618,21 +1629,19 @@ JPABaseEmitter* dPa_control_c::setPoly(u16 param_0, cBgS_PolyInfo& param_1, cXyz param_7, param_8, &a_Stack_10, &a_Stack_14, param_9, local_c); } +void dummy3() { + ((dPa_control_c*)NULL)->levelExecute(0); +} + bool dPa_control_c::newSimple(u16 param_0, u8 param_1, u32* param_2) { - if ( - #if DEBUG - field_0x19 >= 0x30 - #else - field_0x19 >= 0x19 - #endif - ) { + if (field_0x19 >= ARRAY_SIZE(field_0x1c)) { OSReport("\x1B[43;30m１エミッター登録数オーバー！！\n"); return false; } JPABaseEmitter* emitter = field_0x1c[field_0x19].create(mEmitterMng, param_0, param_1); if (emitter == NULL) { - return false;; + return false; } field_0x19++; return true; @@ -1652,10 +1661,11 @@ u32 dPa_control_c::setSimple(u16 param_0, cXyz const* i_pos, dKy_tevstr_c const* dPa_simpleEcallBack* dPa_control_c::getSimple(u16 param_0) { dPa_simpleEcallBack* arr = field_0x1c; - for (int i = 0; i < field_0x19; i++, arr++) { + for (int i = 0; i < field_0x19; i++) { if (param_0 == arr->getID()) { return arr; } + arr++; } return NULL; @@ -1697,11 +1707,9 @@ static void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1, } dKy_ParticleColor_get_bg((cXyz*)param_4, (dKy_tevstr_c*)param_2, &local_70, &local_74, &local_78, &local_7c, fVar1); - fVar1 = g_env_light.bg_light_influence + (1.0f - g_env_light.bg_light_influence) * fVar1; - local_70 = dKy_light_influence_col(&local_70, fVar1); - //_GXColor::operator_ = (&local_70, (_GXColor*)&local_80); - local_74 = dKy_light_influence_col(&local_74, fVar1); - //_GXColor::operator_ = (&local_74, (_GXColor*)&local_84); + f32 var_f30 = g_env_light.bg_light_influence + (1.0f - g_env_light.bg_light_influence) * fVar1; + local_70 = dKy_light_influence_col(&local_70, var_f30); + local_74 = dKy_light_influence_col(&local_74, var_f30); param_1->setGlobalEnvColor(local_70.r, local_70.g, local_70.b); param_1->setGlobalPrmColor(local_74.r, local_74.g, local_74.b); } @@ -1723,11 +1731,8 @@ u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* pos, if (this_00->getCallback() == 0) { pJVar4->setGlobalTranslation(pos->x, pos->y, pos->z); if (i_rotation != NULL) { - JGeometry::TVec3 aTStack_64; - aTStack_64.x = i_rotation->x; - aTStack_64.y = i_rotation->y; - aTStack_64.z = i_rotation->z; - pJVar4->setGlobalRotation(aTStack_64); + JGeometry::TVec3 rot(i_rotation->x, i_rotation->y, i_rotation->z); + pJVar4->setGlobalRotation(rot); } } if (pJVar4->checkStatus(JPAEmtrStts_StopEmit)) { @@ -1800,7 +1805,7 @@ u32 dPa_control_c::setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param {ID_ZI_J_DASHSMOKE_A, ID_ZI_J_DOWNSMOKE_A}, {ID_ZI_J_DASHKUSA_A, ID_ZI_J_DOWNKUSA_A}, {ID_ZI_J_DASHWTRA_A, ID_ZI_J_DOWNWTRA_A}, {dPa_RM(ID_ZI_S_DASHSAND_A), dPa_RM(ID_ZI_S_DOWNSAND_A)}, {dPa_RM(ID_ZI_S_DASHSNOW_A), dPa_RM(ID_ZI_S_DOWNSNOW_A)}, {dPa_RM(ID_ZI_S_DASHSMOKE_INWTR_A), dPa_RM(ID_ZI_S_DOWNSMOKE_INWTR_A)}, }; - u32 rv = setNormal(param_0, effectIDTable[effType][param_5], + param_0 = setNormal(param_0, effectIDTable[effType][param_5], param_3, param_4, param_6, param_7, local_50, param_8, param_9, &a_Stack_48, &a_Stack_4c, param_10, local_44); u8 effType2 = dKy_pol_efftype2_get(¶m_2); @@ -1812,13 +1817,24 @@ u32 dPa_control_c::setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param param_3, param_4, param_6, param_7, local_50, param_8, param_9, &a_Stack_48, &a_Stack_4c, param_10, local_44); } - return rv; + return param_0; } u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz const* param_2, cXyz const* param_3, dKy_tevstr_c const* param_4, u32 param_5, u32 param_6, csXyz const* param_7, cXyz const* param_8, s8 param_9) { + static u16 ringID[6][4] = { + {ID_ZI_J_DOWNSMOKE_A, 0xFFFF, 0xFFFF, 0xFFFF}, {ID_ZI_J_DOWNKUSA_A, 0xFFFF, 0xFFFF, 0xFFFF}, + {ID_ZI_J_DASHWTRA_A, ID_ZI_J_DASHWTRA_B, ID_ZI_J_DASHWTRA_C, 0xFFFF}, {dPa_RM(ID_ZI_S_DOWNSAND_A), 0xFFFF, 0xFFFF, 0xFFFF}, + {dPa_RM(ID_ZI_S_DOWNSNOW_A), dPa_RM(ID_ZI_S_DOWNSNOW_B), 0xFFFF, 0xFFFF}, {dPa_RM(ID_ZI_S_DOWNSMOKE_INWTR_A), 0xFFFF, 0xFFFF, 0xFFFF}, + }; + static u16 normalID[6][4] = { + {ID_ZI_J_DASHSMOKE_A, 0xFFFF, 0xFFFF, 0xFFFF}, {ID_ZI_J_DASHKUSA_A, 0xFFFF, 0xFFFF, 0xFFFF}, + {ID_ZI_J_DOWNWTRA_A, ID_ZI_J_DOWNWTRA_B, ID_ZI_J_DOWNWTRA_C, ID_ZI_J_DOWNWTRA_D}, {dPa_RM(ID_ZI_S_DASHSAND_A), 0xFFFF, 0xFFFF, 0xFFFF}, + {dPa_RM(ID_ZI_S_DASHSNOW_A), dPa_RM(ID_ZI_S_DASHSNOW_B), 0xFFFF, 0xFFFF}, {dPa_RM(ID_ZI_S_DASHSMOKE_INWTR_A), 0xFFFF, 0xFFFF, 0xFFFF}, + }; + f32 local_30; GXColor a_Stack_34; GXColor a_Stack_38; @@ -1831,7 +1847,7 @@ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz cons u16 uVar5 = 0; u8 local_4c; if (dComIfG_Bgsp().ChkPolySafe(*param_1) == 0) { - return 0; + return uVar5; } int local_44 = dComIfG_Bgsp().GetPolyAtt0(*param_1); @@ -1860,17 +1876,7 @@ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz cons { uVar5 |= (0xff << (i << 3)); } else { - static u16 ringID[6][4] = { - {ID_ZI_J_DOWNSMOKE_A, 0xFFFF, 0xFFFF, 0xFFFF}, {ID_ZI_J_DOWNKUSA_A, 0xFFFF, 0xFFFF, 0xFFFF}, - {ID_ZI_J_DASHWTRA_A, ID_ZI_J_DASHWTRA_B, ID_ZI_J_DASHWTRA_C, 0xFFFF}, {dPa_RM(ID_ZI_S_DOWNSAND_A), 0xFFFF, 0xFFFF, 0xFFFF}, - {dPa_RM(ID_ZI_S_DOWNSNOW_A), dPa_RM(ID_ZI_S_DOWNSNOW_B), 0xFFFF, 0xFFFF}, {dPa_RM(ID_ZI_S_DOWNSMOKE_INWTR_A), 0xFFFF, 0xFFFF, 0xFFFF}, - }; - static u16 normalID[6][4] = { - {ID_ZI_J_DASHSMOKE_A, 0xFFFF, 0xFFFF, 0xFFFF}, {ID_ZI_J_DASHKUSA_A, 0xFFFF, 0xFFFF, 0xFFFF}, - {ID_ZI_J_DOWNWTRA_A, ID_ZI_J_DOWNWTRA_B, ID_ZI_J_DOWNWTRA_C, ID_ZI_J_DOWNWTRA_D}, {dPa_RM(ID_ZI_S_DASHSAND_A), 0xFFFF, 0xFFFF, 0xFFFF}, - {dPa_RM(ID_ZI_S_DASHSNOW_A), dPa_RM(ID_ZI_S_DASHSNOW_B), 0xFFFF, 0xFFFF}, {dPa_RM(ID_ZI_S_DASHSMOKE_INWTR_A), 0xFFFF, 0xFFFF, 0xFFFF}, - }; - uVar5 |= bVar3 << (i << 3); + uVar5 |= (bVar3 << (i << 3)); if (bVar3 == 2 && ((param_6 & 0x10000) != 0)) { puVar7 = ringID[bVar3]; local_40 = param_2; @@ -1884,7 +1890,7 @@ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz cons } } ptr = param_0 + 4*i; - for ( j = 0; j < 4; j++, ptr++, puVar7++) { + for (j = 0; j < 4; j++, ptr++, puVar7++) { if (puVar7[0] == 0xffff) { break; } @@ -1899,6 +1905,7 @@ u16 dPa_control_c::setCommonPoly(u32* param_0, cBgS_PolyInfo* param_1, cXyz cons } void dPa_wbPcallBack_c::execute(JPABaseEmitter* i_emitter, JPABaseParticle* param_1) { + UNUSED(i_emitter); JGeometry::TVec3 local_18; param_1->getGlobalPosition(local_18); cXyz cStack_24(local_18.x, local_18.y, local_18.z); @@ -1909,8 +1916,10 @@ void dPa_wbPcallBack_c::execute(JPABaseEmitter* i_emitter, JPABaseParticle* para } void dPa_fsenthPcallBack::execute(JPABaseEmitter* i_emitter, JPABaseParticle* param_1) { - if (g_env_light.now_senses_effect == 1 && g_env_light.senses_effect_strength > 0.0f) { - i_emitter->setGlobalAlpha(255.0f * g_env_light.senses_effect_strength); + UNUSED(param_1); + dScnKy_env_light_c* envLight = dKy_getEnvlight(); + if (envLight->now_senses_effect == 1 && envLight->senses_effect_strength > 0.0f) { + i_emitter->setGlobalAlpha(255.0f * envLight->senses_effect_strength); i_emitter->playDrawParticle(); } else { i_emitter->setGlobalAlpha(0); @@ -1944,7 +1953,7 @@ void dPa_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* param_2 JGeometry::TVec3 local_118; JGeometry::TVec3 local_124; JGeometry::TVec3 local_130; - u8 globalAlpha = param_1->getGlobalAlpha() & 0xff; + u8 globalAlpha = param_1->getGlobalAlpha(); JGeometry::TVec3 local_13c; JGeometry::TVec3 local_148; JGeometry::TVec3 local_154; @@ -2073,7 +2082,7 @@ void dPa_gen_b_light8PcallBack::draw(JPABaseEmitter* param_1, JPABaseParticle* p MTXMultVec(j3dSys.getViewMtx(), &local_8c, &local_8c); f32 dVar9 = JMASSin(param_2->getRotateAngle()); f32 dVar10 = JMASCos(param_2->getRotateAngle()); - param_1->getGlobalParticleScale(local_bc); + param_1->getGlobalParticleScale(&local_bc); f32 var_f29 = local_bc.x * param_2->getWidth(param_1); f32 var_f28 = local_bc.y * param_2->getHeight(param_1); local_80[0][0] = dVar10 * var_f29; @@ -2269,19 +2278,8 @@ void dPa_hermiteEcallBack_c::setOldPosP(cXyz const* param_0, cXyz const* param_1 void dPa_hermiteEcallBack_c::executeAfter(JPABaseEmitter* param_1) { JGeometry::TVec3 aTStack_68; - #if DEBUG JGeometry::TVec3 local_74(field_0x10->x, field_0x10->y, field_0x10->z); JGeometry::TVec3 local_80(field_0xc->x, field_0xc->y, field_0xc->z); - #else - JGeometry::TVec3 local_74; - local_74.x = field_0x10->x; - local_74.y = field_0x10->y; - local_74.z = field_0x10->z; - JGeometry::TVec3 local_80; - local_80.x = field_0xc->x; - local_80.y = field_0xc->y; - local_80.z = field_0xc->z; - #endif JGeometry::TVec3 local_8c; JGeometry::TVec3 local_98; param_1->setGlobalTranslation(local_80); @@ -2301,7 +2299,8 @@ void dPa_hermiteEcallBack_c::executeAfter(JPABaseEmitter* param_1) { } if (fVar1 > 1.0f) { f32 dVar9 = 1.0f / fVar1; - for (f32 dVar8 = dVar9; dVar8 < 1.0f; dVar8 += dVar9) { + f32 dVar8 = dVar9; + for (dVar8 = dVar9; dVar8 < 1.0f; dVar8 += dVar9) { aTStack_68.cubic(local_74, local_8c, local_98, local_80, dVar8); JPABaseParticle* particle = param_1->createParticle(); if (particle != NULL) { From 124eb12f13639c0e50fe8373d7173e5dbb8b392d Mon Sep 17 00:00:00 2001 From: Max Roncace Date: Sun, 4 Jan 2026 20:20:35 -0500 Subject: [PATCH 27/35] m_Do_ext retail linked + debug improvements (#3009) --- config/ShieldD/splits.txt | 4 +- config/ShieldD/symbols.txt | 8 +- configure.py | 2 +- include/JSystem/J3DGraphBase/J3DMaterial.h | 7 +- include/JSystem/J3DGraphBase/J3DSys.h | 5 +- include/JSystem/J3DGraphBase/J3DTexture.h | 1 + include/JSystem/JKernel/JKRExpHeap.h | 4 + include/JSystem/JKernel/JKRHeap.h | 12 +- include/JSystem/JKernel/JKRSolidHeap.h | 4 + include/JSystem/JUtility/JUTCacheFont.h | 8 + include/d/dolzel_base.pch | 5 + include/m_Do/m_Do_ext.h | 598 +++++++++-------- include/m_Do/m_Do_main.h | 2 + include/m_Do/m_Do_mtx.h | 3 + src/f_op/f_op_actor_mng.cpp | 9 - src/m_Do/m_Do_ext.cpp | 726 +++++++++++++++------ src/m_Do/m_Do_main.cpp | 2 +- 17 files changed, 901 insertions(+), 499 deletions(-) diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index 453eb67a2b..a6ef320d93 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -65,7 +65,7 @@ m_Do/m_Do_mtx.cpp: .ctors start:0x8062F7D0 end:0x8062F7D4 .data start:0x80661ED0 end:0x80661FC0 .sdata start:0x8073F3E8 end:0x8073F3F8 - .sbss start:0x8074C3B0 end:0x8074C3BC + .sbss start:0x8074C3B0 end:0x8074C3B8 .sdata2 start:0x8074D878 end:0x8074D888 .bss start:0x807558E0 end:0x80755D30 @@ -74,7 +74,7 @@ m_Do/m_Do_ext.cpp: .rodata start:0x8062FA30 end:0x8062FA70 .data start:0x80661FC0 end:0x80663DB0 .sdata start:0x8073F3F8 end:0x8073F600 - .sbss start:0x8074C3BC end:0x8074C418 + .sbss start:0x8074C3B8 end:0x8074C418 .sdata2 start:0x8074D888 end:0x8074D8D0 .bss start:0x80755D30 end:0x80755D90 diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index 45a62b4b3b..dc8edc3c01 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -64187,9 +64187,9 @@ lbl_8074C3AA = .sbss:0x8074C3AA; // type:object size:0x1 data:byte hash:0xFDF68E lbl_8074C3AB = .sbss:0x8074C3AB; // type:object size:0x1 data:byte hash:0x15E8B591 dhash:0xC99D7D59 @LOCAL@exceptionNNGCReadPad__FPUlPUl@l_oldButton@0 = .sbss:0x8074C3AC; // type:object size:0x4 scope:local data:4byte hash:0x50F85B88 dhash:0x8D7B3DDD mDoMtx_stack = .sbss:0x8074C3B0; // type:object size:0x1 scope:global hash:0x2AB168B3 -lbl_8074C3B8 = .sbss:0x8074C3B8; // type:object size:0x1 data:byte hash:0x60980213 dhash:0x3EBAE505 +CurrentHeapAdjustVerbose__6mDoExt = .sbss:0x8074C3B8; // type:object size:0x1 data:byte hash:0x60980213 dhash:0x3EBAE505 HeapAdjustVerbose__6mDoExt = .sbss:0x8074C3B9; // type:object size:0x1 data:byte hash:0xDD10CA27 dhash:0x25FFD851 -HeapAdjustQuiet__6mDoExt = .sbss:0x8074C3BA; // type:object size:0x2 hash:0x364A3DE1 dhash:0xAED09ED7 +HeapAdjustQuiet__6mDoExt = .sbss:0x8074C3BA; // type:object size:0x1 hash:0x364A3DE1 dhash:0xAED09ED7 AssertHeap = .sbss:0x8074C3BC; // type:object size:0x4 scope:global data:4byte hash:0x0726E63B DbPrintHeap = .sbss:0x8074C3C0; // type:object size:0x4 scope:global data:4byte hash:0x114A8B4E gameHeap = .sbss:0x8074C3C4; // type:object size:0x4 scope:global data:4byte hash:0x31D7CBD7 @@ -64199,8 +64199,8 @@ archiveHeap = .sbss:0x8074C3D0; // type:object size:0x4 scope:global data:4byte j2dHeap = .sbss:0x8074C3D4; // type:object size:0x4 scope:global data:4byte hash:0x7CA37505 HostIOHeap = .sbss:0x8074C3D8; // type:object size:0x4 scope:global data:4byte hash:0x8D1A0E3F mDoExt_SaveCurrentHeap = .sbss:0x8074C3DC; // type:object size:0x4 scope:global data:4byte hash:0x44FDA9E1 -@LOCAL@mDoExt_createSolidHeap__FUlP7JKRHeapUl@displayed@0 = .sbss:0x8074C3E0; // type:object size:0x4 scope:local data:4byte hash:0x1928D6B8 dhash:0xF0ED4395 -lbl_8074C3E4 = .sbss:0x8074C3E4; // type:object size:0x1 data:byte hash:0x74053100 dhash:0xCB66AA90 +@LOCAL@mDoExt_createSolidHeap__FUlP7JKRHeapUl@displayed = .sbss:0x8074C3E0; // type:object size:0x4 scope:local data:4byte hash:0x1928D6B8 dhash:0xF0ED4395 +@GUARD@draw__17mDoExt_cubePacketFv@l_pos = .sbss:0x8074C3E4; // type:object size:0x1 data:byte hash:0x74053100 dhash:0xCB66AA90 mDoExt_font0 = .sbss:0x8074C3E8; // type:object size:0x4 scope:global data:4byte hash:0xA93F74F6 mDoExt_font0_getCount = .sbss:0x8074C3EC; // type:object size:0x4 scope:global data:4byte hash:0xCC867BDC mDoExt_resfont0 = .sbss:0x8074C3F0; // type:object size:0x4 scope:global data:4byte hash:0xFFCF2592 diff --git a/configure.py b/configure.py index 8fb5950bba..d4f49b7ee7 100755 --- a/configure.py +++ b/configure.py @@ -570,7 +570,7 @@ config.libs = [ Object(MatchingFor(ALL_GCN), "m_Do/m_Do_graphic.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_machine.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_mtx.cpp"), - Object(Equivalent, "m_Do/m_Do_ext.cpp"), # weak func order + Object(MatchingFor(ALL_GCN), "m_Do/m_Do_ext.cpp"), Object(NonMatching, "m_Do/m_Do_ext2.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_lib.cpp"), Object(MatchingFor(ALL_GCN), "m_Do/m_Do_Reset.cpp"), diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 39b8be99c2..dcb74c1f46 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -56,12 +56,9 @@ public: J3DIndBlock* getIndBlock() { return mIndBlock; } J3DJoint* getJoint() { return mJoint; } J3DMaterialAnm* getMaterialAnm() { - if ((uintptr_t)mMaterialAnm < 0xC0000000) { - return mMaterialAnm; - } else { - return NULL; - } + return (uintptr_t)mMaterialAnm < 0xC0000000 ? mMaterialAnm : NULL; } + u32 getMaterialMode() { return mMaterialMode; } J3DNBTScale* getNBTScale() { return mTexGenBlock->getNBTScale(); } u16 getTexNo(u32 idx) { return mTevBlock->getTexNo(idx); } J3DGXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); } diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h index 57e3613ea2..1429ca22fe 100644 --- a/include/JSystem/J3DGraphBase/J3DSys.h +++ b/include/JSystem/J3DGraphBase/J3DSys.h @@ -139,7 +139,10 @@ struct J3DSys { J3DMtxCalc * getCurrentMtxCalc() const { return mCurrentMtxCalc; } - void setTexture(J3DTexture* pTex) { mTexture = pTex; } + void setTexture(J3DTexture* pTex) { + JUT_ASSERT_MSG(220, pTex != NULL, "Error : null pointer."); + mTexture = pTex; + } J3DTexture* getTexture() { return mTexture; } void setNBTScale(Vec* scale) { mNBTScale = scale; } diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 0927e08a47..72a165645b 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -33,6 +33,7 @@ public: } void setResTIMG(u16 index, const ResTIMG& timg) { + JUT_ASSERT_MSG(81, (bool)(index < mNum), "Error : range over."); mpRes[index] = timg; mpRes[index].imageOffset = ((mpRes[index].imageOffset + (uintptr_t)&timg - (uintptr_t)(mpRes + index))); mpRes[index].paletteOffset = ((mpRes[index].paletteOffset + (uintptr_t)&timg - (uintptr_t)(mpRes + index))); diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h index 224d4cbe1e..c52211c559 100644 --- a/include/JSystem/JKernel/JKRExpHeap.h +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -116,4 +116,8 @@ inline JKRExpHeap* JKRCreateExpHeap(u32 size, JKRHeap* parent, bool errorFlag) { return JKRExpHeap::create(size, parent, errorFlag); } +inline void JKRDestroyExpHeap(JKRHeap* heap) { + heap->destroy(); +} + #endif /* JKREXPHEAP_H */ diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index 0f149dc7b9..d44088bc1b 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -36,6 +36,7 @@ public: }; public: + JKRHeap(u32 size, JKRHeap* parent, bool errorFlag); JKRHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag); virtual ~JKRHeap(); @@ -112,6 +113,7 @@ public: void lock() { OSLockMutex(&mMutex); } void unlock() { OSUnlockMutex(&mMutex); } u32 getHeapSize() { return mSize; } + u8 getCurrentGroupId() { return 0; } protected: /* 0x00 */ // vtable @@ -151,9 +153,7 @@ public: static u32 getMemorySize(void) { return mMemorySize; } static JKRHeap* getRootHeap() { return sRootHeap; } -#if PLATFORM_WII || PLATFORM_SHIELD static JKRHeap* getRootHeap2() { return sRootHeap2; } -#endif static JKRHeap* getSystemHeap() { return sSystemHeap; } static JKRHeap* getCurrentHeap() { return sCurrentHeap; } @@ -176,9 +176,7 @@ public: static JKRHeap* sRootHeap; -#if PLATFORM_WII || PLATFORM_SHIELD static JKRHeap* sRootHeap2; -#endif static JKRHeap* sSystemHeap; static JKRHeap* sCurrentHeap; @@ -241,6 +239,10 @@ inline u32 JKRGetMemBlockSize(JKRHeap* heap, void* block) { return JKRHeap::getSize(block, heap); } +inline u32 JKRGetFreeSize(JKRHeap* heap) { + return heap->getFreeSize(); +} + inline void* JKRAlloc(u32 size, int alignment) { return JKRHeap::alloc(size, alignment, NULL); } @@ -261,11 +263,9 @@ inline bool JKRSetErrorFlag(JKRHeap* heap, bool flag) { return heap->setErrorFlag(flag); } -#if PLATFORM_WII || PLATFORM_SHIELD inline JKRHeap* JKRGetRootHeap2() { return JKRHeap::getRootHeap2(); } -#endif #if DEBUG inline void JKRSetDebugFillNotuse(u8 status) { data_804508B1 = status; } diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h index 661148cd27..bc2a1ffc15 100644 --- a/include/JSystem/JKernel/JKRSolidHeap.h +++ b/include/JSystem/JKernel/JKRSolidHeap.h @@ -65,4 +65,8 @@ inline JKRSolidHeap* JKRCreateSolidHeap(u32 param_0, JKRHeap* heap, bool param_2 return JKRSolidHeap::create(param_0, heap, param_2); } +inline void JKRDestroySolidHeap(JKRHeap* heap) { + heap->destroy(); +} + #endif /* JKRSOLIDHEAP_H */ diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/include/JSystem/JUtility/JUTCacheFont.h index 1e05200766..4eafcaa255 100644 --- a/include/JSystem/JUtility/JUTCacheFont.h +++ b/include/JSystem/JUtility/JUTCacheFont.h @@ -63,6 +63,14 @@ public: static u32 calcCacheSize(u32 param_0, int param_1) { return (ALIGN_NEXT(param_0, 0x20) + 0x40) * param_1; } GXTexObj* getTexObj(void* buffer) { return &((TCachePage*)buffer)->mTexObj; } + u32 getCachePage() const { + return mCachePage; + } + + int getMaxSheetSize() const { + return mMaxSheetSize; + } + private: /* 0x70 */ u32 mTotalWidSize; /* 0x74 */ u32 mTotalGlySize; diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index 46c707b504..ddbcc3da7d 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -12,6 +12,11 @@ // Fixes weak function ordering #include "math.h" // IWYU pragma: export #include "cstring.h" // IWYU pragma: export +#include "JSystem/JKernel/JKRDisposer.h" // IWYU pragma: export +#include "JSystem/J3DGraphBase/J3DPacket.h" // IWYU pragma: export +#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export +#include "JSystem/J3DGraphAnimator/J3DJoint.h" // IWYU pragma: export +#include "JSystem/J3DGraphAnimator/J3DAnimation.h" // IWYU pragma: export #include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export #include "JSystem/JHostIO/JORReflexible.h" // IWYU pragma: export diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 00a8144bc3..14c3f36e37 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -2,8 +2,10 @@ #define M_DO_M_DO_EXT_H #include "JSystem/J3DGraphAnimator/J3DAnimation.h" +#include "JSystem/J3DGraphAnimator/J3DJoint.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "Z2AudioLib/Z2SoundObject.h" +#include "d/d_kankyo_tev_str.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_mtx.h" @@ -16,16 +18,11 @@ struct ResTIMG; class Z2Creature; namespace mDoExt { + extern u8 CurrentHeapAdjustVerbose; extern u8 HeapAdjustVerbose; extern u8 HeapAdjustQuiet; }; -#if DEBUG -void DummyCheckHeap_init(); -void DummyCheckHeap_create(); -void DummyCheckHeap_destroy(); -#endif - class mDoExt_baseAnm { public: mDoExt_baseAnm() {} @@ -244,41 +241,6 @@ private: /* 0x4 */ J3DAnmTransform* mAnmTransform; }; // Size: 0x8 -class mDoExt_invJntPacket : public J3DPacket { -public: - mDoExt_invJntPacket() {} - - virtual void draw(); - virtual ~mDoExt_invJntPacket() {} - - void setJoint(J3DModel* i_model, u16 param_1, u8 param_2) { - field_0x10 = i_model; - field_0x14 = param_1; - field_0x16 = param_2; - } - -private: - /* 0x10 */ J3DModel* field_0x10; - /* 0x14 */ u16 field_0x14; - /* 0x16 */ u8 field_0x16; -}; // Size: 0x18 - -class mDoExt_invisibleModel { -public: - mDoExt_invisibleModel() {} - int create(J3DModel* i_model, u8 param_1); - void entryJoint(cXyz*); - void entryDL(cXyz*); - - /* 0x0 */ J3DModel* mModel; - /* 0x4 */ mDoExt_invJntPacket* mpPackets; -}; - -class mDoExt_zelAnime : public Z2SoundObjAnime { -public: - void* field_0x48; -}; - class mDoExt_McaMorfCallBack1_c { public: virtual int execute(u16, J3DTransformInfo*) = 0; @@ -289,146 +251,6 @@ public: virtual void execute(u16) = 0; }; -class mDoExt_morf_c - : public J3DMtxCalcNoAnm { -public: - mDoExt_morf_c(); - void setMorf(f32 i_morf); - void frameUpdate(); - - virtual ~mDoExt_morf_c(); - - J3DAnmTransform* getAnm() { return mpAnm; } - void changeAnm(J3DAnmTransform* anm) { mpAnm = anm; } - int getPlayMode() { return mFrameCtrl.getAttribute(); } - void setPlayMode(int mode) { mFrameCtrl.setAttribute(mode); } - BOOL isStop() { return mFrameCtrl.checkState(1) || mFrameCtrl.getRate() == 0.0f; } - bool isLoop() { return mFrameCtrl.checkState(2); } - f32 getStartFrame() { return mFrameCtrl.getStart(); } - void setStartFrame(f32 frame) { mFrameCtrl.setStart(frame); } - f32 getEndFrame() { return mFrameCtrl.getEnd(); } - void setEndFrame(f32 frame) { mFrameCtrl.setEnd(frame); } - f32 getLoopFrame() { return mFrameCtrl.getLoop(); } - void setLoopFrame(f32 frame) { mFrameCtrl.setLoop(frame); } - f32 getPlaySpeed() { return mFrameCtrl.getRate(); } - void setPlaySpeed(f32 speed) { mFrameCtrl.setRate(speed); } - f32 getFrame() { return mFrameCtrl.getFrame(); } - void setFrame(f32 frame) { mFrameCtrl.setFrame((s16)frame); } - void setFrameF(f32 frame) { mFrameCtrl.setFrame(frame); } - BOOL checkFrame(f32 frame) { return mFrameCtrl.checkPass(frame); } - f32 getMorfRatio() { return mCurMorf; } - - /* 0x04 */ J3DModel* mpModel; - /* 0x08 */ J3DAnmTransform* mpAnm; - /* 0x0C */ J3DFrameCtrl mFrameCtrl; - /* 0x20 */ J3DTransformInfo* mpTransformInfo; - /* 0x24 */ Quaternion* mpQuat; - /* 0x28 */ f32 mCurMorf; - /* 0x2C */ f32 mPrevMorf; - /* 0x30 */ f32 mMorfStep; - /* 0x34 */ f32 field_0x34; -}; - -class mDoExt_McaMorfSO : public mDoExt_morf_c { -public: - mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, - int, Z2Creature*, u32, u32); - int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, - J3DAnmTransform*, int, f32, int, int, Z2Creature*, u32, u32); - void setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate, - f32 i_start, f32 i_end); - int play(u32, s8); - void updateDL(); - void entryDL(); - void modelCalc(); - void getTransform(u16, J3DTransformInfo*); - void stopZelAnime(); - - virtual ~mDoExt_McaMorfSO(); - virtual void calc(); - - J3DModel* getModel() { return mpModel; } - void offMorfNone() { mMorfNone = false; } - void onMorfNone() { mMorfNone = true; } - inline void setTranslateScale(cXyz& i_scale) { mTranslateScale = i_scale; } - J3DTransformInfo* getOldTransInfo() { return mpTransformInfo; } - Quaternion* getOldQuaternion() { return mpQuat; } - void offTranslate() { mTranslate = true; } - void setTranslateScale(const cXyz& scale) { mTranslateScale = scale; } - -private: - /* 0x38 */ mDoExt_McaMorfCallBack1_c* mpCallback1; - /* 0x3C */ mDoExt_McaMorfCallBack2_c* mpCallback2; - /* 0x40 */ cXyz mTranslateScale; - /* 0x4C */ Z2Creature* mpSound; - /* 0x50 */ void* mpBas; - /* 0x54 */ bool mTranslate; - /* 0x55 */ bool mMorfNone; -}; - -class mDoExt_McaMorf : public mDoExt_morf_c { -public: - mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, - int, void*, u32, u32); - int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, - J3DAnmTransform*, int, f32, int, int, int, void*, u32, u32); - void setAnm(J3DAnmTransform* i_bck, int i_mode, f32 i_morf, f32 i_speed, f32 i_startF, f32 i_endF, void* i_bas); - u32 play(Vec*, u32, s8); - void entryDL(); - void modelCalc(); - void getTransform(u16, J3DTransformInfo*); - - virtual ~mDoExt_McaMorf(); - virtual void calc(); - - J3DModel* getModel() { return mpModel; } - -private: - /* 0x38 */ mDoExt_McaMorfCallBack1_c* mpCallback1; - /* 0x3C */ mDoExt_McaMorfCallBack2_c* mpCallback2; - /* 0x40 */ cXyz mTranslateScale; - /* 0x4C */ mDoExt_zelAnime* mpSound; - /* 0x50 */ bool field_0x50; - /* 0x51 */ bool field_0x51; - /* 0x52 */ bool field_0x52; -}; - -class mDoExt_McaMorf2 : public mDoExt_morf_c { -public: - mDoExt_McaMorf2(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*, - int, f32, int, int, Z2Creature*, u32, u32); - int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, - mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*, int, - f32, int, int, Z2Creature*, u32, u32); - void ERROR_EXIT(); - void setAnm(J3DAnmTransform*, J3DAnmTransform*, f32, int, f32, f32, f32, f32); - void setAnmRate(f32); - int play(u32, s8); - void entryDL(); - void modelCalc(); - void stopZelAnime(); - - virtual ~mDoExt_McaMorf2(); - virtual void calc(); - - inline f32 getAnmRate() { return mAnmRate; } - inline void changeAnm(J3DAnmTransform* anm, J3DAnmTransform* anm2) { - mpAnm = anm; - field_0x40 = anm2; - } - inline J3DModel* getModel() { return mpModel; } -private: - /* 0x38 */ mDoExt_McaMorfCallBack1_c* mpCallback1; - /* 0x3C */ mDoExt_McaMorfCallBack2_c* mpCallback2; - /* 0x40 */ J3DAnmTransform* field_0x40; - /* 0x44 */ f32 mAnmRate; - /* 0x48 */ Z2Creature* mpSound; - /* 0x4C */ void* mpBas; -}; - class mDoExt_MtxCalcOldFrame { public: void initOldFrameMorf(f32, u16, u16); @@ -508,6 +330,151 @@ struct mDoExt_MtxCalcAnmBlendTblOld : public mDoExt_MtxCalcAnmBlendTbl { STATIC_ASSERT(sizeof(mDoExt_MtxCalcAnmBlendTblOld) == 0x10); +class mDoExt_zelAnime : public Z2SoundObjAnime { +public: + void* field_0x48; +}; + +class mDoExt_morf_c + : public J3DMtxCalcNoAnm { +public: + mDoExt_morf_c(); + void setMorf(f32 i_morf); + void frameUpdate(); + + virtual ~mDoExt_morf_c(); + + J3DAnmTransform* getAnm() { return mpAnm; } + void changeAnm(J3DAnmTransform* anm) { mpAnm = anm; } + int getPlayMode() { return mFrameCtrl.getAttribute(); } + void setPlayMode(int mode) { mFrameCtrl.setAttribute(mode); } + BOOL isStop() { return mFrameCtrl.checkState(1) || mFrameCtrl.getRate() == 0.0f; } + bool isLoop() { return mFrameCtrl.checkState(2); } + f32 getStartFrame() { return mFrameCtrl.getStart(); } + void setStartFrame(f32 frame) { mFrameCtrl.setStart(frame); } + f32 getEndFrame() { return mFrameCtrl.getEnd(); } + void setEndFrame(f32 frame) { mFrameCtrl.setEnd(frame); } + f32 getLoopFrame() { return mFrameCtrl.getLoop(); } + void setLoopFrame(f32 frame) { mFrameCtrl.setLoop(frame); } + f32 getPlaySpeed() { return mFrameCtrl.getRate(); } + void setPlaySpeed(f32 speed) { mFrameCtrl.setRate(speed); } + f32 getFrame() { return mFrameCtrl.getFrame(); } + void setFrame(f32 frame) { mFrameCtrl.setFrame((s16)frame); } + void setFrameF(f32 frame) { mFrameCtrl.setFrame(frame); } + BOOL checkFrame(f32 frame) { return mFrameCtrl.checkPass(frame); } + f32 getMorfRatio() { return mCurMorf; } + + /* 0x04 */ J3DModel* mpModel; + /* 0x08 */ J3DAnmTransform* mpAnm; + /* 0x0C */ J3DFrameCtrl mFrameCtrl; + /* 0x20 */ J3DTransformInfo* mpTransformInfo; + /* 0x24 */ Quaternion* mpQuat; + /* 0x28 */ f32 mCurMorf; + /* 0x2C */ f32 mPrevMorf; + /* 0x30 */ f32 mMorfStep; + /* 0x34 */ f32 field_0x34; +}; + +class mDoExt_McaMorf : public mDoExt_morf_c { +public: + mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, + mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, + int, void*, u32, u32); + int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, + J3DAnmTransform*, int, f32, int, int, int, void*, u32, u32); + void setAnm(J3DAnmTransform* i_bck, int i_mode, f32 i_morf, f32 i_speed, f32 i_startF, f32 i_endF, void* i_bas); + u32 play(Vec*, u32, s8); + void entryDL(); + void modelCalc(); + void getTransform(u16, J3DTransformInfo*); + + virtual ~mDoExt_McaMorf(); + virtual void calc(); + + J3DModel* getModel() { return mpModel; } + +private: + /* 0x38 */ mDoExt_McaMorfCallBack1_c* mpCallback1; + /* 0x3C */ mDoExt_McaMorfCallBack2_c* mpCallback2; + /* 0x40 */ cXyz mTranslateScale; + /* 0x4C */ mDoExt_zelAnime* mpSound; + /* 0x50 */ bool field_0x50; + /* 0x51 */ bool field_0x51; + /* 0x52 */ bool field_0x52; +}; + +class mDoExt_McaMorfSO : public mDoExt_morf_c { +public: + mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, + mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, + int, Z2Creature*, u32, u32); + int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, + J3DAnmTransform*, int, f32, int, int, Z2Creature*, u32, u32); + void setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate, + f32 i_start, f32 i_end); + int play(u32, s8); + void updateDL(); + void entryDL(); + void modelCalc(); + void getTransform(u16, J3DTransformInfo*); + void stopZelAnime(); + + virtual ~mDoExt_McaMorfSO(); + virtual void calc(); + + J3DModel* getModel() { return mpModel; } + void offMorfNone() { mMorfNone = false; } + void onMorfNone() { mMorfNone = true; } + inline void setTranslateScale(cXyz& i_scale) { mTranslateScale = i_scale; } + J3DTransformInfo* getOldTransInfo() { return mpTransformInfo; } + Quaternion* getOldQuaternion() { return mpQuat; } + void offTranslate() { mTranslate = true; } + void setTranslateScale(const cXyz& scale) { mTranslateScale = scale; } + +private: + /* 0x38 */ mDoExt_McaMorfCallBack1_c* mpCallback1; + /* 0x3C */ mDoExt_McaMorfCallBack2_c* mpCallback2; + /* 0x40 */ cXyz mTranslateScale; + /* 0x4C */ Z2Creature* mpSound; + /* 0x50 */ void* mpBas; + /* 0x54 */ bool mTranslate; + /* 0x55 */ bool mMorfNone; +}; + +class mDoExt_McaMorf2 : public mDoExt_morf_c { +public: + mDoExt_McaMorf2(J3DModelData*, mDoExt_McaMorfCallBack1_c*, + mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*, + int, f32, int, int, Z2Creature*, u32, u32); + int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, + mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*, int, + f32, int, int, Z2Creature*, u32, u32); + void ERROR_EXIT(); + void setAnm(J3DAnmTransform*, J3DAnmTransform*, f32, int, f32, f32, f32, f32); + void setAnmRate(f32); + int play(u32, s8); + void entryDL(); + void modelCalc(); + void stopZelAnime(); + + virtual ~mDoExt_McaMorf2(); + virtual void calc(); + + inline f32 getAnmRate() { return mAnmRate; } + inline void changeAnm(J3DAnmTransform* anm, J3DAnmTransform* anm2) { + mpAnm = anm; + field_0x40 = anm2; + } + inline J3DModel* getModel() { return mpModel; } +private: + /* 0x38 */ mDoExt_McaMorfCallBack1_c* mpCallback1; + /* 0x3C */ mDoExt_McaMorfCallBack2_c* mpCallback2; + /* 0x40 */ J3DAnmTransform* field_0x40; + /* 0x44 */ f32 mAnmRate; + /* 0x48 */ Z2Creature* mpSound; + /* 0x4C */ void* mpBas; +}; + struct mDoExt_3Dline_field_0x10_c { s8 x; s8 y; @@ -534,6 +501,46 @@ public: /* 0x1C */ mDoExt_3Dline_field_0x18_c* field_0x1c; }; +class mDoExt_offCupOnAupPacket : public J3DPacket { + virtual void draw(); + virtual ~mDoExt_offCupOnAupPacket(); +}; + +class mDoExt_onCupOffAupPacket : public J3DPacket { + virtual void draw(); + virtual ~mDoExt_onCupOffAupPacket(); +}; + +class mDoExt_invJntPacket : public J3DPacket { +public: + mDoExt_invJntPacket() {} + + virtual void draw(); + virtual ~mDoExt_invJntPacket() {} + + void setJoint(J3DModel* i_model, u16 param_1, u8 param_2) { + field_0x10 = i_model; + field_0x14 = param_1; + field_0x16 = param_2; + } + +private: + /* 0x10 */ J3DModel* field_0x10; + /* 0x14 */ u16 field_0x14; + /* 0x16 */ u8 field_0x16; +}; // Size: 0x18 + +class mDoExt_invisibleModel { +public: + mDoExt_invisibleModel() {} + int create(J3DModel* i_model, u8 param_1); + void entryJoint(cXyz*); + void entryDL(cXyz*); + + /* 0x0 */ J3DModel* mModel; + /* 0x4 */ mDoExt_invJntPacket* mpPackets; +}; + class mDoExt_3DlineMat_c { public: virtual int getMaterialID() = 0; @@ -543,19 +550,27 @@ public: /* 0x4 */ mDoExt_3DlineMat_c* field_0x4; }; -class mDoExt_3DlineMatSortPacket : public J3DPacket { +class mDoExt_3DlineMat0_c : public mDoExt_3DlineMat_c { public: - mDoExt_3DlineMatSortPacket() { mp3DlineMat = NULL; } + int init(u16, u16, int); + void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); + void update(int, _GXColor&, dKy_tevstr_c*); - void reset() { mp3DlineMat = NULL; } - void setMatDark(mDoExt_3DlineMat_c* i_mat) { setMat(i_mat); } - - void setMat(mDoExt_3DlineMat_c*); + virtual int getMaterialID() { return 0; } + virtual void setMaterial(); virtual void draw(); - virtual ~mDoExt_3DlineMatSortPacket() {} + + cXyz* getPos(int param_0) { return field_0x18[param_0].field_0x0; } + f32* getSize(int param_0) { return field_0x18[param_0].field_0x4; } private: - /* 0x10 */ mDoExt_3DlineMat_c* mp3DlineMat; + /* 0x08 */ GXColor field_0x8; + /* 0x0C */ dKy_tevstr_c* field_0xc; + /* 0x10 */ u16 field_0x10; + /* 0x12 */ u16 field_0x12; + /* 0x14 */ u16 field_0x14; + /* 0x16 */ u8 field_0x16; + /* 0x18 */ mDoExt_3Dline_c* field_0x18; }; class dKy_tevstr_c; @@ -582,27 +597,36 @@ private: /* 0x38 */ mDoExt_3Dline_c* mpLines; }; -class mDoExt_3DlineMat0_c : public mDoExt_3DlineMat_c { +class mDoExt_3DlineMat2_c : public mDoExt_3DlineMat_c { public: - int init(u16, u16, int); - void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); - void update(int, _GXColor&, dKy_tevstr_c*); + int getMaterialID() { return 2; } + void setMaterial(); +}; - virtual int getMaterialID() { return 0; } - virtual void setMaterial(); +class mDoExt_3DlineMatSortPacket : public J3DPacket { +public: + mDoExt_3DlineMatSortPacket() { mp3DlineMat = NULL; } + + void reset() { mp3DlineMat = NULL; } + void setMatDark(mDoExt_3DlineMat_c* i_mat) { setMat(i_mat); } + + void setMat(mDoExt_3DlineMat_c*); virtual void draw(); - - cXyz* getPos(int param_0) { return field_0x18[param_0].field_0x0; } - f32* getSize(int param_0) { return field_0x18[param_0].field_0x4; } + virtual ~mDoExt_3DlineMatSortPacket() {} private: - /* 0x08 */ GXColor field_0x8; - /* 0x0C */ dKy_tevstr_c* field_0xc; - /* 0x10 */ u16 field_0x10; - /* 0x12 */ u16 field_0x12; - /* 0x14 */ u16 field_0x14; - /* 0x16 */ u8 field_0x16; - /* 0x18 */ mDoExt_3Dline_c* field_0x18; + /* 0x10 */ mDoExt_3DlineMat_c* mp3DlineMat; +}; + +class mDoExt_cube8pPacket : public J3DPacket { +public: + mDoExt_cube8pPacket(cXyz* i_points, const GXColor& i_color); + + virtual void draw(); + virtual ~mDoExt_cube8pPacket() {} + + /* 0x10 */ cXyz mPoints[8]; + /* 0x70 */ GXColor mColor; }; class mDoExt_cubePacket : public J3DPacket { @@ -618,44 +642,6 @@ public: /* 0x2E */ GXColor mColor; }; -class mDoExt_cylinderPacket : public J3DPacket { -public: - mDoExt_cylinderPacket(cXyz& i_position, f32 i_radius, f32 i_height, const GXColor& i_color, u8 i_clipZ); - - virtual void draw(); - virtual ~mDoExt_cylinderPacket() {} - - /* 0x10 */ cXyz mPosition; - /* 0x1C */ f32 mRadius; - /* 0x20 */ f32 mHeight; - /* 0x24 */ GXColor mColor; - /* 0x28 */ u8 mClipZ; -}; - -class mDoExt_spherePacket : public J3DPacket { -public: - mDoExt_spherePacket(cXyz& i_position, f32 i_size, const GXColor& i_color, u8 i_clipZ); - - virtual void draw(); - virtual ~mDoExt_spherePacket() {} - - /* 0x10 */ cXyz mPosition; - /* 0x1C */ f32 mSize; - /* 0x20 */ GXColor mColor; - /* 0x24 */ u8 mClipZ; -}; - -class mDoExt_cube8pPacket : public J3DPacket { -public: - mDoExt_cube8pPacket(cXyz* i_points, const GXColor& i_color); - - virtual void draw(); - virtual ~mDoExt_cube8pPacket() {} - - /* 0x10 */ cXyz mPoints[8]; - /* 0x70 */ GXColor mColor; -}; - class mDoExt_trianglePacket : public J3DPacket { public: mDoExt_trianglePacket(cXyz* i_points, const GXColor& i_color, u8 i_clipZ); @@ -694,32 +680,6 @@ public: /* 0x2D */ u8 mWidth; }; -class mDoExt_cylinderMPacket : public J3DPacket { -public: - mDoExt_cylinderMPacket(Mtx i_mtx, const GXColor& i_color, u8 i_clipZ); - - virtual void draw(); - virtual ~mDoExt_cylinderMPacket() {} - - /* 0x10 */ Mtx mMatrix; - /* 0x40 */ GXColor mColor; - /* 0x44 */ u8 mClipZ; -}; - -class mDoExt_circlePacket : public J3DPacket { -public: - mDoExt_circlePacket(cXyz& i_position, f32 i_radius, const GXColor& i_color, u8 i_clipZ, u8 i_lineWidth); - - virtual void draw(); - virtual ~mDoExt_circlePacket() {} - - /* 0x10 */ cXyz mPosition; - /* 0x1C */ f32 mRadius; - /* 0x20 */ GXColor mColor; - /* 0x24 */ u8 mClipZ; - /* 0x25 */ u8 mLineWidth; -}; - class mDoExt_ArrowPacket : public J3DPacket { public: mDoExt_ArrowPacket(cXyz& i_position, cXyz& param_1, const GXColor& i_color, u8 i_clipZ, u8 i_lineWidth); @@ -747,6 +707,59 @@ public: /* 0x21 */ u8 mLineWidth; }; +class mDoExt_circlePacket : public J3DPacket { +public: + mDoExt_circlePacket(cXyz& i_position, f32 i_radius, const GXColor& i_color, u8 i_clipZ, u8 i_lineWidth); + + virtual void draw(); + virtual ~mDoExt_circlePacket() {} + + /* 0x10 */ cXyz mPosition; + /* 0x1C */ f32 mRadius; + /* 0x20 */ GXColor mColor; + /* 0x24 */ u8 mClipZ; + /* 0x25 */ u8 mLineWidth; +}; + +class mDoExt_spherePacket : public J3DPacket { +public: + mDoExt_spherePacket(cXyz& i_position, f32 i_size, const GXColor& i_color, u8 i_clipZ); + + virtual void draw(); + virtual ~mDoExt_spherePacket() {} + + /* 0x10 */ cXyz mPosition; + /* 0x1C */ f32 mSize; + /* 0x20 */ GXColor mColor; + /* 0x24 */ u8 mClipZ; +}; + +class mDoExt_cylinderPacket : public J3DPacket { +public: + mDoExt_cylinderPacket(cXyz& i_position, f32 i_radius, f32 i_height, const GXColor& i_color, u8 i_clipZ); + + virtual void draw(); + virtual ~mDoExt_cylinderPacket() {} + + /* 0x10 */ cXyz mPosition; + /* 0x1C */ f32 mRadius; + /* 0x20 */ f32 mHeight; + /* 0x24 */ GXColor mColor; + /* 0x28 */ u8 mClipZ; +}; + +class mDoExt_cylinderMPacket : public J3DPacket { +public: + mDoExt_cylinderMPacket(Mtx i_mtx, const GXColor& i_color, u8 i_clipZ); + + virtual void draw(); + virtual ~mDoExt_cylinderMPacket() {} + + /* 0x10 */ Mtx mMatrix; + /* 0x40 */ GXColor mColor; + /* 0x44 */ u8 mClipZ; +}; + inline void mDoExt_bckAnmRemove(J3DModelData* i_modelData) { i_modelData->getJointNodePointer(0)->setMtxCalc(NULL); } @@ -757,6 +770,8 @@ void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap); u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap); void mDoExt_restoreCurrentHeap(); JKRExpHeap* mDoExt_getGameHeap(); +void mDoExt_setSafeGameHeapSize(); +size_t mDoExt_getSafeGameHeapSize(); void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap); JKRHeap* mDoExt_setCurrentHeap(JKRHeap* i_heap); JKRExpHeap* mDoExt_getArchiveHeap(); @@ -768,13 +783,13 @@ JKRExpHeap* mDoExt_getZeldaHeap(); JKRExpHeap* mDoExt_getJ2dHeap(); JKRExpHeap* mDoExt_getHostIOHeap(); JKRExpHeap* mDoExt_getDbPrintHeap(); -JKRExpHeap* mDoExt_createDbPrintHeap(u32 heapSize, JKRHeap* i_heap); -JKRAssertHeap* mDoExt_createAssertHeap(JKRHeap* i_heap); -JKRExpHeap* mDoExt_createCommandHeap(u32 heapSize, JKRHeap* i_heap); -JKRExpHeap* mDoExt_createArchiveHeap(u32 heapSize, JKRHeap* i_heap); -JKRExpHeap* mDoExt_createJ2dHeap(u32 heapSize, JKRHeap* i_heap); -JKRExpHeap* mDoExt_createZeldaHeap(u32 heapSize, JKRHeap* i_heap); -JKRExpHeap* mDoExt_createGameHeap(u32 heapSize, JKRHeap* i_heap); +JKRExpHeap* mDoExt_createDbPrintHeap(u32 heapSize, JKRHeap* parentHeap); +JKRAssertHeap* mDoExt_createAssertHeap(JKRHeap* parentHeap); +JKRExpHeap* mDoExt_createCommandHeap(u32 heapSize, JKRHeap* parentHeap); +JKRExpHeap* mDoExt_createArchiveHeap(u32 heapSize, JKRHeap* parentHeap); +JKRExpHeap* mDoExt_createJ2dHeap(u32 heapSize, JKRHeap* parentHeap); +JKRExpHeap* mDoExt_createZeldaHeap(u32 heapSize, JKRHeap* parentHeap); +JKRExpHeap* mDoExt_createGameHeap(u32 heapSize, JKRHeap* parentHeap); JKRSolidHeap* mDoExt_createSolidHeapToCurrent(JKRHeap** o_heap, u32 i_size, JKRHeap* i_parent, u32 i_alignment); JKRSolidHeap* mDoExt_createSolidHeapToCurrent(u32 i_size, JKRHeap* i_parent, u32 i_alignment); @@ -810,9 +825,10 @@ void mDoExt_setupShareTexture(J3DModelData* i_modelData, J3DModelData* i_shareMo void mDoExt_btkAnmRemove(J3DModelData* i_modelData); void mDoExt_modelTexturePatch(J3DModelData* i_modelData); -#if VERSION == VERSION_SHIELD_DEBUG -s32 mDoExt_getSafeZeldaHeapSize(); -void mDoExt_addSafeZeldaHeapSize(s32); +void mDoExt_setSafeZeldaHeapSize(); +void mDoExt_addSafeZeldaHeapSize(intptr_t); +intptr_t mDoExt_getSafeZeldaHeapSize(); +#if DEBUG JKRHeap* mDoExt_createHostIOHeap(u32, JKRHeap*); #endif @@ -822,9 +838,33 @@ JUTFont* mDoExt_getSubFont(); JUTFont* mDoExt_getRubyFont(); void mDoExt_removeSubFont(); +class DummyCheckHeap : public JKRDisposer { +public: + DummyCheckHeap(); + ~DummyCheckHeap(); + int isVirgin(); + JKRHeap* getHeap(); + void setHeap(JKRHeap*); + + /* 0x18 */ void* mAlloc; + /* 0x18 */ int mSize; + /* 0x20 */ JKRHeap* mHeap; +}; + +int DummyCheckHeap_init(); + +int DummyCheckHeap_create(); + +void DummyCheckHeap_destroy(); + +int DummyCheckHeap_isVirgin(); + +void DummyCheckHeap_check(); + extern JKRExpHeap* zeldaHeap; extern JKRExpHeap* gameHeap; extern JKRExpHeap* archiveHeap; extern JKRExpHeap* commandHeap; +extern DummyCheckHeap* dch; #endif /* M_DO_M_DO_EXT_H */ diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index 1229687094..99dc3876b8 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -6,6 +6,8 @@ class JKRExpHeap; +extern OSThread mainThread; + void version_check(); s32 LOAD_COPYDATE(void*); diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h index 793416ca4e..01085fb9a0 100644 --- a/include/m_Do/m_Do_mtx.h +++ b/include/m_Do/m_Do_mtx.h @@ -5,6 +5,9 @@ #include "SSystem/SComponent/c_xyz.h" #include +extern u8 g_printCurrentHeapDebug; +extern u8 g_printOtherHeapDebug; + void mDoMtx_XYZrotS(Mtx, s16, s16, s16); void mDoMtx_XYZrotM(Mtx, s16, s16, s16); void mDoMtx_ZXYrotS(Mtx, s16, s16, s16); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index c56d92c086..c288353949 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -392,15 +392,6 @@ int fopAcM::HeapAdjustMargin = 0x10000; #endif -struct DummyCheckHeap { - JKRHeap* getHeap(); - void setHeap(JKRHeap* heap); - - /* 0x0 */ JKRHeap* dummyHeap; -}; - -static DummyCheckHeap* dch = NULL; - bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback, u32 i_size) { #if DEBUG s16 procProfName = fopAcM_GetProfName(i_actor); diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 2a0794cc35..ab4a10c357 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -20,9 +20,18 @@ #include "d/d_com_inf_game.h" #include "global.h" #include "m_Do/m_Do_ext.h" +#include "m_Do/m_Do_main.h" #include "m_Do/m_Do_mtx.h" #include +namespace m_Do_ext { +u8 CurrentHeapAdjustVerbose; +u8 HeapAdjustVerbose; +u8 HeapAdjustQuiet; +} + +static intptr_t safeGameHeapSize = -1; + static void mDoExt_setJ3DData(Mtx mtx, const J3DTransformInfo* transformInfo, u16 param_2) { bool local_28; if (cM3d_IsZero(transformInfo->mScale.x - 1.0f) && cM3d_IsZero(transformInfo->mScale.y - 1.0f) && cM3d_IsZero(transformInfo->mScale.z - 1.0f)) { @@ -37,29 +46,42 @@ static void mDoExt_setJ3DData(Mtx mtx, const J3DTransformInfo* transformInfo, u1 mtx[2][3] = transformInfo->mTranslate.z; if (!local_28) { - mtx[0][0] *= transformInfo->mScale.x; - mtx[0][1] *= transformInfo->mScale.y; - mtx[0][2] *= transformInfo->mScale.z; - mtx[1][0] *= transformInfo->mScale.x; - mtx[1][1] *= transformInfo->mScale.y; - mtx[1][2] *= transformInfo->mScale.z; - mtx[2][0] *= transformInfo->mScale.x; - mtx[2][1] *= transformInfo->mScale.y; - mtx[2][2] *= transformInfo->mScale.z; + f32* mtx_p = (f32*)mtx; + *mtx_p *= transformInfo->mScale.x; + mtx_p++; + *mtx_p *= transformInfo->mScale.y; + mtx_p++; + *mtx_p *= transformInfo->mScale.z; + mtx_p += 2; + *mtx_p *= transformInfo->mScale.x; + mtx_p++; + *mtx_p *= transformInfo->mScale.y; + mtx_p++; + *mtx_p *= transformInfo->mScale.z; + mtx_p += 2; + *mtx_p *= transformInfo->mScale.x; + mtx_p++; + *mtx_p *= transformInfo->mScale.y; + mtx_p++; + *mtx_p *= transformInfo->mScale.z; } if (j3dSys.getModel()->getModelData()->getJointNodePointer(param_2)->getScaleCompensate() == 1) { - f32 x = 1.0f / J3DSys::mParentS.x; - f32 y = 1.0f / J3DSys::mParentS.y; - f32 z = 1.0f / J3DSys::mParentS.z; - mtx[0][0] *= x; - mtx[0][1] *= x; - mtx[0][2] *= x; - mtx[1][0] *= y; - mtx[1][1] *= y; - mtx[1][2] *= y; - mtx[2][0] *= z; - mtx[2][1] *= z; - mtx[2][2] *= z; + f32* mtx_p = (f32*)mtx; + Vec sp0C; + sp0C.x = 1.0f / J3DSys::mParentS.x; + sp0C.y = 1.0f / J3DSys::mParentS.y; + sp0C.z = 1.0f / J3DSys::mParentS.z; + *mtx_p++ *= sp0C.x; + *mtx_p++ *= sp0C.x; + *mtx_p++ *= sp0C.x; + *mtx_p++; + *mtx_p++ *= sp0C.y; + *mtx_p++ *= sp0C.y; + *mtx_p++ *= sp0C.y; + *mtx_p++; + *mtx_p++ *= sp0C.z; + *mtx_p++ *= sp0C.z; + *mtx_p++ *= sp0C.z; } mDoMtx_concat(J3DSys::mCurrentMtx, mtx, J3DSys::mCurrentMtx); j3dSys.getModel()->setAnmMtx(param_2, J3DSys::mCurrentMtx); @@ -108,18 +130,14 @@ int mDoExt_baseAnm::play() { int mDoExt_bpkAnm::init(J3DMaterialTable* i_matTable, J3DAnmColor* i_bpk, int i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF) { + JUT_ASSERT(371, (i_anmPlay == FALSE || getFrameCtrl() != NULL || isCurrentSolidHeap()) && i_matTable != NULL && i_bpk != NULL); + mpAnm = i_bpk; mpAnm->searchUpdateMaterialID(i_matTable); if (i_anmPlay) { - int attribute; - if (i_attribute < 0) { - attribute = mpAnm->getAttribute(); - } else { - attribute = i_attribute; - } - - return initPlay(mpAnm->getFrameMax(), attribute, i_rate, i_startF, i_endF); + return initPlay(mpAnm->getFrameMax(), i_attribute < 0 ? mpAnm->getAttribute() : i_attribute, + i_rate, i_startF, i_endF); } return 1; @@ -132,18 +150,13 @@ void mDoExt_bpkAnm::entry(J3DMaterialTable* i_matTable, f32 i_frame) { int mDoExt_btpAnm::init(J3DMaterialTable* i_matTable, J3DAnmTexPattern* i_btp, int i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF) { + JUT_ASSERT(420, (i_anmPlay == FALSE || getFrameCtrl() != NULL || isCurrentSolidHeap()) && i_matTable != NULL && i_btp != NULL); + mpAnm = i_btp; mpAnm->searchUpdateMaterialID(i_matTable); if (i_anmPlay) { - int attribute; - if (i_attribute < 0) { - attribute = mpAnm->getAttribute(); - } else { - attribute = i_attribute; - } - - return initPlay(mpAnm->getFrameMax(), attribute, i_rate, i_startF, i_endF); + return initPlay(mpAnm->getFrameMax(), i_attribute < 0 ? mpAnm->getAttribute() : i_attribute, i_rate, i_startF, i_endF); } return 1; @@ -156,18 +169,13 @@ void mDoExt_btpAnm::entry(J3DMaterialTable* i_matTable, s16 i_frame) { int mDoExt_btkAnm::init(J3DMaterialTable* i_matTable, J3DAnmTextureSRTKey* i_btk, int i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF) { + JUT_ASSERT(468, (i_anmPlay == FALSE || getFrameCtrl() != NULL || isCurrentSolidHeap()) && i_matTable != NULL && i_btk != NULL); + mpAnm = i_btk; mpAnm->searchUpdateMaterialID(i_matTable); if (i_anmPlay) { - int attribute; - if (i_attribute < 0) { - attribute = mpAnm->getAttribute(); - } else { - attribute = i_attribute; - } - - return initPlay(mpAnm->getFrameMax(), attribute, i_rate, i_startF, i_endF); + return initPlay(mpAnm->getFrameMax(), i_attribute < 0 ? mpAnm->getAttribute() : i_attribute, i_rate, i_startF, i_endF); } return 1; @@ -180,18 +188,13 @@ void mDoExt_btkAnm::entry(J3DMaterialTable* i_matTable, f32 i_frame) { int mDoExt_brkAnm::init(J3DMaterialTable* i_matTable, J3DAnmTevRegKey* i_brk, int i_anmPlay, int i_attribute, f32 i_rate, s16 i_startF, s16 i_endF) { + JUT_ASSERT(516, (i_anmPlay == FALSE || getFrameCtrl() != NULL || isCurrentSolidHeap()) && i_matTable != NULL && i_brk != NULL); + mpAnm = i_brk; mpAnm->searchUpdateMaterialID(i_matTable); if (i_anmPlay) { - int attribute; - if (i_attribute < 0) { - attribute = mpAnm->getAttribute(); - } else { - attribute = i_attribute; - } - - return initPlay(mpAnm->getFrameMax(), attribute, i_rate, i_startF, i_endF); + return initPlay(mpAnm->getFrameMax(), i_attribute < 0 ? mpAnm->getAttribute() : i_attribute, i_rate, i_startF, i_endF); } return 1; @@ -202,9 +205,14 @@ void mDoExt_brkAnm::entry(J3DMaterialTable* i_matTable, f32 i_frame) { i_matTable->entryTevRegAnimator(mpAnm); } +void dummy3(J3DModel* i_model, void* i_bva, bool i_modify) { + JUT_ASSERT(0, (i_modify || isCurrentSolidHeap()) && i_model != NULL && i_bva != NULL); +} + int mDoExt_bckAnm::init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify) { JUT_ASSERT(614, (i_modify || isCurrentSolidHeap()) && i_bck != NULL); + mAnm = i_bck; if (!i_modify) { mpMtxCalc = new J3DMtxCalcAnimation, J3DMtxCalcJ3DSysInitMaya>(mAnm); @@ -215,17 +223,21 @@ int mDoExt_bckAnm::init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_ra mpMtxCalc->setAnmTransform(mAnm); } if (i_play) { - i_attr = i_attr < 0 ? mAnm->getAttribute() : i_attr; - return initPlay(mAnm->getFrameMax(), i_attr, i_rate, i_startF, i_endF); + return initPlay(mAnm->getFrameMax(), i_attr < 0 ? mAnm->getAttribute() : i_attr, i_rate, i_startF, i_endF); } return 1; } void mDoExt_bckAnm::changeBckOnly(J3DAnmTransform* i_bck) { mAnm = i_bck; + JUT_ASSERT(646, mAnm != NULL); mpMtxCalc->setAnmTransform(mAnm); } +void dummy4(J3DModel* i_model, void* i_bxa, bool i_modify) { + JUT_ASSERT(0, (i_modify || isCurrentSolidHeap()) && i_model != NULL && i_bxa != NULL); +} + void mDoExt_bckAnm::entry(J3DModelData* i_modelData, f32 i_frame) { mAnm->setFrame(i_frame); i_modelData->getJointNodePointer(0)->setMtxCalc(mpMtxCalc); @@ -238,18 +250,13 @@ void mDoExt_bckAnm::entryJoint(J3DModelData* i_modelData, u16 i_jntNo, f32 i_fra int mDoExt_blkAnm::init(J3DDeformData* i_deformData, J3DAnmCluster* i_blk, int i_anmPlay, int i_attribute, f32 i_rate, s16 i_start, s16 param_6) { + JUT_ASSERT(747, (i_anmPlay == FALSE || getFrameCtrl() != NULL || isCurrentSolidHeap()) && i_deformData != NULL && i_blk != NULL); + mpAnm = i_blk; i_deformData->setAnm(mpAnm); if (i_anmPlay) { - int attribute; - if (i_attribute < 0) { - attribute = mpAnm->getAttribute(); - } else { - attribute = i_attribute; - } - - return initPlay(mpAnm->getFrameMax(), attribute, i_rate, i_start, param_6); + return initPlay(mpAnm->getFrameMax(), i_attribute < 0 ? mpAnm->getAttribute() : i_attribute, i_rate, i_start, param_6); } return 1; @@ -282,18 +289,34 @@ void mDoExt_modelTexturePatch(J3DModelData* i_modelData) { } static void dummy1() { + ((J3DDrawPacket*)NULL)->beginPatch(); ((J3DTevBlock*)NULL)->patch(); - ((J3DColorBlock*)NULL)->patchLight(); + ((J3DMaterial*)NULL)->getPEBlock(); + ((J3DMaterial*)NULL)->getTexGenBlock(); + ((J3DMaterial*)NULL)->getColorBlock()->patchLight(); ((J3DPEBlock*)NULL)->patch(); + ((J3DDrawPacket*)NULL)->endPatch(); +} + +static inline void modelMtxErrorCheck(J3DModel* i_model) { +#if DEBUG + if (i_model->getBaseTRMtx()[0][0] == 3.4028235e38f) { + i_model->getBaseTRMtx()[0][0] = 1.0f; + JUT_WARN(883, "%s", "Model Matrix Not Initialize !\n"); + } +#endif } static void mDoExt_modelDiff(J3DModel* i_model) { + modelMtxErrorCheck(i_model); i_model->calcMaterial(); i_model->diff(); i_model->entry(); } void mDoExt_modelUpdate(J3DModel* i_model) { + modelMtxErrorCheck(i_model); + J3DModelData* model_data = i_model->getModelData(); if (model_data->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL && @@ -310,6 +333,8 @@ void mDoExt_modelUpdate(J3DModel* i_model) { } void mDoExt_modelUpdateDL(J3DModel* i_model) { + modelMtxErrorCheck(i_model); + J3DModelData* model_data = i_model->getModelData(); if (model_data->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL && @@ -327,6 +352,8 @@ void mDoExt_modelUpdateDL(J3DModel* i_model) { } void mDoExt_modelEntryDL(J3DModel* i_model) { + modelMtxErrorCheck(i_model); + J3DModelData* model_data = i_model->getModelData(); if (model_data->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL && @@ -384,20 +411,24 @@ static void dummy2() { FORCE_DONT_INLINE; FORCE_DONT_INLINE; + ((J3DMaterial*)NULL)->getMaterialMode(); + J3DGXColor gxColor; J3DColorChan colorChan; J3DTexCoord texCoord; J3DGXColorS10 gxColorS10; + J3DTevStageInfo tevStageInfo; + J3DTevStage* stage_p = NULL; + stage_p->setTevStageInfo(tevStageInfo); + J3DTevStage tevStage; + J3DIndTevStage indStage; J3DIndTevStage indTevStage; J3DTevOrder tevOrder; J3DTevSwapModeTable tevSwapModeTable; J3DIndTexOrder indTexOrder; - J3DTevStage* tevStage_p = NULL; - J3DTevStageInfo tevStageInfo; - tevStage_p->setTevStageInfo(tevStageInfo); - J3DTevStage tevStage; - + J3DIndTexMtx* indTexMtx = new J3DIndTexMtx(); + J3DIndTexCoordScale* indTexCoordScale = new J3DIndTexCoordScale(); J3DColorBlock* colorBlock = NULL; colorBlock->setColorChanNum((u8)NULL); colorBlock->setMatColor(0, gxColor); @@ -422,10 +453,8 @@ static void dummy2() { J3DIndBlock* indBlock = NULL; indBlock->setIndTexStageNum(0); - J3DIndTexMtx indTexMtx; - indBlock->setIndTexMtx(0, indTexMtx); - J3DIndTexCoordScale indTexCoordScale; - indBlock->setIndTexCoordScale(0, indTexCoordScale); + indBlock->setIndTexMtx(0, *indTexMtx); + indBlock->setIndTexCoordScale(0, *indTexCoordScale); J3DPEBlock* peBlock = NULL; J3DAlphaComp alphaComp; @@ -463,12 +492,17 @@ static void dummy2() { indBlock->getIndTexMtx(0); indBlock->getIndTexCoordScale(0); + indTexOrder.getMap(); + indTexOrder.getCoord(); + peBlock = NULL; peBlock->getFog(); peBlock->getAlphaComp(); peBlock->getBlend(); peBlock->getZMode(); peBlock->getZCompLoc(); + + ((J3DMaterial*)NULL)->setMaterialAnm(NULL); } int mDoExt_invisibleModel::create(J3DModel* i_model, u8 param_1) { @@ -533,8 +567,7 @@ void mDoExt_setupShareTexture(J3DModelData* i_modelData, J3DModelData* i_shareMo bool bvar = false; for (u16 i = 0; i < texture->getNum(); i++) { - ResTIMG* res = texture->getResTIMG(i); - if (res->imageOffset == 0) { + if (texture->getResTIMG(i)->imageOffset == 0) { for (u16 j = 0; j < shareTexture->getNum(); j++) { if (!strcmp(textureName->getName(i), shareTextureName->getName(j))) { JUT_ASSERT(1564, shareTexture->getResTIMG(j)->imageOffset != 0); @@ -584,12 +617,13 @@ void mDoExt_setupStageTexture(J3DModelData* i_modelData) { bool set_timg = false; for (u16 i = 0; i < texture_p->getNum(); i++) { - ResTIMG* img = texture_p->getResTIMG(i); - if (img->imageOffset == 0) { + if (texture_p->getResTIMG(i)->imageOffset == 0) { char res_name[64]; snprintf(res_name, sizeof(res_name), "%s.bti", tex_name_p->getName(i)); + OS_REPORT("%d:設定テクスチャー名<%s>\n", i, res_name); ResTIMG* timg = (ResTIMG*)dComIfG_getStageRes(res_name); + JUT_ASSERT(1623, timg != NULL); texture_p->setResTIMG(i, *timg); set_timg = true; } @@ -625,8 +659,10 @@ void mDoExt_setupStageTexture(J3DModelData* i_modelData) { static JKRAssertHeap* AssertHeap; -JKRAssertHeap* mDoExt_createAssertHeap(JKRHeap* i_heap) { - return AssertHeap = JKRAssertHeap::create(i_heap); +JKRAssertHeap* mDoExt_createAssertHeap(JKRHeap* parentHeap) { + JUT_ASSERT(1666, AssertHeap == NULL); + AssertHeap = JKRAssertHeap::create(parentHeap); + return AssertHeap; } JKRAssertHeap* mDoExt_getAssertHeap() { @@ -635,8 +671,10 @@ JKRAssertHeap* mDoExt_getAssertHeap() { static JKRExpHeap* DbPrintHeap; -JKRExpHeap* mDoExt_createDbPrintHeap(u32 heapSize, JKRHeap* i_heap) { - return DbPrintHeap = JKRExpHeap::create(heapSize, i_heap, true); +JKRExpHeap* mDoExt_createDbPrintHeap(u32 heapSize, JKRHeap* parentHeap) { + JUT_ASSERT(1693, DbPrintHeap == NULL || heapSize == 0); + DbPrintHeap = JKRExpHeap::create(heapSize, parentHeap, true); + return DbPrintHeap; } JKRExpHeap* mDoExt_getDbPrintHeap() { @@ -645,8 +683,9 @@ JKRExpHeap* mDoExt_getDbPrintHeap() { JKRExpHeap* gameHeap; -JKRExpHeap* mDoExt_createGameHeap(u32 heapSize, JKRHeap* i_heap) { - gameHeap = JKRExpHeap::create(heapSize, i_heap, true); +JKRExpHeap* mDoExt_createGameHeap(u32 heapSize, JKRHeap* parentHeap) { + JUT_ASSERT(1739, gameHeap == NULL || heapSize == 0); + gameHeap = JKRExpHeap::create(heapSize, parentHeap, true); gameHeap->setAllocationMode(JKRExpHeap::ALLOC_MODE_1); return gameHeap; } @@ -655,44 +694,114 @@ JKRExpHeap* mDoExt_getGameHeap() { return gameHeap; } -JKRExpHeap* zeldaHeap; +void mDoExt_setSafeGameHeapSize() { + if (safeGameHeapSize < 0) { + safeGameHeapSize = mDoExt_getGameHeap()->getTotalUsedSize(); + OS_REPORT("++++++++++++++++++++++++++++++ GameHeap Rock !!\n"); + mDoExt_getGameHeap()->dump(); + mDoExt_getGameHeap()->changeGroupID(7); + } +} -JKRExpHeap* mDoExt_createZeldaHeap(u32 heapSize, JKRHeap* i_heap) { - return zeldaHeap = JKRExpHeap::create(heapSize, i_heap, true); +void dummy5() { + JUT_ASSERT(0, safeGameHeapSize >= 0); + OS_REPORT("++++++++++++++++++++++++++++++ safeGameHeapSize <%x>\n", safeGameHeapSize); +} + +size_t mDoExt_getSafeGameHeapSize() { + return safeGameHeapSize; +} + +JKRExpHeap* zeldaHeap; +intptr_t safeZeldaHeapSize = -1; + +JKRExpHeap* mDoExt_createZeldaHeap(u32 heapSize, JKRHeap* parentHeap) { + JUT_ASSERT(1815, zeldaHeap == NULL || heapSize == 0); + zeldaHeap = JKRExpHeap::create(heapSize, parentHeap, true); + return zeldaHeap; } JKRExpHeap* mDoExt_getZeldaHeap() { return zeldaHeap; } -#if DEBUG -s32 safeZeldaHeapSize = -1; +void mDoExt_setSafeZeldaHeapSize() { + if (safeGameHeapSize < 0) { + safeGameHeapSize = mDoExt_getGameHeap()->getTotalUsedSize(); + OS_REPORT("++++++++++++++++++++++++++++++ ZeldaHeap Rock !!\n"); + mDoExt_getGameHeap()->dump(); + mDoExt_getGameHeap()->changeGroupID(7); + } +} -s32 mDoExt_getSafeZeldaHeapSize() { +void mDoExt_addSafeZeldaHeapSize(intptr_t size) { + JUT_ASSERT(1869, safeZeldaHeapSize >= 0); + safeZeldaHeapSize -= size; + OS_REPORT("++++++++++++++++++++++++++++++ addSafeZeldaHeapSize <%x>\n", -size); + mDoExt_getZeldaHeap()->changeGroupID(mDoExt_getZeldaHeap()->getCurrentGroupId() + 1); +} + +intptr_t mDoExt_getSafeZeldaHeapSize() { return safeZeldaHeapSize; } -#endif JKRExpHeap* commandHeap; +intptr_t safeCommandHeapSize = -1; -JKRExpHeap* mDoExt_createCommandHeap(u32 heapSize, JKRHeap* i_heap) { - return commandHeap = JKRExpHeap::create(heapSize, i_heap, true); +JKRExpHeap* mDoExt_createCommandHeap(u32 heapSize, JKRHeap* parentHeap) { + JUT_ASSERT(1894, commandHeap == 0 || heapSize == 0); + commandHeap = JKRExpHeap::create(heapSize, parentHeap, true); + return commandHeap; } JKRExpHeap* mDoExt_getCommandHeap() { return commandHeap; } -JKRExpHeap* archiveHeap; +void mDoExt_setSafeCommandHeapSize() { + if (safeCommandHeapSize < 0) { + safeCommandHeapSize = mDoExt_getGameHeap()->getTotalUsedSize(); + OS_REPORT("++++++++++++++++++++++++++++++ CommandHeap Rock !!\n"); + mDoExt_getGameHeap()->dump(); + mDoExt_getGameHeap()->changeGroupID(7); + } +} -JKRExpHeap* mDoExt_createArchiveHeap(u32 heapSize, JKRHeap* i_heap) { - archiveHeap = JKRExpHeap::create(heapSize, i_heap, true); +intptr_t mDoExt_getSafeCommandHeapSize() { + return safeCommandHeapSize; +} + +JKRExpHeap* archiveHeap; +intptr_t safeArchiveHeapSize = -1; + +JKRExpHeap* mDoExt_createArchiveHeap(u32 heapSize, JKRHeap* parentHeap) { + JUT_ASSERT(1966, archiveHeap == 0 || heapSize == 0); + archiveHeap = JKRExpHeap::create(heapSize, parentHeap, true); archiveHeap->setAllocationMode(JKRExpHeap::ALLOC_MODE_1); return archiveHeap; } +void mDoExt_setSafeArchiveHeapSize() { + if (safeArchiveHeapSize < 0) { + safeArchiveHeapSize = mDoExt_getArchiveHeap()->getTotalUsedSize(); + OS_REPORT("++++++++++++++++++++++++++++++ ArchiveHeap Rock !!\n"); + mDoExt_getArchiveHeap()->dump(); + mDoExt_getArchiveHeap()->changeGroupID(7); + } +} + +void dummy6() { + JUT_ASSERT(0, safeArchiveHeapSize >= 0); + OS_REPORT("++++++++++++++++++++++++++++++ safeArchiveHeapSize <%x>\n", safeArchiveHeapSize); +} + +intptr_t mDoExt_getSafeArchiveHeapSize() { + return safeArchiveHeapSize; +} + JKRExpHeap* mDoExt_getArchiveHeap() { - return archiveHeap; + JKRExpHeap* heap = archiveHeap; + return heap; } JKRExpHeap* mDoExt_getArchiveHeapPtr() { @@ -700,37 +809,80 @@ JKRExpHeap* mDoExt_getArchiveHeapPtr() { } static JKRExpHeap* j2dHeap; +intptr_t safeJ2dHeapSize = -1; -JKRExpHeap* mDoExt_createJ2dHeap(u32 heapSize, JKRHeap* i_heap) { - j2dHeap = JKRExpHeap::create(heapSize, i_heap, true); +JKRExpHeap* mDoExt_createJ2dHeap(u32 heapSize, JKRHeap* parentHeap) { + JUT_ASSERT(2059, j2dHeap == 0 || heapSize == 0); + j2dHeap = JKRExpHeap::create(heapSize, parentHeap, true); j2dHeap->setAllocationMode(JKRExpHeap::ALLOC_MODE_1); return j2dHeap; } +void mDoExt_setSafeJ2dHeapSize() { + if (safeJ2dHeapSize < 0) { + safeJ2dHeapSize = mDoExt_getJ2dHeap()->getTotalUsedSize(); + OS_REPORT("++++++++++++++++++++++++++++++ j2dHeap Rock !!\n"); + mDoExt_getJ2dHeap()->dump(); + mDoExt_getJ2dHeap()->changeGroupID(7); + } +} + +void dummy7() { + JUT_ASSERT(0, safeJ2dHeapSize >= 0); + OS_REPORT("++++++++++++++++++++++++++++++ safeJ2dHeapSize <%x>\n", safeJ2dHeapSize); +} + +intptr_t mDoExt_getSafeJ2dHeapSize() { + return safeJ2dHeapSize; +} + JKRExpHeap* mDoExt_getJ2dHeap() { - return j2dHeap; + JKRExpHeap* heap = j2dHeap; + return heap; } static JKRExpHeap* HostIOHeap; +JKRHeap* mDoExt_createHostIOHeap(u32 heapSize, JKRHeap* parentHeap) { + JUT_ASSERT(2142, HostIOHeap == 0 || heapSize == 0); + HostIOHeap = JKRExpHeap::create(heapSize, parentHeap, true); + return HostIOHeap; +} + JKRExpHeap* mDoExt_getHostIOHeap() { return HostIOHeap; } -JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_alignment) { - if (i_heap == NULL) { - i_heap = JKRGetCurrentHeap(); +static JKRHeap* situationHeap; + +void dummy8(u32 heapSize) { + int situationHeapLocked = 0; + JUT_ASSERT(0, situationHeap == 0 || heapSize == 0); + JUT_ASSERT(0, situationHeapLocked == 0); + JUT_ASSERT(0, situationHeap); + JUT_ASSERT(0, situationHeapLocked); + JKRHeap* heap = NULL; + JUT_ASSERT(0, heap == situationHeap); +} + +static JKRHeap* mDoExt_SaveCurrentHeap; + +JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_parent, u32 i_alignment) { + if (i_parent == NULL) { + i_parent = JKRGetCurrentHeap(); } JKRSolidHeap* createdHeap; if (i_size == 0 || i_size == -1) { #if DEBUG - if (mDoExt::HeapAdjustVerbose != 0) { + if (mDoExt::HeapAdjustVerbose) { + // "mDoExt_createSolidHeap size not set" OS_REPORT("\x1b[44mmDoExt_createSolidHeap サイズ未設定\n\x1b[m"); - OS_REPORT("最大空き容量確保します %08x\n\x1b[m", i_heap->getFreeSize()); + // "Ensure that the maximum available space is allocated %08x" + OS_REPORT("最大空き容量確保します %08x\n\x1b[m", i_parent->getFreeSize()); } #endif - createdHeap = JKRCreateSolidHeap(-1, i_heap, false); + createdHeap = JKRCreateSolidHeap(-1, i_parent, false); } else { u32 solidHeapSize = ALIGN_NEXT(sizeof(JKRSolidHeap), 0x10); i_size = ALIGN_NEXT(i_size, 0x10); @@ -739,19 +891,19 @@ JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_alignmen if (0x10 < i_alignment) { i_size = (i_alignment - 0x10 + i_size); } - createdHeap = JKRCreateSolidHeap(i_size, i_heap, false); + createdHeap = JKRCreateSolidHeap(i_size, i_parent, false); } if (createdHeap != NULL) { JKRSetErrorFlag(createdHeap, true); #if DEBUG if (mDoExt::HeapAdjustVerbose != 0) { - u32 heapSize = createdHeap->getHeapSize(); + u32 solidHeapSize = createdHeap->getHeapSize(); OS_REPORT( "JKRCreateSolidHeap %08x i_size=%08x solidHeapSize=%08x\n", createdHeap, i_size, - heapSize + solidHeapSize ); } #endif @@ -762,13 +914,13 @@ JKRSolidHeap* mDoExt_createSolidHeap(u32 i_size, JKRHeap* i_heap, u32 i_alignmen OS_WARNING( "mDoExt_createMaxSolidHeap : ソリッドヒープ%fKの確保に失敗 連続空き容量=%fK 残り空き容量=%f\n", i_size / 1024.0f, - i_heap->getFreeSize() / 1024.0f, - i_heap->getTotalFreeSize() / 1024.0f + i_parent->getFreeSize() / 1024.0f, + i_parent->getTotalFreeSize() / 1024.0f ); - static BOOL dumped = FALSE; - if (dumped == FALSE) { - dumped = TRUE; - i_heap->dump_sort(); + static BOOL displayed = FALSE; + if (displayed == FALSE) { + displayed = TRUE; + i_parent->dump_sort(); } return createdHeap; } @@ -788,7 +940,7 @@ JKRSolidHeap* mDoExt_createSolidHeapFromSystem(u32 i_size, u32 i_alignment) { JKRSolidHeap* mDoExt_createSolidHeapToCurrent(JKRHeap** o_heap, u32 i_size, JKRHeap* i_parent, u32 i_alignment) { if (o_heap != NULL) { - *o_heap = JKRHeap::getCurrentHeap(); + *o_heap = JKRGetCurrentHeap(); } JKRSolidHeap* resultHeap = mDoExt_createSolidHeap(i_size, i_parent, i_alignment); @@ -799,19 +951,30 @@ JKRSolidHeap* mDoExt_createSolidHeapToCurrent(JKRHeap** o_heap, u32 i_size, JKRH return resultHeap; } -static JKRHeap* mDoExt_SaveCurrentHeap; - JKRSolidHeap* mDoExt_createSolidHeapToCurrent(u32 i_size, JKRHeap* i_parent, u32 i_alignment) { - return mDoExt_createSolidHeapToCurrent(&mDoExt_SaveCurrentHeap, i_size, i_parent, i_alignment); + JUT_ASSERT(2427, OSGetCurrentThread() == &mainThread); + JUT_ASSERT(2428, mDoExt_SaveCurrentHeap == 0); + JKRSolidHeap* heap = + mDoExt_createSolidHeapToCurrent(&mDoExt_SaveCurrentHeap, i_size, i_parent, i_alignment); + if (mDoExt::CurrentHeapAdjustVerbose) { + // "Saving the current heap %08x" + OS_REPORT("カレントヒープを保存 %08x\n", mDoExt_SaveCurrentHeap); + } + return heap; } JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(JKRHeap** o_heap, u32 i_size, u32 i_alignment) { - return mDoExt_createSolidHeapToCurrent(o_heap, i_size, mDoExt_getGameHeap(), i_alignment); + JKRExpHeap* gameHeap = mDoExt_getGameHeap(); + JKRSolidHeap* solidHeap = + mDoExt_createSolidHeapToCurrent(o_heap, i_size, gameHeap, i_alignment); + return solidHeap; } JKRSolidHeap* mDoExt_createSolidHeapFromGameToCurrent(u32 i_size, u32 i_alignment) { - return mDoExt_createSolidHeapToCurrent(i_size, mDoExt_getGameHeap(), i_alignment); + JKRExpHeap* gameHeap = mDoExt_getGameHeap(); + JKRSolidHeap* solidHeap = mDoExt_createSolidHeapToCurrent(i_size, gameHeap, i_alignment); + return solidHeap; } u32 mDoExt_adjustSolidHeap(JKRSolidHeap* i_heap) { @@ -875,23 +1038,54 @@ u32 mDoExt_adjustSolidHeapToSystem(JKRSolidHeap* i_heap) { } void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap) { - i_heap->destroy(); + JKRDestroySolidHeap(i_heap); + if (g_printOtherHeapDebug) { + // "Solid heap destruction" + OS_REPORT("mDoExt_destroySolidHeap ソリッドヒープ破壊 %08x\n", i_heap); + } } void mDoExt_destroyExpHeap(JKRExpHeap* i_heap) { - i_heap->destroy(); + bool var_r30 = true; + bool var_r28; +#if DEBUG + if (i_heap == mDoExt_getCurrentHeap()) { + OS_PANIC(2576, "Failed assertion i_heap != mDoExt_getCurrentHeap()"); + var_r28 = false; + if (!var_r28) { + var_r30 = false; + } + } +#endif + JKRDestroyExpHeap(i_heap); + if (g_printOtherHeapDebug) { + // "mDoExt_destroyExpHeap Exp heap destruction" + OS_REPORT("mDoExt_destroyExpHeap Expヒープ破壊 %08x\n", i_heap); + } } JKRHeap* mDoExt_setCurrentHeap(JKRHeap* heap) { - return heap->becomeCurrentHeap(); + JUT_ASSERT(2594, heap != NULL); + JKRHeap* result = JKRSetCurrentHeap(heap); + if (mDoExt::CurrentHeapAdjustVerbose) { + // "Changing the current heap to the specified heap %08x->%08x" + OS_REPORT("カレントヒープを指定ヒープに変更 %08x->%08x\n", result, heap); + } + return result; } JKRHeap* mDoExt_getCurrentHeap() { - return JKRHeap::getCurrentHeap(); + return JKRGetCurrentHeap(); } void mDoExt_restoreCurrentHeap() { - mDoExt_SaveCurrentHeap->becomeCurrentHeap(); + JUT_ASSERT(2711, OSGetCurrentThread() == &mainThread); + JUT_ASSERT(2712, mDoExt_SaveCurrentHeap != FALSE); + JKRHeap* result = JKRSetCurrentHeap(mDoExt_SaveCurrentHeap); + if (mDoExt::CurrentHeapAdjustVerbose) { + // "The current heap has been restored %08x->%08x" + OS_REPORT("カレントヒープを復帰しました %08x->%08x\n", result, mDoExt_SaveCurrentHeap); + } mDoExt_SaveCurrentHeap = NULL; } @@ -920,14 +1114,14 @@ void mDoExt_MtxCalcAnmBlendTbl::calc() { Quaternion quat3; mAnmRatio->getAnmTransform()->getTransform(jntNo, &info2); JMAEulerToQuat(info2.mRotation.x, info2.mRotation.y, info2.mRotation.z, &quat1); + f32 f30 = mAnmRatio->getRatio(); quat3 = quat1; for (int i = 1; i < mNum; i++) { - J3DAnmTransform* transform = mAnmRatio[i].getAnmTransform(); - if (transform) { + if (mAnmRatio[i].getAnmTransform() != NULL) { J3DTransformInfo info3; - transform->getTransform(jntNo, &info3); + mAnmRatio[i].getAnmTransform()->getTransform(jntNo, &info3); f32 ratio = mAnmRatio[i].getRatio(); - f32 f30 = 1.0f - ratio; + f30 = 1.0f - ratio; JMAEulerToQuat(info3.mRotation.x, info3.mRotation.y, info3.mRotation.z, &quat2); JMAQuatLerp(&quat1, &quat2, ratio, &quat3); quat1 = quat3; @@ -940,7 +1134,7 @@ void mDoExt_MtxCalcAnmBlendTbl::calc() { } } Mtx mtx; - MTXQuat(mtx, &quat3); + mDoMtx_quat(mtx, &quat3); mDoExt_setJ3DData(mtx, &info2, jntNo); } @@ -955,23 +1149,24 @@ void mDoExt_MtxCalcAnmBlendTblOld::calc() { Quaternion quat3; mAnmRatio->getAnmTransform()->getTransform(jntNo, &info1); JMAEulerToQuat(info1.mRotation.x, info1.mRotation.y, info1.mRotation.z, &quat1); + f32 var_f31; + f32 var_f30 = mAnmRatio[0].getRatio(); quat3 = quat1; for (int i = 1; i < mNum; i++) { if (mAnmRatio[i].getAnmTransform()) { - J3DAnmTransform* transform = mAnmRatio[i].getAnmTransform(); J3DTransformInfo info2; - transform->getTransform(jntNo, &info2); - f32 ratio = mAnmRatio[i].getRatio(); - f32 f30 = 1.0f - ratio; + mAnmRatio[i].getAnmTransform()->getTransform(jntNo, &info2); + var_f31 = mAnmRatio[i].getRatio(); + var_f30 = 1.0f - var_f31; JMAEulerToQuat(info2.mRotation.x, info2.mRotation.y, info2.mRotation.z, &quat2); - JMAQuatLerp(&quat1, &quat2, ratio, &quat3); + JMAQuatLerp(&quat1, &quat2, var_f31, &quat3); quat1 = quat3; - info1.mTranslate.x = info1.mTranslate.x * f30 + info2.mTranslate.x * ratio; - info1.mTranslate.y = info1.mTranslate.y * f30 + info2.mTranslate.y * ratio; - info1.mTranslate.z = info1.mTranslate.z * f30 + info2.mTranslate.z * ratio; - info1.mScale.x = info1.mScale.x * f30 + info2.mScale.x * ratio; - info1.mScale.y = info1.mScale.y * f30 + info2.mScale.y * ratio; - info1.mScale.z = info1.mScale.z * f30 + info2.mScale.z * ratio; + info1.mTranslate.x = info1.mTranslate.x * var_f30 + info2.mTranslate.x * var_f31; + info1.mTranslate.y = info1.mTranslate.y * var_f30 + info2.mTranslate.y * var_f31; + info1.mTranslate.z = info1.mTranslate.z * var_f30 + info2.mTranslate.z * var_f31; + info1.mScale.x = info1.mScale.x * var_f30 + info2.mScale.x * var_f31; + info1.mScale.y = info1.mScale.y * var_f30 + info2.mScale.y * var_f31; + info1.mScale.z = info1.mScale.z * var_f30 + info2.mScale.z * var_f31; } } @@ -979,15 +1174,15 @@ void mDoExt_MtxCalcAnmBlendTblOld::calc() { Quaternion* oldQuat = mOldFrame->getOldFrameQuaternion(jntNo); if (mOldFrame->getOldFrameFlg()) { if (mOldFrame->getOldFrameRate() > 0.0f && mOldFrame->getOldFrameStartJoint() <= jntNo && mOldFrame->getOldFrameEndJoint() > jntNo) { - f32 oldFrameRate = mOldFrame->getOldFrameRate(); - f32 f31 = 1.0f - oldFrameRate; - JMAQuatLerp(oldQuat, &quat1, f31, &quat3); - info1.mTranslate.x = info1.mTranslate.x * f31 + oldTransInfo->mTranslate.x * oldFrameRate; - info1.mTranslate.y = info1.mTranslate.y * f31 + oldTransInfo->mTranslate.y * oldFrameRate; - info1.mTranslate.z = info1.mTranslate.z * f31 + oldTransInfo->mTranslate.z * oldFrameRate; - info1.mScale.x = info1.mScale.x * f31 + oldTransInfo->mScale.x * oldFrameRate; - info1.mScale.y = info1.mScale.y * f31 + oldTransInfo->mScale.y * oldFrameRate; - info1.mScale.z = info1.mScale.z * f31 + oldTransInfo->mScale.z * oldFrameRate; + var_f30 = mOldFrame->getOldFrameRate(); + var_f31 = 1.0f - var_f30; + JMAQuatLerp(oldQuat, &quat1, var_f31, &quat3); + info1.mTranslate.x = info1.mTranslate.x * var_f31 + oldTransInfo->mTranslate.x * var_f30; + info1.mTranslate.y = info1.mTranslate.y * var_f31 + oldTransInfo->mTranslate.y * var_f30; + info1.mTranslate.z = info1.mTranslate.z * var_f31 + oldTransInfo->mTranslate.z * var_f30; + info1.mScale.x = info1.mScale.x * var_f31 + oldTransInfo->mScale.x * var_f30; + info1.mScale.y = info1.mScale.y * var_f31 + oldTransInfo->mScale.y * var_f30; + info1.mScale.z = info1.mScale.z * var_f31 + oldTransInfo->mScale.z * var_f30; } } else if (jntNo == modelData->getJointNum() - 1) { mOldFrame->onOldFrameFlg(); @@ -1141,10 +1336,7 @@ int mDoExt_McaMorf::create(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* c goto cleanup; } mpQuat = new Quaternion[modelData->getJointNum()]; - if (!mpQuat) { - goto cleanup; - } - { + if (mpQuat) { J3DTransformInfo* info = mpTransformInfo; Quaternion* quat = mpQuat; J3DModelData* r23 = mpModel->getModelData(); @@ -1996,6 +2188,14 @@ void mDoExt_McaMorf2::stopZelAnime() { } } +void mDoExt_offCupOnAupPacket::draw() { + GFSetBlendModeEtc(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_CLEAR, 0, 1, 1); +} + +void mDoExt_onCupOffAupPacket::draw() { + GFSetBlendModeEtc(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_CLEAR, 1, 0, 1); +} + void mDoExt_invJntPacket::draw() { J3DShape::resetVcdVatCache(); @@ -2360,14 +2560,14 @@ void mDoExt_3DlineMat0_c::update(int param_0, GXColor& param_2, dKy_tevstr_c* pa mDoExt_3Dline_field_0x10_c* local_r30; mDoExt_3Dline_field_0x10_c* local_r29; mDoExt_3Dline_field_0x10_c* sp_1c; - f32* sp_18; + f32* size_p; for (s32 sp_14 = 0; sp_14 < field_0x10; sp_14++) { local_r27 = sp_30->field_0x0; - sp_18 = sp_30->field_0x4; + size_p = sp_30->field_0x4; - JUT_ASSERT(0x1545, sp_18 != NULL); + JUT_ASSERT(5445, size_p != NULL); sp_20 = ((mDoExt_3Dline_c*)((intptr_t)sp_30 + (field_0x16 << 2)))->field_0x8; sp_24 = sp_20; @@ -2388,11 +2588,11 @@ void mDoExt_3DlineMat0_c::update(int param_0, GXColor& param_2, dKy_tevstr_c* pa local_r29->y = -local_r30->y; local_r29->z = -local_r30->z; - sp_120 *= *sp_18; + sp_120 *= *size_p; *sp_24++ = *local_r27 + sp_120; *sp_24++ = *local_r27 - sp_120; local_r27++; - sp_18++; + size_p++; sp_114 = *local_r27 + sp_120; sp_108 = *local_r27 - sp_120; @@ -2412,14 +2612,14 @@ void mDoExt_3DlineMat0_c::update(int param_0, GXColor& param_2, dKy_tevstr_c* pa local_r29->y = -local_r30->y; local_r29->z = -local_r30->z; - sp_120 *= *sp_18; + sp_120 *= *size_p; sp_114 += *local_r27 + sp_120; sp_108 += *local_r27 - sp_120; *sp_24++ = sp_114 * 0.5f; *sp_24++ = sp_108 * 0.5f; local_r27++; - sp_18++; + size_p++; sp_114 = *local_r27 + sp_120; sp_108 = *local_r27 - sp_120; @@ -2483,7 +2683,7 @@ void mDoExt_3DlineMat1_c::setMaterial() { dKy_GxFog_set(); GXCallDisplayList(l_mat1DL, 0x80); GXLoadPosMtxImm(j3dSys.getViewMtx(), GX_PNMTX0); - GXLoadNrmMtxImm(g_mDoMtx_identity, GX_PNMTX0); + GXLoadNrmMtxImm(cMtx_getIdentity(), GX_PNMTX0); } void mDoExt_3DlineMat1_c::draw() { @@ -2531,16 +2731,7 @@ void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, _GXColor& param_2, u1 } view_class* sp_3c = dComIfGd_getView(); mDoExt_3Dline_c* sp_38 = mpLines; - f32 local_f30; - f32 local_f26; - f32 local_f29; - f32 local_f27; - if (param_3 != 0) { - local_f26 = param_1 / param_3; - } else { - local_f26 = 0.0f; - } - local_f27 = local_f26; + f32 local_f27 = param_3 != 0 ? param_1 / param_3 : 0.0f; u32 sp_34 = (field_0x34 << 1) * 12; u32 sp_30 = (field_0x34 << 1) * 3; @@ -2563,6 +2754,7 @@ void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, _GXColor& param_2, u1 mDoExt_3Dline_field_0x18_c* sp_18; + f32 local_f29; f32 local_f31 = 0.0f; for (s32 sp_14 = 0; sp_14 < mNumLines; sp_14++) { @@ -2583,7 +2775,7 @@ void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, _GXColor& param_2, u1 sp_1c++->field_0x4 = local_f31; sp_130 = local_r27[1] - local_r27[0]; - local_f30 = sp_130.abs(); + f32 local_f30 = sp_130.abs(); if (param_1 < 8.0f) { local_f31 += local_f30 * 0.1f; @@ -2602,7 +2794,7 @@ void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, _GXColor& param_2, u1 local_r28->y = -local_r30->y; local_r28->z = -local_r30->z; - sp_130 *= param_1; + sp_130 *= local_f29; *sp_28++ = *local_r27 + sp_130; *sp_28++ = *local_r27 - sp_130; local_r27++; @@ -2677,6 +2869,23 @@ void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, _GXColor& param_2, u1 sp_38++; } } +#include "assets/l_mat2DL__d_a_grass.h" + +void mDoExt_3DlineMat2_c::setMaterial() { + j3dSys.reinitGX(); + GXSetNumIndStages(0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_INDEX16); + GXSetVtxDesc(GX_VA_NRM, GX_INDEX16); + GXSetVtxDesc(GX_VA_TEX0, GX_INDEX16); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_RGB8, 6); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_F32, 0); + dKy_GxFog_set(); + GXCallDisplayList(NULL, 0x80); // DEBUG NONMATCHING - this is supposed to reference l_mat2DL + GXLoadPosMtxImm(j3dSys.getViewMtx(), 0); + GXLoadNrmMtxImm(cMtx_getIdentity(), 0); +} void mDoExt_3DlineMat1_c::update(int param_0, _GXColor& param_2, dKy_tevstr_c* param_4) { mColor = param_2; @@ -2709,11 +2918,11 @@ void mDoExt_3DlineMat1_c::update(int param_0, _GXColor& param_2, dKy_tevstr_c* p mDoExt_3Dline_field_0x18_c* sp_1c; mDoExt_3Dline_field_0x18_c* sp_18; f32 local_f31 = 0.0f; - f32* local_r18; + f32* size_p; for (s32 sp_14 = 0; sp_14 < mNumLines; sp_14++) { local_r27 = sp_38[0].field_0x0; - local_r18 = sp_38->field_0x4; - JUT_ASSERT(0x16f3, sp_18 != NULL); + size_p = sp_38->field_0x4; + JUT_ASSERT(5875, size_p != NULL); sp_24 = ((mDoExt_3Dline_c*)((intptr_t)sp_38 + (mIsDrawn << 2)))->field_0x8; sp_28 = sp_24; sp_20 = ((mDoExt_3Dline_c*)((intptr_t)sp_38 + (mIsDrawn << 2)))->field_0x10; @@ -2735,11 +2944,11 @@ void mDoExt_3DlineMat1_c::update(int param_0, _GXColor& param_2, dKy_tevstr_c* p local_r28->x = -local_r30->x; local_r28->y = -local_r30->y; local_r28->z = -local_r30->z; - sp_130 *= *local_r18; + sp_130 *= *size_p; *sp_28++ = local_r27[0] + sp_130; *sp_28++ = local_r27[0] - sp_130; local_r27++; - local_r18++; + size_p++; sp_124 = local_r27[0] + sp_130; sp_118 = local_r27[0] - sp_130; for (s32 sp_10 = field_0x34 - 2; sp_10 > 0; sp_10--) { @@ -2759,13 +2968,13 @@ void mDoExt_3DlineMat1_c::update(int param_0, _GXColor& param_2, dKy_tevstr_c* p local_r28->x = -local_r30->x; local_r28->y = -local_r30->y; local_r28->z = -local_r30->z; - sp_130 *= *local_r18; + sp_130 *= *size_p; sp_124 += local_r27[0] + sp_130; sp_118 += local_r27[0] - sp_130; *sp_28++ = sp_124 * 0.5f; *sp_28++ = sp_118 * 0.5f; local_r27++; - local_r18++; + size_p++; sp_124 = local_r27[0] + sp_130; sp_118 = local_r27[0] - sp_130; } @@ -3351,33 +3560,50 @@ void mDoExt_cylinderMPacket::draw() { } #endif -static void mDoExt_initFontCommon(JUTFont** mDoExt_font, ResFONT** mDoExt_resfont, JKRHeap* param_2, +static void mDoExt_initFontCommon(JUTFont** mDoExt_font_p, ResFONT** mDoExt_resfont_p, JKRHeap* param_2, char const* param_3, JKRArchive* param_4, u8 param_5, u32 param_6, u32 param_7) { - JUT_ASSERT(7141, mDoExt_font == NULL); - JUT_ASSERT(7142, mDoExt_resfont == NULL); + JUTFont** mDoExt_font = mDoExt_font_p; + ResFONT** mDoExt_resfont = mDoExt_resfont_p; + // these assertion messages are fakematches, not quite sure what's going on here - + // the assembly indicates the parameters are dereferenced inline into compiler temps, + // but the messages don't show a dereference + JUT_ASSERT_MSG(7141, *mDoExt_font == NULL, "mDoExt_font == 0"); + JUT_ASSERT_MSG(7142, *mDoExt_resfont == NULL, "mDoExt_resfont == 0"); *mDoExt_resfont = (ResFONT*)JKRGetResource('ROOT', param_3, param_4); - JUT_ASSERT(7144, *mDoExt_resfont != NULL); + JUT_ASSERT_MSG(7144, *mDoExt_resfont != NULL, "mDoExt_resfont != 0"); if (param_5 == 0) { u32 cacheSize = JUTCacheFont::calcCacheSize(param_7, param_6); JUTCacheFont* cacheFont = new (param_2, 0) JUTCacheFont(*mDoExt_resfont, cacheSize, param_2); if (cacheFont->isValid()) { + // "Allocated %d bytes for font cache buffer size" + OS_REPORT("\nキャッシュフォントバッファサイズとして %d バイト確保しました\n", cacheSize); + // "The size of the JUTCacheFont class is %d bytes." + OS_REPORT("JUTCacheFontクラスサイズは %d バイトです。\n", sizeof(JUTCacheFont)); + // "The number of cached pages is %d." + OS_REPORT("キャッシュページ数は %d です。\n\n", cacheFont->getCachePage()); + // "The maximum sheet size is %d." + OS_REPORT("シートサイズ（最大）は %d です。\n\n", cacheFont->getMaxSheetSize()); *mDoExt_font = cacheFont; cacheFont->setPagingType(JUTCacheFont::PAGE_TYPE_1); } JKRRemoveResource(*mDoExt_resfont, NULL); *mDoExt_resfont = NULL; } else { - JUTResFont* local_28 = new JUTResFont(*mDoExt_resfont, param_2); - *mDoExt_font = local_28; + *mDoExt_font = new JUTResFont(*mDoExt_resfont, param_2); + // "Allocated %d bytes for the font buffer size" + OS_REPORT("\nフォントバッファサイズとして %d バイト確保しました\n", + JKRGetMemBlockSize(param_2, *mDoExt_font)); + // "The size of the JUTResFont class is %d bytes." + OS_REPORT("JUTResFontクラスサイズは %d バイトです。\n", sizeof(JUTResFont)); } if (*mDoExt_font != NULL && !(*mDoExt_font)->isValid()) { - // Failed to create cache font class + // "Failed to create cache font class" OSReport_FatalError("\nキャッシュフォントクラス作成に失敗しました\n"); delete *mDoExt_font; *mDoExt_font = NULL; } - JUT_ASSERT(7183, mDoExt_font != NULL); + JUT_ASSERT_MSG(7183, *mDoExt_font != NULL, "mDoExt_font != 0"); } static JUTFont* mDoExt_font0; @@ -3468,6 +3694,10 @@ JUTFont* mDoExt_getSubFont() { return mDoExt_font2; } +void dummy9() { + JUT_ASSERT(0, mDoExt_font1_getCount > 0); +} + void mDoExt_removeSubFont() { JUT_ASSERT(7354, mDoExt_font2_getCount > 0); if (mDoExt_font2_getCount > 0) { @@ -3489,8 +3719,13 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u3 J3DModel* model = new J3DModel(); if (model != NULL) { +#if DEBUG + model->getBaseTRMtx()[0][0] = MAXFLOAT; +#endif + bool hasSharedDlistObj = + i_modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL; // Update the modelFlag if the model data passed in has a shared dlist object - if (i_modelData->getMaterialNodePointer(0)->getSharedDisplayListObj() != NULL) { + if (hasSharedDlistObj != NULL) { if (i_modelData->isLocked()) { i_modelFlag = J3DMdlFlag_UseSharedDL; } else if (i_modelFlag == J3DMdlFlag_UseSharedDL) { @@ -3501,7 +3736,8 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u3 } // Set up the model - if (model->entryModelData(i_modelData, i_modelFlag, 1) == kJ3DError_Success) { + s32 entryModelData = model->entryModelData(i_modelData, i_modelFlag, 1); + if (entryModelData == kJ3DError_Success) { if (i_modelFlag == J3DMdlFlag_DifferedDLBuffer && model->newDifferedDisplayList(i_differedDlistFlag) != kJ3DError_Success) { @@ -3517,6 +3753,114 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u3 return NULL; } +DummyCheckHeap* dch; + +DummyCheckHeap::DummyCheckHeap() { + mAlloc = NULL; + mSize = 0; + mHeap = NULL; +} + +DummyCheckHeap::~DummyCheckHeap() { + if (mHeap != NULL) { + mHeap->destroy(); + } +} + +int DummyCheckHeap::isVirgin() { + if (mAlloc != NULL && mSize > 0) { + for (int i = 0; i < mSize; i++) { + if (((u8*)mAlloc)[i] != 0xdd) { + u8* off = (u8*)mAlloc + i; + // "DummyCheckHeap: Heap corruption detected" + OS_REPORT_ERROR("DummyCheckHeap 領域破壊発見 %08x+%08x=%08x\n", mAlloc, i, off); + return false; + } + } + } + return true; +} + +JKRHeap* DummyCheckHeap::getHeap() { + if (mHeap != NULL) { + JUT_ASSERT(7604, mHeap); + JUT_ASSERT(7605, mAlloc); + JKRHeap* heap = mHeap; + JUT_ASSERT(7607, mSize > 0); + isVirgin(); + JKRFreeToHeap(mHeap, mAlloc); + mHeap = NULL; + mAlloc = NULL; + return heap; + } else { + return NULL; + } +} + +void DummyCheckHeap::setHeap(JKRHeap* heap) { + JUT_ASSERT(7620, heap != NULL); + JUT_ASSERT(7621, mHeap == NULL); + JUT_ASSERT(7622, mAlloc == NULL); + mHeap = heap; + mSize = JKRGetFreeSize(mHeap); + JUT_ASSERT(7625, mSize > 0); + mAlloc = JKRAllocFromHeap(mHeap, mSize, 0); + JUT_ASSERT(7627, mAlloc); + memset(mAlloc, 0xdd, mSize); +} + +int DummyCheckHeap_init() { + JUT_ASSERT(7634, dch == NULL); + dch = new((JKRHeap*)mDoExt_getZeldaHeap(), 0) DummyCheckHeap(); + if (dch == NULL) { + return false; + } + + return true; +} + +int DummyCheckHeap_create() { + if (dch != NULL) { + if (dch->mHeap == NULL) { + JKRHeap* rootHeap = JKRGetRootHeap2(); + JKRHeap* heap = JKRCreateExpHeap(0x60000, rootHeap, false); + if (heap == NULL) { + // "DummyCheckHeap allocation failure" + OS_REPORT_ERROR("DummyCheckHeap_create 領域確保失敗\n"); + return 0; + } + dch->setHeap(heap); + } + return 1; + } + return 0; +} + +void DummyCheckHeap_destroy() { + if (dch != NULL && dch->mHeap != NULL) { + JKRHeap* heap = dch->getHeap(); + if (heap != NULL) { + heap->destroy(); + } + } +} + +int DummyCheckHeap_isVirgin() { + int retval; + if (dch != NULL) { + retval = dch->isVirgin(); + } else { + retval = 1; + } + return retval; +} + +void DummyCheckHeap_check() { + if (dch != NULL) { + DummyCheckHeap_isVirgin(); + } +} + u32 aram_cache_size; void mDoExt_setAraCacheSize(u32 size) { diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 430bbadc9b..4525bbb97e 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -864,7 +864,7 @@ void parse_args(int argc, const char* argv[]) { static u8 mainThreadStack[32768]; -static OSThread mainThread; +OSThread mainThread; void main(int argc, const char* argv[]) { OSThread* current_thread = OSGetCurrentThread(); From 350d24b4b4925a9c87b94a6933747d53736fdd2f Mon Sep 17 00:00:00 2001 From: roeming Date: Sun, 4 Jan 2026 20:22:04 -0500 Subject: [PATCH 28/35] d_a_e_rdy debug work (#3011) * debug work for d_a_e_rdy * remove unused fake function * fix regressions * rename variable * Fix version diffs of angle adding --- include/SSystem/SComponent/c_angle.h | 7 + include/SSystem/SComponent/c_lib.h | 2 +- include/d/actor/d_a_e_yc.h | 2 +- src/SSystem/SComponent/c_lib.cpp | 4 +- src/d/actor/d_a_alink.cpp | 6 +- src/d/actor/d_a_cstatue.cpp | 2 +- src/d/actor/d_a_e_rdy.cpp | 623 +++++++++++++++------------ 7 files changed, 365 insertions(+), 281 deletions(-) diff --git a/include/SSystem/SComponent/c_angle.h b/include/SSystem/SComponent/c_angle.h index 40377f4283..4afd36e504 100644 --- a/include/SSystem/SComponent/c_angle.h +++ b/include/SSystem/SComponent/c_angle.h @@ -3,6 +3,13 @@ #include "SSystem/SComponent/c_xyz.h" +#if PLATFORM_SHIELD +#define ADD_ANGLE(x, y) ((x) += (s16)(y)) +#else +#define ADD_ANGLE(x, y) ((x) += (y)) +#endif + + class cSAngle { private: s16 mAngle; diff --git a/include/SSystem/SComponent/c_lib.h b/include/SSystem/SComponent/c_lib.h index 48cf3c71df..4a29fb58b3 100644 --- a/include/SSystem/SComponent/c_lib.h +++ b/include/SSystem/SComponent/c_lib.h @@ -102,7 +102,7 @@ void MtxTrans(f32, f32, f32, u8); void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void MtxPush(void); -Mtx* MtxPull(void); +void MtxPull(void); extern Mtx* calc_mtx; diff --git a/include/d/actor/d_a_e_yc.h b/include/d/actor/d_a_e_yc.h index 03d3d0606d..18920192b6 100644 --- a/include/d/actor/d_a_e_yc.h +++ b/include/d/actor/d_a_e_yc.h @@ -43,7 +43,7 @@ public: /* 0x6A2 */ s16 mTimer[4]; /* 0x6AA */ s16 mCcDisableTimer; /* 0x6AC */ u32 mRiderID; - /* 0x6B0 */ u8 field_0x6b0; + /* 0x6B0 */ s8 field_0x6b0; /* 0x6B1 */ u8 field_0x6b1; /* 0x6B2 */ s8 mNoDrawFlag; /* 0x6B3 */ s8 mWolfBiteDamageCount; diff --git a/src/SSystem/SComponent/c_lib.cpp b/src/SSystem/SComponent/c_lib.cpp index 85587fa018..c9646531c7 100644 --- a/src/SSystem/SComponent/c_lib.cpp +++ b/src/SSystem/SComponent/c_lib.cpp @@ -530,6 +530,6 @@ void MtxPush() { MTXCopy(mtx, *calc_mtx); } -Mtx* MtxPull() { - return calc_mtx--; +void MtxPull() { + calc_mtx--; } diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index f0f878205f..f940a04974 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -2855,11 +2855,7 @@ s16 daAlink_c::getNeckAimAngle(cXyz* param_0, s16* param_1, s16* param_2, s16* p s16 sp18; s16 sp16 = field_0x2fe6 + mBodyAngle.y; if ((mProcID == PROC_GOAT_CATCH && mProcVar1.field_0x300a == 0) || (mProcID == PROC_HAND_PAT && mProcVar2.field_0x300c == 0)) { -#if VERSION == VERSION_SHIELD_DEBUG - sp16 += (s16)0x8000; -#else - sp16 -= (s16)0x8000; -#endif + ADD_ANGLE(sp16, 0x8000); } cXyz sp28 = eyePos - field_0x34e0; diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 3c7b71b1a2..727d2fb833 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -1043,7 +1043,7 @@ void daCstatue_c::initStartBrkBtk() { for (int iParticle = 0; iParticle < 2; iParticle++) { dComIfGp_particle_set(0x88bb, &mBallPos, &angle, NULL); dComIfGp_particle_set(0x88bc, &mBallPos, &angle, NULL); - angle.y -= (s16)0x8000; + ADD_ANGLE(angle.y, 0x8000); } } diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 9958da8446..0c7b4967e8 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -229,14 +229,37 @@ daE_RDY_HIO_c::daE_RDY_HIO_c() { field_0x4c = 33.0f; field_0x40 = 5.0f; } - +#if DEBUG void daE_RDY_HIO_c::genMessage(JORMContext* context) { - // DEBUG NONMATCHING + context->genLabel(" 闇ライダー", 0x80000001); + context->genSlider("基本サイズ", &mScale, 0.0f, 5.0f); + context->genSlider("移動速度", &mWalkSpeed, 0.0f, 20.0f); + context->genLabel(" ～～ こん棒兵の場合 ～～", 0x80000001); + context->genSlider("突進速度", &mRunSpeed, 0.0f, 40.0f); + context->genSlider("戦闘開始範囲", &field_0x18, 0.0f, 2000.0f); + context->genSlider("攻撃開始範囲", &field_0x1c, 0.0f, 1000.0f); + context->genSlider("振り速さ", &mAttackAnmSpeed, 0.0f, 3.0f); + context->genLabel(" ", 0x80000001); + context->genLabel(" ～～ 矢兵の場合 ～～", 0x80000001); + context->genSlider("号令→構えの間", &field_0x24, 0, 200); + context->genSlider("攻撃範囲", &field_0x28, 0.0f, 2000.0f); + context->genSlider("騎乗発射距離", &field_0x2c, 0.0f, 3000.0f); + context->genSlider("狼倒れ力Y", &field_0x30, 0.0f, 50.0f); + context->genSlider("狼倒れ力Z", &field_0x34, 0.0f, 50.0f); + context->genSlider("飛びＺ（騎乗停止）", &field_0x48, 0.0f, 50.0f); + context->genSlider("飛びＺ", &field_0x44, 0.0f, 50.0f); + context->genSlider("飛びＹ", &field_0x4c, 0.0f, 50.0f); + context->genSlider("飛びＧ", &field_0x40, 0.0f, 20.0f); + context->genCheckBox("不死身", &field_0x39, 1); + context->genCheckBox("目ポリゴン", &mDrawEyeModel, 1); + context->genCheckBox("一撃必殺", &field_0x3b, 1); + context->genSlider("一騎（ダ）サイズ", &field_0x3c, 0.0f, 150.0f); } +#endif static void anm_init(e_rdy_class* i_this, int i_anm, f32 i_morf, u8 i_attr, f32 i_rate) { - J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, i_anm); - i_this->mpMorf->setAnm(bck, i_attr, i_morf, i_rate, 0.0f, -1.0f); + i_this->mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, i_anm), i_attr, + i_morf, i_rate, 0.0f, -1.0f); i_this->mAnm = i_anm; if (i_anm == ANM_KYORO2) { @@ -291,16 +314,18 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { } } else if (jnt_no == JNT_HEAD) { if (_this->field_0xa98 != 3 && _this->field_0xa98 != 4) { - cMtx_YrotM(*calc_mtx, (_this->field_0xa9e - _this->field_0xa9a) / 2); - cMtx_ZrotM(*calc_mtx, (_this->field_0xb8c[0] - + (_this->field_0xb02[0].x - _this->field_0xa9c)) / 2); + cMtx_YrotM(*calc_mtx, (-_this->field_0xa9a + _this->field_0xa9e) / 2); + cMtx_ZrotM(*calc_mtx, (_this->field_0xb8c[0] + + (-_this->field_0xa9c + _this->field_0xb02[0].x)) / + 2); } } else if (jnt_no == JNT_KUBI) { cMtx_YrotM(*calc_mtx, _this->field_0xb02[0].y); if (_this->field_0xa98 != 3 && _this->field_0xa98 != 4) { - cMtx_YrotM(*calc_mtx, (_this->field_0xa9e - _this->field_0xa9a) / 2); - cMtx_ZrotM(*calc_mtx, (_this->field_0xb8c[0] - + (_this->field_0xb02[0].x - _this->field_0xa9c)) / 2); + cMtx_YrotM(*calc_mtx, (-_this->field_0xa9a + _this->field_0xa9e) / 2); + cMtx_ZrotM(*calc_mtx, (_this->field_0xb8c[0] + + (-_this->field_0xa9c + _this->field_0xb02[0].x)) / + 2); } else { cMtx_ZrotM(*calc_mtx, _this->field_0xb02[0].x + _this->field_0xb8c[0]); } @@ -334,12 +359,15 @@ static int nodeCallBack(J3DJoint* i_joint, int param_1) { static int nodeCallBack_bow(J3DJoint* i_joint, int param_1) { if (param_1 == 0) { - int jnt_no = i_joint->getJntNo(); + J3DJoint* joint = i_joint; + int jnt_no = joint->getJntNo(); J3DModel* model = j3dSys.getModel(); + e_rdy_class* _this = (e_rdy_class*)model->getUserArea(); + e_rdy_class* unused = _this; if (_this != NULL && _this->mBowRotation != 0) { MTXCopy(model->getAnmMtx(jnt_no), *calc_mtx); - mDoMtx_ZrotM(*calc_mtx, _this->mBowRotation); + cMtx_ZrotM(*calc_mtx, _this->mBowRotation); model->setAnmMtx(jnt_no, *calc_mtx); MTXCopy(*calc_mtx, J3DSys::mCurrentMtx); } @@ -349,7 +377,6 @@ static int nodeCallBack_bow(J3DJoint* i_joint, int param_1) { } static int daE_RDY_Draw(e_rdy_class* i_this) { - fopAc_ac_c* a_this = &i_this->actor; if (i_this->field_0x5b8 == 12 /* dSv_event_flag_c::T_0239 - Lake Hylia - Spoke with Fyer (start dark carge) */ && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[239])) { @@ -359,14 +386,16 @@ static int daE_RDY_Draw(e_rdy_class* i_this) { if (i_this->mKargarokDeleteTimer != 0) { return 1; } + fopAc_ac_c* a_this = &i_this->actor; - J3DModel* model = i_this->mpMorf->getModel(); + J3DModel* model = i_this->mpMorf->getModel(); // sp18 g_env_light.settingTevStruct(2, &a_this->current.pos, &a_this->tevStr); dComIfGd_setListDark(); g_env_light.setLightTevColorType_MAJI(model, &a_this->tevStr); - + J3DModelData* model_data; + J3DMaterial* material; if (i_this->mIsDying) { - J3DModelData* model_data = model->getModelData(); + model_data = model->getModelData(); // r26 for (u16 i = 0; i < model_data->getMaterialNum(); i++) { J3DMaterial* material = model_data->getMaterialNodePointer(i); material->getTevColor(0)->r = i_this->mDyingTevColor; @@ -380,7 +409,7 @@ static int daE_RDY_Draw(e_rdy_class* i_this) { if (i_this->mIsDying) { J3DModelData* model_data = model->getModelData(); for (u16 i = 0; i < model_data->getMaterialNum(); i++) { - J3DMaterial* material = model_data->getMaterialNodePointer(i); + material = model_data->getMaterialNodePointer(i); material->getTevColor(0)->r = 0; material->getTevColor(0)->g = 0; material->getTevColor(0)->b = 0; @@ -402,9 +431,9 @@ static int daE_RDY_Draw(e_rdy_class* i_this) { if (i_this->mDrawEyeModel) { for (int i = 0; i < 2; i++) { g_env_light.setLightTevColorType_MAJI(i_this->mpEyeModel[i], &a_this->tevStr); - J3DModelData* model_data = i_this->mpEyeModel[i]->getModelData(); + model_data = i_this->mpEyeModel[i]->getModelData(); for (u16 j = 0; j < model_data->getMaterialNum(); j++) { - J3DMaterial* material = model_data->getMaterialNodePointer(j); + material = model_data->getMaterialNodePointer(j); material->getTevColor(1)->r = 0xff; material->getTevColor(1)->g = 0x8a; material->getTevColor(1)->b = 0x18; @@ -418,10 +447,10 @@ static int daE_RDY_Draw(e_rdy_class* i_this) { if (i_this->mRideState != 2) { cXyz pos; pos.set(a_this->current.pos.x, a_this->current.pos.y + 100.0f, a_this->current.pos.z); - i_this->mShadowKey = dComIfGd_setShadow(i_this->mShadowKey, 1, model, &pos, 1200.0f, 0.0f, - a_this->current.pos.y, i_this->mAcch.GetGroundH(), - i_this->mAcch.m_gnd, &a_this->tevStr, 0, 1.0f, - dDlst_shadowControl_c::getSimpleTex()); + i_this->mShadowKey = dComIfGd_setShadow( + i_this->mShadowKey, 1, model, &pos, 1200.0f + BREG_F(19), 0.0f, a_this->current.pos.y, + i_this->mAcch.GetGroundH(), i_this->mAcch.m_gnd, &i_this->actor.tevStr, 0, 1.0f, + dDlst_shadowControl_c::getSimpleTex()); if (i_this->mWeaponType == WEAPON_CLUB) { dComIfGd_addRealShadow(i_this->mShadowKey, i_this->mpWeaponModel); } @@ -439,7 +468,7 @@ static int daE_RDY_Draw(e_rdy_class* i_this) { static BOOL other_bg_check(e_rdy_class* i_this, fopAc_ac_c* i_actor) { fopAc_ac_c* _this = (fopAc_ac_c*)i_this; dBgS_LinChk lin_chk; - cXyz start, end; + cXyz unused, start, end; end = i_actor->current.pos; end.y += 130.0f; start = _this->current.pos; @@ -453,12 +482,12 @@ static BOOL other_bg_check(e_rdy_class* i_this, fopAc_ac_c* i_actor) { } static void* s_b_sub(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc)) { - fopAc_ac_c* actor = (fopAc_ac_c*)i_proc; - if (dBomb_c::checkBombActor(actor) && !((dBomb_c*)actor)->checkStateExplode() - && target_info_count < 10) + UNUSED(i_this); + if (fopAcM_IsActor(i_proc)) { + if (dBomb_c::checkBombActor((fopAc_ac_c*)i_proc) && + !((dBomb_c*)i_proc)->checkStateExplode() && target_info_count < 10) { - target_info[target_info_count] = actor; + target_info[target_info_count] = (fopAc_ac_c*)i_proc; target_info_count++; } } @@ -466,20 +495,14 @@ static void* s_b_sub(void* i_proc, void* i_this) { return NULL; } -// The bit is sort of a fakematch. This gets GCN to match, but this function doesn't inline in Debug: -inline u16 absoluteValue(s16 num) { - if (num < 0) { - num = -1*num; - } - return num; -} - static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) { if ((i_this->field_0xaf0 & 0x10000000) == 0) { return NULL; } fopAc_ac_c* a_this = &i_this->actor; + dBomb_c* bomb; + target_info_count = 0; for (int i = 0; i < 10; i++) { target_info[i] = NULL; @@ -490,7 +513,7 @@ static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) { if (target_info_count != 0) { cXyz vec1, vec2, vec3; for (int i = 0; i < target_info_count;) { - dBomb_c* bomb = (dBomb_c*)target_info[i]; + bomb = (dBomb_c*)target_info[i]; vec1.x = bomb->current.pos.x - a_this->eyePos.x; vec1.y = 50.0f + bomb->current.pos.y - a_this->eyePos.y; vec1.z = bomb->current.pos.z - a_this->eyePos.z; @@ -506,7 +529,12 @@ static dBomb_c* search_bomb(e_rdy_class* i_this, BOOL param_1) { f32 abs_res = fabsf(50.0f + bomb->current.pos.y - a_this->eyePos.y); if (abs_res <= 300.0f) { s16 ang_y = a_this->shape_angle.y - cM_atan2s(vec1.x, vec1.z); - if (absoluteValue(ang_y) < 20000) { + + if (ang_y < 0) { + ang_y = (-1 * ang_y); + } + + if ((u16)ang_y < 20000) { return bomb; } @@ -545,7 +573,7 @@ static BOOL way_bg_check(e_rdy_class* i_this, f32 i_dist) { cXyz vec, start, end; start = _this->current.pos; start.y += 50.0f; - mDoMtx_YrotS(*calc_mtx, _this->shape_angle.y); + cMtx_YrotS(*calc_mtx, _this->shape_angle.y); vec.x = 0.0f; vec.y = 50.0f; vec.z = i_dist; @@ -571,19 +599,19 @@ static void ride_off(e_rdy_class* i_this) { i_this->mRideState = 0; if (i_this->mpBowMorf != NULL) { - J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11), + J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); i_this->mpBowMorf->setFrame(10.0f); } a_this->home.pos = a_this->current.pos; } static BOOL pl_check(e_rdy_class* i_this, f32 i_dist, s16 i_angle) { - fopAc_ac_c* a_this = &i_this->actor; if (dComIfGp_event_runCheck()) { return FALSE; } + fopAc_ac_c* a_this = &i_this->actor; fopAc_ac_c* player = dComIfGp_getPlayer(0); if (S_find != 0) { @@ -595,11 +623,10 @@ static BOOL pl_check(e_rdy_class* i_this, f32 i_dist, s16 i_angle) { if (angle < i_angle && angle > (s16)-i_angle && !other_bg_check(i_this, player)) { return TRUE; } - for (int i = 0; i <= 2; i++) { if (i_this->mCcSph[i].ChkCoHit()) { - fopAc_ac_c* hit_actor = dCc_GetAc(i_this->mCcSph[i].GetCoHitObj()->GetAc()); - if (daPy_getPlayerActorClass() == hit_actor) { + cCcD_Obj* ccdobj = i_this->mCcSph[i].GetCoHitObj(); + if (daPy_getPlayerActorClass() == dCc_GetAc(ccdobj->GetAc())) { return TRUE; } } @@ -610,10 +637,12 @@ static BOOL pl_check(e_rdy_class* i_this, f32 i_dist, s16 i_angle) { } static dBomb_c* bomb_view_check(e_rdy_class* i_this) { + e_rdy_class* unused = i_this; return search_bomb(i_this, TRUE); } static dBomb_c* bomb_check(e_rdy_class* i_this) { + e_rdy_class* unused = i_this; return search_bomb(i_this, FALSE); } @@ -621,7 +650,8 @@ static BOOL move_gake_check(e_rdy_class* i_this, f32 i_dist) { fopAc_ac_c* a_this = &i_this->actor; dBgS_GndChk gnd_chk; cXyz vec, pos; - mDoMtx_YrotS(*calc_mtx, a_this->shape_angle.y); + s16 r29 = a_this->shape_angle.y; + cMtx_YrotS(*calc_mtx, a_this->shape_angle.y); vec.x = 0.0f; vec.y = 100.0f; vec.z = i_dist; @@ -644,7 +674,7 @@ static BOOL way_check(e_rdy_class* i_this) { start.y += 50.0f; for (int i = 0; i < 5; i++) { for (int j = 0; j < 0x10; j++) { - mDoMtx_YrotS(*calc_mtx, angle); + cMtx_YrotS(*calc_mtx, angle); vec.x = 0.0f; vec.y = 0.0f; vec.z = dist; @@ -653,7 +683,7 @@ static BOOL way_check(e_rdy_class* i_this) { dBgS_LinChk lin_chk; lin_chk.Set(&start, &end, _this); if (dComIfG_Bgsp().LineCross(&lin_chk)) { - angle += 0x1000; + ADD_ANGLE(angle, 0x1000); } else { i_this->mTargetAngleY = angle; return TRUE; @@ -670,12 +700,12 @@ static BOOL path_check(e_rdy_class* i_this) { dBgS_LinChk lin_chk; cXyz start, end; start = a_this->current.pos; - start.y += 10.0f; + start.y += 10.0f + WREG_F(0); dPnt* point = i_this->mpPath->m_points; for (int i = 0; i < i_this->mpPath->m_num; i++, point++) { if (i < 0xff) { end.x = point->m_position.x; - end.y = point->m_position.y + 10.0f; + end.y = point->m_position.y + 10.0f + WREG_F(1); end.z = point->m_position.z; lin_chk.Set(&start, &end, a_this); if (!dComIfG_Bgsp().LineCross(&lin_chk)) { @@ -689,22 +719,25 @@ static BOOL path_check(e_rdy_class* i_this) { f32 dist, delta_x, delta_y, delta_z; f32 threshold = 100.0f; bool check = false; - for (int i = 0; i < 100; threshold += 50.0f, i++) { + for (int i = 0; i < 100; i++, threshold += 50.0f) { point = i_this->mpPath->m_points; for (int i = 0; i < i_this->mpPath->m_num; i++, point++) { if (i < 0xff && check_index[i]) { delta_x = a_this->current.pos.x - point->m_position.x; delta_y = a_this->current.pos.y - point->m_position.y; delta_z = a_this->current.pos.z - point->m_position.z; - dist = JMAFastSqrt(delta_x * delta_x + delta_y * delta_y + delta_z * delta_z); - if (dist < threshold) { + if (JMAFastSqrt(delta_x * delta_x + delta_y * delta_y + delta_z * delta_z) < + threshold) + { i_this->mPathIndex = i; check = true; break; } } } - if (check) break; + if (check) { + break; + } } if (!check) { @@ -721,6 +754,7 @@ static BOOL path_check(e_rdy_class* i_this) { static void e_rdy_normal(e_rdy_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; + cXyz unused1, unused2; f32 target_speed = 0.0f; s16 check_angle = 0x4000; @@ -976,25 +1010,30 @@ static void e_rdy_fight_run(e_rdy_class* i_this) { } static fopAc_ac_c* at_hit_check(e_rdy_class* i_this) { + e_rdy_class* unused1 = i_this; + fopAc_ac_c* unused = dComIfGp_getPlayer(0); if (i_this->mMode >= 10) { return NULL; } if (i_this->mAtSph.ChkAtHit()) { - return dCc_GetAc(i_this->mAtSph.GetAtHitObj()->GetAc()); - } else { - return NULL; + fopAc_ac_c* ac; + cCcD_Obj* ccD; + ccD = i_this->mAtSph.GetAtHitObj(); + ac = dCc_GetAc(ccD->GetAc()); + return ac; } + return NULL; } static void e_rdy_fight(e_rdy_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; + cXyz unused1, unused2; int frame = (int)i_this->mpMorf->getFrame(); - int last_frame; switch (i_this->mMode) { case 0: - anm_init(i_this, ANM_ATTACK01, 6.0f, J3DFrameCtrl::EMode_NONE, 1.0f); + anm_init(i_this, ANM_ATTACK01, 6.0f + TREG_F(14), J3DFrameCtrl::EMode_NONE, 1.0f); if (l_HIO.field_0x38 == 0) { i_this->mTimer[0] = 25; } else if (l_HIO.field_0x38 == 1) { @@ -1020,7 +1059,7 @@ static void e_rdy_fight(e_rdy_class* i_this) { } break; - case 2: + case 2: { if (frame >= 44 && frame <= 47) { i_this->field_0xa7b = 1; } @@ -1030,6 +1069,7 @@ static void e_rdy_fight(e_rdy_class* i_this) { if (i_this->mpMorf->checkFrame(50.0f)) { i_this->mpMorf->setPlaySpeed(1.0f); } + int last_frame; if (l_HIO.field_0x38 == 0) { last_frame = 64; } else if (l_HIO.field_0x38 == 1) { @@ -1048,7 +1088,7 @@ static void e_rdy_fight(e_rdy_class* i_this) { } anm_init(i_this, ANM_KAMAE, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); } - break; + } break; case 3: case 10: @@ -1077,6 +1117,7 @@ static void e_rdy_fight(e_rdy_class* i_this) { static void e_rdy_bow_run(e_rdy_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; + cXyz unused1, unused2; f32 target_speed = 0.0f; f32 run_speed = l_HIO.mRunSpeed; s16 target_angle = fopAcM_searchPlayerAngleY(a_this); @@ -1124,7 +1165,7 @@ static void e_rdy_bow_run(e_rdy_class* i_this) { case 1: target_speed = run_speed; - target_angle += 0x8000; + ADD_ANGLE(target_angle, 0x8000); if (i_this->mPlayerDist > l_HIO.field_0x28 || i_this->mTimer[0] == 0 || i_this->mAcch.ChkWallHit()) { @@ -1179,14 +1220,15 @@ static void e_rdy_bow_run(e_rdy_class* i_this) { static void e_rdy_bow(e_rdy_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; + cXyz unused1, unused2; J3DAnmTransform* bck; int frame = (int)i_this->mpMorf->getFrame(); switch (i_this->mMode) { case 0: anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 8); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 0.9f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 8), + J3DFrameCtrl::EMode_NONE, 5.0f, 0.9f + TREG_F(3), 0.0f, -1.0f); i_this->mMode = 1; a_this->speedF = 0.0f; break; @@ -1211,8 +1253,9 @@ static void e_rdy_bow(e_rdy_class* i_this) { if (i_this->mTimer[0] == 0) { if (!i_this->field_0xa74 && !dMsgObject_isTalkNowCheck()) { anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm( + (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11), + J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); i_this->mMode = 3; } else { i_this->mAction = ACT_BOW_RUN; @@ -1223,11 +1266,11 @@ static void e_rdy_bow(e_rdy_class* i_this) { break; case 3: - if (frame <= 3) { + if (frame <= 3 + XREG_S(5)) { i_this->mHasArrow = true; i_this->field_0xa98 = 4; } - if (frame == 2) { + if (frame == 2 + XREG_S(7)) { i_this->mArrowFired = true; } if (i_this->mpMorf->isStop()) { @@ -1249,10 +1292,9 @@ static void e_rdy_bow(e_rdy_class* i_this) { } static void* s_command3_sub(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { - e_rdy_class* other = (e_rdy_class*)i_proc; - if (other != i_this && other->mAction == ACT_COMMANDER) { - return other; + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (i_proc != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_COMMANDER) { + return i_proc; } } return NULL; @@ -1381,6 +1423,7 @@ static s8 e_rdy_bow2(e_rdy_class* i_this) { static void e_rdy_bow_ikki2(e_rdy_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; fopAc_ac_c* player = dComIfGp_getPlayer(0); + cXyz unused1, unused2; J3DAnmTransform* bck; int frame = (int)i_this->mpMorf->getFrame(); @@ -1388,8 +1431,7 @@ static void e_rdy_bow_ikki2(e_rdy_class* i_this) { case 0: anm_init(i_this, ANM_WAIT01, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); i_this->mMode = 1; - a_this->current.pos.x = -92938.0f; - a_this->current.pos.z = 49992.0f; + a_this->current.pos.set(-92938.0f, a_this->current.pos.y, 49992.0f); break; case 1: @@ -1411,8 +1453,8 @@ static void e_rdy_bow_ikki2(e_rdy_class* i_this) { case 4: anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 8); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 0.9f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 8), + J3DFrameCtrl::EMode_NONE, 5.0f, 0.9f + TREG_F(3), 0.0f, -1.0f); i_this->mMode = 5; break; @@ -1433,18 +1475,18 @@ static void e_rdy_bow_ikki2(e_rdy_class* i_this) { case 6: if (i_this->mTimer[0] == 0 && !i_this->field_0xa74) { anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11), + J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); i_this->mMode = 7; } i_this->mHasArrow = true; break; case 7: - if (frame <= 3) { + if (frame <= 3 + XREG_S(5)) { i_this->mHasArrow = true; } - if (frame == 2) { + if (frame == 2 + XREG_S(7)) { i_this->mArrowFired = true; } if (i_this->mpMorf->isStop()) { @@ -1460,9 +1502,9 @@ static void e_rdy_bow_ikki2(e_rdy_class* i_this) { player->current.pos.z); f32 fVar2; if (i_this->mDemoMode > 25) { - fVar2 = -1000.0f; + fVar2 = -1000.0f + AREG_F(16); } else { - fVar2 = 5400.0f; + fVar2 = 5400.0f + AREG_F(17); } cLib_addCalc2(&i_this->mCamDist, fVar2, 0.1f, 200.0f); } @@ -1476,8 +1518,8 @@ static void e_rdy_avoid(e_rdy_class* i_this) { case 0: anm_init(i_this, ANM_AVOID, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f); i_this->mMode = 1; - a_this->speedF = -30.0f; - a_this->speed.y = 20.0f; + a_this->speedF = -30.0f + XREG_F(1); + a_this->speed.y = 20.0f + XREG_F(2); i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DODGE, -1); break; @@ -1507,10 +1549,8 @@ static void e_rdy_avoid(e_rdy_class* i_this) { } static void* s_kusa_sub(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_Yobikusa) { - fopAc_ac_c* grass = (fopAc_ac_c*)i_proc; - fopAc_ac_c* _this = (fopAc_ac_c*)i_this; - cXyz delta = grass->current.pos - _this->current.pos; + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_Obj_Yobikusa) { + cXyz delta = ((fopAc_ac_c*)i_proc)->current.pos - ((fopAc_ac_c*)i_this)->current.pos; if (delta.abs() < 1000.0f) { return i_proc; } @@ -1739,20 +1779,22 @@ static void e_rdy_tkusa(e_rdy_class* i_this) { } static void e_rdy_yc_ride(e_rdy_class* i_this) { + e_rdy_class* unused_this = i_this; int frame = (int)i_this->mpMorf->getFrame(); - e_yc_class* kargarok = (e_yc_class*)fopAcM_SearchByID(i_this->mKargarokID); + cXyz unused1, unused2; + e_yc_class* kargarok; + e_yc_class* kargarok2 = (e_yc_class*)fopAcM_SearchByID(i_this->mKargarokID); i_this->mIFrameTimer = 20; - if (kargarok == NULL) { - kargarok = (e_yc_class*)fopAcM_SearchByName(PROC_E_YC); - i_this->mKargarokID = fopAcM_GetID(kargarok); + if (kargarok2 == NULL) { + i_this->mKargarokID = fopAcM_GetID((e_yc_class*)fopAcM_SearchByName(PROC_E_YC)); return; } if (i_this->field_0xa6e != 0) { return; } - + kargarok = kargarok2; int kargarok_frame = (int)kargarok->mpMorf->getFrame(); if (i_this->mAnm != ANM_RHANGED && i_this->mAnm != ANM_RHANGED_BRASH && i_this->mAnm != ANM_RHANGED_BRASH2 && i_this->mAnm != ANM_RHANGED_DAMAGE) @@ -1795,8 +1837,8 @@ static void e_rdy_yc_ride(e_rdy_class* i_this) { case 1: if (i_this->mTimer[0] == 0) { anm_init(i_this, ANM_RSHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 9); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 9), + J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f); i_this->mMode = 2; } break; @@ -1815,25 +1857,26 @@ static void e_rdy_yc_ride(e_rdy_class* i_this) { case 3: if (i_this->mTimer[1] == 0 && !dComIfGp_event_runCheck()) { anm_init(i_this, ANM_RSHOOT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11), + J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); i_this->mMode = 4; } i_this->mHasArrow = true; break; case 4: - if (frame <= 3) { + if (frame <= 3 + XREG_S(5)) { i_this->mHasArrow = true; } - if (frame == 2) { + if (frame == 2 + XREG_S(7)) { i_this->mArrowFired = true; } if (i_this->mpMorf->isStop()) { if (kargarok->mAnm == e_yc_class::ANM_HOVERING) { anm_init(i_this, ANM_RSHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 9); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm( + (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 9), + J3DFrameCtrl::EMode_NONE, 5.0f, 1.0f, 0.0f, -1.0f); i_this->mMode = 2; i_this->mTimer[1] = cM_rndF(30.0f) + 20.0f; } else { @@ -1890,7 +1933,7 @@ static void e_rdy_bomb_action(e_rdy_class* i_this) { break; } } - target_angle += 0x8000; + ADD_ANGLE(target_angle, 0x8000); target_speed = l_HIO.mRunSpeed; if (JMAFastSqrt(vec1.x * vec1.x + vec1.z * vec1.z) > 600.0f) { i_this->mMode = 3; @@ -1921,10 +1964,10 @@ static void e_rdy_bomb_action(e_rdy_class* i_this) { i_this->mCollisionEnabled = false; target_angle = i_this->mPlayerAngle; if ((int)i_this->mpMorf->getFrame() <= 10) { - mDoMtx_YrotS(*calc_mtx, target_angle); - vec1.x = -30.0f; + cMtx_YrotS(*calc_mtx, target_angle); + vec1.x = -30.0f + TREG_F(15); vec1.y = 0.0f; - vec1.z = 60.0f; + vec1.z = 60.0f + TREG_F(16); MtxPosition(&vec1, &vec2); vec2 += a_this->current.pos; cLib_addCalc2(&bomb->current.pos.x, vec2.x, 1.0f, 15.0f); @@ -1957,7 +2000,11 @@ static void e_rdy_s_damage(e_rdy_class* i_this) { if (i_this->field_0xa8e != 0) { e_yc_class* kargarok = (e_yc_class*)fopAcM_SearchByID(i_this->mKargarokID); if (kargarok != NULL) { +#if PLATFORM_GCN || PLATFORM_WII kargarok->field_0x6b0 &= ~i_this->field_0xa8e; +#else + kargarok->field_0x6b0 &= (s8)~i_this->field_0xa8e; +#endif } i_this->field_0xa8e = 0; i_this->mKargarokID = fpcM_ERROR_PROCESS_ID_e; @@ -1966,7 +2013,7 @@ static void e_rdy_s_damage(e_rdy_class* i_this) { case 1: if (i_this->mTimer[1] != 0) { - a_this->onHeadLockFlg(); + i_this->actor.onHeadLockFlg(); } if (i_this->mpMorf->isStop()) { if (i_this->mPrevAction == ACT_BOW2) { @@ -1977,6 +2024,7 @@ static void e_rdy_s_damage(e_rdy_class* i_this) { i_this->mAction = ACT_FIGHT_RUN; i_this->mTimer[0] = 40; } + OS_REPORT(" RD AC 2 %d\n", i_this->mAction); i_this->mMode = 0; } } @@ -1989,23 +2037,23 @@ static int kado_check(e_rdy_class* i_this) { dBgS_LinChk lin_chk; cXyz vec1, vec2, vec3; int ret = 0; - mDoMtx_YrotS(*calc_mtx, i_this->field_0xadc.y); + cMtx_YrotS(*calc_mtx, i_this->field_0xadc.y); static int kado_bit[2] = {1, 2}; static f32 kado_check_x[2] = {80.0f, -80.0f}; for (int i = 0; i < 2; i++) { vec2 = _this->current.pos; - vec2.y += 100.0f; - vec1.x = 0.0f; - vec1.y = 0.0f; - vec1.z = 70.0f; + vec2.y += 100.0f + JREG_F(0); + vec1.x = JREG_F(1); + vec1.y = JREG_F(2); + vec1.z = 70.0f + JREG_F(3); MtxPosition(&vec1, &vec3); vec2 += vec3; - vec1.y = 50.0f; - vec1.z = -150.0f; - vec1.x = kado_check_x[i]; + vec1.y = 50.0f + JREG_F(4); + vec1.z = -150.0f + JREG_F(5); + vec1.x = kado_check_x[i] * (1.0f + JREG_F(6)); MtxPosition(&vec1, &vec3); vec3 += vec2; @@ -2036,17 +2084,18 @@ static void rd_disappear(e_rdy_class* i_this) { fopAcM_delete(a_this); } - int sw_bit = fopAcM_GetParam(i_this) >> 0x18; + int sw_bit = (fopAcM_GetParam(a_this) & 0xff000000) >> 0x18; if (sw_bit != 0xff) { dComIfGs_onSwitch(sw_bit, fopAcM_GetRoomNo(a_this)); } } static BOOL body_gake(e_rdy_class* i_this) { + J3DModel* model = i_this->mpMorf->getModel(); fopAc_ac_c* a_this = &i_this->actor; cXyz vec1, vec2; - MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(JNT_MUNE2), *calc_mtx); - vec1.set(40.0f, 0.0f, 0.0f); + MTXCopy(model->getAnmMtx(JNT_MUNE2), *calc_mtx); + vec1.set(40.0f + BREG_F(10), BREG_F(11), BREG_F(12)); MtxPosition(&vec1, &vec2); dBgS_ObjGndChk gnd_chk; vec2.y += 100.0f; @@ -2060,8 +2109,11 @@ static BOOL body_gake(e_rdy_class* i_this) { } static void e_rdy_damage(e_rdy_class* i_this) { - fopEn_enemy_c* a_this = &i_this->actor; + fopAc_ac_c* a_this = &i_this->actor; + fopEn_enemy_c* e_this = (fopEn_enemy_c*)a_this; cXyz vec1, vec2; + s16 angle_y; + int check; if (a_this->health <= 0) { fopAcM_OffStatus(a_this, 0); @@ -2070,8 +2122,8 @@ static void e_rdy_damage(e_rdy_class* i_this) { i_this->mTargetEyeScale = 0.0f; - if (!daPy_py_c::checkNowWolf() && a_this->checkCutDownHitFlg()) { - a_this->offCutDownHitFlg(); + if (!daPy_py_c::checkNowWolf() && e_this->checkCutDownHitFlg()) { + e_this->offCutDownHitFlg(); i_this->mMode = 3; i_this->mTimer[0] = 100; i_this->mTimer[1] = 45; @@ -2079,8 +2131,8 @@ static void e_rdy_damage(e_rdy_class* i_this) { i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); i_this->mIsDying = true; daPy_getPlayerActorClass()->onEnemyDead(); - i_this->field_0xbac = 15; - a_this->offDownFlg(); + i_this->field_0xbac = 15 + TREG_S(7); + e_this->offDownFlg(); } switch (i_this->mMode) { @@ -2089,7 +2141,7 @@ static void e_rdy_damage(e_rdy_class* i_this) { i_this->mMode = 1; a_this->speedF = 0.0f; ride_off(i_this); - i_this->field_0xb88 = 8000.0f; + i_this->field_0xb88 = 8000.0f + BREG_F(10); if (a_this->health <= 0) { i_this->mSound.startCreatureVoice(Z2SE_EN_RD_V_DEATH, -1); i_this->mIsDying = true; @@ -2102,31 +2154,31 @@ static void e_rdy_damage(e_rdy_class* i_this) { case 1: if (i_this->mAcch.ChkWallHit() && i_this->mTimer[0] == 0) { - int check = kado_check(i_this); - if (check != 0) { + if (check = kado_check(i_this)) { + OS_REPORT(" ..KADO KABE ..%x\n", check); if (check == 2) { i_this->field_0xac6 = 0x1000; - i_this->field_0xadc.y += -7000; + i_this->field_0xadc.y += (s16)(TREG_S(8) - 7000); } else { i_this->field_0xac6 = -0x1000; - i_this->field_0xadc.y += 7000; + i_this->field_0xadc.y += (s16)-(TREG_S(8) - 7000); } - i_this->field_0xb88 = 8000.0f; - i_this->field_0xaf4 = 100.0f; - i_this->field_0xafc = 100.0f; + i_this->field_0xb88 = 8000.0f + BREG_F(10); + i_this->field_0xaf4 = 100.0f + BREG_F(4); + i_this->field_0xafc = 100.0f + BREG_F(5); i_this->mTimer[0] = 60; } else { i_this->mMode = 10; a_this->speed.y = 0.0f; i_this->field_0xabc *= 0.2f; - i_this->field_0xadc.y += 0x8000; - i_this->field_0xbc0 = 5; - i_this->field_0xaf4 = 100.0f; - i_this->field_0xafc = 100.0f; + ADD_ANGLE(i_this->field_0xadc.y, 0x8000); + i_this->field_0xbc0 = 5 + BREG_S(7); + i_this->field_0xaf4 = 100.0f + BREG_F(4); + i_this->field_0xafc = 100.0f + BREG_F(5); i_this->field_0xac6 = 0; } } else { - cLib_addCalcAngleS2(&i_this->field_0xadc.x, -0x4000, 1, 0x300); + cLib_addCalcAngleS2(&i_this->field_0xadc.x, -0x4000, 1, BREG_S(4) + 0x300); a_this->current.angle.y += i_this->field_0xac6; a_this->shape_angle.y = a_this->current.angle.y; if (i_this->field_0xadc.x <= -0x3000 && i_this->mAcch.ChkGroundHit()) { @@ -2137,31 +2189,30 @@ static void e_rdy_damage(e_rdy_class* i_this) { i_this->mSound.startCreatureSound(Z2SE_CM_BODYFALL_M, 0, -1); } i_this->mMode = 2; - s16 angle_y; if (!i_this->mIsUpsideDown) { anm_init(i_this, ANM_DIEA, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - angle_y = i_this->field_0xadc.y; + angle_y = (s16)i_this->field_0xadc.y; } else { - angle_y = i_this->field_0xadc.y + 0x8000; + angle_y = (s16)(i_this->field_0xadc.y + 0x8000); } a_this->current.angle.y = angle_y; if (i_this->field_0xac8) { i_this->field_0xabc = 0.0f; - i_this->field_0xb88 = 2000.0f; + i_this->field_0xb88 = 2000.0f + BREG_F(12); } else { if (!i_this->mIsUpsideDown) { - i_this->field_0xaf4 = -100.0f; - i_this->field_0xafc = -100.0f; + i_this->field_0xaf4 = -100.0f - BREG_F(6); + i_this->field_0xafc = -100.0f - BREG_F(7); } else { - i_this->field_0xaf4 = 100.0f; - i_this->field_0xafc = 100.0f; + i_this->field_0xaf4 = 100.0f + BREG_F(4); + i_this->field_0xafc = 100.0f + BREG_F(5); } i_this->field_0xaf8 = -0x5000; i_this->field_0xb00 = -0x4000; i_this->field_0xabc *= 0.5f; - a_this->speed.y = 20.0f; + a_this->speed.y = 20.0f + TREG_F(6); i_this->field_0xac6 /= 2; - i_this->field_0xb88 = 8000.0f; + i_this->field_0xb88 = 8000.0f + BREG_F(12); i_this->mGroundHit = true; } } @@ -2171,10 +2222,10 @@ static void e_rdy_damage(e_rdy_class* i_this) { case 2: a_this->current.angle.y += i_this->field_0xac6; a_this->shape_angle.y = a_this->current.angle.y; - cLib_addCalcAngleS2(&i_this->field_0xadc.x, -0x4000, 1, 0x300); + cLib_addCalcAngleS2(&i_this->field_0xadc.x, -0x4000, 1, BREG_S(4) + 0x300); if (i_this->mAcch.ChkGroundHit()) { if (a_this->health > 0 && !daPy_py_c::checkNowWolf()) { - a_this->onDownFlg(); + e_this->onDownFlg(); } dKy_Sound_set(a_this->current.pos, 100, fopAcM_GetID(i_this), 5); i_this->field_0xaee = 10; @@ -2185,9 +2236,8 @@ static void e_rdy_damage(e_rdy_class* i_this) { } i_this->field_0xabc = 0.0f; i_this->field_0xadc.x = -0x4000; - s16 angle_y; if (!i_this->mIsUpsideDown) { - angle_y = i_this->field_0xadc.y; + angle_y = (s16)i_this->field_0xadc.y; for (int i = 0; i < 4; i++) { i_this->field_0xba2[i] = cM_rndF(10.0f); } @@ -2203,15 +2253,15 @@ static void e_rdy_damage(e_rdy_class* i_this) { i_this->mTimer[1] = 35; } i_this->mMode = 3; - i_this->field_0xb88 = 1500.0f; + i_this->field_0xb88 = 1500.0f + BREG_F(13); i_this->mGroundHit = true; } break; case 3: if (body_gake(i_this)) { - i_this->field_0xabc = -20.0f; - i_this->field_0xadc.x += -0x300; + i_this->field_0xabc = -20.0f + VREG_F(8); + i_this->field_0xadc.x -= (s16)(VREG_S(7) + 0x300); } if (a_this->health <= 0 && i_this->mTimer[1] == 0) { rd_disappear(i_this); @@ -2222,7 +2272,7 @@ static void e_rdy_damage(e_rdy_class* i_this) { { i_this->field_0xabc = 0.0f; i_this->field_0xadc.x = -0x4000; - a_this->offDownFlg(); + e_this->offDownFlg(); i_this->mMode = 20; if (!i_this->mIsUpsideDown) { anm_init(i_this, ANM_DIEA_UP, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); @@ -2237,47 +2287,44 @@ static void e_rdy_damage(e_rdy_class* i_this) { case 10: if (i_this->field_0xbc0 != 0) { - cLib_addCalcAngleS2(&i_this->field_0xadc.x, 0, 1, 0x300); + cLib_addCalcAngleS2(&i_this->field_0xadc.x, 0, 1, BREG_S(4) + 0x300); } else { - cLib_addCalcAngleS2(&i_this->field_0xadc.x, -0x4000, 1, 0x800); + cLib_addCalcAngleS2(&i_this->field_0xadc.x, -0x4000, 1, BREG_S(5) + 0x800); if (i_this->mAcch.ChkGroundHit()) { i_this->mMode = 2; if (!i_this->mIsUpsideDown) { anm_init(i_this, ANM_DIEA, 3.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - i_this->field_0xaf4 = -100.0f; - i_this->field_0xafc = -100.0f; + i_this->field_0xaf4 = -100.0f - BREG_F(6); + i_this->field_0xafc = -100.0f - BREG_F(7); } else { - i_this->field_0xaf4 = 100.0f; - i_this->field_0xafc = 100.0f; + i_this->field_0xaf4 = 100.0f + BREG_F(4); + i_this->field_0xafc = 100.0f + BREG_F(5); } i_this->field_0xaf8 = -0x5000; i_this->field_0xb00 = -0x4000; i_this->field_0xabc *= 0.5f; - a_this->speed.y = 20.0f; - s16 angle_y; + a_this->speed.y = 20.0f + TREG_F(6); if (i_this->mIsUpsideDown == 0) { - angle_y = i_this->field_0xadc.y; + angle_y = (s16)(i_this->field_0xadc.y); } else { angle_y = i_this->field_0xadc.y + 0x8000; } a_this->current.angle.y = angle_y; - i_this->field_0xb88 = 8000.0f; + i_this->field_0xb88 = 8000.0f + BREG_F(12); } } break; case 20: if (i_this->mpMorf->getFrame() >= 35.0f) { - i_this->field_0xae8.z = 0; - i_this->field_0xae8.x = 0; + i_this->field_0xae8.x = i_this->field_0xae8.z = 0; } if (i_this->mpMorf->isStop()) { - i_this->field_0xadc.y = 0; - i_this->field_0xadc.x = 0; + i_this->field_0xadc.x = i_this->field_0xadc.y = 0; anm_init(i_this, ANM_WAIT01, 0.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); i_this->mTimer[0] = 5; i_this->mMode = 21; - a_this->offDownFlg(); + e_this->offDownFlg(); } break; @@ -2300,7 +2347,7 @@ static void e_rdy_damage(e_rdy_class* i_this) { break; case 30: - if (!a_this->checkWolfDownPullFlg()) { + if (!e_this->checkWolfDownPullFlg()) { i_this->mTimer[1] = 0; } if (i_this->mTimer[0] == 0) { @@ -2312,8 +2359,8 @@ static void e_rdy_damage(e_rdy_class* i_this) { } i_this->mTimer[0] = 10; } else if (i_this->mTimer[1] == 1) { - a_this->onWolfDownPullEndFlg(); - a_this->offCutDownHitFlg(); + e_this->onWolfDownPullEndFlg(); + e_this->offCutDownHitFlg(); a_this->health = 0; i_this->mTimer[0] = 1000; i_this->mTimer[1] = 35; @@ -2323,24 +2370,26 @@ static void e_rdy_damage(e_rdy_class* i_this) { case 31: if (i_this->mTimer[0] == 0) { - a_this->offDownFlg(); + e_this->offDownFlg(); i_this->mMode = 20; i_this->field_0xbca = 0; } break; } - if (a_this->checkDownFlg()) { + if (e_this->checkDownFlg()) { MTXCopy(i_this->mpMorf->getModel()->getAnmMtx(JNT_MUNE2), *calc_mtx); - vec1.set(0.0f, 0.0f, 0.0f); + vec1.set(BREG_F(0), BREG_F(1), BREG_F(2)); MtxPosition(&vec1, &vec2); - a_this->setDownPos(&vec2); + e_this->setDownPos(&vec2); i_this->mCollisionEnabled = false; } if (i_this->field_0xbac != 0) { i_this->field_0xbac--; - i_this->field_0xbaa = i_this->field_0xbac * cM_ssin(i_this->field_0xbac * 0x3800) * 100.0f; + i_this->field_0xbaa = i_this->field_0xbac * + cM_ssin(i_this->field_0xbac * (0x3800 + TREG_S(9))) * + (100.0f + TREG_F(5)); } } @@ -2348,10 +2397,11 @@ static s16 gake_check(e_rdy_class* i_this, f32 i_dist) { fopAc_ac_c* _this = (fopAc_ac_c*)i_this; dBgS_GndChk gnd_chk; dBgS_LinChk lin_chk; + cXyz unused1, unused2; cXyz vec1, vec2; s16 angle_y = _this->shape_angle.y; - for (int i = 0; i < 0x10; i++, angle_y += 0x1000) { - mDoMtx_YrotS(*calc_mtx, angle_y); + for (int i = 0; i < 0x10; i++) { + cMtx_YrotS(*calc_mtx, angle_y); vec1.x = 0.0f; vec1.y = 100.0f; vec1.z = i_dist; @@ -2366,6 +2416,7 @@ static s16 gake_check(e_rdy_class* i_this, f32 i_dist) { return angle_y; } } + angle_y += (s16)0x1000; } return _this->shape_angle.y; } @@ -2415,7 +2466,7 @@ static void e_rdy_drop(e_rdy_class* i_this) { i_this->mMode = 0; return; } - if (move_gake_check(i_this, 10.0f)) { + if (move_gake_check(i_this, 10.0f + KREG_F(6))) { i_this->mMode = 3; i_this->field_0xadc.y = a_this->shape_angle.y + 0x8000; i_this->field_0xadc.x = 0; @@ -2431,7 +2482,7 @@ static void e_rdy_drop(e_rdy_class* i_this) { a_this->speed.y = 0.0f; i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_DAMAGE, -1); } else if (i_this->field_0xadc.x > -0x6800) { - a_this->speed.y = -fabsf(cM_scos(i_this->field_0xadc.x) * 70.0f); + a_this->speed.y = -fabsf(cM_scos(i_this->field_0xadc.x) * (70.0f + TREG_F(8))); i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_FALLING, -1); } else { i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_RD_V_SNIPED_FALLING, -1); @@ -2439,9 +2490,10 @@ static void e_rdy_drop(e_rdy_class* i_this) { cLib_addCalcAngleS2(&i_this->field_0xadc.x, -0x7000, 2, i_this->field_0xbc8); cLib_addCalcAngleS2(&i_this->field_0xbc8, 0x800, 1, 0x50); i_this->field_0xa7b = 2; - if (i_this->mTimer[0] == 0 && a_this->current.pos.y <= i_this->mAcch.GetGroundH() + 100.0f) + if (i_this->mTimer[0] == 0 && + a_this->current.pos.y <= i_this->mAcch.GetGroundH() + 100.0f + KREG_F(17)) { - a_this->current.pos.y = i_this->mAcch.GetGroundH() + 100.0f; + a_this->current.pos.y = i_this->mAcch.GetGroundH() + 100.0f + KREG_F(17); i_this->field_0xadc.x = -0x4000; i_this->mAction = ACT_DAMAGE; i_this->mMode = 0; @@ -2477,6 +2529,8 @@ static void e_rdy_a_damage(e_rdy_class* i_this) { } static void e_rdy_stand(e_rdy_class* i_this) { + e_rdy_class* unused = i_this; + switch (i_this->mMode) { case 0: if (i_this->mTimer[0] == 0) { @@ -2523,9 +2577,11 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) { i_this->mTimer[1] = cM_rndF(20.0f) + 40.0f; i_this->mTimer[0] = cM_rndF(20.0f) + 80.0f; } + cXyz unused1, unused2; int frame = (int)i_this->mpMorf->getFrame(); s8 turn_to_player = true; + s8 ret = 0; switch (i_this->mMode) { case 0: @@ -2560,8 +2616,9 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) { case 10: if (i_this->mTimer[0] == 0) { anm_init(i_this, ANM_SHOOT_READY, 5.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 8); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 5.0f, 0.9f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 8), + J3DFrameCtrl::EMode_NONE, 5.0f, 0.9f + TREG_F(3), 0.0f, + -1.0f); i_this->mMode = 11; a_this->speedF = 0.0f; } @@ -2586,19 +2643,19 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) { i_this->field_0xa98 = 4; if (i_this->mTimer[0] == 0 && !i_this->field_0xa74 && !dMsgObject_isTalkNowCheck()) { anm_init(i_this, ANM_SHOOT, 1.0f, J3DFrameCtrl::EMode_NONE, 1.0f); - J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11), + J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); i_this->mMode = 13; } i_this->mHasArrow = true; break; case 13: - if (frame <= 3) { + if (frame <= 3 + XREG_S(5)) { i_this->mHasArrow = true; i_this->field_0xa98 = 4; } - if (frame == 2) { + if (frame == 2 + XREG_S(7)) { i_this->mArrowFired = true; } if (i_this->mpMorf->isStop()) { @@ -2617,25 +2674,24 @@ static s8 e_rdy_bow3(e_rdy_class* i_this) { i_this->field_0x1365 = false; } - return false; + return ret; } static void* s_command2_sub(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { - e_rdy_class* other = (e_rdy_class*)i_proc; - if (other->mAction == ACT_BOW3 && other->mMode < 10) { - other->mTimer[0] = cM_rndF(10.0f) + 10.0f; - other->mMode = 10; + UNUSED(i_this); + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (((e_rdy_class*)i_proc)->mAction == ACT_BOW3 && ((e_rdy_class*)i_proc)->mMode < 10) { + ((e_rdy_class*)i_proc)->mTimer[0] = cM_rndF(10.0f) + 10.0f; + ((e_rdy_class*)i_proc)->mMode = 10; } } return NULL; } static void* s_command4_sub(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { - e_rdy_class* other = (e_rdy_class*)i_proc; - if (other != i_this && other->mAction == ACT_BOW3) { - return other; + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_RDY) { + if (((e_rdy_class*)i_proc) != i_this && ((e_rdy_class*)i_proc)->mAction == ACT_BOW3) { + return i_proc; } } return NULL; @@ -2705,12 +2761,12 @@ static void e_rdy_commander(e_rdy_class* i_this) { anm_init(i_this, ANM_WAIT01, 5.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); if (!dComIfGp_event_runCheck() && !pl_check(i_this, i_this->mPlayerCheckDist, 0x4000)) { i_this->mMode = 10; - i_this->mTimer[1] = 350; + i_this->mTimer[1] = 350 + TREG_S(8); } else { if (dComIfGp_event_runCheck()) { i_this->mTimer[0] = 80; } else { - i_this->mTimer[0] = 0; + i_this->mTimer[0] = TREG_S(3); } i_this->mMode = 6; } @@ -2778,7 +2834,7 @@ static void e_rdy_excite(e_rdy_class* i_this) { i_this->mTimer[0] = cM_rndF(15.0f) + 30.0f; } vec = i_this->field_0x5bc - a_this->current.pos; - i_this->mTargetAngleY = cM_atan2s(vec.x, vec.z); + i_this->mTargetAngleY = (s16)cM_atan2s(vec.x, vec.z); } break; @@ -2827,9 +2883,7 @@ static void e_rdy_water(e_rdy_class* i_this) { } i_this->mTimer[0] = 60; i_this->mMode = 1; - a_this->speedF = 0.0f; - i_this->field_0xabc = 0.0f; - i_this->mKnockback = 0.0f; + i_this->mKnockback = i_this->field_0xabc = a_this->speedF = 0.0f; cXyz pos = a_this->current.pos; pos.y = i_this->mWaterHeight; fopKyM_createWpillar(&pos, 1.5f, 0); @@ -2839,7 +2893,7 @@ static void e_rdy_water(e_rdy_class* i_this) { case 1: a_this->speed.y = 0.0f; cLib_addCalc2(&a_this->current.pos.y, i_this->mWaterHeight, 0.5f, 5.0f); - cLib_addCalcAngleS2(&i_this->field_0xadc.x, -0x4000, 4, 0x400); + cLib_addCalcAngleS2(&i_this->field_0xadc.x, -0x4000, 4, BREG_S(4) + 0x400); if (i_this->mTimer[0] == 0) { rd_disappear(i_this); } @@ -2848,16 +2902,22 @@ static void e_rdy_water(e_rdy_class* i_this) { static void e_rdy_jyunkai(e_rdy_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; - cXyz vec; + int unused = i_this->mpMorf->getFrame(); f32 target_speed = 0.0f; s16 check_angle = 0x4000; + cXyz vec, unused2; switch (i_this->mMode) { case 0: { anm_init(i_this, ANM_WALK, 10.0f, J3DFrameCtrl::EMode_LOOP, 1.0f); i_this->mMode = 1; - dPnt* point = &i_this->mpPath->m_points[i_this->mPathIndex]; - i_this->field_0x5bc = point->m_position; + + dPnt* point = i_this->mpPath->m_points; + point += i_this->mPathIndex; + + i_this->field_0x5bc.x = point->m_position.x; + i_this->field_0x5bc.y = point->m_position.y; + i_this->field_0x5bc.z = point->m_position.z; // fallthrough } @@ -2980,14 +3040,16 @@ static void big_damage(e_rdy_class* i_this) { } if (i_this->mAtInfo.mHitBit & 0x80) { + OS_REPORT("SPIN CUT HIT !!\n"); i_this->field_0xac6 = cM_rndFX(2000.0f) + 4000.0f; } else if (i_this->mAtInfo.mHitBit & 0x800) { + OS_REPORT("SPIN CUT L HIT !!\n"); i_this->field_0xac6 = -(cM_rndFX(2000.0f) + 4000.0f); } else if (i_this->mRideState != 0) { i_this->field_0xac6 = cM_rndFX(3000.0f); } else if (fopAcM_GetName(i_this->mAtInfo.mpActor) == PROC_E_WB) { i_this->field_0xac6 = cM_rndFX(8000.0f); - a_this->speed.y = cM_rndF(15.0f) + 35.0f; + a_this->speed.y = cM_rndF(15.0f) + (35.0f + TREG_F(17)); i_this->field_0xabc = -(i_this->mAtInfo.mpActor->speedF * 0.5f); } else { i_this->field_0xac6 = cM_rndFX(1000.0f); @@ -2998,6 +3060,7 @@ static void big_damage(e_rdy_class* i_this) { static void small_damage(e_rdy_class* i_this, int i_collider) { fopAc_ac_c* a_this = &i_this->actor; + OS_REPORT(" RD AC 1 %d\n", i_this->mAction); if (i_this->mAction != ACT_S_DAMAGE) { i_this->mPrevAction = i_this->mAction; } @@ -3018,7 +3081,7 @@ static void small_damage(e_rdy_class* i_this, int i_collider) { anm_init(i_this, ANM_DAMAGE_W, 2.0f, J3DFrameCtrl::EMode_NONE, 1.0f); } - i_this->mKnockback = 20.0f; + i_this->mKnockback = 20.0f + TREG_F(10); i_this->mHitDirection = i_this->mAtInfo.mHitDirection.y; } @@ -3029,10 +3092,12 @@ static void damage_check(e_rdy_class* i_this) { i_this->field_0xa8f = 0; big_damage(i_this); i_this->mIFrameTimer = 1000; +#if PLATFORM_GCN _this->current.angle.x = 0; _this->current.angle.z = 0; _this->shape_angle.x = _this->current.angle.x; _this->shape_angle.z = _this->current.angle.z; +#endif } else { i_this->mCcStts.Move(); if (i_this->mIFrameTimer == 0) { @@ -3058,6 +3123,7 @@ static void damage_check(e_rdy_class* i_this) { } else { i_this->mTimer[1] = 1; } + OS_REPORT(" HIT AT %d\n", i_this->mAtInfo.mAttackPower); if (i_this->mAtInfo.mHitType != HIT_TYPE_LINK_NORMAL_ATTACK && i_this->mAtInfo.mHitType != HIT_TYPE_STUN @@ -3095,7 +3161,7 @@ static void damage_check(e_rdy_class* i_this) { i_this->mIFrameTimer = 10; } if (i_this->mAtInfo.mAttackPower <= 1) { - i_this->mIFrameTimer = 10; + i_this->mIFrameTimer = 10 + KREG_S(8); } i_this->field_0xaf0 |= i_this->mAtInfo.mHitBit; @@ -3114,7 +3180,7 @@ static void damage_check(e_rdy_class* i_this) { && player->checkCutJumpCancelTurn()) { small_damage(i_this, i); - i_this->mIFrameTimer = 3; + i_this->mIFrameTimer = 3 + NREG_S(7); } else { big_damage(i_this); i_this->mIFrameTimer = 1000; @@ -3130,10 +3196,9 @@ static void damage_check(e_rdy_class* i_this) { _this->speedF = 0.0f; if (i_this->mpBowMorf != NULL) { - J3DAnmTransform* bck = - (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11); - i_this->mpBowMorf->setAnm(bck, J3DFrameCtrl::EMode_NONE, - 1.0f, 1.0f, 0.0f, -1.0f); + i_this->mpBowMorf->setAnm( + (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mpArcName, 11), + J3DFrameCtrl::EMode_NONE, 1.0f, 1.0f, 0.0f, -1.0f); break; } else { break; @@ -3177,7 +3242,7 @@ static void action(e_rdy_class* i_this) { s8 link_search = false; s8 water_check = true; s8 search_sound = false; - a_this->offHeadLockFlg(); + i_this->actor.offHeadLockFlg(); switch (i_this->mAction) { case ACT_NORMAL: @@ -3295,7 +3360,7 @@ static void action(e_rdy_class* i_this) { if (i_this->mRideState == 0) { a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 3; if (i_this->field_0xabc) { - mDoMtx_YrotS(*calc_mtx, i_this->field_0xadc.y); + cMtx_YrotS(*calc_mtx, i_this->field_0xadc.y); if (i_this->field_0xbc0 == 0) { vec1.z = i_this->field_0xabc; } else { @@ -3304,7 +3369,7 @@ static void action(e_rdy_class* i_this) { } a_this->gravity = -(l_HIO.field_0x40 - 1.0f); } else { - mDoMtx_YrotS(*calc_mtx, a_this->current.angle.y); + cMtx_YrotS(*calc_mtx, a_this->current.angle.y); vec1.z = a_this->speedF; a_this->gravity = -5.0f; } @@ -3330,7 +3395,7 @@ static void action(e_rdy_class* i_this) { vec1.x = 0.0f; vec1.y = 0.0f; vec1.z = -i_this->mKnockback; - mDoMtx_YrotS(*calc_mtx, i_this->mHitDirection); + cMtx_YrotS(*calc_mtx, i_this->mHitDirection); MtxPosition(&vec1, &vec2); a_this->current.pos += vec2; cLib_addCalc0(&i_this->mKnockback, 1.0f, TREG_F(12) + 7.0f); @@ -3398,7 +3463,7 @@ static void action(e_rdy_class* i_this) { i_this->field_0xa98 = 2; sVar15 = 0x800 + KREG_S(7); } else if (i_this->field_0xa98 >= 11) { - i_this->field_0xa98 -= 10; + i_this->field_0xa98 -= (s8)10; vec3 = i_this->mArrowTarget; } else { vec3 = player->eyePos; @@ -3680,9 +3745,9 @@ static void fire_eff_set(e_rdy_class* i_this) { i_this->mSound.startCreatureSoundLevel(Z2SE_OBJ_ARROW_FIRE_READY, 0, -1); } - vec1.x = 90.0f; - vec1.y = 10.0f; - vec1.z = -60.0f; + vec1.x = 90.0f + NREG_F(0); + vec1.y = 10.0f + NREG_F(1); + vec1.z = -60.0f + NREG_F(2); MtxPosition(&vec1, &vec2); i_this->field_0x1358 = vec2 - i_this->field_0x134c; i_this->field_0x1358 *= 0.9f; @@ -3717,7 +3782,8 @@ static void cam_3d_morf(e_rdy_class* i_this, f32 i_scale) { } static void* s_adel_sub(void* i_proc, void* i_this) { - if (fopAc_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_ARROW) { + UNUSED(i_this); + if (fopAcM_IsActor(i_proc) && fopAcM_GetName(i_proc) == PROC_E_ARROW) { fopAcM_delete((fopAc_ac_c*)i_proc); } return NULL; @@ -3891,8 +3957,8 @@ static void demo_camera(e_rdy_class* i_this) { i_this->mCamCenter.y += 100.0f + BREG_F(3); cMtx_YrotS(*calc_mtx, a_this->shape_angle.y + BREG_S(0)); vec1.x = 20.0f + BREG_F(0) + 150.0f; - vec1.y = 30.0f + BREG_F(0) + 50.0f + 30.0f + 50.0f; - vec1.z = 300.0f + BREG_F(0); + vec1.y = 30.0f + BREG_F(1) + 50.0f + 30.0f + 50.0f; + vec1.z = 300.0f + BREG_F(2); MtxPosition(&vec1, &i_this->mCamEye); i_this->mCamEye += a_this->current.pos; break; @@ -3909,7 +3975,7 @@ static void demo_camera(e_rdy_class* i_this) { break; case 16: - i_this->mCamFovy = 70.0f + DREG_F(3); + i_this->mCamFovy = 70.0f + JREG_F(17); cMtx_YrotS(*calc_mtx, a_karg->current.angle.y); cMtx_XrotM(*calc_mtx, a_karg->current.angle.x); vec1.x = 0.0f; @@ -4120,7 +4186,7 @@ static void demo_camera(e_rdy_class* i_this) { i_this->mMode = 4; i_this->mCamDist = 0.0f; e_arrow_class* arrow = (e_arrow_class*)fopAcM_SearchByName(PROC_E_ARROW); - arrow->field_0xa00.z = 30000.0f + NREG_F(0); + arrow->field_0xa00.z = 30000.0f + AREG_F(18); cVar12 = 0; } // fallthrough @@ -4358,7 +4424,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) { cLib_addCalc0(&i_this->field_0xbbc, 1.0f, 5.0f + TREG_F(17)); } if (i_this->mAnm == ANM_DIEB && i_this->field_0xadc.x != 0 && !i_this->mIsUpsideDown) { - vec2.y += -20.0f + KREG_F(7); + vec2.y += -20.0f + KREG_F(0); } a_this->current.pos += vec2; a_this->old.pos += vec2; @@ -4675,12 +4741,12 @@ static int daE_RDY_Execute(e_rdy_class* i_this) { vec1.z = 40.0f + BREG_F(12) - 30.0f; MtxPosition(&vec1, &vec3); vec3 += vec2; - a_this->setDownPos(&vec3); + i_this->actor.setDownPos(&vec3); } cXyz lock_pos = a_this->eyePos; lock_pos.y += 130.0f + NREG_F(7); - a_this->setHeadLockPos(&lock_pos); + i_this->actor.setHeadLockPos(&lock_pos); demo_camera(i_this); return 1; @@ -4692,10 +4758,14 @@ static int daE_RDY_IsDelete(e_rdy_class* i_this) { static int daE_RDY_Delete(e_rdy_class* i_this) { fopAc_ac_c* a_this = &i_this->actor; + fpc_ProcID unused = fopAcM_GetID(i_this); dComIfG_resDelete(&i_this->mPhase, i_this->mpArcName); if (i_this->mHIOInit) { hio_set = false; +#if DEBUG + mDoHIO_deleteChild(l_HIO.field_0x4); +#endif } if (a_this->heap != NULL) { @@ -4741,10 +4811,11 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (!_this->mJntCol.init(i_this, jc_data, model, 11)) { return 0; } - + J3DModelData* modelData; if (_this->mWeaponType == WEAPON_CLUB) { - J3DModelData* weapon_model_data = (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 85); - _this->mpWeaponModel = mDoExt_J3DModel__create(weapon_model_data, 0x80000, 0x11000084); + modelData = (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 85); + JUT_ASSERT(7391, modelData != NULL); + _this->mpWeaponModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (_this->mpWeaponModel == NULL) { return 0; } @@ -4757,37 +4828,39 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - J3DModel* bow_model = _this->mpBowMorf->getModel(); - bow_model->setUserArea((uintptr_t)_this); - for (u16 i = 0; i < bow_model->getModelData()->getJointNum(); i++) { + model = _this->mpBowMorf->getModel(); + model->setUserArea((uintptr_t)_this); + for (u16 i = 0; i < model->getModelData()->getJointNum(); i++) { if (i == 2 || i == 3) { - bow_model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_bow); + model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack_bow); } } - J3DModelData* weapon_model_data; if (_this->mWeaponType == WEAPON_BOW_BOMB) { - weapon_model_data = (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 83); + modelData = (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 83); } else { - weapon_model_data = (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 82); + modelData = (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 82); } - _this->mpWeaponModel = mDoExt_J3DModel__create(weapon_model_data, 0x80000, 0x11000084); + JUT_ASSERT(7437, modelData != NULL); + _this->mpWeaponModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (_this->mpWeaponModel == NULL) { return 0; } } - J3DModelData* eye_model_data = (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 80); + modelData = (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 80); + JUT_ASSERT(7449, modelData != NULL); for (u16 i = 0; i < 2; i++) { - _this->mpEyeModel[i] = mDoExt_J3DModel__create(eye_model_data, 0x80000, 0x11000084); + _this->mpEyeModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (_this->mpEyeModel[i] == NULL) { return 0; } } if (_this->field_0x5b8 == 12) { - J3DModelData* grass_model_data = (J3DModelData*)dComIfG_getObjectRes("J_Tobi", 3); - _this->mpHawkGrassModel = mDoExt_J3DModel__create(grass_model_data, 0x80000, 0x11000084); + modelData = (J3DModelData*)dComIfG_getObjectRes("J_Tobi", 3); + JUT_ASSERT(7467, modelData != NULL); + _this->mpHawkGrassModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (_this->mpHawkGrassModel == NULL) { return 0; } @@ -4797,32 +4870,32 @@ static int useHeapInit(fopAc_ac_c* i_this) { } static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) { - fopAcM_ct(i_this, e_rdy_class); e_rdy_class* _this = (e_rdy_class*)i_this; + fopAcM_ct(&_this->actor, e_rdy_class); - _this->field_0x5b6 = fopAcM_GetParam(_this) & 0xff; + _this->field_0x5b6 = fopAcM_GetParam(i_this) & 0xff; _this->field_0x5b7 = _this->field_0x5b6; - _this->field_0x5b8 = (fopAcM_GetParam(_this) >> 0xc) & 0xf; + _this->field_0x5b8 = (fopAcM_GetParam(i_this) & 0xf000) >> 0xc; if (_this->field_0x5b8 == 0xf) { _this->field_0x5b8 = 0; } _this->mpArcName = "E_rdy"; cPhs__Step step = (cPhs__Step)dComIfG_resLoad(&_this->mPhase, _this->mpArcName); - if (step == cPhs_COMPLEATE_e) { + OS_REPORT("E_RDY PARAM %x\n", fopAcM_GetParam(i_this)); if (_this->field_0x5b8 != 3) { - int swbit = fopAcM_GetParam(_this) >> 0x18; + int swbit = (fopAcM_GetParam(i_this) & 0xff000000) >> 0x18; if (swbit != 0xff && dComIfGs_isSwitch(swbit, fopAcM_GetRoomNo(i_this))) { return cPhs_ERROR_e; } } - _this->mWeaponType = (fopAcM_GetParam(_this) >> 8) & 0xf; + _this->mWeaponType = (fopAcM_GetParam(i_this) & 0xf00) >> 8; if (_this->mWeaponType == 0xff) { _this->mWeaponType = WEAPON_NONE; } - _this->mSwBit = (fopAcM_GetParam(_this) >> 0x18) & 0xff; + _this->mSwBit = (fopAcM_GetParam(i_this) & 0xff000000) >> 0x18; if (_this->field_0x5b8 == 3 || _this->field_0x5b8 == 4 || _this->field_0x5b8 == 5 || _this->field_0x5b8 == 6 || _this->field_0x5b8 == 7) @@ -4851,24 +4924,32 @@ static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) { } else if (_this->field_0x5b8 == 11) { _this->mAction = ACT_BOW_IKKI2; } else if (_this->field_0x5b8 == 12) { - /* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete - (Horse grass appears in various places) */ + OS_REPORT("E_RDY EVENT 239: %d\n", + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[239])); + OS_REPORT("E_RDY EVENT 84: %d\n", + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[84])); + /* dSv_event_flag_c::M_051 - Main Event - Shadow Kargorok (?) (Large) event complete + (Horse grass appears in various places) */ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[84])) { return cPhs_ERROR_e; } cXyz pos = i_this->current.pos; - _this->mAction = ACT_TKUSA; - pos.y += 5000.0f; + if (TREG_S(9)) { + _this->mAction = ACT_YC_RIDE; + pos.y += 300.0f; + } else { + _this->mAction = ACT_TKUSA; + pos.y += 5000.0f + YREG_F(0); + } _this->mKargarokID = fpcM_ERROR_PROCESS_ID_e; fopAcM_create(PROC_E_YC, 0xffffff00, &pos, fopAcM_GetRoomNo(i_this), &i_this->shape_angle, NULL, 0xff); } - int tmp1 = i_this->home.angle.z & 0xff; - if (tmp1 == 0 || tmp1 == 0xff) { + if ((i_this->home.angle.z & 0xff) == 0 || (i_this->home.angle.z & 0xff) == 0xff) { _this->mPlayerCheckDist = 100000.0f; } else { - _this->mPlayerCheckDist = tmp1 * 100.0f; + _this->mPlayerCheckDist = (i_this->home.angle.z & 0xff) * 100.0f; } _this->mSwBit2 = (i_this->home.angle.z >> 8) & 0xff; @@ -4876,13 +4957,17 @@ static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) { _this->mSwBit2 = 0; } + OS_REPORT("E_RDY DEMO SW %x\n", _this->mSwBit2); + fopAcM_OnStatus(i_this, fopAcStts_CULL_e); i_this->attention_info.flags = fopAc_AttnFlag_BATTLE_e; u8 path_id = i_this->home.angle.x & 0xff; if (path_id != 0xff) { _this->mpPath = dPath_GetRoomPath(path_id, fopAcM_GetRoomNo(i_this)); + OS_REPORT("//////////////E_RDY PPD %x!!\n", _this->mpPath); if (_this->mpPath == NULL) { + OS_REPORT("......RD NONONONONONO PATH !!!!\n"); return cPhs_ERROR_e; } } @@ -4898,21 +4983,18 @@ static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) { _this->field_0x5b6 = 0; } - i_this->shape_angle.x = 0; - i_this->current.angle.x = 0; - i_this->home.angle.x = 0; - i_this->shape_angle.z = 0; - i_this->current.angle.z = 0; - i_this->home.angle.z = 0; + i_this->home.angle.z = i_this->current.angle.z = i_this->shape_angle.z = + i_this->home.angle.x = i_this->current.angle.x = i_this->shape_angle.x = 0; if (!fopAcM_entrySolidHeap(i_this, useHeapInit, 0x57D0)) { + OS_REPORT("//////////////E_RDY SET NON !!\n"); return cPhs_ERROR_e; } if (!hio_set) { _this->mHIOInit = true; hio_set = true; - l_HIO.field_0x4 = -1; + l_HIO.field_0x4 = mDoHIO_CREATE_CHILD("闇ライダー", &l_HIO); } fopAcM_SetMtx(i_this, _this->mpMorf->getModel()->getBaseTRMtx()); @@ -4922,8 +5004,7 @@ static cPhs__Step daE_RDY_Create(fopAc_ac_c* i_this) { &_this->mAcchCir, fopAcM_GetSpeed_p(i_this), NULL, NULL); _this->mAcchCir.SetWall(50.0f, 50.0f); - i_this->health = 60; - i_this->field_0x560 = 60; + i_this->field_0x560 = i_this->health = 60; static dCcD_SrcSph cc_sph_src = { { From 3ce16f0192535c73b5c1260db21d6571fdd7026f Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sun, 4 Jan 2026 17:22:56 -0800 Subject: [PATCH 29/35] JKernel debug (#3012) --- config/GZ2E01/symbols.txt | 7 +- config/GZ2J01/symbols.txt | 7 +- config/GZ2P01/symbols.txt | 7 +- config/ShieldD/splits.txt | 10 +- config/ShieldD/symbols.txt | 12 +- include/JSystem/JKernel/JKRAram.h | 9 +- include/JSystem/JKernel/JKRAramArchive.h | 3 + include/JSystem/JKernel/JKRAramBlock.h | 2 +- include/JSystem/JKernel/JKRAramHeap.h | 1 - include/JSystem/JKernel/JKRAramPiece.h | 20 +- include/JSystem/JKernel/JKRAramStream.h | 8 + include/JSystem/JKernel/JKRArchive.h | 16 +- include/JSystem/JKernel/JKRAssertHeap.h | 26 +- include/JSystem/JKernel/JKRDecomp.h | 4 + include/JSystem/JKernel/JKRDvdAramRipper.h | 1 + include/JSystem/JKernel/JKRDvdFile.h | 2 +- include/JSystem/JKernel/JKRDvdRipper.h | 11 +- include/JSystem/JKernel/JKRExpHeap.h | 5 +- include/JSystem/JKernel/JKRFile.h | 2 +- include/JSystem/JKernel/JKRFileLoader.h | 4 +- include/JSystem/JKernel/JKRHeap.h | 49 ++- include/JSystem/JKernel/JKRSolidHeap.h | 2 + include/JSystem/JKernel/JKRThread.h | 4 +- include/JSystem/JSupport/JSUList.h | 2 +- src/JSystem/JKernel/JKRAram.cpp | 175 ++++---- src/JSystem/JKernel/JKRAramArchive.cpp | 66 ++- src/JSystem/JKernel/JKRAramBlock.cpp | 24 +- src/JSystem/JKernel/JKRAramHeap.cpp | 47 ++- src/JSystem/JKernel/JKRAramPiece.cpp | 15 +- src/JSystem/JKernel/JKRAramStream.cpp | 28 +- src/JSystem/JKernel/JKRArchivePri.cpp | 54 ++- src/JSystem/JKernel/JKRArchivePub.cpp | 123 +++--- src/JSystem/JKernel/JKRAssertHeap.cpp | 52 +-- src/JSystem/JKernel/JKRCompArchive.cpp | 28 +- src/JSystem/JKernel/JKRDecomp.cpp | 30 +- src/JSystem/JKernel/JKRDisposer.cpp | 5 +- src/JSystem/JKernel/JKRDvdAramRipper.cpp | 52 ++- src/JSystem/JKernel/JKRDvdArchive.cpp | 36 +- src/JSystem/JKernel/JKRDvdFile.cpp | 23 +- src/JSystem/JKernel/JKRDvdRipper.cpp | 191 ++++----- src/JSystem/JKernel/JKRExpHeap.cpp | 384 ++++++++++++------ src/JSystem/JKernel/JKRFile.cpp | 11 +- src/JSystem/JKernel/JKRFileCache.cpp | 114 +++--- src/JSystem/JKernel/JKRFileFinder.cpp | 5 +- src/JSystem/JKernel/JKRFileLoader.cpp | 56 +-- src/JSystem/JKernel/JKRHeap.cpp | 178 +++++--- src/JSystem/JKernel/JKRMemArchive.cpp | 39 +- src/JSystem/JKernel/JKRSolidHeap.cpp | 103 +++-- src/JSystem/JKernel/JKRThread.cpp | 81 ++-- .../MSL/MSL_C/MSL_Common/Include/arith.h | 4 +- src/d/d_resorce.cpp | 2 +- 51 files changed, 1169 insertions(+), 971 deletions(-) diff --git a/config/GZ2E01/symbols.txt b/config/GZ2E01/symbols.txt index 70d988a893..43cc171bce 100644 --- a/config/GZ2E01/symbols.txt +++ b/config/GZ2E01/symbols.txt @@ -21530,10 +21530,10 @@ sStickHigh = .sdata:0x80450898; // type:object size:0x4 scope:local align:4 data sStickCenter = .sdata:0x8045089C; // type:object size:0x4 scope:local align:4 data:float sHowlTobikusa = .sdata:0x804508A0; // type:object size:0x8 scope:local align:4 cm2hw$539 = .sdata:0x804508A8; // type:object size:0x4 scope:local align:4 -data_804508B0 = .sdata:0x804508B0; // type:object size:0x1 scope:global align:4 data:byte +sDefaultFillFlag__7JKRHeap = .sdata:0x804508B0; // type:object size:0x1 scope:global align:4 data:byte sSZSBufferSize__7JKRAram = .sdata:0x804508B8; // type:object size:0x4 scope:global align:4 data:4byte rootPath = .sdata:0x804508C0; // type:object size:0x2 scope:local align:4 data:string -errorRetry = .sdata:0x804508C8; // type:object size:0x1 scope:local align:1 data:byte +errorRetry__12JKRDvdRipper = .sdata:0x804508C8; // type:object size:0x1 scope:local align:1 data:byte sSZSBufferSize__12JKRDvdRipper = .sdata:0x804508CC; // type:object size:0x4 scope:global align:4 data:4byte errorRetry__16JKRDvdAramRipper = .sdata:0x804508D0; // type:object size:0x1 scope:global align:1 data:byte sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x804508D4; // type:object size:0x4 scope:global align:4 data:4byte @@ -22145,8 +22145,7 @@ DBnewFreeBlock = .sbss:0x804513A4; // type:object size:0x4 scope:local align:4 d DBnewUsedBlock = .sbss:0x804513A8; // type:object size:0x4 scope:local align:4 data:4byte sManager__15JKRThreadSwitch = .sbss:0x804513B0; // type:object size:0x4 scope:global align:4 data:4byte sTotalCount__15JKRThreadSwitch = .sbss:0x804513B4; // type:object size:0x4 scope:global align:4 data:4byte -sTotalStart__15JKRThreadSwitch = .sbss:0x804513B8; // type:object size:0x4 scope:global align:4 data:4byte -data_804513BC = .sbss:0x804513BC; // type:object size:0x4 scope:global align:4 data:4byte +sTotalStart__15JKRThreadSwitch = .sbss:0x804513B8; // type:object size:0x8 scope:global align:8 data:4byte mUserPreCallback__15JKRThreadSwitch = .sbss:0x804513C0; // type:object size:0x4 scope:global align:4 data:4byte mUserPostCallback__15JKRThreadSwitch = .sbss:0x804513C4; // type:object size:0x4 scope:global align:4 data:4byte sAramObject__7JKRAram = .sbss:0x804513C8; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/GZ2J01/symbols.txt b/config/GZ2J01/symbols.txt index c3a1d8e1b3..05a39f5b60 100644 --- a/config/GZ2J01/symbols.txt +++ b/config/GZ2J01/symbols.txt @@ -21559,10 +21559,10 @@ sStickHigh = .sdata:0x8044A9D8; // type:object size:0x4 scope:local align:4 data sStickCenter = .sdata:0x8044A9DC; // type:object size:0x4 scope:local align:4 data:float sHowlTobikusa = .sdata:0x8044A9E0; // type:object size:0x8 scope:local align:4 cm2hw$539 = .sdata:0x8044A9E8; // type:object size:0x4 scope:local align:4 -data_804508B0 = .sdata:0x8044A9F0; // type:object size:0x1 data:byte +sDefaultFillFlag__7JKRHeap = .sdata:0x8044A9F0; // type:object size:0x1 data:byte sSZSBufferSize__7JKRAram = .sdata:0x8044A9F8; // type:object size:0x4 scope:global align:4 data:4byte rootPath = .sdata:0x8044AA00; // type:object size:0x2 scope:local align:4 data:string -errorRetry = .sdata:0x8044AA08; // type:object size:0x1 scope:local data:byte +errorRetry__12JKRDvdRipper = .sdata:0x8044AA08; // type:object size:0x1 scope:local data:byte sSZSBufferSize__12JKRDvdRipper = .sdata:0x8044AA0C; // type:object size:0x4 scope:global align:4 data:4byte errorRetry__16JKRDvdAramRipper = .sdata:0x8044AA10; // type:object size:0x1 data:byte sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x8044AA14; // type:object size:0x4 scope:global align:4 data:4byte @@ -22174,8 +22174,7 @@ DBnewFreeBlock = .sbss:0x8044B4E4; // type:object size:0x4 scope:local align:4 d DBnewUsedBlock = .sbss:0x8044B4E8; // type:object size:0x4 scope:local align:4 data:4byte sManager__15JKRThreadSwitch = .sbss:0x8044B4F0; // type:object size:0x4 scope:global align:4 data:4byte sTotalCount__15JKRThreadSwitch = .sbss:0x8044B4F4; // type:object size:0x4 scope:global align:4 data:4byte -sTotalStart__15JKRThreadSwitch = .sbss:0x8044B4F8; // type:object size:0x4 scope:global align:4 data:4byte -data_804513BC = .sbss:0x8044B4FC; // type:object size:0x4 scope:local data:4byte +sTotalStart__15JKRThreadSwitch = .sbss:0x8044B4F8; // type:object size:0x8 scope:global align:8 data:4byte mUserPreCallback__15JKRThreadSwitch = .sbss:0x8044B500; // type:object size:0x4 scope:global align:4 data:4byte mUserPostCallback__15JKRThreadSwitch = .sbss:0x8044B504; // type:object size:0x4 scope:global align:4 data:4byte sAramObject__7JKRAram = .sbss:0x8044B508; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/GZ2P01/symbols.txt b/config/GZ2P01/symbols.txt index fc60314826..56df510488 100644 --- a/config/GZ2P01/symbols.txt +++ b/config/GZ2P01/symbols.txt @@ -21571,10 +21571,10 @@ sStickHigh = .sdata:0x80452858; // type:object size:0x4 scope:local align:4 data sStickCenter = .sdata:0x8045285C; // type:object size:0x4 scope:local align:4 data:float sHowlTobikusa = .sdata:0x80452860; // type:object size:0x8 scope:local align:4 cm2hw$539 = .sdata:0x80452868; // type:object size:0x4 scope:local align:4 -data_804508B0 = .sdata:0x80452870; // type:object size:0x1 data:byte +sDefaultFillFlag__7JKRHeap = .sdata:0x80452870; // type:object size:0x1 data:byte sSZSBufferSize__7JKRAram = .sdata:0x80452878; // type:object size:0x4 scope:global align:4 data:4byte rootPath = .sdata:0x80452880; // type:object size:0x2 scope:local align:4 data:string -errorRetry = .sdata:0x80452888; // type:object size:0x1 scope:local data:byte +errorRetry__12JKRDvdRipper = .sdata:0x80452888; // type:object size:0x1 scope:local data:byte sSZSBufferSize__12JKRDvdRipper = .sdata:0x8045288C; // type:object size:0x4 scope:global align:4 data:4byte errorRetry__16JKRDvdAramRipper = .sdata:0x80452890; // type:object size:0x1 data:byte sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x80452894; // type:object size:0x4 scope:global align:4 data:4byte @@ -22187,8 +22187,7 @@ DBnewFreeBlock = .sbss:0x8045336C; // type:object size:0x4 scope:local align:4 d DBnewUsedBlock = .sbss:0x80453370; // type:object size:0x4 scope:local align:4 data:4byte sManager__15JKRThreadSwitch = .sbss:0x80453378; // type:object size:0x4 scope:global align:4 data:4byte sTotalCount__15JKRThreadSwitch = .sbss:0x8045337C; // type:object size:0x4 scope:global align:4 data:4byte -sTotalStart__15JKRThreadSwitch = .sbss:0x80453380; // type:object size:0x4 scope:global align:4 data:4byte -data_804513BC = .sbss:0x80453384; // type:object size:0x4 scope:local align:4 data:4byte +sTotalStart__15JKRThreadSwitch = .sbss:0x80453380; // type:object size:0x8 scope:global align:8 data:4byte mUserPreCallback__15JKRThreadSwitch = .sbss:0x80453388; // type:object size:0x4 scope:global align:4 data:4byte mUserPostCallback__15JKRThreadSwitch = .sbss:0x8045338C; // type:object size:0x4 scope:global align:4 data:4byte sAramObject__7JKRAram = .sbss:0x80453390; // type:object size:0x4 scope:global align:4 data:4byte diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index a6ef320d93..b3ea4ebc8d 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -3151,7 +3151,7 @@ Z2AudioCSD/Z2AudioCS.cpp: revolution/gf/GFGeometry.cpp: .text start:0x804F8AE0 end:0x804F8CB0 - .sdata start:0x8074A8B0 end:0x8074A8BC + .sdata start:0x8074A8B0 end:0x8074A8B8 revolution/gf/GFLight.cpp: .text start:0x804F8CB0 end:0x804F8D20 @@ -3167,7 +3167,7 @@ revolution/gf/GFTev.cpp: JSystem/JKernel/JKRHeap.cpp: .text start:0x804F91A0 end:0x804FB0C0 .data start:0x8070CF60 end:0x8070D2C0 - .sdata start:0x8074A8BC end:0x8074A8F8 + .sdata start:0x8074A8B8 end:0x8074A8F8 .sbss start:0x8074CE20 end:0x8074CE58 JSystem/JKernel/JKRStdHeap.cpp: @@ -3294,7 +3294,7 @@ JSystem/JKernel/JKRDvdFile.cpp: .text start:0x8050B7F0 end:0x8050C090 .ctors start:0x8062F9BC end:0x8062F9C0 .data start:0x8070E8D0 end:0x8070E988 - .sdata start:0x8074AAA0 end:0x8074AAC4 + .sdata start:0x8074AAA0 end:0x8074AAC0 .bss start:0x807E2000 end:0x807E2018 JSystem/JKernel/JKRRelocation.cpp: @@ -3304,7 +3304,7 @@ JSystem/JKernel/JKRDvdRipper.cpp: .text start:0x8050C100 end:0x8050D0B0 .ctors start:0x8062F9C0 end:0x8062F9C4 .data start:0x8070E988 end:0x8070EA10 - .sdata start:0x8074AAC4 end:0x8074AAD4 + .sdata start:0x8074AAC0 end:0x8074AAD0 .sbss start:0x8074CEF0 end:0x8074CF30 .bss start:0x807E2018 end:0x807E2048 @@ -3312,7 +3312,7 @@ JSystem/JKernel/JKRDvdAramRipper.cpp: .text start:0x8050D0B0 end:0x8050E3E0 .ctors start:0x8062F9C4 end:0x8062F9C8 .data start:0x8070EA10 end:0x8070EA60 - .sdata start:0x8074AAD4 end:0x8074AAE0 + .sdata start:0x8074AAD0 end:0x8074AAE0 .sbss start:0x8074CF30 end:0x8074CF78 .bss start:0x807E2048 end:0x807E2078 diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index dc8edc3c01..7bc5653927 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -63199,10 +63199,10 @@ __RTTI__11Z2TrackView = .sdata:0x8074A798; // type:object size:0x8 scope:global @STRING@getName__8SpkTableFl@6 = .sdata:0x8074A89C; // type:object size:0x5 scope:local data:string hash:0x137611D3 dhash:0x073DA070 @STRING@getName__8SpkTableFl@2 = .sdata:0x8074A8A4; // type:object size:0x5 scope:local data:string hash:0x137611D7 dhash:0x073DA070 @LOCAL@GFSetGenMode2__FUcUcUcUc11_GXCullMode@cm2hw = .sdata:0x8074A8B0; // type:object size:0x4 scope:local hash:0x2556FA26 dhash:0x539006AE -lbl_8074A8B8 = .sdata:0x8074A8B8; // type:object size:0x1 data:byte hash:0xE5885B95 -lbl_8074A8B9 = .sdata:0x8074A8B9; // type:object size:0x1 data:byte hash:0xA67FA7FF -lbl_8074A8BA = .sdata:0x8074A8BA; // type:object size:0x1 data:byte hash:0xE1465DBA -lbl_8074A8BB = .sdata:0x8074A8BB; // type:object size:0x1 data:byte hash:0x945B0366 dhash:0x9612ACB1 +JKRValue_DEBUGFILL_NOTUSE = .sdata:0x8074A8B8; // type:object size:0x1 data:byte hash:0xE5885B95 +JKRValue_DEBUGFILL_NEW = .sdata:0x8074A8B9; // type:object size:0x1 data:byte hash:0xA67FA7FF +JKRValue_DEBUGFILL_DELETE = .sdata:0x8074A8BA; // type:object size:0x1 data:byte hash:0xE1465DBA +sDefaultFillFlag__7JKRHeap = .sdata:0x8074A8BB; // type:object size:0x1 data:byte hash:0x945B0366 dhash:0x9612ACB1 @14089 = .sdata:0x8074A8BC; // type:object size:0x5 scope:local data:string hash:0xA05FF031 @14456 = .sdata:0x8074A8C4; // type:object size:0x7 scope:local data:string hash:0xA05FFF97 fillcheck_dispcount = .sdata:0x8074A8CC; // type:object size:0x4 scope:global data:4byte hash:0x731C7E5E @@ -63271,10 +63271,10 @@ __RTTI__14JKRCompArchive = .sdata:0x8074AA90; // type:object size:0x8 scope:glob __RTTI__10JKRDvdFile = .sdata:0x8074AAA8; // type:object size:0x8 scope:global hash:0xA39B169C dhash:0x1A927B5D @21252 = .sdata:0x8074AAB0; // type:object size:0x8 scope:local data:string hash:0xA0B9E533 __RTTI__7JKRFile = .sdata:0x8074AAB8; // type:object size:0x8 scope:global hash:0x8C1DDA5C dhash:0x58EDFE0B -lbl_8074AAC0 = .sdata:0x8074AAC0; // type:object size:0x1 data:byte hash:0x9B09263F dhash:0xB4D2E83C +errorRetry__12JKRDvdRipper = .sdata:0x8074AAC0; // type:object size:0x1 data:byte hash:0x9B09263F dhash:0xB4D2E83C sSZSBufferSize__12JKRDvdRipper = .sdata:0x8074AAC4; // type:object size:0x4 scope:global data:4byte hash:0x2ED3E403 dhash:0xB48264C0 @14372 = .sdata:0x8074AAC8; // type:object size:0x5 scope:local data:string hash:0xA0600416 -lbl_8074AAD0 = .sdata:0x8074AAD0; // type:object size:0x1 data:byte hash:0xBB6B9A04 dhash:0x9C59CC43 +errorRetry__16JKRDvdAramRipper = .sdata:0x8074AAD0; // type:object size:0x1 data:byte hash:0xBB6B9A04 dhash:0x9C59CC43 sSZSBufferSize__16JKRDvdAramRipper = .sdata:0x8074AAD4; // type:object size:0x4 scope:global data:4byte hash:0xBC3A40B8 dhash:0xE4EAFC7F @5746 = .sdata:0x8074AAD8; // type:object size:0x5 scope:local data:string hash:0x0C9C0385 @4000 = .sdata:0x8074AAE0; // type:object size:0x5 scope:local data:string hash:0x0C9D8B61 diff --git a/include/JSystem/JKernel/JKRAram.h b/include/JSystem/JKernel/JKRAram.h index 9f0e7c3083..9c8ebd88d1 100644 --- a/include/JSystem/JKernel/JKRAram.h +++ b/include/JSystem/JKernel/JKRAram.h @@ -50,14 +50,13 @@ public: static JSUList& getCommandList() { return sAramCommandList; } static u8 decideAramGroupId(int groupId) { - JKRAramHeap* heap; u8 finalGroupId; - if (groupId < 0) { - return getAramHeap()->getCurrentGroupID(); + finalGroupId = getAramHeap()->getCurrentGroupID(); + } else { + finalGroupId = groupId; } - - return (u8)groupId; + return finalGroupId; } static u32 getSZSBufferSize() { return sSZSBufferSize; } diff --git a/include/JSystem/JKernel/JKRAramArchive.h b/include/JSystem/JKernel/JKRAramArchive.h index 131dccbaa8..5ec395e296 100644 --- a/include/JSystem/JKernel/JKRAramArchive.h +++ b/include/JSystem/JKernel/JKRAramArchive.h @@ -12,9 +12,12 @@ class JKRFile; */ class JKRAramArchive : public JKRArchive { public: + JKRAramArchive(); JKRAramArchive(s32, JKRArchive::EMountDirection); virtual ~JKRAramArchive(); + void fixedInit(s32, JKRArchive::EMountDirection); + BOOL mountFixed(s32, JKRArchive::EMountDirection); bool open(s32); u32 getAramAddress_Entry(SDIFileEntry*); u32 getAramAddress(char const*); diff --git a/include/JSystem/JKernel/JKRAramBlock.h b/include/JSystem/JKernel/JKRAramBlock.h index e3eea99167..3945ebad89 100644 --- a/include/JSystem/JKernel/JKRAramBlock.h +++ b/include/JSystem/JKernel/JKRAramBlock.h @@ -34,7 +34,7 @@ public: /* 0x18 */ u32 mSize; /* 0x1C */ u32 mFreeSize; /* 0x20 */ u8 mGroupId; - /* 0x21 */ u8 mIsTempMemory; + /* 0x21 */ bool mIsTempMemory; /* 0x22 */ u8 padding[2]; }; diff --git a/include/JSystem/JKernel/JKRAramHeap.h b/include/JSystem/JKernel/JKRAramHeap.h index 3dd0bbd741..034a90c3eb 100644 --- a/include/JSystem/JKernel/JKRAramHeap.h +++ b/include/JSystem/JKernel/JKRAramHeap.h @@ -17,7 +17,6 @@ public: }; public: - // TODO: fix type static JSUList sAramList; JKRAramHeap(u32, u32); diff --git a/include/JSystem/JKernel/JKRAramPiece.h b/include/JSystem/JKernel/JKRAramPiece.h index a75f63adef..25f304f02b 100644 --- a/include/JSystem/JKernel/JKRAramPiece.h +++ b/include/JSystem/JKernel/JKRAramPiece.h @@ -42,6 +42,16 @@ public: /* 0x94 */ void* field_0x94; }; +struct JKRAramCommand { + s32 field_0x00; + void* command; + + void setting(int param_1, void* param_2) { + field_0x00 = param_1; + command = param_2; + } +}; + /** * @ingroup jsystem-jkernel * @@ -52,12 +62,6 @@ public: // TODO: fix type static JSUList sAramPieceCommandList; -public: - struct Message { - s32 field_0x00; - JKRAMCommand* command; - }; - public: static JKRAMCommand* prepareCommand(int, u32, u32, u32, JKRAramBlock*, JKRAMCommand::AsyncCallback); @@ -74,6 +78,10 @@ private: static void unlock() { OSUnlockMutex(&mMutex); } }; +inline void JKRAramPcs_SendCommand(JKRAMCommand* command) { + JKRAramPiece::sendCommand(command); +} + inline BOOL JKRAramPcs(int direction, u32 source, u32 destination, u32 length, JKRAramBlock* block) { return JKRAramPiece::orderSync(direction, source, destination, length, block); diff --git a/include/JSystem/JKernel/JKRAramStream.h b/include/JSystem/JKernel/JKRAramStream.h index a1a78a6706..47d9257229 100644 --- a/include/JSystem/JKernel/JKRAramStream.h +++ b/include/JSystem/JKernel/JKRAramStream.h @@ -77,8 +77,16 @@ inline JKRAramStreamCommand* JKRStreamToAram_Async(JSUFileInputStream *stream, u return JKRAramStream::write_StreamToAram_Async(stream, addr, size, offset, returnSize); } +inline JKRAramStreamCommand* JKRStreamToAram_Sync(JKRAramStreamCommand* command, BOOL isNonBlocking) { + return JKRAramStream::sync(command, isNonBlocking); +} + inline void JKRSetAramTransferBuffer(u8* buffer, u32 bufferSize, JKRHeap* heap) { JKRAramStream::setTransBuffer(buffer, bufferSize, heap); } +inline void JKRResetAramTransferBuffer() { + JKRAramStream::setTransBuffer(NULL, 0, NULL); +} + #endif /* JKRARAMSTREAM_H */ diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h index ee54335886..cf4b3ef045 100644 --- a/include/JSystem/JKernel/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive.h @@ -186,7 +186,7 @@ public: /* 0x48 */ SDIDirEntry* mNodes; /* 0x4C */ SDIFileEntry* mFiles; /* 0x50 */ s32* mExpandedSize; - /* 0x54 */ char* mStringTable; + /* 0x54 */ const char* mStringTable; protected: /* 0x58 */ u32 field_0x58; @@ -200,29 +200,27 @@ public: static JKRArchive* mount(s32, EMountMode, JKRHeap*, EMountDirection); static void* getGlbResource(u32, const char*, JKRArchive*); - static JKRCompression convertAttrToCompressionType(u32 attr) { + static JKRCompression convertAttrToCompressionType(int attr) { #define JKRARCHIVE_ATTR_COMPRESSION 0x04 #define JKRARCHIVE_ATTR_YAZ0 0x80 - JKRCompression compression; if (!(attr & JKRARCHIVE_ATTR_COMPRESSION)) { - compression = COMPRESSION_NONE; + return COMPRESSION_NONE; } else if (attr & JKRARCHIVE_ATTR_YAZ0) { - compression = COMPRESSION_YAZ0; + return COMPRESSION_YAZ0; } else { - compression = COMPRESSION_YAY0; + return COMPRESSION_YAY0; } - return compression; } static u32 getCurrentDirID() { return sCurrentDirID; } static void setCurrentDirID(u32 dirID) { sCurrentDirID = dirID; } -private: +protected: static u32 sCurrentDirID; }; -inline JKRCompression JKRConvertAttrToCompressionType(u32 attr) { +inline JKRCompression JKRConvertAttrToCompressionType(int attr) { return JKRArchive::convertAttrToCompressionType(attr); } diff --git a/include/JSystem/JKernel/JKRAssertHeap.h b/include/JSystem/JKernel/JKRAssertHeap.h index 13e84d0d1c..e57b989f05 100644 --- a/include/JSystem/JKernel/JKRAssertHeap.h +++ b/include/JSystem/JKernel/JKRAssertHeap.h @@ -2,6 +2,7 @@ #define JKRASSERTHEAP_H #include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JUtility/JUTAssert.h" /** * @ingroup jsystem-jkernel @@ -18,18 +19,19 @@ public: /* vt[06] */ virtual bool dump_sort(void); /* override */ /* vt[07] */ virtual bool dump(void); /* override */ /* vt[08] */ virtual void do_destroy(void); /* override */ - /* vt[09] */ virtual void* do_alloc(u32, int); /* override */ - /* vt[10] */ virtual void do_free(void*); /* override */ - /* vt[11] */ virtual void do_freeAll(void); /* override */ - /* vt[12] */ virtual void do_freeTail(void); /* override */ - /* vt[13] */ virtual void do_fillFreeArea(void); /* override */ - /* vt[14] */ virtual s32 do_resize(void*, u32); /* override */ - /* vt[15] */ virtual s32 do_getSize(void*); /* override */ - /* vt[16] */ virtual s32 do_getFreeSize(void); /* override */ - /* vt[17] */ virtual void* do_getMaxFreeBlock(void); /* override */ - /* vt[18] */ virtual s32 do_getTotalFreeSize(void); /* override */ - /* vt[19] */ virtual s32 do_changeGroupID(u8 param_1); /* override */ - /* vt[20] */ virtual u8 do_getCurrentGroupId(void); /* override */ + /* vt[19] */ virtual s32 do_changeGroupID(u8) { JUT_ASSERT(41, 0&& "illegal changeGroupID()"); return 0; } + /* vt[20] */ virtual u8 do_getCurrentGroupId(void) { return 0; } + /* vt[09] */ virtual void* do_alloc(u32, int alignment) { UNUSED(alignment); JUT_ASSERT(47, 0&& "illegal alloc"); return NULL; } + /* vt[10] */ virtual void do_free(void*) { JUT_ASSERT(51, 0&& "illegal free"); } + /* vt[11] */ virtual void do_freeAll(void) { JUT_ASSERT(53, 0&& "illegal freeAll()"); } + /* vt[12] */ virtual void do_freeTail(void) { JUT_ASSERT(55, 0&& "illegal freeTail()"); } + /* vt[13] */ virtual void do_fillFreeArea(void) {} + /* vt[14] */ virtual s32 do_resize(void*, u32) { JUT_ASSERT(61, 0&& "illegal resize"); return 0; } + /* vt[15] */ virtual s32 do_getSize(void*) { return 0; } + /* vt[16] */ virtual s32 do_getFreeSize(void) { return 0; } + /* vt[17] */ virtual void* do_getMaxFreeBlock(void) { return 0; } + /* vt[18] */ virtual s32 do_getTotalFreeSize(void) { return 0; } + public: static JKRAssertHeap* create(JKRHeap*); diff --git a/include/JSystem/JKernel/JKRDecomp.h b/include/JSystem/JKernel/JKRDecomp.h index c397218591..9131ecfbaa 100644 --- a/include/JSystem/JKernel/JKRDecomp.h +++ b/include/JSystem/JKernel/JKRDecomp.h @@ -82,4 +82,8 @@ inline u32 JKRDecompExpandSize(u8* pBuf) { return (pBuf[4] << 0x18) | (pBuf[5] << 0x10) | (pBuf[6] << 8) | pBuf[7]; } +inline void JKRDecompress_SendCommand(JKRDecompCommand* command) { + JKRDecomp::sendCommand(command); +} + #endif /* JKRDECOMP_H */ diff --git a/include/JSystem/JKernel/JKRDvdAramRipper.h b/include/JSystem/JKernel/JKRDvdAramRipper.h index 1e0f05ac15..110827dc0b 100644 --- a/include/JSystem/JKernel/JKRDvdAramRipper.h +++ b/include/JSystem/JKernel/JKRDvdAramRipper.h @@ -50,6 +50,7 @@ public: static JKRADCommand* callCommand_Async(JKRADCommand*); static bool syncAram(JKRADCommand*, int); + static u32 getSZSBufferSize() { return sSZSBufferSize; } static void setSZSBufferSize(u32 size) { sSZSBufferSize = size; } static bool isErrorRetry() { return errorRetry; } diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile.h index faf5120097..bda9aa738a 100644 --- a/include/JSystem/JKernel/JKRDvdFile.h +++ b/include/JSystem/JKernel/JKRDvdFile.h @@ -28,7 +28,7 @@ public: u32 getFileID() const { return mFileInfo.startAddr; } DVDFileInfo* getFileInfo() { return &mFileInfo; } - int getStatus() { return DVDGetCommandBlockStatus(&mFileInfo.cb); } + int getStatus() const { return DVDGetCommandBlockStatus(&mFileInfo.cb); } public: /* vt[03] */ virtual bool open(const char*); /* override */ diff --git a/include/JSystem/JKernel/JKRDvdRipper.h b/include/JSystem/JKernel/JKRDvdRipper.h index 954c6fd097..82b9c21a2e 100644 --- a/include/JSystem/JKernel/JKRDvdRipper.h +++ b/include/JSystem/JKernel/JKRDvdRipper.h @@ -35,6 +35,7 @@ class JKRDvdRipper { public: static JSUList sDvdAsyncList; static u32 sSZSBufferSize; + static bool errorRetry; enum EAllocDirection { UNKNOWN_EALLOC_DIRECTION = 0, @@ -51,12 +52,20 @@ public: static void* loadToMainRAM(JKRDvdFile*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, JKRCompression*, u32*); - static u8 isErrorRetry(void); + static bool isErrorRetry(void) { return errorRetry; } inline static u32 getSZSBufferSize() { return sSZSBufferSize; } }; // void JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*); + +inline void* JKRDvdToMainRam(JKRDvdFile* file, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, + JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection, + u32 offset, JKRCompression* compression, u32* returnSize) { + return JKRDvdRipper::loadToMainRAM(file, dst, expandSwitch, dstLength, heap, allocDirection, + offset, compression, returnSize); +} + inline void* JKRDvdToMainRam(s32 entryNum, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection, u32 offset, JKRCompression* compression, u32* returnSize) { diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h index c52211c559..309b81f29a 100644 --- a/include/JSystem/JKernel/JKRExpHeap.h +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -63,7 +63,7 @@ protected: void joinTwoBlocks(CMemBlock* block); public: - s32 isEmpty(); + BOOL isEmpty(); s32 getUsedSize(u8 groupId) const; s32 getTotalUsedSize(void) const; @@ -110,6 +110,9 @@ public: static JKRExpHeap* createRoot(int maxHeaps, bool errorFlag); static JKRExpHeap* create(u32 size, JKRHeap* parent, bool errorFlag); static JKRExpHeap* create(void* ptr, u32 size, JKRHeap* parent, bool errorFlag); + + static s32 getUsedSize_(JKRExpHeap* heap) { return heap->mSize - heap->getTotalFreeSize(); } + static void* getState_(TState* state) { return getState_buf_(state); } }; inline JKRExpHeap* JKRCreateExpHeap(u32 size, JKRHeap* parent, bool errorFlag) { diff --git a/include/JSystem/JKernel/JKRFile.h b/include/JSystem/JKernel/JKRFile.h index 896ddb4976..7667bb6527 100644 --- a/include/JSystem/JKernel/JKRFile.h +++ b/include/JSystem/JKernel/JKRFile.h @@ -12,7 +12,7 @@ public: JKRFile() : mIsAvailable(false) {} virtual ~JKRFile() {} - s32 read(void*, s32, s32); + void read(void*, s32, s32); bool isAvailable() const { return mIsAvailable; } diff --git a/include/JSystem/JKernel/JKRFileLoader.h b/include/JSystem/JKernel/JKRFileLoader.h index a7a284b469..7e3e4cd1c5 100644 --- a/include/JSystem/JKernel/JKRFileLoader.h +++ b/include/JSystem/JKernel/JKRFileLoader.h @@ -14,8 +14,8 @@ public: JKRFileLoader(void); virtual ~JKRFileLoader(); - bool isMounted() const { return this->mIsMounted; } - u32 getVolumeType() const { return this->mVolumeType; } + bool isMounted() { return this->mIsMounted; } + u32 getVolumeType() { return this->mVolumeType; } public: /* vt[03] */ virtual void unmount(void); diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index d44088bc1b..650ee57663 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -8,10 +8,12 @@ class JKRHeap; typedef void (*JKRErrorHandler)(void*, u32, int); -extern bool data_804508B0; -extern u8 data_804508B1; -extern u8 data_804508B2; -extern u8 data_804508B3; +extern u8 JKRValue_DEBUGFILL_NOTUSE; +extern u8 JKRValue_DEBUGFILL_NEW; +extern u8 JKRValue_DEBUGFILL_DELETE; + +extern s32 fillcheck_dispcount; +extern bool data_8074A8D0_debug; /** * @ingroup jsystem-jkernel @@ -19,6 +21,9 @@ extern u8 data_804508B3; */ class JKRHeap : public JKRDisposer { public: + typedef void (*JKRAllocCallback)(u32, int, JKRHeap*, void*); + typedef void (*JKRFreeCallback)(void*, JKRHeap*); + class TState { public: /* 0x00 */ u32 mUsedSize; @@ -54,6 +59,7 @@ public: void* getMaxFreeBlock(); s32 getTotalFreeSize(); s32 changeGroupID(u8 newGroupId); + u8 getCurrentGroupId(); u32 getMaxAllocatableSize(int alignment); JKRHeap* find(void* ptr) const; @@ -96,13 +102,13 @@ public: void* getEndAddr() { return (void*)mEnd; } u32 getSize() const { return mSize; } bool getErrorFlag() const { return mErrorFlag; } - void callErrorHandler(JKRHeap* heap, u32 size, int alignment) { + void callErrorHandler(void* heap, u32 size, int alignment) { if (mErrorHandler) { (*mErrorHandler)(heap, size, alignment); } } - JKRHeap* getParent() const { + JKRHeap* getParent() { JSUTree* parent = mChildTree.getParent(); return parent->getObject(); } @@ -110,8 +116,8 @@ public: JSUTree& getHeapTree() { return mChildTree; } void appendDisposer(JKRDisposer* disposer) { mDisposerList.append(&disposer->mLink); } void removeDisposer(JKRDisposer* disposer) { mDisposerList.remove(&disposer->mLink); } - void lock() { OSLockMutex(&mMutex); } - void unlock() { OSUnlockMutex(&mMutex); } + void lock() const { OSLockMutex(const_cast(&mMutex)); } + void unlock() const { OSUnlockMutex(const_cast(&mMutex)); } u32 getHeapSize() { return mSize; } u8 getCurrentGroupId() { return 0; } @@ -133,6 +139,7 @@ protected: public: static bool initArena(char** memory, u32* size, int maxHeaps); + static bool initArena2(char** memory, u32* size, int maxHeaps); static void* alloc(u32 size, int alignment, JKRHeap* heap); static void free(void* ptr, JKRHeap* heap); static s32 resize(void* ptr, u32 size, JKRHeap* heap); @@ -144,8 +151,11 @@ public: static bool checkMemoryFilled(void* src, u32 size, u8 value); static JKRErrorHandler setErrorHandler(JKRErrorHandler errorHandler); + static void fillMemory(u8*, u32, u8); + static bool checkMemoryFilled(u8*, u32, u8); - static void setDefaultDebugFill(bool status) { data_804508B0 = status; } + static bool isDefaultDebugFill() { return sDefaultFillFlag; } + static void setDefaultDebugFill(bool status) { sDefaultFillFlag = status; } static void* getCodeStart(void) { return mCodeStart; } static void* getCodeEnd(void) { return mCodeEnd; } static void* getUserRamStart(void) { return mUserRamStart; } @@ -166,13 +176,16 @@ public: state->mCheckCode = checkCode; } static void* getState_buf_(TState* state) { return &state->mBuf; } - static void* getState_(TState* state) { return getState_buf_(state); } static void* mCodeStart; static void* mCodeEnd; static void* mUserRamStart; static void* mUserRamEnd; static u32 mMemorySize; + static JKRAllocCallback sAllocCallback; + static JKRFreeCallback sFreeCallback; + + static bool sDefaultFillFlag; static JKRHeap* sRootHeap; @@ -206,8 +219,7 @@ inline void* JKRAllocFromHeap(JKRHeap* heap, u32 size, int alignment) { } inline void* JKRAllocFromSysHeap(u32 size, int alignment) { - JKRHeap* systemHeap = JKRHeap::getSystemHeap(); - return systemHeap->alloc(size, alignment); + return JKRHeap::getSystemHeap()->alloc(size, alignment); } inline void JKRFreeToHeap(JKRHeap* heap, void* ptr) { @@ -215,14 +227,17 @@ inline void JKRFreeToHeap(JKRHeap* heap, void* ptr) { } inline void JKRFreeToSysHeap(void* ptr) { - JKRHeap* systemHeap = JKRHeap::getSystemHeap(); - systemHeap->free(ptr); + JKRHeap::getSystemHeap()->free(ptr); } inline void JKRFree(void* ptr) { JKRHeap::free(ptr, NULL); } +inline void JKRFillMemory(u8* dst, u32 size, u8 val) { + JKRHeap::fillMemory(dst, size, val); +} + inline JKRHeap* JKRGetSystemHeap() { return JKRHeap::getSystemHeap(); } @@ -268,9 +283,9 @@ inline JKRHeap* JKRGetRootHeap2() { } #if DEBUG -inline void JKRSetDebugFillNotuse(u8 status) { data_804508B1 = status; } -inline void JKRSetDebugFillNew(u8 status) { data_804508B2 = status; } -inline void JKRSetDebugFillDelete(u8 status) { data_804508B3 = status; } +inline void JKRSetDebugFillNotuse(u8 status) { JKRValue_DEBUGFILL_NOTUSE = status; } +inline void JKRSetDebugFillNew(u8 status) { JKRValue_DEBUGFILL_NEW = status; } +inline void JKRSetDebugFillDelete(u8 status) { JKRValue_DEBUGFILL_DELETE = status; } #endif #endif /* JKRHEAP_H */ diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h index bc2a1ffc15..1897fd5aec 100644 --- a/include/JSystem/JKernel/JKRSolidHeap.h +++ b/include/JSystem/JKernel/JKRSolidHeap.h @@ -59,6 +59,8 @@ public: s32 adjustSize(void); static JKRSolidHeap* create(u32, JKRHeap*, bool); + + static void* getState_(TState* state) { return getState_buf_(state); } }; inline JKRSolidHeap* JKRCreateSolidHeap(u32 param_0, JKRHeap* heap, bool param_2) { diff --git a/include/JSystem/JKernel/JKRThread.h b/include/JSystem/JKernel/JKRThread.h index b82a22ae9b..9fb515fe7b 100644 --- a/include/JSystem/JKernel/JKRThread.h +++ b/include/JSystem/JKernel/JKRThread.h @@ -117,7 +117,7 @@ private: /* 0x28 */ JKRHeap* mHeap; /* 0x2C */ OSThread* mThreadRecord; /* 0x30 */ OSMessageQueue mMessageQueue; - /* 0x50 */ OSMessage* mMessages; + /* 0x50 */ OSMessage* mMesgBuffer; /* 0x54 */ s32 mMessageCount; /* 0x58 */ void* mStackMemory; /* 0x5C */ u32 mStackSize; @@ -159,7 +159,7 @@ public: private: static JKRThreadSwitch* sManager; static u32 sTotalCount; - static u32 sTotalStart; + static u64 sTotalStart; static JKRThreadSwitch_PreCallback mUserPreCallback; static JKRThreadSwitch_PostCallback mUserPostCallback; diff --git a/include/JSystem/JSupport/JSUList.h b/include/JSystem/JSupport/JSUList.h index 8d42762d2c..682dd52e42 100644 --- a/include/JSystem/JSupport/JSUList.h +++ b/include/JSystem/JSupport/JSUList.h @@ -137,7 +137,7 @@ public: return *this; } - T* getObject() { return this->mLink->getObject(); } + T* getObject() const { return this->mLink->getObject(); } bool operator==(JSULink const* other) const { return this->mLink == other; } bool operator!=(JSULink const* other) const { return this->mLink != other; } diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp index 315054a33e..e067e18c06 100644 --- a/src/JSystem/JKernel/JKRAram.cpp +++ b/src/JSystem/JKernel/JKRAram.cpp @@ -10,6 +10,12 @@ #include #include "string.h" +#if PLATFORM_GCN +const u32 stack_size = 0xc00; +#else +const u32 stack_size = 0x4000; +#endif + static u8* firstSrcData(); static u8* nextSrcData(u8* param_0); static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32 dstLength, @@ -21,7 +27,7 @@ JKRAram* JKRAram::sAramObject; JKRAram* JKRAram::create(u32 aram_audio_buffer_size, u32 aram_audio_graph_size, s32 stream_priority, s32 decomp_priority, s32 piece_priority) { if (!sAramObject) { - sAramObject = new (JKRHeap::getSystemHeap(), 0) + sAramObject = new (JKRGetSystemHeap(), 0) JKRAram(aram_audio_buffer_size, aram_audio_graph_size, piece_priority); } @@ -41,11 +47,12 @@ OSMessage JKRAram::sMessageBuffer[4] = { OSMessageQueue JKRAram::sMessageQueue = {0}; JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority) - : JKRThread(0xC00, 0x10, priority) { + : JKRThread(stack_size, 0x10, priority) { u32 aramBase = ARInit(mStackArray, ARRAY_SIZEU(mStackArray)); ARQInit(); u32 aramSize = ARGetSize(); + OS_REPORT("ARAM size = %08x\n", aramSize); mAudioMemorySize = audio_buffer_size; if (audio_graph_size == 0xFFFFFFFF) { @@ -65,7 +72,11 @@ JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority) mAramMemoryPtr = NULL; } - mAramHeap = new (JKRHeap::getSystemHeap(), 0) JKRAramHeap(mGraphMemoryPtr, mGraphMemorySize); + OS_REPORT("ARAM audio area %08x: %08x\n", mAudioMemoryPtr, mAudioMemorySize); + OS_REPORT("ARAM graph area %08x: %08x\n", mGraphMemoryPtr, mGraphMemorySize); + OS_REPORT("ARAM user area %08x: %08x\n", mAramMemoryPtr, mAramMemorySize); + + mAramHeap = new (JKRGetSystemHeap(), 0) JKRAramHeap(mGraphMemoryPtr, mGraphMemorySize); } JKRAram::~JKRAram() { @@ -75,14 +86,13 @@ JKRAram::~JKRAram() { } void* JKRAram::run(void) { - int result; - JKRAMCommand* command; - JKRAramPiece::Message* message; OSInitMessageQueue(&sMessageQueue, sMessageBuffer, 4); do { - OSReceiveMessage(&sMessageQueue, (OSMessage*)&message, OS_MESSAGE_BLOCK); - result = message->field_0x00; - command = message->command; + OSMessage msg; + OSReceiveMessage(&sMessageQueue, &msg, OS_MESSAGE_BLOCK); + JKRAramCommand* message = (JKRAramCommand*)msg; + int result = message->field_0x00; + JKRAMCommand* command = (JKRAMCommand*)message->command; delete message; switch (result) { @@ -104,9 +114,9 @@ void JKRAram::checkOkAddress(u8* addr, u32 size, JKRAramBlock* block, u32 param_ } void JKRAram::changeGroupIdIfNeed(u8* data, int groupId) { - JKRHeap* currentHeap = JKRHeap::getCurrentHeap(); + JKRHeap* currentHeap = JKRGetCurrentHeap(); if (currentHeap->getHeapType() == 'EXPH' && groupId >= 0) { - JKRExpHeap::CMemBlock* block = JKRExpHeap::CMemBlock::getBlock(data); + JKRExpHeap::CMemBlock* block = (JKRExpHeap::CMemBlock*)(data - sizeof(JKRExpHeap::CMemBlock)); block->newGroupId(groupId); } } @@ -127,54 +137,55 @@ JKRAramBlock* JKRAram::mainRamToAram(u8* buf, u32 bufSize, u32 alignedSize, fileSize = ALIGN_NEXT(expandSize, 32); } if (bufSize == 0) { - JKRAramBlock* allocatedBlock = - (JKRAramBlock*)JKRAllocFromAram(fileSize, JKRAramHeap::HEAD); - block = (JKRAramBlock*)allocatedBlock; - if (allocatedBlock == NULL) + block = JKRAllocFromAram(fileSize, JKRAramHeap::HEAD); + if (block == NULL) { return NULL; + } - allocatedBlock->newGroupID(decideAramGroupId(id)); - bufSize = allocatedBlock->getAddress(); + block->newGroupID(decideAramGroupId(id)); + bufSize = block->getAddress(); } - if (alignedSize == 0 || alignedSize > expandSize) + if (alignedSize == 0 || alignedSize > expandSize) { alignedSize = ALIGN_NEXT(expandSize, 32); + } - if (alignedSize > fileSize) + if (alignedSize > fileSize) { alignedSize = fileSize; + } void* allocatedMem = JKRAllocFromHeap(heap, fileSize, -32); if (allocatedMem == NULL) { if (block != NULL) { JKRFreeToAram(block); } - block = NULL; - } else { - JKRDecompress(buf, (u8*)allocatedMem, fileSize, 0); - JKRAramPcs(0, (uintptr_t)allocatedMem, bufSize, alignedSize, block); - JKRFreeToHeap(heap, allocatedMem); - block = block == NULL ? (JKRAramBlock*)-1 : block; - if (pSize != NULL) { - *pSize = alignedSize; - } + return NULL; } - } else { - if (fileSize != 0 && alignedSize > fileSize) - alignedSize = fileSize; - if (bufSize == 0) { - JKRAramBlock* allocatedBlock = - (JKRAramBlock*)JKRAllocFromAram(alignedSize, JKRAramHeap::HEAD); - block = allocatedBlock; - block->newGroupID(decideAramGroupId(id)); - if (block == NULL) - return NULL; - - bufSize = allocatedBlock->getAddress(); - } - - JKRAramPcs(0, (uintptr_t)buf, bufSize, alignedSize, block); + JKRDecompress(buf, (u8*)allocatedMem, fileSize, 0); + JKRAramPcs(0, (uintptr_t)allocatedMem, bufSize, alignedSize, block); + JKRFreeToHeap(heap, allocatedMem); block = block == NULL ? (JKRAramBlock*)-1 : block; - if (pSize != NULL) + if (pSize != NULL) { *pSize = alignedSize; + } + return block; + } + if (fileSize != 0 && alignedSize > fileSize) { + alignedSize = fileSize; + } + if (bufSize == 0) { + block = JKRAllocFromAram(alignedSize, JKRAramHeap::HEAD); + block->newGroupID(decideAramGroupId(id)); + if (block == NULL) { + return NULL; + } + + bufSize = block->getAddress(); + } + + JKRAramPcs(0, (uintptr_t)buf, bufSize, alignedSize, block); + block = block == NULL ? (JKRAramBlock*)-1 : block; + if (pSize != NULL) { + *pSize = alignedSize; } return block; } @@ -201,14 +212,13 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS if (p5 != 0 && p5 < expandSize) expandSize = p5; - if (buf == NULL) - buf = (u8*)JKRAllocFromHeap(heap, expandSize, 32); - if (buf == NULL) + u8* r26 = !buf ? (u8*)JKRAllocFromHeap(heap, expandSize, 32) : buf; + if (r26 == NULL) return NULL; else { - changeGroupIdIfNeed(buf, id); - JKRDecompressFromAramToMainRam(address, buf, p3, expandSize, 0, pSize); - return buf; + changeGroupIdIfNeed(r26, id); + JKRDecompressFromAramToMainRam(address, r26, p3, expandSize, 0, pSize); + return r26; } } else if (compression == COMPRESSION_YAY0) { // SZP u8* szpSpace = (u8*)JKRAllocFromHeap(heap, p3, -32); @@ -219,12 +229,7 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS if (p5 != 0 && p5 < expandSize) expandSize = p5; - u8* rv; - if (buf == NULL) { - rv = (u8*)JKRAllocFromHeap(heap, expandSize, 32); - } else { - rv = buf; - } + u8* rv = !buf ? (u8*)JKRAllocFromHeap(heap, expandSize, 32) : buf; if (rv == NULL) { JKRFree(szpSpace); @@ -240,17 +245,16 @@ u8* JKRAram::aramToMainRam(u32 address, u8* buf, u32 p3, JKRExpandSwitch expandS } } } else { // Not compressed or ASR - if (buf == NULL) - buf = (u8*)JKRAllocFromHeap(heap, p3, 32); - if (buf == NULL) { + u8* r24 = !buf ? (u8*)JKRAllocFromHeap(heap, p3, 32) : buf; + if (r24 == NULL) { return NULL; } else { - changeGroupIdIfNeed(buf, id); - JKRAramPcs(1, address, (uintptr_t)buf, p3, NULL); + changeGroupIdIfNeed(r24, id); + JKRAramPcs(1, address, (uintptr_t)r24, p3, NULL); if (pSize != NULL) { *pSize = p3; } - return buf; + return r24; } } } @@ -303,10 +307,12 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32 u32 szsBufferSize = JKRAram::getSZSBufferSize(); szpBuf = (u8*)JKRAllocFromSysHeap(szsBufferSize, 32); + JUT_ASSERT(1114, szpBuf != NULL); szpEnd = szpBuf + szsBufferSize; if (offset != 0) { refBuf = (u8*)JKRAllocFromSysHeap(0x1120, 0); + JUT_ASSERT(1123, refBuf != NULL) refEnd = refBuf + 0x1120; refCurrent = refBuf; } else { @@ -321,7 +327,8 @@ static int JKRDecompressFromAramToMainRam(u32 src, void* dst, u32 srcLength, u32 tsPtr = (resourceSize != 0) ? resourceSize : &tsArea; *tsPtr = 0; - decompSZS_subroutine(firstSrcData(), (u8*)dst); + u8* first = firstSrcData(); + int r25 = decompSZS_subroutine(first, (u8*)dst); JKRFree(szpBuf); if (refBuf) { JKRFree(refBuf); @@ -350,14 +357,17 @@ int decompSZS_subroutine(u8* src, u8* dest) { } src += 0x10; + s32 b1; + u32 dist; + s32 numBytes; + u8* copySource; do { if (validBitCount == 0) { if ((src > srcLimit) && transLeft) { src = nextSrcData(src); } - currCodeByte = *src; + currCodeByte = *src++; validBitCount = 8; - src++; } if (currCodeByte & 0x80) { if (fileOffset != 0) { @@ -375,9 +385,7 @@ int decompSZS_subroutine(u8* src, u8* dest) { } src++; } else { - *dest = *src; - dest++; - src++; + *dest++ = *src++; ts++; if (dest == endPtr) { break; @@ -385,10 +393,10 @@ int decompSZS_subroutine(u8* src, u8* dest) { } readCount++; } else { - u32 dist = ((src[0] & 0x0f) << 8) | src[1]; - s32 numBytes = src[0] >> 4; + b1 = src[0]; + dist = src[1] | ((b1 & 0x0f) << 8); + numBytes = b1 >> 4; src += 2; - u8* copySource; if (fileOffset != 0) { copySource = refCurrent - dist - 1; if (copySource < refBuf) { @@ -398,8 +406,7 @@ int decompSZS_subroutine(u8* src, u8* dest) { copySource = dest - dist - 1; } if (numBytes == 0) { - numBytes = *src + 0x12; - src += 1; + numBytes = (*src++) + 0x12; } else { numBytes += 2; } @@ -432,9 +439,9 @@ int decompSZS_subroutine(u8* src, u8* dest) { if (dest == endPtr) { break; } + copySource++; readCount++; numBytes--; - copySource++; } while (numBytes != 0); } } @@ -449,18 +456,10 @@ static u8* firstSrcData() { srcLimit = szpEnd - 0x19; u8* buffer = szpBuf; - u32 length; - u32 size = szpEnd - szpBuf; - if (transLeft < size) { - length = transLeft; - } else { - length = size; - } + u32 size = szpEnd - buffer; + u32 length = transLeft < size ? transLeft : size; - u32 src = (uintptr_t)(srcAddress + srcOffset); - u32 dst = (uintptr_t)buffer; - u32 alignedLength = ALIGN_NEXT(length, 0x20); - JKRAramPcs(1, src, dst, alignedLength, NULL); + JKRAramPcs(1, srcAddress + srcOffset, uintptr_t(buffer), ALIGN_NEXT(length, 0x20), NULL); srcOffset += length; transLeft -= length; @@ -474,16 +473,18 @@ static u8* firstSrcData() { static u8* nextSrcData(u8* current) { u8* dest; u32 left = (uintptr_t)(szpEnd - current); - if (IS_NOT_ALIGNED(left, 0x20)) + if (IS_NOT_ALIGNED(left, 0x20)) { dest = szpBuf + 0x20 - (left & (0x20 - 1)); - else + } else { dest = szpBuf; + } memcpy(dest, current, left); u32 transSize = (uintptr_t)(szpEnd - (dest + left)); if (transSize > transLeft) transSize = transLeft; + JUT_ASSERT(1403, transSize > 0); JKRAramPcs(1, (uintptr_t)(srcAddress + srcOffset), ((uintptr_t)dest + left), ALIGN_NEXT(transSize, 0x20), NULL); srcOffset += transSize; diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 251821acf4..600d332fcb 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -10,6 +10,8 @@ #include #include "string.h" +JKRAramArchive::JKRAramArchive() {} + JKRAramArchive::JKRAramArchive(s32 entryNumber, JKRArchive::EMountDirection mountDirection) : JKRArchive(entryNumber, MOUNT_ARAM) { mMountDirection = mountDirection; @@ -28,10 +30,11 @@ JKRAramArchive::~JKRAramArchive() { if (mIsMounted == true) { if (mArcInfoBlock != NULL) { SDIFileEntry* entry = mFiles; - for (int i = 0; i < mArcInfoBlock->num_file_entries; entry++, i++) { + for (int i = 0; i < mArcInfoBlock->num_file_entries; i++) { if (entry->data != NULL) { JKRFreeToHeap(mHeap, entry->data); } + entry++; } JKRFreeToHeap(mHeap, mArcInfoBlock); @@ -56,8 +59,42 @@ JKRAramArchive::~JKRAramArchive() { } } -inline u32 alignNext(u32 var, u32 align) { - return (var + align - 1) & ~(align - 1); +void JKRAramArchive::fixedInit(s32 entryNumber, JKRArchive::EMountDirection mountDirection) { + mIsMounted = false; + mMountDirection = mountDirection; + mMountMode = 2; + mMountCount = 1; + field_0x58 = 2; + mHeap = JKRHeap::getCurrentHeap(); + mEntryNum = entryNumber; + if (sCurrentVolume == NULL) { + sCurrentVolume = this; + sCurrentDirID = 0; + } +} + +BOOL JKRAramArchive::mountFixed(s32 entryNumber, JKRArchive::EMountDirection mountDirection) { + if (entryNumber < 0) { + return FALSE; + } + if (check_mount_already(entryNumber, JKRGetCurrentHeap())) { + return FALSE; + } + fixedInit(entryNumber, mountDirection); + if (!open(entryNumber)) { + return FALSE; + } + mVolumeType = 'RARC'; + mVolumeName = mStringTable + mNodes->name_offset; + sVolumeList.prepend(&mFileLoaderLink); + mIsMounted = true; + return TRUE; +} + +static void dummy() { + OS_REPORT(__FILE__); + OS_REPORT("isMounted()"); + OS_REPORT("mMountCount == 1"); } bool JKRAramArchive::open(s32 entryNum) { @@ -76,7 +113,8 @@ bool JKRAramArchive::open(s32 entryNum) { // NOTE: a different struct is used here for sure, unfortunately i can't get any hits on this // address, so gonna leave it like this for now - SArcHeader* mem = (SArcHeader*)JKRAllocFromSysHeap(32, -32); + SArcHeader* mem = NULL; + mem = (SArcHeader*)JKRAllocFromSysHeap(32, -32); if (mem == NULL) { mMountMode = 0; } else { @@ -104,7 +142,7 @@ bool JKRAramArchive::open(s32 entryNum) { for (int i = 0; i < mArcInfoBlock->num_file_entries; i++) { u8 flag = fileEntry->type_flags_and_name_offset >> 24; if ((flag & 1)) { - compressedFiles |= (flag & JKRARCHIVE_ATTR_COMPRESSION); + compressedFiles |= u8(flag & JKRARCHIVE_ATTR_COMPRESSION); } fileEntry++; } @@ -160,7 +198,7 @@ void* JKRAramArchive::fetchResource(SDIFileEntry* pEntry, u32* pOutSize) { pOutSize = &outSize; } - JKRCompression compression = JKRConvertAttrToCompressionType(pEntry->getFlags()); + JKRCompression compression = JKRConvertAttrToCompressionType(u8(pEntry->type_flags_and_name_offset >> 24)); if (pEntry->data == NULL) { u32 size = JKRAramArchive::fetchResource_subroutine( pEntry->data_offset + mBlock->getAddress(), pEntry->data_size, mHeap, compression, @@ -194,7 +232,7 @@ void* JKRAramArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* size = bufferSize; } - JKRCompression compression = JKRConvertAttrToCompressionType(pEntry->getFlags()); + JKRCompression compression = JKRConvertAttrToCompressionType(u8(pEntry->type_flags_and_name_offset >> 24)); if (pEntry->data == NULL) { bufferSize = (s32)ALIGN_PREV(bufferSize, 0x20); size = JKRAramArchive::fetchResource_subroutine(pEntry->data_offset + mBlock->getAddress(), @@ -228,12 +266,13 @@ u32 JKRAramArchive::getAramAddress_Entry(SDIFileEntry* pEntry) { } u32 JKRAramArchive::getAramAddress(char const* name) { - return JKRAramArchive::getAramAddress_Entry(this->findFsResource(name, 0)); + SDIFileEntry* entry = this->findFsResource(name, 0); + return JKRAramArchive::getAramAddress_Entry(entry); } u32 JKRAramArchive::fetchResource_subroutine(u32 srcAram, u32 srcLength, u8* dst, u32 dstLength, int compression) { - JUT_ASSERT(628, (srcAram & 0x1f) == 0); + JUT_ASSERT(628, ( srcAram & 0x1f ) == 0); u32 outLen; u32 srcSize = ALIGN_NEXT(srcLength, 0x20); u32 dstSize = ALIGN_PREV(dstLength, 0x20); @@ -299,7 +338,8 @@ u32 JKRAramArchive::getExpandedResSize(const void* ptr) const { return 0xFFFFFFFF; } - if (entry->getCompressFlag() == 0) { + u8 flags = entry->type_flags_and_name_offset >> 24; + if ((flags & 4) == 0) { return this->getResSize(ptr); } @@ -312,8 +352,8 @@ u32 JKRAramArchive::getExpandedResSize(const void* ptr) const { u8* buf = (u8*)ALIGN_PREV((s32)&tmpBuf[0x1F], 0x20); JKRAramToMainRam(entry->data_offset + mBlock->getAddress(), buf, 0x20, EXPAND_SWITCH_UNKNOWN0, 0, NULL, -1, NULL); - expandSize = JKRDecompExpandSize(buf); + u32 expandSize2 = JKRDecompExpandSize(buf); // ??? casting away const? - ((JKRArchive*)this)->setExpandSize(entry, expandSize); - return expandSize; + ((JKRArchive*)this)->setExpandSize(entry, expandSize2); + return expandSize2; } diff --git a/src/JSystem/JKernel/JKRAramBlock.cpp b/src/JSystem/JKernel/JKRAramBlock.cpp index c1416686e9..a7a1fcf96d 100644 --- a/src/JSystem/JKernel/JKRAramBlock.cpp +++ b/src/JSystem/JKernel/JKRAramBlock.cpp @@ -18,8 +18,7 @@ JKRAramBlock::~JKRAramBlock() { JSULink* prev = mBlockLink.getPrev(); if (prev) { - JKRAramBlock* block = prev->getObject(); - block->mFreeSize = mSize + mFreeSize + block->mFreeSize; + prev->getObject()->mFreeSize += mSize + mFreeSize; list->remove(&mBlockLink); } else { mFreeSize = mFreeSize + mSize; @@ -28,35 +27,24 @@ JKRAramBlock::~JKRAramBlock() { } JKRAramBlock* JKRAramBlock::allocHead(u32 size, u8 groupId, JKRAramHeap* aramHeap) { - u32 address = mAddress; - u32 usedSize = mSize; - u32 nextAddress = address + usedSize; - u32 freeSize = mFreeSize; - u32 nextFreeSize = freeSize - size; + u32 nextAddress = mAddress + mSize; + u32 nextFreeSize = mFreeSize - size; JKRAramBlock* block = new (aramHeap->getMgrHeap(), 0) JKRAramBlock(nextAddress, size, nextFreeSize, groupId, false); mFreeSize = 0; - JSULink* next = mBlockLink.getNext(); - JSUList* list = mBlockLink.getSupervisor(); - list->insert(next, &block->mBlockLink); + mBlockLink.getSupervisor()->insert(mBlockLink.getNext(), &block->mBlockLink); return block; } JKRAramBlock* JKRAramBlock::allocTail(u32 size, u8 groupId, JKRAramHeap* aramHeap) { - u32 freeSize = mFreeSize; - u32 address = mAddress; - u32 usedSize = mSize; - u32 endAddress = address + usedSize + freeSize; - u32 tailAddress = endAddress - size; + u32 tailAddress = mAddress + mSize + mFreeSize - size; JKRAramBlock* block = new (aramHeap->getMgrHeap(), 0) JKRAramBlock(tailAddress, size, 0, groupId, true); mFreeSize -= size; - JSULink* next = mBlockLink.getNext(); - JSUList* list = mBlockLink.getSupervisor(); - list->insert(next, &block->mBlockLink); + mBlockLink.getSupervisor()->insert(mBlockLink.getNext(), &block->mBlockLink); return block; } diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/src/JSystem/JKernel/JKRAramHeap.cpp index 960e3aedfa..345532a1a0 100644 --- a/src/JSystem/JKernel/JKRAramHeap.cpp +++ b/src/JSystem/JKernel/JKRAramHeap.cpp @@ -21,11 +21,7 @@ JKRAramHeap::JKRAramHeap(u32 startAddress, u32 size) { } JKRAramHeap::~JKRAramHeap() { - JSUListIterator iterator(sAramList.getFirst()); - while (iterator != sAramList.getEnd()) - { - delete (iterator++).getObject(); - } + for (JSUListIterator iterator = sAramList.getFirst(); iterator != sAramList.getEnd(); delete (iterator++).getObject()) {} } JKRAramBlock* JKRAramHeap::alloc(u32 size, JKRAramHeap::EAllocMode allocationMode) { @@ -47,18 +43,19 @@ JKRAramBlock* JKRAramHeap::allocFromHead(u32 size) { u32 bestFreeSize = UINT_MAX; JKRAramBlock* bestBlock = NULL; - JSUList* list = &sAramList; - for (JSUListIterator iterator = list; iterator != list->getEnd(); ++iterator) { + for (JSUListIterator iterator = sAramList.getFirst(); iterator != sAramList.getEnd(); ++iterator) { JKRAramBlock* block = iterator.getObject(); - if (block->mFreeSize < alignedSize) + if (block->mFreeSize < alignedSize) { continue; - if (bestFreeSize <= block->mFreeSize) + } + if (bestFreeSize <= block->mFreeSize) { continue; + } bestFreeSize = block->mFreeSize; bestBlock = block; - if (block->mFreeSize == alignedSize) { + if (bestFreeSize == alignedSize) { break; } } @@ -74,9 +71,7 @@ JKRAramBlock* JKRAramHeap::allocFromTail(u32 size) { u32 alignedSize = ALIGN_NEXT(size, 0x20); JKRAramBlock* tailBlock = NULL; - JSUList* list = &sAramList; - JSUListIterator iterator = list->getLast(); - for (; iterator != list->getEnd(); --iterator) { + for (JSUListIterator iterator = sAramList.getLast(); iterator != sAramList.getEnd(); --iterator) { JKRAramBlock* block = iterator.getObject(); if (block->mFreeSize >= alignedSize) { tailBlock = block; @@ -96,9 +91,7 @@ u32 JKRAramHeap::getFreeSize(void) { lock(); - JSUList* list = &sAramList; - JSUListIterator iterator = list; - for (; iterator != list->getEnd(); ++iterator) { + for (JSUListIterator iterator = sAramList.getFirst(); iterator != sAramList.getEnd(); ++iterator) { if (iterator->mFreeSize > maxFreeSize) { maxFreeSize = iterator->mFreeSize; } @@ -113,9 +106,7 @@ u32 JKRAramHeap::getTotalFreeSize(void) { lock(); - JSUList* list = &sAramList; - JSUListIterator iterator = list; - for (; iterator != list->getEnd(); ++iterator) { + for (JSUListIterator iterator = sAramList.getFirst(); iterator != sAramList.getEnd(); ++iterator) { totalFreeSize += iterator->mFreeSize; } @@ -126,9 +117,21 @@ u32 JKRAramHeap::getTotalFreeSize(void) { void JKRAramHeap::dump(void) { lock(); - JSUList* list = &sAramList; - JSUListIterator iterator = list; - for (; iterator != list->getEnd(); ++iterator) {} + OS_REPORT("\nJKRAramHeap dump\n"); + OS_REPORT(" attr address: size gid\n"); + + u32 usedBytes = 0; + for (JSUListIterator it = sAramList.getFirst(); it != sAramList.getEnd(); ++it) { + if (it->mSize) { + OS_REPORT("%s %08x: %08x %3d\n", it->isTempMemory() ? " temp" : "alloc", it->mAddress, it->mSize, it->mGroupId); + } + if (it->mFreeSize) { + OS_REPORT(" free %08x: %08x 0\n", it->mAddress + it->mSize, it->mFreeSize); + } + usedBytes += it->mSize; + } + + OS_REPORT("%d / %d bytes (%6.2f%%) used\n", usedBytes, mSize, f32(usedBytes) / f32(mSize) * 100.0f); unlock(); } diff --git a/src/JSystem/JKernel/JKRAramPiece.cpp b/src/JSystem/JKernel/JKRAramPiece.cpp index 60322fc2be..7bc83cf0c2 100644 --- a/src/JSystem/JKernel/JKRAramPiece.cpp +++ b/src/JSystem/JKernel/JKRAramPiece.cpp @@ -9,7 +9,7 @@ JKRAMCommand* JKRAramPiece::prepareCommand(int direction, u32 src, u32 dst, u32 length, JKRAramBlock* block, JKRAMCommand::AsyncCallback callback) { - JKRAMCommand* command = new (JKRHeap::getSystemHeap(), -4) JKRAMCommand(); + JKRAMCommand* command = new (JKRGetSystemHeap(), -4) JKRAMCommand(); command->mTransferDirection = direction; command->mSrc = src; command->mDst = dst; @@ -23,7 +23,6 @@ void JKRAramPiece::sendCommand(JKRAMCommand* command) { startDMA(command); } -// JSUList JKRAramPiece::sAramPieceCommandList; JSUList JKRAramPiece::sAramPieceCommandList; OSMutex JKRAramPiece::mMutex; @@ -39,11 +38,10 @@ JKRAMCommand* JKRAramPiece::orderAsync(int direction, u32 source, u32 destinatio JUTException::panic(__FILE__, 108, "illegal address. abort."); } - Message* message = new (JKRHeap::getSystemHeap(), -4) Message(); + JKRAramCommand* message = new (JKRGetSystemHeap(), -4) JKRAramCommand(); JKRAMCommand* command = JKRAramPiece::prepareCommand(direction, source, destination, length, block, callback); - message->field_0x00 = 1; - message->command = command; + message->setting(1, command); OSSendMessage(&JKRAram::sMessageQueue, message, OS_MESSAGE_BLOCK); if (command->mCallback != NULL) { @@ -65,8 +63,7 @@ BOOL JKRAramPiece::sync(JKRAMCommand* command, int is_non_blocking) { return TRUE; } - BOOL result = OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NOBLOCK); - if (!result) { + if (!OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NOBLOCK)) { unlock(); return FALSE; } @@ -109,7 +106,7 @@ void JKRAramPiece::doneDMA(u32 requestAddress) { if (command->field_0x60 != 0) { if (command->field_0x60 == 2) { - JKRDecomp::sendCommand(command->mDecompCommand); + JKRDecompress_SendCommand(command->mDecompCommand); } return; } @@ -140,5 +137,5 @@ JKRAMCommand::~JKRAMCommand() { delete field_0x90; if (field_0x94) - JKRHeap::free(field_0x94, NULL); + JKRFree(field_0x94); } diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp index 409314f574..94b9ca91fc 100644 --- a/src/JSystem/JKernel/JKRAramStream.cpp +++ b/src/JSystem/JKernel/JKRAramStream.cpp @@ -6,12 +6,18 @@ #include "JSystem/JUtility/JUTException.h" #include +#if PLATFORM_GCN +const u32 stack_size = 0xc00; +#else +const u32 stack_size = 0x4000; +#endif + JKRAramStream* JKRAramStream::sAramStreamObject; JKRAramStream* JKRAramStream::create(s32 priority) { if (!sAramStreamObject) { sAramStreamObject = new (JKRGetSystemHeap(), 0) JKRAramStream(priority); - setTransBuffer(NULL, 0, NULL); + JKRResetAramTransferBuffer(); } return sAramStreamObject; @@ -26,7 +32,7 @@ void* JKRAramStream::sMessageBuffer[4] = { OSMessageQueue JKRAramStream::sMessageQueue = {0}; -JKRAramStream::JKRAramStream(s32 priority) : JKRThread(0xc00, 0x10, priority) { +JKRAramStream::JKRAramStream(s32 priority) : JKRThread(stack_size, 0x10, priority) { resume(); } @@ -65,12 +71,12 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { JKRHeap* heap = command->mHeap; if (buffer) { - bufferSize = (bufferSize) ? bufferSize : 0x8000; + bufferSize = bufferSize == 0 ? 0x8000 : bufferSize; command->mTransferBufferSize = bufferSize; command->mAllocatedTransferBuffer = false; } else { - bufferSize = (bufferSize) ? bufferSize : 0x8000; + bufferSize = bufferSize == 0 ? 0x8000 : bufferSize; if (heap) { buffer = (u8*)JKRAllocFromHeap(heap, bufferSize, -0x20); @@ -107,6 +113,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { JKRAramPcs(0, (uintptr_t)buffer, destination, length, NULL); dstSize -= length; + offset += length; writtenLength += length; destination += length; @@ -159,20 +166,15 @@ JKRAramStreamCommand* JKRAramStream::sync(JKRAramStreamCommand* command, BOOL is if (isNonBlocking == 0) { OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_BLOCK); if (message == NULL) { - command = NULL; - return command; + return NULL; } else { return command; } } else { - BOOL receiveResult = - OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NOBLOCK); - if (receiveResult == FALSE) { - command = NULL; - return command; + if (OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NOBLOCK) == FALSE) { + return NULL; } else if (message == NULL) { - command = NULL; - return command; + return NULL; } else { return command; } diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/JSystem/JKernel/JKRArchivePri.cpp index 92d655ec9a..c39d1bc70a 100644 --- a/src/JSystem/JKernel/JKRArchivePri.cpp +++ b/src/JSystem/JKernel/JKRArchivePri.cpp @@ -7,6 +7,11 @@ u32 JKRArchive::sCurrentDirID; +JKRArchive::JKRArchive() { + mIsMounted = false; + mMountDirection = MOUNT_DIRECTION_HEAD; +} + JKRArchive::JKRArchive(s32 entryNumber, JKRArchive::EMountMode mountMode) { mIsMounted = false; mMountMode = mountMode; @@ -19,9 +24,9 @@ JKRArchive::JKRArchive(s32 entryNumber, JKRArchive::EMountMode mountMode) { } mEntryNum = entryNumber; - if (getCurrentVolume() == NULL) { - setCurrentVolume(this); - setCurrentDirID(0); + if (sCurrentVolume == NULL) { + sCurrentVolume = this; + sCurrentDirID = 0; } } @@ -36,14 +41,12 @@ bool JKRArchive::isSameName(JKRArchive::CArcName& name, u32 nameOffset, u16 name JKRArchive::SDIDirEntry* JKRArchive::findResType(u32 type) const { SDIDirEntry* node = mNodes; - u32 count = 0; - while (count < mArcInfoBlock->num_nodes) { + for (u32 count = 0; count < mArcInfoBlock->num_nodes; count++) { if (node->type == type) { return node; } node++; - count++; } return NULL; @@ -58,13 +61,14 @@ JKRArchive::SDIDirEntry* JKRArchive::findDirectory(const char* name, u32 directo SDIDirEntry* dirEntry = mNodes + directoryId; SDIFileEntry* fileEntry = mFiles + dirEntry->first_file_index; - for (int i = 0; i < dirEntry->num_entries; fileEntry++, i++) { - if (isSameName(arcName, fileEntry->getNameOffset(), fileEntry->name_hash)) { - if (fileEntry->isDirectory()) { + for (int i = 0; i < dirEntry->num_entries; i++) { + if (isSameName(arcName, fileEntry->type_flags_and_name_offset & 0xFFFFFF, fileEntry->name_hash)) { + if ((fileEntry->type_flags_and_name_offset >> 24) & 2) { return findDirectory(name, fileEntry->data_offset); } break; } + fileEntry++; } return NULL; @@ -77,10 +81,11 @@ JKRArchive::SDIFileEntry* JKRArchive::findTypeResource(u32 type, const char* nam if (dirEntry) { SDIFileEntry* fileEntry = mFiles + dirEntry->first_file_index; - for (int i = 0; i < dirEntry->num_entries; fileEntry++, i++) { - if (isSameName(arcName, fileEntry->getNameOffset(), fileEntry->getNameHash())) { + for (int i = 0; i < dirEntry->num_entries; i++) { + if (isSameName(arcName, fileEntry->type_flags_and_name_offset & 0xFFFFFF, fileEntry->name_hash)) { return fileEntry; } + fileEntry++; } } } @@ -94,9 +99,9 @@ JKRArchive::SDIFileEntry* JKRArchive::findFsResource(const char* name, u32 direc SDIDirEntry* dirEntry = mNodes + directoryId; SDIFileEntry* fileEntry = mFiles + dirEntry->first_file_index; - for (int i = 0; i < dirEntry->num_entries; fileEntry++, i++) { - if (isSameName(arcName, fileEntry->getNameOffset(), fileEntry->name_hash)) { - if (fileEntry->isDirectory()) { + for (int i = 0; i < dirEntry->num_entries; i++) { + if (isSameName(arcName, fileEntry->type_flags_and_name_offset & 0xFFFFFF, fileEntry->name_hash)) { + if ((fileEntry->type_flags_and_name_offset >> 24) & 2) { return findFsResource(name, fileEntry->data_offset); } @@ -106,6 +111,7 @@ JKRArchive::SDIFileEntry* JKRArchive::findFsResource(const char* name, u32 direc return NULL; } + fileEntry++; } } @@ -124,10 +130,11 @@ JKRArchive::SDIFileEntry* JKRArchive::findNameResource(const char* name) const { SDIFileEntry* fileEntry = mFiles; CArcName arcName(name); - for (int i = 0; i < mArcInfoBlock->num_file_entries; fileEntry++, i++) { - if (isSameName(arcName, fileEntry->getNameOffset(), fileEntry->getNameHash())) { + for (int i = 0; i < mArcInfoBlock->num_file_entries; i++) { + if (isSameName(arcName, fileEntry->type_flags_and_name_offset & 0xFFFFFF, fileEntry->name_hash)) { return fileEntry; } + fileEntry++; } return NULL; @@ -135,10 +142,11 @@ JKRArchive::SDIFileEntry* JKRArchive::findNameResource(const char* name) const { JKRArchive::SDIFileEntry* JKRArchive::findPtrResource(const void* resource) const { SDIFileEntry* fileEntry = mFiles; - for (int i = 0; i < mArcInfoBlock->num_file_entries; fileEntry++, i++) { + for (int i = 0; i < mArcInfoBlock->num_file_entries; i++) { if (fileEntry->data == resource) { return fileEntry; } + fileEntry++; } return NULL; @@ -146,18 +154,20 @@ JKRArchive::SDIFileEntry* JKRArchive::findPtrResource(const void* resource) cons JKRArchive::SDIFileEntry* JKRArchive::findIdResource(u16 id) const { if (id != 0xFFFF) { + SDIFileEntry* fileEntry; if (id < mArcInfoBlock->num_file_entries) { - SDIFileEntry* fileEntry = mFiles + id; - if (fileEntry->file_id == id && fileEntry->isUnknownFlag1()) { + fileEntry = mFiles + id; + if (fileEntry->file_id == id && ((fileEntry->type_flags_and_name_offset >> 24) & 1)) { return fileEntry; } } - SDIFileEntry* fileEntry = mFiles; - for (int i = 0; i < mArcInfoBlock->num_file_entries; fileEntry++, i++) { - if (fileEntry->file_id == id && fileEntry->isUnknownFlag1()) { + fileEntry = mFiles; + for (int i = 0; i < mArcInfoBlock->num_file_entries; i++) { + if (fileEntry->file_id == id && ((fileEntry->type_flags_and_name_offset >> 24) & 1)) { return fileEntry; } + fileEntry++; } } diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/src/JSystem/JKernel/JKRArchivePub.cpp index ef20df7c2d..1d7f2accba 100644 --- a/src/JSystem/JKernel/JKRArchivePub.cpp +++ b/src/JSystem/JKernel/JKRArchivePub.cpp @@ -14,11 +14,9 @@ JKRArchive* JKRArchive::check_mount_already(s32 entryNum, JKRHeap* heap) { heap = JKRGetCurrentHeap(); } - JSUList& volumeList = getVolumeList(); - JSUListIterator iterator; - for (iterator = volumeList.getFirst(); iterator != volumeList.getEnd(); ++iterator) { + for (JSUListIterator iterator = sVolumeList.getFirst(); iterator != sVolumeList.getEnd(); ++iterator) { if (iterator->getVolumeType() == 'RARC') { - JKRArchive* archive = (JKRArchive*)iterator.getObject(); + JKRArchive* archive = (JKRArchive*)iterator.operator->(); if (archive->mEntryNum == entryNum && archive->mHeap == heap) { archive->mMountCount++; return archive; @@ -41,60 +39,50 @@ JKRArchive* JKRArchive::mount(const char* path, EMountMode mountMode, JKRHeap* h JKRArchive* JKRArchive::mount(void* ptr, JKRHeap* heap, EMountDirection mountDirection) { JKRArchive* archive = check_mount_already((s32)ptr, heap); - if (archive) + if (archive) { return archive; - - int alignment; - if (mountDirection == MOUNT_DIRECTION_HEAD) { - alignment = 4; - } else { - alignment = -4; } - archive = new (heap, alignment) JKRMemArchive(ptr, 0xFFFF, JKRMEMBREAK_FLAG_UNKNOWN0); - return archive; + int alignment = mountDirection == MOUNT_DIRECTION_HEAD ? 4 : -4; + + JKRArchive* newArchive = new (heap, alignment) JKRMemArchive(ptr, 0xFFFF, JKRMEMBREAK_FLAG_UNKNOWN0); + return newArchive; } JKRArchive* JKRArchive::mount(s32 entryNum, JKRArchive::EMountMode mountMode, JKRHeap* heap, JKRArchive::EMountDirection mountDirection) { JKRArchive* archive = check_mount_already(entryNum, heap); if (archive != NULL) { - return archive; - } else { - int alignment; - if (mountDirection == JKRArchive::MOUNT_DIRECTION_HEAD) { - alignment = 4; - } else { - alignment = -4; - } - - JKRArchive* archive; - switch (mountMode) { - case JKRArchive::MOUNT_MEM: - archive = new (heap, alignment) JKRMemArchive(entryNum, mountDirection); - break; - case JKRArchive::MOUNT_ARAM: - archive = new (heap, alignment) JKRAramArchive(entryNum, mountDirection); - break; - case JKRArchive::MOUNT_DVD: - archive = new (heap, alignment) JKRDvdArchive(entryNum, mountDirection); - break; - case JKRArchive::MOUNT_COMP: - archive = new (heap, alignment) JKRCompArchive(entryNum, mountDirection); - break; - } - - if (archive && archive->getMountMode() == JKRArchive::UNKNOWN_MOUNT_MODE) { - delete archive; - archive = NULL; - } - return archive; } + int alignment = mountDirection == MOUNT_DIRECTION_HEAD ? 4 : -4; + + JKRArchive* newArchive; + switch (mountMode) { + case JKRArchive::MOUNT_MEM: + newArchive = new (heap, alignment) JKRMemArchive(entryNum, mountDirection); + break; + case JKRArchive::MOUNT_ARAM: + newArchive = new (heap, alignment) JKRAramArchive(entryNum, mountDirection); + break; + case JKRArchive::MOUNT_DVD: + newArchive = new (heap, alignment) JKRDvdArchive(entryNum, mountDirection); + break; + case JKRArchive::MOUNT_COMP: + newArchive = new (heap, alignment) JKRCompArchive(entryNum, mountDirection); + break; + } + + if (newArchive && newArchive->mMountMode == JKRArchive::UNKNOWN_MOUNT_MODE) { + delete newArchive; + newArchive = NULL; + } + + return newArchive; } bool JKRArchive::becomeCurrent(const char* path) { - SDIDirEntry* dirEntry; + SDIDirEntry* dirEntry = NULL; if (*path == '/') { path++; @@ -102,13 +90,13 @@ bool JKRArchive::becomeCurrent(const char* path) { path = NULL; dirEntry = findDirectory(path, 0); } else { - dirEntry = findDirectory(path, getCurrentDirID()); + dirEntry = findDirectory(path, sCurrentDirID); } bool found = dirEntry != NULL; if (found) { - setCurrentVolume(this); - setCurrentDirID(dirEntry - mNodes); + sCurrentVolume = this; + sCurrentDirID = dirEntry - mNodes; } return found; @@ -119,9 +107,9 @@ bool JKRArchive::getDirEntry(SDirEntry* dirEntry, u32 index) const { if (!fileEntry) return false; - dirEntry->flags = fileEntry->getFlags(); - dirEntry->id = fileEntry->getFileID(); - dirEntry->name = mStringTable + fileEntry->getNameOffset(); + dirEntry->flags = fileEntry->type_flags_and_name_offset >> 24; + dirEntry->id = fileEntry->file_id; + dirEntry->name = mStringTable + (fileEntry->type_flags_and_name_offset & 0xFFFFFF); return true; } @@ -131,13 +119,13 @@ void* JKRArchive::getGlbResource(u32 param_1, const char* path, JKRArchive* arch return archive->getResource(param_1, path); } - JSUList& volumeList = getVolumeList(); - JSUListIterator iterator; - for (iterator = volumeList.getFirst(); iterator != volumeList.getEnd(); ++iterator) { + for (JSUListIterator iterator = sVolumeList.getFirst(); iterator != sVolumeList.getEnd(); ++iterator) { if (iterator->getVolumeType() == 'RARC') { - resource = iterator->getResource(param_1, path); - if (resource) + JKRFileLoader* fileLoader = iterator.operator->(); + resource = fileLoader->getResource(param_1, path); + if (resource) { break; + } } } @@ -146,11 +134,11 @@ void* JKRArchive::getGlbResource(u32 param_1, const char* path, JKRArchive* arch void* JKRArchive::getResource(const char* path) { JUT_ASSERT(303, isMounted()); - SDIFileEntry* fileEntry; + SDIFileEntry* fileEntry = NULL; if (*path == '/') { fileEntry = findFsResource(path + 1, 0); } else { - fileEntry = findFsResource(path, getCurrentDirID()); + fileEntry = findFsResource(path, sCurrentDirID); } if (fileEntry) { @@ -216,11 +204,11 @@ u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u32 type, const char* u32 JKRArchive::readResource(void* buffer, u32 bufferSize, const char* path) { JUT_ASSERT(539, isMounted()); - SDIFileEntry* fileEntry; + SDIFileEntry* fileEntry = NULL; if (*path == '/') { fileEntry = findFsResource(path + 1, 0); } else { - fileEntry = findFsResource(path, getCurrentDirID()); + fileEntry = findFsResource(path, sCurrentDirID); } if (fileEntry) { @@ -259,11 +247,12 @@ u32 JKRArchive::readResource(void* buffer, u32 bufferSize, u16 id) { void JKRArchive::removeResourceAll() { if (mArcInfoBlock && mMountMode != MOUNT_MEM) { SDIFileEntry* fileEntry = mFiles; - for (int i = 0; i < mArcInfoBlock->num_file_entries; fileEntry++, i++) { + for (int i = 0; i < mArcInfoBlock->num_file_entries; i++) { if (fileEntry->data) { JKRFreeToHeap(mHeap, fileEntry->data); fileEntry->data = NULL; } + fileEntry++; } } } @@ -301,7 +290,7 @@ u32 JKRArchive::getResSize(const void* resource) const { u32 JKRArchive::countResource() const { u32 count = 0; for (int i = 0; i < mArcInfoBlock->num_file_entries; i++) { - if (mFiles[i].isUnknownFlag1()) { + if ((mFiles[i].type_flags_and_name_offset >> 24) & 1) { count++; } } @@ -309,7 +298,7 @@ u32 JKRArchive::countResource() const { } u32 JKRArchive::countFile(const char* path) const { - SDIDirEntry* dirEntry; + SDIDirEntry* dirEntry = NULL; if (*path == '/') { path++; @@ -317,7 +306,7 @@ u32 JKRArchive::countFile(const char* path) const { path = NULL; dirEntry = findDirectory(path, 0); } else { - dirEntry = findDirectory(path, getCurrentDirID()); + dirEntry = findDirectory(path, sCurrentDirID); } if (dirEntry) { @@ -328,7 +317,7 @@ u32 JKRArchive::countFile(const char* path) const { } JKRFileFinder* JKRArchive::getFirstFile(const char* path) const { - SDIDirEntry* dirEntry; + SDIDirEntry* dirEntry = NULL; if (*path == '/') { path++; @@ -336,12 +325,12 @@ JKRFileFinder* JKRArchive::getFirstFile(const char* path) const { path = NULL; dirEntry = findDirectory(path, 0); } else { - dirEntry = findDirectory(path, getCurrentDirID()); + dirEntry = findDirectory(path, sCurrentDirID); } if (dirEntry) { // don't know what is correct here... for now we're casting away const - return new (JKRHeap::getSystemHeap(), 0) + return new (JKRGetSystemHeap(), 0) JKRArcFinder((JKRArchive*)this, dirEntry->first_file_index, (u32)dirEntry->num_entries); } @@ -351,7 +340,7 @@ JKRFileFinder* JKRArchive::getFirstFile(const char* path) const { u32 JKRArchive::getFileAttribute(u32 index) const { SDIFileEntry* fileEntry = findIdxResource(index); if (fileEntry) { - return fileEntry->getFlags(); + return u8(fileEntry->type_flags_and_name_offset >> 24); } return 0; diff --git a/src/JSystem/JKernel/JKRAssertHeap.cpp b/src/JSystem/JKernel/JKRAssertHeap.cpp index 5a3d723340..635922d6d8 100644 --- a/src/JSystem/JKernel/JKRAssertHeap.cpp +++ b/src/JSystem/JKernel/JKRAssertHeap.cpp @@ -11,18 +11,17 @@ JKRAssertHeap::~JKRAssertHeap() { JKRAssertHeap* JKRAssertHeap::create(JKRHeap* parent) { if (!parent) { - parent = JKRHeap::getRootHeap(); + parent = sRootHeap; } - // 0x70 is sizeof(JKRAssertHeap) aligned to 16 bytes - u32 size = 0x70; - int alignment = 16; + u32 size = ALIGN_NEXT(sizeof(JKRAssertHeap), 16); - void* ptr = JKRHeap::alloc(size, alignment, parent); + void* ptr = JKRAllocFromHeap(parent, size, 16); if (!ptr) return NULL; - return new (ptr) JKRAssertHeap(NULL, 0, parent, false); + JKRAssertHeap* heap = new (ptr) JKRAssertHeap(NULL, 0, parent, false); + return heap; } void JKRAssertHeap::do_destroy() { @@ -44,44 +43,3 @@ bool JKRAssertHeap::dump() { bool JKRAssertHeap::dump_sort() { return true; } - - -s32 JKRAssertHeap::do_changeGroupID(u8) { - return 0; -} - -u8 JKRAssertHeap::do_getCurrentGroupId() { - return 0; -} - -void* JKRAssertHeap::do_alloc(u32, int) { - return NULL; -} - -void JKRAssertHeap::do_free(void* param_0) {} - -void JKRAssertHeap::do_freeAll() {} - -void JKRAssertHeap::do_freeTail() {} - -void JKRAssertHeap::do_fillFreeArea() {} - -s32 JKRAssertHeap::do_resize(void*, u32) { - return 0; -} - -s32 JKRAssertHeap::do_getSize(void*) { - return 0; -} - -s32 JKRAssertHeap::do_getFreeSize() { - return 0; -} - -void* JKRAssertHeap::do_getMaxFreeBlock() { - return NULL; -} - -s32 JKRAssertHeap::do_getTotalFreeSize() { - return 0; -} diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index 7a5c813085..5e64c3b2e2 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -32,7 +32,8 @@ JKRCompArchive::~JKRCompArchive() { if (mArcInfoBlock != NULL) { SDIFileEntry* file = mFiles; for (int i = 0; i < mArcInfoBlock->num_file_entries; i++) { - if (!((file->type_flags_and_name_offset >> 0x18) & 0x10) && file->data != NULL) { + u32 flags = file->type_flags_and_name_offset >> 24; + if ((flags & 16) == 0 && file->data != NULL) { JKRFreeToHeap(mHeap, file->data); } @@ -44,7 +45,7 @@ JKRCompArchive::~JKRCompArchive() { } if (mAramPart != NULL) { - delete mAramPart; + JKRFreeToAram(mAramPart); } if (mExpandedSize != NULL) { @@ -77,7 +78,8 @@ bool JKRCompArchive::open(s32 entryNum) { mMountMode = 0; return 0; } - SArcHeader *arcHeader = (SArcHeader *)JKRAllocFromSysHeap(sizeof(SArcHeader), -32); // NOTE: unconfirmed if this struct is used + SArcHeader *arcHeader = NULL; + arcHeader = (SArcHeader *)JKRAllocFromSysHeap(sizeof(SArcHeader), -32); // NOTE: unconfirmed if this struct is used if(arcHeader == NULL) { mMountMode = 0; } @@ -182,7 +184,7 @@ bool JKRCompArchive::open(s32 entryNum) { u8 flag = fileEntry->type_flags_and_name_offset >> 0x18; if (((flag & 0x1) != 0) && (((flag)&0x10) == 0)) { - compressedFiles = compressedFiles | (flag & 4); + compressedFiles |= (flag & 4); } fileEntry++; } @@ -221,7 +223,7 @@ void* JKRCompArchive::fetchResource(SDIFileEntry *fileEntry, u32 *pSize) { JUT_ASSERT(597, isMounted()); u32 ptrSize; u32 size = fileEntry->data_size; - int compression = JKRConvertAttrToCompressionType(fileEntry->type_flags_and_name_offset >> 0x18); + int compression = JKRConvertAttrToCompressionType(u8(fileEntry->type_flags_and_name_offset >> 0x18)); if(pSize == NULL) { pSize = &ptrSize; // this makes barely any sense but ok @@ -235,7 +237,8 @@ void* JKRCompArchive::fetchResource(SDIFileEntry *fileEntry, u32 *pSize) { } else if (flag & 0x20) { u8 *data; - *pSize = JKRAramArchive::fetchResource_subroutine(fileEntry->data_offset + mAramPart->getAddress() - mSizeOfMemPart, size, mHeap, compression, &data); + size = JKRAramArchive::fetchResource_subroutine(fileEntry->data_offset + mAramPart->getAddress() - mSizeOfMemPart, size, mHeap, compression, &data); + *pSize = size; fileEntry->data = data; if(compression == COMPRESSION_YAZ0) { setExpandSize(fileEntry, *pSize); @@ -269,7 +272,7 @@ void *JKRCompArchive::fetchResource(void *data, u32 compressedSize, SDIFileEntry u32 fileSize = fileEntry->data_size; u32 alignedSize = ALIGN_NEXT(fileSize, 32); u32 fileFlag = fileEntry->type_flags_and_name_offset >> 0x18; - int compression = JKRConvertAttrToCompressionType(fileFlag); + int compression = JKRConvertAttrToCompressionType(u8(fileFlag)); if(fileEntry->data != NULL) { if (compression == COMPRESSION_YAZ0) { @@ -323,6 +326,7 @@ void JKRCompArchive::removeResourceAll() { fileEntry->data = NULL; } } + fileEntry++; } } @@ -331,7 +335,8 @@ bool JKRCompArchive::removeResource(void* resource) { if (!fileEntry) return false; - if (!((fileEntry->type_flags_and_name_offset >> 0x18) & 0x10)) { + u32 flags = fileEntry->type_flags_and_name_offset >> 24; + if ((flags & 0x10) == 0) { JKRFreeToHeap(mHeap, resource); } @@ -357,15 +362,14 @@ u32 JKRCompArchive::getExpandedResSize(const void *resource) const } if ((flags & 0x10) != 0) { - return JKRDecompExpandSize((u8 *)resource); + u32 expandSize = JKRDecompExpandSize((u8*)resource); + return expandSize; } u8 buf[64]; u8 *bufPtr = (u8 *)ALIGN_NEXT((uintptr_t)buf, 32); if ((flags & 0x20) != 0) { - u32 addr = mAramPart->mAddress; - addr = fileEntry->data_offset + addr; - JKRAramToMainRam(addr, bufPtr, sizeof(buf) / 2, EXPAND_SWITCH_UNKNOWN0, 0, NULL, -1, NULL); + JKRAramToMainRam(fileEntry->data_offset + mAramPart->getAddress(), bufPtr, sizeof(buf) / 2, EXPAND_SWITCH_UNKNOWN0, 0, NULL, -1, NULL); DCInvalidateRange(bufPtr, sizeof(buf) / 2); } else if ((flags & 0x40) != 0) { diff --git a/src/JSystem/JKernel/JKRDecomp.cpp b/src/JSystem/JKernel/JKRDecomp.cpp index 67c1e84339..87557d65bf 100644 --- a/src/JSystem/JKernel/JKRDecomp.cpp +++ b/src/JSystem/JKernel/JKRDecomp.cpp @@ -4,11 +4,17 @@ #include "JSystem/JKernel/JKRAramPiece.h" #include "global.h" +#if PLATFORM_GCN +const u32 stack_size = 0x800; +#else +const u32 stack_size = 0x4000; +#endif + JKRDecomp* JKRDecomp::sDecompObject; JKRDecomp* JKRDecomp::create(s32 priority) { if (!sDecompObject) { - sDecompObject = new (JKRHeap::getSystemHeap(), 0) JKRDecomp(priority); + sDecompObject = new (JKRGetSystemHeap(), 0) JKRDecomp(priority); } return sDecompObject; @@ -18,7 +24,7 @@ OSMessage JKRDecomp::sMessageBuffer[8] = {0}; OSMessageQueue JKRDecomp::sMessageQueue = {0}; -JKRDecomp::JKRDecomp(s32 priority) : JKRThread(0x800, 0x10, priority) { +JKRDecomp::JKRDecomp(s32 priority) : JKRThread(stack_size, 0x10, priority) { resume(); } @@ -35,7 +41,7 @@ void* JKRDecomp::run() { if (command->field_0x20 != 0) { if (command->field_0x20 == 1) { - JKRAramPiece::sendCommand(command->mAMCommand); + JKRAramPcs_SendCommand(command->mAMCommand); } continue; } @@ -56,7 +62,7 @@ void* JKRDecomp::run() { JKRDecompCommand* JKRDecomp::prepareCommand(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLength, JKRDecompCommand::AsyncCallback callback) { - JKRDecompCommand* command = new (JKRHeap::getSystemHeap(), -4) JKRDecompCommand(); + JKRDecompCommand* command = new (JKRGetSystemHeap(), -4) JKRDecompCommand(); command->mSrcBuffer = srcBuffer; command->mDstBuffer = dstBuffer; command->mSrcLength = srcLength; @@ -66,7 +72,8 @@ JKRDecompCommand* JKRDecomp::prepareCommand(u8* srcBuffer, u8* dstBuffer, u32 sr } void JKRDecomp::sendCommand(JKRDecompCommand* command) { - OSSendMessage(&sMessageQueue, command, OS_MESSAGE_NOBLOCK); + int result = OSSendMessage(&sMessageQueue, command, OS_MESSAGE_NOBLOCK); + JUT_ASSERT_MSG(142, result, "Decomp MesgBuf FULL!"); } JKRDecompCommand* JKRDecomp::orderAsync(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLength, @@ -79,15 +86,16 @@ JKRDecompCommand* JKRDecomp::orderAsync(u8* srcBuffer, u8* dstBuffer, u32 srcLen bool JKRDecomp::sync(JKRDecompCommand* command, int isNonBlocking) { OSMessage message; - bool result; if (isNonBlocking == JKRDECOMP_SYNC_BLOCKING) { OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_BLOCK); - result = true; - } else { - result = - OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NOBLOCK) != FALSE; + return true; + } + bool result; + if (!OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NOBLOCK)) { + result = false; + } else { + result = true; } - return result; } diff --git a/src/JSystem/JKernel/JKRDisposer.cpp b/src/JSystem/JKernel/JKRDisposer.cpp index 2c2f2bc30c..1446ea5811 100644 --- a/src/JSystem/JKernel/JKRDisposer.cpp +++ b/src/JSystem/JKernel/JKRDisposer.cpp @@ -11,8 +11,7 @@ JKRDisposer::JKRDisposer() : mLink(this) { } JKRDisposer::~JKRDisposer() { - JKRHeap* heap = mHeap; - if (heap) { - heap->removeDisposer(this); + if (mHeap) { + mHeap->removeDisposer(this); } } diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/JSystem/JKernel/JKRDvdAramRipper.cpp index e157ee5bec..764a12cc78 100644 --- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdAramRipper.cpp @@ -56,7 +56,7 @@ JKRADCommand* JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* dvdFile, u32 addres JKRExpandSwitch expandSwitch, void (*callback)(u32), u32 param_4, u32 param_5, u32* param_6) { - JKRADCommand* command = new (JKRHeap::sSystemHeap, -4) JKRADCommand(); + JKRADCommand* command = new (JKRGetSystemHeap(), -4) JKRADCommand(); command->mDvdFile = dvdFile; command->mAddress = address; command->mBlock = NULL; @@ -66,7 +66,8 @@ JKRADCommand* JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* dvdFile, u32 addres command->field_0x40 = param_5; command->field_0x44 = param_6; - if (!callCommand_Async(command)) { + JKRADCommand* cmd2 = callCommand_Async(command); + if (!cmd2) { delete command; return NULL; } @@ -104,7 +105,8 @@ JKRADCommand* JKRDvdAramRipper::callCommand_Async(JKRADCommand* command) { u8 buffer[0x40]; u8* bufPtr = (u8*)ALIGN_NEXT((u32)&buffer, 0x20); while (true) { - if (DVDReadPrio(dvdFile->getFileInfo(), bufPtr, 0x20, 0, 2) >= 0) { + s32 result = DVDReadPrio(dvdFile->getFileInfo(), bufPtr, 0x20, 0, 2); + if (result >= 0) { break; } @@ -193,8 +195,8 @@ bool JKRDvdAramRipper::syncAram(JKRADCommand* command, int param_1) { OSLockMutex(&dvdFile->mMutex2); if (command->mStreamCommand) { - JKRAramStreamCommand* var1 = JKRAramStream::sync(command->mStreamCommand, param_1); - command->field_0x48 = -(var1 == NULL); + JKRAramStreamCommand* var1 = JKRStreamToAram_Sync(command->mStreamCommand, param_1); + command->field_0x48 = (var1) ? 0 : -1; if (param_1 != 0 && var1 == NULL) { OSUnlockMutex(&dvdFile->mMutex2); @@ -274,29 +276,36 @@ int JKRDecompressFromDVDToAram(JKRDvdFile* dvdFile, u32 param_1, u32 fileSize, u OSRestoreInterrupts(level); OSLockMutex(&decompMutex); - u32 bufferSize = JKRDvdAramRipper::sSZSBufferSize; + int result = 0; + u32 bufferSize = JKRDvdAramRipper::getSZSBufferSize(); szpBuf = (u8*)JKRAllocFromSysHeap(bufferSize, 0x20); + JUT_ASSERT(755, szpBuf); szpEnd = szpBuf + bufferSize; refBuf = (u8*)JKRAllocFromSysHeap(0x1120, 0); + JUT_ASSERT(763, refBuf); refEnd = refBuf + 0x1120; refCurrent = refBuf; dmaBuf = (u8*)JKRAllocFromSysHeap(0x100, 0x20); + JUT_ASSERT(772, dmaBuf); dmaEnd = dmaBuf + 0x100; dmaCurrent = dmaBuf; srcFile = dvdFile; srcOffset = param_5; - transLeft = fileSize - param_5; + transLeft = fileSize - srcOffset; fileOffset = param_4; readCount = 0; maxDest = uncompressedSize; - param_6 = param_6 ? param_6 : &tsArea; - tsPtr = param_6; - *param_6 = 0; + tsPtr = param_6 ? param_6 : &tsArea; + *tsPtr = 0; u8* first = firstSrcData(); - int result = first ? decompSZS_subroutine(first, param_1) : -1; - JKRHeap::free(szpBuf, 0); - JKRHeap::free(refBuf, 0); - JKRHeap::free(dmaBuf, 0); + if (first) { + result = decompSZS_subroutine(first, param_1); + } else { + result = -1; + } + JKRFree(szpBuf); + JKRFree(refBuf); + JKRFree(dmaBuf); OSUnlockMutex(&decompMutex); return result; } @@ -326,6 +335,8 @@ static int decompSZS_subroutine(u8* src, u32 dest) { } src += 0x10; + s32 b1; + u32 dist; do { if (validBitCount == 0) { if ((src > srcLimit) && transLeft) { @@ -354,8 +365,9 @@ static int decompSZS_subroutine(u8* src, u32 dest) { src++; readCount++; } else { - u32 dist = ((src[0] & 0x0F) << 8) | src[1]; - numBytes = src[0] >> 4; + b1 = src[0]; + dist = src[1] | ((b1 & 0x0f) << 8); + numBytes = b1 >> 4; src += 2; copySource = refCurrent - dist - 1; if (copySource < refBuf) { @@ -406,11 +418,11 @@ static u8* firstSrcData() { u32 bufSize = szpEnd - buffer; u32 length = transLeft < bufSize ? transLeft : bufSize; while (true) { - int result = DVDReadPrio(&srcFile->mFileInfo, buffer, length, 0, 2); + int result = DVDReadPrio(srcFile->getFileInfo(), buffer, length, 0, 2); if (result >= 0) { break; } - if (JKRDvdAramRipper::errorRetry == 0) { + if (!JKRDvdAramRipper::isErrorRetry()) { return NULL; } VIWaitForRetrace(); @@ -428,11 +440,13 @@ static u8* nextSrcData(u8* src) { } else { dest = szpBuf; } + memcpy(dest, src, size); u32 transSize = szpEnd - (dest + size); if (transSize > transLeft) { transSize = transLeft; } + JUT_ASSERT(1036, transSize > 0); while (true) { s32 result = DVDReadPrio(srcFile->getFileInfo(), dest + size, transSize, srcOffset, 2); @@ -457,7 +471,7 @@ static u32 dmaBufferFlush(u32 param_1) { return 0; } u32 size = ALIGN_NEXT(dmaCurrent - dmaBuf, 0x20); - JKRAramPiece::orderSync(0, (u32)dmaBuf, param_1, size, NULL); + JKRAramPcs(0, (u32)dmaBuf, param_1, size, NULL); dmaCurrent = dmaBuf; return size; } diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index 5436e7a808..74e182a374 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -19,7 +19,7 @@ JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDire mVolumeType = 'RARC'; mVolumeName = mStringTable + mNodes->name_offset; - getVolumeList().prepend(&mFileLoaderLink); + sVolumeList.prepend(&mFileLoaderLink); mIsMounted = true; } @@ -28,10 +28,11 @@ JKRDvdArchive::~JKRDvdArchive() { if (mArcInfoBlock) { SDIFileEntry* fileEntry = mFiles; int i = 0; - for (; i < mArcInfoBlock->num_file_entries; fileEntry++, i++) { + for (; i < mArcInfoBlock->num_file_entries; i++) { if (fileEntry->data) { JKRFreeToHeap(mHeap, fileEntry->data); } + fileEntry++; } JKRFreeToHeap(mHeap, mArcInfoBlock); @@ -47,7 +48,7 @@ JKRDvdArchive::~JKRDvdArchive() { delete mDvdFile; } - getVolumeList().remove(&mFileLoaderLink); + sVolumeList.remove(&mFileLoaderLink); mIsMounted = false; } } @@ -65,7 +66,8 @@ bool JKRDvdArchive::open(s32 entryNum) { return false; } - SArcHeader* arcHeader = (SArcHeader*)JKRAllocFromSysHeap(sizeof(SArcHeader), 0x20); + SArcHeader* arcHeader = NULL; + arcHeader = (SArcHeader*)JKRAllocFromSysHeap(sizeof(SArcHeader), 0x20); if (!arcHeader) { mMountMode = UNKNOWN_MOUNT_MODE; goto cleanup; @@ -98,9 +100,10 @@ bool JKRDvdArchive::open(s32 entryNum) { useCompression = 0; SDIFileEntry* fileEntry; fileEntry = mFiles; - for (u32 i = 0; i < mArcInfoBlock->num_file_entries; fileEntry++, i++) { - if (fileEntry->isUnknownFlag1()) { - useCompression |= fileEntry->getCompressFlag(); + for (u32 i = 0; i < mArcInfoBlock->num_file_entries; i++, fileEntry++) { + u8 flags = fileEntry->type_flags_and_name_offset >> 24; + if (flags & 1) { + useCompression |= u8(flags & 4); } } @@ -144,7 +147,7 @@ void* JKRDvdArchive::fetchResource(SDIFileEntry* fileEntry, u32* returnSize) { returnSize = &tempReturnSize; } - JKRCompression fileCompression = JKRConvertAttrToCompressionType(fileEntry->getAttr()); + JKRCompression fileCompression = JKRConvertAttrToCompressionType(u8(fileEntry->type_flags_and_name_offset >> 24)); if (!fileEntry->data) { u8* resourcePtr; u32 resourceSize = fetchResource_subroutine( @@ -161,8 +164,7 @@ void* JKRDvdArchive::fetchResource(SDIFileEntry* fileEntry, u32* returnSize) { } } else { if (fileCompression == COMPRESSION_YAZ0) { - u32 resourceSize = getExpandSize(fileEntry); - *returnSize = resourceSize; + *returnSize = getExpandSize(fileEntry); } else { *returnSize = fileEntry->data_size; } @@ -174,9 +176,8 @@ void* JKRDvdArchive::fetchResource(SDIFileEntry* fileEntry, u32* returnSize) { void* JKRDvdArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* fileEntry, u32* returnSize) { JUT_ASSERT(504, isMounted()); - u32 expandSize; u32 size = fileEntry->data_size; - JKRCompression fileCompression = JKRConvertAttrToCompressionType(fileEntry->getAttr()); + JKRCompression fileCompression = JKRConvertAttrToCompressionType(u8(fileEntry->type_flags_and_name_offset >> 24)); if (!fileEntry->data) { bufferSize = (s32)ALIGN_PREV(bufferSize, 0x20); @@ -185,7 +186,7 @@ void* JKRDvdArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* f mCompression); } else { if (fileCompression == COMPRESSION_YAZ0) { - expandSize = getExpandSize(fileEntry); + u32 expandSize = getExpandSize(fileEntry); if (expandSize) { size = expandSize; } @@ -343,7 +344,8 @@ u32 JKRDvdArchive::getExpandedResSize(const void* resource) const { return -1; } - if (!fileEntry->isCompressed()) { + u8 flags = fileEntry->type_flags_and_name_offset >> 24; + if ((flags & 4) == 0) { return getResSize(resource); } @@ -361,9 +363,9 @@ u32 JKRDvdArchive::getExpandedResSize(const void* resource) const { mDataOffset + fileEntry->data_offset, NULL, NULL); DCInvalidateRange(arcHeader, sizeof(SArcHeader)); - resourceSize = JKRDecompExpandSize(arcHeader); + u32 expandSize = JKRDecompExpandSize(arcHeader); // ??? - ((JKRDvdArchive*)this)->setExpandSize(fileEntry, resourceSize); + ((JKRDvdArchive*)this)->setExpandSize(fileEntry, expandSize); - return resourceSize; + return expandSize; } diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/src/JSystem/JKernel/JKRDvdFile.cpp index 8cb3790993..20132c3a22 100644 --- a/src/JSystem/JKernel/JKRDvdFile.cpp +++ b/src/JSystem/JKernel/JKRDvdFile.cpp @@ -13,10 +13,9 @@ JKRDvdFile::JKRDvdFile() : mDvdLink(this) { JKRDvdFile::JKRDvdFile(const char* name) : mDvdLink(this) { initiate(); - bool result = open(name); - mIsAvailable = result; + mIsAvailable = open(name); // weird code. doesn't match without this, maybe remains from assert or something? - if (mIsAvailable) + if (!mIsAvailable) return; else return; @@ -24,10 +23,9 @@ JKRDvdFile::JKRDvdFile(const char* name) : mDvdLink(this) { JKRDvdFile::JKRDvdFile(s32 entryNum) : mDvdLink(this) { initiate(); - bool result = open(entryNum); - mIsAvailable = result; + mIsAvailable = open(entryNum); // weird code. doesn't match without this, maybe remains from assert or something? - if (mIsAvailable) + if (!mIsAvailable) return; else return; @@ -52,7 +50,7 @@ bool JKRDvdFile::open(const char* name) { if (!mIsAvailable) { mIsAvailable = DVDOpen(name, &mFileInfo); if (mIsAvailable) { - getDvdList().append(&mDvdLink); + sDvdList.append(&mDvdLink); getStatus(); } } @@ -63,7 +61,7 @@ bool JKRDvdFile::open(s32 entryNum) { if (!mIsAvailable) { mIsAvailable = DVDFastOpen(entryNum, &mFileInfo); if (mIsAvailable) { - getDvdList().append(&mDvdLink); + sDvdList.append(&mDvdLink); getStatus(); } } @@ -72,10 +70,9 @@ bool JKRDvdFile::open(s32 entryNum) { void JKRDvdFile::close() { if (mIsAvailable) { - s32 result = DVDClose(&mFileInfo); - if (result != 0) { + if (DVDClose(&mFileInfo) != 0) { mIsAvailable = false; - getDvdList().remove(&mDvdLink); + sDvdList.remove(&mDvdLink); } else { JUTException::panic(__FILE__, 213, "cannot close DVD file\n"); } @@ -99,9 +96,7 @@ s32 JKRDvdFile::readData(void* param_1, s32 length, s32 param_3) { mOSThread = OSGetCurrentThread(); s32 result = -1; - s32 readAsyncResult = - DVDReadAsyncPrio(&mFileInfo, param_1, length, param_3, JKRDvdFile::doneProcess, 2); - if (readAsyncResult) { + if (DVDReadAsyncPrio(&mFileInfo, param_1, length, param_3, JKRDvdFile::doneProcess, 2)) { result = sync(); } diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp index 2a7a15609a..3f565bc67a 100644 --- a/src/JSystem/JKernel/JKRDvdRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdRipper.cpp @@ -26,7 +26,7 @@ void* JKRDvdRipper::loadToMainRAM(char const* name, u8* dst, JKRExpandSwitch exp if (!file.open(name)) { return NULL; } - return loadToMainRAM(&file, dst, expandSwitch, dstLength, heap, allocDirection, offset, + return JKRDvdToMainRam(&file, dst, expandSwitch, dstLength, heap, allocDirection, offset, pCompression, param_8); } @@ -38,11 +38,11 @@ void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expa if (!file.open(entryNumber)) { return NULL; } - return loadToMainRAM(&file, dst, expandSwitch, dstLength, heap, allocDirection, offset, + return JKRDvdToMainRam(&file, dst, expandSwitch, dstLength, heap, allocDirection, offset, pCompression, param_8); } -static u8 errorRetry = 0x01; +bool JKRDvdRipper::errorRetry = true; void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, JKRHeap* heap, @@ -215,7 +215,8 @@ void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch } else if (compression == COMPRESSION_YAZ0) { - if (JKRDecompressFromDVD(dvdFile, dst, fileSizeAligned, expandSize, offset, 0, param_8) != 0u) + u32 result = JKRDecompressFromDVD(dvdFile, dst, fileSizeAligned, expandSize, offset, 0, param_8); + if (result != 0u) { if (hasAllocated) JKRFree(dst); @@ -279,37 +280,34 @@ static int JKRDecompressFromDVD(JKRDvdFile* dvdFile, void* dst, u32 fileSize, u3 } OSRestoreInterrupts(interrupts); OSLockMutex(&decompMutex); - int bufSize = JKRDvdRipper::getSZSBufferSize(); - szpBuf = (u8 *)JKRAllocFromSysHeap(bufSize, -0x20); + u32 result = 0; + u32 szsBufferSize = JKRDvdRipper::getSZSBufferSize(); + szpBuf = (u8 *)JKRAllocFromSysHeap(szsBufferSize, -0x20); + JUT_ASSERT(909, szpBuf != NULL); - szpEnd = szpBuf + bufSize; - if (inFileOffset != 0) - { + szpEnd = szpBuf + szsBufferSize; + if (inFileOffset != 0) { refBuf = (u8 *)JKRAllocFromSysHeap(0x1120, -4); + JUT_ASSERT(918, refBuf != NULL); refEnd = refBuf + 0x1120; refCurrent = refBuf; - } - else - { + } else { refBuf = NULL; } srcFile = dvdFile; srcOffset = inSrcOffset; - transLeft = fileSize - inSrcOffset; + transLeft = fileSize - srcOffset; fileOffset = inFileOffset; readCount = 0; maxDest = inMaxDest; - if (!inTsPtr) - { - tsPtr = &tsArea; - } - else - { - tsPtr = inTsPtr; - } + tsPtr = inTsPtr ? inTsPtr : &tsArea; *tsPtr = 0; u8 *data = firstSrcData(); - u32 result = (data != NULL) ? decompSZS_subroutine(data, (u8 *)dst) : -1; // figure out correct datatypes + if (data != NULL) { + result = decompSZS_subroutine(data, (u8 *)dst); + } else { + result = -1; + } JKRFree(szpBuf); if (refBuf) { @@ -321,143 +319,110 @@ static int JKRDecompressFromDVD(JKRDvdFile* dvdFile, void* dst, u32 fileSize, u3 } int decompSZS_subroutine(u8* src, u8* dest) { - u8 *endPtr; + u8* endPtr; s32 validBitCount = 0; s32 currCodeByte = 0; u32 ts = 0; - if (src[0] != 'Y' || src[1] != 'a' || src[2] != 'z' || src[3] != '0') - { + if (src[0] != 'Y' || src[1] != 'a' || src[2] != 'z' || src[3] != '0') { return -1; } - SYaz0Header *header = (SYaz0Header *)src; + SYaz0Header* header = (SYaz0Header*)src; endPtr = dest + (header->length - fileOffset); - if (endPtr > dest + maxDest) - { + if (endPtr > dest + maxDest) { endPtr = dest + maxDest; } src += 0x10; - do - { - if (validBitCount == 0) - { - if ((src > srcLimit) && transLeft) - { + s32 b1; + u32 dist; + s32 numBytes; + u8* copySource; + do { + if (validBitCount == 0) { + if ((src > srcLimit) && transLeft) { src = nextSrcData(src); - if (!src) - { + if (!src) { return -1; } } - currCodeByte = *src; + currCodeByte = *src++; validBitCount = 8; - src++; } - if (currCodeByte & 0x80) - { - if (fileOffset != 0) - { - if (readCount >= fileOffset) - { + if (currCodeByte & 0x80) { + if (fileOffset != 0) { + if (readCount >= fileOffset) { *dest = *src; dest++; ts++; - if (dest == endPtr) - { + if (dest == endPtr) { break; } } *(refCurrent++) = *src; - if (refCurrent == refEnd) - { + if (refCurrent == refEnd) { refCurrent = refBuf; } src++; - } - else - { - *dest = *src; - dest++; - src++; + } else { + *dest++ = *src++; ts++; - if (dest == endPtr) - { + if (dest == endPtr) { break; } } readCount++; - } - else - { - u32 dist = ((src[0] & 0x0f) << 8) | src[1]; - s32 numBytes = src[0] >> 4; + } else { + b1 = src[0]; + dist = src[1] | ((b1 & 0x0f) << 8); + numBytes = b1 >> 4; src += 2; - u8 *copySource; - if (fileOffset != 0) - { + if (fileOffset != 0) { copySource = refCurrent - dist - 1; - if (copySource < refBuf) - { + if (copySource < refBuf) { copySource += refEnd - refBuf; } - } - else - { + } else { copySource = dest - dist - 1; } - if (numBytes == 0) - { - numBytes = *src + 0x12; - src += 1; - } - else - { + if (numBytes == 0) { + numBytes = (*src++) + 0x12; + } else { numBytes += 2; } - if (fileOffset != 0) - { - do - { - if (readCount >= fileOffset) - { + if (fileOffset != 0) { + do { + if (readCount >= fileOffset) { *dest = *copySource; dest++; ts++; - if (dest == endPtr) - { + if (dest == endPtr) { break; } } *(refCurrent++) = *copySource; - if (refCurrent == refEnd) - { + if (refCurrent == refEnd) { refCurrent = refBuf; } copySource++; - if (copySource == refEnd) - { + if (copySource == refEnd) { copySource = refBuf; } readCount++; numBytes--; } while (numBytes != 0); - } - else - { - do - { + } else { + do { *dest = *copySource; dest++; ts++; - if (dest == endPtr) - { + if (dest == endPtr) { break; } + copySource++; readCount++; numBytes--; - copySource++; } while (numBytes != 0); } } @@ -480,7 +445,7 @@ static u8* firstSrcData() { break; } - if (result == -3 || !errorRetry) { + if (result == -3 || !JKRDvdRipper::isErrorRetry()) { return NULL; } VIWaitForRetrace(); @@ -494,19 +459,23 @@ static u8* firstSrcData() { static u8* nextSrcData(u8* src) { u32 limit = szpEnd - src; - u8 *buf; - if (IS_NOT_ALIGNED(limit, 0x20)) - buf = szpBuf + 0x20 - (limit & (0x20 - 1)); - else - buf = szpBuf; + u8 *dest; + if (IS_NOT_ALIGNED(limit, 0x20)) { + dest = szpBuf + 0x20 - (limit & (0x20 - 1)); + } else { + dest = szpBuf; + } - memcpy(buf, src, limit); - u32 transSize = (uintptr_t)(szpEnd - (buf + limit)); - if (transSize > transLeft) + memcpy(dest, src, limit); + u32 transSize = (uintptr_t)(szpEnd - (dest + limit)); + if (transSize > transLeft) { transSize = transLeft; + } + JUT_ASSERT(1208, transSize > 0); + while (true) { - s32 result = DVDReadPrio(srcFile->getFileInfo(), (buf + limit), transSize, srcOffset, 2); + s32 result = DVDReadPrio(srcFile->getFileInfo(), (dest + limit), transSize, srcOffset, 2); if (result >= 0) break; // bug: supposed to call isErrorRetry, but didn't @@ -515,15 +484,11 @@ static u8* nextSrcData(u8* src) { VIWaitForRetrace(); } - DCInvalidateRange((buf + limit), transSize); + DCInvalidateRange((dest + limit), transSize); srcOffset += transSize; transLeft -= transSize; if (transLeft == 0) - srcLimit = transSize + (buf + limit); + srcLimit = transSize + (dest + limit); - return buf; -} - -u8 JKRDvdRipper::isErrorRetry() { - return errorRetry; + return dest; } diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp index f3678cb81b..a455bd07fb 100644 --- a/src/JSystem/JKernel/JKRExpHeap.cpp +++ b/src/JSystem/JKernel/JKRExpHeap.cpp @@ -5,19 +5,51 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRExpHeap.h" +#include "JSystem/JGadget/binary.h" #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTException.h" +#include JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) { JKRExpHeap* heap = NULL; if (!sRootHeap) { - void* memory; - u32 memorySize; - initArena((char**)&memory, &memorySize, maxHeaps); - u8* start = (u8*)memory + ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); - u32 alignedSize = memorySize - ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); - heap = new (memory) JKRExpHeap(start, alignedSize, NULL, errorFlag); +#if !PLATFORM_GCN + u8* mem2; + u32 mem2Size; + initArena2((char**)&mem2, &mem2Size, 1); + u32 local_1c = ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); + u8* local_20 = mem2 + local_1c; + u32 local_24 = mem2Size - local_1c; +#if DEBUG + if (local_20) { + u8* local_28 = local_20; + u32 local_2c = local_24; + if (isDefaultDebugFill()) { + JKRFillMemory(local_28, local_2c, JKRValue_DEBUGFILL_NOTUSE); + } + } +#endif + JKRExpHeap* heap2 = new (mem2) JKRExpHeap(local_20, local_24, NULL, errorFlag); + sRootHeap2 = heap2; + heap2->field_0x6e = true; +#endif + void* mem1; + u32 mem1Size; + initArena((char**)&mem1, &mem1Size, maxHeaps); + u32 local_3c = ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); + u8* start1 = (u8*)mem1 + local_3c; + u32 alignedSize = mem1Size - local_3c; +#if DEBUG + if (start1) { + u8* local_4c = start1; + u32 local_48 = alignedSize; + if (isDefaultDebugFill()) { + JKRFillMemory(local_4c, local_48, JKRValue_DEBUGFILL_NOTUSE); + } + } +#endif + heap = new (mem1) JKRExpHeap(start1, alignedSize, NULL, errorFlag); sRootHeap = heap; } heap->field_0x6e = true; @@ -25,17 +57,20 @@ JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) { } JKRExpHeap* JKRExpHeap::create(u32 size, JKRHeap* parent, bool errorFlag) { + JKRExpHeap* newHeap = NULL; if (!parent) { parent = sRootHeap; } + u32 expHeapSize = ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); + u32 blockSize = sizeof(CMemBlock); if (size == 0xffffffff) { size = parent->getMaxAllocatableSize(0x10); } u32 alignedSize = ALIGN_PREV(size, 0x10); - u32 expHeapSize = ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); - if (alignedSize < 0xa0) + + if (alignedSize < expHeapSize + blockSize) return NULL; u8* memory = (u8*)JKRAllocFromHeap(parent, alignedSize, 0x10); @@ -44,14 +79,21 @@ JKRExpHeap* JKRExpHeap::create(u32 size, JKRHeap* parent, bool errorFlag) { return NULL; } - JKRExpHeap* newHeap = - new (memory) JKRExpHeap(dataPtr, alignedSize - expHeapSize, parent, errorFlag); + newHeap = new (memory) JKRExpHeap(dataPtr, alignedSize - expHeapSize, parent, errorFlag); if (newHeap == NULL) { JKRFree(memory); return NULL; } - +#if DEBUG + if (newHeap) { + u8* local_30 = dataPtr + sizeof(CMemBlock); + u32 local_34 = newHeap->mHeadFreeList->size; + if (isDefaultDebugFill()) { + JKRFillMemory(local_30, local_34, JKRValue_DEBUGFILL_NOTUSE); + } + } +#endif newHeap->field_0x6e = false; return newHeap; } @@ -59,7 +101,7 @@ JKRExpHeap* JKRExpHeap::create(u32 size, JKRHeap* parent, bool errorFlag) { JKRExpHeap* JKRExpHeap::create(void* ptr, u32 size, JKRHeap* parent, bool errorFlag) { JKRHeap* parent2; if (parent == NULL) { - parent2 = sRootHeap->find(ptr); + parent2 = getRootHeap()->find(ptr); if (!parent2) return NULL; } else { @@ -71,12 +113,21 @@ JKRExpHeap* JKRExpHeap::create(void* ptr, u32 size, JKRHeap* parent, bool errorF if (size < expHeapSize) return NULL; - void* dataPtr = (u8*)ptr + expHeapSize; + u8* r28 = (u8*)ptr; + u8* dataPtr = r28 + expHeapSize; u32 alignedSize = ALIGN_PREV((uintptr_t)ptr + size - (uintptr_t)dataPtr, 0x10); - if (ptr) { - newHeap = new (ptr) JKRExpHeap(dataPtr, alignedSize, parent2, errorFlag); + if (r28) { + newHeap = new (r28) JKRExpHeap(dataPtr, alignedSize, parent2, errorFlag); } - +#if DEBUG + if (newHeap) { + u8* local_30 = dataPtr + sizeof(CMemBlock); + u32 local_34 = newHeap->mHeadFreeList->size; + if (isDefaultDebugFill()) { + JKRFillMemory(local_30, local_34, JKRValue_DEBUGFILL_NOTUSE); + } + } +#endif newHeap->field_0x6e = true; newHeap->field_0x70 = ptr; newHeap->field_0x74 = size; @@ -85,13 +136,20 @@ JKRExpHeap* JKRExpHeap::create(void* ptr, u32 size, JKRHeap* parent, bool errorF void JKRExpHeap::do_destroy() { if (!field_0x6e) { - JKRHeap* heap = mChildTree.getParent()->getObject(); + JKRHeap* heap = getParent(); if (heap) { this->~JKRExpHeap(); - JKRHeap::free(this, heap); + JKRFreeToHeap(heap, this); } } else { + u8* r28 = (u8*)field_0x70; + u32 r27 = field_0x74; this->~JKRExpHeap(); +#if DEBUG + if (mDebugFill) { + JKRFillMemory(r28, r27, JKRValue_DEBUGFILL_NOTUSE); + } +#endif } } @@ -111,13 +169,21 @@ JKRExpHeap::~JKRExpHeap() { } void* JKRExpHeap::do_alloc(u32 size, int alignment) { - void* ptr; +#if DEBUG + if (alignment) { + u32 u = abs(alignment); + JUT_CONFIRM(356, u < 0x80); + JUT_CONFIRM(357, JGadget::binary::isPower2( u )); + } +#endif lock(); if (size < 4) { size = 4; } + void* ptr = NULL; + if (alignment >= 0) { if (alignment <= 4) { ptr = allocFromHead(size); @@ -131,10 +197,24 @@ void* JKRExpHeap::do_alloc(u32 size, int alignment) { ptr = allocFromTail(size, -alignment); } } +#if DEBUG + if (ptr) { + CMemBlock* block = (CMemBlock*)((u8*)ptr - sizeof(CMemBlock)); + if (mCheckMemoryFilled) { + JKRHeap::checkMemoryFilled((u8*)ptr, block->size, JKRValue_DEBUGFILL_DELETE); + } + if (mDebugFill) { + JKRFillMemory((u8*)ptr, block->size, JKRValue_DEBUGFILL_NEW); + } + if (block->getAlignment() && mDebugFill) { + JKRFillMemory((u8*)ptr - sizeof(CMemBlock) - block->getAlignment(), block->getAlignment(), JKRValue_DEBUGFILL_NEW); + } + } +#endif if (ptr == NULL) { JUTWarningConsole_f(":::cannot alloc memory (0x%x byte).\n", size); - if (mErrorFlag == true) { + if (getErrorFlag() == true) { callErrorHandler(this, size, alignment); } } @@ -156,14 +236,13 @@ static JKRExpHeap::CMemBlock* DBnewUsedBlock; void* JKRExpHeap::allocFromHead(u32 size, int align) { u32 foundOffset; int foundSize; - CMemBlock* newFreeBlock; - CMemBlock* newUsedBlock; - CMemBlock* foundBlock; size = ALIGN_NEXT(size, 4); foundSize = -1; foundOffset = 0; - foundBlock = NULL; + CMemBlock* foundBlock = NULL; + CMemBlock* newFreeBlock = NULL; + CMemBlock* newUsedBlock = NULL; for (CMemBlock* block = mHeadFreeList; block; block = block->mNext) { u32 offset = @@ -183,8 +262,7 @@ void* JKRExpHeap::allocFromHead(u32 size, int align) { break; } - u32 blockSize = block->size; - if (blockSize == size) { + if (foundSize == size) { break; } } @@ -236,17 +314,12 @@ void* JKRExpHeap::allocFromHead(u32 size, int align) { } else { CMemBlock* prev = foundBlock->mPrev; CMemBlock* next = foundBlock->mNext; - // Works but very fake match - size = (uintptr_t)foundBlock->allocFore(size, mCurrentGroupId, 0, 0, 0); + + newFreeBlock = foundBlock->allocFore(size, mCurrentGroupId, 0, 0, 0); removeFreeBlock(foundBlock); - if (size) { - setFreeBlock((CMemBlock*)size, prev, next); + if (newFreeBlock) { + setFreeBlock(newFreeBlock, prev, next); } - // newFreeBlock = foundBlock->allocFore(size, mCurrentGroupId, 0, 0, 0); - // removeFreeBlock(foundBlock); - // if (newFreeBlock) { - // setFreeBlock(newFreeBlock, prev, next); - // } appendUsedList(foundBlock); return foundBlock->getContent(); } @@ -260,16 +333,17 @@ void* JKRExpHeap::allocFromHead(u32 size) { size = ALIGN_NEXT(size, 4); s32 foundSize = -1; CMemBlock* foundBlock = NULL; - for (CMemBlock* block = mHeadFreeList; block; block = block->getNextBlock()) { - if (block->getSize() < size) { + CMemBlock* newblock = NULL; + for (CMemBlock* block = mHeadFreeList; block; block = block->mNext) { + if (block->size < size) { continue; } - if (foundSize <= block->getSize()) { + if (foundSize <= block->size) { continue; } - foundSize = block->getSize(); + foundSize = block->size; foundBlock = block; if (mAllocMode != 0) { break; @@ -281,9 +355,9 @@ void* JKRExpHeap::allocFromHead(u32 size) { } if (foundBlock) { - CMemBlock* newblock = foundBlock->allocFore(size, mCurrentGroupId, 0, 0, 0); + newblock = foundBlock->allocFore(size, mCurrentGroupId, 0, 0, 0); if (newblock) { - setFreeBlock(newblock, foundBlock->getPrevBlock(), foundBlock->getNextBlock()); + setFreeBlock(newblock, foundBlock->mPrev, foundBlock->mNext); } else { removeFreeBlock(foundBlock); } @@ -294,6 +368,7 @@ void* JKRExpHeap::allocFromHead(u32 size) { } void* JKRExpHeap::allocFromTail(u32 size, int align) { + u32 local_2c = 0; u32 offset = 0; CMemBlock* foundBlock = NULL; CMemBlock* newBlock = NULL; @@ -304,6 +379,7 @@ void* JKRExpHeap::allocFromTail(u32 size, int align) { start = ALIGN_PREV((uintptr_t)block->getContent() + block->size - size, align); usedSize = (uintptr_t)block->getContent() + block->size - start; if (block->size >= usedSize) { + local_2c = usedSize; foundBlock = block; offset = block->size - usedSize; newBlock = (CMemBlock*)start - 1; @@ -336,18 +412,19 @@ void* JKRExpHeap::allocFromTail(u32 size, int align) { } void* JKRExpHeap::allocFromTail(u32 size) { - u32 size2 = ALIGN_NEXT(size, 4); + size = ALIGN_NEXT(size, 4); CMemBlock* foundBlock = NULL; - for (CMemBlock* block = mTailFreeList; block; block = block->getPrevBlock()) { - if (block->getSize() >= size2) { + CMemBlock* freeBlock = NULL; + CMemBlock* usedBlock = NULL; + for (CMemBlock* block = mTailFreeList; block; block = block->mPrev) { + if (block->size >= size) { foundBlock = block; break; } } if (foundBlock != NULL) { - CMemBlock* usedBlock = foundBlock->allocBack(size2, 0, 0, mCurrentGroupId, 0); - CMemBlock* freeBlock; + usedBlock = foundBlock->allocBack(size, 0, 0, mCurrentGroupId, 0); if (usedBlock) { freeBlock = foundBlock; } else { @@ -357,7 +434,7 @@ void* JKRExpHeap::allocFromTail(u32 size) { } if (freeBlock) { - setFreeBlock(freeBlock, foundBlock->getPrevBlock(), foundBlock->getNextBlock()); + setFreeBlock(freeBlock, foundBlock->mPrev, foundBlock->mNext); } appendUsedList(usedBlock); return usedBlock->getContent(); @@ -367,31 +444,42 @@ void* JKRExpHeap::allocFromTail(u32 size) { void JKRExpHeap::do_free(void* ptr) { lock(); - if (getStartAddr() <= ptr && ptr <= getEndAddr()) { + if (mStart <= ptr && ptr <= mEnd) { CMemBlock* block = CMemBlock::getHeapBlock(ptr); if (block) { block->free(this); } + } else { + JUT_WARN(921, "free: memblock %x not in heap %x", ptr, this); } unlock(); } +static void dummy() { + OS_REPORT("newSize > 0"); +} + void JKRExpHeap::do_freeAll() { lock(); JKRHeap::callAllDisposer(); - mHeadFreeList = (CMemBlock*)getStartAddr(); + mHeadFreeList = (CMemBlock*)mStart; mTailFreeList = mHeadFreeList; - mHeadFreeList->initiate(NULL, NULL, getSize() - 0x10, 0, 0); + mHeadFreeList->initiate(NULL, NULL, mSize - 0x10, 0, 0); mHeadUsedList = NULL; mTailUsedList = NULL; +#if DEBUG + if (mDebugFill) { + JKRFillMemory((u8*)(mHeadFreeList + 1), mHeadFreeList->size, JKRValue_DEBUGFILL_DELETE); + } +#endif unlock(); } void JKRExpHeap::do_freeTail() { lock(); for (CMemBlock* block = mHeadUsedList; block != NULL;) { - if ((block->mFlags & 0x80) != 0) { - dispose(block + 1, block->size); + if (block->isTempMemBlock()) { + dispose(block->getContent(), block->size); CMemBlock* temp = block->mNext; block->free(this); block = temp; @@ -402,7 +490,15 @@ void JKRExpHeap::do_freeTail() { unlock(); } -void JKRExpHeap::do_fillFreeArea() {} +void JKRExpHeap::do_fillFreeArea() { +#if DEBUG + lock(); + for (CMemBlock* block = mHeadFreeList; block; block = block->mNext) { + JKRFillMemory((u8*)block->getContent(), block->size, JKRValue_DEBUGFILL_DELETE); + } + unlock(); +#endif +} s32 JKRExpHeap::do_changeGroupID(u8 param_0) { lock(); @@ -445,6 +541,7 @@ s32 JKRExpHeap::do_resize(void* ptr, u32 size) { return -1; } + u32 local_24 = block->size; removeFreeBlock(foundBlock); block->size += foundBlock->size + sizeof(CMemBlock); if (block->size - size > sizeof(CMemBlock)) { @@ -453,6 +550,11 @@ s32 JKRExpHeap::do_resize(void* ptr, u32 size) { recycleFreeBlock(newBlock); } } +#if DEBUG + if (mDebugFill) { + JKRFillMemory((u8*)ptr + local_24, block->size - local_24, JKRValue_DEBUGFILL_NEW); + } +#endif } else { if (block->size - size > sizeof(CMemBlock)) { CMemBlock* freeBlock = block->allocFore(size, block->mGroupId, block->mFlags, 0, 0); @@ -469,20 +571,20 @@ s32 JKRExpHeap::do_resize(void* ptr, u32 size) { s32 JKRExpHeap::do_getSize(void* ptr) { lock(); CMemBlock* block = CMemBlock::getHeapBlock(ptr); - if (!block || ptr < getStartAddr() || getEndAddr() < ptr) { + if (!block || ptr < mStart || mEnd < ptr) { unlock(); return -1; } unlock(); - return block->getSize(); + return block->size; } s32 JKRExpHeap::do_getFreeSize() { lock(); s32 size = 0; - for (CMemBlock* block = mHeadFreeList; block; block = block->getNextBlock()) { - if (size < (s32)block->getSize()) { - size = block->getSize(); + for (CMemBlock* block = mHeadFreeList; block; block = block->mNext) { + if (size < (s32)block->size) { + size = block->size; } } unlock(); @@ -493,9 +595,9 @@ void* JKRExpHeap::do_getMaxFreeBlock() { lock(); s32 size = 0; CMemBlock* res = NULL; - for (CMemBlock* block = mHeadFreeList; block; block = block->getNextBlock()) { - if (size < (s32)block->getSize()) { - size = block->getSize(); + for (CMemBlock* block = mHeadFreeList; block; block = block->mNext) { + if (size < (s32)block->size) { + size = block->size; res = block; } } @@ -506,42 +608,46 @@ void* JKRExpHeap::do_getMaxFreeBlock() { s32 JKRExpHeap::do_getTotalFreeSize() { u32 size = 0; lock(); - for (CMemBlock* block = mHeadFreeList; block; block = block->getNextBlock()) { - size += block->getSize(); + for (CMemBlock* block = mHeadFreeList; block; block = block->mNext) { + size += block->size; } unlock(); return size; } s32 JKRExpHeap::getUsedSize(u8 groupId) const { - JKRExpHeap* this2 = const_cast(this); - this2->lock(); + lock(); u32 size = 0; - for (CMemBlock* block = mHeadUsedList; block; block = block->getNextBlock()) { - u8 blockGroupId = block->getGroupId(); - if (blockGroupId == groupId) { - size += block->getSize() + sizeof(CMemBlock); + for (CMemBlock* block = mHeadUsedList; block; block = block->mNext) { + if (block->mGroupId == groupId) { + size += block->size + sizeof(CMemBlock); } } - this2->unlock(); + unlock(); return size; } s32 JKRExpHeap::getTotalUsedSize() const { - JKRExpHeap* this2 = const_cast(this); - this2->lock(); + lock(); u32 size = 0; - for (CMemBlock* block = mHeadUsedList; block; block = block->getNextBlock()) { - size += block->getSize() + sizeof(CMemBlock); + for (CMemBlock* block = mHeadUsedList; block; block = block->mNext) { + size += block->size + sizeof(CMemBlock); } - this2->unlock(); + unlock(); return size; } +BOOL JKRExpHeap::isEmpty() { + lock(); + BOOL result = !mHeadUsedList ? TRUE : FALSE; + unlock(); + return result; +} + void JKRExpHeap::appendUsedList(JKRExpHeap::CMemBlock* newblock) { if (!newblock) { JUTException::panic(__FILE__, 1568, "bad appendUsedList\n"); @@ -621,18 +727,24 @@ void JKRExpHeap::removeUsedBlock(JKRExpHeap::CMemBlock* block) { void JKRExpHeap::recycleFreeBlock(JKRExpHeap::CMemBlock* block) { JKRExpHeap::CMemBlock* newBlock = block; int size = block->size; - void* blockEnd = (u8*)block + size; + void* blockEnd = (u8*)newBlock + size; block->mMagic = 0; if ((block->mFlags & 0x7f) != 0) { - newBlock = (CMemBlock*)((u8*)block - (block->mFlags & 0x7f)); + newBlock = (CMemBlock*)((u8*)newBlock - (block->mFlags & 0x7f)); size += (block->mFlags & 0x7f); blockEnd = (u8*)newBlock + size; newBlock->mGroupId = 0; newBlock->mFlags = 0; newBlock->size = size; } - +#if DEBUG + u8* local_24 = (u8*)(newBlock + 1); + u32 local_28 = newBlock->size; + if (mDebugFill) { + JKRFillMemory(local_24, local_28, JKRValue_DEBUGFILL_DELETE); + } +#endif if (!mHeadFreeList) { newBlock->initiate(NULL, NULL, size, 0, 0); mHeadFreeList = newBlock; @@ -676,13 +788,26 @@ void JKRExpHeap::joinTwoBlocks(CMemBlock* block) { u32 nextAddr = (uintptr_t)next - (next->mFlags & 0x7f); if (endAddr > nextAddr) { JUTWarningConsole_f(":::Heap may be broken. (block = %x)", block); - JKRGetCurrentHeap()->dump(); + OS_REPORT(":::block = %x\n", block); + OS_REPORT(":::joinTwoBlocks [%x %x %x][%x %x %x]\n", block, block->mFlags, block->size, block->mNext, block->mNext->mFlags, block->mNext->size); + OS_REPORT(":::: endAddr = %x\n", endAddr); + OS_REPORT(":::: nextAddr = %x\n", nextAddr); + JKRHeap* heap = JKRGetCurrentHeap(); + heap->dump(); JUTException::panic(__FILE__, 1820, "Bad Block\n"); } if (endAddr == nextAddr) { - block->size = next->size + sizeof(CMemBlock) + next->getAlignment() + block->size; - setFreeBlock(block, block->mPrev, next->mNext); + block->size = next->size + sizeof(CMemBlock) + (next->mFlags & 0x7f) + block->size; + CMemBlock* local_30 = next->mNext; +#if DEBUG + u8* local_34 = (u8*)next; + u32 local_38 = sizeof(CMemBlock); + if (mDebugFill) { + JKRFillMemory(local_34, local_38, JKRValue_DEBUGFILL_DELETE); + } +#endif + setFreeBlock(block, block->mPrev, local_30); } } @@ -691,14 +816,14 @@ bool JKRExpHeap::check() { int totalBytes = 0; bool ok = true; for (CMemBlock* block = mHeadUsedList; block; block = block->mNext) { - if (!block->isValid()) { + if (block->mMagic != 'HM') { ok = false; JUTWarningConsole_f(":::addr %08x: bad heap signature. (%c%c)\n", block, JSUHiByte(block->mMagic), JSULoByte(block->mMagic)); } if (block->mNext) { - if (!block->mNext->isValid()) { + if (block->mNext->mMagic != 'HM') { ok = false; JUTWarningConsole_f(":::addr %08x: bad next pointer (%08x)\nabort\n", block, block->mNext); @@ -739,6 +864,13 @@ bool JKRExpHeap::check() { mTailFreeList); } } +#if DEBUG + if (mCheckMemoryFilled) { + u8* local_34 = (u8*)block->getContent(); + u32 local_38 = block->size; + ok = JKRHeap::checkMemoryFilled(local_34, local_38, JKRValue_DEBUGFILL_DELETE); + } +#endif } if (totalBytes != mSize) { @@ -768,7 +900,7 @@ bool JKRExpHeap::dump() { } for (CMemBlock* block = mHeadUsedList; block; block = block->mNext) { - if (!block->isValid()) { + if (block->mMagic != 'HM') { JUTReportConsole_f("xxxxx %08x: -------- --- --- (-------- --------)\nabort\n", block); break; @@ -794,8 +926,7 @@ bool JKRExpHeap::dump() { freeCount++; } - float percent = ((float)usedBytes / (float)mSize) * 100.0f; - JUTReportConsole_f("%d / %d bytes (%6.2f%%) used (U:%d F:%d)\n", usedBytes, mSize, percent, + JUTReportConsole_f("%d / %d bytes (%6.2f%%) used (U:%d F:%d)\n", usedBytes, mSize, (f32(usedBytes) / f32(mSize)) * 100.0f, usedCount, freeCount); unlock(); return result; @@ -822,21 +953,18 @@ bool JKRExpHeap::dump_sort() { } } - if (block == (CMemBlock*)0xffffffff) { + if (uintptr_t(block) == 0xffffffff) { break; } - if (!block->isValid()) { + if (block->mMagic != 'HM') { JUTReportConsole_f("xxxxx %08x: -------- --- --- (-------- --------)\nabort\n", var1); break; } - int offset = block->getAlignment(); - void* content = block->getContent(); - const char* type = block->isTempMemBlock() ? " temp" : "alloc"; - JUTReportConsole_f("%s %08x: %08x %3d %3d (%08x %08x)\n", type, content, block->size, - block->getGroupId(), offset, block->mPrev, block->mNext); + JUTReportConsole_f("%s %08x: %08x %3d %3d (%08x %08x)\n", block->isTempMemBlock() ? " temp" : "alloc", block->getContent(), block->size, + block->mGroupId, block->getAlignment(), block->mPrev, block->mNext); usedBytes += sizeof(CMemBlock) + block->size + block->getAlignment(); usedCount++; var1 = block; @@ -850,13 +978,12 @@ bool JKRExpHeap::dump_sort() { for (CMemBlock* block = mHeadFreeList; block; block = block->mNext) { JUTReportConsole_f("%s %08x: %08x %3d %3d (%08x %08x)\n", " free", block->getContent(), - block->size, block->getGroupId(), block->getAlignment(), block->mPrev, + block->size, block->mGroupId, block->getAlignment(), block->mPrev, block->mNext); freeCount++; } - float percent = ((float)usedBytes / (float)mSize) * 100.0f; - JUTReportConsole_f("%d / %d bytes (%6.2f%%) used (U:%d F:%d)\n", usedBytes, mSize, percent, + JUTReportConsole_f("%d / %d bytes (%6.2f%%) used (U:%d F:%d)\n", usedBytes, mSize, (f32(usedBytes) / f32(mSize)) * 100.0f, usedCount, freeCount); unlock(); return result; @@ -872,33 +999,33 @@ void JKRExpHeap::CMemBlock::initiate(JKRExpHeap::CMemBlock* prev, JKRExpHeap::CM mNext = next; } -JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocFore(u32 size, u8 groupId1, u8 alignment1, +JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocFore(u32 size1, u8 groupId1, u8 alignment1, u8 groupId2, u8 alignment2) { CMemBlock* block = NULL; mGroupId = groupId1; mFlags = alignment1; - if (getSize() >= size + sizeof(CMemBlock)) { - block = (CMemBlock*)(size + (uintptr_t)this); + if (size >= size1 + sizeof(CMemBlock)) { + block = (CMemBlock*)(size1 + (uintptr_t)this); block[1].mGroupId = groupId2; block[1].mFlags = alignment2; - block[1].size = this->size - (size + sizeof(CMemBlock)); - this->size = size; + block[1].size = size - (size1 + sizeof(CMemBlock)); + size = size1; block = block + 1; } return block; } -JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocBack(u32 size, u8 groupId1, u8 alignment1, +JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocBack(u32 size1, u8 groupId1, u8 alignment1, u8 groupId2, u8 alignment2) { CMemBlock* newblock = NULL; - if (getSize() >= size + sizeof(CMemBlock)) { - newblock = (CMemBlock*)((uintptr_t)this + getSize() - size); + if (size >= size1 + sizeof(CMemBlock)) { + newblock = (CMemBlock*)((uintptr_t)this + size - size1); newblock->mGroupId = groupId2; newblock->mFlags = alignment2 | 0x80; - newblock->size = size; + newblock->size = size1; mGroupId = groupId1; mFlags = alignment1; - this->size -= size + sizeof(CMemBlock); + this->size -= size1 + sizeof(CMemBlock); } else { mGroupId = groupId2; mFlags = 0x80; @@ -922,36 +1049,51 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::getHeapBlock(void* ptr) { return NULL; } +static void dummy2() { + DEAD_STRING("+---------------JKRExpHeap\n"); + DEAD_STRING("| Align Group size ( prev , next )\n"); + DEAD_STRING("| ---- FreeFirst\n"); + DEAD_STRING("| %08x "); + DEAD_STRING("%2x %3d %6x (%08x %08x)\n"); + DEAD_STRING("| ---- FreeLast\n"); + DEAD_STRING("| ---- UsedFirst\n"); + DEAD_STRING("| ---- UsedLast\n"); + DEAD_STRING("+---------------End\n"); +} + void JKRExpHeap::state_register(JKRHeap::TState* p, u32 param_1) const { - p->mId = param_1; + JUT_ASSERT(2433, p != NULL); + JUT_ASSERT(2434, p->getHeap() == this); + void* r24 = getState_(p); + u32 r25 = param_1; + setState_u32ID_(p, param_1); if (param_1 <= 0xff) { - p->mUsedSize = getUsedSize(param_1); + setState_uUsedSize_(p, getUsedSize(r25)); } else { - s32 freeSize = const_cast(this)->getTotalFreeSize(); - p->mUsedSize = getSize() - freeSize; + setState_uUsedSize_(p, getUsedSize_(const_cast(this))); } u32 checkCode = 0; - for (CMemBlock* block = mHeadUsedList; block; block = block->getNextBlock()) { + for (CMemBlock* block = mHeadUsedList; block; block = block->mNext) { if (param_1 <= 0xff) { - u8 groupId = block->getGroupId(); - if (groupId == param_1) { + if (block->mGroupId == param_1) { checkCode += (uintptr_t)block * 3; } } else { checkCode += (uintptr_t)block * 3; } } - p->mCheckCode = checkCode; + setState_u32CheckCode_(p, checkCode); } bool JKRExpHeap::state_compare(JKRHeap::TState const& r1, JKRHeap::TState const& r2) const { + JUT_ASSERT(2481, r1.getHeap() == r2.getHeap()); bool result = true; - if (r1.mCheckCode != r2.mCheckCode) { + if (r1.getCheckCode() != r2.getCheckCode()) { result = false; } - if (r1.mUsedSize != r2.mUsedSize) { + if (r1.getUsedSize() != r2.getUsedSize()) { result = false; } @@ -965,13 +1107,3 @@ u32 JKRExpHeap::getHeapType() { u8 JKRExpHeap::do_getCurrentGroupId() { return mCurrentGroupId; } - -static char* dummyLiteral1() { return "+---------------JKRExpHeap\n"; } -static char* dummyLiteral2() { return "| Align Group size ( prev , next )\n"; } -static char* dummyLiteral3() { return "| ---- FreeFirst\n"; } -static char* dummyLiteral4() { return "| %08x "; } -static char* dummyLiteral5() { return "%2x %3d %6x (%08x %08x)\n"; } -static char* dummyLiteral6() { return "| ---- FreeLast\n"; } -static char* dummyLiteral7() { return "| ---- UsedFirst\n"; } -static char* dummyLiteral8() { return "| ---- UsedLast\n"; } -static char* dummyLiteral9() { return "+---------------End\n"; } diff --git a/src/JSystem/JKernel/JKRFile.cpp b/src/JSystem/JKernel/JKRFile.cpp index e9681a4885..91ac9040a9 100644 --- a/src/JSystem/JKernel/JKRFile.cpp +++ b/src/JSystem/JKernel/JKRFile.cpp @@ -3,12 +3,13 @@ #include "JSystem/JKernel/JKRFile.h" #include "dolphin/vi.h" -s32 JKRFile::read(void* data, s32 size, s32 offset) { +void JKRFile::read(void* data, s32 length, s32 offset) { + JUT_ASSERT(32, ( length & 0x1f ) == 0); while (true) { - s32 result = readData(data, size, offset); - if (size != result) + if (length != readData(data, length, offset)) { VIWaitForRetrace(); - else - return result; + } else { + return; + } } } diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp index 27be140bd8..b6ed72c1c3 100644 --- a/src/JSystem/JKernel/JKRFileCache.cpp +++ b/src/JSystem/JKernel/JKRFileCache.cpp @@ -20,11 +20,9 @@ JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* p return NULL; } - JSUList& volumeList = getVolumeList(); - JSUListIterator iterator; - for (iterator = volumeList.getFirst(); iterator != volumeList.getEnd(); ++iterator) { + for (JSUListIterator iterator = sVolumeList.getFirst(); iterator != sVolumeList.getEnd(); ++iterator) { if (iterator->getVolumeType() == 'CASH') { - JKRFileCache* fileCache = (JKRFileCache*)iterator.getObject(); + JKRFileCache* fileCache = (JKRFileCache*)iterator.operator->(); if (fileCache->mRootPath) { if (strcmp(fileCache->mRootPath, path) == 0) { fileCache->mMountCount++; @@ -34,7 +32,9 @@ JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* p } } - return new (heap, 0) JKRFileCache(path, param_3); + + JKRFileCache* fileCache = new (heap, 0) JKRFileCache(path, param_3); + return fileCache; } JKRFileCache::JKRFileCache(const char* path, const char* volume) { @@ -54,30 +54,27 @@ JKRFileCache::JKRFileCache(const char* path, const char* volume) { strcat(mCurrentPath, "/"); const char* volumePath = volume; - if (!volume) { - volumePath = strrchr(mRootPath, '/'); - volumePath++; + if (!volumePath) { + volumePath = strrchr(mRootPath, '/') + 1; } - u32 volumeLength = strlen(volumePath) + 1; - mVolumePath = (char*)JKRAllocFromSysHeap(volumeLength, 0); + mVolumePath = (char*)JKRAllocFromSysHeap(strlen(volumePath) + 1, 0); strcpy(mVolumePath, volumePath); convStrLower(mVolumePath); mVolumeName = mVolumePath; } else { const char* volumePath = volume; - if (!volume) { + if (!volumePath) { volumePath = "dvd"; } - u32 volumeLength = strlen(volumePath) + 1; - mVolumePath = (char*)JKRAllocFromSysHeap(volumeLength, 0); + mVolumePath = (char*)JKRAllocFromSysHeap(strlen(volumePath) + 1, 0); strcpy(mVolumePath, volumePath); convStrLower(mVolumePath); mVolumeName = mVolumePath; } - getVolumeList().prepend(&mFileLoaderLink); + sVolumeList.prepend(&mFileLoaderLink); mIsMounted = true; } @@ -90,7 +87,7 @@ JKRFileCache::~JKRFileCache() { if (mVolumePath) JKRFreeToSysHeap(mVolumePath); - getVolumeList().remove(&mFileLoaderLink); + sVolumeList.remove(&mFileLoaderLink); } bool JKRFileCache::becomeCurrent(const char* path) { @@ -99,13 +96,13 @@ bool JKRFileCache::becomeCurrent(const char* path) { bool result = DVDChangeDir(dvdPathName); if (result) { sCurrentVolume = this; - JKRHeap::sSystemHeap->free(mCurrentPath); + JKRFreeToSysHeap(mCurrentPath); mCurrentPath = dvdPathName; if (mCurrentPath[1] != '\0') { strcat(mCurrentPath, "/"); } } else { - JKRHeap::sSystemHeap->free(dvdPathName); + JKRFreeToSysHeap(dvdPathName); } return result; @@ -121,13 +118,12 @@ void* JKRFileCache::getResource(const char* path) { if (dvdFile.isAvailable()) { CCacheBlock* cacheBlock = findCacheBlock(dvdFile.getFileID()); if (!cacheBlock) { - u32 fileSize = dvdFile.getFileInfo()->length; - u32 alignedSize = ALIGN_NEXT(fileSize, 0x20); + u32 alignedSize = ALIGN_NEXT(dvdFile.getFileInfo()->length, 0x20); buffer = JKRAllocFromHeap(mParentHeap, alignedSize, 0x20); if (buffer) { dvdFile.read(buffer, alignedSize, 0); - cacheBlock = new (JKRHeap::getSystemHeap(), 0) + cacheBlock = new (JKRGetSystemHeap(), 0) CCacheBlock(dvdFile.getFileID(), dvdFile.getFileInfo()->length, buffer); mCacheBlockList.append(&cacheBlock->mCacheBlockLink); } @@ -145,19 +141,17 @@ void* JKRFileCache::getResource(u32, const char* path) { JUT_ASSERT(303, isMounted()); char finalPath[256]; - u32 rootLength = strlen(mRootPath); - char* filePath = finalPath + rootLength; + char* filePath = finalPath + strlen(mRootPath); strcpy(finalPath, mRootPath); - bool found = findFile(finalPath, path); - if (!found) - return NULL; - - return getResource(filePath); + if (findFile(finalPath, path)) { + return getResource(filePath); + } + return NULL; } u32 JKRFileCache::readResource(void* dst, u32 dstLength, const char* path) { - JUT_ASSERT(412, isMounted()); + JUT_ASSERT(344, isMounted()); char* name = getDvdPathName(path); JKRDvdFile dvdFile(name); @@ -170,8 +164,7 @@ u32 JKRFileCache::readResource(void* dst, u32 dstLength, const char* path) { if (!dvdFile.isAvailable()) { break; } - u32 fileSize = dvdFile.getFileInfo()->length; - resourceSize = ALIGN_NEXT(fileSize, 0x20); + resourceSize = ALIGN_NEXT(dvdFile.getFileInfo()->length, 0x20); dstLength = ALIGN_PREV(dstLength, 0x20); if (resourceSize > dstLength) { resourceSize = dstLength; @@ -190,30 +183,26 @@ u32 JKRFileCache::readResource(void* dst, u32 dstLength, const char* path) { } u32 JKRFileCache::readResource(void* dst, u32 dstLength, u32, const char* path) { - JUT_ASSERT(344, isMounted()); + JUT_ASSERT(412, isMounted()); char finalPath[256]; - u32 rootLength = strlen(mRootPath); - char* filePath = finalPath + rootLength; + char* filePath = finalPath + strlen(mRootPath); strcpy(finalPath, mRootPath); - bool found = findFile(finalPath, path); - if (!found) - return NULL; - - return readResource(dst, dstLength, filePath); + if (findFile(finalPath, path)) { + return readResource(dst, dstLength, filePath); + } + return NULL; } void JKRFileCache::removeResourceAll(void) { - JUT_ASSERT(412, isMounted()); + JUT_ASSERT(441, isMounted()); - JSUListIterator iterator; - iterator = mCacheBlockList.getFirst(); + JSUListIterator iterator = mCacheBlockList.getFirst(); while (iterator != mCacheBlockList.getEnd()) { JKRFreeToHeap(mParentHeap, iterator->mMemoryPtr); mCacheBlockList.remove(&iterator.getObject()->mCacheBlockLink); - CCacheBlock* cacheBlock = (iterator++).getObject(); - delete cacheBlock; + delete (iterator++).getObject(); } } @@ -224,9 +213,7 @@ bool JKRFileCache::removeResource(void* resource) { if (!cacheBlock) return false; - u32 referenceCount = cacheBlock->mReferenceCount - 1; - cacheBlock->mReferenceCount = referenceCount; - if (referenceCount == 0) { + if (--cacheBlock->mReferenceCount == 0) { JKRFreeToHeap(mParentHeap, resource); mCacheBlockList.remove(&cacheBlock->mCacheBlockLink); delete cacheBlock; @@ -257,14 +244,12 @@ u32 JKRFileCache::getResSize(const void* resource) const { } u32 JKRFileCache::countFile(const char* path) const { - DVDDir dir; - DVDDirEntry dirEntry; - u32 count = 0; char* name = getDvdPathName(path); - BOOL result = DVDOpenDir(name, &dir); - if (result != 0) { - while (result = DVDReadDir(&dir, &dirEntry), result != FALSE) { + DVDDir dir; + if (DVDOpenDir(name, &dir) != 0) { + DVDDirEntry dirEntry; + while (DVDReadDir(&dir, &dirEntry)) { count = count + 1; } @@ -277,8 +262,7 @@ u32 JKRFileCache::countFile(const char* path) const { JKRFileFinder* JKRFileCache::getFirstFile(const char* path) const { char* name = getDvdPathName(path); - JKRHeap* systemHeap = JKRHeap::getSystemHeap(); - JKRDvdFinder* finder = new (systemHeap, 0) JKRDvdFinder(name); + JKRDvdFinder* finder = new (JKRGetSystemHeap(), 0) JKRDvdFinder(name); JKRFreeToSysHeap(name); if (finder->isAvailable() != true) { @@ -290,8 +274,7 @@ JKRFileFinder* JKRFileCache::getFirstFile(const char* path) const { } JKRFileCache::CCacheBlock* JKRFileCache::findCacheBlock(const void* resource) const { - JSUListIterator iterator; - for (iterator = mCacheBlockList.getFirst(); iterator != mCacheBlockList.getEnd(); ++iterator) { + for (JSUListIterator iterator = mCacheBlockList.getFirst(); iterator != mCacheBlockList.getEnd(); ++iterator) { if (iterator->mMemoryPtr == resource) { return iterator.getObject(); } @@ -301,8 +284,7 @@ JKRFileCache::CCacheBlock* JKRFileCache::findCacheBlock(const void* resource) co } JKRFileCache::CCacheBlock* JKRFileCache::findCacheBlock(u32 fileID) const { - JSUListIterator iterator; - for (iterator = mCacheBlockList.getFirst(); iterator != mCacheBlockList.getEnd(); ++iterator) { + for (JSUListIterator iterator = mCacheBlockList.getFirst(); iterator != mCacheBlockList.getEnd(); ++iterator) { if (iterator->mFileId == fileID) { return iterator.getObject(); } @@ -312,21 +294,19 @@ JKRFileCache::CCacheBlock* JKRFileCache::findCacheBlock(u32 fileID) const { } bool JKRFileCache::findFile(char* path, const char* fileName) const { - DVDDir dir; - DVDDirEntry dirEntry; - bool result = false; u32 pathLength = strlen(path); + DVDDir dir; if (DVDOpenDir(path, &dir)) { + DVDDirEntry dirEntry; while (DVDReadDir(&dir, &dirEntry)) { if (dirEntry.isDir) { - char* endOfPath = path + pathLength; - *endOfPath = '/'; + path[pathLength] = '/'; strcpy(path + pathLength + 1, dirEntry.name); result = findFile(path, fileName); if (result) break; - *endOfPath = '\0'; + path[pathLength] = '\0'; } else { result = (strcmp(fileName, dirEntry.name) == 0); if (result) { @@ -346,8 +326,7 @@ bool JKRFileCache::findFile(char* path, const char* fileName) const { char* JKRFileCache::getDvdPathName(const char* path) const { char* newPath; if (path[0] == '/') { - u32 length = strlen(mRootPath) + strlen(path) + 2; - newPath = (char*)JKRAllocFromSysHeap(length, 1); + newPath = (char*)JKRAllocFromSysHeap(strlen(mRootPath) + strlen(path) + 2, 1); strcpy(newPath, mRootPath); if (path[1]) { if (mRootPath[1] == 0) { @@ -357,8 +336,7 @@ char* JKRFileCache::getDvdPathName(const char* path) const { } } } else { - u32 length = strlen(mCurrentPath) + strlen(path) + 2; - newPath = (char*)JKRAllocFromSysHeap(length, 1); + newPath = (char*)JKRAllocFromSysHeap(strlen(mCurrentPath) + strlen(path) + 2, 1); strcpy(newPath, mCurrentPath); strcat(newPath, path); } diff --git a/src/JSystem/JKernel/JKRFileFinder.cpp b/src/JSystem/JKernel/JKRFileFinder.cpp index fd2067aabb..fa338a9dd1 100644 --- a/src/JSystem/JKernel/JKRFileFinder.cpp +++ b/src/JSystem/JKernel/JKRFileFinder.cpp @@ -13,17 +13,16 @@ JKRArcFinder::JKRArcFinder(JKRArchive* archive, s32 startIndex, s32 numEntries) } bool JKRArcFinder::findNextFile(void) { - JKRArchive::SDirEntry entry; - if (mIsAvailable) { mIsAvailable = !(mNextIndex > mEndIndex); if (mIsAvailable) { + JKRArchive::SDirEntry entry; mIsAvailable = mArchive->getDirEntry(&entry, mNextIndex); mEntryName = entry.name; mEntryFileIndex = mNextIndex; mEntryId = entry.id; mEntryTypeFlags = entry.flags; - mIsFileOrDirectory = (mEntryTypeFlags >> 1) & 1; + mIsFileOrDirectory = mEntryTypeFlags & 2; mNextIndex++; } } diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp index 0fd148394e..825fa20e8e 100644 --- a/src/JSystem/JKernel/JKRFileLoader.cpp +++ b/src/JSystem/JKernel/JKRFileLoader.cpp @@ -15,49 +15,40 @@ JKRFileLoader::JKRFileLoader(void) : mFileLoaderLink(this), mVolumeName(NULL), mVolumeType(0), mMountCount(0) {} JKRFileLoader::~JKRFileLoader() { - if (getCurrentVolume() == this) { - setCurrentVolume(NULL); + if (sCurrentVolume == this) { + sCurrentVolume = NULL; } } void JKRFileLoader::unmount(void) { - s32 count = mMountCount; if (mMountCount != 0) { - count--; - mMountCount = count; - if (count == 0) { + if (--mMountCount == 0) { delete this; } } } void* JKRFileLoader::getGlbResource(const char* name) { - const char* name_reference[1]; - name_reference[0] = name; - - JKRFileLoader* fileLoader = findVolume(name_reference); + JKRFileLoader* fileLoader = findVolume(&name); void* resource; if (fileLoader == NULL) { - resource = NULL; + return NULL; } else { - resource = fileLoader->getResource(name_reference[0]); + resource = fileLoader->getResource(name); + return resource; } - - return resource; } void* JKRFileLoader::getGlbResource(const char* name, JKRFileLoader* fileLoader) { void* resource = NULL; if (fileLoader) { - return fileLoader->getResource(0, name); - } - - JSUList& volumeList = getVolumeList(); - JSUListIterator iterator; - for (iterator = volumeList.getFirst(); iterator != volumeList.getEnd(); ++iterator) { - resource = iterator->getResource(0, name); - if (resource) - break; + resource = fileLoader->getResource(0, name); + } else { + for (JSUListIterator iterator = sVolumeList.getFirst(); iterator != sVolumeList.getEnd(); ++iterator) { + resource = iterator->getResource(0, name); + if (resource) + break; + } } return resource; } @@ -67,9 +58,7 @@ bool JKRFileLoader::removeResource(void* resource, JKRFileLoader* fileLoader) { return fileLoader->removeResource(resource); } - JSUList& volumeList = getVolumeList(); - JSUListIterator iterator; - for (iterator = volumeList.getFirst(); iterator != volumeList.getEnd(); ++iterator) { + for (JSUListIterator iterator = sVolumeList.getFirst(); iterator != sVolumeList.getEnd(); ++iterator) { if (iterator->removeResource(resource)) { return true; } @@ -83,9 +72,7 @@ bool JKRFileLoader::detachResource(void* resource, JKRFileLoader* fileLoader) { return fileLoader->detachResource(resource); } - JSUList& volumeList = getVolumeList(); - JSUListIterator iterator; - for (iterator = volumeList.getFirst(); iterator != volumeList.getEnd(); ++iterator) { + for (JSUListIterator iterator = sVolumeList.getFirst(); iterator != sVolumeList.getEnd(); ++iterator) { if (iterator->detachResource(resource)) { return true; } @@ -96,15 +83,13 @@ bool JKRFileLoader::detachResource(void* resource, JKRFileLoader* fileLoader) { JKRFileLoader* JKRFileLoader::findVolume(const char** volumeName) { if (*volumeName[0] != '/') { - return getCurrentVolume(); + return sCurrentVolume; } char volumeNameBuffer[0x101]; *volumeName = fetchVolumeName(volumeNameBuffer, ARRAY_SIZEU(volumeNameBuffer), *volumeName); - JSUList& volumeList = getVolumeList(); - JSUListIterator iterator; - for (iterator = volumeList.getFirst(); iterator != volumeList.getEnd(); ++iterator) { + for (JSUListIterator iterator = sVolumeList.getFirst(); iterator != sVolumeList.getEnd(); ++iterator) { if (strcmp(volumeNameBuffer, iterator->mVolumeName) == 0) { return iterator.getObject(); } @@ -113,10 +98,9 @@ JKRFileLoader* JKRFileLoader::findVolume(const char** volumeName) { return NULL; } - -static char rootPath[2] = "/"; - const char* JKRFileLoader::fetchVolumeName(char* buffer, s32 bufferSize, const char* path) { + static char rootPath[2] = "/"; + if (strcmp(path, "/") == 0) { strcpy(buffer, rootPath); return rootPath; diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index 82321544a7..dee3b904a3 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -9,17 +9,16 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" #include - -void* ARALT_AramStartAdr = (void*)0x90000000; - -bool data_804508B0 = 1; +#include #if DEBUG -u8 data_804508B1; -u8 data_804508B2; -u8 data_804508B3; +u8 JKRValue_DEBUGFILL_NOTUSE = 0xFD; +u8 JKRValue_DEBUGFILL_NEW = 0xCD; +u8 JKRValue_DEBUGFILL_DELETE = 0xDD; #endif +bool JKRHeap::sDefaultFillFlag = true; + JKRHeap* JKRHeap::sSystemHeap; JKRHeap* JKRHeap::sCurrentHeap; @@ -47,11 +46,11 @@ JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag) } else { parent->mChildTree.appendChild(&mChildTree); - if (getSystemHeap() == getRootHeap()) { + if (sSystemHeap == sRootHeap) { becomeSystemHeap(); } - if (getCurrentHeap() == getRootHeap()) { + if (sCurrentHeap == sRootHeap) { becomeCurrentHeap(); } } @@ -61,7 +60,7 @@ JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag) mErrorHandler = JKRDefaultMemoryErrorRoutine; } - mDebugFill = data_804508B0; + mDebugFill = sDefaultFillFlag; mCheckMemoryFilled = data_80451380; mInitFlag = false; } @@ -89,36 +88,55 @@ void* JKRHeap::mUserRamEnd; u32 JKRHeap::mMemorySize; -bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) { - void* ram_start; - void* ram_end; - void* arenaStart; +JKRHeap::JKRAllocCallback JKRHeap::sAllocCallback; +JKRHeap::JKRFreeCallback JKRHeap::sFreeCallback; + +bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) { void* arenaLo = OSGetArenaLo(); void* arenaHi = OSGetArenaHi(); + OS_REPORT("original arenaLo = %p arenaHi = %p\n", arenaLo, arenaHi); if (arenaLo == arenaHi) return false; - arenaStart = OSInitAlloc(arenaLo, arenaHi, maxHeaps); - ram_start = (void*)ALIGN_NEXT((uintptr_t)arenaStart, 0x20); - ram_end = (void*)ALIGN_PREV((uintptr_t)arenaHi, 0x20); + arenaLo = OSInitAlloc(arenaLo, arenaHi, maxHeaps); + arenaLo = (void*)ALIGN_NEXT((uintptr_t)arenaLo, 0x20); + arenaHi = (void*)ALIGN_PREV((uintptr_t)arenaHi, 0x20); OSBootInfo* codeStart = (OSBootInfo*)OSPhysicalToCached(0); mCodeStart = codeStart; - mCodeEnd = ram_start; + mCodeEnd = arenaLo; - mUserRamStart = ram_start; - mUserRamEnd = ram_end; + mUserRamStart = arenaLo; + mUserRamEnd = arenaHi; mMemorySize = codeStart->memorySize; - OSSetArenaLo(ram_end); - OSSetArenaHi(ram_end); + OSSetArenaLo(arenaHi); + OSSetArenaHi(arenaHi); - *memory = (char*)ram_start; - *size = (uintptr_t)ram_end - (uintptr_t)ram_start; + *memory = (char*)arenaLo; + *size = (uintptr_t)arenaHi - (uintptr_t)arenaLo; return true; } +#if PLATFORM_WII || PLATFORM_SHIELD +bool JKRHeap::initArena2(char** memory, u32* size, int maxHeaps) { + void* arenaLo = OSGetMEM2ArenaLo(); + void* arenaHi = OSGetMEM2ArenaHi(); + OS_REPORT("original arenaLo = %p arenaHi = %p\n", arenaLo, arenaHi); + if (arenaLo == arenaHi) { + return false; + } + arenaLo = (void*)0x91100000; + arenaHi = (void*)ALIGN_PREV(uintptr_t(arenaHi), 32); + OSSetMEM2ArenaLo(arenaHi); + OSSetMEM2ArenaHi(arenaHi); + *memory = (char*)arenaLo; + *size = uintptr_t(arenaHi) - uintptr_t(arenaLo); + return true; +} +#endif + JKRHeap* JKRHeap::becomeSystemHeap() { JKRHeap* prev = sSystemHeap; sSystemHeap = this; @@ -135,6 +153,10 @@ void JKRHeap::destroy() { do_destroy(); } +static void dummy1(JKRHeap* heap) { + JUT_ASSERT(0, heap != 0); +} + void* JKRHeap::alloc(u32 size, int alignment, JKRHeap* heap) { if (heap != NULL) { return heap->alloc(size, alignment); @@ -151,7 +173,13 @@ void* JKRHeap::alloc(u32 size, int alignment) { if (mInitFlag) { JUT_WARN(393, "alloc %x byte in heap %x", size, this); } - return do_alloc(size, alignment); + void* mem = do_alloc(size, alignment); +#if DEBUG + if (sAllocCallback) { + sAllocCallback(size, alignment, this, mem); + } +#endif + return mem; } void JKRHeap::free(void* ptr, JKRHeap* heap) { @@ -168,6 +196,11 @@ void JKRHeap::free(void* ptr) { if (mInitFlag) { JUT_WARN(441, "free %x in heap %x", ptr, this); } +#if DEBUG + if (sFreeCallback) { + sFreeCallback(ptr, this); + } +#endif do_free(ptr); } @@ -193,6 +226,10 @@ void JKRHeap::freeTail() { do_freeTail(); } +static void dummy2() { + OS_REPORT("fillFreeArea in heap %x"); +} + s32 JKRHeap::resize(void* ptr, u32 size, JKRHeap* heap) { if (!heap) { heap = findFromRoot(ptr); @@ -243,6 +280,10 @@ s32 JKRHeap::changeGroupID(u8 groupID) { return do_changeGroupID(groupID); } +u8 JKRHeap::getCurrentGroupId() { + return do_getCurrentGroupId(); +} + u32 JKRHeap::getMaxAllocatableSize(int alignment) { u32 maxFreeBlock = (uintptr_t)getMaxFreeBlock(); u32 ptrOffset = (alignment - 1) & alignment - (maxFreeBlock & 0xf); @@ -257,7 +298,11 @@ JKRHeap* JKRHeap::findFromRoot(void* ptr) { if (sRootHeap->mStart <= ptr && ptr < sRootHeap->mEnd) { return sRootHeap->find(ptr); } - +#if PLATFORM_WII || PLATFORM_SHIELD + if (sRootHeap2->mStart <= ptr && ptr < sRootHeap2->mEnd) { + return sRootHeap2->find(ptr); + } +#endif return sRootHeap->findAllHeap(ptr); } @@ -301,29 +346,24 @@ JKRHeap* JKRHeap::findAllHeap(void* ptr) const { } void JKRHeap::dispose_subroutine(u32 begin, u32 end) { - JSUListIterator last_iterator; - JSUListIterator next_iterator; - JSUListIterator iterator; - - for (iterator = mDisposerList.getFirst(); iterator != mDisposerList.getEnd(); - iterator = next_iterator) - { - JKRDisposer* disposer = iterator.getObject(); + JSUListIterator next_iterator((JSULink*)NULL); + JSUListIterator it = mDisposerList.getFirst(); + while (it != mDisposerList.getEnd()) { + JKRDisposer* disposer = it.getObject(); if ((void*)begin <= disposer && disposer < (void*)end) { - disposer->~JKRDisposer(); + it->~JKRDisposer(); - if (last_iterator == NULL) { - next_iterator = mDisposerList.getFirst(); - } else { - next_iterator = last_iterator; - next_iterator++; + if (next_iterator == JSUListIterator((JSULink*)NULL)) { + it = mDisposerList.getFirst(); + continue; } - } else { - last_iterator = iterator; - next_iterator = iterator; - next_iterator++; + it = next_iterator; + it++; + continue; } + next_iterator = it; + it++; } } @@ -348,18 +388,19 @@ void JKRHeap::copyMemory(void* dst, void* src, u32 size) { u32* dst_32 = (u32*)dst; u32* src_32 = (u32*)src; - while (count > 0) { - *dst_32 = *src_32; - dst_32++; - src_32++; - count--; + while (count-- > 0) { + *dst_32++ = *src_32++; } } void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment) { OS_REPORT("Error: Cannot allocate memory %d(0x%x)byte in %d byte alignment from %08x\n", size, size, alignment, heap); +#if PLATFORM_GCN JUTException::panic(__FILE__, 831, "abort\n"); +#else + JUTException::panic(__FILE__, 912, "abort\n"); +#endif } bool JKRHeap::setErrorFlag(bool errorFlag) { @@ -371,21 +412,43 @@ bool JKRHeap::setErrorFlag(bool errorFlag) { JKRErrorHandler JKRHeap::setErrorHandler(JKRErrorHandler errorHandler) { JKRErrorHandler prev = mErrorHandler; - if (!errorHandler) { - errorHandler = JKRDefaultMemoryErrorRoutine; - } + mErrorHandler = !errorHandler ? JKRDefaultMemoryErrorRoutine : errorHandler; - mErrorHandler = errorHandler; return prev; } +void JKRHeap::fillMemory(u8* dst, u32 size, u8 val) { + uintptr_t ptr = uintptr_t(dst); + memset(dst, val, size); + DCFlushRange((void*)ALIGN_PREV(ptr, 32), ALIGN_NEXT(size, 32)); +} + +bool JKRHeap::checkMemoryFilled(u8* mem, u32 size, u8 val) { + void* ptr = mem; + bool result = true; + for (int i = 0; i < size; i++) { + if (val == mem[i]) { + continue; + } + result = false; + if (fillcheck_dispcount <= 0) { + continue; + } + fillcheck_dispcount--; + JUT_WARN(999, "**** checkMemoryFilled:\n address %08x size %x:\n (%08x = %02x)\n", mem, size, mem + i, mem[i]); + if (data_8074A8D0_debug) { + break; + } + } + return result; +} + bool JKRHeap::isSubHeap(JKRHeap* heap) const { if (!heap) return false; if (mChildTree.getNumChildren() != 0) { - JSUTreeIterator iterator; - for (iterator = mChildTree.getFirstChild(); iterator != mChildTree.getEndChild(); + for (JSUTreeIterator iterator = mChildTree.getFirstChild(); iterator != mChildTree.getEndChild(); ++iterator) { if (iterator.getObject() == heap) { @@ -433,6 +496,9 @@ void operator delete[](void* ptr) { JKRHeap::free(ptr, NULL); } +s32 fillcheck_dispcount = 100; +bool data_8074A8D0_debug = true; + void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const { JUT_ASSERT(1213, p != NULL); JUT_ASSERT(1214, p->getHeap() == this); @@ -449,6 +515,8 @@ void JKRHeap::state_dump(const JKRHeap::TState& p) const { JUT_LOG(1248, "used size : %u", p.getUsedSize()); } +void* ARALT_AramStartAdr = (void*)0x90000000; + void* JKRHeap::getAltAramStartAdr() { return ARALT_AramStartAdr; } s32 JKRHeap::do_changeGroupID(u8 param_0) { diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index 4f75164161..7f2f587774 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -20,7 +20,7 @@ JKRMemArchive::JKRMemArchive(s32 entryNum, JKRArchive::EMountDirection mountDire mVolumeType = 'RARC'; mVolumeName = mStringTable + mNodes->name_offset; - getVolumeList().prepend(&mFileLoaderLink); + sVolumeList.prepend(&mFileLoaderLink); mIsMounted = true; } @@ -34,7 +34,7 @@ JKRMemArchive::JKRMemArchive(void* buffer, u32 bufferSize, JKRMemBreakFlag param mVolumeType = 'RARC'; mVolumeName = mStringTable + mNodes->name_offset; - getVolumeList().prepend(&mFileLoaderLink); + sVolumeList.prepend(&mFileLoaderLink); mIsMounted = true; } @@ -45,11 +45,17 @@ JKRMemArchive::~JKRMemArchive() { JKRFreeToHeap(mHeap, mArcHeader); } - getVolumeList().remove(&mFileLoaderLink); + sVolumeList.remove(&mFileLoaderLink); mIsMounted = false; } } +static void dummy() { + OS_REPORT(__FILE__); + OS_REPORT("isMounted()"); + OS_REPORT("mMountCount == 1"); +} + bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirection) { mArcHeader = NULL; mArcInfoBlock = NULL; @@ -83,7 +89,7 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio mMountMode = UNKNOWN_MOUNT_MODE; } else { - JUT_ASSERT(438, mArcHeader->signature =='RARC'); + JUT_ASSERT(438, mArcHeader->signature == 'RARC'); mArcInfoBlock = (SArcDataInfo *)((u8 *)mArcHeader + mArcHeader->header_length); mNodes = (SDIDirEntry *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset); mFiles = (SDIFileEntry *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset); @@ -105,7 +111,7 @@ bool JKRMemArchive::open(s32 entryNum, JKRArchive::EMountDirection mountDirectio bool JKRMemArchive::open(void* buffer, u32 bufferSize, JKRMemBreakFlag flag) { mArcHeader = (SArcHeader *)buffer; - JUT_ASSERT(491, mArcHeader->signature =='RARC'); + JUT_ASSERT(491, mArcHeader->signature == 'RARC'); mArcInfoBlock = (SArcDataInfo *)((u8 *)mArcHeader + mArcHeader->header_length); mNodes = (SDIDirEntry *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->node_offset); mFiles = (SDIFileEntry *)((u8 *)&mArcInfoBlock->num_nodes + mArcInfoBlock->file_entry_offset); @@ -141,10 +147,10 @@ void* JKRMemArchive::fetchResource(void* buffer, u32 bufferSize, SDIFileEntry* f if (fileEntry->data != NULL) { memcpy(buffer, fileEntry->data, srcLength); } else { - JKRCompression compression = JKRConvertAttrToCompressionType(fileEntry->getAttr()); - void* data = mArchiveData + fileEntry->data_offset; + u8 flags = fileEntry->type_flags_and_name_offset >> 24; + JKRCompression compression = JKRConvertAttrToCompressionType(flags); srcLength = - fetchResource_subroutine((u8*)data, srcLength, (u8*)buffer, bufferSize, compression); + fetchResource_subroutine(mArchiveData + fileEntry->data_offset, srcLength, (u8*)buffer, bufferSize, compression); } if (resourceSize) { @@ -170,6 +176,7 @@ void JKRMemArchive::removeResourceAll(void) { fileEntry->data = NULL; } } + fileEntry++; } bool JKRMemArchive::removeResource(void* resource) { @@ -197,15 +204,12 @@ u32 JKRMemArchive::fetchResource_subroutine(u8* src, u32 srcLength, u8* dst, u32 case COMPRESSION_YAY0: case COMPRESSION_YAZ0: { u32 expendedSize = JKRDecompExpandSize(src); - #if VERSION != VERSION_SHIELD_DEBUG - srcLength = expendedSize; - #endif if (expendedSize > dstLength) { - srcLength = dstLength; + expendedSize = dstLength; } - JKRDecompress(src, dst, srcLength, 0); - return srcLength; + JKRDecompress(src, dst, expendedSize, 0); + return expendedSize; } default: { @@ -221,9 +225,10 @@ u32 JKRMemArchive::getExpandedResSize(const void* resource) const { if (fileEntry == NULL) return -1; - if (fileEntry->isCompressed() == false) { + u8 flags = fileEntry->type_flags_and_name_offset >> 24; + if ((flags & 4) == false) { return getResSize(resource); - } else { - return JKRDecompExpandSize((u8*)resource); } + u32 expandSize = JKRDecompExpandSize((u8*)resource); + return expandSize; } diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp index a2424c9ca8..4f072cb714 100644 --- a/src/JSystem/JKernel/JKRSolidHeap.cpp +++ b/src/JSystem/JKernel/JKRSolidHeap.cpp @@ -1,33 +1,33 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRSolidHeap.h" +#include "JSystem/JGadget/binary.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" #include "global.h" #include +#include JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler) { if (!heap) { - heap = getRootHeap(); + heap = sRootHeap; } + u32 solidHeapSize = ALIGN_NEXT(sizeof(JKRSolidHeap), 0x10); if (size == -1) { size = heap->getMaxAllocatableSize(0x10); } u32 alignedSize = ALIGN_PREV(size, 0x10); - u32 solidHeapSize = ALIGN_NEXT(sizeof(JKRSolidHeap), 0x10); if (alignedSize < solidHeapSize) return NULL; - JKRSolidHeap* solidHeap = (JKRSolidHeap*)JKRAllocFromHeap(heap, alignedSize, 0x10); - void* dataPtr = (u8*)solidHeap + solidHeapSize; - if (!solidHeap) + u8* mem = (u8*)JKRAllocFromHeap(heap, alignedSize, 0x10); + void* dataPtr = mem + solidHeapSize; + if (!mem) return NULL; - solidHeap = - new (solidHeap) JKRSolidHeap(dataPtr, alignedSize - solidHeapSize, heap, useErrorHandler); - return solidHeap; + return new (mem) JKRSolidHeap(dataPtr, alignedSize - solidHeapSize, heap, useErrorHandler); } void JKRSolidHeap::do_destroy(void) { @@ -44,6 +44,11 @@ JKRSolidHeap::JKRSolidHeap(void* start, u32 size, JKRHeap* parent, bool useError mSolidHead = (u8*)mStart; mSolidTail = (u8*)mEnd; field_0x78 = NULL; +#if DEBUG + if (mDebugFill) { + JKRFillMemory(mStart, mSize, JKRValue_DEBUGFILL_NOTUSE); + } +#endif } JKRSolidHeap::~JKRSolidHeap(void) { @@ -51,12 +56,14 @@ JKRSolidHeap::~JKRSolidHeap(void) { } s32 JKRSolidHeap::adjustSize(void) { + int r25 = 0; JKRHeap* parent = getParent(); if (parent) { lock(); u32 thisSize = (uintptr_t)mStart - (uintptr_t)this; u32 newSize = ALIGN_NEXT(mSolidHead - mStart, 0x20); - if (parent->resize(this, thisSize + newSize) != -1) { + s32 r26 = parent->resize(this, thisSize + newSize); + if (r26 != -1) { mFreeSize = 0; mSize = newSize; mEnd = mStart + mSize; @@ -74,12 +81,11 @@ s32 JKRSolidHeap::adjustSize(void) { void* JKRSolidHeap::do_alloc(u32 size, int alignment) { #if DEBUG - // TODO(Julgodis): JUTAssertion::setConfirmMessage - /* if (alignment != 0) { - int u = abs(alignment); - JUT_ASSERT(219, u < 0x80); - JUT_ASSERT(220, JGadget::binary::isPower2(u)); - } */ + if (alignment) { + u32 u = abs(alignment); + JUT_CONFIRM(219, u < 0x80); + JUT_CONFIRM(220, JGadget::binary::isPower2( u )); + } #endif lock(); @@ -92,13 +98,7 @@ void* JKRSolidHeap::do_alloc(u32 size, int alignment) { if (alignment >= 0) { ptr = allocFromHead(size, alignment < 4 ? 4 : alignment); } else { - if (-alignment < 4) { - alignment = 4; - } else { - alignment = -alignment; - } - - ptr = allocFromTail(size, alignment); + ptr = allocFromTail(size, -alignment < 4 ? 4 : -alignment); } unlock(); @@ -109,9 +109,16 @@ void* JKRSolidHeap::allocFromHead(u32 size, int alignment) { size = ALIGN_NEXT(size, 0x4); void* ptr = NULL; u32 alignedStart = (alignment - 1 + (uintptr_t)mSolidHead) & ~(alignment - 1); - u32 offset = alignedStart - (uintptr_t)mSolidHead; - u32 totalSize = size + offset; + u32 totalSize = size + (alignedStart - (uintptr_t)mSolidHead); if (totalSize <= mFreeSize) { +#if DEBUG + if (mCheckMemoryFilled) { + checkMemoryFilled(mSolidHead, totalSize, JKRValue_DEBUGFILL_DELETE); + } + if (mDebugFill) { + JKRFillMemory(mSolidHead, totalSize, JKRValue_DEBUGFILL_NEW); + } +#endif ptr = (void*)alignedStart; mSolidHead += totalSize; mFreeSize -= totalSize; @@ -134,6 +141,14 @@ void* JKRSolidHeap::allocFromTail(u32 size, int alignment) { ptr = (void*)alignedStart; mSolidTail -= totalSize; mFreeSize -= totalSize; +#if DEBUG + if (mCheckMemoryFilled) { + checkMemoryFilled((u8*)alignedStart, totalSize, JKRValue_DEBUGFILL_DELETE); + } + if (mDebugFill) { + JKRFillMemory((u8*)alignedStart, totalSize, JKRValue_DEBUGFILL_NEW); + } +#endif } else { JUTWarningConsole_f("allocFromTail: cannot alloc memory (0x%x byte).\n", totalSize); if (getErrorFlag() == true) { @@ -155,7 +170,11 @@ void JKRSolidHeap::do_freeAll(void) { mSolidHead = (u8*)mStart; mSolidTail = (u8*)mEnd; field_0x78 = NULL; - +#if DEBUG + if (mDebugFill) { + JKRFillMemory(mStart, mSize, JKRValue_DEBUGFILL_DELETE); + } +#endif unlock(); } @@ -165,14 +184,17 @@ void JKRSolidHeap::do_freeTail(void) { if (mSolidTail != mEnd) { dispose(mSolidTail, mEnd); } +#if DEBUG + if (mDebugFill) { + JKRFillMemory(mSolidTail, mEnd - mSolidTail, JKRValue_DEBUGFILL_DELETE); + } +#endif this->mFreeSize = ((uintptr_t)mEnd - (uintptr_t)mSolidTail + mFreeSize); this->mSolidTail = mEnd; - JKRSolidHeap::Unknown* unknown = field_0x78; - while (unknown) { + for (JKRSolidHeap::Unknown* unknown = field_0x78; unknown; unknown = unknown->mNext) { unknown->field_0xc = mEnd; - unknown = unknown->mNext; } unlock(); @@ -180,7 +202,7 @@ void JKRSolidHeap::do_freeTail(void) { void JKRSolidHeap::do_fillFreeArea() { #if DEBUG - // fillMemory(mSolidHead, mEnd - mSolidHead, (uint)DAT_8074a8ba); + JKRFillMemory(mSolidHead, mEnd - mSolidHead, JKRValue_DEBUGFILL_DELETE); #endif } @@ -198,12 +220,10 @@ bool JKRSolidHeap::check(void) { lock(); bool result = true; - u32 calculatedSize = - ((uintptr_t)mSolidHead - (uintptr_t)mStart) + mFreeSize + ((uintptr_t)mEnd - (uintptr_t)mSolidTail); - u32 availableSize = mSize; - if (calculatedSize != availableSize) { + u32 calculatedSize = (mSolidHead - mStart) + mFreeSize + (mEnd - mSolidTail); + if (calculatedSize != mSize) { result = false; - JUTWarningConsole_f("check: bad total memory block size (%08X, %08X)\n", availableSize, + JUTWarningConsole_f("check: bad total memory block size (%08X, %08X)\n", mSize, calculatedSize); } @@ -215,15 +235,10 @@ bool JKRSolidHeap::dump(void) { bool result = check(); lock(); - u32 headSize = ((uintptr_t)mSolidHead - (uintptr_t)mStart); - u32 tailSize = ((uintptr_t)mEnd - (uintptr_t)mSolidTail); - s32 htSize = headSize + tailSize; - JUTReportConsole_f("head %08x: %08x\n", mStart, headSize); - JUTReportConsole_f("tail %08x: %08x\n", mSolidTail, ((uintptr_t)mEnd - (uintptr_t)mSolidTail)); - - u32 totalSize = mSize; - float percentage = (float)htSize / (float)totalSize * 100.0f; - JUTReportConsole_f("%d / %d bytes (%6.2f%%) used\n", htSize, totalSize, percentage); + s32 htSize = (mSolidHead - mStart) + (mEnd - mSolidTail); + JUTReportConsole_f("head %08x: %08x\n", mStart, (mSolidHead - mStart)); + JUTReportConsole_f("tail %08x: %08x\n", mSolidTail, (mEnd - mSolidTail)); + JUTReportConsole_f("%d / %d bytes (%6.2f%%) used\n", htSize, mSize, f32(htSize) / f32(mSize) * 100.0f); unlock(); return result; @@ -232,7 +247,7 @@ void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const { JUT_ASSERT(604, p != NULL); JUT_ASSERT(605, p->getHeap() == this); - getState_(p); + void* r28 = getState_(p); setState_u32ID_(p, id); setState_uUsedSize_(p, getUsedSize((JKRSolidHeap*)this)); u32 r29 = (uintptr_t)mSolidHead; diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index da157b43b1..c17a2dce21 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -13,9 +13,7 @@ JKRThreadSwitch* JKRThreadSwitch::sManager; u32 JKRThreadSwitch::sTotalCount; -u32 JKRThreadSwitch::sTotalStart; - -static u32 data_804513BC; +u64 JKRThreadSwitch::sTotalStart; JKRThreadSwitch_PreCallback JKRThreadSwitch::mUserPreCallback; @@ -24,7 +22,7 @@ JKRThreadSwitch_PostCallback JKRThreadSwitch::mUserPostCallback; JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadListLink(this) { JKRHeap* heap = JKRHeap::findFromRoot(this); if (heap == NULL) { - heap = JKRHeap::getSystemHeap(); + heap = JKRGetSystemHeap(); } setCommon_heapSpecified(heap, stack_size, param_3); @@ -34,7 +32,7 @@ JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadLi JKRThread::JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param_4) : mThreadListLink(this) { if (heap == NULL) { - heap = JKRHeap::getCurrentHeap(); + heap = JKRGetCurrentHeap(); } setCommon_heapSpecified(heap, stack_size, param_4); @@ -47,30 +45,30 @@ JKRThread::JKRThread(OSThread* thread, int message_count) : mThreadListLink(this mStackSize = (uintptr_t)thread->stackEnd - (uintptr_t)thread->stackBase; mStackMemory = thread->stackBase; - setCommon_mesgQueue(JKRHeap::getSystemHeap(), message_count); + setCommon_mesgQueue(JKRGetSystemHeap(), message_count); } JKRThread::~JKRThread() { - getList().remove(&mThreadListLink); + sThreadList.remove(&mThreadListLink); if (mHeap) { - BOOL result = OSIsThreadTerminated(mThreadRecord); - if (result == FALSE) { + if (OSIsThreadTerminated(mThreadRecord) == FALSE) { OSDetachThread(mThreadRecord); OSCancelThread(mThreadRecord); } JKRFreeToHeap(mHeap, mStackMemory); JKRFreeToHeap(mHeap, mThreadRecord); } - JKRFree(mMessages); + JKRFree(mMesgBuffer); } void JKRThread::setCommon_mesgQueue(JKRHeap* heap, int message_count) { mMessageCount = message_count; - mMessages = (OSMessage*)JKRHeap::alloc(mMessageCount * sizeof(OSMessage), 0, heap); + mMesgBuffer = (OSMessage*)JKRAllocFromHeap(heap, mMessageCount * sizeof(OSMessage), 0); + JUT_ASSERT(130, mMesgBuffer); - OSInitMessageQueue(&mMessageQueue, mMessages, mMessageCount); - getList().append(&mThreadListLink); + OSInitMessageQueue(&mMessageQueue, mMesgBuffer, mMessageCount); + sThreadList.append(&mThreadListLink); mCurrentHeap = NULL; mCurrentHeapError = NULL; @@ -80,21 +78,19 @@ void JKRThread::setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param mHeap = heap; mStackSize = stack_size & 0xffffffe0; mStackMemory = JKRAllocFromHeap(mHeap, mStackSize, 0x20); + JUT_ASSERT(164, mStackMemory); mThreadRecord = (OSThread*)JKRAllocFromHeap(mHeap, sizeof(OSThread), 0x20); + JUT_ASSERT(168, mThreadRecord); - void* stackBase = (void*)((intptr_t)mStackMemory + mStackSize); - OSCreateThread(mThreadRecord, start, this, stackBase, mStackSize, param_3, 1); + OSCreateThread(mThreadRecord, start, this, (u8*)mStackMemory + mStackSize, mStackSize, param_3, 1); } -void* JKRThread::start(void* param) { - JKRThread* thread = (JKRThread*)param; - return thread->run(); +void* JKRThread::start(void* thread) { + return ((JKRThread*)thread)->run(); } JKRThread* JKRThread::searchThread(OSThread* thread) { - JSUList& threadList = getList(); - JSUListIterator iterator; - for (iterator = threadList.getFirst(); iterator != threadList.getEnd(); ++iterator) { + for (JSUListIterator iterator = getList().getFirst(); iterator != getList().getEnd(); ++iterator) { if (iterator->getThreadRecord() == thread) { return iterator.getObject(); } @@ -110,7 +106,6 @@ JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) { this->field_0x10 = 1; this->field_0x18 = 0; sTotalCount = 0; - data_804513BC = 0; sTotalStart = 0; this->field_0x20 = 0; this->field_0x24 = 0; @@ -159,24 +154,20 @@ void JKRThreadSwitch::callback(OSThread* current, OSThread* next) { sTotalCount = sTotalCount + 1; JKRHeap* next_heap = NULL; - JSUList& threadList = JKRThread::getList(); - JSUListIterator iterator; - for (iterator = threadList.getFirst(); iterator != threadList.getEnd(); ++iterator) { + for (JSUListIterator iterator = JKRThread::getList().getFirst(); iterator != JKRThread::getList().getEnd(); ++iterator) { JKRThread* thread = iterator.getObject(); if (thread->getThreadRecord() == current) { thread->setCurrentHeap(JKRHeap::getCurrentHeap()); - JKRThread::TLoad* loadInfo = thread->getLoadInfo(); - if (loadInfo->isValid()) { - loadInfo->addCurrentCost(); + if (thread->getLoadInfo()->isValid()) { + thread->getLoadInfo()->addCurrentCost(); } } if (thread->getThreadRecord() == next) { - JKRThread::TLoad* loadInfo = thread->getLoadInfo(); - if (loadInfo->isValid()) { - loadInfo->setCurrentTime(); - loadInfo->incCount(); + if (thread->getLoadInfo()->isValid()) { + thread->getLoadInfo()->setCurrentTime(); + thread->getLoadInfo()->incCount(); } if (sManager->mSetNextHeap) { @@ -186,7 +177,7 @@ void JKRThreadSwitch::callback(OSThread* current, OSThread* next) { } else if (JKRHeap::getRootHeap()->isSubHeap(next_heap)) { continue; #if PLATFORM_WII || PLATFORM_SHIELD - } else if (!JKRHeap::getRootHeap2()->isSubHeap(next_heap)) { + } else if (JKRHeap::getRootHeap2()->isSubHeap(next_heap)) { continue; #endif } else { @@ -223,18 +214,16 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console const char* print_0 = " total: switch:%3d time:%d(%df)\n"; const char* print_1 = " -------------------------------------\n"; - if (!console) { - OS_REPORT(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10); - OS_REPORT(print_1); - } else { + if (console) { console->clear(); console->print_f(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10); console->print(print_1); + } else { + OS_REPORT(print_0, getTotalCount(), (int)this->field_0x18, this->field_0x10); + OS_REPORT(print_1); } - JSUList& threadList = JKRThread::getList(); - JSUListIterator iterator; - for (iterator = threadList.getFirst(); iterator != threadList.getEnd(); ++iterator) { + for (JSUListIterator iterator = JKRThread::getList().getFirst(); iterator != JKRThread::getList().getEnd(); ++iterator) { JKRThread* thread = iterator.getObject(); JKRThread::TLoad* loadInfo = thread->getLoadInfo(); @@ -257,16 +246,18 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console } u32 switch_count = loadInfo->getCount(); - float cost_per_0x18 = loadInfo->getCost() / (float)this->field_0x18; + u32 cost = loadInfo->getCost(); + f32 cost_per_0x18 = loadInfo->getCost() / f32(this->field_0x18); u32 cost_int = (u32)(cost_per_0x18 * 100.0f); u32 cost_float = (u32)(cost_per_0x18 * 1000.0f) % 10; - if (!console) { - OS_REPORT(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count, - cost_int, cost_float); - } else { + if (console) { console->print_f(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count, cost_int, cost_float); + } else { + OS_REPORT(" [%10s] switch:%5d cost:%2d.%d%%\n", thread_print_name, switch_count, + cost_int, cost_float); + } } } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h index ce89344673..6e79bc47f6 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/arith.h @@ -10,10 +10,12 @@ typedef struct { int rem; /* remainder */ } div_t; +int abs(int n); +long int labs(long int n); div_t div(int numerator, int denominator); #ifdef __cplusplus } #endif -#endif /* _MSL_COMMON_ARITH_H */ \ No newline at end of file +#endif /* _MSL_COMMON_ARITH_H */ diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 3ee2226a11..a372d5ad57 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -488,7 +488,7 @@ void dRes_info_c::deleteArchiveRes() { if (mArchive->isFileEntry(fileIndex)) { JKRArchive::SDIFileEntry* fileEntry = mArchive->findIdxResource(fileIndex); u32 nameOffset = fileEntry->getNameOffset(); - char* fileName = mArchive->mStringTable + nameOffset; + const char* fileName = mArchive->mStringTable + nameOffset; size_t resNameLen = strlen(fileName) - 4; JUT_ASSERT(0x46C, resNameLen <= NAME_MAX); From 8561613852821acf114e9c9ad748371386f38efb Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Mon, 5 Jan 2026 02:19:14 -0800 Subject: [PATCH 30/35] m_Do debug (#3017) * m_Do debug * d_particle fix --- config/ShieldD/splits.txt | 8 +- config/ShieldD/symbols.txt | 90 ++++---- include/CaptureScreen.h | 31 +++ include/JSystem/JHostIO/JORReflexible.h | 3 +- include/JSystem/JKernel/JKRExpHeap.h | 2 +- include/JSystem/JKernel/JKRHeap.h | 6 +- include/JSystem/JKernel/JKRSolidHeap.h | 2 +- include/d/d_com_inf_game.h | 7 + include/d/d_drawlist.h | 4 + include/d/d_jcam_editor.h | 38 ++++ include/d/d_jpreviewer.h | 40 ++++ include/d/d_particle.h | 1 - include/f_ap/f_ap_game.h | 11 +- include/m_Do/m_Do_controller_pad.h | 1 + include/m_Do/m_Do_ext.h | 12 +- include/m_Do/m_Do_machine.h | 2 +- include/m_Do/m_Do_main.h | 1 + src/f_op/f_op_actor.cpp | 4 +- src/m_Do/m_Do_controller_pad.cpp | 51 +++-- src/m_Do/m_Do_ext.cpp | 66 +++--- src/m_Do/m_Do_graphic.cpp | 286 ++++++++++++++++++------ src/m_Do/m_Do_machine.cpp | 209 +++++++++++++---- src/m_Do/m_Do_main.cpp | 33 ++- 23 files changed, 663 insertions(+), 245 deletions(-) create mode 100644 include/d/d_jcam_editor.h create mode 100644 include/d/d_jpreviewer.h diff --git a/config/ShieldD/splits.txt b/config/ShieldD/splits.txt index b3ea4ebc8d..5b6aba600e 100644 --- a/config/ShieldD/splits.txt +++ b/config/ShieldD/splits.txt @@ -17,7 +17,7 @@ m_Do/m_Do_main.cpp: .text start:0x80006880 end:0x8000AF00 .ctors start:0x8062F7C4 end:0x8062F7C8 .data start:0x8065FFA0 end:0x80660CF8 - .sdata start:0x8073F140 end:0x8073F264 + .sdata start:0x8073F140 end:0x8073F260 .sbss start:0x8074C260 end:0x8074C298 .sdata2 start:0x8074D740 end:0x8074D768 .bss start:0x80753500 end:0x80753980 @@ -25,8 +25,8 @@ m_Do/m_Do_main.cpp: m_Do/m_Do_printf.cpp: .text start:0x8000AF00 end:0x8000B8A0 .data start:0x80660CF8 end:0x80660DE8 - .sdata start:0x8073F264 end:0x8073F268 - .sbss start:0x8074C298 end:0x8074C2C4 + .sdata start:0x8073F260 end:0x8073F268 + .sbss start:0x8074C298 end:0x8074C2C0 .bss start:0x80753980 end:0x807541A0 m_Do/m_Do_audio.cpp: @@ -35,7 +35,7 @@ m_Do/m_Do_audio.cpp: .rodata start:0x8062FA20 end:0x8062FA30 .data start:0x80660DE8 end:0x80661190 .sdata start:0x8073F268 end:0x8073F2F0 - .sbss start:0x8074C2C4 end:0x8074C310 + .sbss start:0x8074C2C0 end:0x8074C310 .bss start:0x807541A0 end:0x80755570 m_Do/m_Do_controller_pad.cpp: diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index 7bc5653927..a40e70ba33 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -56923,7 +56923,7 @@ __RTTI__16JOREventListener = .sdata:0x8073F1D8; // type:object size:0x8 scope:gl @STRING@__ml__Q37JGadget40TLinkList<24JOREventCallbackListNode,-4>8iteratorCFv@2 = .sdata:0x8073F248; // type:object size:0x5 scope:local data:string hash:0x77A6A5B2 dhash:0xE9E906E0 @STRING@__ml__Q37JGadget40TLinkList<24JOREventCallbackListNode,-4>8iteratorCFv@0 = .sdata:0x8073F250; // type:object size:0x5 scope:local data:string hash:0x77A6A5B0 dhash:0xE9E906E0 @STRING@showAssert__12JUTAssertionFUlPCciPCc = .sdata:0x8073F258; // type:object size:0x3 scope:local data:string hash:0xB5B49325 dhash:0x8A51682D -lbl_8073F260 = .sdata:0x8073F260; // type:object size:0x4 hash:0xDEEFD0FB +print_callerPCLevel = .sdata:0x8073F260; // type:object size:0x1 hash:0xDEEFD0FB @74060 = .sdata:0x8073F264; // type:object size:0x4 scope:local hash:0xA0402070 @114385 = .sdata:0x8073F268; // type:object size:0x5 scope:local data:string hash:0xAC930B0F @114386 = .sdata:0x8073F270; // type:object size:0x7 scope:local data:string hash:0xAC930B0C @@ -56943,7 +56943,7 @@ __RTTI__28JASGlobalInstance<8Z2SeqMgr> = .sdata:0x8073F2D0; // type:object size: __RTTI__7Z2SeMgr = .sdata:0x8073F2E0; // type:object size:0x8 scope:global hash:0x4F5CF78F dhash:0x2CFD2898 __RTTI__27JASGlobalInstance<7Z2SeMgr> = .sdata:0x8073F2E8; // type:object size:0x8 scope:global hash:0x2E788E52 dhash:0xBD7E1260 @132349 = .sdata:0x8073F2F0; // type:object size:0x5 scope:local data:string hash:0xACB8534B -lbl_8073F2F5 = .sdata:0x8073F2F5; // type:object size:0x1 data:byte hash:0xB9EF6A6E dhash:0xAB6702CC +mWide__13mDoGph_gInf_c = .sdata:0x8073F2F5; // type:object size:0x1 data:byte hash:0xB9EF6A6E dhash:0xAB6702CC m_aspect__13mDoGph_gInf_c = .sdata:0x8073F2F8; // type:object size:0x4 scope:global align:4 data:float hash:0x3090CED9 dhash:0x81D7591B m_scale__13mDoGph_gInf_c = .sdata:0x8073F2FC; // type:object size:0x4 scope:global align:4 data:float hash:0xE062C531 dhash:0x713B30F3 m_invScale__13mDoGph_gInf_c = .sdata:0x8073F300; // type:object size:0x4 scope:global align:4 data:float hash:0xB7C31840 dhash:0xEBCB59E2 @@ -57084,8 +57084,8 @@ __RTTI__19JPAParticleCallBack = .sdata:0x8073F690; // type:object size:0x8 scope @115063 = .sdata:0x8073F6D8; // type:object size:0x5 scope:local data:string hash:0xAC938265 @115212 = .sdata:0x8073F6E0; // type:object size:0x2 scope:local data:string hash:0xAC938A01 lbl_8073F6E8 = .sdata:0x8073F6E8; // type:object size:0x1 data:byte hash:0xC4F99235 dhash:0x36EB3D35 -lbl_8073F6E9 = .sdata:0x8073F6E9; // type:object size:0x1 data:byte hash:0xDA67CD23 dhash:0x36F37423 -lbl_8073F6EA = .sdata:0x8073F6EA; // type:object size:0x1 data:byte hash:0x3EAABB7D dhash:0x36F3743D +mCaptureScreenDivH__11fapGm_HIO_c = .sdata:0x8073F6E9; // type:object size:0x1 data:byte hash:0xDA67CD23 dhash:0x36F37423 +mCaptureScreenDivV__11fapGm_HIO_c = .sdata:0x8073F6EA; // type:object size:0x1 data:byte hash:0x3EAABB7D dhash:0x36F3743D lbl_8073F6EB = .sdata:0x8073F6EB; // type:object size:0x1 data:byte hash:0x2C072CEE dhash:0x37B0404E @114738 = .sdata:0x8073F6EC; // type:object size:0x4 scope:local data:string hash:0xAC931B2D @114739 = .sdata:0x8073F6F0; // type:object size:0x4 scope:local data:string hash:0xAC931B2C @@ -64088,39 +64088,39 @@ __float_nan = .sdata:0x8074C238; // type:object size:0x4 scope:global align:4 da __float_huge = .sdata:0x8074C23C; // type:object size:0x4 scope:global align:4 data:float hash:0x05E96515 __double_huge = .sdata:0x8074C240; // type:object size:0x8 scope:global align:8 data:double hash:0xF83ACA30 lbl_8074C248 = .sdata:0x8074C248; // type:object size:0x1 data:byte hash:0x95F85801 -lbl_8074C260 = .sbss:0x8074C260; // type:object size:0x1 data:byte hash:0xC2BBDF96 -lbl_8074C261 = .sbss:0x8074C261; // type:object size:0x1 data:byte hash:0x8DBD5017 +memorycheck_check_frame = .sbss:0x8074C260; // type:object size:0x1 data:byte hash:0xC2BBDF96 +fillcheck_check_frame = .sbss:0x8074C261; // type:object size:0x1 data:byte hash:0x8DBD5017 sPowerOnTime__7mDoMain = .sbss:0x8074C268; // type:object size:0x8 scope:global data:4byte hash:0x268FA347 dhash:0xF9564990 sHungUpTime__7mDoMain = .sbss:0x8074C270; // type:object size:0x8 scope:global data:4byte hash:0xDF30E828 dhash:0x64C8059F -lbl_8074C278 = .sbss:0x8074C278; // type:object size:0x1 data:byte hash:0xAE961E8B -lbl_8074C279 = .sbss:0x8074C279; // type:object size:0x1 data:byte hash:0x5BC5D1B2 -lbl_8074C27A = .sbss:0x8074C27A; // type:object size:0x1 data:byte hash:0x9EBDA68D -lbl_8074C27B = .sbss:0x8074C27B; // type:object size:0x1 data:byte hash:0xEF85C4EB -lbl_8074C27C = .sbss:0x8074C27C; // type:object size:0x1 data:byte hash:0x85493AEA -lbl_8074C27D = .sbss:0x8074C27D; // type:object size:0x1 data:byte hash:0xC10E9EB2 +mDisplayHeapSize = .sbss:0x8074C278; // type:object size:0x1 data:byte hash:0xAE961E8B +mReportDisable = .sbss:0x8074C279; // type:object size:0x1 data:byte hash:0x5BC5D1B2 +mSelectHeapBar = .sbss:0x8074C27A; // type:object size:0x1 data:byte hash:0x9EBDA68D +mVisibleHeapBar = .sbss:0x8074C27B; // type:object size:0x1 data:byte hash:0xEF85C4EB +mPrintFrameLine = .sbss:0x8074C27C; // type:object size:0x1 data:byte hash:0x85493AEA +mCheckHeap = .sbss:0x8074C27D; // type:object size:0x1 data:byte hash:0xC10E9EB2 mDoMain_HIO = .sbss:0x8074C280; // type:object size:0x8 scope:global hash:0x5C34CFD9 @LOCAL@Debug_console__FUl@console_scroll@1 = .sbss:0x8074C288; // type:object size:0x4 scope:local align:4 data:float hash:0xBF7B851A dhash:0x7086F27F @LOCAL@main01__Fv@frame = .sbss:0x8074C28C; // type:object size:0x4 scope:local data:4byte hash:0xA8D047CF dhash:0x4B63C2BB instance__29JHIComPortManager<9JHICmnMem> = .sbss:0x8074C290; // type:object size:0x4 scope:global data:4byte hash:0x3E85C712 dhash:0x073E21A0 -print_initialized = .sbss:0x8074C298; // type:object size:0x1 data:byte hash:0xAA4B677C -lbl_8074C299 = .sbss:0x8074C299; // type:object size:0x1 data:byte hash:0x732354FB -lbl_8074C29A = .sbss:0x8074C29A; // type:object size:0x1 data:byte hash:0x192C6F69 -lbl_8074C29B = .sbss:0x8074C29B; // type:object size:0x1 data:byte hash:0xD31C3E46 -lbl_8074C29C = .sbss:0x8074C29C; // type:object size:0x1 data:byte hash:0x58778549 +__OSReport_disable = .sbss:0x8074C298; // type:object size:0x1 data:byte hash:0xAA4B677C +__OSReport_Error_disable = .sbss:0x8074C299; // type:object size:0x1 data:byte hash:0x732354FB +__OSReport_Warning_disable = .sbss:0x8074C29A; // type:object size:0x1 data:byte hash:0x192C6F69 +__OSReport_System_disable = .sbss:0x8074C29B; // type:object size:0x1 data:byte hash:0xD31C3E46 +__OSReport_enable = .sbss:0x8074C29C; // type:object size:0x1 data:byte hash:0x58778549 __OSReport_MonopolyThread = .sbss:0x8074C2A0; // type:object size:0x4 scope:global data:4byte hash:0x5152D00F -lbl_8074C2A4 = .sbss:0x8074C2A4; // type:object size:0x1 data:byte hash:0x5220DD69 -lbl_8074C2A5 = .sbss:0x8074C2A5; // type:object size:0x1 data:byte hash:0x506935B7 -lbl_8074C2A6 = .sbss:0x8074C2A6; // type:object size:0x1 hash:0x3BB70A48 -lbl_8074C2A7 = .sbss:0x8074C2A7; // type:object size:0x1 hash:0x583CBD0D +print_mutex_initialized = .sbss:0x8074C2A4; // type:object size:0x1 data:byte hash:0x5220DD69 +print_highPriority = .sbss:0x8074C2A5; // type:object size:0x1 data:byte hash:0x506935B7 +print_threadID = .sbss:0x8074C2A6; // type:object size:0x1 hash:0x3BB70A48 +print_callerPC = .sbss:0x8074C2A7; // type:object size:0x1 hash:0x583CBD0D print_counts = .sbss:0x8074C2A8; // type:object size:0x4 scope:global data:4byte hash:0x0C25061B print_errors = .sbss:0x8074C2AC; // type:object size:0x4 scope:global data:4byte hash:0x123F5FA0 print_warings = .sbss:0x8074C2B0; // type:object size:0x4 scope:global data:4byte hash:0xA05AA6BC print_systems = .sbss:0x8074C2B4; // type:object size:0x4 scope:global data:4byte hash:0x36CB5A9D -lbl_8074C2B8 = .sbss:0x8074C2B8; // type:object size:0x1 data:byte hash:0xBF9D0727 +print_initialized = .sbss:0x8074C2B8; // type:object size:0x1 data:byte hash:0xBF9D0727 lbl_8074C2B9 = .sbss:0x8074C2B9; // type:object size:0x7 data:byte hash:0xB0FDA7F8 -lbl_8074C2C0 = .sbss:0x8074C2C0; // type:object size:0x1 data:byte hash:0x694E5028 dhash:0x0978C44E -lbl_8074C2C1 = .sbss:0x8074C2C1; // type:object size:0x1 data:byte hash:0x842F0E27 dhash:0x44515221 -lbl_8074C2C2 = .sbss:0x8074C2C2; // type:object size:0x1 data:byte hash:0xB5B466D4 dhash:0x04485F72 +mInitFlag__17mDoAud_zelAudio_c = .sbss:0x8074C2C0; // type:object size:0x1 data:byte hash:0x694E5028 dhash:0x0978C44E +mResetFlag__17mDoAud_zelAudio_c = .sbss:0x8074C2C1; // type:object size:0x1 data:byte hash:0x842F0E27 dhash:0x44515221 +mBgmSet__17mDoAud_zelAudio_c = .sbss:0x8074C2C2; // type:object size:0x1 data:byte hash:0xB5B466D4 dhash:0x04485F72 g_mDoAud_audioHeap = .sbss:0x8074C2C4; // type:object size:0x4 scope:global data:4byte hash:0xB286EBBE l_affCommand = .sbss:0x8074C2C8; // type:object size:0x4 scope:global data:4byte hash:0x527CFA30 l_arcCommand = .sbss:0x8074C2CC; // type:object size:0x4 scope:global data:4byte hash:0xD9970F01 @@ -64152,13 +64152,13 @@ mFadeRate__13mDoGph_gInf_c = .sbss:0x8074C330; // type:object size:0x4 scope:glo mFadeSpeed__13mDoGph_gInf_c = .sbss:0x8074C334; // type:object size:0x4 scope:global align:4 data:float hash:0x32A55ED7 dhash:0xB8023455 mBackColor__13mDoGph_gInf_c = .sbss:0x8074C338; // type:object size:0x4 scope:global hash:0xE3382340 dhash:0xFFA7FDE2 mFadeColor__13mDoGph_gInf_c = .sbss:0x8074C33C; // type:object size:0x4 scope:global data:byte hash:0xCF624FAD dhash:0xB920E1EF -lbl_8074C340 = .sbss:0x8074C340; // type:object size:0x1 data:byte hash:0x8060A1F6 dhash:0x97199254 -lbl_8074C341 = .sbss:0x8074C341; // type:object size:0x1 data:byte hash:0xAEFC12D8 dhash:0x970ECC7A -lbl_8074C342 = .sbss:0x8074C342; // type:object size:0x1 data:byte hash:0x17ED86D0 dhash:0x64BC5A72 -lbl_8074C343 = .sbss:0x8074C343; // type:object size:0x1 data:byte hash:0x833AD687 dhash:0x1FCE5685 +mBlureFlag__13mDoGph_gInf_c = .sbss:0x8074C340; // type:object size:0x1 data:byte hash:0x8060A1F6 dhash:0x97199254 +mBlureRate__13mDoGph_gInf_c = .sbss:0x8074C341; // type:object size:0x1 data:byte hash:0xAEFC12D8 dhash:0x970ECC7A +mFade__13mDoGph_gInf_c = .sbss:0x8074C342; // type:object size:0x1 data:byte hash:0x17ED86D0 dhash:0x64BC5A72 +mAutoForcus__13mDoGph_gInf_c = .sbss:0x8074C343; // type:object size:0x1 data:byte hash:0x833AD687 dhash:0x1FCE5685 lbl_8074C344 = .sbss:0x8074C344; // type:object size:0x1 data:byte hash:0x21FC0675 dhash:0x0CE64537 m_blurID__Q213mDoGph_gInf_c5csr_c = .sbss:0x8074C348; // type:object size:0x4 scope:global data:4byte hash:0x847B8725 dhash:0x564F5EB1 -lbl_8074C34C = .sbss:0x8074C34C; // type:object size:0x1 data:byte hash:0xE004A661 dhash:0xBFC539A3 +mWideZoom__13mDoGph_gInf_c = .sbss:0x8074C34C; // type:object size:0x1 data:byte hash:0xE004A661 dhash:0xBFC539A3 m_minX__13mDoGph_gInf_c = .sbss:0x8074C350; // type:object size:0x4 scope:global data:4byte hash:0x148AEC1B dhash:0xFBA4BE99 m_minY__13mDoGph_gInf_c = .sbss:0x8074C354; // type:object size:0x4 scope:global data:4byte hash:0x3CEC7A3A dhash:0xFBA4BE98 m_minXF__13mDoGph_gInf_c = .sbss:0x8074C358; // type:object size:0x4 scope:global align:4 data:float hash:0x56FA6CBD dhash:0x703C91FF @@ -64182,9 +64182,9 @@ archiveHeapErrors = .sbss:0x8074C398; // type:object size:0x4 scope:global data: unknownHeapErrors = .sbss:0x8074C39C; // type:object size:0x4 scope:global data:4byte hash:0x6BEBABBA heapErrors = .sbss:0x8074C3A0; // type:object size:0x4 scope:global data:4byte hash:0xAD85E432 @LOCAL@myGetHeapTypeByString__FP7JKRHeap@tmpString = .sbss:0x8074C3A4; // type:object size:0x5 scope:local data:byte hash:0x34A07792 dhash:0xEB3242A8 -lbl_8074C3A9 = .sbss:0x8074C3A9; // type:object size:0x1 data:byte hash:0x355216F6 dhash:0xC99D7D59 -lbl_8074C3AA = .sbss:0x8074C3AA; // type:object size:0x1 data:byte hash:0xFDF68EEF dhash:0xC99D7D59 -lbl_8074C3AB = .sbss:0x8074C3AB; // type:object size:0x1 data:byte hash:0x15E8B591 dhash:0xC99D7D59 +@LOCAL@developKeyCheck__FUlUl@key_link = .sbss:0x8074C3A9; // type:object size:0x1 data:byte hash:0x355216F6 dhash:0xC99D7D59 +@LOCAL@developKeyCheck__FUlUl@key_ganon@0 = .sbss:0x8074C3AA; // type:object size:0x1 data:byte hash:0xFDF68EEF dhash:0xC99D7D59 +@LOCAL@developKeyCheck__FUlUl@key_zelda@1 = .sbss:0x8074C3AB; // type:object size:0x1 data:byte hash:0x15E8B591 dhash:0xC99D7D59 @LOCAL@exceptionNNGCReadPad__FPUlPUl@l_oldButton@0 = .sbss:0x8074C3AC; // type:object size:0x4 scope:local data:4byte hash:0x50F85B88 dhash:0x8D7B3DDD mDoMtx_stack = .sbss:0x8074C3B0; // type:object size:0x1 scope:global hash:0x2AB168B3 CurrentHeapAdjustVerbose__6mDoExt = .sbss:0x8074C3B8; // type:object size:0x1 data:byte hash:0x60980213 dhash:0x3EBAE505 @@ -64216,10 +64216,10 @@ sFirst__16FixedMemoryCheck = .sbss:0x8074C418; // type:object size:0x4 scope:glo mSystemFar__14mDoLib_clipper = .sbss:0x8074C420; // type:object size:0x4 scope:global align:4 data:float hash:0x5BDDFAD2 dhash:0x3BFD5D57 mFovyRate__14mDoLib_clipper = .sbss:0x8074C424; // type:object size:0x4 scope:global align:4 data:float hash:0x73CD1106 dhash:0x00162BE3 mResetData__6mDoRst = .sbss:0x8074C428; // type:object size:0x4 scope:global data:4byte hash:0x55C17868 dhash:0x9A2A045E -lbl_8074C430 = .sbss:0x8074C430; // type:object size:0x1 data:byte hash:0x19BE1E2E dhash:0xD42015B7 -lbl_8074C431 = .sbss:0x8074C431; // type:object size:0x1 data:byte hash:0xCE8E7825 dhash:0xA822CCBC -lbl_8074C432 = .sbss:0x8074C432; // type:object size:0x1 data:byte hash:0xCBBFFD36 dhash:0x283B9E2F -lbl_8074C433 = .sbss:0x8074C433; // type:object size:0x1 hash:0x5096A6E1 dhash:0x1F2BBC78 +verbose__9mDoDvdThd = .sbss:0x8074C430; // type:object size:0x1 data:byte hash:0x19BE1E2E dhash:0xD42015B7 +DVDLogoMode__9mDoDvdThd = .sbss:0x8074C431; // type:object size:0x1 data:byte hash:0xCE8E7825 dhash:0xA822CCBC +SyncWidthSound__9mDoDvdThd = .sbss:0x8074C432; // type:object size:0x1 data:byte hash:0xCBBFFD36 dhash:0x283B9E2F +Report_DVDRead__9mDoDvdThd = .sbss:0x8074C433; // type:object size:0x1 hash:0x5096A6E1 dhash:0x1F2BBC78 BootInfo__10mDoDvdHack = .sbss:0x8074C434; // type:object size:0x4 scope:global data:4byte hash:0x602B2CCD dhash:0x0350F38C FstStart__10mDoDvdHack = .sbss:0x8074C438; // type:object size:0x4 scope:global data:4byte hash:0xB059FB54 dhash:0x87146F95 FstStringStart__10mDoDvdHack = .sbss:0x8074C43C; // type:object size:0x4 scope:global data:4byte hash:0x56901DA1 dhash:0x76F925E0 @@ -64242,7 +64242,7 @@ lbl_8074C468 = .sbss:0x8074C468; // type:object size:0x1 data:byte hash:0xBABF0D cDyl_Initialized = .sbss:0x8074C46C; // type:object size:0x4 scope:global data:4byte hash:0x4F14A2E4 cDyl_DVD = .sbss:0x8074C470; // type:object size:0x4 scope:global data:4byte hash:0x12A4A3DE lbl_8074C478 = .sbss:0x8074C478; // type:object size:0x1 data:byte hash:0x212A8642 dhash:0x9C6E1C22 -lbl_8074C479 = .sbss:0x8074C479; // type:object size:0x1 data:byte hash:0x911301CA dhash:0x705BB8AA +m_CpuTimerOff__11fapGm_HIO_c = .sbss:0x8074C479; // type:object size:0x1 data:byte hash:0x911301CA dhash:0x705BB8AA lbl_8074C47A = .sbss:0x8074C47A; // type:object size:0x1 data:byte hash:0xDE8007C6 dhash:0x7D1A2EE6 m_CpuTimerTick__11fapGm_HIO_c = .sbss:0x8074C47C; // type:object size:0x4 scope:global data:4byte hash:0x1D284173 dhash:0x706361F3 mCaptureScreen__11fapGm_HIO_c = .sbss:0x8074C480; // type:object size:0x4 scope:global data:4byte hash:0x440BFED0 dhash:0x751F8370 @@ -64252,8 +64252,8 @@ mCaptureScreenWidth__11fapGm_HIO_c = .sbss:0x8074C48A; // type:object size:0x2 s mCaptureScreenHeight__11fapGm_HIO_c = .sbss:0x8074C48C; // type:object size:0x2 scope:global data:2byte hash:0xE990D42F dhash:0xCAB4FC6F mCaptureScreenLinePf__11fapGm_HIO_c = .sbss:0x8074C48E; // type:object size:0x2 scope:global data:2byte hash:0x45377208 dhash:0xD3358B28 mCaptureScreenLineNum__11fapGm_HIO_c = .sbss:0x8074C490; // type:object size:0x2 scope:global data:2byte hash:0xCC174908 dhash:0x39E708E8 -lbl_8074C492 = .sbss:0x8074C492; // type:object size:0x1 data:byte hash:0x56EDE2EE dhash:0x36F65A0E -lbl_8074C493 = .sbss:0x8074C493; // type:object size:0x1 data:byte hash:0xDA2ADA30 dhash:0x36F65A10 +mCaptureScreenNumH__11fapGm_HIO_c = .sbss:0x8074C492; // type:object size:0x1 data:byte hash:0x56EDE2EE dhash:0x36F65A0E +mCaptureScreenNumV__11fapGm_HIO_c = .sbss:0x8074C493; // type:object size:0x1 data:byte hash:0xDA2ADA30 dhash:0x36F65A10 lbl_8074C494 = .sbss:0x8074C494; // type:object size:0x1 data:byte hash:0xA9B59EC0 dhash:0xA12DE4E0 mPriorityMaximum__19print_error_check_c = .sbss:0x8074C498; // type:object size:0x1 data:byte hash:0xE0AE7E09 dhash:0x4F24BEA1 mPrintDisable__19print_error_check_c = .sbss:0x8074C499; // type:object size:0x1 data:byte hash:0xC93122F6 dhash:0x62D5041E @@ -64308,7 +64308,7 @@ lbl_8074C580 = .sbss:0x8074C580; // type:object size:0x1 data:byte hash:0x3F91BE mArcBankName__20dStage_roomControl_c = .sbss:0x8074C584; // type:object size:0x4 scope:global data:4byte hash:0x885DF1A0 dhash:0xD2AA5D02 mArcBankData__20dStage_roomControl_c = .sbss:0x8074C588; // type:object size:0x4 scope:global data:4byte hash:0xF1AABD97 dhash:0xD2A70575 m_roomDzs__20dStage_roomControl_c = .sbss:0x8074C590; // type:object size:0x8 scope:global hash:0x67101B7C dhash:0x0B10A8BE -lbl_8074C598 = .sbss:0x8074C598; // type:object size:0x1 data:byte hash:0x0FE1C5F9 dhash:0x486303FB +mNoArcBank__20dStage_roomControl_c = .sbss:0x8074C598; // type:object size:0x1 data:byte hash:0x0FE1C5F9 dhash:0x486303FB mMySelfPointer__10dMap_HIO_c = .sbss:0x8074C5A0; // type:object size:0x4 scope:global data:4byte hash:0x1A38E60F dhash:0x9D3A05CE m_res_src_p__10dMap_HIO_c = .sbss:0x8074C5A4; // type:object size:0x4 scope:global data:4byte hash:0x3D5090F5 dhash:0xF541D914 m_res__22dMap_HIO_prm_res_dst_s = .sbss:0x8074C5A8; // type:object size:0x4 scope:global data:4byte hash:0xD26B2581 dhash:0x3C11EE61 @@ -64594,13 +64594,13 @@ g_msg_unit = .sbss:0x8074CA28; // type:object size:0x4 scope:global hash:0x2DF27 lbl_8074CA30 = .sbss:0x8074CA30; // type:object size:0x1 data:byte hash:0xDEF1B632 dOvlpFd_execute_f = .sbss:0x8074CA38; // type:object size:0x4 scope:global data:4byte hash:0x3CC65A9F g_LogHIO = .sbss:0x8074CA40; // type:object size:0x8 scope:global hash:0xE945B397 -lbl_8074CA48 = .sbss:0x8074CA48; // type:object size:0x1 data:byte hash:0x9DFC8DF2 dhash:0xE09EDBD3 +mOpeningCut__10dScnLogo_c = .sbss:0x8074CA48; // type:object size:0x1 data:byte hash:0x9DFC8DF2 dhash:0xE09EDBD3 lbl_8074CA49 = .sbss:0x8074CA49; // type:object size:0x1 data:byte hash:0x1236F8BB dhash:0x544758AC g_playerKind = .sbss:0x8074CA50; // type:object size:0x4 scope:global data:4byte hash:0x5D97F186 g_debugHpMode = .sbss:0x8074CA54; // type:object size:0x4 scope:global data:4byte hash:0x6F1EFA77 g_horsePosInit = .sbss:0x8074CA58; // type:object size:0x4 scope:global data:4byte hash:0x4285DC88 cursolStageName__10dScnMenu_c = .sbss:0x8074CA60; // type:object size:0x8 scope:global data:byte hash:0x50155B86 dhash:0x49261767 -lbl_8074CA68 = .sbss:0x8074CA68; // type:object size:0x1 data:byte hash:0x30DDAE9D dhash:0x1C912FBC +m_error_flags__10dScnMenu_c = .sbss:0x8074CA68; // type:object size:0x1 data:byte hash:0x30DDAE9D dhash:0x1C912FBC lbl_8074CA69 = .sbss:0x8074CA69; // type:object size:0x1 data:byte hash:0x63AE7904 dhash:0x6FB32EC5 m_autoCursolID__10dScnMenu_c = .sbss:0x8074CA6C; // type:object size:0x4 scope:global data:4byte hash:0x3A8D7EB5 dhash:0x1EF4BE34 m_autoGroupPoint__10dScnMenu_c = .sbss:0x8074CA70; // type:object size:0x4 scope:global data:4byte hash:0x548FE15F dhash:0xD7C99ADE @@ -64638,7 +64638,7 @@ lbl_8074CAF4 = .sbss:0x8074CAF4; // type:object size:0x1 data:byte hash:0x65D790 mFirst__24DynamicModuleControlBase = .sbss:0x8074CAF8; // type:object size:0x4 scope:global data:4byte hash:0x7A4D7869 dhash:0x286EBE4F mLast__24DynamicModuleControlBase = .sbss:0x8074CAFC; // type:object size:0x4 scope:global data:4byte hash:0x9730AE79 dhash:0xA427AC7F m_heap__24DynamicModuleControlBase = .sbss:0x8074CB00; // type:object size:0x4 scope:global data:4byte hash:0x03390490 dhash:0x27E5FEB6 -lbl_8074CB04 = .sbss:0x8074CB04; // type:object size:0x4 hash:0xA60021A4 dhash:0xCF20E6E2 +verbose__24DynamicModuleControlBase = .sbss:0x8074CB04; // type:object size:0x1 hash:0xA60021A4 dhash:0xCF20E6E2 sAllocBytes__20DynamicModuleControl = .sbss:0x8074CB08; // type:object size:0x4 scope:global data:4byte hash:0x0026CC68 dhash:0x7AE869CA sArchive__20DynamicModuleControl = .sbss:0x8074CB0C; // type:object size:0x4 scope:global data:4byte hash:0x8F5167FE dhash:0x63B1595C sFileCache__20DynamicModuleControl = .sbss:0x8074CB10; // type:object size:0x4 scope:global data:4byte hash:0xAFDE7EB6 dhash:0x9BB1DC14 @@ -64895,7 +64895,7 @@ sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFB8; // type:object size sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFBC; // type:object size:0x4 scope:global data:4byte hash:0xCC5C4708 dhash:0x77A84D68 sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFC0; // type:object size:0x8 scope:global data:4byte hash:0xFCCCB7E2 dhash:0xE2BF2EC2 lbl_8074CFC8 = .sbss:0x8074CFC8; // type:object size:0x1 data:byte hash:0xBD6B48CC dhash:0x498A7ECC -lbl_8074CFC9 = .sbss:0x8074CFC9; // type:object size:0x1 data:byte hash:0x878FC37B dhash:0xB3FB803B +sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFC9; // type:object size:0x1 data:byte hash:0x878FC37B dhash:0xB3FB803B sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFCC; // type:object size:0x4 scope:global data:4byte hash:0xEAB52F22 dhash:0x4A01E002 sErrorManager__12JUTException = .sbss:0x8074CFD0; // type:object size:0x4 scope:global data:4byte hash:0x6DF35642 dhash:0x528F3581 sPreUserCallback__12JUTException = .sbss:0x8074CFD4; // type:object size:0x4 scope:global data:4byte hash:0xADFB8956 dhash:0x5E579095 diff --git a/include/CaptureScreen.h b/include/CaptureScreen.h index 1f843da9aa..8ae80ab064 100644 --- a/include/CaptureScreen.h +++ b/include/CaptureScreen.h @@ -3,6 +3,37 @@ #include "JSystem/JFramework/JFWDisplay.h" +class CProjectionDivider { +public: + /* 0x00 */ f32 field_0x0; + /* 0x04 */ f32 field_0x4; + /* 0x08 */ f32 field_0x8; + /* 0x0C */ f32 field_0xc; + /* 0x10 */ f32 field_0x10; + /* 0x14 */ f32 field_0x14; + /* 0x18 */ s32 field_0x18; + /* 0x1C */ s32 field_0x1c; + + CProjectionDivider(s32, s32); + virtual ~CProjectionDivider() {} + f32 calcDivRatioH(s32) const; + f32 calcDivRatioV(s32) const; +}; + +class CPerspDivider : public CProjectionDivider { +public: + CPerspDivider(const Mtx44&, s32, s32); + virtual ~CPerspDivider() {} + void divide(Mtx44&, s32, s32) const; +}; + +class COrthoDivider : public CProjectionDivider { +public: + COrthoDivider(const Mtx44&, s32, s32); + virtual ~COrthoDivider() {} + void divide(Mtx44&, s32, s32) const; +}; + class CaptureScreen { public: CaptureScreen(const JFWDisplay*); diff --git a/include/JSystem/JHostIO/JORReflexible.h b/include/JSystem/JHostIO/JORReflexible.h index 4789cfd202..a0e0aeaaa3 100644 --- a/include/JSystem/JHostIO/JORReflexible.h +++ b/include/JSystem/JHostIO/JORReflexible.h @@ -39,6 +39,7 @@ struct JORServer; class JOREventListener { public: #if DEBUG + JOREventListener() {} virtual void listenPropertyEvent(const JORPropertyEvent*) = 0; #endif }; @@ -46,7 +47,7 @@ public: class JORReflexible : public JOREventListener { public: #if DEBUG - JORReflexible(); + JORReflexible() {} static JORServer* getJORServer(); virtual void listenPropertyEvent(const JORPropertyEvent*); diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h index 309b81f29a..1535ba757b 100644 --- a/include/JSystem/JKernel/JKRExpHeap.h +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -119,7 +119,7 @@ inline JKRExpHeap* JKRCreateExpHeap(u32 size, JKRHeap* parent, bool errorFlag) { return JKRExpHeap::create(size, parent, errorFlag); } -inline void JKRDestroyExpHeap(JKRHeap* heap) { +inline void JKRDestroyExpHeap(JKRExpHeap* heap) { heap->destroy(); } diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index 650ee57663..ec9ca10497 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -108,10 +108,7 @@ public: } } - JKRHeap* getParent() { - JSUTree* parent = mChildTree.getParent(); - return parent->getObject(); - } + JKRHeap* getParent() { return mChildTree.getParent()->getObject(); } JSUTree& getHeapTree() { return mChildTree; } void appendDisposer(JKRDisposer* disposer) { mDisposerList.append(&disposer->mLink); } @@ -119,7 +116,6 @@ public: void lock() const { OSLockMutex(const_cast(&mMutex)); } void unlock() const { OSUnlockMutex(const_cast(&mMutex)); } u32 getHeapSize() { return mSize; } - u8 getCurrentGroupId() { return 0; } protected: /* 0x00 */ // vtable diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h index 1897fd5aec..a14fd915fe 100644 --- a/include/JSystem/JKernel/JKRSolidHeap.h +++ b/include/JSystem/JKernel/JKRSolidHeap.h @@ -67,7 +67,7 @@ inline JKRSolidHeap* JKRCreateSolidHeap(u32 param_0, JKRHeap* heap, bool param_2 return JKRSolidHeap::create(param_0, heap, param_2); } -inline void JKRDestroySolidHeap(JKRHeap* heap) { +inline void JKRDestroySolidHeap(JKRSolidHeap* heap) { heap->destroy(); } diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h index f30e2bbee5..bf1523042c 100644 --- a/include/d/d_com_inf_game.h +++ b/include/d/d_com_inf_game.h @@ -4198,6 +4198,13 @@ inline void dComIfGd_drawListItem3d() { g_dComIfG_gameInfo.drawlist.drawXluListItem3d(); } +# if VERSION > VERSION_GCN_JPN +inline void dComIfGd_drawListCursor() { + g_dComIfG_gameInfo.drawlist.drawOpaListCursor(); + g_dComIfG_gameInfo.drawlist.drawXluListCursor(); +} +#endif + inline void dComIfGd_reset() { g_dComIfG_gameInfo.drawlist.reset(); } diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h index 38b4861bcb..8b77ee4dd4 100644 --- a/include/d/d_drawlist.h +++ b/include/d/d_drawlist.h @@ -483,6 +483,10 @@ public: void drawOpaList3Dlast() { drawOpaDrawList(mDrawBuffers[DB_LIST_3D_LAST]); } void drawOpaListFilter() { drawOpaDrawList(mDrawBuffers[DB_LIST_FILTER]); } void drawOpaListP0() { drawOpaDrawList(mDrawBuffers[DB_LIST_P0]); } +#if VERSION > VERSION_GCN_JPN + void drawOpaListCursor() { drawOpaDrawList(mDrawBuffers[DB_LIST_CURSOR]); } + void drawXluListCursor() { drawXluDrawList(mDrawBuffers[DB_LIST_CURSOR]); } +#endif void draw2DOpa() { draw(mp2DOpaDrawLists, mp2DOpaStart); } void draw2DOpaTop() { draw(mp2DOpaTopDrawLists, mp2DOpaTopStart); } void draw2DXlu() { draw(mp2DXluDrawLists, mp2DXluStart); } diff --git a/include/d/d_jcam_editor.h b/include/d/d_jcam_editor.h new file mode 100644 index 0000000000..db926274cc --- /dev/null +++ b/include/d/d_jcam_editor.h @@ -0,0 +1,38 @@ +#ifndef D_JCAM_EDITOR_H +#define D_JCAM_EDITOR_H + +#include "dolphin/mtx.h" + +namespace JStage { + class TSystem; +} +namespace JStudioCameraEditor { + class TControl; +} + +class JKRExpHeap; +class JUTGamePad; +class JUTResFont; + +class dJcame_c { +public: + dJcame_c(const JStage::TSystem*, f32, JUTGamePad&); + + void show3D(Mtx); + void show2D(); + + static void create(const JStage::TSystem*, f32, JUTGamePad&); + + static dJcame_c* m_myObj; + + static dJcame_c* get() { return m_myObj; } + + /* 0x00 */ JStage::TSystem* field_0x0; + /* 0x04 */ JUTResFont* field_0x4; + /* 0x08 */ JKRExpHeap* mHeap; + /* 0x0C */ JStudioCameraEditor::TControl* mControl; + /* 0x10 */ int field_0x10; + /* 0x14 */ u8 field_0x14; +}; + +#endif /* D_JCAM_EDITOR_H */ diff --git a/include/d/d_jpreviewer.h b/include/d/d_jpreviewer.h new file mode 100644 index 0000000000..c9cd4cbc35 --- /dev/null +++ b/include/d/d_jpreviewer.h @@ -0,0 +1,40 @@ +#ifndef D_JPREVIEWER_H +#define D_JPREVIEWER_H + +#include "dolphin/mtx.h" + +namespace JStudio { + class TControl; +} + +class J2DOrthoGraph; +class JKRExpHeap; +class JUTGamePad; +class JUTResFont; +class tParse_; + +class dJprevCtrl_c /* : public JStudioPreviewer::TControl */ { +public: + +}; + +class dJprev_c { +public: + dJprev_c(JStudio::TControl*, const JUTGamePad&); + + void show3D(Mtx); + void show2D(); + + static dJprev_c* get() { return m_myObj; } + + static dJprev_c* m_myObj; + + /* 0x00 */ J2DOrthoGraph* mOrthoGraph; + /* 0x04 */ JUTResFont* mFont; + /* 0x08 */ JKRExpHeap* mHeap; + /* 0x0C */ tParse_* m_parse; + /* 0x10 */ dJprevCtrl_c* mControl; + /* 0x14 */ u8 field_0x14; +}; + +#endif /* D_JPREVIEWER_H */ diff --git a/include/d/d_particle.h b/include/d/d_particle.h index a57a6918b7..74e304a531 100644 --- a/include/d/d_particle.h +++ b/include/d/d_particle.h @@ -211,7 +211,6 @@ public: UNUSED(i_emitter); dPa_cleanupGX(); } - virtual void execute(JPABaseEmitter*); virtual void setup(JPABaseEmitter*, cXyz const*, csXyz const*, s8); }; diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h index 618caed84f..836554ba50 100644 --- a/include/f_ap/f_ap_game.h +++ b/include/f_ap/f_ap_game.h @@ -33,7 +33,7 @@ public: JUT_ASSERT(46, mCaptureScreen != NULL); } - static u8 isCaptureScreen() { + static bool isCaptureScreen() { return mCaptureScreenFlag; } @@ -44,6 +44,12 @@ public: static void offCpuTimer() { m_CpuTimerOff = FALSE; } + + static u8 getCaptureScreenNumH() { return mCaptureScreenNumH; } + static u8 getCaptureScreenNumV() { return mCaptureScreenNumV; } + + static u8 getCaptureScreenDivH() { return mCaptureScreenDivH; } + static u8 getCaptureScreenDivV() { return mCaptureScreenDivV; } #endif #if DEBUG @@ -63,6 +69,9 @@ public: static u8 mCaptureScreenNumV; static u8 mParticle254Fix; + + static u8 mCaptureScreenDivH; + static u8 mCaptureScreenDivV; #endif /* 0x04 */ s8 field_0x04; diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h index 8f8f2a2ea9..c4291c1af9 100644 --- a/include/m_Do/m_Do_controller_pad.h +++ b/include/m_Do/m_Do_controller_pad.h @@ -70,6 +70,7 @@ public: static JUTGamePad* m_gamePad[4]; static interface_of_controller_pad m_cpadInfo[4]; + static interface_of_controller_pad m_debugCpadInfo[4]; }; inline void mDoCPd_ANALOG_CONV(u8 analog, f32& param_1) { diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h index 14c3f36e37..e03eb6e1ca 100644 --- a/include/m_Do/m_Do_ext.h +++ b/include/m_Do/m_Do_ext.h @@ -148,7 +148,7 @@ STATIC_ASSERT(sizeof(mDoExt_bpkAnm) == 0x18); class mDoExt_bckAnm : public mDoExt_baseAnm { public: - mDoExt_bckAnm() { mpMtxCalc = NULL; } + mDoExt_bckAnm() { mAnm = NULL; } int init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify); void changeBckOnly(J3DAnmTransform* i_bck); @@ -164,15 +164,15 @@ public: i_modelData->getJointNodePointer(0)->setMtxCalc(NULL); } - J3DAnmTransform* getBckAnm() { return mAnm; } + J3DAnmTransform* getBckAnm() { return mAnmTransform; } void removeJoint(J3DModelData* i_modelData, u16 i_idx) { i_modelData->getJointNodePointer(i_idx)->setMtxCalc(0); } private: - /* 0x14 */ J3DAnmTransform* mAnm; - /* 0x18 */ J3DMtxCalcAnimation, J3DMtxCalcJ3DSysInitMaya>* mpMtxCalc; + /* 0x14 */ J3DAnmTransform* mAnmTransform; + /* 0x18 */ J3DMtxCalcAnimation, J3DMtxCalcJ3DSysInitMaya>* mAnm; }; // Size: 0x1C STATIC_ASSERT(sizeof(mDoExt_bckAnm) == 0x1C); @@ -811,10 +811,8 @@ J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u32 i_differedDlistFlag); extern u32 aram_cache_size; +u32 mDoExt_getAraCacheSize(); void mDoExt_setAraCacheSize(u32 size); -inline u32 mDoExt_getAraCacheSize() { - return aram_cache_size; -} int mDoExt_resIDToIndex(JKRArchive* p_archive, u16 id); void mDoExt_modelEntryDL(J3DModel* i_model); diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h index a9bfa34485..47879f3adb 100644 --- a/include/m_Do/m_Do_machine.h +++ b/include/m_Do/m_Do_machine.h @@ -8,7 +8,7 @@ class JKRHeap; void myHeapCheckRecursive(JKRHeap*); BOOL mDoMch_IsProgressiveMode(); -bool exceptionReadPad(u32*, u32*); +void exceptionReadPad(u32*, u32*); void exceptionRestart(); void myExceptionCallback(u16, OSContext*, u32, u32); void my_SysPrintHeap(char const*, void*, u32); diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h index 99dc3876b8..4685b4aef7 100644 --- a/include/m_Do/m_Do_main.h +++ b/include/m_Do/m_Do_main.h @@ -11,6 +11,7 @@ extern OSThread mainThread; void version_check(); s32 LOAD_COPYDATE(void*); +extern OSThread mainThread; const int HeapCheckTableNum = 8; class HeapCheck { diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index a04944759e..221e14b308 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -75,7 +75,7 @@ void print_error_check_c::start() { mPrintErrors = print_errors; if (mPrintDisable) { - mPrintInit = print_initialized; + mPrintInit = __OSReport_disable; OSReportDisable(); } else { mPrintInit = -1; @@ -106,7 +106,7 @@ void print_error_check_c::check() { } if (mPrintInit != -1) { - print_initialized = mPrintInit; + __OSReport_disable = mPrintInit; } if (mPrintErrors != print_errors) { diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp index 3893d9b965..dfc784a8eb 100644 --- a/src/m_Do/m_Do_controller_pad.cpp +++ b/src/m_Do/m_Do_controller_pad.cpp @@ -4,7 +4,9 @@ */ #include "m_Do/m_Do_controller_pad.h" +#include "JSystem/JAWExtSystem/JAWExtSystem.h" #include "SSystem/SComponent/c_lib.h" +#include "d/d_com_inf_game.h" #include "f_ap/f_ap_game.h" #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_main.h" @@ -12,14 +14,14 @@ JUTGamePad* mDoCPd_c::m_gamePad[4]; interface_of_controller_pad mDoCPd_c::m_cpadInfo[4]; +interface_of_controller_pad mDoCPd_c::m_debugCpadInfo[4]; void mDoCPd_c::create() { #if PLATFORM_GCN || PLATFORM_SHIELD - JUTGamePad* pad = new JUTGamePad(JUTGamePad::EPort1); - m_gamePad[0] = pad; + m_gamePad[0] = new JUTGamePad(JUTGamePad::EPort1); #endif - if (mDoMain::developmentMode != 0) { + if (DEBUG || mDoMain::developmentMode != 0) { #if PLATFORM_WII m_gamePad[0] = new JUTGamePad(JUTGamePad::EPort1); #endif @@ -47,10 +49,8 @@ void mDoCPd_c::create() { interface_of_controller_pad* cpad = &m_cpadInfo[0]; for (int i = 0; i < 4; i++) { - cpad->mTrigLockL = false; - cpad->mHoldLockL = false; - cpad->mTrigLockR = false; - cpad->mHoldLockR = false; + cpad->mHoldLockL = cpad->mTrigLockL = false; + cpad->mHoldLockR = cpad->mTrigLockR = false; cpad++; } } @@ -59,15 +59,27 @@ void mDoCPd_c::read() { JUTGamePad::read(); if (!mDoRst::isReset() && mDoRst::is3ButtonReset()) { - JUTGamePad* pad = JUTGamePad::getGamePad(mDoRst::get3ButtonResetPort()); - - if (!pad->isPushing3ButtonReset()) { + if (!JUTGamePad::getGamePad(mDoRst::get3ButtonResetPort())->isPushing3ButtonReset()) { mDoRst::off3ButtonReset(); } } +#if DEBUG + if (m_gamePad[3]) { + JAWExtSystem::padProc(*m_gamePad[3]); + } +#endif + JUTGamePad** pad = m_gamePad; interface_of_controller_pad* interface = m_cpadInfo; +#if DEBUG + interface_of_controller_pad* interface2 = m_debugCpadInfo; + if (dComIfG_isDebugMode()) { + interface_of_controller_pad* tmp = interface; + interface = interface2; + interface2 = tmp; + } +#endif for (u32 i = 0; i < 4; i++) { if (*pad == NULL) { @@ -76,9 +88,14 @@ void mDoCPd_c::read() { convert(interface, *pad); LRlockCheck(interface); } - +#if DEBUG + cLib_memSet(interface2, 0, sizeof(interface_of_controller_pad)); +#endif pad++; interface++; +#if DEBUG + interface2++; +#endif } } @@ -103,26 +120,26 @@ void mDoCPd_c::convert(interface_of_controller_pad* pInterface, JUTGamePad* pPad } void mDoCPd_c::LRlockCheck(interface_of_controller_pad* interface) { - f32 trig_left = interface->mTriggerLeft; + f32 trigger = interface->mTriggerLeft; interface->mTrigLockL = false; interface->mTrigLockR = false; - if (trig_left > fapGmHIO_getLROnValue()) { + if (trigger > fapGmHIO_getLROnValue()) { if (interface->mHoldLockL != true) { interface->mTrigLockL = true; } interface->mHoldLockL = true; - } else if (trig_left < fapGmHIO_getLROffValue()) { + } else if (trigger < fapGmHIO_getLROffValue()) { interface->mHoldLockL = false; } - f32 trig_right = interface->mTriggerRight; - if (trig_right > fapGmHIO_getLROnValue()) { + trigger = interface->mTriggerRight; + if (trigger > fapGmHIO_getLROnValue()) { if (interface->mHoldLockR != true) { interface->mTrigLockR = true; } interface->mHoldLockR = true; - } else if (trig_right < fapGmHIO_getLROffValue()) { + } else if (trigger < fapGmHIO_getLROffValue()) { interface->mHoldLockR = false; } } diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index ab4a10c357..833a5558a0 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -212,26 +212,25 @@ void dummy3(J3DModel* i_model, void* i_bva, bool i_modify) { int mDoExt_bckAnm::init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify) { JUT_ASSERT(614, (i_modify || isCurrentSolidHeap()) && i_bck != NULL); - - mAnm = i_bck; + mAnmTransform = i_bck; if (!i_modify) { - mpMtxCalc = new J3DMtxCalcAnimation, J3DMtxCalcJ3DSysInitMaya>(mAnm); - if (!mpMtxCalc) { + mAnm = new J3DMtxCalcAnimation, J3DMtxCalcJ3DSysInitMaya>(mAnmTransform); + if (!mAnm) { return 0; } } else { - mpMtxCalc->setAnmTransform(mAnm); + mAnm->setAnmTransform(mAnmTransform); } if (i_play) { - return initPlay(mAnm->getFrameMax(), i_attr < 0 ? mAnm->getAttribute() : i_attr, i_rate, i_startF, i_endF); + return initPlay(mAnmTransform->getFrameMax(), i_attr < 0 ? mAnmTransform->getAttribute() : i_attr, i_rate, i_startF, i_endF); } return 1; } void mDoExt_bckAnm::changeBckOnly(J3DAnmTransform* i_bck) { - mAnm = i_bck; - JUT_ASSERT(646, mAnm != NULL); - mpMtxCalc->setAnmTransform(mAnm); + mAnmTransform = i_bck; + JUT_ASSERT(646, mAnm != 0); + mAnm->setAnmTransform(mAnmTransform); } void dummy4(J3DModel* i_model, void* i_bxa, bool i_modify) { @@ -239,13 +238,13 @@ void dummy4(J3DModel* i_model, void* i_bxa, bool i_modify) { } void mDoExt_bckAnm::entry(J3DModelData* i_modelData, f32 i_frame) { - mAnm->setFrame(i_frame); - i_modelData->getJointNodePointer(0)->setMtxCalc(mpMtxCalc); + mAnmTransform->setFrame(i_frame); + i_modelData->getJointNodePointer(0)->setMtxCalc(mAnm); } void mDoExt_bckAnm::entryJoint(J3DModelData* i_modelData, u16 i_jntNo, f32 i_frame) { - mAnm->setFrame(i_frame); - i_modelData->getJointNodePointer(i_jntNo)->setMtxCalc(mpMtxCalc); + mAnmTransform->setFrame(i_frame); + i_modelData->getJointNodePointer(i_jntNo)->setMtxCalc(mAnm); } int mDoExt_blkAnm::init(J3DDeformData* i_deformData, J3DAnmCluster* i_blk, int i_anmPlay, @@ -288,19 +287,19 @@ void mDoExt_modelTexturePatch(J3DModelData* i_modelData) { } } -static void dummy1() { - ((J3DDrawPacket*)NULL)->beginPatch(); - ((J3DTevBlock*)NULL)->patch(); - ((J3DMaterial*)NULL)->getPEBlock(); - ((J3DMaterial*)NULL)->getTexGenBlock(); - ((J3DMaterial*)NULL)->getColorBlock()->patchLight(); - ((J3DPEBlock*)NULL)->patch(); - ((J3DDrawPacket*)NULL)->endPatch(); +static void dummy1(J3DModel* model, J3DMaterial* material) { + J3DMatPacket* packet = model->getMatPacket(0); + packet->beginPatch(); + material->getTevBlock()->patch(); + material->getColorBlock()->patchLight(); + material->getTexGenBlock(); + material->getPEBlock()->patch(); + packet->endPatch(); } static inline void modelMtxErrorCheck(J3DModel* i_model) { #if DEBUG - if (i_model->getBaseTRMtx()[0][0] == 3.4028235e38f) { + if (i_model->getBaseTRMtx()[0][0] == FLT_MAX) { i_model->getBaseTRMtx()[0][0] = 1.0f; JUT_WARN(883, "%s", "Model Matrix Not Initialize !\n"); } @@ -953,7 +952,7 @@ JKRSolidHeap* mDoExt_createSolidHeapToCurrent(JKRHeap** o_heap, u32 i_size, JKRH JKRSolidHeap* mDoExt_createSolidHeapToCurrent(u32 i_size, JKRHeap* i_parent, u32 i_alignment) { JUT_ASSERT(2427, OSGetCurrentThread() == &mainThread); - JUT_ASSERT(2428, mDoExt_SaveCurrentHeap == 0); + JUT_ASSERT(2428, mDoExt_SaveCurrentHeap == NULL); JKRSolidHeap* heap = mDoExt_createSolidHeapToCurrent(&mDoExt_SaveCurrentHeap, i_size, i_parent, i_alignment); if (mDoExt::CurrentHeapAdjustVerbose) { @@ -1046,22 +1045,13 @@ void mDoExt_destroySolidHeap(JKRSolidHeap* i_heap) { } void mDoExt_destroyExpHeap(JKRExpHeap* i_heap) { - bool var_r30 = true; - bool var_r28; -#if DEBUG - if (i_heap == mDoExt_getCurrentHeap()) { - OS_PANIC(2576, "Failed assertion i_heap != mDoExt_getCurrentHeap()"); - var_r28 = false; - if (!var_r28) { - var_r30 = false; - } - } -#endif + ASSERTLINE(2576, i_heap != mDoExt_getCurrentHeap()); JKRDestroyExpHeap(i_heap); - if (g_printOtherHeapDebug) { - // "mDoExt_destroyExpHeap Exp heap destruction" +#if DEBUG + if (mDoExt::HeapAdjustVerbose) { OS_REPORT("mDoExt_destroyExpHeap Expヒープ破壊 %08x\n", i_heap); } +#endif } JKRHeap* mDoExt_setCurrentHeap(JKRHeap* heap) { @@ -3863,6 +3853,10 @@ void DummyCheckHeap_check() { u32 aram_cache_size; +u32 mDoExt_getAraCacheSize() { + return aram_cache_size; +} + void mDoExt_setAraCacheSize(u32 size) { aram_cache_size = size; } diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index a34af824f4..7aed86fb99 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -7,6 +7,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPrint.h" +#include "JSystem/JAWExtSystem/JAWExtSystem.h" #include "JSystem/JFramework/JFWSystem.h" #include "JSystem/JParticle/JPADrawInfo.h" #include "JSystem/JUtility/JUTConsole.h" @@ -17,6 +18,8 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_menu_collect.h" +#include "d/d_jcam_editor.h" +#include "d/d_jpreviewer.h" #include #include "f_ap/f_ap_game.h" #include "f_op/f_op_camera_mng.h" @@ -384,6 +387,12 @@ mDoGph_gInf_c::bloom_c mDoGph_gInf_c::m_bloom; Mtx mDoGph_gInf_c::mBlureMtx; +#if DEBUG +cXyz mDoGph_gInf_c::csr_c::m_nowEffPos(0.0f, 0.0f, 0.0f); +cXyz mDoGph_gInf_c::csr_c::m_oldEffPos(0.0f, 0.0f, 0.0f); +cXyz mDoGph_gInf_c::csr_c::m_oldOldEffPos(0.0f, 0.0f, 0.0f); +#endif + void mDoGph_gInf_c::onBlure(const Mtx m) { mBlureFlag = true; setBlureMtx(m); @@ -573,81 +582,85 @@ u8 mDoGph_gInf_c::isWide() { } void mDoGph_gInf_c::setWideZoomProjection(Mtx44& m) { - if (isWideZoom()) { - f32 sp20 = m[0][0]; - f32 sp1C = m[0][2]; - f32 sp18 = m[1][1]; - f32 sp14 = m[1][2]; - f32 sp10 = m[2][2]; - f32 spC = m[2][3]; - - f32 temp_f31 = spC / (sp10 - 1.0f); - f32 sp8 = spC / sp10; - - f32 temp_f30 = ((temp_f31 * (1.0f + sp14)) / sp18); - f32 temp_f29 = ((temp_f31 * (sp14 - 1.0f)) / sp18); - f32 temp_f28 = ((temp_f31 * (sp1C - 1.0f)) / sp20); - f32 temp_f27 = ((temp_f31 * (1.0f + sp1C)) / sp20); - - temp_f30 *= getInvScale(); - temp_f29 *= getInvScale(); - temp_f28 *= getInvScale(); - temp_f27 *= getInvScale(); - - m[0][0] = (2.0f * temp_f31) / (temp_f27 - temp_f28); - m[0][1] = 0.0f; - m[0][2] = (temp_f27 + temp_f28) / (temp_f27 - temp_f28); - m[0][3] = 0.0f; - - m[1][0] = 0.0f; - m[1][1] = (2.0f * temp_f31) / (temp_f30 - temp_f29); - m[1][2] = (temp_f30 + temp_f29) / (temp_f30 - temp_f29); - m[1][3] = 0.0f; - - m[2][0] = 0.0f; - m[2][1] = 0.0f; - m[2][2] = -temp_f31 / (sp8 - temp_f31); - m[2][3] = -(sp8 * temp_f31) / (sp8 - temp_f31); - - m[3][0] = 0.0f; - m[3][1] = 0.0f; - m[3][2] = -1.0f; - m[3][3] = 0.0f; + if (!isWideZoom()) { + return; } + + f32 sp20 = m[0][0]; + f32 sp1C = m[0][2]; + f32 sp18 = m[1][1]; + f32 sp14 = m[1][2]; + f32 sp10 = m[2][2]; + f32 spC = m[2][3]; + + f32 temp_f31 = spC / (sp10 - 1.0f); + f32 sp8 = spC / sp10; + + f32 temp_f30 = ((temp_f31 * (1.0f + sp14)) / sp18); + f32 temp_f29 = ((temp_f31 * (sp14 - 1.0f)) / sp18); + f32 temp_f28 = ((temp_f31 * (sp1C - 1.0f)) / sp20); + f32 temp_f27 = ((temp_f31 * (1.0f + sp1C)) / sp20); + + temp_f30 *= getInvScale(); + temp_f29 *= getInvScale(); + temp_f28 *= getInvScale(); + temp_f27 *= getInvScale(); + + m[0][0] = (2.0f * temp_f31) / (temp_f27 - temp_f28); + m[0][1] = 0.0f; + m[0][2] = (temp_f27 + temp_f28) / (temp_f27 - temp_f28); + m[0][3] = 0.0f; + + m[1][0] = 0.0f; + m[1][1] = (2.0f * temp_f31) / (temp_f30 - temp_f29); + m[1][2] = (temp_f30 + temp_f29) / (temp_f30 - temp_f29); + m[1][3] = 0.0f; + + m[2][0] = 0.0f; + m[2][1] = 0.0f; + m[2][2] = -temp_f31 / (sp8 - temp_f31); + m[2][3] = -(sp8 * temp_f31) / (sp8 - temp_f31); + + m[3][0] = 0.0f; + m[3][1] = 0.0f; + m[3][2] = -1.0f; + m[3][3] = 0.0f; } void mDoGph_gInf_c::setWideZoomLightProjection(Mtx& m) { - if (isWideZoom()) { - f32 temp_f27 = m[0][0]; - f32 temp_f26 = m[0][2]; - f32 temp_f25 = m[1][1]; - f32 temp_f24 = m[1][2]; - - f32 temp_f31 = (1.0f + temp_f24) / temp_f25; - f32 temp_f30 = (temp_f24 - 1.0f) / temp_f25; - f32 temp_f29 = (temp_f26 - 1.0f) / temp_f27; - f32 temp_f28 = (1.0f + temp_f26) / temp_f27; - - temp_f31 *= getInvScale(); - temp_f30 *= getInvScale(); - temp_f29 *= getInvScale(); - temp_f28 *= getInvScale(); - - m[0][0] = 2.0f / (temp_f28 - temp_f29); - m[0][1] = 0.0f; - m[0][2] = (temp_f28 + temp_f29) / (temp_f28 - temp_f29); - m[0][3] = 0.0f; - - m[1][0] = 0.0f; - m[1][1] = 2.0f / (temp_f31 - temp_f30); - m[1][2] = (temp_f31 + temp_f30) / (temp_f31 - temp_f30); - m[1][3] = 0.0f; - - m[2][0] = 0.0f; - m[2][1] = 0.0f; - m[2][2] = -1.0f; - m[2][3] = 0.0f; + if (!isWideZoom()) { + return; } + + f32 temp_f27 = m[0][0]; + f32 temp_f26 = m[0][2]; + f32 temp_f25 = m[1][1]; + f32 temp_f24 = m[1][2]; + + f32 temp_f31 = (1.0f + temp_f24) / temp_f25; + f32 temp_f30 = (temp_f24 - 1.0f) / temp_f25; + f32 temp_f29 = (temp_f26 - 1.0f) / temp_f27; + f32 temp_f28 = (1.0f + temp_f26) / temp_f27; + + temp_f31 *= getInvScale(); + temp_f30 *= getInvScale(); + temp_f29 *= getInvScale(); + temp_f28 *= getInvScale(); + + m[0][0] = 2.0f / (temp_f28 - temp_f29); + m[0][1] = 0.0f; + m[0][2] = (temp_f28 + temp_f29) / (temp_f28 - temp_f29); + m[0][3] = 0.0f; + + m[1][0] = 0.0f; + m[1][1] = 2.0f / (temp_f31 - temp_f30); + m[1][2] = (temp_f31 + temp_f30) / (temp_f31 - temp_f30); + m[1][3] = 0.0f; + + m[2][0] = 0.0f; + m[2][1] = 0.0f; + m[2][2] = -1.0f; + m[2][3] = 0.0f; } #endif @@ -1360,8 +1373,54 @@ static void setLight() { GXLoadLightObjImm(&obj, GX_LIGHT0); } +#if DEBUG static void captureScreenSetProjection(Mtx44& m) { - // DEBUG NONMATCHING + if (fapGm_HIO_c::isCaptureScreen()) { + f32 local_88[7]; + + GXGetProjectionv(local_88); + if (int(local_88[0]) == 0) { + m[0][0] = local_88[1]; + m[0][1] = 0.0f; + m[0][2] = local_88[2]; + m[0][3] = 0.0f; + m[1][0] = 0.0f; + m[1][1] = local_88[3]; + m[1][2] = local_88[4]; + m[1][3] = 0.0f; + m[2][0] = 0.0f; + m[2][1] = 0.0f; + m[2][2] = local_88[5]; + m[2][3] = local_88[6]; + m[3][0] = 0.0f; + m[3][1] = 0.0f; + m[3][2] = -1.0f; + m[3][3] = 0.0f; + CPerspDivider divider(m, fapGm_HIO_c::getCaptureScreenDivH(), fapGm_HIO_c::getCaptureScreenDivV()); + divider.divide(m, fapGm_HIO_c::getCaptureScreenNumH(), fapGm_HIO_c::getCaptureScreenNumV()); + GXSetProjection(m, GX_PERSPECTIVE); + } else { + m[0][0] = local_88[1]; + m[0][1] = 0.0f; + m[0][2] = 0.0f; + m[0][3] = local_88[2]; + m[1][0] = 0.0f; + m[1][1] = local_88[3]; + m[1][2] = 0.0f; + m[1][3] = local_88[4]; + m[2][0] = 0.0f; + m[2][1] = 0.0f; + m[2][2] = local_88[5]; + m[2][3] = local_88[6]; + m[3][0] = 0.0f; + m[3][1] = 0.0f; + m[3][2] = 0.0f; + m[3][3] = 1.0f; + COrthoDivider divider(m, fapGm_HIO_c::getCaptureScreenDivH(), fapGm_HIO_c::getCaptureScreenDivV()); + divider.divide(m, fapGm_HIO_c::getCaptureScreenNumH(), fapGm_HIO_c::getCaptureScreenNumV()); + GXSetProjection(m, GX_ORTHOGRAPHIC); + } + } } static void captureScreenSetPort() { @@ -1370,12 +1429,70 @@ static void captureScreenSetPort() { } static void captureScreenSetScissor(scissor_class* scissor) { - // DEBUG NONMATCHING + if (fapGm_HIO_c::isCaptureScreen()) { + scissor->x_orig *= fapGm_HIO_c::getCaptureScreenDivH(); + scissor->y_orig *= fapGm_HIO_c::getCaptureScreenDivV(); + scissor->width *= fapGm_HIO_c::getCaptureScreenDivH(); + scissor->height *= fapGm_HIO_c::getCaptureScreenDivV(); + f32 f29 = fapGm_HIO_c::getCaptureScreenNumH() * 640; + f32 f27 = (fapGm_HIO_c::getCaptureScreenNumH() + 1) * 640; + f32 f28 = fapGm_HIO_c::getCaptureScreenNumV() * 456; + f32 f26 = (fapGm_HIO_c::getCaptureScreenNumV() + 1) * 456; + f32 f31 = scissor->x_orig + scissor->width; + if (f31 < f29) { + f31 = 0.0f; + } else if (f31 > f27) { + f31 = 640.0f; + } else { + f31 -= f29; + } + if (scissor->x_orig < f29) { + scissor->x_orig = 0.0f; + } else if (scissor->x_orig > f27) { + scissor->x_orig = 640.0f; + } else { + scissor->x_orig -= f29; + } + scissor->width = f31 - scissor->x_orig; + f32 f30 = scissor->y_orig + scissor->height; + if (f30 < f28) { + f30 = 0.0f; + } else if (f30 > f26) { + f30 = 456.0f; + } else { + f30 -= f28; + } + if (scissor->y_orig < f28) { + scissor->y_orig = 0.0f; + } else if (scissor->y_orig > f26) { + scissor->y_orig = 456.0f; + } else { + scissor->y_orig -= f28; + } + scissor->height = f30 - scissor->y_orig; + } } -static void captureScreenPerspDrawInfo(JPADrawInfo&) { - // DEBUG NONMATCHING +static void captureScreenPerspDrawInfo(JPADrawInfo& info) { + if (fapGm_HIO_c::isCaptureScreen()) { + Mtx44 m; + info.getPrjMtx(m); + m[0][0] *= 2.0f; + m[0][2] = 0.0f; + m[1][1] *= -2.0f; + m[1][2] = 0.0f; + m[2][3] = -2.0f; + CPerspDivider divider(m, fapGm_HIO_c::getCaptureScreenDivH(), fapGm_HIO_c::getCaptureScreenDivV()); + divider.divide(m, fapGm_HIO_c::getCaptureScreenNumH(), fapGm_HIO_c::getCaptureScreenNumV()); + m[0][0] *= 0.5f; + m[0][2] = m[0][2] * 0.5f - 0.5f; + m[1][1] *= -0.5f; + m[1][2] = m[1][2] * -0.5f - 0.5f; + m[2][3] = 0.0f; + info.setPrjMtx(m); + } } +#endif static void drawItem3D() { Mtx item_mtx; @@ -1610,6 +1727,15 @@ int mDoGph_Painter() { j3dSys.reinitGX(); GXSetClipMode(GX_CLIP_ENABLE); +#if DEBUG + if (dJcame_c::get()) { + dJcame_c::get()->show3D(camera_p->viewMtx); + } + if (dJprev_c::get()) { + dJprev_c::get()->show3D(camera_p->viewMtx); + } +#endif + if (!dComIfGp_isPauseFlag()) { #if DEBUG fapGm_HIO_c::startCpuTimer(); @@ -1941,6 +2067,11 @@ int mDoGph_Painter() { dComIfGp_particle_draw2Dfore(&draw_info3); } +#if DEBUG + j3dSys.setViewMtx(m5); + dComIfGd_drawListCursor(); +#endif + if (strcmp(dComIfGp_getStartStageName(), "F_SP127") == 0 || (mDoGph_gInf_c::isFade() & 0x80) != 0) { mDoGph_gInf_c::calcFade(); @@ -1951,8 +2082,15 @@ int mDoGph_Painter() { } #if DEBUG + if (dJcame_c::get()) { + dJcame_c::get()->show2D(); + } + if (dJprev_c::get()) { + dJprev_c::get()->show2D(); + } // "drawing up to 2D-fore particle (Rendering)" fapGm_HIO_c::stopCpuTimer("２Ｄ前（？）パーティクル描画まで（レンダリング）"); + JAWExtSystem::draw(); #endif mDoGph_gInf_c::endRender(); diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index d58a1766b8..34217648c7 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -28,6 +28,33 @@ #include "m_Do/m_Do_main.h" #include "DynamicLink.h" +#if !PLATFORM_GCN +#include "revolution/sc.h" +#include "revolution/wpad.h" +#endif + +#if PLATFORM_GCN +#define MAP_FILE_PLATFORM "" +#define MAP_FOLDER_PLATFORM "/Final" +#elif PLATFORM_WII +#define MAP_FILE_PLATFORM "R" +#define MAP_FOLDER_PLATFORM "/Rfinal" +#else +#define MAP_FILE_PLATFORM "R" +#define MAP_FOLDER_PLATFORM "/RVL" +#endif + +#if DEBUG +#define MAP_FILE_SUFFIX "D" +#define MAP_FOLDER_MODE "/Debug" +#else +#define MAP_FILE_SUFFIX "F" +#define MAP_FOLDER_MODE "/Release" +#endif + +#define MAP_FOLDER "/map" MAP_FOLDER_PLATFORM MAP_FOLDER_MODE +#define MAP_FILE "/" MAP_FILE_PLATFORM "framework" MAP_FILE_SUFFIX ".map" + #if DEBUG u8 mDoMch::mDebugFill = true; u8 mDoMch::mDebugFillNotUse = 0xDD; @@ -292,13 +319,16 @@ static const char* myGetHeapTypeByString(JKRHeap* p_heap) { case 0: return "(Null)"; default: - u32 tmpType = heapType; - char* typeStr = (char*)&tmpType; + union { + char c[4]; + u32 word; + } typeStr; + typeStr.word = heapType; - tmpString[0] = typeStr[0]; - tmpString[1] = typeStr[1]; - tmpString[2] = typeStr[2]; - tmpString[3] = typeStr[3]; + tmpString[0] = typeStr.c[0]; + tmpString[1] = typeStr.c[1]; + tmpString[2] = typeStr.c[2]; + tmpString[3] = typeStr.c[3]; tmpString[4] = 0; return tmpString; } @@ -319,13 +349,16 @@ static void myMemoryErrorRoutine(void* p_heap, u32 size, int alignment) { size, size, alignment, p_heap); } - u32 heapType = heap->getHeapType(); - u8* tmpString = (u8*)&heapType; + union { + u8 c[4]; + u32 word; + } heapType; + heapType.word = heap->getHeapType(); if (notSolidHeap) { OSReport_Error( "FreeSize=%08x TotalFreeSize=%08x HeapType=%08x(%c%c%c%c) HeapSize=%08x %s\n", - heap->getFreeSize(), heap->getTotalFreeSize(), heapType, tmpString[0], tmpString[1], - tmpString[2], tmpString[3], heap->getHeapSize(), myGetHeapTypeByString(heap)); + heap->getFreeSize(), heap->getTotalFreeSize(), heapType.word, heapType.c[0], heapType.c[1], + heapType.c[2], heapType.c[3], heap->getHeapSize(), myGetHeapTypeByString(heap)); } if (heapErrors == 0) { @@ -350,18 +383,26 @@ static void myMemoryErrorRoutine(void* p_heap, u32 size, int alignment) { void myHeapCheckRecursive(JKRHeap* p_heap) { if (!p_heap->check()) { - const char* type = myGetHeapTypeByString(p_heap); - OSReport_Error("error in %08x(%s)\n", p_heap, type); + OSReport_Error("error in %08x(%s)\n", p_heap, myGetHeapTypeByString(p_heap)); } - JSUTree* heapTree = &p_heap->getHeapTree(); - for (JSUTree* i = heapTree->getFirstChild(); i != NULL; i = i->getNextChild()) { + for (JSUTree* i = p_heap->getHeapTree().getFirstChild(); i != NULL; i = i->getNextChild()) { myHeapCheckRecursive(i->getObject()); } } void mDoMch_HeapCheckAll() { - myHeapCheckRecursive(JKRHeap::sRootHeap); + myHeapCheckRecursive(JKRGetRootHeap()); +#if PLATFORM_WII || PLATFORM_SHIELD + myHeapCheckRecursive(JKRGetRootHeap2()); +#endif +#if DEBUG + DummyCheckHeap_check(); +#endif +} + +void mDoMch_HeapFreeFillAll() { + myHeapCheckRecursive(JKRGetRootHeap()); } static int developKeyCheck(u32 btnTrig, u32 btnHold) { @@ -396,18 +437,73 @@ static int developKeyCheck(u32 btnTrig, u32 btnHold) { } BOOL mDoMch_IsProgressiveMode() { - return OSGetProgressiveMode() == true; +#if PLATFORM_GCN + bool result = OSGetProgressiveMode() == true; +#else + bool result = SCGetProgressiveMode() == true; +#endif + return result; } -bool exceptionReadPad(u32* p_btnTrig, u32* p_btnHold) { - return JUTException::getManager()->readPad(p_btnTrig, p_btnHold); +#if !PLATFORM_GCN +void exceptionNNGCReadPad(u32* p_btnTrig, u32* p_btnHold) { + static u32 l_cnvButton[10][2] = { + WPAD_BUTTON_MINUS, 0x40, + WPAD_BUTTON_PLUS, 0x20, + WPAD_BUTTON_HOME, 0x10, + WPAD_BUTTON_UP, 0x8, + WPAD_BUTTON_DOWN, 0x4, + WPAD_BUTTON_LEFT, 0x1, + WPAD_BUTTON_RIGHT, 0x2, + WPAD_BUTTON_1, 0x100, + WPAD_BUTTON_2, 0x200, + WPAD_BUTTON_A, 0x1000, + }; + static u32 l_oldButton; + + WPADStatus status; + WPADRead(0, &status); + *p_btnHold = 0; + u32* r29 = l_cnvButton[0]; + for (u32 i = 0; i < 10; i++) { + if (status.button & r29[0]) { + *p_btnHold |= r29[1]; + } + r29 += 2; + } + *p_btnTrig = *p_btnHold & (*p_btnHold ^ l_oldButton); + l_oldButton = *p_btnHold; } +#endif + +void exceptionReadPad(u32* p_btnTrig, u32* p_btnHold) { +#if PLATFORM_GCN + JUTException::getManager()->readPad(p_btnTrig, p_btnHold); +#else + exceptionNNGCReadPad(p_btnTrig, p_btnHold); +#endif +} + +void forever() { + while (true) {} +} + +#if !PLATFORM_GCN +void exceptionShutdown() { + mDoRst_reset(2, 0, 0); + //OSShutdownSystem(); + forever(); +} +#endif void exceptionRestart() { mDoRst_reset(0, 0, 0); +#if PLATFORM_GCN OSResetSystem(0, 0, 0); - do { - } while (true); +#else + //OSRestart(0); +#endif + while (true) {} } void myExceptionCallback(u16, OSContext*, u32, u32) { @@ -429,9 +525,10 @@ void myExceptionCallback(u16, OSContext*, u32, u32) { } else { manager->setTraceSuppress(0x80); if (mDoMain::developmentMode == 0) { +#if PLATFORM_GCN JUTGamePad pad(JUTGamePad::EPort1); manager->setGamePad(&pad); - +#endif if (manager != NULL) { OSEnableInterrupts(); // "Accepting Key input\n" @@ -440,16 +537,29 @@ void myExceptionCallback(u16, OSContext*, u32, u32) { exceptionReadPad(&btnTrig, &btnHold); developKeyCheck(btnTrig, btnHold); JUTException::waitTime(30); +#if PLATFORM_GCN if (JUTGamePad::C3ButtonReset::sResetOccurred) { exceptionRestart(); } +#else + if (mDoRst::isShutdown()) { + exceptionShutdown(); + } + if (OSGetResetButtonState()) { + // lbl_8074C385 = 1; + } else { +#if !DEBUG + exceptionRestart(); +#endif + } +#endif } // "JUTAssertion is visible\n" OSReport("JUTAssertionを可視化しました\n"); JUTAssertion::setVisible(true); JUTDbPrint::getManager()->setVisible(true); - JFWSystem::getSystemConsole()->setOutput(JUTConsole::OUTPUT_OSREPORT | - JUTConsole::OUTPUT_CONSOLE); + JUTConsole* console = JFWSystem::getSystemConsole(); + console->setOutput(JUTConsole::OUTPUT_OSREPORT | JUTConsole::OUTPUT_CONSOLE); } else { PPCHalt(); } @@ -459,7 +569,7 @@ void myExceptionCallback(u16, OSContext*, u32, u32) { JUTException::waitTime(3000); } } - DVDChangeDir("/map/Final/Release"); + DVDChangeDir(MAP_FOLDER); JUTDestroyVideoManager(); GXSetDrawDoneCallback(NULL); VISetBlack(0); @@ -476,10 +586,14 @@ static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) { *(u32*)(srr0 - 0x8), *(u32*)(srr0 - 0x4), *(u32*)srr0); } +#if PLATFORM_GCN JUTGamePad pad(JUTGamePad::EPort1); manager->setGamePad(&pad); BOOL padDisabled = manager->isEnablePad() == false; +#else + bool padDisabled = false; +#endif if (!padDisabled) { exConsole->print("PUSH START BUTTON TO ADDITIONAL INFOMATION\n"); exConsole->print("--------------------------------------\n"); @@ -491,10 +605,11 @@ static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) { while (true) { u32 btnHold, btnTrig; exceptionReadPad(&btnTrig, &btnHold); - +#if PLATFORM_GCN if (JUTGamePad::C3ButtonReset::sResetOccurred) { OSResetSystem(1, 0, 0); } +#endif bool waitRetrace = false; if (btnTrig == PAD_BUTTON_START) { @@ -504,13 +619,14 @@ static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) { if (btnTrig == PAD_TRIGGER_Z) { JUTConsole* sysConsole = JFWSystem::getSystemConsole(); - if (JUTConsoleManager::getManager()->getDirectConsole() != sysConsole) { + JUTConsole* directConsole = JUTConsoleManager::getManager()->getDirectConsole(); + if (directConsole != sysConsole) { exConsole = sysConsole; - exConsole->setFontSize(8.0f, 6.0f); - exConsole->setPosition(8, 32); - exConsole->setHeight(23); - exConsole->setVisible(true); - exConsole->setOutput(JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT); + sysConsole->setFontSize(8.0f, 6.0f); + sysConsole->setPosition(8, 32); + sysConsole->setHeight(23); + sysConsole->setVisible(true); + sysConsole->setOutput(JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT); } else { exConsole = JUTException::getConsole(); } @@ -531,13 +647,13 @@ static void fault_callback_scroll(u16, OSContext* p_context, u32, u32) { if (btnHold == PAD_BUTTON_UP) { exConsole->scroll(holdUpCount < 3 ? -1 : (holdUpCount < 5 ? -2 : (holdUpCount < 7 ? -4 : -8))); waitRetrace = true; - holdDownCount = 0; holdUpCount++; + holdDownCount = 0; } else if (btnHold == PAD_BUTTON_DOWN) { exConsole->scroll(holdDownCount < 3 ? 1 : (holdDownCount < 5 ? 2 : (holdDownCount < 7 ? 4 : 8))); waitRetrace = true; - holdUpCount = 0; holdDownCount++; + holdUpCount = 0; } else { holdUpCount = 0; holdDownCount = 0; @@ -597,6 +713,27 @@ void my_SysPrintHeap(char const* message, void* start, u32 size) { end, size / 1024); } +#if DEBUG +u8 myWarningCount[115]; + +void myGXVerifyCallback(GXWarningLevel param_1, u32 param_2, const char* param_3) { + if (param_2 < ARRAY_SIZE(myWarningCount)) { + if (myWarningCount[param_2] >= 255) { + return; + } + if (myWarningCount[param_2] == 0) { + static const char* color[] = {"\x1b[34m", "\x1b[41;37m", "\x1b[43;30m", "\x1b[33m"}; + OSReport("%sGX L%1d, Warning %03d: %s\n\x1b[m", color[param_1], param_1, param_2, param_3); + JUTReportConsole_f("GX L%1d, Warning %03d: %s\n", param_1, param_2, param_3); + } + myWarningCount[param_2]++; + } else { + OSReport_Warning("GX L%1d, Warning %03d: %s\n", param_1, param_2, param_3); + JUTReportConsole_f("GX L%1d, Warning %03d: %s\n", param_1, param_2, param_3); + } +} +#endif + int mDoMch_Create() { if (mDoMain::developmentMode == 0 || !(OSGetConsoleType() & 0x10000000)) { OSReportDisable(); @@ -813,11 +950,7 @@ int mDoMch_Create() { sysConsole->setOutput(JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT); sysConsole->setPosition(16, 42); -#if DEBUG - JUTException::setMapFile("/map/RVL/Debug/RframeworkD.map"); -#else - JUTException::appendMapFile("/map/Final/Release/frameworkF.map"); -#endif + JUTException::setMapFile(MAP_FOLDER MAP_FILE); JUTException::setPreUserCallback(myExceptionCallback); JUTException::setPostUserCallback(fault_callback_scroll); diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 4525bbb97e..5ab5fa334b 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -660,6 +660,22 @@ static void debug() { } } +// linker generated symbols +extern u8 _f_text[]; +extern u8 _e_text[]; +extern u8 _f_ctors[]; +extern u8 _e_ctors[]; +extern u8 _f_dtors[]; +extern u8 _e_dtors[]; +extern u8 _f_rodata[]; +extern u8 _e_rodata[]; + +#if VERSION == VERSION_SHIELD_DEBUG +const int audioHeapSize = 0x169000; +#else +const int audioHeapSize = 0x14D800; +#endif + void main01(void) { OS_REPORT("\x1b[m"); @@ -667,11 +683,10 @@ void main01(void) { mDoMch_Create(); #if DEBUG - // not sure how this works. appears to be getting .text, .ctors, .dtors, and .rodata areas - FixedMemoryCheck::easyCreate((void*)0x80006880, (s32)0x628F40); - FixedMemoryCheck::easyCreate((void*)0x8062F7C0, (s32)0x224); - FixedMemoryCheck::easyCreate((void*)0x8062FA00, (s32)0xc); - FixedMemoryCheck::easyCreate((void*)0x8062FA20, (s32)0x30568); + FixedMemoryCheck* local_20 = FixedMemoryCheck::easyCreate(_f_text, intptr_t(_e_text - _f_text)); + FixedMemoryCheck* local_24 = FixedMemoryCheck::easyCreate(_f_ctors, intptr_t(_e_ctors - _f_ctors)); + FixedMemoryCheck* local_28 = FixedMemoryCheck::easyCreate(_f_dtors, intptr_t(_e_dtors - _f_dtors)); + FixedMemoryCheck* local_2c = FixedMemoryCheck::easyCreate(_f_rodata, intptr_t(_e_rodata - _f_rodata)); #endif // setup FrameBuffer and ZBuffer, init display lists @@ -697,7 +712,8 @@ void main01(void) { mDoExt_setCurrentHeap(sp10); var_r28->dump_sort(); - OSReport("\x1b[36mHOSTIOヒープ残り %u Bytes\n\x1b[m", var_r28->getTotalFreeSize()); + s32 local_34 = var_r28->getTotalFreeSize(); + OSReport("\x1b[36mHOSTIOヒープ残り %u Bytes\n\x1b[m", local_34); #endif JUTConsole* console = JFWSystem::getSystemConsole(); @@ -718,11 +734,6 @@ void main01(void) { mDisplayHeapSize = 0; cDyl_InitAsync(); // init RELs - #if VERSION == VERSION_SHIELD_DEBUG - const int audioHeapSize = 0x169000; - #else - const int audioHeapSize = 0x14D800; - #endif g_mDoAud_audioHeap = JKRCreateSolidHeap(audioHeapSize, JKRGetCurrentHeap(), false); do { From ea53712c30246c9fdc7d2f7ecf143edb275deb59 Mon Sep 17 00:00:00 2001 From: kipcode66 Date: Mon, 5 Jan 2026 06:50:45 -0500 Subject: [PATCH 31/35] Add guards around std library headers (#3013) * Last fix for standard compiler error * adding define guards around headers * rename cmath.h and climits.h to cmath and climits respectively * renaming cstdarg.h to cstdarg * renaming cstdlib.h to cstdlib * renaming cstring.h to cstring * renaming cstdio.h to cstdio * renaming cmath locale ctype * renaming stdarg string and va_list * renaming cstddef * renaming stdio stddef stdlib * renaming algorithm, functional, iterator, memory, and utility * renaming bitset, cstdint, limits, and stdint * renaming new and type_traits * update quote includes for standard library headers to angle bracket includes --- include/JSystem/J2DGraph/J2DPrint.h | 2 +- include/JSystem/J3DGraphBase/J3DMaterial.h | 2 +- include/JSystem/J3DGraphBase/J3DPacket.h | 2 +- include/JSystem/J3DGraphBase/J3DTexture.h | 2 +- include/JSystem/JAudio2/JAISeqDataMgr.h | 2 +- include/JSystem/JAudio2/JASGadget.h | 2 +- include/JSystem/JAudio2/JAUSectionHeap.h | 2 +- include/JSystem/JAudio2/JAUStreamAramMgr.h | 4 ++-- include/JSystem/JGadget/linklist.h | 2 +- include/JSystem/JGadget/search.h | 6 +++--- include/JSystem/JGadget/std-streambuf.h | 2 +- include/JSystem/JGadget/std-vector.h | 6 +++--- include/JSystem/JGeometry.h | 7 ++++++- include/JSystem/JHostIO/JORMContext.h | 2 +- include/JSystem/JKernel/JKRExpHeap.h | 2 +- include/JSystem/JKernel/JKRHeap.h | 2 ++ include/JSystem/JMath/JMATrigonometric.h | 2 +- include/JSystem/JMath/JMath.h | 2 +- include/JSystem/JMessage/processor.h | 2 +- include/JSystem/JParticle/JPAEmitter.h | 2 +- include/JSystem/JStudio/JStudio/functionvalue.h | 2 +- include/JSystem/JStudio/JStudio/jstudio-math.h | 2 +- include/JSystem/JStudio/JStudio/jstudio-object.h | 4 ++-- include/JSystem/JSupport/JSupport.h | 2 +- include/JSystem/JUtility/JUTConsole.h | 2 +- include/JSystem/JUtility/JUTDirectPrint.h | 2 +- include/JSystem/JUtility/JUTException.h | 2 +- include/JSystem/JUtility/JUTFont.h | 2 +- include/JSystem/JUtility/JUTTexture.h | 2 +- include/SSystem/SComponent/c_m3d.h | 2 +- include/SSystem/SComponent/c_math.h | 7 +++++++ include/SSystem/SComponent/c_xyz.h | 2 +- include/d/actor/d_a_obj_dust.h | 2 +- include/d/d_menu_dmap_map.h | 2 +- include/d/d_resorce.h | 2 ++ include/d/d_save.h | 2 +- include/d/dolzel_base.pch | 6 +++--- include/dolphin/os.h | 2 +- include/dolphin/types.h | 2 +- include/f_ap/f_ap_game.h | 2 +- include/global.h | 2 ++ include/m_Do/m_Do_hostIO.h | 2 +- include/revolution/os.h | 2 +- include/revolution/types.h | 2 +- include/revolution/wpad/bte.h | 2 +- src/DynamicLink.cpp | 2 +- src/JSystem/J2DGraph/J2DManage.cpp | 2 +- src/JSystem/J2DGraph/J2DMaterialFactory.cpp | 2 +- src/JSystem/J2DGraph/J2DPrint.cpp | 4 ++-- src/JSystem/J2DGraph/J2DTevs.cpp | 2 +- src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp | 2 +- src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 2 +- src/JSystem/J3DGraphBase/J3DPacket.cpp | 2 +- src/JSystem/J3DGraphBase/J3DShapeDraw.cpp | 4 ++-- src/JSystem/J3DGraphBase/J3DVertex.cpp | 2 +- src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp | 2 +- src/JSystem/J3DU/J3DUClipper.cpp | 2 +- src/JSystem/JAHostIO/JAHioUtil.cpp | 2 +- src/JSystem/JAWExtSystem/JAWExtSystem.cpp | 2 +- src/JSystem/JAudio2/JASAiCtrl.cpp | 2 +- src/JSystem/JAudio2/JASAudioThread.cpp | 2 +- src/JSystem/JAudio2/JASBasicWaveBank.cpp | 2 +- src/JSystem/JAudio2/JASCalc.cpp | 4 ++-- src/JSystem/JAudio2/JASReport.cpp | 2 +- src/JSystem/JAudio2/JASSimpleWaveBank.cpp | 2 +- src/JSystem/JAudio2/JASWaveArcLoader.cpp | 4 ++-- src/JSystem/JFramework/JFWDisplay.cpp | 2 +- src/JSystem/JGadget/binary.cpp | 2 +- src/JSystem/JGadget/define.cpp | 2 +- src/JSystem/JGadget/std-stream.cpp | 2 +- src/JSystem/JGadget/std-streambuf.cpp | 2 +- src/JSystem/JGadget/std-string.cpp | 2 +- src/JSystem/JHostIO/JHIMccBuf.cpp | 2 +- src/JSystem/JHostIO/JORServer.cpp | 2 +- src/JSystem/JKernel/JKRAram.cpp | 2 +- src/JSystem/JKernel/JKRAramArchive.cpp | 4 ++-- src/JSystem/JKernel/JKRAramHeap.cpp | 2 +- src/JSystem/JKernel/JKRAramStream.cpp | 2 +- src/JSystem/JKernel/JKRArchivePri.cpp | 4 ++-- src/JSystem/JKernel/JKRCompArchive.cpp | 6 +++--- src/JSystem/JKernel/JKRDvdAramRipper.cpp | 2 +- src/JSystem/JKernel/JKRDvdArchive.cpp | 6 +++--- src/JSystem/JKernel/JKRDvdFile.cpp | 2 +- src/JSystem/JKernel/JKRDvdRipper.cpp | 4 ++-- src/JSystem/JKernel/JKRExpHeap.cpp | 2 +- src/JSystem/JKernel/JKRFileCache.cpp | 4 ++-- src/JSystem/JKernel/JKRFileLoader.cpp | 4 ++-- src/JSystem/JKernel/JKRHeap.cpp | 4 ++-- src/JSystem/JKernel/JKRMemArchive.cpp | 4 ++-- src/JSystem/JKernel/JKRSolidHeap.cpp | 4 ++-- src/JSystem/JKernel/JKRThread.cpp | 4 ++-- src/JSystem/JMath/JMATrigonometric.cpp | 2 +- src/JSystem/JMessage/processor.cpp | 2 +- src/JSystem/JMessage/resource.cpp | 4 ++-- src/JSystem/JParticle/JPAResourceManager.cpp | 2 +- src/JSystem/JStage/JSGCamera.cpp | 2 +- src/JSystem/JStage/JSGFog.cpp | 2 +- src/JSystem/JStudio/JStudio/ctb.cpp | 6 +++--- src/JSystem/JStudio/JStudio/functionvalue.cpp | 6 +++--- src/JSystem/JStudio/JStudio/fvb.cpp | 2 +- src/JSystem/JStudio/JStudio/jstudio-control.cpp | 2 +- src/JSystem/JStudio/JStudio/jstudio-math.cpp | 2 +- src/JSystem/JStudio/JStudio/stb-data-parse.cpp | 2 +- src/JSystem/JStudio/JStudio/stb.cpp | 4 ++-- src/JSystem/JSupport/JSUMemoryStream.cpp | 2 +- src/JSystem/JSupport/JSUOutputStream.cpp | 2 +- src/JSystem/JUtility/JUTAssert.cpp | 2 +- src/JSystem/JUtility/JUTCacheFont.cpp | 2 +- src/JSystem/JUtility/JUTConsole.cpp | 2 +- src/JSystem/JUtility/JUTDbPrint.cpp | 2 +- src/JSystem/JUtility/JUTDirectFile.cpp | 2 +- src/JSystem/JUtility/JUTDirectPrint.cpp | 2 +- src/JSystem/JUtility/JUTException.cpp | 8 ++++---- src/JSystem/JUtility/JUTGamePad.cpp | 2 +- src/JSystem/JUtility/JUTGraphFifo.cpp | 2 +- src/JSystem/JUtility/JUTNameTab.cpp | 2 +- src/JSystem/JUtility/JUTProcBar.cpp | 2 +- src/JSystem/JUtility/JUTResource.cpp | 2 +- .../MSL_Common/Include/{algorithm.h => algorithm} | 6 +++--- .../MSL_C++/MSL_Common/Include/{bitset.h => bitset} | 6 +++--- .../MSL_C++/MSL_Common/Include/{cstdint.h => cstdint} | 0 .../MSL_Common/Include/{functional.h => functional} | 0 .../MSL_Common/Include/{iterator.h => iterator} | 2 +- .../MSL_C++/MSL_Common/Include/{limits.h => limits} | 2 +- .../MSL_Common/Include/{msl_memory.h => memory} | 0 .../MSL/MSL_C++/MSL_Common/Include/{new.h => new} | 2 +- .../MSL_C++/MSL_Common/Include/{stdint.h => stdint} | 2 +- .../MSL_Common/Include/{type_traits.h => type_traits} | 2 +- .../MSL_C++/MSL_Common/Include/{utility.h => utility} | 0 .../MSL/MSL_C/MSL_Common/Include/ansi_files.h | 2 +- .../MSL/MSL_C/MSL_Common/Include/buffer_io.h | 2 +- .../MSL_C/MSL_Common/Include/{climits.h => climits} | 0 .../MSL/MSL_C/MSL_Common/Include/{cmath.h => cmath} | 0 .../MSL_C/MSL_Common/Include/{cstdarg.h => cstdarg} | 2 +- .../MSL_C/MSL_Common/Include/{cstddef.h => cstddef} | 0 .../MSL/MSL_C/MSL_Common/Include/{cstdio.h => cstdio} | 4 ++-- .../MSL_C/MSL_Common/Include/{cstdlib.h => cstdlib} | 0 .../MSL_C/MSL_Common/Include/{cstring.h => cstring} | 2 +- .../MSL/MSL_C/MSL_Common/Include/{ctype.h => ctype} | 2 +- .../MSL/MSL_C/MSL_Common/Include/extras.h | 2 +- .../MSL/MSL_C/MSL_Common/Include/{locale.h => locale} | 2 +- .../MSL/MSL_C/MSL_Common/Include/{math.h => math} | 2 +- .../MSL/MSL_C/MSL_Common/Include/mem_funcs.h | 2 +- .../MSL/MSL_C/MSL_Common/Include/printf.h | 2 +- .../MSL/MSL_C/MSL_Common/Include/{stdarg.h => stdarg} | 2 +- .../MSL/MSL_C/MSL_Common/Include/{stddef.h => stddef} | 2 +- .../MSL/MSL_C/MSL_Common/Include/{stdio.h => stdio} | 6 +++--- .../MSL/MSL_C/MSL_Common/Include/{stdlib.h => stdlib} | 2 +- .../MSL/MSL_C/MSL_Common/Include/{string.h => string} | 2 +- .../MSL_C/MSL_Common/Include/{va_list.h => va_list} | 0 .../MSL/MSL_C/MSL_Common/Include/wctype_api.h | 2 +- .../MSL/MSL_C/MSL_Common/Include/wstring.h | 2 +- .../MSL/MSL_C/MSL_Common/Src/abort_exit.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/alloc.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/ctype.c | 4 ++-- .../MSL/MSL_C/MSL_Common/Src/extras.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/file_io.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/locale.c | 4 ++-- .../MSL/MSL_C/MSL_Common/Src/math_double.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/mbstring.c | 4 ++-- .../MSL/MSL_C/MSL_Common/Src/mem.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/printf.c | 10 +++++----- .../MSL/MSL_C/MSL_Common/Src/scanf.c | 8 ++++---- .../MSL/MSL_C/MSL_Common/Src/secure_error.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/string.c | 2 +- .../MSL/MSL_C/MSL_Common/Src/strtold.c | 10 +++++----- .../MSL/MSL_C/MSL_Common/Src/strtoul.c | 4 ++-- .../MSL/MSL_C/MSL_Common/Src/wctype.c | 2 +- .../MSL_Common_Embedded/Math/Double_precision/e_acos.c | 2 +- .../MSL_Common_Embedded/Math/Double_precision/e_asin.c | 2 +- .../MSL_Common_Embedded/Math/Double_precision/e_pow.c | 2 +- .../MSL_Common_Embedded/Math/Double_precision/e_sqrt.c | 2 +- .../MSL_Common_Embedded/Math/Double_precision/k_tan.c | 2 +- .../Math/Double_precision/s_ldexp.c | 2 +- .../MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c | 4 ++-- .../MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c | 2 +- src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h | 2 +- src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c | 4 ++-- src/SSystem/SComponent/c_lib.cpp | 2 +- src/SSystem/SComponent/c_math.cpp | 2 +- .../debugger/embedded/MetroTRK/Portable/mem_TRK.c | 2 +- .../debugger/embedded/MetroTRK/Portable/msghndlr.c | 2 +- .../debugger/embedded/MetroTRK/Portable/support.c | 2 +- .../embedded/MetroTRK/Processor/ppc/Generic/targimpl.c | 4 ++-- src/Z2AudioLib/Z2Calc.cpp | 2 +- src/d/actor/d_a_b_bq.cpp | 2 +- src/d/actor/d_a_b_tn.cpp | 2 +- src/d/actor/d_a_b_zant.cpp | 2 +- src/d/actor/d_a_b_zant_magic.cpp | 2 +- src/d/actor/d_a_b_zant_mobile.cpp | 2 +- src/d/actor/d_a_bg_obj.cpp | 2 +- src/d/actor/d_a_door_dbdoor00.cpp | 2 +- src/d/actor/d_a_door_knob00.cpp | 2 +- src/d/actor/d_a_door_shutter.cpp | 2 +- src/d/actor/d_a_e_dk.cpp | 2 +- src/d/actor/d_a_e_sw.cpp | 2 +- src/d/actor/d_a_e_vt.cpp | 2 +- src/d/actor/d_a_e_ws.cpp | 2 +- src/d/actor/d_a_e_ymb.cpp | 2 +- src/d/actor/d_a_grass.cpp | 2 +- src/d/actor/d_a_horse.cpp | 2 +- src/d/actor/d_a_kago.cpp | 2 +- src/d/actor/d_a_mg_rod.cpp | 2 +- src/d/actor/d_a_npc_henna.cpp | 2 +- src/d/actor/d_a_npc_taro.cpp | 2 +- src/d/actor/d_a_obj_bhbridge.cpp | 2 +- src/d/actor/d_a_obj_carry.cpp | 2 +- src/d/actor/d_a_obj_cwall.cpp | 2 +- src/d/actor/d_a_obj_digsnow.cpp | 2 +- src/d/actor/d_a_obj_drop.cpp | 2 +- src/d/actor/d_a_obj_gra2_soldier.inc | 2 +- src/d/actor/d_a_obj_ice_l.cpp | 2 +- src/d/actor/d_a_obj_ice_s.cpp | 2 +- src/d/actor/d_a_obj_kanban2.cpp | 2 +- src/d/actor/d_a_obj_lv4digsand.cpp | 2 +- src/d/actor/d_a_obj_pdoor.cpp | 2 +- src/d/actor/d_a_obj_shield.cpp | 2 +- src/d/actor/d_a_obj_stone.cpp | 2 +- src/d/actor/d_a_obj_swturn.cpp | 2 +- src/d/actor/d_a_obj_wdStick.cpp | 2 +- src/d/actor/d_a_set_bgobj.cpp | 2 +- src/d/actor/d_a_tag_camera.cpp | 2 +- src/d/actor/d_a_tag_chkpoint.cpp | 2 +- src/d/actor/d_a_tag_firewall.cpp | 2 +- src/d/actor/d_a_tag_kmsg.cpp | 2 +- src/d/actor/d_a_tag_sppath.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 2 +- src/d/d_bg_w_kcol.cpp | 4 ++-- src/d/d_camera.cpp | 4 ++-- src/d/d_com_inf_game.cpp | 2 +- src/d/d_com_static.cpp | 2 +- src/d/d_envse.cpp | 2 +- src/d/d_error_msg.cpp | 2 +- src/d/d_event_manager.cpp | 2 +- src/d/d_file_sel_info.cpp | 2 +- src/d/d_kankyo.cpp | 2 +- src/d/d_kankyo_wether.cpp | 2 +- src/d/d_menu_dmap_map.cpp | 2 +- src/d/d_menu_fmap.cpp | 2 +- src/d/d_menu_insect.cpp | 2 +- src/d/d_menu_item_explain.cpp | 2 +- src/d/d_menu_letter.cpp | 2 +- src/d/d_menu_option.cpp | 2 +- src/d/d_menu_ring.cpp | 4 ++-- src/d/d_menu_save.cpp | 2 +- src/d/d_meter2_draw.cpp | 2 +- src/d/d_msg_class.cpp | 2 +- src/d/d_msg_object.cpp | 2 +- src/d/d_msg_scrn_3select.cpp | 2 +- src/d/d_msg_scrn_base.cpp | 2 +- src/d/d_msg_scrn_explain.cpp | 2 +- src/d/d_msg_unit.cpp | 2 +- src/d/d_name.cpp | 2 +- src/d/d_particle.cpp | 2 +- src/d/d_resorce.cpp | 8 +++++++- src/d/d_s_menu.cpp | 2 +- src/d/d_s_room.cpp | 2 +- src/d/d_save.cpp | 2 +- src/d/d_stage.cpp | 2 +- src/d/d_vibration.cpp | 2 +- src/dolphin/card/CARDUnlock.c | 2 +- src/dolphin/dsp/dsp.c | 2 +- src/dolphin/dsp/dsp_task.c | 2 +- src/dolphin/gx/GXDisplayList.c | 2 +- src/dolphin/gx/GXFifo.c | 2 +- src/dolphin/gx/GXGeometry.c | 2 +- src/dolphin/gx/GXInit.c | 2 +- src/dolphin/gx/GXMisc.c | 2 +- src/dolphin/gx/GXTexture.c | 2 +- src/dolphin/gx/GXVerifRAS.c | 2 +- src/dolphin/gx/GXVerifXF.c | 2 +- src/dolphin/os/OSError.c | 2 +- src/dolphin/os/__ppc_eabi_init.c | 2 +- src/f_op/f_op_actor_mng.cpp | 2 +- src/m_Do/m_Do_MemCardRWmng.cpp | 2 +- src/m_Do/m_Do_ext.cpp | 2 +- src/m_Do/m_Do_main.cpp | 2 +- src/m_Do/m_Do_printf.cpp | 2 +- src/revolution/aralt/aralt.c | 2 +- src/revolution/card/CARDUnlock.c | 2 +- src/revolution/dsp/dsp.c | 2 +- src/revolution/dsp/dsp_task.c | 2 +- src/revolution/dvd/dvd.c | 2 +- src/revolution/dvd/dvdidutils.c | 2 +- src/revolution/fs/fs.c | 2 +- src/revolution/gx/GXDisplayList.c | 2 +- src/revolution/gx/GXGeometry.c | 2 +- src/revolution/gx/GXInit.c | 2 +- src/revolution/gx/GXMisc.c | 2 +- src/revolution/gx/GXTexture.c | 2 +- src/revolution/gx/GXVerifRAS.c | 2 +- src/revolution/gx/GXVerifXF.c | 2 +- src/revolution/homebuttonLib/HBMBase.cpp | 2 +- src/revolution/homebuttonLib/HBMBase.h | 2 +- src/revolution/homebuttonLib/HBMGUIManager.cpp | 2 +- src/revolution/homebuttonLib/HBMRemoteSpk.cpp | 2 +- src/revolution/homebuttonLib/nw4hbm/db/assert.h | 2 +- .../homebuttonLib/nw4hbm/db/db_directPrint.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_animation.cpp | 4 ++-- .../nw4hbm/lyt/lyt_arcResourceAccessor.cpp | 2 +- src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp | 2 +- src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp | 4 ++-- src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_material.cpp | 2 +- src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_picture.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp | 2 +- src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp | 2 +- src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h | 4 ++-- src/revolution/homebuttonLib/nw4hbm/math/triangular.h | 4 ++-- src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h | 2 +- src/revolution/homebuttonLib/nw4hbm/snd/Channel.h | 2 +- src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h | 2 +- .../homebuttonLib/nw4hbm/snd/SoundInstanceManager.h | 2 +- src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h | 2 +- .../homebuttonLib/nw4hbm/ut/TextWriterBase.h | 4 ++-- src/revolution/homebuttonLib/sound/mix.cpp | 2 +- src/revolution/homebuttonLib/sound/synenv.cpp | 4 ++-- src/revolution/ipc/ipcProfile.c | 2 +- src/revolution/ipc/ipcclt.c | 2 +- src/revolution/nand/NANDCore.c | 2 +- src/revolution/nand/NANDLogging.c | 4 ++-- src/revolution/nand/nand.c | 2 +- src/revolution/os/OS.c | 2 +- src/revolution/os/OSAudioSystem.c | 2 +- src/revolution/os/OSError.c | 2 +- src/revolution/os/OSExec.c | 2 +- src/revolution/os/OSFatal.c | 2 +- src/revolution/os/OSInterrupt.c | 2 +- src/revolution/os/OSLaunch.c | 2 +- src/revolution/os/OSLink.c | 2 +- src/revolution/os/OSPlayTime.c | 2 +- src/revolution/os/OSReset.c | 2 +- src/revolution/os/OSStateFlags.c | 2 +- src/revolution/os/OSSync.c | 2 +- src/revolution/os/OSTime.c | 2 +- src/revolution/pad/Pad.c | 2 +- src/revolution/sc/scapi_prdinfo.c | 2 +- src/revolution/sc/scsystem.c | 2 +- src/revolution/wenc/wenc.c | 2 +- src/revolution/wpad/WPAD.c | 2 +- 342 files changed, 422 insertions(+), 398 deletions(-) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{algorithm.h => algorithm} (98%) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{bitset.h => bitset} (97%) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{cstdint.h => cstdint} (100%) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{functional.h => functional} (100%) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{iterator.h => iterator} (99%) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{limits.h => limits} (98%) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{msl_memory.h => memory} (100%) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{new.h => new} (85%) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{stdint.h => stdint} (93%) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{type_traits.h => type_traits} (99%) rename src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/{utility.h => utility} (100%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{climits.h => climits} (100%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{cmath.h => cmath} (100%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{cstdarg.h => cstdarg} (73%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{cstddef.h => cstddef} (100%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{cstdio.h => cstdio} (85%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{cstdlib.h => cstdlib} (100%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{cstring.h => cstring} (97%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{ctype.h => ctype} (99%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{locale.h => locale} (99%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{math.h => math} (97%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{stdarg.h => stdarg} (88%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{stddef.h => stddef} (89%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{stdio.h => stdio} (86%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{stdlib.h => stdlib} (92%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{string.h => string} (95%) rename src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/{va_list.h => va_list} (100%) diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h index 234f1c0c29..be06e01c26 100644 --- a/include/JSystem/J2DGraph/J2DPrint.h +++ b/include/JSystem/J2DGraph/J2DPrint.h @@ -2,7 +2,7 @@ #define J2DPRINT_H #include "JSystem/J2DGraph/J2DTextBox.h" -#include +#include class JUTFont; class J2DPrint; diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index dcb74c1f46..462849c843 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "JSystem/J3DGraphBase/J3DPacket.h" #include "JSystem/J3DGraphBase/J3DShape.h" -#include +#include class J3DJoint; class J3DMaterialAnm; diff --git a/include/JSystem/J3DGraphBase/J3DPacket.h b/include/JSystem/J3DGraphBase/J3DPacket.h index 92b817ec23..c5ff05c350 100644 --- a/include/JSystem/J3DGraphBase/J3DPacket.h +++ b/include/JSystem/J3DGraphBase/J3DPacket.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "dolphin/gd/GDBase.h" -#include +#include class J3DMatPacket; diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 72a165645b..f046a75262 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -5,7 +5,7 @@ #include "JSystem/J3DAssert.h" #include "JSystem/JUtility/JUTTexture.h" #include "global.h" -#include +#include /** * @ingroup jsystem-j3d diff --git a/include/JSystem/JAudio2/JAISeqDataMgr.h b/include/JSystem/JAudio2/JAISeqDataMgr.h index 510f1f4905..c207f0878c 100644 --- a/include/JSystem/JAudio2/JAISeqDataMgr.h +++ b/include/JSystem/JAudio2/JAISeqDataMgr.h @@ -2,7 +2,7 @@ #define JAISEQDATAMGR_H #include "JSystem/JAudio2/JAISound.h" -#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h index 5c3e9f5542..718ce02069 100644 --- a/include/JSystem/JAudio2/JASGadget.h +++ b/include/JSystem/JAudio2/JASGadget.h @@ -2,7 +2,7 @@ #define JASGADGET_H #include "JSystem/JUtility/JUTAssert.h" -#include "string.h" +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JAudio2/JAUSectionHeap.h b/include/JSystem/JAudio2/JAUSectionHeap.h index 25eee17d55..a7535500a4 100644 --- a/include/JSystem/JAudio2/JAUSectionHeap.h +++ b/include/JSystem/JAudio2/JAUSectionHeap.h @@ -4,7 +4,7 @@ #include "JSystem/JAudio2/JAUBankTable.h" #include "JSystem/JAudio2/JAUSeqDataBlockMgr.h" #include "JSystem/JKernel/JKRDisposer.h" -#include "bitset.h" +#include class JAISeqData; class JAISeqDataMgr; diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/include/JSystem/JAudio2/JAUStreamAramMgr.h index da44e02e6f..d33306d323 100644 --- a/include/JSystem/JAudio2/JAUStreamAramMgr.h +++ b/include/JSystem/JAudio2/JAUStreamAramMgr.h @@ -5,8 +5,8 @@ #include "JSystem/JAudio2/JASAramStream.h" #include "JSystem/JAudio2/JASHeapCtrl.h" #include "JSystem/JUtility/JUTAssert.h" -#include "bitset.h" -#include +#include +#include /** * @ingroup jsystem-jaudio diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index 47a438ddb8..8d0f7c43b1 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -4,7 +4,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JGadget/define.h" #include "JSystem/JGadget/search.h" -#include +#include namespace JGadget { diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h index 555cf63cd7..bbc5c9ce6c 100644 --- a/include/JSystem/JGadget/search.h +++ b/include/JSystem/JGadget/search.h @@ -2,9 +2,9 @@ #define JGADGET_SEARCH_H #include -#include -#include -#include +#include +#include +#include namespace JGadget { namespace search { diff --git a/include/JSystem/JGadget/std-streambuf.h b/include/JSystem/JGadget/std-streambuf.h index 06ac0e36e7..d6bf291415 100644 --- a/include/JSystem/JGadget/std-streambuf.h +++ b/include/JSystem/JGadget/std-streambuf.h @@ -2,7 +2,7 @@ #define JGADGET_STD_STREAMBUF_H #include -#include +#include namespace JGadget { template diff --git a/include/JSystem/JGadget/std-vector.h b/include/JSystem/JGadget/std-vector.h index 652ea7c3a3..4e74855e55 100644 --- a/include/JSystem/JGadget/std-vector.h +++ b/include/JSystem/JGadget/std-vector.h @@ -2,9 +2,9 @@ #define STD_VECTOR_H #include "JSystem/JGadget/std-memory.h" -#include -#include -#include +#include +#include +#include namespace JGadget { namespace vector { diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h index c90d3bdc81..c13d838082 100644 --- a/include/JSystem/JGeometry.h +++ b/include/JSystem/JGeometry.h @@ -2,9 +2,14 @@ #define JGEOMETRY_H #include "dolphin/mtx.h" -#include +#include #include "JSystem/JMath/JMath.h" +#ifndef __MWERKS__ +#include +#define FLT_EPSILON std::numeric_limits::epsilon() +#endif + namespace JGeometry { template diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h index 0db8cf22a6..f16ffdd57d 100644 --- a/include/JSystem/JHostIO/JORMContext.h +++ b/include/JSystem/JHostIO/JORMContext.h @@ -2,7 +2,7 @@ #define JORMCONTEXT_H #include -#include +#include #include "JSystem/JHostIO/JORReflexible.h" #include "JSystem/JSupport/JSUMemoryStream.h" diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h index 1535ba757b..f7739ada1d 100644 --- a/include/JSystem/JKernel/JKRExpHeap.h +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -2,7 +2,7 @@ #define JKREXPHEAP_H #include "JSystem/JKernel/JKRHeap.h" -#include +#include /** * @ingroup jsystem-jkernel diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index ec9ca10497..e0162fc595 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -204,9 +204,11 @@ void* operator new[](size_t size, JKRHeap* heap, int alignment); void operator delete(void* ptr); void operator delete[](void* ptr); +#ifdef __MWERKS__ inline void* operator new(size_t size, void* ptr) { return ptr; } +#endif void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment); diff --git a/include/JSystem/JMath/JMATrigonometric.h b/include/JSystem/JMath/JMATrigonometric.h index 276ea2399e..8b15f6624e 100644 --- a/include/JSystem/JMath/JMATrigonometric.h +++ b/include/JSystem/JMath/JMATrigonometric.h @@ -2,7 +2,7 @@ #define JMATRIGONOMETRIC_H #include "dolphin/types.h" -#include +#include namespace JMath { template diff --git a/include/JSystem/JMath/JMath.h b/include/JSystem/JMath/JMath.h index 35cde38bef..c6f26c771f 100644 --- a/include/JSystem/JMath/JMath.h +++ b/include/JSystem/JMath/JMath.h @@ -2,7 +2,7 @@ #define JMATH_H #include "dolphin/mtx.h" -#include +#include void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32); void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3); diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h index feb5be25c4..cfb20c2c46 100644 --- a/include/JSystem/JMessage/processor.h +++ b/include/JSystem/JMessage/processor.h @@ -2,7 +2,7 @@ #define JMESSAGE_PROCESSOR_H #include "JSystem/JMessage/resource.h" -#include +#include #include "global.h" namespace JMessage { diff --git a/include/JSystem/JParticle/JPAEmitter.h b/include/JSystem/JParticle/JPAEmitter.h index 9ce16e8f22..c47cd538d6 100644 --- a/include/JSystem/JParticle/JPAEmitter.h +++ b/include/JSystem/JParticle/JPAEmitter.h @@ -2,7 +2,7 @@ #define JPAEMITTER_H #include -#include +#include #include "JSystem/JParticle/JPAResource.h" #include "JSystem/JParticle/JPAList.h" #include "JSystem/JParticle/JPARandom.h" diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index 74f89eb2d7..f2f51ae923 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -1,7 +1,7 @@ #ifndef FUNCTIONVALUE_H #define FUNCTIONVALUE_H -#include +#include #include "JSystem/JGadget/std-vector.h" #include "JSystem/JGadget/define.h" #include "JSystem/JGadget/search.h" diff --git a/include/JSystem/JStudio/JStudio/jstudio-math.h b/include/JSystem/JStudio/JStudio/jstudio-math.h index 109d17230d..d902c218fa 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-math.h +++ b/include/JSystem/JStudio/JStudio/jstudio-math.h @@ -2,7 +2,7 @@ #define JSTUDIO_MATH_H #include "dolphin/mtx.h" -#include +#include namespace JStudio { namespace math { diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 6bca78c4c0..653ffc9474 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -3,8 +3,8 @@ #include "JSystem/JStudio/JStudio/jstudio-control.h" #include "global.h" -#include -#include +#include +#include typedef struct _GXColor GXColor; diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h index 717fd9b7b0..bdd2960543 100644 --- a/include/JSystem/JSupport/JSupport.h +++ b/include/JSystem/JSupport/JSupport.h @@ -2,7 +2,7 @@ #define JSUPPORT_H #include -#include +#include /** * @ingroup jsystem-jsupport diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 6f9194b837..7b852eb0a0 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -4,7 +4,7 @@ #include "JSystem/JGadget/linklist.h" #include "JSystem/JKernel/JKRDisposer.h" #include "JSystem/JUtility/JUTFont.h" -#include +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h index d856510ff3..aeff790f55 100644 --- a/include/JSystem/JUtility/JUTDirectPrint.h +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -2,7 +2,7 @@ #define JUTDIRECTPRINT_H #include "JSystem/JUtility/TColor.h" -#include +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 197936ed81..29849460e9 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTGamePad.h" -#include +#include #include #include #include "global.h" diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index 7b3639d6af..193a3ac3fd 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -2,7 +2,7 @@ #define JUTFONT_H #include "JSystem/JUtility/TColor.h" -#include "string.h" +#include /** * @ingroup jsystem-jutility diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index 2fc24af2c2..d83be32158 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -2,7 +2,7 @@ #define JUTTEXTURE_H #include -#include +#include class JUTPalette; diff --git a/include/SSystem/SComponent/c_m3d.h b/include/SSystem/SComponent/c_m3d.h index 6634100209..a8045c74a7 100644 --- a/include/SSystem/SComponent/c_m3d.h +++ b/include/SSystem/SComponent/c_m3d.h @@ -1,7 +1,7 @@ #ifndef C_M3D_H_ #define C_M3D_H_ -#include +#include #include "dolphin/mtx.h" class cM3dGAab; diff --git a/include/SSystem/SComponent/c_math.h b/include/SSystem/SComponent/c_math.h index c525dfa7e4..0203b4e2f1 100644 --- a/include/SSystem/SComponent/c_math.h +++ b/include/SSystem/SComponent/c_math.h @@ -3,6 +3,13 @@ #include "JSystem/JMath/JMATrigonometric.h" +#ifndef __MWERKS__ +#include +#ifndef FLT_MAX +#define FLT_MAX std::numeric_limits::max() +#endif +#endif + s16 cM_rad2s(float rad); u16 U_GetAtanTable(float, float); s16 cM_atan2s(float y, float x); diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index be2bf76935..838949cb13 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -2,7 +2,7 @@ #define C_XYZ_H #include "dolphin/mtx.h" -#include +#include struct cXyz : Vec { static const cXyz Zero; diff --git a/include/d/actor/d_a_obj_dust.h b/include/d/actor/d_a_obj_dust.h index 8adb5133b8..8f00781e8c 100644 --- a/include/d/actor/d_a_obj_dust.h +++ b/include/d/actor/d_a_obj_dust.h @@ -11,7 +11,7 @@ #include "d/d_resorce.h" #include "d/d_s_play.h" -#include +#include /** * @ingroup actors-objects diff --git a/include/d/d_menu_dmap_map.h b/include/d/d_menu_dmap_map.h index ca8b26f15e..311448c72b 100644 --- a/include/d/d_menu_dmap_map.h +++ b/include/d/d_menu_dmap_map.h @@ -2,7 +2,7 @@ #define D_MENU_D_MENU_DMAP_MAP_H #include "d/d_menu_dmap.h" -#include +#include class dMenu_DmapMap_c { public: diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h index db8efde952..86722f7bf9 100644 --- a/include/d/d_resorce.h +++ b/include/d/d_resorce.h @@ -42,7 +42,9 @@ public: return --mCount; } +#ifdef __MWERKS__ static const int NAME_MAX = 9; +#endif private: /* 0x00 */ char mArchiveName[11]; diff --git a/include/d/d_save.h b/include/d/d_save.h index fff3db0a7a..b99d904023 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -1,7 +1,7 @@ #ifndef D_SAVE_D_SAVE_H #define D_SAVE_D_SAVE_H -#include "string.h" +#include #include "SSystem/SComponent/c_xyz.h" #include #include "global.h" diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch index ddbcc3da7d..c49cbbb2ba 100644 --- a/include/d/dolzel_base.pch +++ b/include/d/dolzel_base.pch @@ -5,13 +5,13 @@ #include "weak_bss_1109_to_1009.h" // IWYU pragma: export // Fixes weak .data -#include "cmath.h" // IWYU pragma: export +#include // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DMatBlock.h" // IWYU pragma: export #include "Z2AudioLib/Z2Calc.h" // IWYU pragma: export // Fixes weak function ordering -#include "math.h" // IWYU pragma: export -#include "cstring.h" // IWYU pragma: export +#include // IWYU pragma: export +#include // IWYU pragma: export #include "JSystem/JKernel/JKRDisposer.h" // IWYU pragma: export #include "JSystem/J3DGraphBase/J3DPacket.h" // IWYU pragma: export #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export diff --git a/include/dolphin/os.h b/include/dolphin/os.h index 1abc59108f..f9bd33ab5b 100644 --- a/include/dolphin/os.h +++ b/include/dolphin/os.h @@ -1,7 +1,7 @@ #ifndef _DOLPHIN_OS_H_ #define _DOLPHIN_OS_H_ -#include +#include #ifdef __REVOLUTION_SDK__ #include diff --git a/include/dolphin/types.h b/include/dolphin/types.h index 53ba266cbe..8411e10999 100644 --- a/include/dolphin/types.h +++ b/include/dolphin/types.h @@ -82,7 +82,7 @@ typedef unsigned int uint; #define __REGISTER #endif -#include +#include #endif #endif diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h index 836554ba50..360b4c5a07 100644 --- a/include/f_ap/f_ap_game.h +++ b/include/f_ap/f_ap_game.h @@ -6,7 +6,7 @@ #include "JSystem/JFramework/JFWDisplay.h" #include "JSystem/JUtility/JUTAssert.h" #include "CaptureScreen.h" -#include +#include void fapGm_After(); void fapGm_Create(); diff --git a/include/global.h b/include/global.h index ab207f43d3..cf8e285c23 100644 --- a/include/global.h +++ b/include/global.h @@ -50,9 +50,11 @@ // Necessary for debug matches. #define UNUSED(x) ((void)(x)) +#ifdef __MWERKS__ #ifndef decltype #define decltype __decltype__ #endif +#endif #define _SDA_BASE_(dummy) 0 #define _SDA2_BASE_(dummy) 0 diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h index 643143cd45..4542ff4ab9 100644 --- a/include/m_Do/m_Do_hostIO.h +++ b/include/m_Do/m_Do_hostIO.h @@ -2,7 +2,7 @@ #define M_DO_M_DO_HOSTIO_H #include "JSystem/JHostIO/JORReflexible.h" -#include +#include class mDoHIO_child_c { public: diff --git a/include/revolution/os.h b/include/revolution/os.h index 351615ee52..703891f29b 100644 --- a/include/revolution/os.h +++ b/include/revolution/os.h @@ -1,7 +1,7 @@ #ifndef _REVOLUTION_OS_H_ #define _REVOLUTION_OS_H_ -#include +#include #include #include diff --git a/include/revolution/types.h b/include/revolution/types.h index 65fbba9203..2434b54085 100644 --- a/include/revolution/types.h +++ b/include/revolution/types.h @@ -79,6 +79,6 @@ typedef unsigned int uint; #define __REGISTER #endif -#include +#include #endif diff --git a/include/revolution/wpad/bte.h b/include/revolution/wpad/bte.h index 1751d8998b..c816fa8baf 100644 --- a/include/revolution/wpad/bte.h +++ b/include/revolution/wpad/bte.h @@ -1,7 +1,7 @@ #ifndef CONTEXT_BTE_H #define CONTEXT_BTE_H -#include +#include // taken from https://github.com/doldecomp/sdk_2009-12-11/blob/main/include/context_bte.h diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 9a70147dc0..eb0b559221 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -8,7 +8,7 @@ #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRFileCache.h" #include "JSystem/JUtility/JUTConsole.h" -#include +#include #include "m_Do/m_Do_dvd_thread.h" #include "m_Do/m_Do_ext.h" diff --git a/src/JSystem/J2DGraph/J2DManage.cpp b/src/JSystem/J2DGraph/J2DManage.cpp index 0af6517313..10758a8268 100644 --- a/src/JSystem/J2DGraph/J2DManage.cpp +++ b/src/JSystem/J2DGraph/J2DManage.cpp @@ -2,7 +2,7 @@ #include "JSystem/J2DGraph/J2DManage.h" #include "JSystem/JSupport/JSUInputStream.h" -#include "string.h" +#include void* J2DDataManage::get(char const* name) { for (J2DataManageLink* link = mList; link != NULL; link = link->mNext) { diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp index a0229abb69..a4ef4b6672 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -5,7 +5,7 @@ #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTResource.h" -#include "string.h" +#include #include "dolphin/types.h" J2DMaterialFactory::J2DMaterialFactory(J2DMaterialBlock const& param_0) { diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index 9dfb3954d2..a155a2e62f 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -3,8 +3,8 @@ #include "JSystem/J2DGraph/J2DPrint.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTFont.h" -#include -#include +#include +#include char* J2DPrint::mStrBuff; diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp index cfd68821e5..3f6010e4df 100644 --- a/src/JSystem/J2DGraph/J2DTevs.cpp +++ b/src/JSystem/J2DGraph/J2DTevs.cpp @@ -6,7 +6,7 @@ #include "JSystem/J2DGraph/J2DTevs.h" #include "JSystem/J2DGraph/J2DMatBlock.h" -#include +#include #include "dolphin/gx.h" void J2DTexMtx::load(u32 mtxIdx) { diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp index d8ddfdea22..d2501ea709 100644 --- a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include J3DSkinNList::J3DSkinNList() { field_0x0 = NULL; diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 6256c376af..21a8bf5789 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -5,7 +5,7 @@ #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/J3DGraphBase/J3DTransform.h" #include "global.h" -#include +#include inline void loadMatColors(const J3DGXColor* color) { J3DGDWriteXFCmdHdr(0x100C, 2); diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/src/JSystem/J3DGraphBase/J3DPacket.cpp index b99c5a8f1d..173061882c 100644 --- a/src/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/src/JSystem/J3DGraphBase/J3DPacket.cpp @@ -7,7 +7,7 @@ #include "JSystem/J3DGraphBase/J3DShapeMtx.h" #include "JSystem/JKernel/JKRHeap.h" #include -#include "string.h" +#include #include "global.h" J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) { diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp index dc00a46f9a..50bd2ac793 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -2,8 +2,8 @@ #include "JSystem/J3DGraphBase/J3DShapeDraw.h" #include "JSystem/JKernel/JKRHeap.h" -#include -#include +#include +#include #include u32 J3DShapeDraw::countVertex(u32 stride) { diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/src/JSystem/J3DGraphBase/J3DVertex.cpp index 29a826b74f..3724aa6b94 100644 --- a/src/JSystem/J3DGraphBase/J3DVertex.cpp +++ b/src/JSystem/J3DGraphBase/J3DVertex.cpp @@ -4,7 +4,7 @@ #include "JSystem/J3DGraphAnimator/J3DJointTree.h" #include "JSystem/J3DGraphBase/J3DSys.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include J3DVertexData::J3DVertexData() { mVtxNum = 0; diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index 895652ef40..b6afb156b9 100644 --- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -9,7 +9,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JKernel/JKRHeap.h" #include "dolphin/os.h" -#include "string.h" +#include void* J3DClusterLoaderDataBase::load(const void* i_data) { const JUTDataFileHeader* fileHeader = (JUTDataFileHeader*)i_data; diff --git a/src/JSystem/J3DU/J3DUClipper.cpp b/src/JSystem/J3DU/J3DUClipper.cpp index 04edda6427..59367bee3a 100644 --- a/src/JSystem/J3DU/J3DUClipper.cpp +++ b/src/JSystem/J3DU/J3DUClipper.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J3DU/J3DUClipper.h" -#include +#include void J3DUClipper::init() { mNear = 1.0f; diff --git a/src/JSystem/JAHostIO/JAHioUtil.cpp b/src/JSystem/JAHostIO/JAHioUtil.cpp index 6c938ec2b7..8bc18b763d 100644 --- a/src/JSystem/JAHostIO/JAHioUtil.cpp +++ b/src/JSystem/JAHostIO/JAHioUtil.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAHostIO/JAHioUtil.h" -#include "stdio.h" +#include char JAHioUtil::mStringBuffer[256]; diff --git a/src/JSystem/JAWExtSystem/JAWExtSystem.cpp b/src/JSystem/JAWExtSystem/JAWExtSystem.cpp index 4e63330b3d..9495148ece 100644 --- a/src/JSystem/JAWExtSystem/JAWExtSystem.cpp +++ b/src/JSystem/JAWExtSystem/JAWExtSystem.cpp @@ -5,7 +5,7 @@ #include "JSystem/JAWExtSystem/JAWGraphContext.h" #include "JSystem/JAWExtSystem/JAWWindow.h" #include "JSystem/JUtility/JUTGamePad.h" -#include "algorithm.h" +#include JGadget::TList JAWExtSystem::sPage[128]; JAWExtSystem::TSystemInterface JAWExtSystem::sInterface; diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/src/JSystem/JAudio2/JASAiCtrl.cpp index 662e5e6df4..9beb08f0bd 100644 --- a/src/JSystem/JAudio2/JASAiCtrl.cpp +++ b/src/JSystem/JAudio2/JASAiCtrl.cpp @@ -16,7 +16,7 @@ #include "JSystem/JUtility/JUTAssert.h" #include "dolphin/ai.h" #include -#include +#include s16* JASDriver::sDmaDacBuffer[3]; diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/src/JSystem/JAudio2/JASAudioThread.cpp index e1f6f83f08..e74ba52e9a 100644 --- a/src/JSystem/JAudio2/JASAudioThread.cpp +++ b/src/JSystem/JAudio2/JASAudioThread.cpp @@ -10,7 +10,7 @@ #include "JSystem/JAudio2/JASReport.h" #include "JSystem/JKernel/JKRSolidHeap.h" #include "dolphin/dsp.h" -#include "stdint.h" +#include JASAudioThread::JASAudioThread(int stackSize, int msgCount, u32 threadPriority) : diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/src/JSystem/JAudio2/JASBasicWaveBank.cpp index f7417e174d..ad11ba25d2 100644 --- a/src/JSystem/JAudio2/JASBasicWaveBank.cpp +++ b/src/JSystem/JAudio2/JASBasicWaveBank.cpp @@ -4,7 +4,7 @@ #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include "stdint.h" +#include JASBasicWaveBank::JASBasicWaveBank() { mWaveTable = NULL; diff --git a/src/JSystem/JAudio2/JASCalc.cpp b/src/JSystem/JAudio2/JASCalc.cpp index 99695d6498..b4ef0d66be 100644 --- a/src/JSystem/JAudio2/JASCalc.cpp +++ b/src/JSystem/JAudio2/JASCalc.cpp @@ -1,8 +1,8 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASCalc.h" -#include -#include +#include +#include void JASCalc::imixcopy(const s16* s1, const s16* s2, s16* dst, u32 n) { for (n; n != 0; n--) { diff --git a/src/JSystem/JAudio2/JASReport.cpp b/src/JSystem/JAudio2/JASReport.cpp index 744bc69eaf..941338ba3a 100644 --- a/src/JSystem/JAudio2/JASReport.cpp +++ b/src/JSystem/JAudio2/JASReport.cpp @@ -8,7 +8,7 @@ #include "JSystem/JAudio2/JASCalc.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRHeap.h" -#include +#include static OSMutex sMutex; diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp index 5598ab2277..a105fe7c37 100644 --- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp +++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JAudio2/JASSimpleWaveBank.h" -#include "stdint.h" +#include JASSimpleWaveBank::JASSimpleWaveBank() { mWaveTable = NULL; diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp index ee91eb3e8a..9672a087ae 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -5,9 +5,9 @@ #include "JSystem/JAudio2/JASTaskThread.h" #include "JSystem/JAudio2/JASMutex.h" #include "JSystem/JKernel/JKRDvdAramRipper.h" -#include "string.h" +#include #include "dolphin/os.h" -#include +#include JASHeap* JASWaveArcLoader::sAramHeap; diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp index 7f775989b8..86b633f6fc 100644 --- a/src/JSystem/JFramework/JFWDisplay.cpp +++ b/src/JSystem/JFramework/JFWDisplay.cpp @@ -9,7 +9,7 @@ #include "dolphin/gx.h" #include #include "global.h" -#include "stdint.h" +#include void JFWDisplay::ctor_subroutine(bool enableAlpha) { mEnableAlpha = enableAlpha; diff --git a/src/JSystem/JGadget/binary.cpp b/src/JSystem/JGadget/binary.cpp index cde00093f2..af49191265 100644 --- a/src/JSystem/JGadget/binary.cpp +++ b/src/JSystem/JGadget/binary.cpp @@ -2,7 +2,7 @@ #include "JSystem/JGadget/binary.h" #include "JSystem/JGadget/define.h" -#include +#include #if DEBUG static void dummyString() { diff --git a/src/JSystem/JGadget/define.cpp b/src/JSystem/JGadget/define.cpp index f7496480ac..84b1914f17 100644 --- a/src/JSystem/JGadget/define.cpp +++ b/src/JSystem/JGadget/define.cpp @@ -3,7 +3,7 @@ #include "JSystem/JGadget/define.h" #define MSL_USE_INLINES 1 -#include +#include JGadget_outMessage::JGadget_outMessage(MessageFunc fn, const char* file, int line) { mMsgFunc = fn; diff --git a/src/JSystem/JGadget/std-stream.cpp b/src/JSystem/JGadget/std-stream.cpp index 418e8096a3..3ce2def24d 100644 --- a/src/JSystem/JGadget/std-stream.cpp +++ b/src/JSystem/JGadget/std-stream.cpp @@ -2,7 +2,7 @@ #include "JSystem/JGadget/std-stream.h" #include "JSystem/JGadget/define.h" -#include +#include #include namespace JGadget { diff --git a/src/JSystem/JGadget/std-streambuf.cpp b/src/JSystem/JGadget/std-streambuf.cpp index b9cc93de22..8a538021d9 100644 --- a/src/JSystem/JGadget/std-streambuf.cpp +++ b/src/JSystem/JGadget/std-streambuf.cpp @@ -2,7 +2,7 @@ #include "JSystem/JGadget/std-streambuf.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include namespace JGadget { TStreamBuffer::~TStreamBuffer() {} diff --git a/src/JSystem/JGadget/std-string.cpp b/src/JSystem/JGadget/std-string.cpp index 04b416b0d1..9b7206b3ae 100644 --- a/src/JSystem/JGadget/std-string.cpp +++ b/src/JSystem/JGadget/std-string.cpp @@ -1,6 +1,6 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep -#include +#include static void dummy() { u32 a = 0; diff --git a/src/JSystem/JHostIO/JHIMccBuf.cpp b/src/JSystem/JHostIO/JHIMccBuf.cpp index 0e2e8a2f4c..f71f9fc0fa 100644 --- a/src/JSystem/JHostIO/JHIMccBuf.cpp +++ b/src/JSystem/JHostIO/JHIMccBuf.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JHostIO/JHIRMcc.h" #include -#include +#include void JHIReport(const char* fmt, ...) {} diff --git a/src/JSystem/JHostIO/JORServer.cpp b/src/JSystem/JHostIO/JORServer.cpp index c724ba72e0..5a55a342c9 100644 --- a/src/JSystem/JHostIO/JORServer.cpp +++ b/src/JSystem/JHostIO/JORServer.cpp @@ -5,7 +5,7 @@ #include "JSystem/JHostIO/JORFile.h" #include "JSystem/JHostIO/JORHostInfo.h" #include "JSystem/JSupport/JSUMemoryStream.h" -#include +#include void JOREventCallbackListNode::JORAppend() { JORServer* pServer = JORServer::getInstance(); diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp index e067e18c06..7d1c573f11 100644 --- a/src/JSystem/JKernel/JKRAram.cpp +++ b/src/JSystem/JKernel/JKRAram.cpp @@ -8,7 +8,7 @@ #include "JSystem/JUtility/JUTException.h" #include "dolphin/ar.h" #include -#include "string.h" +#include #if PLATFORM_GCN const u32 stack_size = 0xc00; diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 600d332fcb..35817fe158 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -7,8 +7,8 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include -#include "string.h" +#include +#include JKRAramArchive::JKRAramArchive() {} diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/src/JSystem/JKernel/JKRAramHeap.cpp index 345532a1a0..a1ea01f816 100644 --- a/src/JSystem/JKernel/JKRAramHeap.cpp +++ b/src/JSystem/JKernel/JKRAramHeap.cpp @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRAramHeap.h" #include "JSystem/JKernel/JKRHeap.h" #include "global.h" -#include +#include JSUList JKRAramHeap::sAramList; diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp index 94b9ca91fc..d126b08b5d 100644 --- a/src/JSystem/JKernel/JKRAramStream.cpp +++ b/src/JSystem/JKernel/JKRAramStream.cpp @@ -4,7 +4,7 @@ #include "JSystem/JKernel/JKRAramPiece.h" #include "JSystem/JSupport/JSUFileStream.h" #include "JSystem/JUtility/JUTException.h" -#include +#include #if PLATFORM_GCN const u32 stack_size = 0xc00; diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/JSystem/JKernel/JKRArchivePri.cpp index c39d1bc70a..5dff53f00b 100644 --- a/src/JSystem/JKernel/JKRArchivePri.cpp +++ b/src/JSystem/JKernel/JKRArchivePri.cpp @@ -2,8 +2,8 @@ #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JKernel/JKRHeap.h" -#include "ctype.h" -#include "string.h" +#include +#include u32 JKRArchive::sCurrentDirID; diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index 5e64c3b2e2..5e9eb638e6 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -10,9 +10,9 @@ #include "JSystem/JKernel/JKRMemArchive.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include -#include "string.h" -#include +#include +#include +#include JKRCompArchive::JKRCompArchive(s32 entryNum, JKRArchive::EMountDirection eMountDirection) : JKRArchive(entryNum, MOUNT_COMP) { diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/JSystem/JKernel/JKRDvdAramRipper.cpp index 764a12cc78..8d44cc29d8 100644 --- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdAramRipper.cpp @@ -11,7 +11,7 @@ #include #include "dolphin/vi.h" #include "global.h" -#include "string.h" +#include static int JKRDecompressFromDVDToAram(JKRDvdFile*, u32, u32, u32, u32, u32, u32*); static int decompSZS_subroutine(u8*, u32); diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index 74e182a374..0a74ca8c01 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -6,10 +6,10 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include -#include "string.h" +#include +#include #include "global.h" -#include +#include JKRDvdArchive::JKRDvdArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection) : JKRArchive(entryNum, MOUNT_DVD) { diff --git a/src/JSystem/JKernel/JKRDvdFile.cpp b/src/JSystem/JKernel/JKRDvdFile.cpp index 20132c3a22..172827e520 100644 --- a/src/JSystem/JKernel/JKRDvdFile.cpp +++ b/src/JSystem/JKernel/JKRDvdFile.cpp @@ -3,7 +3,7 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "stdint.h" +#include JSUList JKRDvdFile::sDvdList; diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp index 3f565bc67a..877d10d740 100644 --- a/src/JSystem/JKernel/JKRDvdRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdRipper.cpp @@ -8,10 +8,10 @@ #include "JSystem/JKernel/JKRDvdFile.h" #include "JSystem/JKernel/JKRDecomp.h" #include "JSystem/JUtility/JUTException.h" -#include "string.h" +#include #include #include "dolphin/vi.h" -#include +#include static int JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*); static int decompSZS_subroutine(u8*, u8*); diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp index a455bd07fb..9f1109d12a 100644 --- a/src/JSystem/JKernel/JKRExpHeap.cpp +++ b/src/JSystem/JKernel/JKRExpHeap.cpp @@ -9,7 +9,7 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTException.h" -#include +#include JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) { JKRExpHeap* heap = NULL; diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp index b6ed72c1c3..2c764a7024 100644 --- a/src/JSystem/JKernel/JKRFileCache.cpp +++ b/src/JSystem/JKernel/JKRFileCache.cpp @@ -6,8 +6,8 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" -#include "ctype.h" -#include "string.h" +#include +#include #include "global.h" JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* param_3) { diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp index 825fa20e8e..cf756ee279 100644 --- a/src/JSystem/JKernel/JKRFileLoader.cpp +++ b/src/JSystem/JKernel/JKRFileLoader.cpp @@ -4,8 +4,8 @@ #define MSL_USE_INLINES 1 // needed to inline tolower call. not inlined elsewhere in the repo -#include "string.h" -#include "ctype.h" +#include +#include #include "global.h" JKRFileLoader* JKRFileLoader::sCurrentVolume; diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index dee3b904a3..b805901b78 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -8,8 +8,8 @@ #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include -#include +#include +#include #if DEBUG u8 JKRValue_DEBUGFILL_NOTUSE = 0xFD; diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index 7f2f587774..505329847c 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -5,9 +5,9 @@ #include "JSystem/JKernel/JKRDvdRipper.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTException.h" -#include "string.h" +#include #include "global.h" -#include +#include JKRMemArchive::JKRMemArchive(s32 entryNum, JKRArchive::EMountDirection mountDirection) : JKRArchive(entryNum, MOUNT_MEM) { diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp index 4f072cb714..593f4b78ac 100644 --- a/src/JSystem/JKernel/JKRSolidHeap.cpp +++ b/src/JSystem/JKernel/JKRSolidHeap.cpp @@ -5,8 +5,8 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" #include "global.h" -#include -#include +#include +#include JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler) { if (!heap) { diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index c17a2dce21..0392beef0f 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -3,9 +3,9 @@ #include "JSystem/JKernel/JKRThread.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" -#include +#include #include "global.h" -#include +#include JSUList JKRThread::sThreadList(0); diff --git a/src/JSystem/JMath/JMATrigonometric.cpp b/src/JSystem/JMath/JMATrigonometric.cpp index 605353736d..89e36a413e 100644 --- a/src/JSystem/JMath/JMATrigonometric.cpp +++ b/src/JSystem/JMath/JMATrigonometric.cpp @@ -2,7 +2,7 @@ // don't include header until this "zero" mess is figured out // #include "JSystem/JMath/JMATrigonometric.h" -#include +#include #include "global.h" static f32 dummy() { diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp index 58400bc70d..eef50e7516 100644 --- a/src/JSystem/JMessage/processor.cpp +++ b/src/JSystem/JMessage/processor.cpp @@ -3,7 +3,7 @@ #include "JSystem/JMessage/processor.h" #include "JSystem/JMessage/control.h" #include "JSystem/JUtility/JUTAssert.h" -#include +#include JMessage::TReference::~TReference() {} diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp index 0007e370af..04387050c2 100644 --- a/src/JSystem/JMessage/resource.cpp +++ b/src/JSystem/JMessage/resource.cpp @@ -3,8 +3,8 @@ #include "JSystem/JMessage/resource.h" #include "JSystem/JGadget/search.h" #include "JSystem/JGadget/define.h" -#include -#include +#include +#include u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, bool* pbValid) const { if (!oParse_TBlock_messageID_.getRaw()) { diff --git a/src/JSystem/JParticle/JPAResourceManager.cpp b/src/JSystem/JParticle/JPAResourceManager.cpp index 7b0de811bc..fba6d81ab7 100644 --- a/src/JSystem/JParticle/JPAResourceManager.cpp +++ b/src/JSystem/JParticle/JPAResourceManager.cpp @@ -3,7 +3,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JParticle/JPADynamicsBlock.h" #include "JSystem/JParticle/JPAResource.h" -#include "string.h" +#include struct JPAResourceLoader { JPAResourceLoader(u8 const*, JPAResourceManager*); diff --git a/src/JSystem/JStage/JSGCamera.cpp b/src/JSystem/JStage/JSGCamera.cpp index 19a16cf5b5..cd35cfed17 100644 --- a/src/JSystem/JStage/JSGCamera.cpp +++ b/src/JSystem/JStage/JSGCamera.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JStage/JSGCamera.h" -#include +#include JStage::TCamera::~TCamera() {} diff --git a/src/JSystem/JStage/JSGFog.cpp b/src/JSystem/JStage/JSGFog.cpp index 0f63fedd7e..cf1a8eb2c8 100644 --- a/src/JSystem/JStage/JSGFog.cpp +++ b/src/JSystem/JStage/JSGFog.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JStage/JSGFog.h" -#include +#include JStage::TFog::~TFog() {} diff --git a/src/JSystem/JStudio/JStudio/ctb.cpp b/src/JSystem/JStudio/JStudio/ctb.cpp index db86c69e77..a28752af7a 100644 --- a/src/JSystem/JStudio/JStudio/ctb.cpp +++ b/src/JSystem/JStudio/JStudio/ctb.cpp @@ -1,9 +1,9 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JStudio/JStudio/ctb.h" -#include "iterator.h" -#include "string.h" -#include +#include +#include +#include JStudio::ctb::TObject::~TObject() {} diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index 3a929bb433..7d891a47d6 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -5,9 +5,9 @@ #include "JSystem/JUtility/JUTException.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JGadget/linklist.h" -#include -#include -#include +#include +#include +#include namespace JStudio { diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp index d10cd0c78a..94721909c4 100644 --- a/src/JSystem/JStudio/JStudio/fvb.cpp +++ b/src/JSystem/JStudio/JStudio/fvb.cpp @@ -2,7 +2,7 @@ #include "JSystem/JStudio/JStudio/fvb.h" #include "JSystem/JUtility/JUTException.h" -#include +#include namespace JStudio { namespace fvb { diff --git a/src/JSystem/JStudio/JStudio/jstudio-control.cpp b/src/JSystem/JStudio/JStudio/jstudio-control.cpp index 649501b4c9..38fe394ea0 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-control.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-control.cpp @@ -7,7 +7,7 @@ #include "JSystem/JStudio/JStudio/jstudio-control.h" #include "JSystem/JStudio/JStudio/jstudio-math.h" #include "JSystem/JStudio/JStudio/jstudio-data.h" -#include "string.h" +#include JStudio::TControl::TControl() { mTransformOnSet = false; diff --git a/src/JSystem/JStudio/JStudio/jstudio-math.cpp b/src/JSystem/JStudio/JStudio/jstudio-math.cpp index e6c5403b64..0203a9e894 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-math.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-math.cpp @@ -3,7 +3,7 @@ #include "JSystem/JStudio/JStudio/jstudio-math.h" #include "JSystem/JGeometry.h" #include "JSystem/TPosition3.h" -#include +#include void JStudio::math::getRotation_xyz(MtxP param_1, f32 x, f32 y, f32 z) { f32 cosx = cosf(DEG_TO_RAD(x)); diff --git a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp index 3a0f7f54b9..a5d0136d2b 100644 --- a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp +++ b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp @@ -3,7 +3,7 @@ #include "JSystem/JStudio/JStudio/stb-data-parse.h" #include "JSystem/JUtility/JUTAssert.h" #include "dolphin/os.h" -#include "stdint.h" +#include namespace JStudio { namespace stb { diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp index a84ad897ed..b2dbddbd6d 100644 --- a/src/JSystem/JStudio/JStudio/stb.cpp +++ b/src/JSystem/JStudio/JStudio/stb.cpp @@ -3,8 +3,8 @@ #include "JSystem/JStudio/JStudio/stb.h" #include "JSystem/JStudio/JStudio/jstudio-object.h" #include "JSystem/JUtility/JUTException.h" -#include -#include +#include +#include namespace JStudio { namespace stb { diff --git a/src/JSystem/JSupport/JSUMemoryStream.cpp b/src/JSystem/JSupport/JSUMemoryStream.cpp index 02913807d5..9364bc7d0d 100644 --- a/src/JSystem/JSupport/JSUMemoryStream.cpp +++ b/src/JSystem/JSupport/JSUMemoryStream.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JSupport/JSUMemoryStream.h" -#include "string.h" +#include void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) { mBuffer = pBuffer; diff --git a/src/JSystem/JSupport/JSUOutputStream.cpp b/src/JSystem/JSupport/JSUOutputStream.cpp index 3732397523..132b143c5d 100644 --- a/src/JSystem/JSupport/JSUOutputStream.cpp +++ b/src/JSystem/JSupport/JSUOutputStream.cpp @@ -3,7 +3,7 @@ #include "JSystem/JSupport/JSUOutputStream.h" #include "JSystem/JSupport/JSURandomOutputStream.h" #include -#include +#include JSUOutputStream::~JSUOutputStream() { if (!isGood()) { diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/src/JSystem/JUtility/JUTAssert.cpp index 16029f3036..7e36d35df6 100644 --- a/src/JSystem/JUtility/JUTAssert.cpp +++ b/src/JSystem/JUtility/JUTAssert.cpp @@ -4,7 +4,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTDirectPrint.h" -#include +#include #include bool sAssertVisible = true; diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index f460f315db..dc2a5455dc 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -6,7 +6,7 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JKernel/JKRAram.h" #include "dolphin/gx.h" -#include "stdint.h" +#include JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_heap) { initialize_state(); diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp index 4111950c19..4290c61893 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/src/JSystem/JUtility/JUTConsole.cpp @@ -7,7 +7,7 @@ #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTVideo.h" #include -#include +#include #include "global.h" JUTConsoleManager* JUTConsoleManager::sManager; diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index 5537b321f7..a84c863f26 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" -#include +#include JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { mFont = pFont; diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/src/JSystem/JUtility/JUTDirectFile.cpp index d091d12ad1..ffbff6b2a5 100644 --- a/src/JSystem/JUtility/JUTDirectFile.cpp +++ b/src/JSystem/JUtility/JUTDirectFile.cpp @@ -3,7 +3,7 @@ #include "JSystem/JUtility/JUTDirectFile.h" #include #include "global.h" -#include +#include int JUTDirectFile::fetch32byte() { mToRead = mLength - ALIGN_PREV(mPos, DVD_MIN_TRANSFER_SIZE); diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp index 799d8ae78b..d0c7387412 100644 --- a/src/JSystem/JUtility/JUTDirectPrint.cpp +++ b/src/JSystem/JUtility/JUTDirectPrint.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTDirectPrint.h" -#include +#include #include #include "global.h" diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index 876804d584..32d46c5531 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -4,11 +4,11 @@ #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDirectPrint.h" #include "JSystem/JUtility/JUTDirectFile.h" -#include -#include -#include +#include +#include +#include #include -#include +#include OSMessageQueue JUTException::sMessageQueue = {0}; diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp index ea3709594a..6faf755bae 100644 --- a/src/JSystem/JUtility/JUTGamePad.cpp +++ b/src/JSystem/JUtility/JUTGamePad.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTGamePad.h" -#include +#include u32 JUTGamePad::CRumble::sChannelMask[4] = { PAD_CHAN0_BIT, diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/src/JSystem/JUtility/JUTGraphFifo.cpp index 98f7db2c39..6553d90453 100644 --- a/src/JSystem/JUtility/JUTGraphFifo.cpp +++ b/src/JSystem/JUtility/JUTGraphFifo.cpp @@ -2,7 +2,7 @@ #include "JSystem/JUtility/JUTGraphFifo.h" #include "JSystem/JKernel/JKRHeap.h" -#include "stdint.h" +#include static bool data_804514B8; diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/src/JSystem/JUtility/JUTNameTab.cpp index 7ad26bf58e..3b6ed448e0 100644 --- a/src/JSystem/JUtility/JUTNameTab.cpp +++ b/src/JSystem/JUtility/JUTNameTab.cpp @@ -1,7 +1,7 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTNameTab.h" -#include "string.h" +#include JUTNameTab::JUTNameTab() { setResource(NULL); diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/src/JSystem/JUtility/JUTProcBar.cpp index 235132832b..c9599868bc 100644 --- a/src/JSystem/JUtility/JUTProcBar.cpp +++ b/src/JSystem/JUtility/JUTProcBar.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTVideo.h" -#include +#include JUTProcBar::JUTProcBar() { mVisible = true; diff --git a/src/JSystem/JUtility/JUTResource.cpp b/src/JSystem/JUtility/JUTResource.cpp index 9d74852f58..80eb6a8e5f 100644 --- a/src/JSystem/JUtility/JUTResource.cpp +++ b/src/JSystem/JUtility/JUTResource.cpp @@ -3,7 +3,7 @@ #include "JSystem/JUtility/JUTResource.h" #include "JSystem/JKernel/JKRArchive.h" #include "JSystem/JSupport/JSUInputStream.h" -#include "string.h" +#include void* JUTResReference::getResource(JSUInputStream* stream, u32 resType, JKRArchive* archive) { stream->read(&mType, 1); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm similarity index 98% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm index 8a1ef98eb3..d0903fc69d 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm @@ -1,9 +1,9 @@ #ifndef MSL_ALGORITHM_H_ #define MSL_ALGORITHM_H_ -#include -#include -#include +#include +#include +#include #include "global.h" namespace std { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset similarity index 97% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset index f6bb7354f7..e3b01b3435 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/bitset @@ -1,9 +1,9 @@ #ifndef MSL_BITSET_H_ #define MSL_BITSET_H_ -#include "stdio.h" -#include "stdlib.h" -#include "algorithm.h" +#include +#include +#include namespace std { // TODO: where does this go? diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/cstdint diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/functional diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator similarity index 99% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator index 89bc271d5a..778d0c30ae 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator @@ -1,7 +1,7 @@ #ifndef MSL_ITERATOR_H_ #define MSL_ITERATOR_H_ -#include +#include namespace std { struct input_iterator_tag {}; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits similarity index 98% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits index 91c3dedf0e..75f643aa61 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/limits @@ -1,7 +1,7 @@ #ifndef _MSL_LIMITS_H #define _MSL_LIMITS_H -#include +#include #include namespace std { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new similarity index 85% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new index 62446b959e..414c6fd5be 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/new @@ -1,7 +1,7 @@ #ifndef STD_NEW_H_ #define STD_NEW_H_ -#include +#include inline void* (operator new)(size_t, void *ptr) { return ptr; } diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint similarity index 93% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint index 157c4180b7..caf108094b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/stdint @@ -1,7 +1,7 @@ #ifndef MSL_STDINT_H_ #define MSL_STDINT_H_ -#include +#include #ifdef __cplusplus using std::uint8_t; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits similarity index 99% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits index 14c7f35734..720115c1e1 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/type_traits @@ -1,7 +1,7 @@ #ifndef MSL_TYPE_TRAITS_H_ #define MSL_TYPE_TRAITS_H_ -#include +#include namespace std { // helper class diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility.h b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility.h rename to src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/utility diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h index ce7410884c..fdd13966d4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ansi_files.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_ANSI_FILES_H #define _MSL_COMMON_ANSI_FILES_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h index eabc120a1c..e9271066b5 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/buffer_io.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_BUFFER_IO_H #define _MSL_COMMON_BUFFER_IO_H -#include +#include enum { __align_buffer, __dont_align_buffer }; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/climits diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cmath diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg similarity index 73% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg index 5f54f9a6f9..cb2c57977e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdarg @@ -1,6 +1,6 @@ #ifndef _MSL_CSTDARG_H_ #define _MSL_CSTDARG_H_ -#include +#include #endif diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstddef diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio similarity index 85% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio index 2a966f076a..739a62f641 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdio @@ -6,8 +6,8 @@ #include #include #include -#include -#include +#include +#include #define stdin (&__files._stdin) #define stdout (&__files._stdout) diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstdlib diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring similarity index 97% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring index 2290c183cb..c55307fb71 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/cstring @@ -1,7 +1,7 @@ #ifndef _MSL_CSTRING_H #define _MSL_CSTRING_H -#include +#include #include #include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype similarity index 99% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype index 8ae87d0401..5def2776ff 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/ctype @@ -34,7 +34,7 @@ extern unsigned char __upper_map[]; // added underscore to avoid naming conflicts inline int _tolower(int c) { return (c == -1 ? -1 : (int)__lower_map[(unsigned char)c]); } #else -#include +#include extern const unsigned char __lower_mapC[0x100]; extern const unsigned char __upper_mapC[0x100]; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h index 7adcede674..f6702aa064 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/extras.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_EXTRAS_H #define _MSL_COMMON_EXTRAS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale similarity index 99% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale index fa317f2837..717d128b0e 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/locale @@ -1,7 +1,7 @@ #ifndef _MSL_LOCALE_H #define _MSL_LOCALE_H -#include +#include typedef int (*__decode_mbyte) (wchar_t*, const char*, size_t); typedef int (*__encode_mbyte) (char*, wchar_t); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math similarity index 97% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math index ad27789b8b..de9c0a6bc2 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/math @@ -1,7 +1,7 @@ #ifndef MSL_MATH_H_ #define MSL_MATH_H_ -#include +#include namespace std { template diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h index 94f32a9e35..5e9eaee242 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/mem_funcs.h @@ -1,7 +1,7 @@ #ifndef _MSL_COMMON_MEM_FUNCS_H #define _MSL_COMMON_MEM_FUNCS_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h index 9c76f61882..d8322efb06 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h @@ -2,7 +2,7 @@ #define _MSL_COMMON_PRINTF_H #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg similarity index 88% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg index 849ca8be5a..54628ea6ea 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdarg @@ -1,7 +1,7 @@ #ifndef _MSL_STDARG_H_ #define _MSL_STDARG_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef similarity index 89% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef index 69fc7cf83f..a960525303 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stddef @@ -1,7 +1,7 @@ #ifndef _MSL_STDDEF_H_ #define _MSL_STDDEF_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio similarity index 86% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio index 950bead4cc..8526a010ff 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdio @@ -1,9 +1,9 @@ #ifndef MSL_STDIO_H_ #define MSL_STDIO_H_ -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib similarity index 92% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib index 409d5598f8..3d8239713a 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/stdlib @@ -1,7 +1,7 @@ #ifndef _MSL_STDLIB_H_ #define _MSL_STDLIB_H_ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string similarity index 95% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string index e478d7e8eb..41984de8b5 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/string @@ -1,7 +1,7 @@ #ifndef MSL_STRING_H_ #define MSL_STRING_H_ -#include +#include namespace std { using ::memcpy; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list similarity index 100% rename from src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list.h rename to src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/va_list diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h index fd011d70d1..a08f44ea29 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wctype_api.h @@ -1,7 +1,7 @@ #ifndef _MSL_WCTYPE_H #define _MSL_WCTYPE_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h index 7cd6e26b55..8fbf40231b 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/wstring.h @@ -1,7 +1,7 @@ #ifndef MSL_WSTRING_H #define MSL_WSTRING_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c index 230f504a6f..c399b82827 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/abort_exit.c @@ -1,6 +1,6 @@ #include "abort_exit.h" #include "critical_regions.h" -#include "cstddef.h" +#include extern void (*_dtors[])(void); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c index a50c8913aa..5d933cf0c3 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/alloc.c @@ -1,6 +1,6 @@ #include "alloc.h" #include "critical_regions.h" -#include +#include #include "global.h" diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c index 4bc8cd4a7e..967879ace0 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/ctype.c @@ -1,5 +1,5 @@ -#include "locale.h" +#include #include "global.h" @@ -7,7 +7,7 @@ #undef MSL_INLINE #define MSL_INLINE __declspec(weak) -#include "ctype.h" +#include #if PLATFORM_GCN #define ctrl __control_char diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c index d24ac7b5ea..9d68210dc2 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/extras.c @@ -1,5 +1,5 @@ #include "extras.h" -#include "ctype.h" +#include int stricmp(const char* str1, const char* str2) { char a_var; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c index fe71593f35..c73b270039 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/file_io.c @@ -1,5 +1,5 @@ #include "file_io.h" -#include "ctype.h" +#include int fclose(FILE* file) { int flush_result, close_result; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c index 3826686f22..1917c23b63 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/locale.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #include #include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c index 690e3dd71c..e7a388e062 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/math_double.c @@ -4,4 +4,4 @@ #undef MSL_INLINE #define MSL_INLINE __declspec(weak) -#include +#include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c index 17e30a364e..2b03a829f4 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mbstring.c @@ -1,6 +1,6 @@ #include "mbstring.h" -#include "cstring.h" -#include +#include +#include #include "global.h" diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c index f2ea575cce..a3ffdd25a1 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/mem.c @@ -1,4 +1,4 @@ -#include "cstring.h" +#include void* memmove(void* dst, const void* src, size_t n) { const char* csrc; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c index 0c2856e046..83305984e1 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/printf.c @@ -1,12 +1,12 @@ #include "printf.h" #include "ansi_fp.h" #include "critical_regions.h" -#include "ctype.h" +#include #include "scanf.h" -#include "cmath.h" -#include "cstdio.h" -#include "cstring.h" -#include "cstdint.h" +#include +#include +#include +#include #include "wchar_io.h" #define LDBL_MANT_DIG 53 diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c index e2016b1d41..b60a21131c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/scanf.c @@ -1,8 +1,8 @@ #include "scanf.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c index faf85586d6..1cc3d7ee16 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/secure_error.c @@ -1,4 +1,4 @@ -#include +#include typedef void (*constraint_handler_t)(const char*, void*, int); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c index 7c9ded40f1..ff5f9dd6a9 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/string.c @@ -1,4 +1,4 @@ -#include "cstring.h" +#include #include "global.h" #define K1 0x80808080 diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c index b4599b1e75..444ceed800 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtold.c @@ -1,11 +1,11 @@ #include "strtold.h" -#include "cstdio.h" +#include #include "ansi_fp.h" -#include "locale.h" -#include "ctype.h" +#include +#include #include "float.h" -#include "cmath.h" -#include "climits.h" +#include +#include #include extern double nan(const char*); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c index 3d3136e397..cb65203382 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/strtoul.c @@ -1,7 +1,7 @@ #include "strtoul.h" -#include "ctype.h" +#include #include "errno.h" -#include "climits.h" +#include #include "scanf.h" enum scan_states { diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c index 73e8f15d71..7faf351f1c 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Src/wctype.c @@ -1,4 +1,4 @@ -#include "ctype.h" +#include const unsigned short __wctype_mapC[256] = { ctype_cntrl, diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c index 9588c00582..e56c8f9295 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_acos.c @@ -34,7 +34,7 @@ * Function needed: sqrt */ -#include "cmath.h" +#include #ifdef __STDC__ static const double diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c index 05c49cee7e..4bbf550c22 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_asin.c @@ -40,7 +40,7 @@ * */ -#include "cmath.h" +#include #ifdef __STDC__ static const double diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c index 0fe4053e3d..4a72bebf1f 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_pow.c @@ -56,7 +56,7 @@ */ #include "errno.h" -#include "cmath.h" +#include #ifdef __STDC__ static const double diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c index b3db70acde..19f30a6123 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/e_sqrt.c @@ -81,7 +81,7 @@ */ #include "errno.h" -#include "cmath.h" +#include #ifdef __STDC__ static const double one = 1.0, tiny = 1.0e-300; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c index c7eb4edc5d..2eff01e529 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/k_tan.c @@ -99,7 +99,7 @@ * = 1 - 2*(tan(y) - (tan(y)^2)/(1+tan(y))) */ -#include "cmath.h" +#include static const double one = 1.00000000000000000000e+00, /* 0x3FF00000, 0x00000000 */ pio4 = 7.85398163397448278999e-01, /* 0x3FE921FB, 0x54442D18 */ pio4lo = 3.06161699786838301793e-17, /* 0x3C81A626, 0x33145C07 */ diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c index 3fe3aea68b..4a5a76e563 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Double_precision/s_ldexp.c @@ -14,7 +14,7 @@ #include "global.h" #if PLATFORM_GCN -#include "cmath.h" /* for isfinite macro */ +#include /* for isfinite macro */ #else #include #define isfinite(x) ((__fpclassifyd(x) > 2)) diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c index 879effbd02..e057f9efe7 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/ansi_fp.c @@ -1,7 +1,7 @@ #include "ansi_fp.h" #include "ansi_fp.h" -#include "climits.h" -#include "cmath.h" +#include +#include static int __count_trailing_zerol(unsigned long x) { int result = 0; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c index aba9df81ed..68722043cc 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Src/math_sun.c @@ -1,4 +1,4 @@ -#include +#include double scalbn(double x, int n) { double mant; diff --git a/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h b/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h index 36b6f440dd..a5542f9c99 100644 --- a/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h +++ b/src/PowerPC_EABI_Support/Runtime/Inc/MWCPlusLib.h @@ -1,7 +1,7 @@ #ifndef MWCPLUSLIB_H #define MWCPLUSLIB_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c index badb510ee8..4ad6a4e66f 100644 --- a/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c +++ b/src/PowerPC_EABI_Support/Runtime/Src/__va_arg.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include #undef __va_arg diff --git a/src/SSystem/SComponent/c_lib.cpp b/src/SSystem/SComponent/c_lib.cpp index c9646531c7..4440acbc07 100644 --- a/src/SSystem/SComponent/c_lib.cpp +++ b/src/SSystem/SComponent/c_lib.cpp @@ -4,7 +4,7 @@ */ #include "SSystem/SComponent/c_lib.h" -#include "string.h" +#include #include "SSystem/SComponent/c_math.h" /** diff --git a/src/SSystem/SComponent/c_math.cpp b/src/SSystem/SComponent/c_math.cpp index 49866b3684..f590bc9bba 100644 --- a/src/SSystem/SComponent/c_math.cpp +++ b/src/SSystem/SComponent/c_math.cpp @@ -5,7 +5,7 @@ #include "SSystem/SComponent/c_math.h" #include "SSystem/SComponent/c_m3d.h" -#include +#include s16 cM_rad2s(f32 rad) { s32 s = (std::fmod(rad, 2 * M_PI) * (0x8000 / M_PI)); diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c index a30ab8c7a8..36473080f0 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/mem_TRK.c @@ -4,7 +4,7 @@ */ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mem_TRK.h" -#include +#include #pragma dont_inline on void TRK_fill_mem(void* dst, int val, u32 n) { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c index 094ec4c2bd..36a33d75fa 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/msghndlr.c @@ -2,7 +2,7 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubevent.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include "trk.h" -#include +#include static BOOL IsTRKConnected; diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c index 1afc4a68cc..b386f7cdbe 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Portable/support.c @@ -1,7 +1,7 @@ #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/support.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" #include "TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.h" -#include +#include DSError TRKSuppAccessFile(u32 file_handle, u8* data, size_t* count, DSIOResult* io_result, BOOL need_reply, BOOL read) { diff --git a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c index 76fef30a46..becb062ca8 100644 --- a/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c +++ b/src/TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Processor/ppc/Generic/targimpl.c @@ -1,7 +1,7 @@ #include "TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.h" #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h" -#include -#include +#include +#include typedef struct memRange { u8* start; diff --git a/src/Z2AudioLib/Z2Calc.cpp b/src/Z2AudioLib/Z2Calc.cpp index 91eccdcfb6..3f0ab802e0 100644 --- a/src/Z2AudioLib/Z2Calc.cpp +++ b/src/Z2AudioLib/Z2Calc.cpp @@ -1,6 +1,6 @@ #include "Z2AudioLib/Z2Calc.h" #include "JSystem/JMath/random.h" -#include +#include f32 Z2Calc::linearTransform(f32 inValue, f32 inMin, f32 inMax, f32 outMin, f32 outMax, bool noClamp) { f32 transformed = outMin + ((inValue - inMin) * ((outMax - outMin) / (inMax - inMin))); diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 6513781efe..a99c2ea721 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -16,7 +16,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -#include +#include enum B_bq_RES_File_ID { /* BCK */ diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 09b761d637..4600e64c7f 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_tn.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_nbomb.h" diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index ea53c4d7be..ed9383a6e9 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -17,7 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" -#include +#include enum Joint { /* 0x00 */ JNT_CENTER, diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index d94326b6b2..83482ffd36 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" -#include +#include int daB_ZANTM_c::draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index c67b00498e..282bec5900 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -11,7 +11,7 @@ #include "d/d_cc_uty.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_math.h" -#include +#include namespace { dCcD_SrcSph cc_zant_src = { diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 6fee7b6dde..cc3b88375b 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_bg_obj.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" -#include +#include #include "dolphin/os.h" #include "d/actor/d_a_set_bgobj.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index 4c1e8e8c5e..0f0f827d0c 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -5,7 +5,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_dbdoor00.h" -#include "printf.h" +#include #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_player.h" #include "d/d_door_param2.h" diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index dec122fa0c..05958a9b45 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_meter2_info.h" #include "SSystem/SComponent/c_math.h" -#include "printf.h" +#include u32 knob_param_c::getDoorModel(fopAc_ac_c* i_this) { return fopAcM_GetParamBit(i_this, 5, 3); diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 4bf468af08..4689faed0a 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -14,7 +14,7 @@ #include "d/d_msg_object.h" #include "d/d_map_path_dmap.h" #include "SSystem/SComponent/c_math.h" -#include "printf.h" +#include char* daDoor20_c::getStopBmdName() { switch (door_param2_c::getKind(this)) { diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index 0f13d897a4..b8f5114d6d 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" -#include +#include #define ACTION_MODE_WAIT 0 #define ACTION_MODE_CHASE 1 diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 6f2ccf382c..1a8a58b611 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_actor_enemy.h" #include "f_op/f_op_camera_mng.h" #include "d/d_bomb.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" class daE_SW_HIO_c { diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index e3e0b9de5f..c43e04cb25 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -9,7 +9,7 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "SSystem/SComponent/c_math.h" #include "c/c_damagereaction.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 2a9920ddd4..fefe58fd45 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_e_ws.h" #include "d/actor/d_a_obj_carry.h" -#include +#include #include "f_op/f_op_actor_enemy.h" class daE_WS_HIO_c : public JORReflexible { diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 750a6ea406..956a31bc88 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_camera_mng.h" -#include +#include #include "Z2AudioLib/Z2Instances.h" struct daE_YMB_HIO_c { diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 83fe7c78d2..33a079524c 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -10,7 +10,7 @@ #include "SSystem/SComponent/c_math.h" #include "d/d_com_inf_game.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include #include "d/actor/d_grass.inc" // IWYU pragma: keep #include "d/actor/d_flower.inc" diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index a99b8d4b8f..f77b11be6c 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -17,7 +17,7 @@ #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" #include "JSystem/JAudio2/JAUSectionHeap.h" -#include +#include #define ANM_HS_BACK_WALK 6 #define ANM_HS_WALK_START 7 diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index b863c19ba9..b9909276b2 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -10,7 +10,7 @@ #include "d/d_com_inf_game.h" #include "d/d_msg_object.h" -#include +#include #include "d/actor/d_a_balloon_2D.h" #include "d/actor/d_a_e_ym.h" diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index bdac3c86c4..f46f0c237e 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -22,7 +22,7 @@ #include "c/c_damagereaction.h" #include "SSystem/SComponent/c_counter.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include class dmg_rod_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index b9cb555a42..e81a8a2b8c 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -11,7 +11,7 @@ #include "SSystem/SComponent/c_m3d_g_pla.h" #include "Z2AudioLib/Z2Instances.h" #include "c/c_damagereaction.h" -#include +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_canoe.h" #include "d/actor/d_a_mg_fshop.h" diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 8c1f7d9525..b4009d49bf 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -1328,7 +1328,7 @@ int daNpc_Taro_c::cutSwdTutorial(int param_1) { break; } } - int local_68[2] = {-1, 0xffffffff}; + int local_68[2] = {-1, -1}; switch (local_70) { case 0: mJntAnm.lookPlayer(0); diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index 0697f830c3..59e2ed6fd5 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_s_play.h" #include "d/actor/d_a_player.h" -#include +#include void daObjBhbridge_c::RideOn_Angle(s16& param_1, f32 param_2, s16 param_3, f32 param_4) { cLib_addCalcAngleS(¶m_1, param_3 * (param_2 / param_4), 1, 0x100, 1); diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index cb4b785a34..e3960aebce 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" -#include +#include #include "d/d_com_inf_game.h" #include "SSystem/SComponent/c_math.h" #include "d/actor/d_a_obj_swBallA.h" diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index 87d7158cd7..7a54788e6b 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -12,7 +12,7 @@ #include "Z2AudioLib/Z2Instances.h" #include "d/d_cc_d.h" #include "d/d_com_inf_game.h" -#include +#include void daObjCwall_c::initBaseMtx() { mWallModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 9a1335844d..62f3922ee6 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -8,7 +8,7 @@ #include "d/actor/d_a_obj_digsnow.h" #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" -#include +#include void daObjDigSnow_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 85f5564e4c..1ee2d25856 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_obj_drop.h" #include "SSystem/SComponent/c_math.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_camera.h" diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index f8b1870f67..879062983f 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -1,7 +1,7 @@ #include "d/actor/d_a_obj_gra2.h" #include "d/d_camera.h" #include "d/actor/d_a_tag_gra.h" -#include +#include f32 daObj_GrA_c::getSrchCircleR() { f32 srchCircleR; diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index 46ddd0ed60..396e79fcf9 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_player.h" #include "d/d_procname.h" #include "d/d_s_play.h" -#include +#include f32 dummyLiteral() { return 0.0f; diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index f58db9592b..ba8ad44d1f 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -12,7 +12,7 @@ #include "d/d_s_play.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" -#include +#include class daOBJ_ICE_S_HIO_c : public JORReflexible { public: diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index e2a5a08b3c..9bab3f6ea2 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -11,7 +11,7 @@ #include "d/actor/d_a_npc_tk.h" #include "d/d_s_play.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include #define PARTS_ALL 0x3FFFF #define PART_TOP_LEFT_UNDER (1 << 0) diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 8b90c751a2..9aab3a1190 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/actor/d_a_player.h" #include "d/d_item.h" -#include +#include void daObjL4DigSand_c::initBaseMtx() { mpModel->setBaseScale(scale); diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index fe71c9fca2..91c6f80b4a 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -9,7 +9,7 @@ #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_lib.h" #include "SSystem/SComponent/c_math.h" -#include +#include #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index 95505cbfb0..c10e53e2be 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_cc_d.h" #include "d/d_item_data.h" -#include +#include const static dCcD_SrcCyl l_cyl_src = { { diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 488436c5ee..852361498a 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -14,7 +14,7 @@ #include "f_op/f_op_kankyo_mng.h" #include "global.h" #include "SSystem/SComponent/c_math.h" -#include +#include const static int l_bmdIdx[2] = {3, 3}; diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 3d2f64299d..909b94da11 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -11,7 +11,7 @@ #include "SSystem/SComponent/c_lib.h" #include "d/d_com_inf_game.h" #include "d/d_bg_w.h" -#include +#include static u32 const l_bmd[2] = { 4, 4, diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index 1949c2f395..0e4abd5d4c 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -10,7 +10,7 @@ #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "f_op/f_op_kankyo_mng.h" -#include +#include static daWdStick_HIO_c l_HIO; diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index 9aafaa6e2f..f072a3f6a9 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_set_bgobj.h" -#include +#include #include "f_op/f_op_actor_mng.h" static const char l_specName[] = "spec.dat"; diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index 99c2c69f6b..ee95c98107 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -1,7 +1,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_camera.h" -#include +#include #include "d/actor/d_a_alink.h" #include "d/d_com_inf_game.h" #include "d/actor/d_a_horse.h" diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index a033afdfe0..06f2a51779 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_chkpoint.h" -#include +#include #include "d/actor/d_a_player.h" int daTag_Chk_c::execute() { diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index 7b77433fbb..fa6470cdda 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -6,7 +6,7 @@ #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_firewall.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_bomb.h" diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index 7e0681ec52..1588e5a9c2 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -4,7 +4,7 @@ #include "d/actor/d_a_npc.h" #include "d/actor/d_a_player.h" #include "SSystem/SComponent/c_counter.h" -#include "string.h" +#include struct EventListItem { char* mEventName; diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index 96955e7610..e736d8d82e 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -7,7 +7,7 @@ #include "d/actor/d_a_tag_sppath.h" #include "d/actor/d_a_player.h" -#include +#include static dCcD_SrcCyl l_cylSrc = { { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index a0149a3d19..117c9b02ba 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -9,7 +9,7 @@ #include "f_op/f_op_camera_mng.h" #include "SSystem/SComponent/c_math.h" #include "Z2AudioLib/Z2Instances.h" -#include +#include static const f32 l_cull_size_box[6] = { -150.0f, -10.0f, -150.0f, 150.0f, 300.0f, 100.0f }; diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index 91e9884f24..8c39fa39aa 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -5,8 +5,8 @@ #include "d/actor/d_a_horse.h" #include "d/d_bg_s_cap_poly.h" -#include -#include +#include +#include #include "SSystem/SComponent/c_bg_s_shdw_draw.h" #include "SSystem/SComponent/c_m2d.h" diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index 9fca792bc5..00acd50d42 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -3,7 +3,7 @@ #include "d/d_camera.h" #include "SSystem/SComponent/c_counter.h" #include "SSystem/SComponent/c_math.h" -#include +#include #include "d/actor/d_a_alink.h" #include "d/actor/d_a_boomerang.h" #include "d/actor/d_a_horse.h" @@ -21,7 +21,7 @@ #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#include +#include namespace { diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 2f22a58de1..87708c6dca 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -22,7 +22,7 @@ #include "m_Do/m_Do_Reset.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include +#include void dComIfG_play_c::ct() { mWindowNum = 0; diff --git a/src/d/d_com_static.cpp b/src/d/d_com_static.cpp index 461f182719..f3bace3685 100644 --- a/src/d/d_com_static.cpp +++ b/src/d/d_com_static.cpp @@ -12,7 +12,7 @@ #include "d/actor/d_a_tag_magne.h" #include "d/actor/d_a_tag_mist.h" #include "d/actor/d_a_tag_stream.h" -#include +#include void daSus_c::data_c::set(s8 i_roomNo, cXyz const& param_1, cXyz const& param_2, u8 param_3, u8 param_4, u8 i_type) { diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index 51b082baf7..df9a133bec 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -9,7 +9,7 @@ #include "d/d_com_inf_game.h" #include "d/d_path.h" #include "f_op/f_op_camera_mng.h" -#include "string.h" +#include static int dEnvSe_Draw(dEnvSe_c* i_this) { return 1; diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 5cf7749878..9bfc896a71 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -5,7 +5,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPicture.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index ab346a899d..41b31b5837 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -13,7 +13,7 @@ #include "d/d_demo.h" #include "d/d_s_play.h" #include "SSystem/SComponent/c_counter.h" -#include +#include #if DEBUG static dEvM_HIO_c l_HIO; diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index c723c99376..642ccc6764 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -11,7 +11,7 @@ #include "d/d_com_inf_game.h" #include "d/d_meter2_info.h" #include "d/d_pane_class_alpha.h" -#include +#include dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { mArchive = i_archive; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 4a5233faa4..209de4cd58 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -24,7 +24,7 @@ #include "f_op/f_op_kankyo.h" #include "m_Do/m_Do_graphic.h" #include "m_Do/m_Do_lib.h" -#include +#include static void GxXFog_set(); diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index bcdbb5412e..8acb561fde 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -12,7 +12,7 @@ #include "d/d_kankyo.h" #include "d/d_kankyo_rain.h" #include "f_op/f_op_camera_mng.h" -#include "string.h" +#include #include "m_Do/m_Do_audio.h" static void dKyw_pntlight_set(WIND_INFLUENCE* pntwind); diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp index 80278dda50..468b2c2f17 100644 --- a/src/d/d_menu_dmap_map.cpp +++ b/src/d/d_menu_dmap_map.cpp @@ -4,7 +4,7 @@ #include "d/dolzel.h" // IWYU pragma: keep -#include +#include #include "d/d_com_inf_game.h" #include "d/d_map_path_dmap.h" #include "d/d_menu_dmap.h" diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 1fb29a54ce..b9b22f841b 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -5,7 +5,7 @@ #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include +#include #include "f_op/f_op_msg_mng.h" #include "d/d_com_inf_game.h" #include "d/d_lib.h" diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 6b847ef8ee..953cd73589 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -19,7 +19,7 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include +#include typedef void (dMenu_Insect_c::*initFunc)(); static initFunc map_init_process[] = { diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index 8ef451074a..cc901b9a72 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -9,7 +9,7 @@ #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JUtility/JUTTexture.h" -#include +#include #include "d/actor/d_a_player.h" #include "d/d_com_inf_game.h" #include "d/d_item.h" diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index 7e45500dc9..57a20807f4 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -4,7 +4,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include +#include #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index e0bf6c8714..647638768c 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -22,7 +22,7 @@ #include "f_op/f_op_msg_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "string.h" +#include typedef void (dMenu_Option_c::*initFunc)(); static initFunc init[] = { diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index 48747da384..4785e46bf0 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -25,9 +25,9 @@ #include "d/d_msg_string.h" #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_graphic.h" -#include "string.h" +#include -#include +#include typedef void (dMenu_Ring_c::*initFunc)(); static initFunc stick_init[] = { diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 1faa35b2ed..b9737e3a4b 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -3,7 +3,7 @@ #include "d/d_menu_save.h" #include "JSystem/JKernel/JKRExpHeap.h" #include "JSystem/JKernel/JKRMemArchive.h" -#include +#include #include "d/d_com_inf_game.h" #include "d/d_lib.h" #include "d/d_select_cursor.h" diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index 971868b3fa..5be39371cd 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -20,7 +20,7 @@ #include "d/d_msg_class.h" #include "d/d_msg_object.h" #include "d/d_pane_class.h" -#include "string.h" +#include dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { OS_REPORT("enter dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap *mp_heap)\n"); diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index c7ecc0780a..683b192bb6 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1,7 +1,7 @@ #include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_class.h" -#include +#include #include "d/d_meter2_info.h" #include "d/d_msg_object.h" #include "d/d_msg_unit.h" diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 6e2287a869..f1a9c6945c 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -22,7 +22,7 @@ #include "d/d_meter2.h" #include "d/actor/d_a_midna.h" #include "f_op/f_op_msg_mng.h" -#include +#include #include "m_Do/m_Do_controller_pad.h" #include "m_Do/m_Do_lib.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index 834919ff1d..557ed12cd9 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -10,7 +10,7 @@ #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/J2DGraph/J2DScreen.h" #include "JSystem/J2DGraph/J2DTextBox.h" -#include "string.h" +#include #include "d/d_com_inf_game.h" #include "d/d_select_cursor.h" #include "d/d_msg_object.h" diff --git a/src/d/d_msg_scrn_base.cpp b/src/d/d_msg_scrn_base.cpp index 11bbadf7c5..43651004d3 100644 --- a/src/d/d_msg_scrn_base.cpp +++ b/src/d/d_msg_scrn_base.cpp @@ -6,7 +6,7 @@ #include "d/d_msg_object.h" #include "d/d_msg_out_font.h" #include "d/d_pane_class.h" -#include "string.h" +#include dMsgScrnBase_c::dMsgScrnBase_c() { init(); diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index 01794f419e..a6618cf265 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -11,7 +11,7 @@ #include "d/d_msg_string.h" #include "d/d_pane_class.h" #include "m_Do/m_Do_controller_pad.h" -#include +#include #if VERSION == VERSION_GCN_JPN #define STR_BUF_LEN 528 diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index 1b1dfcad4a..0e2447b4b0 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -2,7 +2,7 @@ #include "d/d_msg_unit.h" #include "d/d_com_inf_game.h" -#include +#include #include "d/d_kankyo.h" #include "d/d_meter2_info.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 9dcb14d00a..bd2515ecc3 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -6,7 +6,7 @@ #include "d/d_lib.h" #include "m_Do/m_Do_audio.h" #include "m_Do/m_Do_controller_pad.h" -#include +#include #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "f_op/f_op_msg_mng.h" diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index a955d202fe..fec0de589c 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -17,7 +17,7 @@ #include "JSystem/JParticle/JPAResourceManager.h" #include "JSystem/JMath/JMATrigonometric.h" #include "d/d_s_play.h" -#include +#include #include "d/d_com_inf_game.h" #include "m_Do/m_Do_lib.h" #include "m_Do/m_Do_graphic.h" diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index a372d5ad57..be4e71b9f3 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -14,7 +14,7 @@ #include "d/d_com_inf_game.h" #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_graphic.h" -#include +#include dRes_info_c::dRes_info_c() { mCount = 0; @@ -44,7 +44,9 @@ dRes_info_c::~dRes_info_c() { int dRes_info_c::set(char const* i_arcName, char const* i_path, u8 i_mountDirection, JKRHeap* i_heap) { char path[40]; +#ifdef __MWERKS__ JUT_ASSERT(120, strlen(i_arcName) <= NAME_MAX); +#endif if (*i_path != NULL) { snprintf(path, sizeof(path), "%s%s.arc", i_path, i_arcName); @@ -334,7 +336,9 @@ int dRes_info_c::loadResource() { const char* name_p = mArchive->mStringTable + entry->getNameOffset(); size_t resNameLen = strlen(name_p) - 4; +#ifdef __MWERKS__ JUT_ASSERT(0x301, resNameLen <= NAME_MAX); +#endif char arcName[9]; strncpy(arcName, name_p, resNameLen); @@ -490,7 +494,9 @@ void dRes_info_c::deleteArchiveRes() { u32 nameOffset = fileEntry->getNameOffset(); const char* fileName = mArchive->mStringTable + nameOffset; size_t resNameLen = strlen(fileName) - 4; +#ifdef __MWERKS__ JUT_ASSERT(0x46C, resNameLen <= NAME_MAX); +#endif char nameBuffer[12]; strncpy(nameBuffer, fileName, resNameLen); diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index da6d9d5918..e86cc5f062 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -19,7 +19,7 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTReport.h" -#include +#include #if DEBUG void dScnMenu_setItem(int i_slotNo, u8 i_itemNo); diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 9c4bb22f2d..b0b6ad1e19 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -10,7 +10,7 @@ #include "d/d_s_play.h" #include "d/d_s_room.h" #include "m_Do/m_Do_Reset.h" -#include +#include static int dScnRoom_Draw(room_of_scene_class* i_this) { return 1; diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index 9b8f2d1805..99bcced05a 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -13,7 +13,7 @@ #include "d/d_save.h" #include "d/d_save_init.h" #include "f_op/f_op_scene_mng.h" -#include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index cbb907c16d..7c6a9dc2c0 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -17,7 +17,7 @@ #include "f_op/f_op_scene_mng.h" #include "global.h" #include "m_Do/m_Do_Reset.h" -#include +#include void dStage_nextStage_c::set(const char* i_stage, s8 i_roomId, s16 i_point, s8 i_layer, s8 i_wipe, u8 i_speed) { diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index 6b5a96362d..d3bd59c5cf 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -5,7 +5,7 @@ #include "f_op/f_op_camera_mng.h" #include "m_Do/m_Do_controller_pad.h" #include "SSystem/SComponent/c_math.h" -#include +#include #define RESET_FRAME -99 diff --git a/src/dolphin/card/CARDUnlock.c b/src/dolphin/card/CARDUnlock.c index 124e0c2069..48f64e500a 100644 --- a/src/dolphin/card/CARDUnlock.c +++ b/src/dolphin/card/CARDUnlock.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/dsp/dsp.c b/src/dolphin/dsp/dsp.c index 085cde1f6d..bd38142c8d 100644 --- a/src/dolphin/dsp/dsp.c +++ b/src/dolphin/dsp/dsp.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/dsp/dsp_task.c b/src/dolphin/dsp/dsp_task.c index b1651a0de3..1f11c7123d 100644 --- a/src/dolphin/dsp/dsp_task.c +++ b/src/dolphin/dsp/dsp_task.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXDisplayList.c b/src/dolphin/gx/GXDisplayList.c index 356cfcb4a9..e0f3892c18 100644 --- a/src/dolphin/gx/GXDisplayList.c +++ b/src/dolphin/gx/GXDisplayList.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXFifo.c b/src/dolphin/gx/GXFifo.c index 8acdac3688..1ac868a2ec 100644 --- a/src/dolphin/gx/GXFifo.c +++ b/src/dolphin/gx/GXFifo.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/dolphin/gx/GXGeometry.c b/src/dolphin/gx/GXGeometry.c index cbd7a19c40..43c595ee4c 100644 --- a/src/dolphin/gx/GXGeometry.c +++ b/src/dolphin/gx/GXGeometry.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXInit.c b/src/dolphin/gx/GXInit.c index aceef9f9b5..c22f5acbd8 100644 --- a/src/dolphin/gx/GXInit.c +++ b/src/dolphin/gx/GXInit.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/gx/GXMisc.c b/src/dolphin/gx/GXMisc.c index 2138303882..1200461d79 100644 --- a/src/dolphin/gx/GXMisc.c +++ b/src/dolphin/gx/GXMisc.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/dolphin/gx/GXTexture.c b/src/dolphin/gx/GXTexture.c index 8efb2ec06c..1fa9284e8b 100644 --- a/src/dolphin/gx/GXTexture.c +++ b/src/dolphin/gx/GXTexture.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__gx.h" diff --git a/src/dolphin/gx/GXVerifRAS.c b/src/dolphin/gx/GXVerifRAS.c index 4492385851..b6198bfd64 100644 --- a/src/dolphin/gx/GXVerifRAS.c +++ b/src/dolphin/gx/GXVerifRAS.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/dolphin/gx/GXVerifXF.c b/src/dolphin/gx/GXVerifXF.c index 70498a3fdd..d48d4b69b6 100644 --- a/src/dolphin/gx/GXVerifXF.c +++ b/src/dolphin/gx/GXVerifXF.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/dolphin/os/OSError.c b/src/dolphin/os/OSError.c index 8e0ff3dce5..347efdbc0e 100644 --- a/src/dolphin/os/OSError.c +++ b/src/dolphin/os/OSError.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/dolphin/os/__ppc_eabi_init.c b/src/dolphin/os/__ppc_eabi_init.c index 5aef392edc..ec33998fa3 100644 --- a/src/dolphin/os/__ppc_eabi_init.c +++ b/src/dolphin/os/__ppc_eabi_init.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index c288353949..592d87ec3c 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -22,7 +22,7 @@ #include "f_op/f_op_camera_mng.h" #include "f_op/f_op_scene_mng.h" #include "m_Do/m_Do_lib.h" -#include +#include #define MAKE_ITEM_PARAMS(itemNo, itemBitNo, param_2, param_3) \ ((itemNo & 0xFF) << 0x0 | (itemBitNo & 0xFF) << 0x8 | (param_2 & 0xFF) << 0x10 | (param_3 & 0xF) << 0x18) diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index 010b986c00..25c4bc529f 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -8,7 +8,7 @@ #include "JSystem/JUtility/JUTTexture.h" #include "d/d_com_inf_game.h" #include "d/d_save.h" -#include +#include #if VERSION == VERSION_GCN_JPN #define HEADER_TITLE "ゼルダの伝説 ﾄﾜｲﾗｲﾄﾌﾟﾘﾝｾｽ" diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 833a5558a0..c1adb5a8ec 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -22,7 +22,7 @@ #include "m_Do/m_Do_ext.h" #include "m_Do/m_Do_main.h" #include "m_Do/m_Do_mtx.h" -#include +#include namespace m_Do_ext { u8 CurrentHeapAdjustVerbose; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 5ab5fa334b..311685d165 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -33,7 +33,7 @@ #include "m_Do/m_Do_printf.h" #include "m_Do/m_Do_ext2.h" #include "SSystem/SComponent/c_counter.h" -#include +#include #if PLATFORM_WII || PLATFORM_SHIELD #include diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index 3f6ca18008..fe55ea10c9 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -4,7 +4,7 @@ */ #include "m_Do/m_Do_printf.h" -#include +#include #include #include "m_Do/m_Do_ext.h" diff --git a/src/revolution/aralt/aralt.c b/src/revolution/aralt/aralt.c index 1ec72ba63f..b8f8cc1f6a 100644 --- a/src/revolution/aralt/aralt.c +++ b/src/revolution/aralt/aralt.c @@ -2,7 +2,7 @@ #include #include "sdk_math.h" -#include +#include #include "__ar.h" diff --git a/src/revolution/card/CARDUnlock.c b/src/revolution/card/CARDUnlock.c index 124e0c2069..48f64e500a 100644 --- a/src/revolution/card/CARDUnlock.c +++ b/src/revolution/card/CARDUnlock.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dsp/dsp.c b/src/revolution/dsp/dsp.c index f7c03c9cc9..21fa18f843 100644 --- a/src/revolution/dsp/dsp.c +++ b/src/revolution/dsp/dsp.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dsp/dsp_task.c b/src/revolution/dsp/dsp_task.c index fb1455477f..6e66ed448d 100644 --- a/src/revolution/dsp/dsp_task.c +++ b/src/revolution/dsp/dsp_task.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/dvd/dvd.c b/src/revolution/dvd/dvd.c index 13b692f260..0e5dbd0945 100644 --- a/src/revolution/dvd/dvd.c +++ b/src/revolution/dvd/dvd.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include "os/__os.h" #include "__dvd.h" diff --git a/src/revolution/dvd/dvdidutils.c b/src/revolution/dvd/dvdidutils.c index ed6c815b83..f48be89316 100644 --- a/src/revolution/dvd/dvdidutils.c +++ b/src/revolution/dvd/dvdidutils.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__dvd.h" diff --git a/src/revolution/fs/fs.c b/src/revolution/fs/fs.c index bf3af1a1da..1e5f601198 100644 --- a/src/revolution/fs/fs.c +++ b/src/revolution/fs/fs.c @@ -1,6 +1,6 @@ #include #include -#include +#include static IOSFd __fsFd = -1; static u32 __fsInitialized = FALSE; diff --git a/src/revolution/gx/GXDisplayList.c b/src/revolution/gx/GXDisplayList.c index 50d4a6d339..b16e494a8d 100644 --- a/src/revolution/gx/GXDisplayList.c +++ b/src/revolution/gx/GXDisplayList.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXGeometry.c b/src/revolution/gx/GXGeometry.c index a7c00a4483..fd583caefa 100644 --- a/src/revolution/gx/GXGeometry.c +++ b/src/revolution/gx/GXGeometry.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXInit.c b/src/revolution/gx/GXInit.c index 50b5d4026d..0504827170 100644 --- a/src/revolution/gx/GXInit.c +++ b/src/revolution/gx/GXInit.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/gx/GXMisc.c b/src/revolution/gx/GXMisc.c index fe757ab0f7..e80e90ac4b 100644 --- a/src/revolution/gx/GXMisc.c +++ b/src/revolution/gx/GXMisc.c @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/revolution/gx/GXTexture.c b/src/revolution/gx/GXTexture.c index 97abcfda02..0b3b6787f0 100644 --- a/src/revolution/gx/GXTexture.c +++ b/src/revolution/gx/GXTexture.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__gx.h" diff --git a/src/revolution/gx/GXVerifRAS.c b/src/revolution/gx/GXVerifRAS.c index 190647818e..33a16b46ab 100644 --- a/src/revolution/gx/GXVerifRAS.c +++ b/src/revolution/gx/GXVerifRAS.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/revolution/gx/GXVerifXF.c b/src/revolution/gx/GXVerifXF.c index ec2cde4f6d..79783ff192 100644 --- a/src/revolution/gx/GXVerifXF.c +++ b/src/revolution/gx/GXVerifXF.c @@ -1,6 +1,6 @@ #if DEBUG -#include +#include #include diff --git a/src/revolution/homebuttonLib/HBMBase.cpp b/src/revolution/homebuttonLib/HBMBase.cpp index 99beba4c99..f7666506cc 100644 --- a/src/revolution/homebuttonLib/HBMBase.cpp +++ b/src/revolution/homebuttonLib/HBMBase.cpp @@ -8,7 +8,7 @@ #include "nw4hbm/lyt/arcResourceAccessor.h" #include "nw4hbm/math/triangular.h" -#include "new.h" +#include #if HBM_REVISION == 1 #define LN(rev1, rev2) rev1 diff --git a/src/revolution/homebuttonLib/HBMBase.h b/src/revolution/homebuttonLib/HBMBase.h index 8707cb1695..55156b28c6 100644 --- a/src/revolution/homebuttonLib/HBMBase.h +++ b/src/revolution/homebuttonLib/HBMBase.h @@ -17,7 +17,7 @@ #include "nw4hbm/snd/SoundSystem.h" -#include "new.h" +#include namespace homebutton { static void initgx(); diff --git a/src/revolution/homebuttonLib/HBMGUIManager.cpp b/src/revolution/homebuttonLib/HBMGUIManager.cpp index 99ab563da6..0cb856cbdf 100644 --- a/src/revolution/homebuttonLib/HBMGUIManager.cpp +++ b/src/revolution/homebuttonLib/HBMGUIManager.cpp @@ -5,7 +5,7 @@ #include "nw4hbm/lyt/picture.h" #include "nw4hbm/lyt/window.h" -#include "new.h" +#include namespace homebutton { namespace gui { diff --git a/src/revolution/homebuttonLib/HBMRemoteSpk.cpp b/src/revolution/homebuttonLib/HBMRemoteSpk.cpp index 4d2bc75c2d..126029c381 100644 --- a/src/revolution/homebuttonLib/HBMRemoteSpk.cpp +++ b/src/revolution/homebuttonLib/HBMRemoteSpk.cpp @@ -2,7 +2,7 @@ #include "HBMController.h" -#include "string.h" +#include namespace homebutton { diff --git a/src/revolution/homebuttonLib/nw4hbm/db/assert.h b/src/revolution/homebuttonLib/nw4hbm/db/assert.h index 3e62ab08d7..8a7097e4f5 100644 --- a/src/revolution/homebuttonLib/nw4hbm/db/assert.h +++ b/src/revolution/homebuttonLib/nw4hbm/db/assert.h @@ -3,7 +3,7 @@ #include -#include +#include namespace nw4hbm { namespace db { diff --git a/src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp b/src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp index 92d5ce2aa5..a09b2df354 100644 --- a/src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/db/db_directPrint.cpp @@ -3,7 +3,7 @@ #include "assert.h" #include "directPrint.h" -#include +#include #define ROUND_UP(x, align) (((x) + (align)-1) & (-(align))) #define ROUND_DOWN(x, align) ((x) & (~((align) - 1))) diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp index a1a86b1603..f142b9ff51 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp @@ -4,8 +4,8 @@ #include "layout.h" #include "pane.h" -#include "new.h" -#include +#include +#include namespace { // pretend this is nw4hbm::lyt diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp index 554ba0d985..f60362fdf4 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_arcResourceAccessor.cpp @@ -2,7 +2,7 @@ #include -#include "string.h" +#include namespace { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp index 9e26b3bdb4..a3579403df 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_common.cpp @@ -2,7 +2,7 @@ #include "layout.h" -#include +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp index ab04812226..df256f4f0a 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_drawInfo.cpp @@ -1,6 +1,6 @@ #include "drawInfo.h" -#include +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp index ef44a5abab..c8a0835765 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp @@ -3,8 +3,8 @@ #include "common.h" #include "layout.h" -#include -#include +#include +#include namespace nw4hbm { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp index 1fe41d34e9..53f7566427 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp @@ -5,7 +5,7 @@ #include "textBox.h" #include "window.h" -#include +#include #define CONVERT_OFFSET_TO_PTR(type_, ptr_, offset_) \ reinterpret_cast(reinterpret_cast(ptr_) + offset_) diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp index ac44e57e51..cbc6cd036e 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_material.cpp @@ -6,7 +6,7 @@ #include -#include +#include static const GXColorS10 DefaultBlackColor = {0, 0, 0, 0}; diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp index a56cf35c0f..cf8e2f4091 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_pane.cpp @@ -3,7 +3,7 @@ #include "common.h" #include "layout.h" -#include +#include namespace { // pretend this is nw4hbm::lyt diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp index 65d262e033..5d1d522523 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp @@ -2,7 +2,7 @@ #include "layout.h" -#include "new.h" +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp index 1dc5fea683..d7bb8f9050 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp @@ -8,7 +8,7 @@ #include "pane.h" #include "textBox.h" -#include "new.h" +#include namespace nw4hbm { namespace lyt { diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp index bc909c15eb..294e5ca820 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp @@ -2,7 +2,7 @@ #include "layout.h" -#include "new.h" +#include struct TextureFlipInfo { /* 0x00 */ u8 coords[4][2]; diff --git a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h b/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h index 5a7485eb0a..e0ccf2445c 100644 --- a/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h +++ b/src/revolution/homebuttonLib/nw4hbm/math/arithmetic.h @@ -1,8 +1,8 @@ #ifndef NW4HBM_MATH_ARITHMETIC_H #define NW4HBM_MATH_ARITHMETIC_H -#include -#include +#include +#include #include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h b/src/revolution/homebuttonLib/nw4hbm/math/triangular.h index f260a5ceeb..9f175a00cc 100644 --- a/src/revolution/homebuttonLib/nw4hbm/math/triangular.h +++ b/src/revolution/homebuttonLib/nw4hbm/math/triangular.h @@ -1,8 +1,8 @@ #ifndef NW4HBM_MATH_TRIANGULAR_H #define NW4HBM_MATH_TRIANGULAR_H -#include -#include +#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h b/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h index 65ac357af8..feb0933c1b 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/AxVoice.h @@ -4,7 +4,7 @@ #include #include #include "DisposeCallbackManager.h" -#include "climits.h" +#include #include "snd_global.h" #include "snd_types.h" diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h b/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h index 49185de63d..335d9bec1b 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/Channel.h @@ -1,7 +1,7 @@ #ifndef NW4HBM_SND_CHANNEL_H #define NW4HBM_SND_CHANNEL_H -#include // USHRT_MAX +#include // USHRT_MAX #include diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h b/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h index 9a74c22f39..69054fc90d 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h @@ -1,7 +1,7 @@ #ifndef NW4HBM_SND_INSTANCE_POOL_H #define NW4HBM_SND_INSTANCE_POOL_H -#include +#include #include namespace nw4hbm { diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h b/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h index 5af6bb4dda..9649d6920b 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h @@ -1,7 +1,7 @@ #ifndef NW4HBM_SND_SOUND_INSTANCE_MANAGER_H #define NW4HBM_SND_SOUND_INSTANCE_MANAGER_H -#include +#include #include diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h b/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h index 751d69846b..3692ff3ff5 100644 --- a/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h +++ b/src/revolution/homebuttonLib/nw4hbm/ut/LinkList.h @@ -6,7 +6,7 @@ #include "inlines.h" #include "../db/assert.h" -#include +#include namespace nw4hbm { namespace ut { diff --git a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h b/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h index fc21259462..e19778295c 100644 --- a/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h +++ b/src/revolution/homebuttonLib/nw4hbm/ut/TextWriterBase.h @@ -6,8 +6,8 @@ #include "CharWriter.h" #include "Rect.h" -#include -#include +#include +#include #include "TagProcessorBase.h" diff --git a/src/revolution/homebuttonLib/sound/mix.cpp b/src/revolution/homebuttonLib/sound/mix.cpp index 36dcc452ae..2f5cfae669 100644 --- a/src/revolution/homebuttonLib/sound/mix.cpp +++ b/src/revolution/homebuttonLib/sound/mix.cpp @@ -1,7 +1,7 @@ #include "mix.h" -#include +#include #include diff --git a/src/revolution/homebuttonLib/sound/synenv.cpp b/src/revolution/homebuttonLib/sound/synenv.cpp index ec524ec197..c9057b158e 100644 --- a/src/revolution/homebuttonLib/sound/synenv.cpp +++ b/src/revolution/homebuttonLib/sound/synenv.cpp @@ -1,8 +1,8 @@ #include "synprivate.h" -#include -#include +#include +#include #include diff --git a/src/revolution/ipc/ipcProfile.c b/src/revolution/ipc/ipcProfile.c index ff963a44e5..95ffec8bb9 100644 --- a/src/revolution/ipc/ipcProfile.c +++ b/src/revolution/ipc/ipcProfile.c @@ -1,5 +1,5 @@ #include -#include +#include static u32 IpcReqPtrArray[96] = {0}; static u32 IpcReqArray[0x300] = {0}; diff --git a/src/revolution/ipc/ipcclt.c b/src/revolution/ipc/ipcclt.c index 36cd1c1ada..7484547cd2 100644 --- a/src/revolution/ipc/ipcclt.c +++ b/src/revolution/ipc/ipcclt.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include /* macro for matching __ipcQueueRequest */ #define diff(a, b) \ diff --git a/src/revolution/nand/NANDCore.c b/src/revolution/nand/NANDCore.c index 35235c0b3f..c93ec26c9c 100644 --- a/src/revolution/nand/NANDCore.c +++ b/src/revolution/nand/NANDCore.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #ifdef SDK_AUG2010 #define BUILD_DATE "Aug 23 2010" diff --git a/src/revolution/nand/NANDLogging.c b/src/revolution/nand/NANDLogging.c index 3106fde878..8e620895d5 100644 --- a/src/revolution/nand/NANDLogging.c +++ b/src/revolution/nand/NANDLogging.c @@ -1,8 +1,8 @@ #include #include #include -#include -#include +#include +#include static IOSFd s_fd = -255; static IOSError s_err = ISFS_ERROR_UNKNOWN; diff --git a/src/revolution/nand/nand.c b/src/revolution/nand/nand.c index 8e445ca37c..6155789690 100644 --- a/src/revolution/nand/nand.c +++ b/src/revolution/nand/nand.c @@ -2,7 +2,7 @@ #include #include -#include +#include static BOOL nandInspectPermission(u8); static void nandSplitPerm(u8, u32*, u32*, u32*); diff --git a/src/revolution/os/OS.c b/src/revolution/os/OS.c index 57872a3b0e..382a56e524 100644 --- a/src/revolution/os/OS.c +++ b/src/revolution/os/OS.c @@ -9,7 +9,7 @@ #include "__os.h" #include "__dvd.h" -#include +#include #define NOP 0x60000000 diff --git a/src/revolution/os/OSAudioSystem.c b/src/revolution/os/OSAudioSystem.c index a426d869d1..18a6785186 100644 --- a/src/revolution/os/OSAudioSystem.c +++ b/src/revolution/os/OSAudioSystem.c @@ -1,7 +1,7 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSError.c b/src/revolution/os/OSError.c index 771dc4f661..7784d2b086 100644 --- a/src/revolution/os/OSError.c +++ b/src/revolution/os/OSError.c @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/revolution/os/OSExec.c b/src/revolution/os/OSExec.c index 35bdc46f6b..39e2edc4ef 100644 --- a/src/revolution/os/OSExec.c +++ b/src/revolution/os/OSExec.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "__os.h" #include "__dvd.h" diff --git a/src/revolution/os/OSFatal.c b/src/revolution/os/OSFatal.c index cc395e090a..32222db082 100644 --- a/src/revolution/os/OSFatal.c +++ b/src/revolution/os/OSFatal.c @@ -4,7 +4,7 @@ #include #include "__os.h" -#include +#include typedef struct OSFatalParam { GXColor fg; diff --git a/src/revolution/os/OSInterrupt.c b/src/revolution/os/OSInterrupt.c index 939e943533..dc360f2901 100644 --- a/src/revolution/os/OSInterrupt.c +++ b/src/revolution/os/OSInterrupt.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSLaunch.c b/src/revolution/os/OSLaunch.c index 8165e04f11..2c57906e95 100644 --- a/src/revolution/os/OSLaunch.c +++ b/src/revolution/os/OSLaunch.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSLink.c b/src/revolution/os/OSLink.c index ec3bde8938..816c9d3227 100644 --- a/src/revolution/os/OSLink.c +++ b/src/revolution/os/OSLink.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSPlayTime.c b/src/revolution/os/OSPlayTime.c index 16fcb7938c..a374d68409 100644 --- a/src/revolution/os/OSPlayTime.c +++ b/src/revolution/os/OSPlayTime.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSReset.c b/src/revolution/os/OSReset.c index e3ac6c5c52..f0dbc50ba2 100644 --- a/src/revolution/os/OSReset.c +++ b/src/revolution/os/OSReset.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #include "__os.h" #include "__dvd.h" diff --git a/src/revolution/os/OSStateFlags.c b/src/revolution/os/OSStateFlags.c index 959949fab5..723069d5a6 100644 --- a/src/revolution/os/OSStateFlags.c +++ b/src/revolution/os/OSStateFlags.c @@ -1,6 +1,6 @@ #include #include -#include +#include static OSStateFlags StateFlags ATTRIBUTE_ALIGN(32); diff --git a/src/revolution/os/OSSync.c b/src/revolution/os/OSSync.c index e21499a765..4466b94070 100644 --- a/src/revolution/os/OSSync.c +++ b/src/revolution/os/OSSync.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/os/OSTime.c b/src/revolution/os/OSTime.c index 7d7ce67fa0..08eca2ed75 100644 --- a/src/revolution/os/OSTime.c +++ b/src/revolution/os/OSTime.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "__os.h" diff --git a/src/revolution/pad/Pad.c b/src/revolution/pad/Pad.c index e887b188d1..4c68a1aee4 100644 --- a/src/revolution/pad/Pad.c +++ b/src/revolution/pad/Pad.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include "__si.h" diff --git a/src/revolution/sc/scapi_prdinfo.c b/src/revolution/sc/scapi_prdinfo.c index 862666d428..2c7a1400a4 100644 --- a/src/revolution/sc/scapi_prdinfo.c +++ b/src/revolution/sc/scapi_prdinfo.c @@ -1,6 +1,6 @@ #include #include -#include +#include typedef struct { s8 area; diff --git a/src/revolution/sc/scsystem.c b/src/revolution/sc/scsystem.c index 21e090c5db..74d78e6bfc 100644 --- a/src/revolution/sc/scsystem.c +++ b/src/revolution/sc/scsystem.c @@ -1,6 +1,6 @@ #include #include -#include +#include // #include #ifdef SDK_AUG2010 diff --git a/src/revolution/wenc/wenc.c b/src/revolution/wenc/wenc.c index a30c7b7c13..743811892b 100644 --- a/src/revolution/wenc/wenc.c +++ b/src/revolution/wenc/wenc.c @@ -1,5 +1,5 @@ #include -#include +#include typedef struct { s32 nXN; // size 0x04, offset 0x00 diff --git a/src/revolution/wpad/WPAD.c b/src/revolution/wpad/WPAD.c index af5cc1d99c..bdd1531617 100644 --- a/src/revolution/wpad/WPAD.c +++ b/src/revolution/wpad/WPAD.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include "__wpad.h" From 02e0a0127069ddb2b0b2e0f86630f9621210a3bb Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Mon, 5 Jan 2026 03:54:00 -0800 Subject: [PATCH 32/35] Z2AudioLib debug (#3016) --- include/JSystem/JAudio2/JAISeMgr.h | 1 + include/JSystem/JAudio2/JAISound.h | 2 +- include/Z2AudioLib/Z2Param.h | 8 + include/Z2AudioLib/Z2SeqMgr.h | 10 +- include/Z2AudioLib/Z2SoundMgr.h | 6 + include/Z2AudioLib/Z2SoundObjMgr.h | 2 +- include/Z2AudioLib/Z2StatusMgr.h | 2 +- src/Z2AudioLib/Z2AudioArcLoader.cpp | 74 +- src/Z2AudioLib/Z2Calc.cpp | 2 +- src/Z2AudioLib/Z2Param.cpp | 12 + src/Z2AudioLib/Z2SeMgr.cpp | 130 ++- src/Z2AudioLib/Z2SeqMgr.cpp | 1244 ++++++++++++++------------- src/Z2AudioLib/Z2SoundHandles.cpp | 3 +- src/Z2AudioLib/Z2SoundMgr.cpp | 8 +- 14 files changed, 790 insertions(+), 714 deletions(-) diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr.h index a2f1fff791..50f81fb1b4 100644 --- a/include/JSystem/JAudio2/JAISeMgr.h +++ b/include/JSystem/JAudio2/JAISeMgr.h @@ -13,6 +13,7 @@ struct JASSoundParams; */ struct JASNonCopyable { JASNonCopyable() {} + ~JASNonCopyable() {} /* 0x0 */ int field_0x0; }; // Size: 0x4 diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h index 50c45562b9..3e1e36b9ad 100644 --- a/include/JSystem/JAudio2/JAISound.h +++ b/include/JSystem/JAudio2/JAISound.h @@ -349,7 +349,7 @@ public: return audible_ != NULL; } - JAISoundFader& getFader() { return fader_; } + JAISoundFader* getFader() const { return (JAISoundFader*)&fader_; } void fadeIn(u32 maxSteps) { fader_.fadeInFromOut(maxSteps); } void fadeOut(u32 maxSteps) { fader_.fadeOut(maxSteps); } diff --git a/include/Z2AudioLib/Z2Param.h b/include/Z2AudioLib/Z2Param.h index 541bbb9556..aceb09ce97 100644 --- a/include/Z2AudioLib/Z2Param.h +++ b/include/Z2AudioLib/Z2Param.h @@ -47,6 +47,10 @@ struct Z2Param { static u8 BGM_CROSS_FADEOUT_TIME; static u8 BATTLE_BGM_WAIT_TIME; + static f32 ENEMY_NEARBY_DIST; + static f32 BATTLE_FADEIN_DIST; + static f32 BATTLE_FADEOUT_DIST; + static u8 FOUND_TRACK_FI_TIME; static u8 FOUND_TRACK_FO_TIME; static u8 CLOSE_BATTLE_TRACK_FI_TIME; @@ -60,6 +64,10 @@ struct Z2Param { static u8 DARK_SE_FILTER_ON; static u8 DARK_SE_LOW_PASS_FILTER_SETTING; static u8 SYSTEM_SE_USE_DARK_SE_SETTING; + + static f32 AUDIBLE_DELTA_RANGE_VOLUME; + static f32 AUDIBLE_DELTA_RANGE_PAN; + static f32 AUDIBLE_DELTA_RANGE_DOLBY; }; extern u8 data_8045086C; diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h index eadb0e0675..76c2674697 100644 --- a/include/Z2AudioLib/Z2SeqMgr.h +++ b/include/Z2AudioLib/Z2SeqMgr.h @@ -45,7 +45,7 @@ struct Z2SoundFader { fadeIn(fadeTime); } - u32 getCount() { + u32 getCount() const { return transition_.remainingSteps_; } @@ -53,12 +53,8 @@ struct Z2SoundFader { return intensity_; } - f32 getDest() { - if (getCount() != 0) { - return transition_.targetValue_; - } else { - return intensity_; - } + f32 getDest() const { + return getCount() != 0 ? transition_.targetValue_ : getIntensity(); } void calc() { diff --git a/include/Z2AudioLib/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr.h index e8fd244eca..cd6341b2cb 100644 --- a/include/Z2AudioLib/Z2SoundMgr.h +++ b/include/Z2AudioLib/Z2SoundMgr.h @@ -9,6 +9,12 @@ u16 seqCallback(JASTrack* track, u16 command); class Z2SoundMgr : public JASGlobalInstance { public: +#if PLATFORM_GCN + static const int MAX_CATEGORIES = 9; +#else + static const int MAX_CATEGORIES = 10; +#endif + Z2SoundMgr(); void calc(); void setIIR(JAISound* sound, const s16* iir); diff --git a/include/Z2AudioLib/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr.h index da709d2e34..a353ff1bcc 100644 --- a/include/Z2AudioLib/Z2SoundObjMgr.h +++ b/include/Z2AudioLib/Z2SoundObjMgr.h @@ -96,7 +96,7 @@ public: u8 isTwilightBattle(); u8 getEnemyNumNear() const { return enemuNumNear_; } - u8 getEnemyNumVeryFar() { return enemuNumVeryFar_; } + u8 getEnemyNumVeryFar() const { return enemuNumVeryFar_; } bool isForceBattle() { return forceBattle_; } JSUList* getEnemyList() { return this; } diff --git a/include/Z2AudioLib/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr.h index 6532801576..615374f2be 100644 --- a/include/Z2AudioLib/Z2StatusMgr.h +++ b/include/Z2AudioLib/Z2StatusMgr.h @@ -37,7 +37,7 @@ struct Z2StatusMgr : public JASGlobalInstance { /* 0x01 */ u8 mMinute; /* 0x02 */ u8 mWeekday; /* 0x03 */ u8 field_0x03; - /* 0x04 */ s16 mTime; + /* 0x04 */ u16 mTime; /* 0x08 */ void* mEventBit; /* 0x0C */ u8 mPauseFlag; /* 0x10 */ u32 mCameraMapInfo; diff --git a/src/Z2AudioLib/Z2AudioArcLoader.cpp b/src/Z2AudioLib/Z2AudioArcLoader.cpp index d16a9d82ab..93343014c5 100644 --- a/src/Z2AudioLib/Z2AudioArcLoader.cpp +++ b/src/Z2AudioLib/Z2AudioArcLoader.cpp @@ -24,53 +24,57 @@ bool Z2AudioArcLoader::readCommandMore(u32 command) { } void Z2AudioArcLoader::readBFCA(const void* addr) { - JUT_ASSERT(76, addr); + { + JUT_ASSERT(76, addr); - JKRHeap* heap = JAUSectionHeap::getInstance()->getHeap(); - JUT_ASSERT(78, heap); - JUT_ASSERT(79, Z2GetFxLineMgr()); + JKRHeap* heap = JAUSectionHeap::getInstance()->getHeap(); + JUT_ASSERT(78, heap); + JUT_ASSERT(79, Z2GetFxLineMgr()); - JKRArchive* archive = JKRMountArchive((void*)addr, JKRGetCurrentHeap(), JKRArchive::MOUNT_DIRECTION_TAIL); - Z2GetFxLineMgr()->initDataArc(archive, heap); - JKRUnmountArchive(archive); + JKRArchive* archive = JKRMountArchive((void*)addr, JKRGetCurrentHeap(), JKRArchive::MOUNT_DIRECTION_TAIL); + Z2GetFxLineMgr()->initDataArc(archive, heap); + JKRUnmountArchive(archive); + } } void Z2AudioArcLoader::readBSTN(const void* addr, u32 param_1) { #if VERSION == VERSION_SHIELD_DEBUG - JAUSectionHeap* sectionHeap = JASGlobalInstance::getInstance(); - JUT_ASSERT(97, sectionHeap); + { + JAUSectionHeap* sectionHeap = JASGlobalInstance::getInstance(); + JUT_ASSERT(97, sectionHeap); - JUT_ASSERT(99, sectionHeap->isOpen()); - JUT_ASSERT(100, sectionHeap->isBuilding()); - JUT_ASSERT(101, addr); + JUT_ASSERT(99, sectionHeap->isOpen()); + JUT_ASSERT(100, sectionHeap->isBuilding()); + JUT_ASSERT(101, addr); - JUT_ASSERT(103, sectionHeap->getSectionHeapData().soundNameTable == 0); + JUT_ASSERT(103, sectionHeap->getSectionHeapData().soundNameTable == 0); - JKRHeap* heap = JKRHeap::getCurrentHeap(); - JKRHeap* gameHeap = (JKRHeap*)mDoExt_getGameHeap(); - JKRSetCurrentHeap(gameHeap); + JKRHeap* heap = JKRHeap::getCurrentHeap(); + JKRHeap* gameHeap = (JKRHeap*)mDoExt_getGameHeap(); + JKRSetCurrentHeap(gameHeap); - u8* bstnDst = (u8*)addr; - if (param_1 != 0) { - bstnDst = new (gameHeap, 4) u8[param_1]; - if (bstnDst != NULL) { - memcpy(bstnDst, addr, param_1); + u8* bstnDst = (u8*)addr; + if (param_1 != 0) { + bstnDst = new (gameHeap, 4) u8[param_1]; + if (bstnDst != NULL) { + memcpy(bstnDst, addr, param_1); + } + + JUT_ASSERT(122, bstnDst); } - JUT_ASSERT(122, bstnDst); + JAUSoundNameTable* soundNameTable = new (gameHeap, 0) JAUSoundNameTable(true); + JUT_ASSERT(125, soundNameTable); + + soundNameTable->init(bstnDst); + + JAUSectionHeap::TSectionHeapData& sectionHeapData = (JAUSectionHeap::TSectionHeapData&)sectionHeap->getSectionHeapData(); + sectionHeapData.soundNameTable = soundNameTable; + + JAUSection::TSectionData& sectionData = (JAUSection::TSectionData&)sectionHeap->getSectionData(); + sectionData.mBstnDst = bstnDst; + + JKRSetCurrentHeap(heap); } - - JAUSoundNameTable* soundNameTable = new (gameHeap, 0) JAUSoundNameTable(true); - JUT_ASSERT(125, soundNameTable); - - soundNameTable->init(bstnDst); - - JAUSectionHeap::TSectionHeapData& sectionHeapData = (JAUSectionHeap::TSectionHeapData&)sectionHeap->getSectionHeapData(); - sectionHeapData.soundNameTable = soundNameTable; - - JAUSection::TSectionData& sectionData = (JAUSection::TSectionData&)sectionHeap->getSectionData(); - sectionData.mBstnDst = bstnDst; - - JKRSetCurrentHeap(heap); #endif } diff --git a/src/Z2AudioLib/Z2Calc.cpp b/src/Z2AudioLib/Z2Calc.cpp index 3f0ab802e0..a55a14c753 100644 --- a/src/Z2AudioLib/Z2Calc.cpp +++ b/src/Z2AudioLib/Z2Calc.cpp @@ -46,7 +46,7 @@ f32 Z2Calc::getRandom(f32 magnitude, f32 exponent, f32 bias) { f32 negBias = (1.0f - bias) * -2.0f; magnitude *= Z2Calc::getRandom_0_1() < bias ? posBias : negBias; - f32 exprnd = pow(Z2Calc::getRandom_0_1(), exponent); + f32 exprnd = powf(Z2Calc::getRandom_0_1(), exponent); return exprnd * magnitude; } diff --git a/src/Z2AudioLib/Z2Param.cpp b/src/Z2AudioLib/Z2Param.cpp index 064a1e0521..d081c73b07 100644 --- a/src/Z2AudioLib/Z2Param.cpp +++ b/src/Z2AudioLib/Z2Param.cpp @@ -80,7 +80,13 @@ u8 Z2Param::BGM_CROSS_FADEIN_TIME = 60; u8 Z2Param::BGM_CROSS_FADEOUT_TIME = 60; u8 Z2Param::BATTLE_BGM_WAIT_TIME = 30; +#if DEBUG +f32 Z2Param::ENEMY_NEARBY_DIST = 700.0f; +f32 Z2Param::BATTLE_FADEIN_DIST = 1100.0f; + +f32 Z2Param::BATTLE_FADEOUT_DIST = 1500.0f; +#endif u8 Z2Param::FOUND_TRACK_FI_TIME = 20; u8 Z2Param::FOUND_TRACK_FO_TIME = 30; @@ -98,7 +104,13 @@ u8 Z2Param::ENDING_BLOW_VOL_LOWER_RECOVER_TIME = 30; u8 Z2Param::ENDING_BLOW_MIN_FINISH_TIME = 20; u8 data_8045086C = 1; +#if DEBUG +f32 Z2Param::AUDIBLE_DELTA_RANGE_VOLUME = 0.25f; +f32 Z2Param::AUDIBLE_DELTA_RANGE_PAN = 0.15f; + +f32 Z2Param::AUDIBLE_DELTA_RANGE_DOLBY = 0.15f; +#endif f32 Z2Param::MIN_DISTANCE_VOLUME; f32 Z2Param::ENEMY_LASTHIT_MUTE_VOLUME; diff --git a/src/Z2AudioLib/Z2SeMgr.cpp b/src/Z2AudioLib/Z2SeMgr.cpp index c53af03ece..03cee56fb9 100644 --- a/src/Z2AudioLib/Z2SeMgr.cpp +++ b/src/Z2AudioLib/Z2SeMgr.cpp @@ -77,7 +77,7 @@ void Z2SeMgr::modHeightAtCamera(const Vec** param_0) { for (i = 0; i < 8; i++) { if (mModY[i] == NULL) { idx = i; - mModY[i] = *param_0; + mModY[idx] = *param_0; break; } } @@ -752,71 +752,77 @@ void Z2SeMgr::messageSePlay(u16 param_0, Vec* param_1, s8 param_2) { } void Z2SeMgr::talkInSe() { - if (Z2GetSceneMgr()->isInGame()) { - if (Z2GetStatusMgr()->getDemoStatus() == 13) { - seMoveVolumeAll(0.0f, 0); - } + if (!Z2GetSceneMgr()->isInGame()) { + return; + } - JAISeMgr* seMgr = Z2GetSoundMgr()->getSeMgr(); - seMgr->getCategory(0)->getParams()->moveVolume(Z2Param::VOL_SE_SYSTEM_TALKING, 2); - seMgr->getCategory(1)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_VOICE_TALKING, 2); - seMgr->getCategory(2)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_MOTION_TALKING, 2); - seMgr->getCategory(3)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_FOOTNOTE_TALKING, 2); - seMgr->getCategory(4)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_TALKING, 2); - seMgr->getCategory(5)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_TALKING, 2); - seMgr->getCategory(6)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_MOVE_TALKING, 2); - seMgr->getCategory(7)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_TALKING, 2); - seMgr->getCategory(8)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_TALKING, 2); + if (Z2GetStatusMgr()->getDemoStatus() == 13) { + seMoveVolumeAll(0.0f, 0); + } - if (Z2GetStatusMgr()->getDemoStatus() != 12) { - seMgr->getCategory(9)->getParams()->moveVolume(Z2Param::VOL_SE_ATMOSPHERE_TALKING, 2); - } + JAISeMgr* seMgr = Z2GetSoundMgr()->getSeMgr(); + seMgr->getCategory(0)->getParams()->moveVolume(Z2Param::VOL_SE_SYSTEM_TALKING, 2); + seMgr->getCategory(1)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_VOICE_TALKING, 2); + seMgr->getCategory(2)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_MOTION_TALKING, 2); + seMgr->getCategory(3)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_FOOTNOTE_TALKING, 2); + seMgr->getCategory(4)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_TALKING, 2); + seMgr->getCategory(5)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_TALKING, 2); + seMgr->getCategory(6)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_MOVE_TALKING, 2); + seMgr->getCategory(7)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_TALKING, 2); + seMgr->getCategory(8)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_TALKING, 2); + + if (Z2GetStatusMgr()->getDemoStatus() != 12) { + seMgr->getCategory(9)->getParams()->moveVolume(Z2Param::VOL_SE_ATMOSPHERE_TALKING, 2); } } void Z2SeMgr::talkOutSe() { - if (Z2GetSceneMgr()->isInGame()) { - if (Z2GetStatusMgr()->getDemoStatus() == 13) { - seMoveVolumeAll(0.0f, 0); - } + if (!Z2GetSceneMgr()->isInGame()) { + return; + } - JAISeMgr* seMgr = Z2GetSoundMgr()->getSeMgr(); - seMgr->getCategory(0)->getParams()->moveVolume(Z2Param::VOL_SE_SYSTEM_DEFAULT, 2); - seMgr->getCategory(1)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_VOICE_DEFAULT, 2); - seMgr->getCategory(2)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_MOTION_DEFAULT, 2); - seMgr->getCategory(3)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_FOOTNOTE_DEFAULT, 2); - seMgr->getCategory(4)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_DEFAULT, 2); - seMgr->getCategory(5)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_DEFAULT, 2); - seMgr->getCategory(6)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_MOVE_DEFAULT, 2); - seMgr->getCategory(7)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_DEFAULT, 2); - seMgr->getCategory(8)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_DEFAULT, 2); + if (Z2GetStatusMgr()->getDemoStatus() == 13) { + seMoveVolumeAll(0.0f, 0); + } - if (Z2GetStatusMgr()->getDemoStatus() != 12) { - seMgr->getCategory(9)->getParams()->moveVolume(Z2Param::VOL_SE_ATMOSPHERE_DEFAULT, 2); - } + JAISeMgr* seMgr = Z2GetSoundMgr()->getSeMgr(); + seMgr->getCategory(0)->getParams()->moveVolume(Z2Param::VOL_SE_SYSTEM_DEFAULT, 2); + seMgr->getCategory(1)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_VOICE_DEFAULT, 2); + seMgr->getCategory(2)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_MOTION_DEFAULT, 2); + seMgr->getCategory(3)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_FOOTNOTE_DEFAULT, 2); + seMgr->getCategory(4)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_DEFAULT, 2); + seMgr->getCategory(5)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_DEFAULT, 2); + seMgr->getCategory(6)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_MOVE_DEFAULT, 2); + seMgr->getCategory(7)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_DEFAULT, 2); + seMgr->getCategory(8)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_DEFAULT, 2); + + if (Z2GetStatusMgr()->getDemoStatus() != 12) { + seMgr->getCategory(9)->getParams()->moveVolume(Z2Param::VOL_SE_ATMOSPHERE_DEFAULT, 2); } } void Z2SeMgr::menuInSe() { - if (Z2GetSceneMgr()->isInGame()) { - if (Z2GetStatusMgr()->getDemoStatus() == 13) { - seMoveVolumeAll(0.0f, 0); - } + if (!Z2GetSceneMgr()->isInGame()) { + return; + } - JAISeMgr* seMgr = Z2GetSoundMgr()->getSeMgr(); - seMgr->getCategory(0)->getParams()->moveVolume(Z2Param::VOL_SE_SYSTEM_PAUSING, 2); - seMgr->getCategory(1)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_VOICE_PAUSING, 2); - seMgr->getCategory(2)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_MOTION_PAUSING, 2); - seMgr->getCategory(3)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_FOOTNOTE_PAUSING, 2); - seMgr->getCategory(4)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_PAUSING, 2); - seMgr->getCategory(5)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_PAUSING, 2); - seMgr->getCategory(6)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_MOVE_PAUSING, 2); - seMgr->getCategory(7)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_PAUSING, 2); - seMgr->getCategory(8)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_PAUSING, 2); + if (Z2GetStatusMgr()->getDemoStatus() == 13) { + seMoveVolumeAll(0.0f, 0); + } - if (Z2GetStatusMgr()->getDemoStatus() != 12) { - seMgr->getCategory(9)->getParams()->moveVolume(Z2Param::VOL_SE_ATMOSPHERE_PAUSING, 2); - } + JAISeMgr* seMgr = Z2GetSoundMgr()->getSeMgr(); + seMgr->getCategory(0)->getParams()->moveVolume(Z2Param::VOL_SE_SYSTEM_PAUSING, 2); + seMgr->getCategory(1)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_VOICE_PAUSING, 2); + seMgr->getCategory(2)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_MOTION_PAUSING, 2); + seMgr->getCategory(3)->getParams()->moveVolume(Z2Param::VOL_SE_LINK_FOOTNOTE_PAUSING, 2); + seMgr->getCategory(4)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_PAUSING, 2); + seMgr->getCategory(5)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_PAUSING, 2); + seMgr->getCategory(6)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_MOVE_PAUSING, 2); + seMgr->getCategory(7)->getParams()->moveVolume(Z2Param::VOL_SE_CHAR_VOICE_PAUSING, 2); + seMgr->getCategory(8)->getParams()->moveVolume(Z2Param::VOL_SE_OBJECT_PAUSING, 2); + + if (Z2GetStatusMgr()->getDemoStatus() != 12) { + seMgr->getCategory(9)->getParams()->moveVolume(Z2Param::VOL_SE_ATMOSPHERE_PAUSING, 2); } } @@ -1231,25 +1237,9 @@ void Z2MultiSeMgr::resetMultiSePos() { } f32 Z2MultiSeMgr::getPanPower() { - f32 pow_r = getMaxPowR(); - f32 pow_l = getMaxPowL(); - if (pow_l + pow_r > 0.0f) { - f32 pow_r = getMaxPowR(); - f32 pow_l = getMaxPowL(); - return getMaxPowR() / (pow_l + pow_r); - } else { - return 0.5f; - } + return getMaxPowL() + getMaxPowR() > 0.0f ? getMaxPowR() / (getMaxPowL() + getMaxPowR()) : 0.5f; } f32 Z2MultiSeMgr::getDolbyPower() { - f32 pow_b = getMaxPowB(); - f32 pow_f = getMaxPowF(); - if (pow_f + pow_b > 0.0f) { - f32 pow_b = getMaxPowB(); - f32 pow_f = getMaxPowF(); - return getMaxPowB() / (pow_f + pow_b); - } else { - return 0.5f; - } + return getMaxPowF() + getMaxPowB() > 0.0f ? getMaxPowB() / (getMaxPowF() + getMaxPowB()) : 0.5f; } diff --git a/src/Z2AudioLib/Z2SeqMgr.cpp b/src/Z2AudioLib/Z2SeqMgr.cpp index cd90349a97..a9cad68b5e 100644 --- a/src/Z2AudioLib/Z2SeqMgr.cpp +++ b/src/Z2AudioLib/Z2SeqMgr.cpp @@ -143,15 +143,16 @@ void Z2SeqMgr::bgmStart(u32 bgmID, u32 fadeTime, s32 param_2) { mMainBgmMaster.forceIn(); break; case Z2BGM_GAME_OVER: - if (getMainBgmID() != bgmID) { - Z2GetSceneMgr()->setInGame(false); - Z2GetSceneMgr()->setSceneExist(false); - setBattleBgmOff(true); - Z2GetSoundMgr()->getSeqMgr()->stop(0); - Z2GetSoundMgr()->getStreamMgr()->stop(0); - Z2GetSoundMgr()->startSound(bgmID, &mMainBgmHandle, NULL); - mBgmStatus = 0xff; + if (getMainBgmID() == bgmID) { + return; } + Z2GetSceneMgr()->setInGame(false); + Z2GetSceneMgr()->setSceneExist(false); + setBattleBgmOff(true); + Z2GetSoundMgr()->getSeqMgr()->stop(0); + Z2GetSoundMgr()->getStreamMgr()->stop(0); + Z2GetSoundMgr()->startSound(bgmID, &mMainBgmHandle, NULL); + mBgmStatus = 0xff; return; case Z2BGM_LAKE: if (Z2GetLink() != NULL && Z2GetLink()->getCurrentPos() != NULL && @@ -245,10 +246,6 @@ void Z2SeqMgr::bgmStop(u32 fadeTime, s32 param_1) { } void Z2SeqMgr::subBgmStart(u32 bgmID) { - #if DEBUG - const char** spotName = sSpotName; - #endif - if (bgmID == -1) { return; } @@ -350,7 +347,7 @@ void Z2SeqMgr::subBgmStart(u32 bgmID) { fadeoutTime = 1; break; case Z2BGM_COWBOY_GAME: - mAllBgmMaster.forceIn(); + bgmAllUnMute(0); fadeinTime = 0; fadeoutTime = 1; break; @@ -391,7 +388,11 @@ void Z2SeqMgr::subBgmStart(u32 bgmID) { } if (bgmID == getSubBgmID()) { - if (bgmID == Z2BGM_SUMO || bgmID == Z2BGM_COWBOY_GAME) { + if (bgmID == Z2BGM_SUMO +#if PLATFORM_GCN + || bgmID == Z2BGM_COWBOY_GAME +#endif + ) { mSubBgmHandle->stop(0); mSubBgmHandle.releaseSound(); } else { @@ -416,7 +417,7 @@ void Z2SeqMgr::subBgmStart(u32 bgmID) { bgmStreamStop(0); // fallthrough case Z2BGM_TN_MBOSS_LV9: - mStreamBgmMaster.forceIn(); + mStreamBgmMaster.fadeIn(0); // fallthrough case Z2BGM_RODEO: changeSubBgmStatus(1); @@ -437,9 +438,9 @@ void Z2SeqMgr::subBgmStart(u32 bgmID) { #if DEBUG if (bgmID == Z2BGM_HIDDEN_VIL_D1) { - OS_REPORT("[Z2SeqMgr::subBgmStart] HIDDEN_VIL_D01 start(%d)\n", mMainBgmHandle.isSoundAttached()); - OS_REPORT(" mainBgmMasterVol::%.2f \n", mMainBgmMaster.get()); + OS_REPORT("[Z2SeqMgr::subBgmStart] HIDDEN_VIL_D01 start(%d)\n", mSubBgmHandle.isSoundAttached()); OS_REPORT(" subBgmMasterVol::%.2f \n", mSubBgmMaster.get()); + OS_REPORT(" mainBgmMasterVol::%.2f \n", mMainBgmMaster.get()); OS_REPORT(" allBgmMasterVol::%.2f \n", mAllBgmMaster.get()); OS_REPORT(" bgmPauseVol::%.2f \n", mBgmPause.get()); OS_REPORT(" fanfareMuteVol::%.2f \n", mFanfareMute.get()); @@ -583,7 +584,13 @@ void Z2SeqMgr::subBgmStopInner() { field_0xb8 = -1; } +static void dummy1() { + OS_REPORT("[Z2SeqMgr::bgmStreamPrepare] %08x\n"); + OS_REPORT("[Z2SeqMgr::bgmStreamPlay] \n"); +} + void Z2SeqMgr::bgmStreamPrepare(u32 bgmID) { + u32 bgmID2 = bgmID; if (mStreamBgmHandle) { bgmStreamStop(0); } @@ -592,18 +599,21 @@ void Z2SeqMgr::bgmStreamPrepare(u32 bgmID) { mStreamBgmHandle->lockWhenPrepared(); switch (bgmID) { +#if PLATFORM_GCN case 0x2000010: mAllBgmMaster.forceIn(); // fallthrough +#endif case 0x200000f: return; case 0x2000014: Z2GetSceneMgr()->setSceneExist(true); return; case 0x2000023: - if (mMainBgmHandle) { - mMainBgmHandle->stop(Z2Param::BGM_CROSS_FADEOUT_TIME); + if (!mMainBgmHandle) { + return; } + mMainBgmHandle->stop(Z2Param::BGM_CROSS_FADEOUT_TIME); return; case 0x2000038: if (mMainBgmHandle) { @@ -613,7 +623,7 @@ void Z2SeqMgr::bgmStreamPrepare(u32 bgmID) { case 0x2000003: case 0x2000047: case 0x200005f: - mStreamBgmMaster.forceOut(); + mStreamBgmMaster.fadeOut(0); return; case 0x200007c: mStreamBgmMaster.fadeOut(45); @@ -670,453 +680,450 @@ void Z2SeqMgr::bgmStreamStop(u32 fadeTime) { } void Z2SeqMgr::changeBgmStatus(s32 status) { - if (!mMainBgmHandle) { - return; - } + if (mMainBgmHandle) { + u32 moveTime = 0; + bool mute; - u32 moveTime = 0; - bool mute; + #if PLATFORM_SHIELD + f32 volume1 = 1.0f; + f32 volume2 = 1.0f; + f32 volume3 = 1.0f; + f32 volume4 = 1.0f; + #else + f32 volume1, volume2, volume3, volume4; + #endif - #if PLATFORM_SHIELD - f32 volume1 = 1.0f; - f32 volume2 = 1.0f; - f32 volume3 = 1.0f; - f32 volume4 = 1.0f; - #else - f32 volume1, volume2, volume3, volume4; - #endif + switch (getMainBgmID()) { + case Z2BGM_TOAL_VILLEGE: + if (status == mBgmStatus) { + return; + } - switch (getMainBgmID()) { - case Z2BGM_TOAL_VILLEGE: - if (status == mBgmStatus) { - return; - } + if (mBgmStatus != 0xff) { + moveTime = 60; + } - if (mBgmStatus != 0xff) { - moveTime = 60; - } + if (status == 1) { + volume1 = 0.65f; + volume2 = 0.0f; + volume3 = 1.0f; + moveTime = 30; + } else { + volume1 = 1.0f; + volume2 = 1.0f; + volume3 = 0.0f; + } - if (status == 1) { - volume1 = 0.65f; - volume2 = 0.0f; - volume3 = 1.0f; - moveTime = 30; - } else { - volume1 = 1.0f; - volume2 = 1.0f; - volume3 = 0.0f; - } - - setChildTrackVolume(&mMainBgmHandle, 0, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 1, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 2, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 8, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 9, volume3, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 10, volume3, moveTime, -1.0f, -1.0f); - break; - case Z2BGM_HORSE_BATTLE: - setChildTrackVolume(&mMainBgmHandle, 11, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 12, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 13, 0.0f, moveTime, -1.0f, -1.0f); - break; - case Z2BGM_DUNGEON_FOREST: - mute = false; - switch (status) { - case 4: - case 0xc: - muteSceneBgm(Z2Param::SCENE_CHANGE_BGM_FADEOUT_TIME, 0.0f); - // fallthrough - case 7: - mute = true; + setChildTrackVolume(&mMainBgmHandle, 0, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 1, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 2, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 8, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 9, volume3, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 10, volume3, moveTime, -1.0f, -1.0f); break; - case 2: - Z2GetSoundObjMgr()->setForceBattleArea(true, 1500, 5000, 10000); + case Z2BGM_HORSE_BATTLE: + setChildTrackVolume(&mMainBgmHandle, 11, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 12, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 13, 0.0f, moveTime, -1.0f, -1.0f); break; - } + case Z2BGM_DUNGEON_FOREST: + mute = false; + switch (status) { + case 4: + case 0xc: + muteSceneBgm(Z2Param::SCENE_CHANGE_BGM_FADEOUT_TIME, 0.0f); + // fallthrough + case 7: + mute = true; + break; + case 2: + Z2GetSoundObjMgr()->setForceBattleArea(true, 1500, 5000, 10000); + break; + } - if (!mute) { - unMuteSceneBgm(Z2Param::SCENE_CHANGE_BGM_FADEOUT_TIME); - } - break; - case Z2BGM_DUNGEON_LV2: - switch (status) { - case 0xe: - case 0x10: - case 0x11: - subBgmStart(Z2BGM_DEATH_MOUNTAIN02); - return; - default: - if (getSubBgmID() == Z2BGM_DEATH_MOUNTAIN02) { - subBgmStop(); + if (!mute) { + unMuteSceneBgm(Z2Param::SCENE_CHANGE_BGM_FADEOUT_TIME); + } + break; + case Z2BGM_DUNGEON_LV2: + switch (status) { + case 0xe: + case 0x10: + case 0x11: + subBgmStart(Z2BGM_DEATH_MOUNTAIN02); + break; + default: + if (getSubBgmID() == Z2BGM_DEATH_MOUNTAIN02) { + subBgmStop(); + } } return; - } - break; - case Z2BGM_DUNGEON_LV5: - if (mBgmStatus != 0xff) { - moveTime = 45; - } + case Z2BGM_DUNGEON_LV5: + if (mBgmStatus != 0xff) { + moveTime = 45; + } - if (status == 2 || status == 1) { - volume1 = 0.0f; - volume2 = 1.0f; - } else { - volume1 = 1.0f; - volume2 = 0.0f; - } + if (status == 2 || status == 1) { + volume1 = 0.0f; + volume2 = 1.0f; + } else { + volume1 = 1.0f; + volume2 = 0.0f; + } - setChildTrackVolume(&mMainBgmHandle, 0, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 1, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 2, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 8, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 9, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 10, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 11, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 12, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 13, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 0, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 1, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 2, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 8, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 9, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 10, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 11, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 12, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 13, volume2, moveTime, -1.0f, -1.0f); - if (status == 4) { - muteSceneBgm(60, 0.29f); - } else { - unMuteSceneBgm(60); - } - break; - case Z2BGM_CASTLE_TOWN: - if (mBgmStatus != 0xff) { - moveTime = 45; - } - - switch (status) { - case 0: - case 1: - case 5: - setChildTrackVolume(&mMainBgmHandle, 0, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 1, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 2, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 8, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 9, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 10, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 11, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 12, 0.0f, moveTime, -1.0f, -1.0f); + if (status == 4) { + muteSceneBgm(60, 0.29f); + } else { + unMuteSceneBgm(60); + } break; - case 2: - setChildTrackVolume(&mMainBgmHandle, 0, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 1, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 2, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 8, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 9, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 10, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 11, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 12, 0.0f, moveTime, -1.0f, -1.0f); - break; - case 3: - setChildTrackVolume(&mMainBgmHandle, 0, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 1, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 2, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 8, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 9, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 10, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 11, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 12, 1.0f, moveTime, -1.0f, -1.0f); - break; - case 4: - setChildTrackVolume(&mMainBgmHandle, 0, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 1, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 2, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 8, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 9, 1.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 10, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 11, 0.0f, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 12, 0.0f, moveTime, -1.0f, -1.0f); - break; - } + case Z2BGM_CASTLE_TOWN: + if (mBgmStatus != 0xff) { + moveTime = 45; + } - if (status == 5) { - muteSceneBgm(moveTime, 0.35f); - mFlags.mHeightVolMod = false; - } else { - unMuteSceneBgm(moveTime); - if (status < 2) { + switch (status) { + case 0: + case 1: + case 5: + setChildTrackVolume(&mMainBgmHandle, 0, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 1, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 2, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 8, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 9, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 10, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 11, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 12, 0.0f, moveTime, -1.0f, -1.0f); + break; + case 2: + setChildTrackVolume(&mMainBgmHandle, 0, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 1, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 2, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 8, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 9, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 10, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 11, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 12, 0.0f, moveTime, -1.0f, -1.0f); + break; + case 3: + setChildTrackVolume(&mMainBgmHandle, 0, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 1, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 2, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 8, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 9, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 10, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 11, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 12, 1.0f, moveTime, -1.0f, -1.0f); + break; + case 4: + setChildTrackVolume(&mMainBgmHandle, 0, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 1, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 2, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 8, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 9, 1.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 10, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 11, 0.0f, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 12, 0.0f, moveTime, -1.0f, -1.0f); + break; + } + + if (status == 5) { + muteSceneBgm(moveTime, 0.35f); mFlags.mHeightVolMod = false; } else { - mFlags.mHeightVolMod = true; + unMuteSceneBgm(moveTime); + if (status < 2) { + mFlags.mHeightVolMod = false; + } else { + mFlags.mHeightVolMod = true; + } } - } - break; - case Z2BGM_HOLY_FOREST: - if (mBgmStatus != 0xff) { - moveTime = 45; - setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, 5, -1.0f, -1.0f); - } else { - setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, 0, -1.0f, -1.0f); - } - - if (status == 1) { - volume1 = 0.6f; - volume2 = 1.0f; - } else { - volume1 = 1.0f; - volume2 = 0.0f; - } - - setChildTrackVolume(&mMainBgmHandle, 0, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 1, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 2, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, volume2, moveTime, -1.0f, -1.0f); - break; - case Z2BGM_LUTERA2: - if (status == 0) { - muteSceneBgm(0, 0.5f); - } else if (status == 1) { - unMuteSceneBgm(80); - } - break; - case Z2BGM_DEMO08: - if (status == 1) { - setChildTrackVolume(&mMainBgmHandle, 4, 1.0f, 90, -1.0f, -1.0f); - } else if (status == 2) { - bgmStop(90, 0); - } else { - setChildTrackVolume(&mMainBgmHandle, 4, 0.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, 0.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, 0.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, 0, -1.0f, -1.0f); - } - break; - case Z2BGM_DEMO10: - if (status == 1) { - setChildTrackVolume(&mMainBgmHandle, 0, 0.3f, 143, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 1, 0.3f, 143, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 2, 0.6f, 143, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, 0.6f, 143, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, 0.0f, 143, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, 1.0f, 143, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, 1.0f, 143, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, 1.0f, 143, -1.0f, -1.0f); - } else { - setChildTrackVolume(&mMainBgmHandle, 5, 0.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, 0.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, 0, -1.0f, -1.0f); - } - break; - case Z2BGM_BOSS_SNOWWOMAN_1: - if (status == 1) { - setChildTrackVolume(&mMainBgmHandle, 9, 0.0f, 60, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 10, 1.0f, 60, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 11, 1.0f, 60, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 12, 1.0f, 60, -1.0f, -1.0f); - } else { - setChildTrackVolume(&mMainBgmHandle, 10, 0.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 11, 0.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 12, 0.0f, 0, -1.0f, -1.0f); - } - break; - case Z2BGM_DUNGEON_LV8: - if (status == mBgmStatus) { - return; - } - - if (mBgmStatus != 0xff) { - moveTime = 45; - } - - if (status == 0 || status == 0xb) { - volume1 = 1.0f; - volume2 = 0.0f; - volume3 = 0.0f; - volume4 = 0.0f; - } else if (status >= 100) { - volume1 = 0.0f; - volume2 = 1.0f; - - volume3 = status < 200 ? 1.0f : - status > 3100 ? 0.0f : - Z2Calc::getParamByExp(status, 3100.0f, 200.0f, 0.3f, 0.0f, 1.0f, - Z2Calc::CURVE_POSITIVE); - - volume4 = status < 200 ? 1.0f : - status > 1600 ? 0.0f : - Z2Calc::getParamByExp(status, 1600.0f, 200.0f, 0.3f, 0.0f, 1.0f, - Z2Calc::CURVE_POSITIVE); - } else { - volume1 = 0.0f; - volume2 = 1.0f; - volume3 = 0.0f; - volume4 = 0.0f; - } - - setChildTrackVolume(&mMainBgmHandle, 2, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 8, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 9, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 10, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 11, volume3, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 12, volume3, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 13, volume4, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 14, volume4, moveTime, -1.0f, -1.0f); - break; - case Z2BGM_BOSS_ZANT: - if (status == 0xd) { - mSceneBgm.move(0.3f, 134); - } else { - mSceneBgm.forceIn(); - if (status > 6) { - status = (status - 7) * 2; + break; + case Z2BGM_HOLY_FOREST: + if (mBgmStatus != 0xff) { + moveTime = 45; + setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, 5, -1.0f, -1.0f); } else { - status = status * 2 - 1; - } - } - break; - case Z2BGM_FORTUNE: - if (status == 1) { - muteSceneBgm(45, 0.5f); - } else { - unMuteSceneBgm(45); - } - break; - case Z2BGM_DUNGEON_LV9_02: - if (mBgmStatus != 0xff) { - moveTime = 30; - } - - if (status == 0xc) { - volume4 = 1.0f; - volume1 = 0.0f; - volume2 = 0.5f; - volume3 = 0.0f; - } else if (status == 8) { - volume4 = 0.0f; - volume1 = 0.5f; - volume2 = 1.0f; - volume3 = 0.8f; - } else if (status > 3000) { - volume4 = Z2Calc::linearTransform(status, 3150.0f, 6150.0f, 1.0f, 0.0f, false); - volume1 = Z2Calc::linearTransform(status, 3150.0f, 6150.0f, 0.0f, 1.0f, false); - volume2 = Z2Calc::linearTransform(status, 3150.0f, 6150.0f, 0.5f, 1.0f, false); - volume3 = Z2Calc::linearTransform(status, 3150.0f, 6150.0f, 0.0f, 1.0f, false); - } - - setChildTrackVolume(&mMainBgmHandle, 0, volume4, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 1, volume4, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 2, volume4, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 8, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 9, volume3, moveTime, -1.0f, -1.0f); - break; - case Z2BGM_VS_GANON_02: - if (status == mBgmStatus) { - return; - } - - if (mBgmStatus != 0xff) { - moveTime = 45; - } - - if (status == 1) { - volume1 = 0.0f; - volume2 = 1.0f; - } else { - volume1 = 1.0f; - volume2 = 0.0f; - } - - setChildTrackVolume(&mMainBgmHandle, 0, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 1, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 2, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 4, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 5, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 6, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 7, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 10, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 11, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 12, volume2, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 13, volume2, moveTime, -1.0f, -1.0f); - break; - case Z2BGM_TOAL_NIGHT: - case Z2BGM_FILONE_FOREST: - if (status == 1) { - muteSceneBgm(45, 0.5f); - } else if (status == 2) { - muteSceneBgm(0, 0.5f); - } else { - unMuteSceneBgm(45); - } - break; - case Z2BGM_VS_GANON_04: - if (status == mBgmStatus) { - return; - } - - if (status >= 4) { - moveTime = 50; - if (status == 4) { - volume4 = 1.0f; - volume1 = 0.0f; - } else if (status == 5) { - volume4 = 0.0f; - volume1 = 1.0f; - } else if (status == 6) { - volume4 = 0.0f; - volume1 = 0.0f; - } else if (status == 7) { - volume4 = 0.0f; - volume1 = 0.0f; - moveTime = 0; - } else if (status == 8) { - volume4 = 1.0f; - volume1 = 1.0f; - moveTime = 0; + setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, 0, -1.0f, -1.0f); } - setChildTrackVolume(&mMainBgmHandle, 12, volume4, moveTime, -1.0f, -1.0f); + if (status == 1) { + volume1 = 0.6f; + volume2 = 1.0f; + } else { + volume1 = 1.0f; + volume2 = 0.0f; + } + + setChildTrackVolume(&mMainBgmHandle, 0, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 1, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 2, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, volume2, moveTime, -1.0f, -1.0f); + break; + case Z2BGM_LUTERA2: + if (status == 0) { + muteSceneBgm(0, 0.5f); + } else if (status == 1) { + unMuteSceneBgm(80); + } + break; + case Z2BGM_DEMO08: + if (status == 1) { + setChildTrackVolume(&mMainBgmHandle, 4, 1.0f, 90, -1.0f, -1.0f); + } else if (status == 2) { + bgmStop(90, 0); + } else { + setChildTrackVolume(&mMainBgmHandle, 4, 0.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, 0.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, 0.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, 0, -1.0f, -1.0f); + } + break; + case Z2BGM_DEMO10: + if (status == 1) { + setChildTrackVolume(&mMainBgmHandle, 0, 0.3f, 143, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 1, 0.3f, 143, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 2, 0.6f, 143, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, 0.6f, 143, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, 0.0f, 143, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, 1.0f, 143, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, 1.0f, 143, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, 1.0f, 143, -1.0f, -1.0f); + } else { + setChildTrackVolume(&mMainBgmHandle, 5, 0.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, 0.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, 0.0f, 0, -1.0f, -1.0f); + } + break; + case Z2BGM_BOSS_SNOWWOMAN_1: + if (status == 1) { + setChildTrackVolume(&mMainBgmHandle, 9, 0.0f, 60, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 10, 1.0f, 60, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 11, 1.0f, 60, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 12, 1.0f, 60, -1.0f, -1.0f); + } else { + setChildTrackVolume(&mMainBgmHandle, 10, 0.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 11, 0.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 12, 0.0f, 0, -1.0f, -1.0f); + } + break; + case Z2BGM_DUNGEON_LV8: + if (status == mBgmStatus) { + return; + } + + if (mBgmStatus != 0xff) { + moveTime = 45; + } + + if (status == 0 || status == 0xb) { + volume1 = 1.0f; + volume2 = 0.0f; + volume3 = 0.0f; + volume4 = 0.0f; + } else if (status >= 100) { + volume1 = 0.0f; + volume2 = 1.0f; + + volume3 = status < 200 ? 1.0f : + status > 3100 ? 0.0f : + Z2Calc::getParamByExp(status, 3100.0f, 200.0f, 0.3f, 0.0f, 1.0f, + Z2Calc::CURVE_POSITIVE); + + volume4 = status < 200 ? 1.0f : + status > 1600 ? 0.0f : + Z2Calc::getParamByExp(status, 1600.0f, 200.0f, 0.3f, 0.0f, 1.0f, + Z2Calc::CURVE_POSITIVE); + } else { + volume1 = 0.0f; + volume2 = 1.0f; + volume3 = 0.0f; + volume4 = 0.0f; + } + + setChildTrackVolume(&mMainBgmHandle, 2, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 8, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 9, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 10, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 11, volume3, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 12, volume3, moveTime, -1.0f, -1.0f); setChildTrackVolume(&mMainBgmHandle, 13, volume4, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 14, volume1, moveTime, -1.0f, -1.0f); - setChildTrackVolume(&mMainBgmHandle, 15, volume1, moveTime, -1.0f, -1.0f); - } - break; - } + setChildTrackVolume(&mMainBgmHandle, 14, volume4, moveTime, -1.0f, -1.0f); + break; + case Z2BGM_BOSS_ZANT: + if (status == 0xd) { + mSceneBgm.move(0.3f, 134); + } else { + mSceneBgm.forceIn(); + if (status > 6) { + status = (status - 7) * 2; + } else { + status = status * 2 - 1; + } + } + break; + case Z2BGM_FORTUNE: + if (status == 1) { + muteSceneBgm(45, 0.5f); + } else { + unMuteSceneBgm(45); + } + break; + case Z2BGM_DUNGEON_LV9_02: + if (mBgmStatus != 0xff) { + moveTime = 30; + } - Z2GetSoundStarter()->setPortData(&mMainBgmHandle, 9, status, -1); - mBgmStatus = status & 0xff; + if (status == 0xc) { + volume4 = 1.0f; + volume1 = 0.0f; + volume2 = 0.5f; + volume3 = 0.0f; + } else if (status == 8) { + volume4 = 0.0f; + volume1 = 0.5f; + volume2 = 1.0f; + volume3 = 0.8f; + } else if (status > 3000) { + volume4 = Z2Calc::linearTransform(status, 3150.0f, 6150.0f, 1.0f, 0.0f, false); + volume1 = Z2Calc::linearTransform(status, 3150.0f, 6150.0f, 0.0f, 1.0f, false); + volume2 = Z2Calc::linearTransform(status, 3150.0f, 6150.0f, 0.5f, 1.0f, false); + volume3 = Z2Calc::linearTransform(status, 3150.0f, 6150.0f, 0.0f, 1.0f, false); + } + + setChildTrackVolume(&mMainBgmHandle, 0, volume4, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 1, volume4, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 2, volume4, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 8, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 9, volume3, moveTime, -1.0f, -1.0f); + break; + case Z2BGM_VS_GANON_02: + if (status == mBgmStatus) { + return; + } + + if (mBgmStatus != 0xff) { + moveTime = 45; + } + + if (status == 1) { + volume1 = 0.0f; + volume2 = 1.0f; + } else { + volume1 = 1.0f; + volume2 = 0.0f; + } + + setChildTrackVolume(&mMainBgmHandle, 0, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 1, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 2, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 3, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 4, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 5, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 6, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 7, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 10, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 11, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 12, volume2, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 13, volume2, moveTime, -1.0f, -1.0f); + break; + case Z2BGM_TOAL_NIGHT: + case Z2BGM_FILONE_FOREST: + if (status == 1) { + muteSceneBgm(45, 0.5f); + } else if (status == 2) { + muteSceneBgm(0, 0.5f); + } else { + unMuteSceneBgm(45); + } + break; + case Z2BGM_VS_GANON_04: + if (status == mBgmStatus) { + return; + } + + if (status >= 4) { + moveTime = 50; + if (status == 4) { + volume4 = 1.0f; + volume1 = 0.0f; + } else if (status == 5) { + volume4 = 0.0f; + volume1 = 1.0f; + } else if (status == 6) { + volume4 = 0.0f; + volume1 = 0.0f; + } else if (status == 7) { + volume4 = 0.0f; + volume1 = 0.0f; + moveTime = 0; + } else if (status == 8) { + volume4 = 1.0f; + volume1 = 1.0f; + moveTime = 0; + } + + setChildTrackVolume(&mMainBgmHandle, 12, volume4, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 13, volume4, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 14, volume1, moveTime, -1.0f, -1.0f); + setChildTrackVolume(&mMainBgmHandle, 15, volume1, moveTime, -1.0f, -1.0f); + } + break; + } + + Z2GetSoundStarter()->setPortData(&mMainBgmHandle, 9, status, -1); + mBgmStatus = status & 0xff; + } } void Z2SeqMgr::changeSubBgmStatus(s32 status) { @@ -1284,9 +1291,11 @@ void Z2SeqMgr::changeSubBgmStatus(s32 status) { setChildTrackVolume(&mSubBgmHandle, 11, 0.0f, moveTime, -1.0f, -1.0f); setChildTrackVolume(&mSubBgmHandle, 12, 0.0f, moveTime, -1.0f, -1.0f); } +#if PLATFORM_GCN break; case Z2BGM_BATTLE_NORMAL: return; +#endif } if (bvar2) { @@ -1341,6 +1350,14 @@ void Z2SeqMgr::changeFishingBgm(s32 param_0) { } } +static void dummy2() { + OS_REPORT("[Z2SeqMgr::talkInBgm]\n"); + OS_REPORT("[Z2SeqMgr::talkOutBgm]\n"); + OS_REPORT("[Z2SeqMgr::menuInBgm]\n"); + OS_REPORT("[Z2SeqMgr::menuOutBgm]\n"); + OS_REPORT("[Z2SeqMgr::fanfareFramework] mOpenBoxWait = %d\n"); +} + void Z2SeqMgr::talkInBgm() { if (getStreamBgmID() == 0x2000038 || getStreamBgmID() == 0x200007c || getMainBgmID() == Z2BGM_WCS_D01) { return; @@ -1362,6 +1379,7 @@ void Z2SeqMgr::menuOutBgm() { } void Z2SeqMgr::fanfareFramework() { + u8 r30; switch (mFanfareID) { case Z2BGM_OPEN_BOX: mFanfareCount = 150; @@ -1395,6 +1413,7 @@ void Z2SeqMgr::fanfareFramework() { case Z2BGM_ITEM_GET_SMELL: case Z2BGM_ITEM_GET_POU: case Z2BGM_ITEM_GET_ME_S: + r30 = mFanfareCount; if (mFanfareCount == 0) { Z2GetSoundMgr()->startSound(mFanfareID, &mFanfareHandle, 0); mFanfareMute.fadeOut(1); @@ -1420,7 +1439,7 @@ void Z2SeqMgr::fanfareFramework() { mFanfareCount = 50; mFanfareMute.fadeOut(30); } else if (mFanfareCount == 1) { - Z2GetSoundMgr()->startSound((u32)mFanfareID, &mFanfareHandle, 0); + Z2GetSoundMgr()->startSound(mFanfareID, &mFanfareHandle, 0); mFanfareID.setAnonymous(); } break; @@ -1528,21 +1547,17 @@ void Z2SeqMgr::processBgmFramework() { && Z2GetLink() != NULL && Z2GetLink()->getCurrentPos() != NULL) { f32 link_y = Z2GetLink()->getCurrentPos()->y; - f32 volume, depth; + f32 depth; switch (getMainBgmID()) { case Z2BGM_DEATH_MOUNTAIN01: - volume = Z2Calc::getParamByExp(link_y, sDeathMtTop, sDeathMtBottom, 0.3f, 0.0f, 1.0f, - Z2Calc::CURVE_NEGATIVE); - field_0x84.move(volume, 0); + field_0x84.move(Z2Calc::getParamByExp(link_y, sDeathMtTop, sDeathMtBottom, 0.3f, 0.0f, 1.0f, Z2Calc::CURVE_NEGATIVE), 0); break; case Z2BGM_RAKKA_HOUSE: if (link_y < -10500.0f) { bgmStart(Z2BGM_LAKE, 150, 0); field_0x84.forceIn(); } else if (link_y < -7500.0f) { - volume = Z2Calc::getParamByExp(link_y, -10500.0f, -7500.0f, 0.3f, 0.0f, 1.0f, - Z2Calc::CURVE_POSITIVE); - field_0x84.move(volume, 0); + field_0x84.move(Z2Calc::getParamByExp(link_y, -10500.0f, -7500.0f, 0.3f, 0.0f, 1.0f, Z2Calc::CURVE_POSITIVE), 0); } break; case Z2BGM_FIELD_LINK_DAY: @@ -1554,9 +1569,7 @@ void Z2SeqMgr::processBgmFramework() { if (depth > sUnderWaterDepthMax) { field_0x84.forceOut(); } else if (depth > 0.0f) { - volume = Z2Calc::getParamByExp(depth, sUnderWaterDepthMax, 0.0f, 0.3f, 0.1f, 1.0f, - Z2Calc::CURVE_POSITIVE); - field_0x84.move(volume, 0); + field_0x84.move(Z2Calc::getParamByExp(depth, sUnderWaterDepthMax, 0.0f, 0.3f, 0.1f, 1.0f, Z2Calc::CURVE_POSITIVE), 0); } else if (field_0x84.getDest() != 1.0f) { field_0x84.fadeIn(30); } @@ -1566,9 +1579,7 @@ void Z2SeqMgr::processBgmFramework() { if (link_y > -1500.0f) { field_0x84.move(0.3f, 0); } else if (link_y > -13000.0f) { - volume = Z2Calc::getParamByExp(link_y, -1500.0f, -13000.0f, 0.3f, 0.3f, 1.0f, - Z2Calc::CURVE_NEGATIVE); - field_0x84.move(volume, 0); + field_0x84.move(Z2Calc::getParamByExp(link_y, -1500.0f, -13000.0f, 0.3f, 0.3f, 1.0f, Z2Calc::CURVE_NEGATIVE), 0); } else { field_0x84.forceIn(); } @@ -1576,9 +1587,7 @@ void Z2SeqMgr::processBgmFramework() { if (link_y > -4500.0f) { field_0x84.fadeOut(30); } else if (link_y > -45000.0f) { - volume = Z2Calc::getParamByExp(link_y, -3000.0f, -45000.0f, 0.3f, 0.0f, 1.0f, - Z2Calc::CURVE_NEGATIVE); - field_0x84.move(volume, 0); + field_0x84.move(Z2Calc::getParamByExp(link_y, -3000.0f, -45000.0f, 0.3f, 0.0f, 1.0f, Z2Calc::CURVE_NEGATIVE), 0); } else { field_0x84.forceIn(); } @@ -1586,9 +1595,7 @@ void Z2SeqMgr::processBgmFramework() { if (link_y > 900.0f) { field_0x84.forceOut(); } else if (link_y > -1500.0f) { - volume = Z2Calc::getParamByExp(link_y, 900.0f, -1500.0f, 0.3f, 0.0f, 0.3f, - Z2Calc::CURVE_NEGATIVE); - field_0x84.move(volume, 0); + field_0x84.move(Z2Calc::getParamByExp(link_y, 900.0f, -1500.0f, 0.3f, 0.0f, 0.3f, Z2Calc::CURVE_NEGATIVE), 0); } else { field_0x84.move(0.3f, 0); } @@ -1624,7 +1631,11 @@ void Z2SeqMgr::processBgmFramework() { field_0xa4.calc(); f32 base_vol = mAllBgmMaster.get() * mBgmPause.get() * mFanfareMute.get() * mWindStone.get() * mTwilightGateVol; - +#if DEBUG + if (field_0x04_debug) { + base_vol *= field_0x00_debug; + } +#endif if (mMainBgmHandle) { f32 volume = 1.0f; if (getMainBgmID() != Z2BGM_GAME_OVER) { @@ -1634,13 +1645,11 @@ void Z2SeqMgr::processBgmFramework() { } if (mSubBgmHandle) { - f32 volume = base_vol * mSubBgmMaster.get() * mStreamBgmMaster.get(); - mSubBgmHandle->getAuxiliary().moveVolume(volume, 0); + mSubBgmHandle->getAuxiliary().moveVolume(base_vol * mSubBgmMaster.get() * mStreamBgmMaster.get(), 0); } if (mStreamBgmHandle) { - f32 volume = base_vol * mMainBgmMaster.get() * mSceneBgm.get(); - mStreamBgmHandle->getAuxiliary().moveVolume(volume, 0); + mStreamBgmHandle->getAuxiliary().moveVolume(base_vol * mMainBgmMaster.get() * mSceneBgm.get(), 0); } setWindStoneVol(1.0f, 30); @@ -1663,13 +1672,20 @@ bool Z2SeqMgr::checkBgmIDPlaying(u32 bgmID) { } f32 Z2SeqMgr::getChildTrackVolume(JAISoundHandle* handle, int trackId) { + JUT_ASSERT(2030, handle); f32 volume = 0.0f; if (*handle) { JAISeq* seq = handle->getSound()->asSeq(); - if (seq != NULL && seq->getChildTrack(trackId) != NULL) { - JAISoundChild* child = seq->getChild(trackId); - if (child != NULL) { - volume = child->mMove.params_.mVolume; + if (seq != NULL) { + JASTrack* track = seq->getChildTrack(trackId); + if (!track) { + int r24 = trackId; + } else { + JAISoundChild* child = seq->getChild(trackId); + if (child != NULL) { + volume = child->mMove.params_.mVolume; + f32 f30 = volume; + } } } } @@ -1677,18 +1693,31 @@ f32 Z2SeqMgr::getChildTrackVolume(JAISoundHandle* handle, int trackId) { return volume; } +static void dummy3() { + OS_REPORT("[Z2SeqMgr::getChildTrackVolume]シーケンスがないですよ。\n"); + OS_REPORT("[Z2SeqMgr::getChildTrackVolume]子トラック%dがオープンしてませんよ\n"); + OS_REPORT("[Z2SeqMgr::getChildTrackVolume]子トラック%dのボリューム%.2f\n"); + OS_REPORT("[Z2SeqMgr::setChildTrackVolume]シーケンスがないですよ。\n"); + OS_REPORT("[Z2SeqMgr::setChildTrackVolume]子トラック%dがオープンしてませんよ\n"); + OS_REPORT("[Z2SeqMgr::setChildTrackVolume]子トラック%dのボリューム%.2f → %.2f カウント %d\n"); +} + void Z2SeqMgr::setChildTrackVolume(JAISoundHandle* handle, int trackId, f32 volume, u32 moveTime, f32 pan, f32 dolby) { + int r24; + JUT_ASSERT(2064, handle); if (!*handle) { return; } - JAISeq* seq = (*handle)->asSeq(); + JAISeq* seq = handle->getSound()->asSeq(); if (seq == NULL) { return; } - if (seq->getChildTrack(trackId) == NULL) { + JASTrack* track = seq->getChildTrack(trackId); + if (track == NULL) { + r24 = trackId; return; } @@ -1704,6 +1733,7 @@ void Z2SeqMgr::setChildTrackVolume(JAISoundHandle* handle, int trackId, f32 volu } child->mMove.moveVolume(volume, moveTime); + u32 r23 = moveTime; if (pan != -1.0f) { child->mMove.movePan(pan, moveTime); } @@ -1771,17 +1801,20 @@ void Z2SeqMgr::setBattleDistState(u8 state) { mBattleSeqCount = 0; if (getSubBgmID() == Z2BGM_BATTLE_TWILIGHT || getSubBgmID() == Z2BGM_BATTLE_NORMAL) { - mSubBgmHandle->getFader().fadeIn(10); + JAISoundFader* fader = mSubBgmHandle->getFader(); + fader->fadeIn(10); mMainBgmMaster.fadeOut(10); } } +#if !DEBUG if ((Z2GetSoundObjMgr()->isTwilightBattle() && getSubBgmID() == Z2BGM_BATTLE_NORMAL) || (!Z2GetSoundObjMgr()->isTwilightBattle() && getSubBgmID() == Z2BGM_BATTLE_TWILIGHT)) { mSubBgmHandle->stop(30); mSubBgmHandle->releaseHandle(); } +#endif if (Z2GetSoundObjMgr()->isTwilightBattle() || getSubBgmID() == Z2BGM_BATTLE_TWILIGHT) { switch (state) { @@ -1835,41 +1868,52 @@ void Z2SeqMgr::setBattleDistState(u8 state) { } void Z2SeqMgr::setBattleSeqState(u8 state) { - if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist() && mBattleSeqState != state) { - if (state == 0) { - stopBattleBgm(Z2Param::BGM_CROSS_FADEOUT_TIME, Z2Param::BGM_CROSS_FADEIN_TIME); - } else if (getSubBgmID() == Z2BGM_BATTLE_NORMAL && !(getMainBgmID() == Z2BGM_FIELD_LINK_DAY && !Z2GetSoundObjMgr()->isTwilightBattle())) { - switch (state) { - case 2: - if (mBattleSeqState == 1) { - Z2GetSoundStarter()->setPortData(&mSubBgmHandle, 9, 1, -1); - setChildTrackVolume(&mSubBgmHandle, data_8045086C, 1.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mSubBgmHandle, 2, 1.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mSubBgmHandle, 3, 1.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mSubBgmHandle, 12, 1.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mSubBgmHandle, 14, 1.0f, 0, -1.0f, -1.0f); - } + if (mFlags.mBattleBgmOff) { + return; + } + if (!Z2GetSceneMgr()->isSceneExist()) { + return; + } + if (mBattleSeqState == state) { + return; + } - if (mBattleSeqCount != 0) { - mBattleSeqCount = 0; - mSubBgmHandle->getFader().fadeIn(10); - mMainBgmMaster.fadeOut(10); - } - break; - case 3: - mMainBgmMaster.forceOut(); - mSubBgmMaster.forceIn(); - - if (mBattleSeqState == 1) { - Z2GetSoundStarter()->setPortData(&mSubBgmHandle, 9, 3, -1); - } else if (mBattleSeqState == 2) { - Z2GetSoundStarter()->setPortData(&mSubBgmHandle, 9, 2, -1); - } - break; + if (state == 0) { + stopBattleBgm(Z2Param::BGM_CROSS_FADEOUT_TIME, Z2Param::BGM_CROSS_FADEIN_TIME); + return; + } + if (getSubBgmID() == Z2BGM_BATTLE_NORMAL && !(getMainBgmID() == Z2BGM_FIELD_LINK_DAY && !Z2GetSoundObjMgr()->isTwilightBattle())) { + switch (state) { + case 2: + if (mBattleSeqState == 1) { + Z2GetSoundStarter()->setPortData(&mSubBgmHandle, 9, 1, -1); + setChildTrackVolume(&mSubBgmHandle, data_8045086C, 1.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mSubBgmHandle, 2, 1.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mSubBgmHandle, 3, 1.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mSubBgmHandle, 12, 1.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mSubBgmHandle, 14, 1.0f, 0, -1.0f, -1.0f); } - mBattleSeqState = state; + if (mBattleSeqCount != 0) { + mBattleSeqCount = 0; + JAISoundFader* fader = mSubBgmHandle->getFader(); + fader->fadeIn(10); + mMainBgmMaster.fadeOut(10); + } + break; + case 3: + mMainBgmMaster.forceOut(); + mSubBgmMaster.forceIn(); + + if (mBattleSeqState == 1) { + Z2GetSoundStarter()->setPortData(&mSubBgmHandle, 9, 3, -1); + } else if (mBattleSeqState == 2) { + Z2GetSoundStarter()->setPortData(&mSubBgmHandle, 9, 2, -1); + } + break; } + + mBattleSeqState = state; } } @@ -1930,102 +1974,114 @@ void Z2SeqMgr::battleBgmFramework() { } void Z2SeqMgr::startBattleBgm(bool isFadeIn) { - if (!mFlags.mBattleBgmOff && Z2GetSceneMgr()->isSceneExist() - && mBattleSeqState == 0 && (mFlags.mBattleDistIgnore || mBattleDistState <= 1)) - { - JAISoundID bgm_id = Z2BGM_BATTLE_NORMAL; - if (Z2GetSceneMgr()->isInDarkness() || Z2GetSoundObjMgr()->isTwilightBattle()) { - bgm_id = Z2BGM_BATTLE_TWILIGHT; - } + if (mFlags.mBattleBgmOff) { + return; + } + if (!Z2GetSceneMgr()->isSceneExist()) { + return; + } + if (mBattleSeqState) { + return; + } + if (!mFlags.mBattleDistIgnore && mBattleDistState > 1) { + return; + } - u32 subBgmID = getSubBgmID(); - if (subBgmID != bgm_id) { - mBattleSeqState = 1; - if (Z2GetSoundMgr()->startSound(bgm_id, &mSubBgmHandle, NULL)) { - Z2GetSoundObjMgr()->setBattleInit(); - mSubBgmStatus = 0xff; + JAISoundID bgm_id = Z2BGM_BATTLE_NORMAL; + if (Z2GetSceneMgr()->isInDarkness() || Z2GetSoundObjMgr()->isTwilightBattle()) { + bgm_id = Z2BGM_BATTLE_TWILIGHT; + } - s16 ivar2 = Z2GetLink()->getMoveSpeed() - 23; - if (ivar2 < 0) { - ivar2 = 0; - } + u32 subBgmID = getSubBgmID(); + s16 ivar2; + u8 fadeinTime, fadeoutTime; + if (subBgmID != bgm_id) { + mBattleSeqState = 1; + if (Z2GetSoundMgr()->startSound(bgm_id, &mSubBgmHandle, NULL)) { + Z2GetSoundObjMgr()->setBattleInit(); + mSubBgmStatus = 0xff; - if (ivar2 > Z2Param::BGM_CROSS_FADEIN_TIME) { - ivar2 = Z2Param::BGM_CROSS_FADEIN_TIME; - } - - u8 fadeinTime, fadeoutTime; - switch (bgm_id) { - case Z2BGM_BATTLE_NORMAL: - fadeinTime = Z2Param::BGM_CROSS_FADEIN_TIME - ivar2; - fadeoutTime = Z2Param::BGM_CROSS_FADEOUT_TIME - ivar2 / 2; - if (!mFlags.mBattleSearched) { - setChildTrackVolume(&mSubBgmHandle, 2, 0.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mSubBgmHandle, 3, 0.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mSubBgmHandle, 12, 0.0f, 0, -1.0f, -1.0f); - setChildTrackVolume(&mSubBgmHandle, 14, 0.0f, 0, -1.0f, -1.0f); - } - if (mBattleDistState != 0) { - setChildTrackVolume(&mSubBgmHandle, data_8045086C, 0.0f, 0, -1.0f, -1.0f); - } - break; - case Z2BGM_BATTLE_TWILIGHT: - changeSubBgmStatus(Z2GetSoundObjMgr()->isTwilightBattle()); - fadeinTime = 25 - ivar2 / 4; - fadeoutTime = 25 - ivar2 / 4; - break; - } - - if (isFadeIn) { - mSubBgmMaster.fadeInFromOut(fadeinTime); - } else { - mSubBgmMaster.forceIn(); - } - - mMainBgmMaster.fadeOut(fadeoutTime); + ivar2 = Z2GetLink()->getMoveSpeed() - 23; + if (ivar2 < 0) { + ivar2 = 0; } + + if (ivar2 > Z2Param::BGM_CROSS_FADEIN_TIME) { + ivar2 = Z2Param::BGM_CROSS_FADEIN_TIME; + } + + switch (bgm_id) { + case Z2BGM_BATTLE_NORMAL: + fadeinTime = Z2Param::BGM_CROSS_FADEIN_TIME - ivar2; + fadeoutTime = Z2Param::BGM_CROSS_FADEOUT_TIME - ivar2 / 2; + if (!mFlags.mBattleSearched) { + setChildTrackVolume(&mSubBgmHandle, 2, 0.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mSubBgmHandle, 3, 0.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mSubBgmHandle, 12, 0.0f, 0, -1.0f, -1.0f); + setChildTrackVolume(&mSubBgmHandle, 14, 0.0f, 0, -1.0f, -1.0f); + } + if (mBattleDistState != 0) { + setChildTrackVolume(&mSubBgmHandle, data_8045086C, 0.0f, 0, -1.0f, -1.0f); + } + break; + case Z2BGM_BATTLE_TWILIGHT: + changeSubBgmStatus(Z2GetSoundObjMgr()->isTwilightBattle()); + fadeinTime = 25 - ivar2 / 4; + fadeoutTime = 25 - ivar2 / 4; + break; + } + + if (isFadeIn) { + mSubBgmMaster.fadeInFromOut(fadeinTime); + } else { + mSubBgmMaster.forceIn(); + } + + mMainBgmMaster.fadeOut(fadeoutTime); } } } void Z2SeqMgr::stopBattleBgm(u8 subFadeoutTime, u8 mainFadeinTime) { - if (mBattleSeqCount == 0) { - s16 ivar6 = 0; - if (Z2GetLink() != NULL) { - ivar6 = Z2GetLink()->getMoveSpeed() - 23; - } - - if (ivar6 < 0) { - ivar6 = 0; - } - - if (ivar6 > Z2Param::BGM_CROSS_FADEIN_TIME) { - ivar6 = Z2Param::BGM_CROSS_FADEIN_TIME; - } - - if (getSubBgmID() == Z2BGM_BATTLE_NORMAL) { - subFadeoutTime = Z2Param::BGM_CROSS_FADEIN_TIME + ivar6; - mainFadeinTime = Z2Param::BGM_CROSS_FADEOUT_TIME + ivar6 / 2; - mSubBgmHandle->fadeOut(subFadeoutTime); - mBattleSeqCount = subFadeoutTime; - } else if (getSubBgmID() == Z2BGM_BATTLE_TWILIGHT) { - if (mSubBgmStatus > 1) { - subFadeoutTime = Z2Param::BGM_CROSS_FADEIN_TIME + ivar6 / 4; - mainFadeinTime = Z2Param::BGM_CROSS_FADEIN_TIME + ivar6 / 4; - } else { - subFadeoutTime = 25 + ivar6 / 4; - mainFadeinTime = 25 + ivar6 / 4; - } - - mSubBgmHandle->fadeOut(subFadeoutTime); - mBattleSeqCount = subFadeoutTime; - } - - mMainBgmMaster.fadeIn(mainFadeinTime); - mBattleDistState = 3; - setBattleDistIgnore(false); - mFlags.mBattleSearched = false; + if (mBattleSeqCount) { + return; } + + s16 ivar6 = 0; + if (Z2GetLink() != NULL) { + ivar6 = Z2GetLink()->getMoveSpeed() - 23; + } + + if (ivar6 < 0) { + ivar6 = 0; + } + + if (ivar6 > Z2Param::BGM_CROSS_FADEIN_TIME) { + ivar6 = Z2Param::BGM_CROSS_FADEIN_TIME; + } + + if (getSubBgmID() == Z2BGM_BATTLE_NORMAL) { + subFadeoutTime = Z2Param::BGM_CROSS_FADEIN_TIME + ivar6; + mainFadeinTime = Z2Param::BGM_CROSS_FADEOUT_TIME + ivar6 / 2; + mSubBgmHandle->fadeOut(subFadeoutTime); + mBattleSeqCount = subFadeoutTime; + } else if (getSubBgmID() == Z2BGM_BATTLE_TWILIGHT) { + if (mSubBgmStatus > 1) { + subFadeoutTime = Z2Param::BGM_CROSS_FADEIN_TIME + ivar6 / 4; + mainFadeinTime = Z2Param::BGM_CROSS_FADEIN_TIME + ivar6 / 4; + } else { + subFadeoutTime = 25 + ivar6 / 4; + mainFadeinTime = 25 + ivar6 / 4; + } + + mSubBgmHandle->fadeOut(subFadeoutTime); + mBattleSeqCount = subFadeoutTime; + } + + mMainBgmMaster.fadeIn(mainFadeinTime); + mBattleDistState = 3; + setBattleDistIgnore(false); + mFlags.mBattleSearched = false; } void Z2SeqMgr::fieldBgmStart() { @@ -2052,8 +2108,8 @@ void Z2SeqMgr::fieldBgmStart() { } void Z2SeqMgr::fieldRidingMute() { + f32 volume1, volume2; if (Z2GetSceneMgr()->isSceneExist() && mMainBgmHandle) { - f32 volume1, volume2; if (mFlags.mRiding) { volume1 = 1.0f; volume2 = 0.0f; diff --git a/src/Z2AudioLib/Z2SoundHandles.cpp b/src/Z2AudioLib/Z2SoundHandles.cpp index bbd1dba50f..8990cd4fd1 100644 --- a/src/Z2AudioLib/Z2SoundHandles.cpp +++ b/src/Z2AudioLib/Z2SoundHandles.cpp @@ -120,8 +120,7 @@ void Z2SoundHandles::stopAllSounds(u32 fadeTime) { } bool Z2SoundHandles::isActive() const { - JSULink* i; - for (i = getFirst(); i != NULL; i = i->getNext()) { + for (JSULink*i = getFirst(); i != NULL; i = i->getNext()) { if (i->getObject()->isSoundAttached()) { return true; } diff --git a/src/Z2AudioLib/Z2SoundMgr.cpp b/src/Z2AudioLib/Z2SoundMgr.cpp index 8e32d68196..9d3b4825f0 100644 --- a/src/Z2AudioLib/Z2SoundMgr.cpp +++ b/src/Z2AudioLib/Z2SoundMgr.cpp @@ -14,6 +14,10 @@ #include "Z2AudioLib/Z2AudioCS.h" #endif +static void dummy() { + OS_REPORT("seqCallBack!!!!!\n"); +} + u16 seqCallback(JASTrack* track, u16 command) { switch (command) { case 0x1000: @@ -246,7 +250,7 @@ void Z2SoundMgr::resetFilterAll() { i = 0; } - for (; i < 9; i++) { + for (; i < MAX_CATEGORIES; i++) { JAISeCategoryMgr* category = seMgr_.getCategory(i); int se_count = category->getMaxActiveSe(); if (se_count > 0) { @@ -274,7 +278,7 @@ void Z2SoundMgr::mixOut() { i = 0; } - for (; i < 9; i++) { + for (; i < MAX_CATEGORIES; i++) { JAISeCategoryMgr* category = seMgr_.getCategory(i); int se_count = category->getMaxActiveSe(); if (se_count > 0) { From 378e6ecf72e98d262dc46b0b32c4913cc1750d62 Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Mon, 5 Jan 2026 03:55:35 -0800 Subject: [PATCH 33/35] fix functions not returning values (#3018) --- include/JSystem/J2DGraph/J2DWindow.h | 7 +++++++ include/d/actor/d_a_npc_hoz.h | 2 +- include/d/actor/d_a_obj_bemos.h | 1 + src/JSystem/J2DGraph/J2DWindow.cpp | 19 +++++++++++++++++-- src/JSystem/JAudio2/JASHeapCtrl.cpp | 4 ++-- src/d/actor/d_a_npc_hoz.cpp | 19 +++++++++++++++++++ src/d/actor/d_a_obj_bemos.cpp | 3 ++- src/d/actor/d_a_obj_kshutter.cpp | 15 +++++++-------- src/d/actor/d_a_obj_stopper.cpp | 16 ++++++++-------- src/f_op/f_op_scene_req.cpp | 2 +- 10 files changed, 65 insertions(+), 23 deletions(-) diff --git a/include/JSystem/J2DGraph/J2DWindow.h b/include/JSystem/J2DGraph/J2DWindow.h index f467b953db..0d194c4995 100644 --- a/include/JSystem/J2DGraph/J2DWindow.h +++ b/include/JSystem/J2DGraph/J2DWindow.h @@ -9,9 +9,16 @@ class JUTTexture; enum J2DTextureBase { TEXTUREBASE_0 = 0, + TEXTUREBASE_1 = 1, + TEXTUREBASE_2 = 2, + TEXTUREBASE_3 = 3, }; enum J2DWindowMirror { + WINDOWMIRROR_39 = 39, + WINDOWMIRROR_114 = 114, + WINDOWMIRROR_141 = 141, + WINDOWMIRROR_216 = 216, }; /** diff --git a/include/d/actor/d_a_npc_hoz.h b/include/d/actor/d_a_npc_hoz.h index 5234e1bdc2..0a0b10eada 100644 --- a/include/d/actor/d_a_npc_hoz.h +++ b/include/d/actor/d_a_npc_hoz.h @@ -100,7 +100,7 @@ public: static cutFunc mCutList[]; private: - /* 0xE40 */ u8 field_0xE40[0xE44 - 0xE40]; + /* 0xE40 */ int field_0xE40; /* 0xE44 */ dCcD_Cyl mCyl; /* 0xF80 */ u8 mType; /* 0xF84 */ daStartAndGoal_c* field_0xf84; diff --git a/include/d/actor/d_a_obj_bemos.h b/include/d/actor/d_a_obj_bemos.h index bf28ec9eca..713794c3b1 100644 --- a/include/d/actor/d_a_obj_bemos.h +++ b/include/d/actor/d_a_obj_bemos.h @@ -46,6 +46,7 @@ public: }; Bgc_c(); + static void chk_wall_touch(const fopAc_ac_c*, const daObjBm_c::BgcSrc_c*, short); void wall_pos(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16, f32); bool chk_wall_pre(fopAc_ac_c const*, daObjBm_c::BgcSrc_c const*, int, s16); diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/src/JSystem/J2DGraph/J2DWindow.cpp index 8e02439053..c33fd3c095 100644 --- a/src/JSystem/J2DGraph/J2DWindow.cpp +++ b/src/JSystem/J2DGraph/J2DWindow.cpp @@ -276,8 +276,23 @@ void J2DWindow::initinfo2() { } } -J2DWindowMirror J2DWindow::convertMirror(J2DTextureBase) { - +J2DWindowMirror J2DWindow::convertMirror(J2DTextureBase texBase) { + J2DWindowMirror winMirror = WINDOWMIRROR_39; + switch (texBase) { + case TEXTUREBASE_0: + winMirror = WINDOWMIRROR_39; + break; + case TEXTUREBASE_1: + winMirror = WINDOWMIRROR_141; + break; + case TEXTUREBASE_2: + winMirror = WINDOWMIRROR_114; + break; + case TEXTUREBASE_3: + winMirror = WINDOWMIRROR_216; + break; + } + return winMirror; } J2DWindow::~J2DWindow() { diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp index ffa19293e0..5e82d25366 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp @@ -323,9 +323,9 @@ JASHeap* JASKernel::getAramHeap() { } u32 JASKernel::getAramFreeSize() { - audioAramHeap.getFreeSize(); + return audioAramHeap.getFreeSize(); } u32 JASKernel::getAramSize() { - audioAramHeap.getSize(); + return audioAramHeap.getSize(); } diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index 3463b27cde..1990a7cf2b 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -818,6 +818,25 @@ BOOL daNpc_Hoz_c::drawDbgInfo() { int daNpc_Hoz_c::test(void* i_this) { // DEBUG NONMATCHING + int r30 = 0; + switch (mMode) { + case 0: + case 1: + speedF = 0.0f; + speed.setall(0.0f); + mMode = 2; + // fall-through + case 2: + // TODO: determine pointer type of field_0xE40 + mFaceMotionSeqMngr.setNo(field_0xE40, -1.0f, 0, 0); + mMotionSeqMngr.setNo(field_0xE40, -1.0f, 0, 0); + mJntAnm.lookNone(0); + attention_info.flags = 0; + case 3: + default: + break; + } + return r30; } int daNpc_Hoz_c::selectAction() { diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 52d796d6b5..44a8c086e7 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -1117,8 +1117,9 @@ dBgS_WtrChk daObjBm_c::Bgc_c::M_wrt_work; dBgS_ObjLinChk daObjBm_c::Bgc_c::M_wall_work[23]; -static dBgS_ObjGndChk dummy_touch_work() { +void daObjBm_c::Bgc_c::chk_wall_touch(const fopAc_ac_c*, const daObjBm_c::BgcSrc_c*, short) { static dBgS_ObjLinChk touch_work; + const static float bgc_add = 10.0f; } static f32 dummy_rodata_5158() { diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index 96c3711ca3..e2e425097c 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -308,12 +308,8 @@ cPhs__Step daObjKshtr_c::phase_0() { if (!field_0x619) { mHomeAngleZ = home.angle.z; mHomeAngleX = home.angle.x; - shape_angle.x = 0; - current.angle.x = 0; - home.angle.x = 0; - shape_angle.z = 0; - current.angle.z = 0; - home.angle.z = 0; + home.angle.x = current.angle.x = shape_angle.x = 0; + home.angle.z = current.angle.z = shape_angle.z = 0; field_0x619 = true; } @@ -330,7 +326,8 @@ cPhs__Step daObjKshtr_c::phase_0() { #endif #if DEBUG - if (mType >= 6) { + int r28 = 5; + if (mType > r28) { OS_REPORT_ERROR("鍵付き壁ドア：引数０のタイプ指定が不正値です\n"); // Locked wall door: The type specification for argument 0 is invalid return cPhs_ERROR_e; @@ -345,7 +342,8 @@ cPhs__Step daObjKshtr_c::phase_0() { } } - if (dComIfG_resLoad(&mPhase1, l_arcName[mType]) == cPhs_COMPLEATE_e) { + phase = (cPhs__Step)dComIfG_resLoad(&mPhase1, l_arcName[mType]); + if (phase == cPhs_COMPLEATE_e) { phase = (cPhs__Step)MoveBGCreate(l_arcName[mType], l_dzb[mType], NULL, l_heap_size[mType], NULL); if (phase == cPhs_ERROR_e) { return phase; @@ -355,6 +353,7 @@ cPhs__Step daObjKshtr_c::phase_0() { OS_REPORT("KSHTR PARAM:0x%x\n", fopAcM_GetParam(this)); return cPhs_INIT_e; } + return phase; } cPhs__Step daObjKshtr_c::phase_1() { diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp index 557f02c22a..bee5fc640d 100644 --- a/src/d/actor/d_a_obj_stopper.cpp +++ b/src/d/actor/d_a_obj_stopper.cpp @@ -70,18 +70,18 @@ int daObjStopper_c::create() { if (!field_0x9fc) { field_0x9f8 = home.angle.x; field_0x9fa = home.angle.z; - home.angle.z = 0; - home.angle.x = 0; - current.angle.z = 0; - current.angle.x = 0; - shape_angle.z = 0; - shape_angle.x = 0; + home.angle.x = home.angle.z = 0; + current.angle.x = current.angle.z = 0; + shape_angle.x = shape_angle.z = 0; field_0x9fc = 1; } - cPhs__Step phase = (cPhs__Step)MoveBGCreate(NULL, -1, dBgS_MoveBGProc_TypicalRotY, 0x810, NULL); - if (phase != cPhs_ERROR_e) { + cPhs__Step phase = cPhs_COMPLEATE_e; + phase = (cPhs__Step)MoveBGCreate(NULL, -1, dBgS_MoveBGProc_TypicalRotY, 0x810, NULL); + if (phase == cPhs_ERROR_e) { return phase; } + OS_REPORT("STOPPER PARAM<0x%x>\n", fopAcM_GetParam(this)); + return phase; } int daObjStopper_c::Execute(Mtx** param_0) { diff --git a/src/f_op/f_op_scene_req.cpp b/src/f_op/f_op_scene_req.cpp index 94aed7f3e8..8c98a1693c 100644 --- a/src/f_op/f_op_scene_req.cpp +++ b/src/f_op/f_op_scene_req.cpp @@ -165,5 +165,5 @@ s32 fopScnRq_ReRequest(fpc_ProcID i_requestId, s16 i_procName, void* i_data) { } int fopScnRq_Handler() { - fpcNdRq_Handler(); + return fpcNdRq_Handler(); } From 29d2308308247921ab5b79b8fbc20f1003e413dc Mon Sep 17 00:00:00 2001 From: Max Roncace Date: Mon, 5 Jan 2026 06:58:09 -0500 Subject: [PATCH 34/35] Link d_a_npc and d_a_npc_cd2 (#3019) --- configure.py | 4 +- include/d/actor/d_a_npc4.h | 9 ++++ src/d/actor/d_a_npc4.cpp | 21 +++++++++ src/d/actor/d_a_npc_cd2.cpp | 94 ++++++++++++++++++------------------- 4 files changed, 79 insertions(+), 49 deletions(-) diff --git a/configure.py b/configure.py index d4f49b7ee7..198579ee58 100755 --- a/configure.py +++ b/configure.py @@ -755,9 +755,9 @@ config.libs = [ Object(Equivalent, "d/actor/d_a_alink.cpp"), # weak func order, vtable order Object(MatchingFor(ALL_GCN), "d/actor/d_a_itembase.cpp"), Object(MatchingFor(ALL_GCN), "d/actor/d_a_no_chg_room.cpp"), - Object(Equivalent, "d/actor/d_a_npc.cpp"), # weak func order (daNpcF_MoveBgActor_c::Delete) + Object(MatchingFor(ALL_GCN), "d/actor/d_a_npc.cpp"), Object(MatchingFor(ALL_GCN), "d/actor/d_a_npc_cd.cpp"), - Object(NonMatching, "d/actor/d_a_npc_cd2.cpp"), # stripped vtable order + Object(MatchingFor(ALL_GCN), "d/actor/d_a_npc_cd2.cpp"), Object(MatchingFor(ALL_GCN), "d/actor/d_a_obj_item.cpp"), Object(MatchingFor(ALL_GCN), "d/d_insect.cpp"), Object(MatchingFor(ALL_GCN), "d/actor/d_a_obj_ss_base.cpp"), diff --git a/include/d/actor/d_a_npc4.h b/include/d/actor/d_a_npc4.h index 76a6cd8381..bcecb54f5c 100644 --- a/include/d/actor/d_a_npc4.h +++ b/include/d/actor/d_a_npc4.h @@ -409,6 +409,15 @@ public: 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 + // (otherwise Delete is placed under Draw instead of under Create) + int MoveBGCreateHeap(); + int MoveBGCreate(); + int MoveBGDelete(); + int MoveBGExecute(); + int MoveBGDraw(); + virtual bool CreateHeap() { return true; } virtual bool Create() { return true; } virtual bool Execute(Mtx**) { return true; } diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index a8f6db90d5..9e59ae820f 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -2137,6 +2137,27 @@ static void dummyVirtual() { daNpcF_MoveBgActor_c dummy; } +// see note in header, this fixes weak function order for daNpcF_MoveBgActor_c functions +int daNpcF_MoveBgActor_c::MoveBGCreateHeap() { + return CreateHeap(); +} + +int daNpcF_MoveBgActor_c::MoveBGCreate() { + return Create(); +} + +int daNpcF_MoveBgActor_c::MoveBGDelete() { + return Delete(); +} + +int daNpcF_MoveBgActor_c::MoveBGExecute() { + return Execute((Mtx**)NULL); +} + +int daNpcF_MoveBgActor_c::MoveBGDraw() { + return Draw(); +} + dCcD_SrcGObjInf const daBaseNpc_c::mCcDObj = { {0, {{0, 0, 0}, {0x0, 0x0}, {0x79}}}, {dCcD_SE_NONE, 0, 0, 0, 0}, diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 721afc93f3..227ea5703b 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -195,6 +195,53 @@ dCcD_SrcCyl const daNpcCd2_c::m_cylDat = { } }; +static char* const* l_resNameTbl[30] = { + l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa, + l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2, + l_resWANa, l_resWADa, l_resMATa, l_resWCNa, l_resWONa, l_resWGNa, l_resWANb, l_resWANa2, + l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2, +}; + +static anmTblPrm const l_bmdTbl[30] = { + l_resMANa[0], 3, l_resMADa[0], 3, l_resMCNa[0], 4, l_resMONa[0], 4, l_resMANb[0], 3, + l_resMANc[0], 4, l_resMASa[0], 4, l_resMBNa[0], 4, l_resMANa2[0], 4, l_resMADa2[0], 4, + l_resMCNa2[0], 4, l_resMONa2[0], 4, l_resMANb2[0], 3, l_resMANc2[0], 4, l_resMASa2[0], 4, + l_resMBNa2[0], 4, l_resWANa[0], 4, l_resWADa[0], 4, l_resMATa[0], 3, l_resWCNa[0], 4, + l_resWONa[0], 4, l_resWGNa[0], 4, l_resWANb[0], 4, l_resWANa2[0], 4, l_resWADa2[0], 4, + l_resMATa2[0], 3, l_resWCNa2[0], 4, l_resWONa2[0], 4, l_resWGNa2[0], 4, l_resWANb2[0], 4, +}; + +static anmTblPrm const l_bmdTWTbl[30] = { + l_resMANa[1], 3, l_resMADa[1], 3, l_resMCNa[1], 4, l_resMONa[1], 4, l_resMANb[1], 3, + l_resMANc[1], 4, l_resMASa[1], 4, l_resMBNa[1], 4, l_resMANa2[1], 4, l_resMADa2[1], 3, + l_resMCNa2[1], 4, l_resMONa2[1], 4, l_resMANb2[1], 3, l_resMANc2[1], 4, l_resMASa2[1], 4, + l_resMBNa2[1], 4, l_resWANa[1], 4, l_resWADa[1], 4, l_resMATa[1], 3, l_resWCNa[1], 4, + l_resWONa[1], 4, l_resWGNa[1], 4, l_resWANb[1], 4, l_resWANa2[1], 4, l_resWADa2[1], 4, + l_resMATa2[1], 3, l_resWCNa2[1], 4, l_resWONa2[1], 4, l_resWGNa2[1], 4, l_resWANb2[1], 4, +}; + +static anmTblPrm const l_btpTbl[30] = { + l_resMANa[0], -1, l_resMADa[0], -1, l_resMCNa[0], 7, l_resMONa[0], 7, l_resMANb[0], -1, + l_resMANc[0], 7, l_resMASa[0], 7, l_resMBNa[0], 7, l_resMANa2[0], 7, l_resMADa2[0], 7, + l_resMCNa2[0], 7, l_resMONa2[0], 7, l_resMANb2[0], -1, l_resMANc2[0], 7, l_resMASa2[0], 7, + l_resMBNa2[0], 7, l_resWANa[0], 7, l_resWADa[0], 7, l_resMATa[0], -1, l_resWCNa[0], 7, + l_resWONa[0], 7, l_resWGNa[0], 7, l_resWANb[0], 7, l_resWANa2[0], 7, l_resWADa2[0], 7, + l_resMATa2[0], -1, l_resWCNa2[0], 7, l_resWONa2[0], 7, l_resWGNa2[0], 7, l_resWANb2[0], 7, +}; + +static anmTblPrm const l_btpTWTbl[30] = { + l_resMANa[1], -1, l_resMADa[1], -1, l_resMCNa[1], 7, l_resMONa[1], 7, l_resMANb[1], -1, + l_resMANc[1], 7, l_resMASa[1], 7, l_resMBNa[1], 7, l_resMANa2[1], 7, l_resMADa2[1], -1, + l_resMCNa2[1], 7, l_resMONa2[1], 7, l_resMANb2[1], -1, l_resMANc2[1], 7, l_resMASa2[1], 7, + l_resMBNa2[1], 7, l_resWANa[1], 7, l_resWADa[1], 7, l_resMATa[1], -1, l_resWCNa[1], 7, + l_resWONa[1], 7, l_resWGNa[1], 7, l_resWANb[1], 7, l_resWANa2[1], 7, l_resWADa2[1], 7, + l_resMATa2[1], -1, l_resWCNa2[1], 7, l_resWONa2[1], 7, l_resWGNa2[1], 7, l_resWANb2[1], 7, +}; + +#include "d/actor/d_a_npc_cd2_HIO.inc" + +daNpcCd2_HIO_c l_Cd2_HIO; + int daNpcCd2_c::NpcCreate(int param_1) { J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1); JUT_ASSERT(590, NULL != a_mdlData_p); @@ -292,51 +339,6 @@ bool daNpcCd2_c::isM_() { return a_jntNum == JntM_NUM_e; } -static char* const* l_resNameTbl[30] = { - l_resMANa, l_resMADa, l_resMCNa, l_resMONa, l_resMANb, l_resMANc, l_resMASa, l_resMBNa, - l_resMANa2, l_resMADa2, l_resMCNa2, l_resMONa2, l_resMANb2, l_resMANc2, l_resMASa2, l_resMBNa2, - l_resWANa, l_resWADa, l_resMATa, l_resWCNa, l_resWONa, l_resWGNa, l_resWANb, l_resWANa2, - l_resWADa2, l_resMATa2, l_resWCNa2, l_resWONa2, l_resWGNa2, l_resWANb2, -}; - -static anmTblPrm const l_bmdTbl[30] = { - l_resMANa[0], 3, l_resMADa[0], 3, l_resMCNa[0], 4, l_resMONa[0], 4, l_resMANb[0], 3, - l_resMANc[0], 4, l_resMASa[0], 4, l_resMBNa[0], 4, l_resMANa2[0], 4, l_resMADa2[0], 4, - l_resMCNa2[0], 4, l_resMONa2[0], 4, l_resMANb2[0], 3, l_resMANc2[0], 4, l_resMASa2[0], 4, - l_resMBNa2[0], 4, l_resWANa[0], 4, l_resWADa[0], 4, l_resMATa[0], 3, l_resWCNa[0], 4, - l_resWONa[0], 4, l_resWGNa[0], 4, l_resWANb[0], 4, l_resWANa2[0], 4, l_resWADa2[0], 4, - l_resMATa2[0], 3, l_resWCNa2[0], 4, l_resWONa2[0], 4, l_resWGNa2[0], 4, l_resWANb2[0], 4, -}; - -static anmTblPrm const l_bmdTWTbl[30] = { - l_resMANa[1], 3, l_resMADa[1], 3, l_resMCNa[1], 4, l_resMONa[1], 4, l_resMANb[1], 3, - l_resMANc[1], 4, l_resMASa[1], 4, l_resMBNa[1], 4, l_resMANa2[1], 4, l_resMADa2[1], 3, - l_resMCNa2[1], 4, l_resMONa2[1], 4, l_resMANb2[1], 3, l_resMANc2[1], 4, l_resMASa2[1], 4, - l_resMBNa2[1], 4, l_resWANa[1], 4, l_resWADa[1], 4, l_resMATa[1], 3, l_resWCNa[1], 4, - l_resWONa[1], 4, l_resWGNa[1], 4, l_resWANb[1], 4, l_resWANa2[1], 4, l_resWADa2[1], 4, - l_resMATa2[1], 3, l_resWCNa2[1], 4, l_resWONa2[1], 4, l_resWGNa2[1], 4, l_resWANb2[1], 4, -}; - -static anmTblPrm const l_btpTbl[30] = { - l_resMANa[0], -1, l_resMADa[0], -1, l_resMCNa[0], 7, l_resMONa[0], 7, l_resMANb[0], -1, - l_resMANc[0], 7, l_resMASa[0], 7, l_resMBNa[0], 7, l_resMANa2[0], 7, l_resMADa2[0], 7, - l_resMCNa2[0], 7, l_resMONa2[0], 7, l_resMANb2[0], -1, l_resMANc2[0], 7, l_resMASa2[0], 7, - l_resMBNa2[0], 7, l_resWANa[0], 7, l_resWADa[0], 7, l_resMATa[0], -1, l_resWCNa[0], 7, - l_resWONa[0], 7, l_resWGNa[0], 7, l_resWANb[0], 7, l_resWANa2[0], 7, l_resWADa2[0], 7, - l_resMATa2[0], -1, l_resWCNa2[0], 7, l_resWONa2[0], 7, l_resWGNa2[0], 7, l_resWANb2[0], 7, -}; - -static anmTblPrm const l_btpTWTbl[30] = { - l_resMANa[1], -1, l_resMADa[1], -1, l_resMCNa[1], 7, l_resMONa[1], 7, l_resMANb[1], -1, - l_resMANc[1], 7, l_resMASa[1], 7, l_resMBNa[1], 7, l_resMANa2[1], 7, l_resMADa2[1], -1, - l_resMCNa2[1], 7, l_resMONa2[1], 7, l_resMANb2[1], -1, l_resMANc2[1], 7, l_resMASa2[1], 7, - l_resMBNa2[1], 7, l_resWANa[1], 7, l_resWADa[1], 7, l_resMATa[1], -1, l_resWCNa[1], 7, - l_resWONa[1], 7, l_resWGNa[1], 7, l_resWANb[1], 7, l_resWANa2[1], 7, l_resWADa2[1], 7, - l_resMATa2[1], -1, l_resWCNa2[1], 7, l_resWONa2[1], 7, l_resWGNa2[1], 7, l_resWANb2[1], 7, -}; - -#include "d/actor/d_a_npc_cd2_HIO.inc" - J3DAnmTransform* daNpcCd2_c::getAnmP(int param_1, int param_2) { int a_anmNum = param_1; switch (a_anmNum) { @@ -597,8 +599,6 @@ J3DAnmTransform* daNpcCd2_c::getAnmP(int param_1, int param_2) { return (J3DAnmTransform*)dComIfG_getObjectRes(name, index); } -daNpcCd2_HIO_c l_Cd2_HIO; - int daNpcCd2_c::setAttention(int param_1) { static cXyz a_eyeOfsTbl[30] = { cXyz(0.0f, 10.0f, 0.0f), From 3726054a9950776538bb54d39c2fe951de7f9dfa Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Mon, 5 Jan 2026 04:07:04 -0800 Subject: [PATCH 35/35] JUtility debug (#3020) --- config/GZ2E01/symbols.txt | 2 +- config/GZ2J01/symbols.txt | 2 +- config/GZ2P01/symbols.txt | 2 +- config/ShieldD/symbols.txt | 8 +- include/JSystem/JGadget/linklist.h | 5 +- include/JSystem/JKernel/JKRHeap.h | 4 + include/JSystem/JSupport/JSUInputStream.h | 4 + include/JSystem/JSupport/JSUList.h | 2 + include/JSystem/JUtility/JUTAssert.h | 3 - include/JSystem/JUtility/JUTCacheFont.h | 3 +- include/JSystem/JUtility/JUTConsole.h | 9 +- include/JSystem/JUtility/JUTDbPrint.h | 4 +- include/JSystem/JUtility/JUTDirectFile.h | 2 + include/JSystem/JUtility/JUTException.h | 2 +- include/JSystem/JUtility/JUTFont.h | 8 +- include/JSystem/JUtility/JUTGamePad.h | 22 +++- include/JSystem/JUtility/JUTGraphFifo.h | 5 +- include/JSystem/JUtility/JUTPalette.h | 14 +- include/JSystem/JUtility/JUTProcBar.h | 1 + include/JSystem/JUtility/JUTTexture.h | 10 +- include/JSystem/JUtility/JUTXfb.h | 12 +- src/JSystem/JUtility/JUTAssert.cpp | 60 +++++---- src/JSystem/JUtility/JUTCacheFont.cpp | 112 ++++++++-------- src/JSystem/JUtility/JUTConsole.cpp | 75 ++++++----- src/JSystem/JUtility/JUTDbPrint.cpp | 14 +- src/JSystem/JUtility/JUTDirectFile.cpp | 32 +++-- src/JSystem/JUtility/JUTDirectPrint.cpp | 54 +++----- src/JSystem/JUtility/JUTException.cpp | 148 +++++++++++----------- src/JSystem/JUtility/JUTFader.cpp | 12 +- src/JSystem/JUtility/JUTFont.cpp | 10 +- src/JSystem/JUtility/JUTGamePad.cpp | 73 ++++++----- src/JSystem/JUtility/JUTGraphFifo.cpp | 5 +- src/JSystem/JUtility/JUTPalette.cpp | 4 +- src/JSystem/JUtility/JUTProcBar.cpp | 39 +++--- src/JSystem/JUtility/JUTResFont.cpp | 120 +++++++++--------- src/JSystem/JUtility/JUTResource.cpp | 10 +- src/JSystem/JUtility/JUTTexture.cpp | 41 +++--- src/JSystem/JUtility/JUTVideo.cpp | 22 ++-- src/JSystem/JUtility/JUTXfb.cpp | 6 +- 39 files changed, 494 insertions(+), 467 deletions(-) diff --git a/config/GZ2E01/symbols.txt b/config/GZ2E01/symbols.txt index 43cc171bce..509c9baf23 100644 --- a/config/GZ2E01/symbols.txt +++ b/config/GZ2E01/symbols.txt @@ -21544,7 +21544,7 @@ sReleasePoint__Q210JUTGamePad6CStick = .sdata:0x804508E4; // type:object size:0x sResetPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804508E8; // type:object size:0x4 scope:global align:4 data:4byte sResetMaskPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804508EC; // type:object size:0x4 scope:global align:4 data:4byte sMessageBuffer__12JUTException = .sdata:0x804508F0; // type:object size:0x4 scope:global align:4 -sAssertVisible = .sdata:0x804508F8; // type:object size:0x1 scope:global align:1 data:byte +mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x804508F8; // type:object size:0x1 scope:global align:1 data:byte oneFrameRate = .sdata:0x80450900; // type:object size:0x4 scope:local align:4 data:float oneFrameRateUser = .sdata:0x80450904; // type:object size:0x4 scope:local align:4 data:float cm2hw$552 = .sdata:0x80450908; // type:object size:0x4 scope:local align:4 diff --git a/config/GZ2J01/symbols.txt b/config/GZ2J01/symbols.txt index 05a39f5b60..ed67ba16d9 100644 --- a/config/GZ2J01/symbols.txt +++ b/config/GZ2J01/symbols.txt @@ -21573,7 +21573,7 @@ sReleasePoint__Q210JUTGamePad6CStick = .sdata:0x8044AA24; // type:object size:0x sResetPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x8044AA28; // type:object size:0x4 scope:global align:4 data:4byte sResetMaskPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x8044AA2C; // type:object size:0x4 scope:global align:4 data:4byte sMessageBuffer__12JUTException = .sdata:0x8044AA30; // type:object size:0x4 scope:global align:4 -sAssertVisible = .sdata:0x8044AA38; // type:object size:0x1 scope:global align:1 data:byte +mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8044AA38; // type:object size:0x1 scope:global align:1 data:byte oneFrameRate = .sdata:0x8044AA40; // type:object size:0x4 scope:local align:4 data:float oneFrameRateUser = .sdata:0x8044AA44; // type:object size:0x4 scope:local align:4 data:float cm2hw$552 = .sdata:0x8044AA48; // type:object size:0x4 scope:local align:4 diff --git a/config/GZ2P01/symbols.txt b/config/GZ2P01/symbols.txt index 56df510488..c84900b3fd 100644 --- a/config/GZ2P01/symbols.txt +++ b/config/GZ2P01/symbols.txt @@ -21585,7 +21585,7 @@ sReleasePoint__Q210JUTGamePad6CStick = .sdata:0x804528A4; // type:object size:0x sResetPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804528A8; // type:object size:0x4 scope:global align:4 data:4byte sResetMaskPattern__Q210JUTGamePad13C3ButtonReset = .sdata:0x804528AC; // type:object size:0x4 scope:global align:4 data:4byte sMessageBuffer__12JUTException = .sdata:0x804528B0; // type:object size:0x4 scope:global align:4 -sAssertVisible = .sdata:0x804528B8; // type:object size:0x1 data:byte +mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x804528B8; // type:object size:0x1 data:byte oneFrameRate = .sdata:0x804528C0; // type:object size:0x4 scope:local align:4 data:float oneFrameRateUser = .sdata:0x804528C4; // type:object size:0x4 scope:local align:4 data:float cm2hw$552 = .sdata:0x804528C8; // type:object size:0x4 scope:local align:4 diff --git a/config/ShieldD/symbols.txt b/config/ShieldD/symbols.txt index a40e70ba33..8abff0e033 100644 --- a/config/ShieldD/symbols.txt +++ b/config/ShieldD/symbols.txt @@ -63396,7 +63396,7 @@ __RTTI__12JUTException = .sdata:0x8074AE18; // type:object size:0x8 scope:global @6861 = .sdata:0x8074AE20; // type:object size:0x3 scope:local data:string hash:0x0C9EC66C sDisplayTime__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8074AE28; // type:object size:0x4 scope:global data:4byte hash:0x14776654 dhash:0xB02A20B5 sDevice__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8074AE2C; // type:object size:0x4 scope:global data:4byte hash:0xAB641663 dhash:0xDE80A722 -lbl_8074AE30 = .sdata:0x8074AE30; // type:object size:0x1 data:byte hash:0xF164C2F5 dhash:0x13B63B34 +mVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sdata:0x8074AE30; // type:object size:0x1 data:byte hash:0xF164C2F5 dhash:0x13B63B34 @21133 = .sdata:0x8074AE34; // type:object size:0x3 scope:local data:string hash:0xA0B9E9B7 @21184 = .sdata:0x8074AE38; // type:object size:0x4 scope:local data:string hash:0xA0B9EADB @21235 = .sdata:0x8074AE3C; // type:object size:0x2 scope:local data:string hash:0xA0B9E5F2 @@ -64883,7 +64883,7 @@ lbl_8074CF80 = .sbss:0x8074CF80; // type:object size:0x1 data:byte hash:0x0135BA sCurrentFifo__12JUTGraphFifo = .sbss:0x8074CF84; // type:object size:0x4 scope:global data:4byte hash:0x3E10453B dhash:0xADA054F8 mGpStatus__12JUTGraphFifo = .sbss:0x8074CF88; // type:object size:0x5 scope:global hash:0xE45701E9 dhash:0x776AE8CA sDebugPrint__10JUTDbPrint = .sbss:0x8074CF90; // type:object size:0x4 scope:global data:4byte hash:0x80711BCB dhash:0x255411CA -lbl_8074CF98 = .sbss:0x8074CF98; // type:object size:0x1 data:byte hash:0x7D0B2177 dhash:0x111A89B6 +mListInitialized__10JUTGamePad = .sbss:0x8074CF98; // type:object size:0x1 data:byte hash:0x7D0B2177 dhash:0x111A89B6 mPadAssign__10JUTGamePad = .sbss:0x8074CF9C; // type:object size:0x4 scope:global hash:0x7962D9AD dhash:0x16A8416C sSuppressPadReset__10JUTGamePad = .sbss:0x8074CFA0; // type:object size:0x4 scope:global data:4byte hash:0x5E8C9776 dhash:0x876EE0B7 lbl_8074CFA4 = .sbss:0x8074CFA4; // type:object size:0x1 data:byte hash:0x79F03151 dhash:0x8212CF50 @@ -64894,7 +64894,7 @@ mEnabled__Q210JUTGamePad7CRumble = .sbss:0x8074CFB4; // type:object size:0x4 sco sCallback__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFB8; // type:object size:0x4 scope:global data:4byte hash:0xF1111C3C dhash:0x5261607C sCallbackArg__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFBC; // type:object size:0x4 scope:global data:4byte hash:0xCC5C4708 dhash:0x77A84D68 sThreshold__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFC0; // type:object size:0x8 scope:global data:4byte hash:0xFCCCB7E2 dhash:0xE2BF2EC2 -lbl_8074CFC8 = .sbss:0x8074CFC8; // type:object size:0x1 data:byte hash:0xBD6B48CC dhash:0x498A7ECC +sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFC8; // type:object size:0x1 data:byte hash:0xBD6B48CC dhash:0x498A7ECC sResetOccurred__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFC9; // type:object size:0x1 data:byte hash:0x878FC37B dhash:0xB3FB803B sResetOccurredPort__Q210JUTGamePad13C3ButtonReset = .sbss:0x8074CFCC; // type:object size:0x4 scope:global data:4byte hash:0xEAB52F22 dhash:0x4A01E002 sErrorManager__12JUTException = .sbss:0x8074CFD0; // type:object size:0x4 scope:global data:4byte hash:0x6DF35642 dhash:0x528F3581 @@ -64909,7 +64909,7 @@ fpscr__12JUTException = .sbss:0x8074CFF0; // type:object size:0x4 scope:global d sDirectPrint__14JUTDirectPrint = .sbss:0x8074CFF8; // type:object size:0x4 scope:global data:4byte hash:0xAD5B2218 dhash:0x2B49FC9D sMessageLife__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x8074D000; // type:object size:0x4 scope:global data:4byte hash:0xB70B9CD6 dhash:0x14F45BF7 sMessageOwner__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x8074D004; // type:object size:0x4 scope:global data:4byte hash:0xBFF3EE31 dhash:0xB3683D70 -lbl_8074D008 = .sbss:0x8074D008; // type:object size:0x1 data:byte hash:0xFA6CFDB7 dhash:0xEDED67B6 +mSynchro__Q212JUTAssertion23@unnamed@JUTAssert_cpp@ = .sbss:0x8074D008; // type:object size:0x1 data:byte hash:0xFA6CFDB7 dhash:0xEDED67B6 sManager__8JUTVideo = .sbss:0x8074D010; // type:object size:0x4 scope:global data:4byte hash:0x55839787 dhash:0x9B46867F sVideoLastTick__8JUTVideo = .sbss:0x8074D014; // type:object size:0x4 scope:global data:4byte hash:0xFF55AB9A dhash:0xA259C402 sVideoInterval__8JUTVideo = .sbss:0x8074D018; // type:object size:0x4 scope:global data:4byte hash:0xEBE85CBA dhash:0x5C483962 diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index 8d0f7c43b1..4728f4197e 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -234,7 +234,10 @@ struct TLinkList : TNodeLinkList { const_iterator begin() const { return const_iterator(const_cast(this)->begin()); } iterator end() { return iterator(TNodeLinkList::end()); } const_iterator end() const { return const_iterator(const_cast(this)->end()); } - T& front() { return *begin(); } + T& front() { + JUT_ASSERT(642, !empty()); + return *begin(); + } T& back() { JUT_ASSERT(652, !empty()); return *--end(); } void pop_front() { erase(TNodeLinkList::begin()); } void Push_front(T* element) { Insert(begin(), element); } diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index e0162fc595..77a4acd8e3 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -210,6 +210,10 @@ inline void* operator new(size_t size, void* ptr) { } #endif +inline void* operator new[](size_t size, void* ptr) { + return ptr; +} + void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment); inline void* JKRAllocFromHeap(JKRHeap* heap, u32 size, int alignment) { diff --git a/include/JSystem/JSupport/JSUInputStream.h b/include/JSystem/JSupport/JSUInputStream.h index 2763e7f5aa..52c80575ee 100644 --- a/include/JSystem/JSupport/JSUInputStream.h +++ b/include/JSystem/JSupport/JSUInputStream.h @@ -89,6 +89,10 @@ public: return *this; } + s32 read(u8& val) { + return read(&val, sizeof(u8)); + } + s32 read(u32& param_0) { return read(¶m_0, 4); } diff --git a/include/JSystem/JSupport/JSUList.h b/include/JSystem/JSupport/JSUList.h index 682dd52e42..20e36c1525 100644 --- a/include/JSystem/JSupport/JSUList.h +++ b/include/JSystem/JSupport/JSUList.h @@ -100,6 +100,8 @@ public: ~JSUList() {} + void initiate() { JSUPtrList::initiate(); } + bool append(JSULink* link) { return this->JSUPtrList::append((JSUPtrLink*)link); } bool prepend(JSULink* link) { return this->JSUPtrList::prepend((JSUPtrLink*)link); } diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index 66af11774b..7ccc07eaa2 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -78,7 +78,4 @@ namespace JUTAssertion { } }; - -extern bool sAssertVisible; - #endif /* JUTASSERT_H */ diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/include/JSystem/JUtility/JUTCacheFont.h index 4eafcaa255..8698901afb 100644 --- a/include/JSystem/JUtility/JUTCacheFont.h +++ b/include/JSystem/JUtility/JUTCacheFont.h @@ -61,7 +61,8 @@ public: void setPagingType(EPagingType type) { mPagingType = type; } static u32 calcCacheSize(u32 param_0, int param_1) { return (ALIGN_NEXT(param_0, 0x20) + 0x40) * param_1; } - GXTexObj* getTexObj(void* buffer) { return &((TCachePage*)buffer)->mTexObj; } + GXTexObj* getTexObj(void* buffer) const { return &((TCachePage*)buffer)->mTexObj; } + void delete_and_initialize() { deleteMemBlocks_CacheFont(); initialize_state(); } u32 getCachePage() const { return mCachePage; diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h index 7b852eb0a0..e1708adab9 100644 --- a/include/JSystem/JUtility/JUTConsole.h +++ b/include/JSystem/JUtility/JUTConsole.h @@ -71,15 +71,18 @@ public: bool isVisible() const { return mVisible; } void setVisible(bool visible) { mVisible = visible; } - u8 getLineAttr(int param_0) { return mBuf[(field_0x20 + 2) * param_0]; } + u8 getLineAttr(int param_0) const { return mBuf[(field_0x20 + 2) * param_0]; } void setLineAttr(int param_0, u8 param_1) { mBuf[(field_0x20 + 2) * param_0] = param_1; } u8* getLinePtr(int param_0) const { return &mBuf[(field_0x20 + 2) * param_0] + 1; } int diffIndex(int param_0, int param_1) const { + int result; int diff = param_1 - param_0; if (diff >= 0) { - return diff; + result = diff; + } else { + result = diff + mMaxLines; } - return diff += mMaxLines; + return result; } int prevIndex(int index) const { diff --git a/include/JSystem/JUtility/JUTDbPrint.h b/include/JSystem/JUtility/JUTDbPrint.h index 4d5c0749fa..14714df16e 100644 --- a/include/JSystem/JUtility/JUTDbPrint.h +++ b/include/JSystem/JUtility/JUTDbPrint.h @@ -28,10 +28,10 @@ public: JUTDbPrint(JUTFont*, JKRHeap*); static JUTDbPrint* start(JUTFont*, JKRHeap*); JUTFont* changeFont(JUTFont*); - void enter(int, int, int, char const*, int); + void enter(int, int, int, const char*, int); void flush(int, int, int, int); void flush(); - void drawString(int, int, int, u8 const*); + void drawString(int, int, int, const u8*); static JUTDbPrint* getManager() { return sDebugPrint; } diff --git a/include/JSystem/JUtility/JUTDirectFile.h b/include/JSystem/JUtility/JUTDirectFile.h index e2249f1fcb..71a0c1f21c 100644 --- a/include/JSystem/JUtility/JUTDirectFile.h +++ b/include/JSystem/JUtility/JUTDirectFile.h @@ -17,6 +17,8 @@ struct JUTDirectFile { void fclose(); int fgets(void*, int); + bool isOpened() const { return mIsOpen; } + /* 0x000 */ u8 mBuffer[0x820]; /* 0x820 */ u8* mSectorStart; /* 0x824 */ u32 mToRead; diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h index 29849460e9..4830ed4f74 100644 --- a/include/JSystem/JUtility/JUTException.h +++ b/include/JSystem/JUtility/JUTException.h @@ -57,7 +57,7 @@ public: class JUTExMapFile { public: - JUTExMapFile(char* path) : mLink(this) { mPath = path; } + JUTExMapFile(const char* path) : mLink(this) { mPath = const_cast(path); } public: /* 0x00 */ char* mPath; diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h index 193a3ac3fd..12cf8f6772 100644 --- a/include/JSystem/JUtility/JUTFont.h +++ b/include/JSystem/JUtility/JUTFont.h @@ -114,8 +114,8 @@ public: drawString_size(posX, posY, str, strlen(str), visible); } - void drawString_size(int posX, int posY, const char* str, u32 len, bool visible) { - drawString_size_scale(posX, posY, getWidth(), getHeight(), str, len, visible); + s32 drawString_size(int posX, int posY, const char* str, u32 len, bool visible) { + return drawString_size_scale(posX, posY, getWidth(), getHeight(), str, len, visible); } void drawString_scale(f32 posX, f32 posY, f32 width, f32 height, const char* str, @@ -132,6 +132,10 @@ public: bool isValid() const { return mValid; } bool isFixed() const { return mFixed; } int getFixedWidth() const { return mFixedWidth; } + void setFixedWidth(bool fixed, int width) { + mFixed = fixed; + mFixedWidth = width; + } int getOffset(int i_no) const { JUTFont::TWidth width; getWidthEntry(i_no, &width); diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h index 5d9fb62c96..af8da7aa33 100644 --- a/include/JSystem/JUtility/JUTGamePad.h +++ b/include/JSystem/JUtility/JUTGamePad.h @@ -61,6 +61,7 @@ public: void checkResetCallback(OSTime holdTime); void update(); void stopPatternedRumble() { mRumble.stopPatternedRumble(mPortNum); } + void setButtonRepeat(u32, u32, u32); static void checkResetSwitch(); static void clearForReset(); @@ -72,6 +73,8 @@ public: PADSetAnalogMode(mode); } + static int getClampMode() { return sClampMode; } + static void clearResetOccurred() { C3ButtonReset::sResetOccurred = false; } static void setResetCallback(callbackFn callback, void* arg) { @@ -111,7 +114,7 @@ public: void stopMotorWave() { mRumble.stopPatternedRumbleAtThePeriod(); } void stopMotor() { mRumble.stopMotor(mPortNum, false); } - void stopMotorHard() { mRumble.stopMotorHard(mPortNum); } + void stopMotorHard() { CRumble::stopMotorHard(mPortNum); } static s8 getPortStatus(EPadPort port) { JUT_ASSERT(360, 0 <= port && port < 4); @@ -181,7 +184,7 @@ public: CRumble(JUTGamePad* pad) { clear(pad); } static u32 sChannelMask[4]; - static bool mStatus[4]; + static u8 mStatus[4]; static u32 mEnabled; enum ERumble { @@ -201,9 +204,18 @@ public: void stopPatternedRumbleAtThePeriod(); static void setEnabled(u32 mask); - void stopMotorHard(int port) { stopMotor(port, true); } + static void stopMotor(int port) { stopMotor(port, false); } + static void stopMotorHard(int port) { stopMotor(port, true); } - static bool isEnabled(u32 mask) { return mEnabled & mask; } + static bool isEnabled(u32 mask) { + bool result; + if (mEnabled & mask) { + result = true; + } else { + result = false; + } + return result; + } static bool isEnabledPort(int port) { JUT_ASSERT(250, 0 <= port && port < 4); @@ -274,4 +286,6 @@ struct JUTGamePadLongPress { /* 0x50 */ s32 field_0x50; }; +inline void JUTReadGamePad() { JUTGamePad::read(); } + #endif /* JUTGAMEPAD_H */ diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/include/JSystem/JUtility/JUTGraphFifo.h index 512e5713ab..9af2d8a0bc 100644 --- a/include/JSystem/JUtility/JUTGraphFifo.h +++ b/include/JSystem/JUtility/JUTGraphFifo.h @@ -13,12 +13,13 @@ public: virtual ~JUTGraphFifo(); - void getGpStatus() { + static bool* getGpStatus() { GXGetGPStatus((GXBool*)&mGpStatus[0], (GXBool*)&mGpStatus[1], (GXBool*)&mGpStatus[2], (GXBool*)&mGpStatus[3], (GXBool*)&mGpStatus[4]); + return mGpStatus; } - bool isGPActive() { + static bool isGPActive() { getGpStatus(); return mGpStatus[2] == false; } diff --git a/include/JSystem/JUtility/JUTPalette.h b/include/JSystem/JUtility/JUTPalette.h index 714d069397..0053913630 100644 --- a/include/JSystem/JUtility/JUTPalette.h +++ b/include/JSystem/JUtility/JUTPalette.h @@ -21,7 +21,7 @@ struct ResTLUT { */ class JUTPalette { public: - JUTPalette(_GXTlut p1, _GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) { + JUTPalette(GXTlut p1, GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) { this->storeTLUT(p1, p2, p3, p4, p5); } @@ -29,18 +29,18 @@ public: storeTLUT(tlutNo, p_tlutRes); } - void storeTLUT(_GXTlut, ResTLUT*); - void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*); + void storeTLUT(GXTlut, ResTLUT*); + void storeTLUT(GXTlut, GXTlutFmt, JUTTransparency, u16, void*); bool load(); - u8 getTlutName() const { return mTlutName; } - u8 getFormat() const { return mFormat; } - u8 getTransparency() const { return mTransparency; } + GXTlut getTlutName() const { return GXTlut(mTlutName); } + GXTlutFmt getFormat() const { return GXTlutFmt(mFormat); } + JUTTransparency getTransparency() const { return JUTTransparency(mTransparency); } u16 getNumColors() const { return mNumColors; } ResTLUT* getColorTable() const { return mColorTable; } private: - /* 0x00 */ _GXTlutObj mTlutObj; + /* 0x00 */ GXTlutObj mTlutObj; /* 0x0C */ u8 mTlutName; /* 0x0D */ u8 mFormat; /* 0x10 */ ResTLUT* mColorTable; diff --git a/include/JSystem/JUtility/JUTProcBar.h b/include/JSystem/JUtility/JUTProcBar.h index 447f31ce9c..e299caf005 100644 --- a/include/JSystem/JUtility/JUTProcBar.h +++ b/include/JSystem/JUtility/JUTProcBar.h @@ -62,6 +62,7 @@ public: /* 0x0C */ int mWidth; /* 0x10 */ int mUserPosition; + CParamSet() {} void setBarWidth(int width) { mBarWidth = width; } void setPosition(int x, int y) { mPosX = x; diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h index d83be32158..8294cb994a 100644 --- a/include/JSystem/JUtility/JUTTexture.h +++ b/include/JSystem/JUtility/JUTTexture.h @@ -59,14 +59,14 @@ public: } ~JUTTexture(); - void storeTIMG(ResTIMG const*, JUTPalette*, _GXTlut); + void storeTIMG(ResTIMG const*, JUTPalette*, GXTlut); void storeTIMG(ResTIMG const*, u8); void storeTIMG(ResTIMG const*, JUTPalette*); void attachPalette(JUTPalette*); void init(); - void initTexObj(_GXTlut); + void initTexObj(GXTlut); void initTexObj(); - void load(_GXTexMapID); + void load(GXTexMapID); const ResTIMG* getTexInfo() const { return mTexInfo; } s32 getFormat() const { return mTexInfo->format; } @@ -74,8 +74,8 @@ public: s32 getWidth() const { return mTexInfo->width; } s32 getHeight() const { return mTexInfo->height; } void setCaptureFlag(bool flag) { mFlags &= 2 | flag; } - u8 getCaptureFlag() const { return mFlags & 1; } - u8 getEmbPaletteDelFlag() const { return mFlags & 2; } + bool getCaptureFlag() const { return mFlags & 1; } + bool getEmbPaletteDelFlag() const { return mFlags & 2; } void setEmbPaletteDelFlag(bool flag) { mFlags = (mFlags & 1) | (flag << 1);} int getTlutName() const { return mTlutName; } bool operator==(const JUTTexture& other) { diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h index 3ef30186eb..3c5966dbe4 100644 --- a/include/JSystem/JUtility/JUTXfb.h +++ b/include/JSystem/JUtility/JUTXfb.h @@ -28,16 +28,20 @@ public: static void destroyManager(); void initiate(u16, u16, JKRHeap*, JUTXfb::EXfbNumber); - s32 getBufferNum() const { return mBufferNum; } + s32 getBufferNum() { return mBufferNum; } s16 getDrawnXfbIndex() const { return mDrawnXfbIndex; } s16 getDrawingXfbIndex() const { return mDrawingXfbIndex; } s16 getDisplayingXfbIndex() const { return mDisplayingXfbIndex; } s32 getSDrawingFlag() const { return mSDrawingFlag; } void* getDrawnXfb() const { - if (mDrawnXfbIndex >= 0) - return mBuffer[mDrawnXfbIndex]; - return NULL; + void* result; + if (mDrawnXfbIndex >= 0) { + result = mBuffer[mDrawnXfbIndex]; + } else { + result = NULL; + } + return result; } void* getDrawingXfb() const { diff --git a/src/JSystem/JUtility/JUTAssert.cpp b/src/JSystem/JUtility/JUTAssert.cpp index 7e36d35df6..9916b8e4c8 100644 --- a/src/JSystem/JUtility/JUTAssert.cpp +++ b/src/JSystem/JUtility/JUTAssert.cpp @@ -7,8 +7,6 @@ #include #include -bool sAssertVisible = true; - namespace JUTAssertion { void create() {} @@ -36,15 +34,15 @@ u32 flush_subroutine() { sMessageLife--; } - if (sMessageLife >= 5) { - return sMessageLife; + if (sMessageLife < 5) { + return 0; } - return 0; + return sMessageLife; } void flushMessage() { - if (flush_subroutine() && sAssertVisible == true) { + if (flush_subroutine() && mVisible == true) { JUTDirectPrint* manager = JUTDirectPrint::getManager(); JUtility::TColor color = manager->getCharColor(); manager->setCharColor(JUtility::TColor(255, 200, 200, 255)); @@ -55,7 +53,7 @@ void flushMessage() { } void flushMessage_dbPrint() { - if (flush_subroutine() && sAssertVisible == true && JUTDbPrint::getManager() != NULL) { + if (flush_subroutine() && mVisible == true && JUTDbPrint::getManager() != NULL) { JUTFont* font = JUTDbPrint::getManager()->getFont(); if (font != NULL) { u8 tmp = ((VIGetRetraceCount() & 0x3C) << 2) | 0xF; @@ -75,6 +73,7 @@ void setConfirmMessage(u32 param_1, char* file, int line, bool param_4, const ch if (param_4 == 1) { return; } + int r30 = 0; u32 r28 = sMessageLife; if (r28 == 0 && (param_1 & 1) != 0) { sMessageLife = sDisplayTime; @@ -96,29 +95,30 @@ void showAssert_f_va(u32 device, const char* file, int line, const char* msg, va OSReport("%s\n", sMessageString); } - if ((device & 1) && JUTDirectPrint::getManager()) { - JUtility::TColor old_color(JUTDirectPrint::getManager()->getCharColor()); - JUTDirectPrint::getManager()->setCharColor(JUtility::TColor(255, 255, 255, 255)); - JUTDirectPrint::getManager()->erase(10, 16, 306, 24); + if ((device & 1)) { + JUTDirectPrint* directPrint = JUTDirectPrint::getManager(); + if (directPrint) { + JUtility::TColor old_color(directPrint->getCharColor()); + directPrint->setCharColor(JUtility::TColor(255, 255, 255, 255)); + directPrint->erase(10, 16, 306, 24); - snprintf(sMessageFileLine, 63, "Failed assertion: %s:%d", file, line); - JUTDirectPrint::getManager()->drawString(16, 16, sMessageFileLine); - JUTDirectPrint::getManager()->drawString(16, 24, sMessageString); + snprintf(sMessageFileLine, 63, "Failed assertion: %s:%d", file, line); + directPrint->drawString(16, 16, sMessageFileLine); + directPrint->drawString(16, 24, sMessageString); - JUTDirectPrint::getManager()->setCharColor(old_color); - VISetNextFrameBuffer(JUTDirectPrint::getManager()->getFrameBuffer()); - VIFlush(); - OSEnableInterrupts(); + directPrint->setCharColor(old_color); + VISetNextFrameBuffer(directPrint->getFrameBuffer()); + VIFlush(); + OSEnableInterrupts(); - u32 retrace_count = VIGetRetraceCount(); - u32 new_count; - do { - new_count = VIGetRetraceCount(); - } while (retrace_count == new_count); + u32 retrace_count = VIGetRetraceCount(); + do { + } while (retrace_count == VIGetRetraceCount()); - // busy loop for 2 seconds - OSTime var1 = OSGetTime(); - while (OSTicksToMilliseconds(OSGetTime() - var1) < 2000) { + // busy loop for 2 seconds + OSTime var1 = OSGetTime(); + while (OSTicksToMilliseconds(OSGetTime() - var1) < 2000) { + } } } } @@ -191,11 +191,15 @@ void setLogMessage_f(u32 device, char* file, int line, const char* msg, ...) { } void setVisible(bool visible) { - sAssertVisible = visible; + mVisible = visible; } void setMessageCount(int msg_count) { - sMessageLife = msg_count <= 0 ? 0 : msg_count; + if (msg_count <= 0) { + sMessageLife = 0; + } else { + sMessageLife = msg_count; + } } }; // namespace JUTAssertion diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index dc2a5455dc..9054c6ec77 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -16,12 +16,9 @@ JUTCacheFont::JUTCacheFont(ResFONT const* p_fontRes, u32 cacheSize, JKRHeap* p_h } JUTCacheFont::~JUTCacheFont() { - if (isValid()) { - deleteMemBlocks_CacheFont(); - initialize_state(); - - deleteMemBlocks_ResFont(); - JUTResFont::initialize_state(); + if (mValid) { + delete_and_initialize(); + JUTResFont::delete_and_initialize(); JUTFont::initialize_state(); } @@ -32,7 +29,7 @@ void JUTCacheFont::deleteMemBlocks_CacheFont() { delete[] mCacheBuffer; } - delete field_0xac; + JKRFreeToAram(field_0xac); delete mInf1Ptr; delete mMemBlocks; delete field_0x7c; @@ -149,10 +146,8 @@ int JUTCacheFont::initiate(ResFONT const* p_fontRes, void* param_1, u32 param_2, bool JUTCacheFont::internal_initiate(ResFONT const* p_fontRes, void* param_1, u32 param_2, JKRHeap* param_3) { - deleteMemBlocks_CacheFont(); - initialize_state(); - deleteMemBlocks_ResFont(); - JUTResFont::initialize_state(); + delete_and_initialize(); + JUTResFont::delete_and_initialize(); JUTFont::initialize_state(); if (p_fontRes == NULL) { @@ -174,7 +169,7 @@ bool JUTCacheFont::internal_initiate(ResFONT const* p_fontRes, void* param_1, u3 return true; } -bool JUTCacheFont::allocArea(void* param_0, u32 param_1, JKRHeap* heap) { +bool JUTCacheFont::allocArea(void* cacheBuffer, u32 param_1, JKRHeap* heap) { mInf1Ptr = (ResFONT::INF1*)new (heap, 0) ResFONT(); if (mInf1Ptr == NULL) { return false; @@ -193,8 +188,7 @@ bool JUTCacheFont::allocArea(void* param_0, u32 param_1, JKRHeap* heap) { return false; } - field_0xac = JKRAram::getManager()->mAramHeap->alloc( - mTotalGlySize - (mGly1BlockNum * sizeof(ResFONT::GLY1)), JKRAramHeap::HEAD); + field_0xac = JKRAllocFromAram(mTotalGlySize - (mGly1BlockNum * sizeof(ResFONT::GLY1)), JKRAramHeap::HEAD); if (field_0xac == NULL) { return false; } @@ -214,8 +208,9 @@ bool JUTCacheFont::allocArea(void* param_0, u32 param_1, JKRHeap* heap) { return false; } - if (param_0 != NULL) { - mCacheBuffer = param_0; + if (cacheBuffer != NULL) { + JUT_ASSERT(352, ( (u32)cacheBuffer & 0x1f ) == 0); + mCacheBuffer = cacheBuffer; field_0xb0 = 0; } else { mCacheBuffer = new (heap, 0x20) u8[v1]; @@ -237,18 +232,18 @@ bool JUTCacheFont::allocArray(JKRHeap* param_0) { void** blocks = mMemBlocks; if (mWid1BlockNum) { - mpWidthBlocks = (ResFONT::WID1**)blocks; + mpWidthBlocks = new (blocks) ResFONT::WID1*[mWid1BlockNum]; blocks = blocks + mWid1BlockNum; } if (mGly1BlockNum) { - mpGlyphBlocks = (ResFONT::GLY1**)blocks; + mpGlyphBlocks = new (blocks) ResFONT::GLY1*[mGly1BlockNum]; blocks = blocks + mGly1BlockNum; for (int i = 0; i < mGly1BlockNum; i++) { mpGlyphBlocks[i] = (ResFONT::GLY1*)((u8*)mCacheBuffer + (field_0x94 * i)); } - } + } if (mMap1BlockNum) { - mpMapBlocks = (ResFONT::MAP1**)blocks; + mpMapBlocks = new (blocks) ResFONT::MAP1*[mMap1BlockNum]; } return true; } @@ -265,16 +260,19 @@ void JUTCacheFont::setBlock() { const int* pData = (int*)mResFont->data; for (int i = 0; i < mResFont->numBlocks; i++) { + u32 u; switch (*pData) { case 'INF1': memcpy(mInf1Ptr, pData, 0x20); - mIsLeadByte = &JUTResFont::saoAboutEncoding_[mInf1Ptr->fontType]; + u = mInf1Ptr->fontType; + JUT_ASSERT(448, u < suAboutEncoding_); + mIsLeadByte = &JUTResFont::saoAboutEncoding_[u]; break; case 'WID1': memcpy(pWidth, pData, pData[1]); mpWidthBlocks[widthNum] = (ResFONT::WID1*)pWidth; - pWidth += pData[1]; widthNum++; + pWidth += pData[1]; break; case 'GLY1': memcpy(piVar5, pData, 0x20); @@ -292,7 +290,7 @@ void JUTCacheFont::setBlock() { mpGlyphBlocks[gylphNum] = piVar5; gylphNum++; piVar5++; - aramAddress = pData[1] + aramAddress - 0x20; + aramAddress += pData[1] - 0x20; break; case 'MAP1': memcpy(pMap, pData, pData[1]); @@ -313,27 +311,27 @@ void JUTCacheFont::setBlock() { } JUTCacheFont::TGlyphCacheInfo* JUTCacheFont::determineBlankPage() { - TGlyphCacheInfo* pVar1 = field_0xa4; - if (pVar1 != NULL) { + TGlyphCacheInfo* pVar1; + if (field_0xa4 != NULL) { + pVar1 = field_0xa4; field_0xa4 = pVar1->mNext; - TGlyphCacheInfo* pVar2 = pVar1->mNext; - if (pVar2 == NULL) { + if (pVar1->mNext == NULL) { field_0xa8 = 0; } else { - pVar2->mPrev = NULL; + pVar1->mNext->mPrev = NULL; } return pVar1; } - TGlyphCacheInfo* puVar1 = field_0xa0; - while (puVar1 != NULL) { - TGlyphCacheInfo* prev = puVar1->mPrev; - if (puVar1->field_0x1e == 0) { - unlink(puVar1); + pVar1 = field_0xa0; + while (pVar1 != NULL) { + TGlyphCacheInfo* prev = pVar1->mPrev; + if (pVar1->field_0x1e == 0) { + unlink(pVar1); field_0xb4++; - return puVar1; + return pVar1; } - puVar1 = prev; + pVar1 = prev; } return NULL; @@ -342,19 +340,20 @@ JUTCacheFont::TGlyphCacheInfo* JUTCacheFont::determineBlankPage() { void JUTCacheFont::getGlyphFromAram(JUTCacheFont::TGlyphCacheInfo* param_0, JUTCacheFont::TCachePage* pCachePage, int* param_2, int* param_3) { TGlyphCacheInfo* pGylphCacheInfo = pCachePage; + int* r30 = param_2; memcpy(pGylphCacheInfo, param_0, sizeof(TGlyphCacheInfo)); prepend(pGylphCacheInfo); int iVar3 = pGylphCacheInfo->field_0x16 * pGylphCacheInfo->field_0x18; - int iVar2 = *param_2 / iVar3; + int iVar2 = *r30 / iVar3; pGylphCacheInfo->field_0x8 += iVar2 * iVar3; u16 local_30 = pGylphCacheInfo->field_0x8 + iVar3 - 1; pGylphCacheInfo->field_0xa = pGylphCacheInfo->field_0xa < local_30 ? pGylphCacheInfo->field_0xa : local_30; *param_3 = iVar2; - *param_2 -= iVar2 * iVar3; - u8* addr = + *r30 -= iVar2 * iVar3; + u8* result = JKRAramToMainRam((u32)param_0->mPrev + pGylphCacheInfo->field_0x10 * iVar2, pCachePage->mImage, pGylphCacheInfo->field_0x10, EXPAND_SWITCH_UNKNOWN0, 0, NULL, 0xffffffff, NULL); - JUT_ASSERT(624, addr != NULL); + JUT_ASSERT(624, result); GXInitTexObj(&pCachePage->mTexObj, pCachePage->mImage, pGylphCacheInfo->mWidth, pGylphCacheInfo->mHeight, (GXTexFmt)pGylphCacheInfo->mTexFormat, GX_CLAMP, GX_CLAMP, GX_FALSE); GXInitTexObjLOD(&pCachePage->mTexObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, @@ -376,21 +375,23 @@ void JUTCacheFont::loadImage(int param_0, _GXTexMapID texMapId) { JUTCacheFont::TCachePage* JUTCacheFont::loadCache_char_subroutine(int* param_0, bool param_1) { TCachePage* rv = NULL; + int* r29 = param_0; for (TCachePage* pCachePage = (TCachePage*)field_0x9c; pCachePage != NULL; pCachePage = (TCachePage*)pCachePage->mNext) { - if (pCachePage->field_0x8 <= *param_0 && *param_0 <= pCachePage->field_0xa) { + if (pCachePage->field_0x8 <= *r29 && *r29 <= pCachePage->field_0xa) { rv = pCachePage; - *param_0 -= pCachePage->field_0x8; + *r29 -= pCachePage->field_0x8; break; } } if (rv == NULL) { + rv = NULL; int i = 0; for (; i < mGly1BlockNum; i++) { - if (mpGlyphBlocks[i]->startCode <= *param_0 && *param_0 <= mpGlyphBlocks[i]->endCode) { - *param_0 -= mpGlyphBlocks[i]->startCode; + if (mpGlyphBlocks[i]->startCode <= *r29 && *r29 <= mpGlyphBlocks[i]->endCode) { + *r29 -= mpGlyphBlocks[i]->startCode; break; } } @@ -400,7 +401,7 @@ JUTCacheFont::TCachePage* JUTCacheFont::loadCache_char_subroutine(int* param_0, return NULL; } int texPageIdx; - getGlyphFromAram((JUTCacheFont::TGlyphCacheInfo*)mpGlyphBlocks[i], pBlankPage, param_0, + getGlyphFromAram((JUTCacheFont::TGlyphCacheInfo*)mpGlyphBlocks[i], pBlankPage, r29, &texPageIdx); mTexPageIdx = texPageIdx; field_0x66 = i; @@ -416,24 +417,13 @@ JUTCacheFont::TCachePage* JUTCacheFont::loadCache_char_subroutine(int* param_0, } void JUTCacheFont::invalidiateAllCache() { - int* piVar3 = (int*)mCacheBuffer; - for (int uVar2 = 0; uVar2 < mCachePage; uVar2++) { - int iVar1; - if (uVar2 == 0) { - iVar1 = 0; - } else { - iVar1 = (intptr_t)piVar3 - field_0x94; - } - *piVar3 = iVar1; - if (uVar2 == mCachePage - 1) { - iVar1 = 0; - } else { - iVar1 = (intptr_t)piVar3 + field_0x94; - } - piVar3[1] = iVar1; - piVar3 = (int*)((intptr_t)piVar3 + field_0x94); + int* cacheBuffer = (int*)mCacheBuffer; + for (int i = 0; i < mCachePage; i++) { + *cacheBuffer = i == 0 ? 0 : (intptr_t)cacheBuffer - field_0x94; + cacheBuffer[1] = i == mCachePage - 1 ? 0 : (intptr_t)cacheBuffer + field_0x94; + cacheBuffer = (int*)((intptr_t)cacheBuffer + field_0x94); } - field_0xa8 = (intptr_t)piVar3 - field_0x94; + field_0xa8 = (intptr_t)cacheBuffer - field_0x94; field_0xa4 = (TGlyphCacheInfo*)mCacheBuffer; field_0x9c = NULL; field_0xa0 = NULL; diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp index 4290c61893..98f8404211 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/src/JSystem/JUtility/JUTConsole.cpp @@ -61,8 +61,8 @@ JUTConsole::JUTConsole(unsigned int param_0, unsigned int maxLines, bool param_2 field_0x6b = false; mOutput = 1; - field_0x5c.set(0, 0, 0, 100); - field_0x60.set(0, 0, 0, 230); + field_0x5c = JUtility::TColor(0, 0, 0, 100); + field_0x60 = JUtility::TColor(0, 0, 0, 230); field_0x64 = 8; } @@ -72,11 +72,13 @@ JUTConsole::~JUTConsole() { } size_t JUTConsole::getObjectSizeFromBufferSize(unsigned int param_0, unsigned int maxLines) { - return (param_0 + 2) * maxLines + sizeof(JUTConsole); + size_t result = (param_0 + 2) * maxLines + sizeof(JUTConsole); + return result; } size_t JUTConsole::getLineFromObjectSize(u32 bufferSize, unsigned int param_1) { - return (bufferSize - sizeof(JUTConsole)) / (param_1 + 2); + size_t result = (bufferSize - sizeof(JUTConsole)) / (param_1 + 2); + return result; } void JUTConsole::clear() { @@ -104,12 +106,12 @@ void JUTConsole::doDraw(JUTConsole::EConsoleType consoleType) const { font_yOffset = 2.0f + mFontSizeY; if (consoleType != CONSOLE_TYPE_2) { - if (JUTVideo::getManager() == NULL) { + if (JUTGetVideoManager() == NULL) { J2DOrthoGraph ortho(0.0f, 0.0f, 640.0f, 480.0f, -1.0f, 1.0f); ortho.setPort(); } else { - J2DOrthoGraph ortho(0.0f, 0.0f, JUTVideo::getManager()->getFbWidth(), - JUTVideo::getManager()->getEfbHeight(), -1.0f, 1.0f); + J2DOrthoGraph ortho(0.0f, 0.0f, JUTGetVideoManager()->getFbWidth(), + JUTGetVideoManager()->getEfbHeight(), -1.0f, 1.0f); ortho.setPort(); } @@ -250,7 +252,7 @@ extern "C" void JUTConsole_print_f_va_(JUTConsole* console, const char* fmt, va_ JUT_ASSERT(563, console!=NULL); char buf[1024]; - vsnprintf(buf, sizeof(buf), fmt, args); + int len = vsnprintf(buf, sizeof(buf), fmt, args); console->print(buf); } @@ -262,13 +264,13 @@ void JUTConsole::dumpToTerminal(unsigned int param_0) { int r29 = field_0x34; if (param_0 != -1) { r29 = field_0x38; - for (int i = 0; i != param_0; i++) { + for (; param_0; param_0--) { int r25 = prevIndex(r29); if (getLineAttr(r25) == 0) { break; } r29 = r25; - if (r25 == field_0x34) { + if (r29 == field_0x34) { break; } } @@ -277,7 +279,7 @@ void JUTConsole::dumpToTerminal(unsigned int param_0) { int r27 = 0; OS_REPORT("\n:::dump of console[%x]--------------------------------\n", this); - do { + while (true) { u8* r28 = getLinePtr(r29); u8 r24 = r28[-1]; if (r24 == 0) { @@ -290,7 +292,10 @@ void JUTConsole::dumpToTerminal(unsigned int param_0) { } r29 = nextIndex(r29); r27++; - } while (r29 != field_0x34); + if (r29 == field_0x34) { + break; + } + }; OS_REPORT(":::dump of console[%x] END----------------------------\n", this); } @@ -301,16 +306,13 @@ void JUTConsole::scroll(int scrollAmnt) { if (scrollAmnt < -diff) { scrollAmnt = -diff; } - } else { - if (scrollAmnt > 0) { - int diff = diffIndex(field_0x34, field_0x38); - if (diff + 1 <= mHeight) { - scrollAmnt = 0; - } else { - diff = diffIndex(field_0x30, field_0x38); - if (scrollAmnt > (int)(diff - mHeight) + 1) { - scrollAmnt = (int)(diff - mHeight) + 1; - } + } else if (scrollAmnt > 0) { + if (diffIndex(field_0x34, field_0x38) + 1 <= mHeight) { + scrollAmnt = 0; + } else { + int r27 = diffIndex(field_0x30, field_0x38) - mHeight + 1; + if (scrollAmnt > r27) { + scrollAmnt = r27; } } } @@ -326,11 +328,13 @@ void JUTConsole::scroll(int scrollAmnt) { } int JUTConsole::getUsedLine() const { - return diffIndex(field_0x34, field_0x38); + int result = diffIndex(field_0x34, field_0x38); + return result; } int JUTConsole::getLineOffset() const { - return diffIndex(field_0x34, field_0x30); + int result = diffIndex(field_0x34, field_0x30); + return result; } JUTConsoleManager::JUTConsoleManager() { @@ -345,9 +349,8 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) { pHeap = JKRGetCurrentHeap(); } - JUTConsoleManager* manager = new (pHeap, 0) JUTConsoleManager(); - sManager = manager; - return manager; + sManager = new (pHeap, 0) JUTConsoleManager(); + return sManager; } void JUTConsoleManager::appendConsole(JUTConsole* console) { @@ -362,8 +365,8 @@ void JUTConsoleManager::appendConsole(JUTConsole* console) { } void JUTConsoleManager::removeConsole(JUTConsole* console) { - JUT_ASSERT(982, sManager != NULL && console != NULL); - JUT_ASSERT(985, soLink_.Find( console ) != soLink_.end()); + JUT_ASSERT(984, sManager != NULL && console != NULL); + JUT_ASSERT(987, soLink_.Find( console ) != soLink_.end()); if (mActiveConsole == console) { if (soLink_.size() <= 1) { @@ -402,8 +405,7 @@ void JUTConsoleManager::drawDirect(bool waitRetrace) const { u32 retrace_count = VIGetRetraceCount(); u32 new_count; do { - new_count = VIGetRetraceCount(); - } while (retrace_count == new_count); + } while (retrace_count == VIGetRetraceCount()); OSRestoreInterrupts(interrupt_status); } mDirectConsole->doDraw(JUTConsole::CONSOLE_TYPE_2); @@ -443,13 +445,15 @@ extern "C" JUTConsole* JUTGetWarningConsole() { extern "C" void JUTReportConsole_f_va(const char* fmt, va_list args) { char buf[256]; + int len; if (JUTGetReportConsole() == NULL) { - vsnprintf(buf, sizeof(buf), fmt, args); + len = vsnprintf(buf, sizeof(buf), fmt, args); + OS_REPORT("%s", buf); } else if (JUTGetReportConsole()->getOutput() & (JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT)) { - vsnprintf(buf, sizeof(buf), fmt, args); + len = vsnprintf(buf, sizeof(buf), fmt, args); JUTGetReportConsole()->print(buf); } } @@ -472,14 +476,15 @@ void JUTReportConsole(const char* message) { void JUTWarningConsole_f_va(const char* fmt, va_list args) { char buf[256]; + int len; if (JUTGetWarningConsole() == NULL) { - vsnprintf(buf, sizeof(buf), fmt, args); + len = vsnprintf(buf, sizeof(buf), fmt, args); OSReport("%s", buf); } else if (JUTGetWarningConsole()->getOutput() & (JUTConsole::OUTPUT_CONSOLE | JUTConsole::OUTPUT_OSREPORT)) { - vsnprintf(buf, sizeof(buf), fmt, args); + len = vsnprintf(buf, sizeof(buf), fmt, args); JUTGetWarningConsole()->print(buf); } } diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index a84c863f26..f137c13dd5 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -9,8 +9,8 @@ JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) { mFont = pFont; mFirst = NULL; - mHeap = pHeap != NULL ? pHeap : JKRHeap::getCurrentHeap(); - mColor.set(255, 255, 255, 255); + mHeap = pHeap != NULL ? pHeap : JKRGetCurrentHeap(); + mColor = JUtility::TColor(255, 255, 255, 255); mVisible = true; } @@ -19,7 +19,7 @@ JUTDbPrint* JUTDbPrint::sDebugPrint; JUTDbPrint* JUTDbPrint::start(JUTFont* pFont, JKRHeap* pHeap) { if (sDebugPrint == NULL) { if (pHeap == NULL) { - pHeap = JKRHeap::getCurrentHeap(); + pHeap = JKRGetCurrentHeap(); } sDebugPrint = new JUTDbPrint(pFont, pHeap); } @@ -35,7 +35,7 @@ JUTFont* JUTDbPrint::changeFont(JUTFont* pFont) { return old; } -void JUTDbPrint::enter(int param_0, int param_1, int param_2, char const* param_3, int param_4) { +void JUTDbPrint::enter(int param_0, int param_1, int param_2, const char* param_3, int param_4) { if (param_4 > 0) { unk_print* ptr = static_cast(JKRAllocFromHeap(mHeap, param_4 + 0x10, -4)); if (ptr != NULL) { @@ -82,10 +82,8 @@ void JUTDbPrint::flush(int param_0, int param_1, int param_2, int param_3) { } } -void JUTDbPrint::drawString(int param_0, int param_1, int param_2, u8 const* param_3) { - JUTFont* font = mFont; - font->drawString_size_scale(param_0, param_1, font->getWidth(), font->getHeight(), - (const char*)param_3, param_2, true); +void JUTDbPrint::drawString(int posX, int posY, int len, const u8* str) { + mFont->drawString_size(posX, posY, (const char*)str, len, true); } void JUTReport(int param_0, int param_1, char const* fmt, ...) { diff --git a/src/JSystem/JUtility/JUTDirectFile.cpp b/src/JSystem/JUtility/JUTDirectFile.cpp index ffbff6b2a5..a60a90c5ec 100644 --- a/src/JSystem/JUtility/JUTDirectFile.cpp +++ b/src/JSystem/JUtility/JUTDirectFile.cpp @@ -54,27 +54,33 @@ bool JUTDirectFile::fopen(const char* filename) { return false; } - int interrupts2 = OSEnableInterrupts(); + interrupts = OSEnableInterrupts(); mLength = mFileInfo.length; - OSRestoreInterrupts(interrupts2); + OSRestoreInterrupts(interrupts); mPos = 0; mIsOpen = true; return true; } +static void dummy(JUTDirectFile* directFile) { + directFile->isOpened(); +} + void JUTDirectFile::fclose() { - if (mIsOpen) { - int interrupts = OSEnableInterrupts(); - DVDClose(&mFileInfo); - OSRestoreInterrupts(interrupts); - mIsOpen = false; + if (!isOpened()) { + return; } + + int interrupts = OSEnableInterrupts(); + DVDClose(&mFileInfo); + OSRestoreInterrupts(interrupts); + mIsOpen = false; } int JUTDirectFile::fgets(void* buf, int len) { // if file isn't open, return error (-1). - if (!mIsOpen) { + if (!isOpened()) { return -1; } @@ -86,6 +92,7 @@ int JUTDirectFile::fgets(void* buf, int len) { // if desired length to get is 1, return 1. // (final byte gotten is always 0, so len 1 is pointless). if (len == 1) { + buf = NULL; return 1; } @@ -99,10 +106,8 @@ int JUTDirectFile::fgets(void* buf, int len) { return -1; } - int readMax; u8* byteBuf = (u8*)buf; int readCount = 0; - readMax = len - 1; // desired bytes of data to get (last value is then 0). while (mPos < mLength) { // if there's nothing left to read, return error. @@ -113,14 +118,13 @@ int JUTDirectFile::fgets(void* buf, int len) { // read in each chunk. u32 currPos = mPos & (JUTDF_BUFSIZE - 1); u32 chunkSize = (mToRead - currPos); - if (readCount + chunkSize > readMax) { + if (readCount + chunkSize > len - 1) { chunkSize = len - readCount - 1; } BOOL isAtEnd = FALSE; for (int i = 0; i < chunkSize; i++) { - u8 byte = mSectorStart[currPos]; - currPos++; + u8 byte = mSectorStart[currPos++]; *byteBuf++ = byte; // if we hit the end of a line, stop reading. @@ -149,7 +153,7 @@ int JUTDirectFile::fgets(void* buf, int len) { readCount += chunkSize; // if we're at (or beyond) our desired length, set final byte to 0 and stop reading. - if (readCount >= readMax) { + if (readCount >= len - 1) { *byteBuf = 0; break; } diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp index d0c7387412..6a9fa75d1e 100644 --- a/src/JSystem/JUtility/JUTDirectPrint.cpp +++ b/src/JSystem/JUtility/JUTDirectPrint.cpp @@ -81,14 +81,9 @@ u32 JUTDirectPrint::sFontData2[77] = { 0xF8000000, 0x10000000, 0x20000000, 0x40000000, 0xF8000000, }; -static u32 twiceBit[4] = { - 0, - 3, - 12, - 15, -}; - void JUTDirectPrint::drawChar(int position_x, int position_y, int ch) { + static u32 twiceBit[4] = { 0, 3, 12, 15 }; + int codepoint = (100 <= ch) ? ch - 100 : ch; int col_index = (codepoint % 5) * 6; int row_index = (codepoint / 5) * 7; @@ -99,46 +94,39 @@ void JUTDirectPrint::drawChar(int position_x, int position_y, int ch) { int scale_y = (mFrameBufferHeight < 300) ? 1 : 2; u16 *pixel = mFrameBuffer + mStride * position_y * scale_y + position_x * scale_x; - for (int y = 0; y < 7; y++) - { - u32 data = *font_data << col_index; - font_data += 1; + for (int y = 0; y < 7; y++) { + u32 data = *font_data++ << col_index; - if (scale_x == 1) - { + if (scale_x == 1) { data = (data & 0xfc000000) >> 1; - } - else - { - u32 a = twiceBit[(data >> 26) & 3]; - u32 b = twiceBit[(data >> 28) & 3] << 4; - u32 c = twiceBit[(data >> 30) & 3] << 8; - data = (a | b | c) << 19; + } else { + data = (twiceBit[(data >> 26) & 3] | twiceBit[(data >> 28) & 3] << 4 | twiceBit[(data >> 30) & 3] << 8) << 19; } - for (int x = 0; x < scale_x * 6; x += 2) - { + for (int x = 0; x < scale_x * 6; x += 2) { u16 value; value = (((data & 0x40000000) ? mCharColor_Y : 0) | ((data & 0x80000000) ? mCharColor_Cb4 : 32) + ((data & 0x40000000) ? mCharColor_Cb2 : 64) + ((data & 0x20000000) ? mCharColor_Cb4 : 32)); - pixel[0] = value; - if (scale_y > 1) + *pixel = value; + if (scale_y > 1) { pixel[mStride] = value; + } + pixel++; value = (((data & 0x20000000) ? mCharColor_Y : 0) | ((data & 0x40000000) ? mCharColor_Cr4 : 32) + ((data & 0x20000000) ? mCharColor_Cr2 : 64) + ((data & 0x10000000) ? mCharColor_Cr4 : 32)); - pixel[1] = value; - if (scale_y > 1) - pixel[1 + mStride] = value; + *pixel = value; + if (scale_y > 1) { + pixel[mStride] = value; + } + pixel++; - pixel += 2; data <<= 2; - } pixel += mStride * scale_y - 6 * scale_x; @@ -172,12 +160,10 @@ void JUTDirectPrint::printSub(u16 position_x, u16 position_y, char const* format for (; 0 < buffer_length; buffer_length--, ptr++) { int codepoint = sAsciiTable[*ptr & 0x7f]; if (codepoint == 0xfe) { - position_x = x; position_y += 7; + position_x = x; } else if (codepoint == 0xfd) { - s32 current_position = (int)position_x; - s32 tab = (current_position - x + 0x2f) % 0x30; - position_x = current_position + 0x30 - tab; + position_x = position_x + 0x30 - ((position_x - x + 0x2f) % 0x30); } else { if (codepoint != 0xff) { drawChar(position_x, position_y, codepoint); @@ -217,7 +203,7 @@ void JUTDirectPrint::setCharColor(JUtility::TColor color) { } void JUTDirectPrint::setCharColor(u8 r, u8 g, u8 b) { - mCharColor.set(r, g, b, 0xFF); + mCharColor = JUtility::TColor(r, g, b, 0xFF); int Cb = -0.148 * (int)r - 0.291 * (int)g + 0.439 * (int)b + 128; int Cr = 0.439 * (int)r - 0.368 * (int)g - 0.071 * (int)b + 128; diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index 32d46c5531..5a2c6289a5 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -52,7 +52,8 @@ JUTException::JUTException(JUTDirectPrint* directPrint) sPreUserCallback = NULL; sPostUserCallback = NULL; - setGamePad(NULL); + mGamePad = NULL; + mGamePadPort = JUTGamePad::EPortInvalid; this->mPrintWaitTime0 = 10; this->mPrintWaitTime1 = 10; @@ -64,8 +65,7 @@ JUTException::JUTException(JUTDirectPrint* directPrint) JUTException* JUTException::create(JUTDirectPrint* directPrint) { if (!sErrorManager) { - JKRHeap* systemHeap = JKRGetSystemHeap(); - sErrorManager = new (systemHeap, 0) JUTException(directPrint); + sErrorManager = new (JKRGetSystemHeap(), 0) JUTException(directPrint); sErrorManager->resume(); } @@ -85,7 +85,9 @@ struct CallbackObject { }; void* JUTException::run() { - PPCMtmsr(PPCMfmsr() & ~0x0900); + u32 msr = PPCMfmsr(); + msr &= ~0x0900; + PPCMtmsr(msr); OSInitMessageQueue(&sMessageQueue, sMessageBuffer, 1); OSMessage message; while (true) { @@ -161,9 +163,8 @@ void JUTException::panic_f_va(char const* file, int line, char const* format, va OSPanic((char*)file, line, buffer); } - OSContext* current_context = OSGetCurrentContext(); static OSContext context; - memcpy(&context, current_context, sizeof(OSContext)); + memcpy(&context, OSGetCurrentContext(), sizeof(OSContext)); sErrorManager->mStackPointer = (uintptr_t)OSGetStackPointer(); exCallbackObject.callback = sPreUserCallback; @@ -181,8 +182,7 @@ void JUTException::panic_f_va(char const* file, int line, char const* format, va } OSSendMessage(&sMessageQueue, &exCallbackObject, 1); - OSThread* current_thread = OSGetCurrentThread(); - OSSuspendThread(current_thread); + OSSuspendThread(OSGetCurrentThread()); } void JUTException::panic_f(char const* file, int line, char const* format, ...) { @@ -249,7 +249,7 @@ bool JUTException::searchPartialModule(u32 address, u32* module_id, u32* section OSModuleInfo* module = *(OSModuleInfo**)0x800030C8; while (module) { OSSectionInfo* section = (OSSectionInfo*)module->sectionInfoOffset; - for (u32 i = 0; i < module->numSections; section = section + 1, i++) { + for (u32 i = 0; i < module->numSections; i++) { if (section->size) { u32 addr = ALIGN_PREV(section->offset, 2); if ((addr <= address) && (address < addr + section->size)) { @@ -264,6 +264,7 @@ bool JUTException::searchPartialModule(u32 address, u32* module_id, u32* section return true; } } + section++; } module = (OSModuleInfo*)module->link.next; @@ -273,21 +274,21 @@ bool JUTException::searchPartialModule(u32 address, u32* module_id, u32* section } static void search_name_part(u8* src, u8* dst, int dst_length) { + u8* r30 = src; for (u8* p = src; *p; p++) { if (*p == '\\') { - src = p; + r30 = p; } } - if (*src == '\\') { - src++; + if (*r30 == '\\') { + r30++; } - for (int i = 0; (*src != 0) && (i < dst_length);) { - if (*src == '.') + for (int i = 0; (*r30 != 0) && (i < dst_length); *dst++ = *r30++, i++) { + if (*r30 == '.') { break; - *dst++ = *src++; - i++; + } } *dst = '\0'; @@ -311,8 +312,7 @@ void JUTException::showStack(OSContext* context) { sConsole->print_f("%08X: %08X %08X\n", stackPointer, stackPointer[0], stackPointer[1]); showMapInfo_subroutine(stackPointer[1], false); - JUTConsoleManager* manager = JUTConsoleManager::sManager; - manager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); waitTime(mPrintWaitTime1); stackPointer = (u32*)stackPointer[0]; } @@ -330,7 +330,8 @@ void JUTException::showMainInfo(u16 error, OSContext* context, u32 dsisr, u32 da } if (error == __OS_EXCEPTION_FLOATING_POINT_EXCEPTION) { - u32 flags = fpscr & (((fpscr & 0xf8) << 0x16) | 0x1f80700); + u32 flags = fpscr; + flags &= ((flags & 0xf8) << 0x16) | 0x1f80700; if ((flags & 0x20000000) != 0) { sConsole->print_f(" FPE: Invalid operation\n"); if ((fpscr & 0x1000000) != 0) { @@ -407,31 +408,30 @@ bool JUTException::showMapInfo_subroutine(u32 address, bool begin_with_newline) new_line = ""; } - bool result = - searchPartialModule(address, &module_id, §ion_id, §ion_offset, &name_offset); + bool result = searchPartialModule(address, &module_id, §ion_id, §ion_offset, &name_offset); if (result == true) { search_name_part((u8*)name_offset, name_part, 32); sConsole->print_f("%s %s:%x section:%d\n", new_line, name_part, section_offset, section_id); + new_line = ""; begin_with_newline = false; } - JSUListIterator last = sMapFileList.getEnd(); - JSUListIterator first = sMapFileList.getFirst(); - if (first != last) { + JSULink* last = sMapFileList.getEnd(); + if (sMapFileList.getFirst() != last) { u32 out_addr; u32 out_size; char out_line[256]; - + bool result2; if (result == true) { - result = + result2 = queryMapAddress((char*)name_part, section_offset, section_id, &out_addr, &out_size, out_line, ARRAY_SIZEU(out_line), true, begin_with_newline); } else { - result = queryMapAddress(NULL, address, -1, &out_addr, &out_size, out_line, + result2 = queryMapAddress(NULL, address, -1, &out_addr, &out_size, out_line, ARRAY_SIZEU(out_line), true, begin_with_newline); } - if (result == true) { + if (result2 == true) { return true; } } @@ -454,10 +454,11 @@ void JUTException::showGPRMap(OSContext* context) { found_address_register = true; sConsole->print_f("R%02d: %08XH", i, address); - if (!showMapInfo_subroutine(address, true)) { + bool result = showMapInfo_subroutine(address, true); + if (!result) { sConsole->print(" no information\n"); } - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); waitTime(mPrintWaitTime1); } } @@ -476,7 +477,8 @@ void JUTException::showSRR0Map(OSContext* context) { u32 address = context->srr0; if (address >= 0x80000000 && address <= 0x83000000 - 1) { sConsole->print_f("SRR0: %08XH", address); - if (showMapInfo_subroutine(address, true) == false) { + bool result = showMapInfo_subroutine(address, true); + if (result == false) { sConsole->print(" no information\n"); } JUTConsoleManager::getManager()->drawDirect(true); @@ -487,7 +489,8 @@ void JUTException::printDebugInfo(JUTException::EInfoPage page, OSError error, O u32 param_3, u32 param_4) { switch (page) { case EINFO_PAGE_GPR: - return showGPR(context); + showGPR(context); + break; case EINFO_PAGE_FLOAT: showFloat(context); if (sConsole) { @@ -495,11 +498,14 @@ void JUTException::printDebugInfo(JUTException::EInfoPage page, OSError error, O } break; case EINFO_PAGE_STACK: - return showStack(context); + showStack(context); + break; case EINFO_PAGE_GPR_MAP: - return showGPRMap(context); + showGPRMap(context); + break; case EINFO_PAGE_SSR0_MAP: - return showSRR0Map(context); + showSRR0Map(context); + break; } } @@ -510,7 +516,10 @@ bool JUTException::isEnablePad() const { if (mGamePadPort >= 0) return true; - return mGamePad; + if (mGamePad) { + return true; + } + return false; } bool JUTException::readPad(u32* out_trigger, u32* out_button) { @@ -528,7 +537,7 @@ bool JUTException::readPad(u32* out_trigger, u32* out_button) { JUTGamePad gamePad1(JUTGamePad::EPort2); JUTGamePad gamePad2(JUTGamePad::EPort3); JUTGamePad gamePad3(JUTGamePad::EPort4); - JUTGamePad::read(); + JUTReadGamePad(); c3bcnt[0] = (gamePad0.isPushing3ButtonReset() ? (c3bcnt[0] != 0 ? c3bcnt[0] : OSGetTime()) : 0); @@ -568,7 +577,7 @@ bool JUTException::readPad(u32* out_trigger, u32* out_button) { OSTime resetTime = (gamePadTime != 0) ? (OSGetTime() - gamePadTime) : 0; gamePad.checkResetCallback(resetTime); - JUTGamePad::read(); + JUTReadGamePad(); if (out_trigger) { *out_trigger = gamePad.getTrigger(); } @@ -578,7 +587,7 @@ bool JUTException::readPad(u32* out_trigger, u32* out_button) { result = true; } else if (mGamePad) { - JUTGamePad::read(); + JUTReadGamePad(); if (out_trigger) { *out_trigger = mGamePad->getTrigger(); } @@ -594,7 +603,7 @@ bool JUTException::readPad(u32* out_trigger, u32* out_button) { // clean up void JUTException::printContext(OSError error, OSContext* context, u32 dsisr, u32 dar) { - bool is_pad_enabled = isEnablePad() == 0; + bool is_pad_enabled = isEnablePad() ? false : true; if (!sErrorManager->mDirectPrint->isActive()) { return; } @@ -619,37 +628,37 @@ void JUTException::printContext(OSError error, OSContext* context, u32 dsisr, u3 while (true) { showMainInfo(error, context, dsisr, dar); - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); waitTime(mPrintWaitTime0); if ((mPrintFlags & JUT_PRINT_GPR) != 0) { printDebugInfo(EINFO_PAGE_GPR, error, context, dsisr, dar); - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); waitTime(mPrintWaitTime0); } if ((mPrintFlags & JUT_PRINT_SRR0_MAP) != 0) { printDebugInfo(EINFO_PAGE_SSR0_MAP, error, context, dsisr, dar); - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); waitTime(mPrintWaitTime0); } if ((mPrintFlags & JUT_PRINT_GPR_MAP) != 0) { printDebugInfo(EINFO_PAGE_GPR_MAP, error, context, dsisr, dar); - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); waitTime(mPrintWaitTime0); } if ((mPrintFlags & JUT_PRINT_FLOAT) != 0) { printDebugInfo(EINFO_PAGE_FLOAT, error, context, dsisr, dar); - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); waitTime(mPrintWaitTime0); } if ((mPrintFlags & JUT_PRINT_STACK) != 0) { printDebugInfo(EINFO_PAGE_STACK, error, context, dsisr, dar); - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); waitTime(mPrintWaitTime1); } sConsole->print("--------------------------------\n"); - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); if (post_callback_executed == 0 && sPostUserCallback) { BOOL enable = OSEnableInterrupts(); @@ -662,7 +671,8 @@ void JUTException::printContext(OSError error, OSContext* context, u32 dsisr, u3 break; } - sConsole->setOutput(sConsole->getOutput() & 1); + u32 output = sConsole->getOutput(); + sConsole->setOutput(output & 1); } if (!is_pad_enabled) { @@ -688,21 +698,15 @@ void JUTException::printContext(OSError error, OSContext* context, u32 dsisr, u3 } if (button == 8) { - JUTConsole* console = sConsole; - up = (down < 3) ? -1 : ((down < 5) ? -2 : ((down < 7) ? -4 : -8)); - - console->scroll(up); + sConsole->scroll((down < 3) ? -1 : ((down < 5) ? -2 : ((down < 7) ? -4 : -8))); draw = true; - up = 0; down++; + up = 0; } else if (button == 4) { - JUTConsole* console = sConsole; - down = (up < 3) ? 1 : ((up < 5) ? 2 : ((up < 7) ? 4 : 8)); - - console->scroll(down); + sConsole->scroll((up < 3) ? 1 : ((up < 5) ? 2 : ((up < 7) ? 4 : 8))); draw = true; - down = 0; up++; + down = 0; } else { down = 0; up = 0; @@ -712,7 +716,7 @@ void JUTException::printContext(OSError error, OSContext* context, u32 dsisr, u3 u32 start = VIGetRetraceCount(); while (start == VIGetRetraceCount()) ; - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); } waitTime(30); @@ -721,7 +725,7 @@ void JUTException::printContext(OSError error, OSContext* context, u32 dsisr, u3 while (true) { sConsole->scrollToFirstLine(); - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); waitTime(2000); int line_offset; @@ -730,23 +734,15 @@ void JUTException::printContext(OSError error, OSContext* context, u32 dsisr, u3 next: for (u32 i = sConsole->getHeight(); i > 0; i--) { sConsole->scroll(1); - JUTConsoleManager::sManager->drawDirect(true); + JUTConsoleManager::getManager()->drawDirect(true); - height = sConsole->getHeight(); - JUTConsole* console = sConsole; - line_offset = console->getLineOffset(); - used_line = console->getUsedLine(); - if ((used_line - height) + 1U <= line_offset) + if ((sConsole->getUsedLine() - sConsole->getHeight()) + 1U <= sConsole->getLineOffset()) break; waitTime(20); } waitTime(3000); - height = sConsole->getHeight(); - JUTConsole* console = sConsole; - line_offset = console->getLineOffset(); - used_line = console->getUsedLine(); - if ((used_line - height) + 1U <= line_offset) { + if ((sConsole->getUsedLine() - sConsole->getHeight()) + 1U <= sConsole->getLineOffset()) { continue; } goto next; @@ -810,8 +806,7 @@ void JUTException::appendMapFile(char const* path) { return; } - JSUListIterator iterator; - for (iterator = sMapFileList.getFirst(); iterator != sMapFileList.getEnd(); ++iterator) { + for (JSUListIterator iterator = sMapFileList.getFirst(); iterator != sMapFileList.getEnd(); iterator++) { if (strcmp(path, iterator->mPath) == 0) { return; } @@ -833,7 +828,7 @@ bool JUTException::queryMapAddress(char* mapPath, u32 address, s32 section_id, u { return true; } - } else if (sMapFileList.getFirst() != sMapFileList.getEnd()) { + } else if (sMapFileList.getFirst()) { if (queryMapAddress_single(sMapFileList.getFirst()->getObject()->mPath, address, -1, out_addr, out_size, out_line, line_length, print, begin_with_newline) == true) @@ -979,10 +974,9 @@ void JUTException::createConsole(void* console_buffer, u32 console_buffer_size) if (lines != 0) { sConsoleBuffer = console_buffer; sConsoleBufferSize = console_buffer_size; - sConsole = JUTConsole::create(0x32, console_buffer, console_buffer_size); + sConsole = JUTConsole::create(0x32, sConsoleBuffer, sConsoleBufferSize); - JUTConsoleManager* manager = JUTConsoleManager::sManager; - manager->setDirectConsole(sConsole); + JUTConsoleManager::getManager()->setDirectConsole(sConsole); sConsole->setFontSize(10.0, 6.0); sConsole->setPosition(15, 26); diff --git a/src/JSystem/JUtility/JUTFader.cpp b/src/JSystem/JUtility/JUTFader.cpp index 57a7e09395..35bcb09d87 100644 --- a/src/JSystem/JUtility/JUTFader.cpp +++ b/src/JSystem/JUtility/JUTFader.cpp @@ -51,13 +51,11 @@ void JUTFader::control() { } void JUTFader::draw() { - if (mColor.a == 0) { - return; - } - - J2DOrthoGraph orthograph; - orthograph.setColor(mColor); - orthograph.fillBox(mBox); + if (mColor.a != 0) { + J2DOrthoGraph orthograph; + orthograph.setColor(mColor); + orthograph.fillBox(mBox); + } } bool JUTFader::startFadeIn(int param_0) { diff --git a/src/JSystem/JUtility/JUTFont.cpp b/src/JSystem/JUtility/JUTFont.cpp index eedd0d8e85..90976b3f76 100644 --- a/src/JSystem/JUtility/JUTFont.cpp +++ b/src/JSystem/JUtility/JUTFont.cpp @@ -12,9 +12,8 @@ JUTFont::JUTFont() : mColor1(), mColor2(), mColor3(), mColor4() { } void JUTFont::initialize_state() { - setCharColor(JUtility::TColor()); - mFixed = false; - mFixedWidth = 0; + setCharColor(-1); + setFixedWidth(false, 0); mValid = false; } @@ -36,14 +35,15 @@ f32 JUTFont::drawString_size_scale(f32 a1, f32 a2, f32 a3, f32 a4, const char* s bool a7) { f32 temp = a1; - for (; usz > 0; usz--, str++) { + for (; usz > 0; --usz, ++str) { u32 c = *(u8*)str; u32 b = c; if (isLeadByte(b)) { + JUT_ASSERT(114, usz >= 2); + usz--; str++; b <<= 8; b |= *(u8*)str; - usz--; } a1 += drawChar_scale(a1, a2, a3, a4, b, a7); diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp index 6faf755bae..2330d538f2 100644 --- a/src/JSystem/JUtility/JUTGamePad.cpp +++ b/src/JSystem/JUtility/JUTGamePad.cpp @@ -80,7 +80,7 @@ u32 JUTGamePad::sRumbleSupported; u32 JUTGamePad::read() { sRumbleSupported = PADRead(mPadStatus); - switch (sClampMode) { + switch (getClampMode()) { case EClampStick: PADClamp(mPadStatus); break; @@ -115,7 +115,7 @@ u32 JUTGamePad::read() { } } - for (JSUListIterator pad(mPadList.getFirst()); pad != mPadList.getEnd(); pad++) { + for (JSUListIterator pad(mPadList.getFirst()); pad != mPadList.getEnd(); ++pad) { if (pad->getPadReplay() != NULL && pad->getPadReplay()->isActive()) { PADStatus status; pad->getPadReplay()->getStatus(&status); @@ -162,7 +162,7 @@ void JUTGamePad::assign() { } } -bool JUTGamePad::CRumble::mStatus[4]; +u8 JUTGamePad::CRumble::mStatus[4]; u32 JUTGamePad::CRumble::mEnabled; @@ -246,6 +246,7 @@ JSUList JUTGamePadLongPress::sPatternList(false); void JUTGamePad::checkResetSwitch() { if (!JUTGamePad::C3ButtonReset::sResetOccurred) { + int unused; if (OSGetResetSwitchState()) { C3ButtonReset::sResetSwitchPushing = true; } else { @@ -284,14 +285,7 @@ void JUTGamePad::CButton::clear() { } void JUTGamePad::CButton::update(const PADStatus* padStatus, u32 stickStatus) { - u32 buttons; - if (padStatus != NULL) { - buttons = padStatus->button; - } else { - buttons = 0; - } - - buttons = stickStatus | buttons; + u32 buttons = stickStatus | (padStatus != NULL ? padStatus->button : 0); mRepeat = 0; if (mRepeatDelay != 0 && mRepeatMask != 0) { @@ -347,7 +341,7 @@ void JUTGamePad::CStick::clear() { u32 JUTGamePad::CStick::update(s8 x, s8 y, JUTGamePad::EStickMode mode, JUTGamePad::EWhichStick stick, u32 buttons) { s32 clamp; - switch (sClampMode) { + switch (getClampMode()) { case EClampStick: clamp = stick == EMainStick ? 54 : 42; break; @@ -385,8 +379,7 @@ u32 JUTGamePad::CStick::update(s8 x, s8 y, JUTGamePad::EStickMode mode, } } - u32 button_shift = stick == EMainStick ? 0x18 : 0x10; - return getButton(buttons >> button_shift); + return getButton(buttons >> (stick == EMainStick ? 0x18 : 0x10)); } u32 JUTGamePad::CStick::getButton(u32 buttons) { @@ -436,8 +429,13 @@ void JUTGamePad::CRumble::startMotor(int port) { } void JUTGamePad::CRumble::stopMotor(int port, bool hard_stop) { + u8 command; if (isEnabledPort(port)) { - u8 command = hard_stop ? PAD_MOTOR_STOP_HARD : PAD_MOTOR_STOP; + if (hard_stop) { + command = PAD_MOTOR_STOP_HARD; + } else { + command = PAD_MOTOR_STOP; + } PADControlMotor(port, command); mStatus[port] = false; } @@ -484,7 +482,7 @@ void JUTGamePad::CRumble::update(s16 port) { if (status) { stopMotor(port, hard_stop); } else if (hard_stop) { - stopMotorHard(port); + stopMotor(port, true); } } } @@ -518,18 +516,18 @@ void JUTGamePad::CRumble::startPatternedRumble(void* data, JUTGamePad::CRumble:: } void JUTGamePad::CRumble::stopPatternedRumble(s16 port) { + JUT_ASSERT(1341, 0 <= port && port < 4); mLength = 0; stopMotorHard(port); } void JUTGamePad::CRumble::stopPatternedRumbleAtThePeriod() { + u32 r31 = mFrame % mFrameCount; mLength = (mFrame + mFrameCount - 1) % mFrameCount; } JUTGamePad* JUTGamePad::getGamePad(int port) { - JSUListIterator pad(mPadList.getFirst()); - - for (; pad != mPadList.getEnd(); pad++) { + for (JSUListIterator pad(mPadList.getFirst()); pad != mPadList.getEnd(); ++pad) { if (port == pad->mPortNum) { return pad.getObject(); } @@ -539,20 +537,21 @@ JUTGamePad* JUTGamePad::getGamePad(int port) { } void JUTGamePad::CRumble::setEnabled(u32 mask) { + mask = (mask & (PAD_CHAN3_BIT | PAD_CHAN2_BIT | PAD_CHAN1_BIT | PAD_CHAN0_BIT)); for (int i = 0; i < 4; i++) { if ((mEnabled & channel_mask[i]) == 0) { if (mStatus[i]) { - stopMotor(i, false); + stopMotor(i); } JUTGamePad* pad = getGamePad(i); if (pad != NULL) { - pad->mRumble.stopPatternedRumble(pad->mPortNum); + pad->stopMotorWaveHard(); } } } - mEnabled = (mask & (PAD_CHAN3_BIT | PAD_CHAN2_BIT | PAD_CHAN1_BIT | PAD_CHAN0_BIT)); + mEnabled = mask; } void JUTGamePad::CButton::setRepeat(u32 mask, u32 delay, u32 rate) { @@ -563,6 +562,13 @@ void JUTGamePad::CButton::setRepeat(u32 mask, u32 delay, u32 rate) { mRepeatRate = rate; } +void JUTGamePad::setButtonRepeat(u32 mask, u32 delay, u32 rate) { + mButton.setRepeat(mask, delay, rate); + if (mPortNum >= 0) { + mPadButton[mPortNum].setRepeat(mask, delay, rate); + } +} + bool JUTGamePad::recalibrate(u32 mask) { for (int i = 0; i < 4; i++) { if (sSuppressPadReset & channel_mask[i]) { @@ -570,16 +576,25 @@ bool JUTGamePad::recalibrate(u32 mask) { } } - return PADRecalibrate(mask); + BOOL result = PADRecalibrate(mask); + return result; } void JUTGamePadLongPress::checkCallback(int port, u32 hold_time) { - if (port >= 0 && hold_time >= mThreshold) { - field_0x11 = true; - field_0x48[port] = true; + if (port < 0) { + return; + } - if (mCallback != NULL) { - mCallback(port, this, field_0x50); - } + JUT_ASSERT(1673, 0 <= port && port < 4); + + if (hold_time < mThreshold) { + return; + } + + field_0x11 = true; + field_0x48[port] = true; + + if (mCallback != NULL) { + mCallback(port, this, field_0x50); } } diff --git a/src/JSystem/JUtility/JUTGraphFifo.cpp b/src/JSystem/JUtility/JUTGraphFifo.cpp index 6553d90453..06d47d6a11 100644 --- a/src/JSystem/JUtility/JUTGraphFifo.cpp +++ b/src/JSystem/JUtility/JUTGraphFifo.cpp @@ -11,8 +11,9 @@ JUTGraphFifo* JUTGraphFifo::sCurrentFifo; JUTGraphFifo::JUTGraphFifo(u32 size) { mSize = size + 0x1F & ~0x1F; if (data_804514B8) { - mFifo = (GXFifoObj*)JKRAllocFromSysHeap(mSize + 0x80, 32); - mBase = mFifo + 1; + u32 r29 = sizeof(GXFifoObj); + mFifo = (GXFifoObj*)JKRAllocFromSysHeap(mSize + r29, 32); + mBase = (u8*)mFifo + r29; GXInitFifoBase(mFifo, mBase, mSize); GXInitFifoPtrs(mFifo, mBase, mBase); } else { diff --git a/src/JSystem/JUtility/JUTPalette.cpp b/src/JSystem/JUtility/JUTPalette.cpp index 049f78dfe9..a28b4184dd 100644 --- a/src/JSystem/JUtility/JUTPalette.cpp +++ b/src/JSystem/JUtility/JUTPalette.cpp @@ -4,7 +4,7 @@ #include "dolphin/gx.h" #include "dolphin/os.h" -void JUTPalette::storeTLUT(_GXTlut param_0, ResTLUT* tlut) { +void JUTPalette::storeTLUT(GXTlut param_0, ResTLUT* tlut) { if (tlut == NULL) { OSPanic("JUTPalette.cpp", 35, "JUTTexture: TLUT is NULL\n"); } @@ -16,7 +16,7 @@ void JUTPalette::storeTLUT(_GXTlut param_0, ResTLUT* tlut) { GXInitTlutObj(&mTlutObj, (void*)mColorTable, (GXTlutFmt)mFormat, mNumColors); } -void JUTPalette::storeTLUT(_GXTlut param_0, _GXTlutFmt param_1, JUTTransparency param_2, +void JUTPalette::storeTLUT(GXTlut param_0, GXTlutFmt param_1, JUTTransparency param_2, u16 param_3, void* param_4) { mTlutName = param_0; mFormat = param_1; diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/src/JSystem/JUtility/JUTProcBar.cpp index c9599868bc..6de3753989 100644 --- a/src/JSystem/JUtility/JUTProcBar.cpp +++ b/src/JSystem/JUtility/JUTProcBar.cpp @@ -64,15 +64,16 @@ void JUTProcBar::clear() { void JUTProcBar::bar_subroutine(int param_0, int param_1, int param_2, int param_3, int param_4, int param_5, int param_6, JUtility::TColor param_7, JUtility::TColor param_8) { - int var1 = param_6 * param_3 / param_4; - J2DFillBox(param_0, param_1, param_5 * param_3 / param_4, param_2, param_7); - if (var1 < 0) { + int r29 = param_5 * param_3 / param_4; + int r31 = param_6 * param_3 / param_4; + J2DFillBox(param_0, param_1, r29, param_2, param_7); + if (r31 < 0) { return; } - if (var1 < 6) { - J2DFillBox(param_0, param_1, var1, param_2, param_8); + if (r31 < 6) { + J2DFillBox(param_0, param_1, r31, param_2, param_8); } else { - J2DFillBox(param_0 + var1 - 6, param_1, 6.0f, param_2, param_8); + J2DFillBox(param_0 + r31 - 6, param_1, 6.0f, param_2, param_8); } } @@ -250,18 +251,21 @@ void JUTProcBar::drawProcessBar() { } static int addrToXPos(void* param_0, int param_1) { - return param_1 * (((uintptr_t)param_0 - 0x80000000) / (float)JKRHeap::mMemorySize); + int result = param_1 * (((uintptr_t)param_0 - 0x80000000) / (float)JKRHeap::getMemorySize()); + return result; } static int byteToXLen(int param_0, int param_1) { - return param_1 * (param_0 / (float)JKRHeap::mMemorySize); + int result = param_1 * (param_0 / (float)JKRHeap::getMemorySize()); + return result; } static void heapBar(JKRHeap* param_0, int param_1, int param_2, int param_3, int param_4, int param_5) { int stack52 = param_1 + addrToXPos(param_0->getStartAddr(), param_4); int var1 = param_1 + addrToXPos(param_0->getEndAddr(), param_4); - int stack36 = byteToXLen(param_0->getTotalFreeSize(), param_4); + s32 freeSize = param_0->getTotalFreeSize(); + int stack36 = byteToXLen(freeSize, param_4); J2DFillBox(stack52, param_2 - param_5 * 2 + param_5 / 2, var1 - stack52, param_5 / 2, JUtility::TColor(255, 0, 200, 255)); J2DFillBox(stack52, param_2 - param_5 * 2 + param_5 / 2, stack36, param_5 / 2, @@ -270,8 +274,6 @@ static void heapBar(JKRHeap* param_0, int param_1, int param_2, int param_3, int void JUTProcBar::drawHeapBar() { if (mHeapBarVisible) { - int start; // required/workaround for regswaps, end might be a shared variable too, however - // doesn't seem to be needed? int posX = mParams.mPosX; int posY = mParams.mPosY; int barHeight = mParams.mBarWidth * 2; @@ -284,25 +286,26 @@ void JUTProcBar::drawHeapBar() { 6); // Draws a pink line that shows the size of the memstart to start of arenalow? - start = posX + addrToXPos(JKRHeap::getCodeStart(), width); - int codeEnd = posX + addrToXPos(JKRHeap::getCodeEnd(), width); - J2DFillBox(start, posY - (height * 2), codeEnd - start, height, + int start = posX + addrToXPos(JKRHeap::getCodeStart(), width); + int end = posX + addrToXPos(JKRHeap::getCodeEnd(), width); + J2DFillBox(start, posY - (height * 2), end - start, height, JUtility::TColor(255, 50, 150, 255)); // draws a dark blue line that shows how much memory is free? start = posX + addrToXPos(JKRHeap::getUserRamStart(), width); - int userEnd = posX + addrToXPos(JKRHeap::getUserRamEnd(), width); - J2DFillBox(start, posY - (height * 2), userEnd - start, height, + end = posX + addrToXPos(JKRHeap::getUserRamEnd(), width); + J2DFillBox(start, posY - (height * 2), end - start, height, JUtility::TColor(0, 50, 150, 255)); // draws a light blue line that shows how much memory is free in the root heap(blends to // light pink, not sure how this works) - int size = byteToXLen(JKRHeap::getRootHeap()->getTotalFreeSize(), width); + s32 freeSize = JKRHeap::getRootHeap()->getTotalFreeSize(); + int size = byteToXLen(freeSize, width); J2DFillBox(start, posY - (height * 2), size, height / 2, JUtility::TColor(0, 250, 250, 255)); if (field_0x128 == 0) { // draws a line of either the watch heap(if available), otherwise draw the current heap - JKRHeap* heap = mWatchHeap ? mWatchHeap : JKRGetCurrentHeap(); + JKRHeap* heap = mWatchHeap ? mWatchHeap : JKRHeap::getCurrentHeap(); if (heap != JKRHeap::getSystemHeap()) { heapBar(heap, posX, posY, barHeight, width, height); } diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/src/JSystem/JUtility/JUTResFont.cpp index b375a90388..5a609070ca 100644 --- a/src/JSystem/JUtility/JUTResFont.cpp +++ b/src/JSystem/JUtility/JUTResFont.cpp @@ -20,8 +20,7 @@ JUTResFont::JUTResFont(const ResFONT* pFont, JKRHeap* pHeap) { JUTResFont::~JUTResFont() { if (mValid) { - deleteMemBlocks_ResFont(); - initialize_state(); + delete_and_initialize(); JUTFont::initialize_state(); } } @@ -43,8 +42,7 @@ void JUTResFont::initialize_state() { bool JUTResFont::initiate(const ResFONT* pFont, JKRHeap* pHeap) { if (!protected_initiate(pFont, pHeap)) { - deleteMemBlocks_ResFont(); - initialize_state(); + delete_and_initialize(); JUTFont::initialize_state(); mValid = false; return false; @@ -65,25 +63,25 @@ bool JUTResFont::protected_initiate(const ResFONT* pFont, JKRHeap* pHeap) { countBlock(); mMemBlocks = new (pHeap, 0) void*[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum]; - p = mMemBlocks; if (!mMemBlocks) { return false; - } else { - if (mWid1BlockNum != 0) { - mpWidthBlocks = (ResFONT::WID1**)p; - p += mWid1BlockNum; - } - if (mGly1BlockNum != 0) { - mpGlyphBlocks = (ResFONT::GLY1**)p; - p += mGly1BlockNum; - } - if (mMap1BlockNum != 0) { - mpMapBlocks = (ResFONT::MAP1**)p; - } - setBlock(); - return true; } + p = mMemBlocks; + if (mWid1BlockNum != 0) { + mpWidthBlocks = new (p) ResFONT::WID1*[mWid1BlockNum]; + p += mWid1BlockNum; + } + if (mGly1BlockNum != 0) { + mpGlyphBlocks = new (p) ResFONT::GLY1*[mGly1BlockNum]; + p += mGly1BlockNum; + } + if (mMap1BlockNum != 0) { + mpMapBlocks = new (p) ResFONT::MAP1*[mMap1BlockNum]; + } + setBlock(); + return true; + } void JUTResFont::countBlock() { @@ -215,7 +213,6 @@ f32 JUTResFont::drawChar_scale(f32 pos_x, f32 pos_y, f32 scale_x, f32 scale_y, i bool flag) { f32 x1; f32 y1; - f32 scaled_height; f32 x2; JUT_ASSERT(378, mValid); @@ -237,9 +234,7 @@ f32 JUTResFont::drawChar_scale(f32 pos_x, f32 pos_y, f32 scale_x, f32 scale_y, i } x2 = x1 + scale_x; y1 = pos_y - getAscent() * (scale_y / getHeight()); - scaled_height = scale_y / getHeight(); - f32 descent = getDescent(); - f32 y2 = descent * scaled_height + pos_y; + f32 y2 = getDescent() * (scale_y / getHeight()) + pos_y; s32 u1 = (mWidth * 0x8000) / mpGlyphBlocks[field_0x66]->textureWidth; s32 v1 = (mHeight * 0x8000) / mpGlyphBlocks[field_0x66]->textureHeight; @@ -268,6 +263,7 @@ f32 JUTResFont::drawChar_scale(f32 pos_x, f32 pos_y, f32 scale_x, f32 scale_y, i GXPosition3f32(x1, y2, 0.0f); GXColor1u32(mColor3); GXTexCoord2u16(u1, v2); + GXEnd(); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0); @@ -290,9 +286,7 @@ void JUTResFont::getWidthEntry(int code, JUTFont::TWidth* i_width) const { for (int i = 0; i < mWid1BlockNum; i++) { if (mpWidthBlocks[i]->startCode <= fontCode && fontCode <= mpWidthBlocks[i]->endCode) { - u8* ptr = &mpWidthBlocks[i]->mChunkNum[(fontCode - mpWidthBlocks[i]->startCode) * 2]; - i_width->field_0x0 = ptr[0]; - i_width->field_0x1 = ptr[1]; + *i_width = *(JUTFont::TWidth*)&mpWidthBlocks[i]->mChunkNum[(fontCode - mpWidthBlocks[i]->startCode) * 2]; break; } } @@ -300,9 +294,8 @@ void JUTResFont::getWidthEntry(int code, JUTFont::TWidth* i_width) const { s32 JUTResFont::getCellWidth() const { if (mpGlyphBlocks) { - ResFONT::GLY1* glyphBlock = *mpGlyphBlocks; - if (glyphBlock) { - return glyphBlock->cellWidth; + if (mpGlyphBlocks[0]) { + return mpGlyphBlocks[0]->cellWidth; } } @@ -311,9 +304,8 @@ s32 JUTResFont::getCellWidth() const { s32 JUTResFont::getCellHeight() const { if (mpGlyphBlocks) { - ResFONT::GLY1* glyphBlock = *mpGlyphBlocks; - if (glyphBlock) { - return glyphBlock->cellHeight; + if (mpGlyphBlocks[0]) { + return mpGlyphBlocks[0]->cellHeight; } } @@ -324,18 +316,18 @@ bool JUTResFont::isLeadByte(int chr) const { return (*mIsLeadByte)(chr); } -static const u16 halftofull[95] = { - 0x8140, 0x8149, 0x8168, 0x8194, 0x8190, 0x8193, 0x8195, 0x8166, 0x8169, 0x816A, 0x8196, 0x817B, - 0x8143, 0x817C, 0x8144, 0x815E, 0x824F, 0x8250, 0x8251, 0x8252, 0x8253, 0x8254, 0x8255, 0x8256, - 0x8257, 0x8258, 0x8146, 0x8147, 0x8183, 0x8181, 0x8184, 0x8148, 0x8197, 0x8260, 0x8261, 0x8262, - 0x8263, 0x8264, 0x8265, 0x8266, 0x8267, 0x8268, 0x8269, 0x826A, 0x826B, 0x826C, 0x826D, 0x826E, - 0x826F, 0x8270, 0x8271, 0x8272, 0x8273, 0x8274, 0x8275, 0x8276, 0x8277, 0x8278, 0x8279, 0x816D, - 0x818F, 0x816E, 0x814F, 0x8151, 0x8165, 0x8281, 0x8282, 0x8283, 0x8284, 0x8285, 0x8286, 0x8287, - 0x8288, 0x8289, 0x828A, 0x828B, 0x828C, 0x828D, 0x828E, 0x828F, 0x8290, 0x8291, 0x8292, 0x8293, - 0x8294, 0x8295, 0x8296, 0x8297, 0x8298, 0x8299, 0x829A, 0x816F, 0x8162, 0x8170, 0x8160, -}; - int JUTResFont::getFontCode(int chr) const { + static const u16 halftofull[95] = { + 0x8140, 0x8149, 0x8168, 0x8194, 0x8190, 0x8193, 0x8195, 0x8166, 0x8169, 0x816A, 0x8196, 0x817B, + 0x8143, 0x817C, 0x8144, 0x815E, 0x824F, 0x8250, 0x8251, 0x8252, 0x8253, 0x8254, 0x8255, 0x8256, + 0x8257, 0x8258, 0x8146, 0x8147, 0x8183, 0x8181, 0x8184, 0x8148, 0x8197, 0x8260, 0x8261, 0x8262, + 0x8263, 0x8264, 0x8265, 0x8266, 0x8267, 0x8268, 0x8269, 0x826A, 0x826B, 0x826C, 0x826D, 0x826E, + 0x826F, 0x8270, 0x8271, 0x8272, 0x8273, 0x8274, 0x8275, 0x8276, 0x8277, 0x8278, 0x8279, 0x816D, + 0x818F, 0x816E, 0x814F, 0x8151, 0x8165, 0x8281, 0x8282, 0x8283, 0x8284, 0x8285, 0x8286, 0x8287, + 0x8288, 0x8289, 0x828A, 0x828B, 0x828C, 0x828D, 0x828E, 0x828F, 0x8290, 0x8291, 0x8292, 0x8293, + 0x8294, 0x8295, 0x8296, 0x8297, 0x8298, 0x8299, 0x829A, 0x816F, 0x8162, 0x8170, 0x8160, + }; + int ret = mInf1Ptr->defaultCode; if ((getFontType() == 2) && (mMaxCode >= 0x8000U) && (chr >= 0x20) && (chr < 0x7FU)) { chr = halftofull[chr - 32]; @@ -346,7 +338,8 @@ int JUTResFont::getFontCode(int chr) const { ret = chr - mpMapBlocks[i]->startCode; break; } else if (mpMapBlocks[i]->mappingMethod == 2) { - ret = *(&mpMapBlocks[i]->mLeading + (chr - mpMapBlocks[i]->startCode)); + u16* leading_temp = &mpMapBlocks[i]->mLeading; + ret = leading_temp[chr - mpMapBlocks[i]->startCode]; break; } else if (mpMapBlocks[i]->mappingMethod == 3) { u16* leading_temp = &mpMapBlocks[i]->mLeading; @@ -394,31 +387,31 @@ void JUTResFont::loadImage(int code, GXTexMapID id){ } } - if (i == mGly1BlockNum) - return; + if (i != mGly1BlockNum) { + s32 pageNumCells = mpGlyphBlocks[i]->numRows * mpGlyphBlocks[i]->numColumns; + s32 pageIdx = code / pageNumCells; + s32 cellIdxInPage = code - pageIdx * pageNumCells; + s32 cellRow = (cellIdxInPage / mpGlyphBlocks[i]->numRows); + s32 cellCol = (cellIdxInPage - cellRow * mpGlyphBlocks[i]->numRows); + mWidth = cellCol * mpGlyphBlocks[i]->cellWidth; + mHeight = cellRow * mpGlyphBlocks[i]->cellHeight; - s32 pageNumCells = mpGlyphBlocks[i]->numRows * mpGlyphBlocks[i]->numColumns; - s32 pageIdx = code / pageNumCells; - s32 cellIdxInPage = code % pageNumCells; - s32 cellCol = (cellIdxInPage % mpGlyphBlocks[i]->numRows); - s32 cellRow = (cellIdxInPage / mpGlyphBlocks[i]->numRows); - mWidth = cellCol * mpGlyphBlocks[i]->cellWidth; - mHeight = cellRow * mpGlyphBlocks[i]->cellHeight; + if (pageIdx != mTexPageIdx || i != field_0x66) + { + GXInitTexObj(&mTexObj, &mpGlyphBlocks[i]->data[pageIdx * mpGlyphBlocks[i]->textureSize], mpGlyphBlocks[i]->textureWidth, + mpGlyphBlocks[i]->textureHeight, (GXTexFmt)mpGlyphBlocks[i]->textureFormat, GX_CLAMP, GX_CLAMP, 0); - if (pageIdx != mTexPageIdx || i != field_0x66) - { - GXInitTexObj(&mTexObj, &mpGlyphBlocks[i]->data[pageIdx * mpGlyphBlocks[i]->textureSize], mpGlyphBlocks[i]->textureWidth, - mpGlyphBlocks[i]->textureHeight, (GXTexFmt)mpGlyphBlocks[i]->textureFormat, GX_CLAMP, GX_CLAMP, 0); + GXInitTexObjLOD(&mTexObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, 0U, 0U, GX_ANISO_1); + mTexPageIdx = pageIdx; + field_0x66 = i; + } - GXInitTexObjLOD(&mTexObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, 0U, 0U, GX_ANISO_1); - mTexPageIdx = pageIdx; - field_0x66 = i; + GXLoadTexObj(&mTexObj, id); } - - GXLoadTexObj(&mTexObj, id); } int JUTResFont::convertSjis(int inChr, u16* inLead) const { + int r29; int tmp = JSUHiByte(inChr); int tmp2 = JSULoByte(inChr) - 0x40; @@ -432,5 +425,6 @@ int JUTResFont::convertSjis(int inChr, u16* inLead) const { lead = *inLead; } - return tmp2 + (tmp - 0x88) * 0xbc + -0x5e + lead; + r29 = tmp2 + (tmp - 0x88) * 0xbc + -0x5e + lead; + return r29; } diff --git a/src/JSystem/JUtility/JUTResource.cpp b/src/JSystem/JUtility/JUTResource.cpp index 80eb6a8e5f..1b28ef1871 100644 --- a/src/JSystem/JUtility/JUTResource.cpp +++ b/src/JSystem/JUtility/JUTResource.cpp @@ -6,8 +6,8 @@ #include void* JUTResReference::getResource(JSUInputStream* stream, u32 resType, JKRArchive* archive) { - stream->read(&mType, 1); - stream->read(&mNameLength, 1); + stream->read(mType); + stream->read(mNameLength); stream->read(&mName, mNameLength); if (mType == RESTYPE_Unk2 || mType == RESTYPE_Unk3 || mType == RESTYPE_Unk4) { @@ -39,13 +39,13 @@ void* JUTResReference::getResource(u32 resType, JKRArchive* archive) { case RESTYPE_Unk1: break; case RESTYPE_Unk2: - res = JKRArchive::getGlbResource(resType, mName, archive); + res = JKRGetTypeResource(resType, mName, archive); break; case RESTYPE_Unk3: - res = JKRFileLoader::getGlbResource(mName, archive); + res = JKRGetNameResource(mName, archive); break; case RESTYPE_Unk4: - res = JKRFileLoader::getGlbResource(mName); + res = JKRGetResource(mName); break; } diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/src/JSystem/JUtility/JUTTexture.cpp index 3a5926586d..0bbdc93fe0 100644 --- a/src/JSystem/JUtility/JUTTexture.cpp +++ b/src/JSystem/JUtility/JUTTexture.cpp @@ -14,8 +14,6 @@ JUTTexture::~JUTTexture() { } void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { - _GXTlut tlut; - if (param_0 && param_1 < 0x10) { mTexInfo = param_0; mTexData = (void*)((intptr_t)mTexInfo + mTexInfo->imageOffset); @@ -37,19 +35,20 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { if (mTexInfo->numColors == 0) { initTexObj(); } else { + GXTlut tlut; if (mTexInfo->numColors > 0x100) { - tlut = (_GXTlut)((param_1 % 4) + GX_BIGTLUT0); + tlut = (GXTlut)((param_1 % 4) + GX_BIGTLUT0); } else { - tlut = (_GXTlut)param_1; + tlut = (GXTlut)param_1; } if (mEmbPalette == NULL || !getEmbPaletteDelFlag()) { - mEmbPalette = new JUTPalette(tlut, (_GXTlutFmt)mTexInfo->colorFormat, + mEmbPalette = new JUTPalette(tlut, (GXTlutFmt)mTexInfo->colorFormat, (JUTTransparency)mTexInfo->alphaEnabled, mTexInfo->numColors, (void*)(&mTexInfo->format + mTexInfo->paletteOffset)); - mFlags = mFlags & 1 | 2; + setEmbPaletteDelFlag(true); } else { - mEmbPalette->storeTLUT(tlut, (_GXTlutFmt)mTexInfo->colorFormat, + mEmbPalette->storeTLUT(tlut, (GXTlutFmt)mTexInfo->colorFormat, (JUTTransparency)mTexInfo->alphaEnabled, mTexInfo->numColors, (void*)(&mTexInfo->format + mTexInfo->paletteOffset)); } @@ -59,18 +58,18 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { } void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1) { - _GXTlut type; + GXTlut type; if (param_1 != NULL) { - type = (_GXTlut)param_1->getTlutName(); + type = param_1->getTlutName(); } else { type = GX_TLUT0; } storeTIMG(param_0, param_1, type); } -void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1, _GXTlut param_2) { - _GXTlut type; +void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1, GXTlut param_2) { + GXTlut type; if (param_0 == NULL) { return; @@ -89,13 +88,11 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1, _GXTlut if (param_1 != NULL) { mTlutName = param_2; if (param_2 != param_1->getTlutName()) { - u8 format = param_1->getFormat(); - u8 transperancy = param_1->getTransparency(); + GXTlutFmt format = param_1->getFormat(); + JUTTransparency transperancy = param_1->getTransparency(); u16 numColors = param_1->getNumColors(); ResTLUT* colorTable = param_1->getColorTable(); - param_1->storeTLUT(param_2, (_GXTlutFmt)format, - (JUTTransparency)transperancy, - numColors, colorTable); + param_1->storeTLUT(param_2, format, transperancy, numColors, colorTable); } } @@ -116,8 +113,7 @@ void JUTTexture::attachPalette(JUTPalette* param_0) { } else { field_0x2c = param_0; } - _GXTlut name = (_GXTlut)field_0x2c->getTlutName(); - initTexObj(name); + initTexObj(field_0x2c->getTlutName()); } } @@ -128,8 +124,9 @@ void JUTTexture::init() { if (mEmbPalette != NULL) { field_0x2c = mEmbPalette; - _GXTlut name = (_GXTlut)field_0x2c->getTlutName(); - initTexObj(name); + initTexObj(field_0x2c->getTlutName()); + } else { + OS_REPORT("This texture is CI-Format, but EmbPalette is NULL.\n"); } } } @@ -151,7 +148,7 @@ void JUTTexture::initTexObj() { mTexInfo->doEdgeLOD, (GXAnisotropy)mTexInfo->maxAnisotropy); } -void JUTTexture::initTexObj(_GXTlut param_0) { +void JUTTexture::initTexObj(GXTlut param_0) { GXBool mipmapEnabled; if (mTexInfo->mipmapEnabled != 0) { mipmapEnabled = 1; @@ -169,7 +166,7 @@ void JUTTexture::initTexObj(_GXTlut param_0) { mTexInfo->doEdgeLOD, (GXAnisotropy)mTexInfo->maxAnisotropy); } -void JUTTexture::load(_GXTexMapID param_0) { +void JUTTexture::load(GXTexMapID param_0) { if (field_0x2c) { field_0x2c->load(); } diff --git a/src/JSystem/JUtility/JUTVideo.cpp b/src/JSystem/JUtility/JUTVideo.cpp index fc05d945b5..b40b841c9a 100644 --- a/src/JSystem/JUtility/JUTVideo.cpp +++ b/src/JSystem/JUtility/JUTVideo.cpp @@ -78,20 +78,20 @@ void JUTVideo::preRetraceProc(u32 retrace_count) { static void* frameBuffer = NULL; if (frameBuffer) { - JUTVideo* videoManager = JUTGetVideoManager(); - const GXRenderModeObj* renderMode = videoManager->getRenderMode(); - JUTDirectPrint* directPrint = JUTDirectPrint::getManager(); - directPrint->changeFrameBuffer(frameBuffer, renderMode->fbWidth, renderMode->efbHeight); + const GXRenderModeObj* renderMode = JUTGetVideoManager()->getRenderMode(); + u16 width = renderMode->fbWidth; + u16 height = renderMode->efbHeight; + JUTDirectPrint::getManager()->changeFrameBuffer(frameBuffer, width, height); } - if (sManager->mSetBlack == 1) { - s32 frame_count = sManager->mSetBlackFrameCount; + if (getManager()->mSetBlack == 1) { + s32 frame_count = getManager()->mSetBlackFrameCount; if (frame_count > 0) { frame_count--; } - sManager->mSetBlackFrameCount = frame_count; - sManager->mSetBlack = frame_count != 0; + getManager()->mSetBlackFrameCount = frame_count; + getManager()->mSetBlack = frame_count ? true : false; VISetBlack(TRUE); VIFlush(); return; @@ -157,8 +157,7 @@ void JUTVideo::drawDoneCallback() { if (xfb->getSDrawingFlag() == 1) { xfb->setSDrawingFlag(0); - void* frameBuffer = xfb->getDrawnXfb(); - if (frameBuffer) { + if (xfb->getDrawnXfb()) { VISetNextFrameBuffer(xfb->getDrawnXfb()); VIFlush(); } @@ -175,8 +174,7 @@ void JUTVideo::postRetraceProc(u32 retrace_count) { sManager->mPostCallback(retrace_count); } - OSMessage message = (OSMessage*)VIGetRetraceCount(); - OSSendMessage(&sManager->mMessageQueue, message, OS_MESSAGE_NOBLOCK); + OSSendMessage(&sManager->mMessageQueue, (OSMessage)VIGetRetraceCount(), OS_MESSAGE_NOBLOCK); } void JUTVideo::setRenderMode(GXRenderModeObj const* pObj) { diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp index 73d9c1889a..3557f7d8c1 100644 --- a/src/JSystem/JUtility/JUTXfb.cpp +++ b/src/JSystem/JUtility/JUTXfb.cpp @@ -69,11 +69,11 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber int size = (u16)((u16)width + 0xf & ~0xf) * height * 2; - mBuffer[0] = ::operator new[](size, pHeap, 0x20); + mBuffer[0] = new (pHeap, 0x20) u8[size]; mXfbAllocated[0] = true; if (xfbNum >= 2) { - mBuffer[1] = ::operator new[](size, pHeap, 0x20); + mBuffer[1] = new (pHeap, 0x20) u8[size]; mXfbAllocated[1] = true; } else { mBuffer[1] = NULL; @@ -81,7 +81,7 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber } if (xfbNum >= 3) { - mBuffer[2] = ::operator new[](size, pHeap, 0x20); + mBuffer[2] = new (pHeap, 0x20) u8[size]; mXfbAllocated[2] = true; } else { mBuffer[2] = NULL;